Upload qr-payment.js

qr-payment.js

@@ -1,5 +1,5 @@
-/* V.AI STUDIO — QR Payment / Quote Data v1049 - FIX TRIET DE: PHI + CK MA SP */
-(function(){'use strict';
+/* V.AI STUDIO — QR Payment / Quote Data v1050 - FIX TRIET DE: PHI + CK MA SP */
+(function(){'use strict'};
 
 window.__VAI_BLOB_REG = window.__VAI_BLOB_REG || { blobs: [], isUnloading: false };
 var blobRegistry = window.__VAI_BLOB_REG.blobs;
@@ -127,7 +127,7 @@ function getPromptText(){
     var inputs=document.querySelectorAll('input,textarea');
     for(var j=0;j<inputs.length;j++){
         var ph=(inputs[j].placeholder||'').toLowerCase();
-        if(ph.includes('yêu cầu')||ph.includes('chiết khấu')||ph.includes('yeu cau')||ph.includes('chiet khau')||ph.includes('ck')||ph.includes('giao hàng')||ph.includes('lắp')){
+        if(ph.indexOf('yêu cầu')>=0||ph.indexOf('chiết khấu')>=0||ph.indexOf('yeu cau')>=0||ph.indexOf('chiet khau')>=0||ph.indexOf('ck')>=0||ph.indexOf('giao hàng')>=0||ph.indexOf('lắp')>=0){
             var val=(inputs[j].value||'').trim();
             if(!val||val.toUpperCase().replace(/[\s.]/g,'')==='VAISTUDIO')continue;
             _lastPromptText=val;
@@ -144,8 +144,9 @@ function getData(){
     var surcharge=0;
     parsed.fees.forEach(function(f){surcharge+=f.amount;});
     var grandTotal=(qd.grandTotal||0)+surcharge;
-    var remaining=grandTotal-parsed.deposit;
-    return{qd:qd,fees:parsed.fees,notes:parsed.notes,discount:parsed.discount,deposit:parsed.deposit,grandTotal:grandTotal,remaining:remaining>0?remaining:0};
+    var dep=parsed.deposit||0;
+    var remaining=grandTotal-dep;
+    return{qd:qd,fees:parsed.fees,notes:parsed.notes,discount:parsed.discount,deposit:dep,grandTotal:grandTotal,remaining:remaining>0?remaining:0};
 }
 
 function orderToVAIData(order){
@@ -379,7 +380,7 @@ async function doOverride(){
         if(qd.customer)qd.customer.orderCode=getEffectiveOrderCode();
         return qd;
     };
-    console.log('✅ QR Payment v1049 — FIX TRIET DE: PHI GIAO HANG, LAP DAT, COC VAO EXCEL');
+    console.log('✅ QR Payment v1050 — FIX TRIET DE: PHÍ GIAO HÀNG, LẮP ĐẶT, CỌC VÀO EXCEL');
     return true;
 }
 
@@ -413,7 +414,7 @@ async function _doExportDeliveryPDF(qd,code){
     pdf.save('GH-'+code+'.pdf');
 }
 
-// ===== EXPORT EXCEL - BAO GOM PHI - v1049 =====
+// ===== EXPORT EXCEL - BAO GỒM PHÍ - v1050 =====
 var WHITE={argb:'FFFFFFFF'};
 var HEAD_FILL={type:'pattern',pattern:'solid',fgColor:{argb:'FF003F62'}};
 var TOTAL_FILL={type:'pattern',pattern:'solid',fgColor:{argb:'FF003F62'}};
@@ -473,7 +474,7 @@ async function _doExportExcel(d,qd,code,qrUrl){
         cr++;
     }
 
-    // FIX: THEM CAC DONG PHI (giao hàng, lắp đặt, cọc...)
+    // FIX: THÊM CÁC DÒNG PHÍ (giao hàng, lắp đặt, cọc...)
     var fees = d.fees || [];
     var feeStartRow = cr;
     for(var f=0; f<fees.length; f++){
@@ -505,6 +506,7 @@ async function _doExportExcel(d,qd,code,qrUrl){
     ws.getCell('I'+cr).numFmt=MONEY_FMT;
     ws.getCell('I'+cr).font=GRAND_FONT;
 
+    // Thông tin cọc nếu có
     if(d.deposit>0){
         cr++;
         ws.getCell('A'+cr).value='Đã cọc: '+fmt(d.deposit);
@@ -540,10 +542,10 @@ async function _doExportDeliveryExcel(qd,code){
     ws.getCell('A1').value='PHIẾU GIAO HÀNG';
     ws.getCell('A1').font={bold:true,size:16,color:{argb:'FF003F62'}};
 
-    ws.getCell('A2').value='KH: '+(qd.customer?qd.customer.name:'');
+    ws.getCell('A2').value='KH: '+(qd.customer?qd.customer.name:''),
     ws.getCell('D2').value='Mã: '+code;
     ws.getCell('A3').value='SĐT: '+(qd.customer?qd.customer.phone:'');
-    ws.getCell('A4').value='Địa chỉ: '+(qd.customer?qd.customer.addr||'':'');
+    ws.getCell('A4').value='Địa chỉ: '+(qd.customer?qd.customer.addr||':'');
 
     var hr=ws.getRow(6);
     ['STT','Tên sản phẩm','Mã SP','SL','Ghi chú'].forEach(function(h,i){
@@ -587,14 +589,14 @@ document.addEventListener('click',function(e){
     if(!btn)return;
     var txt=(btn.textContent||'').toLowerCase();
     if(!window._origGetQuoteData)return;
-    if(txt.includes('excel')&&txt.includes('xuất')){
+    if(txt.indexOf('excel')>=0&&txt.indexOf('xuất')>=0){
         e.preventDefault();e.stopPropagation();
         if(btn.dataset.vaiExporting==='1')return;
         setExportButtonState(btn,true);
         window.exportExcel().finally(function(){setExportButtonState(btn,false);});
         return false;
     }
-    if((txt.includes('pdf')&&txt.includes('xuất'))||(txt.includes('pdf')&&!txt.includes('giao hàng'))){
+    if((txt.indexOf('pdf')>=0&&txt.indexOf('xuất')>=0)||(txt.indexOf('pdf')>=0&&txt.indexOf('giao hàng')<0)){
         e.preventDefault();e.stopPropagation();
         if(btn.dataset.vaiExporting==='1')return;
         setExportButtonState(btn,true);
@@ -628,5 +630,5 @@ window.VAI_QR={
     orderToVAIData:orderToVAIData,
     _fixed:true
 };
-console.log('[VAI QR v1049 FIX] Loaded - Phí giao hàng, lắp đặt, cọc được thêm vào Excel báo giá & đơn hàng lưu');
+console.log('[VAI QR v1050 FIX] Loaded - Phí giao hàng, lắp đặt, cọc đư��c thêm vào Excel báo giá & đơn hàng lưu');
 })();