v7: Fix Excel export - fees, deposit, notes always render 100%

vai-export-fixed.js

@@ -1,16 +1,21 @@
 /**
- * V.AI STUDIO — EXPORT v6.0 DEFINITIVE (100% images guaranteed)
+ * V.AI STUDIO — EXPORT v7 DEFINITIVE (100% fees + deposit + notes guaranteed)
  * ======================================================
- * https://huggingface.co/spaces/bep40/V.AISTUDIO
- * 
- * FIX TRIỆT ĐỂ:
- * - Tự fetch ảnh bằng CORS + AllOrigins proxy fallback (vượt bizweb.dktcdn.net, eurogold.vn)
- * - Chuyển ArrayBuffer → base64 → addImage trực tiếp vào Excel workbook
- * - KHÔNG dùng DOM canvas, KHÔNG phụ thuộc .qt-img, KHÔNG CORS taint
- * - KHÔNG race condition — genXl tự xử lý hết
+ * FIX TRIỆT ĐỂ v7:
+ * - Tái cấu trúc hoàn toàn genXl: luôn đọc fees/deposit/notes từ VAI_QR.getData()
+ * - Luôn render "CÒN LẠI (100%)" khi không có cọc
+ * - Luôn render "Đã cọc" + "Còn lại" khi có cọc
+ * - Luôn render phụ phí khi có fees
+ * - Luôn render ghi chú khi có notes
+ * - Tự động pre-fetch ảnh bằng CORS + proxy fallback
+ * - KHÔNG phụ thuộc DOM canvas, KHÔNG CORS taint
+ * - KHÔNG xung đột với các hàm khác: chỉ override exportExcel 1 lần duy nhất
  * ======================================================
  */
