diff --git a/image/page_drink_disable_n2/bn_Matcha_Latte_Premium.png b/image/page_drink_disable_n2/bn_Matcha_Latte_Premium.png index 7d255093..40cead4b 100644 Binary files a/image/page_drink_disable_n2/bn_Matcha_Latte_Premium.png and b/image/page_drink_disable_n2/bn_Matcha_Latte_Premium.png differ diff --git a/image/page_drink_disable_n2/bn_Matcha_Latte_X3.png b/image/page_drink_disable_n2/bn_Matcha_Latte_X3.png index 30a47fcd..13758e04 100644 Binary files a/image/page_drink_disable_n2/bn_Matcha_Latte_X3.png and b/image/page_drink_disable_n2/bn_Matcha_Latte_X3.png differ diff --git a/image/page_drink_disable_n2/bn_PEPSI_LYCHEE.png b/image/page_drink_disable_n2/bn_PEPSI_LYCHEE.png index 12f4aee9..8ff187dc 100644 Binary files a/image/page_drink_disable_n2/bn_PEPSI_LYCHEE.png and b/image/page_drink_disable_n2/bn_PEPSI_LYCHEE.png differ diff --git a/image/page_drink_disable_n2/bn_PEPSI_YUZU.png b/image/page_drink_disable_n2/bn_PEPSI_YUZU.png index 074179eb..3556cb5f 100644 Binary files a/image/page_drink_disable_n2/bn_PEPSI_YUZU.png and b/image/page_drink_disable_n2/bn_PEPSI_YUZU.png differ diff --git a/image/page_drink_disable_n2/bn_Pepsi Caramel.png b/image/page_drink_disable_n2/bn_Pepsi Caramel.png deleted file mode 100644 index 43b5438b..00000000 Binary files a/image/page_drink_disable_n2/bn_Pepsi Caramel.png and /dev/null differ diff --git a/image/page_drink_disable_n2/bn_Pepsi_Caramel.png b/image/page_drink_disable_n2/bn_Pepsi_Caramel.png new file mode 100644 index 00000000..ecb234a5 Binary files /dev/null and b/image/page_drink_disable_n2/bn_Pepsi_Caramel.png differ diff --git a/image/page_drink_disable_n2/bn_Pepsi_Coconut.png b/image/page_drink_disable_n2/bn_Pepsi_Coconut.png index 54a7faf3..7668f93b 100644 Binary files a/image/page_drink_disable_n2/bn_Pepsi_Coconut.png and b/image/page_drink_disable_n2/bn_Pepsi_Coconut.png differ diff --git a/image/page_drink_disable_n2/bn_Pepsi_Lime.png b/image/page_drink_disable_n2/bn_Pepsi_Lime.png index b6f049c6..0d35ed3b 100644 Binary files a/image/page_drink_disable_n2/bn_Pepsi_Lime.png and b/image/page_drink_disable_n2/bn_Pepsi_Lime.png differ diff --git a/image/page_drink_disable_n2/bn_Pepsi_Strawberry.png b/image/page_drink_disable_n2/bn_Pepsi_Strawberry.png index f051cb2e..2fa1396b 100644 Binary files a/image/page_drink_disable_n2/bn_Pepsi_Strawberry.png and b/image/page_drink_disable_n2/bn_Pepsi_Strawberry.png differ diff --git a/image/page_drink_disable_n2/bn_Pepsi_Tropical.png b/image/page_drink_disable_n2/bn_Pepsi_Tropical.png index 643f182b..ff3ff436 100644 Binary files a/image/page_drink_disable_n2/bn_Pepsi_Tropical.png and b/image/page_drink_disable_n2/bn_Pepsi_Tropical.png differ diff --git a/image/page_drink_disable_n2/bn_Pure_Matcha_X3.png b/image/page_drink_disable_n2/bn_Pure_Matcha_X3.png index 270517af..0d6f466d 100644 Binary files a/image/page_drink_disable_n2/bn_Pure_Matcha_X3.png and b/image/page_drink_disable_n2/bn_Pure_Matcha_X3.png differ diff --git a/image/page_drink_disable_n2/bn_Yuzu_Caramel_Soda.png b/image/page_drink_disable_n2/bn_Yuzu_Caramel_Soda.png index a3cfa874..d8359ef1 100644 Binary files a/image/page_drink_disable_n2/bn_Yuzu_Caramel_Soda.png and b/image/page_drink_disable_n2/bn_Yuzu_Caramel_Soda.png differ diff --git a/image/page_drink_disable_n2/bn_Yuzu_Milk_Oreo_Volcano.png b/image/page_drink_disable_n2/bn_Yuzu_Milk_Oreo_Volcano.png index 31be2f58..49165a30 100644 Binary files a/image/page_drink_disable_n2/bn_Yuzu_Milk_Oreo_Volcano.png and b/image/page_drink_disable_n2/bn_Yuzu_Milk_Oreo_Volcano.png differ diff --git a/image/page_drink_n/bn_Matcha_Latte_Premium.png b/image/page_drink_n/bn_Matcha_Latte_Premium.png index 09e72c4b..c29b810c 100644 Binary files a/image/page_drink_n/bn_Matcha_Latte_Premium.png and b/image/page_drink_n/bn_Matcha_Latte_Premium.png differ diff --git a/image/page_drink_n/bn_Matcha_Latte_X3.png b/image/page_drink_n/bn_Matcha_Latte_X3.png index 3d8be959..0e27f7da 100644 Binary files a/image/page_drink_n/bn_Matcha_Latte_X3.png and b/image/page_drink_n/bn_Matcha_Latte_X3.png differ diff --git a/image/page_drink_n/bn_PEPSI_LYCHEE.png b/image/page_drink_n/bn_PEPSI_LYCHEE.png index 7184a32b..84238e8a 100644 Binary files a/image/page_drink_n/bn_PEPSI_LYCHEE.png and b/image/page_drink_n/bn_PEPSI_LYCHEE.png differ diff --git a/image/page_drink_n/bn_PEPSI_YUZU.png b/image/page_drink_n/bn_PEPSI_YUZU.png index eb332090..3e105944 100644 Binary files a/image/page_drink_n/bn_PEPSI_YUZU.png and b/image/page_drink_n/bn_PEPSI_YUZU.png differ diff --git a/image/page_drink_n/bn_Pepsi Caramel.png b/image/page_drink_n/bn_Pepsi Caramel.png deleted file mode 100644 index e5ee9a23..00000000 Binary files a/image/page_drink_n/bn_Pepsi Caramel.png and /dev/null differ diff --git a/image/page_drink_n/bn_Pepsi_Caramel.png b/image/page_drink_n/bn_Pepsi_Caramel.png new file mode 100644 index 00000000..5c990e1a Binary files /dev/null and b/image/page_drink_n/bn_Pepsi_Caramel.png differ diff --git a/image/page_drink_n/bn_Pepsi_Coconut.png b/image/page_drink_n/bn_Pepsi_Coconut.png index ba332b3d..9761dadd 100644 Binary files a/image/page_drink_n/bn_Pepsi_Coconut.png and b/image/page_drink_n/bn_Pepsi_Coconut.png differ diff --git a/image/page_drink_n/bn_Pepsi_Lime.png b/image/page_drink_n/bn_Pepsi_Lime.png index 60f34dcf..195cf7fa 100644 Binary files a/image/page_drink_n/bn_Pepsi_Lime.png and b/image/page_drink_n/bn_Pepsi_Lime.png differ diff --git a/image/page_drink_n/bn_Pepsi_Strawberry.png b/image/page_drink_n/bn_Pepsi_Strawberry.png index 9041b7f8..f7c5e187 100644 Binary files a/image/page_drink_n/bn_Pepsi_Strawberry.png and b/image/page_drink_n/bn_Pepsi_Strawberry.png differ diff --git a/image/page_drink_n/bn_Pepsi_Tropical.png b/image/page_drink_n/bn_Pepsi_Tropical.png index dbcf2a9a..d7a88ad6 100644 Binary files a/image/page_drink_n/bn_Pepsi_Tropical.png and b/image/page_drink_n/bn_Pepsi_Tropical.png differ diff --git a/image/page_drink_n/bn_Pure_Matcha_X3.png b/image/page_drink_n/bn_Pure_Matcha_X3.png index e9da796c..26f5f103 100644 Binary files a/image/page_drink_n/bn_Pure_Matcha_X3.png and b/image/page_drink_n/bn_Pure_Matcha_X3.png differ diff --git a/image/page_drink_n/bn_Yuzu_Caramel_Soda.png b/image/page_drink_n/bn_Yuzu_Caramel_Soda.png index a297ca0c..e2f57999 100644 Binary files a/image/page_drink_n/bn_Yuzu_Caramel_Soda.png and b/image/page_drink_n/bn_Yuzu_Caramel_Soda.png differ diff --git a/image/page_drink_n/bn_Yuzu_Milk_Oreo_Volcano.png b/image/page_drink_n/bn_Yuzu_Milk_Oreo_Volcano.png index fd922f26..b5a000ef 100644 Binary files a/image/page_drink_n/bn_Yuzu_Milk_Oreo_Volcano.png and b/image/page_drink_n/bn_Yuzu_Milk_Oreo_Volcano.png differ diff --git a/image/page_drink_picture2_n/bn_Matcha_Latte_Premium.png b/image/page_drink_picture2_n/bn_Matcha_Latte_Premium.png index bc9b51ba..6360d246 100644 Binary files a/image/page_drink_picture2_n/bn_Matcha_Latte_Premium.png and b/image/page_drink_picture2_n/bn_Matcha_Latte_Premium.png differ diff --git a/image/page_drink_picture2_n/bn_Matcha_Latte_X3.png b/image/page_drink_picture2_n/bn_Matcha_Latte_X3.png index b9f74ca1..195bf5ca 100644 Binary files a/image/page_drink_picture2_n/bn_Matcha_Latte_X3.png and b/image/page_drink_picture2_n/bn_Matcha_Latte_X3.png differ diff --git a/image/page_drink_picture2_n/bn_PEPSI_LYCHEE.png b/image/page_drink_picture2_n/bn_PEPSI_LYCHEE.png index f9320044..99171bc1 100644 Binary files a/image/page_drink_picture2_n/bn_PEPSI_LYCHEE.png and b/image/page_drink_picture2_n/bn_PEPSI_LYCHEE.png differ diff --git a/image/page_drink_picture2_n/bn_PEPSI_YUZU.png b/image/page_drink_picture2_n/bn_PEPSI_YUZU.png index 9e32027c..57b22abc 100644 Binary files a/image/page_drink_picture2_n/bn_PEPSI_YUZU.png and b/image/page_drink_picture2_n/bn_PEPSI_YUZU.png differ diff --git a/image/page_drink_picture2_n/bn_Pepsi Caramel.png b/image/page_drink_picture2_n/bn_Pepsi Caramel.png deleted file mode 100644 index cb216f14..00000000 Binary files a/image/page_drink_picture2_n/bn_Pepsi Caramel.png and /dev/null differ diff --git a/image/page_drink_picture2_n/bn_Pepsi_Caramel.png b/image/page_drink_picture2_n/bn_Pepsi_Caramel.png new file mode 100644 index 00000000..65f51322 Binary files /dev/null and b/image/page_drink_picture2_n/bn_Pepsi_Caramel.png differ diff --git a/image/page_drink_picture2_n/bn_Pepsi_Coconut.png b/image/page_drink_picture2_n/bn_Pepsi_Coconut.png index 89da87da..402df306 100644 Binary files a/image/page_drink_picture2_n/bn_Pepsi_Coconut.png and b/image/page_drink_picture2_n/bn_Pepsi_Coconut.png differ diff --git a/image/page_drink_picture2_n/bn_Pepsi_Lime.png b/image/page_drink_picture2_n/bn_Pepsi_Lime.png index c722e2b7..d1682e6d 100644 Binary files a/image/page_drink_picture2_n/bn_Pepsi_Lime.png and b/image/page_drink_picture2_n/bn_Pepsi_Lime.png differ diff --git a/image/page_drink_picture2_n/bn_Pepsi_Strawberry.png b/image/page_drink_picture2_n/bn_Pepsi_Strawberry.png index 63587701..c9ac4880 100644 Binary files a/image/page_drink_picture2_n/bn_Pepsi_Strawberry.png and b/image/page_drink_picture2_n/bn_Pepsi_Strawberry.png differ diff --git a/image/page_drink_picture2_n/bn_Pepsi_Tropical.png b/image/page_drink_picture2_n/bn_Pepsi_Tropical.png index 26aa6c54..01070a5c 100644 Binary files a/image/page_drink_picture2_n/bn_Pepsi_Tropical.png and b/image/page_drink_picture2_n/bn_Pepsi_Tropical.png differ diff --git a/image/page_drink_picture2_n/bn_Pure_Matcha_X3.png b/image/page_drink_picture2_n/bn_Pure_Matcha_X3.png index 2c0f56fd..97cb439c 100644 Binary files a/image/page_drink_picture2_n/bn_Pure_Matcha_X3.png and b/image/page_drink_picture2_n/bn_Pure_Matcha_X3.png differ diff --git a/image/page_drink_picture2_n/bn_Yuzu_Caramel_Soda.png b/image/page_drink_picture2_n/bn_Yuzu_Caramel_Soda.png index e54c1244..b98efd9c 100644 Binary files a/image/page_drink_picture2_n/bn_Yuzu_Caramel_Soda.png and b/image/page_drink_picture2_n/bn_Yuzu_Caramel_Soda.png differ diff --git a/image/page_drink_picture2_n/bn_Yuzu_Milk_Oreo_Volcano.png b/image/page_drink_picture2_n/bn_Yuzu_Milk_Oreo_Volcano.png index 102b747c..f8acb2d6 100644 Binary files a/image/page_drink_picture2_n/bn_Yuzu_Milk_Oreo_Volcano.png and b/image/page_drink_picture2_n/bn_Yuzu_Milk_Oreo_Volcano.png differ diff --git a/image/page_drink_press_n/bn_Matcha_Latte_Premium.png b/image/page_drink_press_n/bn_Matcha_Latte_Premium.png index 74793a27..c8ae4248 100644 Binary files a/image/page_drink_press_n/bn_Matcha_Latte_Premium.png and b/image/page_drink_press_n/bn_Matcha_Latte_Premium.png differ diff --git a/image/page_drink_press_n/bn_Matcha_Latte_X3.png b/image/page_drink_press_n/bn_Matcha_Latte_X3.png index 8f5bb76c..9f169dc4 100644 Binary files a/image/page_drink_press_n/bn_Matcha_Latte_X3.png and b/image/page_drink_press_n/bn_Matcha_Latte_X3.png differ diff --git a/image/page_drink_press_n/bn_PEPSI_LYCHEE.png b/image/page_drink_press_n/bn_PEPSI_LYCHEE.png index a91ad7cf..49b289b5 100644 Binary files a/image/page_drink_press_n/bn_PEPSI_LYCHEE.png and b/image/page_drink_press_n/bn_PEPSI_LYCHEE.png differ diff --git a/image/page_drink_press_n/bn_PEPSI_YUZU.png b/image/page_drink_press_n/bn_PEPSI_YUZU.png index 158629d5..29ecbda0 100644 Binary files a/image/page_drink_press_n/bn_PEPSI_YUZU.png and b/image/page_drink_press_n/bn_PEPSI_YUZU.png differ diff --git a/image/page_drink_press_n/bn_Pepsi Caramel.png b/image/page_drink_press_n/bn_Pepsi Caramel.png index 6dd5b755..fecd4b32 100644 Binary files a/image/page_drink_press_n/bn_Pepsi Caramel.png and b/image/page_drink_press_n/bn_Pepsi Caramel.png differ diff --git a/image/page_drink_press_n/bn_Pepsi_Caramel.png b/image/page_drink_press_n/bn_Pepsi_Caramel.png new file mode 100644 index 00000000..fecd4b32 Binary files /dev/null and b/image/page_drink_press_n/bn_Pepsi_Caramel.png differ diff --git a/image/page_drink_press_n/bn_Pepsi_Coconut.png b/image/page_drink_press_n/bn_Pepsi_Coconut.png index 662a5d52..ff576e7e 100644 Binary files a/image/page_drink_press_n/bn_Pepsi_Coconut.png and b/image/page_drink_press_n/bn_Pepsi_Coconut.png differ diff --git a/image/page_drink_press_n/bn_Pepsi_Lime.png b/image/page_drink_press_n/bn_Pepsi_Lime.png index 351369b1..ffd8c220 100644 Binary files a/image/page_drink_press_n/bn_Pepsi_Lime.png and b/image/page_drink_press_n/bn_Pepsi_Lime.png differ diff --git a/image/page_drink_press_n/bn_Pepsi_Strawberry.png b/image/page_drink_press_n/bn_Pepsi_Strawberry.png index 67f5c16e..9dc23e29 100644 Binary files a/image/page_drink_press_n/bn_Pepsi_Strawberry.png and b/image/page_drink_press_n/bn_Pepsi_Strawberry.png differ diff --git a/image/page_drink_press_n/bn_Pepsi_Tropical.png b/image/page_drink_press_n/bn_Pepsi_Tropical.png index 0d66f835..c5800ea3 100644 Binary files a/image/page_drink_press_n/bn_Pepsi_Tropical.png and b/image/page_drink_press_n/bn_Pepsi_Tropical.png differ diff --git a/image/page_drink_press_n/bn_Pure_Matcha_X3.png b/image/page_drink_press_n/bn_Pure_Matcha_X3.png index 099694ec..d59d32bc 100644 Binary files a/image/page_drink_press_n/bn_Pure_Matcha_X3.png and b/image/page_drink_press_n/bn_Pure_Matcha_X3.png differ diff --git a/image/page_drink_press_n/bn_Yuzu_Caramel_Soda.png b/image/page_drink_press_n/bn_Yuzu_Caramel_Soda.png index 39cc11ee..f82f5609 100644 Binary files a/image/page_drink_press_n/bn_Yuzu_Caramel_Soda.png and b/image/page_drink_press_n/bn_Yuzu_Caramel_Soda.png differ diff --git a/image/page_drink_press_n/bn_Yuzu_Milk_Oreo_Volcano.png b/image/page_drink_press_n/bn_Yuzu_Milk_Oreo_Volcano.png index 04eef6f5..3fe49827 100644 Binary files a/image/page_drink_press_n/bn_Yuzu_Milk_Oreo_Volcano.png and b/image/page_drink_press_n/bn_Yuzu_Milk_Oreo_Volcano.png differ diff --git a/inter/aus/material_image/17-01-01-0069.jpeg b/inter/aus/material_image/17-01-01-0069.jpeg new file mode 100644 index 00000000..d281f465 Binary files /dev/null and b/inter/aus/material_image/17-01-01-0069.jpeg differ diff --git a/inter/sgp/xml/page_drinkfail_sg.lxml b/inter/sgp/xml/page_drinkfail_sg.lxml index 1090f3c3..bc7ea423 100644 --- a/inter/sgp/xml/page_drinkfail_sg.lxml +++ b/inter/sgp/xml/page_drinkfail_sg.lxml @@ -188,7 +188,7 @@ EndIf 329 - 1301 + 1351 ShowQRByNoMember Var( DirImage + "/QR_contract.png" ) diff --git a/inter/tha/xml/multi/page_catalog.lxml b/inter/tha/xml/multi/page_catalog.lxml index 30bfdc9e..3d14e939 100644 --- a/inter/tha/xml/multi/page_catalog.lxml +++ b/inter/tha/xml/multi/page_catalog.lxml @@ -1047,7 +1047,7 @@ - 694 + 699 CustomCoffeeTextY KanitRegularTTF showCoffeeQuantity @@ -6106,7 +6125,8 @@ - 784 + "Enable" + CustomCoffeeQuantityTextX[1] CustomCoffeeTextY KanitRegularTTF showCoffeeQuantity @@ -6116,7 +6136,8 @@ - 892 + "Enable" + CustomCoffeeQuantityTextX[2] CustomCoffeeTextY KanitRegularTTF showCoffeeQuantity @@ -7907,10 +7928,10 @@ Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price1 EndIf If CustomCoffeeQuantityState[1] = "PressForever" Then - Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2 + Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price3 EndIf If CustomCoffeeQuantityState[2] = "PressForever" Then - Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price3 + Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price4 EndIf If CustomCoffeeLevelState[0] = "PressForever" Then