price

src/app/services/api.service.ts

@@ -86,6 +86,18 @@ export class ApiService {
     return c.startsWith('0x') ? '#' + c.slice(2) : c;
   }
 
+  private normalizeOptionalNumber(value: unknown): number | undefined {
+    if (value === null || value === undefined || value === '') {
+      return undefined;
+    }
+
+    const normalized = typeof value === 'number'
+      ? value
+      : Number(String(value).replace(',', '.'));
+
+    return Number.isFinite(normalized) ? normalized : undefined;
+  }
+
   /** Resolve relative image URLs (e.g. ./images/x.webp) against site origin */
   private resolveImageUrl(url: string): string {
     if (!url) return '';
@@ -102,6 +114,13 @@ export class ApiService {
   private normalizeItem(raw: any): Item {
     const { partnerID, ...rest } = raw;
     const item: Item = { ...rest };
+    const topLevelDeliveryPrice = this.normalizeOptionalNumber(
+      raw.deliveryPrice ?? raw.delivery_price ?? raw.deliveryprice
+    );
+
+    if (topLevelDeliveryPrice !== undefined) {
+      item.deliveryPrice = topLevelDeliveryPrice;
+    }
 
     // Extract price/currency/remaining/colour/size from itemDetails[]
     // Note: Go struct tag is "itemdetails" but actual API may send "itemDetails"
@@ -112,11 +131,23 @@ export class ApiService {
         ...d,
         colour: this.normalizeColor(d.colour || d.color || ''),
         color: undefined,
+        deliveryPrice: this.normalizeOptionalNumber(
+          d.deliveryPrice ?? d.delivery_price ?? d.deliveryprice
+        ),
       }));
       if (item.price == null || item.price === 0) item.price = detail.price;
       if (!item.currency) item.currency = detail.currency;
       if (!item.colour) item.colour = this.normalizeColor(detail.colour || detail.color || '');
       if (!item.size) item.size = detail.size || '';
+      if (item.deliveryPrice == null) {
+        const detailDeliveryPrice = this.normalizeOptionalNumber(
+          detail.deliveryPrice ?? detail.delivery_price ?? detail.deliveryprice
+        );
+
+        if (detailDeliveryPrice !== undefined) {
+          item.deliveryPrice = detailDeliveryPrice;
+        }
+      }
       // Use remaining from detail for stock level
       if (raw.remaining == null && detail.remaining != null) {
         (raw as any).remaining = detail.remaining;

src/app/services/cart.service.ts

@@ -28,6 +28,17 @@ export class CartService {
       return total + (getDiscountedPrice(item) * item.quantity);
     }, 0);
   });
+  totalDeliveryPrice = computed(() => {
+    const items = this.cartItems();
+    if (!Array.isArray(items)) return 0;
+    return items.reduce((total, item) => total + ((item.deliveryPrice ?? 0) * item.quantity), 0);
+  });
+  totalWithDelivery = computed(() => this.totalPrice() + this.totalDeliveryPrice());
+  hasDeliveryPrice = computed(() => {
+    const items = this.cartItems();
+    if (!Array.isArray(items)) return false;
+    return items.some(item => item.deliveryPrice !== undefined && item.deliveryPrice !== null);
+  });
 
   constructor(private apiService: ApiService) {
     this.loadCart();
@@ -41,6 +52,29 @@ export class CartService {
     });
   }
 
+  private normalizeOptionalNumber(value: unknown): number | undefined {
+    if (value === null || value === undefined || value === '') {
+      return undefined;
+    }
+
+    const normalized = typeof value === 'number'
+      ? value
+      : Number(String(value).replace(',', '.'));
+
+    return Number.isFinite(normalized) ? normalized : undefined;
+  }
+
+  private normalizeCartItem(item: CartItem): CartItem {
+    const { deliveryPrice, ...rest } = item;
+    const normalizedDeliveryPrice = this.normalizeOptionalNumber(deliveryPrice);
+
+    return {
+      ...rest,
+      quantity: item.quantity || 1,
+      ...(normalizedDeliveryPrice !== undefined ? { deliveryPrice: normalizedDeliveryPrice } : {}),
+    };
+  }
+
   private saveToStorage(items: CartItem[]): void {
     const data = JSON.stringify(items);
     
@@ -90,10 +124,7 @@ export class CartService {
     try {
       const items = JSON.parse(json);
       if (Array.isArray(items)) {
-        this.cartItems.set(items.map(item => ({
-          ...item,
-          quantity: item.quantity || 1
-        })));
+        this.cartItems.set(items.map(item => this.normalizeCartItem(item)));
         return true;
       }
     } catch (err) {
@@ -118,14 +149,14 @@ export class CartService {
       this.addingItems.add(itemID);
       this.apiService.getItem(itemID).subscribe({
         next: (item) => {
-          const cartItem: CartItem = {
+          const cartItem = this.normalizeCartItem({
             ...item,
             quantity,
             ...(variant?.colour != null && { colour: variant.colour }),
             ...(variant?.size != null && { size: variant.size }),
             ...(variant?.price != null && { price: variant.price }),
             ...(variant?.currency != null && { currency: variant.currency }),
-          };
+          });
           this.cartItems.set([...this.cartItems(), cartItem]);
           this.addingItems.delete(itemID);
         },