Khôi phục từ commit e37f787

qr-payment.js

@@ -1,9 +1,7 @@
-/* V.AI STUDIO — QR Payment / Quote Data v1041
+/* V.AI STUDIO — QR Payment / Quote Data v1039
  * FIX: parsePrompt — 'Malloca ck 35%' now correctly detected as global discount;
  *      'ghi chú: giao thứ 7' treated as note, not a 7đ fee;
- *      small numbers with ordinal/date context (thứ, ngày, giờ) = note, not fee;
- *      FIX EXPORT ARGS v2: window.VAI_QR now points to wrapper functions that accept arguments
- *      ROOT CAUSE FIXED: VAI_QR.exportExcel now correctly uses passed data with fees
+ *      small numbers with ordinal/date context (thứ, ngày, giờ) = note, not fee
  */
 (function(){
 'use strict';
@@ -59,6 +57,7 @@ function parsePrompt(text){
     if(!text)return{fees:fees,notes:notes,discount:discount,deposit:deposit,discountPercent:discountPercent,itemDiscounts:itemDiscounts};
     text.split(/[,;\n]+/).forEach(function(line){
         line=line.trim();if(!line)return;
+        // FIX: detect 'ghi chú:' / 'note:' prefix → rest is a note (skip all number matching)
         if(line.match(/^(ghi chú|ghichu|note|notes)\s*[:\-]?\s*/i)){
             var nt=line.replace(/^(ghi chú|ghichu|note|notes)\s*[:\-]?\s*/i,'');
             if(nt) notes.push(nt);
@@ -66,6 +65,7 @@ function parsePrompt(text){
         }
         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;
+        // FIX: also match 'WORD ck X%' (e.g. 'Malloca ck 35%') — global discount
         if(line.match(/^(ck|chiết khấu|chiet khau|giảm|giam|discount)/i) || line.match(/\bck\s*[\d.,]+\s*%/i)){
             discount=line;
             var ckm=line.match(/([\d.,]+)\s*(%)?/);
@@ -77,9 +77,11 @@ 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: number match — skip lines that look like dates/ordinals (e.g. 'thứ 7')
         var m=line.match(/([\d.,]+)\s*(k|K|nghìn|nghin|triệu|tr|đ|d|vnd)?/);
         if(m){
             var amt=parseFloat(m[1].replace(/\./g,'').replace(',','.'));var u=(m[2]||'').toLowerCase();if(u==='k'||u==='nghìn'||u==='nghin')amt*=1000;if(u==='triệu'||u==='tr')amt*=1000000;if(amt<=0)return;
+            // FIX: small numbers (<1000, no unit) with context words → note, not fee
             var lb=line.replace(m[0],'').trim();
             if(amt<1000&&!u&&lb.match(/thứ|ngày|giờ|tuần|tháng|năm|lúc/i)){notes.push(line);return;}
             if(lb.match(/giao|ship|vận chuyển|delivery/i))lb='Phí giao hàng';else if(lb.match(/lắp|lap|install/i))lb='Phí lắp đặt';else if(lb.match(/bốc|boc|xếp|xep|vác/i))lb='Phí bốc xếp';else if(!lb||lb.length<2)lb='Phụ phí';fees.push({label:lb,amount:amt});
@@ -191,59 +193,13 @@ async function _fetchImageAsBuffer(url){
 function doOverride(){
     if(typeof getQuoteData!=='function'||typeof html2canvas!=='function')return false;
     window._origGetQuoteData=getQuoteData;
-    
     window.shareQuoteImage=async function(){var d=getData(),code=getEffectiveOrderCode(),qr=getQRUrl(d.deposit>0?d.remaining:d.grandTotal,code);try{var cv=await toCanvas(buildQuoteHTML(d,code,qr),1000);var blob=await new Promise(function(r){cv.toBlob(r,'image/png');});var f=new File([blob],code+'.png',{type:'image/png'});if(navigator.share&&navigator.canShare&&navigator.canShare({files:[f]})){await navigator.share({title:code,files:[f]});}else{var url=URL.createObjectURL(blob);var p=document.createElement('div');p.style.cssText='position:fixed;inset:0;background:rgba(0,0,0,.7);z-index:999;display:flex;align-items:center;justify-content:center;padding:16px;backdrop-filter:blur(4px)';p.innerHTML='<div style="background:#fff;border-radius:16px;max-width:90vw;max-height:85vh;overflow:auto;padding:16px"><img src="'+url+'" style="max-width:100%;border-radius:8px"><div style="display:flex;gap:8px;margin-top:12px;justify-content:center"><a href="'+url+'" download="'+code+'.png" style="padding:10px 20px;background:#003f62;color:#fff;border-radius:8px;font-weight:700;text-decoration:none">⬇ Tải ảnh</a><button onclick="this.closest(\'div[style*=fixed]\').remove()" style="padding:10px 20px;background:#e2e8f0;border:none;border-radius:8px;font-weight:700;cursor:pointer">Đóng</button></div></div>';document.body.appendChild(p);}}catch(e){console.error(e);}};
-    
-    // CRITICAL FIX: Export functions now ALWAYS use passed arguments, never fallback incorrectly
-    window.exportPDF=function(d,code){
-        if(d && typeof d==='object' && d.qd){
-            console.log('[exportPDF] Using passed data with fees:', d.fees);
-            return _doExportPDF(d, code || getEffectiveOrderCode());
-        } else {
-            var d2=getData();
-            console.log('[exportPDF] Using getData() with fees:', d2.fees);
-            return _doExportPDF(d2, getEffectiveOrderCode());
-        }
-    };
-    
-    window.exportExcel=function(d,qd,code,qr){
-        if(d && typeof d==='object' && d.qd){
-            console.log('[exportExcel] Using passed data with fees:', d.fees);
-            qd=qd||d.qd;
-            code=code||getEffectiveOrderCode();
-            if(!qr && d.grandTotal!==undefined){
-                qr=getQRUrl(d.deposit>0?d.remaining:d.grandTotal,code);
-            }
-            return _doExportExcel(d,qd,code,qr);
-        } else {
-            var d2=getData();
-            console.log('[exportExcel] Using getData() with fees:', d2.fees);
-            return _doExportExcel(d2,d2.qd,getEffectiveOrderCode(),getQRUrl(d2.deposit>0?d2.remaining:d2.grandTotal,getEffectiveOrderCode()));
-        }
-    };
-    
-    window.exportDeliveryExcel=function(qd,code){
-        if(qd && typeof qd==='object' && qd.items){
-            console.log('[exportDeliveryExcel] Using passed qd');
-            return _doExportDeliveryExcel(qd, code || getEffectiveOrderCode());
-        } else {
-            var qd2=window._origGetQuoteData();
-            return _doExportDeliveryExcel(qd2, getEffectiveOrderCode());
-        }
-    };
-    
-    window.exportDeliveryPDF=function(qd,code){
-        if(qd && typeof qd==='object' && qd.items){
-            console.log('[exportDeliveryPDF] Using passed qd');
-            return _doExportDeliveryPDF(qd, code || getEffectiveOrderCode());
-        } else {
-            var qd2=window._origGetQuoteData();
-            return _doExportDeliveryPDF(qd2, getEffectiveOrderCode());
-        }
-    };
-    
+    window.exportPDF=async function(){var d=getData(),code=getEffectiveOrderCode(),qr=getQRUrl(d.deposit>0?d.remaining:d.grandTotal,code);try{await _doExportPDF(d,code);}catch(e){console.error(e);alert('Không xuất được PDF: '+(e&&e.message?e.message:e));}};
+    window.exportExcel=async function(){if(typeof ExcelJS==='undefined')return;var d=getData(),qd=d.qd,code=getEffectiveOrderCode(),qr=getQRUrl(d.deposit>0?d.remaining:d.grandTotal,code);await _doExportExcel(d,qd,code,qr);};
+    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 v1041 — EXPORT ARGS FIXED: Now correctly uses passed arguments with fees');return true;
+    console.log('✅ QR Payment v1039 — parsePrompt fixed: ghi chú, Malloca ck 35%, thứ 7');return true;
 }
 
 async function _doExportPDF(d,code){
@@ -292,6 +248,7 @@ async function _doExportExcel(d,qd,code,qr){
     var ckPct=Number(d.discountPercent||0);
 
     // Pre-fetch ALL item images eagerly (with cache-bust) BEFORE building cells
+    // This avoids DOM canvas taint — fetches directly from CDN with CORS
     var imgBuffers=[];
     try{
         for(var pi=0;pi<qd.items.length;pi++){
@@ -307,6 +264,7 @@ async function _doExportExcel(d,qd,code,qr){
         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'};
 
+        // Use pre-fetched image buffer (direct CORS fetch, no DOM canvas)
         try{
             if(imgBuffers[i]&&imgBuffers[i].byteLength>100){
                 ws.addImage(wb.addImage({buffer:imgBuffers[i],extension:'jpeg'}),{tl:{col:1,row:cr-1},ext:{width:46,height:46}});
@@ -402,6 +360,5 @@ document.addEventListener('click',function(e){
     if(txt.includes('chia sẻ')&&txt.includes('ảnh')){e.preventDefault();e.stopPropagation();window.shareQuoteImage();return false;}
 },true);
 
-// CRITICAL FIX: VAI_QR now points to wrapper functions (window.exportExcel etc.) NOT internal functions
-window.VAI_QR={getEffectiveOrderCode:getEffectiveOrderCode,getQRUrl:getQRUrl,generateOrderCode:generateOrderCode,parsePrompt:parsePrompt,getPromptText:getPromptText,injectToModal:injectToModal,getData:getData,buildQuoteHTML:buildQuoteHTML,buildDeliveryHTML:buildDeliveryHTML,toCanvas:toCanvas,exportPDF:window.exportPDF,exportExcel:window.exportExcel,exportDeliveryPDF:window.exportDeliveryPDF,exportDeliveryExcel:window.exportDeliveryExcel,fmt:fmt,compactKey:compactKey,matchItemDiscount:matchItemDiscount,parseItemDiscountLine:parseItemDiscountLine,applyPromptDiscounts:applyPromptDiscounts};
-})();
+window.VAI_QR={getEffectiveOrderCode:getEffectiveOrderCode,getQRUrl:getQRUrl,generateOrderCode:generateOrderCode,parsePrompt:parsePrompt,getPromptText:getPromptText,injectToModal:injectToModal,getData:getData,buildQuoteHTML:buildQuoteHTML,buildDeliveryHTML:buildDeliveryHTML,toCanvas:toCanvas,exportPDF:_doExportPDF,exportExcel:_doExportExcel,exportDeliveryPDF:_doExportDeliveryPDF,exportDeliveryExcel:_doExportDeliveryExcel,fmt:fmt,compactKey:compactKey,matchItemDiscount:matchItemDiscount,parseItemDiscountLine:parseItemDiscountLine,applyPromptDiscounts:applyPromptDiscounts};
+})();