@o2vend/theme-cli 1.0.35 → 1.0.37

package/lib/lib/mock-data.js

@@ -10,29 +10,41 @@
 function generateMockData() {
   return {
     store: {
-      id: 'mock-store-1',
+      id: 1,
+      identifier: 'mock-store',
       name: 'My O2VEND Store',
-      description: 'A beautiful e-commerce store powered by O2VEND',
       domain: 'localhost:3000',
-      email: 'store@example.com',
-      phone: '+1234567890',
-      address: {
-        address1: '123 Main Street',
-        city: 'New York',
-        state: 'NY',
-        zip: '10001',
-        country: 'US'
-      },
+      companyName: 'My O2VEND Store',
+      companyAddress: '123 Main Street, New York, NY 10001',
+      companyPhoneNumber: '+1234567890',
+      companyEmail: 'store@example.com',
       currency: 'USD',
       currencySymbol: '$',
-      locale: 'en-US',
       timezone: 'America/New_York',
+      language: 'en',
+      logoUrl: '/assets/logo.png',
+      favouriteIconUrl: '/favicon.ico',
       settings: {
+        currency: 'USD',
         currencySymbol: '$',
         currencyFormat: '#,##0.00',
         currencyDecimalDigits: 2,
         currencyGroupSeparator: ',',
-        currencyDecimalSeparator: '.'
+        currencyDecimalSeparator: '.',
+        currencyGroupSizes: [3],
+        deliveryZoneSupport: false,
+        deliveryZoneSelection: 0,
+        defaultDeliveryZoneZipCode: null,
+        loginTypes: null,
+        zipcodeSearchEnabled: false,
+        referEnabled: false,
+        shoppingCartIconType: null,
+        timezone: 'America/New_York',
+        language: 'en',
+        logo: '/assets/logo.png',
+        favicon: '/favicon.ico',
+        countries: [],
+        states: {}
       }
     },
     
@@ -50,8 +62,10 @@ function generateMockData() {
       id: 'mock-cart-1',
       items: [],
       total: 0,
-      itemCount: 0,
-      currency: 'USD'
+      subTotal: 0,
+      taxAmount: 0,
+      shippingAmount: 0,
+      itemCount: 0
     }
   };
 }
@@ -67,21 +81,21 @@ function generateMockProducts(count = 20) {
   
   // Category mapping - map category names to category IDs (matching generateMockCategories order)
   const categoryMap = {
-    'Electronics': 'category-1',
-    'Clothing': 'category-2',
-    'Accessories': 'category-3',
-    'Home & Garden': 'category-4',
-    'Home': 'category-4', // Alias for Home & Garden
-    'Sports & Fitness': 'category-5',
-    'Sports': 'category-5', // Alias for Sports & Fitness
-    'Books & Media': 'category-6',
-    'Toys & Games': 'category-7',
-    'Beauty & Health': 'category-8',
-    'Automotive': 'category-9',
-    'Food & Beverages': 'category-10',
-    'Furniture': 'category-4', // Map Furniture to Home & Garden
-    'Office': 'category-6', // Map Office to Books & Media (or could be separate)
-    'Footwear': 'category-2' // Map Footwear to Clothing
+    'Electronics': 1,
+    'Clothing': 2,
+    'Accessories': 3,
+    'Home & Garden': 4,
+    'Home': 4,
+    'Sports & Fitness': 5,
+    'Sports': 5,
+    'Books & Media': 6,
+    'Toys & Games': 7,
+    'Beauty & Health': 8,
+    'Automotive': 9,
+    'Food & Beverages': 10,
+    'Furniture': 4,
+    'Office': 6,
+    'Footwear': 2
   };
   
   // Product data with images from picsum.photos (reliable placeholder service)
@@ -140,7 +154,7 @@ function generateMockProducts(count = 20) {
     const productImageId = productTemplate.imageId;
     
     // Get categoryId from category name using categoryMap
-    const categoryId = categoryMap[productCategory] || 'category-1'; // Default to Electronics if not found
+    const categoryId = categoryMap[productCategory] || 1;
     
     // Determine stock quantity - mix of low stock, high stock, and out of stock
     const stockType = i % 5;
@@ -179,10 +193,10 @@ function generateMockProducts(count = 20) {
           const variantPrice = basePrice + (variantIndex % 3 === 0 ? 500 : 0); // Some variants slightly more expensive
           const variantMrp = Math.round(variantPrice * 1.5);
           const variantStock = Math.floor(Math.random() * stock) + (stock > 0 ? 1 : 0);
-          const variantProductId = (i + 1) * 1000 + variantIndex; // Unique productId for variant
+          const variantProductId = (i + 1) * 1000 + variantIndex;
           variants.push({
             id: `variant-${i + 1}-${variantIndex}`,
-            productId: variantProductId, // Required by product-card template
+            productId: variantProductId,
             title: `${size} / ${color}`,
             option1: size,
             option2: color,
@@ -190,14 +204,15 @@ function generateMockProducts(count = 20) {
             option2Name: 'Color',
             price: variantPrice,
             compareAtPrice: variantMrp,
-            // prices object required by product-card template
             prices: {
               price: variantPrice,
               mrp: variantMrp
             },
             sku: `SKU-${i + 1}-${size}-${color}`,
             inStock: variantStock > 0,
-            stock: variantStock,
+            stockQuantity: variantStock,
+            stockTrackingIsEnabled: true,
+            isAllowToOrder: false,
             available: variantStock > 0
           });
           variantIndex++;
@@ -206,7 +221,7 @@ function generateMockProducts(count = 20) {
     } else if (hasSizeVariations) {
       // Product with size variations only
       sizes.slice(0, 5).forEach((size, idx) => {
-        const variantPrice = basePrice + (idx * 200); // Larger sizes cost more
+        const variantPrice = basePrice + (idx * 200);
         const variantMrp = Math.round(variantPrice * 1.5);
         const variantStock = Math.floor(Math.random() * stock) + (stock > 0 ? 1 : 0);
         const variantProductId = (i + 1) * 1000 + idx + 1;
@@ -224,14 +239,16 @@ function generateMockProducts(count = 20) {
           },
           sku: `SKU-${i + 1}-${size}`,
           inStock: variantStock > 0,
-          stock: variantStock,
+          stockQuantity: variantStock,
+          stockTrackingIsEnabled: true,
+          isAllowToOrder: false,
           available: variantStock > 0
         });
       });
     } else if (hasColorVariations) {
       // Product with color variations only
       colors.slice(0, 4).forEach((color, idx) => {
-        const variantPrice = basePrice + (idx % 2 === 0 ? 300 : 0); // Some colors cost more
+        const variantPrice = basePrice + (idx % 2 === 0 ? 300 : 0);
         const variantMrp = Math.round(variantPrice * 1.5);
         const variantStock = Math.floor(Math.random() * stock) + (stock > 0 ? 1 : 0);
         const variantProductId = (i + 1) * 1000 + idx + 1;
@@ -249,7 +266,9 @@ function generateMockProducts(count = 20) {
           },
           sku: `SKU-${i + 1}-${color}`,
           inStock: variantStock > 0,
-          stock: variantStock,
+          stockQuantity: variantStock,
+          stockTrackingIsEnabled: true,
+          isAllowToOrder: false,
           available: variantStock > 0
         });
       });
@@ -268,49 +287,44 @@ function generateMockProducts(count = 20) {
         },
         sku: `SKU-${i + 1}`,
         inStock: inStock,
-        stock: stock,
+        stockQuantity: stock,
+        stockTrackingIsEnabled: true,
+        isAllowToOrder: false,
         available: inStock
       });
     }
 
