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

Merge branch 'master' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project

Browse source
This commit is contained in:
pichet 2023-05-02 15:31:47 +07:00
commit 992c51820e
23 changed files with 354 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/bn_back_to_school.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 120 KiB

BIN
image/bn_back_to_school_en.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 115 KiB

BIN
image/bn_oreo_buy2_save_move.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 93 KiB

BIN
image/bn_oreo_buy2_save_move_en.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 88 KiB

BIN
image/event/bn_back_to_school.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 119 KiB

After

Width:  |  Height:  |  Size: 120 KiB

Before After
Before After

BIN
image/event/bn_back_to_school_en.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 115 KiB

After

Width:  |  Height:  |  Size: 115 KiB

Before After
Before After

BIN
image/event/bn_back_to_school_limit.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 81 KiB

BIN
image/event/bn_back_to_school_limit_en.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 80 KiB

BIN
image/event/bn_oreo_buy2_save_move.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 93 KiB

After

Width:  |  Height:  |  Size: 93 KiB

Before After
Before After

BIN
image/event/bn_oreo_buy2_save_move_en.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 88 KiB

After

Width:  |  Height:  |  Size: 93 KiB

Before After
Before After

BIN
image/topping2/bn_childrenFree.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
image/topping2_en/bn_childrenFree.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.5 KiB

47
xml/event/big_logo_back_to_school.inc
View file

@ -6,33 +6,54 @@
<Filename>
eval(
If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/bn_back_to_school_en.png"
If OreoForFreeLimit = "true" Then
Var return = "ROOT/taobin_project/image/event/bn_back_to_school_limit_en.png"
Else
Var return = "ROOT/taobin_project/image/event/bn_back_to_school_en.png"
EndIf
Else
Var return = "ROOT/taobin_project/image/event/bn_back_to_school.png"
If OreoForFreeLimit = "true" Then
Var return = "ROOT/taobin_project/image/event/bn_back_to_school_limit.png"
Else
Var return = "ROOT/taobin_project/image/event/bn_back_to_school.png"
EndIf
EndIf
)
</Filename>
<FilenamePress>
eval(
If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/bp_back_to_school_en.png"
If OreoForFreeLimit = "true" Then
Var return = "ROOT/taobin_project/image/event/bp_back_to_school_limit_en.png"
Else
Var return = "ROOT/taobin_project/image/event/bp_back_to_school_en.png"
EndIf
Else
Var return = "ROOT/taobin_project/image/event/bp_back_to_school.png"
If OreoForFreeLimit = "true" Then
Var return = "ROOT/taobin_project/image/event/bp_back_to_school_limit.png"
Else
Var return = "ROOT/taobin_project/image/event/bp_back_to_school.png"
EndIf
EndIf
)
</FilenamePress>
<FilenameDisable>
eval(
If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/bn_back_to_school_en.png"
If OreoForFreeLimit = "true" Then
Var return = "ROOT/taobin_project/image/event/bn_back_to_school_limit_en.png"
Else
Var return = "ROOT/taobin_project/image/event/bn_back_to_school_en.png"
EndIf
Else
Var return = "ROOT/taobin_project/image/event/bn_back_to_school.png"
If OreoForFreeLimit = "true" Then
Var return = "ROOT/taobin_project/image/event/bn_back_to_school_limit.png"
Else
Var return = "ROOT/taobin_project/image/event/bn_back_to_school.png"
EndIf
EndIf
)
</FilenameDisable>
@ -89,8 +110,12 @@
DEBUGVAR PD_STAGE_3
Var SelectDrinkType = 0
Var BackToSchoolForFreeEnable = 1
Open "ROOT/taobin_project/xml/page_topping_select6.xml"
If OreoForFreeLimit = "true" Then
Else
Var BackToSchoolForFreeEnable = 1
Open "ROOT/taobin_project/xml/page_topping_select6.xml"
EndIf
</EventOnClick>
</Button>

49
xml/event/page_recommend_backToSchool.xml
View file

@ -8906,7 +8906,7 @@ LIMENADE SODA" </Value>
<EventClick>
Machine RemoveCup
Machine DoorLidOpen
Var buttonRemoveCup = "Invisible"
;Var buttonRemoveCup = "Invisible"
</EventClick>
</Button>
@ -8920,33 +8920,54 @@ LIMENADE SODA" </Value>
<Filename>
eval(
If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/bn_back_to_school_en.png"
If OreoForFreeLimit = "true" Then
Var return = "ROOT/taobin_project/image/event/bn_back_to_school_limit_en.png"
Else
Var return = "ROOT/taobin_project/image/event/bn_back_to_school_en.png"
EndIf
Else
Var return = "ROOT/taobin_project/image/event/bn_back_to_school.png"
If OreoForFreeLimit = "true" Then
Var return = "ROOT/taobin_project/image/event/bn_back_to_school_limit.png"
Else
Var return = "ROOT/taobin_project/image/event/bn_back_to_school.png"
EndIf
EndIf
)
</Filename>
<FilenamePress>
eval(
If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/bp_back_to_school_en.png"
If OreoForFreeLimit = "true" Then
Var return = "ROOT/taobin_project/image/event/bp_back_to_school_limit_en.png"
Else
Var return = "ROOT/taobin_project/image/event/bp_back_to_school_en.png"
EndIf
Else
Var return = "ROOT/taobin_project/image/event/bp_back_to_school.png"
If OreoForFreeLimit = "true" Then
Var return = "ROOT/taobin_project/image/event/bp_back_to_school_limit.png"
Else
Var return = "ROOT/taobin_project/image/event/bp_back_to_school.png"
EndIf
EndIf
)
</FilenamePress>
<FilenameDisable>
eval(
If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/bn_back_to_school_en.png"
If OreoForFreeLimit = "true" Then
Var return = "ROOT/taobin_project/image/event/bn_back_to_school_limit_en.png"
Else
Var return = "ROOT/taobin_project/image/event/bn_back_to_school_en.png"
EndIf
Else
Var return = "ROOT/taobin_project/image/event/bn_back_to_school.png"
If OreoForFreeLimit = "true" Then
Var return = "ROOT/taobin_project/image/event/bn_back_to_school_limit.png"
Else
Var return = "ROOT/taobin_project/image/event/bn_back_to_school.png"
EndIf
EndIf
)
</FilenameDisable>
@ -9003,8 +9024,12 @@ LIMENADE SODA" </Value>
DEBUGVAR PD_STAGE_3
Var SelectDrinkType = 0
Var BackToSchoolForFreeEnable = 1
Open "ROOT/taobin_project/xml/page_topping_select6.xml"
If OreoForFreeLimit = "true" Then
Else
Var BackToSchoolForFreeEnable = 1
Open "ROOT/taobin_project/xml/page_topping_select6.xml"
EndIf
</EventOnClick>
</Button>

2
xml/event/page_recommend_oreo_buy2_save_more.xml
View file

@ -8906,7 +8906,7 @@ LIMENADE SODA" </Value>
<EventClick>
Machine RemoveCup
Machine DoorLidOpen
Var buttonRemoveCup = "Invisible"
;Var buttonRemoveCup = "Invisible"
</EventClick>
</Button>

23
xml/event/tricker.ev
View file

