This commit is contained in:
miggaze 2021-12-09 15:29:52 +07:00
parent 651d132fab
commit d995b39061
4 changed files with 52 additions and 81 deletions

View file

@ -14,6 +14,9 @@
DEBUGVAR SoundVolume
Var Seeker = "curr"
Var PauseOrder = "false"
DEBUGVAR web_ref
DEBUGVAR web_payment
DEBUGVAR web_telnum

View file

@ -963,13 +963,17 @@
</EventClick>
</Button>
<Button>
<X> 10 </X>
<Y> 424 </Y>
<Filename> next_pic_bg </Filename>
<EventClick>
Var PauseOrder = "true"
Open "ROOT/taobin_project/xml/page_catalog.xml"
Var Seeker = "next"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml"
</EventClick>
</Button>

View file

@ -32,23 +32,22 @@
Var CountStepPackPayment = 0
Var VendingCode = "C00"
Var VendingCampaignRI3 = 0
Var IntVendingCampaign = 0
Var FreeVendingCampaign = 0
Var CodeChannel = 0
Var Seeker.VendingCode = "C00"
Var Seeker.VendingCampaignRI3 = 0
Var Seeker.IntVendingCampaign = 0
Var Seeker.FreeVendingCampaign = 0
Var Seeker.CodeChannel = 0
Var CoinVendingOnFlag = 0
Var IntVendingCredit = 0
Var Seeker.IntVendingCredit = 0
Var StoreCreditFlag = 0
Var pageStoreCredit0 = 0
Var TNumberTaobinCredit = ""
Var TNumberTaobinMember = ""
Var VendingTSIDTmp = ""
Var Seeker.StoreCreditFlag = 0
Var Seeker.pageStoreCredit0 = 0
Var Seeker.TNumberTaobinCredit = ""
Var Seeker.TNumberTaobinMember = ""
Var Seeker.VendingTSIDTmp = ""
Var TNumberTaobinMember = ""
Var VendingTSIDTmp = ""
Var PayType = ""
Var CART_INDEX = 0
@ -86,7 +85,7 @@
Var MachineStage = "-"
Var PayReference = ""
Var CreditReferenceTmp = ""
Var Seeker.CreditReferenceTmp = ""
If web_app_prepar = "true" Then
Var web_app_prepar = "false"

View file

@ -150,7 +150,7 @@
Var PayWithQR = 0
Var Seeker.PayWithQR = 0
Var NoGotoMenupage = "false"
If show_eng = "true" Then
Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png"
@ -172,21 +172,16 @@
EndIf
If GetFreeFromError = 1 Then
Var FreeVendingCampaign = 1
CoinVending OFF
MakeDrinkV1 SelectDrink SelectSugarID
Var Seeker.FreeVendingCampaign = 1
CoinVending OFF
If Seeker = "curr" Then
MakeDrinkV1 SelectDrink SelectSugarID
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
If IntVendingCampaign >= PayAmount Then
Var RemainAmount = 0
Var RemainAmountStr = "" + RemainAmount
CoinVending OFF
MakeDrinkV1 SelectDrink SelectSugarID
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
If CoinInOK = 0 Then
@ -389,10 +384,11 @@
VendingQR OFF
CoinVending OFF
;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
MakeDrinkV1 SelectDrink SelectSugarID
Var PayWithQR = 1
;Open "/media/bt/xml/page_page4-1.xml"
If Seeker = "curr" Then
MakeDrinkV1 SelectDrink SelectSugarID
EndIf
Var Seeker.PayWithQR = 1
Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
Var BrewingTextThai = "เตรียมแก้ว"
@ -534,7 +530,11 @@
GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
;Var Timeout = 0
EndIf
Open "ROOT/taobin_project/xml/page_catalog.xml"
If Seeker = "curr" Then
Open "ROOT/taobin_project/xml/page_catalog.xml"
Else
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf
EndIf
@ -564,7 +564,10 @@
If Timeout > 180 Then
If PayOK = 1 Then
MakeDrinkV1 SelectDrink SelectSugarID
If Seeker = "curr" Then
MakeDrinkV1 SelectDrink SelectSugarID
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"
Else
@ -581,7 +584,11 @@
If CoinAmount = 0 Then
If IntVendingCampaign = 0 Then
VendingQR OFF
Open "ROOT/taobin_project/xml/page_catalog.xml"
If Seeker = "curr" Then
Open "ROOT/taobin_project/xml/page_catalog.xml"
Else
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf
EndIf
EndIf
@ -648,7 +655,11 @@
;EndIf
Var ActionOKCase = 1
If IntVendingCampaign = 0 Then
Open "ROOT/taobin_project/xml/page_catalog.xml"
If Seeker = "curr" Then
Open "ROOT/taobin_project/xml/page_catalog.xml"
Else
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf
EndIf
EndIf
EndIf
@ -1504,53 +1515,7 @@
<Button>
<X> 870 </X>
<Y> 1860 </Y>
<Width> 200 </Width>
<Height> 50 </Height>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var countClick2 = countClick2 + 1
If countClick2 = 3 Then
EndIf
If countClick2 = 5 Then
If IgnoreNetCore = "true" Then
;Var MachineStage = "make-drink"
; make drink
MakeDrinkV1 SelectDrink ExtendData
Open "ROOT/taobin_project/xml/page_thankyou.xml"
;Open "ROOT/taobin_project/xml/page_tel_number_mask.xml"
;Var UnitTestType = "1"
Var UnitTestType = "2"
;Open "ROOT/taobin_project/xml/page_show_consent2.xml"
;Open "ROOT/taobin_project/xml/page_payment_code.xml"
;Open "ROOT/taobin_project/xml/page_thankyou.xml"
;Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
; show consent
;Open "ROOT/taobin_project/xml/page_show_consent.xml"
;Open "ROOT/taobin_project/xml/page_drinkok.xml"
;Var CoffeePoint = 11
;Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
;Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf
Refresh
</EventClick>
</Button>