miggaze fix
This commit is contained in:
miggaze
parent
2c35ff0504
commit
dc74a9c5ad
9 changed files with 586 additions and 163 deletions
|
|
@ -16,6 +16,11 @@
|
|||
;SAVELOG topping2
|
||||
;SAVELOG topping3
|
||||
|
||||
|
||||
|
||||
Var PayInfoCFlag = 0
|
||||
Var ActionOKCase = 0
|
||||
Var VendingCampaign = IntVendingCampaign
|
||||
|
||||
Var PayAmount = PriceDrink
|
||||
|
||||
|
|
@ -30,7 +35,7 @@
|
|||
Var CoinInCounter = 0
|
||||
|
||||
Var PayAmount = PriceDrink
|
||||
Var RemainAmount = PayAmount
|
||||
Var RemainAmount = PayAmount - IntVendingCampaign
|
||||
Var RemainAmountStr = "" + RemainAmount
|
||||
Var Timeout = 0
|
||||
Var PayOK = 0
|
||||
|
|
@ -52,7 +57,7 @@
|
|||
Var CancleState = "Enable"
|
||||
|
||||
Var VendingDiscount = DiscountDrink
|
||||
Var VendingCampaign = 0
|
||||
|
||||
|
||||
Var CashTextWarning = ""
|
||||
Var QRErrorState = "Invisible"
|
||||
|
|
@ -99,11 +104,17 @@
|
|||
|
||||
Else
|
||||
Var PayState1 = "PressForever"
|
||||
Var PayState2 = "Enable"
|
||||
If IntVendingCampaign = 0 Then
|
||||
Var PayState2 = "Enable"
|
||||
Else
|
||||
Var PayState2 = "Disable"
|
||||
EndIf
|
||||
Var PayState3 = "Enable"
|
||||
Var showRemaining = charOfBaht + RemainAmountStr
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
Var PayWithQR = 0
|
||||
Var NoGotoMenupage = "false"
|
||||
|
|
@ -116,38 +127,55 @@
|
|||
Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash_2.png"
|
||||
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
|
||||
|
||||
|
||||
|
||||
</EventOpen>
|
||||
|
||||
<EventActionOk>
|
||||
If VendingREFID = "" Then
|
||||
SAVELOG "menu_page4-QR.xml > ActOK_REFID"
|
||||
Refresh
|
||||
Else
|
||||
SAVELOG "menu_page4-QR.xml > ActOK_make"
|
||||
;Var VendingQRCode = "ERROR"
|
||||
;Coin STANDBY
|
||||
VendingQR 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"
|
||||
|
||||
Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
|
||||
Var BrewingTextThai = "เตรียมแก้ว"
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
If ActionOKCase = 0 Then
|
||||
If VendingREFID = "" Then
|
||||
SAVELOG "menu_page4-QR.xml > ActOK_REFID"
|
||||
Refresh
|
||||
Else
|
||||
SAVELOG "menu_page4-QR.xml > ActOK_make"
|
||||
;Var VendingQRCode = "ERROR"
|
||||
;Coin STANDBY
|
||||
VendingQR OFF
|
||||
|
||||
EndIf
|
||||
;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 ReqPayInfoFlag = 1 Then
|
||||
Var QRCODE99 = SessionID
|
||||
Var QRCODE99 = QRCODE99 + Ext1a
|
||||
SAVELOG QRCODE99
|
||||
Var QRCODE99 = QRCODE99 + Ext21
|
||||
Var QRCODETMP = QRCODE99
|
||||
Var ReqPayInfoFlag = 0
|
||||
Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
|
||||
Var BrewingTextThai = "เตรียมแก้ว"
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
|
||||
EndIf
|
||||
|
||||
If ReqPayInfoFlag = 1 Then
|
||||
Var QRCODE99 = SessionID
|
||||
Var QRCODE99 = QRCODE99 + Ext1a
|
||||
SAVELOG QRCODE99
|
||||
Var QRCODE99 = QRCODE99 + Ext21
|
||||
Var QRCODETMP = QRCODE99
|
||||
Var ReqPayInfoFlag = 0
|
||||
|
||||
EndIf
|
||||
Else
|
||||
Var PayInfoCFlag = 1
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
</EventActionOk>
|
||||
|
||||
|
||||
|
|
@ -155,95 +183,149 @@
|
|||
<EventTimeout>
|
||||
|
||||
Var Timeout = Timeout + 1
|
||||
If Timeout > 120 Then
|
||||
;
|
||||
|
||||
|
||||
If Timeout > 90 Then
|
||||
If ActionOKCase = 1 Then
|
||||
Var PayInfoCFlag = 1
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If PayInfoCFlag = 1 Then
|
||||
Var SessionID2 = SelectSlot + ":"
|
||||
Var SessionID2 = SessionID2 + ExtendData
|
||||
|
||||
Var CreditAmount1 = ""
|
||||
Var ServiceAmountFlow = ""
|
||||
Var TelephoneNumber = "0899999999"
|
||||
Var ServiceType = "coffee"
|
||||
Var ECommerce = ""
|
||||
Var ECommerce = ECommerce + PriceDrink
|
||||
Var ECommerce = ECommerce + "/"
|
||||
Var ECommerce = ECommerce + DiscountDrink
|
||||
Var ECommerce = ECommerce + "/"
|
||||
Var ECommerce = ECommerce + SessionID2
|
||||
Var ECommerce = ECommerce + "/"
|
||||
Var ECommerce = ECommerce + SelectDrink
|
||||
Var ECommerce = ECommerce + "/"
|
||||
Var ECommerce = ECommerce + "C00"
|
||||
Var ECommerce = ECommerce + "/"
|
||||
Var ECommerce = ECommerce + CodeNumber
|
||||
Var ECommerce = ECommerce + "/"
|
||||
Var ECommerce = ECommerce + "C"
|
||||
Var ServiceParameter = "max"
|
||||
Var ServiceCharge = 0
|
||||
Var AccountType = "new"
|
||||
Var testservice = "kbank"
|
||||
Var tc = ""
|
||||
Var GetScore = ""
|
||||
Var OperatorName = ""
|
||||
Var SessionID = ""
|
||||
GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
|
||||
;Var Timeout = 0
|
||||
Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
If CoinInOK = 1 Then
|
||||
Var CoinInCounter = CoinInCounter + 1
|
||||
If CoinInCounter = 1 Then
|
||||
|
||||
Var ChangeOK = 1
|
||||
Var Timeout = 60
|
||||
Var PayOK = 1
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If Timeout > 60 Then
|
||||
If PayOK = 1 Then
|
||||
|
||||
If ChangeOK = 1 Then
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
|
||||
Else
|
||||
If Timeout > 180 Then
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
Else
|
||||
If CancelFlag = 0 Then
|
||||
VendingQR OFF
|
||||
CoinVending OFF
|
||||
|
||||
|
||||
|
||||
If CoinAmount > 0 Then
|
||||
Var CancelFlag = 1
|
||||
Var CancelCounter = 0
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
Var CancelFlag = 1
|
||||
Var CancelCounter = 0
|
||||
If CoinAmount = 0 Then
|
||||
If IntVendingCampaign = 0 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
Var CancelCounter = CancelCounter + 1
|
||||
If CancelFlag = 1 Then
|
||||
;Var VendingQRCode = "ERROR"
|
||||
|
||||
Var CancelCounter = CancelCounter + 1
|
||||
If CancelCounter = 3 Then
|
||||
;Change CoinAmount
|
||||
If CoinAmount > 0 Then
|
||||
Change CoinAmount
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
If ActionOKCase = 0 Then
|
||||
Var ActionOKCase = 1
|
||||
Var PayInfoCFlag = 1
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If CancelCounter >= 33 Then
|
||||
Var ChangeOK = 1
|
||||
EndIf
|
||||
|
||||
; This copy in file menu_catalog.xml
|
||||
If CancelFlag = 1 Then
|
||||
|
||||
If ChangeOK = 1 Then
|
||||
Var VendingDiscount = 0
|
||||
Var VendingCampaign = 0
|
||||
Var ServiceType = "credit"
|
||||
Var SessionID2 = SelectDrink
|
||||
Var ServiceCredit = "coffee"
|
||||
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
|
||||
If NoGotoMenupage = "false" Then
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Var CoinInCounter = CoinInCounter + 1
|
||||
If CoinInOK = 1 Then
|
||||
If CoinInCounter = 1 Then
|
||||
|
||||
Var RemainAmount = PayAmount - CoinAmount
|
||||
If CoinAmount >= PayAmount Then
|
||||
Var Canout = CoinAmount - PayAmount
|
||||
If Canout > 0 Then
|
||||
Change Canout
|
||||
Else
|
||||
Var ChangeOK = 1
|
||||
EndIf
|
||||
|
||||
Var Timeout = 118
|
||||
Var PayOK = 1
|
||||
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
|
||||
If ActionOKCase = 0 Then
|
||||
Var VendingDiscount = 0
|
||||
Var VendingCampaign = 0
|
||||
Var ServiceType = "credit"
|
||||
Var SessionID2 = SelectDrink
|
||||
Var ServiceCredit = "coffee"
|
||||
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
|
||||
;If NoGotoMenupage = "false" Then
|
||||
;
|
||||
; Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
;EndIf
|
||||
Var ActionOKCase = 1
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
;Var CoinInCounter = CoinInCounter + 1
|
||||
;If CoinInOK = 1 Then
|
||||
; If CoinInCounter = 3 Then
|
||||
;
|
||||
; Var RemainAmount = PayAmount - CoinAmount
|
||||
; If CoinAmount >= PayAmount Then
|
||||
; Var Canout = CoinAmount - PayAmount
|
||||
; If Canout > 0 Then
|
||||
; Change Canout
|
||||
; Else
|
||||
; Var ChangeOK = 1
|
||||
; EndIf
|
||||
;
|
||||
; Var Timeout = 118
|
||||
; Var PayOK = 1
|
||||
;
|
||||
; MakeDrinkV1 SelectDrink SelectSugarID
|
||||
;
|
||||
; Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
;
|
||||
; EndIf
|
||||
; EndIf
|
||||
;EndIf
|
||||
|
||||
Refresh
|
||||
TimerReset
|
||||
</EventTimeout>
|
||||
|
|
@ -257,17 +339,22 @@
|
|||
<EventCoin>
|
||||
TimerReset
|
||||
|
||||
If CoinInFlag = 0 Then
|
||||
VendingQR OFF
|
||||
EndIf
|
||||
|
||||
Var CoinInFlag = 1
|
||||
|
||||
If CoinInOK = 0 Then
|
||||
|
||||
Var RemainAmount = PayAmount - CoinAmount
|
||||
If CoinAmount >= PayAmount Then
|
||||
Var RemainAmount = RemainAmount - IntVendingCampaign
|
||||
Var SumCoinAmount = CoinAmount + IntVendingCampaign
|
||||
If SumCoinAmount >= PayAmount Then
|
||||
;Var VendingQRCode = "ERROR"
|
||||
CoinVending OFF
|
||||
Var Canout = CoinAmount - PayAmount
|
||||
Var Canout = SumCoinAmount - PayAmount
|
||||
If Canout = 0 Then
|
||||
|
||||
Var RemainAmountStr = 0
|
||||
Else
|
||||
Var RemainAmountStr = "ทอน " + Canout
|
||||
|
|
@ -300,8 +387,12 @@
|
|||
CoinVending OFF
|
||||
Var CancelFlag = 1
|
||||
Var CancelCounter = 0
|
||||
If CoinAmount = 0 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
EndIf
|
||||
|
||||
Var showRemaining = "คืนเงิน"
|
||||
Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
;Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
@ -417,18 +508,21 @@
|
|||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
Var alphaState = "Enable"
|
||||
CoinVending OFF
|
||||
VendingQR ON
|
||||
Refresh
|
||||
|
||||
If CoinAmount > 0 Then
|
||||
Change CoinAmount
|
||||
Var ChangeOK = 0
|
||||
Var CancelFlag = 1
|
||||
Var CancelCounter = 0
|
||||
Var NoGotoMenupage = "true"
|
||||
|
||||
If CoinInFlag = 0 Then
|
||||
Var alphaState = "Enable"
|
||||
CoinVending OFF
|
||||
VendingQR ON
|
||||
Refresh
|
||||
|
||||
If CoinAmount > 0 Then
|
||||
Change CoinAmount
|
||||
Var ChangeOK = 0
|
||||
Var CancelFlag = 1
|
||||
Var CancelCounter = 0
|
||||
Var NoGotoMenupage = "true"
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
; If CoinInFlag = 0 Then
|
||||
|
|
@ -454,21 +548,33 @@
|
|||
<EventClick>
|
||||
|
||||
VendingQR OFF
|
||||
|
||||
|
||||
CoinVending OFF
|
||||
|
||||
|
||||
If CoinAmount > 0 Then
|
||||
Change CoinAmount
|
||||
Var ChangeOK = 0
|
||||
Var CancelFlag = 1
|
||||
Var CancelCounter = 0
|
||||
|
||||
Else
|
||||
Var ChangeOK = 1
|
||||
If CoinInOK = 0 Then
|
||||
If CancelFlag = 0 Then
|
||||
CoinVending OFF
|
||||
Var CancelFlag = 1
|
||||
Var CancelCounter = 0
|
||||
If CoinAmount = 0 Then
|
||||
If IntVendingCampaign = 0 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
|
||||
;If CoinAmount > 0 Then
|
||||
; Change CoinAmount
|
||||
; Var ChangeOK = 0
|
||||
; Var CancelFlag = 1
|
||||
; Var CancelCounter = 0
|
||||
;
|
||||
;Else
|
||||
; ;Var ChangeOK = 1
|
||||
;EndIf
|
||||
|
||||
;Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue