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

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

Browse source
This commit is contained in:
wanlop run 2024-11-12 17:47:06 +07:00
commit be10b8bc25
17 changed files with 768 additions and 578 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
font/Noto_Sans_Thai/NotoSansThai-Black.ttf Normal file
View file

Binary file not shown.

BIN
font/Noto_Sans_Thai/NotoSansThai-Bold.ttf Normal file
View file

Binary file not shown.

BIN
font/Noto_Sans_Thai/NotoSansThai-ExtraBold.ttf Normal file
View file

Binary file not shown.

BIN
font/Noto_Sans_Thai/NotoSansThai-ExtraLight.ttf Normal file
View file

Binary file not shown.

BIN
font/Noto_Sans_Thai/NotoSansThai-Light.ttf Normal file
View file

Binary file not shown.

BIN
font/Noto_Sans_Thai/NotoSansThai-Medium.ttf Normal file
View file

Binary file not shown.

BIN
font/Noto_Sans_Thai/NotoSansThai-Regular.ttf Normal file
View file

Binary file not shown.

BIN
font/Noto_Sans_Thai/NotoSansThai-SemiBold.ttf Normal file
View file

Binary file not shown.

BIN
font/Noto_Sans_Thai/NotoSansThai-Thin.ttf Normal file
View file

Binary file not shown.

BIN
image/collectiing/bd_pay_with_cashACU.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.1 KiB

BIN
image/collectiing/bn_pay_with_cashACU.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9.2 KiB

BIN
image/collectiing/bp_pay_with_cashACU.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9 KiB

2
xml/page_board.xml
View file

@ -98,6 +98,8 @@
Var OpunThinTTF = "ROOT/taobin_project/font/Opun/Opun-Thin.ttf"
Var OpunBoldTTF = "ROOT/taobin_project/font/Opun/Opun-Bold.ttf"
Var NotoSansThaiBold = "ROOT/taobin_project/font/Noto_Sans_Thai/NotoSansThai-Bold.ttf"
Var KanitSemiBoldTTF = "ROOT/taobin_project/font/Kanit/Kanit-Medium.ttf"
Var BlinkStar = "ROOT/taobin_project/image/animation/blink_star.gif"

3
xml/page_catalog_with_vending.xml
View file

@ -117,6 +117,9 @@
EndIf
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
; 1035 is Coke.
STRCONTAIN "1035" MaterialAvailable CokeUI

2
xml/page_payment.xml
View file

@ -22,6 +22,8 @@
Var QRCODE99 = ""
Var QRCODETMP = ""
Var QRPopupOpenFlag = 0
Var QRChannel = 0
;Var PriceDrink = 2

157
xml/page_payment_cash.xml
View file

