v16: fix applyAiDiscount with phụ phí/cọc in quote + add +Giỏ/+Đơn buttons to AI search results

index.html

@@ -2041,18 +2041,19 @@ let btn=document.getElementById('aiDiscBtn');
 let statusEl=document.getElementById('aiDiscStatus');
 if(!txt){if(statusEl)statusEl.textContent='VD: Malloca ck 35%, Eurogold ck 50%, gov304190 giá 7tr';return}
 
-// Parse commands — split by comma, semicolon, or newline
 let commands=txt.split(/[,;\n]+/).map(c=>c.trim()).filter(c=>c.length>1);
 let results=[];
 let applied=0;
+let extraFee=0;
+let deposit=0;
+let depositPct=0;
 
-// Known brands for matching
 const BRANDS=['malloca','grob','canzy','eurogold','garis','demax','hafele','boss','teka','bosch'];
 
 commands.forEach(cmd=>{
   let cmdLow=cmd.toLowerCase().normalize('NFD').replace(/[\u0300-\u036f]/g,'').replace(/[đĐ]/g,'d');
   
-  // Pattern 1: [Brand] ck/giảm [X]% — brand-specific discount
+  // Pattern 1: [Brand] ck/giảm [X]%
   let brandCkMatch=cmdLow.match(/^(\w+)\s+(?:ck|chiet khau|giam|discount)\s*(\d+)\s*%?/);
   if(brandCkMatch){
     let brandName=brandCkMatch[1];
@@ -2075,62 +2076,70 @@ commands.forEach(cmd=>{
     }
   }
   
-  // Pattern 2: [Mã SP] giá [X] — fixed price for specific SKU
-  let skuPriceMatch=cmdLow.match(/^([a-z0-9_\-]+)\s+(?:gia|giá|price)\s*([\d.,]+)\s*(tr|trieu|k|m|nghin|nghìn)?/);
+  // Pattern 2: [Mã SP] giá [X]
+  let skuPriceMatch=cmdLow.match(/^([a-z0-9_\-]+)\s+(?:gia|price)\s*([\d.,]+)\s*(tr|trieu|k|m|nghin)?/);
   if(skuPriceMatch){
     let skuQuery=skuPriceMatch[1].replace(/[.\-_ ]/g,'');
     let priceVal=parseFloat(skuPriceMatch[2].replace(/\./g,'').replace(',','.'));
     let unit=(skuPriceMatch[3]||'').toLowerCase();
     if(unit==='tr'||unit==='trieu'||unit==='m')priceVal*=1000000;
-    else if(unit==='k'||unit==='nghin'||unit==='nghìn')priceVal*=1000;
-    else if(priceVal>0&&priceVal<500)priceVal*=1000000; // auto: dưới 500 → triệu
-    
+    else if(unit==='k'||unit==='nghin')priceVal*=1000;
+    else if(priceVal>0&&priceVal<500)priceVal*=1000000;
     if(priceVal>0){
       cart.forEach((c,i)=>{
-        let cSku=((c.sku||'')+(c.mod||'')).toLowerCase().replace(/[.\-_ ]/g,'');
+        let cSku=((c.sku||'')+(c.model||c.mod||'')).toLowerCase().replace(/[.\-_ ]/g,'');
         if(cSku.indexOf(skuQuery)!==-1||skuQuery.indexOf(cSku)!==-1){
           let el=document.querySelector('.qt-disc[data-idx="'+i+'"]');
-          if(el){el.value=priceVal.toLocaleString('vi-VN');applied++;results.push((c.sku||c.mod||skuQuery)+' → '+priceVal.toLocaleString('vi-VN')+'đ');}
+          if(el){el.value=priceVal.toLocaleString('vi-VN');applied++;results.push((c.sku||c.model||skuQuery)+' → '+priceVal.toLocaleString('vi-VN')+'đ');}
         }
       });
     }
     return;
   }
   
-  // Pattern 3: ck/giảm [X]% (tất cả) — global discount
+  // Pattern 3: ck/giảm [X]% (tất cả)
   let globalCkMatch=cmdLow.match(/(?:ck|chiet khau|giam|discount)\s*(\d+)\s*%/);
   if(globalCkMatch){
     let pct=parseFloat(globalCkMatch[1]);
     if(pct>0&&pct<=90){
+      let count=0;
       cart.forEach((c,i)=>{
         if(c.priceNum>0){
           let dp=Math.round(c.priceNum*(1-pct/100));
           let el=document.querySelector('.qt-disc[data-idx="'+i+'"]');
-          if(el){el.value=dp.toLocaleString('vi-VN');applied++;}
+          if(el){el.value=dp.toLocaleString('vi-VN');count++;}
         }
       });
-      results.push('CK '+pct+'% tất cả ('+applied+' SP)');
+      results.push('CK '+pct+'% tất cả ('+count+' SP)');applied+=count;
     }
     return;
   }
   
-  // Pattern 4: phụ phí / cọc
-  let feeMatch=cmdLow.match(/(?:phu phi|phi|fee)\s*([\d.,]+)\s*(k|tr|trieu|m|nghin)?/);
+  // Pattern 4: phụ phí
+  let feeMatch=cmdLow.match(/(?:phu phi|phi|fee|van chuyen|ship)\s*([\d.,]+)\s*(k|tr|trieu|m|nghin)?/);
   if(feeMatch){
     let fee=parseFloat(feeMatch[1].replace(/\./g,'').replace(',','.'));
     let u2=(feeMatch[2]||'').toLowerCase();
     if(u2==='k'||u2==='nghin')fee*=1000;
     else if(u2==='tr'||u2==='trieu'||u2==='m')fee*=1000000;
-    results.push('Phụ phí: '+fee.toLocaleString('vi-VN')+'đ');
+    else if(fee>0&&fee<500)fee*=1000;
+    extraFee+=fee;
+    results.push('Phụ phí: +'+fee.toLocaleString('vi-VN')+'đ');
     return;
   }
+  
+  // Pattern 5: cọc
   let cocMatch=cmdLow.match(/(?:coc|dat coc|deposit)\s*([\d.,]+)\s*(k|tr|trieu|%|m)?/);
   if(cocMatch){
     let cocVal=parseFloat(cocMatch[1].replace(/\./g,'').replace(',','.'));
     let cu=(cocMatch[2]||'').toLowerCase();
-    if(cu==='%'){results.push('Cọc: '+cocVal+'% tổng');}
-    else{
+    if(cu==='%'){
+      depositPct=cocVal;
+      results.push('Cọc: '+cocVal+'%');
+    }else{
       if(cu==='k')cocVal*=1000;else if(cu==='tr'||cu==='trieu'||cu==='m')cocVal*=1000000;
+      else if(cocVal>0&&cocVal<500)cocVal*=1000000;
+      deposit=cocVal;
       results.push('Cọc: '+cocVal.toLocaleString('vi-VN')+'đ');
     }
     return;
@@ -2138,9 +2147,47 @@ commands.forEach(cmd=>{
 });
 
 updateQuoteTotal();
+
+// Add phụ phí/cọc rows to quote footer
+let tfoot=document.querySelector('.quote-table tfoot');
+// Remove old extra rows
+document.querySelectorAll('.qt-extra-row').forEach(r=>r.remove());
+
+if(tfoot&&(extraFee>0||deposit>0||depositPct>0)){
+  let totalCell=document.getElementById('quoteTotalCell');
+  let totalVal=parseInt((totalCell?totalCell.textContent:'0').replace(/\D/g,''))||0;
+  let insertBefore=tfoot.querySelector('.quote-total-row');
+  
+  if(extraFee>0){
+    let feeRow=document.createElement('tr');
+    feeRow.className='qt-extra-row';
+    feeRow.innerHTML='<td colspan="8" style="text-align:right;padding-right:12px;font-size:.82rem;color:#64748b">Phụ phí:</td><td class="qt-price" style="font-size:.82rem;color:#e53935;font-weight:700">+'+extraFee.toLocaleString('vi-VN')+'đ</td><td></td>';
+    if(insertBefore)tfoot.insertBefore(feeRow,insertBefore);else tfoot.appendChild(feeRow);
+    totalVal+=extraFee;
+  }
+  
+  // Update total with fee
+  if(extraFee>0&&totalCell){
+    totalCell.textContent=totalVal.toLocaleString('vi-VN')+'đ';
+  }
+  
+  if(deposit>0||depositPct>0){
+    let cocAmt=deposit>0?deposit:Math.round(totalVal*depositPct/100);
+    let cocRow=document.createElement('tr');
+    cocRow.className='qt-extra-row';
+    cocRow.innerHTML='<td colspan="8" style="text-align:right;padding-right:12px;font-size:.82rem;color:#2563eb;font-weight:600">Đặt cọc'+(depositPct>0?' ('+depositPct+'%)':'')+':</td><td class="qt-price" style="font-size:.82rem;color:#2563eb;font-weight:700">'+cocAmt.toLocaleString('vi-VN')+'đ</td><td></td>';
+    tfoot.appendChild(cocRow);
+    
+    let remainRow=document.createElement('tr');
+    remainRow.className='qt-extra-row';
+    remainRow.innerHTML='<td colspan="8" style="text-align:right;padding-right:12px;font-size:.82rem;color:#059669;font-weight:600">Còn lại:</td><td class="qt-price" style="font-size:.82rem;color:#059669;font-weight:700">'+(totalVal-cocAmt).toLocaleString('vi-VN')+'đ</td><td></td>';
+    tfoot.appendChild(remainRow);
+  }
+}
+
 if(statusEl){
   if(results.length)statusEl.innerHTML='✅ '+results.join(' | ');
-  else statusEl.textContent='⚠️ Không nhận diện. VD: Malloca ck 35%, gov304190 giá 7tr, ck 20% tất cả';
+  else statusEl.textContent='⚠️ Không nhận diện. VD: Malloca ck 35%, gov304190 giá 7tr, phụ phí 500k, cọc 30%';
 }
 }
 
@@ -2834,10 +2881,9 @@ Miễn phí giao hàng trong TPHCM. | Giá đã bao gồm VAT.
   document.getElementById('aiResults').innerHTML='⏳ Đang tải dữ liệu...';document.getElementById('aiResults').style.display='block';
 }
 function _renderAIResults(prods,res){
-  var norm=window._vaiSearchContext?function(s){return(s||'').normalize('NFD').replace(/[\u0300-\u036f]/g,'').replace(/[Đđ]/g,'d').toLowerCase()}:function(s){return(s||'').toLowerCase()};
+  var fmt=function(n){if(!n||isNaN(n))return'LH';return Number(n).toLocaleString('vi-VN')+'đ'};
   var cat=window._vaiDetectCategory?window._vaiDetectCategory(document.getElementById('aiSearch').value):'';
   var brand=window._vaiDetectBrand?window._vaiDetectBrand(document.getElementById('aiSearch').value):'';
-  var fmt=function(n){if(!n||isNaN(n))return'LH';return Number(n).toLocaleString('vi-VN')+'đ'};
   var parts=[];
   if(cat)parts.push('📂 '+cat);if(brand)parts.push('🏷 '+brand);
   parts.push('🔍 '+prods.length+' SP');
@@ -2845,7 +2891,7 @@ function _renderAIResults(prods,res){
   h+='<div style="display:grid;grid-template-columns:repeat(auto-fill,minmax(170px,1fr));gap:10px">';
   prods.slice(0,24).forEach(function(p){
     var idx=D.indexOf(p);
-    var name=p.name||p.n||'';var price=p.price||p.p||'LH';var img=p.image||p.img||p.i||'';var sku=p.sku||p.model||p.mod||'';var brand2=p.brand||'';
+    var name=p.name||p.n||'';var price=p.price||p.p||'LH';var img=p.image||p.img||p.i||'';var sku=p.sku||p.model||p.mod||'';var brand2=p.brand||'';var slug=p.slug||'';
     var feats=(p.feats||[]).slice(0,2).join(' • ');
     var specs=p.specs||{};var sk=Object.entries(specs).slice(0,3);
     h+='<div style="background:#fff;border:1px solid #e2e8f0;border-radius:10px;overflow:hidden;transition:all .2s;cursor:pointer" onclick="showDetail('+idx+')" onmouseover="this.style.transform=\'translateY(-2px)\';this.style.boxShadow=\'0 4px 12px rgba(0,0,0,.1)\'" onmouseout="this.style.transform=\'\';this.style.boxShadow=\'\'">';
@@ -2856,6 +2902,11 @@ function _renderAIResults(prods,res){
     if(feats)h+='<div style="font-size:8.5px;color:#64748b;margin-top:2px;height:12px;overflow:hidden">'+feats+'</div>';
     if(sk.length){h+='<div style="margin-top:3px;font-size:8px;color:#555;border-top:1px solid #f0f0f0;padding-top:3px">';sk.forEach(function(kv){h+=kv[0]+': <b>'+kv[1]+'</b><br>'});h+='</div>'}
     h+='<div style="font-size:13px;font-weight:800;color:#059669;margin-top:4px">'+price+'</div>';
+    h+='</div>';
+    // Buttons: +Giỏ hàng + +Đơn
+    h+='<div style="display:flex;gap:4px;padding:0 6px 6px">';
+    h+='<button onclick="event.stopPropagation();if(typeof addToCart===\'function\')addToCart('+idx+')" style="flex:1;padding:4px;background:#db9815;color:#fff;border:none;border-radius:5px;font-size:9px;font-weight:700;cursor:pointer">+ Giỏ</button>';
+    h+='<button onclick="event.stopPropagation();window._vaiAddOrder(\''+slug+'\',this)" style="flex:1;padding:4px;background:#003f62;color:#fff;border:none;border-radius:5px;font-size:9px;font-weight:700;cursor:pointer">+ Đơn</button>';
     h+='</div></div>';
   });
   h+='</div>';res.innerHTML=h;