do milo and release 8.39

This commit is contained in:
wanlop run 2024-04-22 13:53:31 +07:00
commit 609144e666
44 changed files with 2275 additions and 2210 deletions

View file

@ -1984,7 +1984,6 @@ EndIf
CoinVending BILLREJECT
EndIf
CoinVending OFF
C
Var CancelFlag = 1
Var cancelState = "Enable"
Var CancelCounter = 0

View file

@ -346,6 +346,13 @@
Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_en"
Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
Var backTopLeft = DirImage + "/bn_back_arrow2.png"
Var cancelBtn = DirImage + "/bn_cancel.png"
Var cancelBtnP = DirImage + "/bp_cancel.png"
Var cancel2Btn = DirImage2 + "/bn_cancel2.png"
Var cancel2BtnP = DirImage2 + "/bp_cancel2.png"
Else
Var DirImage = "ROOT/taobin_project/image/page_payment"
Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend"
@ -354,6 +361,17 @@
If LanguageShow = "UAE_DUBAI" Then
Var DirImage = CountryRootPath + "/image/page_payment_cash/"
Var backTopLeft = DirImage + "/bn_back_arrow2-UAE_DUBAI.png"
Var cancelBtn = DirImage + "/bn_cancel-UAE_DUBAI.png"
Var cancelBtnP = DirImage + "/bp_cancel-UAE_DUBAI.png"
Var cancel2Btn = DirImage + "/bn_cancel2-UAE_DUBAI.png"
Var cancel2BtnP = DirImage + "/bp_cancel2-UAE_DUBAI.png"
DEBUGVAR cancel2Btn
DEBUGVAR cancel2BtnP
EndIf
Var EnoughChange = "yes"
@ -474,6 +492,8 @@
If DisableTaobinCredit = "true" Then
Var PayState4 = "Invisible"
EndIf
DEBUGVAR DirImage2
</EventOpen>
<EventActionOk>
@ -1365,8 +1385,8 @@
<Button>
<X> 18 </X>
<Y> 422 </Y>
<Filename> Var( DirImage + "/bn_back_arrow2.png") </Filename>
<FilenamePress> Var( DirImage + "/bn_back_arrow2.png") </FilenamePress>
<Filename> backTopLeft </Filename>
<FilenamePress> backTopLeft </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -1661,7 +1681,14 @@ EndIf
<X> 249 </X>
<Y> 748 </Y>
<State> alphaState </State>
<Filename> Var( DirImage + QR_POPUP )</Filename>
<Filename> eval(
If LanguageShow = "UAE_DUBAI" Then
Var return = DirImage + QR_POPUP
Else
Var return = "ROOT/taobin_project/image/page_payment_en/page_payment/" + QR_POPUP
EndIf
DEBUGVAR return
)</Filename>
</Image>
@ -1681,8 +1708,8 @@ EndIf
<X> 438 </X>
<Y> 1345 </Y>
<State> alphaState </State>
<Filename> Var( DirImage + "/bn_cancel.png" )</Filename>
<FilenamePress> Var( DirImage + "/bp_cancel.png" )</FilenamePress>
<Filename> cancelBtn </Filename>
<FilenamePress> cancelBtnP </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -1853,8 +1880,8 @@ EndIf
<X> 438 </X>
<Y> 1345 </Y>
<State> alphaState2 </State>
<Filename> Var( DirImage + "/bn_cancel.png" )</Filename>
<FilenamePress> Var( DirImage + "/bp_cancel.png" )</FilenamePress>
<Filename> cancelBtn </Filename>
<FilenamePress> cancelBtn </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -1914,7 +1941,7 @@ EndIf
<X> 182 </X>
<Y> 748 </Y>
<State> alphaState3 </State>
<Filename> Var( DirImage2 + "/img_popup12.png" )</Filename>
<Filename> Var( DirImage + "/img_popup12.png" )</Filename>
</Image>
<Button>
@ -1935,8 +1962,8 @@ EndIf
<X> 327 </X>
<Y> 1335 </Y>
<State> alphaState3 </State>
<Filename> Var( DirImage2 + "/bn_cancel2.png" )</Filename>
<FilenamePress> Var( DirImage2 + "/bp_cancel2.png" )</FilenamePress>
<Filename> cancel2Btn </Filename>
<FilenamePress> cancel2BtnP </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -1965,8 +1992,8 @@ EndIf
<X> 327 </X>
<Y> 1335 </Y>
<State> alphaState3_offline </State>
<Filename> Var( DirImage2 + "/bn_cancel2.png" )</Filename>
<FilenamePress> Var( DirImage2 + "/bp_cancel2.png" )</FilenamePress>
<Filename> cancel2Btn </Filename>
<FilenamePress> cancel2BtnP </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -2028,7 +2055,14 @@ EndIf
<X> 0 </X>
<Y> 380 </Y>
<State> cancelState </State>
<Filename> Var( DirImage + "/CancelOrder.png" ) </Filename>
;Var( DirImage + "/CancelOrder.png" )
<Filename> eval(
If LanguageShow = "UAE_DUBAI" Then
Var return = DirImage + "/CancelOrder-UAE_DUBAI.png"
Else
Var return = DirImage + "/CancelOrder.png"
EndIf
) </Filename>
</Image>
;<GIF>

View file

@ -7449,6 +7449,10 @@
Var PriceDrink = PriceDrinkTmp
Var PromotionPriceDrink = PriceDrink
DEBUGVAR PriceDrink
SAVELOG "USER press next ( topping ) - new"
If SugarState1 = "PressForever" Then