FIX: CK formula shows *1 (should be *0.65) + Excel/PDF 2nd download blocked on Chrome

index.html

@@ -1680,7 +1680,8 @@ let blob=new Blob([csv],{type:'text/csv;charset=utf-8'});
 let url=URL.createObjectURL(blob);
 let a=document.createElement('a');
 a.href=url;a.download='BaoGia_VAI_STUDIO_'+today.replace(/\//g,'-')+'.csv';
-a.click();setTimeout(function(){URL.revokeObjectURL(url);},60000);
+window.open(url,'_blank');
+setTimeout(function(){URL.revokeObjectURL(url);},300000);
 showToast('Đã tải báo giá Excel!');
 }
 
@@ -1712,8 +1713,8 @@ function exportQuoteCSV(qd){
   let blob=new Blob([csv],{type:'text/csv;charset=utf-8'});
   let url=URL.createObjectURL(blob);
   let a=document.createElement('a');
-  a.href=url;a.download='BaoGia_'+(qd.customer.orderCode||'VAI_STUDIO')+'.csv';
-  a.click();setTimeout(function(){URL.revokeObjectURL(url);},60000);
+  window.open(url,'_blank');
+  setTimeout(function(){URL.revokeObjectURL(url);},300000);
   showToast('Đã xuất file CSV (mở bằng Excel)!');
 }
 function openQuotation(){
@@ -2045,6 +2046,13 @@ function _vaiExcelParseExtras(){
   txt.split(/[,;\n]+/).forEach(line=>{
     line=(line||'').trim();if(!line)return;
     let lo=line.toLowerCase().normalize('NFD').replace(/[\u0300-\u036f]/g,'').replace(/[đĐ]/g,'d');
+    // Brand-level CK: "Malloca CK 35%" - apply CK% globally for Excel formula
+    let brandCkLine = lo.match(/^([a-z][a-z0-9\s\-]{0,30}?)\s+(ck|chiet khau|giam|discount)\s*([\d.,]+)\s*%?/);
+    if(brandCkLine){
+      let v=parseFloat(brandCkLine[3].replace(/\./g,'').replace(',','.'));
+      if(v>0&&v<=100){out.discountPercent=v;out.brandCk=brandCkLine[1];return;}
+    }
+    // Global CK: "CK 35%" or "chiết khấu 30%"
     let ck=lo.match(/^(ck|chiet khau|giam|discount)\s*([\d.,]+)\s*%?/);
     if(ck){let v=parseFloat(ck[2].replace(/\./g,'').replace(',','.'));if(v>0&&v<=100)out.discountPercent=v;return;}
     if(/coc|dat coc|deposit/.test(lo)){
@@ -2191,7 +2199,7 @@ try{
   let buf=await wb.xlsx.writeBuffer();
   let blob=new Blob([buf],{type:'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'});
   let url=URL.createObjectURL(blob);
-  let a=document.createElement('a');a.href=url;a.download=(qd.customer.orderCode||'BG')+'.xlsx';a.click();setTimeout(function(){URL.revokeObjectURL(url);},60000);
+  window.open(url,'_blank');setTimeout(function(){URL.revokeObjectURL(url);},300000);
   showToast('Đã xuất file Excel số + công thức!');
 }catch(e){
   console.error('ExcelJS error:',e);
@@ -2653,8 +2661,8 @@ function exportDeliveryExcel(){
     let blob = new Blob([csv],{type:'text/csv;charset=utf-8'});
     let url = URL.createObjectURL(blob);
     let a = document.createElement('a');
-    a.href = url; a.download = 'Giao_hang_VAI_STUDIO_'+today.replace(/\//g,'-')+'.csv';
-    a.click(); setTimeout(function(){URL.revokeObjectURL(url);},60000);
+    window.open(url,'_blank');
+    setTimeout(function(){URL.revokeObjectURL(url);},300000);
     showToast('✅ Đã tải Excel giao hàng (CSV)!');
   } catch(e){showToast('❌ Xuất Excel thất bại: '+e.message);}
 }