diff --git a/image/event/image_template1 b/image/event/image_template1
index b05f02e1..a0c0c2cc 100644
--- a/image/event/image_template1
+++ b/image/event/image_template1
@@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/lipit/lipit_en.png
-normal_thai=ROOT/taobin_project/image/event/lipit/lipit_th.png
-press_eng=ROOT/taobin_project/image/event/lipit/lipit_en.png
-press_thai=ROOT/taobin_project/image/event/lipit/lipit_th.png
-disable_eng=ROOT/taobin_project/image/event/lipit/lipit_en.png
-disable_thai=ROOT/taobin_project/image/event/lipit/lipit_th.png
\ No newline at end of file
+normal_eng=ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_EN.png
+normal_thai=ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_TH.png
+press_eng=ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_EN.png
+press_thai=ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_TH.png
+disable_eng=ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_EN.png
+disable_thai=ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_TH.png
\ No newline at end of file
diff --git a/image/event/image_template2 b/image/event/image_template2
index 5c9181c7..81088725 100644
--- a/image/event/image_template2
+++ b/image/event/image_template2
@@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png
-normal_thai=ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png
-press_eng=ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png
-press_thai=ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png
-disable_eng=ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png
-disable_thai=ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png
+normal_eng=ROOT/taobin_project/image/event/coffee_drink_1_bath/1_baht_coffee_EN.png
+normal_thai=ROOT/taobin_project/image/event/coffee_drink_1_bath/1_baht_coffee_TH.png
+press_eng=ROOT/taobin_project/image/event/coffee_drink_1_bath/1_baht_coffee_EN.png
+press_thai=ROOT/taobin_project/image/event/coffee_drink_1_bath/1_baht_coffee_TH.png
+disable_eng=ROOT/taobin_project/image/event/coffee_drink_1_bath/1_baht_coffee_EN.png
+disable_thai=ROOT/taobin_project/image/event/coffee_drink_1_bath/1_baht_coffee_TH.png
\ No newline at end of file
diff --git a/inter/aus/xml/page_topping_select6.lxml b/inter/aus/xml/page_topping_select6.lxml
index 77064d2d..3a168119 100644
--- a/inter/aus/xml/page_topping_select6.lxml
+++ b/inter/aus/xml/page_topping_select6.lxml
@@ -483,7 +483,9 @@
Var text_show_normal_x = 408
Var text_show_blend_x = 872
Var SugarZeroCalPrice_X = 540
- Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3"
+ If BGSugar = "Enable" Then
+ Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3"
+ EndIf
EndIf
If LanguageShow = "THAI" Then
Var topping_shot_price_x = 600
diff --git a/xml/event/promotion_coffee_drink_1_bath.xml b/xml/event/promotion_coffee_drink_1_bath.xml
index 4e391213..ecd6a103 100644
--- a/xml/event/promotion_coffee_drink_1_bath.xml
+++ b/xml/event/promotion_coffee_drink_1_bath.xml
@@ -12525,6 +12525,510 @@ LIMENADE SODA"
text_unavailable
center-vertical-horizontal
+
+ ; - - -
+ ; ==================> Len = 12
+ ; - 12-05-03-0092
+
+ 33
+ 22
+ 225
+ 296
+ Flag( .Button,12-05-03-0092.Button,Disable=Invisible,$Sum1205030092)
+
+
+ 16
+ 164
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ "มะพร้าวน้ำหอมปั่น"
+
+
+ 16
+ 220
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ "น้ำเชื่อมมะพร้าว และน้ำ "
+
+
+ 16
+ 164
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ "Coconut smoothie"
+
+
+ 16
+ 220
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ "Coconut Syrup and Water"
+
+
+ 16
+ 264
+ Var( DirImage2 + "option_deactive.png" )
+
+
+ 16
+ 264
+ "Invisible"
+ Var( DirImage2 + "hot.png" )
+ Var( DirImage2 + "hot_db.png" )
+
+
+ 50
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ "Invisible"
+ StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 81
+ 264
+ Var( DirImage2 + "cold.png" )
+ Var( DirImage2 + "cold_db.png" )
+ "Invisible"
+
+
+ 115
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ "Invisible"
+ StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 146
+ 264
+ Var( DirImage2 + "blend.png" )
+ Var( DirImage2 + "blend_db.png" )
+ $12-05-03-0092.Button
+
+
+ 180
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitRegularTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-05-03-0092.Button
+ StringFmt( $12-05-03-0092.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 81
+ 264
+
+ eval(
+ If ICE_PROCESS_STATUS = 2 Then
+
+ Var ice_tab_process_show = "Invisible"
+
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+ Var return = ice_tab_process_show
+ )
+
+ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png"
+ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png"
+
+
+ 49
+ 117
+
+ eval(
+ If $Sum1205030092 = "Disable" Then
+ STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+ STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
+ STRCONTAIN "ERR" $12-05-03-0092.TAG tag3_is_disable
+ Var return = "Invisible"
+ If tag1_is_disable = "true" Then
+ Var return = "Enable"
+ EndIf
+ If tag2_is_disable = "true" Then
+ Var return = "Enable"
+ EndIf
+ If tag3_is_disable = "true" Then
+ Var return = "Enable"
+ EndIf
+ Else
+ Var return = "Invisible"
+ EndIf
+ )
+
+ "ROOT/taobin_project/image//img_menu_err2.png"
+
+
+ 84
+ 266
+ 10
+ OpunMediumTTF
+ 0xDE794E
+ ice_tab_process_show
+ ice_show_open
+
+
+ 48
+ 116
+ 32
+ 128
+ 64
+ MITRegularTTF
+ 0x5A5A5A
+ "disable-show"
+ $Sum1205030092
+ text_unavailable
+ center-vertical-horizontal
+
+
+ ; - - -
+ ; ==================> Len = 12
+ ; - 12-03-02-0058 12-03-03-0058
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-03-02-0058.Button,12-03-03-0058.Button,Disable=Invisible,$Sum12030200581203030058)
+
+
+ 16
+ 164
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ "มะพร้าวน้ำหอมปั่น
+นมนิวซีแลนด์"
+
+
+ 16
+ 220
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ "น้ำเชื่อมมะพร้าว นม และน้ำ "
+
+
+ 16
+ 164
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ "coconut milk"
+
+
+ 16
+ 220
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ "Coconut syrup, Milk,
+Water"
+
+
+ 16
+ 264
+ Var( DirImage2 + "option_deactive.png" )
+
+
+ 16
+ 264
+ "Invisible"
+ Var( DirImage2 + "hot.png" )
+ Var( DirImage2 + "hot_db.png" )
+
+
+ 50
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ "Invisible"
+ StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 81
+ 264
+ Var( DirImage2 + "cold.png" )
+ Var( DirImage2 + "cold_db.png" )
+ $12-03-02-0058.Button
+
+
+ 115
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-03-02-0058.Button
+ StringFmt( $12-03-02-0058.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 146
+ 264
+ Var( DirImage2 + "blend.png" )
+ Var( DirImage2 + "blend_db.png" )
+ $12-03-03-0058.Button
+
+
+ 180
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitRegularTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-03-03-0058.Button
+ StringFmt( $12-03-03-0058.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 81
+ 264
+
+ eval(
+ If ICE_PROCESS_STATUS = 2 Then
+
+ Var ice_tab_process_show = "Invisible"
+
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+ Var return = ice_tab_process_show
+ )
+
+ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png"
+ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png"
+
+
+ 49
+ 117
+
+ eval(
+ If $Sum12030200581203030058 = "Disable" Then
+ STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+ STRCONTAIN "ERR" $12-03-02-0058.TAG tag2_is_disable
+ STRCONTAIN "ERR" $12-03-03-0058.TAG tag3_is_disable
+ Var return = "Invisible"
+ If tag1_is_disable = "true" Then
+ Var return = "Enable"
+ EndIf
+ If tag2_is_disable = "true" Then
+ Var return = "Enable"
+ EndIf
+ If tag3_is_disable = "true" Then
+ Var return = "Enable"
+ EndIf
+ Else
+ Var return = "Invisible"
+ EndIf
+ )
+
+ "ROOT/taobin_project/image//img_menu_err2.png"
+
+
+ 84
+ 266
+ 10
+ OpunMediumTTF
+ 0xDE794E
+ ice_tab_process_show
+ ice_show_open
+
+
+ 48
+ 116
+ 32
+ 128
+ 64
+ MITRegularTTF
+ 0x5A5A5A
+ "disable-show"
+ $Sum12030200581203030058
+ text_unavailable
+ center-vertical-horizontal
+
; - - -
@@ -12556,27 +13060,27 @@ LIMENADE SODA"
eval(
If show_eng = "true" Then
- Var return = "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png"
+ Var return = "ROOT/taobin_project/image/event/coffee_drink_1_bath/1_baht_coffee_EN.png"
Else
- Var return = "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png"
+ Var return = "ROOT/taobin_project/image/event/coffee_drink_1_bath/1_baht_coffee_TH.png"
EndIf
)
eval(
If show_eng = "true" Then
- Var return = "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png"
+ Var return = "ROOT/taobin_project/image/event/coffee_drink_1_bath/1_baht_coffee_EN.png"
Else
- Var return = "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png"
+ Var return = "ROOT/taobin_project/image/event/coffee_drink_1_bath/1_baht_coffee_TH.png"
EndIf
)
eval(
If show_eng = "true" Then
- Var return = "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png"
+ Var return = "ROOT/taobin_project/image/event/coffee_drink_1_bath/1_baht_coffee_EN.png"
Else
- Var return = "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png"
+ Var return = "ROOT/taobin_project/image/event/coffee_drink_1_bath/1_baht_coffee_TH.png"
EndIf
)
diff --git a/xml/event/promotion_energy_drink_1_bath.xml b/xml/event/promotion_energy_drink_1_bath.xml
index 8da2c354..5e8d9315 100644
--- a/xml/event/promotion_energy_drink_1_bath.xml
+++ b/xml/event/promotion_energy_drink_1_bath.xml
@@ -12665,14 +12665,23 @@ LIMENADE SODA"
50
+<<<<<<< HEAD
265
14
+=======
+ TextPriceMenuY
+ TextPriceMenuSize
+>>>>>>> 66a34af8e1ecebd3e9b18141f9cf61b3628765c5
220
KanitMediumTTF
0x6F5F51
0xEAE6E1
"Invisible"
+<<<<<<< HEAD
Var( "฿" + $-.Price )
+=======
+ StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
+>>>>>>> 66a34af8e1ecebd3e9b18141f9cf61b3628765c5
81
@@ -12683,14 +12692,23 @@ LIMENADE SODA"
115
+<<<<<<< HEAD
265
14
+=======
+ TextPriceMenuY
+ TextPriceMenuSize
+>>>>>>> 66a34af8e1ecebd3e9b18141f9cf61b3628765c5
220
KanitMediumTTF
0x6F5F51
0xEAE6E1
"Invisible"
+<<<<<<< HEAD
Var( "฿" + $.Price )
+=======
+ StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) ; test
+>>>>>>> 66a34af8e1ecebd3e9b18141f9cf61b3628765c5
146
@@ -12700,6 +12718,7 @@ LIMENADE SODA"
$12-05-03-0092.Button
+<<<<<<< HEAD
183
264
14
@@ -12709,6 +12728,17 @@ LIMENADE SODA"
0xEAE6E1
$12-05-03-0092.Button
Var( "฿" + $12-05-03-0092.Price )
+=======
+ 180
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitRegularTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-05-03-0092.Button
+ StringFmt( $12-05-03-0092.Price , DisplayFormat, PreScaleConvertShow) ; test
+>>>>>>> 66a34af8e1ecebd3e9b18141f9cf61b3628765c5
81
@@ -12918,14 +12948,23 @@ Water"
50
+<<<<<<< HEAD
265
14
+=======
+ TextPriceMenuY
+ TextPriceMenuSize
+>>>>>>> 66a34af8e1ecebd3e9b18141f9cf61b3628765c5
220
KanitMediumTTF
0x6F5F51
0xEAE6E1
"Invisible"
+<<<<<<< HEAD
Var( "฿" + $-.Price )
+=======
+ StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
+>>>>>>> 66a34af8e1ecebd3e9b18141f9cf61b3628765c5
81
@@ -12936,14 +12975,23 @@ Water"
115
+<<<<<<< HEAD
265
14
+=======
+ TextPriceMenuY
+ TextPriceMenuSize
+>>>>>>> 66a34af8e1ecebd3e9b18141f9cf61b3628765c5
220
KanitMediumTTF
0x6F5F51
0xEAE6E1
$12-03-02-0058.Button
+<<<<<<< HEAD
Var( "฿" + $12-03-02-0058.Price )
+=======
+ StringFmt( $12-03-02-0058.Price , DisplayFormat, PreScaleConvertShow) ; test
+>>>>>>> 66a34af8e1ecebd3e9b18141f9cf61b3628765c5
146
@@ -12953,6 +13001,7 @@ Water"
$12-03-03-0058.Button
+<<<<<<< HEAD
183
264
14
@@ -12962,6 +13011,17 @@ Water"
0xEAE6E1
$12-03-03-0058.Button
Var( "฿" + $12-03-03-0058.Price )
+=======
+ 180
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitRegularTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-03-03-0058.Button
+ StringFmt( $12-03-03-0058.Price , DisplayFormat, PreScaleConvertShow) ; test
+>>>>>>> 66a34af8e1ecebd3e9b18141f9cf61b3628765c5
81
@@ -13052,6 +13112,92 @@ Water"
+
+
+
+ Var BigButtonEnable = "Enable"
+ Refresh
+
+
+ Var BigButtonEnable = "Invisible"
+ Refresh
+
+