merged
This commit is contained in:
commit
36ceee08bc
160 changed files with 5829 additions and 360 deletions
|
|
@ -29,6 +29,7 @@
|
|||
; On open
|
||||
Var alphaState = "Invisible"
|
||||
Var alphaState2 = "Invisible"
|
||||
Var alphaState3 = "Invisible"
|
||||
|
||||
|
||||
Var CoinInFlag = 0
|
||||
|
|
@ -46,6 +47,8 @@
|
|||
Var PayOK = 0
|
||||
Var ChangeOK = 0
|
||||
Var CoinInOK = 0
|
||||
|
||||
Var RemainAmountKeep = 0
|
||||
|
||||
Var showRemaining = charOfBaht + RemainAmountStr
|
||||
|
||||
|
|
@ -59,7 +62,7 @@
|
|||
Var ServiceCharge = 0
|
||||
Var Donate = ""
|
||||
Var SuggestID = ""
|
||||
Var CancleState = "Enable"
|
||||
Var CancleState = "Invisible"
|
||||
|
||||
Var VendingDiscount = DiscountDrink
|
||||
|
||||
|
|
@ -114,20 +117,25 @@
|
|||
Var PayState1 = "Enable"
|
||||
Var PayState2 = "Invisible"
|
||||
Var PayState3 = "Invisible"
|
||||
Var PayState4 = "Invisible"
|
||||
Var showRemaining = "Free"
|
||||
|
||||
Else
|
||||
Var PayState1 = "Enable"
|
||||
If IntVendingCampaign = 0 Then
|
||||
Var PayState2 = "Enable"
|
||||
Var PayState4 = "Enable"
|
||||
Else
|
||||
Var PayState2 = "Disable"
|
||||
Var PayState4 = "Disable"
|
||||
EndIf
|
||||
Var PayState3 = "Enable"
|
||||
|
||||
|
||||
If CoinAmount > 0 Then
|
||||
Var PayState2 = "Disable"
|
||||
Var PayState3 = "Disable"
|
||||
Var PayState4 = "Disable"
|
||||
Var CoinInFlag = 1
|
||||
EndIf
|
||||
Var showRemaining = charOfBaht + RemainAmountStr
|
||||
|
|
@ -219,6 +227,9 @@
|
|||
Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
|
||||
EndIf
|
||||
|
||||
|
||||
Var EnoughChange = "yes"
|
||||
|
||||
</EventOpen>
|
||||
|
||||
<EventActionOk>
|
||||
|
|
@ -356,6 +367,10 @@
|
|||
If CancelFlag = 0 Then
|
||||
SAVELOG "Timeout > 180 s."
|
||||
|
||||
If ViewBill > 0 Then
|
||||
CoinVending BILLREJECT
|
||||
EndIf
|
||||
|
||||
CoinVending OFF
|
||||
Var CancelFlag = 1
|
||||
Var CancelCounter = 0
|
||||
|
|
@ -377,7 +392,12 @@
|
|||
If CancelCounter = CancelNumber Then
|
||||
;Change CoinAmount
|
||||
If CoinAmount > 0 Then
|
||||
Change CoinAmount
|
||||
If StoreCreditFlag = 1 Then
|
||||
Var ChangeOK = 1
|
||||
Else
|
||||
Change CoinAmount
|
||||
EndIf
|
||||
|
||||
Else
|
||||
If ActionOKCase = 0 Then
|
||||
Var ActionOKCase = 1
|
||||
|
|
@ -396,6 +416,15 @@
|
|||
|
||||
If ChangeOK = 1 Then
|
||||
If ActionOKCase = 0 Then
|
||||
|
||||
If TNumberTaobinCredit = "" Then
|
||||
Var TelephoneNumber = "0899999999"
|
||||
Var PayO2 = ""
|
||||
Else
|
||||
Var TelephoneNumber = TNumberTaobinCredit
|
||||
Var PayO2 = CoffeePinNumber
|
||||
EndIf
|
||||
|
||||
Var VendingDiscount = 0
|
||||
Var VendingCampaign = 0
|
||||
Var ServiceType = "credit"
|
||||
|
|
@ -457,43 +486,79 @@
|
|||
Var alphaState = "Invisible"
|
||||
EndIf
|
||||
|
||||
;If StoreCreditFlag = 1 Then
|
||||
; Var ViewBill = 0
|
||||
;EndIf
|
||||
|
||||
Var CoinInFlag = 1
|
||||
|
||||
If CoinInOK = 0 Then
|
||||
If ViewBill > 0 Then
|
||||
|
||||
|
||||
Var RemainAmount = PayAmount - CoinAmount
|
||||
Var RemainAmount = RemainAmount - IntVendingCampaign
|
||||
Var SumCoinAmount = CoinAmount + IntVendingCampaign
|
||||
If SumCoinAmount >= PayAmount Then
|
||||
;Var VendingQRCode = "ERROR"
|
||||
CoinVending OFF
|
||||
VendingQR OFF
|
||||
Var Canout = SumCoinAmount - PayAmount
|
||||
If Canout = 0 Then
|
||||
Var RemainAmountStr = 0
|
||||
Else
|
||||
Var RemainAmountStr = "ทอน " + Canout
|
||||
EndIf
|
||||
|
||||
|
||||
Var CancleState = "Disable"
|
||||
Var CoinInOK = 1
|
||||
Var CoinInCounter = 0
|
||||
|
||||
|
||||
|
||||
If ViewBill > RemainAmount Then
|
||||
Var RemainAmountKeep = ViewBill - RemainAmount
|
||||
Else
|
||||
Var RemainAmountStr = "" + RemainAmount
|
||||
Var RemainAmountKeep = ViewBill
|
||||
EndIf
|
||||
|
||||
Var Timeout = 0
|
||||
|
||||
;Var RemainAmount = 0
|
||||
|
||||
Var RemainAmountStr = "" + RemainAmount
|
||||
Var showRemaining = charOfBaht + RemainAmountStr
|
||||
Var alphaState2 = "Enable"
|
||||
|
||||
|
||||
|
||||
|
||||
Var alphaState3 = "Enable"
|
||||
|
||||
|
||||
Else
|
||||
|
||||
|
||||
If CoinInOK = 0 Then
|
||||
|
||||
Var RemainAmount = PayAmount - CoinAmount
|
||||
Var RemainAmount = RemainAmount - IntVendingCampaign
|
||||
Var SumCoinAmount = CoinAmount + IntVendingCampaign
|
||||
If SumCoinAmount >= PayAmount Then
|
||||
;Var VendingQRCode = "ERROR"
|
||||
CoinVending OFF
|
||||
VendingQR OFF
|
||||
Var Canout = SumCoinAmount - PayAmount
|
||||
If Canout = 0 Then
|
||||
Var RemainAmountStr = 0
|
||||
Else
|
||||
Var RemainAmountStr = "ทอน " + Canout
|
||||
EndIf
|
||||
|
||||
|
||||
Var CancleState = "Disable"
|
||||
Var CoinInOK = 1
|
||||
Var CoinInCounter = 0
|
||||
|
||||
|
||||
|
||||
Else
|
||||
Var RemainAmountStr = "" + RemainAmount
|
||||
EndIf
|
||||
|
||||
Var Timeout = 0
|
||||
|
||||
;Var RemainAmount = 0
|
||||
Var showRemaining = charOfBaht + RemainAmountStr
|
||||
Var alphaState2 = "Enable"
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
Refresh
|
||||
|
|
@ -548,18 +613,31 @@
|
|||
|
||||
|
||||
; back
|
||||
;<Button>
|
||||
;<X> 19 </X>
|
||||
;<Y> 420 </Y>
|
||||
;<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
|
||||
;<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
|
||||
;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
;<Volume> SoundVolume </Volume>
|
||||
;<EventClick>
|
||||
; Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
;
|
||||
;</EventClick>
|
||||
;</Button>
|
||||
<Button>
|
||||
<X> 19 </X>
|
||||
<Y> 420 </Y>
|
||||
<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
If CoinInOK = 0 Then
|
||||
If CancelFlag = 0 Then
|
||||
SAVELOG "ButtonCancleMain > Cancle Order."
|
||||
CoinVending OFF
|
||||
Var CancelFlag = 1
|
||||
Var CancelCounter = 0
|
||||
|
||||
If FlagQROpened = 1 Then
|
||||
Var CancelNumber = 12
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
||||
|
||||
|
|
@ -578,25 +656,31 @@
|
|||
<State> PayState1</State>
|
||||
<Filename> FilenameShowbuttonCashBN </Filename>
|
||||
<FilenamePress> FilenameShowbuttonCashBP </FilenamePress>
|
||||
<FilenameDisable> FilenameShowbuttonCashBP </FilenameDisable>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
If alphaState = "Invisible" Then
|
||||
;Var PayState1 = "PressForever"
|
||||
;Var PayState2 = "Enable"
|
||||
;Var QRChannel = 0
|
||||
;Open "ROOT/taobin_project/xml/page_payment_cash.xml"
|
||||
Var alphaState2 = "Enable"
|
||||
|
||||
If RoadShow = "true" Then
|
||||
Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
|
||||
Var MachineStage = "make-drink"
|
||||
Var BrewingTextThai = "เตรียมแก้ว"
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
|
||||
|
||||
If EnoughChange = "yes" Then
|
||||
|
||||
Var alphaState2 = "Enable"
|
||||
|
||||
If RoadShow = "true" Then
|
||||
Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
|
||||
Var MachineStage = "make-drink"
|
||||
Var BrewingTextThai = "เตรียมแก้ว"
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
|
||||
|
||||
EndIf
|
||||
Else
|
||||
|
||||
Var alphaState3 = "Enable"
|
||||
Refresh
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
</EventClick>
|
||||
|
|
@ -604,10 +688,11 @@
|
|||
|
||||
<Button>
|
||||
<X> 287 </X>
|
||||
<Y> 1549</Y>
|
||||
<Y> 1696</Y>
|
||||
<State> PayState2</State>
|
||||
<Filename> Var( DirImage + "/bn_pay_with_code.png") </Filename>
|
||||
<FilenamePress> Var( DirImage + "/bp_pay_with_code.png") </FilenamePress>
|
||||
<FilenameDisable> Var( DirImage + "/bp_pay_with_code.png") </FilenameDisable>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
|
@ -628,10 +713,11 @@
|
|||
|
||||
<Button>
|
||||
<X> 287 </X>
|
||||
<Y> 1400 </Y>
|
||||
<Y> 1401 </Y>
|
||||
<State> PayState3</State>
|
||||
<Filename> Var( DirImage + "/bn_prompt_pay.png") </Filename>
|
||||
<FilenamePress> Var( DirImage + "/bp_prompt_pay.png") </FilenamePress>
|
||||
<FilenameDisable> Var( DirImage + "/bp_prompt_pay.png") </FilenameDisable>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
|
@ -670,6 +756,34 @@
|
|||
</EventClick>
|
||||
</Button>
|
||||
|
||||
<Button>
|
||||
<X> 287 </X>
|
||||
<Y> 1548 </Y>
|
||||
<State> PayState4</State>
|
||||
<Filename> Var( DirImage + "/bn_pay_with_credit.png") </Filename>
|
||||
<FilenamePress> Var( DirImage + "/bp_pay_with_credit.png") </FilenamePress>
|
||||
<FilenameDisable> Var( DirImage + "/bp_pay_with_credit.png") </FilenameDisable>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
|
||||
If alphaState = "Invisible" Then
|
||||
|
||||
If CoinInFlag = 0 Then
|
||||
If CancelFlag = 0 Then
|
||||
Var TelephoneNumber = ""
|
||||
Var Tel_Confirm_State = "Disable"
|
||||
Open "ROOT/taobin_project/xml/page_payment_credit.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
<Button>
|
||||
<X> 438 </X>
|
||||
<Y> 1786 </Y>
|
||||
|
|
@ -807,7 +921,8 @@
|
|||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
;VendingQR OFF
|
||||
|
||||
|
||||
|
||||
|
||||
If CoinInOK = 0 Then
|
||||
|
|
@ -821,13 +936,17 @@
|
|||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
Var alphaState2 = "Invisible"
|
||||
Refresh
|
||||
|
||||
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
||||
|
||||
<Text>
|
||||
<X> 0 </X>
|
||||
<Y> 1041 </Y>
|
||||
|
|
@ -841,6 +960,65 @@
|
|||
</Text>
|
||||
; end case popup
|
||||
|
||||
<Image>
|
||||
<X> 0 </X>
|
||||
<Y> 380 </Y>
|
||||
<State> alphaState3 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_payment/alpha.png" </Filename>
|
||||
</Image>
|
||||
|
||||
<Image>
|
||||
<X> 182 </X>
|
||||
<Y> 748 </Y>
|
||||
<State> alphaState3 </State>
|
||||
<Filename> Var( DirImage2 + "/img_popup12.png" )</Filename>
|
||||
</Image>
|
||||
|
||||
<Button>
|
||||
<X> 327 </X>
|
||||
<Y> 1208 </Y>
|
||||
<State> alphaState3 </State>
|
||||
<Filename> Var( DirImage2 + "/bn_keep.png" )</Filename>
|
||||
<FilenamePress> Var( DirImage2 + "/bp_keep.png" )</FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_payment_storeCredit.xml"
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
<Button>
|
||||
<X> 327 </X>
|
||||
<Y> 1335 </Y>
|
||||
<State> alphaState3 </State>
|
||||
<Filename> Var( DirImage2 + "/bn_cancel2.png" )</Filename>
|
||||
<FilenamePress> Var( DirImage2 + "/bp_cancel2.png" )</FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
CoinVending BILLREJECT
|
||||
Var alphaState3 = "Invisible"
|
||||
Refresh
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
<Text>
|
||||
<X> 0 </X>
|
||||
<Y> 1041 </Y>
|
||||
<Size> 100 </Size>
|
||||
<Align> Center </Align>
|
||||
<Width> 1080 </Width>
|
||||
<Font> KanitRegularTTF </Font>
|
||||
<State> alphaState3 </State>
|
||||
<Color> 0xDE794E </Color>
|
||||
<Value> RemainAmountKeep </Value>
|
||||
</Text>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<QRCode>
|
||||
<X> 399 </X>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue