Thiết bị nhà bếp & khóa thông minh — Malloca, Eurogold, Grob, Canzy & Demax
+
+
+
Giỏ hàng
+
+
BẢNG BÁO GIÁ
Khách hàng:
STT
Hình
Tên SP
Mã SP
SL
Đơn giá
CK
Thành tiền
Ghi chú
+ Phí giao hàng:
+ Phí lắp đặt:
TỔNG CỘNG0đ
Đặt cọc: 0đ | Còn lại: 0đ
Ghi chú:
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/order-store.js b/order-store.js
index e7cab45833f8f066da52ab2c2b7bfd39a484a4dc..34402cd717c31113f407915500d3ee6be4767df9 100644
--- a/order-store.js
+++ b/order-store.js
@@ -1,13 +1,11 @@
/**
- * V.AI STUDIO — Order Store v19.3
- * FIX TRIỆT ĐỂ (v19.3):
+ * V.AI STUDIO — Order Store v19.2
+ * FIX TRIỆT ĐỂ (v19.2):
* - saveCurrentOrder: lưu date từ input khách hàng (không để trống ngày đơn)
* - orderToVAIData: productTotal = tổng tiền SP (KHÔNG trừ phí); lấy notes từ order.notes (ưu tiên) rồi qd.notes
* - openOrderDetail: thêm cột Ghi chú vào bảng; lấy date từ input; luôn recalc trước export
* - parsePrompt: 'Malloca ck 35%' detected as global discount; 'ghi chú: giao thứ 7' = note
* - exportExcel: Truyền đúng tham số d,qd,code,qr cho _doExportExcel (4 tham số)
- * - FIX: null-safe event handlers in render() — close button (#xc) and search panel (#od-sp-close, #od-sp-search)
- * - FIX BUG: modal close button on "Thêm sản phẩm" — use event delegation on modal so close works after innerHTML rebuild
*/
(function(){
'use strict';
@@ -62,10 +60,10 @@ function syncFromServer(){
});
if(added>0){
saveOrders(localOrders);
- console.log('[OS v19.3] ☁️ Synced '+added+' orders from server. Total local: '+localOrders.length);
+ console.log('[OS v19.2] ☁️ Synced '+added+' orders from server. Total local: '+localOrders.length);
}
}).catch(function(e){
- console.log('[OS v19.3] Server sync skip (bot may be sleeping)');
+ console.log('[OS v19.2] Server sync skip (bot may be sleeping)');
});
}
// Sync from server 3s after page load (give bot time to wake up)
@@ -81,7 +79,7 @@ function processQueue(){
var q=getQueue();if(!q.length)return;
var item=q[0];
fetch(KETOAN_API+item.endpoint,{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(item.payload)})
- .then(function(r){if(r.ok){q.shift();saveQueue(q);console.log('[OS v19.3] Queue sync OK: '+item.endpoint+' ('+q.length+' remaining)');if(q.length)setTimeout(processQueue,2000);}else throw new Error('HTTP '+r.status);})
+ .then(function(r){if(r.ok){q.shift();saveQueue(q);console.log('[OS v19.2] Queue sync OK: '+item.endpoint+' ('+q.length+' remaining)');if(q.length)setTimeout(processQueue,2000);}else throw new Error('HTTP '+r.status);})
.catch(function(){item.attempts=(item.attempts||0)+1;if(item.attempts>50){q.shift();}saveQueue(q);});
}
setInterval(processQueue,30000);
@@ -381,20 +379,15 @@ function openOrderDetail(order){
h+='
';
h+=renderSearchPanel();
h+='';modal.innerHTML=h;
- // FIX: null-safe event handlers after innerHTML rebuild — prevents close button failures
- var _xc=document.getElementById('xc');if(_xc)_xc.onclick=function(){ov.remove();};
+ document.getElementById('xc').onclick=function(){ov.remove();};
modal.querySelectorAll('.xd').forEach(function(b){b.onclick=function(e){e.stopPropagation();order.items.splice(parseInt(this.dataset.i),1);render();};});
- var _addSp=document.getElementById('od-add-sp');if(_addSp)_addSp.onclick=toggleSearchPanel;
- var _closeSp=document.getElementById('od-sp-close');if(_closeSp)_closeSp.onclick=function(){_searchOpen=false;render();};
- var _spSearch=document.getElementById('od-sp-search');if(_spSearch){_spSearch.oninput=function(){renderSearchResults();};_spSearch.onkeydown=function(e){if(e.key==='Escape'){_searchOpen=false;render();}};}
+ var addSpBtn=document.getElementById('od-add-sp');
+ if(addSpBtn){addSpBtn.onclick=toggleSearchPanel;}
+ var closeSpBtn=document.getElementById('od-sp-close');
+ if(closeSpBtn){closeSpBtn.onclick=function(){_searchOpen=false;render();};}
+ var searchInput=document.getElementById('od-sp-search');
+ if(searchInput){searchInput.oninput=function(){renderSearchResults();};searchInput.onkeydown=function(e){if(e.key==='Escape'){_searchOpen=false;render();}};}
if(_searchOpen){renderSearchResults();}
- // FIX BUG: close button on "Thêm sản phẩm" modal — use event delegation on modal
- // so close works even after innerHTML rebuilds the DOM
- modal.onclick=function(e){
- var t=e.target;
- if(t&&t.closest&&t.closest('#xc')){ov.remove();return;}
- if(t&&t.closest&&t.closest('#od-sp-close')){_searchOpen=false;render();return;}
- };
function cc(){
order.customer=document.getElementById('od-name').value;
order.phone=document.getElementById('od-phone').value;
@@ -431,5 +424,5 @@ var _mO=new MutationObserver(function(){setTimeout(injectMaKHToQuote,500);});_mO
window.VAI_ORDERS={save:saveCurrentOrder,search:searchOrders,openSearch:openSearchModal,openDetail:openOrderDetail,getAll:getOrders,getByCode:function(c){return getOrders().find(function(o){return o.code===c;});},add:addOrder,delete:deleteOrder,confirm:confirmOrder,unconfirm:unconfirmOrder,toVAIData:orderToVAIData,loadKH:loadKhachHang,findKH:findKH,processQueue:processQueue,syncFromServer:syncFromServer};
var qLen=getQueue().length;
-console.log('[OS v19.3] '+getOrders().length+' orders'+(qLen?' | ⏳ '+qLen+' pending sync':'')+' | ☁️ Server sync enabled | ➕ Add product to order enabled | FIX: exportExcel params + notes + CÒN LẠI 100% + date saved + modal close bug fix');
+console.log('[OS v19.2] '+getOrders().length+' orders'+(qLen?' | ⏳ '+qLen+' pending sync':'')+' | ☁️ Server sync enabled | ➕ Add product to order enabled | FIX: exportExcel params + notes + CÒN LẠI 100% + date saved');
})();
\ No newline at end of file
diff --git a/sync_products.py b/sync_products.py
deleted file mode 100644
index ead550e693899ca38bdb519e9bdd03bdede6a070..0000000000000000000000000000000000000000
--- a/sync_products.py
+++ /dev/null
@@ -1,152 +0,0 @@
-#!/usr/bin/env python3
-"""
-Product Auto-Sync Script — bep40/V.AISTUDIO ↔ bep40/vai-avatar2
-Mục đích: Tự động so sánh và cập nhật sản phẩm từ bep40/grob-products-updated dataset
-"""
-import json
-import os
-import sys
-from datetime import datetime, timezone
-
-try:
- from huggingface_hub import HfApi, hf_hub_download
-except ImportError:
- print("Installing huggingface_hub...")
- os.system(f"{sys.executable} -m pip install huggingface_hub --quiet")
- from huggingface_hub import HfApi, hf_hub_download
-
-def log(msg, level="INFO"):
- ts = datetime.now(timezone.utc).strftime("%Y-%m-%d %H:%M:%S UTC")
- print(f"[{level}] [{ts}] {msg}", flush=True)
-
-def slug_id(p):
- for key in ("slug", "_source_alias", "sku", "mod", "model"):
- val = p.get(key)
- if val and str(val).strip():
- return str(val).strip().lower()
- return ""
-
-def load_dataset():
- api = HfApi()
- try:
- path = hf_hub_download(repo_id="bep40/grob-products-updated", filename="products_with_slugs.json", repo_type="dataset")
- with open(path, 'r', encoding='utf-8') as f:
- products = json.load(f)
- log(f"Loaded {len(products)} products from grob-products-updated dataset")
- return products
- except Exception as e:
- log(f"Failed to load dataset: {e}", "ERROR")
- return []
-
-def get_space_slugs(api, space_id):
- slugs = set()
- candidates = ["products_with_slugs.json", "vaix-products.json"]
- for fname in candidates:
- try:
- path = hf_hub_download(repo_id=space_id, repo_type="space", filename=fname)
- with open(path, 'r', encoding='utf-8') as f:
- content = f.read()
- if fname.endswith('.js'):
- import re
- match = re.search(r'\[.*\]', content, re.DOTALL | re.IGNORECASE)
- if match:
- items = json.loads(match.group())
- for item in items:
- sid = slug_id(item)
- if sid: slugs.add(sid)
- else:
- items = json.loads(content)
- for item in items:
- sid = slug_id(item)
- if sid: slugs.add(sid)
- if slugs:
- log(f"Found {len(slugs)} slugs in {space_id}/{fname}")
- break
- except:
- continue
- return slugs
-
-def sync_to_space(api, space_id, products, products_list=None):
- """Sync a single space."""
- if isinstance(products, dict):
- product_list = products_list or []
- else:
- product_list = products
-
- payload = json.dumps(product_list, ensure_ascii=False, indent=2).encode('utf-8') if isinstance(product_list, list) else products.encode('utf-8') if isinstance(products, bytes) else json.dumps(products, ensure_ascii=False, indent=2).encode('utf-8')
-
- api.upload_file(
- path_or_fileobj=payload,
- path_in_repo="products_with_slugs.json",
- repo_id=space_id,
- repo_type="space",
- commit_message=f"[AUTO-SYNC] Update products ({len(product_list) if isinstance(product_list, list) else len(json.loads(payload))} items)"
- )
- log(f"Updated {space_id}")
- return True
-
-def sync_api_response(api, space_id, products_list=None):
- """API Response mode for /api/vaix/json endpoint."""
- payload = json.dumps(products_list, ensure_ascii=False, indent=2).encode('utf-8')
- api.upload_file(
- path_or_fileobj=payload,
- path_in_repo="/api/vaix/json",
- repo_id=space_id,
- repo_type="space",
- commit_message=f"[AUTO-SYNC] Update /api/vaix/json ({len(products_list)} items)"
- )
- log(f"Updated /api/vaix/json in {space_id}")
- return True
-
-def trigger_rebuild(api, space_id):
- ts = datetime.now(timezone.utc).isoformat()
- content = f"# Sync rebuild at {ts}\nSpace: {space_id}\nSource: bep40/grob-products-updated\n"
- flag = ".cache_bust" if "avatar" in space_id else "build-trigger"
- try:
- api.upload_file(
- path_or_fileobj=content.encode('utf-8'),
- path_in_repo=flag,
- repo_id=space_id,
- repo_type="space",
- commit_message=f"[SYNC] Rebuild at {ts}"
- )
- log(f"Rebuild triggered for {space_id}")
- except:
- pass
-
-def main():
- log("=" * 50)
- log("V.AISTUDIO ↔ vai-avatar2 Auto-Sync")
- log("=" * 50)
-
- api = HfApi()
-
- products = load_dataset()
- if not products:
- log("No products loaded", "ERROR")
- sys.exit(1)
-
- total_prods = len(products)
- prods_list = products if isinstance(products, list) else [products] if products else []
-
- # Update V.AISTUDIO with full products list
- log("\n=== Updating V.AISTUDIO ===")
- sync_to_space(api, "bep40/V.AISTUDIO", prods_list, prods_list)
- trigger_rebuild(api, "bep40/V.AISTUDIO")
-
- # Also update /api/vaix/json for API endpoint compatibility
- sync_api_response(api, "bep40/V.AISTUDIO", prods_list)
-
- # Update vai-avatar2
- log("\n=== Updating vai-avatar2 ===")
- sync_to_space(api, "bep40/vai-avatar2", prods_list, prods_list)
- trigger_rebuild(api, "bep40/vai-avatar2")
-
- # Also update /api/vaix/json for API endpoint compatibility
- sync_api_response(api, "bep40/vai-avatar2", prods_list)
-
- log(f"\n✅ Sync complete — Updated both spaces with {total_prods} products!")
- log("=" * 50)
-
-if __name__ == "__main__":
- main()
\ No newline at end of file
+