Fix export buttons responsive feedback + image rendering: route all PDF/image/Excel images through /api/img CORS proxy (fixes blank ảnh báo giá/PDF), add busy spinners, filename-specific download toasts, popup-blocker fallbacks

index.html

@@ -330,10 +330,9 @@
           </div>
           <div class="quote-actions">
             <button class="quote-btn" onclick="shareQuoteImage()" style="background:#25D366"><i class="fas fa-share-alt"></i> Chia sẻ ảnh</button>
-            <button class="quote-btn" onclick="shareQuoteLink()" style="background:#0068FF"><i class="fas fa-share-alt"></i> Chia sẻ báo giá</button>
+            <button class="quote-btn" onclick="shareQuoteLink()" style="background:#0068FF"><i class="fas fa-copy"></i> Sao chép báo giá</button>
             <button class="quote-btn quote-btn-excel" onclick="exportQuoteExcel()"><i class="fas fa-file-excel"></i> Xuất Excel</button>
             <button class="quote-btn quote-btn-pdf" onclick="exportQuotePDF()"><i class="fas fa-file-pdf"></i> Xuất PDF</button>
-            <label class="quote-btn" style="background:#fff;color:#111;border:1px solid #111"><input id="vai-bw-export" type="checkbox" style="width:16px;height:16px;margin-right:6px"> Trắng đen</label>
             <button class="quote-btn quote-btn-print" onclick="printQuotation()"><i class="fas fa-print"></i> In báo giá</button>
             <button class="quote-btn" onclick="saveOrder()" style="background:#7c3aed"><i class="fas fa-save"></i> Lưu</button>
           </div>
@@ -836,10 +835,10 @@
     <script defer src="./src/modal-top.js?gc=2"></script>
     <!-- App modules: defer keeps execution order (parse order) but doesn't block
          first paint — the welcome/avatar-picker modal renders immediately. -->
-    <script defer src="./src/cart-quote.js?gc=36"></script>    <!-- Cart + Quote module (Giỏ hàng / Báo giá) -->
+    <script defer src="./src/cart-quote.js?gc=37"></script>    <!-- Cart + Quote module (Giỏ hàng / Báo giá) -->
     <script defer src="./src/customers.js?gc=19"></script>    <!-- Customer list (Danh sách khách hàng) -->
 <script defer src="./src/vaix-rag.js?gc=66"></script>    <!-- V.AI STUDIO RAG Module - loads FASTER via light index; lazy galleries; spec-aware search -->
-	    <script defer src="./src/greeting-news.js?gc=41"></script>  <!-- Greeting HOT news cards + source links -->
+	    <script defer src="./src/greeting-news.js?gc=42"></script>  <!-- Greeting HOT news cards + source links -->
 	    <script defer src="./src/order-sync.js?gc=17"></script>    <!-- Order sync with V.AISTUDIO backend -->
 	    <script type="module" src="./src/app.js?gc=61"></script>
 	    <script defer src="./src/greeting-source-cards.js?gc=15"></script> <!-- FIX: Nguồn tin cards under greeting -->

src/cart-quote.js

