Merge branch 'uae_dubai_blue' into masterpiece

inter/uae_dubai/image/image_requirement copy.json

@@ -0,0 +1,84 @@
+{
+    "header": "page_doing",
+    "todos": [
+{"content":"bg_show_time_remaining.png", "State":false},
+{"content":"bn_cash.png", "State":false},
+{"content":"bn_get_lid.png", "State":false},
+{"content":"bn_get_lid_en.png", "State":false},
+{"content":"bn_get_more_straw.png", "State":false},
+{"content":"bn_get_more_straw_en.png", "State": false},
+{"content":"bn_next_order.png", "State": false},
+{"content":"bn_send_report.png", "State": false},
+{"content":"bn_send_report_lid_en.png", "State": false},
+{"content":"bn_send_report_straw_en.png", "State": false},
+{"content":"bp_get_lid.png", "State": false},
+{"content":"bp_get_lid_en.png", "State": false},
+{"content":"bp_get_more_straw.png", "State": false},
+{"content":"bp_get_more_straw_en.png", "State": false},
+{"content":"bp_next_order.png", "State": false},
+{"content":"bp_send_report.png", "State": false},
+{"content":"bp_send_report_lid_en.png", "State": false},
+{"content":"bp_send_report_straw_en.png", "State": false},
+{"content":"img2.png", "State": false},
+{"content":"img2_eng.png", "State": false},
+{"content":"txt_10_en.png", "State": false},
+{"content":"txt_11_en.png", "State": false},
+{"content":"txt_12_en.png", "State": false},
+{"content":"txt_13_en.png", "State": false},
+{"content":"txt_14_en.png", "State": false},
+{"content":"txt_15_en.png", "State": false},
+{"content":"txt_16_en.png", "State": false},
+{"content":"txt_17_en.png", "State": false},
+{"content":"txt_18_en.png", "State": false},
+{"content":"txt_19_en.png", "State": false},
+{"content":"txt_1_en.png", "State": false},
+{"content":"txt_20_en.png", "State": false},
+{"content":"txt_21_en.png", "State": false},
+{"content":"txt_22_en-1.png", "State": false},
+{"content":"txt_22_en.png", "State": false},
+{"content":"txt_23_en.png", "State": false},
+{"content":"txt_25_en-1.png", "State": false},
+{"content":"txt_25_en.png", "State": false},
+{"content":"txt_26_en.png", "State": false},
+{"content":"txt_2_en.png", "State": false},
+{"content":"txt_31_en.png", "State": false},
+{"content":"txt_32_en.png", "State": false},
+{"content":"txt_33_en.png", "State": false},
+{"content":"txt_34_en.png", "State": false},
+{"content":"txt_35_en.png", "State": false},
+{"content":"txt_36_en.png", "State": false},
+{"content":"txt_37_en.png", "State": false},
+{"content":"txt_3_en.png", "State": false},
+{"content":"txt_40_en.png", "State": false},
+{"content":"txt_41_en.png", "State": false},
+{"content":"txt_42_en.png", "State": false},
+{"content":"txt_43_en.png", "State": false},
+{"content":"txt_44_en.png", "State": false},
+{"content":"txt_45_en.png", "State": false},
+{"content":"txt_46_en.png", "State": false},
+{"content":"txt_47_en.png", "State": false},
+{"content":"txt_48_en.png", "State": false},
+{"content":"txt_49_en.png", "State": false},
+{"content":"txt_4_en.png", "State": false},
+{"content":"txt_50_en.png", "State": false},
+{"content":"txt_51_en.png", "State": false},
+{"content":"txt_52_en.png", "State": false},
+{"content":"txt_53_en.png", "State": false},
+{"content":"txt_55_en.png", "State": false},
+{"content":"txt_56_en.png", "State": false},
+{"content":"txt_57_en-1.png", "State": false},
+{"content":"txt_57_en-2.png", "State": false},
+{"content":"txt_57_en.png", "State": false},
+{"content":"txt_5_en.png", "State": false},
+{"content":"txt_6_en.png", "State": false},
+{"content":"txt_70_en.png", "State": false},
+{"content":"txt_7_en.png", "State": false},
+{"content":"txt_81_en.png", "State": false},
+{"content":"txt_82_en.png", "State": false},
+{"content":"txt_83_en.png", "State": false},
+{"content":"txt_84_en.png", "State": false},
+{"content":"txt_8_en.png", "State": false},
+{"content":"txt_9_en.png", "State": false}
+    ]
+}
+

inter/uae_dubai/image/image_requirement.json

