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

Merged + MYS: update new promotion Melonzy

Browse source
This commit is contained in:
Pakin 2025-02-11 14:05:32 +07:00
parent 124a46b3d5
commit 7e0076614a
31 changed files with 30835 additions and 15687 deletions
Download patch file Download diff file Expand all files Collapse all files

16
inc/video.inc
View file

@ -107,8 +107,8 @@
If ProReducedPriceEnable = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
EndIf
If IgnoreProfileFromRunEV = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
If ProMelonEnable = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_26.mp4"
EndIf
If UseSlideShowVideo = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
@ -205,8 +205,8 @@
If ProReducedPriceEnable = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
EndIf
If IgnoreProfileFromRunEV = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
If ProMelonEnable = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_26.mp4"
EndIf
If UseSlideShowVideo = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
@ -311,8 +311,8 @@
If ProReducedPriceEnable = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
EndIf
If IgnoreProfileFromRunEV = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
If ProMelonEnable = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_26.mp4"
EndIf
If UseSlideShowVideo = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
@ -374,6 +374,10 @@
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
EndIf
If ProMelonEnable = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_26.mp4"
EndIf
If UseSlideShowVideo = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
EndIf

BIN
inter/mys/adv/taobin_adv_menu_26.mp4 Normal file
View file

Binary file not shown.

12
inter/mys/image/event/image_template1
View file

@ -1,6 +1,6 @@
normal_eng=ROOT/taobin_project/inter/mys/image/event/pro_yuzu_250/pro_yuzu_250.png
normal_thai=ROOT/taobin_project/inter/mys/image/event/pro_yuzu_250/pro_yuzu_250.png
press_eng=ROOT/taobin_project/inter/mys/image/event/pro_yuzu_250/pro_yuzu_250.png
press_thai=ROOT/taobin_project/inter/mys/image/event/pro_yuzu_250/pro_yuzu_250.png
disable_eng=ROOT/taobin_project/inter/mys/image/event/pro_yuzu_250/pro_yuzu_250.png
disable_thai=ROOT/taobin_project/inter/mys/image/event/pro_yuzu_250/pro_yuzu_250.png
normal_eng=ROOT/taobin_project/inter/mys/image/event/pro_melonzy/pro_melonzy.png
normal_thai=ROOT/taobin_project/inter/mys/image/event/pro_melonzy/pro_melonzy.png
press_eng=ROOT/taobin_project/inter/mys/image/event/pro_melonzy/pro_melonzy.png
press_thai=ROOT/taobin_project/inter/mys/image/event/pro_melonzy/pro_melonzy.png
disable_eng=ROOT/taobin_project/inter/mys/image/event/pro_melonzy/pro_melonzy.png
disable_thai=ROOT/taobin_project/inter/mys/image/event/pro_melonzy/pro_melonzy.png

BIN
inter/mys/image/event/pro_melonzy/pro_melonzy.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 455 KiB

6
inter/mys/menu/lang.tsv
View file

@ -1036,7 +1036,7 @@ TextID Note English Thai China Japan Malaysia
1300003 Beans module ชุดเมล็ดกาแฟ
1300004 Bean tray ถาดใส่เมล็ดกาแฟ
1300005 Switch tray : สวิตซ์ถาด :
1300006 Check tray shutter ตรวจสอบชัตเตอร์ถาด
1300006 Check tray shutter ตรวจสอบชัตเตอร์ของถาด
1300007 Pay beans จ่ายถั่ว
1300008 1. Select beans 1. เลือกเมล็ดกาแฟ
1300009 2. Select direction 2. เลือกทิศทาง
@ -1049,7 +1049,7 @@ TextID Note English Thai China Japan Malaysia
1300016 Brew time:sec เวลาชง: วินาที
1300017 Test grind sizes ทดสอบขนาดบด
1300018 Coffee module type : ประเภทชุดกาแฟ :
1300019 1. Select grind sizes 1. เลือกขนาดการบด
1300019 1. Select grind sizes 1. เลือกขนาดบด
1300020 More coarse หยาบขึ้น
1300021 More fine ละเอียดขึ้น
1300022 2. Test grinding 2. ทดสอบการบด
@ -1297,4 +1297,4 @@ TextID Note English Thai China Japan Malaysia
EOF
9999999 Load language finish Load language finish
9999999 Load language finish Load language finish Load language finish Load language finish Load language finish

