Xóa sp mọi danh sách (admin), phân loại BIGSALE >=40% / FLASHSALE <40%, chatbox z-index khi kéo

big_sale.js

@@ -53,6 +53,12 @@ function formatVND(price) {
   if (isNaN(num)) return price;
   return new Intl.NumberFormat('vi-VN', { style: 'currency', currency: 'VND' }).format(num);
 }
+// Plain digit-group format WITHOUT currency symbol (for BIGSALE price fields).
+function fmtNum(n) {
+  const num = Number(n || 0);
+  if (!num) return '0';
+  return num.toLocaleString('vi-VN');
+}
 
 // Build a product card HTML string
 function buildProductCard(p) {
@@ -595,6 +601,35 @@ function loadBigSaleProducts(force) {
         // Admin explicitly emptied the BIGSALE list — respect it.
         BIG_SALE_PRODUCTS = [];
       }
+      // Auto-merge catalog products whose discount is >= 40% (BIGSALE tier).
+      // Tagged _auto:true so they are NOT deletable via the promo API.
+      try {
+        var cat = (window.vaix && typeof window.vaix.allProducts === 'function') ? window.vaix.allProducts() : [];
+        var normCode = function (s) { return String(s || '').trim().toUpperCase().replace(/\s+/g, ' '); };
+        var have = {};
+        for (var h = 0; h < BIG_SALE_PRODUCTS.length; h++) { var hk = normCode(BIG_SALE_PRODUCTS[h].code) || normCode(BIG_SALE_PRODUCTS[h].name); if (hk) have[hk] = 1; }
+        var added = 0;
+        for (var ci = 0; ci < cat.length && added < 30; ci++) {
+          var p2 = cat[ci];
+          if (p2._deleted || p2.deleted) continue;
+          var ln = Number(p2.listPn) || (p2.listPrice ? parseInt(String(p2.listPrice).replace(/[^\d]/g, ''), 10) : 0) || 0;
+          var sn = Number(p2.salePn) || (p2.salePrice ? parseInt(String(p2.salePrice).replace(/[^\d]/g, ''), 10) : 0) || Number(p2.priceNum) || 0;
+          if (!ln || !sn || ln <= sn) continue;
+          var disc = Math.round((ln - sn) / ln * 100);
+          if (disc < 40) continue;
+          var ck = normCode(p2.sku || p2.model || p2.code || '');
+          if (!ck) ck = normCode(p2.title_clean || p2.name || '');
+          if (!ck || have[ck]) continue;
+          have[ck] = 1;
+          BIG_SALE_PRODUCTS.push({
+            stt: BIG_SALE_PRODUCTS.length + 1, code: p2.sku || p2.model || p2.code || ck,
+            name: (p2.title_clean || p2.name || '').toUpperCase(), category: p2.category || p2.category_slug || '',
+            price: fmtNum(ln), bigsale: fmtNum(sn), discount: disc + '%', status: 'AUTO', image: p2.image || (p2.images && p2.images[0]) || '',
+            _auto: true
+          });
+          added++;
+        }
+      } catch (e) {}
       window.BIG_SALE_PRODUCTS = BIG_SALE_PRODUCTS;
       _bigsaleLoaded = true;
       refreshBigSalePanel();
@@ -682,6 +717,12 @@ function injectBigSaleAdminActions() {
       var card = cards[i];
       var code = card.getAttribute('data-code') || '';
       if (!code) continue;
+      // Auto-merged catalog items are NOT admin-managed → no delete button.
+      var isAuto = false;
+      for (var k = 0; k < BIG_SALE_PRODUCTS.length; k++) {
+        if (norm(BIG_SALE_PRODUCTS[k].code) === norm(code)) { isAuto = !!BIG_SALE_PRODUCTS[k]._auto; break; }
+      }
+      if (isAuto) continue;
       var actions = card.querySelector('.big-sale-card-actions');
       if (!actions || actions.querySelector('.bs-del-btn')) continue;
       var del = document.createElement('button');

index.html

@@ -758,18 +758,18 @@
          first paint — the welcome/avatar-picker modal renders immediately. -->
     <script defer src="./src/cart-quote.js?gc=33"></script>    <!-- Cart + Quote module (Giỏ hàng / Báo giá) -->
     <script defer src="./src/customers.js?gc=17"></script>    <!-- Customer list (Danh sách khách hàng) -->
-<script defer src="./src/vaix-rag.js?gc=57"></script>    <!-- V.AI STUDIO RAG Module - loads FASTER via light index; lazy galleries; spec-aware search -->
+<script defer src="./src/vaix-rag.js?gc=58"></script>    <!-- V.AI STUDIO RAG Module - loads FASTER via light index; lazy galleries; spec-aware search -->
 	    <script defer src="./src/greeting-news.js?gc=40"></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=59"></script>
+	    <script type="module" src="./src/app.js?gc=60"></script>
 	    <script defer src="./src/greeting-source-cards.js?gc=15"></script> <!-- FIX: Nguồn tin cards under greeting -->
 	    <script defer src="./src/avatar-picker.js?gc=13"></script> <!-- ✨ Circular avatar picker (Mr V / Lisamy) + loading progress bar -->
 	    <!-- BIG SALE Floating Promotion Module -->
-	    <script defer src="./big_sale.js?v=14"></script>
+	    <script defer src="./big_sale.js?v=15"></script>
 	    <!-- V.AI STUDIO Promo CMS (admin editor + BIGSALE/COMBO manager) -->
 	    <script defer src="./src/vaix-promo-cms.js?v=3"></script>
 	    <script defer src="./src/vaix-combo.js?v=5"></script>
-	    <script defer src="./src/vaix-flashsale.js?v=1"></script>
+	    <script defer src="./src/vaix-flashsale.js?v=2"></script>
 
     <script>
       // Wire the "Đơn hàng" buttons to the order modal

src/app.js

@@ -147,9 +147,9 @@ function clampRect(){const vw=innerWidth,vh=innerHeight,r=textChat.getBoundingCl
 function makeDraggable(){
   let d=false,sx,sy,sl,st;
   function gp(e){const p=e.changedTouches?e.changedTouches[0]:e;return{x:p.clientX,y:p.clientY}}
-  function os(e){if(e.target.closest("#chat-header-actions,#chat-avatar-select"))return;const p=gp(e);d=true;const r=textChat.getBoundingClientRect();sx=p.x;sy=p.y;sl=r.left;st=r.top;textChat.classList.add("dragging");e.preventDefault}
+  function os(e){if(e.target.closest("#chat-header-actions,#chat-avatar-select"))return;const p=gp(e);d=true;const r=textChat.getBoundingClientRect();sx=p.x;sy=p.y;sl=r.left;st=r.top;textChat.classList.add("dragging");textChat.style.zIndex="110020";e.preventDefault}
   function om(e){if(!d)return;const p=gp(e);textChat.style.left=(sl+p.x-sx)+"px";textChat.style.top=(st+p.y-sy)+"px";textChat.style.right="auto";textChat.style.bottom="auto";e.preventDefault}
-  function oe(){if(!d)return;d=false;textChat.classList.remove("dragging");clampRect()}
+  function oe(){if(!d)return;d=false;textChat.classList.remove("dragging");textChat.style.zIndex="";clampRect()}
   chatHeader.addEventListener("mousedown",os);document.addEventListener("mousemove",om);document.addEventListener("mouseup",oe);chatHeader.addEventListener("touchstart",os,{passive:false});document.addEventListener("touchmove",om,{passive:false});document.addEventListener("touchend",oe);
 }
 function makeResizable(){

src/vaix-flashsale.js

@@ -34,12 +34,15 @@
       var saleN = Number(p.salePn) || (p.salePrice ? parseInt(String(p.salePrice).replace(/[^\d]/g, ""), 10) : 0) || Number(p.priceNum) || 0;
       if (!listN || !saleN || listN <= saleN) continue;
       if (p._deleted || p.deleted) continue;
+      var disc = Math.round((listN - saleN) / listN * 100);
+      // BIGSALE takes discount >= 40%; FLASHSALE keeps only < 40%.
+      if (disc >= 40) continue;
       out.push({
         name: p.title_clean || p.name || p.title || "",
         code: p.sku || p.model || p.code || "",
         image: p.image || (p.images && p.images[0]) || "",
         listPn: listN, salePn: saleN,
-        discount: saleN ? Math.round((listN - saleN) / listN * 100) + "%" : "",
+        discountNum: disc, discount: disc + "%",
         slug: p.slug || "", catalog: true
       });
     }
@@ -70,9 +73,12 @@
         var listN = parseInt(String(b.price || "0").replace(/\./g, ""), 10) || 0;
         var saleN = parseInt(String(b.bigsale || "0").replace(/\./g, ""), 10) || 0;
         if (listN <= 0 || saleN <= 0 || listN <= saleN) continue;
+        var bdisc = Math.round((listN - saleN) / listN * 100);
+        // BIGSALE items are discount >= 40% → not FLASHSALE.
+        if (bdisc >= 40) continue;
         push({
           name: b.name, code: b.code, image: b.image || "", listPn: listN, salePn: saleN,
-          discount: b.discount || "", _fromBigSale: true
+          discountNum: bdisc, discount: bdisc + "%", _fromBigSale: true
         });
       }
     } catch (e) {}

src/vaix-rag.js

@@ -1772,9 +1772,10 @@ function renderPanelResults(products) {
       const adminBtns = document.createElement("div");
       adminBtns.className = "product-card-admin";
       adminBtns.style.cssText = "display:flex;gap:6px;margin-top:8px;flex-wrap:wrap";
-      // Delete button (admin only) — appears on admin-added products and
-      // permanently removes them from the shared dataset.
-      if (isAddedProduct) {
+      // Delete button (admin only) — appears on EVERY product card. For
+      // admin-added products it removes them from the shared dataset; for
+      // base catalog products it clears the promo-edit mirror (soft remove).
+      {
         const delBtn = document.createElement("button");
         delBtn.type = "button";
         delBtn.className = "product-card-btn del-btn";