@@ -0,0 +1,106 @@
+{
+    "header": "close_en",
+    "todos": [
+      {"content":"Frame1.png", "State":false},
+    {"content":"Frame10.png", "State": false},
+        {"content":"Frame11.png", "State":false},
+        {"content":"Frame12.png", "State":false},
+        {"content":"Frame13.png", "State":false},
+        {"content":"Frame14.png", "State":false},
+        {"content":"Frame15.png", "State":false},
+        {"content":"Frame16.png", "State":false},
+        {"content":"Frame17.png", "State":false},
+        {"content":"Frame18.png", "State":false},
+        {"content":"Frame19.png", "State":false},
+        {"content":"Frame2.png", "State":false},
+        {"content":"Frame20.png", "State":false},
+        {"content":"Frame3.png", "State":false},
+        {"content":"Frame4.png", "State":false},
+        {"content":"Frame5.png", "State":false},
+        {"content":"Frame6.png", "State":false},
+        {"content":"Frame7.png", "State":false},
+        {"content":"Frame8.png", "State":false},
+        {"content":"Frame9.png", "State":false},
+        {"content":"img1.png", "State":false}
+    ]
+}
+
+
+bg_show_time_remaining.png
+bn_cash.png
+bn_get_lid.png
+bn_get_lid_en.png
+bn_get_more_straw.png
+bn_get_more_straw_en.png
+bn_next_order.png
+bn_send_report.png
+bn_send_report_lid_en.png
+bn_send_report_straw_en.png
+bp_get_lid.png
+bp_get_lid_en.png
+bp_get_more_straw.png
+bp_get_more_straw_en.png
+bp_next_order.png
+bp_send_report.png
+bp_send_report_lid_en.png
+bp_send_report_straw_en.png
+img2.png
+img2_eng.png
+txt_10_en.png
+txt_11_en.png
+txt_12_en.png
+txt_13_en.png
+txt_14_en.png
+txt_15_en.png
+txt_16_en.png
+txt_17_en.png
+txt_18_en.png
+txt_19_en.png
+txt_1_en.png
+txt_20_en.png
+txt_21_en.png
+txt_22_en-1.png
+txt_22_en.png
+txt_23_en.png
+txt_25_en-1.png
+txt_25_en.png
+txt_26_en.png
+txt_2_en.png
+txt_31_en.png
+txt_32_en.png
+txt_33_en.png
+txt_34_en.png
+txt_35_en.png
+txt_36_en.png
+txt_37_en.png
+txt_3_en.png
+txt_40_en.png
+txt_41_en.png
+txt_42_en.png
+txt_43_en.png
+txt_44_en.png
+txt_45_en.png
+txt_46_en.png
+txt_47_en.png
+txt_48_en.png
+txt_49_en.png
+txt_4_en.png
+txt_50_en.png
+txt_51_en.png
+txt_52_en.png
+txt_53_en.png
+txt_55_en.png
+txt_56_en.png
+txt_57_en-1.png
+txt_57_en-2.png
+txt_57_en.png
+txt_5_en.png
+txt_6_en.png
+txt_70_en.png
+txt_7_en.png
+txt_81_en.png
+txt_82_en.png
+txt_83_en.png
+txt_84_en.png
+txt_8_en.png
+txt_9_en.png

inter/uae_dubai/image/image_requirement.txt