Can't render this file because it has a wrong number of fields in line 21.

45
inter/mys/xml/event/event_profile.ev
View file

@ -5,6 +5,8 @@ DEBUGVAR XMLProfile
STRCONTAIN "PromoYuzu250" XMLProfile HasProYuzu250Concat
STRCONTAIN "PromoReduced" XMLProfile IsProfileReduce
STRCONTAIN "PromoMelon" XMLProfile HasProMelonConcat
Var refresh_str = "-RefreshProf"
STRCONTAIN refresh_str XMLProfile HasRefreshProf
@ -18,10 +20,10 @@ If NeedRefreshProfile = 1 Then
READ_FILE "/mnt/sdcard/coffeevending/profile/price/profile_MYS_slot_4.json" ProfileSlot4MYS
STRCONTAIN "Drop" ProfileSlot3MYS PromoYuzuDrop
STRCONTAIN "Drop" ProfileSlot4MYS PromoYuzuDis50Drop
STRCONTAIN "Drop" ProfileSlot4MYS PromoMelonDrop
DEBUGVAR PromoYuzuDrop
DEBUGVAR PromoYuzuDis50Drop
DEBUGVAR PromoMelonDrop
If HasRefreshProf = "true" Then
@ -33,16 +35,13 @@ If NeedRefreshProfile = 1 Then
Var NeedRefreshProfile = 0
Else
; save-current-as-pre
CacheVarStr "put" XMLProfilePreEvent
CacheVarStr "get" XMLProfilePreEvent
If PromoYuzuDrop = "true" Then
DEBUGVAR "case yuzu drop --> refresh"
Var XMLProfile = XMLProfilePreEvent
If PromoMelonDrop = "true" Then
SAVELOG "case melon drop --> refresh"
Var XMLProfile = XMLProfile + refresh_str
Else
If PromoYuzuDis50Drop = "true" Then
DEBUGVAR "case yuzu drop discount 50% --> refresh"
Var XMLProfile = XMLProfile + refresh_str
EndIf
EndIf
EndIf
@ -50,6 +49,9 @@ Else
DEBUGVAR HasProYuzu250Concat
DEBUGVAR ProReducedPriceEnable
DEBUGVAR HasProMelonConcat
DEBUGVAR IgnoreProfileFromRunEV
If ProReducedPriceEnable = 1 Then
@ -58,10 +60,10 @@ Else
DEBUGVAR "Case pro reduce end"
; case-pro-reduce-end
If IgnoreProfileFromRunEV = 1 Then
DEBUGVAR "Pro yuzu ongoing"
DEBUGVAR "Pro melon ongoing"
; concat-profile
If HasProYuzu250Concat = "true" Then
DEBUGVAR "Pro yuzu concat"
If HasProMelonConcat = "true" Then
DEBUGVAR "Pro melon concat"
Else
If IsProfileReduce = "true" Then
@ -71,25 +73,25 @@ Else
DEBUGVAR "Get PreEvent Empty"
Var XMLProfile = "General"
Else
DEBUGVAR "Restore profile by pre-event, also concat Yuzu"
DEBUGVAR "Restore profile by pre-event, also concat Melon"
DEBUGVAR XMLProfilePreEvent
Var XMLProfile = XMLProfilePreEvent + "-"
Var XMLProfile = XMLProfile + "PromoYuzu250"
Var XMLProfile = XMLProfile + "PromoMelon250"
EndIf
Else
DEBUGVAR "No pro reduce, concat pro yuzu"
DEBUGVAR "No pro reduce, concat pro melon"
CacheVarStr "put" XMLProfilePreEvent
Var XMLProfile = XMLProfile + "-"
Var XMLProfile = XMLProfile + "PromoYuzu250"
Var XMLProfile = XMLProfile + "PromoMelon250"
EndIf
EndIf
Else
If IsProfileReduce = "true" Then
DEBUGVAR "No yuzu but set pro reduce"
DEBUGVAR "No melon but set pro reduce"
CacheVarStr "get" XMLProfilePreEvent
If XMLProfilePreEvent = "" Then
DEBUGVAR "PreEvent empty, set General"
@ -101,7 +103,7 @@ Else
Else
If HasProYuzu250Concat = "true" Then
If HasProMelonConcat = "true" Then
CacheVarStr "get" XMLProfilePreEvent
Var XMLProfile = XMLProfilePreEvent
EndIf
@ -119,6 +121,11 @@ Else
If IgnoreProfileFromRunEV = 1 Then
Var ToggleAfterEventProfileOff = 1
If ProMelonEnable = 1 Then
Var IgnoreProfileFromRunEV = 0
SAVELOG "Allow exec cmd brew from event_profile"
EndIf
EndIf

148
inter/mys/xml/event/fruit_raya/page_get_free_1_fruit_raya.lxml
View file

@ -1,148 +0,0 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
Var Timeout = 0
DEBUGVAR TelephoneNumber
DEBUGVAR FromFruityRaya
DEBUGVAR Seeker.VendingCode
DEBUGVAR Seeker.FruityRaya
DEBUGVAR Seeker.UseFruityRayaCode
Var Cid = 43
Var param1 = ""
Var param2 = ""
Var param3 = ""
If FromFruityRaya = 1 Then
If TelephoneNumber = "" Then
Else
DEBUGVAR TelephoneNumber
; Telephone must not empty
If Seeker.CodeChannel = 1 Then
DEBUGVAR Seeker.CodeChannel
Var Seeker.UseFruityRayaCode = 1
Var Seeker.FruityRaya = 1
Else
Var Seeker.FruityRaya = 1
Var Seeker.UseFruityRayaCode = 0
DEBUGVAR Seeker.FruityRaya
DEBUGVAR Seeker.UseFruityRayaCode
AddData Cid TelephoneNumber param1 param2 param3
EndIf
EndIf
EndIf
; reset flag
Var FromFruityRaya = 0
; goto lid straw
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
Var CountDownBrewing = BREW_CNT
Var ShowCountDownBrewing = CountDownBrewing
Var Timeout = Timeout + 1
If Timeout > 2 Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
TimerReset
Refresh
</EventTimeout>
<EventSecurity>
Open "/media/bt/xml/security_alarm.xml"
</EventSecurity>
<EventActionOk>
;
</EventActionOk>
<EventMachine>
If MachineStage = "drink-success" Then
Var MachineState_Result = 1
EndIf
If MachineStage = "drink-failed" Then
Var MachineState_Result = 2
EndIf
</EventMachine>
;<Image>
;<X> 0 </X>
;<Y> 0 </Y>
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
;</Image>
;include="ROOT/taobin_project/inc/video.inc"
;<Image>
;<X> 0 </X>
;<Y> 380 </Y>
;<Filename> "ROOT/taobin_project/image/display_get_free/alpha.png" </Filename>
;</Image>
<Image>
<X> 0 </X>
<Y> 560 </Y>
<State> "Enable" </State>
<Filename> Var( DirImage + img_popup6 )</Filename>
</Image>
<Image>
<X> 751 </X>
<Y> 413 </Y>
<Filename> IMG_CNT </Filename>
</Image>
;
<Text>
<X> XPosiShowCountDownBrew </X>
<Y> 470 </Y>
<Align> End </Align>
<Width> 153 </Width>
<Size> 88 </Size>
<Font> RobotoBold </Font>
<Color> 0x513C2F </Color>
<Value> ShowCountDownBrewing </Value>
</Text>
<Text>
<X> 99 </X>
<Y> 1300 </Y>
<Align> center </Align>
<Size> 48 </Size>
<Color> 0x513C2F </Color>
<Value> "Please wait for coupon from SMS ... "
</Text>
</Popup>

2
inter/mys/xml/event/out_put_file1.txt
View file

@ -1 +1 @@
/event/promotion_yuzu_250.lxml
/event/promotion_melonzy.lxml

14052
inter/mys/xml/event/promotion_melonzy.lxml Normal file
View file

File diff suppressed because it is too large Load diff

2
inter/mys/xml/event/promotion_onclick1.inc
View file

@ -1 +1 @@
Open "ROOT/taobin_project/inter/mys/xml/page_catalog_group_pro_yuzu_250.lxml"
Open "ROOT/taobin_project/inter/mys/xml/page_catalog_group_pro_melon.lxml"

12
inter/mys/xml/event/script_common_for_open_promotion_xml.ev
View file

@ -2,16 +2,18 @@
; zone promote
DEBUGVAR FruityRayaEnable
; 10/02/25_remove_fruity_raya
DEBUGVAR ProThaiTeaEnable
DEBUGVAR ProYuzuEnable
DEBUGVAR ProMelonEnable
DEBUGVAR IgnoreProfileFromRunEV
If OpenFromPageBoard = 1 Then
; has-ongoing-pro
If IgnoreProfileFromRunEV = 1 Then
OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_yuzu_250.lxml"
If ProMelonEnable = 1 Then
OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_melonzy.lxml"
Var OpenFromPageBoard = 0
Else
@ -20,8 +22,8 @@ If OpenFromPageBoard = 1 Then
Else
; has-ongoing-pro
If IgnoreProfileFromRunEV = 1 Then
OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_yuzu_250.lxml"
If ProMelonEnable = 1 Then
OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_melonzy.lxml"
Var OpenFromPageBoard = 0
Else

86
inter/mys/xml/event/tricker.ev
View file

@ -24,6 +24,11 @@ Var FromProYuzu = 0
Var IgnoreProfileFromRunEV = 0
Var FromProYuzu250 = 0
; Melon Promo
Var ProMelonEnable = 0
Var FromProMelon = 0
; Pro free oreo topping
Var PromotionOreoToppingFreeEnable = 0
@ -46,57 +51,54 @@ Var UseSlideShowVideo = 0
Var NoTrickPriceProfile = 0
If SystemDateMonthInt = 9 Then
If SystemDateDayInt < 16 Then
Var PromotionOreoToppingFreeEnable = 1
If SetProReduceByBO = 1 Then
Var ProReducedPriceEnable = 1
EndIf
Else
Var PromotionOreoToppingFreeEnable = 0
EndIf
EndIf
If SystemDateMonthInt = 10 Then
Var IgnoreProfileFromRunEV = 0
EndIf
If SystemDateMonthInt = 11 Then
Var IgnoreProfileFromRunEV = 0
EndIf
If SystemDateMonthInt = 12 Then
Var IgnoreProfileFromRunEV = 0
EndIf
If SystemDateMonthInt < 10 Then
Var ProReducedPriceEnable = 0
Var IgnoreProfileFromRunEV = 0
EndIf
If ProReducedPriceEnable = 0 Then
If XMLProfile = "PromoReduced" Then
Var NoTrickPriceProfile = 1
If SystemDateMonthInt = 3 Then
If SystemDateDayInt >= 10 Then
Var ProMelonEnable = 1
Else
Var ProMelonEnable = 0
EndIf
EndIf
If SystemDateMonthInt = 4 Then
If SystemDateDayInt <= 20 Then
Var ProMelonEnable = 1
Else
Var ProMelonEnable = 0
READ_FILE "/mnt/sdcard/coffeevending/profile/price/profile_MYS_slot_4.json" ProfileSlot4MYS
STRCONTAIN "Drop" ProfileSlot4MYS PromoMelonDrop
If PromoMelonDrop = "true" Then
SAVELOG "Promotion <Melon> already dropped !!!"
Else
; zone-self-refresh
SAVELOG "Promotion <Melon> End, Self Refresh !!!"
WRITE_FILE "/mnt/sdcard/coffeevending/profile/price/profile_MYS_slot_4.json" "Drop"
WRITE_FILE "/mnt/sdcard/coffeevending/profile/profile_MYS_5.json" "Drop"
WRITE_FILE "/mnt/sdcard/coffeevending/profile/profile_MYS_new_5.json" "Drop"
WRITE_FILE "/mnt/sdcard/coffeevending/need_refresh_file" "1"
EndIf
EndIf
EndIf
; zone-refresh-once
READ_FILE "/mnt/sdcard/coffeevending/need_refresh_file" NeedRefreshStr
STRCONTAIN "1" NeedRefreshStr need_refresh
DEBUGVAR need_refresh
If need_refresh = "true" Then
Var NeedRefreshProfile = 1
WRITE_FILE "/mnt/sdcard/coffeevending/need_refresh_file" "0"
SAVELOG "Set SelfRefresh := True"
Else
Var NeedRefreshProfile = 0
EndIf
@ -104,10 +106,12 @@ EndIf
If BoxID = 177746 Then
Var ProThaiTeaEnable = 1
Var ProYuzuEnable = 1
Var ProThaiTeaEnable = 0
Var ProYuzuEnable = 0
Var PromotionOreoToppingFreeEnable = 0
;Var ProMelonEnable = 0
Var EnablePayLaterMode = 1
;Var AdvertiseProfile = "00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00"
@ -118,6 +122,10 @@ If BoxID = 177746 Then
;Var IgnoreProfileFromRunEV = 1
EndIf
If ProMelonEnable = 1 Then
Var IgnoreProfileFromRunEV = 1
EndIf
If BoxID = 210037 Then
Var UseSlideShowVideo = 1
EndIf

