pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

fix bug web credit

Browse source
This commit is contained in:
miggaze 2022-02-04 15:39:40 +07:00
commit 9c324357bc
49 changed files with 184 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

37
xml/page_board.xml
View file

@ -341,40 +341,15 @@
EndIf
If CAMPAIGN1 = "true" Then
Var video_menu_1 = "ROOT/taobin_project/campaign1/page_catalog_menu.mp4"
Var video_menu_0 = "ROOT/taobin_project/campaign1/page_catalog.mp4"
Var video_main_2 = "/mnt/sdcard/coffeevending/taobin_project/campaign1/page_main.mp4"
Var video_main_count = 3
EndIf
Var showCart = "Invisible"
Var LedLidBlink = "no"
Var web_app_str = ""
READ_FILE "/mnt/sdcard/web_app_enable" web_app_str
STRCONTAIN "1" web_app_str WebAppEnable
DEBUGVAR WebAppEnable
If WebAppEnable = "true" Then
Var WebAppShow = "Enable"
Else
Var WebAppShow = "Invisible"
EndIf
Var can_select_menu = ""
READ_FILE "/mnt/sdcard/can_select_menu" can_select_menu
DEBUGVAR can_select_menu
If can_select_menu = "1" Then
Var EnableSelectMenuBetweenBrew = "Enable"
Else
Var EnableSelectMenuBetweenBrew = "Invisible"
EndIf
Var WebAppShow = "Enable"
Var EnableSelectMenuBetweenBrew = "Enable"
DEBUGVAR XMLProfile
@ -399,7 +374,7 @@
DEBUGVAR AdvertiseProfile
If XMLProfile = "taobin_notopup" Then
Var ButtontoTopupMenu = "Invisible"
Var ButtontoTopupMenu = "Disable"
Else
Var ButtontoTopupMenu = "Enable"
EndIf

5
xml/page_catalog.xml
View file

@ -135,6 +135,10 @@
EndIf
If XMLProfile = "taobin_notopup" Then
Var ButtontoTopupMenu = "Disable"
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
@ -356,6 +360,7 @@
<State> ButtontoTopupMenu </State>
<Filename> Var(DirImage + "/bn_main_page_topup.png") </Filename>
<FilenamePress> Var(DirImage + "/bp_main_page_topup.png") </FilenamePress>
<FilenameDisable> Var(DirImage + "/bp_main_page_topup.png") </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>

4
xml/page_catalog_choose_drink6.pml
View file

@ -49,8 +49,12 @@
product_code.append('12-05-02-0030')
product_code.append('12-05-02-0002')
product_code.append('12-05-02-0003')
product_code.append('12-06-01-0001')
product_code.append('12-05-02-0016')
product_code.append('12-05-02-0017')
product_code.append('12-05-02-0018')

114
xml/page_catalog_choose_drink6.xml
View file

@ -3896,7 +3896,113 @@
<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
</Image>
</Block>
; button i=35 12-05-02-0016
; button i=35 12-06-01-0001
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> $12-06-01-0001.Button </State>
<Button>
<State> $12-06-01-0001.Button </State>
<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-06-01-0001.image ) </Filename>
<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-06-01-0001.image ) " </FilenamePress>
<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-06-01-0001.image ) " </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var SelectDrink = $12-06-01-0001.Self
Var NameDrink = $12-06-01-0001.NameE
Var NameDrinkTH = $12-06-01-0001.Name
Var DrinkDescriptionTH = $12-06-01-0001.description
Var DrinkDescription = $12-06-01-0001.descriptionE
Var PriceDrink = $12-06-01-0001.Price
Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-06-01-0001.image
Topping "Load" SelectDrink
SAVELOG NameDrink
Var PriceShowValue = charOfBaht + PriceDrink
Var OpenFromXML = CurrentXMLFileName2
STRCONTAIN "Smoothie" $12-06-01-0001.Button IsSmoRet
Open "ROOT/taobin_project/xml/page_topping_select.xml"
</EventOnClick>
</Button>
<Text>
<X> 182 </X>
<Y> 12 </Y>
<State> ShowPrice </State>
<Align> "Hurr" </Align>
<Width>150</Width>
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> $12-06-01-0001.Price </Value>
</Text>
<Text>
<X> 164 </X>
<Y> 12 </Y>
<State> ShowPrice </State>
<Width>20</Width>
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "฿"" </Value>
</Text>
<Text>
<X> 16 </X>
<Y> 190 </Y>
<Size> 24 </Size>
<Width>220</Width>
<Mode> "multi2" </Mode>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showthaiText </State>
<Value> $12-06-01-0001.Name </Value>
</Text>
<Text>
<X> 16 </X>
<Y> 246 </Y>
<Size> 14 </Size>
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> $12-06-01-0001.description </Value>
</Text>
<Text>
<X> 16 </X>
<Y> 190 </Y>
<Size> 22 </Size>
<Width>220</Width>
<Mode> "multi2" </Mode>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> $12-06-01-0001.NameE </Value>
</Text>
<Text>
<X> 16 </X>
<Y> 246 </Y>
<Size> 14 </Size>
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> $12-06-01-0001.descriptionE </Value>
</Text>
<Image>
<X> 2 </X>
<Y> 2 </Y>
<State> eval( STRCONTAIN "Smoothie" $12-06-01-0001.Button SmoRet
If SmoRet = "true" Then
Var return = "Enable"
Else
Var return = "Invisible"
EndIf
) </State>
<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
</Image>
</Block>
; button i=36 12-05-02-0016
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
@ -4002,7 +4108,7 @@
<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
</Image>
</Block>
; button i=36 12-05-02-0017
; button i=37 12-05-02-0017
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
@ -4108,7 +4214,7 @@
<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
</Image>
</Block>
; button i=37 12-05-02-0018
; button i=38 12-05-02-0018
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
@ -4214,7 +4320,7 @@
<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
</Image>
</Block>
; button i=38 12-05-01-0002
; button i=39 12-05-01-0002
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>

9
xml/page_thankyou.xml
View file

@ -93,9 +93,16 @@
Var SaveTheWorldCount = SaveTheWorldCount + 1
EndIf
DEBUGVAR LedLidBlink
DEBUGVAR SaveTheWorldCount
If SaveTheWorldCount = 2 Then
Var SaveTheWorldST = "Enable"
If LedLidBlink = "no" Then
Var SaveTheWorldST = "Enable"
EndIf
EndIf
</EventOpen>

28
xml/page_topping_select4.xml
View file

@ -1519,24 +1519,22 @@
DEBUGVAR UserSelectProductCode
DEBUGVAR HAVE_UV_DOOR_LID
If HAVE_UV_DOOR_LID = "true" Then
If StrawState = "Press" Then
Machine StrawOrder
Var LedLidBlink = "true"
EndIf
If LidState = "Press" Then
Machine LidOrder
Var LedLidBlink = "true"
EndIf
Var StrawState = "Enable"
Var LidState = "Enable"
;
If StrawState = "Press" Then
Machine StrawOrder
Var LedLidBlink = "true"
EndIf
If LidState = "Press" Then
Machine LidOrder
Var LedLidBlink = "true"
EndIf
Var StrawState = "Enable"
Var LidState = "Enable"
;
Var SelectDrink = UserSelectProductCode
; Set drink
Topping "Select" UserSelectProductCode