@@ -0,0 +1,185 @@
+close_en:
+Frame1.png
+Frame10.png
+Frame11.png
+Frame12.png
+Frame13.png
+Frame14.png
+Frame15.png
+Frame16.png
+Frame17.png
+Frame18.png
+Frame19.png
+Frame2.png
+Frame20.png
+Frame3.png
+Frame4.png
+Frame5.png
+Frame6.png
+Frame7.png
+Frame8.png
+Frame9.png
+img1.png
+
+collect_point1:
+text_2.png
+
+complete_en:
+text_bottom.png
+
+event:
+image_template1
+image_template2
+image_template3
+
+page3_2:
+bn_appfast2.png
+bn_cho_ca2.png
+bn_cocktail.png
+bn_coffee2.png
+bn_forkid2.png
+bn_health.png
+bn_protein2.png
+bn_recommend2.png
+bn_recommend3.png
+bn_sodada2.png
+bn_tea2.png
+bn_vending2.png
+bp_appfast2.png
+bp_cho_ca2.png
+bp_cocktail.png
+bp_coffee2.png
+bp_forkid2.png
+bp_health.png
+bp_protein2.png
+bp_recommend2.png
+bp_recommend3.png
+bp_sodada2.png
+bp_tea2.png
+bp_vending2.png
+
+page3_2_en:
+bn_cho_ca2.png
+bp_cho_ca2.png
+
+page_doing:
+bg_show_time_remaining.png
+bn_cash.png
+bn_get_lid.png
+bn_get_lid_en.png
+bn_get_more_straw.png
+bn_get_more_straw_en.png
+bn_next_order.png
+bn_send_report.png
+bn_send_report_lid_en.png
+bn_send_report_straw_en.png
+bp_get_lid.png
+bp_get_lid_en.png
+bp_get_more_straw.png
+bp_get_more_straw_en.png
+bp_next_order.png
+bp_send_report.png
+bp_send_report_lid_en.png
+bp_send_report_straw_en.png
+img2.png
+img2_eng.png
+txt_10_en.png
+txt_11_en.png
+txt_12_en.png
+txt_13_en.png
+txt_14_en.png
+txt_15_en.png
+txt_16_en.png
+txt_17_en.png
+txt_18_en.png
+txt_19_en.png
+txt_1_en.png
+txt_20_en.png
+txt_21_en.png
+txt_22_en-1.png
+txt_22_en.png
+txt_23_en.png
+txt_25_en-1.png
+txt_25_en.png
+txt_26_en.png
+txt_2_en.png
+txt_31_en.png
+txt_32_en.png
+txt_33_en.png
+txt_34_en.png
+txt_35_en.png
+txt_36_en.png
+txt_37_en.png
+txt_3_en.png
+txt_40_en.png
+txt_41_en.png
+txt_42_en.png
+txt_43_en.png
+txt_44_en.png
+txt_45_en.png
+txt_46_en.png
+txt_47_en.png
+txt_48_en.png
+txt_49_en.png
+txt_4_en.png
+txt_50_en.png
+txt_51_en.png
+txt_52_en.png
+txt_53_en.png
+txt_55_en.png
+txt_56_en.png
+txt_57_en-1.png
+txt_57_en-2.png
+txt_57_en.png
+txt_5_en.png
+txt_6_en.png
+txt_70_en.png
+txt_7_en.png
+txt_81_en.png
+txt_82_en.png
+txt_83_en.png
+txt_84_en.png
+txt_8_en.png
+txt_9_en.png
+
+page_payment_cash:
+CancelOrder-UAE_DUBAI.png
+CancelOrder.png
+CancelOrder2.png
+bd_cash.png
+bd_credit_card_and_qr.png
+bd_pay_with_code.png
+bn_back.png
+bn_back2.png
+bn_back_arrow2-UAE_DUBAI.png
+bn_back_arrow2.png
+bn_cancel-UAE_DUBAI.png
+bn_cancel.png
+bn_cancel2-UAE_DUBAI.png
+bn_cancel2.png
+bn_cancel3.png
+bn_cancel_all.png
+bn_cash.png
+bn_credit_card_and_qr.png
+bn_pay_with_code.png
+bp_back.png
+bp_back2.png
+bp_cancel-UAE_DUBAI.png
+bp_cancel.png
+bp_cancel2-UAE_DUBAI.png
+bp_cancel2.png
+bp_cancel3.png
+bp_cancel_all.png
+bp_cash.png
+bp_credit_card_and_qr.png
+bp_pay_with_code.png
+img_popup11-UAE_DUBAI.png
+img_popup11-UAE_DUBAI_en.png
+img_popup8.png
+text_1.png
+text_4-UAE_DUBAI.png
+
+vending_error_en:
+img1.png
+text1.png
+text2.png

inter/uae_dubai/menu/lang.tsv

@@ -42,24 +42,24 @@ TextID	Note	English	arabic
 	page_toopping_select
 		Font=Kanit,Type=Regular,Size=22,Color=0x0025FF,Align=Center	Font=Kanit,Type=Regular,Size=22,Color=0x0025FF,Align=Center
 		Font=Kanit,Type=Medium,Size=22,Color=0xFFFFFF,Align=Center	Font=Kanit,Type=Medium,Size=22,Color=0xFFFFFF,Align=Center
-		Font=Kanit,Type=Regular,Size=22,Color=0x0025FF,Align=Center	Font=Kanit,Type=Regular,Size=22,Color=0x0025FF,Align=Center
+		Font=Kanit,Type=Regular,Size=22,Color=0xD5D9F5,Align=Center	Font=Kanit,Type=Regular,Size=22,Color=0xD5D9F5,Align=Center
 000040		Not sweet	بدون سكر
 000041		Little	قليل
 000042		Less	أقل
 000043		Perfect	ممتاز
 000044		Extra	زيادة
 000045		Sweetest	حلو
-		Font=Kanit,Type=Regular,Size=14,Color=0x8092FF,Align=Center	Font=Kanit,Type=Regular,Size=14,Color=0x8092FF,Align=Center
-		Font=Kanit,Type=Regular,Size=14,Color=0xEEEEEE,Align=Center	Font=Kanit,Type=Regular,Size=14,Color=0xEEEEEE,Align=Center
 		Font=Kanit,Type=Regular,Size=14,Color=0x0025FF,Align=Center	Font=Kanit,Type=Regular,Size=14,Color=0x0025FF,Align=Center