157
inter/mys/xml/event/yuzu/page_get_free_1_yuzu.lxml
View file

@ -1,157 +0,0 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
Var Timeout = 0
DEBUGVAR TelephoneNumber
DEBUGVAR FromProYuzu
DEBUGVAR Seeker.VendingCode
DEBUGVAR Seeker.ProYuzu
DEBUGVAR Seeker.UseProYuzuCode
Var Cid = 43
Var param1 = ""
Var param2 = ""
Var param3 = ""
If FromProYuzu = 1 Then
If TelephoneNumber = "" Then
Else
DEBUGVAR Seeker.TNumberTaobinMember
; Telephone must not empty
If Seeker.CodeChannel = 1 Then
DEBUGVAR Seeker.CodeChannel
Var Seeker.UseProYuzuCode = 1
Var Seeker.ProYuzu = 1
Else
DEBUGVAR Seeker.TNumberTaobinMember
DEBUGVAR TelephoneNumber
Var Seeker.TNumberTaobinMember = TelephoneNumber
DEBUGVAR Seeker.TNumberTaobinMember
Var Seeker.ProYuzu = 1
Var Seeker.UseProYuzuCode = 0
DEBUGVAR Seeker.ProYuzu
DEBUGVAR Seeker.UseProYuzuCode
; support-for-multi-pro-with-same-cid
Var param1 = "703"
AddData Cid TelephoneNumber param1 param2 param3
EndIf
EndIf
EndIf
; reset flag
Var FromProYuzu = 0
; goto lid straw
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
Var CountDownBrewing = BREW_CNT
Var ShowCountDownBrewing = CountDownBrewing
Var Timeout = Timeout + 1
If Timeout > 2 Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
TimerReset
Refresh
</EventTimeout>
<EventSecurity>
Open "/media/bt/xml/security_alarm.xml"
</EventSecurity>
<EventActionOk>
;
</EventActionOk>
<EventMachine>
If MachineStage = "drink-success" Then
Var MachineState_Result = 1
EndIf
If MachineStage = "drink-failed" Then
Var MachineState_Result = 2
EndIf
</EventMachine>
;<Image>
;<X> 0 </X>
;<Y> 0 </Y>
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
;</Image>
;include="ROOT/taobin_project/inc/video.inc"
;<Image>
;<X> 0 </X>
;<Y> 380 </Y>
;<Filename> "ROOT/taobin_project/image/display_get_free/alpha.png" </Filename>
;</Image>
<Image>
<X> 0 </X>
<Y> 560 </Y>
<State> "Enable" </State>
<Filename> Var( DirImage + img_popup6 )</Filename>
</Image>
<Image>
<X> 751 </X>
<Y> 413 </Y>
<Filename> IMG_CNT </Filename>
</Image>
;
<Text>
<X> XPosiShowCountDownBrew </X>
<Y> 470 </Y>
<Align> End </Align>
<Width> 153 </Width>
<Size> 88 </Size>
<Font> RobotoBold </Font>
<Color> 0x513C2F </Color>
<Value> ShowCountDownBrewing </Value>
</Text>
<Text>
<X> 99 </X>
<Y> 1300 </Y>
<Align> center </Align>
<Size> 48 </Size>
<Color> 0x513C2F </Color>
<Value> "Please wait for coupon from SMS ... "
</Text>
</Popup>

3
inter/mys/xml/menu_new_layout_gen_v2.py
View file

@ -195,6 +195,9 @@
if "yuzu_250" in current_file_name:
out_xml( '\t\tVar FromProYuzu250 = 1 \r\n')
if "melonzy" in current_file_name:
out_xml('\t\tVar FromProMelon = 1\r\n')
out_xml( '\t\t\r\n')
out_xml( '\t\t\r\n')

1
inter/mys/xml/page_catalog_group_milk.lxml
View file

@ -4273,6 +4273,7 @@
DEBUGVAR PD_STAGE_3
Var SelectDrinkType = 0
Var FromProMelon = 1
Open "ROOT/taobin_project/xml/page_topping_select6.lxml"

3
inter/mys/xml/page_catalog_group_other.lxml
View file

@ -1551,6 +1551,7 @@
DEBUGVAR PD_STAGE_3
Var SelectDrinkType = 0
Var FromProMelon = 1
Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
@ -6411,6 +6412,8 @@
DEBUGVAR PD_STAGE_3
Var SelectDrinkType = 0
Var FromProMelon = 1
Open "ROOT/taobin_project/xml/page_topping_select6.lxml"

1462
inter/mys/xml/page_catalog_group_pro_melon.lxml Normal file
View file

File diff suppressed because it is too large Load diff

46
inter/mys/xml/page_catalog_group_pro_melon.skt Normal file
View file

@ -0,0 +1,46 @@
<?hurr
#include=menu_head.py
?>
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
<?hurr
#include=menu_catalog_default_init.xml
?>
Var FromProYuzu = 0
Var Timeout = 0
<?hurr
#include=menu_catalog_new_menu.xml
?>
</EventOpen>
<?hurr
#include=menu_catalog_new.py
?>
<?hurr
#include=menu_new_layout_gen_v2.py
?>
<?hurr
#include=menu_new_layout_gen.py
?>
</Popup>

2
inter/mys/xml/page_catalog_group_pro_yuzu.lxml
View file

@ -116,7 +116,7 @@
Var FromProYuzu = 0
Var FromProMelon = 0
Var Timeout = 0

2
inter/mys/xml/page_catalog_group_pro_yuzu.skt
View file

@ -14,7 +14,7 @@
#include=menu_catalog_default_init.xml
?>
Var FromProYuzu = 0
Var FromProMelon = 0
Var Timeout = 0

185
inter/mys/xml/page_collect_point_1.lxml
View file