@ -60,6 +60,7 @@
Var PreScaleCanculate = 1
Var CashlessPayFlag = 0
Var RemainAmountStrENG = ""
Var AdultState = "Invisible"
@ -176,6 +177,8 @@
Var Seeker.VendingDiscount = DiscountDrink
Var CancelingPopupFlag = "Invisible"
Var CancelingPopupCountDown = 0
Var CashTextWarning = ""
Var QRErrorState = "Invisible"
@ -598,6 +601,7 @@
Var alphaState = "Enable"
;CoinVending OFF
VendingQR ON
Var QRPopupOpenFlag = 1
Var SessionID2 = SelectSlot + ":"
@ -663,6 +667,7 @@
Var alphaState = "Enable"
;CoinVending OFF
VendingQR ON
Var QRPopupOpenFlag = 1
Var SessionID2 = SelectSlot + ":"
@ -715,6 +720,7 @@
Var alphaState = "Enable"
;CoinVending OFF
VendingQR ON
Var QRPopupOpenFlag = 1
Var SessionID2 = SelectSlot + ":"
@ -758,6 +764,7 @@
Var alphaState = "Enable"
;CoinVending OFF
VendingQR ON
Var QRPopupOpenFlag = 1
Var SessionID2 = SelectSlot + ":"
@ -801,6 +808,7 @@
Var alphaState = "Enable"
;CoinVending OFF
VendingQR ON
Var QRPopupOpenFlag = 1
Var SessionID2 = SelectSlot + ":"
@ -844,6 +852,7 @@
Var alphaState = "Enable"
;CoinVending OFF
VendingQR ON
Var QRPopupOpenFlag = 1
Var SessionID2 = SelectSlot + ":"
@ -887,6 +896,7 @@
Var alphaState = "Enable"
;CoinVending OFF
VendingQR ON
Var QRPopupOpenFlag = 1
Var SessionID2 = SelectSlot + ":"
@ -930,6 +940,7 @@
Var alphaState = "Enable"
;CoinVending OFF
VendingQR ON
Var QRPopupOpenFlag = 1
Var SessionID2 = SelectSlot + ":"
@ -973,6 +984,7 @@
Var alphaState = "Enable"
;CoinVending OFF
VendingQR ON
Var QRPopupOpenFlag = 1
Var SessionID2 = SelectSlot + ":"
@ -1016,6 +1028,7 @@
Var alphaState = "Enable"
;CoinVending OFF
VendingQR ON
Var QRPopupOpenFlag = 1
Var SessionID2 = SelectSlot + ":"
@ -1064,6 +1077,7 @@
Var alphaState = "Enable"
VendingQR ON
Var QRPopupOpenFlag = 1
Var ReqPayInfoFromCashOther = 0
EndIf
@ -1629,6 +1643,49 @@
EndIf
EndIf
If ReqPayInfoFlag = 11 Then
If VendingQRTypeResult = "ACU:2" Then
Var CashTextWarning = ""
Var QRErrorState = "Invisible"
Var QRCODE99Shoppy = ""
Var QRCODE99Shoppy = QRCODE99Shoppy + SessionID
Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1a
SAVELOG Ext1a
SAVELOG QRCODE99Shoppy
Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21
Var ReqPayInfoFlag = 0
Var ReqPayInfoFlag2 = 10
SAVELOG QRCODE99Shoppy
SAVELOG Ext21
DEBUGVAR QRCODE99Shoppy
Var QRCODE99 = QRCODE99Shoppy
Var LOADING_STATE = "Invisible"
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
Else
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3"
; Play Sound #zone
If SoundBackToSchoolEnable = 1 Then
If SoundBackToSchoolType = 1 Then
Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/"
EndIf
If SoundBackToSchoolType = 2 Then
Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/"
EndIf
Var PlaySoundLag = RootPathSoundBackToSchool + "Please_scan_to_pay_via_e-wallet.wav"
EndIf
Play PlaySoundLag
EndIf
EndIf
EndIf
Else
Var PayInfoCFlag = 1
EndIf
@ -2040,6 +2097,30 @@
; EndIf
;EndIf
If CancelingPopupFlag = "Enable" Then
Var CancelingPopupCountDown = CancelingPopupCountDown + 1
If CancelingPopupCountDown > 3 Then
Var CancelingPopupFlag = "Invisible"
Var alphaState = "Invisible"
If QRPopupOpenFlag = 1 Then
VendingQR OFF
EndIf
If ReqPayInfoFromCashOther = 2 Then
DEBUGVAR "CashlessReq OFF by user"
CashlessReq OFF
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
EndIf
EndIf
Refresh
TimerReset
</EventTimeout>
@ -2528,11 +2609,13 @@
Var QRCODE99 = ""
Var LOADING_STATE = "Enable"
Var CancelingPopupFlag = "Invisible"
Var FlagQROpened = 1
Var alphaState = "Enable"
;CoinVending OFF
VendingQR ON
Var QRPopupOpenFlag = 1
Var SessionID2 = SelectSlot + ":"
@ -2827,6 +2910,26 @@
</Image>
<Text>
<X> 267 </X>
<Y> 1065 </Y>
<State> CancelingPopupFlag </State>
<Width> 546 </Width>
<Height> 75 </Height>
<Font> NotoSansThaiBold </Font>
<Size> 58 </Size>
<Color> 0x5A5A5A </Color>
<Value>
eval(
If show_eng = "true" Then
Var return = "Canceling..."
Else
Var return = "กำลังยกเลิก..."
EndIf
)
</Value>
<Align> center-vertical-horizontal </Align>
</Text>
<Image>
<X> 267 </X>
@ -2835,10 +2938,6 @@
<Filename> Var( DirImage + "/loadingText.png" )</Filename>
</Image>
<Button>
<X> 438 </X>
<Y> 1345 </Y>
@ -2849,30 +2948,22 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var LOADING_STATE = "Invisible"
Var QRErrorState = "Invisible"
Var alphaState = "Invisible"
Var QRCODE99 = ""
;CoinVending ON
;VendingQR OFF
If CancelingPopupFlag = "Invisible" Then
Var LOADING_STATE = "Invisible"
Var QRErrorState = "Invisible"
Var QRCODE99 = ""
;CoinVending ON
DEBUGVAR ReqPayInfoFromCashOther
Var CancelingPopupFlag = "Enable"
Var CancelingPopupCountDown = 0
If ReqPayInfoFromCashOther = 2 Then
DEBUGVAR "CashlessReq OFF by user"
CashlessReq OFF
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
Refresh
Refresh
EndIf
</EventClick>
</Button>
; begin cash popup
<Image>
<X> 0 </X>
@ -3199,12 +3290,28 @@
<Y> 968 </Y>
<Width> 94 </Width>
<Height> 94 </Height>
<State> LOADING_STATE </State>
<State>
eval(
Var should_show = 0
If LOADING_STATE = "Enable" Then
Var should_show = 1
EndIf
If CancelingPopupFlag = "Enable" Then
Var should_show = 1
EndIf
If should_show = 1 Then
Var return = "Enable"
Else
Var return = "Invisible"
EndIf
)
</State>
<Filename> Var( DirImage + "/loading.gif" )</Filename>
</GIF>
<EventSecurity>
Open "/media/bt/xml/security_alarm.xml"
</EventSecurity>