+		Font=Kanit,Type=Regular,Size=14,Color=0xFFFFFF,Align=Center	Font=Kanit,Type=Regular,Size=14,Color=0xFFFFFF,Align=Center
+		Font=Kanit,Type=Regular,Size=14,Color=0xD5D9F5,Align=Center	Font=Kanit,Type=Regular,Size=14,Color=0xD5D9F5,Align=Center
 000046		0%	0%
 000047		20%	20%
 000048		40%	40%
 000049		60%	60%
 000050		80%	80%
 000051		100%	100%
-		Font=Kanit,Type=Regular,Size=24,Color=0x0025FF,Align=Center	Font=Kanit,Type=Regular,Size=24,Color=0x0025FF,Align=Center
+		Font=Kanit,Type=Regular,Size=24,Color=0x0025FF,PressColor=0xFFFFFF,Align=Center	Font=Kanit,Type=Regular,Size=24,Color=0x0025FF,0xFFFFFF,Align=Center
-		Font=Kanit,Type=Bold,Size=24,Color=0x0025FF,Align=Center	Font=Kanit,Type=Bold,Size=24,Color=0x0025FF,Align=Center
+		Font=Kanit,Type=Bold,Size=24,Color=0xFFFFFF,Align=Center	Font=Kanit,Type=Bold,Size=24,Color=0xFFFFFF,Align=Center
 000052		No added sugar	بدون سكر 
 000053		Less sweet	أقل حلاوة
 000054		Healthy sweet	حلو صحي 
@@ -71,7 +71,8 @@ TextID	Note	English	arabic
 000057		=+ SUGAR 3 g (11 cal)	=+ سكر3 جم (11 سعر حراري)
 000058		=+ SUGAR 7 g (26 cal)	=+ سكر 7 جم (26 سعر حراري)
 000059		=+ SUGAR 10 g (38 cal)	=+ سكر 10 جم (38 سعر حراري)
-
+		Font=Kanit,Type=Regular,Size=15,Color=0x8092FF,Align=Center	Font=Kanit,Type=Regular,Size=15,Color=0x8092FF,Align=Center
+		Font=Kanit,Type=Regular,Size=15,Color=0xEEEEEE,Align=Center	Font=Kanit,Type=Regular,Size=15,Color=0xEEEEEE,Align=Center
 000060		=+ SUGAR 0 g (0 cal)	=+ سكر 0 جم (0 سعر حراري)
 000061		=+ SUGAR 2 g (8 cal)	=+ سكر 2 جم (8 سعر حراري)
 000062		=+ SUGAR 5 g (19 cal)	=+ سكر 5 جم (19 سعر حراري)

inter/uae_dubai/video/script_thank.ev

@@ -1,15 +1,5 @@
 SAVELOG "For change size this file. New video"
 
-If EventTurnOn = 1 Then
-
-    GetFileSizeK "taobin_project/inter/sgp/video/taobin_thank1_event.mp4" MainfileSize
-    DEBUGVAR MainfileSize
-    If MainfileSize = 6749397 Then
-        Var video_file_name = "ROOT/taobin_project/inter/sgp/video/taobin_thank1_event.mp4"
-    EndIf
-
-EndIf
-
 
 If UsePepsiTheme = 1 Then
 

inter/uae_dubai/xml/menu_catalog_new_pepsi.lxml

@@ -171,7 +171,7 @@
 <Image>
 <X> 0 </X>
 <Y> 494 </Y>
-<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/page3_2_en/tab_line_bottom.png" </Filename>
+<Filename> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/tab_line_bottom.png" </Filename>
 </Image>
 
 
@@ -187,8 +187,8 @@
 <Button>
 <X> 19 </X>
 <Y> 381 </Y>
-<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/page2_en/bn_back_arrow_2.png" </Filename>
+<Filename> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page2_en/bn_back_arrow_2.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/inter/whatthecup/sgp/image/page2_en/bn_back_arrow_2.png" </FilenamePress>
+<FilenamePress> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page2_en/bn_back_arrow_2.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
@@ -513,4 +513,3 @@
     EndIf
 
 </EventWebApp>
-

inter/uae_dubai/xml/page_catalog_group_appfast.lxml

@@ -352,7 +352,7 @@
 <Image>
 <X> 0 </X>
 <Y> 494 </Y>
-<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/page3_2_en/tab_line_bottom.png" </Filename>
+<Filename> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/tab_line_bottom.png" </Filename>
 </Image>
 
 
@@ -368,8 +368,8 @@
 <Button>
 <X> 19 </X>
 <Y> 381 </Y>
