FIX: Thêm phí giao hàng, lắp đặt, cọc vào Excel báo giá

qr-payment.js

@@ -1,195 +1,566 @@
-/**
- * V.AI STUDIO - Excel Export v1102
- * FIX: Hình ảnh 100x100px trong Excel
- */
-(function(){
-'use strict';
-
-function fmt(n){
-    if(!n||isNaN(n))return'0đ';
-    return Number(n).toLocaleString('vi-VN')+'đ';
-}
-
-function compactKey(s){
-    return (s||'').toString().normalize('NFD').replace(/[̀-ͯ]/g,'').replace(/[Đđ]/g,'d').toLowerCase().replace(/[^a-z0-9]/g,'');
-}
-
-async function fetchImageArrayBuffer(url){
-    if(!url||!url.startsWith('http')) return null;
-    try{
-        var r = await fetch(url,{mode:'cors'});
-        if(r.ok) return await r.arrayBuffer();
-    }catch(e){}
-    try{
-        var r2 = await fetch('https://api.allorigins.win/raw?url=' + encodeURIComponent(url));
-        if(r2.ok) return await r2.arrayBuffer();
-    }catch(e){}
-    return null;
-}
-
-function generateOrderCode(name){
-    var now = new Date(), dd=String(now.getDate()).padStart(2,'0'),
-        mm=String(now.getMonth()+1).padStart(2,'0'), yy=String(now.getFullYear()).slice(-2), ini='';
-    if(name && name.trim()){
-        name.trim().split(/\s+/).forEach(function(w){
-            var ch = stripDiacritics(w.charAt(0)).toUpperCase();
-            if(ch && /[A-Z]/.test(ch)) ini += ch;
-        });
-    }
-    return 'VAS'+(ini||'X')+dd+mm+yy;
-}
-
-function stripDiacritics(s){
-    return s.normalize('NFD').replace(/[̀-ͯ]/g,'');
-}
-
-function getEffectiveOrderCode(){
-    var n = document.getElementById('quoteName')?.value || '';
-    if(n && n.trim()) return generateOrderCode(n);
-    var h = window.location.hash;
-    if(h && h.length>1 && /^VAS[A-Z0-9]{3,}$/.test(h.substring(1))) 
-        return h.substring(1);
-    return generateOrderCode('');
-}
-
-function getQRUrl(amount, code){
-    return 'https://img.vietqr.io/image/vib-918258385-compact2.png?amount='+(Math.round(amount||0))+'&addInfo='+encodeURIComponent(code||'VAISTUDIO')+'&accountName='+encodeURIComponent('TRAN QUOC VUONG');
-}
-
-// MAIN EXPORT EXCEL - compatible with order-store.js call
-async function _doExportExcel(d, qd, code, qrUrl, blackWhite){
-    qd = qd || d?.qd;
-    code = code || getEffectiveOrderCode();
-    qrUrl = qrUrl || getQRUrl(d?.grandTotal || qd?.grandTotal || 0, code);
-    
-    var items = (qd?.items || window.cart || []).map(function(it, i){
-        var p = window.D && D[it.idx] ? D[it.idx] : null;
-        return {
-            stt: i+1,
-            name: it.name || (p?p.name||p.n:'') || '',
-            model: it.model || (p?p.sku||p.model:'') || '',
-            image: p?.image || it.image || it.img || '',
-            specs: it.specs || (p && p.specs ? formatSpecs(p.specs) : '') || '',
-            qty: Number(it.qty||1),
-            price: Number(it.price||it.priceNum||0),
-            discPrice: Number(it.discPrice||it.priceNum||it.price||0),
-            total: Number(it.total||(Number(it.discPrice||it.priceNum||0)*Number(it.qty||1))||0),
-            note: it.note || ''
-        };
+/* V.AI STUDIO — QR Payment / Quote Data v1043 - FIX: THÊM PHÍ GIAO HÀNG, LẮP ĐẶT, CỌC VÀO EXCEL */
+(function(){'use strict';
+
+// ===== BLOB REGISTRY =====
+window.__VAI_BLOB_REG = window.__VAI_BLOB_REG || { blobs: [], isUnloading: false };
+var blobRegistry = window.__VAI_BLOB_REG.blobs;
+
+function cleanupBlobs(){
+    window.__VAI_BLOB_REG.isUnloading = true;
+    blobRegistry.forEach(function(e) { 
+        if (!e.revoked) { try { URL.revokeObjectURL(e.url); e.revoked = true; } catch(err) {} } 
     });
+    blobRegistry = [];
+}
+window.addEventListener('pagehide', cleanupBlobs);
+window.addEventListener('beforeunload', cleanupBlobs);
+
+function dlBlob(blob, filename) {
+    var url = URL.createObjectURL(blob);
+    blobRegistry.push({ url: url, revoked: false });
+    var a = document.createElement('a');
+    a.href = url;
+    a.download = filename;
+    a.style.cssText = 'position:absolute;left:-9999px';
+    document.body.appendChild(a);
+    a.click();
+    setTimeout(function() { try { document.body.removeChild(a); } catch(err) {} }, 100);
+}
+
+var BANK_ID='vib',BANK_ACCOUNT='918258385',BANK_NAME='TRAN QUOC VUONG';
+function stripDiacritics(s){return s.normalize('NFD').replace(/[\u0300-\u036f]/g,'').replace(/[Đđ]/g,'D');}
+function generateOrderCode(name){var now=new Date(),dd=String(now.getDate()).padStart(2,'0'),mm=String(now.getMonth()+1).padStart(2,'0'),yy=String(now.getFullYear()).slice(-2),ini='';if(name&&name.trim()){name.trim().split(/\s+/).forEach(function(w){if(w){var ch=stripDiacritics(w.charAt(0)).toUpperCase();if(/[A-Z]/.test(ch))ini+=ch;}});}return 'VAS'+(ini||'X')+dd+mm+yy;}
+function getCustomerName(){var sels=['#quoteName','#quoteCustomerName','#checkoutName','.quote-field input:first-of-type'];for(var i=0;i<sels.length;i++){var el=document.querySelector(sels[i]);if(el&&el.value&&el.value.trim().length>1)return el.value.trim();}return '';}
+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 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;}
+function parseItemDiscountLine(line,map){var lo=stripDiacritics(String(line||'')).toLowerCase();var re1=/\b([a-z]{1,8}[a-z0-9._\-\/]{1,30}\d[a-z0-9._\-\/]*)\\b\s*(?:[:=\-]|\s+)?\s*(?:ck|chiet\s*khau|giam|discount)\s*([\d.,]+)\s*%?/gi;var re2=/(?:ck|chiet\s*khau|giam|discount)\s*\\b([a-z]{1,8}[a-z0-9._\-\/]{1,30}\d[a-z0-9._\-\/]*)\\b\\s*([\d.,]+)\s*%?/gi;var m;while((m=re1.exec(lo))!==null){var v=parseFloat(m[2].replace(/\\./g,'').replace(',','.'));if(v>0&&v<=100)map[compactKey(m[1])]=v;}while((m=re2.exec(lo))!==null){var v2=parseFloat(m[2].replace(/\\./g,'').replace(',','.'));if(v2>0&&v<=100)map[compactKey(m[1])]=v2;}}
+
+function applyPromptDiscounts(qd,parsed){if(!qd||!qd.items)return qd;var productTotal=0;var itemDiscounts=(parsed&&parsed.itemDiscounts)||{};var globalPct=Number((parsed&&parsed.discountPercent)||0);qd.items.forEach(function(it){var base=Number(it.price||0),qty=Number(it.qty||1);var pct=matchItemDiscount(it,itemDiscounts);if(pct>0){it.discPrice=Math.round(base*(1-pct/100));it.discountPercent=pct;}else if(globalPct>0&&globalPct<=100){it.discPrice=Math.round(base*(1-globalPct/100));it.discountPercent=globalPct;}else if(!it.discPrice){it.discPrice=base;}it.total=Number(it.discPrice||base)*qty;productTotal+=Number(it.total||0);});qd.grandTotal=productTotal;return qd;}
+
+function parsePrompt(text){
+    var fees=[],notes=[],discount=null,deposit=0,discountPercent=0,itemDiscounts={};
+    if(!text)return{fees:fees,notes:notes,discount:discount,deposit:deposit,discountPercent:discountPercent,itemDiscounts:itemDiscounts};
     
-    if(!items.length){
-        alert('❌ Giỏ trống!');
-        return;
-    }
-    
-    try{
-        var wb = new ExcelJS.Workbook(), ws = wb.addWorksheet('Báo giá');
-        
-        ws.columns = [
-            {width:6},{width:15},{width:30},{width:15},
-            {width:22},{width:8},{width:15},{width:15},{width:18},{width:16}
-        ];
+    text.split(/[,;\n]+/).forEach(function(line){
+        line=line.trim();if(!line)return;
+        parseItemDiscountLine(line,itemDiscounts);
         
-        // Header
-        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.getRow(3).height = 30;
-        
-        var headerRow = ws.getRow(10);
-        ['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 = headerRow.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'};
-        });
-        headerRow.height = 20;
+        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;
         
-        // Items with 100x100px images
-        var startRow = 11;
-        await Promise.all(items.map(async function(it, i){
-            var row = ws.getRow(startRow + i);
-            row.height = 120; // 100px + padding
-            
-            var bgColor = i % 2 === 0 ? 'FFF8FAFC' : 'FFFFFFFF';
-            
-            row.getCell(1).value = it.stt;
-            row.getCell(1).alignment = {horizontal:'center', vertical:'middle'};
-            
-            // IMAGE 100x100px with CORS fallback
-            if(it.image && it.image.startsWith('http')){
-                var imgBuf = await fetchImageArrayBuffer(it.image);
-                if(imgBuf){
-                    try{
-                        wb.addImage(wb.addImage({buffer:imgBuf, extension:'png'}), 
-                            {tl:{col:1, row:startRow + i - 1}, ext:{width:100, height:100}});
-                    }catch(e){}
-                }
+        // CK
+        if(line.match(/^(ck|chiết khấu|chiet khau|giảm|giam|discount)/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;
             }
-            
-            row.getCell(3).value = it.name; row.getCell(3).font = {bold:true, size:9};
-            row.getCell(4).value = it.model;
-            row.getCell(5).value = it.specs;
-            row.getCell(6).value = it.qty;
-            row.getCell(7).value = it.price; row.getCell(7).numFmt = '#,##0"đ"';
-            row.getCell(8).value = it.discPrice; row.getCell(8).numFmt = '#,##0"đ"';
-            row.getCell(9).value = it.total; row.getCell(9).numFmt = '#,##0"đ"';
-            row.getCell(10).value = it.note;
-            
-            for(var ci=1; ci<=10; ci++){
-                row.getCell(ci).fill = {type:'pattern', pattern:'solid', fgColor:{argb:bgColor}};
-            }
-        }));
-        
-        var lastRow = startRow + items.length - 1;
-        // Total row
-        ws.getCell('A'+(lastRow+2)).value = 'TỔNG CỘNG';
-        ws.getCell('A'+(lastRow+2)).font = {bold:true, size:13, color:{argb:'FFFFFFFF'}};
-        ws.getCell('A'+(lastRow+2)).fill = {type:'pattern', pattern:'solid', fgColor:{argb:'FF003F62'}};
-        ws.getCell('G'+(lastRow+2)).value = {formula:'SUM(G'+startRow+':G'+lastRow+')'};
-        ws.getCell('G'+(lastRow+2)).numFmt = '#,##0"đ"';
-        ws.getCell('G'+(lastRow+2)).font = {bold:true, size:14, color:{argb:'FFF0B840'}};
+            return;
+        }
         
-        wb.calcProperties.fullCalcOnLoad = true;
-        var buf = await wb.xlsx.writeBuffer();
-        var blob = new Blob([buf], {type:'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'});
-        var dlUrl = URL.createObjectURL(blob);
-        var a = document.createElement('a');
-        a.href = dlUrl;
-        a.download = code + '.xlsx';
-        document.body.appendChild(a);
-        a.click();
-        setTimeout(function(){ document.body.removeChild(a); URL.revokeObjectURL(dlUrl); }, 30000);
+        // Cọc
+        if(line.match(/cọc|coc|deposit/i)){
+            var dm=line.match(/([\d.,]+)\\s*(k|K|nghìn|nghin|triệu|tr|đ|d|vnd)?/);
+            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'||du==='m')da*=1000000;
+                deposit=da;
+            }
+            return;
+        }
         
-        console.log('[VAI v1102] ✅ Excel export completed with 100x100px images');
+        // 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)?/);
+        if(feeMatch){
+            var amt=parseFloat(feeMatch[1].replace(/\\./g,'').replace(',','.'));
+            var u=(feeMatch[2]||'').toLowerCase();
+            if(u==='k'||u==='nghìn'||u==='nghin')amt*=1000;
+            if(u==='triệu'||u==='tr'||u==='m')amt*=1000000;
+            if(amt>0){
+                var lb=line.replace(feeMatch[0],'').trim();
+                // Xác định loại phí
+                var lo=line.toLowerCase().normalize('NFD').replace(/[̀-ͯ]/g,'').replace(/[đĐ]/g,'d');
+                if(lo.match(/giao|ship|phi giao|phí giao/))lb='Phí giao hàng';
+                else if(lo.match(/lap|install|phi lap|phí lắp/))lb='Phí lắp đặt';
+                else if(lo.match(/bốc|boc|xep|phi bot/))lb='Phí bốc xếp';
+                else if(!lb||lb.length<2)lb='Phụ phí';
+                fees.push({label:lb,amount:amt});
+            }
+            return;
+        }
         
-    }catch(e){
-        console.error('[VAI v1102] Lỗi export Excel:', e);
-        alert('❌ Lỗi: ' + (e.message || e));
+        notes.push(line);
+    });
+    return{fees:fees,notes:notes,discount:discount,deposit:deposit,discountPercent:discountPercent,itemDiscounts:itemDiscounts};
+}
+
+var _lastPromptText='';
+function getPromptText(){
+    var direct=document.getElementById('qcAiPrompt');
+    if(direct){
+        var dv=(direct.value||'').trim();
+        if(dv&&dv.toUpperCase().replace(/[\s.]/g,'')!=='VAISTUDIO'){
+            _lastPromptText=dv;
+            return dv;
+        }
     }
+    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')){
+            var val=(inputs[j].value||'').trim();
+            if(!val||val.toUpperCase().replace(/[\s.]/g,'')==='VAISTUDIO')continue;
+            _lastPromptText=val;
+            return val;
+        }
+    }
+    return _lastPromptText;
+}
+
+function getData(){
+    var qd=window._origGetQuoteData?window._origGetQuoteData():getQuoteData();
+    var parsed=parsePrompt(getPromptText());
+    qd=applyPromptDiscounts(qd,parsed);
+    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};
+}
+
+function orderToVAIData(order){
+    return{
+        qd:{
+            customer:{name:order.customer||'',phone:order.phone||'',email:order.email||'',addr:order.addr||'',date:order.date||''},
+            items:(order.items||[]).map(function(it,i){
+                return{
+                    stt:i+1,
+                    image:it.image||'',
+                    name:it.name||'',
+                    model:it.model||'',
+                    specs:it.specs||it.info||'',
+                    qty:it.qty||1,
+                    price:it.price||it.listPrice||it.discPrice||0,
+                    discPrice:it.discPrice||it.price||0,
+                    total:it.total||0,
+                    note:it.note||''
+                };
+            }),
+            grandTotal:order.grandTotal||0
+        },
+        fees:order.fees||[],
+        deposit:order.deposit||0,
+        remaining:order.remaining||0
+    };
 }
 
-function formatSpecs(specs){
-    if(!specs) return '';
-    if(typeof specs === 'string') return specs.slice(0,100);
-    if(typeof specs === 'object'){
-        var parts = [];
-        Object.entries(specs).forEach(function(e){
-            if(e[1] != null) parts.push(e[0] + ': ' + e[1]);
+function setExportButtonState(btn,exporting){
+    if(!btn)return;
+    if(exporting){
+        btn.disabled=true;
+        btn.dataset.vaiExporting='1';
+        btn.dataset.vaiOrigText=btn.innerHTML;
+        btn.innerHTML='<span style="opacity:0.7">⏳</span>';
+    }else{
+        btn.disabled=false;
+        btn.dataset.vaiExporting='0';
+        if(btn.dataset.vaiOrigText)btn.innerHTML=btn.dataset.vaiOrigText;
+    }
+}
+
+function injectToModal(){
+    var modal=document.querySelector('.quote-overlay.open,.quote-modal.open,.quote-overlay[style*="block"],.quote-modal[style*="block"],[class*="quote"][class*="open"],[class*="quote"][style*="block"]');
+    if(!modal)return;
+    var old=modal.querySelector('.vai-extra-section');
+    old&&old.remove();
+    var parsed=parsePrompt(getPromptText());
+    if(!parsed.fees.length&&!parsed.deposit)return;
+    var surcharge=0;
+    parsed.fees.forEach(function(f){surcharge+=f.amount;});
+    var qd=window._origGetQuoteData?window._origGetQuoteData():(typeof getQuoteData==='function'?getQuoteData():{grandTotal:0});
+    var grandTotal=(qd.grandTotal||0)+surcharge;
+    var sec=document.createElement('div');
+    sec.className='vai-extra-section';
+    sec.style.cssText='margin:10px 0;padding:0 16px;font-size:13px';
+    var html='';
+    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>';
+    }
+    html+='<div style="padding:8px 12px;background:#003f62;border-radius:6px;display:flex;justify-content:space-between;align-items:center"><span style="color:#fff;font-weight:800">TỔNG CỘNG</span><span style="color:#f0b840;font-weight:900;font-size:16px">'+fmt(grandTotal)+'</span></div>';
+    sec.innerHTML=html;
+    var actions=modal.querySelector('.quote-actions,[class*="actions"],[class*="button"]');
+    if(actions&&actions.parentNode)actions.parentNode.insertBefore(sec,actions);
+    else modal.appendChild(sec);
+}
+
+async function toCanvas(html,w){
+    var div=document.createElement('div');
+    div.style.cssText='position:absolute;left:-10000px;top:0;width:'+(w||1000)+'px;background:#fff;padding:28px;font-family:Inter,Arial,DejaVu Sans,sans-serif;z-index:-1;box-sizing:border-box';
+    div.innerHTML=html;
+    document.body.appendChild(div);
+    try{if(document.fonts&&document.fonts.ready)await document.fonts.ready;}catch(e){}
+    var imgs=Array.from(div.querySelectorAll('img'));
+    await Promise.all(imgs.map(function(img){
+        return new Promise(function(res){
+            if(img.complete)return res();
+            img.onload=img.onerror=function(){res();};
+            setTimeout(res,2500);
         });
-        return parts.join('; ').slice(0,100);
+    }));
+    await new Promise(function(r){setTimeout(r,500);});
+    var h=Math.max(div.scrollHeight,div.offsetHeight);
+    var cv=await html2canvas(div,{scale:2,useCORS:true,allowTaint:false,backgroundColor:'#fff',width:w||1000,height:h,windowWidth:w||1000,windowHeight:h,scrollX:0,scrollY:0});
+    div.remove();
+    return cv;
+}
+
+function buildQuoteHTML(d,code,qrUrl){
+    var qd=d.qd;
+    var rows=qd.items.map(function(it){
+        return '<tr style="border-bottom:1px solid #e2e8f0">'
+            +'<td style="padding:6px 4px;text-align:center;font-size:11px">'+(it.stt||'')+'</td>'
+            +'<td style="padding:6px 4px"><img src="'+(it.image||'')+'" style="width:50px;height:50px;object-fit:contain;border-radius:4px" onerror="this.style.display=\'none\'"></td>'
+            +'<td style="padding:6px 4px;font-size:11px;font-weight:600">'+(it.name||'')+'</td>'
+            +'<td style="padding:6px 4px;text-align:center;font-size:10px">'+(it.model||'')+'</td>'
+            +'<td style="padding:6px 4px;font-size:9px;color:#64748b">'+(it.specs||'')+'</td>'
+            +'<td style="padding:6px 4px;text-align:center">'+(it.qty||'')+'</td>'
+            +'<td style="padding:6px 4px;text-align:right;font-size:11px">'+(it.price?fmt(it.price):'')+'</td>'
+            +'<td style="padding:6px 4px;text-align:right;font-size:11px">'+(it.discPrice?fmt(it.discPrice):'')+'</td>'
+            +'<td style="padding:6px 4px;text-align:right;font-size:11px;font-weight:700">'+(it.total?fmt(it.total):'')+'</td>'
+            +'<td style="padding:6px 4px;font-size:9px">'+(it.note||'')+'</td>'
+            +'</tr>';
+    }).join('');
+    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>';
+        });
+    }
+    return '<div style="display:flex;align-items:center;gap:10px">'
+        +'<img src="https://huggingface.co/spaces/bep40/V.AISTUDIO/resolve/main/logo/logo_200.png" style="width:40px">'
+        +'</div>'
+        +'<div style="text-align:center;margin-bottom:12px">'
+        +'<div style="font-size:20px;font-weight:900;color:#db9815">BẢNG BÁO GIÁ</div>'
+        +'</div>'
+        +'<div style="display:flex;justify-content:space-between;margin-bottom:12px;font-size:11px">'
+        +'<div><b>Khách hàng:</b> '+(qd.customer.name||'')+'<br><b>SĐT:</b> '+(qd.customer.phone||'')+'</div>'
+        +'<div><b>Mã đơn:</b> '+code+'<br><b>Ngày:</b> '+(qd.customer.date||'')+'</div>'
+        +'</div>'
+        +'<table style="width:100%;border-collapse:collapse">'
+        +'<thead><tr style="background:#003f62;color:#fff">'
+        +'<th>STT</th><th>Hình</th><th>Tên SP</th><th>Mã</th><th>Thông tin</th><th>SL</th><th>Đơn giá</th><th>Giá CK</th><th>Thành tiền</th><th>Ghi chú</th>'
+        +'</tr></thead>'
+        +'<tbody>'+rows+feeRows+'</tbody>'
+        +'</table>'
+        +'<div style="padding:10px 14px;background:#003f62">'
+        +'<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>':'');
+}
+
+function buildDeliveryHTML(qd,code){
+    var rows=(qd.items||[]).map(function(it,i){
+        return '<tr style="border-bottom:1px solid #e2e8f0">'
+            +'<td style="padding:8px 4px;text-align:center;font-size:12px">'+(it.stt||(i+1))+'</td>'
+            +'<td style="padding:8px 4px;font-weight:600;font-size:12px">'+(it.name||'')+'</td>'
+            +'<td style="padding:8px 4px;text-align:center;font-size:11px">'+(it.model||'')+'</td>'
+            +'<td style="padding:8px 4px;text-align:center;font-weight:700;font-size:13px">'+(it.qty||1)+'</td>'
+            +'<td style="padding:8px 4px;font-size:11px">'+(it.note||'')+'</td>'
+            +'</tr>';
+    }).join('');
+    return '<div style="text-align:center;margin-bottom:14px">'
+        +'<div style="font-size:20px;font-weight:900;color:#003f62">PHIẾU GIAO HÀNG</div>'
+        +'</div>'
+        +'<div style="margin-bottom:12px;font-size:11px;line-height:1.6">'
+        +'<b>Khách hàng:</b> '+(qd.customer?qd.customer.name:'')+' | <b>SĐT:</b> '+(qd.customer?qd.customer.phone:'')+'<br>'
+        +'<b>Địa chỉ:</b> '+(qd.customer?qd.customer.addr||'':'')+'<br>'
+        +'<b>Mã đơn:</b> '+code+' | <b>Ngày:</b> '+(qd.customer?qd.customer.date||'':'')+'</div>'
+        +'<table style="width:100%;border-collapse:collapse;font-size:12px">'
+        +'<thead><tr style="background:#003f62;color:#fff">'
+        +'<th style="padding:8px 4px;width:35px">STT</th>'
+        +'<th style="padding:8px 4px;text-align:left">Tên sản phẩm</th>'
+        +'<th style="padding:8px 4px;width:90px">Mã SP</th>'
+        +'<th style="padding:8px 4px;width:40px">SL</th>'
+        +'<th style="padding:8px 4px;text-align:left;width:120px">Ghi chú</th>'
+        +'</tr></thead>'
+        +'<tbody>'+rows+'</tbody></table>'
+        +'<div style="margin-top:60px;display:flex;justify-content:space-around;font-size:12px">'
+        +'<div style="text-align:center"><b>Bên giao</b><br>(Ký, họ tên)<div style="margin-top:30px">_______________</div></div>'
+        +'<div style="text-align:center"><b>Bên nhận</b><br>(Ký, họ tên)<div style="margin-top:30px">_______________</div></div>'
+        +'</div>';
+}
+
+async function doOverride(){
+    if(typeof getQuoteData!=='function'||typeof html2canvas!=='function')return false;
+    window._origGetQuoteData=getQuoteData;
+    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.exportDeliveryExcel=async function(order,opt){
+        if(typeof ExcelJS==='undefined')return;
+        var qd=order&&order.items?orderToVAIData(order).qd:window._origGetQuoteData();
+        var code=order&&order.code?order.code:getEffectiveOrderCode();
+        var activeBtn=document.activeElement;
+        if(activeBtn&&activeBtn.dataset.vaiExporting==='1')return;
+        if(activeBtn)setExportButtonState(activeBtn,true);
+        try{await _doExportDeliveryExcel(qd,code);}finally{if(activeBtn)setExportButtonState(activeBtn,false);}
+    };
+    window.exportDeliveryPDF=async function(order,opt){
+        var qd=order&&order.items?orderToVAIData(order).qd:window._origGetQuoteData();
+        var code=order&&order.code?order.code:getEffectiveOrderCode();
+        var activeBtn=document.activeElement;
+        if(activeBtn&&activeBtn.dataset.vaiExporting==='1')return;
+        if(activeBtn)setExportButtonState(activeBtn,true);
+        try{await _doExportDeliveryPDF(qd,code);}finally{if(activeBtn)setExportButtonState(activeBtn,false);}
+    };
+    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.getQuoteData=function(){
+        var qd=window._origGetQuoteData.apply(this,arguments);
+        if(qd.customer)qd.customer.orderCode=getEffectiveOrderCode();
+        return qd;
+    };
+    console.log('✅ QR Payment v1043 — FIX: PHÍ GIAO HÀNG, LẮP ĐẶT ĐƯỢC THÊM VÀO EXCEL');
+    return true;
+}
+
+async function _doExportPDF(d,code){
+    var qr=getQRUrl(d.deposit>0?d.remaining:d.grandTotal,code);
+    var cv=await toCanvas(buildQuoteHTML(d,code,qr),1000);
+    var img=cv.toDataURL('image/jpeg',0.92);
+    var pageW=595,pageH=842,imgW=pageW,imgH=cv.height*imgW/cv.width;
+    var pdf=new jspdf.jsPDF({orientation:'p',unit:'pt',format:'a4'});
+    if(imgH<=pageH){pdf.addImage(img,'JPEG',0,0,imgW,imgH);}
+    else{
+        var y=0,rem=imgH,page=0;
+        while(rem>0){
+            if(page>0)pdf.addPage();
+            pdf.addImage(img,'JPEG',0,-y,imgW,imgH);
+            y+=pageH;
+            rem-=pageH;
+            page++;
+        }
+    }
+    pdf.save(code+'.pdf');
+}
+
+async function _doExportDeliveryPDF(qd,code){
+    var cv=await toCanvas(buildDeliveryHTML({qd:qd},code),700);
+    var img=cv.toDataURL('image/png');
+    var pdf=new jspdf.jsPDF({orientation:'p',unit:'pt',format:'a4'});
+    var margin=25,usableW=595-margin*2,ratio=cv.height/cv.width,imgH=usableW*ratio;
+    if(imgH>842-margin*2){imgH=842-margin*2;usableW=imgH/ratio;}
+    pdf.addImage(img,'PNG',margin,margin,usableW,imgH);
+    pdf.save('GH-'+code+'.xlsx');
+}
+
+// ===== EXPORT EXCEL - FIX BAO GỒM PHÍ =====
+async function _doExportExcel(d,qd,code,qrUrl){
+    var MONEY_FMT='#,##0"đ"';
+    var NUM_FMT='#,##0';
+    
+    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}];
+    
+    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.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:'';
+    
+    var hr=ws.getRow(10);
+    ['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;
+        c.font={bold:true,color:{argb:'FFFFFFFF'}};
+        c.fill={type:'pattern',pattern:'solid',fgColor:{argb:'FF003F62'};
+    });
+    
+    var cr=11,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);
+        row.height=50;
+        row.getCell(1).value=it.stt||i+1;
+        row.getCell(3).value=it.name||'';
+        row.getCell(3).font={bold:true,size:9};
+        row.getCell(4).value=it.model||'';
+        row.getCell(5).value=it.specs||'';
+        row.getCell(5).font={size:8,color:{argb:'FF64748B'};};
+        row.getCell(6).value=Number(it.qty||1);
+        row.getCell(6).numFmt=NUM_FMT;
+        row.getCell(7).value=Number(it.price||0);
+        row.getCell(7).numFmt=MONEY_FMT;
+        row.getCell(8).value=Number(it.discPrice||it.price||0);
+        row.getCell(8).numFmt=MONEY_FMT;
+        if((it.discPrice||0)&&(it.price||0)&&it.discPrice<it.price)row.getCell(8).font={bold:true,color:{argb:'FFDC3545'};};
+        row.getCell(9).value=Number(it.total||0);
+        row.getCell(9).numFmt=MONEY_FMT;
+        row.getCell(9).font={bold:true};
+        cr++;
+    }
+    
+    // FIX: THÊM CÁC DÒNG PHÍ (giao hàng, lắp đặt...)
+    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).font={bold:true};
+        feeRow.getCell(9).value=fees[f].amount;
+        feeRow.getCell(9).numFmt=MONEY_FMT;
+        feeRow.getCell(9).font={bold:true};
+        cr++;
     }