78
xml/page_payment_cashOther.xml
View file

@ -186,6 +186,7 @@
Var alphaState = "Enable"
;CoinVending OFF
VendingQR ON
Var QRPopupOpenFlag = 1
Var SessionID2 = SelectSlot + ":"
@ -252,6 +253,7 @@
Var alphaState = "Enable"
;CoinVending OFF
VendingQR ON
Var QRPopupOpenFlag = 1
Var SessionID2 = SelectSlot + ":"
@ -317,6 +319,7 @@
Var alphaState = "Enable"
;CoinVending OFF
VendingQR ON
Var QRPopupOpenFlag = 1
Var SessionID2 = SelectSlot + ":"
@ -385,6 +388,7 @@
Var alphaState = "Enable"
;CoinVending OFF
VendingQR ON
Var QRPopupOpenFlag = 1
Var SessionID2 = SelectSlot + ":"
@ -450,6 +454,7 @@
Var alphaState = "Enable"
;CoinVending OFF
VendingQR ON
Var QRPopupOpenFlag = 1
Var SessionID2 = SelectSlot + ":"
@ -515,6 +520,7 @@
Var alphaState = "Enable"
;CoinVending OFF
VendingQR ON
Var QRPopupOpenFlag = 1
Var SessionID2 = SelectSlot + ":"
@ -581,6 +587,7 @@
Var alphaState = "Enable"
;CoinVending OFF
VendingQR ON
Var QRPopupOpenFlag = 1
Var SessionID2 = SelectSlot + ":"
@ -631,7 +638,7 @@
<Button>
<X> 440 </X>
<Y> 1189 </Y>
<State> "Enable" </State>
<State> WalletEnable </State>
<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_cashAli.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_cashAli.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/collectiing/bd_pay_with_cashAli.png" </FilenameDisable>
@ -648,6 +655,7 @@
Var alphaState = "Enable"
;CoinVending OFF
VendingQR ON
Var QRPopupOpenFlag = 1
Var SessionID2 = SelectSlot + ":"
@ -714,6 +722,7 @@
Var alphaState = "Enable"
;CoinVending OFF
VendingQR ON
Var QRPopupOpenFlag = 1
Var SessionID2 = SelectSlot + ":"
@ -760,6 +769,73 @@
</Button>
<Button>
<X> 208 </X>
<Y> 1413 </Y>
<State> "Invisible" </State>
<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_cashACU.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_cashACU.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/collectiing/bd_pay_with_cashACU.png" </FilenameDisable>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var QR_POPUP = "/img_popup22.png"
Var LOADING_STATE = "Enable"
Var QRCODE99 = ""
Var FlagQROpened = 1
Var alphaState = "Enable"
;CoinVending OFF
VendingQR ON
Var QRPopupOpenFlag = 1
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + Seeker.ExtendData
Var CreditAmount1 = ""
Var ServiceAmountFlow = ""
Var TelephoneNumberQR = "0899999999"
Var ServiceType = "coffee"
Var ECommerceQR = ""
Var ECommerceQR = ECommerceQR + PriceDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + DiscountDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + SessionID2
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + SelectDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + "ACU:2/"
;If IntVendingCampaign > 0 Then
; Var ECommerceQR = ECommerceQR + Seeker.VendingCode
; Var ECommerceQR = ECommerceQR + ":"
; Var ECommerceQR = ECommerceQR + Seeker.CodeNumber
; Var ECommerceQR = ECommerceQR + ":"
; Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3
;EndIf
Var ServiceParameter = "max"
Var ServiceCharge = 0
Var AccountType = "new"
Var testservice = "kbank"
Var tc = ""
Var GetScore = ""
Var OperatorName = ""
Var SessionID = ""
GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
Var ReqPayInfoFlag = 11
Var ReqPayInfoFromCashOther = 1
Open "ROOT/taobin_project/xml/page_payment_cash.xml"
</EventClick>
</Button>
<Button>
<X> 208 </X>
<Y> 1413 </Y>