Do topping

2021-09-21 23:59:04 +07:00 · 2021-09-21 23:59:04 +07:00 · 854945c955
commit 854945c955
parent 59558bed81
106 changed files with 477 additions and 431 deletions
--- a/image/page2/bn_soda_coke.png
+++ b/image/page2/bn_soda_coke.png
--- a/image/page2/bp_soda_coke.png
+++ b/image/page2/bp_soda_coke.png
--- a/image/page2_en/page2/bn_soda_coke.png
+++ b/image/page2_en/page2/bn_soda_coke.png
--- a/image/page2_en/page2/bp_soda_coke.png
+++ b/image/page2_en/page2/bp_soda_coke.png
--- a/image/topping2/bd_lid.png
+++ b/image/topping2/bd_lid.png
--- a/image/topping2/bd_straw.png
+++ b/image/topping2/bd_straw.png
--- a/image/topping2/bg_add_shot.png
+++ b/image/topping2/bg_add_shot.png
--- a/image/topping2/bg_add_shot_coffee2_only.png
+++ b/image/topping2/bg_add_shot_coffee2_only.png
--- a/image/topping2/bg_add_shot_coffee_only.png
+++ b/image/topping2/bg_add_shot_coffee_only.png
--- a/image/topping2/bg_blended.png
+++ b/image/topping2/bg_blended.png
--- a/image/topping2/bg_lid_only.png
+++ b/image/topping2/bg_lid_only.png
--- a/image/topping2/bg_straw_only.png
+++ b/image/topping2/bg_straw_only.png
--- a/image/topping2/bg_strawlid.png
+++ b/image/topping2/bg_strawlid.png
--- a/image/topping2/bg_sugar.png
+++ b/image/topping2/bg_sugar.png
--- a/image/topping2/bn_add.png
+++ b/image/topping2/bn_add.png
--- a/image/topping2/bn_add_Honey.png
+++ b/image/topping2/bn_add_Honey.png
--- a/image/topping2/bn_add_bubble.png
+++ b/image/topping2/bn_add_bubble.png
--- a/image/topping2/bn_add_shot.png
+++ b/image/topping2/bn_add_shot.png
--- a/image/topping2/bn_add_shot2.png
+++ b/image/topping2/bn_add_shot2.png
--- a/image/topping2/bn_blended.png
+++ b/image/topping2/bn_blended.png
--- a/image/topping2/bn_cancel.png
+++ b/image/topping2/bn_cancel.png
--- a/image/topping2/bn_lid.png
+++ b/image/topping2/bn_lid.png
--- a/image/topping2/bn_next.png
+++ b/image/topping2/bn_next.png
--- a/image/topping2/bn_normal_sugar.png
+++ b/image/topping2/bn_normal_sugar.png
--- a/image/topping2/bn_straw.png
+++ b/image/topping2/bn_straw.png
--- a/image/topping2/bn_sugar1.png
+++ b/image/topping2/bn_sugar1.png
--- a/image/topping2/bn_sugar2.png
+++ b/image/topping2/bn_sugar2.png
--- a/image/topping2/bn_sugar3.png
+++ b/image/topping2/bn_sugar3.png
--- a/image/topping2/bn_sugar4.png
+++ b/image/topping2/bn_sugar4.png
--- a/image/topping2/bn_sugar5.png
+++ b/image/topping2/bn_sugar5.png
--- a/image/topping2/bn_sugar_zero_cal.png
+++ b/image/topping2/bn_sugar_zero_cal.png
--- a/image/topping2/bp_add.png
+++ b/image/topping2/bp_add.png
--- a/image/topping2/bp_add_Honey.png
+++ b/image/topping2/bp_add_Honey.png
--- a/image/topping2/bp_add_bubble.png
+++ b/image/topping2/bp_add_bubble.png
--- a/image/topping2/bp_add_shot.png
+++ b/image/topping2/bp_add_shot.png
--- a/image/topping2/bp_add_shot2.png
+++ b/image/topping2/bp_add_shot2.png
--- a/image/topping2/bp_blended.png
+++ b/image/topping2/bp_blended.png
--- a/image/topping2/bp_cancel.png
+++ b/image/topping2/bp_cancel.png
--- a/image/topping2/bp_lid.png
+++ b/image/topping2/bp_lid.png
--- a/image/topping2/bp_next.png
+++ b/image/topping2/bp_next.png
--- a/image/topping2/bp_normal_sugar.png
+++ b/image/topping2/bp_normal_sugar.png
--- a/image/topping2/bp_straw.png
+++ b/image/topping2/bp_straw.png
--- a/image/topping2/bp_sugar1.png
+++ b/image/topping2/bp_sugar1.png
--- a/image/topping2/bp_sugar2.png
+++ b/image/topping2/bp_sugar2.png
--- a/image/topping2/bp_sugar3.png
+++ b/image/topping2/bp_sugar3.png
--- a/image/topping2/bp_sugar4.png
+++ b/image/topping2/bp_sugar4.png
--- a/image/topping2/bp_sugar5.png
+++ b/image/topping2/bp_sugar5.png
--- a/image/topping2/bp_sugar_zero_cal.png
+++ b/image/topping2/bp_sugar_zero_cal.png
--- a/image/topping2/bu_sugar1.png
+++ b/image/topping2/bu_sugar1.png
--- a/image/topping2/bu_sugar2.png
+++ b/image/topping2/bu_sugar2.png
--- a/image/topping2/bu_sugar3.png
+++ b/image/topping2/bu_sugar3.png
--- a/image/topping2/bu_sugar4.png
+++ b/image/topping2/bu_sugar4.png
--- a/image/topping2/bu_sugar5.png
+++ b/image/topping2/bu_sugar5.png
--- a/image/topping2/cb_checked.png
+++ b/image/topping2/cb_checked.png
--- a/image/topping2/cb_notcheck.png
+++ b/image/topping2/cb_notcheck.png
--- a/image/topping2/cb_straw_nch.png
+++ b/image/topping2/cb_straw_nch.png
--- a/image/topping2_en/bd_lid.png
+++ b/image/topping2_en/bd_lid.png
--- a/image/topping2_en/bd_straw.png
+++ b/image/topping2_en/bd_straw.png
--- a/image/topping2_en/bg_add_shot_coffee2_only.png
+++ b/image/topping2_en/bg_add_shot_coffee2_only.png
--- a/image/topping2_en/bg_add_shot_coffee_only.png
+++ b/image/topping2_en/bg_add_shot_coffee_only.png
--- a/image/topping2_en/bg_lid_only.png
+++ b/image/topping2_en/bg_lid_only.png
--- a/image/topping2_en/bg_straw_only.png
+++ b/image/topping2_en/bg_straw_only.png
--- a/image/topping2_en/bn_add.png
+++ b/image/topping2_en/bn_add.png
--- a/image/topping2_en/bn_add_shot.png
+++ b/image/topping2_en/bn_add_shot.png
--- a/image/topping2_en/bn_add_shot2.png
+++ b/image/topping2_en/bn_add_shot2.png
--- a/image/topping2_en/bn_blended.png
+++ b/image/topping2_en/bn_blended.png
--- a/image/topping2_en/bn_cancel.png
+++ b/image/topping2_en/bn_cancel.png
--- a/image/topping2_en/bn_lid.png
+++ b/image/topping2_en/bn_lid.png
--- a/image/topping2_en/bn_next.png
+++ b/image/topping2_en/bn_next.png
--- a/image/topping2_en/bn_straw.png
+++ b/image/topping2_en/bn_straw.png
--- a/image/topping2_en/bn_sugar1.png
+++ b/image/topping2_en/bn_sugar1.png
--- a/image/topping2_en/bn_sugar2.png
+++ b/image/topping2_en/bn_sugar2.png
--- a/image/topping2_en/bn_sugar3.png
+++ b/image/topping2_en/bn_sugar3.png
--- a/image/topping2_en/bn_sugar4.png
+++ b/image/topping2_en/bn_sugar4.png
--- a/image/topping2_en/bn_sugar5.png
+++ b/image/topping2_en/bn_sugar5.png
--- a/image/topping2_en/bp_add.png
+++ b/image/topping2_en/bp_add.png
--- a/image/topping2_en/bp_add_shot.png
+++ b/image/topping2_en/bp_add_shot.png
--- a/image/topping2_en/bp_add_shot2.png
+++ b/image/topping2_en/bp_add_shot2.png
--- a/image/topping2_en/bp_blended.png
+++ b/image/topping2_en/bp_blended.png
--- a/image/topping2_en/bp_cancel.png
+++ b/image/topping2_en/bp_cancel.png
--- a/image/topping2_en/bp_lid.png
+++ b/image/topping2_en/bp_lid.png
--- a/image/topping2_en/bp_next.png
+++ b/image/topping2_en/bp_next.png
--- a/image/topping2_en/bp_straw.png
+++ b/image/topping2_en/bp_straw.png
--- a/image/topping2_en/bp_sugar1.png
+++ b/image/topping2_en/bp_sugar1.png
--- a/image/topping2_en/bp_sugar2.png
+++ b/image/topping2_en/bp_sugar2.png
--- a/image/topping2_en/bp_sugar3.png
+++ b/image/topping2_en/bp_sugar3.png
--- a/image/topping2_en/bp_sugar4.png
+++ b/image/topping2_en/bp_sugar4.png
--- a/image/topping2_en/bp_sugar5.png
+++ b/image/topping2_en/bp_sugar5.png
--- a/image/topping2_en/bu_sugar1.png
+++ b/image/topping2_en/bu_sugar1.png
--- a/image/topping2_en/bu_sugar2.png
+++ b/image/topping2_en/bu_sugar2.png
--- a/image/topping2_en/bu_sugar3.png
+++ b/image/topping2_en/bu_sugar3.png
--- a/image/topping2_en/bu_sugar4.png
+++ b/image/topping2_en/bu_sugar4.png
--- a/image/topping2_en/bu_sugar5.png
+++ b/image/topping2_en/bu_sugar5.png
--- a/image/topping2_en/cb_checked.png
+++ b/image/topping2_en/cb_checked.png
--- a/image/topping2_en/cb_notcheck.png
+++ b/image/topping2_en/cb_notcheck.png
--- a/image/topping2_en/cb_straw_nch.png
+++ b/image/topping2_en/cb_straw_nch.png
--- a/image/topping2_en/topping_en/bg_blended.png
+++ b/image/topping2_en/topping_en/bg_blended.png
--- a/image/topping2_en/topping_en/bg_strawlid.png
+++ b/image/topping2_en/topping_en/bg_strawlid.png
--- a/xml/page_catalog.xml
+++ b/xml/page_catalog.xml
@ -68,13 +68,9 @@
 	; 1035 is Coke.
 	STRCONTAIN "1035" MaterialAvailable CokeUI 

-	If CokeUI = "true" Then
-		Var bnSodaAndOther = DirImage + "/bn_soda_coke.png"
-		Var bpSodaAndOther = DirImage + "/bp_soda_coke.png"
-	Else
-		Var bnSodaAndOther = DirImage + "/bn_soda.png"
-		Var bpSodaAndOther = DirImage + "/bp_soda.png"
-	EndIf
+	Var bnSodaAndOther = DirImage + "/bn_soda_coke.png"
+	Var bpSodaAndOther = DirImage + "/bp_soda_coke.png"
+

 </EventOpen>
 <Timeout> 1000 </Timeout>
--- a/xml/page_drinkok.xml
+++ b/xml/page_drinkok.xml
@ -65,6 +65,8 @@

 	StopLongPlay

+	Var show_eng = "false"	
+
 </EventOpen>
 <Timeout> 500 </Timeout>
 <EventTimeout> 
--- a/Show more
+++ b/Show more