@ -50,34 +50,29 @@ If SystemDateMonthInt = 5 Then
EndIf
EndIf
If OreoDueEnable = 0 Then
Var $12-03-03-0009-alter.Button = "Invisible"
Else
Var $12-03-03-0009-alter.Button = "Enable"
EndIf
If BoxID = 172644 Then
Var OreoDueEnable = 1
Var OreoDueEnable = 0
Var OreoForFreeEnable = 0
EndIf
If BoxID = 172527 Then
Var OreoDueEnable = 1
EndIf
If BoxID = 173149 Then
Var OreoForFreeEnable = 1
EndIf
Var OreoForFreeLimit = ""
READ_FILE "/mnt/sdcard/oreo_for_free_limit" OreoForFreeLimit
;Var OreoForFreeLimit = "true"
Var SoundBackToSchoolEnable = 1
DEBUGVAR OreoForFreeLimit
DEBUGVAR OreoDueEnable
DEBUGVAR OreoForFreeEnable
;Var $12-03-03-0009-alter.Price = 70
;Var $12-03-03-0009-alter.NameE = $12-03-03-0009.NameE
;Var $12-03-03-0009-alter.descriptionE = $12-03-03-0009.descriptionE
;Var $12-03-03-0009-alter.Name = $12-03-03-0009.Name
;Var $12-03-03-0009-alter.description = $12-03-03-0009.description

33
xml/page_board.xml
View file

@ -674,37 +674,6 @@
Var SongkranEnable = 0
If SystemDateMonthInt = 4 Then
If SystemDateDayInt > 7 Then
Var SongkranEnable = 1
EndIf
EndIf
If SystemDateMonthInt = 5 Then
If SystemDateDayInt = 1 Then
Var SongkranEnable = 1
EndIf
If SystemDateDayInt = 2 Then
Var SongkranEnable = 1
EndIf
EndIf
If SongkranEnable = 1 Then
If SoundThaiIndex = 0 Then
Var SoundThaiIndex = 1
Else
If SoundThaiIndex = 1 Then
Var SoundThaiIndex = 2
Else
If SoundThaiIndex = 2 Then
Var SoundThaiIndex = 3
Else
Var SoundThaiIndex = 0
EndIf
EndIf
EndIf
EndIf
If BoxID = 200434 Then
Var SongkranEnable = 0
@ -1176,7 +1145,7 @@
Machine DoorLidOpen
Var CheckCupStateDoorCupClose = "reset"
Var buttonRemoveCup = "Invisible"
;Var buttonRemoveCup = "Invisible"
</EventClick>
</Button>

4
xml/page_catalog2.xml
View file

@ -646,10 +646,10 @@
</EventWebApp>
<EventUnitTest1>
Var SongkranEnable = 0
WRITE_FILE "/mnt/sdcard/oreo_for_free_limit" "-"
</EventUnitTest1>
<EventUnitTest2>
Var SongkranEnable = 1
WRITE_FILE "/mnt/sdcard/oreo_for_free_limit" "true"
</EventUnitTest2>
<EventUnitTest3>

2
xml/page_catalog_group_recommend.skt
View file

@ -70,7 +70,7 @@
<EventClick>
Machine RemoveCup
Machine DoorLidOpen
Var buttonRemoveCup = "Invisible"
;Var buttonRemoveCup = "Invisible"
</EventClick>
</Button>

2
xml/page_catalog_group_recommend.xml
View file

@ -7926,7 +7926,7 @@ LIMENADE SODA" </Value>
<EventClick>
Machine RemoveCup
Machine DoorLidOpen
Var buttonRemoveCup = "Invisible"
;Var buttonRemoveCup = "Invisible"
</EventClick>
</Button>

2
xml/page_catalog_group_recommend3.xml
View file

@ -8906,7 +8906,7 @@ LIMENADE SODA" </Value>
<EventClick>
Machine RemoveCup
Machine DoorLidOpen
Var buttonRemoveCup = "Invisible"
;Var buttonRemoveCup = "Invisible"
</EventClick>
</Button>

283
xml/page_topping_select6.xml
View file

