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

Merge

Browse source
This commit is contained in:
miggaze 2021-12-09 15:33:02 +07:00
commit ff2c8e7b49
7 changed files with 58 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
xml/page_brewing3.xml
View file

@ -534,7 +534,7 @@
Var PayDetail = PayDetail + NOBONUS
Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
;Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
If GetFreeFromError = 1 Then
Var CodeChannel = 1

1
xml/page_catalog.xml
View file

@ -13,6 +13,7 @@
Var web_readyOK = "false"
Var web_telnumOK = ""
Var PicturePath = "/mnt/sdcard/coffeevending/taobin_project/image/page_doing/"
If CocktailShow = "true" Then
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"

14
xml/page_payment_cash.xml
View file

@ -530,7 +530,11 @@
GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
;Var Timeout = 0
EndIf
<<<<<<< HEAD
If Seeker = "curr" Then
=======
If PauseOrder = "false" Then
>>>>>>> 0479282586527f47f0f2821824b32af59e613c53
Open "ROOT/taobin_project/xml/page_catalog.xml"
Else
Open "ROOT/taobin_project/xml/page_brewing3.xml"
@ -582,6 +586,16 @@
Var CancelFlag = 1
Var CancelCounter = 0
If CoinAmount = 0 Then
If IntVendingCredit > 0 Then
Var BmiYear = IntVendingCredit
Var GetScore = "useCredit"
AddData 24 TNumberTaobinCredit BmiYear PointCrm GetScore
Var IntVendingCredit = 0
EndIf
If IntVendingCampaign = 0 Then
VendingQR OFF
If Seeker = "curr" Then

31
xml/page_payment_cashMore.xml
View file

@ -568,6 +568,13 @@
Var CancelFlag = 1
Var CancelCounter = 0
If CoinAmount = 0 Then
If IntVendingCredit > 0 Then
Var BmiYear = IntVendingCredit
Var GetScore = "useCredit"
AddData 24 TNumberTaobinCredit BmiYear PointCrm GetScore
Var IntVendingCredit = 0
EndIf
If IntVendingCampaign = 0 Then
VendingQR OFF
@ -1037,6 +1044,12 @@
If CoinInFlag = 0 Then
VendingQR OFF
If IntVendingCredit > 0 Then
Var BmiYear = IntVendingCredit
Var GetScore = "useCredit"
AddData 24 TNumberTaobinCredit BmiYear PointCrm GetScore
Var IntVendingCredit = 0
EndIf
Open "ROOT/taobin_project/xml/page_catalog.xml"
EndIf
@ -1360,6 +1373,12 @@
<State> cart1_en </State>
<Filename> "ROOT/taobin_project/image/page_payment/iconX.png" </Filename>
<EventClick>
If IntVendingCredit > 0 Then
Var BmiYear = IntVendingCredit
Var GetScore = "useCredit"
AddData 24 TNumberTaobinCredit BmiYear PointCrm GetScore
Var IntVendingCredit = 0
EndIf
Cart "DeleteMenuID" 1
</EventClick>
@ -1399,6 +1418,12 @@
<State> cart2_en </State>
<Filename> "ROOT/taobin_project/image/page_payment/iconX.png" </Filename>
<EventClick>
If IntVendingCredit > 0 Then
Var BmiYear = IntVendingCredit
Var GetScore = "useCredit"
AddData 24 TNumberTaobinCredit BmiYear PointCrm GetScore
Var IntVendingCredit = 0
EndIf
Cart "DeleteMenuID" 2
</EventClick>
</Button>
@ -1438,6 +1463,12 @@
<State> cart3_en </State>
<Filename> "ROOT/taobin_project/image/page_payment/iconX.png" </Filename>
<EventClick>
If IntVendingCredit > 0 Then
Var BmiYear = IntVendingCredit
Var GetScore = "useCredit"
AddData 24 TNumberTaobinCredit BmiYear PointCrm GetScore
Var IntVendingCredit = 0
EndIf
Cart "DeleteMenuID" 3
</EventClick>

6
xml/page_thankyou.xml
View file

@ -35,15 +35,18 @@
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
Var BottomText = PicturePath + "text_bottom_eng.png"
Else
Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2.png"
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
Var BottomText = PicturePath + "text_bottom_thai2.png"
EndIf
DEBUGVAR StarwState
DEBUGVAR LidState
DEBUGVAR BottomText
If StarwState = "Press" Then
Machine StrawWithDelay
LED LedDoorLid Blink 255 255 255 255
@ -59,7 +62,6 @@
DEBUGVAR StoreCreditFlag
</EventOpen>
<Timeout> 1000 </Timeout>

6
xml/page_thankyouMore.xml
View file

@ -30,15 +30,19 @@
Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2_eng.png"
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
Var BottomText = PicturePath + "text_bottom_eng.png"
Else
Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2.png"
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
Var BottomText = PicturePath + "text_bottom_thai2.png"
EndIf
DEBUGVAR StarwState
DEBUGVAR LidState
DEBUGVAR BottomText
If StarwState = "Press" Then
Machine StrawWithDelay

4
xml_main/startup.xml
View file

@ -95,8 +95,8 @@
Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0
Var XMLPageVersion = "5.83"
Var XMLPageVersionInt = 583
Var XMLPageVersion = "5.84"
Var XMLPageVersionInt = 584
</EventOpen>
<Text>