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

Merge remote-tracking branch 'origin/masterpiece' into hkg_multi

Browse source
This commit is contained in:
Ittipat Lusuk 2025-02-26 11:11:55 +07:00
commit a54adb7b12
39 changed files with 8792 additions and 1663 deletions
Download patch file Download diff file Expand all files Collapse all files

4
xml/page_catalog_group_coffee.xml
View file

@ -48,7 +48,7 @@
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 12-01-03-0090.Button,$Sum1201030090) </State>
<State> Flag( 12-01-03-0090.Button,DateTimeStart="2025/03/01T00:00:00",$Sum1201030090) </State>
<Button>
<State> $Sum1201030090 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Coconut_Milk_Coffee_Smoothie.png" </Filename>
@ -301,7 +301,7 @@ Sugar And Ice" </Value>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 12-21-03-0090.Button,$Sum1221030090) </State>
<State> Flag( 12-21-03-0090.Button,DateTimeStart="2025/03/01T00:00:00",$Sum1221030090) </State>
<Button>
<State> $Sum1221030090 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Coconut_Milk_Coffee_Smoothie.png" </Filename>

1277
xml/page_catalog_group_milk.xml
View file

File diff suppressed because it is too large Load diff

255
xml/page_catalog_group_tea.xml
View file

@ -3357,261 +3357,6 @@ Caramel Oreo" </Value>
<Value> text_unavailable </Value>
<Align> center-vertical-horizontal </Align>
</Text>
</Block>
; - - -
; ==================> Len = 15
; 12-02-01-0001 12-02-02-0001 12-02-03-0001
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 12-02-01-0001.Button,12-02-02-0001.Button,12-02-03-0001.Button,$Sum120201000112020200011202030001) </State>
<Button>
<State> $Sum120201000112020200011202030001 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_chrysanthemum_tea.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_chrysanthemum_tea.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_chrysanthemum_tea.png" </FilenameDisable>
<OverlayImage> xmlpro( 12-02-01-0001, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var NameDrink = "Chrysanths Tea"
Var NameDrinkTH = "เก็กฮวย "
Var DrinkDescriptionTH = "น้ำเก๊กฮวย น้ำตาล"
Var DrinkDescription = "Chrysanthemum & Water "
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_chrysanthemum_tea.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $12-02-01-0001.Price
Var PriceD2 = $12-02-02-0001.Price
Var PriceD3 = $12-02-03-0001.Price
Var PD_CODE1 = "12-02-01-0001"
Var PD_CODE2 = "12-02-02-0001"
Var PD_CODE3 = "12-02-03-0001"
Var PD_STAGE_1 = $12-02-01-0001.Button
Var PD_STAGE_2 = $12-02-02-0001.Button
Var PD_STAGE_3 = $12-02-03-0001.Button
Var OverlayMenuFilter !assigned xmlpro( 12-02-01-0001, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
DEBUGVAR OverlayMenuFilter
Var SelectCountDrinkType = 0
Var DefaultDrinkType = 0
If PD_STAGE_1 = "Enable" Then
Var SelectCountDrinkType = SelectCountDrinkType + 1
Var DefaultDrinkType = 1
EndIf
If PD_STAGE_2 = "Enable" Then
Var SelectCountDrinkType = SelectCountDrinkType + 1
Var DefaultDrinkType = 2
EndIf
If PD_STAGE_3 = "Enable" Then
Var SelectCountDrinkType = SelectCountDrinkType + 1
Var DefaultDrinkType = 3
EndIf
If PD_STAGE_2 = "Enable" Then
Topping "Load" "12-02-02-0001"
Else
If PD_STAGE_1 = "Enable" Then
Topping "Load" "12-02-01-0001"
Else
Topping "Load" "12-02-03-0001"
EndIf
EndIf
Var menu_name_eng_hot = $12-02-01-0001.NameE
Var menu_desc_eng_hot = $12-02-01-0001.descriptionE
Var menu_name_thai_hot = $12-02-01-0001.Name
Var menu_desc_thai_hot = $12-02-01-0001.description
Var menu_name_eng_cold = $12-02-02-0001.NameE
Var menu_desc_eng_cold = $12-02-02-0001.descriptionE
Var menu_name_thai_cold = $12-02-02-0001.Name
Var menu_desc_thai_cold = $12-02-02-0001.description
Var menu_name_eng_blender = $12-02-03-0001.NameE
Var menu_desc_eng_blender = $12-02-03-0001.descriptionE
Var menu_name_thai_blender = $12-02-03-0001.Name
Var menu_desc_thai_blender = $12-02-03-0001.description
DEBUGVAR PD_STAGE_1
DEBUGVAR PD_STAGE_2
DEBUGVAR PD_STAGE_3
Var SelectDrinkType = 0
Open "ROOT/taobin_project/xml/page_topping_select5.xml"
</EventOnClick>
</Button>
<Text>
<X> 16 </X>
<Y> 164 </Y>
<Size> 24 </Size>
<Width>220</Width>
<Mode> "multi2" </Mode>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showthaiText </State>
<Value> "เก็กฮวย " </Value>
</Text>
<Text>
<X> 16 </X>
<Y> 220 </Y>
<Size> 14 </Size>
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "น้ำเก๊กฮวย น้ำตาล" </Value>
</Text>
<Text>
<X> 16 </X>
<Y> 164 </Y>
<Size> 22 </Size>
<Width>220</Width>
<Mode> "multi2" </Mode>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "Chrysanths Tea" </Value>
</Text>
<Text>
<X> 16 </X>
<Y> 220 </Y>
<Size> 14 </Size>
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "Chrysanthemum & Water " </Value>
</Text>
<Image>
<X> 16 </X>
<Y> 264 </Y>
<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
</Image>
<Image>
<X> 16 </X>
<Y> 264 </Y>
<State> $12-02-01-0001.Button </State>
<Filename> Var( DirImage2 + "hot.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
</Image>
<Text>
<X> 50 </X>
<Y> TextPriceMenuY </Y>
<Size> TextPriceMenuSize </Size>
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> $12-02-01-0001.Button </State>
<Value> StringFmt( $12-02-01-0001.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text>
<Image>
<X> 81 </X>
<Y> 264 </Y>
<Filename> Var( DirImage2 + "cold.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
<State> $12-02-02-0001.Button </State>
</Image>
<Text>
<X> 115 </X>
<Y> TextPriceMenuY </Y>
<Size> TextPriceMenuSize </Size>
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> $12-02-02-0001.Button </State>
<Value> StringFmt( $12-02-02-0001.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text>
<Image>
<X> 146 </X>
<Y> 264 </Y>
<Filename> Var( DirImage2 + "blend.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
<State> $12-02-03-0001.Button </State>
</Image>
<Text>
<X> 180 </X>
<Y> TextPriceMenuY </Y>
<Size> TextPriceMenuSize </Size>
<Width>220</Width>
<Font> KanitRegularTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> $12-02-03-0001.Button </State>
<Value> StringFmt( $12-02-03-0001.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text>
<Image>
<X> 81 </X>
<Y> 264 </Y>
<State>
eval(
If ICE_PROCESS_STATUS = 2 Then
If $Sum120201000112020200011202030001 = "Disable" Then
Var ice_tab_process_show = "Disable"
Else
Var ice_tab_process_show = "Enable"
EndIf
Else
Var ice_tab_process_show = "Invisible"
EndIf
Var return = ice_tab_process_show
)
</State>
<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
</Image>
<Image>
<X> 49 </X>
<Y> 117 </Y>
<State>
eval(
If $Sum120201000112020200011202030001 = "Disable" Then
STRCONTAIN "ERR" $12-02-01-0001.TAG tag1_is_disable
STRCONTAIN "ERR" $12-02-02-0001.TAG tag2_is_disable
STRCONTAIN "ERR" $12-02-03-0001.TAG tag3_is_disable
Var return = "Invisible"
If tag1_is_disable = "true" Then
Var return = "Enable"
EndIf
If tag2_is_disable = "true" Then
Var return = "Enable"
EndIf
If tag3_is_disable = "true" Then
Var return = "Enable"
EndIf
Else
Var return = "Invisible"
EndIf
)
</State>
<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
</Image>
<Text>
<X> 84 </X>
<Y> 266 </Y>
<Size> 10 </Size>
<Font> OpunMediumTTF </Font>
<Color> 0xDE794E </Color>
<State> ice_tab_process_show </State>
<Value> ice_show_open </Value>
</Text>
<Text>
<X> 48 </X>
<Y> 116 </Y>
<Size> 32 </Size>
<Width>128</Width>
<Height>64</Height>
<Font> MITRegularTTF </Font>
<Color> 0x5A5A5A </Color>
<Mode> "disable-show" </Mode>
<State> $Sum120201000112020200011202030001 </State>
<Value> text_unavailable </Value>
<Align> center-vertical-horizontal </Align>
</Text>
</Block>
; - - -
; ==================> Len = 20

37
xml/page_payment_cash-HKG.xml
View file

@ -346,21 +346,21 @@
Var FirstTimeDelayEnableButton = 1
Var FirstTimeDelayEnableButtonCountDown = 5
If CoinInFlag = 0 Then
If CancelFlag = 0 Then
If CreditCardButtonState = "Enable" Then
Coin CARD
Var UserChoosePayment = "CreditCard"
Var CreditCardButtonState = "Disable"
Var QRCodeButtonState = "Disable"
Var LOADING_STATE = "Enable"
Var AlphaLoadingState = "Enable"
Var EnablingCreditCard = 1
Var EnablingCountDown = 5
Var RequestCreditCardCountDown = 1
EndIf
EndIf
EndIf
;If CoinInFlag = 0 Then
; If CancelFlag = 0 Then
; If CreditCardButtonState = "Enable" Then
; Coin CARD
; Var UserChoosePayment = "CreditCard"
; Var CreditCardButtonState = "Disable"
; Var QRCodeButtonState = "Disable"
; Var LOADING_STATE = "Enable"
; Var AlphaLoadingState = "Enable"
; Var EnablingCreditCard = 1
; Var EnablingCountDown = 5
; Var RequestCreditCardCountDown = 1
; EndIf
; EndIf
;EndIf
If LanguageShow = "ENG" Then
Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
@ -753,6 +753,9 @@
DEBUGVAR UserChoosePayment
Var UserChoosePayment = ""
CashlessReq SUCCESS ""
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
@ -991,7 +994,7 @@
Var stringLog = stringLog + PayOK
If Timeout > 180 Then
If Timeout >= 120 Then
If PayOK = 1 Then
If Seeker = "curr" Then
@ -1013,7 +1016,7 @@
Else
If CancelFlag = 0 Then
SAVELOG "Timeout > 180 s."
SAVELOG "Timeout > 120 s."
If ViewBill > 0 Then
CoinVending BILLREJECT

1
xml/page_payment_cash.xml
View file

@ -1942,6 +1942,7 @@
If KBankCashlessMachine = 1 Then
; popup will close after 30 second
Var Timeout = 90
Var cancelButtonQRPopupState = "Enable"
Else
Var Timeout = 0
EndIf

6
xml/page_payment_credit3-1.xml
View file

@ -49,6 +49,10 @@
Var TopupWithCashState = "Disable"
EndIf
If Seeker.CodeChannel = 1 Then
Var TopupWithCodeState = "Disable"
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
@ -165,8 +169,10 @@
<Button>
<X> 664 </X>
<Y> 1225 </Y>
<State> TopupWithCodeState </State>
<Filename> Var( DirImage + "/bn_topup_with_code.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bp_topup_with_code.png" )</FilenamePress>
<FilenameDisable> Var( DirImage + "/bp_topup_with_code.png" )</FilenameDisable>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>

1
xml/page_payment_credit3-TopupCode.xml
View file

@ -65,6 +65,7 @@
Var SumCreditAndCouponAmount = IntAmoutCoupon + SumCreditAmount
If SumCreditAndCouponAmount < PayAmountSubDiscount Then
Var SumCreditAmount = SumCreditAndCouponAmount
Var Seeker.CodeChannel = 0
Open "ROOT/taobin_project/xml/page_payment_credit3-1.xml"
Else
GenHashWithTimeStamp PointCrm