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 2025-05-19 20:59:24 +07:00
commit 00d0a0fc7c
66 changed files with 2814 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

6
xml/page_board.xml
View file

@ -1021,12 +1021,6 @@
; Singapore disable point
Var SettingIgnoreCollectPoint = 1
If BoxID = 210604 Then
Var SettingIgnoreCollectPoint = 0
EndIf
;If BoxID = 210699 Then
;Var SettingIgnoreCollectPoint = 0
;EndIf
READ_FILE "/mnt/sdcard/coffeevending/use_pt_dev" use_pt_dev
STRCONTAIN "1" use_pt_dev enable_pt_mode_by_cfg

27
xml/page_payment_cash.xml
View file

@ -9,7 +9,7 @@
RootLayoutVisible 3 "hide"
DEBUGVAR CountryName
SAVELOG "cash version 1.1"
Var cash_disable = "0"
@ -1392,6 +1392,8 @@
If VendingQRTypeResult = "KBA:2" Then
Var CashTextWarning = ""
Var QRErrorState = "Invisible"
Var PopupTimeoutEnable = "Enable"
Var PopupTimeout = 15
Var QRCODE99KBANK = SessionID
Var QRCODE99KBANK = QRCODE99KBANK + Ext1a
SAVELOG Ext1a
@ -1949,6 +1951,7 @@
If alphaState = "Enable" Then
Var QRErrorState = "Enable"
Var LOADING_STATE = "Invisible"
Var PopupTimeoutEnable = "Invisible"
Var QRCODE99 = ""
EndIf
EndIf
@ -2445,19 +2448,19 @@
EndIf
EndIf
EndIf
If PopupTimeoutEnable = "Enable" Then
If PopupTimeout > 0 Then
Var PopupTimeout = PopupTimeout - 1
Else
Var PopupTimeoutEnable = "Invisible"
Var cancelButtonQRPopupState = "Enable"
EndIf
EndIf
EndIf
EndIf
EndIf
If PopupTimeoutEnable = "Enable" Then
If PopupTimeout > 0 Then
Var PopupTimeout = PopupTimeout - 1
Else
Var PopupTimeoutEnable = "Invisible"
Var cancelButtonQRPopupState = "Enable"
EndIf
EndIf
Refresh
TimerReset
</EventTimeout>
@ -2996,7 +2999,7 @@
Var FlagQROpened = 1
Var alphaState = "Enable"
Var cancelButtonQRPopupState = "Enable"
Var cancelButtonQRPopupState = "Invisible"
Var QRCodeImageState = "Enable"
;CoinVending OFF
VendingQR ON
@ -3270,7 +3273,7 @@
<Y> 938 </Y>
<Width> 1080 </Width>
<Align> Center </Align>
<MaxSize> 66 </MaxSize>
<MaxSize> 66 </MaxSize>
<Size> Auto </Size>
<MaxLine> 1 </MaxLine>
<Font> KanitMediumTTF </Font>

41
xml/page_topping_select7.xml
View file

@ -2380,7 +2380,14 @@
Var showShotEnable = "Invisible"
Var ExtraTopping = "Enable"
Else
Var EnableLightRoast = "Enable"
If toppingID2index3 = 0 Then
Var EnableLightRoast = "Invisible"
Var ShotCoffeePremium = "Enable"
Var showShotEnable = "Invisible"
Var ExtraTopping = "Enable"
Else
Var EnableLightRoast = "Enable"
EndIf
EndIf
DEBUGVAR TOPPING2
@ -2438,16 +2445,16 @@
Var CustomCoffeeQuantityAdditionalPrice[0] = ""
EndIf
If toppingID2price2 > 0 Then
Var priceFormated !assigned StringFmt( toppingID2price2 , PriceCustomCoffeeFormat, PreScaleConvertShow)
If toppingID2price3 > 0 Then
Var priceFormated !assigned StringFmt( toppingID2price3 , PriceCustomCoffeeFormat, PreScaleConvertShow)
Var CustomCoffeeQuantityAdditionalPrice[1] = "(+" + priceFormated
Var CustomCoffeeQuantityAdditionalPrice[1] = CustomCoffeeQuantityAdditionalPrice[1] + ")"
Else
Var CustomCoffeeQuantityAdditionalPrice[1] = ""
EndIf
If toppingID2price3 > 0 Then
Var priceFormated !assigned StringFmt( toppingID2price3 , PriceCustomCoffeeFormat, PreScaleConvertShow)
If toppingID2price4 > 0 Then
Var priceFormated !assigned StringFmt( toppingID2price4 , PriceCustomCoffeeFormat, PreScaleConvertShow)
Var CustomCoffeeQuantityAdditionalPrice[2] = "(+" + priceFormated
Var CustomCoffeeQuantityAdditionalPrice[2] = CustomCoffeeQuantityAdditionalPrice[2] + ")"
Else
@ -2455,6 +2462,18 @@
EndIf
EndIf
If CustomCoffeeQuantityAdditionalPrice[1] = "" Then
Var CustomCoffeeQuantityTextX[1] = 809
Else
Var CustomCoffeeQuantityTextX[1] = 784
EndIf
If CustomCoffeeQuantityAdditionalPrice[2] = "" Then
Var CustomCoffeeQuantityTextX[2] = 922
Else
Var CustomCoffeeQuantityTextX[2] = 892
EndIf
;-END
@ -6096,7 +6115,7 @@
</Button>
<Text>
<X> 694 </X>
<X> 699 </X>
<Y> CustomCoffeeTextY </Y>
<Font> KanitRegularTTF </Font>
<State> showCoffeeQuantity </State>
@ -6106,7 +6125,8 @@
</Text>
<Text>
<X> 784 </X>
<Refresh> "Enable" </Refresh>
<X> CustomCoffeeQuantityTextX[1] </X>
<Y> CustomCoffeeTextY </Y>
<Font> KanitRegularTTF </Font>
<State> showCoffeeQuantity </State>
@ -6116,7 +6136,8 @@
</Text>
<Text>
<X> 892 </X>
<Refresh> "Enable" </Refresh>
<X> CustomCoffeeQuantityTextX[2] </X>
<Y> CustomCoffeeTextY </Y>
<Font> KanitRegularTTF </Font>
<State> showCoffeeQuantity </State>
@ -7907,10 +7928,10 @@
Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price1
EndIf
If CustomCoffeeQuantityState[1] = "PressForever" Then
Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2
Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price3
EndIf
If CustomCoffeeQuantityState[2] = "PressForever" Then
Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price3
Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price4
EndIf
If CustomCoffeeLevelState[0] = "PressForever" Then