-<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/page2_en/bn_back_arrow_2.png" </Filename>
+<Filename> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page2_en/bn_back_arrow_2.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/inter/whatthecup/sgp/image/page2_en/bn_back_arrow_2.png" </FilenamePress>
+<FilenamePress> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page2_en/bn_back_arrow_2.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
@@ -701,7 +701,6 @@
 
 
 
-
 <FrameScroll> 
 <X> 10 </X>
 <Y> 497 </Y>

inter/uae_dubai/xml/page_catalog_group_cocktail.lxml

@@ -318,7 +318,7 @@
 <Image>
 <X> 0 </X>
 <Y> 494 </Y>
-<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/page3_2_en/tab_line_bottom.png" </Filename>
+<Filename> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/tab_line_bottom.png" </Filename>
 </Image>
 
 
@@ -334,8 +334,8 @@
 <Button>
 <X> 19 </X>
 <Y> 381 </Y>
-<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/page2_en/bn_back_arrow_2.png" </Filename>
+<Filename> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page2_en/bn_back_arrow_2.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/inter/whatthecup/sgp/image/page2_en/bn_back_arrow_2.png" </FilenamePress>
+<FilenamePress> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page2_en/bn_back_arrow_2.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
@@ -666,7 +666,6 @@
 
 
 
-
 <FrameScroll> 
 <X> 10 </X>
 <Y> 497 </Y>

inter/uae_dubai/xml/page_catalog_group_coffee.lxml

@@ -344,7 +344,7 @@
 <Image>
 <X> 0 </X>
 <Y> 494 </Y>
-<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/page3_2_en/tab_line_bottom.png" </Filename>
+<Filename> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/tab_line_bottom.png" </Filename>
 </Image>
 
 
@@ -360,8 +360,8 @@
 <Button>
 <X> 19 </X>
 <Y> 381 </Y>
-<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/page2_en/bn_back_arrow_2.png" </Filename>
+<Filename> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page2_en/bn_back_arrow_2.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/inter/whatthecup/sgp/image/page2_en/bn_back_arrow_2.png" </FilenamePress>
+<FilenamePress> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page2_en/bn_back_arrow_2.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
@@ -692,7 +692,6 @@
 
 
 
-
 <FrameScroll> 
 <X> 10 </X>
 <Y> 497 </Y>
@@ -6775,7 +6774,7 @@
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
 		Var NameLang[1][0] = "MANDARINE  \nIced AMERICANO"
-		Var NameLang[1][1] = "مندرين \nأمريكان مثلج"
+		Var NameLang[1][1] = "مندرين \nأمريكانو مثلج"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""
@@ -14665,7 +14664,7 @@
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
 		Var NameLang[1][0] = "Iced MOCHA"
-		Var NameLang[1][1] = "موكا مثلجة"
+		Var NameLang[1][1] = "موكا مثلج"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""

inter/uae_dubai/xml/page_catalog_group_forkid.lxml

@@ -353,7 +353,7 @@
 <Image>
 <X> 0 </X>
 <Y> 494 </Y>
-<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/page3_2_en/tab_line_bottom.png" </Filename>
+<Filename> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/tab_line_bottom.png" </Filename>
 </Image>
 
 
@@ -369,8 +369,8 @@
 <Button>
 <X> 19 </X>
 <Y> 381 </Y>
-<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/page2_en/bn_back_arrow_2.png" </Filename>
+<Filename> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page2_en/bn_back_arrow_2.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/inter/whatthecup/sgp/image/page2_en/bn_back_arrow_2.png" </FilenamePress>
+<FilenamePress> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page2_en/bn_back_arrow_2.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
@@ -702,7 +702,6 @@
 
 
 
-
 <FrameScroll> 
 <X> 10 </X>
 <Y> 497 </Y>

inter/uae_dubai/xml/page_catalog_group_health.lxml

@@ -344,7 +344,7 @@
 <Image>
 <X> 0 </X>
 <Y> 494 </Y>
-<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/page3_2_en/tab_line_bottom.png" </Filename>
+<Filename> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/tab_line_bottom.png" </Filename>
 </Image>
 
 
@@ -360,8 +360,8 @@
 <Button>
 <X> 19 </X>
 <Y> 381 </Y>
-<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/page2_en/bn_back_arrow_2.png" </Filename>
+<Filename> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page2_en/bn_back_arrow_2.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/inter/whatthecup/sgp/image/page2_en/bn_back_arrow_2.png" </FilenamePress>
+<FilenamePress> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page2_en/bn_back_arrow_2.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
@@ -689,7 +689,6 @@
 
 
 
-
 <FrameScroll> 
 <X> 10 </X>
 <Y> 497 </Y>
@@ -1848,7 +1847,7 @@
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
 		Var NameLang[1][0] = "Iced MOCHA"
-		Var NameLang[1][1] = "موكا مثلجة"
+		Var NameLang[1][1] = "موكا مثلج"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""
@@ -2122,7 +2121,7 @@
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
 		Var NameLang[1][0] = "Iced MOCHA"
-		Var NameLang[1][1] = "موكا مثلجة"
+		Var NameLang[1][1] = "موكا مثلج"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""
@@ -5404,7 +5403,7 @@
 		Var NameLang[0][4] = ""
 		Var NameLang[0][5] = ""
 		Var DescLang[0][0] = "Taiwan tea, Limenade, Water, and Ice"
-		Var DescLang[0][1] = "شاي تايوان، ليمون، ماء وثلج"
+		Var DescLang[0][1] = "شاي تايوان والليمون والماء والثلج"
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
@@ -5416,7 +5415,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Taiwan tea, Limenade, Water, and Ice"
-		Var DescLang[1][1] = "شاي تايوان، ليمون، ماء وثلج"
+		Var DescLang[1][1] = "شاي تايوان والليمون والماء والثلج"
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""

inter/uae_dubai/xml/page_catalog_group_milk.lxml

@@ -342,7 +342,7 @@
 <Image>
 <X> 0 </X>
 <Y> 494 </Y>
-<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/page3_2_en/tab_line_bottom.png" </Filename>
+<Filename> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/tab_line_bottom.png" </Filename>
 </Image>
 
 
@@ -358,8 +358,8 @@
 <Button>
 <X> 19 </X>
 <Y> 381 </Y>
-<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/page2_en/bn_back_arrow_2.png" </Filename>
+<Filename> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page2_en/bn_back_arrow_2.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/inter/whatthecup/sgp/image/page2_en/bn_back_arrow_2.png" </FilenamePress>
+<FilenamePress> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page2_en/bn_back_arrow_2.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
@@ -689,7 +689,6 @@
 
 
 
-
 <FrameScroll> 
 <X> 10 </X>
 <Y> 497 </Y>

inter/uae_dubai/xml/page_catalog_group_other.lxml

@@ -343,7 +343,7 @@
 <Image>
 <X> 0 </X>
 <Y> 494 </Y>
-<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/page3_2_en/tab_line_bottom.png" </Filename>
+<Filename> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/tab_line_bottom.png" </Filename>
 </Image>
 
 
@@ -359,8 +359,8 @@
 <Button>
 <X> 19 </X>
 <Y> 381 </Y>
-<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/page2_en/bn_back_arrow_2.png" </Filename>
+<Filename> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page2_en/bn_back_arrow_2.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/inter/whatthecup/sgp/image/page2_en/bn_back_arrow_2.png" </FilenamePress>
+<FilenamePress> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page2_en/bn_back_arrow_2.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
@@ -691,7 +691,6 @@
 
 
 
-
 <FrameScroll> 
 <X> 10 </X>
 <Y> 497 </Y>
@@ -5890,7 +5889,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Pepsi, Banana Syrup& Ice"
-		Var DescLang[1][1] = "بيبسي، شراب موز و ثلج"
+		Var DescLang[1][1] = "بيبسي، شراب الموز والثلج"
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""

inter/uae_dubai/xml/page_catalog_group_recommend.lxml

@@ -335,7 +335,7 @@
 <Image>
 <X> 0 </X>
 <Y> 494 </Y>
-<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/page3_2_en/tab_line_bottom.png" </Filename>
+<Filename> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/tab_line_bottom.png" </Filename>
 </Image>
 
 
@@ -351,8 +351,8 @@
 <Button>
 <X> 19 </X>
 <Y> 381 </Y>
-<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/page2_en/bn_back_arrow_2.png" </Filename>
+<Filename> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page2_en/bn_back_arrow_2.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/inter/whatthecup/sgp/image/page2_en/bn_back_arrow_2.png" </FilenamePress>
+<FilenamePress> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page2_en/bn_back_arrow_2.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
@@ -680,7 +680,6 @@
 
 
 
-
 <FrameScroll> 
 <Max> 16 </Max>
 <X> 10 </X>
@@ -6221,7 +6220,7 @@
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
 		Var NameLang[1][0] = "MANDARINE  \nIced AMERICANO"
-		Var NameLang[1][1] = "مندرين \nأمريكان مثلج"
+		Var NameLang[1][1] = "مندرين \nأمريكانو مثلج"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""

inter/uae_dubai/xml/page_catalog_group_recommend_multi_pro.lxml

@@ -5582,7 +5582,7 @@
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
 		Var NameLang[1][0] = "MANDARINE  \nIced AMERICANO"
-		Var NameLang[1][1] = "مندرين \nأمريكان مثلج"
+		Var NameLang[1][1] = "مندرين \nأمريكانو مثلج"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""

