add smoothies
This commit is contained in:
parent
53b641c56b
commit
72a1d0c489
19 changed files with 32877 additions and 518 deletions
|
|
@ -198,6 +198,12 @@ If ConfigNumer >= 1762 Then
|
|||
Var ToppingNewUINewSystem = 1
|
||||
EndIf
|
||||
|
||||
If ConfigNumer >= 1763 Then
|
||||
Var ToppingNewUINewSystemStep2 = 1
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
; override again
|
||||
|
||||
Var CleanFeedbackFlag = 1
|
||||
|
|
|
|||
|
|
@ -393,17 +393,19 @@
|
|||
str_con_var += spl[6] + '-'
|
||||
|
||||
str_con_var = str_con_var.replace("-", "")
|
||||
try:
|
||||
if re.match(r'(\d{4})/(\d{2})/(\d{2})T(\d{2}):(\d{2}):(\d{2})', spl[12].strip()):
|
||||
str_con += f'DateTimeStart="{spl[12].strip()}",'
|
||||
if re.match(r'(\d{4})/(\d{2})/(\d{2})T(\d{2}):(\d{2}):(\d{2})', spl[13].strip()):
|
||||
str_con += f'DateTimeEnd="{spl[13].strip()}",'
|
||||
|
||||
if re.match(r'(\d{4})/(\d{2})/(\d{2})T(\d{2}):(\d{2}):(\d{2})', spl[12].strip()):
|
||||
str_con += f'DateTimeStart="{spl[12].strip()}",'
|
||||
if re.match(r'(\d{4})/(\d{2})/(\d{2})T(\d{2}):(\d{2}):(\d{2})', spl[13].strip()):
|
||||
str_con += f'DateTimeEnd="{spl[13].strip()}",'
|
||||
if re.match(r'^\w.*', spl[14].strip()):
|
||||
str_con += f'Var={spl[14].strip()},'
|
||||
|
||||
if re.match(r'^\w.*', spl[14].strip()):
|
||||
str_con += f'Var={spl[14].strip()},'
|
||||
|
||||
if recommend_page:
|
||||
str_con += "Disable=Invisible,"
|
||||
if recommend_page:
|
||||
str_con += "Disable=Invisible,"
|
||||
except Exception:
|
||||
print("ProductCode = " + spl[4] + " Ignore")
|
||||
|
||||
str_con += "$Sum" + str_con_var
|
||||
|
||||
|
|
@ -1111,6 +1113,9 @@
|
|||
###############################################################################
|
||||
if "all" in verbose:
|
||||
print("sp[2]" + spl[2])
|
||||
if( len( spl) < 10):
|
||||
print(list(map(str, spl)))
|
||||
return
|
||||
out_xml( '\t; '+ spl[8] + ' ' + spl[9] + ' ' + spl[10]+ ' \r\n')
|
||||
if spl[8] != '-' or spl[9] != '-' or spl[10] != '-':
|
||||
menu_img = spl[7]
|
||||
|
|
|
|||
|
|
@ -1236,17 +1236,8 @@
|
|||
|
||||
Var MyanmarLangEnable = "true"
|
||||
|
||||
Var CatalogLayoutV3 = 0
|
||||
|
||||
If BoxID = 123456 Then
|
||||
Var CatalogLayoutV3 = 1
|
||||
EndIf
|
||||
If BoxID = 173149 Then
|
||||
Var CatalogLayoutV3 = 1
|
||||
EndIf
|
||||
If BoxID = 105005 Then
|
||||
Var CatalogLayoutV3 = 1
|
||||
EndIf
|
||||
Var CatalogLayoutV3 = 1
|
||||
|
||||
|
||||
; test payment
|
||||
Var New_Payment = 1
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -16686,257 +16686,6 @@ Plant Protein" </Value>
|
|||
<Value> text_unavailable </Value>
|
||||
<Align> center-vertical-horizontal </Align>
|
||||
</Text>
|
||||
</Block>
|
||||
; - - -
|
||||
; ==================> Len = 21
|
||||
; - 12-05-02-0016 -
|
||||
<Block>
|
||||
<MarginLeft> 33 </MarginLeft>
|
||||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( 12-05-02-0016.Button,$Sum1205020016) </State>
|
||||
<Button>
|
||||
<State> $Sum1205020016 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_water_roomtemp.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_water_roomtemp.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_water_roomtemp.png" </FilenameDisable>
|
||||
<OverlayImage> xmlpro( 12-05-02-0016, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventOnClick>
|
||||
Var NameDrink = "Drinking Water"
|
||||
Var NameDrinkTH = "น้ำดื่ม"
|
||||
Var DrinkDescriptionTH = "น้ำ"
|
||||
Var DrinkDescription = "Water"
|
||||
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_water_roomtemp.png"
|
||||
Var OpenFromXML = CurrentXMLFileName2
|
||||
Var PriceD1 = $-.Price
|
||||
Var PriceD2 = $12-05-02-0016.Price
|
||||
Var PriceD3 = $-.Price
|
||||
Var PD_CODE1 = "##-##-##-####"
|
||||
Var PD_CODE2 = "12-05-02-0016"
|
||||
Var PD_CODE3 = "##-##-##-####"
|
||||
Var PD_STAGE_1 = "Disable2"
|
||||
Var PD_STAGE_2 = $12-05-02-0016.Button
|
||||
Var PD_STAGE_3 = "Disable2"
|
||||
Var OverlayMenuFilter !assigned xmlpro( 12-05-02-0016, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
|
||||
DEBUGVAR OverlayMenuFilter
|
||||
Var SelectCountDrinkType = 0
|
||||
Var DefaultDrinkType = 0
|
||||
If PD_STAGE_1 = "Enable" Then
|
||||
Var SelectCountDrinkType = SelectCountDrinkType + 1
|
||||
Var DefaultDrinkType = 1
|
||||
EndIf
|
||||
If PD_STAGE_2 = "Enable" Then
|
||||
Var SelectCountDrinkType = SelectCountDrinkType + 1
|
||||
Var DefaultDrinkType = 2
|
||||
EndIf
|
||||
If PD_STAGE_3 = "Enable" Then
|
||||
Var SelectCountDrinkType = SelectCountDrinkType + 1
|
||||
Var DefaultDrinkType = 3
|
||||
EndIf
|
||||
If PD_STAGE_2 = "Enable" Then
|
||||
Topping "Load" "12-05-02-0016"
|
||||
Else
|
||||
If PD_STAGE_1 = "Enable" Then
|
||||
Topping "Load" "-"
|
||||
Else
|
||||
Topping "Load" "-"
|
||||
EndIf
|
||||
EndIf
|
||||
Var menu_name_eng_hot = $##-##-##-####.NameE
|
||||
Var menu_desc_eng_hot = $##-##-##-####.descriptionE
|
||||
Var menu_name_thai_hot = $##-##-##-####.Name
|
||||
Var menu_desc_thai_hot = $##-##-##-####.description
|
||||
|
||||
Var menu_name_eng_cold = $12-05-02-0016.NameE
|
||||
Var menu_desc_eng_cold = $12-05-02-0016.descriptionE
|
||||
Var menu_name_thai_cold = $12-05-02-0016.Name
|
||||
Var menu_desc_thai_cold = $12-05-02-0016.description
|
||||
|
||||
Var menu_name_eng_blender = $##-##-##-####.NameE
|
||||
Var menu_desc_eng_blender = $##-##-##-####.descriptionE
|
||||
Var menu_name_thai_blender = $##-##-##-####.Name
|
||||
Var menu_desc_thai_blender = $##-##-##-####.description
|
||||
|
||||
DEBUGVAR PD_STAGE_1
|
||||
DEBUGVAR PD_STAGE_2
|
||||
DEBUGVAR PD_STAGE_3
|
||||
Var SelectDrinkType = 0
|
||||
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_topping_select5.xml"
|
||||
|
||||
</EventOnClick>
|
||||
</Button>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
<Y> 164 </Y>
|
||||
<Size> 24 </Size>
|
||||
<Width>220</Width>
|
||||
<Mode> "multi2" </Mode>
|
||||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x322B26 </Color>
|
||||
<State> showthaiText </State>
|
||||
<Value> "น้ำดื่ม" </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
<Y> 220 </Y>
|
||||
<Size> 14 </Size>
|
||||
<Width>220</Width>
|
||||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<State> showthaiText </State>
|
||||
<Value> "น้ำ" </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
<Y> 164 </Y>
|
||||
<Size> 22 </Size>
|
||||
<Width>220</Width>
|
||||
<Mode> "multi2" </Mode>
|
||||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x322B26 </Color>
|
||||
<State> showengText </State>
|
||||
<Value> "Drinking Water" </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
<Y> 220 </Y>
|
||||
<Size> 14 </Size>
|
||||
<Width>220</Width>
|
||||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<State> showengText </State>
|
||||
<Value> "Water" </Value>
|
||||
</Text>
|
||||
<Image>
|
||||
<X> 16 </X>
|
||||
<Y> 264 </Y>
|
||||
<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
|
||||
</Image>
|
||||
<Image>
|
||||
<X> 16 </X>
|
||||
<Y> 264 </Y>
|
||||
<State> "Invisible" </State>
|
||||
<Filename> Var( DirImage2 + "hot.png" ) </Filename>
|
||||
<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
|
||||
</Image>
|
||||
<Text>
|
||||
<X> 50 </X>
|
||||
<Y> TextPriceMenuY </Y>
|
||||
<Size> TextPriceMenuSize </Size>
|
||||
<Width>220</Width>
|
||||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<ColorDisable> 0xEAE6E1 </ColorDisable>
|
||||
<State> "Invisible" </State>
|
||||
<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
|
||||
</Text>
|
||||
<Image>
|
||||
<X> 81 </X>
|
||||
<Y> 264 </Y>
|
||||
<Filename> Var( DirImage2 + "cold.png" ) </Filename>
|
||||
<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
|
||||
<State> $12-05-02-0016.Button </State>
|
||||
</Image>
|
||||
<Text>
|
||||
<X> 115 </X>
|
||||
<Y> TextPriceMenuY </Y>
|
||||
<Size> TextPriceMenuSize </Size>
|
||||
<Width>220</Width>
|
||||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<ColorDisable> 0xEAE6E1 </ColorDisable>
|
||||
<State> $12-05-02-0016.Button </State>
|
||||
<Value> StringFmt( $12-05-02-0016.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
|
||||
</Text>
|
||||
<Image>
|
||||
<X> 146 </X>
|
||||
<Y> 264 </Y>
|
||||
<Filename> Var( DirImage2 + "blend.png" ) </Filename>
|
||||
<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
|
||||
<State> "Invisible" </State>
|
||||
</Image>
|
||||
<Text>
|
||||
<X> 180 </X>
|
||||
<Y> TextPriceMenuY </Y>
|
||||
<Size> TextPriceMenuSize </Size>
|
||||
<Width>220</Width>
|
||||
<Font> KanitRegularTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<ColorDisable> 0xEAE6E1 </ColorDisable>
|
||||
<State> "Invisible" </State>
|
||||
<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
|
||||
</Text>
|
||||
<Image>
|
||||
<X> 81 </X>
|
||||
<Y> 264 </Y>
|
||||
<State>
|
||||
eval(
|
||||
If ICE_PROCESS_STATUS = 2 Then
|
||||
|
||||
Var ice_tab_process_show = "Invisible"
|
||||
|
||||
Else
|
||||
Var ice_tab_process_show = "Invisible"
|
||||
EndIf
|
||||
Var return = ice_tab_process_show
|
||||
)
|
||||
</State>
|
||||
<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
|
||||
<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
|
||||
</Image>
|
||||
<Image>
|
||||
<X> 49 </X>
|
||||
<Y> 117 </Y>
|
||||
<State>
|
||||
eval(
|
||||
If $Sum1205020016 = "Disable" Then
|
||||
STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
|
||||
STRCONTAIN "ERR" $12-05-02-0016.TAG tag2_is_disable
|
||||
STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
|
||||
Var return = "Invisible"
|
||||
If tag1_is_disable = "true" Then
|
||||
Var return = "Enable"
|
||||
EndIf
|
||||
If tag2_is_disable = "true" Then
|
||||
Var return = "Enable"
|
||||
EndIf
|
||||
If tag3_is_disable = "true" Then
|
||||
Var return = "Enable"
|
||||
EndIf
|
||||
Else
|
||||
Var return = "Invisible"
|
||||
EndIf
|
||||
)
|
||||
</State>
|
||||
<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
|
||||
</Image>
|
||||
<Text>
|
||||
<X> 84 </X>
|
||||
<Y> 266 </Y>
|
||||
<Size> 10 </Size>
|
||||
<Font> OpunMediumTTF </Font>
|
||||
<Color> 0xDE794E </Color>
|
||||
<State> ice_tab_process_show </State>
|
||||
<Value> ice_show_open </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 48 </X>
|
||||
<Y> 116 </Y>
|
||||
<Size> 32 </Size>
|
||||
<Width>128</Width>
|
||||
<Height>64</Height>
|
||||
<Font> MITRegularTTF </Font>
|
||||
<Color> 0x5A5A5A </Color>
|
||||
<Mode> "disable-show" </Mode>
|
||||
<State> $Sum1205020016 </State>
|
||||
<Value> text_unavailable </Value>
|
||||
<Align> center-vertical-horizontal </Align>
|
||||
</Text>
|
||||
</Block>
|
||||
; - - -
|
||||
; ==================> Len = 21
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -9,9 +9,34 @@
|
|||
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
|
||||
|
||||
|
||||
If Seeker = "curr" Then
|
||||
If MachineStage = "remove-cup" Then
|
||||
SAVELOG "MachineStage = remove-cup"
|
||||
If HaveCup = "true" Then
|
||||
Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
|
||||
EndIf
|
||||
|
||||
;Open "ROOT/taobin_project/xml/page_display_ExclusiveGift.xml"
|
||||
EndIf
|
||||
|
||||
If CupChecking = "true" Then
|
||||
If HaveCup = "true" Then
|
||||
SAVELOG "Have cup"
|
||||
Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If DoorCupPosition = "bottom" Then
|
||||
|
||||
Else
|
||||
SAVELOG "DoorCupPosition not bottom"
|
||||
Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
|
||||
EndIf
|
||||
Else
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
Var IndoQR = 0
|
||||
|
||||
Var PaymentEnableAll = "true"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue