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

Merge branch 'master' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project

Browse source
This commit is contained in:
kong 2022-06-24 16:36:25 +07:00
commit 43406c2295
13 changed files with 343 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

39
xml/page_member_topupCash.xml
View file

@ -93,6 +93,9 @@
If CoinAmount = 0 Then
Var RemainAmountStr = "ยกเลิก"
EndIf
If Seeker.StoreCreditFlag = 1 Then
Var RemainAmountStr = "เก็บเครดิต"
EndIf
If ViewBill > 0 Then
CoinVending BILLREJECT
EndIf
@ -157,9 +160,13 @@
Var CancelCounter = CancelCounter + 1
If CancelCounter = 2 Then
;Change CoinAmount
If CoinAmount > 0 Then
Change CoinAmount
Var ChangeFlag2 = 1
If CoinAmount > 0 Then
If Seeker.StoreCreditFlag = 0 Then
Change CoinAmount
Var ChangeFlag2 = 1
Else
Var ChangeOK = 1
EndIf
Else
Var ChangeOK = 1
EndIf
@ -223,7 +230,10 @@
Var alphaState3 = "Enable"
Var alphaState2 = "Disable"
Else
CoinVending BILLSTACKALL
;CoinVending BILLSTACKALL
Var RemainAmountKeep = 0
Var alphaState3 = "Enable"
Var alphaState2 = "Disable"
EndIf
Var Timeout = 0
@ -254,6 +264,11 @@
Var RemainAmountStr = "ทอน " + Canout
EndIf
If Seeker.StoreCreditFlag = 1 Then
Var RemainAmountStr = 0
EndIf
Var CancleState = "Disable"
Var CoinInOK = 1
@ -293,6 +308,11 @@
If CoinAmount = 0 Then
Var RemainAmountStr = "ยกเลิก"
EndIf
If Seeker.StoreCreditFlag = 1 Then
Var RemainAmountStr = "เก็บเครดิต"
EndIf
EndIf
EndIf
@ -470,6 +490,9 @@
If CoinAmount = 0 Then
Var RemainAmountStr = "ยกเลิก"
EndIf
If Seeker.StoreCreditFlag = 1 Then
Var RemainAmountStr = "เก็บเครดิต"
EndIf
EndIf
EndIf
@ -500,6 +523,9 @@
If CoinAmount = 0 Then
Var RemainAmountStr = "ยกเลิก"
EndIf
If Seeker.StoreCreditFlag = 1 Then
Var RemainAmountStr = "เก็บเครดิต"
EndIf
EndIf
EndIf
</EventClick>
@ -540,6 +566,10 @@
CoinVending BILLSTACKALL
Var Seeker.StoreCreditFlag = 1
Var alphaState3 = "Invisible"
Refresh
</EventClick>
</Button>
@ -564,6 +594,7 @@
If CoinAmount = 0 Then
Var RemainAmountStr = "ยกเลิก"
EndIf
EndIf
EndIf

26
xml/page_payment.xml
View file

@ -22,6 +22,24 @@
Var ServiceCharge = 0
Var AdultFlag = 0
If SelectDrink = "12-05-02-0028" Then
Var AdultFlag = 1
EndIf
If SelectDrink = "12-05-02-0029" Then
Var AdultFlag = 1
EndIf
If SelectDrink = "12-05-03-0028" Then
Var AdultFlag = 1
EndIf
If SelectDrink = "12-05-03-0029" Then
Var AdultFlag = 1
EndIf
Var QRCODE1 = "A000000677010112"
Var QRCODE2 = "010755600066301"
Var QRCODE3 = "VDGN"
@ -219,7 +237,13 @@
SaveLog "RoadShow test"
If RoadShow = "false" Then
;CoinVending ON
CoinVending XBILL
If AdultFlag = 1 Then
Var CoinAmount = 0
Else
CoinVending XBILL
EndIf
;Var CoinAmount = 0
Var Delay = 1
Else

