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

BIN
inter/aus/material_image/17-01-01-0069.jpeg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 63 KiB

2
inter/sgp/xml/page_drinkfail_sg.lxml
View file

@ -188,7 +188,7 @@ EndIf
<Image>
<X> 329 </X>
<Y> 1301 </Y>
<Y> 1351 </Y>
<State> ShowQRByNoMember </State>
<Filename> Var( DirImage + "/QR_contract.png" ) </Filename>
</Image>

4
inter/tha/xml/multi/page_catalog.lxml
View file

@ -1047,7 +1047,7 @@
<Button>
<X> 225 </X>
<Y> 424 </Y>
<State> "Enable" </State>
<State> ShowButtonClick2 </State>
<Filename> Var(DirImage + "/bn_main_page_member.png") </Filename>
<FilenamePress> Var(DirImage + "/bp_main_page_member.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -1071,7 +1071,7 @@
<Button>
<X> 696 </X>
<Y> 424 </Y>
<State> "Enable" </State>
<State> ButtontoTopupMenu </State>
<Filename> Var(DirImage + "/bn_main_page_topup.png") </Filename>
<FilenamePress> Var(DirImage + "/bp_main_page_topup.png") </FilenamePress>
<FilenameDisable> Var(DirImage + "/bp_main_page_topup.png") </FilenameDisable>

8
inter/tha/xml/multi/v3/page_catalog_group_other.lxml
View file

@ -4439,9 +4439,9 @@
; - 12-05-02-0150 -
<Menu>
<State> Flag( 12-05-02-0150.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1205020150) </State>
<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Pepsi Caramel.png" </IdleImage>
<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Pepsi Caramel.png" </PressImage>
<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Pepsi Caramel.png" </DisableImage>
<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Pepsi_Caramel.png" </IdleImage>
<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Pepsi_Caramel.png" </PressImage>
<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Pepsi_Caramel.png" </DisableImage>
<Name>
<LanguageGroup>
<LanguageSlot1>Pepsi Caramel</LanguageSlot1>
@ -4533,7 +4533,7 @@
<Value> $Sum1205020150TextValue </Value>
</ConditionalDisable>
<EventOnClick>
Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Pepsi Caramel.png"
Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Pepsi_Caramel.png"
GetInstanceIDMenuTab OpenFromInstMenuTab
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $##-##-##-####.Price

8
inter/tha/xml/multi/v3/page_catalog_group_other_other.lxml
View file

@ -4454,9 +4454,9 @@
; - 12-05-02-0150 -
<Menu>
<State> Flag( 12-05-02-0150.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1205020150) </State>
<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Pepsi Caramel.png" </IdleImage>
<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Pepsi Caramel.png" </PressImage>
<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Pepsi Caramel.png" </DisableImage>
<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Pepsi_Caramel.png" </IdleImage>
<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Pepsi_Caramel.png" </PressImage>
<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Pepsi_Caramel.png" </DisableImage>
<Name>
<LanguageGroup>
<LanguageSlot1>Pepsi Caramel</LanguageSlot1>
@ -4548,7 +4548,7 @@
<Value> $Sum1205020150TextValue </Value>
</ConditionalDisable>
<EventOnClick>
Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Pepsi Caramel.png"
Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Pepsi_Caramel.png"
GetInstanceIDMenuTab OpenFromInstMenuTab
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $##-##-##-####.Price

8
inter/tha/xml/multi/v3/page_catalog_group_pepsi_7up.lxml
View file

@ -1714,9 +1714,9 @@
; - 12-05-02-0150 -
<Menu>
<State> Flag( 12-05-02-0150.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1205020150) </State>
<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Pepsi Caramel.png" </IdleImage>
<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Pepsi Caramel.png" </PressImage>
<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Pepsi Caramel.png" </DisableImage>
<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Pepsi_Caramel.png" </IdleImage>
<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Pepsi_Caramel.png" </PressImage>
<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Pepsi_Caramel.png" </DisableImage>
<Name>
<LanguageGroup>
<LanguageSlot1>Pepsi Caramel</LanguageSlot1>
@ -1808,7 +1808,7 @@
<Value> $Sum1205020150TextValue </Value>
</ConditionalDisable>
<EventOnClick>
Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Pepsi Caramel.png"
Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Pepsi_Caramel.png"
GetInstanceIDMenuTab OpenFromInstMenuTab
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $##-##-##-####.Price

8
inter/tha/xml/multi/v3/page_catalog_group_pro_pepsi_x_taobin.lxml
View file

@ -1440,9 +1440,9 @@
; - 12-05-02-0150 -
<Menu>
<State> Flag( 12-05-02-0150.Button,$Sum1205020150) </State>
<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Pepsi Caramel.png" </IdleImage>
<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Pepsi Caramel.png" </PressImage>
<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Pepsi Caramel.png" </DisableImage>
<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Pepsi_Caramel.png" </IdleImage>
<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Pepsi_Caramel.png" </PressImage>
<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Pepsi_Caramel.png" </DisableImage>
<Name>
<LanguageGroup>
<LanguageSlot1>Pepsi Caramel</LanguageSlot1>
@ -1534,7 +1534,7 @@
<Value> $Sum1205020150TextValue </Value>
</ConditionalDisable>
<EventOnClick>
Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Pepsi Caramel.png"
Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Pepsi_Caramel.png"
GetInstanceIDMenuTab OpenFromInstMenuTab
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $##-##-##-####.Price

2592
inter/tha/xml/multi/v3/page_catalog_group_pro_school_ovaltine.lxml Normal file
View file

File diff suppressed because it is too large Load diff

BIN
inter/whatthecup/sgp/image/collectiing/text_11.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 83 KiB

Before After
Before After

155
inter/whatthecup/sgp/xml/page_topping_select6_blue.lxml
View file

@ -91,6 +91,7 @@
;SAVELOG PreviseXMLFileName2
Var MenuReady = "-"
Var topping1 = "1"
Var topping2 = "31"
@ -385,6 +386,120 @@
;include="ROOT/taobin_project/inc/return_condition.ev"
EndIf
If SelectDrinkType = 1 Then
If MenuReady = "YES" Then
DEBUGVAR ToppingDetail
; echo -n true > /mnt/sdcard/coffeevending/menu_blend_free
READ_FILE "/mnt/sdcard/coffeevending/menu_blend_free" menu_blend_free
DEBUGVAR menu_blend_free
DEBUGVAR blend_button_state
DEBUGVAR DoorCupPosition
DEBUGVAR show_eng
If menu_blend_free = "true" Then
If blend_button_state = "PressForever" Then
Var PriceDrinkNoTop = 0
Var PriceDrink = 0
Var PriceDrinkTmpShow = "Free"
EndIf
EndIf
If Seeker = "next" Then
If CupRemain > 0 Then
If Only18 = "true" Then
DEBUGVAR SelectDrink
MenuProfile SelectDrink "IsMenuInProfile"
; disable old verification
Var AdultState1 = "Invisible"
DEBUGVAR IsMenuInProfile
If IsMenuInProfile = "true" Then
; Check profile
If EnableLiveness = "true" Then
DEBUGVAR EnableLiveness
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
; full
Open "ROOT/taobin_project/xml/page_identity_verification.xml"
Else
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
; Only IDCard
Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
EndIf
Else
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
Open "ROOT/taobin_project/xml/page_payment.xml"
EndIf
Else
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
Open "ROOT/taobin_project/xml/page_payment.xml"
EndIf
EndIf
Else
If DoorCupPosition = "bottom" Then
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
If FromEnergyDrink1BathPro = 1 Then
Open "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_consent.xml"
EndIf
If Only18 = "true" Then
DEBUGVAR SelectDrink
MenuProfile SelectDrink "IsMenuInProfile"
; disable old verification
Var AdultState1 = "Invisible"
DEBUGVAR IsMenuInProfile
If IsMenuInProfile = "true" Then
; Check profile
If EnableLiveness = "true" Then
DEBUGVAR EnableLiveness
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
; full
Open "ROOT/taobin_project/xml/page_identity_verification.xml"
Else
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
; Only IDCard
Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
EndIf
Else
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
Open "ROOT/taobin_project/xml/page_payment.xml"
EndIf
Else
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
Open "ROOT/taobin_project/xml/page_payment.xml"
EndIf
EndIf
EndIf
EndIf
If MenuReady = "YES" Then
EndIf
EndIf
Var Timeout = Timeout + 1
If Timeout > 40 Then
@ -3485,7 +3600,25 @@
<Volume> SoundVolume </Volume>
<EventClick>
;Var Seeker = "curr"
Var Timeout = 0
Var StatementCheckMenu = "ProductCodeCheck=" + UserSelectProductCode
__CMD "statement" 0 StatementCheckMenu "-"
DEBUGVAR StatementCheckMenu
DEBUGVAR PriceDrinkTmp
;Var Seeker.PriceDrink = PriceDrinkTmp
Var PriceDrink = PriceDrinkTmp
Var PromotionPriceDrink = PriceDrink
DEBUGVAR PriceDrink
SAVELOG "USER press next ( topping ) - new"
DEBUGVAR topping1
DEBUGVAR topping2
@ -3505,6 +3638,13 @@
If LidState = "Press" Then
Machine LidOrder
Var LedLidBlink = "true"
Var bg_lidProblem_ST = "Enable"
Else
If LidState = "Disable" Then
Var bg_lidProblem_ST = "Disable"
Else
Var bg_lidProblem_ST = "Invisible"
EndIf
EndIf
Var StrawState = "Enable"
@ -3566,6 +3706,12 @@
;Var Seeker = "curr"
Var StatementCheckMenu = "ProductCodeCheck=" + UserSelectProductCode
__CMD "statement" 0 StatementCheckMenu "-"
DEBUGVAR StatementCheckMenu
DEBUGVAR PriceDrinkTmp
@ -3675,7 +3821,11 @@
Var LedLidBlink = "true"
Var bg_lidProblem_ST = "Enable"
Else
Var bg_lidProblem_ST = "Invisible"
If LidState = "Disable" Then
Var bg_lidProblem_ST = "Disable"
Else
Var bg_lidProblem_ST = "Invisible"
EndIf
EndIf
If SelectDrinkType = 0 Then
@ -3755,7 +3905,8 @@
Else
If SelectDrinkType = 1 Then
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
Open "ROOT/taobin_project/xml/page_payment.xml"
;Open "ROOT/taobin_project/xml/page_payment.xml"
DEBUGVAR "WaitCheckMenu"
EndIf
EndIf