-    // Calculate total stock from variants
-    const totalStock = variants.reduce((sum, v) => sum + (v.stock || 0), 0);
+    const totalStock = variants.reduce((sum, v) => sum + (v.stockQuantity || 0), 0);
     const hasAnyStock = variants.some(v => v.inStock || v.available);
 
-    const productHandle = `product-${i + 1}`.toLowerCase();
+    const productHandle = productName.toLowerCase().replace(/\s+/g, '-').replace(/[^a-z0-9-]/g, '') + (i > 0 ? `-${i + 1}` : '');
+    const productTitle = productName + (i > 0 ? ` ${i + 1}` : '');
     products.push({
-      id: productId,
-      productId: i + 1, // Numeric product ID for API compatibility
-      title: productName + (i > 0 ? ` ${i + 1}` : ''),
-      name: productName + (i > 0 ? ` ${i + 1}` : ''), // Also provide name for templates
+      id: i + 1,
+      productId: i + 1,
+      title: productTitle,
+      name: productTitle,
       handle: productHandle,
       slug: productHandle,
-      url: `/products/${productHandle}`, // URL for product detail page
-      link: `/products/${productHandle}`, // Alternative URL property
+      url: productHandle,
+      link: productHandle,
       description: `Description for ${productName}. High quality product with excellent features.${hasVariations ? ' Available in multiple options.' : ''}`,
       price: basePrice,
       compareAtPrice: comparePrice,
-      // Prices object used by product-card snippet
       prices: {
         price: basePrice,
-        mrp: comparePrice,
-        currency: 'USD'
+        mrp: comparePrice
       },
-      discountPercentage: Math.floor(((comparePrice - basePrice) / comparePrice) * 100),
-      currency: 'USD',
       inStock: hasAnyStock,
-      available: hasAnyStock, // Alternative property for availability
-      stock: totalStock,
-      stockQuantity: totalStock, // Alternative property for stock
+      available: hasAnyStock,
+      stockQuantity: totalStock,
+      stockTrackingIsEnabled: true,
+      isAllowToOrder: false,
       sku: `SKU-${i + 1}`,
-      categoryId: categoryId, // Use mapped categoryId based on product category
-      category: productCategory, // Also include category name for reference
-      brandId: `brand-${(i % 8) + 1}`,
-      // Primary thumbnail for product cards
-      thumbnailImage1: {
-        url: `https://picsum.photos/seed/${productImageId}/800/800`,
-        altText: productName
-      },
+      categoryId: categoryId,
+      category: { id: categoryId, name: productCategory },
+      brandId: (i % 8) + 1,
+      thumbnailImage: `https://picsum.photos/seed/${productImageId}/800/800`,
       imageUrl: `https://picsum.photos/seed/${productImageId}/800/800`,
       images: [
         {
@@ -351,23 +365,235 @@ function generateMockProducts(count = 20) {
         : [],
       tags: ['featured', 'new', 'sale'],
       createdAt: new Date(Date.now() - Math.random() * 365 * 24 * 60 * 60 * 1000).toISOString(),
-      // Required fields for product-detail JSON template
-      productType: 0, // 0 = simple product, 1 = variable, 2 = subscription
-      // additionalData uses | default:null without | json, so we use string 'null'
-      // This outputs as literal null in JSON (without quotes)
+      productType: 0,
       additionalData: 'null',
-      // These fields use | json filter, so they should be actual arrays
       combinations: [],
       subscriptions: [],
       shippingMethods: [],
-      variations: variants // Also expose as variations for template compatibility
+      variations: variants
     });
   }
 
+  // Variation product with production-style options structure
+  const variationProductId = products.length + 1;
+  const variationVariants = [
+    {
+      id: `variant-var-1`, productId: variationProductId * 1000 + 1, name: 'Wireless Headphones - Black / Standard',
+      sku: 'WH-BLK-STD', title: 'Black / Standard',
+      prices: { price: 7999, mrp: 9999 }, price: 7999, compareAtPrice: 9999,
+      options: [
+        { id: 1, optionId: 1, optionName: 'Color', value: 'Black', displayType: 'color', displayValue: '#000000', sortIndex: 1 },
+        { id: 2, optionId: 2, optionName: 'Edition', value: 'Standard', displayType: 'text', displayValue: '', sortIndex: 1 }
+      ],
+      images: [{ url: 'https://picsum.photos/seed/wh-black/800/800', altText: 'Wireless Headphones Black' }],
+      inStock: true, available: true, stockQuantity: 25
+    },
+    {
+      id: `variant-var-2`, productId: variationProductId * 1000 + 2, name: 'Wireless Headphones - Black / Pro',
+      sku: 'WH-BLK-PRO', title: 'Black / Pro',
+      prices: { price: 11999, mrp: 14999 }, price: 11999, compareAtPrice: 14999,
+      options: [
+        { id: 3, optionId: 1, optionName: 'Color', value: 'Black', displayType: 'color', displayValue: '#000000', sortIndex: 1 },
+        { id: 4, optionId: 2, optionName: 'Edition', value: 'Pro', displayType: 'text', displayValue: '', sortIndex: 2 }
+      ],
+      images: [{ url: 'https://picsum.photos/seed/wh-black-pro/800/800', altText: 'Wireless Headphones Black Pro' }],
+      inStock: true, available: true, stockQuantity: 15
+    },
+    {
+      id: `variant-var-3`, productId: variationProductId * 1000 + 3, name: 'Wireless Headphones - White / Standard',
+      sku: 'WH-WHT-STD', title: 'White / Standard',
+      prices: { price: 7999, mrp: 9999 }, price: 7999, compareAtPrice: 9999,
+      options: [
+        { id: 5, optionId: 1, optionName: 'Color', value: 'White', displayType: 'color', displayValue: '#ffffff', sortIndex: 2 },
+        { id: 6, optionId: 2, optionName: 'Edition', value: 'Standard', displayType: 'text', displayValue: '', sortIndex: 1 }
+      ],
+      images: [{ url: 'https://picsum.photos/seed/wh-white/800/800', altText: 'Wireless Headphones White' }],
+      inStock: true, available: true, stockQuantity: 20
+    },
+    {
+      id: `variant-var-4`, productId: variationProductId * 1000 + 4, name: 'Wireless Headphones - Silver / Pro',
+      sku: 'WH-SLV-PRO', title: 'Silver / Pro',
+      prices: { price: 12999, mrp: 15999 }, price: 12999, compareAtPrice: 15999,
+      options: [
+        { id: 7, optionId: 1, optionName: 'Color', value: 'Silver', displayType: 'color', displayValue: '#c0c0c0', sortIndex: 3 },
+        { id: 8, optionId: 2, optionName: 'Edition', value: 'Pro', displayType: 'text', displayValue: '', sortIndex: 2 }
+      ],
+      images: [{ url: 'https://picsum.photos/seed/wh-silver-pro/800/800', altText: 'Wireless Headphones Silver Pro' }],
+      inStock: false, available: false, stockQuantity: 0
+    }
+  ];
+  products.push({
+    id: variationProductId, productId: variationProductId,
+    title: 'Wireless Noise-Cancelling Headphones', name: 'Wireless Noise-Cancelling Headphones',
+    handle: 'wireless-noise-cancelling-headphones', slug: 'wireless-noise-cancelling-headphones',
+    url: 'wireless-noise-cancelling-headphones', link: 'wireless-noise-cancelling-headphones',
+    description: 'Premium wireless headphones with active noise cancellation. Available in multiple colors and editions.',
+    price: 7999, compareAtPrice: 9999, prices: { price: 7999, mrp: 9999 },
+    inStock: true, available: true, stockQuantity: 60, stockTrackingIsEnabled: true, isAllowToOrder: false,
+    sku: 'WH-MAIN', categoryId: 1, category: { id: 1, name: 'Electronics' }, brandId: 1,
+    thumbnailImage: 'https://picsum.photos/seed/wh-main/800/800',
+    imageUrl: 'https://picsum.photos/seed/wh-main/800/800',
+    images: [
+      { id: 'img-var-1', url: 'https://picsum.photos/seed/wh-main/800/800', altText: 'Wireless Headphones' },
+      { id: 'img-var-2', url: 'https://picsum.photos/seed/wh-side/800/800', altText: 'Wireless Headphones Side View' },
+      { id: 'img-var-3', url: 'https://picsum.photos/seed/wh-case/800/800', altText: 'Wireless Headphones with Case' }
+    ],
+    variants: variationVariants, variations: variationVariants,
+    options: [
+      { name: 'Color', values: ['Black', 'White', 'Silver'] },
+      { name: 'Edition', values: ['Standard', 'Pro'] }
+    ],
+    tags: ['featured', 'electronics', 'audio'], productType: 0, additionalData: 'null',
+    combinations: [], subscriptions: [], shippingMethods: [],
+    createdAt: new Date(Date.now() - 10 * 24 * 60 * 60 * 1000).toISOString()
+  });
+
+  // Combination product with group-based add-ons
+  const comboProductId = products.length + 1;
+  products.push({
+    id: comboProductId, productId: comboProductId,
+    title: 'Gaming Console Bundle', name: 'Gaming Console Bundle',
+    handle: 'gaming-console-bundle', slug: 'gaming-console-bundle',
+    url: 'gaming-console-bundle', link: 'gaming-console-bundle',
+    description: 'Next-gen gaming console with customizable accessories bundle. Choose your controller, headset, and games.',
+    price: 49999, compareAtPrice: 59999, prices: { price: 49999, mrp: 59999 },
+    inStock: true, available: true, stockQuantity: 30, stockTrackingIsEnabled: true, isAllowToOrder: false,
+    sku: 'GCB-MAIN', categoryId: 1, category: { id: 1, name: 'Electronics' }, brandId: 2,
+    thumbnailImage: 'https://picsum.photos/seed/gcb-main/800/800',
+    imageUrl: 'https://picsum.photos/seed/gcb-main/800/800',
+    images: [
+      { id: 'img-combo-1', url: 'https://picsum.photos/seed/gcb-main/800/800', altText: 'Gaming Console Bundle' },
+      { id: 'img-combo-2', url: 'https://picsum.photos/seed/gcb-box/800/800', altText: 'Gaming Console Box Contents' }
+    ],
+    variants: [{ id: 'variant-combo-1', productId: comboProductId * 1000 + 1, title: 'Default', price: 49999, compareAtPrice: 59999, prices: { price: 49999, mrp: 59999 }, sku: 'GCB-DEF', inStock: true, available: true, stockQuantity: 30 }],
+    variations: [],
+    options: [],
+    combinations: [
+      {
+        productId: comboProductId * 100 + 1, name: 'Extra Wireless Controller', sku: 'GCB-CTRL',
+        prices: { price: 5999, mrp: 6999 }, quantity: 1,
+        group: { groupDetail: { groupName: 'Controllers', groupType: 1, minimumSelectable: 0, maximumSelectable: 2, isOptional: true } },
+        thumbnailImage1: { url: 'https://picsum.photos/seed/gcb-ctrl/200/200' },
+        images: [{ url: 'https://picsum.photos/seed/gcb-ctrl/400/400' }],
+        additionalData: null
+      },
+      {
+        productId: comboProductId * 100 + 2, name: 'Pro Controller (Elite)', sku: 'GCB-CTRL-PRO',
+        prices: { price: 12999, mrp: 14999 }, quantity: 1,
+        group: { groupDetail: { groupName: 'Controllers', groupType: 1, minimumSelectable: 0, maximumSelectable: 2, isOptional: true } },
+        thumbnailImage1: { url: 'https://picsum.photos/seed/gcb-ctrl-pro/200/200' },
+        images: [{ url: 'https://picsum.photos/seed/gcb-ctrl-pro/400/400' }],
+        additionalData: null
+      },
+      {
+        productId: comboProductId * 100 + 3, name: 'Gaming Headset 7.1', sku: 'GCB-HS',
+        prices: { price: 7999, mrp: 9999 }, quantity: 1,
+        group: { groupDetail: { groupName: 'Audio', groupType: 1, minimumSelectable: 1, maximumSelectable: 1, isOptional: false } },
+        thumbnailImage1: { url: 'https://picsum.photos/seed/gcb-headset/200/200' },
+        images: [{ url: 'https://picsum.photos/seed/gcb-headset/400/400' }],
+        additionalData: null
+      },
+      {
+        productId: comboProductId * 100 + 4, name: 'Racing Game Deluxe', sku: 'GCB-GAME1',
+        prices: { price: 3999, mrp: 4999 }, quantity: 1,
+        group: { groupDetail: { groupName: 'Games', groupType: 1, minimumSelectable: 1, maximumSelectable: 3, isOptional: false } },
+        thumbnailImage1: { url: 'https://picsum.photos/seed/gcb-game1/200/200' },
+        images: [{ url: 'https://picsum.photos/seed/gcb-game1/400/400' }],
+        additionalData: null
+      },
+      {
+        productId: comboProductId * 100 + 5, name: 'Adventure Quest RPG', sku: 'GCB-GAME2',
+        prices: { price: 4999, mrp: 5999 }, quantity: 1,
+        group: { groupDetail: { groupName: 'Games', groupType: 1, minimumSelectable: 1, maximumSelectable: 3, isOptional: false } },
+        thumbnailImage1: { url: 'https://picsum.photos/seed/gcb-game2/200/200' },
+        images: [{ url: 'https://picsum.photos/seed/gcb-game2/400/400' }],
+        additionalData: null
+      }
+    ],
+    subscriptions: [],
+    tags: ['featured', 'electronics', 'gaming', 'bundle'], productType: 0,
+    additionalData: 'null', shippingMethods: [],
+    createdAt: new Date(Date.now() - 5 * 24 * 60 * 60 * 1000).toISOString()
+  });
+
+  // Subscription product
+  const subProductId = products.length + 1;
+  const subscriptionAdditionalData = JSON.stringify({
+    settings: {
+      isScheduleByCustomer: true, typeOfOrder: 10, shippingClassId: 1,
+      perOrderPrice: 1999, startDate: new Date().toISOString(),
+      endDate: new Date(Date.now() + 365 * 24 * 60 * 60 * 1000).toISOString(),
+      isProductChoiceEnabled: false, isQuantityChangeAllowed: true,
+      minSubscriptionProducts: 1, maxSubscriptionProducts: 5
+    },
+    subscriptionDetails: {
+      shippingFeeAmount: 0, paymentFeeAmount: 0, roundOff: 0,
+      discountAmount: 500, subscriptionCoupon: null, orderTotal: '1999'
+    },
+    frequency: { selectedOption: 'monthly', timeFre: '', ordersCount: 12 },
+    frequencyData: {
+      selectedOption: 'monthly', ordersCount: 12,
+      startDate: new Date().toISOString(),
+      endDate: new Date(Date.now() + 365 * 24 * 60 * 60 * 1000).toISOString(),
+      isDailyFrequency: true, isWeeklyFrequency: true,
+      isAlterNativeFrequency: false, isMonthlyFrequency: true, isYearlyFrequency: false
+    },
+    IsSubscriptionPrice: true,
+    items: [
+      { Id: 1, Name: 'Organic Coffee Blend - 250g', Price: 1999, Quantity: 1 },
+      { Id: 2, Name: 'Single Origin Ethiopian - 250g', Price: 2499, Quantity: 1 },
+      { Id: 3, Name: 'Dark Roast Espresso - 250g', Price: 1799, Quantity: 1 }
+    ]
+  });
+  products.push({
+    id: subProductId, productId: subProductId,
+    title: 'Premium Coffee Subscription Box', name: 'Premium Coffee Subscription Box',
+    handle: 'premium-coffee-subscription', slug: 'premium-coffee-subscription',
+    url: 'premium-coffee-subscription', link: 'premium-coffee-subscription',
+    description: 'Get freshly roasted premium coffee delivered to your door. Choose your frequency and customize your selection.',
+    price: 1999, compareAtPrice: 2499, prices: { price: 1999, mrp: 2499 },
+    inStock: true, available: true, stockQuantity: 999, stockTrackingIsEnabled: false, isAllowToOrder: true,
+    sku: 'SUB-COFFEE', categoryId: 10, category: { id: 10, name: 'Food & Beverages' }, brandId: 5,
+    thumbnailImage: 'https://picsum.photos/seed/sub-coffee/800/800',
+    imageUrl: 'https://picsum.photos/seed/sub-coffee/800/800',
+    images: [
+      { id: 'img-sub-1', url: 'https://picsum.photos/seed/sub-coffee/800/800', altText: 'Coffee Subscription Box' },
+      { id: 'img-sub-2', url: 'https://picsum.photos/seed/sub-beans/800/800', altText: 'Premium Coffee Beans' },
+      { id: 'img-sub-3', url: 'https://picsum.photos/seed/sub-cup/800/800', altText: 'Fresh Brewed Coffee' }
+    ],
+    variants: [{ id: 'variant-sub-1', productId: subProductId * 1000 + 1, title: 'Monthly Box', price: 1999, compareAtPrice: 2499, prices: { price: 1999, mrp: 2499 }, sku: 'SUB-COFFEE-M', inStock: true, available: true, stockQuantity: 999 }],
+    variations: [],
+    options: [],
+    combinations: [],
+    subscriptions: [
+      {
+        productId: subProductId * 100 + 1, name: 'Organic Coffee Blend - 250g', sku: 'SUB-BLEND',
+        prices: { price: 1999, mrp: 2499 }, quantity: 1,
+        specification: 'Premium organic blend, medium roast',
+        images: [{ url: 'https://picsum.photos/seed/sub-blend/400/400' }], additionalData: null
+      },
+      {
+        productId: subProductId * 100 + 2, name: 'Single Origin Ethiopian - 250g', sku: 'SUB-ETHIOP',
+        prices: { price: 2499, mrp: 2999 }, quantity: 1,
+        specification: 'Light roast, fruity notes',
+        images: [{ url: 'https://picsum.photos/seed/sub-ethiop/400/400' }], additionalData: null
+      },
+      {
+        productId: subProductId * 100 + 3, name: 'Dark Roast Espresso - 250g', sku: 'SUB-ESPRESSO',
+        prices: { price: 1799, mrp: 2199 }, quantity: 1,
+        specification: 'Bold and intense espresso blend',
+        images: [{ url: 'https://picsum.photos/seed/sub-espresso/400/400' }], additionalData: null
+      }
+    ],
+    tags: ['subscription', 'coffee', 'food'], productType: 90,
+    additionalData: subscriptionAdditionalData, shippingMethods: [],
+    createdAt: new Date(Date.now() - 3 * 24 * 60 * 60 * 1000).toISOString()
+  });
+
   // Log summary
   const productsWithVariations = products.filter(p => (p.variants?.length || 0) > 1).length;
   const productsWithOptions = products.filter(p => (p.options?.length || 0) > 0).length;
-  const outOfStock = products.filter(p => !p.inStock || (p.stock || 0) === 0).length;
+  const outOfStock = products.filter(p => !p.inStock || (p.stockQuantity || 0) === 0).length;
   
   // Log category distribution
   const categoryDistribution = {};
@@ -410,14 +636,24 @@ function generateMockCategories(count = 10) {
 
   for (let i = 0; i < count; i++) {
     const catData = categoryData[i] || { name: `Category ${i + 1}`, imageId: 60 + i, description: `Products in Category ${i + 1}` };
+    const catHandle = catData.name.toLowerCase().replace(/\s+/g, '-').replace(/&/g, 'and');
+    const catImageUrl = `https://picsum.photos/seed/cat${catData.imageId}/400/300`;
     categories.push({
-      id: `category-${i + 1}`,
+      id: i + 1,
+      categoryId: i + 1,
       name: catData.name,
-      handle: catData.name.toLowerCase().replace(/\s+/g, '-').replace(/&/g, 'and'),
+      displayName: catData.name,
+      handle: catHandle,
+      slug: catHandle,
       description: catData.description,
-      image: `https://picsum.photos/seed/cat${catData.imageId}/400/300`,
-      productCount: Math.floor(Math.random() * 50) + 5,
-      parentId: i > 5 ? `category-${Math.floor(Math.random() * 5) + 1}` : null
+      thumbnailImage: { url: catImageUrl },
+      bannerImage: { url: catImageUrl },
+      menuImage: { url: catImageUrl },
+      displayOrder: i + 1,
+      parentCategoryId: i > 5 ? Math.floor(Math.random() * 5) + 1 : null,
+      parentName: i > 5 ? categoryData[Math.floor(Math.random() * 5)]?.name || null : null,
+      products: [],
+      productsCount: Math.floor(Math.random() * 50) + 5
     });
   }
 
@@ -447,9 +683,11 @@ function generateMockBrands(count = 10) {
   for (let i = 0; i < count; i++) {
     const brand = brandData[i] || { name: `Brand ${i + 1}`, tagline: 'Quality Products', imageId: 80 + i };
     brands.push({
-      id: `brand-${i + 1}`,
+      id: i + 1,
+      brandId: i + 1,
       name: brand.name,
       handle: brand.name.toLowerCase().replace(/\s+/g, '-'),
+      slug: brand.name.toLowerCase().replace(/\s+/g, '-'),
       description: `${brand.tagline}. Premium products from ${brand.name}`,
       logo: `https://picsum.photos/seed/brand${brand.imageId}/200/100`,
       image: `https://picsum.photos/seed/brand${brand.imageId}/400/200`,
@@ -473,6 +711,7 @@ function generateMockWidgets() {
       type: 'Header',
       section: 'header',
       sectionName: 'header',
+      pageId: 'all',
       status: 'active',
       Position: 1,
       settings: {
@@ -494,6 +733,7 @@ function generateMockWidgets() {
       type: 'HeaderMenu',
       section: 'header',
       sectionName: 'header',
+      pageId: 'all',
       status: 'active',
       Position: 2,
       settings: {
@@ -514,6 +754,7 @@ function generateMockWidgets() {
       type: 'Carousel',
       section: 'hero',
       sectionName: 'hero',
+      pageId: 'home',
       status: 'active',
       Position: 1,
       settings: {
@@ -584,6 +825,7 @@ function generateMockWidgets() {
       type: 'SpaceBar',
       section: 'hero',
       sectionName: 'hero',
+      pageId: 'home',
       status: 'active',
       Position: 2,
       settings: {
@@ -654,6 +896,7 @@ function generateMockWidgets() {
       type: 'CategoryList',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 1,
       Title: 'Shop by Category',
@@ -701,6 +944,7 @@ function generateMockWidgets() {
       type: 'ProductCarousel',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 2,
       Title: 'Featured Products',
@@ -739,6 +983,7 @@ function generateMockWidgets() {
       type: 'ProductCarousel',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 3,
       Title: 'Best Sellers',
@@ -775,6 +1020,7 @@ function generateMockWidgets() {
       type: 'ProductCarousel',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 4,
       Title: 'New Arrivals',
@@ -810,6 +1056,7 @@ function generateMockWidgets() {
       type: 'ProductCarousel',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 5,
       Title: 'On Sale',
@@ -847,6 +1094,7 @@ function generateMockWidgets() {
       type: 'ProductCarousel',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 6,
       Title: 'Trending Now',
@@ -882,6 +1130,7 @@ function generateMockWidgets() {
       type: 'ProductCarousel',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 7,
       Title: 'Electronics',
@@ -918,6 +1167,7 @@ function generateMockWidgets() {
       type: 'ProductCarousel',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 8,
       Title: 'Fashion',
@@ -954,6 +1204,7 @@ function generateMockWidgets() {
       type: 'ProductCarousel',
       section: 'content',
       sectionName: 'content',
+      pageId: 'product',
       status: 'active',
       Position: 9,
       Title: 'You May Also Like',
@@ -988,6 +1239,7 @@ function generateMockWidgets() {
       type: 'ProductCarousel',
       section: 'content',
       sectionName: 'content',
+      pageId: 'product',
       status: 'active',
       Position: 10,
       Title: 'Frequently Bought Together',
@@ -1023,6 +1275,7 @@ function generateMockWidgets() {
       type: 'ProductCarousel',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 11,
       Title: "Editor's Choice",
@@ -1060,6 +1313,7 @@ function generateMockWidgets() {
       type: 'ProductGrid',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 12,
       Title: 'Shop All Products',
@@ -1082,7 +1336,8 @@ function generateMockWidgets() {
           Limit: 12,
           Columns: 4,
           Products: []
-        }
+        },
+        products: []
       },
       content: JSON.stringify({
         NumberOfProducts: 12,
@@ -1096,6 +1351,7 @@ function generateMockWidgets() {
       type: 'ProductGrid',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 13,
       Title: 'Featured Collection',
@@ -1118,7 +1374,8 @@ function generateMockWidgets() {
           Columns: 3,
           IsFeatured: true,
           Products: []
-        }
+        },
+        products: []
       },
       content: JSON.stringify({
         NumberOfProducts: 6,
@@ -1133,6 +1390,7 @@ function generateMockWidgets() {
       type: 'Banner',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 4,
       Title: 'Special Offers',
@@ -1171,6 +1429,7 @@ function generateMockWidgets() {
       type: 'SimpleProduct',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 5,
       Title: 'Best Sellers',
@@ -1195,6 +1454,7 @@ function generateMockWidgets() {
       type: 'SingleProduct',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 6,
       Title: 'Deal of the Day',
@@ -1217,6 +1477,7 @@ function generateMockWidgets() {
       type: 'RecentlyViewed',
       section: 'content',
       sectionName: 'content',
+      pageId: 'product',
       status: 'active',
       Position: 7,
       Title: 'Recently Viewed',
@@ -1228,7 +1489,8 @@ function generateMockWidgets() {
         show_add_to_cart: false
       },
       data: {
-        products: [] // Will be enriched by dev server
+        products: [],
+        content: { products: [], Products: [] }
       }
     },
     
@@ -1238,6 +1500,7 @@ function generateMockWidgets() {
       type: 'BrandCarousel',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 8,
       Title: 'Our Brands',
@@ -1283,6 +1546,7 @@ function generateMockWidgets() {
       type: 'Gallery',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 4,
       Title: 'Instagram Gallery',
@@ -1323,6 +1587,7 @@ function generateMockWidgets() {
       type: 'TestimonialCarousel',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 5,
       Title: 'What Our Customers Say',
@@ -1335,71 +1600,294 @@ function generateMockWidgets() {
         hideDot: false
       },
       data: {
-        content: [
-          {
-            Title: 'Amazing Quality!',
-            title: 'Amazing Quality!',
-            Description: 'I\'ve been shopping here for years and the quality never disappoints. Fast shipping and excellent customer service too!',
-            description: 'I\'ve been shopping here for years and the quality never disappoints. Fast shipping and excellent customer service too!',
-            PersonName: 'Sarah Johnson',
-            personName: 'Sarah Johnson',
-            CompanyName: 'Verified Buyer',
-            companyName: 'Verified Buyer',
-            Rating: 5,
-            rating: 5,
-            ImageUrl: 'https://picsum.photos/seed/user1/100/100',
-            imageUrl: 'https://picsum.photos/seed/user1/100/100'
-          },
-          {
-            Title: 'Great Experience',
-            title: 'Great Experience',
-            Description: 'The customer service team went above and beyond to help me find exactly what I needed. Highly recommend!',
-            description: 'The customer service team went above and beyond to help me find exactly what I needed. Highly recommend!',
-            PersonName: 'Michael Chen',
-            personName: 'Michael Chen',
-            CompanyName: 'Regular Customer',
-            companyName: 'Regular Customer',
-            Rating: 5,
-            rating: 5,
-            ImageUrl: 'https://picsum.photos/seed/user2/100/100',
-            imageUrl: 'https://picsum.photos/seed/user2/100/100'
-          },
-          {
-            Title: 'Will Shop Again',
-            title: 'Will Shop Again',
-            Description: 'Love the variety of products and the prices are very competitive. The website is easy to navigate too.',
-            description: 'Love the variety of products and the prices are very competitive. The website is easy to navigate too.',
-            PersonName: 'Emily Davis',
-            personName: 'Emily Davis',
-            CompanyName: 'Fashion Enthusiast',
-            companyName: 'Fashion Enthusiast',
-            Rating: 5,
-            rating: 5,
-            ImageUrl: 'https://picsum.photos/seed/user3/100/100',
-            imageUrl: 'https://picsum.photos/seed/user3/100/100'
-          },
-          {
-            Title: 'Fast Delivery',
-            title: 'Fast Delivery',
-            Description: 'Ordered on Monday, received on Wednesday! The packaging was perfect and the product exceeded expectations.',
-            description: 'Ordered on Monday, received on Wednesday! The packaging was perfect and the product exceeded expectations.',
-            PersonName: 'David Wilson',
-            personName: 'David Wilson',
-            CompanyName: 'Tech Reviewer',
-            companyName: 'Tech Reviewer',
-            Rating: 4,
-            rating: 4,
-            ImageUrl: 'https://picsum.photos/seed/user4/100/100',
-            imageUrl: 'https://picsum.photos/seed/user4/100/100'
-          }
+        content: {
+          Items: [
+            {
+              Title: 'Amazing Quality!',
+              title: 'Amazing Quality!',
+              Description: 'I\'ve been shopping here for years and the quality never disappoints. Fast shipping and excellent customer service too!',
+              description: 'I\'ve been shopping here for years and the quality never disappoints. Fast shipping and excellent customer service too!',
+              PersonName: 'Sarah Johnson',
+              personName: 'Sarah Johnson',
+              CompanyName: 'Verified Buyer',
+              companyName: 'Verified Buyer',
+              Rating: 5,
+              rating: 5,
+              ImageUrl: 'https://picsum.photos/seed/user1/100/100',
+              imageUrl: 'https://picsum.photos/seed/user1/100/100'
+            },
+            {
+              Title: 'Great Experience',
+              title: 'Great Experience',
+              Description: 'The customer service team went above and beyond to help me find exactly what I needed. Highly recommend!',
+              description: 'The customer service team went above and beyond to help me find exactly what I needed. Highly recommend!',
+              PersonName: 'Michael Chen',
+              personName: 'Michael Chen',
+              CompanyName: 'Regular Customer',
+              companyName: 'Regular Customer',
+              Rating: 5,
+              rating: 5,
+              ImageUrl: 'https://picsum.photos/seed/user2/100/100',
+              imageUrl: 'https://picsum.photos/seed/user2/100/100'
+            },
+            {
+              Title: 'Will Shop Again',
+              title: 'Will Shop Again',
+              Description: 'Love the variety of products and the prices are very competitive. The website is easy to navigate too.',
+              description: 'Love the variety of products and the prices are very competitive. The website is easy to navigate too.',
+              PersonName: 'Emily Davis',
+              personName: 'Emily Davis',
+              CompanyName: 'Fashion Enthusiast',
+              companyName: 'Fashion Enthusiast',
+              Rating: 5,
+              rating: 5,
+              ImageUrl: 'https://picsum.photos/seed/user3/100/100',
+              imageUrl: 'https://picsum.photos/seed/user3/100/100'
+            },
+            {
+              Title: 'Fast Delivery',
+              title: 'Fast Delivery',
+              Description: 'Ordered on Monday, received on Wednesday! The packaging was perfect and the product exceeded expectations.',
+              description: 'Ordered on Monday, received on Wednesday! The packaging was perfect and the product exceeded expectations.',
+              PersonName: 'David Wilson',
+              personName: 'David Wilson',
+              CompanyName: 'Tech Reviewer',
+              companyName: 'Tech Reviewer',
+              Rating: 4,
+              rating: 4,
+              ImageUrl: 'https://picsum.photos/seed/user4/100/100',
+              imageUrl: 'https://picsum.photos/seed/user4/100/100'
+            }
+          ]
+        }
+      },
+      content: JSON.stringify({
+        Items: [
+          { Title: 'Amazing Quality!', Description: 'The quality never disappoints.', PersonName: 'Sarah Johnson', CompanyName: 'Verified Buyer', Rating: 5, ImageUrl: 'https://picsum.photos/seed/user1/100/100' },
+          { Title: 'Great Experience', Description: 'Excellent customer service.', PersonName: 'Michael Chen', CompanyName: 'Regular Customer', Rating: 5, ImageUrl: 'https://picsum.photos/seed/user2/100/100' },
+          { Title: 'Will Shop Again', Description: 'Love the variety.', PersonName: 'Emily Davis', CompanyName: 'Fashion Enthusiast', Rating: 5, ImageUrl: 'https://picsum.photos/seed/user3/100/100' },
+          { Title: 'Fast Delivery', Description: 'Quick and perfect packaging.', PersonName: 'David Wilson', CompanyName: 'Tech Reviewer', Rating: 4, ImageUrl: 'https://picsum.photos/seed/user4/100/100' }
         ]
+      })
+    },
+
+    // DiscountTime Widget
+    {
+      id: 'widget-discount-time-1',
+      type: 'DiscountTime',
+      section: 'content',
+      sectionName: 'content',
+      pageId: 'home',
+      status: 'active',
+      Position: 14,
+      Title: 'Limited Time Offer',
+      settings: {
+        title: 'Limited Time Offer',
+        textColor: '#ffffff',
+        backgroundColor: '#1f2937',
+        background_from: '#1f2937',
+        background_to: '#111827',
+        cta_label: 'Shop Now',
+        cta_link: '/products',
+        cta_background: '#ef4444',
+        cta_text: '#ffffff'
       },
-      content: JSON.stringify([
-        { Title: 'Amazing Quality!', Description: 'The quality never disappoints.', PersonName: 'Sarah Johnson', CompanyName: 'Verified Buyer', Rating: 5, ImageUrl: 'https://picsum.photos/seed/user1/100/100' },
-        { Title: 'Great Experience', Description: 'Excellent customer service.', PersonName: 'Michael Chen', CompanyName: 'Regular Customer', Rating: 5, ImageUrl: 'https://picsum.photos/seed/user2/100/100' },
-        { Title: 'Will Shop Again', Description: 'Love the variety.', PersonName: 'Emily Davis', CompanyName: 'Fashion Enthusiast', Rating: 5, ImageUrl: 'https://picsum.photos/seed/user3/100/100' },
-        { Title: 'Fast Delivery', Description: 'Quick and perfect packaging.', PersonName: 'David Wilson', CompanyName: 'Tech Reviewer', Rating: 4, ImageUrl: 'https://picsum.photos/seed/user4/100/100' }
-      ])
+      data: {
+        content: {
+          couponValid: true,
+          coupon: {
+            discountAmount: 25,
+            couponCode: 'SAVE25',
+            description: 'Get 25% off on all products! Limited time only.',
+            endOn: new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString(),
+            startOn: new Date().toISOString(),
+            ruleToApply: 'by_percent',
+            fileName: '',
+            imageUrl: 'https://picsum.photos/seed/discount-banner/1200/400'
+          }
+        }
+      }
+    },
+
+    // Product Widget (uses product-grid shared template)
+    {
+      id: 'widget-product-1',
+      type: 'Product',
+      section: 'content',
+      sectionName: 'content',
+      pageId: 'home',
+      status: 'active',
+      Position: 15,
+      Title: 'Our Products',
+      settings: {
+        title: 'Our Products',
+        subtitle: 'Top picks for you',
+        columns: 4,
+        showWidgetTitle: 'Yes',
+        widgetTitleAlignment: 'center',
+        show_add_to_cart: true
+      },
+      data: {
+        content: {
+          products: [],
+          Products: []
+        },
+        products: []
+      }
+    },
+
+    // ProductCanvas Widget
+    {
+      id: 'widget-product-canvas-1',
+      type: 'ProductCanvas',
+      section: 'content',
+      sectionName: 'content',
+      pageId: 'home',
+      status: 'active',
+      Position: 16,
+      Title: 'Shop the Look',
+      settings: {
+        title: 'Shop the Look',
+        showContainer: 'Yes',
+        showWidgetBottomMargin: 'Yes',
+        backgroundColor: '#f9fafb'
+      },
+      data: {
+        content: {
+          ImageUrl: 'https://picsum.photos/seed/canvas-main/1200/600',
+          imageUrl: 'https://picsum.photos/seed/canvas-main/1200/600',
+          ShowContainer: 'Yes',
+          ShowWidgetBottomMargin: 'Yes',
+          Items: [
+            { X: 25, Y: 30, x: 25, y: 30, TargetUrl: '/products', targetUrl: '/products', Url: '/products', url: '/products' },
+            { X: 55, Y: 45, x: 55, y: 45, TargetUrl: '/products', targetUrl: '/products', Url: '/products', url: '/products' },
+            { X: 75, Y: 60, x: 75, y: 60, TargetUrl: '/products', targetUrl: '/products', Url: '/products', url: '/products' }
+          ]
+        }
+      }
+    },
+
+    // Splash Widget
+    {
+      id: 'widget-splash-1',
+      type: 'Splash',
+      section: 'content',
+      sectionName: 'content',
+      pageId: 'home',
+      status: 'active',
+      Position: 17,
+      Title: 'Welcome Offer',
+      settings: {
+        backgroundColor: '#ffffff',
+        textColor: '#111111',
+        seconds: 3,
+        showOnce: true,
+        overlayColor: 'rgba(0,0,0,0.6)',
+        eventType: 'Onload'
+      },
+      data: {
+        content: {
+          ImageUrl: 'https://picsum.photos/seed/splash-promo/600/400',
+          imageUrl: 'https://picsum.photos/seed/splash-promo/600/400',
+          Title: 'Welcome to Our Store!',
+          title: 'Welcome to Our Store!',
+          Description: 'Sign up and get 15% off your first order. Use code WELCOME15 at checkout.',
+          description: 'Sign up and get 15% off your first order. Use code WELCOME15 at checkout.',
+          LinkText: 'Shop Now',
+          linkText: 'Shop Now',
+          ButtonText: 'Shop Now',
+          buttonText: 'Shop Now',
+          TargetUrl: '/products',
+          targetUrl: '/products',
+          Link: '/products',
+          link: '/products',
+          BackgroundColor: '#ffffff',
+          backgroundColor: '#ffffff',
+          TextColor: '#111111',
+          textColor: '#111111',
+          Seconds: 3,
+          seconds: 3,
+          DelaySeconds: 3,
+          delaySeconds: 3,
+          ShowOnce: true,
+          showOnce: true,
+          OverlayColor: 'rgba(0,0,0,0.6)',
+          overlayColor: 'rgba(0,0,0,0.6)',
+          EventType: 'Onload',
+          eventType: 'Onload'
+        }
+      }
+    },
+
+    // SpaceBarCarousel Widget
+    {
+      id: 'widget-spacebar-carousel-1',
+      type: 'SpaceBarCarousel',
+      section: 'content',
+      sectionName: 'content',
+      pageId: 'home',
+      status: 'active',
+      Position: 18,
+      Title: 'Why Shop With Us',
+      settings: {
+        title: 'Why Shop With Us',
+        subtitle: 'We deliver excellence',
+        showWidgetTitle: 'Yes',
+        widgetTitleAlignment: 'center',
+        backgroundColor: '#f8f9fa',
+        textColor: '#111',
+        hideDot: false,
+        hideArrow: false,
+        priorityCount: 4
+      },
+      data: {
+        content: {
+          Items: [
+            {
+              Title: 'Free Shipping', title: 'Free Shipping',
+              Description: 'On orders over $50', description: 'On orders over $50',
+              IconHtml: '<svg width="40" height="40" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="1" y="3" width="15" height="13"></rect><polygon points="16 8 20 8 23 11 23 16 16 16 16 8"></polygon><circle cx="5.5" cy="18.5" r="2.5"></circle><circle cx="18.5" cy="18.5" r="2.5"></circle></svg>',
+              ImageUrl: 'https://picsum.photos/seed/feat-ship/100/100', imageUrl: 'https://picsum.photos/seed/feat-ship/100/100',
+              Link: '/shipping-info', link: '/shipping-info'
+            },
+            {
+              Title: '24/7 Support', title: '24/7 Support',
+              Description: 'Dedicated support team', description: 'Dedicated support team',
+              IconHtml: '<svg width="40" height="40" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M22 16.92v3a2 2 0 0 1-2.18 2 19.79 19.79 0 0 1-8.63-3.07 19.5 19.5 0 0 1-6-6 19.79 19.79 0 0 1-3.07-8.67A2 2 0 0 1 4.11 2h3a2 2 0 0 1 2 1.72"></path></svg>',
+              ImageUrl: 'https://picsum.photos/seed/feat-support/100/100', imageUrl: 'https://picsum.photos/seed/feat-support/100/100',
+              Link: '/contact', link: '/contact'
+            },
+            {
+              Title: 'Secure Payment', title: 'Secure Payment',
+              Description: '100% secure checkout', description: '100% secure checkout',
+              IconHtml: '<svg width="40" height="40" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="3" y="11" width="18" height="11" rx="2" ry="2"></rect><path d="M7 11V7a5 5 0 0 1 10 0v4"></path></svg>',
+              ImageUrl: 'https://picsum.photos/seed/feat-secure/100/100', imageUrl: 'https://picsum.photos/seed/feat-secure/100/100',
+              Link: '/security', link: '/security'
+            },
+            {
+              Title: 'Easy Returns', title: 'Easy Returns',
+              Description: '30-day return policy', description: '30-day return policy',
+              IconHtml: '<svg width="40" height="40" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polyline points="1 4 1 10 7 10"></polyline><path d="M3.51 15a9 9 0 1 0 2.13-9.36L1 10"></path></svg>',
+              ImageUrl: 'https://picsum.photos/seed/feat-return/100/100', imageUrl: 'https://picsum.photos/seed/feat-return/100/100',
+              Link: '/returns', link: '/returns'
+            },
+            {
+              Title: 'Loyalty Rewards', title: 'Loyalty Rewards',
+              Description: 'Earn points on every purchase', description: 'Earn points on every purchase',
+              IconHtml: '<svg width="40" height="40" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="8" r="7"></circle><polyline points="8.21 13.89 7 23 12 20 17 23 15.79 13.88"></polyline></svg>',
+              ImageUrl: 'https://picsum.photos/seed/feat-loyalty/100/100', imageUrl: 'https://picsum.photos/seed/feat-loyalty/100/100',
+              Link: '/loyalty', link: '/loyalty'
+            },
+            {
+              Title: 'Quality Assured', title: 'Quality Assured',
+              Description: 'Premium products guaranteed', description: 'Premium products guaranteed',
+              IconHtml: '<svg width="40" height="40" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M22 11.08V12a10 10 0 1 1-5.93-9.14"></path><polyline points="22 4 12 14.01 9 11.01"></polyline></svg>',
+              ImageUrl: 'https://picsum.photos/seed/feat-quality/100/100', imageUrl: 'https://picsum.photos/seed/feat-quality/100/100',
+              Link: '/about', link: '/about'
+            }
+          ]
+        }
+      }
     },
     
     // ==================== FOOTER SECTION ====================
@@ -1408,6 +1896,7 @@ function generateMockWidgets() {
       type: 'Footer',
       section: 'footer',
       sectionName: 'footer',
+      pageId: 'all',
       status: 'active',
       Position: 1,
       settings: {
@@ -1475,6 +1964,7 @@ function generateMockWidgets() {
       type: 'FooterMenu',
       section: 'footer',
       sectionName: 'footer',
+      pageId: 'all',
       status: 'active',
       Position: 2,
       settings: {