fix: CK input on order-detail accepts % / k / tr like quote modal; all ?kh= discount links point to canonical bep40-vai-avatar.hf.space

index.html

@@ -556,9 +556,9 @@
     <script defer src="./src/cart-quote.js?gc=29"></script>    <!-- Cart + Quote module (Giỏ hàng / Báo giá) -->
     <script defer src="./src/customers.js?gc=15"></script>    <!-- Customer list (Danh sách khách hàng) -->
     <script defer src="./src/vaix-rag.js?gc=53"></script>    <!-- V.AI STUDIO RAG Module - loads FASTER via light index; lazy galleries; spec-aware search -->
-    <script defer src="./src/greeting-news.js?gc=36"></script>  <!-- Greeting HOT news cards + source links -->
+    <script defer src="./src/greeting-news.js?gc=37"></script>  <!-- Greeting HOT news cards + source links -->
     <script defer src="./src/order-sync.js?gc=16"></script>    <!-- Order sync with V.AISTUDIO backend -->
-    <script type="module" src="./src/app.js?gc=57"></script>
+    <script type="module" src="./src/app.js?gc=58"></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 -->

index.ts

@@ -1415,7 +1415,7 @@ const server = Bun.serve({
           const exp = Math.floor(Date.now() / 1000) + 3600;
           const crypto = await import("node:crypto");
           const tk = crypto.createHmac("sha256", secret).update(maKh + ":" + exp).digest("hex").slice(0, 24);
-          const link = url.origin + "/?kh=" + encodeURIComponent(maKh) + "&tk=" + tk + "&exp=" + exp;
+          const link = "https://bep40-vai-avatar.hf.space/?kh=" + encodeURIComponent(maKh) + "&tk=" + tk + "&exp=" + exp;
           const ck = rec.ck != null ? String(rec.ck) : null;
           return Response.json({ ok: true, kh: maKh, ck: ck, customer: rec.name || "", link: link });
         } catch (e: any) {

src/app.js

@@ -1153,7 +1153,7 @@ async function initDiscountLink() {
     const maKh = signed.kh;
     const ck = signed.ck != null ? String(signed.ck) : "";
     const custName = signed.customer || "";
-    const linkUrl = _servedLink || (location.origin + location.pathname + "?kh=" + encodeURIComponent(maKh) + "&tk=" + encodeURIComponent(signed.tk || "") + "&exp=" + encodeURIComponent(signed.exp || ""));
+    const linkUrl = _servedLink || ("https://bep40-vai-avatar.hf.space/?kh=" + encodeURIComponent(maKh) + "&tk=" + encodeURIComponent(signed.tk || "") + "&exp=" + encodeURIComponent(signed.exp || ""));
     _discountLink = { kh: maKh, url: linkUrl };
     _discountCustomer = { ma_kh: maKh, ck: ck, name: custName };
     // Remember the customer for the quote/order exports (customers.js format).

src/greeting-news.js

@@ -742,12 +742,40 @@
         var isEcoLine = false;
         try { isEcoLine = typeof window.isEcoKitchen === 'function' && window.isEcoKitchen({ name: item.name, title_clean: item.name, model: item.model || item.sku || '', sku: item.sku || '', slug: item.slug || '' }); } catch (_e) {}
         var discEl = ov.querySelector('[data-edit="disc"][data-idx="' + idx + '"]');
-        var val = isEcoLine ? (Number(item.price) || 0)
-          : ((discEl && discEl.value) ? (parseInt(String(discEl.value).replace(/[^\d]/g, ''), 10) || 0) : 0);
-        if (val <= 0) val = Number(item.price) || 0;
-        item.discPrice = val;
-        item.total = val * (Number(item.qty) || 1);
-        if (isEcoLine) item.ck_percent = undefined;
+        var raw = (discEl && discEl.value != null) ? String(discEl.value).trim() : '';
+        if (isEcoLine) {
+          // Force full list price.
+          item.discPrice = Number(item.price) || 0;
+          item.ck_percent = undefined;
+        } else {
+          // Accept BOTH absolute VND ("2.000.000", "2tr", "200k") AND a
+          // chiết khấu PERCENT ("35%", "35") — parity with the quote modal's
+          // CK input / __applyCkPercent. A % applies minus that percent off the
+          // line's listed price; otherwise the raw number is the discounted price.
+          var price = Number(item.price) || 0;
+          var hasUnit = /(k|tr|trieu|m|nghin)$/i.test(raw);
+          var isPct = /%/.test(raw) || (/^\s*\d+(?:[.,]\d+)?\s*$/.test(raw) && price > 0 && parseFloat(raw.replace(',', '.')) <= 100 && price / parseFloat(raw.replace(',', '.')) >= 10 && !hasUnit);
+          if (isPct) {
+            var pct = parseFloat(raw.replace('%', '').replace(',', '.'));
+            if (!(pct > 0 && pct <= 90)) pct = 0;
+            item.discPrice = Math.round(price * (1 - pct / 100));
+            item.ck_percent = pct;
+          } else {
+            var num = 0;
+            if (hasUnit) {
+              var unit2 = String(raw).match(/(k|tr|trieu|m|nghin)$/i);
+              num = parseFloat(String(raw).replace(/[^\d.]/g, '')) || 0;
+              if (unit2) { var us2 = unit2[1].toLowerCase(); if (us2 === 'k' || us2 === 'nghin') num *= 1000; else if (us2 === 'tr' || us2 === 'trieu' || us2 === 'm') num *= 1000000; }
+            } else {
+              num = parseFloat(String(raw).replace(/[.,](?=\d{3})/g, '').replace(/[^\d.]/g, ''));
+            }
+            if (!(num > 0)) num = price || 0;
+            item.discPrice = Math.round(num);
+            var pp = Math.round((1 - num / (price || 1)) * 100);
+            item.ck_percent = (price > 0 && pp > 0 && pp <= 90) ? pp : undefined;
+          }
+        }
+        item.total = item.discPrice * (Number(item.qty) || 1);
         recomputeTotals(ord);
         var li = list.findIndex(function (x) { return String(x.code) === String(order.code); });
         if (li >= 0) list[li] = ord; saveOrders(list);
@@ -757,7 +785,9 @@
         if (gt) gt.textContent = money(ord.grandTotal || ord.total || 0);
         var sll = ov.querySelector('#od-total-sll');
         if (sll) sll.textContent = (ord.items || []).reduce(function (a, it) { return a + (Number(it.qty) || 0); }, 0);
-        if (window.showToast) window.showToast('✅ Đã cập nhật CK');
+        // Reflect the (possibly %-normalised) discounted price back into the input.
+        if (discEl && !isEcoLine && item.discPrice > 0) discEl.value = item.discPrice.toLocaleString('vi-VN');
+        if (window.showToast) window.showToast('✅ Đã cập nhật CK' + (item.ck_percent ? ' ' + item.ck_percent + '%' : ''));
       } catch (e) { console.warn('[od] disc error:', e); }
     };
     // Parse an AI discount prompt like the quote modal (CK %, fees, cọc, ghi chú).