inter/uae_dubai/xml/page_catalog_group_tea.lxml

@@ -344,7 +344,7 @@
 <Image>
 <X> 0 </X>
 <Y> 494 </Y>
-<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/page3_2_en/tab_line_bottom.png" </Filename>
+<Filename> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/tab_line_bottom.png" </Filename>
 </Image>
 
 
@@ -360,8 +360,8 @@
 <Button>
 <X> 19 </X>
 <Y> 381 </Y>
-<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/page2_en/bn_back_arrow_2.png" </Filename>
+<Filename> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page2_en/bn_back_arrow_2.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/inter/whatthecup/sgp/image/page2_en/bn_back_arrow_2.png" </FilenamePress>
+<FilenamePress> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page2_en/bn_back_arrow_2.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
@@ -694,7 +694,6 @@
 
 
 
-
 <FrameScroll> 
 <X> 10 </X>
 <Y> 497 </Y>
@@ -11163,7 +11162,7 @@
 		Var NameLang[0][4] = ""
 		Var NameLang[0][5] = ""
 		Var DescLang[0][0] = "Taiwan tea, Limenade, Water, and Ice"
-		Var DescLang[0][1] = "شاي تايوان، ليمون، ماء وثلج"
+		Var DescLang[0][1] = "شاي تايوان والليمون والماء والثلج"
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
@@ -11175,7 +11174,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Taiwan tea, Limenade, Water, and Ice"
-		Var DescLang[1][1] = "شاي تايوان، ليمون، ماء وثلج"
+		Var DescLang[1][1] = "شاي تايوان والليمون والماء والثلج"
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""

inter/uae_dubai/xml/page_catalog_group_whey.lxml

@@ -349,7 +349,7 @@
 <Image>
 <X> 0 </X>
 <Y> 494 </Y>
-<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/page3_2_en/tab_line_bottom.png" </Filename>
+<Filename> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/tab_line_bottom.png" </Filename>
 </Image>
 
 
@@ -365,8 +365,8 @@
 <Button>
 <X> 19 </X>
 <Y> 381 </Y>
-<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/page2_en/bn_back_arrow_2.png" </Filename>
+<Filename> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page2_en/bn_back_arrow_2.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/inter/whatthecup/sgp/image/page2_en/bn_back_arrow_2.png" </FilenamePress>
+<FilenamePress> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page2_en/bn_back_arrow_2.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
@@ -697,7 +697,6 @@
 
 
 
-
 <FrameScroll> 
 <X> 10 </X>
 <Y> 497 </Y>

inter/whatthecup/uae_dubai/xml/page_catalog.lxml

@@ -42,6 +42,19 @@
 
 	Var PicturePath = "/mnt/sdcard/coffeevending/taobin_project/image/page_doing/"
 
+	If UsePepsiTheme = 1 Then
+
+		Var PicturePath = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+		Var PicturePath = PicturePath + "/image/page_doing/"
+		Var PictureBegin = "txt_"
+
+		If LanguageShow = "ENG" Then
+		    Var PictureEnd = "_en.png"
+		Else
+		    Var PictureEnd = ".png"
+		EndIf
+	EndIf
+
 	If CocktailShow = "true" Then
 		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"
 	EndIf
@@ -298,6 +311,19 @@
 		Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/taobin_sawade.mp3"
 	EndIf
 
+	If UsePepsiTheme = 1 Then
+
+		Var PicturePath = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+		Var PicturePath = PicturePath + "/image/page_doing/"
+		Var PictureBegin = "txt_"
+
+		If LanguageShow = "ENG" Then
+		    Var PictureEnd = "_en.png"
+		Else
+		    Var PictureEnd = ".png"
+		EndIf
+	EndIf
+
 	Play PlaySoundLag
 	Var countDownRetrun = 300
 
@@ -317,8 +343,8 @@
 <Button>
 <X> 19 </X>
 <Y> 420 </Y>
-<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/page2_en/bn_back_arrow_2.png" </Filename>
+<Filename> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page2_en/bn_back_arrow_2.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/inter/whatthecup/sgp/image/page2_en/bn_back_arrow_2.png" </FilenamePress>
+<FilenamePress> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page2_en/bn_back_arrow_2.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>

inter/whatthecup/uae_dubai/xml/page_topping_select6_blue.lxml

@@ -536,6 +536,7 @@
 </Button>
 
 <EventMachine>
+
 	DEBUGVAR MAT_ID_STRAW_OFFER
 	DEBUGVAR MAT_ID_LID_OFFER
 	DEBUGVAR MAT_ID_511215
@@ -905,6 +906,54 @@
 					Var SugarZeroCalOption = "Invisible"
 				EndIf
 