@ -127,8 +127,6 @@
DEBUGVAR PepweenCollectPoint
DEBUGVAR FruityRayaEnable
DEBUGVAR FromFruityRaya
DEBUGVAR ProThaiTeaEnable
DEBUGVAR FromProThaiTea
DEBUGVAR FromProYuzu
@ -176,22 +174,6 @@
Var Param1 = TelephoneNumber + "/"
Var Param1 = Param1 + ParamCP
If MyMintEnable = 1 Then
If FromMyMintPro = 1 Then
GETACCEXT TelephoneNumber 32
Open "ROOT/taobin_project/xml/event/my_mint_my_moment/page_collect_point_pro_mymint_2.xml"
EndIf
EndIf
DEBUGVAR FruityRayaEnable
DEBUGVAR FromFruityRaya
If FruityRayaEnable = 1 Then
If FromFruityRaya = 1 Then
Open "ROOT/taobin_project/inter/mys/xml/event/fruit_raya/page_get_free_1_fruit_raya.lxml"
EndIf
EndIf
DEBUGVAR ProThaiTeaEnable
DEBUGVAR FromProThaiTea
If ProThaiTeaEnable = 1 Then
@ -208,73 +190,6 @@
EndIf
EndIf
If PepweenEnable = 1 Then
If PepweenCollectPoint = 0 Then
GETACCEXT TelephoneNumber 31
Open "ROOT/taobin_project/xml/event/pepween/page_collect_point_pro_pepween_2.xml"
EndIf
EndIf
If ProBadValentineEnable = 1 Then
If FromBadValentinePro = 1 Then
GETACCEXT TelephoneNumber 32
Open "ROOT/taobin_project/xml/event/bad_valentine/page_collect_point_pro_bad_valentine_2.xml"
EndIf
EndIf
If LipitPro = 1 Then
If FromLipitPro = 1 Then
If Seeker.CodeChannel = 1 Then
If Seeker.CollectPointPromotion = 1 Then
If LipitRewardOutOfStock = 0 Then
GETACCEXT TelephoneNumber 32
Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
EndIf
EndIf
Else
If LipitRewardOutOfStock = 0 Then
GETACCEXT TelephoneNumber 32
Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
EndIf
EndIf
EndIf
EndIf
DEBUGVAR NamHomCoconutPro
DEBUGVAR FromNamHomCoconutPro
DEBUGVAR Seeker.CodeChannel
If NamHomCoconutPro = 1 Then
If FromNamHomCoconutPro = 1 Then
If Seeker.CodeChannel = 1 Then
If Seeker.CollectPointPromotion = 1 Then
If NamHomCoconutRewardOutOfStock = 0 Then
GETACCEXT TelephoneNumber 32
Open "ROOT/taobin_project/xml/event/nam_hom_coconut/page_collect_point_nam_hom_coconut_2.xml"
EndIf
EndIf
Else
If NamHomCoconutRewardOutOfStock = 0 Then
GETACCEXT TelephoneNumber 32
Open "ROOT/taobin_project/xml/event/nam_hom_coconut/page_collect_point_nam_hom_coconut_2.xml"
EndIf
EndIf
EndIf
EndIf
If RobinsonBeautyPro = 1 Then
If FromRobinsonBeautyPro = 1 Then
If Seeker.CodeChannel = 1 Then
If Seeker.CollectPointPromotion = 1 Then
GETACCEXT TelephoneNumber 32
Open "ROOT/taobin_project/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml"
EndIf
Else
GETACCEXT TelephoneNumber 32
Open "ROOT/taobin_project/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml"
EndIf
EndIf
EndIf
GETACCEXT Param1 23
Open "ROOT/taobin_project/inter/mys/xml/page_collect_point_2.lxml"
@ -310,33 +225,13 @@
Var Param1 = TelephoneNumber + "/"
Var Param1 = Param1 + ParamCP
DEBUGVAR MyMintEnable
DEBUGVAR FromMyMintPro
DEBUGVAR LipitPro
DEBUGVAR FromLipitPro
If MyMintEnable = 1 Then
If FromMyMintPro = 1 Then
GETACCEXT TelephoneNumber 32
Open "ROOT/taobin_project/xml/event/my_mint_my_moment/page_collect_point_pro_mymint_2.xml"
EndIf
EndIf
DEBUGVAR FruityRayaEnable
DEBUGVAR FromFruityRaya
If FruityRayaEnable = 1 Then
If FromFruityRaya = 1 Then
Open "ROOT/taobin_project/inter/mys/xml/event/fruit_raya/page_get_free_1_fruit_raya.lxml"
EndIf
EndIf
DEBUGVAR ProThaiTeaEnable
DEBUGVAR FromProThaiTea
If ProThaiTeaEnable = 1 Then
If FromProThaiTea = 1 Then
Open "ROOT/taobin_project/inter/mys/xml/event/thai_tea/page_get_free_1_thai_tea.lxml"
EndIf
DEBUGVAR FromProThaiTea
If ProThaiTeaEnable = 1 Then
If FromProThaiTea = 1 Then
Open "ROOT/taobin_project/inter/mys/xml/event/thai_tea/page_get_free_1_thai_tea.lxml"
EndIf
EndIf
DEBUGVAR ProYuzuEnable
DEBUGVAR FromProYuzu
@ -346,67 +241,6 @@
EndIf
EndIf
If ProBadValentineEnable = 1 Then
If FromBadValentinePro = 1 Then
GETACCEXT TelephoneNumber 32
Open "ROOT/taobin_project/xml/event/bad_valentine/page_collect_point_pro_bad_valentine_2.xml"
EndIf
EndIf
If LipitPro = 1 Then
If FromLipitPro = 1 Then
If Seeker.CodeChannel = 1 Then
If Seeker.CollectPointPromotion = 1 Then
If LipitRewardOutOfStock = 0 Then
GETACCEXT TelephoneNumber 32
Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
EndIf
EndIf
Else
If LipitRewardOutOfStock = 0 Then
GETACCEXT TelephoneNumber 32
Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
EndIf
EndIf
EndIf
EndIf
DEBUGVAR NamHomCoconutPro
DEBUGVAR FromNamHomCoconutPro
DEBUGVAR Seeker.CodeChannel
If NamHomCoconutPro = 1 Then
If FromNamHomCoconutPro = 1 Then
If Seeker.CodeChannel = 1 Then
If Seeker.CollectPointPromotion = 1 Then
If NamHomCoconutRewardOutOfStock = 0 Then
GETACCEXT TelephoneNumber 32
Open "ROOT/taobin_project/xml/event/nam_hom_coconut/page_collect_point_nam_hom_coconut_2.xml"
EndIf
EndIf
Else
If NamHomCoconutRewardOutOfStock = 0 Then
GETACCEXT TelephoneNumber 32
Open "ROOT/taobin_project/xml/event/nam_hom_coconut/page_collect_point_nam_hom_coconut_2.xml"
EndIf
EndIf
EndIf
EndIf
If RobinsonBeautyPro = 1 Then
If FromRobinsonBeautyPro = 1 Then
If Seeker.CodeChannel = 1 Then
If Seeker.CollectPointPromotion = 1 Then
GETACCEXT TelephoneNumber 32
Open "ROOT/taobin_project/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml"
EndIf
Else
GETACCEXT TelephoneNumber 32
Open "ROOT/taobin_project/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml"
EndIf
EndIf
EndIf
GETACCEXT Param1 23
Open "ROOT/taobin_project/inter/mys/xml/page_collect_point_2.lxml"
@ -865,15 +699,6 @@
Var Param1 = TelephoneNumber + "/"
Var Param1 = Param1 + ParamCP
DEBUGVAR FruityRayaEnable
DEBUGVAR FromFruityRaya
If FruityRayaEnable = 1 Then
If FromFruityRaya = 1 Then
Open "ROOT/taobin_project/inter/mys/xml/event/fruit_raya/page_get_free_1_fruit_raya.lxml"
EndIf
EndIf
DEBUGVAR ProThaiTeaEnable
DEBUGVAR FromProThaiTea
If ProThaiTeaEnable = 1 Then

