Merge pull request #39 from touchmegit1:shift

xukki241 · web-flow · commit ce81655cf960 · 2026-03-29T05:02:28.000+07:00
feat: Update sidebar label for payroll section and enhance seed scripts with sale_order_histories count
diff --git a/backend/run-seed.cmd b/backend/run-seed.cmd
@@ -92,6 +92,7 @@ call :query_scalar "SELECT COUNT(*) FROM product_variants;" VARIANTS_COUNT
 call :query_scalar "SELECT COUNT(*) FROM inventory_stock;" STOCK_COUNT
 call :query_scalar "SELECT COUNT(*) FROM sale_orders;" SALE_ORDERS_COUNT
 call :query_scalar "SELECT COUNT(*) FROM sale_order_items;" SALE_ORDER_ITEMS_COUNT
+call :query_scalar "SELECT COUNT(*) FROM sale_order_histories;" SALE_ORDER_HISTORIES_COUNT
 call :query_scalar "SELECT COUNT(*) FROM tickets;" TICKETS_COUNT
 call :query_scalar "SELECT COUNT(*) FROM loyalty_gifts;" LOYALTY_GIFTS_COUNT
 call :query_scalar "SELECT COUNT(*) FROM product_variants pv LEFT JOIN products p ON p.id = pv.product_id LEFT JOIN units u ON u.id = pv.unit_id WHERE p.id IS NOT NULL AND u.id IS NOT NULL;" JOINABLE_VARIANTS_COUNT
@@ -105,6 +106,7 @@ if not defined VARIANTS_COUNT set "VARIANTS_COUNT=0"
 if not defined STOCK_COUNT set "STOCK_COUNT=0"
 if not defined SALE_ORDERS_COUNT set "SALE_ORDERS_COUNT=0"
 if not defined SALE_ORDER_ITEMS_COUNT set "SALE_ORDER_ITEMS_COUNT=0"
+if not defined SALE_ORDER_HISTORIES_COUNT set "SALE_ORDER_HISTORIES_COUNT=0"
 if not defined TICKETS_COUNT set "TICKETS_COUNT=0"
 if not defined LOYALTY_GIFTS_COUNT set "LOYALTY_GIFTS_COUNT=0"
 if not defined JOINABLE_VARIANTS_COUNT set "JOINABLE_VARIANTS_COUNT=0"
@@ -114,7 +116,7 @@ if not defined STOCKED_VARIANTS_COUNT set "STOCKED_VARIANTS_COUNT=0"
 
 echo [INFO] Seed verification counts:
 echo        users=%USERS_COUNT%, products=%PRODUCTS_COUNT%, variants=%VARIANTS_COUNT%, inventory_stock=%STOCK_COUNT%
-echo        sale_orders=%SALE_ORDERS_COUNT%, sale_order_items=%SALE_ORDER_ITEMS_COUNT%, tickets=%TICKETS_COUNT%, loyalty_gifts=%LOYALTY_GIFTS_COUNT%
+echo        sale_orders=%SALE_ORDERS_COUNT%, sale_order_items=%SALE_ORDER_ITEMS_COUNT%, sale_order_histories=%SALE_ORDER_HISTORIES_COUNT%, tickets=%TICKETS_COUNT%, loyalty_gifts=%LOYALTY_GIFTS_COUNT%
 echo        joinable_variants=%JOINABLE_VARIANTS_COUNT%, orphan_product_refs=%ORPHAN_PRODUCT_REFS%, orphan_unit_refs=%ORPHAN_UNIT_REFS%, stocked_variants=%STOCKED_VARIANTS_COUNT%
 
 if "%USERS_COUNT%"=="0" goto :seed_invalid
@@ -123,6 +125,7 @@ if "%VARIANTS_COUNT%"=="0" goto :seed_invalid
 if "%STOCK_COUNT%"=="0" goto :seed_invalid
 if "%SALE_ORDERS_COUNT%"=="0" goto :seed_invalid
 if "%SALE_ORDER_ITEMS_COUNT%"=="0" goto :seed_invalid
