Skip to content

Commit e1376a9

Browse files
authored
Merge pull request #40 from touchmegit1:shift
delete: remove ShiftTicketCenter component and its associated logic
2 parents ce81655 + 17e7dfe commit e1376a9

File tree

8 files changed

+28
-1706
lines changed

8 files changed

+28
-1706
lines changed

backend/src/main/resources/data.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ INSERT INTO `audit_logs` VALUES (1,'LOGIN','{\"event\":\"seed login\"}','2026-03
387387
-- =============================================================================
388388
-- ADVERTISEMENTS & AD CONTRACTS
389389
-- =============================================================================
390-
INSERT INTO `advertisements` VALUES (1,'#ffffff','marketing@smalltrend.vn','Nguyễn Văn Marketing','0901-234-567','2026-12-31','AD-2026-LEFT-001','2026-01-01',5000000.00,'2026-03-18 01:40:09.000000','#4f46e5','Mua ngay','https://images.unsplash.com/photo-1607082348824-0a96f2a4b9da?w=400&q=80',0,'','Hợp đồng quảng cáo nội bộ, ưu tiên slot trái toàn năm 2026','Thanh toán hàng quý, net 30 ngày','LEFT','SmallTrend Brand','Ưu đãi cuối tuần cho mọi sản phẩm','Mega Sale 50% OFF','2026-03-19 15:39:05.966119'),(2,'#f0fdf4','ads@expressdelivery.vn','Trần Thị Logistics','0912-345-678','2026-06-30','AD-2026-RIGHT-001','2026-01-01',12000000.00,'2026-03-18 01:40:09.000000','#059669','Đặt ngay','https://images.unsplash.com/photo-1556742049-0cfed4f6a45d?w=400&q=80',0,'','Đối tác giao hàng nhanh khu vực HCM & Hà Nội. Hợp đồng gia hạn mỗi 6 tháng.','Thanh toán hàng tháng vào ngày 15','RIGHT','Express Delivery Partner','Đơn từ 200.000đ — giao trong 2h','Giao hàng miễn phí','2026-03-19 14:04:19.055381'),(3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2026-03-19 14:03:25.455314',NULL,NULL,'https://res.cloudinary.com/didvvefmu/image/upload/v1773928997/smalltrend/crm/ads/ymypqgpfxq3wvajk8ycq.jpg',0,NULL,NULL,NULL,'LEFT','KitKat',NULL,'KitKat- đn là mê','2026-03-19 14:03:25.455314'),(4,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2026-03-19 14:04:02.978638',NULL,NULL,'https://res.cloudinary.com/didvvefmu/image/upload/v1773929027/smalltrend/crm/ads/dhabu2yyxvfnse54t4ds.jpg',0,NULL,NULL,NULL,'RIGHT','HuyHandSome',NULL,'HotDog-Bữa sáng tốt lành cho mọi người','2026-03-19 14:04:02.978638');
390+
INSERT INTO `advertisements` (id,slot,sponsor_name,title,subtitle,image_url,link_url,cta_text,cta_color,bg_color,is_active,created_at,updated_at) VALUES (1,'LEFT','SmallTrend Brand','Mega Sale 50% OFF','Ưu đãi cuối tuần cho mọi sản phẩm','https://images.unsplash.com/photo-1607082348824-0a96f2a4b9da?w=400&q=80','','Mua ngay','#4f46e5','#ffffff',0,'2026-03-18 01:40:09.000000','2026-03-19 15:39:05.966119'),(2,'RIGHT','Express Delivery Partner','Giao hàng miễn phí','Đơn từ 200.000đ — giao trong 2h','https://images.unsplash.com/photo-1556742049-0cfed4f6a45d?w=400&q=80','','Đặt ngay','#059669','#f0fdf4',0,'2026-03-18 01:40:09.000000','2026-03-19 14:04:19.055381'),(3,'LEFT','KitKat','KitKat- đn là mê',NULL,'https://res.cloudinary.com/didvvefmu/image/upload/v1773928997/smalltrend/crm/ads/ymypqgpfxq3wvajk8ycq.jpg',NULL,NULL,NULL,NULL,0,'2026-03-19 14:03:25.455314','2026-03-19 14:03:25.455314'),(4,'RIGHT','HuyHandSome','HotDog-Bữa sáng tốt lành cho mọi người',NULL,'https://res.cloudinary.com/didvvefmu/image/upload/v1773929027/smalltrend/crm/ads/dhabu2yyxvfnse54t4ds.jpg',NULL,NULL,NULL,NULL,0,'2026-03-19 14:04:02.978638','2026-03-19 14:04:02.978638');
391391

392392

393393
-- =============================================================================

deploy/fix_seed.sql

Lines changed: 11 additions & 11 deletions
Large diffs are not rendered by default.

deploy/gen_fix_seed.js

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

deploy/scripts/reset-db-and-seed.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,14 @@ verify_core_counts() {
163163
SALE_ORDERS_COUNT="$(count_table sale_orders)"
164164
SALE_ORDER_ITEMS_COUNT="$(count_table sale_order_items)"
165165
SALE_ORDER_HISTORIES_COUNT="$(count_table sale_order_histories)"
166+
PURCHASE_ORDERS_COUNT="$(count_table purchase_orders)"
167+
INVENTORY_COUNTS_COUNT="$(count_table inventory_counts)"
168+
DISPOSAL_VOUCHERS_COUNT="$(count_table disposal_vouchers)"
169+
ADVERTISEMENTS_COUNT="$(count_table advertisements)"
166170
TICKETS_COUNT="$(count_table tickets)"
167171
LOYALTY_GIFTS_COUNT="$(count_table loyalty_gifts)"
168172
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"
173+
echo "purchase_orders=$PURCHASE_ORDERS_COUNT, inventory_counts=$INVENTORY_COUNTS_COUNT, disposal_vouchers=$DISPOSAL_VOUCHERS_COUNT, advertisements=$ADVERTISEMENTS_COUNT"
169174
}
170175

171176
verify_core_integrity() {
@@ -293,7 +298,7 @@ log "10/10" "Final verification"
293298
verify_core_counts
294299
verify_core_integrity
295300

296-
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
301+
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" ] || [ "$PURCHASE_ORDERS_COUNT" = "0" ] || [ "$INVENTORY_COUNTS_COUNT" = "0" ] || [ "$DISPOSAL_VOUCHERS_COUNT" = "0" ] || [ "$ADVERTISEMENTS_COUNT" = "0" ]; then
297302
log "ERROR" "Seed finished but one or more critical tables are empty."
298303
exit 1
299304
fi

0 commit comments

Comments
 (0)