+			EndIf
+
+
+
+			If TOPPING1 = "Powder Sugar for Hot" Then
+
+				If RecipeTag2 = "Topping6Step" Then
+					Var BGSugar = "Invisible"
+					Var BGSugarNew = "Enable"
+				Else
+					Var BGSugar = "Enable"
+				EndIf
+
+				Var ShiftSugarStep = 1
+				Var SugarState1 = "Enable"
+				Var SugarState2 = "Enable"
+				Var SugarState3 = "Enable"
+				Var SugarState4 = "Enable"
+				Var SugarState5 = "Enable"
+
+				If toppingID1index1 = toppingID1Default Then
+					Var SugarState1 = "PressForever"
+					Var sugar_default_flag = 1
+				EndIf
+
+				If toppingID1index2 = toppingID1Default Then
+					Var SugarState2 = "PressForever"
+					Var sugar_default_flag = 1
+				EndIf
+
+				If toppingID1index3 = toppingID1Default Then
+					Var SugarState3 = "PressForever"
+					Var sugar_default_flag = 1
+				EndIf
+
+				If toppingID1index4 = toppingID1Default Then
+					Var SugarState4 = "PressForever"
+					Var sugar_default_flag = 1
+				EndIf
+
+				If toppingID1index5 = toppingID1Default Then
+					Var SugarState5 = "PressForever"
+					Var sugar_default_flag = 1
+				EndIf
+
+				If sugar_default_flag = 0 Then
+					Var SugarState1 = "PressForever"
+				EndIf
 
 			EndIf
 
@@ -1376,6 +1425,10 @@
 			Var PriceShowValue = "Free"
 		EndIf
 	
+		If ExtraToppingState = "Invisible" Then
+       		Var ExtraTopping = "Invisible"
+    	EndIf
+
 		DEBUGVAR showShotEnable
 		DEBUGVAR showOreoAddEnable
 		DEBUGVAR ShotCoffeePremium

xml/page_board.xml

@@ -679,6 +679,11 @@
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
 
 
+	; zone-fast-load-lang
+	READ_FILE "/mnt/sdcard/enable_load_lang_fast" ENABLE_LOAD_LANG_V2
+	STRCONTAIN "1" ENABLE_LOAD_LANG_V2 UseLoadLangV2
+
+
 	;inter-page-board
 	If CountryName = "Malaysia" Then
 
@@ -718,10 +723,26 @@
 		Var XButtonMember = 384
 		Var YButtonMember = 1695
 
-		If Not#LanguageLoaded = "" Then
+		DEBUGVAR UseLoadLangV2
-			LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/inter/mys/menu/lang.tsv"
+		DEBUGVAR Not#LanguageLoaded
+		DEBUGVAR Not#LanguageResult
+		DEBUGVAR LangProcess
+
+		DEBUGVAR LangLoadTime
+
+		If UseLoadLangV2 = "true" Then
+		    ; load-process-should-be-done-b4-this
+		    If Not#LanguageLoaded = "" Then
+		        LoadLanguageV2 "/mnt/sdcard/coffeevending/taobin_project/inter/mys/menu/lang.tsv"
+			EndIf
+		Else
+            If Not#LanguageLoaded = "" Then
+     			LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/inter/mys/menu/lang.tsv"
+      		EndIf
 		EndIf
 
+
+
 		; load credit
 
 		If EnableCreditCard = "" Then
@@ -1012,6 +1033,7 @@
 		Var TextPriceMenuHotX = 48
 		Var ShowButtonClick2 = "Enable"
 		Var ButtontoTopupMenu = "Invisible"
+		Var ExtraToppingState = "Invisible"
 
 		Var PriceUnitText = "Price in DH"
 
@@ -1437,6 +1459,7 @@
 	Var TimeProfilePrice = 0
 
 	DEBUGVAR LangProcess
+	DEBUGVAR LangLoadTime
 
     ; lang-lock-until-done
 	If LangProcess = "Done" Then
@@ -1660,8 +1683,8 @@ PRICE "Reset" "-"
  </EventUnitTest7>
 
  <EventUnitTest8>
-	Var XMLProfile = "General"
+    Var buttonRemoveCup = "Enable"
-	Var TimeProfilePrice = 0
+    DEBUGVAR buttonRemoveCup
 
  </EventUnitTest8>
 

xml/page_topping_select7.xml

@@ -612,7 +612,7 @@
 								; full
 								Open "ROOT/taobin_project/xml/page_identity_verification.xml"
 							Else
-								OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/advert.xml"
+								OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
 								; Only IDCard
 								Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
 							EndIf
@@ -654,7 +654,7 @@
 									; full
 									Open "ROOT/taobin_project/xml/page_identity_verification.xml"
 								Else
-									OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/advert.xml"
+									OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
 									; Only IDCard
 									Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
 								EndIf