Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

fix page_test_color (not toggle off & delay)
Update vending pre main to support v3 ui
2025-06-05 11:28:29 +07:00 · 2025-06-05 11:28:04 +07:00 · 2025-06-05 11:26:33 +07:00 · 2025-06-05 10:58:39 +07:00 · 2025-06-04 18:46:56 +07:00 · 2025-06-04 15:21:53 +07:00
191 changed files with 20047 additions and 30939 deletions
--- a/inter/aus/material_image/04-03-04-0002.jpeg
+++ b/inter/aus/material_image/04-03-04-0002.jpeg
--- a/inter/gbr/animation01/play_list.tsv
+++ b/inter/gbr/animation01/play_list.tsv
@ -211,7 +211,6 @@ HOT LYCHEE TEA	55-02-01-0019	1	11	16							24	100	19:40	32
 HOT GINGER TEA	55-02-01-0020	1	10								24	88	1:28	42
 HOT LIME \nGINGER TEA	55-02-01-0021	1	10	12							24	88	1:28	42
 Hot strawberry tea	55-02-01-0022	1	10	19							24	90	1:30	43
-Hot thai milk tea	55-02-01-0024	1	6	7	10						24	78	1:18	25
 Hot thai milk tea	55-02-01-0024	1	6	70	10						24	78	1:18	25
 Hot Taiwanese Tea	55-02-01-0025	1	6	7	10						24	90	1:30	29
 Hot matcha latte	55-02-01-0026	1	6	9	7	8					24	149	2:29	36
