Upload vai-excel-ultimate-fix.js

vai-excel-ultimate-fix.js

@@ -1,35 +1,46 @@
 /**
- * V.AI STUDIO - Excel Export Fix v8.1 FINAL
- * ========================================
- * ROOT CAUSE: Chrome's "transient activation" expires after async operations
- * SOLUTION: Pre-build xlsx in background, download SYNC from cache on click
+ * V.AI STUDIO Excel Export Fix FINAL
+ * 
+ * FIX CHO SPACE CÓ DẤU CHẤM (V.AISTUDIO)
+ * - Tên dấu chấm gây CDN cache khó bust
+ * - Inline sync download, không async/await
+ * - Mỗi click tạo blob mới, không revoke sớm
  */
 (function() {
   'use strict';
   
-  var cache = { quote: null, delivery: null };
+  // Blob URL registry - KHÔNG REVKE SỚM
+  var blobUrls = [];
   
-  // SYNC download - must be called within user gesture
-  function downloadSync(blob, filename) {
+  // Cleanup khi tab đóng
+  window.addEventListener('beforeunload', function() {
+    blobUrls.forEach(function(u) { try { URL.revokeObjectURL(u); } catch(e){} });
+  });
+  
+  // Download SYNC - phải trong user gesture
+  function downloadSync(data, filename, mime) {
+    var blob = (data instanceof Blob) ? data : new Blob([data], {type: mime || 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'});
     var url = URL.createObjectURL(blob);
+    blobUrls.push(url);
+    
     var a = document.createElement('a');
     a.href = url;
     a.download = filename;
-    a.style.cssText = 'position:fixed;top:-10000px;';
+    a.style.cssText = 'position:fixed;top:-9999px;';
     document.body.appendChild(a);
+    
+    // Click NGAY - không được đưa ra setTimeout/setInterval
     a.click();
+    
+    // Cleanup sau
     setTimeout(function() {
-      document.body.removeChild(a);
-    }, 200);
-  }
-  
-  // SYNC CSV download - always works
-  function downloadCSVSync(csv, filename) {
-    var blob = new Blob(['\uFEFF' + csv], { type: 'text/csv;charset=utf-8;' });
-    return downloadSync(blob, filename);
+      try { document.body.removeChild(a); } catch(e) {}
+    }, 100);
+    
+    return true;
   }
   
-  // Get data safely
+  // Get quote data
   function getQuoteDataSafe() {
     try {
       if (typeof getQuoteData === 'function') return getQuoteData();
@@ -37,162 +48,119 @@
     return { customer: {}, items: [] };
   }
   
-  function getCartSafe() {
-    var cart = window.cart || [];
-    try {
-      var s = localStorage.getItem('malloca_cart');
-      if (s) {
-        var p = JSON.parse(s);
-        if (Array.isArray(p) && p.length) cart = p;
-      }
-    } catch(e) {}
-    return cart;
-  }
-  
-  // Build CSV (simple, works always)
-  function buildCSV(qd) {
-    var csv = 'BÁO GIÁ V.AI STUDIO\n';
-    csv += 'Khách hàng:,' + (qd.customer.name || '') + '\n';
-    csv += 'SĐT:,' + (qd.customer.phone || '') + '\n';
-    csv += 'Mã đơn:,' + (qd.customer.orderCode || '') + '\n\n';
-    csv += 'STT,Tên,Mã SP,SL,Đơn giá,Thành tiền,Ghi chú\n';
-    var total = 0;
-    (qd.items || []).forEach(function(it, i) {
-      var lt = (it.qty || 1) * (it.discPrice || it.price || 0);
-      total += lt;
-      csv += (i + 1) + ',' + (it.name || '').replace(/,/g, '-') + ',' + (it.model || '') + ',' + (it.qty || 1) + ',' + (it.price || 0) + ',' + lt + ',' + (it.note || '') + '\n';
-    });
-    csv += '\n,,,,,,TỔNG:,' + total + '\n';
-    return csv;
-  }
-  
-  function buildDeliveryCSV(cart) {
-    var csv = 'PHIẾU GIAO HÀNG\n\n';
-    csv += 'STT,Mã SP,Tên,SL,Đơn giá,Thành tiền\n';
-    var total = 0;
-    (cart || []).forEach(function(c, i) {
-      var price = Number(c.priceNum || 0) || 0;
-      var qty = Number(c.qty || 1);
-      var lt = price * qty;
-      total += lt;
-      csv += (i + 1) + ',' + (c.sku || '') + ',' + (c.name || '').replace(/,/g, '-') + ',' + qty + ',' + price + ',' + lt + '\n';
-    });
-    csv += '\n,,,,,TỔNG:,' + total + '\n';
-    return csv;
-  }
-  
-  // Build xlsx (async, called in background)
-  function buildXLSX(qd, cb) {
-    if (typeof ExcelJS === 'undefined') { cb(null); return; }
-    try {
+  // Build xlsx - trả về Promise
+  function buildXLSX(qd) {
+    return new Promise(function(resolve) {
+      if (!qd || !qd.items || !qd.items.length) { resolve(null); return; }
+      
       var wb = new ExcelJS.Workbook();
-      var ws = wb.addWorksheet('Báo Giá');
+      var ws = wb.addWorksheet('Báo giá');
       ws.columns = [
-        { width: 6 }, { width: 32 }, { width: 16 },
-        { width: 28 }, { width: 18 }, { width: 8 },
-        { width: 16 }, { width: 16 }, { width: 18 }, { width: 18 }
+        {width:6}, {width:32}, {width:16}, {width:25},
+        {width:18}, {width:8}, {width:15}, {width:15}, {width:18}, {width:18}
       ];
-      ws.mergeCells('A1:J1');
-      ws.getCell('A1').value = 'BÁO GIÁ V.AI STUDIO';
-      ws.getCell('A1').font = { bold: true, size: 16, color: { argb: 'FFDB9815' } };
       
-      var r = 3;
+      // Header
+      ws.mergeCells('A1:J1').value = 'BÁO GIÁ V.AI STUDIO';
+      ws.getCell('A1').font = {bold:true, size:16};
+      
+      // Dữ liệu
+      var r = 3, total = 0;
       (qd.items || []).forEach(function(it, i) {
         r++;
         var row = ws.getRow(r);
+        var qty = Number(it.qty || 1);
+        var price = Number(it.price || 0);
+        var discPrice = Number(it.discPrice || price);
+        var lineTotal = qty * discPrice;
+        total += lineTotal;
+        
         row.values = [
-          i + 1, '', it.name || '', it.model || '', it.specs || '',
-          it.qty || 1, it.price || 0, it.discPrice || it.price || 0,
-          (it.qty || 1) * (it.discPrice || it.price || 0), it.note || ''
+          i+1, it.name || '', it.model || '', it.specs || '', '',
+          qty, price, discPrice, lineTotal, it.note || ''
         ];
-        if (i % 2 === 1) {
-          for (var c = 1; c <= 10; c++) {
-            row.getCell(c).fill = { type: 'pattern', pattern: 'solid', fgColor: { argb: 'FFF8FAFC' } };
-          }
-        }
       });
       
-      var total = (qd.items || []).reduce(function(s, it) {
-        return s + (it.qty || 1) * (it.discPrice || it.price || 0);
-      }, 0);
+      // Tổng cộng
+      r++;
+      ws.mergeCells('A' + r + ':H' + r).value = 'TỔNG CỘNG';
+      ws.getCell('I' + r).value = total;
+      ws.getCell('I' + r).numFmt = '#,##0"đ"';
       
-      var tr = ws.getRow(++r);
-      ws.mergeCells('A' + r + ':I' + r);
-      tr.getCell(1).value = 'TỔNG CỘNG';
-      tr.getCell(1).font = { bold: true, size: 12 };
-      tr.getCell(9).value = total;
-      tr.getCell(9).numFmt = '#,##0"đ"';
-      tr.getCell(9).font = { bold: true, size: 12 };
-      
-      wb.xlsx.writeBuffer().then(cb).catch(cb);
-    } catch(e) { cb(null); }
-  }
-  
-  // Prebuild xlsx when modal opens (background, no gesture needed)
-  function prebuildQuote() {
-    var qd = getQuoteDataSafe();
-    if (!qd || !qd.items || !qd.items.length) return;
-    buildXLSX(qd, function(buf) {
-      if (buf) {
-        cache.quote = { buffer: buf, filename: (qd.customer.orderCode || 'BG') + '.xlsx' };
-        if (typeof showToast === 'function') {
-          showToast('✅ File Excel sẵn sàng! Bấm để tải');
-        }
-      }
+      wb.xlsx.writeBuffer().then(resolve).catch(resolve);
     });
   }
   
-  // OVERRIDE exportExcel - DOWNLOAD FIRST, TOAST AFTER
+  // EXPORT EXCEL - FIXED FOR DẤU CHẤM SPACE
   window.exportExcel = function() {
     var qd = getQuoteDataSafe();
+    var filename = (qd && qd.customer && qd.customer.orderCode ? qd.customer.orderCode : 'BG') + '.xlsx';
+    
+    // Check data
     if (!qd || !qd.items || !qd.items.length) {
       if (typeof showToast === 'function') showToast('⚠️ Không có sản phẩm');
+      else alert('Không có sản phẩm để xuất');
       return;
     }
     
-    var xlsxName = (qd.customer.orderCode || 'BG') + '.xlsx';
-    var csvName = xlsxName.replace('.xlsx', '.csv');
-    
-    // CACHE READY → download xlsx SYNC (guaranteed)
-    if (cache.quote && cache.quote.buffer) {
-      downloadSync(cache.quote.buffer, xlsxName);
-      if (typeof showToast === 'function') showToast('✅ Đã tải ' + xlsxName);
-      // Rebuild cache
-      prebuildQuote();
+    // Check ExcelJS
+    if (typeof ExcelJS === 'undefined') {
+      if (typeof showToast === 'function') showToast('⚠️ ExcelJS chưa tải');
+      else alert('Chưa tải được thư viện Excel');
       return;
     }
     
-    // NO CACHE → download CSV SYNC (guaranteed), build xlsx in background
-    downloadCSVSync(buildCSV(qd), csvName);
-    if (typeof showToast === 'function') showToast('⏳ Excel đang tạo... CSV đã tải');
-    prebuildQuote();
+    // Build xlsx rồi download
+    buildXLSX(qd).then(function(buf) {
+      if (!buf) {
+        if (typeof showToast === 'function') showToast('❌ Lỗi tạo file');
+        else alert('Lỗi tạo file Excel');
+        return;
+      }
+      downloadSync(buf, filename);
+      if (typeof showToast === 'function') showToast('✅ Đã tải ' + filename);
+    });
   };
   
-  // OVERRIDE exportDeliveryExcel
+  // EXPORT DELIVERY EXCEL
   window.exportDeliveryExcel = function() {
-    var cart = getCartSafe();
-    if (!cart || !cart.length) {
-      if (typeof showToast === 'function') showToast('⚠️ Giỏ trống');
+    var cart = window.cart || [];
+    var filename = 'Giao_hang.xlsx';
+    
+    if (!cart.length) {
+      if (typeof showToast === 'function') showToast('⚠️ Giỏ hàng trống');
+      else alert('Giỏ hàng trống');
       return;
     }
     
-    var name = 'Giao_hang.xlsx';
-    downloadCSVSync(buildDeliveryCSV(cart), name.replace('.xlsx', '.csv'));
-    if (typeof showToast === 'function') showToast('✅ Đã tải CSV giao hàng');
-  };
-  
-  // Hook openQuotation to start prebuilding
-  if (!window.__VAI_HOOKED_V81) {
-    var orig = window.openQuotation;
-    if (typeof orig === 'function') {
-      window.openQuotation = function() {
-        var r = orig.apply(this, arguments);
-        setTimeout(prebuildQuote, 300);
-        return r;
-      };
+    if (typeof ExcelJS === 'undefined') {
+      if (typeof showToast === 'function') showToast('⚠️ ExcelJS chưa tải');
+      return;
     }
-    window.__VAI_HOOKED_V81 = true;
-  }
+    
+    // Convert cart to quote format
+    var qd = {
+      items: (cart || []).map(function(c, i) {
+        var p = (window.D && window.D[c.idx]) ? window.D[c.idx] : {};
+        return {
+          stt: i + 1,
+          name: c.name || (p.name || p.n || ''),
+          model: c.sku || (p.sku || p.model || ''),
+          specs: '',
+          qty: c.qty || 1,
+          price: p.priceNum || c.priceNum || 0,
+          discPrice: p.priceNum || c.priceNum || 0
+        };
+      })
+    };
+    
+    buildXLSX(qd).then(function(buf) {
+      if (buf) {
+        downloadSync(buf, filename);
+        if (typeof showToast === 'function') showToast('✅ Đã tải ' + filename);
+      }
+    });
+  };
   
-  console.log('[VAI v8.1] Ready - SYNC download + cache');
+  console.log('[VAI FINAL] Excel export fixed');
 })();