Load both DMX + Garis products, update stats after each source

dmx-loader.js

@@ -1,77 +1,60 @@
-// DMX Products Loader v2 - 6273 products from Điện Máy Xanh
-// Fixes: strip utm params, ensure OG-compatible images
+// External Products Loader v3 — DMX (6273) + Garis (202)
 (function(){
-  function cleanUrl(u){
-    // Remove all tracking params (utm_*, flashsale, etc)
-    try{ return u.split('?')[0].split('#')[0]; }catch(e){ return u; }
-  }
+  function cleanUrl(u){try{return u.split('?')[0].split('#')[0]}catch(e){return u}}
   function fixImg(src){
-    if(!src) return '';
-    src = src.trim();
-    if(src.startsWith('//')) src = 'https:' + src;
+    if(!src)return '';src=src.trim();
+    if(src.startsWith('//'))src='https:'+src;
     return src.split('?')[0];
   }
-  function mapDMX(p){
-    var link = cleanUrl(p.l||'');
-    var image = fixImg(p.i||'');
-    var images = (p.imgs||[]).map(fixImg).filter(Boolean);
-    if(image && images.indexOf(image)===-1) images.unshift(image);
-    if(!image && images.length) image = images[0];
+  function mapProduct(p,defaultBrand){
+    var link=cleanUrl(p.l||'');
+    var image=fixImg(p.i||'');
+    var images=(p.imgs||[]).map(fixImg).filter(Boolean);
+    if(image&&images.indexOf(image)===-1)images.unshift(image);
+    if(!image&&images.length)image=images[0];
     return {
-      name:p.n, link:link, image:image, price:p.p, priceNum:p.pn,
-      cat:p.c, catSlug:p.cs, catIcon:p.ci,
-      subCat:p.sub_c||'', subCatSlug:p.sub_cs||'',
-      images:images, summary:p.sum||'', desc:p.desc||'',
-      specs:p.specs||{}, feats:p.feats||[], sku:p.sku||'',
-      video:p.vid||'', model:p.mod||'', slug:p.slug||'',
-      brand:p.brand||'Điện Máy Xanh',
-      _idx: (p.sku||'') + '  ' + (p.brand||'').toLowerCase() + '  ' + (p.n||'').toLowerCase()
+      name:p.n,link:link,image:image,price:p.p,priceNum:p.pn,
+      cat:p.c,catSlug:p.cs,catIcon:p.ci,
+      subCat:p.sub_c||'',subCatSlug:p.sub_cs||'',
+      images:images,summary:p.sum||'',desc:p.desc||'',
+      specs:p.specs||{},feats:p.feats||[],sku:p.sku||'',
+      video:p.vid||'',model:p.mod||'',slug:p.slug||'',
+      brand:p.brand||defaultBrand,
+      _idx:(p.sku||'')+' '+(p.brand||'').toLowerCase()+' '+(p.n||'').toLowerCase()
     };
   }
-  
-  var checkInterval = setInterval(function(){
-    if(typeof D !== 'undefined' && D.length > 0 && typeof init === 'function'){
+  function updateStats(){
+    var st=document.getElementById('statTotal');
+    if(st)st.textContent=D.length;
+    var sc=document.getElementById('statCats');
+    if(sc){var cats={};D.forEach(function(p){cats[p.catSlug]=true});sc.textContent=Object.keys(cats).length}
+  }
+  function loadSource(jsonFile,brand,label){
+    return fetch(jsonFile).then(function(r){return r.json()}).then(function(data){
+      var existingSlugs={};
+      D.forEach(function(p){if(p.slug)existingSlugs[p.slug]=true});
+      var added=0;
+      data.forEach(function(p){
+        var mapped=mapProduct(p,brand);
+        if(!existingSlugs[mapped.slug]){
+          if(typeof buildSearchIndex==='function')mapped._idx=buildSearchIndex(mapped);
+          D.push(mapped);existingSlugs[mapped.slug]=true;added++;
+        }
+      });
+      console.log('['+label+'] Added',added,'products. Total:',D.length);
+      return added;
+    });
+  }
+  var checkInterval=setInterval(function(){
+    if(typeof D!=='undefined'&&D.length>0&&typeof init==='function'){
       clearInterval(checkInterval);
-      console.log('[DMX] Main data loaded:', D.length, 'products. Loading DMX...');
-      
-      fetch('products_dmx_slugs.json')
-        .then(function(r){ return r.json(); })
-        .then(function(dmxData){
-          var existingSlugs = {};
-          D.forEach(function(p){ if(p.slug) existingSlugs[p.slug] = true; });
-          
-          var added = 0;
-          dmxData.forEach(function(p){
-            var mapped = mapDMX(p);
-            if(!existingSlugs[mapped.slug]){
-              if(typeof buildSearchIndex === 'function'){
-                mapped._idx = buildSearchIndex(mapped);
-              }
-              D.push(mapped);
-              existingSlugs[mapped.slug] = true;
-              added++;
-            }
-          });
-          
-          console.log('[DMX] Added', added, 'DMX products. Total:', D.length);
-          
-          var st = document.getElementById('statTotal');
-          if(st) st.textContent = D.length;
-          
-          var sc = document.getElementById('statCats');
-          if(sc){
-            var cats = {};
-            D.forEach(function(p){ cats[p.catSlug] = true; });
-            sc.textContent = Object.keys(cats).length;
-          }
-          
-          if(typeof init === 'function') init();
-        })
-        .catch(function(e){
-          console.warn('[DMX] Failed to load DMX products:', e);
-        });
+      console.log('[Loader] Main data:',D.length,'products. Loading external sources...');
+      // Load DMX then Garis, then re-init once
+      loadSource('products_dmx_slugs.json','Điện Máy Xanh','DMX')
+        .then(function(){return loadSource('products_garis_slugs.json','Garis','Garis')})
+        .then(function(){updateStats();if(typeof init==='function')init()})
+        .catch(function(e){console.warn('[Loader] Error:',e);updateStats();if(typeof init==='function')init()});
     }
-  }, 500);
-  
-  setTimeout(function(){ clearInterval(checkInterval); }, 30000);
+  },500);
+  setTimeout(function(){clearInterval(checkInterval)},30000);
 })();