4
inter/mys/xml/page_topping_select6.lxml
View file

@ -679,10 +679,12 @@
DEBUGVAR FromFruityRaya
DEBUGVAR FromProThaiTea
DEBUGVAR FromProYuzu
DEBUGVAR FromProMelon
Var FromFruityRaya = 0
Var FromProThaiTea = 0
Var FromProYuzu = 0
Var FromProMelon = 0
;Open PreviseXMLFileName2
DEBUGVAR OpenFromXML
@ -3582,10 +3584,12 @@
DEBUGVAR FromFruityRaya
DEBUGVAR FromProThaiTea
DEBUGVAR FromProYuzu
DEBUGVAR FromProMelon
Var FromFruityRaya = 0
Var FromProThaiTea = 0
Var FromProYuzu = 0
Var FromProMelon = 0
If Seeker = "next" Then
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"

11
inter/mys/xml/process/discount_from_promotion.ev
View file

@ -1,3 +1,5 @@
SAVELOG "Process::discount_from_promotion"
; fruit_raya
If FromFruityRaya = 1 Then
Var Seeker.VendingCode = "RAYA"
@ -37,3 +39,12 @@ EndIf
If FromProYuzu250 = 1 Then
Var Seeker.VendingCode = "YUZU25"
EndIf
; promotion melonzy
If FromProMelon = 1 Then
Var Seeker.VendingCode = "MELN25"
EndIf
DEBUGVAR Seeker.VendingCode

7
xml/page_board.xml
View file

@ -1997,6 +1997,13 @@ PRICE "Reset" "-"
PRICE "Reload" "-"
Var XMLProfilePrevious = XMLProfile
Var refresh_str = "-RefreshProf"
STRCONTAIN refresh_str XMLProfile HasRefreshProf
If HasRefreshProf = "true" Then
RebootWithCause "RefreshProf_ProMelon"
EndIf
EndIf
EndIf

18
xml/page_payment_cash.xml
View file

@ -397,6 +397,8 @@
Var X_Diff = 113
;113
DEBUGVAR CreditCardButtonState
If CreditCardButtonState = "Invisible" Then
Else
@ -1267,6 +1269,14 @@
DEBUGVAR MenuCautionImageStage0
If CreditCardButtonState = "Invisible" Then
Else
Var X_CASH1 = 216 - 113
Var X_CASH2 = 439 - 113
Var X_CASH3 = 664 - 113
EndIf
</EventOpen>
<EventActionOk>
@ -1983,6 +1993,14 @@
DEBUGVAR ChangeOK
DEBUGVAR CancelFlag
If CreditCardButtonState = "Invisible" Then
Else
Var X_CASH1 = 216 - 113
Var X_CASH2 = 439 - 113
Var X_CASH3 = 664 - 113
EndIf
If CamFlag = 1 Then
Var CamCount = CamCount + 1