diff --git a/inter/tha/image/page_drink_disable_n2/bn_frozen_mango.png b/inter/tha/image/page_drink_disable_n2/bn_frozen_mango.png new file mode 100644 index 00000000..61d7daf2 Binary files /dev/null and b/inter/tha/image/page_drink_disable_n2/bn_frozen_mango.png differ diff --git a/inter/tha/image/page_drink_n/bn_frozen_mango.png b/inter/tha/image/page_drink_n/bn_frozen_mango.png new file mode 100644 index 00000000..08bcc170 Binary files /dev/null and b/inter/tha/image/page_drink_n/bn_frozen_mango.png differ diff --git a/inter/tha/image/page_drink_press_n/bn_frozen_mango.png b/inter/tha/image/page_drink_press_n/bn_frozen_mango.png new file mode 100644 index 00000000..b7c2434a Binary files /dev/null and b/inter/tha/image/page_drink_press_n/bn_frozen_mango.png differ diff --git a/inter/tha/xml/menu_catalog_new.lxml b/inter/tha/xml/menu_catalog_new.lxml index c48750cc..c79261ca 100644 --- a/inter/tha/xml/menu_catalog_new.lxml +++ b/inter/tha/xml/menu_catalog_new.lxml @@ -126,10 +126,6 @@ Var LanguageButtonEnable = "Enable" - Var ButtonLanguageCurrentXPosition = 990 - Var ButtonLanguageCurrentYPosition = 438 - Var ButtonLanguageListXPosition = 970 - Var ButtonLanguageListYPosition = 430 OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" diff --git a/inter/tha/xml/multi/control_and_lang_swith.ev b/inter/tha/xml/multi/control_and_lang_swith.ev index 564af154..e23f731c 100644 --- a/inter/tha/xml/multi/control_and_lang_swith.ev +++ b/inter/tha/xml/multi/control_and_lang_swith.ev @@ -70,11 +70,12 @@ Var InstanceTabOpenFile9 = InstanceTabOpenFile9 + "/page_catalog_group_frozen_fr -Var InstanceTabOpenFile10 = "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml" Var InstanceTabOpenFile11 = "ROOT/taobin_project/inter/tha/xml/multi/start_up_inst_dummy.lxml" Var InstanceTabOpenFile12 = "ROOT/taobin_project/inter/tha/xml/multi/start_up_inst_dummy.lxml" -Var InstanceTabOpenFile13 = "ROOT/taobin_project/inter/tha/xml/multi/start_up_inst_dummy.lxml" +Var InstanceTabOpenFile10 = "ROOT/taobin_project/inter/tha/xml/multi/start_up_inst_dummy.lxml" + +Var InstanceTabOpenFile13 = "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml" TabMenuVisibleInst 99 diff --git a/inter/tha/xml/multi/menu_catalog_new.lxml b/inter/tha/xml/multi/menu_catalog_new.lxml index 4abb4542..e4bf075e 100644 --- a/inter/tha/xml/multi/menu_catalog_new.lxml +++ b/inter/tha/xml/multi/menu_catalog_new.lxml @@ -57,11 +57,6 @@ Var LanguageButtonEnable = "Enable" - Var ButtonLanguageCurrentXPosition = 1009 - Var ButtonLanguageCurrentYPosition = 458 - 38 - - Var ButtonLanguageListXPosition = 970 - Var ButtonLanguageListYPosition = 450 - 38 OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" diff --git a/inter/tha/xml/multi/menu_catalog_new_menu.lxml b/inter/tha/xml/multi/menu_catalog_new_menu.lxml index fcc68d99..5fbef876 100644 --- a/inter/tha/xml/multi/menu_catalog_new_menu.lxml +++ b/inter/tha/xml/multi/menu_catalog_new_menu.lxml @@ -20,9 +20,9 @@ Var DirImageAlter = "ROOT/taobin_project/inter/hkg/image/page3_2_msc/" EndIf - Var ButtonLanguageCurrentXPosition = 1005 + Var ButtonLanguageCurrentXPosition = 1015 Var ButtonLanguageCurrentYPosition = 458 - 38 - Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListXPosition = 990 Var ButtonLanguageListYPosition = 450 - 38 diff --git a/inter/tha/xml/multi/menu_new_layout_gen_v2.py b/inter/tha/xml/multi/menu_new_layout_gen_v2.py index a11a8b48..e69de29b 100644 --- a/inter/tha/xml/multi/menu_new_layout_gen_v2.py +++ b/inter/tha/xml/multi/menu_new_layout_gen_v2.py @@ -1,816 +0,0 @@ - if "v2" in param: - def GenMenuProductCodeBlock( str_hot_product_code, str_cold_product_code, str_blend_product_code, str_date_time_start, str_date_time_end, str_product_var): - print(" size " + str( len(spl)) + " img=" + spl[ idx_img][1] ) - out_xml( '\t; ==================> Len = ' + str(len(spl)) + '\r\n') - menu_img = spl[ idx_img][1] - out_xml( '\t; '+ str_hot_product_code + ' ' + str_cold_product_code + ' ' + str_blend_product_code+ ' \r\n') - - out_xml( '\r\n') - out_xml('\t 33 \r\n') - out_xml('\t 22 \r\n') - out_xml('\t 225 \r\n') - out_xml('\t 296 \r\n') - str_con = "" - str_con_var = "" - #print("#########################################################################################################################") - #print( str( spl)) - #print("#########################################################################################################################") - if str_hot_product_code != '-': - str_con += str_hot_product_code + '.Button,' - - if str_cold_product_code != '-': - str_con += str_cold_product_code + '.Button,' - - if str_blend_product_code != '-': - str_con += str_blend_product_code + '.Button,' - - if str_date_time_start != '-': - str_con += 'DateTimeStart="' + str_date_time_start + '",' - - if str_date_time_end != '-': - str_con += 'DateTimeEnd="' + str_date_time_end + '",' - - if str_product_var != '-': - str_con += 'Var=' + str_product_var + ',' - - if str_hot_product_code != '-': - str_con_var += str_hot_product_code + '-' - - if str_cold_product_code != '-': - str_con_var += str_cold_product_code + '-' - - if str_blend_product_code != '-': - str_con_var += str_blend_product_code + '-' - - # if str_date_time_start != '-': - # str_con_var += str_date_time_start + '-' - - # if str_date_time_end != '-': - # str_con_var += str_date_time_end + '-' - - # if str_product_var != '-': - # str_con_var += str_product_var + '-' - - str_con_var = str_con_var.replace("-", "") - if touch_less_gen == True: - str_con += "Disable=Invisible," - - str_con += "$Sum" + str_con_var - - out_xml( '\t Flag( '+ str_con + ') \r\n') - - pd_code_1 = str_hot_product_code - pd_stage1 = '$' + str_hot_product_code + '.Button' - if str_hot_product_code == "-" or len(str_hot_product_code) == 0 : - pd_code_1 = pd_code_available - pd_stage1 = '"Disable2"' - - pd_code_2 = str_cold_product_code - pd_stage2 = '$' + str_cold_product_code + '.Button' - if str_cold_product_code == "-" or len(str_cold_product_code) == 0: - pd_code_2 = pd_code_available - pd_stage2 = '"Disable2"' - - pd_code_3 = str_blend_product_code - pd_stage3 = '$' + str_blend_product_code + '.Button' - if str_blend_product_code == "-" or len(str_blend_product_code) == 0: - pd_code_3 = pd_code_available - pd_stage3 = '"Disable2"' - - - - - out_xml( '\t\r\n') - - - - out_xml( '\t\r\n') - out_xml( '\t 16 \r\n') - out_xml( '\t 164 \r\n') - out_xml( '\t 22 \r\n') - out_xml( '\t222\r\n') - out_xml( '\t "multi2" \r\n') - out_xml( '\t KanitMediumTTF \r\n') - out_xml( '\t 0x322B26 \r\n') - - out_xml( '\t\r\n') - out_xml( '\t\t' + spl[ idx_name][ idx_lang_eng] + '\r\n') - out_xml( '\t\t' + spl[ idx_name][ idx_lang_thai] + '\r\n') - out_xml( '\t\t' + spl[ idx_name][ idx_lang_china] + '\r\n') - out_xml( '\t\t' + spl[ idx_name][ idx_lang_thai] + '\r\n') - out_xml( '\t\t' + spl[ idx_name][ idx_lang_malay] + '\r\n') - out_xml( '\t\t' + spl[ idx_name][ idx_lang_myanmar] + '\r\n') - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - out_xml( '\t 16 \r\n') - out_xml( '\t 220 \r\n') - out_xml( '\t 14 \r\n') - out_xml( '\t222\r\n') - out_xml( '\t KanitMediumTTF \r\n') - out_xml( '\t 0x6F5F51 \r\n') - #out_xml( '\t showthaiText \r\n') - out_xml( '\t\r\n') - out_xml( '\t\t' + spl[ idx_desc][ idx_lang_eng] + '\r\n') - out_xml( '\t\t' + spl[ idx_desc][ idx_lang_thai] + '\r\n') - out_xml( '\t\t' + spl[ idx_desc][ idx_lang_china] + '\r\n') - out_xml( '\t\t' + spl[ idx_desc][ idx_lang_thai] + '\r\n') - out_xml( '\t\t' + spl[ idx_desc][ idx_lang_malay] + '\r\n') - out_xml( '\t\t' + spl[ idx_desc][ idx_lang_myanmar] + '\r\n') - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - - - - out_xml( '\t\r\n') - out_xml( '\t 16 \r\n') - out_xml( '\t 264 \r\n') - out_xml( '\t Var( DirImage2 + "option_deactive.png" ) \r\n') - out_xml( '\t\r\n') - - ice_tab_hot_show = True - shw = "$" + str_hot_product_code + ".Button" - if str_hot_product_code == "-" : - shw = '"Invisible"' - ice_tab_hot_show = False - - if len(str_hot_product_code) == 0 : - shw = '"Invisible"' - ice_tab_hot_show = False - - out_xml( '\t\r\n') - out_xml( '\t 16 \r\n') - out_xml( '\t 264 \r\n') - out_xml( '\t ' + shw + ' \r\n') - out_xml( '\t Var( DirImage2 + "hot.png" ) \r\n') - out_xml( '\t Var( DirImage2 + "hot_db.png" ) \r\n') - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - out_xml( '\t TextPriceMenuHotX \r\n') - out_xml( '\t TextPriceMenuY \r\n') - out_xml( '\t TextPriceMenuSize \r\n') - out_xml( '\t220\r\n') - out_xml( '\t KanitMediumTTF \r\n') - - - out_xml( '\t 0x6F5F51 \r\n') - out_xml( '\t 0xEAE6E1 \r\n') - out_xml( '\t ' + shw + ' \r\n') - - out_xml( '\t eval( \r\n') - - out_xml( '\t\tIf $' + str_hot_product_code + '.Price = -1 Then\r\n') - out_xml( '\t\t\tVar return = "Free"\r\n') - out_xml( '\t\tElse\r\n') - out_xml( '\t\t\tVar return = "฿" + $' + str_hot_product_code + '.Price \r\n') - out_xml( '\t\tEndIf\r\n') - - out_xml( '\t) \r\n') - out_xml( '\t\r\n') - - ice_tab_ice_show = True - - shw = "$" + str_cold_product_code + ".Button" - if str_cold_product_code == "-" : - shw = '"Invisible"' - ice_tab_ice_show = False - - if len(str_cold_product_code) == 0 : - shw = '"Invisible"' - ice_tab_ice_show = False - - out_xml( '\t\r\n') - out_xml( '\t 81 \r\n') - out_xml( '\t 264 \r\n') - if pd_code_2 == "51-05-02-0016": - out_xml( '\t Var( DirImage2 + "normal.png" ) \r\n') - out_xml( '\t Var( DirImage2 + "cold_db.png" ) \r\n') - else: - out_xml( '\t Var( DirImage2 + "cold.png" ) \r\n') - out_xml( '\t Var( DirImage2 + "cold_db.png" ) \r\n') - out_xml( '\t ' + shw + ' \r\n') - out_xml( '\t\r\n') - out_xml( '\t\r\n') - out_xml( '\t 123 \r\n') - out_xml( '\t TextPriceMenuY \r\n') - out_xml( '\t TextPriceMenuSize \r\n') - out_xml( '\t220\r\n') - out_xml( '\t KanitMediumTTF \r\n') - - out_xml( '\t 0x6F5F51 \r\n') - out_xml( '\t 0xEAE6E1 \r\n') - out_xml( '\t ' + shw + ' \r\n') - out_xml( '\t eval( \r\n') - - out_xml( '\t\tIf $' + str_cold_product_code + '.Price = -1 Then\r\n') - out_xml( '\t\t\tVar return = "Free"\r\n') - out_xml( '\t\tElse\r\n') - out_xml( '\t\t\tVar return = "฿" + $' + str_cold_product_code + '.Price \r\n') - out_xml( '\t\tEndIf\r\n') - - out_xml( '\t) \r\n') - out_xml( '\t\r\n') - - ice_tab_blend_show = True - - shw = "$" + str_blend_product_code + ".Button" - if str_blend_product_code == "-" : - shw = '"Invisible"' - ice_tab_blend_show = False - - if len(str_blend_product_code) == 0 : - shw = '"Invisible"' - ice_tab_blend_show = False - - out_xml( '\t\r\n') - out_xml( '\t 146 \r\n') - out_xml( '\t 264 \r\n') - out_xml( '\t Var( DirImage2 + "blend.png" ) \r\n') - out_xml( '\t Var( DirImage2 + "blend_db.png" ) \r\n') - out_xml( '\t ' + shw + ' \r\n') - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - out_xml( '\t TextPriceMenuBlendX \r\n') - out_xml( '\t TextPriceMenuY \r\n') - out_xml( '\t TextPriceMenuSize \r\n') - out_xml( '\t220\r\n') - out_xml( '\t KanitRegularTTF \r\n') - #out_xml( '\t end \r\n') - - out_xml( '\t 0x6F5F51 \r\n') - out_xml( '\t 0xEAE6E1 \r\n') - out_xml( '\t ' + shw + ' \r\n') - - out_xml( '\t eval( \r\n') - - out_xml( '\t\tIf $' + str_blend_product_code + '.Price = -1 Then\r\n') - out_xml( '\t\t\tVar return = "Free"\r\n') - out_xml( '\t\tElse\r\n') - out_xml( '\t\t\tVar return = "฿" + $' + str_blend_product_code + '.Price \r\n') - out_xml( '\t\tEndIf\r\n') - - out_xml( '\t) \r\n') - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - out_xml( '\t 81 \r\n') - out_xml( '\t 264 \r\n') - out_xml( '\t \r\n') - out_xml( '\t\teval( \r\n') - out_xml( '\t\tIf ICE_PROCESS_STATUS = 2 Then\r\n') - out_xml( '\t\t\r\n') - if ice_tab_hot_show == True: - - #out_xml( '\t\t\tDEBUGVAR $Sum' + str_con_var +'\r\n') - out_xml( '\t\t\tIf $Sum' + str_con_var +' = "Disable" Then\r\n') - out_xml( '\t\t\t\tVar ice_tab_process_show = "Disable"\r\n') - out_xml( '\t\t\tElse\r\n') - out_xml( '\t\t\t\tVar ice_tab_process_show = "Enable"\r\n') - out_xml( '\t\t\tEndIf\r\n') - else: - out_xml( '\t\t\tVar ice_tab_process_show = "Invisible"\r\n') - - out_xml( '\t\t\r\n') - out_xml( '\t\tElse\r\n') - out_xml( '\t\t\tVar ice_tab_process_show = "Invisible"\r\n') - out_xml( '\t\tEndIf\r\n') - out_xml( '\t\tVar return = ice_tab_process_show\r\n') - out_xml( '\t\t)\r\n') - out_xml( '\t\r\n') - out_xml( '\t "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" \r\n') - out_xml( '\t "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" \r\n') - out_xml( '\t\r\n') - - - out_xml( '\t\r\n') - out_xml( '\t 49 \r\n') - out_xml( '\t 117 \r\n') - out_xml( '\t \r\n') - out_xml( '\t\teval( \r\n') - out_xml( '\t\t\tIf $Sum' + str_con_var +' = "Disable" Then\r\n') - out_xml( '\t\t\t\tSTRCONTAIN "ERR" $' + pd_code_1 + '.TAG tag1_is_disable\r\n') - out_xml( '\t\t\t\tSTRCONTAIN "ERR" $' + pd_code_2 + '.TAG tag2_is_disable\r\n') - out_xml( '\t\t\t\tSTRCONTAIN "ERR" $' + pd_code_3 + '.TAG tag3_is_disable\r\n') - #out_xml( '\t\t\t\tDEBUGVAR $' + pd_code_1 + '.TAG\r\n') - #out_xml( '\t\t\t\tDEBUGVAR $' + pd_code_2 + '.TAG\r\n') - #out_xml( '\t\t\t\tDEBUGVAR $' + pd_code_3 + '.TAG\r\n') - out_xml( '\t\t\t\tVar return = "Invisible"\r\n') - out_xml( '\t\t\t\tIf tag1_is_disable = "true" Then\r\n') - out_xml( '\t\t\t\t\tVar return = "Enable"\r\n') - out_xml( '\t\t\t\tEndIf\r\n') - out_xml( '\t\t\t\tIf tag2_is_disable = "true" Then\r\n') - out_xml( '\t\t\t\t\tVar return = "Enable"\r\n') - out_xml( '\t\t\t\tEndIf\r\n') - out_xml( '\t\t\t\tIf tag3_is_disable = "true" Then\r\n') - out_xml( '\t\t\t\t\tVar return = "Enable"\r\n') - out_xml( '\t\t\t\tEndIf\r\n') - out_xml( '\t\t\tElse\r\n') - out_xml( '\t\t\t\t\tVar return = "Invisible"\r\n') - - out_xml( '\t\t\tEndIf\r\n') - - out_xml( '\t\t)\r\n') - out_xml( '\t\r\n') - out_xml( '\t "ROOT/taobin_project/image//img_menu_err2.png" \r\n') - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - out_xml( '\t 84 \r\n') - out_xml( '\t 266 \r\n') - out_xml( '\t 10 \r\n') - out_xml( '\t OpunMediumTTF \r\n') - out_xml( '\t 0xDE794E \r\n') - out_xml( '\t ice_tab_process_show \r\n') - out_xml( '\t ice_show_open \r\n') - out_xml( '\t\r\n') - - OldVersion = False - if OldVersion : - out_xml( '\t\r\n') - out_xml( '\t 48 \r\n') - out_xml( '\t 116 \r\n') - out_xml( '\t 32 \r\n') - out_xml( '\t128\r\n') - out_xml( '\t64\r\n') - out_xml( '\t "disable-show" \r\n') - out_xml( '\t $Sum' + str_con_var +' \r\n') - out_xml( '\t\r\n') - #out_xml( '\t\t $Sum' + str_con_var +'.MenuText \r\n') - out_xml( '\t\t 000013 \r\n') - out_xml( '\t\r\n') - out_xml( '\t center-vertical-horizontal \r\n') - out_xml( '\t\r\n') - else: - out_xml( '\t\r\n') - out_xml( '\t 48 \r\n') - out_xml( '\t 116 \r\n') - out_xml( '\t auto \r\n') - out_xml( '\t128\r\n') - out_xml( '\t64\r\n') - out_xml( '\t 1 \r\n') - out_xml( '\t 14 \r\n') - out_xml( '\t OpunMediumTTF \r\n') - out_xml( '\t 0x6F5F51 \r\n') - - out_xml( '\t "auto,value" \r\n') - - out_xml( '\t 128 \r\n') - out_xml( '\t "disable-show" \r\n') - out_xml( '\t $Sum' + str_con_var +' \r\n') - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - out_xml( '\t $Sum' + str_con_var +'TextID \r\n') - out_xml( '\t\r\n') - out_xml( '\t $Sum' + str_con_var +'TextValue \r\n') - out_xml( '\t center-vertical-horizontal \r\n') - - out_xml( '\r\n') - - # feature: alert sms - out_xml('\t\r\n') - - out_xml( '\r\n') - - - def GenMenuBlock( idx_hot_product_code, idx_cold_product_code, idx_blend_product_code): - GenMenuProductCodeBlock( spl[ idx_name][ idx_hot_product_code], spl[ idx_name][ idx_cold_product_code] , spl[ idx_name][ idx_blend_product_code],spl[ idx_name][ idx_date_time_start],spl[ idx_name][idx_date_time_end],spl[ idx_name][idx_product_var] ) - - idx_lang_myanmar = 6 - idx_lang_malay = 5 - idx_lang_japan = 4 - idx_lang_china = 3 - idx_lang_thai = 2 - idx_lang_eng = 1 - - - idx_name = 0 - idx_desc = 1 - idx_img = 2 - - - idx_hot_product_code = 7 - idx_cold_product_code = idx_hot_product_code + 1 - idx_blend_product_code = idx_cold_product_code + 1 - - idx_date_time_start = 17 - idx_date_time_end = idx_date_time_start + 1 - idx_product_var = idx_date_time_end + 1 - - # - idx_hot_product_code2 = idx_blend_product_code + 1 - idx_cold_product_code2 = idx_hot_product_code2 + 1 - idx_blend_product_code2 = idx_cold_product_code2 + 1 - idx_of_eng = 2 - idx_of_eng_des = 3 - idx_of_thai = 0 - idx_of_thai_des = 1 - print ("--------------------------------------------------------------------------------------------------------------------------") - - - if current_file_name == "page_catalog_group_recommend.skt": - touch_less_gen = True - else: - touch_less_gen = False - - out_xml(' \r\n') - if touch_less_gen == True: - out_xml(' 16 \r\n') - out_xml(' 10 \r\n') - out_xml(' 497 \r\n') - out_xml(' 1080 \r\n') - out_xml(' "auto" \r\n') - out_xml(' "Vertical" \r\n') - out_xml(' 4 \r\n') - out_xml('\r\n') - - pd_code_available = '##-##-##-####' - count = 0 - count_test = 0 - #if touch_less_gen == True: - # out_xml( '\r\n') - # out_xml('\t 33 \r\n') - # out_xml('\t 22 \r\n') - # out_xml('\t 225 \r\n') - # out_xml('\t 296 \r\n') - # out_xml('\t "Enable" \r\n') - # out_xml('\t\r\n') - # out_xml('\t 0 \r\n') - # out_xml('\t 0 \r\n') - # out_xml('\t TouchLessStg \r\n') - # out_xml('\t Var( DirImage + "/touch_less_order.png" )\r\n') - # out_xml('\t Var( DirImage + "/touch_less_order_db.png" )\r\n') - # out_xml('\t\r\n') - # out_xml('\t\r\n') - # out_xml('\t 40 \r\n') - # out_xml('\t 153 \r\n') - # out_xml('\t 150 \r\n') - # out_xml('\t "0xeae6e1" \r\n') - # out_xml('\t "0x513C2F" \r\n') - # out_xml('\t 150 \r\n') - # - # #out_xml('\t TouchLessQrStg \r\n') - # #out_xml('\t "Herr" \r\n') - # out_xml('\t TouchLessQrStg \r\n') - # out_xml('\t testservice \r\n') - # - # out_xml('\t\r\n') - # out_xml('\r\n') - out_xml(';dummy_layout.inc\r\n') -# - #out_xml('; menu_new_list '+ str(len(menu_new_list))+'\r\n') - for spl in menu_new_list: - #product_code = s - #if spl[ idx_of_eng] == "IGNORE": - # continue - if len(spl) == 1: - if spl[0].startswith("TAG"): - out_xml( '\t;' + spl[0] + '\r\n') - print("Have TAGESP") - continue - print( '==>\t; '+ spl[ idx_name][ idx_hot_product_code] + ' ' + spl[ idx_name][ idx_cold_product_code] + ' ' + spl[ idx_name][ idx_blend_product_code] + ' \r\n') - - if "," in spl[ idx_name][ idx_hot_product_code] and "," in spl[ idx_name][ idx_cold_product_code] and "," in spl[ idx_name][ idx_blend_product_code]: - print(" hot = " + spl[ idx_name][ idx_hot_product_code]) - hot_pd = spl[ idx_name][ idx_hot_product_code].split(',') - print("ok hot") - cold_pd = spl[ idx_name][ idx_cold_product_code].split(',') - print("ok cold") - blend_pd = spl[ idx_name][ idx_blend_product_code].split(',') - print("ok blend") - date_time_start = spl[idx_name][idx_date_time_start] if len(spl[idx_name]) > 17 else "-" - print("ok datetime") - date_time_end = spl[idx_name][idx_date_time_end] if len(spl[idx_name]) > 17 else "-" - print("ok datetime end") - product_var = spl[idx_name][idx_product_var] if len(spl[idx_name]) > 17 else "-" - print("ok pd") - # if len(spl) > idx_name and len(spl[idx_name]) > max(idx_date_time_start, idx_date_time_end, idx_product_var): - # date_time_start = spl[idx_name][idx_date_time_start] - # date_time_end = spl[idx_name][idx_date_time_end] - # product_var = spl[idx_name][idx_product_var] - # else: - # date_time_start = '-' - # date_time_end = '-' - # product_var = '-' - # print(f"Index error: spl[{idx_name}] does not have enough elements") - # continue - - print(f"spl[{idx_name}] =", spl[idx_name]) - print(f"Expected indices: date_time_start:{date_time_start}, date_time_end:{date_time_end}, product_var:{product_var}") - - - #print(' size = ' + str( len( hot_pd)) + ' size = ' + str( len( cold_pd)) + ' size = ' + str( len( blend_pd)) + '\r\n') - list_size = len( hot_pd) - for idx in range( list_size): - print(' hot = ' + hot_pd[ idx] + ' cold = ' + cold_pd[ idx]+ ' blend_pd = ' + blend_pd[ idx] + '\r\n') - if hot_pd[ idx] == '-' and cold_pd[ idx] == '-' and blend_pd[ idx] == '-': - print("\t\t==> ignore ") - else: - print("\t\t==> gen ") - GenMenuProductCodeBlock( hot_pd[ idx], cold_pd[ idx], blend_pd[ idx], date_time_start, date_time_end, product_var ) - else: - GenMenuBlock( idx_hot_product_code, idx_cold_product_code, idx_blend_product_code) - #out_xml( '\t; parallel '+ spl[ idx_name][ idx_hot_product_code2] + ' ' + spl[ idx_name][ idx_cold_product_code2] + ' ' + spl[ idx_name][ idx_blend_product_code2] + ' \r\n') - #print("++++++++++++++++++++++++++++++ " + str( count_test) ) - #count_test = count_test + 1 - #if count_test > 5 : - # break - if len( spl[idx_name] ) >= 11: - if spl[ idx_name][ idx_hot_product_code2] != "-" or spl[ idx_name][ idx_cold_product_code2] != "-" or spl[ idx_name][ idx_blend_product_code2] != "-": - GenMenuBlock( idx_hot_product_code2, idx_cold_product_code2, idx_blend_product_code2) - - out_xml('\r\n') - - - out_xml('; Cart\r\n') - out_xml('\r\n') - # if "v2" in param: - - diff --git a/inter/tha/xml/multi/page_instance2.xml b/inter/tha/xml/multi/page_instance2.xml index 198d3f95..9ec80a94 100644 --- a/inter/tha/xml/multi/page_instance2.xml +++ b/inter/tha/xml/multi/page_instance2.xml @@ -11,13 +11,14 @@ OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" - Var ButtonLanguageCurrentXPosition = 1005 + + Var ButtonLanguageCurrentXPosition = 1015 Var ButtonLanguageCurrentYPosition = 458 - 38 - Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListXPosition = 990 Var ButtonLanguageListYPosition = 450 - 38 - + Var Timeout = 0 diff --git a/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml b/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml index d318f9db..4c978b66 100644 --- a/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml +++ b/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml @@ -25,7 +25,6 @@ OpenInst 13 "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml" RootLayoutVisible 13 "show" - RootLayoutVisible 12 "show" RootLayoutVisible 3 "show" DEBUGVAR SlientRefreshIndex diff --git a/inter/tha/xml/multi/v3/menu_new_layout_gen_v3.py b/inter/tha/xml/multi/v3/menu_new_layout_gen_v3.py index 27ac6f98..052487ec 100644 --- a/inter/tha/xml/multi/v3/menu_new_layout_gen_v3.py +++ b/inter/tha/xml/multi/v3/menu_new_layout_gen_v3.py @@ -300,9 +300,19 @@ print("topping_xml_file=" + topping_xml_file) print("current_file_name=" + current_file_name) - out_xml( '\t\t\t\tOpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"\n') + if len( topping_xml_file) == 0 : + out_xml( '\t\t\t\tOpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"\n') + else: + out_xml( '\t\t\t\tOpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/'+ topping_xml_file +'\n') + out_xml( '\t\t\tElse\n') - out_xml( '\t\t\t\tOpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"\n') + + if len( topping_xml_file) == 0 : + out_xml( '\t\t\t\tOpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"\n') + else: + out_xml( '\t\t\t\tOpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/'+ topping_xml_file +'\n') + + out_xml( '\t\t\tEndIf\n') out_xml( '\t\t\t\n') out_xml( '\t\t\t\n') diff --git a/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml b/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml index d93bba3c..e5c55e84 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml +++ b/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml @@ -49,10 +49,60 @@ 1000 + ;DEBUGVAR ICE_PROCESS_STATUS - ;include="ROOT/taobin_project/inter/tha/xml/multi/ForProGroup.inc" + ;include="ROOT/taobin_project/inter/tha/xml/multi/InstanceGetSetString.inc" + + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + GetVisible inst_show_frozen_fruit + + If inst_show_frozen_fruit = 1 Then + If inst_show_frozen_fruit_counter > 0 Then + DEBUGVAR inst_show_frozen_fruit_counter + + Var inst_show_frozen_fruit_counter = inst_show_frozen_fruit_counter - 1 + + If inst_show_frozen_fruit_counter = 0 Then + RefreshAll + Var inst_show_frozen_fruit_counter = 4 + EndIf + EndIf + EndIf + + + + + ; setvarint RefreshFrozenFruitMenu 1 + If RefreshFrozenFruitMenu = 1 Then + Var RefreshFrozenFruitMenu = 0 + SAVELOG "OPEN FROM 3" + Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml" + EndIf + + ; setvarint ScriptFrozenMenu 1 + If ScriptFrozenMenu = 1 Then + Var ScriptFrozenMenu = 0 + SAVELOG "Runscript 3" + Script "-" "-" + EndIf + + If FrozenFruitRefreshTimeOut > 15 Then + Var FrozenFruitRefreshTimeOut = 0 + Script "-" "-" + EndIf + + Var FrozenFruitRefreshTimeOut = FrozenFruitRefreshTimeOut + 1 + + TimerReset @@ -320,9 +370,9 @@ Else Var show_eng = "true" EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_frozen_fruit_select.lxml Else - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_frozen_fruit_select.lxml EndIf diff --git a/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.skt b/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.skt index 50927a77..fcf99eed 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.skt +++ b/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.skt @@ -51,10 +51,60 @@ 1000 + ;DEBUGVAR ICE_PROCESS_STATUS - ;include="ROOT/taobin_project/inter/tha/xml/multi/ForProGroup.inc" + ;include="ROOT/taobin_project/inter/tha/xml/multi/InstanceGetSetString.inc" + + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + GetVisible inst_show_frozen_fruit + + If inst_show_frozen_fruit = 1 Then + If inst_show_frozen_fruit_counter > 0 Then + DEBUGVAR inst_show_frozen_fruit_counter + + Var inst_show_frozen_fruit_counter = inst_show_frozen_fruit_counter - 1 + + If inst_show_frozen_fruit_counter = 0 Then + RefreshAll + Var inst_show_frozen_fruit_counter = 4 + EndIf + EndIf + EndIf + + + + + ; setvarint RefreshFrozenFruitMenu 1 + If RefreshFrozenFruitMenu = 1 Then + Var RefreshFrozenFruitMenu = 0 + SAVELOG "OPEN FROM 3" + Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml" + EndIf + + ; setvarint ScriptFrozenMenu 1 + If ScriptFrozenMenu = 1 Then + Var ScriptFrozenMenu = 0 + SAVELOG "Runscript 3" + Script "-" "-" + EndIf + + If FrozenFruitRefreshTimeOut > 15 Then + Var FrozenFruitRefreshTimeOut = 0 + Script "-" "-" + EndIf + + Var FrozenFruitRefreshTimeOut = FrozenFruitRefreshTimeOut + 1 + + TimerReset diff --git a/xml/topview2.xml b/xml/topview2.xml index 637b0002..9c1bfcbe 100644 --- a/xml/topview2.xml +++ b/xml/topview2.xml @@ -68,17 +68,12 @@ DEBUGVAR langfn Var DirLanguageImage = "ROOT/taobin_project/image/lang/" - ;If CountryName = "Malaysia" Then - ; Var dirImageLang = CountryRootPath + "image/lang/" - ; Var langfn = dirImageLang + langFileNameIcon - ; DEBUGVAR langfn - ; DEBUGVAR ButtonLanguageCurrentXPosition - ; DEBUGVAR ButtonLanguageCurrentYPosition - ;EndIf Var ButtonLanguageListXPositionIcon = ButtonLanguageListXPosition + 27 Var ButtonLanguageListYPositionIcon = ButtonLanguageListYPosition + 14 + Var ButtonLanguageListWidth = 70 + l 86 DEBUGVAR ENABLE_LANGUAGE_COUNT If ENABLE_LANGUAGE_COUNT = "" Then @@ -508,13 +503,13 @@ ButtonLanguageListXPositionIcon ButtonLanguageListYPositionIcon - 958 + 1080 "auto" "vertical" LanguageButtonListEnable ; - 82 + ButtonLanguageListWidth 68 ENABLE_THAI - 82 + ButtonLanguageListWidth 68 ENABLE_ENG - 82 + ButtonLanguageListWidth 68 ENABLE_JAPAN - 82 + ButtonLanguageListWidth 68 ENABLE_CHINA - 82 + ButtonLanguageListWidth 68 ENABLE_MALAY - 82 + ButtonLanguageListWidth 68 ENABLE_MSC - 82 + ButtonLanguageListWidth 68 ENABLE_MTC - 82 + ButtonLanguageListWidth 68 ENABLE_MYANMAR - 82 + ButtonLanguageListWidth 68 ENABLE_UAE_DUBAI