@@ -977,6 +977,7 @@ window.openOrderPage = function() { openOrderModal(); };
 window.shareQuoteLink = function() {
   var cart = loadCart();
   if (!cart.length) { toast('Giỏ hàng trống!'); return; }
+  var btn = (event && event.target && event.target.closest) ? event.target.closest('button[onclick*="shareQuoteLink"], [onclick*="shareQuoteLink"]') : null;
   var lines = ['📋 BÁO GIÁ V.AI STUDIO', '----------------------------------'];
   cart.forEach(function(c, i) {
     var discInput = document.querySelector('.qt-disc[data-idx="' + i + '"]');
@@ -995,8 +996,8 @@ window.shareQuoteLink = function() {
   var customer = (document.getElementById('qcName') || {}).value || '';
   if (customer) lines.push('Khách hàng: ' + customer);
   var text = lines.join('\n');
-  if (navigator.share) { navigator.share({ title: 'Báo giá', text: text }).catch(function() {}); }
-  else { navigator.clipboard.writeText(text).then(function() { toast('✅ Đã sao chép báo giá'); }).catch(function() { prompt('Sao chép báo giá:', text); }); }
+  if (navigator.share && navigator.share) { navigator.share({ title: 'Báo giá', text: text }).then(function(){ toast('✅ Đã chia sẻ báo giá!'); }).catch(function(){ /* user cancelled */ }); }
+  else { navigator.clipboard.writeText(text).then(function() { toast('✅ Đã sao chép báo giá vào bộ nhớ tạm — dán (Ctrl+V) vào Zalo/Email!'); }).catch(function() { prompt('Sao chép báo giá:', text); }); }
 };
 
 // ── Excel export (ExcelJS) with branded V.AISTUDIO layout ──
@@ -1009,11 +1010,90 @@ window.shareQuoteLink = function() {
  */
 var BANK_ID = 'vib', BANK_ACCOUNT = '918258385', BANK_NAME = 'TRAN QUOC VUONG', BANK_NAME_VN = 'Trần Quốc Vương';
 function __qGetQRUrl(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); }
+
+// ── Shared export helpers (image proxy + button feedback + download) ──
+// Route every external <img> through the Space's OWN /api/img proxy so
+// html2canvas NEVER taints the canvas. CDN images (bossvn/dktcdn/... ) often
+// lack CORS headers — with useCORS:true they used to taint the canvas and
+// canvas.toDataURL() then threw SecurityError, which is why the PDF/ảnh báo giá
+// exports rendered blank images or failed. Same-origin proxy = always clean.
+window.__qRenderSrc = function(url, absolute) {
+  if (!url) return url;
+  if (/^data:/i.test(url)) return url;
+  if (/^https?:\/\//i.test(url)) {
+    try {
+      var p = '/api/img?url=' + encodeURIComponent(url);
+      if (absolute && location.origin) p = location.origin + p;
+      return p;
+    } catch (e) {}
+  }
+  return url;
+};
+// Rewrite all <img> in a render div to proxied URLs + wait for every image and
+// fonts to finish, so html2canvas captures a COMPLETE layout (no blank spots).
+window.__qPreloadRender = function(div, timeoutMs) {
+  var imgs = Array.prototype.slice.call((div || document).querySelectorAll('img'));
+  var waits = imgs.map(function (img) {
+    var src = img.getAttribute('src') || '';
+    var proxy = window.__qRenderSrc(src);
+    if (proxy !== src) img.setAttribute('src', proxy);
+    if (img.complete && img.naturalWidth > 0) return Promise.resolve();
+    return new Promise(function (res) {
+      var done = false;
+      var fin = function () { if (!done) { done = true; res(); } };
+      img.addEventListener('load', fin);
+      img.addEventListener('error', fin);
+      setTimeout(fin, timeoutMs || 8000);
+    });
+  });
+  var fontWait = (document.fonts && document.fonts.ready) ? document.fonts.ready : Promise.resolve();
+  return Promise.all([fontWait].concat(waits));
+};
+// Toggle a busy state on an export button (spinner + label + disabled) so the
+// user SEES the click registered while the file is being generated.
+window.__qBtnBusy = function(btn, busy, label) {
+  if (!btn || !btn.style) return;
+  if (!document.getElementById('vai-spin-kf')) {
+    var st = document.createElement('style');
+    st.id = 'vai-spin-kf';
+    st.textContent = '@keyframes vaiSpin{to{transform:rotate(360deg)}}';
+    document.head.appendChild(st);
+  }
+  if (busy) {
+    if (btn._vaiBusy) return;
+    btn._vaiBusy = true;
+    btn._vaiOldHtml = btn.innerHTML;
+    btn._vaiOldDisabled = btn.disabled;
+    btn.disabled = true;
+    btn.style.opacity = '.65';
+    btn.style.cursor = 'wait';
+    btn.innerHTML = '<span style="display:inline-block;width:12px;height:12px;border:2px solid rgba(255,255,255,.45);border-top-color:#fff;border-radius:50%;animation:vaiSpin .7s linear infinite;margin-right:6px;vertical-align:-2px"></span>' + (label || 'Đang xử lý...');
+  } else {
+    btn._vaiBusy = false;
+    btn.disabled = !!btn._vaiOldDisabled;
+    btn.style.opacity = '';
+    btn.style.cursor = '';
+    if (btn._vaiOldHtml) btn.innerHTML = btn._vaiOldHtml;
+  }
+};
+// Trigger a file download from a Blob + return the object URL.
+window.__qDownload = function(blob, filename) {
+  var url = URL.createObjectURL(blob);
+  var a = document.createElement('a');
+  a.href = url; a.download = filename;
+  document.body.appendChild(a); a.click(); document.body.removeChild(a);
+  setTimeout(function () { URL.revokeObjectURL(url); }, 60000);
+  return url;
+};
 window.exportQuoteExcel = window.exportExcel = async function() {
   var cart = loadCart();
   if (!cart.length) { toast('Giỏ hàng trống!'); return; }
   if (typeof ExcelJS === 'undefined') { toast('⚠️ Thư viện Excel chưa tải xong.'); return; }
-  toast('⏳ Đang xuất Excel...');
+  // Responsive button: spinner + "Đang xuất Excel..." immediately on click.
+  var btn = (event && event.target && event.target.closest) ? event.target.closest('.quote-btn-excel, [onclick*="exportQuoteExcel"]') : null;
+  __qBtnBusy(btn, true, 'Đang xuất Excel...');
+  toast('⏳ Đang tạo file Excel...');
+  try {
   var qd = getQuoteData();
   var qdItems = qd.items;
   var grandTotal = Number(qd.grandTotal || 0);
@@ -1027,8 +1107,10 @@ window.exportQuoteExcel = window.exportExcel = async function() {
 
   // Row 1: logo + tagline
   try {
-    var lr = await fetch('https://huggingface.co/spaces/bep40/vai-avatar2/resolve/main/public/quote_logo.png', { mode:'cors' });
-    if (!lr.ok) lr = await fetch('https://huggingface.co/spaces/bep40/V.AISTUDIO/resolve/main/logo/logo_main.png', { mode:'cors' });
+    var logoUrl = 'https://huggingface.co/spaces/bep40/vai-avatar2/resolve/main/public/quote_logo.png';
+    if (window.__qRenderSrc) logoUrl = window.__qRenderSrc(logoUrl);
+    var lr = await fetch(logoUrl, { mode:'cors' });
+    if (!lr.ok) lr = await fetch(window.__qRenderSrc ? window.__qRenderSrc('https://huggingface.co/spaces/bep40/V.AISTUDIO/resolve/main/logo/logo_main.png') : 'https://huggingface.co/spaces/bep40/V.AISTUDIO/resolve/main/logo/logo_main.png', { mode:'cors' });
     if (lr.ok) {
       var lb = await lr.arrayBuffer();
       ws.addImage(wb.addImage({ buffer: lb, extension:'png' }), { tl:{ col:0, row:0 }, ext:{ width:40, height:40 } });
@@ -1118,25 +1200,25 @@ window.exportQuoteExcel = window.exportExcel = async function() {
     var bgColor = i % 2 === 0 ? 'FFF8FAFC' : 'FFFFFFFF';
     var RB = { top:{style:'thin',color:{argb:bgColor}}, bottom:{style:'thin',color:{argb:bgColor}}, left:{style:'thin',color:{argb:bgColor}}, right:{style:'thin',color:{argb:bgColor}} };
     row.getCell(1).value = it.stt || i + 1; row.getCell(1).alignment = { horizontal:'center', vertical:'middle' };
-    // Fetch REAL product image (ArrayBuffer) with wsrv.nl CORS fallback → images ALWAYS appear
+    // Fetch REAL product image (ArrayBuffer). Order of attempts: (1) same-origin
+    // /api/img proxy (always CORS-clean, mirrors what PDF/image renders use),
+    // (2) direct fetch, (3) wsrv.nl CORS proxy → images ALWAYS appear.
     if (it.image && it.image.indexOf('http') === 0) {
-      try {
-        var ir = await fetch(it.image, { mode:'cors' });
-        if (!ir.ok) throw new Error('HTTP ' + ir.status);
-        var ib = await ir.arrayBuffer();
-        var ext = it.image.match(/\.(png|jpe?g)/i); ext = ext ? (ext[1].indexOf('png') === 0 ? 'png' : 'jpeg') : 'jpeg';
-        ws.addImage(wb.addImage({ buffer: ib, extension: ext }), { tl:{ col:1, row:cr - 1 }, ext:{ width:46, height:46 } });
-      } catch(e1) {
+      var imgBuf = null, imgExt = 'jpeg';
+      var candidates = [];
+      if (window.__qRenderSrc) candidates.push(window.__qRenderSrc(it.image));
+      candidates.push(it.image);
+      candidates.push('https://wsrv.nl/?url=' + encodeURIComponent(it.image) + '&w=200&output=' + (/\.png/i.test(it.image) ? 'png' : 'jpg'));
+      for (var ciFetch = 0; ciFetch < candidates.length && !imgBuf; ciFetch++) {
         try {
-          var proxyUrl = 'https://wsrv.nl/?url=' + encodeURIComponent(it.image) + '&w=200&output=' + (/\.png/i.test(it.image) ? 'png' : 'jpg');
-          var ir2 = await fetch(proxyUrl);
-          if (ir2.ok) {
-            var ib2 = await ir2.arrayBuffer();
-            var ext2 = it.image.match(/\.(png|jpe?g)/i); ext2 = ext2 ? (ext2[1].indexOf('png') === 0 ? 'png' : 'jpeg') : 'jpeg';
-            ws.addImage(wb.addImage({ buffer: ib2, extension: ext2 }), { tl:{ col:1, row:cr - 1 }, ext:{ width:46, height:46 } });
-          }
-        } catch(e2) {}
+          var irX = await fetch(candidates[ciFetch], { mode:'cors' });
+          if (!irX.ok) continue;
+          imgBuf = await irX.arrayBuffer();
+          var extX = candidates[ciFetch].match(/\.(png|jpe?g)/i); imgExt = extX ? (extX[1].indexOf('png') === 0 ? 'png' : 'jpeg') : 'jpeg';
+          if (candidates[ciFetch].indexOf('output=') !== -1 && /output=(\w+)/.test(candidates[ciFetch])) imgExt = RegExp.$1 === 'png' ? 'png' : 'jpeg';
+        } catch (eF) { imgBuf = null; }
       }
+      if (imgBuf) { try { ws.addImage(wb.addImage({ buffer: imgBuf, extension: imgExt }), { tl:{ col:1, row:cr - 1 }, ext:{ width:46, height:46 } }); } catch (eA) {} }
     }
     row.getCell(3).value = it.name || ''; row.getCell(3).font = { bold:true, size:9 }; row.getCell(3).alignment = { wrapText:true, vertical:'middle' };
     row.getCell(4).value = it.model || ''; row.getCell(4).alignment = { horizontal:'center', vertical:'middle' };
@@ -1200,7 +1282,9 @@ window.exportQuoteExcel = window.exportExcel = async function() {
   ws.mergeCells(cr, 1, cr, 5); ws.getCell('A' + cr).value = '🔢 STK: ' + BANK_ACCOUNT; ws.getCell('A' + cr).font = { bold:true, size:10 }; ws.getCell('A' + cr).fill = { type:'pattern', pattern:'solid', fgColor:{ argb:QBG } }; ws.getCell('A' + cr).border = QB; cr++;
   ws.mergeCells(cr, 1, cr, 5); ws.getCell('A' + cr).value = '💰 ' + fmtVND(grandTotal) + ' | 📝 ' + code; ws.getCell('A' + cr).font = { bold:true, size:10 }; ws.getCell('A' + cr).fill = { type:'pattern', pattern:'solid', fgColor:{ argb:QBG } }; ws.getCell('A' + cr).border = QB;
   try {
-    var qrR = await fetch(__qGetQRUrl(grandTotal, code), { mode:'cors' });
+    var qrUrlX = __qGetQRUrl(grandTotal, code);
+    if (window.__qRenderSrc) qrUrlX = window.__qRenderSrc(qrUrlX);
+    var qrR = await fetch(qrUrlX, { mode:'cors' });
     if (qrR.ok) { var qb = await qrR.arrayBuffer(); ws.addImage(wb.addImage({ buffer: qb, extension:'png' }), { tl:{ col:6, row:totalRowNum + 1 }, ext:{ width:115, height:115 } }); }
   } catch(e) {}
 
@@ -1209,12 +1293,11 @@ window.exportQuoteExcel = window.exportExcel = async function() {
   try {
     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';
-    document.body.appendChild(a); a.click(); document.body.removeChild(a);
-    setTimeout(function(){ URL.revokeObjectURL(url); }, 60000);
-    toast('✅ Đã xuất file Excel!');
-  } catch(e) { console.error('ExcelJS error:', e); toast('⚠️ Xuất Excel thất bại'); }
+    __qDownload(blob, code + '.xlsx');
+    __qBtnBusy(btn, false);
+    toast('✅ Đã tải file ' + code + '.xlsx — kiểm tra mục Tải xuống (Downloads) trên trình duyệt!');
+  } catch(e) { console.error('ExcelJS error:', e); __qBtnBusy(btn, false); toast('⚠️ Xuất Excel thất bại: ' + (e.message || e)); }
+  } catch(e) { console.error('Excel export error:', e); __qBtnBusy(btn, false); toast('⚠️ Xuất Excel thất bại: ' + (e.message || e)); }
 };
 
 
@@ -1240,6 +1323,9 @@ window.__custInfoHtml = function(cust) {
 window.exportQuotePDF = window.exportPDF = async function() {
   var cart = loadCart();
   if (!cart.length) { toast('Giỏ hàng trống!'); return; }
+  var btn = (event && event.target && event.target.closest) ? event.target.closest('.quote-btn-pdf, [onclick*="exportQuotePDF"]') : null;
+  __qBtnBusy(btn, true, 'Đang xuất PDF...');
+  toast('⏳ Đang tạo file PDF (chờ ảnh sản phẩm)...');
   var qd = getQuoteData();
   var qdItems = qd.items;
   var div = document.createElement('div');
@@ -1248,7 +1334,7 @@ window.exportQuotePDF = window.exportPDF = async function() {
   var itemsHtml = qdItems.map(function(it) {
     return '<tr style="border-bottom:1px solid #e2e8f0">'
       + '<td style="padding:10px 6px;text-align:center;font-size:13px;color:#0f172a">' + it.stt + '</td>'
-      + '<td style="padding:10px 6px">' + (it.image ? '<img src="' + it.image + '" style="width:80px;height:80px;object-fit:contain;border-radius:6px;border:1px solid #e2e8f0;background:#f8fafc" onerror="this.style.display=\'none\'">' : '') + '</td>'
+      + '<td style="padding:10px 6px">' + (it.image ? '<img src="' + it.image + '" style="width:80px;height:80px;object-fit:contain;border-radius:6px;border:1px solid #e2e8f0;background:#f8fafc">' : '') + '</td>'
       + '<td style="padding:10px 6px;font-size:12px;font-weight:600;color:#0f172a">' + esc(it.name) + '</td>'
       + '<td style="padding:10px 6px;text-align:center;font-size:12px;color:#003f62">' + esc(it.model) + '</td>'
       + '<td style="padding:10px 6px;font-size:11px;color:#64748b;max-width:180px">' + esc(it.specs) + '</td>'
@@ -1261,7 +1347,7 @@ window.exportQuotePDF = window.exportPDF = async function() {
   }).join('');
 
   div.innerHTML = '<div style="display:flex;align-items:center;justify-content:center;gap:14px;margin-bottom:16px">'
-    + '<img src="https://huggingface.co/spaces/bep40/vai-avatar2/resolve/main/public/quote_logo.png" style="height:56px;width:auto;object-fit:contain" onerror="this.style.display=\'none\'">'
+    + '<img src="' + __qRenderSrc('https://huggingface.co/spaces/bep40/vai-avatar2/resolve/main/public/quote_logo.png') + '" style="height:56px;width:auto;object-fit:contain">'
     + '<div>'
     + '<div style="font-size:16px;font-weight:800;color:#003f62">V.AI STUDIO</div>'
     + '<div style="font-size:11px;color:#64748b;letter-spacing:2px;font-style:italic">❝ Niềm tin khách hàng là tài sản của chúng tôi ❞</div>'
@@ -1276,7 +1362,7 @@ window.exportQuotePDF = window.exportPDF = async function() {
     // (CK) is shown by __custInfoHtml above; the VIB transfer QR sits next to it
     // so the image shared on Zalo carries the payment QR right beside the CK info.
     + '<div style="margin-top:8px;display:inline-block">'
-    + '<img src="' + __qGetQRUrl(qd.grandTotal, qd.customer.orderCode || 'VAISTUDIO') + '" title="Mã QR thanh toán" style="width:96px;height:96px;border:1px solid #e2e8f0;border-radius:8px;background:#fff" onerror="this.style.display=\'none\'">'
+    + '<img src="' + __qRenderSrc(__qGetQRUrl(qd.grandTotal, qd.customer.orderCode || 'VAISTUDIO')) + '" title="Mã QR thanh toán" style="width:96px;height:96px;border:1px solid #e2e8f0;border-radius:8px;background:#fff">'
     + '</div>'
     + '</div>'
     + '</div>'
@@ -1289,11 +1375,14 @@ window.exportQuotePDF = window.exportPDF = async function() {
     + '<div style="margin-top:20px;font-size:11px;color:#64748b;font-style:italic">Miễn phí giao hàng trong TPHCM. | Giá đã bao gồm VAT.</div>';
 
   document.body.appendChild(div);
-  await new Promise(function(r){ setTimeout(r, 500); });
   try {
-    var canvas = await html2canvas(div, { scale:2, useCORS:true, allowTaint:true, logging:false, backgroundColor:'#fff' });
+    // Rewrite images through the /api/img CORS proxy + wait until all images
+    // and fonts have loaded — this is the fix for blank/ảnh báo giá không hiện.
+    await __qPreloadRender(div, 10000);
+    await new Promise(function(r){ setTimeout(r, 150); });
+    var canvas = await html2canvas(div, { scale:2, useCORS:true, allowTaint:false, logging:false, backgroundColor:'#fff' });
     var imgData = canvas.toDataURL('image/jpeg', 0.95);
-    if (!window.jspdf || !window.jspdf.jsPDF) { div.remove(); toast('⚠️ Thư viện PDF chưa tải.'); return; }
+    if (!window.jspdf || !window.jspdf.jsPDF) { div.remove(); __qBtnBusy(btn, false); toast('⚠️ Thư viện PDF chưa tải.'); return; }
     var jsPDF = window.jspdf.jsPDF;
     var pdf = new jsPDF({ orientation:'landscape', unit:'mm', format:'a4' });
     var pdfW = pdf.internal.pageSize.getWidth();
@@ -1312,8 +1401,9 @@ window.exportQuotePDF = window.exportPDF = async function() {
       srcY += sliceH;
     }
     pdf.save((qd.customer.orderCode || 'BG') + '.pdf');
-    toast('✅ Đã xuất file PDF!');
-  } catch(e) { console.error('PDF error:', e); toast('❌ Lỗi xuất PDF'); }
+    __qBtnBusy(btn, false);
+    toast('✅ Đã tải file ' + (qd.customer.orderCode || 'BG') + '.pdf — kiểm tra mục Tải xuống (Downloads)!');
+  } catch(e) { console.error('PDF error:', e); __qBtnBusy(btn, false); toast('❌ Lỗi xuất PDF: ' + (e.message || e)); }
   div.remove();
 };
 
@@ -1321,6 +1411,9 @@ window.exportQuotePDF = window.exportPDF = async function() {
 window.shareQuoteImage = async function() {
   var cart = loadCart();
   if (!cart.length) { toast('Giỏ hàng trống!'); return; }
+  var btn = (event && event.target && event.target.closest) ? event.target.closest('.quote-btn[onclick*="shareQuoteImage"], [onclick*="shareQuoteImage"]') : null;
+  __qBtnBusy(btn, true, 'Đang tạo ảnh...');
+  toast('⏳ Đang tạo ảnh báo giá (chờ ảnh sản phẩm)...');
   var qd = getQuoteData();
   var qdItems = qd.items;
   var div = document.createElement('div');
@@ -1328,7 +1421,7 @@ window.shareQuoteImage = async function() {
   var itemsHtml = qdItems.map(function(it) {
     return '<tr style="border-bottom:1px solid #e2e8f0">'
       + '<td style="padding:10px 6px;text-align:center;font-size:13px;color:#0f172a">' + it.stt + '</td>'
-      + '<td style="padding:10px 6px">' + (it.image ? '<img src="' + it.image + '" style="width:80px;height:80px;object-fit:contain;border-radius:6px;border:1px solid #e2e8f0;background:#f8fafc" onerror="this.style.display=\'none\'">' : '') + '</td>'
+      + '<td style="padding:10px 6px">' + (it.image ? '<img src="' + it.image + '" style="width:80px;height:80px;object-fit:contain;border-radius:6px;border:1px solid #e2e8f0;background:#f8fafc">' : '') + '</td>'
       + '<td style="padding:10px 6px;font-size:12px;font-weight:600;color:#0f172a">' + esc(it.name) + '</td>'
       + '<td style="padding:10px 6px;text-align:center;font-size:12px;color:#003f62">' + esc(it.model) + '</td>'
       + '<td style="padding:10px 6px;font-size:11px;color:#64748b;max-width:180px">' + esc(it.specs) + '</td>'
@@ -1340,7 +1433,7 @@ window.shareQuoteImage = async function() {
       + '</tr>';
   }).join('');
   div.innerHTML = '<div style="display:flex;align-items:center;justify-content:center;gap:14px;margin-bottom:16px">'
-    + '<img src="https://huggingface.co/spaces/bep40/vai-avatar2/resolve/main/public/quote_logo.png" style="height:56px;width:auto;object-fit:contain" onerror="this.style.display=\'none\'">'
+    + '<img src="' + __qRenderSrc('https://huggingface.co/spaces/bep40/vai-avatar2/resolve/main/public/quote_logo.png') + '" style="height:56px;width:auto;object-fit:contain">'
     + '<div>'
     + '<div style="font-size:16px;font-weight:800;color:#003f62">V.AI STUDIO</div>'
     + '<div style="font-size:11px;color:#64748b;letter-spacing:2px;font-style:italic">❝ Niềm tin khách hàng là tài sản của chúng t��i ❞</div>'
@@ -1355,7 +1448,7 @@ window.shareQuoteImage = async function() {
     // (CK) is shown by __custInfoHtml above; the VIB transfer QR sits next to it
     // so the image shared on Zalo carries the payment QR right beside the CK info.
     + '<div style="margin-top:8px;display:inline-block">'
-    + '<img src="' + __qGetQRUrl(qd.grandTotal, qd.customer.orderCode || 'VAISTUDIO') + '" title="Mã QR thanh toán" style="width:96px;height:96px;border:1px solid #e2e8f0;border-radius:8px;background:#fff" onerror="this.style.display=\'none\'">'
+    + '<img src="' + __qRenderSrc(__qGetQRUrl(qd.grandTotal, qd.customer.orderCode || 'VAISTUDIO')) + '" title="Mã QR thanh toán" style="width:96px;height:96px;border:1px solid #e2e8f0;border-radius:8px;background:#fff">'
     + '</div>'
     + '</div>'
     + '</div>'
@@ -1367,9 +1460,11 @@ window.shareQuoteImage = async function() {
     + '</table>'
     + '<div style="margin-top:16px;font-size:11px;color:#64748b;font-style:italic">Miễn phí giao hàng trong TPHCM. | Giá đã bao gồm VAT.</div>';
   document.body.appendChild(div);
-  await new Promise(function(r){ setTimeout(r, 500); });
   try {
-    var canvas = await html2canvas(div, { scale:2, useCORS:true, allowTaint:true, backgroundColor:'#fff', logging:false });
+    // CORS-proxy every image + wait for them to load → canvas stays clean.
+    await __qPreloadRender(div, 10000);
+    await new Promise(function(r){ setTimeout(r, 150); });
+    var canvas = await html2canvas(div, { scale:2, useCORS:true, allowTaint:false, backgroundColor:'#fff', logging:false });
     div.remove();
     var blob = await new Promise(function(r){ canvas.toBlob(r, 'image/png'); });
     var file = new File([blob], (qd.customer.orderCode || 'BG') + '.png', { type:'image/png' });
@@ -1384,18 +1479,23 @@ window.shareQuoteImage = async function() {
       var url = URL.createObjectURL(blob);
       var preview = document.createElement('div');
       preview.style.cssText = 'position:fixed;inset:0;background:rgba(0,0,0,.7);z-index:110060;display:flex;flex-direction:column;align-items:center;justify-content:center;padding:16px;backdrop-filter:blur(4px)';
-      preview.innerHTML = '<div style="background:#fff;border-radius:16px;max-width:90vw;max-height:85vh;overflow:auto;padding:16px"><img src="' + url + '" style="max-width:100%;border-radius:8px"><div style="display:flex;gap:8px;margin-top:12px;justify-content:center"><a href="' + url + '" download="' + (qd.customer.orderCode || 'BG') + '.png" style="padding:10px 20px;background:#003f62;color:#fff;border-radius:8px;font-weight:700;font-size:.85rem;text-decoration:none"><i class="fas fa-download"></i> Tải ảnh</a><button onclick="this.closest(\'div[style*=fixed]\').remove()" style="padding:10px 20px;background:#e2e8f0;border:none;border-radius:8px;font-weight:700;font-size:.85rem;cursor:pointer">Đóng</button></div></div>';
+      preview.innerHTML = '<div style="background:#fff;border-radius:16px;max-width:90vw;max-height:85vh;overflow:auto;padding:16px"><img src="' + url + '" style="max-width:100%;border-radius:8px"><div style="display:flex;gap:8px;margin-top:12px;justify-content:center"><a href="' + url + '" download="' + (qd.customer.orderCode || 'BG') + '.png" style="padding:10px 20px;background:#003f62;color:#fff;border-radius:8px;font-weight:700;font-size:.85rem;text-decoration:none"><i class="fas fa-download"></i> Tải ảnh ' + (qd.customer.orderCode || 'BG') + '.png</a><button onclick="this.closest(\'div[style*=fixed]\').remove()" style="padding:10px 20px;background:#e2e8f0;border:none;border-radius:8px;font-weight:700;font-size:.85rem;cursor:pointer">Đóng</button></div></div>';
       document.body.appendChild(preview);
-      toast('✅ Ảnh báo giá đã sẵn sàng!');
+      __qBtnBusy(btn, false);
+      toast('✅ Ảnh báo giá đã sẵn sàng! Bấm "Tải ảnh" để lưu file ' + (qd.customer.orderCode || 'BG') + '.png');
+    } else {
+      __qBtnBusy(btn, false);
+      toast('✅ Đã chia sẻ ảnh báo giá!');
     }
-  } catch(e) { div.remove(); toast('Lỗi: ' + e.message); }
+  } catch(e) { div.remove(); __qBtnBusy(btn, false); toast('Lỗi: ' + e.message); }
 };
 
 // Print quote (đúng layout)
 window.printQuotation = function() {
   var qd = getQuoteData();
+  toast('⏳ Đang mở cửa sổ in...');
   var w = window.open('', '_blank', 'width=1100,height=800');
-  if (!w) { exportQuotePDF(); return; }
+  if (!w) { toast('⚠️ Trình duyệt chặn popup — đang xuất PDF thay thế...'); exportQuotePDF(); return; }
   var rows = qd.items.map(function(it) {
     return '<tr>'
       + '<td>' + it.stt + '</td>'
@@ -1420,7 +1520,7 @@ window.printQuotation = function() {
   w.document.write('</body></html>');
   w.document.close();
   w.focus();
-  setTimeout(function() { w.print(); }, 400);
+  setTimeout(function() { w.print(); toast('🖨️ Đã mở cửa sổ in — chọn máy in và nhấn In!'); }, 400);
 };
 
 function toast(msg) {

src/greeting-news.js

@@ -1054,8 +1054,14 @@
     // Row 1: logo + tagline
     imagePromises.push((async function addLogo(){
       try {
-        var lr = await fetch('https://huggingface.co/spaces/bep40/vai-avatar2/resolve/main/public/quote_logo.png', { mode:'cors' });
-        if (!lr.ok) lr = await fetch('https://huggingface.co/spaces/bep40/V.AISTUDIO/resolve/main/logo/logo_main.png', { mode:'cors' });
+        var logoUrl = 'https://huggingface.co/spaces/bep40/vai-avatar2/resolve/main/public/quote_logo.png';
+        if (window.__qRenderSrc) logoUrl = window.__qRenderSrc(logoUrl);
+        var lr = await fetch(logoUrl, { mode:'cors' });
+        if (!lr.ok) {
+          var logoUrl2 = 'https://huggingface.co/spaces/bep40/V.AISTUDIO/resolve/main/logo/logo_main.png';
+          if (window.__qRenderSrc) logoUrl2 = window.__qRenderSrc(logoUrl2);
+          lr = await fetch(logoUrl2, { mode:'cors' });
+        }
         if (lr.ok) { var lb = await lr.arrayBuffer(); ws.addImage(wb.addImage({ buffer: lb, extension:'png' }), { tl:{ col:0, row:0 }, ext:{ width:40, height:40 } }); }
       } catch(e) {}
     })());
@@ -1112,19 +1118,21 @@
       if (it.image && it.image.indexOf('http') === 0) {
         (function(img, r2){
           imagePromises.push((async function(){
-            try {
-              var ir = await fetch(img, { mode:'cors' });
-              if (!ir.ok) throw new Error('HTTP ' + ir.status);
-              var ib = await ir.arrayBuffer();
-              var ext = img.match(/\.(png|jpe?g)/i); ext = ext ? (ext[1].indexOf('png') === 0 ? 'png' : 'jpeg') : 'jpeg';
-              ws.addImage(wb.addImage({ buffer: ib, extension: ext }), { tl:{ col:1, row:r2 - 1 }, ext:{ width:46, height:46 } });
-            } catch(e1) {
+            var buf = null, ext = 'jpeg';
+            var candidates = [];
+            if (window.__qRenderSrc) candidates.push(window.__qRenderSrc(img));
+            candidates.push(img);
+            candidates.push('https://wsrv.nl/?url=' + encodeURIComponent(img) + '&w=200&output=' + (/\.png/i.test(img) ? 'png' : 'jpg'));
+            for (var cf = 0; cf < candidates.length && !buf; cf++) {
               try {
-                var proxyUrl = 'https://wsrv.nl/?url=' + encodeURIComponent(img) + '&w=200&output=' + (/\.png/i.test(img) ? 'png' : 'jpg');
-                var ir2 = await fetch(proxyUrl);
-                if (ir2.ok) { var ib2 = await ir2.arrayBuffer(); var ext2 = img.match(/\.(png|jpe?g)/i); ext2 = ext2 ? (ext2[1].indexOf('png') === 0 ? 'png' : 'jpeg') : 'jpeg'; ws.addImage(wb.addImage({ buffer: ib2, extension: ext2 }), { tl:{ col:1, row:r2 - 1 }, ext:{ width:46, height:46 } }); }
-              } catch(e2) {}
+                var ir = await fetch(candidates[cf], { mode:'cors' });
+                if (!ir.ok) continue;
+                buf = await ir.arrayBuffer();
+                var ex = candidates[cf].match(/\.(png|jpe?g)/i); ext = ex ? (ex[1].indexOf('png') === 0 ? 'png' : 'jpeg') : 'jpeg';
+                if (candidates[cf].indexOf('output=') !== -1 && /output=(\w+)/.test(candidates[cf])) ext = RegExp.$1 === 'png' ? 'png' : 'jpeg';
+              } catch (eF) { buf = null; }
             }
+            if (buf) { try { ws.addImage(wb.addImage({ buffer: buf, extension: ext }), { tl:{ col:1, row:r2 - 1 }, ext:{ width:46, height:46 } }); } catch (eA) {} }
           })());
         })(it.image, cr);
       }
@@ -1168,6 +1176,7 @@
     imagePromises.push((async function addQR(){
       try {
         var qrUrl = 'https://img.vietqr.io/image/vib-918258385-compact2.png?amount=' + (Math.round(grandTotal) || 0) + '&addInfo=' + encodeURIComponent(code || 'VAISTUDIO') + '&accountName=' + encodeURIComponent('TRAN QUOC VUONG');
+        if (window.__qRenderSrc) qrUrl = window.__qRenderSrc(qrUrl);
         var qrR = await fetch(qrUrl, { mode:'cors' });
         if (qrR.ok) { var qb2 = await qrR.arrayBuffer(); ws.addImage(wb.addImage({ buffer: qb2, extension:'png' }), { tl:{ col:6, row:totalRowNum + 1 }, ext:{ width:115, height:115 } }); }
       } catch(e) {}
@@ -1193,16 +1202,18 @@
   function exportOrderExcel(order) {
     var toast = window.toast || function (m) { alert(m); };
     if (typeof ExcelJS === 'undefined') { toast('⚠️ Thư viện Excel chưa tải'); return; }
+    var btn = (event && event.target && event.target.closest) ? event.target.closest('[data-ord="excel"]') : null;
+    if (window.__qBtnBusy) window.__qBtnBusy(btn, true, 'Đang xuất Excel...');
     (async function () {
-      toast('⏳ Đang xuất Excel đơn ' + order.code + '...');
+      toast('⏳ Đang tạo Excel đơn ' + order.code + '...');
       var built = await orderBrandedSheet(order);
       var buf = await built.wb.xlsx.writeBuffer();
       var blob = new Blob([buf], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
-      var url = URL.createObjectURL(blob), a = document.createElement('a');
-      a.href = url; a.download = built.code + '.xlsx'; document.body.appendChild(a); a.click(); document.body.removeChild(a);
-      setTimeout(function () { URL.revokeObjectURL(url); }, 60000);
-      toast('✅ Đã xuất Excel đơn ' + order.code);
-    })().catch(function (e) { console.error(e); toast('⚠️ Xuất Excel thất bại'); });
+      if (window.__qDownload) { window.__qDownload(blob, built.code + '.xlsx'); }
+      else { var url = URL.createObjectURL(blob), a = document.createElement('a'); a.href = url; a.download = built.code + '.xlsx'; document.body.appendChild(a); a.click(); document.body.removeChild(a); setTimeout(function () { URL.revokeObjectURL(url); }, 60000); }
+      if (window.__qBtnBusy) window.__qBtnBusy(btn, false);
+      toast('✅ Đã tải file ' + built.code + '.xlsx — kiểm tra mục Tải xuống (Downloads)!');
+    })().catch(function (e) { console.error(e); if (window.__qBtnBusy) window.__qBtnBusy(btn, false); toast('⚠️ Xuất Excel thất bại: ' + (e.message || e)); });
   }
 
   // Branded HTML used for both PDF and image export. Mirrors EXACTLY the Excel
@@ -1219,7 +1230,7 @@
     var itemsHtml = items.map(function (it) {
       return '<tr style="border-bottom:1px solid #e2e8f0">'
         + '<td style="padding:10px 6px;text-align:center;font-size:13px;color:#0f172a">' + it.stt + '</td>'
-        + '<td style="padding:10px 6px">' + (it.image ? '<img src="' + esc(it.image) + '" style="width:80px;height:80px;object-fit:contain;border-radius:6px;border:1px solid #e2e8f0;background:#f8fafc" onerror="this.style.display=\'none\'">' : '') + '</td>'
+        + '<td style="padding:10px 6px">' + (it.image ? '<img src="' + (window.__qRenderSrc ? window.__qRenderSrc(it.image) : it.image) + '" style="width:80px;height:80px;object-fit:contain;border-radius:6px;border:1px solid #e2e8f0;background:#f8fafc">' : '') + '</td>'
         + '<td style="padding:10px 6px;font-size:12px;font-weight:600;color:#0f172a">' + esc(it.name) + '</td>'
         + '<td style="padding:10px 6px;text-align:center;font-size:12px;color:#003f62">' + esc(it.model) + '</td>'
         + '<td style="padding:10px 6px;font-size:11px;color:#64748b;max-width:180px">' + esc(it.specs) + '</td>'
@@ -1233,11 +1244,11 @@
     var qrImg = '';
     try {
       var qrUrl = 'https://img.vietqr.io/image/vib-918258385-compact2.png?amount=' + (Math.round(grandTotal) || 0) + '&addInfo=' + encodeURIComponent(code || 'VAISTUDIO') + '&accountName=' + encodeURIComponent('TRAN QUOC VUONG');
-      qrImg = '<img src="' + qrUrl + '" style="width:120px;height:120px;border:1px solid #e2e8f0;border-radius:8px;background:#fff" onerror="this.style.display=\'none\'">';
+      qrImg = '<img src="' + (window.__qRenderSrc ? window.__qRenderSrc(qrUrl) : qrUrl) + '" style="width:120px;height:120px;border:1px solid #e2e8f0;border-radius:8px;background:#fff">';
     } catch (e) { qrImg = ''; }
     // Logo (brand logo on navy card) + tagline.
     var logoSrc = 'https://huggingface.co/spaces/bep40/vai-avatar2/resolve/main/public/quote_logo.png';
-    var logoImg = '<img src="' + logoSrc + '" style="height:48px;width:auto;object-fit:contain" onerror="this.style.display=\'none\'">';
+    var logoImg = '<img src="' + (window.__qRenderSrc ? window.__qRenderSrc(logoSrc) : logoSrc) + '" style="height:48px;width:auto;object-fit:contain">';
     return '<div style="display:flex;align-items:center;justify-content:center;gap:12px;margin-bottom:10px">'
       + logoImg
       + '<div style="font-size:16px;font-weight:800;color:#003f62">V.AI STUDIO</div>'
@@ -1293,15 +1304,12 @@
     return new Promise(function (resolve, reject) {
       // Wait for every <img> inside the render node to finish loading so
       // product images / layout render identically to the Excel every time.
-      var imgs = Array.prototype.slice.call(div.querySelectorAll('img'));
-      var imgWaits = imgs.map(function (img) {
-        if (img.complete && img.naturalWidth > 0) return Promise.resolve();
-        return new Promise(function (res) { img.onload = function(){ res(); }; img.onerror = function(){ res(); }; });
-      });
-      var fontWait = (document.fonts && document.fonts.ready) ? document.fonts.ready : Promise.resolve();
-      Promise.all([fontWait, Promise.all(imgWaits)]).then(function () {
+      // Images are already routed through the /api/img CORS proxy by
+      // orderBrandedHTML/__qRenderSrc so the canvas never taints.
+      var ready = window.__qPreloadRender ? window.__qPreloadRender(div, 10000) : Promise.resolve();
+      ready.then(function () {
         setTimeout(function () {
-          html2canvas(div, { scale:2, useCORS:true, allowTaint:true, logging:false, backgroundColor:'#ffffff' })
+          html2canvas(div, { scale:2, useCORS:true, allowTaint:false, logging:false, backgroundColor:'#ffffff' })
             .then(function (canvas) { div.remove(); resolve(canvas); })
             .catch(function (e) { div.remove(); reject(e); });
         }, 120);
@@ -1313,7 +1321,9 @@
     var toast = window.toast || function (m) { alert(m); };
     if ((typeof window.jspdf === 'undefined' && typeof window.jsPDF === 'undefined') || typeof html2canvas === 'undefined') { toast('⚠️ Thư viện PDF/html2canvas chưa tải'); return; }
     var code = order.code || 'DH';
-    toast('⏳ Đang xuất PDF đơn ' + code + '...');
+    var btn = (event && event.target && event.target.closest) ? event.target.closest('[data-ord="pdf"]') : null;
+    if (window.__qBtnBusy) window.__qBtnBusy(btn, true, 'Đang xuất PDF...');
+    toast('⏳ Đang tạo PDF đơn ' + code + ' (chờ ảnh sản phẩm)...');
     (async function () {
       try {
         var canvas = await renderOrderBrandedToCanvas(order);
@@ -1336,8 +1346,9 @@
           srcY += sliceH;
         }
         pdf.save(code + '.pdf');
-        toast('✅ Đã xuất PDF đơn ' + code);
-      } catch(e) { console.error(e); toast('❌ Lỗi xuất PDF'); }
+        if (window.__qBtnBusy) window.__qBtnBusy(btn, false);
+        toast('✅ Đã tải file ' + code + '.pdf — kiểm tra mục Tải xuống (Downloads)!');
+      } catch(e) { console.error(e); if (window.__qBtnBusy) window.__qBtnBusy(btn, false); toast('❌ Lỗi xuất PDF: ' + (e.message || e)); }
     })();
   }
 
@@ -1345,7 +1356,9 @@
     var toast = window.toast || function (m) { alert(m); };
     if (typeof html2canvas === 'undefined') { toast('⚠️ Thư viện html2canvas chưa tải'); return; }
     var code = order.code || 'DH';
-    toast('⏳ Đang tạo ảnh đơn ' + code + '...');
+    var btn = (event && event.target && event.target.closest) ? event.target.closest('[data-ord="image"]') : null;
+    if (window.__qBtnBusy) window.__qBtnBusy(btn, true, 'Đang tạo ảnh...');
+    toast('⏳ Đang tạo ảnh đơn ' + code + ' (chờ ảnh sản phẩm)...');
     (async function () {
       try {
         var canvas = await renderOrderBrandedToCanvas(order);
@@ -1361,14 +1374,15 @@
           try { await navigator.share({ title:'Đơn hàng V.AI STUDIO - ' + code, files:[file] }); shared = true; }
           catch (e) { shared = false; /* user cancelled or API unavailable → preview */ }
         }
-        if (shared) return;
+        if (shared) { if (window.__qBtnBusy) window.__qBtnBusy(btn, false); toast('✅ Đã chia sẻ ảnh đơn hàng!'); return; }
         var url = URL.createObjectURL(blob);
         var preview = document.createElement('div');
         preview.style.cssText = 'position:fixed;inset:0;background:rgba(0,0,0,.7);z-index:110062;display:flex;flex-direction:column;align-items:center;justify-content:center;padding:16px;backdrop-filter:blur(4px)';
-        preview.innerHTML = '<div style="background:#fff;border-radius:16px;max-width:90vw;max-height:85vh;overflow:auto;padding:16px"><img src="' + url + '" style="max-width:100%;border-radius:8px"><div style="display:flex;gap:8px;margin-top:12px;justify-content:center"><a href="' + url + '" download="' + code + '.png" style="padding:10px 20px;background:#003f62;color:#fff;border-radius:8px;font-weight:700;font-size:.85rem;text-decoration:none"><i class="fas fa-download"></i> Tải ảnh</a><button onclick="this.closest(\'div[style*=fixed]\').remove()" style="padding:10px 20px;background:#e2e8f0;border:none;border-radius:8px;font-weight:700;font-size:.85rem;cursor:pointer">Đóng</button></div></div>';
+        preview.innerHTML = '<div style="background:#fff;border-radius:16px;max-width:90vw;max-height:85vh;overflow:auto;padding:16px"><img src="' + url + '" style="max-width:100%;border-radius:8px"><div style="display:flex;gap:8px;margin-top:12px;justify-content:center"><a href="' + url + '" download="' + code + '.png" style="padding:10px 20px;background:#003f62;color:#fff;border-radius:8px;font-weight:700;font-size:.85rem;text-decoration:none"><i class="fas fa-download"></i> Tải ảnh ' + code + '.png</a><button onclick="this.closest(\'div[style*=fixed]\').remove()" style="padding:10px 20px;background:#e2e8f0;border:none;border-radius:8px;font-weight:700;font-size:.85rem;cursor:pointer">Đóng</button></div></div>';
         document.body.appendChild(preview);
-        toast('✅ Ảnh đơn hàng đã sẵn sàng!');
-      } catch(e) { toast('Lỗi: ' + e.message); }
+        if (window.__qBtnBusy) window.__qBtnBusy(btn, false);
+        toast('✅ Ảnh đơn hàng đã sẵn sàng! Bấm "Tải ảnh" để lưu file ' + code + '.png');
+      } catch(e) { if (window.__qBtnBusy) window.__qBtnBusy(btn, false); toast('Lỗi: ' + e.message); }
     })();
   }
 
@@ -1377,8 +1391,10 @@
     if (typeof ExcelJS === 'undefined') { toast('⚠️ Thư viện Excel chưa tải'); return; }
     var items = orderToQuoteData(order).items;
     var code = order.code || 'DH';
+    var btn = (event && event.target && event.target.closest) ? event.target.closest('[data-ord="delivery-excel"]') : null;
+    if (window.__qBtnBusy) window.__qBtnBusy(btn, true, 'Đang xuất...');
     (async function () {
-      toast('⏳ Đang xuất Phiếu giao hàng ' + code + '...');
+      toast('⏳ Đang tạo Phiếu giao hàng ' + code + '...');
       // ── V.AISTUDIO PHIẾU GIAO HÀNG layout (STT|Mã SP|Tên sản phẩm|SL|Ghi chú)
       //    Price columns (Đơn giá / Thành tiền) removed per request; Ghi chú added. ──
       var WHITE = { argb: 'FFFFFFFF' };
@@ -1434,11 +1450,11 @@
       ws.eachRow(function (row) { row.eachCell(function (cell) { if (!cell.border) cell.border = WB; }); });
       var buf = await wb.xlsx.writeBuffer();
       var blob = new Blob([buf], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
-      var url = URL.createObjectURL(blob), a = document.createElement('a');
-      a.href = url; a.download = 'GH-' + code + '.xlsx'; document.body.appendChild(a); a.click(); document.body.removeChild(a);
-      setTimeout(function () { URL.revokeObjectURL(url); }, 300000);
-      toast('✅ Đã xuất Phiếu giao hàng ' + code);
-    })().catch(function (e) { console.error(e); toast('⚠️ Xuất Phiếu giao hàng thất bại'); });
+      if (window.__qDownload) { window.__qDownload(blob, 'GH-' + code + '.xlsx'); }
+      else { var url = URL.createObjectURL(blob), a = document.createElement('a'); a.href = url; a.download = 'GH-' + code + '.xlsx'; document.body.appendChild(a); a.click(); document.body.removeChild(a); setTimeout(function () { URL.revokeObjectURL(url); }, 300000); }
+      if (window.__qBtnBusy) window.__qBtnBusy(btn, false);
+      toast('✅ Đã tải file GH-' + code + '.xlsx — kiểm tra mục Tải xuống (Downloads)!');
+    })().catch(function (e) { console.error(e); if (window.__qBtnBusy) window.__qBtnBusy(btn, false); toast('⚠️ Xuất Phiếu giao hàng thất bại: ' + (e.message || e)); });
   }
 
 
@@ -1446,10 +1462,13 @@
     var toast = window.toast || function (m) { alert(m); };
     var qd = orderToQuoteData(order);
     var code = order.code || 'DH';
+    var btn = (event && event.target && event.target.closest) ? event.target.closest('[data-ord="delivery-pdf"]') : null;
+    if (window.__qBtnBusy) window.__qBtnBusy(btn, true, 'Đang xuất...');
     // ── V.AISTUDIO PHIẾU GIAO HÀNG (html2canvas → PNG), columns:
     //    STT | Mã SP | Tên sản phẩm | SL | Ghi chú + TỔNG SL + signature.
     //    Price columns (Đơn giá / Thành tiền) removed per request. ──
     if (typeof html2canvas === 'undefined') {
+      if (window.__qBtnBusy) window.__qBtnBusy(btn, false);
       toast('⚠️ Thư viện html2canvas chưa tải');
       return;
     }
@@ -1482,7 +1501,7 @@
         await new Promise(function (r) { setTimeout(r, 500); });
         var cv = await html2canvas(div, { scale: 2, useCORS: true, allowTaint: false, backgroundColor: '#fff', width: 900, height: Math.max(div.scrollHeight, div.offsetHeight), windowWidth: 900, windowHeight: Math.max(div.scrollHeight, div.offsetHeight), scrollX: 0, scrollY: 0 });
         var img = cv.toDataURL('image/png');
-        if (typeof window.jspdf === 'undefined' && typeof window.jsPDF === 'undefined') { div.remove(); toast('⚠️ Thư viện PDF chưa tải'); return; }
+        if (typeof window.jspdf === 'undefined' && typeof window.jsPDF === 'undefined') { div.remove(); if (window.__qBtnBusy) window.__qBtnBusy(btn, false); toast('⚠️ Thư viện PDF chưa tải'); return; }
         var PDF = (typeof window.jspdf !== 'undefined') ? window.jspdf.jsPDF : window.jsPDF;
         var pdf = new PDF({ orientation: 'p', unit: 'pt', format: 'a4' });
         var margin = 25, usableW = 595 - margin * 2;
@@ -1491,22 +1510,26 @@
         if (imgH > 842 - margin * 2) { imgH = 842 - margin * 2; usableW = imgH / ratio; }
         pdf.addImage(img, 'PNG', margin, margin, usableW, imgH);
         pdf.save('GH-' + code + '.pdf');
-        toast('✅ Đã xuất Phiếu giao hàng ' + code);
-      } catch (e) { console.error(e); toast('⚠️ Xuất Phiếu giao hàng thất bại'); }
+        if (window.__qBtnBusy) window.__qBtnBusy(btn, false);
+        toast('✅ Đã tải file GH-' + code + '.pdf — kiểm tra mục Tải xuống (Downloads)!');
+      } catch (e) { console.error(e); if (window.__qBtnBusy) window.__qBtnBusy(btn, false); toast('⚠️ Xuất Phiếu giao hàng thất bại: ' + (e.message || e)); }
       div.remove();
     })();
   }
 
 
   function printOrder(order) {
+    var toast = window.toast || function (m) { alert(m); };
+    toast('⏳ Đang mở cửa sổ in...');
     var w = window.open('', '_blank');
-    if (!w) { alert('Vui lòng cho phép popup'); return; }
+    if (!w) { toast('⚠️ Trình duyệt chặn popup — đang xuất PDF thay thế...'); exportOrderPDF(order); return; }
     var rows = (order.items || []).map(function (it) {
       var n = normItem(it);
       return '<tr style="border-bottom:1px solid #e2e8f0"><td style="padding:8px;text-align:center">' + n.stt + '</td><td style="padding:8px">' + esc(n.name) + '</td><td style="padding:8px;text-align:center">' + n.qty + '</td><td style="padding:8px;text-align:right">' + money(n.price) + '</td><td style="padding:8px;text-align:right">' + money(n.discPrice) + '</td><td style="padding:8px;text-align:right">' + money(n.total) + '</td></tr>';
     }).join('');
     w.document.write('<html><head><title>Đơn ' + order.code + '</title><style>body{font-family:Arial;padding:30px}table{border-collapse:collapse;width:100%;font-size:13px}th,td{border-bottom:1px solid #e2e8f0}th{background:#003f62;color:#fff;padding:8px}</style></head><body><h2 style="color:#003f62">ĐƠN HÀNG ' + order.code + '</h2><p><b>Khách hàng:</b> ' + esc(order.customer || '') + ' &nbsp; <b>SĐT:</b> ' + esc(order.phone || '') + '<br><b>Email:</b> ' + esc(order.email || '') + ' &nbsp; <b>Ngày:</b> ' + esc(order.date || '') + '<br><b>Địa chỉ:</b> ' + esc(order.addr || '') + '</p><table><thead><tr><th style="text-align:center">STT</th><th style="text-align:left">Tên SP</th><th>SL</th><th style="text-align:right">Đơn giá</th><th style="text-align:right">Giá CK</th><th style="text-align:right">Thành tiền</th></tr></thead><tbody>' + rows + '</tbody></table><h3 style="text-align:right;color:#c2410c">TỔNG CỘNG: ' + money(order.grandTotal || order.total || 0) + '</h3><script>window.onload=function(){window.print()}<\/script></body></html>');
     w.document.close();
+    toast('🖨️ Đã mở cửa sổ in — chọn máy in và nhấn In!');
   }
 
   // Expose overrides + export helpers

src/version.js

@@ -1,3 +1,3 @@
 // V.AI AVATAR — version banner (used for cache-busting / diagnostics)
-window.VAI_AVATAR_VERSION = "v30-order-code-live";
-window.VAI_AVATAR_CACHE = "v26-gc-" + Date.now();
+window.VAI_AVATAR_VERSION = "v31-export-fix-live";
+window.VAI_AVATAR_CACHE = "v27-gc-" + Date.now();