FIX v1037.3: Thêm CORS proxy fallback wsrv.nl cho ảnh trong Excel khi fetch trực tiếp fail (Eurogold, Hafele, v.v. không có CORS header)

qr-payment.js

@@ -1,4 +1,7 @@
-/* V.AI STUDIO — QR Payment / Quote Data v1037.2
+/* V.AI STUDIO — QR Payment / Quote Data v1037.3
+ * FIX v1037.3: Thêm CORS proxy fallback wsrv.nl cho ảnh trong Excel
+ *   - fetch trực tiếp fail (CORS) → fallback qua wsrv.nl
+ *   - Tested: Eurogold, Hafele images đều load được với ACL=*
  * FIX v1037.2: 
  * 1) parsePrompt() extract brand discount (malloca ck35% → itemDiscounts)
  * 2) matchItemDiscount() brand matching fallback (Malloca→35%)
@@ -8,7 +11,6 @@
  *   không qua VAI_QR.parsePrompt, nên comprehensive-fix.js không áp dụng được.
  *   Thêm guards trong parsePrompt() để skip bare numbers, brand+discount, CK lines.
  * Restored from 9db23f9 (v24) — full Excel/PDF export with proper layout
- * Fixes: Excel export broken in v1036 (parameter mismatch, missing layout)
  */
 (function(){
 'use strict';
@@ -39,12 +41,10 @@ function vaiProductInfoForQuote(product){
 
 function compactKey(s){return stripDiacritics(String(s||'')).toLowerCase().replace(/[^a-z0-9]/g,'');}
 function itemKeys(it){var arr=[];['model','sku','code','ma','name'].forEach(function(k){if(it&&it[k])arr.push(compactKey(it[k]));});if(it&&it.name){String(it.name).split('|').forEach(function(x){arr.push(compactKey(x));});}return arr.filter(function(x){return x&&x.length>=3;});}
-// FIX v1037.2: matchItemDiscount - thêm brand matching fallback
 function matchItemDiscount(it,itemDiscounts){
     itemDiscounts=itemDiscounts||{};var keys=itemKeys(it);
     for(var i=0;i<keys.length;i++){var k=keys[i];if(itemDiscounts[k])return itemDiscounts[k];}
     for(var code in itemDiscounts){for(var j=0;j<keys.length;j++){var kk=keys[j];if(code.length>=3&&kk.length>=3&&(kk.indexOf(code)!==-1||code.indexOf(kk)!==-1))return itemDiscounts[code];}}
-    // Brand matching fallback (vd "malloca" → 35 cho sản phẩm Malloca)
     var brandKeys=Object.keys(itemDiscounts).filter(function(k){return !k.match(/\d[A-Za-z0-9._\/-]*$/);});
     if(brandKeys.length>0){
         var itemBrand='';var idx=(it.idx!=null?it.idx:(it.productIdx!=null?it.productIdx:null));
@@ -69,7 +69,6 @@ function applyPromptDiscounts(qd,parsed){
     qd.grandTotal=productTotal;return qd;
 }
 
-// FIX v1037.2: parsePrompt - extract brand discount (malloca ck35%) vào itemDiscounts
 function parsePrompt(text){
     var fees=[],notes=[],discount=null,deposit=0,discountPercent=0,itemDiscounts={};
     if(!text)return{fees:fees,notes:notes,discount:discount,deposit:deposit,discountPercent:discountPercent,itemDiscounts:itemDiscounts};
@@ -77,7 +76,6 @@ function parsePrompt(text){
         line=line.trim();if(!line)return;
         parseItemDiscountLine(line,itemDiscounts);
         if(Object.keys(itemDiscounts).length&&line.match(/\b[A-Za-z]{1,8}[A-Za-z0-9._\-\/]{1,30}\d[A-Za-z0-9._\-\/]*\b/i)&&line.match(/\b(ck|chiết khấu|chiet khau|giảm|giam|discount)\b/i))return;
-        // Extract brand-level discount BEFORE skipping (vd "malloca ck35%" → itemDiscounts.malloca=35)
         var brandCkMatch=line.match(/^(malloca|eurogold|grob|canzy|demax|hafele|garis|boss)\b.*(?:ck|chiet|chiet khau|giam|discount|chiết khấu)\s*([\d.,]+)/i);
         if(brandCkMatch){var brandName=brandCkMatch[1].trim().toLowerCase().replace(/[^a-z0-9]/g,'');var pct=parseFloat(brandCkMatch[2].replace(/\./g,'').replace(',','.'));if(pct>0&&pct<=100)itemDiscounts[brandName]=pct;notes.push(line);return;}
         if(line.match(/^(ck|chiết khấu|chiet khau|giảm|giam|discount)/i)){
@@ -91,11 +89,9 @@ function parsePrompt(text){
             if(dm){var da=parseFloat(dm[1].replace(/\./g,'').replace(',','.'));var du=(dm[2]||'').toLowerCase();if(du==='k'||du==='nghìn'||du==='nghin')da*=1000;if(du==='triệu'||du==='tr')da*=1000000;deposit=da;}
             return;
         }
-        // ===== FIX v1037.1: Skip bare numbers / discount notations =====
         if(line.match(/^[\d.,]+$/)){notes.push(line);return;}
         var priceUnit=line.match(/^[\d.,]+\s*(k|nghìn|nghin|tr|triệu|m|%|đ|d|vnd)?$/i);
         if(priceUnit&&line.replace(/[\d.,\s%\knhìnghintrriệuđdvnđvndKHTRML]/gi,'').trim().length<2){notes.push(line);return;}
-        // Dòng brand+discount (extracted above) hoặc brand+số
         var brandNum=line.match(/^(malloca|eurogold|grob|canzy|demax|hafele|garis|boss)\b.*[\d.,]/i);
         if(brandNum){var textAfterBrand=line.replace(/^(malloca|eurogold|grob|canzy|demax|hafele|garis|boss)/i,'').trim();if(textAfterBrand.match(/^[\d.,\s%(k|nghìn|nghin|tr|triệu|m|đ|d|vnd)]+$/i)){notes.push(line);return;}}
         var m=line.match(/([\d.,]+)\s*(k|K|nghìn|nghin|triệu|tr|đ|d|vnd)?/);
@@ -197,7 +193,7 @@ function doOverride(){
     window.exportDeliveryExcel=async function(){if(typeof ExcelJS==='undefined')return;var qd=window._origGetQuoteData(),code=getEffectiveOrderCode();await _doExportDeliveryExcel(qd,code);};
     window.exportDeliveryPDF=async function(){var qd=window._origGetQuoteData(),code=getEffectiveOrderCode();await _doExportDeliveryPDF(qd,code);};
     window.getQuoteData=function(){var qd=window._origGetQuoteData.apply(this,arguments);if(qd.customer)qd.customer.orderCode=getEffectiveOrderCode();return qd;};
-    console.log('✅ QR Payment v1037.2 — brand discounts, formula-only Excel, no phantom fees');return true;
+    console.log('✅ QR Payment v1037.3 — CORS proxy, brand discounts, formula Excel, no phantom fees');return true;
 }
 
 async function _doExportPDF(d,code){
@@ -216,6 +212,7 @@ async function _doExportPDF(d,code){
 async function _doExportDeliveryPDF(qd,code){var cv=await toCanvas(buildDeliveryHTML(qd,code),700);var img=cv.toDataURL('image/png');var pdf=new jspdf.jsPDF({orientation:'p',unit:'pt',format:'a4'});var margin=25,usableW=595-margin*2;var ratio=cv.height/cv.width;var imgH=usableW*ratio;if(imgH>842-margin*2){imgH=842-margin*2;usableW=imgH/ratio;}pdf.addImage(img,'PNG',margin,margin,usableW,imgH);pdf.save('GH-'+code+'.pdf');}
 
 // FIX v1037.2: _doExportExcel - Giá CK luôn là formula, ko hằng số
+// FIX v1037.3: Thêm CORS proxy fallback wsrv.nl cho ảnh (Eurogold, Hafele...)
 async function _doExportExcel(d,qd,code,qr){
     var MONEY_FMT='#,##0"đ"';
     var NUM_FMT='#,##0';
@@ -250,13 +247,32 @@ async function _doExportExcel(d,qd,code,qr){
         var bgColor=i%2===0?'FFF8FAFC':'FFFFFFFF';
         var RB={top:{style:'thin',color:{argb:bgColor}},bottom:{style:'thin',color:{argb:bgColor}},left:{style:'thin',color:{argb:bgColor}},right:{style:'thin',color:{argb:bgColor}}};
         row.getCell(1).value=it.stt||i+1;row.getCell(1).alignment={horizontal:'center',vertical:'middle'};
-        if(it.image&&it.image.startsWith('http')){try{var ir=await fetch(it.image,{mode:'cors'});if(ir.ok){var ib=await ir.arrayBuffer();ws.addImage(wb.addImage({buffer:ib,extension:it.image.includes('.png')?'png':'jpeg'}),{tl:{col:1,row:cr-1},ext:{width:46,height:46}});}}catch(e){}}
+        // FIX v1037.3: Load ảnh với CORS proxy fallback wsrv.nl
+        if(it.image&&it.image.startsWith('http')){
+            try{
+                var ir=await fetch(it.image,{mode:'cors'});
+                if(!ir.ok)throw new Error('HTTP '+ir.status);
+                var ib=await ir.arrayBuffer();
+                var ext=it.image.match(/\.(png|jpe?g)/i);ext=ext?ext[1].startsWith('png')?'png':'jpeg':'jpeg';
+                ws.addImage(wb.addImage({buffer:ib,extension:ext}),{tl:{col:1,row:cr-1},ext:{width:46,height:46}});
+            }catch(e1){
+                // Fallback: dùng wsrv.nl (CORS proxy, tested: ✅ Eurogold, Hafele)
+                try{
+                    var proxyUrl='https://wsrv.nl/?url='+encodeURIComponent(it.image)+'&w=200&output='+(it.image.match(/\.png/i)?'png':'jpg');
+                    var ir2=await fetch(proxyUrl);
+                    if(ir2.ok){
+                        var ib2=await ir2.arrayBuffer();
+                        var ext2=it.image.match(/\.(png|jpe?g)/i);ext2=ext2?ext2[1].startsWith('png')?'png':'jpeg':'jpeg';
+                        ws.addImage(wb.addImage({buffer:ib2,extension:ext2}),{tl:{col:1,row:cr-1},ext:{width:46,height:46}});
+                    }
+                }catch(e2){/* skip image if all fails */}
+            }
+        }
         row.getCell(3).value=it.name||'';row.getCell(3).font={bold:true,size:9};row.getCell(3).alignment={wrapText:true,vertical:'middle'};
         row.getCell(4).value=it.model||'';row.getCell(4).alignment={horizontal:'center',vertical:'middle'};
         row.getCell(5).value=it.specs||'';row.getCell(5).font={size:8,color:{argb:'FF64748B'}};row.getCell(5).alignment={wrapText:true,vertical:'middle'};
         row.getCell(6).value=Number(it.qty||1);row.getCell(6).numFmt=NUM_FMT;row.getCell(6).alignment={horizontal:'center',vertical:'middle'};
         row.getCell(7).value=Number(it.price||0);row.getCell(7).numFmt=MONEY_FMT;row.getCell(7).alignment={horizontal:'right',vertical:'middle'};
-        // Giá CK luôn là formula =G{row}*factor — ko hardcode hằng số
         var itemPct=matchItemDiscount(it,d.itemDiscounts||{});
         var discountFactor=1.0;
         if(itemPct>0&&itemPct<=100){discountFactor=1-itemPct/100;}
@@ -281,7 +297,6 @@ async function _doExportExcel(d,qd,code,qr){
     tRow.getCell(1).value='TỔNG CỘNG';tRow.getCell(1).font={bold:true,size:13,color:{argb:'FFFFFFFF'}};tRow.getCell(1).alignment={horizontal:'left',vertical:'middle',indent:1};tRow.getCell(1).fill={type:'pattern',pattern:'solid',fgColor:{argb:TBG}};tRow.getCell(1).border=TB;
     tRow.getCell(6).value={formula:totalQtyFormula,result:totalQtyValue};tRow.getCell(6).numFmt=NUM_FMT;tRow.getCell(6).font={bold:true,size:12,color:{argb:'FFFFFFFF'}};tRow.getCell(6).alignment={horizontal:'center',vertical:'middle'};tRow.getCell(6).fill={type:'pattern',pattern:'solid',fgColor:{argb:TBG}};tRow.getCell(6).border=TB;
     tRow.getCell(7).fill={type:'pattern',pattern:'solid',fgColor:{argb:TBG}};tRow.getCell(7).border=TB;tRow.getCell(8).fill={type:'pattern',pattern:'solid',fgColor:{argb:TBG}};tRow.getCell(8).border=TB;
-    // TỔNG CỘNG = SUM(thành tiền sp) + phụ phí
     tRow.getCell(9).value={formula:sumParts.length?sumParts.join('+'):'0',result:Number(d.grandTotal||0)};tRow.getCell(9).numFmt=MONEY_FMT;tRow.getCell(9).font={bold:true,size:14,color:{argb:'FFF0B840'}};tRow.getCell(9).alignment={horizontal:'right',vertical:'middle'};tRow.getCell(9).fill={type:'pattern',pattern:'solid',fgColor:{argb:TBG}};tRow.getCell(9).border=TB;tRow.getCell(10).fill={type:'pattern',pattern:'solid',fgColor:{argb:TBG}};tRow.getCell(10).border=TB;cr++;
     if(d.deposit>0){var DBG='FFF0FDF4';var DB={top:{style:'thin',color:{argb:DBG}},bottom:{style:'thin',color:{argb:DBG}},left:{style:'thin',color:{argb:DBG}},right:{style:'thin',color:{argb:DBG}}};ws.mergeCells(cr,1,cr,8);var dRow=ws.getRow(cr);dRow.height=24;dRow.getCell(1).value='Đã cọc';dRow.getCell(1).font={bold:true,size:11,color:{argb:'FF166534'}};dRow.getCell(1).alignment={horizontal:'left',vertical:'middle',indent:1};dRow.getCell(1).fill={type:'pattern',pattern:'solid',fgColor:{argb:DBG}};dRow.getCell(1).border=DB;dRow.getCell(9).value=Number(d.deposit||0);dRow.getCell(9).numFmt=MONEY_FMT;dRow.getCell(9).font={bold:true,size:11,color:{argb:'FF166534'}};dRow.getCell(9).alignment={horizontal:'right',vertical:'middle'};dRow.getCell(9).fill={type:'pattern',pattern:'solid',fgColor:{argb:DBG}};dRow.getCell(9).border=DB;dRow.getCell(10).fill={type:'pattern',pattern:'solid',fgColor:{argb:DBG}};dRow.getCell(10).border=DB;var depositRowNum=cr;cr++;var RBG='FFFEF2F2';var RBD={top:{style:'thin',color:{argb:RBG}},bottom:{style:'thin',color:{argb:RBG}},left:{style:'thin',color:{argb:RBG}},right:{style:'thin',color:{argb:RBG}}};ws.mergeCells(cr,1,cr,8);var rRow=ws.getRow(cr);rRow.height=26;rRow.getCell(1).value='CÒN LẠI';rRow.getCell(1).font={bold:true,size:12,color:{argb:'FFDC2626'}};rRow.getCell(1).alignment={horizontal:'left',vertical:'middle',indent:1};rRow.getCell(1).fill={type:'pattern',pattern:'solid',fgColor:{argb:RBG}};rRow.getCell(1).border=RBD;rRow.getCell(9).value={formula:'MAX(I'+totalRowNum+'-I'+depositRowNum+',0)',result:Number(d.remaining||0)};rRow.getCell(9).numFmt=MONEY_FMT;rRow.getCell(9).font={bold:true,size:13,color:{argb:'FFDC2626'}};rRow.getCell(9).alignment={horizontal:'right',vertical:'middle'};rRow.getCell(9).fill={type:'pattern',pattern:'solid',fgColor:{argb:RBG}};rRow.getCell(9).border=RBD;rRow.getCell(10).fill={type:'pattern',pattern:'solid',fgColor:{argb:RBG}};rRow.getCell(10).border=RBD;cr++;}
     if(d.notes&&d.notes.length){var NBG='FFF0FDF4';var NB2={top:{style:'thin',color:{argb:NBG}},bottom:{style:'thin',color:{argb:NBG}},left:{style:'thin',color:{argb:NBG}},right:{style:'thin',color:{argb:NBG}}};ws.mergeCells(cr,1,cr,10);ws.getCell('A'+cr).value='📝 Ghi chú: '+d.notes.join('; ');ws.getCell('A'+cr).font={italic:true,size:9,color:{argb:'FF166534'}};ws.getCell('A'+cr).fill={type:'pattern',pattern:'solid',fgColor:{argb:NBG}};ws.getCell('A'+cr).border=NB2;cr++;}