-    return '';
+    
+    // Tổng cộng
+    ws.getRow(cr).height=28;
+    ws.mergeCells(cr,1,cr,8);
+    ws.getCell('A'+cr).value='TỔNG CỘNG';
+    ws.getCell('A'+cr).font={bold:true,size:13,color:{argb:'FFFFFFFF'};};
+    ws.getCell('A'+cr).fill={type:'pattern',pattern:'solid',fgColor:{argb:'FF003F62'};};
+    
+    var totalFormula = 'SUM(I'+firstItemRow+':I'+(feeStartRow-1)+')';
+    if(fees.length > 0){
+        totalFormula += '+SUM(I'+feeStartRow+':I'+(cr-1)+')';
+    }
+    ws.getCell('I'+cr).value={formula:totalFormula,result:Number(d.grandTotal||0)};
+    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ó
+    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};
+    }
+    
+    wb.calcProperties.fullCalcOnLoad=true;
+    var buf=await wb.xlsx.writeBuffer();
+    var blob=new Blob([buf],{type:'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'});
+    dlBlob(blob,code+'.xlsx');
 }
 
-// Register to VAI_QR
-if(!window.VAI_QR) window.VAI_QR = {};
-window.VAI_QR.exportExcel = _doExportExcel;
-window.VAI_QR.exportDeliveryExcel = function(qd, code){ /* not implemented for now */ };
-window.VAI_QR.getEffectiveOrderCode = getEffectiveOrderCode;
-window.VAI_QR.getQRUrl = getQRUrl;
-window.VAI_QR.fmt = fmt;
+async function _doExportDeliveryExcel(qd,code){
+    var wb=new ExcelJS.Workbook(),ws=wb.addWorksheet('Giao hàng');
+    ws.views=[{showGridLines:false}];
+    ws.columns=[{width:5},{width:34},{width:14},{width:8},{width:20}];
+    
+    ws.mergeCells('A1:E1');
+    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('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||'':'');
+    
+    var hr=ws.getRow(6);
+    ['STT','Tên sản phẩm','Mã SP','SL','Ghi chú'].forEach(function(h,i){
+        var c=hr.getCell(i+1);
+        c.value=h;
+        c.font={bold:true,color:{argb:'FFFFFFFF'}};
+        c.fill={type:'pattern',pattern:'solid',fgColor:{argb:'FF003F62'};
+    });
+    
+    var cr=7,items=qd.items||[],totalQty=0;
+    for(var i=0;i<items.length;i++){
+        var it=items[i],row=ws.getRow(cr);
+        row.height=20;
+        row.getCell(1).value=it.stt||i+1;
+        row.getCell(2).value=it.name||'';
+        row.getCell(3).value=it.model||'';
+        row.getCell(4).value=it.qty||1;
+        row.getCell(5).value=it.note||'';
+        totalQty+=Number(it.qty||1);
+        cr++;
+    }
+    
+    var totalQtyRow=cr;
+    ws.mergeCells(totalQtyRow,1,totalQtyRow,3);
+    ws.getCell('A'+totalQtyRow).value='TỔNG CỘNG SỐ LƯỢNG';
+    ws.getCell('D'+totalQtyRow).value=totalQty;
+    
+    var buf=await wb.xlsx.writeBuffer();
+    var blob=new Blob([buf],{type:'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'});
+    dlBlob(blob,'GH-'+code+'.xlsx');
+}
+
+var att=0,t=setInterval(function(){if(doOverride()||att>120)clearInterval(t);att++;},500);
+
+document.addEventListener('click',function(e){
+    var btn=e.target.closest&&e.target.closest('button,a');
+    if(!btn)return;
+    var txt=(btn.textContent||'').toLowerCase();
+    if(!window._origGetQuoteData)return;
+    if(txt.includes('excel')&&txt.includes('xuất')){
+        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'))){
+        e.preventDefault();e.stopPropagation();
+        if(btn.dataset.vaiExporting==='1')return;
+        setExportButtonState(btn,true);
+        window.exportPDF().finally(function(){setExportButtonState(btn,false);});
+        return false;
+    }
+},true);
 
-console.log('[VAI v1102] Script loaded - Excel with 100px images ready');
+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,
+    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');
+})();