fix parsePrompt: Malloca ck 35% discount, ghi chú: giao thứ 7 → note, small ordinal numbers skipped

qr-payment.js

@@ -1,6 +1,7 @@
-/* V.AI STUDIO — QR Payment / Quote Data v1038
- * FIX: Excel images now use fetch+cache-busting instead of DOM canvas (which taints)
- * Because bizweb.dktcdn.net supports CORS, fetch() with cache-bust works reliably
+/* 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
  */
 (function(){
 'use strict';
@@ -56,9 +57,16 @@ 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);
+            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;
-        if(line.match(/^(ck|chiết khấu|chiet khau|giảm|giam|discount)/i)){
+        // 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*(%)?/);
             if(ckm){var v=parseFloat(ckm[1].replace(/\./g,'').replace(',','.'));if(v>0&&v<=100)discountPercent=v;}
@@ -69,8 +77,15 @@ 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;var lb=line.replace(m[0],'').trim();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});}
+        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});
+        }
         else{notes.push(line);}
     });
     return{fees:fees,notes:notes,discount:discount,deposit:deposit,discountPercent:discountPercent,itemDiscounts:itemDiscounts};
@@ -184,7 +199,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 v1038 — fetch+CORS images, Excel images fixed');return true;
+    console.log('✅ QR Payment v1039 — parsePrompt fixed: ghi chú, Malloca ck 35%, thứ 7');return true;
 }
 
 async function _doExportPDF(d,code){