--- a/inter/gbr/image/page_drink_disable_n2/bn_Banana_Cheesecake_Royale_Banana_yuzu_Vanilla_Milk.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_Banana_Cheesecake_Royale_Banana_yuzu_Vanilla_Milk.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_COCONUT_AMERICANO.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_COCONUT_AMERICANO.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_COCONUT_CHOCOLATE_MILK.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_COCONUT_CHOCOLATE_MILK.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_COCONUT_JASMINE_MILK_TEA.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_COCONUT_JASMINE_MILK_TEA.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_COCONUT_LATTE.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_COCONUT_LATTE.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_COCONUT_LYCHEE_SODA.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_COCONUT_LYCHEE_SODA.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_COCONUT_MATCHA_LATTE.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_COCONUT_MATCHA_LATTE.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_COCONUT_MILK.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_COCONUT_MILK.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_COCONUT_PEPSI.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_COCONUT_PEPSI.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_COCONUT_SMOOTHIE.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_COCONUT_SMOOTHIE.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_COCONUT_SODA.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_COCONUT_SODA.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_COCONUT_THAI_BLACK_TEA.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_COCONUT_THAI_BLACK_TEA.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_COCONUT_THAI_MILK_TEA.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_COCONUT_THAI_MILK_TEA.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_Caramel_Cheesecake_Splendor_Caramel_yuzu_Vanilla_Milk.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_Caramel_Cheesecake_Splendor_Caramel_yuzu_Vanilla_Milk.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_Hot_Vanilla_Latte_Coffee_Vanilla_Milk.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_Hot_Vanilla_Latte_Coffee_Vanilla_Milk.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_Mint_Matcha_Latte.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_Mint_Matcha_Latte.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_Mint_Milk_Biscoff.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_Mint_Milk_Biscoff.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_Mint_Milk_Straw_Biscoff.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_Mint_Milk_Straw_Biscoff.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_Mint_Oreo_smoothie.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_Mint_Oreo_smoothie.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_Mint_Strawberry_Soda.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_Mint_Strawberry_Soda.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_Strawberry_smoothie_oreo.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_Strawberry_smoothie_oreo.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_Vanilla_caramel_latte.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_Vanilla_caramel_latte.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_Yuzu_americano.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_Yuzu_americano.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_hot_COCONUT_JASMINE_TEA.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_hot_COCONUT_JASMINE_TEA.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_hot_COCONUT_MATCHA_LATTE.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_hot_COCONUT_MATCHA_LATTE.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_hot_america_no.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_hot_america_no.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_hot_cappuccino.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_hot_cappuccino.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_hot_caramel_latte.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_hot_caramel_latte.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_hot_latte.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_hot_latte.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_hot_matcha_milk_tea.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_hot_matcha_milk_tea.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_hot_matcha_milk_tea_sing.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_hot_matcha_milk_tea_sing.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_hot_matcha_tea.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_hot_matcha_tea.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_hot_matcha_tea_sing.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_hot_matcha_tea_sing.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_hot_mocha.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_hot_mocha.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_iced_Lychee.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_iced_Lychee.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_iced_Lychee_soda.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_iced_Lychee_soda.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_iced_Strawberry_Matcha_Latte.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_iced_Strawberry_Matcha_Latte.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_iced_caramel_Biscoff.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_iced_caramel_Biscoff.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_iced_cocoa.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_iced_cocoa.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_iced_energy_drink_soda.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_iced_energy_drink_soda.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_iced_lemonade_soda.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_iced_lemonade_soda.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_iced_melon_soda.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_iced_melon_soda.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_iced_strawberry_soda.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_iced_strawberry_soda.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_iced_yuzu_soda.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_iced_yuzu_soda.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_jasmine_milk_tea.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_jasmine_milk_tea.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_limeblack_tea_SingPark.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_limeblack_tea_SingPark.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_melon_americano.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_melon_americano.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_protein_Chocolate.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_protein_Chocolate.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_protein_Mocha.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_protein_Mocha.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_smoothie_oreo.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_smoothie_oreo.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_thai_black_tea_SingPark.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_thai_black_tea_SingPark.png
--- a/inter/gbr/image/page_drink_disable_n2/bn_thai_milk_tea_SingPark.png
+++ b/inter/gbr/image/page_drink_disable_n2/bn_thai_milk_tea_SingPark.png
--- a/inter/gbr/image/page_drink_n/bn_COCONUT_LATTE.png
+++ b/inter/gbr/image/page_drink_n/bn_COCONUT_LATTE.png
--- a/inter/gbr/image/page_drink_n/bn_COCONUT_LYCHEE_SODA.png
+++ b/inter/gbr/image/page_drink_n/bn_COCONUT_LYCHEE_SODA.png
--- a/inter/gbr/image/page_drink_n/bn_COCONUT_MILK.png
+++ b/inter/gbr/image/page_drink_n/bn_COCONUT_MILK.png
--- a/inter/gbr/image/page_drink_n/bn_COCONUT_PEPSI.png
+++ b/inter/gbr/image/page_drink_n/bn_COCONUT_PEPSI.png
--- a/inter/gbr/image/page_drink_n/bn_COCONUT_SMOOTHIE.png
+++ b/inter/gbr/image/page_drink_n/bn_COCONUT_SMOOTHIE.png
--- a/inter/gbr/image/page_drink_n/bn_Mint_Matcha_Latte.png
+++ b/inter/gbr/image/page_drink_n/bn_Mint_Matcha_Latte.png
--- a/inter/gbr/image/page_drink_n/bn_Mint_Oreo_smoothie.png
+++ b/inter/gbr/image/page_drink_n/bn_Mint_Oreo_smoothie.png
--- a/inter/gbr/image/page_drink_n/bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png
+++ b/inter/gbr/image/page_drink_n/bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png
--- a/inter/gbr/image/page_drink_n/bn_Vanilla_caramel_latte.png
+++ b/inter/gbr/image/page_drink_n/bn_Vanilla_caramel_latte.png
--- a/inter/gbr/image/page_drink_n/bn_hot_COCONUT_JASMINE_TEA.png
+++ b/inter/gbr/image/page_drink_n/bn_hot_COCONUT_JASMINE_TEA.png
--- a/inter/gbr/image/page_drink_n/bn_hot_COCONUT_MATCHA_LATTE.png
+++ b/inter/gbr/image/page_drink_n/bn_hot_COCONUT_MATCHA_LATTE.png
--- a/inter/gbr/image/page_drink_n/bn_hot_america_no.png
+++ b/inter/gbr/image/page_drink_n/bn_hot_america_no.png
--- a/inter/gbr/image/page_drink_n/bn_hot_cappuccino.png
+++ b/inter/gbr/image/page_drink_n/bn_hot_cappuccino.png
--- a/inter/gbr/image/page_drink_n/bn_hot_caramel_latte.png
+++ b/inter/gbr/image/page_drink_n/bn_hot_caramel_latte.png
--- a/inter/gbr/image/page_drink_n/bn_hot_latte.png
+++ b/inter/gbr/image/page_drink_n/bn_hot_latte.png
--- a/inter/gbr/image/page_drink_n/bn_hot_matcha_milk_tea_sing.png
+++ b/inter/gbr/image/page_drink_n/bn_hot_matcha_milk_tea_sing.png
--- a/inter/gbr/image/page_drink_n/bn_hot_mocha.png
+++ b/inter/gbr/image/page_drink_n/bn_hot_mocha.png
--- a/inter/gbr/image/page_drink_n/bn_iced_Lychee.png
+++ b/inter/gbr/image/page_drink_n/bn_iced_Lychee.png
--- a/inter/gbr/image/page_drink_n/bn_iced_Lychee_soda.png
+++ b/inter/gbr/image/page_drink_n/bn_iced_Lychee_soda.png
--- a/inter/gbr/image/page_drink_n/bn_iced_Strawberry_Matcha_Latte.png
+++ b/inter/gbr/image/page_drink_n/bn_iced_Strawberry_Matcha_Latte.png
--- a/inter/gbr/image/page_drink_n/bn_iced_caramel_Biscoff.png
+++ b/inter/gbr/image/page_drink_n/bn_iced_caramel_Biscoff.png
--- a/inter/gbr/image/page_drink_n/bn_iced_cocoa.png
+++ b/inter/gbr/image/page_drink_n/bn_iced_cocoa.png
--- a/inter/gbr/image/page_drink_n/bn_iced_energy_drink_soda.png
+++ b/inter/gbr/image/page_drink_n/bn_iced_energy_drink_soda.png
--- a/inter/gbr/image/page_drink_n/bn_iced_lemonade_soda.png
+++ b/inter/gbr/image/page_drink_n/bn_iced_lemonade_soda.png
--- a/inter/gbr/image/page_drink_n/bn_iced_strawberry_soda.png
+++ b/inter/gbr/image/page_drink_n/bn_iced_strawberry_soda.png
--- a/inter/gbr/image/page_drink_n/bn_iced_strawberrycocoa_smoothie.png
+++ b/inter/gbr/image/page_drink_n/bn_iced_strawberrycocoa_smoothie.png
--- a/inter/gbr/image/page_drink_n/bn_jasmine_milk_tea.png
+++ b/inter/gbr/image/page_drink_n/bn_jasmine_milk_tea.png
--- a/inter/gbr/image/page_drink_n/bn_protein_Chocolate.png
+++ b/inter/gbr/image/page_drink_n/bn_protein_Chocolate.png
--- a/inter/gbr/image/page_drink_n/bn_protein_Mocha.png
+++ b/inter/gbr/image/page_drink_n/bn_protein_Mocha.png
--- a/inter/gbr/image/page_drink_n/bn_smoothie_oreo.png
+++ b/inter/gbr/image/page_drink_n/bn_smoothie_oreo.png
--- a/inter/gbr/image/page_drink_n/bn_thai_milk_tea_SingPark.png
+++ b/inter/gbr/image/page_drink_n/bn_thai_milk_tea_SingPark.png
--- a/inter/gbr/image/page_drink_picture2_n/bn_COCONUT_JASMINE_MILK_TEA.png
+++ b/inter/gbr/image/page_drink_picture2_n/bn_COCONUT_JASMINE_MILK_TEA.png
--- a/inter/gbr/image/page_drink_picture2_n/bn_COCONUT_LATTE.png
+++ b/inter/gbr/image/page_drink_picture2_n/bn_COCONUT_LATTE.png
--- a/inter/gbr/image/page_drink_picture2_n/bn_COCONUT_THAI_BLACK_TEA.png
+++ b/inter/gbr/image/page_drink_picture2_n/bn_COCONUT_THAI_BLACK_TEA.png
--- a/inter/gbr/image/page_drink_picture2_n/bn_Choc_caramel_crumble.png
+++ b/inter/gbr/image/page_drink_picture2_n/bn_Choc_caramel_crumble.png
--- a/inter/gbr/image/page_drink_picture2_n/bn_Mint_Matcha_Latte.png
+++ b/inter/gbr/image/page_drink_picture2_n/bn_Mint_Matcha_Latte.png
--- a/inter/gbr/image/page_drink_picture2_n/bn_Strawberry_smoothie_oreo.png
+++ b/inter/gbr/image/page_drink_picture2_n/bn_Strawberry_smoothie_oreo.png
--- a/inter/gbr/image/page_drink_picture2_n/bn_Vanilla_caramel_latte.png
+++ b/inter/gbr/image/page_drink_picture2_n/bn_Vanilla_caramel_latte.png
--- a/inter/gbr/image/page_drink_picture2_n/bn_hot_Vanilla_latte.png
+++ b/inter/gbr/image/page_drink_picture2_n/bn_hot_Vanilla_latte.png
--- a/Show more
+++ b/Show more
Author	SHA1	Message	Date
Pakin	ccbd8f8071	Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece	2025-06-05 11:28:29 +07:00
Pakin	0401484530	fix page_test_color (not toggle off & delay)	2025-06-05 11:28:04 +07:00
Pakin	3f3ee8dd82	Update vending pre main to support v3 ui	2025-06-05 11:26:33 +07:00
Kenta420	b95ef0b6a3	GBR: Update menus order	2025-06-05 10:58:39 +07:00
Kenta420	0d8603bfa6	GBR: Update Image show error	2025-06-04 18:46:56 +07:00
Kenta420	a288d5c174	THAI: Added SCROLL_TO_TOP to catalog layout v3	2025-06-04 15:21:53 +07:00
Kenta420	6f6944e05c	GBR: Changed menus images	2025-06-02 18:39:11 +07:00
Kenta420	0239198572	GBR: Changed payment service name AUB -> UKB	2025-06-02 17:48:55 +07:00
Kenta420	e31c6040f9	GBR: Regenerate xml remove blend menus	2025-06-02 17:27:50 +07:00
Kenta420	31b0e2167a	AUS: Changed material image	2025-05-30 17:32:17 +07:00
Pakin	a810d6baa6	DUBAI: hide oatmilk topping, fix cashless turn on cancel immediately after detect end then error	2025-05-30 14:18:07 +07:00
Pakin	1786d5a5ec	MYS: update promotion generate	2025-05-30 14:16:24 +07:00