@ -305,22 +305,23 @@
DEBUGVAR PromotionIDCurrentOrder
Var DiscountWithIdentifyState = "Enable"
;Var DiscountWithIdentifyState = "Invisible"
Var DiscountWithIdentifyState = "Invisible"
Var BackToSchoolForFreeButtonState = "Invisible"
DEBUGVAR Price5Active
DEBUGVAR EnableLiveness
DEBUGVAR DiscountWithIdentifyState
Var ChildrenFree = 0
DEBUGVAR BackToSchoolForFreeEnable
If BackToSchoolForFreeEnable = 1 Then
Var BackToSchoolForFreeEnable = 0
Var BackToSchoolForFreeButtonState = "Enable"
EndIf
DEBUGVAR BackToSchoolForFreeButtonState
If EnableLiveness = "true" Then
If CameraCount = 1 Then
; echo -n true > /mnt/sdcard/enable_discount_price5
@ -333,7 +334,6 @@
EndIf
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
@ -482,7 +482,7 @@
EndIf
Var PlaySoundLag = RootPathSoundBackToSchool + "select_level.wav"
EndIf
Play PlaySoundLag
EndIf
EndIf
@ -1158,16 +1158,18 @@
Else
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3"
If SoundThaiIndex = 1 Then
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/north/select_level.wav"
; 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 + "select_level.wav"
EndIf
If SoundThaiIndex = 2 Then
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/northeast/select_level.wav"
EndIf
If SoundThaiIndex = 3 Then
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/south/select_level.wav"
EndIf
Play PlaySoundLag
EndIf
EndIf
@ -3283,8 +3285,8 @@
<State> DiscountWithIdentifyState </State>
<X> 285 </X>
<Y> 1785 </Y>
<Filename> Var( DirImage + "/bp_childrenFree.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bp_childrenFree.png" )</FilenamePress>
<Filename> Var( DirImage + "/bn_price5baht.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bp_price5baht.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -3512,6 +3514,7 @@
</Button>
; next
<Button>
<X> 673 </X>
@ -3750,6 +3753,7 @@
<Function2>
Var img_cold_no_flag = 0
@ -4064,6 +4068,246 @@
<Value> PriceDrinkTmpShow </Value>
</Text>
; zone
; free oreo
<Button>
<State> BackToSchoolForFreeButtonState </State>
<X> 673 </X>
<Y> 1785 </Y>
<Filename> Var( DirImage + "/bn_childrenFree.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bp_childrenFree.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
;Var Seeker = "curr"
DEBUGVAR PriceDrinkTmp
;Var Seeker.PriceDrink = PriceDrinkTmp
Var PriceDrink = PriceDrinkTmp
SAVELOG "USER press next ( topping ) - new"
If SugarState1 = "PressForever" Then
If ShiftSugarStep = 1 Then
Var topping1 = toppingID1index1
EndIf
EndIf
If SugarState2 = "PressForever" Then
If ShiftSugarStep = 1 Then
Var topping1 = toppingID1index2
EndIf
If ShiftSugarStep = 2 Then
Var topping1 = toppingID1index1
EndIf
EndIf
If SugarState3 = "PressForever" Then
If ShiftSugarStep = 1 Then
Var topping1 = toppingID1index3
EndIf
If ShiftSugarStep = 2 Then
Var topping1 = toppingID1index2
EndIf
If ShiftSugarStep = 3 Then
Var topping1 = toppingID1index1
EndIf
EndIf
If SugarState3 = "PressForever" Then
If ShiftSugarStep = 1 Then
Var topping1 = toppingID1index3
EndIf
If ShiftSugarStep = 2 Then
Var topping1 = toppingID1index2
EndIf
If ShiftSugarStep = 3 Then
Var topping1 = toppingID1index1
EndIf
EndIf
If SugarState4 = "PressForever" Then
If ShiftSugarStep = 1 Then
Var topping1 = toppingID1index4
EndIf
If ShiftSugarStep = 2 Then
Var topping1 = toppingID1index3
EndIf
If ShiftSugarStep = 3 Then
Var topping1 = toppingID1index2
EndIf
EndIf
If SugarState5 = "PressForever" Then
If ShiftSugarStep = 1 Then
Var topping1 = toppingID1index5
EndIf
If ShiftSugarStep = 2 Then
Var topping1 = toppingID1index4
EndIf
If ShiftSugarStep = 3 Then
Var topping1 = toppingID1index3
EndIf
EndIf
Var Seeker.topping1 = topping1
Var Seeker.topping2 = topping2
Var Seeker.topping3 = topping3
Var Seeker.topping6 = topping6
Var Seeker.get_a_straw = StrawState
Var Seeker.get_a_lid = LidState
DEBUGVAR Seeker.topping1
DEBUGVAR Seeker.topping2
DEBUGVAR Seeker.topping3
DEBUGVAR Seeker.topping6
DEBUGVAR Seeker.get_a_straw
DEBUGVAR Seeker.get_a_lid
DEBUGVAR LidState
DEBUGVAR StrawState
DEBUGVAR UserSelectProductCode
If StrawState = "Press" Then
Machine StrawOrder
Var LedLidBlink = "true"
EndIf
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
If SelectDrinkType = 0 Then
Else
Var StrawState = "Enable"
Var LidState = "Enable"
EndIf
;
Var PromotionIDCurrentOrder = 0
Var SelectDrink = UserSelectProductCode
Var Seeker.selected_a_drink = UserSelectProductCode
DEBUGVAR Seeker.selected_a_drink
; Set drink
If Seeker = "curr" Then
Topping "Select" UserSelectProductCode
; Set option toppinng and pack
Topping "Select1-ID" topping1
Topping "Select2-ID" topping2
Topping "Select3-ID" topping3
Topping "Select6-ID" topping6
; Pack
Topping "Pack" ExtendDataCurr
Else
Topping "SetNextOrder" UserSelectProductCode
Topping "__select" UserSelectProductCode
; Set option toppinng and pack
Topping "__select1-id" topping1
Topping "__select2-id" topping2
Topping "__select3-id" topping3
Topping "__select6-id" topping6
; Pack
Topping "__pack" ExtendDataNext
Var NextUserSelectDrinkFromPaid = UserSelectProductCode
Var NextUserSelecttopping1Paid = topping1
Var NextUserSelecttopping2Paid = topping2
Var NextUserSelecttopping3Paid = topping3
Var NextUserSelecttopping6Paid = topping6
EndIf
DEBUGVAR Seeker
DEBUGVAR Seeker.ExtendData
Var Seeker.PictureDrink = PictureDrink
Var Seeker.showname = showname
DEBUGVAR MenuCautionImageStage0
DEBUGVAR CustomerFilterEnable
DEBUGVAR CustomerFilterType
GetLongTimeInMinute LastTimeClickOrder
If CART_COUNT = 0 Then
If UserSelectProductCode = "-" Then
Else
If SelectDrinkType = 1 Then
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
;Open "ROOT/taobin_project/xml/page_identity_verification.xml"
Open "ROOT/taobin_project/xml/page_identityChildren_consent.xml"
EndIf
EndIf
If SelectDrinkType = 0 Then
Var high_light_drink_type = "Enable"
EndIf
Else
If CART1_STATUS = "EMPTY" Then
Cart "AddMenuID" 1
Else
If CART2_STATUS = "EMPTY" Then
Cart "AddMenuID" 2
Else
If CART3_STATUS = "EMPTY" Then
Cart "AddMenuID" 3
EndIf
EndIf
EndIf
Var CartUpdate = "true"
Var ButtonNext = "true"
EndIf
Var LastTimeClickOrder = 0
</EventClick>
</Button>
<Image>
<X> 0 </X>
<Y> 380 </Y>
@ -4224,4 +4468,5 @@
</EventUnitTest2>
</Page>

2
xml/vending_info.xml
View file

@ -681,7 +681,7 @@
SAVELOG IDFullNameEng
</EventIDCard>
; /mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/