-(function(){'use strict';console.log('[VAI EXPORT v6] === LOADING ===');
+(function(){'use strict';console.log('[VAI EXPORT v7] === LOADING ===');
+
+// ===== UTILITY =====
+function fmtVND(n){if(!n||isNaN(n))return'0đ';return Number(n).toLocaleString('vi-VN')+'đ';}
 
 // ===== IMAGE FETCH ENGINE =====
 function fetchImg(url) {
@@ -40,37 +45,39 @@ function getImgUrl(it){
   return'';
 }
 
-// ===== BUILD EXCEL =====
+// ===== BUILD EXCEL v7 =====
 async function genXl(data,qd,code){
   var M='#,##0"đ"',N='#,##0',WH={argb:'FFFFFFFF'},WB={top:{style:'thin',color:WH},bottom:{style:'thin',color:WH},left:{style:'thin',color:WH},right:{style:'thin',color:WH}};
   var wb=new ExcelJS.Workbook(),ws=wb.addWorksheet('Báo giá');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}];
   
+  // HEADER
   ws.mergeCells('A1:J1');ws.getRow(1).height=28;ws.getCell('A1').value='V.AI STUDIO ❝ Niềm tin khách hàng là tài sản của chúng tôi ❞';ws.getCell('A1').font={italic:true,size:9,color:{argb:'FF64748B'}};ws.getCell('A1').alignment={vertical:'middle'};ws.getCell('A1').border=WB;
   ws.getRow(2).height=5;ws.mergeCells('A3:J3');ws.getRow(3).height=30;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',vertical:'middle'};ws.getCell('A3').border=WB;ws.getRow(4).height=5;
   
+  // CUSTOMER INFO
   var cust=qd.customer||{};
   ws.getCell('A5').value='Khách hàng:';ws.getCell('A5').font={bold:true,size:9};ws.getCell('A5').border=WB;ws.mergeCells('B5:E5');ws.getCell('B5').value=cust.name||'';ws.getCell('B5').font={bold:true,size:10};ws.getCell('B5').border=WB;ws.getCell('H5').value='Mã đơn:';ws.getCell('H5').font={size:9};ws.getCell('H5').border=WB;ws.mergeCells('I5:J5');ws.getCell('I5').value=code;ws.getCell('I5').font={bold:true,size:10,color:{argb:'FF003F62'}};ws.getCell('I5').border=WB;
   ws.getCell('A6').value='SĐT:';ws.getCell('A6').font={size:9};ws.getCell('A6').border=WB;ws.getCell('B6').value=cust.phone||'';ws.getCell('B6').border=WB;ws.getCell('H6').value='Ngày:';ws.getCell('H6').font={size:9};ws.getCell('H6').border=WB;ws.getCell('I6').value=cust.date||'';ws.getCell('I6').border=WB;
   ws.getCell('A7').value='Email:';ws.getCell('A7').font={size:9};ws.getCell('A7').border=WB;ws.getCell('B7').value=cust.email||'';ws.getCell('B7').border=WB;ws.getCell('A8').value='Địa chỉ:';ws.getCell('A8').font={size:9};ws.getCell('A8').border=WB;ws.mergeCells('B8:J8');ws.getCell('B8').value=cust.addr||'';ws.getCell('B8').border=WB;ws.getRow(9).height=5;
   
-  // HEADER row
+  // TABLE HEADER
   var HB={top:{style:'thin',color:{argb:'FF003F62'}},bottom:{style:'thin',color:{argb:'FF003F62'}},left:{style:'thin',color:{argb:'FF003F62'}},right:{style:'thin',color:{argb:'FF003F62'}}};
   var hRow=ws.getRow(10);hRow.height=20;
   ['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=hRow.getCell(i+1);c.value=h;c.font={bold:true,color:{argb:'FFFFFFFF'},size:9};c.fill={type:'pattern',pattern:'solid',fgColor:{argb:'FF003F62'}};c.alignment={horizontal:'center',vertical:'middle',wrapText:true};c.border=HB;
   });
   
-  // PRELOAD images BEFORE building rows
+  // FETCH IMAGES
   var items=qd.items||[];
   var imgUrls=items.map(getImgUrl);
-  console.log('[VAI EXPORT v6] Fetching',imgUrls.filter(Boolean).length,'images for',items.length,'items...');
+  console.log('[VAI EXPORT v7] Fetching',imgUrls.filter(Boolean).length,'images for',items.length,'items...');
   var imgResults=await Promise.all(imgUrls.map(function(url){
     if(!url)return Promise.resolve(null);
     return fetchImg(url).then(function(buf){return bufToB64(buf,url);});
   }));
-  console.log('[VAI EXPORT v6] Loaded',imgResults.filter(Boolean).length,'images');
+  console.log('[VAI EXPORT v7] Loaded',imgResults.filter(Boolean).length,'images');
   
-  // BUILD rows với ảnh trực tiếp
+  // BUILD ITEM ROWS
   var cr=11;
   items.forEach(function(it,i){
     var row=ws.getRow(cr);row.height=50;
@@ -80,13 +87,13 @@ async function genXl(data,qd,code){
     
     row.getCell(1).value=it.stt||(i+1);row.getCell(1).alignment={horizontal:'center',vertical:'middle'};
     
-    // ===== INJECT ẢNH TRỰC TIẾP VÀO EXCEL =====
+    // INJECT ẢNH
     var ri=imgResults[i];
     if(ri&&ri.base64){
       try{
         var imgId=wb.addImage({base64:ri.base64,extension:ri.ext||'jpeg'});
         ws.addImage(imgId,{tl:{col:1,row:cr-1},ext:{width:46,height:46}});
-      }catch(ie){console.warn('[VAI EXPORT v6] img add error:',ie);}
+      }catch(ie){console.warn('[VAI EXPORT v7] img add error:',ie);}
     }
     
     row.getCell(2).value='';row.getCell(2).font={size:8};row.getCell(2).alignment={horizontal:'center',vertical:'middle'};
@@ -105,67 +112,179 @@ async function genXl(data,qd,code){
   // WARRANTY
   ws.mergeCells(cr,1,cr,10);ws.getRow(cr).height=18;ws.getCell('A'+cr).value='✅ Bảo hành 2 năm (sản phẩm) — Bảo hành hoen gỉ vĩnh viễn (rổ SUS304)';ws.getCell('A'+cr).font={size:9,color:{argb:'FF059669'},italic:true};ws.getCell('A'+cr).alignment={vertical:'middle'};for(var ci=1;ci<=10;ci++)ws.getCell(cr,ci).fill={type:'pattern',pattern:'solid',fgColor:{argb:'FFF0FDF4'}};cr++;
   
-  // FEES
+  // ===== FEES - LUÔN render nếu có =====
   var fees=data.fees||[];
-  if(fees.length>0){fees.forEach(function(f){ws.mergeCells(cr,1,cr,8);ws.getRow(cr).height=20;ws.getCell('A'+cr).value='   ⊕ '+(f.label||'Phụ phí');ws.getCell('A'+cr).font={size:9,color:{argb:'FF92400E'}};ws.getCell('A'+cr).alignment={vertical:'middle'};ws.getCell('I'+cr).value=Number(f.amount||0);ws.getCell('I'+cr).numFmt=M;ws.getCell('I'+cr).font={bold:true,size:9,color:{argb:'FF92400E'}};ws.getCell('I'+cr).alignment={horizontal:'right',vertical:'middle'};for(var ci=1;ci<=10;ci++)ws.getCell(cr,ci).fill={type:'pattern',pattern:'solid',fgColor:{argb:'FFFFFBEB'}};cr++;});}
+  if(fees.length>0){
+    fees.forEach(function(f){
+      ws.mergeCells(cr,1,cr,8);ws.getRow(cr).height=20;
+      ws.getCell('A'+cr).value='   ⊕ '+(f.label||'Phụ phí');
+      ws.getCell('A'+cr).font={size:9,color:{argb:'FF92400E'}};ws.getCell('A'+cr).alignment={vertical:'middle'};
+      ws.getCell('I'+cr).value=Number(f.amount||0);ws.getCell('I'+cr).numFmt=M;
+      ws.getCell('I'+cr).font={bold:true,size:9,color:{argb:'FF92400E'}};ws.getCell('I'+cr).alignment={horizontal:'right',vertical:'middle'};
+      for(var ci=1;ci<=10;ci++)ws.getCell(cr,ci).fill={type:'pattern',pattern:'solid',fgColor:{argb:'FFFFFBEB'}};
+      cr++;
+    });
+  }
   
-  // TOTAL
-  var TBG='FF003F62',TB={top:{style:'thin',color:{argb:TBG}},bottom:{style:'thin',color:{argb:TBG}},left:{style:'thin',color:{argb:TBG}},right:{style:'thin',color:{argb:TBG}}};ws.mergeCells(cr,1,cr,8);var tRow=ws.getRow(cr);tRow.height=28;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};for(var ci=1;ci<=10;ci++){tRow.getCell(ci).fill={type:'pattern',pattern:'solid',fgColor:{argb:TBG}};tRow.getCell(ci).border=TB;}
-  tRow.getCell(9).value=Number(data.grandTotal||0);tRow.getCell(9).numFmt=M;tRow.getCell(9).font={bold:true,size:15,color:{argb:'FFF0B840'}};tRow.getCell(9).alignment={horizontal:'right',vertical:'middle'};cr++;
+  // ===== TỔNG CỘNG =====
+  var grandTotal=Number(data.grandTotal||0);
+  var TBG='FF003F62',TB={top:{style:'thin',color:{argb:TBG}},bottom:{style:'thin',color:{argb:TBG}},left:{style:'thin',color:{argb:TBG}},right:{style:'thin',color:{argb:TBG}}};
+  ws.mergeCells(cr,1,cr,8);var tRow=ws.getRow(cr);tRow.height=28;
+  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(9).value=grandTotal;tRow.getCell(9).numFmt=M;tRow.getCell(9).font={bold:true,size:15,color:{argb:'FFF0B840'}};tRow.getCell(9).alignment={horizontal:'right',vertical:'middle'};
+  for(var ci=1;ci<=10;ci++){tRow.getCell(ci).fill={type:'pattern',pattern:'solid',fgColor:{argb:TBG}};tRow.getCell(ci).border=TB;}
+  var totalRowNum=cr;
+  cr++;
   
-  // DEPOSIT
+  // ===== CỌC / CÒN LẠI =====
   var deposit=Number(data.deposit||0);
-  if(deposit>0){ws.mergeCells(cr,1,cr,8);ws.getRow(cr).height=22;ws.getCell('A'+cr).value='Đã cọc';ws.getCell('A'+cr).font={bold:true,size:11,color:{argb:'FF166534'}};ws.getCell('A'+cr).alignment={horizontal:'left',vertical:'middle',indent:1};for(var ci=1;ci<=10;ci++)ws.getCell(cr,ci).fill={type:'pattern',pattern:'solid',fgColor:{argb:'FFF0FDF4'}};ws.getCell('I'+cr).value=deposit;ws.getCell('I'+cr).numFmt=M;ws.getCell('I'+cr).font={bold:true,size:11,color:{argb:'FF166534'}};ws.getCell('I'+cr).alignment={horizontal:'right',vertical:'middle'};cr++;
-  ws.mergeCells(cr,1,cr,8);ws.getRow(cr).height=24;ws.getCell('A'+cr).value='CÒN LẠI';ws.getCell('A'+cr).font={bold:true,size:12,color:{argb:'FFDC2626'}};ws.getCell('A'+cr).alignment={horizontal:'left',vertical:'middle',indent:1};for(var ci=1;ci<=10;ci++)ws.getCell(cr,ci).fill={type:'pattern',pattern:'solid',fgColor:{argb:'FFFEF2F2'}};ws.getCell('I'+cr).value=Number(data.remaining||0);ws.getCell('I'+cr).numFmt=M;ws.getCell('I'+cr).font={bold:true,size:13,color:{argb:'FFDC2626'}};ws.getCell('I'+cr).alignment={horizontal:'right',vertical:'middle'};cr++;}
+  if(deposit>0){
+    // Đã cọc
+    ws.mergeCells(cr,1,cr,8);ws.getRow(cr).height=22;
+    ws.getCell('A'+cr).value='Đã cọc';ws.getCell('A'+cr).font={bold:true,size:11,color:{argb:'FF166534'}};ws.getCell('A'+cr).alignment={horizontal:'left',vertical:'middle',indent:1};
+    ws.getCell('I'+cr).value=deposit;ws.getCell('I'+cr).numFmt=M;ws.getCell('I'+cr).font={bold:true,size:11,color:{argb:'FF166534'}};ws.getCell('I'+cr).alignment={horizontal:'right',vertical:'middle'};
+    for(var ci=1;ci<=10;ci++)ws.getCell(cr,ci).fill={type:'pattern',pattern:'solid',fgColor:{argb:'FFF0FDF4'}};
+    cr++;
+    // Còn lại
+    var remaining=Math.max(0,grandTotal-deposit);
+    ws.mergeCells(cr,1,cr,8);ws.getRow(cr).height=24;
+    ws.getCell('A'+cr).value='CÒN LẠI';ws.getCell('A'+cr).font={bold:true,size:12,color:{argb:'FFDC2626'}};ws.getCell('A'+cr).alignment={horizontal:'left',vertical:'middle',indent:1};
+    ws.getCell('I'+cr).value=remaining;ws.getCell('I'+cr).numFmt=M;ws.getCell('I'+cr).font={bold:true,size:13,color:{argb:'FFDC2626'}};ws.getCell('I'+cr).alignment={horizontal:'right',vertical:'middle'};
+    for(var ci=1;ci<=10;ci++)ws.getCell(cr,ci).fill={type:'pattern',pattern:'solid',fgColor:{argb:'FFFEF2F2'}};
+    cr++;
+  } else {
+    // CÒN LẠI (100%) - luôn hiển thị khi không có cọc
+    ws.mergeCells(cr,1,cr,8);ws.getRow(cr).height=24;
+    ws.getCell('A'+cr).value='CÒN LẠI (100%)';ws.getCell('A'+cr).font={bold:true,size:12,color:{argb:'FFDC2626'}};ws.getCell('A'+cr).alignment={horizontal:'left',vertical:'middle',indent:1};
+    ws.getCell('I'+cr).value=grandTotal;ws.getCell('I'+cr).numFmt=M;ws.getCell('I'+cr).font={bold:true,size:13,color:{argb:'FFDC2626'}};ws.getCell('I'+cr).alignment={horizontal:'right',vertical:'middle'};
+    for(var ci=1;ci<=10;ci++)ws.getCell(cr,ci).fill={type:'pattern',pattern:'solid',fgColor:{argb:'FFFEF2F2'}};
+    cr++;
+  }
   
-  // NOTES
-  var notes=data.notes||[];if(notes.length>0){ws.mergeCells(cr,1,cr,10);ws.getCell('A'+cr).value='📝 Ghi chú: '+notes.join('; ');ws.getCell('A'+cr).font={italic:true,size:9,color:{argb:'FF166534'}};for(var ci=1;ci<=10;ci++)ws.getCell(cr,ci).fill={type:'pattern',pattern:'solid',fgColor:{argb:'FFF0FDF4'}};cr++;}
+  // ===== NOTES - LUÔN render nếu có =====
+  var notes=data.notes||[];
+  if(notes.length>0){
+    ws.mergeCells(cr,1,cr,10);ws.getRow(cr).height=20;
+    ws.getCell('A'+cr).value='📝 Ghi chú: '+notes.join('; ');
+    ws.getCell('A'+cr).font={italic:true,size:9,color:{argb:'FF166534'}};
+    ws.getCell('A'+cr).alignment={wrapText:true,vertical:'middle'};
+    for(var ci=1;ci<=10;ci++)ws.getCell(cr,ci).fill={type:'pattern',pattern:'solid',fgColor:{argb:'FFF0FDF4'}};
+    cr++;
+  }
   
   // BANK INFO
-  cr++;ws.mergeCells(cr,1,cr,5);ws.getRow(cr).height=18;ws.getCell('A'+cr).value='💳 QR CODE: VIB - 918258385 - Trần Quốc Vương';ws.getCell('A'+cr).font={bold:true,size:10,color:{argb:'FF003F62'}};for(var ci=1;ci<=10;ci++)ws.getCell(cr,ci).fill={type:'pattern',pattern:'solid',fgColor:{argb:'FFF8FAFC'}};cr++;
-  ws.mergeCells(cr,1,cr,10);ws.getCell('A'+cr).value='🏦 VIB | 👤 Trần Quốc Vương | STK: 918258385 | 💰 '+((deposit>0?data.remaining:data.grandTotal)||0).toLocaleString('vi-VN')+'đ | 📝 '+code;ws.getCell('A'+cr).font={bold:true,size:10};for(var ci=1;ci<=10;ci++)ws.getCell(cr,ci).fill={type:'pattern',pattern:'solid',fgColor:{argb:'FFF8FAFC'}};
+  cr++;ws.mergeCells(cr,1,cr,5);ws.getRow(cr).height=18;
+  ws.getCell('A'+cr).value='💳 QR CODE: VIB - 918258385 - Trần Quốc Vương';
+  ws.getCell('A'+cr).font={bold:true,size:10,color:{argb:'FF003F62'}};
+  for(var ci=1;ci<=10;ci++)ws.getCell(cr,ci).fill={type:'pattern',pattern:'solid',fgColor:{argb:'FFF8FAFC'}};
+  cr++;
+  ws.mergeCells(cr,1,cr,10);
+  var paymentAmt=deposit>0?remaining:grandTotal;
+  ws.getCell('A'+cr).value='🏦 VIB | 👤 Trần Quốc Vương | STK: 918258385 | 💰 '+fmtVND(paymentAmt)+' | 📝 '+code;
+  ws.getCell('A'+cr).font={bold:true,size:10};
+  for(var ci=1;ci<=10;ci++)ws.getCell(cr,ci).fill={type:'pattern',pattern:'solid',fgColor:{argb:'FFF8FAFC'}};
   
   // Final borders
   ws.eachRow(function(row){row.eachCell(function(cell){if(!cell.border)cell.border=WB;});});
   wb.calcProperties.fullCalcOnLoad=true;
   
   var buf=await wb.xlsx.writeBuffer();var blob=new Blob([buf],{type:'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'});var url=URL.createObjectURL(blob);var a=document.createElement('a');a.href=url;a.download=code+'.xlsx';a.style.display='none';document.body.appendChild(a);a.click();setTimeout(function(){document.body.removeChild(a);URL.revokeObjectURL(url);},60000);
-  console.log('[VAI EXPORT v6] ✅ '+code+'.xlsx');
+  console.log('[VAI EXPORT v7] ✅ '+code+'.xlsx');
 }
 
-// ===== FALLBACK HTML (khi ExcelJS lỗi) =====
-function fallbackXls(){try{var data;if(window.VAI_QR&&typeof window.VAI_QR.getData==='function')data=window.VAI_QR.getData();else if(typeof getData==='function')data=getData();if(!data||!data.qd||!data.qd.items){alert('⚠️ Không có dữ liệu');return;}
-  var qd=data.qd,cust=qd.customer||{},code=(window.VAI_QR&&typeof window.VAI_QR.getEffectiveOrderCode==='function')?window.VAI_QR.getEffectiveOrderCode():'VAS'+Date.now().toString(36).toUpperCase();
-  function fmt(n){if(!n||isNaN(n))return'0đ';return Number(n).toLocaleString('vi-VN')+'đ';}
-  var h='<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns="http://www.w3.org/TR/REC-html40"><head><meta charset="UTF-8"><!--[if gte mso 9]><xml><x:ExcelWorkbook><x:ExcelWorksheets><x:ExcelWorksheet><x:Name>BaoGia</x:Name><x:WorksheetOptions><x:DisplayGridlines/></x:WorksheetOptions></x:ExcelWorksheet></x:ExcelWorksheets></x:ExcelWorkbook></xml><![endif]--><style>td,th{border:1px solid #ccc;padding:4px;font-family:Arial;font-size:11px}th{background:#003f62;color:#fff;font-weight:700}</style></head><body><table cellpadding="3" cellspacing="0" style="border-collapse:collapse;font-family:Arial;font-size:11px;width:100%">';
-  h+='<tr><th colspan="7" style="font-size:18px;color:#db9815;text-align:center;padding:10px;background:#003f62;color:#fff">V.AI STUDIO — BẢNG BÁO GIÁ</th></tr>';h+='<tr><td colspan="2"><b>KH:</b> '+(cust.name||'')+'</td><td colspan="3"><b>Mã:</b> '+code+'</td><td colspan="2"><b>Ngày:</b> '+(cust.date||'')+'</td></tr>';h+='<tr><td colspan="7"><b>SĐT:</b> '+(cust.phone||'')+' | <b>Email:</b> '+(cust.email||'')+' | <b>ĐC:</b> '+(cust.addr||'')+'</td></tr>';h+='<tr><th>STT</th><th>Tên SP</th><th>Mã SP</th><th>SL</th><th>Đơn giá</th><th>Giá CK</th><th>Thành tiền</th></tr>';
-  var total=0;qd.items.forEach(function(it,i){var lt=(it.discPrice||it.price||0)*(it.qty||1);total+=lt;var bg=i%2===0?'#f8fafc':'#fff';var ckS=(it.discPrice&&it.price&&it.discPrice<it.price)?' style="color:#dc3545;font-weight:700"':'';h+='<tr style="background:'+bg+'"><td style="text-align:center">'+(i+1)+'</td><td style="font-weight:600">'+(it.name||'')+'</td><td style="text-align:center">'+(it.model||'')+'</td><td style="text-align:center">'+(it.qty||1)+'</td><td style="text-align:right">'+fmt(it.price||0)+'</td><td style="text-align:right"'+ckS+'>'+fmt(it.discPrice||it.price||0)+'</td><td style="text-align:right;font-weight:700">'+fmt(lt)+'</td></tr>';});(data.fees||[]).forEach(function(f){h+='<tr style="background:#fffbeb"><td colspan="6" style="color:#92400e">⊕ '+f.label+'</td><td style="text-align:right;font-weight:700;color:#92400e">'+fmt(f.amount)+'</td></tr>';});
-  var gt=data.grandTotal||total;h+='<tr style="font-weight:bold;background:#003f62;color:#fff"><td colspan="6" style="text-align:right;padding:8px;font-size:13px">TỔNG CỘNG</td><td style="text-align:right;color:#f0b840;font-size:16px;padding:8px">'+fmt(gt)+'</td></tr>';
-  if(data.deposit>0){var rem=gt-data.deposit;h+='<tr style="background:#f0fdf4"><td colspan="6" style="color:#166534">Đã cọc</td><td style="text-align:right;font-weight:700;color:#166534">'+fmt(data.deposit)+'</td></tr>';h+='<tr style="background:#fef2f2"><td colspan="6" style="color:#dc2626;font-weight:700">CÒN LẠI</td><td style="text-align:right;font-weight:900;color:#dc2626">'+fmt(rem>0?rem:0)+'</td></tr>';}
-  h+='<tr><td colspan="7" style="font-size:10px;color:#059669;font-style:italic;padding:6px;background:#f0fdf4">✅ Bảo hành 2 năm (sản phẩm) — Bảo hành hoen gỉ vĩnh viễn (rổ SUS304)</td></tr>';h+='<tr><td colspan="7" style="font-size:10px;background:#f8fafc;padding:6px">💳 VIB | Trần Quốc Vương | STK: 918258385 | Số tiền: '+fmt(data.deposit>0?gt-data.deposit:gt)+' | ND: '+code+'</td></tr></table></body></html>';
-  var blob=new Blob([h],{type:'application/vnd.ms-excel'});var url=URL.createObjectURL(blob);var a=document.createElement('a');a.href=url;a.download=code+'.xls';a.style.display='none';document.body.appendChild(a);a.click();setTimeout(function(){document.body.removeChild(a);URL.revokeObjectURL(url);},60000);console.log('[VAI EXPORT v6] ✅ Fallback '+code+'.xls');}catch(e){console.error('[VAI EXPORT v6] Fallback error:',e);alert('❌ Lỗi xuất Excel: '+(e.message||e));}}
-
-// ===== SET EXPORT =====
-setInterval(function(){
-  if(typeof ExcelJS!=='undefined'&&window.VAI_QR){
-    window.exportExcel=async function(data,qd,code,qrUrl,bw){
-      console.log('[VAI EXPORT v6] exportExcel');
-      try{
-        // Use passed data or try to get it
-        if(!data || !data.qd || !data.qd.items || !data.qd.items.length){
-          if(window.VAI_QR&&typeof window.VAI_QR.getData==='function')data=window.VAI_QR.getData();
-          else if(typeof getData==='function')data=getData();
-          if(!data||!data.qd){
-            if(typeof getQuoteData==='function'){var qd2=getQuoteData();data={qd:qd2,fees:[],notes:[],deposit:0,discountPercent:0,itemDiscounts:{},grandTotal:qd2.grandTotal||0,remaining:qd2.grandTotal||0,productTotal:qd2.grandTotal||0};}
+// ===== GET COMPLETE DATA =====
+function getExportData(){
+  var data=null;
+  if(window.VAI_QR&&typeof window.VAI_QR.getData==='function'){
+    try{data=window.VAI_QR.getData();}catch(e){console.warn('[VAI EXPORT v7] getData error:',e);}
+  }
+  if(!data||!data.qd||!data.qd.items||!data.qd.items.length){
+    if(typeof getQuoteData==='function'){
+      var qd2=getQuoteData();
+      // Parse prompt for fees/deposit/notes manually
+      var promptTxt='';
+      var inp=document.getElementById('qcAiPrompt');
+      if(inp)promptTxt=inp.value||'';
+      
+      // Simple inline parse
+      var fees=[],deposit=0,notes=[],discountPct=0;
+      if(promptTxt){
+        var lines=promptTxt.split(/[,;\n]+/);
+        lines.forEach(function(line){
+          line=(line||'').trim();if(!line)return;
+          var lo=line.toLowerCase().normalize('NFD').replace(/[\u0300-\u036f]/g,'').replace(/[đĐ]/g,'d');
+          
+          // CK
+          var ckm=lo.match(/^ck\s*([\d.,]+)\s*%/);
+          if(ckm){discountPct=parseFloat(ckm[1].replace(/\./g,'').replace(',','.'));return;}
+          // Brand CK
+          var bck=lo.match(/^(malloca|eurogold|grob|canzy|demax|hafele)\s+ck\s*([\d.,]+)\s*%/);
+          if(bck){discountPct=parseFloat(bck[2].replace(/\./g,'').replace(',','.'));return;}
+          // Ghi chú
+          if(lo.match(/^ghi chu/)){notes.push(line.replace(/^ghi chú|ghi chu[:\s]*/i,''));return;}
+          // Cọc
+          if(lo.match(/coc/)){
+            var dm=lo.match(/([\d.,]+)\s*(k|tr|trieu|m)?/);
+            if(dm){var a=parseFloat(dm[1].replace(/\./g,'').replace(',','.'));var u=(dm[2]||'').toLowerCase();if(u==='k')a*=1000;else if(u==='tr'||u==='trieu'||u==='m')a*=1000000;deposit=a;}
+            return;
+          }
+          // Phí
+          var fm=lo.match(/^(giao hang|giao|lap dat|lap|van chuyen|ship|phi)\s*([\d.,]+)\s*(k|tr)?/);
+          if(fm){
+            var a=parseFloat(fm[2].replace(/\./g,'').replace(',','.'));var u=(fm[3]||'').toLowerCase();
+            if(u==='k')a*=1000;else if(u==='tr')a*=1000000;else if(a>0&&a<500)a*=1000;
+            var labelMap={'giao hang':'Phí giao hàng','giao':'Phí giao hàng','lap dat':'Phí lắp đặt','lap':'Phí lắp đặt','van chuyen':'Phí vận chuyển','ship':'Phí vận chuyển','phi':'Phụ phí'};
+            fees.push({label:labelMap[fm[1]]||'Phụ phí',amount:a});return;
           }
-        }
-        if(!data||!data.qd||!data.qd.items||!data.qd.items.length){console.error('[VAI EXPORT v6] No data');return;}
-        var qd=data.qd,code=code||(window.VAI_QR&&typeof window.VAI_QR.getEffectiveOrderCode==='function')?window.VAI_QR.getEffectiveOrderCode():(qd.customer&&qd.customer.orderCode)||'VAS'+Date.now().toString(36).toUpperCase();
-        try{await genXl(data,qd,code);}catch(e){console.error('[VAI EXPORT v6] genXl error:',e);fallbackXls();}
-      }catch(e){console.error('[VAI EXPORT v6] Error:',e);fallbackXls();}
-    };
-    window._doExportExcel=window.exportExcel;
-    window.VAI_QR.exportExcel=window.exportExcel;
+          // Số có đơn vị fallback
+          var nm2=lo.match(/([\d.,]+)\s*(k|tr)/);
+          if(nm2){var a2=parseFloat(nm2[1].replace(/\./g,'').replace(',','.'));var u2=nm2[2].toLowerCase();if(u2==='k')a2*=1000;else if(u2==='tr')a2*=1000000;var lb=line.replace(nm2[0],'').trim();if(!lb||lb.length<2)lb='Phụ phí';fees.push({label:lb.charAt(0).toUpperCase()+lb.slice(1),amount:a2});}
+        });
+      }
+      
+      var pt=0;
+      qd2.items.forEach(function(it){
+        var dp=Number(it.discPrice||it.price||0);
+        pt+=dp*Number(it.qty||1);
+      });
+      var sc=0;fees.forEach(function(f){sc+=f.amount;});
+      var gt=pt+sc;
+      data={qd:qd2,fees:fees,notes:notes,deposit:deposit,discountPercent:discountPct,itemDiscounts:{},productTotal:pt,grandTotal:gt,remaining:Math.max(0,gt-deposit)};
+    }
   }
+  return data;
+}
+
+// ===== SET EXPORT - definitive single override =====
+function setExport(){
+  if(typeof ExcelJS==='undefined'||!window.VAI_QR)return false;
+  
+  window.exportExcel=async function(data,qd,code,qrUrl,bw){
+    console.log('[VAI EXPORT v7] exportExcel called');
+    try{
+      data=getExportData();
+      if(!data||!data.qd||!data.qd.items||!data.qd.items.length){
+        console.error('[VAI EXPORT v7] No data');
+        showToast('⚠️ Không có dữ liệu xuất Excel');
+        return;
+      }
+      code=code||(data.qd.customer&&data.qd.customer.orderCode)||'VAS'+Date.now().toString(36).toUpperCase();
+      try{await genXl(data,data.qd,code);showToast('✅ Đã xuất Excel thành công!');}
+      catch(e){console.error('[VAI EXPORT v7] genXl error:',e);showToast('���️ Lỗi xuất Excel, thử lại...');}
+    }catch(e){console.error('[VAI EXPORT v7] Error:',e);showToast('⚠️ Lỗi: '+(e.message||e));}
+  };
+  window._doExportExcel=window.exportExcel;
+  window.VAI_QR.exportExcel=window.exportExcel;
+  
+  console.log('[VAI EXPORT v7] ✅ Set as definitive export');
+  return true;
+}
+
+// Poll until ready
+var _v7Att=0;
+var _v7Timer=setInterval(function(){
+  if(setExport()||_v7Att>150)clearInterval(_v7Timer);
+  _v7Att++;
 },200);
-console.log('[VAI EXPORT v6] ✅ Loaded');})();
+
+console.log('[VAI EXPORT v7] ✅ Loaded');})();