Upload qr-payment-v1043-FIXED.js

qr-payment-v1043-FIXED.js

@@ -34,6 +34,7 @@ function getCustomerName(){var sels=['#quoteName','#quoteCustomerName','#checkou
 function getEffectiveOrderCode(){var n=getCustomerName();if(n)return generateOrderCode(n);var h=window.location.hash;if(h&&h.length>1){var c=h.substring(1);if(/^VAS[A-Z0-9]{3,}$/.test(c))return c;}return generateOrderCode('');}
 function getQRUrl(a,c){return'https://img.vietqr.io/image/'+BANK_ID+'-'+BANK_ACCOUNT+'-compact2.png?amount='+(Math.round(a)||0)+'&addInfo='+encodeURIComponent(c||'VAISTUDIO')+'&accountName='+encodeURIComponent(BANK_NAME);}
 function fmt(n){if(!n||isNaN(n))return'0đ';return Number(n).toLocaleString('vi-VN')+'đ';}
+function fmtSigned(n){if(!n||isNaN(n))return'0đ';return('+'+(Number(n).toLocaleString('vi-VN')+'đ'));}
 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;});}
 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];}}return 0;}
@@ -51,7 +52,7 @@ function parsePrompt(text){
         
         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;
         
-        // CK
+        // CK - FIX: xử lý "Malloca ck 35%" dạng toàn cục
         if(line.match(/^(ck|chiết khấu|chiet khau|giảm|giam|discount)/i)){
             discount=line;
             var ckm=line.match(/([\d.,]+)\\s*(%)?/);
@@ -61,6 +62,13 @@ function parsePrompt(text){
             }
             return;
         }
+        // FIX: "Tên thương hiệu ck X%" - xử lý global discount sau tên brand
+        var brandCkMatch = line.match(/^([A-Za-z]+)\\s*ck\\s*([\\d.,]+)\\s*%/i);
+        if(brandCkMatch && !line.match(/\\$/) && !line.match(/%/)){
+            var vBrand = parseFloat(brandCkMatch[2].replace(/\\./g,'').replace(',','.'));
+            if(vBrand>0 && vBrand<=100) discountPercent=vBrand;
+            return;
+        }
         
         // Cọc
         if(line.match(/cọc|coc|deposit/i)){
@@ -75,8 +83,15 @@ function parsePrompt(text){
             return;
         }
         
+        // FIX: "giao thứ X" / "lắp thứ X" = note about delivery day
+        if(line.match(/(giao|lap)\\s*thu\\s*\\d/i)){
+            var dayMatch = line.match(/(giao|lap)\\s*thu\\s*(\\d+)/i);
+            if(dayMatch) {notes.push('Giao thứ ' + dayMatch[2]);}
+            return;
+        }
+        
         // Phí giao hàng, lắp đặt - FIX QUAN TRỌNG
-        var feeMatch=line.match(/([\d.,]+)\\s*(k|K|nghìn|nghin|triệu|tr|đ|d|vnd)?/);
+        var feeMatch=line.match(/([\\d.,]+)\\s*(k|K|nghìn|nghin|triệu|tr|đ|d|vnd)?/);
         if(feeMatch){
             var amt=parseFloat(feeMatch[1].replace(/\\./g,'').replace(',','.'));
             var u=(feeMatch[2]||'').toLowerCase();
@@ -192,7 +207,7 @@ function injectToModal(){
     if(parsed.fees.length){
         html+='<div style="padding:8px 12px;background:#fffbeb;border-radius:6px;border:1px solid #fde68a;margin-bottom:8px"><div style="font-weight:700;color:#92400e;font-size:12px;margin-bottom:4px">PHỤ PHÍ</div>';
         parsed.fees.forEach(function(f){
-            html+='<div style="display:flex;justify-content:space-between;padding:2px 0"><span>'+f.label+'</span><span style="font-weight:700">'+fmt(f.amount)+'</span></div>';
+            html+='<div style="display:flex;justify-content:space-between;padding:2px 0"><span>+ '+f.label+'</span><span style="font-weight:700">'+fmt(f.amount)+'</span></div>';
         });
         html+='</div>';
     }
@@ -243,7 +258,7 @@ function buildQuoteHTML(d,code,qrUrl){
     var feeRows='';
     if(d.fees&&d.fees.length){
         d.fees.forEach(function(f){
-            feeRows+='<tr style="background:#fffbeb"><td colspan="8" style="padding:5px 10px;font-size:11px;color:#92400e">⊕ '+f.label+'</td><td style="padding:5px 4px;text-align:right;font-size:11px;font-weight:700">'+fmt(f.amount)+'</td></tr>';
+            feeRows+='<tr style="background:#fffbeb"><td colspan="8" style="padding:5px 10px;font-size:11px;color:#92400e">+ '+f.label+'</td><td style="padding:5px 4px;text-align:right;font-size:11px;font-weight:700">'+fmt(f.amount)+'</td></tr>';
         });
     }
     return '<div style="display:flex;align-items:center;gap:10px">'
@@ -266,7 +281,7 @@ function buildQuoteHTML(d,code,qrUrl){
         +'<span style="color:#fff;font-weight:800">TỔNG CỘNG</span>'
         +'<span style="color:#f0b840;font-weight:900;margin-left:10px">'+fmt(d.grandTotal)+'</span>'
         +'</div>'
-        +(d.deposit>0?'<div style="margin-top:6px;padding:6px 12px;background:#f0fdf4;font-size:12px"><span>Cọc: <b>'+fmt(d.deposit)+'</b></span> | <span>Còn lại: <b style="color:#dc2626">'+fmt(d.remaining)+'</b></span></div>':'');
+        +(d.deposit>0?'<div style="margin-top:6px;padding:6px 12px;background:#f0fdf4;font-size:12px"><span>Đặt cọc: <b>'+fmt(d.deposit)+'</b></span><br><span>Còn lại: <b style="color:#dc2626">'+fmt(d.remaining)+'</b></span></div>':'');
 }
 
 function buildDeliveryHTML(qd,code){
@@ -374,7 +389,7 @@ async function _doExportDeliveryPDF(qd,code){
     pdf.save('GH-'+code+'.xlsx');
 }
 
-// ===== EXPORT EXCEL - FIX BAO GỒM PHÍ =====
+// ===== EXPORT EXCEL - FIX BAO GỒM PHÍ, CỌC, CÒN LẠI =====
 async function _doExportExcel(d,qd,code,qrUrl){
     var MONEY_FMT='#,##0"đ"';
     var NUM_FMT='#,##0';
@@ -383,19 +398,19 @@ async function _doExportExcel(d,qd,code,qrUrl){
     ws.views=[{showGridLines:false}];
     ws.columns=[{width:5},{width:11},{width:28},{width:13},{width:20},{width:6},{width:13},{width:13},{width:15},{width:14}];
     
-    ws.mergeCells('A3:J3');
-    ws.getCell('A3').value='BẢNG BÁO GIÁ';
-    ws.getCell('A3').font={bold:true,size:18,color:{argb:'FFDB9815'}};
-    ws.getCell('A3').alignment={horizontal:'center'};
+    ws.mergeCells('A1:J1');
+    ws.getCell('A1').value='BẢNG BÁO GIÁ';
+    ws.getCell('A1').font={bold:true,size:18,color:{argb:'FFDB9815'}};
+    ws.getCell('A1').alignment={horizontal:'center'};
     
-    ws.getCell('A5').value='Khách hàng:';ws.mergeCells('B5:E5');ws.getCell('B5').value=qd.customer?qd.customer.name:'';
-    ws.getCell('H5').value='Mã đơn:';ws.mergeCells('I5:J5');ws.getCell('I5').value=code;
-    ws.getCell('A6').value='SĐT:';ws.mergeCells('B6:E6');ws.getCell('B6').value=qd.customer?qd.customer.phone:'';
-    ws.getCell('H6').value='Ngày:';ws.mergeCells('I6:J6');ws.getCell('I6').value=qd.customer?qd.customer.date:'';
-    ws.getCell('A7').value='Email:';ws.mergeCells('B7:E7');ws.getCell('B7').value=qd.customer?qd.customer.email:'';
-    ws.getCell('A8').value='Địa chỉ:';ws.mergeCells('B8:J8');ws.getCell('B8').value=qd.customer?qd.customer.addr:'';
+    ws.getCell('A3').value='Khách hàng:';ws.mergeCells('B3:E3');ws.getCell('B3').value=qd.customer?qd.customer.name:'';
+    ws.getCell('H3').value='Mã đơn:';ws.mergeCells('I3:J3');ws.getCell('I3').value=code;
+    ws.getCell('A4').value='SĐT:';ws.mergeCells('B4:E4');ws.getCell('B4').value=qd.customer?qd.customer.phone:'';
+    ws.getCell('H4').value='Ngày:';ws.mergeCells('I4:J4');ws.getCell('I4').value=qd.customer?qd.customer.date:'';
+    ws.getCell('A5').value='Email:';ws.mergeCells('B5:E5');ws.getCell('B5').value=qd.customer?qd.customer.email:'';
+    ws.getCell('A6').value='Địa chỉ:';ws.mergeCells('B6:J6');ws.getCell('B6').value=qd.customer?qd.customer.addr:'';
     
-    var hr=ws.getRow(10);
+    var hr=ws.getRow(8);
     ['STT','Hình','Tên sản phẩm','Mã SP','Thông tin','SL','Đơn giá','Giá CK','Thành tiền','Ghi chú'].forEach(function(h,i){
         var c=hr.getCell(i+1);
         c.value=h;
@@ -403,7 +418,7 @@ async function _doExportExcel(d,qd,code,qrUrl){
         c.fill={type:'pattern',pattern:'solid',fgColor:{argb:'FF003F62'};
     });
     
-    var cr=11,firstItemRow=cr;
+    var cr=9,firstItemRow=cr;
     // Dòng sản phẩm
     for(var i=0;i<qd.items.length;i++){
         var it=qd.items[i],row=ws.getRow(cr);
@@ -427,14 +442,14 @@ async function _doExportExcel(d,qd,code,qrUrl){
         cr++;
     }
     
-    // FIX: THÊM CÁC DÒNG PHÍ (giao hàng, lắp đặt...)
+    // FIX: THÊM CÁC DÒNG PHÍ (giao hàng, lắp đặt...) - mỗi phí 1 dòng riêng
     var fees = d.fees || [];
     var feeStartRow = cr;
     for(var f=0; f<fees.length; f++){
         var feeRow = ws.getRow(cr);
         feeRow.height=22;
         ws.mergeCells(cr, 2, cr, 8);
-        feeRow.getCell(2).value='⊕ ' + fees[f].label;
+        feeRow.getCell(2).value='+ ' + fees[f].label;
         feeRow.getCell(2).font={bold:true};
         feeRow.getCell(9).value=fees[f].amount;
         feeRow.getCell(9).numFmt=MONEY_FMT;
@@ -457,12 +472,25 @@ async function _doExportExcel(d,qd,code,qrUrl){
     ws.getCell('I'+cr).numFmt=MONEY_FMT;
     ws.getCell('I'+cr).font={bold:true,size:14,color:{argb:'FFF0B840'};};
     
-    // Thông tin cọc nếu có
+    // Thông tin cọc - tách thành 2 dòng riêng
     if(d.deposit>0){
         cr++;
-        ws.mergeCells(cr,1,cr,10);
-        ws.getCell('A'+cr).value='Cọc: '+fmt(d.deposit)+' | Còn lại: '+fmt(d.remaining);
-        ws.getCell('A'+cr).font={size:11};
+        // Dòng Đặt cọc
+        ws.mergeCells(cr,1,cr,8);
+        ws.getCell('A'+cr).value='Đặt cọc';
+        ws.getCell('A'+cr).font={bold:true,size:11};
+        ws.getCell('I'+cr).value=d.deposit;
+        ws.getCell('I'+cr).numFmt=MONEY_FMT;
+        ws.getCell('I'+cr).font={bold:true};
+        
+        cr++;
+        // Dòng Còn lại
+        ws.mergeCells(cr,1,cr,8);
+        ws.getCell('A'+cr).value='Còn lại';
+        ws.getCell('A'+cr).font={bold:true,size:11,color:{argb:'FFDC2626'};};
+        ws.getCell('I'+cr).value=d.remaining;
+        ws.getCell('I'+cr).numFmt=MONEY_FMT;
+        ws.getCell('I'+cr).font={bold:true,color:{argb:'FFDC2626'};};
     }
     
     wb.calcProperties.fullCalcOnLoad=true;
@@ -555,6 +583,7 @@ window.VAI_QR={
     exportDeliveryPDF:_doExportDeliveryPDF,
     exportDeliveryExcel:_doExportDeliveryExcel,
     fmt:fmt,
+    fmtSigned:fmtSigned,
     compactKey:compactKey,
     matchItemDiscount:matchItemDiscount,
     parseItemDiscountLine:parseItemDiscountLine,
@@ -562,5 +591,5 @@ window.VAI_QR={
     setExportButtonState:setExportButtonState,
     orderToVAIData:orderToVAIData
 };
-console.log('[VAI QR v1043 FIX] Loaded - Phí giao hàng, lắp đặt, cọc được thêm vào Excel');
+console.log('[VAI QR v1043 FIX] Loaded - Phí giao hàng, lắp đặt, cọc được thêm vào Excel - Format mới: từng dòng phí riêng');
 })();