diff --git a/image/collectiing/img_popupAIS.png b/image/collectiing/img_popupAIS.png index ab5deac2..60996df1 100644 Binary files a/image/collectiing/img_popupAIS.png and b/image/collectiing/img_popupAIS.png differ diff --git a/image/collectiing_en/img_popupAIS.png b/image/collectiing_en/img_popupAIS.png index ab5deac2..60996df1 100644 Binary files a/image/collectiing_en/img_popupAIS.png and b/image/collectiing_en/img_popupAIS.png differ diff --git a/xml/menu_new_layout_gen.py b/xml/menu_new_layout_gen.py index 1f3d60cf..22b99024 100644 --- a/xml/menu_new_layout_gen.py +++ b/xml/menu_new_layout_gen.py @@ -1,544 +1,95 @@ - 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') + print ("######################################################################################################") + idx_of_eng = 2 + 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') - str_con = "" - str_con_var = "" - if spl[4] != '-': - str_con += spl[4] + '.Button,' - if spl[5] != '-': - str_con += spl[5] + '.Button,' - if spl[6] != '-': - str_con += spl[6] + '.Button,' - - if spl[4] != '-': - str_con_var += spl[4] + '-' - if spl[5] != '-': - str_con_var += spl[5] + '-' - if spl[6] != '-': - str_con_var += spl[6] + '-' - - str_con_var = str_con_var.replace("-", "") - if touch_less_gen == True: - str_con += "Disable=Invisible," + 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') - str_con += "$Sum" + str_con_var - - out_xml( '\t Flag( '+ str_con + ') \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') - pd_code_1 = spl[4] - pd_stage1 = '$' + spl[4] + '.Button' - if spl[4] == "-" or len(spl[4]) == 0 : - pd_code_1 = pd_code_available - pd_stage1 = '"Disable2"' + out_xml('\t\r\n') + out_xml('\r\n') - pd_code_2 = spl[5] - pd_stage2 = '$' + spl[5] + '.Button' - if spl[5] == "-" or len(spl[5]) == 0: - pd_code_2 = pd_code_available - pd_stage2 = '"Disable2"' - - pd_code_3 = spl[6] - pd_stage3 = '$' + spl[6] + '.Button' - if spl[6] == "-" or len(spl[6]) == 0: - pd_code_3 = pd_code_available - pd_stage3 = '"Disable2"' + out_xml('; menu_new_list '+ str(len(menu_new_list))+'\r\n') + for spl in menu_new_list: + #product_code = s + if spl[0] == "IGNORE": + continue - - - - 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 24 \r\n') - out_xml( '\t220\r\n') - out_xml( '\t "multi2" \r\n') - out_xml( '\t KanitMediumTTF \r\n') - out_xml( '\t 0x322B26 \r\n') - out_xml( '\t showthaiText \r\n') - out_xml( '\t "' + spl[0].replace("\\n", "\n") + '" \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( '\t220\r\n') - out_xml( '\t KanitMediumTTF \r\n') - out_xml( '\t 0x6F5F51 \r\n') - out_xml( '\t showthaiText \r\n') - out_xml( '\t "' + spl[2].replace("\\n", "\n") + '" \r\n') - 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( '\t220\r\n') - out_xml( '\t "multi2" \r\n') - out_xml( '\t KanitMediumTTF \r\n') - out_xml( '\t 0x322B26 \r\n') - out_xml( '\t showengText \r\n') - out_xml( '\t "' + spl[1].replace("\\n", "\n") + '" \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( '\t220\r\n') - out_xml( '\t KanitMediumTTF \r\n') - out_xml( '\t 0x6F5F51 \r\n') - out_xml( '\t showengText \r\n') - out_xml( '\t "' + spl[3].replace("\\n", "\n") + '" \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 = "$" + spl[4] + ".Button" - if spl[4] == "-" : - shw = '"Invisible"' - ice_tab_hot_show = False - - if len(spl[4]) == 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') - if "inter" in param: - out_xml( '\t\r\n') - out_xml( '\t 50 \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') - else: - out_xml( '\t\r\n') - out_xml( '\t 50 \r\n') - out_xml( '\t 265 \r\n') - out_xml( '\t 14 \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 Var( "฿" + $' + spl[4] + '.Price ) \r\n') - - if "inter" in param: - if "free" in param: - out_xml( '\t "Free" \r\n') - else: - out_xml( '\t StringFmt( $' + spl[4] + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') - else: - out_xml( '\t Var( "฿" + $' + spl[4] + '.Price ) \r\n') - out_xml( '\t\r\n') - - ice_tab_ice_show = True - - shw = "$" + spl[5] + ".Button" - if spl[5] == "-" : - shw = '"Invisible"' - ice_tab_ice_show = False - - if len(spl[5]) == 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') - 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') - if "inter" in param: - out_xml( '\t\r\n') - out_xml( '\t 115 \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') - else: - out_xml( '\t\r\n') - out_xml( '\t 115 \r\n') - out_xml( '\t 265 \r\n') - out_xml( '\t 14 \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') - if "inter" in param: - if "free" in param: - out_xml( '\t "Free" \r\n') - else: - out_xml( '\t StringFmt( $' + spl[5] + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') - else: - out_xml( '\t Var( "฿" + $' + spl[5] + '.Price ) \r\n') - out_xml( '\t\r\n') - - ice_tab_blend_show = True - - shw = "$" + spl[6] + ".Button" - if spl[6] == "-" : - shw = '"Invisible"' - ice_tab_blend_show = False - - if len(spl[6]) == 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') - if "inter" in param: - out_xml( '\t 180 \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') - - else: - out_xml( '\t 183 \r\n') - out_xml( '\t 264 \r\n') - out_xml( '\t 14 \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') - if "inter" in param: - if "free" in param: - out_xml( '\t "Free" \r\n') - else: - out_xml( '\t StringFmt( $' + spl[6] + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') - else: - out_xml( '\t Var( "฿" + $' + spl[6] + '.Price ) \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') - if param == "old": - out_xml( '\t\r\n') - out_xml( '\t "ROOT/taobin_project/image//img_menu_err.png" \r\n') - out_xml( '\t\r\n') - else: - 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') - - - if param == "old": - print(";param=" + param) - else: - - 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 MITRegularTTF \r\n') - out_xml( '\t 0x5A5A5A \r\n') - out_xml( '\t "disable-show" \r\n') - out_xml( '\t $Sum' + str_con_var +' \r\n') - out_xml( '\t text_unavailable \r\n') - out_xml( '\t center-vertical-horizontal \r\n') - out_xml( '\t\r\n') - - - out_xml( '\r\n') - - ############################################################################### - out_xml( '\t; '+ spl[8] + ' ' + spl[9] + ' ' + spl[10]+ ' \r\n') - if spl[8] != '-' or spl[9] != '-' or spl[10] != '-': + out_xml( '\t; ==================> Len = ' + str(len(spl)) + '\r\n') menu_img = spl[7] + out_xml( '\t; '+ spl[4] + ' ' + spl[5] + ' ' + spl[6]+ ' \r\n') out_xml( '\r\n') out_xml('\t 33 \r\n') out_xml('\t 22 \r\n') @@ -546,19 +97,19 @@ out_xml('\t 296 \r\n') str_con = "" str_con_var = "" - if spl[8] != '-': - str_con += spl[8] + '.Button,' - if spl[9] != '-': - str_con += spl[9] + '.Button,' + if spl[4] != '-': + str_con += spl[4] + '.Button,' + if spl[5] != '-': + str_con += spl[5] + '.Button,' if spl[6] != '-': - str_con += spl[10] + '.Button,' + str_con += spl[6] + '.Button,' - if spl[8] != '-': - str_con_var += spl[8] + '-' - if spl[9] != '-': - str_con_var += spl[9] + '-' - if spl[10] != '-': - str_con_var += spl[10] + '-' + if spl[4] != '-': + str_con_var += spl[4] + '-' + if spl[5] != '-': + str_con_var += spl[5] + '-' + if spl[6] != '-': + str_con_var += spl[6] + '-' str_con_var = str_con_var.replace("-", "") if touch_less_gen == True: @@ -568,21 +119,21 @@ out_xml( '\t Flag( '+ str_con + ') \r\n') - pd_code_1 = spl[8] - pd_stage1 = '$' + spl[8] + '.Button' - if spl[8] == "-" or len(spl[8]) == 0 : + pd_code_1 = spl[4] + pd_stage1 = '$' + spl[4] + '.Button' + if spl[4] == "-" or len(spl[4]) == 0 : pd_code_1 = pd_code_available pd_stage1 = '"Disable2"' - pd_code_2 = spl[9] - pd_stage2 = '$' + spl[9] + '.Button' - if spl[9] == "-" or len(spl[9]) == 0: + pd_code_2 = spl[5] + pd_stage2 = '$' + spl[5] + '.Button' + if spl[5] == "-" or len(spl[5]) == 0: pd_code_2 = pd_code_available pd_stage2 = '"Disable2"' - pd_code_3 = spl[10] - pd_stage3 = '$' + spl[10] + '.Button' - if spl[10] == "-" or len(spl[10]) == 0: + pd_code_3 = spl[6] + pd_stage3 = '$' + spl[6] + '.Button' + if spl[6] == "-" or len(spl[6]) == 0: pd_code_3 = pd_code_available pd_stage3 = '"Disable2"' @@ -608,9 +159,9 @@ out_xml( '\t\tVar OpenFromXML = CurrentXMLFileName2\r\n') - out_xml( '\t\tVar PriceD1 = $' + spl[8] + '.Price\r\n') - out_xml( '\t\tVar PriceD2 = $' + spl[9] + '.Price\r\n') - out_xml( '\t\tVar PriceD3 = $' + spl[10] + '.Price\r\n') + out_xml( '\t\tVar PriceD1 = $' + spl[4] + '.Price\r\n') + out_xml( '\t\tVar PriceD2 = $' + spl[5] + '.Price\r\n') + out_xml( '\t\tVar PriceD3 = $' + spl[6] + '.Price\r\n') out_xml( '\t\tVar PD_CODE1 = "' + pd_code_1 + '"\r\n') out_xml( '\t\tVar PD_CODE2 = "' + pd_code_2 + '"\r\n') @@ -645,14 +196,14 @@ out_xml( '\t\tIf PD_STAGE_2 = "Enable" Then\r\n') #out_xml( '\t\t\tVar PD_STAGE_2 = "Enable"\r\n') - out_xml( '\t\t\tTopping "Load" "'+ spl[9] +'"\r\n') + out_xml( '\t\t\tTopping "Load" "'+ spl[5] +'"\r\n') out_xml( '\t\tElse\r\n') out_xml( '\t\t\tIf PD_STAGE_1 = "Enable" Then\r\n') #out_xml( '\t\t\t\tVar PD_STAGE_1 = "Enable"\r\n') - out_xml( '\t\t\tTopping "Load" "'+ spl[8] +'"\r\n') + out_xml( '\t\t\tTopping "Load" "'+ spl[4] +'"\r\n') out_xml( '\t\t\tElse\r\n') #out_xml( '\t\t\t\tVar PD_STAGE_3 = "Enable"\r\n') - out_xml( '\t\t\tTopping "Load" "'+ spl[10] +'"\r\n') + out_xml( '\t\t\tTopping "Load" "'+ spl[6] +'"\r\n') out_xml( '\t\t\tEndIf\r\n') out_xml( '\t\tEndIf\r\n') @@ -681,11 +232,12 @@ out_xml( '\t\tDEBUGVAR PD_STAGE_2\r\n') out_xml( '\t\tDEBUGVAR PD_STAGE_3\r\n') out_xml( '\t\tVar SelectDrinkType = 0\r\n') - + + out_xml( '\t\t\r\n') out_xml( '\t\t\r\n') if "inter" in param: - out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_select6.xml"\r\n') + out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_select5.xml"\r\n') else: out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_select4.xml"\r\n') out_xml( '\t\t\r\n') @@ -751,12 +303,12 @@ out_xml( '\t\r\n') ice_tab_hot_show = True - shw = "$" + spl[8] + ".Button" + shw = "$" + spl[4] + ".Button" if spl[4] == "-" : shw = '"Invisible"' ice_tab_hot_show = False - if len(spl[8]) == 0 : + if len(spl[4]) == 0 : shw = '"Invisible"' ice_tab_hot_show = False @@ -767,7 +319,6 @@ out_xml( '\t Var( DirImage2 + "hot.png" ) \r\n') out_xml( '\t Var( DirImage2 + "hot_db.png" ) \r\n') out_xml( '\t\r\n') - if "inter" in param: out_xml( '\t\r\n') out_xml( '\t 50 \r\n') @@ -782,29 +333,30 @@ out_xml( '\t 14 \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 Var( "฿" + $' + spl[4] + '.Price ) \r\n') + if "inter" in param: if "free" in param: out_xml( '\t "Free" \r\n') else: - out_xml( '\t StringFmt( $' + spl[8] + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') + out_xml( '\t StringFmt( $' + spl[4] + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') else: - out_xml( '\t Var( "฿" + $' + spl[8] + '.Price ) \r\n') - + out_xml( '\t Var( "฿" + $' + spl[4] + '.Price ) \r\n') out_xml( '\t\r\n') ice_tab_ice_show = True - shw = "$" + spl[9] + ".Button" - if spl[9] == "-" : + shw = "$" + spl[5] + ".Button" + if spl[5] == "-" : shw = '"Invisible"' ice_tab_ice_show = False - if len(spl[9]) == 0 : + if len(spl[5]) == 0 : shw = '"Invisible"' ice_tab_ice_show = False @@ -815,7 +367,6 @@ out_xml( '\t Var( DirImage2 + "cold_db.png" ) \r\n') out_xml( '\t ' + shw + ' \r\n') out_xml( '\t\r\n') - if "inter" in param: out_xml( '\t\r\n') out_xml( '\t 115 \r\n') @@ -838,20 +389,19 @@ if "free" in param: out_xml( '\t "Free" \r\n') else: - out_xml( '\t StringFmt( $' + spl[9] + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') + out_xml( '\t StringFmt( $' + spl[5] + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') else: - out_xml( '\t Var( "฿" + $' + spl[9] + '.Price ) \r\n') - + out_xml( '\t Var( "฿" + $' + spl[5] + '.Price ) \r\n') out_xml( '\t\r\n') ice_tab_blend_show = True - shw = "$" + spl[10] + ".Button" - if spl[10] == "-" : + shw = "$" + spl[6] + ".Button" + if spl[6] == "-" : shw = '"Invisible"' ice_tab_blend_show = False - if len(spl[10]) == 0 : + if len(spl[6]) == 0 : shw = '"Invisible"' ice_tab_blend_show = False @@ -863,20 +413,22 @@ out_xml( '\t ' + shw + ' \r\n') out_xml( '\t\r\n') + out_xml( '\t\r\n') if "inter" in param: - out_xml( '\t\r\n') - out_xml( '\t 183 \r\n') + out_xml( '\t 180 \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 KanitRegularTTF \r\n') + #out_xml( '\t end \r\n') + else: - out_xml( '\t\r\n') out_xml( '\t 183 \r\n') - out_xml( '\t 265 \r\n') + out_xml( '\t 264 \r\n') out_xml( '\t 14 \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') @@ -884,10 +436,9 @@ if "free" in param: out_xml( '\t "Free" \r\n') else: - out_xml( '\t StringFmt( $' + spl[10] + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') + out_xml( '\t StringFmt( $' + spl[6] + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') else: - out_xml( '\t Var( "฿" + $' + spl[10] + '.Price ) \r\n') - + out_xml( '\t Var( "฿" + $' + spl[6] + '.Price ) \r\n') out_xml( '\t\r\n') out_xml( '\t\r\n') @@ -969,7 +520,7 @@ if param == "old": - print("param=" + param) + print(";param=" + param) else: out_xml( '\t\r\n') @@ -986,29 +537,483 @@ out_xml( '\t center-vertical-horizontal \r\n') out_xml( '\t\r\n') + out_xml( '\r\n') - count_test = count_test + 1 - #if count_test > 8 : - # break - + ############################################################################### + out_xml( '\t; '+ spl[8] + ' ' + spl[9] + ' ' + spl[10]+ ' \r\n') + if spl[8] != '-' or spl[9] != '-' or spl[10] != '-': + menu_img = spl[7] + 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 = "" + if spl[8] != '-': + str_con += spl[8] + '.Button,' + if spl[9] != '-': + str_con += spl[9] + '.Button,' + if spl[6] != '-': + str_con += spl[10] + '.Button,' + + if spl[8] != '-': + str_con_var += spl[8] + '-' + if spl[9] != '-': + str_con_var += spl[9] + '-' + if spl[10] != '-': + str_con_var += spl[10] + '-' + + 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 = spl[8] + pd_stage1 = '$' + spl[8] + '.Button' + if spl[8] == "-" or len(spl[8]) == 0 : + pd_code_1 = pd_code_available + pd_stage1 = '"Disable2"' + + pd_code_2 = spl[9] + pd_stage2 = '$' + spl[9] + '.Button' + if spl[9] == "-" or len(spl[9]) == 0: + pd_code_2 = pd_code_available + pd_stage2 = '"Disable2"' + + pd_code_3 = spl[10] + pd_stage3 = '$' + spl[10] + '.Button' + if spl[10] == "-" or len(spl[10]) == 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 24 \r\n') + out_xml( '\t220\r\n') + out_xml( '\t "multi2" \r\n') + out_xml( '\t KanitMediumTTF \r\n') + out_xml( '\t 0x322B26 \r\n') + out_xml( '\t showthaiText \r\n') + out_xml( '\t "' + spl[0].replace("\\n", "\n") + '" \r\n') + out_xml( '\t\r\n') - out_xml('\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( '\t220\r\n') + out_xml( '\t KanitMediumTTF \r\n') + out_xml( '\t 0x6F5F51 \r\n') + out_xml( '\t showthaiText \r\n') + out_xml( '\t "' + spl[2].replace("\\n", "\n") + '" \r\n') + 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( '\t220\r\n') + out_xml( '\t "multi2" \r\n') + out_xml( '\t KanitMediumTTF \r\n') + out_xml( '\t 0x322B26 \r\n') + out_xml( '\t showengText \r\n') + out_xml( '\t "' + spl[1].replace("\\n", "\n") + '" \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( '\t220\r\n') + out_xml( '\t KanitMediumTTF \r\n') + out_xml( '\t 0x6F5F51 \r\n') + out_xml( '\t showengText \r\n') + out_xml( '\t "' + spl[3].replace("\\n", "\n") + '" \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 = "$" + spl[8] + ".Button" + if spl[4] == "-" : + shw = '"Invisible"' + ice_tab_hot_show = False + + if len(spl[8]) == 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') + + if "inter" in param: + out_xml( '\t\r\n') + out_xml( '\t 50 \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') + else: + out_xml( '\t\r\n') + out_xml( '\t 50 \r\n') + out_xml( '\t 265 \r\n') + out_xml( '\t 14 \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') + + if "inter" in param: + if "free" in param: + out_xml( '\t "Free" \r\n') + else: + out_xml( '\t StringFmt( $' + spl[8] + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') + else: + out_xml( '\t Var( "฿" + $' + spl[8] + '.Price ) \r\n') + + out_xml( '\t\r\n') + + ice_tab_ice_show = True + + shw = "$" + spl[9] + ".Button" + if spl[9] == "-" : + shw = '"Invisible"' + ice_tab_ice_show = False + + if len(spl[9]) == 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') + 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') + + if "inter" in param: + out_xml( '\t\r\n') + out_xml( '\t 115 \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') + else: + out_xml( '\t\r\n') + out_xml( '\t 115 \r\n') + out_xml( '\t 265 \r\n') + out_xml( '\t 14 \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') + if "inter" in param: + if "free" in param: + out_xml( '\t "Free" \r\n') + else: + out_xml( '\t StringFmt( $' + spl[9] + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') + else: + out_xml( '\t Var( "฿" + $' + spl[9] + '.Price ) \r\n') + + out_xml( '\t\r\n') + + ice_tab_blend_show = True + + shw = "$" + spl[10] + ".Button" + if spl[10] == "-" : + shw = '"Invisible"' + ice_tab_blend_show = False + + if len(spl[10]) == 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') + + if "inter" in param: + out_xml( '\t\r\n') + out_xml( '\t 183 \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') + else: + out_xml( '\t\r\n') + out_xml( '\t 183 \r\n') + out_xml( '\t 265 \r\n') + out_xml( '\t 14 \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') + if "inter" in param: + if "free" in param: + out_xml( '\t "Free" \r\n') + else: + out_xml( '\t StringFmt( $' + spl[10] + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') + else: + out_xml( '\t Var( "฿" + $' + spl[10] + '.Price ) \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') + if param == "old": + out_xml( '\t\r\n') + out_xml( '\t "ROOT/taobin_project/image//img_menu_err.png" \r\n') + out_xml( '\t\r\n') + else: + 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') - out_xml('; Cart\r\n') - out_xml('\r\n') + if param == "old": + print("param=" + param) + else: + + 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 MITRegularTTF \r\n') + out_xml( '\t 0x5A5A5A \r\n') + out_xml( '\t "disable-show" \r\n') + out_xml( '\t $Sum' + str_con_var +' \r\n') + out_xml( '\t text_unavailable \r\n') + out_xml( '\t center-vertical-horizontal \r\n') + out_xml( '\t\r\n') + + out_xml( '\r\n') + + count_test = count_test + 1 + #if count_test > 8 : + # break + + + + out_xml('\r\n') + + + out_xml('; Cart\r\n') + out_xml('\r\n') diff --git a/xml/menu_new_layout_gen_v2.py b/xml/menu_new_layout_gen_v2.py index b515c034..6901f686 100644 --- a/xml/menu_new_layout_gen_v2.py +++ b/xml/menu_new_layout_gen_v2.py @@ -1,553 +1,104 @@ - idx_hot_product_code = 4 - idx_cold_product_code = 5 - idx_blend_product_code = 6 - - idx_of_eng = 2 - idx_of_eng_des = 3 - idx_of_thai = 0 - idx_of_thai_des = 1 - - 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') + if current_file_name == "page_catalog_group_recommend.skt": + touch_less_gen = True + else: + touch_less_gen = False - out_xml('\t\r\n') - out_xml('\r\n') + 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') - str_con = "" - str_con_var = "" - if spl[ idx_hot_product_code] != '-': - str_con += spl[ idx_hot_product_code] + '.Button,' - if spl[ idx_cold_product_code] != '-': - str_con += spl[ idx_cold_product_code] + '.Button,' - if spl[ idx_blend_product_code] != '-': - str_con += spl[ idx_blend_product_code] + '.Button,' - - if spl[ idx_hot_product_code] != '-': - str_con_var += spl[ idx_hot_product_code] + '-' - if spl[ idx_cold_product_code] != '-': - str_con_var += spl[ idx_cold_product_code] + '-' - if spl[ idx_blend_product_code] != '-': - str_con_var += spl[ idx_blend_product_code] + '-' - - str_con_var = str_con_var.replace("-", "") - if touch_less_gen == True: - str_con += "Disable=Invisible," + 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') - str_con += "$Sum" + str_con_var - - out_xml( '\t Flag( '+ str_con + ') \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') - pd_code_1 = spl[ idx_hot_product_code] - pd_stage1 = '$' + spl[ idx_hot_product_code] + '.Button' - if spl[ idx_hot_product_code] == "-" or len(spl[ idx_hot_product_code]) == 0 : - pd_code_1 = pd_code_available - pd_stage1 = '"Disable2"' + out_xml('\t\r\n') + out_xml('\r\n') - pd_code_2 = spl[ idx_cold_product_code] - pd_stage2 = '$' + spl[ idx_cold_product_code] + '.Button' - if spl[ idx_cold_product_code] == "-" or len(spl[ idx_cold_product_code]) == 0: - pd_code_2 = pd_code_available - pd_stage2 = '"Disable2"' - - pd_code_3 = spl[ idx_blend_product_code] - pd_stage3 = '$' + spl[ idx_blend_product_code] + '.Button' - if spl[ idx_blend_product_code] == "-" or len(spl[ idx_blend_product_code]) == 0: - pd_code_3 = pd_code_available - pd_stage3 = '"Disable2"' + #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 - - - - 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 24 \r\n') - out_xml( '\t220\r\n') - out_xml( '\t "multi2" \r\n') - out_xml( '\t KanitMediumTTF \r\n') - out_xml( '\t 0x322B26 \r\n') - out_xml( '\t showthaiText \r\n') - out_xml( '\t "' + spl[ idx_of_eng].replace("\\n", "\n") + '" \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( '\t220\r\n') - out_xml( '\t KanitMediumTTF \r\n') - out_xml( '\t 0x6F5F51 \r\n') - out_xml( '\t showthaiText \r\n') - out_xml( '\t "' + spl[ idx_of_thai].replace("\\n", "\n") + '" \r\n') - 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( '\t220\r\n') - out_xml( '\t "multi2" \r\n') - out_xml( '\t KanitMediumTTF \r\n') - out_xml( '\t 0x322B26 \r\n') - out_xml( '\t showengText \r\n') - out_xml( '\t "' + spl[ idx_of_eng_des].replace("\\n", "\n") + '" \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( '\t220\r\n') - out_xml( '\t KanitMediumTTF \r\n') - out_xml( '\t 0x6F5F51 \r\n') - out_xml( '\t showengText \r\n') - out_xml( '\t "' + spl[ idx_of_thai_des].replace("\\n", "\n") + '" \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 = "$" + spl[ idx_hot_product_code] + ".Button" - if spl[ idx_hot_product_code] == "-" : - shw = '"Invisible"' - ice_tab_hot_show = False - - if len(spl[ idx_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') - if "inter" in param: - out_xml( '\t\r\n') - out_xml( '\t 50 \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') - else: - out_xml( '\t\r\n') - out_xml( '\t 50 \r\n') - out_xml( '\t 265 \r\n') - out_xml( '\t 14 \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 Var( "฿" + $' + spl[ idx_hot_product_code] + '.Price ) \r\n') - - if "inter" in param: - if "free" in param: - out_xml( '\t "Free" \r\n') - else: - out_xml( '\t StringFmt( $' + spl[ idx_hot_product_code] + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') - else: - out_xml( '\t Var( "฿" + $' + spl[ idx_hot_product_code] + '.Price ) \r\n') - out_xml( '\t\r\n') - - ice_tab_ice_show = True - - shw = "$" + spl[ idx_cold_product_code] + ".Button" - if spl[ idx_cold_product_code] == "-" : - shw = '"Invisible"' - ice_tab_ice_show = False - - if len(spl[ idx_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') - 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') - if "inter" in param: - out_xml( '\t\r\n') - out_xml( '\t 115 \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') - else: - out_xml( '\t\r\n') - out_xml( '\t 115 \r\n') - out_xml( '\t 265 \r\n') - out_xml( '\t 14 \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') - if "inter" in param: - if "free" in param: - out_xml( '\t "Free" \r\n') - else: - out_xml( '\t StringFmt( $' + spl[ idx_cold_product_code] + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') - else: - out_xml( '\t Var( "฿" + $' + spl[ idx_cold_product_code] + '.Price ) \r\n') - out_xml( '\t\r\n') - - ice_tab_blend_show = True - - shw = "$" + spl[ idx_blend_product_code] + ".Button" - if spl[ idx_blend_product_code] == "-" : - shw = '"Invisible"' - ice_tab_blend_show = False - - if len(spl[ idx_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') - if "inter" in param: - out_xml( '\t 180 \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') - - else: - out_xml( '\t 183 \r\n') - out_xml( '\t 264 \r\n') - out_xml( '\t 14 \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') - if "inter" in param: - if "free" in param: - out_xml( '\t "Free" \r\n') - else: - out_xml( '\t StringFmt( $' + spl[ idx_blend_product_code] + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') - else: - out_xml( '\t Var( "฿" + $' + spl[ idx_blend_product_code] + '.Price ) \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') - if param == "old": - out_xml( '\t\r\n') - out_xml( '\t "ROOT/taobin_project/image//img_menu_err.png" \r\n') - out_xml( '\t\r\n') - else: - 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') - - - if param == "old": - print(";param=" + param) - else: - - 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 MITRegularTTF \r\n') - out_xml( '\t 0x5A5A5A \r\n') - out_xml( '\t "disable-show" \r\n') - out_xml( '\t $Sum' + str_con_var +' \r\n') - out_xml( '\t text_unavailable \r\n') - out_xml( '\t center-vertical-horizontal \r\n') - out_xml( '\t\r\n') - - - out_xml( '\r\n') - - ############################################################################### - out_xml( '\t; '+ spl[8] + ' ' + spl[9] + ' ' + spl[10]+ ' \r\n') - if spl[8] != '-' or spl[9] != '-' or spl[10] != '-': - menu_img = spl[7] + out_xml( '\t; ==================> Len = ' + str(len(spl)) + '\r\n') + menu_img = spl[ idx_img][1] + out_xml( '\t; '+ spl[ idx_name][ idx_hot_product_code] + ' ' + spl[ idx_name][ idx_cold_product_code] + ' ' + spl[ idx_name][ idx_blend_product_code]+ ' \r\n') out_xml( '\r\n') out_xml('\t 33 \r\n') out_xml('\t 22 \r\n') @@ -555,19 +106,19 @@ out_xml('\t 296 \r\n') str_con = "" str_con_var = "" - if spl[8] != '-': - str_con += spl[8] + '.Button,' - if spl[9] != '-': - str_con += spl[9] + '.Button,' + if spl[ idx_hot_product_code] != '-': + str_con += spl[ idx_name][ idx_hot_product_code] + '.Button,' + if spl[ idx_cold_product_code] != '-': + str_con += spl[ idx_name][ idx_cold_product_code] + '.Button,' if spl[ idx_blend_product_code] != '-': - str_con += spl[10] + '.Button,' + str_con += spl[ idx_name][ idx_blend_product_code] + '.Button,' - if spl[8] != '-': - str_con_var += spl[8] + '-' - if spl[9] != '-': - str_con_var += spl[9] + '-' - if spl[10] != '-': - str_con_var += spl[10] + '-' + if spl[ idx_name][ idx_hot_product_code] != '-': + str_con_var += spl[ idx_name][ idx_hot_product_code] + '-' + if spl[ idx_name][ idx_cold_product_code] != '-': + str_con_var += spl[ idx_name][ idx_cold_product_code] + '-' + if spl[ idx_name][ idx_blend_product_code] != '-': + str_con_var += spl[ idx_name][ idx_blend_product_code] + '-' str_con_var = str_con_var.replace("-", "") if touch_less_gen == True: @@ -577,25 +128,25 @@ out_xml( '\t Flag( '+ str_con + ') \r\n') - pd_code_1 = spl[8] - pd_stage1 = '$' + spl[8] + '.Button' - if spl[8] == "-" or len(spl[8]) == 0 : + pd_code_1 = spl[ idx_name][ idx_hot_product_code] + pd_stage1 = '$' + spl[ idx_name][ idx_hot_product_code] + '.Button' + if spl[ idx_name][ idx_hot_product_code] == "-" or len(spl[ idx_name][ idx_hot_product_code]) == 0 : pd_code_1 = pd_code_available pd_stage1 = '"Disable2"' - pd_code_2 = spl[9] - pd_stage2 = '$' + spl[9] + '.Button' - if spl[9] == "-" or len(spl[9]) == 0: + pd_code_2 = spl[ idx_name][ idx_cold_product_code] + pd_stage2 = '$' + spl[ idx_name][ idx_cold_product_code] + '.Button' + if spl[ idx_name][ idx_cold_product_code] == "-" or len(spl[ idx_name][ idx_cold_product_code]) == 0: pd_code_2 = pd_code_available pd_stage2 = '"Disable2"' - pd_code_3 = spl[10] - pd_stage3 = '$' + spl[10] + '.Button' - if spl[10] == "-" or len(spl[10]) == 0: + pd_code_3 = spl[ idx_name][ idx_blend_product_code] + pd_stage3 = '$' + spl[ idx_name][ idx_blend_product_code] + '.Button' + if spl[ idx_name][ idx_blend_product_code] == "-" or len(spl[ idx_name][ idx_blend_product_code]) == 0: pd_code_3 = pd_code_available pd_stage3 = '"Disable2"' - + out_xml( '\t\r\n') - + out_xml('; Cart\r\n') + out_xml('\r\n') + # if "v2" in param: + diff --git a/xml/page_board.xml b/xml/page_board.xml index d89c2711..ea84cdf9 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -146,7 +146,7 @@ Var CocktailShow = "false" Var RoadShow = "false" EndIf - + Var TermTemOnline = "false" Var TaobinOnline = "false" diff --git a/xml/page_catalog.lxml b/xml/page_catalog.lxml index 53987bdf..ce006e8f 100644 --- a/xml/page_catalog.lxml +++ b/xml/page_catalog.lxml @@ -310,7 +310,7 @@ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" ; eng - Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.lxml" @@ -332,7 +332,7 @@ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml" + Open "ROOT/taobin_project/xml/page_catalog_group_coffee.lxml" @@ -354,7 +354,8 @@ SoundVolume OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml" + + Open "ROOT/taobin_project/xml/page_catalog_group_tea.lxml" @@ -375,7 +376,8 @@ SoundVolume OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml" + + Open "ROOT/taobin_project/xml/page_catalog_group_milk.lxml" @@ -398,7 +400,8 @@ SoundVolume OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml" + + Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" @@ -420,7 +423,8 @@ SoundVolume OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml" + + Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" @@ -442,7 +446,8 @@ SoundVolume OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - Open "ROOT/taobin_project/xml/page_catalog_group_other.xml" + + Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" 000009 @@ -467,7 +472,8 @@ SoundVolume OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml" + + Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" @@ -491,7 +497,7 @@ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - Open "ROOT/taobin_project/xml/page_catalog_group_health.xml" + Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" diff --git a/xml/page_catalog_group_appfast.lxml b/xml/page_catalog_group_appfast.lxml index f3827660..9346c111 100644 --- a/xml/page_catalog_group_appfast.lxml +++ b/xml/page_catalog_group_appfast.lxml @@ -1,547 +1,5 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" - - Var ice_tab_text = "Ice will be ready at " - Var text_unavailable = "UNAVAILABLE###size=16" - - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var text_unavailable = "หมด###size=32" - EndIf - - 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 - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - EndIf - - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf - ; - - - - - If AppFastEnable = "true" Then - Var Menu11Selected = "PressForever" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu7Selected = "PressForever" - EndIf - - - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - - - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - 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 - - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - SAVELOG "COA9" - Open NextPage - EndIf - Else - If Timeout > 30 Then - SAVELOG "COA30" - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - SAVELOG "Back" - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - If Seeker = "curr" Then - If DoorCupPosition = "bottom" Then - ; It normal - Var EmergencyStop = "false" - Else - Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" - - EndIf - EndIf - - If IgnoreNetCore = "true" Then - - Else - ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -; - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - - - - - - 10 - 497 - 1080 - "auto" - "Vertical" - 4 - -; menu_new_list 0 - -; Cart - - - - - +Traceback (most recent call last): + File "./menu_gen_inter.py", line 132, in eval_exe + exec( str, globals()) + File "", line 93, in +TypeError: can only concatenate str (not "list") to str diff --git a/xml/page_catalog_group_cocktail.lxml b/xml/page_catalog_group_cocktail.lxml index 416b6e63..9346c111 100644 --- a/xml/page_catalog_group_cocktail.lxml +++ b/xml/page_catalog_group_cocktail.lxml @@ -1,538 +1,5 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" - - Var ice_tab_text = "Ice will be ready at " - Var text_unavailable = "UNAVAILABLE###size=16" - - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var text_unavailable = "หมด###size=32" - EndIf - - 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 - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - EndIf - - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf - ; - - - - Var Menu8Selected = "PressForever" - - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - - - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - 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 - - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - SAVELOG "COA9" - Open NextPage - EndIf - Else - If Timeout > 30 Then - SAVELOG "COA30" - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - SAVELOG "Back" - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - If Seeker = "curr" Then - If DoorCupPosition = "bottom" Then - ; It normal - Var EmergencyStop = "false" - Else - Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" - - EndIf - EndIf - - If IgnoreNetCore = "true" Then - - Else - ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -; - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - - - - - 10 - 497 - 1080 - "auto" - "Vertical" - 4 - -; menu_new_list 0 - -; Cart - - - - - +Traceback (most recent call last): + File "./menu_gen_inter.py", line 132, in eval_exe + exec( str, globals()) + File "", line 93, in +TypeError: can only concatenate str (not "list") to str diff --git a/xml/page_catalog_group_coffee.lxml b/xml/page_catalog_group_coffee.lxml index b5f2f49f..9346c111 100644 --- a/xml/page_catalog_group_coffee.lxml +++ b/xml/page_catalog_group_coffee.lxml @@ -1,539 +1,5 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" - - Var ice_tab_text = "Ice will be ready at " - Var text_unavailable = "UNAVAILABLE###size=16" - - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var text_unavailable = "หมด###size=32" - EndIf - - 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 - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - EndIf - - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf - ; - - - - Var Menu2Selected = "PressForever" - - - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - - - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - 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 - - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - SAVELOG "COA9" - Open NextPage - EndIf - Else - If Timeout > 30 Then - SAVELOG "COA30" - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - SAVELOG "Back" - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - If Seeker = "curr" Then - If DoorCupPosition = "bottom" Then - ; It normal - Var EmergencyStop = "false" - Else - Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" - - EndIf - EndIf - - If IgnoreNetCore = "true" Then - - Else - ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -; - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - - - - - 10 - 497 - 1080 - "auto" - "Vertical" - 4 - -; menu_new_list 0 - -; Cart - - - - - - +Traceback (most recent call last): + File "./menu_gen_inter.py", line 132, in eval_exe + exec( str, globals()) + File "", line 93, in +TypeError: can only concatenate str (not "list") to str diff --git a/xml/page_catalog_group_forkid.lxml b/xml/page_catalog_group_forkid.lxml index 5d65a39c..9346c111 100644 --- a/xml/page_catalog_group_forkid.lxml +++ b/xml/page_catalog_group_forkid.lxml @@ -1,547 +1,5 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" - - Var ice_tab_text = "Ice will be ready at " - Var text_unavailable = "UNAVAILABLE###size=16" - - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var text_unavailable = "หมด###size=32" - EndIf - - 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 - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - EndIf - - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf - ; - - - - ; protein - If AppFastEnable = "true" Then - Var Menu11Selected = "PressForever" - Var Menu7Selected = "Invisible" - Var Menu21Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu7Selected = "Invisible" - Var Menu21Selected = "PressForever" - EndIf - - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - - - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - 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 - - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - SAVELOG "COA9" - Open NextPage - EndIf - Else - If Timeout > 30 Then - SAVELOG "COA30" - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - SAVELOG "Back" - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - If Seeker = "curr" Then - If DoorCupPosition = "bottom" Then - ; It normal - Var EmergencyStop = "false" - Else - Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" - - EndIf - EndIf - - If IgnoreNetCore = "true" Then - - Else - ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -; - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - - - - - 10 - 497 - 1080 - "auto" - "Vertical" - 4 - -; menu_new_list 0 - -; Cart - - - - - +Traceback (most recent call last): + File "./menu_gen_inter.py", line 132, in eval_exe + exec( str, globals()) + File "", line 93, in +TypeError: can only concatenate str (not "list") to str diff --git a/xml/page_catalog_group_health.lxml b/xml/page_catalog_group_health.lxml index 3ab947fe..9346c111 100644 --- a/xml/page_catalog_group_health.lxml +++ b/xml/page_catalog_group_health.lxml @@ -1,538 +1,5 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" - - Var ice_tab_text = "Ice will be ready at " - Var text_unavailable = "UNAVAILABLE###size=16" - - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var text_unavailable = "หมด###size=32" - EndIf - - 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 - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - EndIf - - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf - ; - - - - Var Menu22Selected = "PressForever" - - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - - - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - 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 - - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - SAVELOG "COA9" - Open NextPage - EndIf - Else - If Timeout > 30 Then - SAVELOG "COA30" - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - SAVELOG "Back" - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - If Seeker = "curr" Then - If DoorCupPosition = "bottom" Then - ; It normal - Var EmergencyStop = "false" - Else - Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" - - EndIf - EndIf - - If IgnoreNetCore = "true" Then - - Else - ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -; - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - - - - - 10 - 497 - 1080 - "auto" - "Vertical" - 4 - -; menu_new_list 0 - -; Cart - - - - - +Traceback (most recent call last): + File "./menu_gen_inter.py", line 132, in eval_exe + exec( str, globals()) + File "", line 93, in +TypeError: can only concatenate str (not "list") to str diff --git a/xml/page_catalog_group_health.skt b/xml/page_catalog_group_health.skt index 92fd5f80..1b8e7af5 100644 --- a/xml/page_catalog_group_health.skt +++ b/xml/page_catalog_group_health.skt @@ -36,8 +36,9 @@ ?> - - + diff --git a/xml/page_catalog_group_health.xml b/xml/page_catalog_group_health.xml index 6f739124..bf29f632 100644 --- a/xml/page_catalog_group_health.xml +++ b/xml/page_catalog_group_health.xml @@ -505,7 +505,6 @@ - 10 497 diff --git a/xml/page_catalog_group_milk.lxml b/xml/page_catalog_group_milk.lxml index 228dab2e..9346c111 100644 --- a/xml/page_catalog_group_milk.lxml +++ b/xml/page_catalog_group_milk.lxml @@ -1,535 +1,5 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" - - Var ice_tab_text = "Ice will be ready at " - Var text_unavailable = "UNAVAILABLE###size=16" - - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var text_unavailable = "หมด###size=32" - EndIf - - 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 - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - EndIf - - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf - ; - - - - Var Menu4Selected = "PressForever" - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - - - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - 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 - - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - SAVELOG "COA9" - Open NextPage - EndIf - Else - If Timeout > 30 Then - SAVELOG "COA30" - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - SAVELOG "Back" - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - If Seeker = "curr" Then - If DoorCupPosition = "bottom" Then - ; It normal - Var EmergencyStop = "false" - Else - Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" - - EndIf - EndIf - - If IgnoreNetCore = "true" Then - - Else - ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -; - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - - - - 10 - 497 - 1080 - "auto" - "Vertical" - 4 - -; menu_new_list 0 - -; Cart - - - - - +Traceback (most recent call last): + File "./menu_gen_inter.py", line 132, in eval_exe + exec( str, globals()) + File "", line 93, in +TypeError: can only concatenate str (not "list") to str diff --git a/xml/page_catalog_group_other.lxml b/xml/page_catalog_group_other.lxml index d815d54d..9346c111 100644 --- a/xml/page_catalog_group_other.lxml +++ b/xml/page_catalog_group_other.lxml @@ -1,537 +1,5 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" - - Var ice_tab_text = "Ice will be ready at " - Var text_unavailable = "UNAVAILABLE###size=16" - - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var text_unavailable = "หมด###size=32" - EndIf - - 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 - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - EndIf - - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf - ; - - - - ; soda and other - Var Menu6Selected = "PressForever" - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - - - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - 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 - - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - SAVELOG "COA9" - Open NextPage - EndIf - Else - If Timeout > 30 Then - SAVELOG "COA30" - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - SAVELOG "Back" - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - If Seeker = "curr" Then - If DoorCupPosition = "bottom" Then - ; It normal - Var EmergencyStop = "false" - Else - Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" - - EndIf - EndIf - - If IgnoreNetCore = "true" Then - - Else - ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -; - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - - - - - 10 - 497 - 1080 - "auto" - "Vertical" - 4 - -; menu_new_list 0 - -; Cart - - - - - +Traceback (most recent call last): + File "./menu_gen_inter.py", line 132, in eval_exe + exec( str, globals()) + File "", line 93, in +TypeError: can only concatenate str (not "list") to str diff --git a/xml/page_catalog_group_recommend.lxml b/xml/page_catalog_group_recommend.lxml index 59b934a9..9346c111 100644 --- a/xml/page_catalog_group_recommend.lxml +++ b/xml/page_catalog_group_recommend.lxml @@ -1,595 +1,5 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" - - Var ice_tab_text = "Ice will be ready at " - Var text_unavailable = "UNAVAILABLE###size=16" - - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var text_unavailable = "หมด###size=32" - EndIf - - 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 - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - EndIf - - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf - ; - - - - Var Menu1Selected = "PressForever" - - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - If show_eng = "true" Then - - Var text_unavailable = "UNAVAILABLE###size=16" - Else - Var text_unavailable = "หมด###size=32" - - EndIf - - - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - 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 - - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - SAVELOG "COA9" - Open NextPage - EndIf - Else - If Timeout > 30 Then - SAVELOG "COA30" - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - SAVELOG "Back" - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - If Seeker = "curr" Then - If DoorCupPosition = "bottom" Then - ; It normal - Var EmergencyStop = "false" - Else - Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" - - EndIf - EndIf - - If IgnoreNetCore = "true" Then - - Else - ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -; - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - - - 16 - 10 - 497 - 1080 - "auto" - "Vertical" - 4 - - - 33 - 22 - 225 - 296 - "Enable" - - 0 - 0 - TouchLessStg - Var( DirImage + "/touch_less_order.png" ) - Var( DirImage + "/touch_less_order_db.png" ) - - - 40 - 153 - 150 - "0xeae6e1" - "0x513C2F" - 150 - TouchLessQrStg - testservice - - -; menu_new_list 0 - -; Cart - - - - - - - - - - +Traceback (most recent call last): + File "./menu_gen_inter.py", line 132, in eval_exe + exec( str, globals()) + File "", line 93, in +TypeError: can only concatenate str (not "list") to str diff --git a/xml/page_catalog_group_recommend.skt b/xml/page_catalog_group_recommend.skt index 3de2e479..70fba93f 100644 --- a/xml/page_catalog_group_recommend.skt +++ b/xml/page_catalog_group_recommend.skt @@ -41,6 +41,9 @@ ?> + diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml index f54a3c2b..87127beb 100644 --- a/xml/page_catalog_group_recommend.xml +++ b/xml/page_catalog_group_recommend.xml @@ -510,6 +510,7 @@ + 16 10 diff --git a/xml/page_catalog_group_tea.lxml b/xml/page_catalog_group_tea.lxml index efff6a33..9346c111 100644 --- a/xml/page_catalog_group_tea.lxml +++ b/xml/page_catalog_group_tea.lxml @@ -1,537 +1,5 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" - - Var ice_tab_text = "Ice will be ready at " - Var text_unavailable = "UNAVAILABLE###size=16" - - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var text_unavailable = "หมด###size=32" - EndIf - - 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 - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - EndIf - - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf - ; - - - - Var Menu3Selected = "PressForever" - - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - - - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - 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 - - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - SAVELOG "COA9" - Open NextPage - EndIf - Else - If Timeout > 30 Then - SAVELOG "COA30" - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - SAVELOG "Back" - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - If Seeker = "curr" Then - If DoorCupPosition = "bottom" Then - ; It normal - Var EmergencyStop = "false" - Else - Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" - - EndIf - EndIf - - If IgnoreNetCore = "true" Then - - Else - ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -; - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - - - - 10 - 497 - 1080 - "auto" - "Vertical" - 4 - -; menu_new_list 0 - -; Cart - - - - - +Traceback (most recent call last): + File "./menu_gen_inter.py", line 132, in eval_exe + exec( str, globals()) + File "", line 93, in +TypeError: can only concatenate str (not "list") to str diff --git a/xml/page_catalog_group_whey.lxml b/xml/page_catalog_group_whey.lxml index 480aa51e..9346c111 100644 --- a/xml/page_catalog_group_whey.lxml +++ b/xml/page_catalog_group_whey.lxml @@ -1,542 +1,5 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" - - Var ice_tab_text = "Ice will be ready at " - Var text_unavailable = "UNAVAILABLE###size=16" - - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var text_unavailable = "หมด###size=32" - EndIf - - 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 - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - EndIf - - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf - ; - - - - If AppFastEnable = "true" Then - Var Menu11Selected = "PressForever" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu7Selected = "PressForever" - EndIf - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - - - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - 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 - - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - SAVELOG "COA9" - Open NextPage - EndIf - Else - If Timeout > 30 Then - SAVELOG "COA30" - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - SAVELOG "Back" - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - If Seeker = "curr" Then - If DoorCupPosition = "bottom" Then - ; It normal - Var EmergencyStop = "false" - Else - Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" - - EndIf - EndIf - - If IgnoreNetCore = "true" Then - - Else - ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -; - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - - - - 10 - 497 - 1080 - "auto" - "Vertical" - 4 - -; menu_new_list 0 - -; Cart - - - - - +Traceback (most recent call last): + File "./menu_gen_inter.py", line 132, in eval_exe + exec( str, globals()) + File "", line 93, in +TypeError: can only concatenate str (not "list") to str diff --git a/xml/page_topping_select6.xml b/xml/page_topping_select6.xml index cd86c1fe..f2d0bbe3 100644 --- a/xml/page_topping_select6.xml +++ b/xml/page_topping_select6.xml @@ -28,24 +28,9 @@ DEBUGVAR SelectDrink DEBUGVAR PictureDrink - DEBUGVAR new_layout - If new_layout = "true" Then - - Else - If SelectDrinkLen = 0 Then - SAVELOG "SelectDrinkLen=0" - Open "ROOT/taobin_project/xml/page_catalog.xml" - EndIf - - If PriceDrink = 0 Then - SAVELOG "PriceDrink=0" - Open "ROOT/taobin_project/xml/page_catalog.xml" - EndIf - EndIf - - Var SaveProductCodeSelect = SelectDrink - Var UserSelectProductCode = SelectDrink + Var SaveProductCodeSelect = "-" + Var UserSelectProductCode = "-" Var showText4 = "Invisible" Var showText7 = "Invisible" @@ -618,32 +603,7 @@ Var h_block_of_sugar = 210 - ;STRCONTAIN "Smoothie" SubMenuName11 HaveSmoothie - STRCONTAIN "Smoothie" MenuCodeName HaveSmoothie - If show_select_type = "Invisible" Then - If HaveSmoothie = "true" Then - Var blendedState = "Enable" - Var blendedStateShow = "Enable" - - Var PriceDiff = SubMenuPrice1 - PriceDrinkNoTop - - DEBUGVAR IsSmoRet - - If IsSmoRet = "true" Then - Var blendedState = "ForceSet" - Var blendedStateTxt = "Enable" - Topping "LoadSubMenu" SubMenuProductCode1 - Function 1 - Else - Var blendedStateTxt = "Invisible" - - EndIf - - EndIf - Else - Var blendedStateShow = "Invisible" - EndIf - + If IgnoreLidStraw = "true" Then Var IgnoreLidStraw = "false" Var ShowLidStraw = "Invisible" @@ -1561,95 +1521,6 @@ - -; -; 986 -; 160 -; 20 -; blendedStateShow -; -; Var( DirImage + "/bg_blended.png" ) -; -; -; -; -; -; -; -; showText7 -; 602 -; 64 -; Var( DirImage + "/text7.png" ) -; -; -; -; blendedStateTxt -; 602 -; 64 -; Var( DirImage + "/text5.png" ) -; -; -; -; ; ; ; @@ -3220,12 +3091,6 @@ ;Var Seeker = "curr" - If new_layout = "true" Then - ; Name , Descript - - EndIf - - DEBUGVAR PriceDrinkTmp @@ -3323,7 +3188,6 @@ DEBUGVAR LidState DEBUGVAR StrawState DEBUGVAR UserSelectProductCode - ; DEBUGVAR HAVE_UV_DOOR_LID obsolete. If StrawState = "Press" Then @@ -3347,13 +3211,8 @@ EndIf ; - If RoadShow = "true" Then - Var SelectDrink = UserSelectProductCode - Else - Var SelectDrink = UserSelectProductCode - EndIf - + Var SelectDrink = UserSelectProductCode Var Seeker.selected_a_drink = UserSelectProductCode DEBUGVAR Seeker.selected_a_drink @@ -3408,9 +3267,13 @@ GetLongTimeInMinute LastTimeClickOrder If CART_COUNT = 0 Then - If SelectDrinkType = 1 Then - OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" - Open "ROOT/taobin_project/xml/page_payment.xml" + If UserSelectProductCode = "-" Then + + Else + If SelectDrinkType = 1 Then + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" + Open "ROOT/taobin_project/xml/page_payment.xml" + EndIf EndIf If SelectDrinkType = 0 Then @@ -3443,102 +3306,6 @@ - - SAVELOG "FUNCTION1" - Var TOPPING_PRICE = 0 - DEBUGVAR PriceDrinkNoTop - DEBUGVAR PriceDiff - - DEBUGVAR showShotEnable - DEBUGVAR blendedState - - If blendedState = "ForceSet" Then - Var TOPPING_PRICE = PriceDiff - Var UserSelectProductCode = SubMenuProductCode1 - If showShotEnable = "Invisible" Then - - Else - Var showShotEnable = "Disable" - EndIf - - Var showText4 = "Enable" - Else - - If blendedState = "Press" Then - Var TOPPING_PRICE = PriceDiff - Var UserSelectProductCode = SubMenuProductCode1 - If showShotEnable = "Invisible" Then - - Else - Var showShotEnable = "Disable" - EndIf - - Var showText4 = "Enable" - Else - - Var UserSelectProductCode = SaveProductCodeSelect - If showShotEnable = "Disable" Then - Var showShotEnable = "Enable" - EndIf - - Var showText4 = "Invisible" - EndIf - EndIf - - If RoadShow = "true" Then - Var PriceDrinkTmp = "Free" - Var SaveSelectDrinkRoadShow = UserSelectProductCode - EndIf - - DEBUGVAR UserSelectProductCode - - - If showShotEnable = "Press" Then - If blendedState = "Press" Then - Var PriceDrinkTmp = PriceDrinkNoTop - EndIf - - Var blendedState = "Disable" - - Var TOPPING_PRICE = 0 - - ;Var PriceDrinkTmp = PriceDrinkNoTop + toppingID2price2 - Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2 - - Var topping2 = toppingID2index2 - Var DisableUsingCode = "true" - - Var showText7 = "Enable" - - SAVELOG "Select add normal shot" - Else - If blendedState = "Disable" Then - Var blendedState = "Enable" - EndIf - - - Var PriceDrinkTmp = PriceDrinkNoTop - Var topping2 = toppingID2index1 - Var DisableUsingCode = "false" - SAVELOG "Deselect add normal shot" - - Var showText7 = "Invisible" - - EndIf - - DEBUGVAR showShotEnable - DEBUGVAR blendedState - - Var PriceDrinkTmp = PriceDrinkNoTop + TOPPING_PRICE - Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp - - SAVELOG PriceDrinkTmp - - - Var Timeout = 0 - - - diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 9c024716..d9f7cbb5 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -106,8 +106,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "6.90" - Var XMLPageVersionInt = 690 + Var XMLPageVersion = "6.91" + Var XMLPageVersionInt = 691