diff --git a/inter/uae_dubai/image/image_requirement copy.json b/inter/uae_dubai/image/image_requirement copy.json new file mode 100644 index 00000000..2c45bb97 --- /dev/null +++ b/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} + ] +} + diff --git a/inter/uae_dubai/image/image_requirement.json b/inter/uae_dubai/image/image_requirement.json new file mode 100644 index 00000000..e70e527f --- /dev/null +++ b/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 \ No newline at end of file diff --git a/inter/uae_dubai/image/image_requirement.txt b/inter/uae_dubai/image/image_requirement.txt new file mode 100644 index 00000000..e674b442 --- /dev/null +++ b/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 diff --git a/inter/uae_dubai/image/page_drink_disable_n2/bn_iced_Ginger_soda_Doikum.png b/inter/uae_dubai/image/page_drink_disable_n2/bn_iced_Ginger_soda_Doikum.png index 045a0670..e48045b1 100644 Binary files a/inter/uae_dubai/image/page_drink_disable_n2/bn_iced_Ginger_soda_Doikum.png and b/inter/uae_dubai/image/page_drink_disable_n2/bn_iced_Ginger_soda_Doikum.png differ diff --git a/inter/uae_dubai/image/page_drink_disable_n2/bn_iced_Gingerlime_soda_Doikum.png b/inter/uae_dubai/image/page_drink_disable_n2/bn_iced_Gingerlime_soda_Doikum.png index 8ca9a475..8d74ceb3 100644 Binary files a/inter/uae_dubai/image/page_drink_disable_n2/bn_iced_Gingerlime_soda_Doikum.png and b/inter/uae_dubai/image/page_drink_disable_n2/bn_iced_Gingerlime_soda_Doikum.png differ diff --git a/inter/uae_dubai/image/page_drink_n/bn_iced_Ginger_soda_Doikum.png b/inter/uae_dubai/image/page_drink_n/bn_iced_Ginger_soda_Doikum.png index 4f7fbf71..bedd81a4 100644 Binary files a/inter/uae_dubai/image/page_drink_n/bn_iced_Ginger_soda_Doikum.png and b/inter/uae_dubai/image/page_drink_n/bn_iced_Ginger_soda_Doikum.png differ diff --git a/inter/uae_dubai/image/page_drink_n/bn_iced_Gingerlime_soda_Doikum.png b/inter/uae_dubai/image/page_drink_n/bn_iced_Gingerlime_soda_Doikum.png index d41f4054..1144fd78 100644 Binary files a/inter/uae_dubai/image/page_drink_n/bn_iced_Gingerlime_soda_Doikum.png and b/inter/uae_dubai/image/page_drink_n/bn_iced_Gingerlime_soda_Doikum.png differ diff --git a/inter/uae_dubai/image/page_drink_picture2_n/bn_iced_Ginger_soda_Doikum.png b/inter/uae_dubai/image/page_drink_picture2_n/bn_iced_Ginger_soda_Doikum.png index 5e52aa18..4009aa3a 100644 Binary files a/inter/uae_dubai/image/page_drink_picture2_n/bn_iced_Ginger_soda_Doikum.png and b/inter/uae_dubai/image/page_drink_picture2_n/bn_iced_Ginger_soda_Doikum.png differ diff --git a/inter/uae_dubai/image/page_drink_picture2_n/bn_iced_Gingerlime_soda_Doikum.png b/inter/uae_dubai/image/page_drink_picture2_n/bn_iced_Gingerlime_soda_Doikum.png index 14944b92..2620b611 100644 Binary files a/inter/uae_dubai/image/page_drink_picture2_n/bn_iced_Gingerlime_soda_Doikum.png and b/inter/uae_dubai/image/page_drink_picture2_n/bn_iced_Gingerlime_soda_Doikum.png differ diff --git a/inter/uae_dubai/image/page_drink_press_n/bn_iced_Ginger_soda_Doikum.png b/inter/uae_dubai/image/page_drink_press_n/bn_iced_Ginger_soda_Doikum.png index 839f4d6e..f29660a3 100644 Binary files a/inter/uae_dubai/image/page_drink_press_n/bn_iced_Ginger_soda_Doikum.png and b/inter/uae_dubai/image/page_drink_press_n/bn_iced_Ginger_soda_Doikum.png differ diff --git a/inter/uae_dubai/image/page_drink_press_n/bn_iced_Gingerlime_soda_Doikum.png b/inter/uae_dubai/image/page_drink_press_n/bn_iced_Gingerlime_soda_Doikum.png index ebd4b845..a834e59f 100644 Binary files a/inter/uae_dubai/image/page_drink_press_n/bn_iced_Gingerlime_soda_Doikum.png and b/inter/uae_dubai/image/page_drink_press_n/bn_iced_Gingerlime_soda_Doikum.png differ diff --git a/inter/uae_dubai/menu/lang.tsv b/inter/uae_dubai/menu/lang.tsv index d2c6a364..3da5aeef 100644 --- a/inter/uae_dubai/menu/lang.tsv +++ b/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=Bold,Size=24,Color=0x0025FF,Align=Center Font=Kanit,Type=Bold,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=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 سعر حراري) diff --git a/inter/uae_dubai/video/script_thank.ev b/inter/uae_dubai/video/script_thank.ev index 9720d898..4491f930 100644 --- a/inter/uae_dubai/video/script_thank.ev +++ b/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 diff --git a/inter/uae_dubai/xml/menu_catalog_new_pepsi.lxml b/inter/uae_dubai/xml/menu_catalog_new_pepsi.lxml index 2a4ac788..1d63d6ea 100644 --- a/inter/uae_dubai/xml/menu_catalog_new_pepsi.lxml +++ b/inter/uae_dubai/xml/menu_catalog_new_pepsi.lxml @@ -171,7 +171,7 @@ 0 494 - "ROOT/taobin_project/inter/whatthecup/sgp/image/page3_2_en/tab_line_bottom.png" + "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/tab_line_bottom.png" @@ -187,8 +187,8 @@ + 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 @@ -1375,6 +1424,10 @@ If RoadShow = "true" Then Var PriceShowValue = "Free" EndIf + + If ExtraToppingState = "Invisible" Then + Var ExtraTopping = "Invisible" + EndIf DEBUGVAR showShotEnable DEBUGVAR showOreoAddEnable diff --git a/xml/page_board.xml b/xml/page_board.xml index 8e2d4b00..8a90ba60 100644 --- a/xml/page_board.xml +++ b/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 - LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/inter/mys/menu/lang.tsv" + DEBUGVAR UseLoadLangV2 + 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 @@ -990,7 +1011,7 @@ TRY "/mnt/sdcard/coffeevending/taobin_project/inter/uae_dubai/video/script_video.ev" - + Var WebAppShow = "Invisible" EnableLanguage "ENG" EnableLanguage "UAE_DUBAI" @@ -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" "-" - Var XMLProfile = "General" - Var TimeProfilePrice = 0 + Var buttonRemoveCup = "Enable" + DEBUGVAR buttonRemoveCup diff --git a/xml/page_topping_select7.xml b/xml/page_topping_select7.xml index 01001b77..75d37ae2 100644 --- a/xml/page_topping_select7.xml +++ b/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