Merge branch 'master' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project

This commit is contained in:
kong 2023-05-02 14:39:07 +07:00
commit 3a1c2d5bd4
45 changed files with 848 additions and 10 deletions

View file

@ -305,10 +305,17 @@
DEBUGVAR PromotionIDCurrentOrder
Var DiscountWithIdentifyState = "Invisible"
Var DiscountWithIdentifyState = "Enable"
;Var DiscountWithIdentifyState = "Invisible"
DEBUGVAR Price5Active
DEBUGVAR EnableLiveness
DEBUGVAR DiscountWithIdentifyState
Var ChildrenFree = 0
If BackToSchoolForFreeEnable = 1 Then
@ -3278,8 +3285,8 @@
<State> DiscountWithIdentifyState </State>
<X> 285 </X>
<Y> 1785 </Y>
<Filename> Var( DirImage + "/bp_price5baht.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bp_price5baht.png" )</FilenamePress>
<Filename> Var( DirImage + "/bp_childrenFree.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bp_childrenFree.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -3473,7 +3480,8 @@
If SelectDrinkType = 1 Then
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
Open "ROOT/taobin_project/xml/page_identity_verification.xml"
;Open "ROOT/taobin_project/xml/page_identity_verification.xml"
Open "ROOT/taobin_project/xml/page_identityChildren_consent.xml"
EndIf
EndIf