299
xml/page_payment_cash.xml
View file

@ -7,6 +7,46 @@
<Sound> PlaySoundLag </Sound>
<EventOpen>
Var AdultState = "Invisible"
Var AdultState1 = "Invisible"
Var AdultState2 = "Invisible"
Var AdultState3 = "Invisible"
;Var AdultFlag = 0
Var AdultFlag2 = 0
If AdultFlag = 1 Then
Var AdultFlag = 0
DEBUGVAR SystemDate
Var sdate = ""
Var sdate = SystemDate
Var sdateday = ""
Var sdatemonth = ""
Var sdateyear = ""
SPLIT sdate "/" 1 sdateday
SPLIT sdate "/" 2 sdatemonth
SPLIT sdate "/" 3 sdateyear
INT sdateday
INT sdatemonth
INT sdateyear
READCARDID
Var AdultState = "Enable"
Var AdultState1 = "Enable"
Var countAdultS2 = 0
Var AdultFlag2 = 1
EndIf
DEBUGVAR QRCODETMP
DEBUGVAR IsSmoRet
@ -585,6 +625,19 @@
EndIf
If AdultState2 = "Enable" Then
Var countAdultS2 = countAdultS2 + 1
If countAdultS2 > 60 Then
Var AdultState2 = "Invisible"
Var AdultState3 = "Enable"
EndIf
Else
Var countAdultS2 = 0
EndIf
@ -839,6 +892,126 @@
EndIf
</EventChangeStatus>
<EventIDCard>
DEBUGVAR IDCardStatus
DEBUGVAR IDCardReady
DEBUGVAR IDCardData
DEBUGVAR IDBirthdate
If AdultFlag2 = 1 Then
If IDCardStatus = "OK" Then
If IDCardReady = "OK" Then
If IDCardData = "START" Then
Var AdultState2 = "Enable"
Var AdultState1 = "Invisible"
Refresh
EndIf
EndIf
EndIf
If IDCardStatus = "OK" Then
If IDCardReady = "OK" Then
If IDCardData = "ERROR" Then
Var AdultState2 = "Invisible"
Var AdultState3 = "Enable"
Refresh
EndIf
EndIf
EndIf
If IDCardStatus = "ERROR" Then
Var AdultState2 = "Invisible"
Var AdultState3 = "Enable"
Refresh
EndIf
If IDCardStatus = "OK" Then
If IDCardReady = "OK" Then
If IDCardData = "DONE" Then
;Var birthDate = IDBirthdate
Var StrYear = ""
Var StrMon = ""
Var StrDay = ""
SUBSTRING IDBirthdate 0 4 StrYear
SUBSTRING IDBirthdate 4 6 StrMon
SUBSTRING IDBirthdate 6 8 StrDay
INT StrYear
INT StrMon
INT StrDay
Var Adult20 = 0
DEBUGVAR StrYear
DEBUGVAR StrMon
DEBUGVAR StrDay
DEBUGVAR sdatemonth
DEBUGVAR sdateday
Var sdateyear = sdateyear + 543
Var AgeNumber = sdateyear - StrYear
DEBUGVAR AgeNumber
If AgeNumber >= 20 Then
If AgeNumber = 20 Then
If sdatemonth > StrMon Then
Var Adult20 = 1
Else
If sdatemonth = StrMon Then
If sdateday >= StrDay Then
Var Adult20 = 1
EndIf
EndIf
EndIf
Else
Var Adult20 = 1
EndIf
If Adult20 = 1 Then
Var AdultState3 = "Invisible"
Var AdultState2 = "Invisible"
Var AdultState1 = "Invisible"
Var AdultState = "Invisible"
CoinVending XBILL
Refresh
Else
Var AdultState2 = "Invisible"
Var AdultState3 = "Enable"
Refresh
EndIf
Else
Var AdultState2 = "Invisible"
Var AdultState3 = "Enable"
Refresh
EndIf
Var AdultFlag2 = 1
EndIf
EndIf
EndIf
EndIf
</EventIDCard>
<EventCoin>
TimerReset
@ -1440,7 +1613,7 @@
<Button>
<X> 287 </X>
<X> 360 </X>
<Y> 1781 </Y>
<State>CancleState</State>
<Filename> Var( DirImage + "/bn_cancel_all.png" )</Filename>
@ -1452,8 +1625,6 @@
;VendingQR OFF
If CoinInOK = 0 Then
If CancelFlag = 0 Then
SAVELOG "ButtonCancleMain > Cancle Order."
@ -1473,19 +1644,6 @@
EndIf
EndIf
;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"
Refresh
</EventClick>
@ -1593,6 +1751,106 @@
<State> alphaState2 </State>
<Filename> Var( DirImage2 + "/img_popup11.png" )</Filename>
</Image>
<Image>
<X> 0 </X>
<Y> 380 </Y>
<State> AdultState </State>
<Filename> "ROOT/taobin_project/image/page_payment/alpha.png" </Filename>
</Image>
<Image>
<X> 249 </X>
<Y> 751 </Y>
<State> AdultState1 </State>
<Filename> Var( DirImage + "/img_popup4.png" )</Filename>
</Image>
<Button>
<X> 360 </X>
<Y> 1373 </Y>
<State>AdultState1</State>
<Filename> Var( DirImage + "/bn_cancel_all.png" )</Filename>
<FilenamePress> Var( DirImage + "/bp_cancel_all.png" ) </FilenamePress>
<FilenameDisable> Var( DirImage + "/bp_cancel_all.png" ) </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
;VendingQR OFF
If CoinInOK = 0 Then
If CancelFlag = 0 Then
SAVELOG "ButtonCancleMain > Cancle Order."
Machine CancelWepApp
If ViewBill > 0 Then
CoinVending BILLREJECT
EndIf
CoinVending OFF
Var CancelFlag = 1
Var cancelState = "Enable"
Var CancelCounter = 0
If FlagQROpened = 1 Then
Var CancelNumber = 12
EndIf
EndIf
EndIf
Refresh
</EventClick>
</Button>
<Image>
<X> 249 </X>
<Y> 751 </Y>
<State> AdultState2 </State>
<Filename> Var( DirImage + "/img_popup4-2.png" )</Filename>
</Image>
<Image>
<X> 249 </X>
<Y> 751 </Y>
<State> AdultState3 </State>
<Filename> Var( DirImage + "/img_popup4-3.png" )</Filename>
</Image>
<Button>
<X> 360 </X>
<Y> 1373 </Y>
<State>AdultState3</State>
<Filename> Var( DirImage + "/bn_cancel_all.png" )</Filename>
<FilenamePress> Var( DirImage + "/bp_cancel_all.png" ) </FilenamePress>
<FilenameDisable> Var( DirImage + "/bp_cancel_all.png" ) </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
;VendingQR OFF
If CoinInOK = 0 Then
If CancelFlag = 0 Then
SAVELOG "ButtonCancleMain > Cancle Order."
Machine CancelWepApp
If ViewBill > 0 Then
CoinVending BILLREJECT
EndIf
CoinVending OFF
Var CancelFlag = 1
Var cancelState = "Enable"
Var CancelCounter = 0
If FlagQROpened = 1 Then
Var CancelNumber = 12
EndIf
EndIf
EndIf
Refresh
</EventClick>
</Button>
<Button>
<X> 438 </X>
@ -1755,6 +2013,15 @@
<Filename> Var( DirImage + "/loading.gif" )</Filename>
</GIF>
<GIF>
<X> 493 </X>
<Y> 1195 </Y>
<Width> 94 </Width>
<Height> 94 </Height>
<State> AdultState2 </State>
<Filename> Var( DirImage + "/loading.gif" )</Filename>
</GIF>
<EventSecurity>