+if "%SALE_ORDER_HISTORIES_COUNT%"=="0" goto :seed_invalid
 if "%TICKETS_COUNT%"=="0" goto :seed_invalid
 if "%LOYALTY_GIFTS_COUNT%"=="0" goto :seed_invalid
 if "%JOINABLE_VARIANTS_COUNT%"=="0" goto :seed_invalid
diff --git a/deploy/fix_seed.sql b/deploy/fix_seed.sql
@@ -199,7 +199,7 @@ INSERT INTO `sale_orders` (id,created_at,discount_amount,notes,order_code,order_
 INSERT INTO `sale_order_items` (id,line_discount_amount,line_tax_amount,line_total_amount,notes,product_name,quantity,sku,unit_price,sale_order_id,product_variant_id) VALUES (2,0.00,2400.00,26400.00,NULL,'Oishi Snack',3,'OISHI-50G',8000.00,1,5),(3,2000.00,4800.00,52800.00,NULL,'Fresh Milk 1L',2,'VMILK-1L',25000.00,2,1),(4,3000.00,4500.00,46500.00,NULL,'Nescafe 3in1',1,'NESCAFE-200G',45000.00,2,3),(5,0.00,3000.00,33000.00,'1 sản phẩm bị lỗi vỏ hộp','Dove Soap 90g',2,'DOVE-90G',15000.00,3,2),(6,0.00,0.00,175000.00,'Migrated from legacy sales_order_items','Fresh Milk 1L',7,'VMILK-1L',25000.00,4,1),(7,0.00,0.00,95000.00,'Migrated from legacy sales_order_items','Dove Soap 90g',4,'DOVE-90G',23750.00,5,2),(8,0.00,0.00,57999.96,'Migrated from legacy sales_order_items','Nescafe 3in1',12,'NESCAFE-200G',4833.33,6,3),(10,0.00,0.00,67000.00,'Migrated from legacy sales_order_items','Oishi Snack',5,'OISHI-50G',13400.00,8,5),(12,0.00,0.00,24000.00,NULL,'Oishi Snack',3,'OISHI-50G',8000.00,9,5),(13,0.00,0.00,50000.00,NULL,'Fresh Milk 1L',2,'VMILK-1L',25000.00,10,1),(14,0.00,0.00,45000.00,NULL,'Nescafe 3in1',1,'NESCAFE-200G',45000.00,10,3),(15,0.00,0.00,30000.00,NULL,'Dove Soap 90g',2,'DOVE-90G',15000.00,11,2),(16,0.00,0.00,25000.00,NULL,'Fresh Milk 1L',1,'VMILK-1L',25000.00,12,1),(18,0.00,0.00,32000.00,NULL,'Oishi Snack',4,'OISHI-50G',8000.00,13,5),(20,0.00,0.00,15000.00,NULL,'Dove Soap 90g',1,'DOVE-90G',15000.00,14,2),(21,0.00,0.00,75000.00,NULL,'Fresh Milk 1L',3,'VMILK-1L',25000.00,15,1),(22,0.00,0.00,90000.00,NULL,'Nescafe 3in1',2,'NESCAFE-200G',45000.00,15,3),(23,0.00,0.00,40000.00,NULL,'Oishi Snack',5,'OISHI-50G',8000.00,16,5),(24,0.00,0.00,50000.00,NULL,'Fresh Milk 1L',2,'VMILK-1L',25000.00,17,1),(25,0.00,0.00,45000.00,NULL,'Dove Soap 90g',3,'DOVE-90G',15000.00,17,2);
 
 -- 20. SALE ORDER HISTORIES
-INSERT INTO `sale_order_histories` VALUES (1,'CREATED','Khởi tạo đơn tại POS-001','2026-02-24 09:30:00.000000',NULL,'PENDING',3,1),(2,'PAYMENT_SUCCESS','Thanh toán tiền mặt thành công','2026-02-24 09:31:00.000000','PENDING','COMPLETED',3,1),(3,'CREATED','Khởi tạo đơn tại POS-001','2026-02-24 19:20:00.000000',NULL,'PENDING',3,2),(4,'PAYMENT_SUCCESS','Thanh toán thẻ thành công','2026-02-24 19:23:00.000000','PENDING','COMPLETED',3,2),(5,'CREATED','Khởi tạo đơn tại POS-002','2026-02-25 20:10:00.000000',NULL,'PENDING',3,3),(6,'PAYMENT_SUCCESS','Thanh toán ví điện tử thành công','2026-02-25 20:15:00.000000','PENDING','COMPLETED',3,3),(7,'REFUND_PARTIAL','Khách trả lại sản phẩm lỗi','2026-02-25 21:00:00.000000','COMPLETED','REFUNDED',2,3);
+INSERT INTO `sale_order_histories` (id,action_type,change_notes,changed_at,from_status,to_status,changed_by_user_id,sale_order_id) VALUES (1,'CREATED','Khởi tạo đơn tại POS-001','2026-02-24 09:30:00.000000',NULL,'PENDING',3,1),(2,'PAYMENT_SUCCESS','Thanh toán tiền mặt thành công','2026-02-24 09:31:00.000000','PENDING','COMPLETED',3,1),(3,'CREATED','Khởi tạo đơn tại POS-001','2026-02-24 19:20:00.000000',NULL,'PENDING',3,2),(4,'PAYMENT_SUCCESS','Thanh toán thẻ thành công','2026-02-24 19:23:00.000000','PENDING','COMPLETED',3,2),(5,'CREATED','Khởi tạo đơn tại POS-002','2026-02-25 20:10:00.000000',NULL,'PENDING',3,3),(6,'PAYMENT_SUCCESS','Thanh toán ví điện tử thành công','2026-02-25 20:15:00.000000','PENDING','COMPLETED',3,3),(7,'REFUND_PARTIAL','Khách trả lại sản phẩm lỗi','2026-02-25 21:00:00.000000','COMPLETED','REFUNDED',2,3);
 
 -- 20.1 CASH TRANSACTIONS
 INSERT INTO `cash_transactions` (id,amount,transaction_time,balance_after,balance_before,created_at,description,notes,reason,receipt_image_url,status,transaction_code,approved_at,transaction_type,updated_at,register_id,approved_by,performed_by,order_id) VALUES (1,53900.00,'2026-02-24 09:35:00.000000',5053900.00,5000000.00,'2026-03-18 01:40:09.000000','Thu tiền mặt từ đơn SO-20260224-001','Đã đối soát cuối ca','SALE',NULL,'COMPLETED','CT-20260224-001','2026-02-24 09:31:00.000000','CASH_IN','2026-03-18 01:40:09.000000',2,1,3,1),(2,15000.00,'2026-02-25 21:05:00.000000',2985000.00,3000000.00,'2026-03-18 01:40:09.000000','Hoàn tiền mặt 1 phần cho đơn SO-20260225-001','Refund do sản phẩm lỗi','REFUND',NULL,'COMPLETED','CT-20260225-001','2026-02-25 21:00:00.000000','CASH_OUT','2026-03-18 01:40:09.000000',2,2,3,3);
diff --git a/deploy/gen_fix_seed.js b/deploy/gen_fix_seed.js
@@ -28,6 +28,7 @@ const COLUMN_MAPS = {
     "cash_registers": "id,created_at,max_cash_limit,device_id,current_cash,notes,location,total_card_today,total_cash_today,opening_balance,register_code,register_name,register_type,session_start_time,status,store_name,total_sales_today,total_transactions_today,variance,expected_balance,updated_at,last_transaction_time,current_operator_id",
     "sale_orders": "id,created_at,discount_amount,notes,order_code,order_date,payment_method,status,subtotal,tax_amount,total_amount,updated_at,cash_register_id,cashier_id,customer_id",
     "sale_order_items": "id,line_discount_amount,line_tax_amount,line_total_amount,notes,product_name,quantity,sku,unit_price,sale_order_id,product_variant_id",
+    "sale_order_histories": "id,action_type,change_notes,changed_at,from_status,to_status,changed_by_user_id,sale_order_id",
     "user_credentials": "id,password_hash,username,user_id",
     "purchase_order_items": "id,expiry_date,notes,quantity,received_quantity,total_cost,unit_price,variant_id,purchase_order_id"
 };
diff --git a/deploy/scripts/reset-db-and-seed.sh b/deploy/scripts/reset-db-and-seed.sh
@@ -162,9 +162,10 @@ verify_core_counts() {
   STOCK_COUNT="$(count_table inventory_stock)"
   SALE_ORDERS_COUNT="$(count_table sale_orders)"
   SALE_ORDER_ITEMS_COUNT="$(count_table sale_order_items)"
+  SALE_ORDER_HISTORIES_COUNT="$(count_table sale_order_histories)"
   TICKETS_COUNT="$(count_table tickets)"
   LOYALTY_GIFTS_COUNT="$(count_table loyalty_gifts)"
-  echo "users=$USERS_COUNT, products=$PRODUCTS_COUNT, variants=$VARIANTS_COUNT, inventory_stock=$STOCK_COUNT, sale_orders=$SALE_ORDERS_COUNT, sale_order_items=$SALE_ORDER_ITEMS_COUNT, tickets=$TICKETS_COUNT, loyalty_gifts=$LOYALTY_GIFTS_COUNT"
+  echo "users=$USERS_COUNT, products=$PRODUCTS_COUNT, variants=$VARIANTS_COUNT, inventory_stock=$STOCK_COUNT, sale_orders=$SALE_ORDERS_COUNT, sale_order_items=$SALE_ORDER_ITEMS_COUNT, sale_order_histories=$SALE_ORDER_HISTORIES_COUNT, tickets=$TICKETS_COUNT, loyalty_gifts=$LOYALTY_GIFTS_COUNT"
 }
 
 verify_core_integrity() {
@@ -292,7 +293,7 @@ log "10/10" "Final verification"
 verify_core_counts
 verify_core_integrity
 
-if [ "$USERS_COUNT" = "0" ] || [ "$PRODUCTS_COUNT" = "0" ] || [ "$VARIANTS_COUNT" = "0" ] || [ "$STOCK_COUNT" = "0" ] || [ "$SALE_ORDERS_COUNT" = "0" ] || [ "$SALE_ORDER_ITEMS_COUNT" = "0" ] || [ "$TICKETS_COUNT" = "0" ] || [ "$LOYALTY_GIFTS_COUNT" = "0" ]; then
+if [ "$USERS_COUNT" = "0" ] || [ "$PRODUCTS_COUNT" = "0" ] || [ "$VARIANTS_COUNT" = "0" ] || [ "$STOCK_COUNT" = "0" ] || [ "$SALE_ORDERS_COUNT" = "0" ] || [ "$SALE_ORDER_ITEMS_COUNT" = "0" ] || [ "$SALE_ORDER_HISTORIES_COUNT" = "0" ] || [ "$TICKETS_COUNT" = "0" ] || [ "$LOYALTY_GIFTS_COUNT" = "0" ]; then
   log "ERROR" "Seed finished but one or more critical tables are empty."
   exit 1
 fi
diff --git a/frontend/src/components/layout/Sidebar.jsx b/frontend/src/components/layout/Sidebar.jsx
@@ -93,13 +93,13 @@ const Sidebar = ({ collapsed, onToggleSidebar }) => {
       { label: "Lịch làm việc chung", path: "/hr/schedule" },
       { label: "Phân ca làm việc", path: "/hr/shifts" },
       { label: "Trung tâm ticket", path: "/hr/ticket-processing" },
-      { label: "Tổng hợp cá nhân & lương", path: "/hr/my-payroll" },
+      { label: "Lương của tôi", path: "/hr/my-payroll" },
     ]
     : [
       { label: "Lịch làm việc chung", path: "/hr/schedule" },
       { label: "Trung tâm ticket", path: "/hr/ticket-processing" },
       { label: "Chấm công", path: "/hr/my-attendance" },
-      { label: "Tổng hợp cá nhân & lương", path: "/hr/my-payroll" },
+      { label: "Lương của tôi", path: "/hr/my-payroll" },
     ];
 
   const navItems = showBusinessMenu
