Merged + MYS: update new promotion Melonzy

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

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

Binary file not shown.

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 455 KiB

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.

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

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>

View file

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

File diff suppressed because it is too large Load diff

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"

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

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

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>

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')

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

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>

View file

@ -115,8 +115,8 @@
Var FromProYuzu = 0
Var FromProMelon = 0
Var Timeout = 0

View file

@ -1,5 +1,5 @@
<?hurr
#include=menu_head.py
<?hurr
#include=menu_head.py
?>
<Popup>
@ -13,12 +13,12 @@
<?hurr
#include=menu_catalog_default_init.xml
?>
Var FromProYuzu = 0
Var FromProMelon = 0
Var Timeout = 0
<?hurr
<?hurr
#include=menu_catalog_new_menu.xml
?>
@ -26,7 +26,7 @@
<?hurr
<?hurr
#include=menu_catalog_new.py
?>
@ -34,10 +34,10 @@
<?hurr
<?hurr
#include=menu_new_layout_gen_v2.py
?>
<?hurr
<?hurr
#include=menu_new_layout_gen.py
?>

View file

@ -11,8 +11,8 @@
; jump
If IgnoreCollectPointByMe = 1 Then
Var IgnoreCollectPointByMe = 0
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
If Seeker.CodeChannel = 1 Then
If Seeker.CollectPointMain = 0 Then
@ -20,10 +20,10 @@
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
If SettingIgnoreCollectPoint = 1 Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Var ShowErrorText = "Invisible"
@ -35,7 +35,7 @@
Var TimeOutPlay = 0
If show_eng = "true" Then
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/collect_point1_en"
;Play "ROOT/taobin_project/sound_eng/Reward_final.mp3"
@ -74,7 +74,7 @@
Var CampaingRef1 = ""
Var CampaingRef2 = ""
SUBSTRING CampaingRef 0 6 CampaingRef1
SUBSTRING CampaingRef 12 18 CampaingRef2
@ -124,22 +124,20 @@
Var PepweenCollectPoint = 0
EndIf
EndIf
DEBUGVAR PepweenCollectPoint
DEBUGVAR FruityRayaEnable
DEBUGVAR FromFruityRaya
DEBUGVAR ProThaiTeaEnable
DEBUGVAR FromProThaiTea
DEBUGVAR FromProYuzu
DEBUGVAR FromProYuzu250
If Seeker.TNumberTaobinCredit = "" Then
If web_telnumOK = "" Then
If show_eng = "true" Then
If show_eng = "true" Then
Play "ROOT/taobin_project/sound_eng/Reward_final.mp3"
Else
Play "ROOT/taobin_project/sound_thai/dontforget_number.mp3"
@ -150,7 +148,7 @@
Var StepGetPoint = 1
Var PdpaAsk = 0
Var OperatorTemp = ""
Var CreditAmount = 0
Var OperatorStatus = ""
@ -170,28 +168,12 @@
AddData 45 TelPhoneNum drink_price param2 param3
EndIf
;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
Var Param1 = TelephoneNumber + "/"
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,75 +190,8 @@
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"
Open "ROOT/taobin_project/inter/mys/xml/page_collect_point_2.lxml"
EndIf
Else
@ -294,7 +209,7 @@
Var StepGetPoint = 1
Var PdpaAsk = 0
Var OperatorTemp = ""
Var CreditAmount = 0
Var OperatorStatus = ""
@ -304,40 +219,20 @@
Var TelephoneNumberX = TelephoneNumber
DEBUGVAR TelephoneNumber
DEBUGVAR PepweenCollectPoint
;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
Var Param1 = TelephoneNumber + "/"
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
If ProYuzuEnable = 1 Then
@ -346,69 +241,8 @@
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"
Open "ROOT/taobin_project/inter/mys/xml/page_collect_point_2.lxml"
EndIf
@ -416,24 +250,24 @@
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
<EventTimeout>
Var CountDownBrewing = BREW_CNT
Var ShowCountDownBrewing = CountDownBrewing
StrLen TelephoneNumber TelNumLen
If TelNumLen > 0 Then
Var ShowTextNumber = "Invisible"
Else
; Add
Var TimeOutPlay = TimeOutPlay + 1
If TimeOutPlay > 10 Then
Var TimeOutPlay = 0
If show_eng = "true" Then
If show_eng = "true" Then
Play "ROOT/taobin_project/sound_eng/Reward_final.mp3"
Else
Play "ROOT/taobin_project/sound_thai/dontforget_number.mp3"
@ -442,17 +276,17 @@
;
EndIf
DEBUGVAR Timeout
Var Timeout = Timeout + 1
If Timeout > 30 Then
SAVELOG "collect_point1-p107."
;Open "ROOT/taobin_project/xml/page_catalog.xml"
;Open "ROOT/taobin_project/xml/page_catalog.xml"
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
If Timeout = 18 Then
@ -470,7 +304,7 @@
Refresh
TimerReset
</EventTimeout>
</EventTimeout>
@ -496,13 +330,13 @@
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_1.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var Timeout = 0
Var TelephoneNumber = TelephoneNumber + "1"
Trim TelephoneNumber MaxPhoneNumber
StrLen TelephoneNumber TelNumLen
If TelNumLen >= MinPhoneNumber Then
If TelNumLen >= MinPhoneNumber Then
Var Tel_Confirm_State = "Enable"
EndIf
@ -512,9 +346,9 @@
TimerReset
Refresh
</EventClick>
</Button>
@ -526,13 +360,13 @@
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_2.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var Timeout = 0
Var TelephoneNumber = TelephoneNumber + "2"
Trim TelephoneNumber MaxPhoneNumber
StrLen TelephoneNumber TelNumLen
If TelNumLen >= MinPhoneNumber Then
If TelNumLen >= MinPhoneNumber Then
Var Tel_Confirm_State = "Enable"
EndIf
@ -551,13 +385,13 @@
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_3.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var Timeout = 0
Var TelephoneNumber = TelephoneNumber + "3"
Trim TelephoneNumber MaxPhoneNumber
StrLen TelephoneNumber TelNumLen
If TelNumLen >= MinPhoneNumber Then
If TelNumLen >= MinPhoneNumber Then
Var Tel_Confirm_State = "Enable"
EndIf
@ -576,13 +410,13 @@
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_4.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var Timeout = 0
Var TelephoneNumber = TelephoneNumber + "4"
Trim TelephoneNumber MaxPhoneNumber
StrLen TelephoneNumber TelNumLen
If TelNumLen >= MinPhoneNumber Then
If TelNumLen >= MinPhoneNumber Then
Var Tel_Confirm_State = "Enable"
EndIf
@ -601,13 +435,13 @@
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_5.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var Timeout = 0
Var TelephoneNumber = TelephoneNumber + "5"
Trim TelephoneNumber MaxPhoneNumber
StrLen TelephoneNumber TelNumLen
If TelNumLen >= MinPhoneNumber Then
If TelNumLen >= MinPhoneNumber Then
Var Tel_Confirm_State = "Enable"
EndIf
@ -626,13 +460,13 @@
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_6.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var Timeout = 0
Var TelephoneNumber = TelephoneNumber + "6"
Trim TelephoneNumber MaxPhoneNumber
StrLen TelephoneNumber TelNumLen
If TelNumLen >= MinPhoneNumber Then
If TelNumLen >= MinPhoneNumber Then
Var Tel_Confirm_State = "Enable"
EndIf
@ -651,13 +485,13 @@
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_7.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var Timeout = 0
Var TelephoneNumber = TelephoneNumber + "7"
Trim TelephoneNumber MaxPhoneNumber
StrLen TelephoneNumber TelNumLen
If TelNumLen >= MinPhoneNumber Then
If TelNumLen >= MinPhoneNumber Then
Var Tel_Confirm_State = "Enable"
EndIf
@ -676,13 +510,13 @@
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_8.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var Timeout = 0
Var TelephoneNumber = TelephoneNumber + "8"
Trim TelephoneNumber MaxPhoneNumber
StrLen TelephoneNumber TelNumLen
If TelNumLen >= MinPhoneNumber Then
If TelNumLen >= MinPhoneNumber Then
Var Tel_Confirm_State = "Enable"
EndIf
@ -701,13 +535,13 @@
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_9.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var Timeout = 0
Var TelephoneNumber = TelephoneNumber + "9"
Trim TelephoneNumber MaxPhoneNumber
StrLen TelephoneNumber TelNumLen
If TelNumLen >= MinPhoneNumber Then
If TelNumLen >= MinPhoneNumber Then
Var Tel_Confirm_State = "Enable"
EndIf
@ -716,7 +550,7 @@
TimerReset
Refresh
</EventClick>
</Button>
@ -727,13 +561,13 @@
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_0.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var Timeout = 0
Var TelephoneNumber = TelephoneNumber + "0"
Trim TelephoneNumber MaxPhoneNumber
StrLen TelephoneNumber TelNumLen
If TelNumLen >= MinPhoneNumber Then
If TelNumLen >= MinPhoneNumber Then
Var Tel_Confirm_State = "Enable"
EndIf
@ -752,24 +586,24 @@
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_back-1.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var Timeout = 0
Trim TelephoneNumber -1
StrLen TelephoneNumber TelNumLen
If TelNumLen < 10 Then
If TelNumLen < 10 Then
Var Tel_Confirm_State = "Invisible"
EndIf
If TelNumLen = 0 Then
If TelNumLen = 0 Then
Var ShowTextNumber = "Enable"
EndIf
TimerReset
Refresh
</EventClick>
</Button>
@ -793,11 +627,11 @@
<FilenamePress> Var( DirImage + "/bp_negative.png") </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
; goto lid straw
;Open "ROOT/taobin_project/xml/page_catalog.xml"
;Open "ROOT/taobin_project/xml/page_catalog.xml"
SAVELOG "collect_point1-p589."
If LuckyDrawCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
@ -816,9 +650,9 @@
<FilenameDisable> Var( DirImage + "/bn_positive.png") </FilenameDisable>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
If Tel_Confirm_Flag = 1 Then
@ -833,7 +667,7 @@
Var StepGetPoint = 1
Var PdpaAsk = 0
Var OperatorTemp = ""
Var CreditAmount = 0
Var OperatorStatus = ""
@ -852,28 +686,19 @@
AddData 45 TelPhoneNum drink_price param2 param3
EndIf
If ChildrenFree = 1 Then
Var Seeker.TNumberTaobinMember = TelephoneNumber
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Var Param1 = TelephoneNumber + "/"
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
@ -893,7 +718,7 @@
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"
Open "ROOT/taobin_project/xml/event/my_mint_my_moment/page_collect_point_pro_mymint_2.xml"
EndIf
EndIf
@ -958,12 +783,12 @@
EndIf
GETACCEXT Param1 23
;Open "ROOT/taobin_project/xml/page_catalog.xml"
Open "ROOT/taobin_project/inter/mys/xml/page_collect_point_2.lxml"
;Open "ROOT/taobin_project/xml/page_catalog.xml"
Open "ROOT/taobin_project/inter/mys/xml/page_collect_point_2.lxml"
Else
Else
If show_eng = "true" Then
If show_eng = "true" Then
Var DirImage2 = "ROOT/taobin_project/image/collectiing_en"
Else
Var DirImage2 = "ROOT/taobin_project/image/collectiing"
@ -976,7 +801,7 @@
Var Tel_Confirm_State = "Invisible"
Refresh
EndIf
@ -1067,11 +892,11 @@
<State> ShowErrorText </State>
<Filename> text_show_error </Filename>
</Image>
<EventSecurity>
Open "/media/bt/xml/security_alarm.xml"
<EventSecurity>
Open "/media/bt/xml/security_alarm.xml"
</EventSecurity>
<EventMachine>
If MachineStage = "drink-success" Then
@ -1086,4 +911,4 @@
</Popup>
</Popup>

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"

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

File diff suppressed because it is too large Load diff

View file

@ -1,5 +1,5 @@
<?hurr
#include=menu_head.py
<?hurr
#include=menu_head.py
?>
<Popup>
@ -10,7 +10,7 @@
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
If SlientRefreshIndex = 2 Then
Var SlientRefreshIndex = 3
@ -26,7 +26,7 @@
<EventOnShow>
SAVELOG "Onshow 1"
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
Var Menu2Selected = "PressForever"
SAVELOG "Onshow 2"
@ -39,7 +39,7 @@
SetInstanceIgnoreTouch
DEBUGVAR SlientRefreshIndex
</EventOnShow>
@ -54,7 +54,7 @@
Var ice_tab_process_show = "Invisible"
EndIf
GetVisible inst_show2
;DEBUGVAR inst_show2
@ -67,7 +67,7 @@
GetXMLFileNameCurrentRunning CurrentOpenFile
Open CurrentOpenFile
If show_eng = "true" Then
If show_eng = "true" Then
InstanceSetString "ShowEng"
Else
InstanceSetString "ShowThai"
@ -84,12 +84,12 @@
GetXMLFileNameCurrentRunning CurrentOpenFile
Open CurrentOpenFile
If show_eng = "true" Then
If show_eng = "true" Then
InstanceSetString "ShowEng"
Else
InstanceSetString "ShowThai"
EndIf
EndIf
EndIf
@ -98,7 +98,7 @@
SAVELOG "OPEN slient 1"
GetXMLFileNameCurrentRunning CurrentOpenFile2
Open CurrentOpenFile2
Else
Var SlientRefreshIndex = 3
EndIf
@ -115,7 +115,7 @@
InstanceGetString SaveStringInst
If SaveStringInst = "RefreshNow" Then
Else
If LanguageShow = "ENG" Then
Var SaveStringInst = "ShowEng"
@ -132,7 +132,7 @@
EndIf
EndIf
@ -140,7 +140,7 @@
Var Inst5CountCurrentMenuEnable = 0
GetFrameScrollBlockCount Inst5CountCurrentMenuEnable
GetCurrentEnableBlockCount Inst5CountMenuEnable
;DEBUGVAR Inst5CountMenuEnable
;DEBUGVAR Inst5CountMenuEnablePrev
;DEBUGVAR Inst5CountCurrentMenuEnable
@ -169,7 +169,7 @@
EndIf
If Inst5CountCurrentMenuEnable = 0 Then
DEBUGVAR Inst5CountDownOpenXMLFromMenuZero
If Inst5CountDownOpenXMLFromMenuZero > 0 Then
@ -184,7 +184,7 @@
If Inst5CountMenuEnable = Inst5CountCurrentMenuEnable Then
If Inst5CountCurrentMenuEnable > 0 Then
Var Inst5MenuLoaded = "done"
Var Inst5MenuLoaded = "done"
EndIf
EndIf
@ -197,7 +197,7 @@
EndIf
InstanceGetString SaveStringInst
If SaveStringInst = "RefreshNow" Then
Else
If LanguageShow = "ENG" Then
Var SaveStringInst = "ShowEng"
@ -227,7 +227,7 @@
Var ScriptCoffeeMenu = 0
SAVELOG "Runscript 3"
Script "-" "-"
EndIf
EndIf
If CoffeeRefreshTimeOut > 15 Then
Var CoffeeRefreshTimeOut = 0
@ -235,7 +235,7 @@
EndIf
Var CoffeeRefreshTimeOut = CoffeeRefreshTimeOut + 1
TimerReset
</EventTimeout>
@ -245,10 +245,10 @@
<?hurr
<?hurr
#include=menu_new_layout_gen_v2.py
?>
<?hurr
<?hurr
#include=menu_new_layout_gen.py
?>

File diff suppressed because it is too large Load diff

View file

@ -1,5 +1,5 @@
<?hurr
#include=menu_head.py
<?hurr
#include=menu_head.py
touch_less_gen = False
?>
@ -11,7 +11,7 @@
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
SetInstanceIgnoreTouch
DEBUGVAR SlientRefreshIndex
@ -23,14 +23,14 @@
</EventOpen>
<EventOnShow>
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
; protein
If AppFastEnable = "true" Then
Var Menu11Selected = "PressForever"
Var Menu11Selected = "PressForever"
Var Menu7Selected = "Invisible"
Var Menu21Selected = "Invisible"
Else
Var Menu11Selected = "Invisible"
Var Menu11Selected = "Invisible"
Var Menu7Selected = "Invisible"
Var Menu21Selected = "PressForever"
EndIf
@ -60,8 +60,8 @@
EndIf
GetVisible inst_show5
;DEBUGVAR inst_show5
@ -73,7 +73,7 @@
GetXMLFileNameCurrentRunning CurrentOpenFile
Open CurrentOpenFile
If show_eng = "true" Then
If show_eng = "true" Then
InstanceSetString "ShowEng"
Else
InstanceSetString "ShowThai"
@ -89,12 +89,12 @@
GetXMLFileNameCurrentRunning CurrentOpenFile
Open CurrentOpenFile
If show_eng = "true" Then
If show_eng = "true" Then
InstanceSetString "ShowEng"
Else
InstanceSetString "ShowThai"
EndIf
EndIf
EndIf
@ -119,7 +119,7 @@
InstanceGetString SaveStringInst
If SaveStringInst = "RefreshNow" Then
Else
If LanguageShow = "ENG" Then
Var SaveStringInst = "ShowEng"
@ -142,7 +142,7 @@
Var Inst8CountCurrentMenuEnable = 0
GetFrameScrollBlockCount Inst8CountCurrentMenuEnable
GetCurrentEnableBlockCount Inst8CountMenuEnable
;DEBUGVAR Inst8CountMenuEnable
;DEBUGVAR Inst8CountMenuEnablePrev
;DEBUGVAR Inst8CountCurrentMenuEnable
@ -169,10 +169,10 @@
Var Inst8CountDownForOpenXML = 10
EndIf
EndIf
If Inst8CountCurrentMenuEnable = 0 Then
DEBUGVAR Inst8CountDownOpenXMLFromMenuZero
If Inst8CountDownOpenXMLFromMenuZero > 0 Then
@ -186,7 +186,7 @@
If Inst8CountMenuEnable = Inst8CountCurrentMenuEnable Then
If Inst8CountCurrentMenuEnable > 0 Then
Var Inst8MenuLoaded = "done"
Var Inst8MenuLoaded = "done"
EndIf
EndIf
@ -197,7 +197,7 @@
Open "ROOT/taobin_project/inter/tha/xml/multi/page_catalog_group_forkid.lxml"
EndIf
EndIf
TimerReset
</EventTimeout>
@ -206,10 +206,10 @@
<?hurr
<?hurr
#include=menu_new_layout_gen_v2.py
?>
<?hurr
<?hurr
#include=menu_new_layout_gen.py
?>

View file

@ -1,198 +1,198 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
DEBUGVAR SlientRefreshIndex
If SlientRefreshIndex = 8 Then
Var SlientRefreshIndex = 9
EndIf
</EventOpen>
<EventOnShow>
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
Var Menu61Selected = "PressForever"
Var Timeout = 0
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
SetInstanceIgnoreTouch
DEBUGVAR SlientRefreshIndex
</EventOnShow>
<Timeout> 1000 </Timeout>
<EventTimeout>
;DEBUGVAR ICE_PROCESS_STATUS
If ICE_PROCESS_STATUS = 2 Then
Var ice_tab_process_show = "Enable"
Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
Else
Var ice_tab_process_show = "Invisible"
EndIf
GetVisible inst_show9
;DEBUGVAR inst_show9
If inst_show9 = 1 Then
InstanceGetString SaveStringInst
;DEBUGVAR SaveStringInst
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile
Open CurrentOpenFile
If show_eng = "true" Then
InstanceSetString "ShowEng"
Else
InstanceSetString "ShowThai"
EndIf
EndIf
EndIf
; setvarint SlientRefreshEnable 1
;DEBUGVAR SlientRefreshEnable
If SlientRefreshEnable = 1 Then
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile
Open CurrentOpenFile
If show_eng = "true" Then
InstanceSetString "ShowEng"
Else
InstanceSetString "ShowThai"
EndIf
EndIf
EndIf
If SlientRefreshIndex = 8 Then
If inst_show9 = 0 Then
GetXMLFileNameCurrentRunning CurrentOpenFile5
Open CurrentOpenFile5
Else
Var SlientRefreshIndex = 9
EndIf
EndIf
If langnext9 = "true" Then
Var langnext9 = "false"
RefreshAll
EndIf
If inst_show9 = 1 Then
InstanceGetString SaveStringInst
If SaveStringInst = "RefreshNow" Then
Else
If LanguageShow = "ENG" Then
Var SaveStringInst = "ShowEng"
Var show_eng = "false"
EndIf
If LanguageShow = "THAI" Then
Var SaveStringInst = "ShowThai"
Var show_eng = "true"
EndIf
If LanguageShow = "MYANMAR" Then
Var show_eng = "false"
Var SaveStringInst = "ShowMYANMAR"
EndIf
EndIf
EndIf
Var Inst10CountMenuEnable = 0
Var Inst10CountCurrentMenuEnable = 0
GetFrameScrollBlockCount Inst10CountCurrentMenuEnable
GetCurrentEnableBlockCount Inst10CountMenuEnable
;DEBUGVAR Inst10CountMenuEnable
;DEBUGVAR Inst10CountMenuEnablePrev
;DEBUGVAR Inst10CountCurrentMenuEnable
If Inst10CountMenuEnablePrev = "" Then
Var Inst10CountMenuEnablePrev = Inst10CountMenuEnable
Var Inst10CountDownForOpenXML = 0
Var Inst10CountDownOpenXMLFromMenuZero = 20
EndIf
If Inst10CountMenuEnable = Inst10CountMenuEnablePrev Then
Else
SAVELOG "Inst10 Refresh ===================================================================== Refresh"
Var Inst10CountDownForOpenXML = 10
Var Inst10CountMenuEnablePrev = CountMenuEnable
EndIf
If Inst10CountMenuEnable = Inst10CountCurrentMenuEnable Then
Else
If Inst10CountDownForOpenXML = 0 Then
SAVELOG "Inst10 Refresh =======================Inst10CountMenuEnable / Inst10CountCurrentMenuEnable ============================================== Refresh"
Var Inst10CountDownForOpenXML = 10
EndIf
EndIf
If Inst10CountCurrentMenuEnable = 0 Then
DEBUGVAR Inst10CountDownOpenXMLFromMenuZero
If Inst10CountDownOpenXMLFromMenuZero > 0 Then
Var Inst10CountDownOpenXMLFromMenuZero = Inst10CountDownOpenXMLFromMenuZero - 1
If Inst10CountDownOpenXMLFromMenuZero = 0 Then
Var Inst10CountDownOpenXMLFromMenuZero = 20
Open "ROOT/taobin_project/inter/tha/xml/multi/page_catalog_group_pepsi_7up.lxml"
EndIf
EndIf
EndIf
If Inst10CountMenuEnable = Inst10CountCurrentMenuEnable Then
If Inst10CountCurrentMenuEnable > 0 Then
Var Inst10MenuLoaded = "done"
EndIf
EndIf
If Inst10CountDownForOpenXML > 0 Then
Var Inst10CountDownForOpenXML = Inst10CountDownForOpenXML - 1
DEBUGVAR Inst10CountDownForOpenXML
If Inst10CountDownForOpenXML = 0 Then
Open "ROOT/taobin_project/inter/tha/xml/multi/page_catalog_group_pepsi_7up.lxml"
EndIf
EndIf
TimerReset
</EventTimeout>
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new.lxml"
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
DEBUGVAR SlientRefreshIndex
If SlientRefreshIndex = 8 Then
Var SlientRefreshIndex = 9
EndIf
</EventOpen>
<EventOnShow>
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
Var Menu61Selected = "PressForever"
Var Timeout = 0
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
SetInstanceIgnoreTouch
DEBUGVAR SlientRefreshIndex
</EventOnShow>
<Timeout> 1000 </Timeout>
<EventTimeout>
;DEBUGVAR ICE_PROCESS_STATUS
If ICE_PROCESS_STATUS = 2 Then
Var ice_tab_process_show = "Enable"
Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
Else
Var ice_tab_process_show = "Invisible"
EndIf
GetVisible inst_show9
;DEBUGVAR inst_show9
If inst_show9 = 1 Then
InstanceGetString SaveStringInst
;DEBUGVAR SaveStringInst
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile
Open CurrentOpenFile
If show_eng = "true" Then
InstanceSetString "ShowEng"
Else
InstanceSetString "ShowThai"
EndIf
EndIf
EndIf
; setvarint SlientRefreshEnable 1
;DEBUGVAR SlientRefreshEnable
If SlientRefreshEnable = 1 Then
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile
Open CurrentOpenFile
If show_eng = "true" Then
InstanceSetString "ShowEng"
Else
InstanceSetString "ShowThai"
EndIf
EndIf
EndIf
If SlientRefreshIndex = 8 Then
If inst_show9 = 0 Then
GetXMLFileNameCurrentRunning CurrentOpenFile5
Open CurrentOpenFile5
Else
Var SlientRefreshIndex = 9
EndIf
EndIf
If langnext9 = "true" Then
Var langnext9 = "false"
RefreshAll
EndIf
If inst_show9 = 1 Then
InstanceGetString SaveStringInst
If SaveStringInst = "RefreshNow" Then
Else
If LanguageShow = "ENG" Then
Var SaveStringInst = "ShowEng"
Var show_eng = "false"
EndIf
If LanguageShow = "THAI" Then
Var SaveStringInst = "ShowThai"
Var show_eng = "true"
EndIf
If LanguageShow = "MYANMAR" Then
Var show_eng = "false"
Var SaveStringInst = "ShowMYANMAR"
EndIf
EndIf
EndIf
Var Inst10CountMenuEnable = 0
Var Inst10CountCurrentMenuEnable = 0
GetFrameScrollBlockCount Inst10CountCurrentMenuEnable
GetCurrentEnableBlockCount Inst10CountMenuEnable
;DEBUGVAR Inst10CountMenuEnable
;DEBUGVAR Inst10CountMenuEnablePrev
;DEBUGVAR Inst10CountCurrentMenuEnable
If Inst10CountMenuEnablePrev = "" Then
Var Inst10CountMenuEnablePrev = Inst10CountMenuEnable
Var Inst10CountDownForOpenXML = 0
Var Inst10CountDownOpenXMLFromMenuZero = 20
EndIf
If Inst10CountMenuEnable = Inst10CountMenuEnablePrev Then
Else
SAVELOG "Inst10 Refresh ===================================================================== Refresh"
Var Inst10CountDownForOpenXML = 10
Var Inst10CountMenuEnablePrev = CountMenuEnable
EndIf
If Inst10CountMenuEnable = Inst10CountCurrentMenuEnable Then
Else
If Inst10CountDownForOpenXML = 0 Then
SAVELOG "Inst10 Refresh =======================Inst10CountMenuEnable / Inst10CountCurrentMenuEnable ============================================== Refresh"
Var Inst10CountDownForOpenXML = 10
EndIf
EndIf
If Inst10CountCurrentMenuEnable = 0 Then
DEBUGVAR Inst10CountDownOpenXMLFromMenuZero
If Inst10CountDownOpenXMLFromMenuZero > 0 Then
Var Inst10CountDownOpenXMLFromMenuZero = Inst10CountDownOpenXMLFromMenuZero - 1
If Inst10CountDownOpenXMLFromMenuZero = 0 Then
Var Inst10CountDownOpenXMLFromMenuZero = 20
Open "ROOT/taobin_project/inter/tha/xml/multi/page_catalog_group_pepsi_7up.lxml"
EndIf
EndIf
EndIf
If Inst10CountMenuEnable = Inst10CountCurrentMenuEnable Then
If Inst10CountCurrentMenuEnable > 0 Then
Var Inst10MenuLoaded = "done"
EndIf
EndIf
If Inst10CountDownForOpenXML > 0 Then
Var Inst10CountDownForOpenXML = Inst10CountDownForOpenXML - 1
DEBUGVAR Inst10CountDownForOpenXML
If Inst10CountDownForOpenXML = 0 Then
Open "ROOT/taobin_project/inter/tha/xml/multi/page_catalog_group_pepsi_7up.lxml"
EndIf
EndIf
TimerReset
</EventTimeout>
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new.lxml"
<FrameScroll>
<X> 10 </X>
<Y> 497 </Y>
@ -10869,8 +10869,8 @@
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
</EventClick>
</Button>
</Popup>
</Popup>

View file

@ -1,5 +1,5 @@
<?hurr
#include=menu_head.py
<?hurr
#include=menu_head.py
echo param
?>
@ -20,7 +20,7 @@
</EventOpen>
<EventOnShow>
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
Var Menu61Selected = "PressForever"
@ -29,7 +29,7 @@
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
SetInstanceIgnoreTouch
@ -50,12 +50,12 @@
EndIf
GetVisible inst_show9
;DEBUGVAR inst_show9
If inst_show9 = 1 Then
InstanceGetString SaveStringInst
@ -64,12 +64,12 @@
GetXMLFileNameCurrentRunning CurrentOpenFile
Open CurrentOpenFile
If show_eng = "true" Then
If show_eng = "true" Then
InstanceSetString "ShowEng"
Else
InstanceSetString "ShowThai"
EndIf
EndIf
EndIf
@ -81,12 +81,12 @@
GetXMLFileNameCurrentRunning CurrentOpenFile
Open CurrentOpenFile
If show_eng = "true" Then
If show_eng = "true" Then
InstanceSetString "ShowEng"
Else
InstanceSetString "ShowThai"
EndIf
EndIf
EndIf
@ -109,7 +109,7 @@
InstanceGetString SaveStringInst
If SaveStringInst = "RefreshNow" Then
Else
If LanguageShow = "ENG" Then
Var SaveStringInst = "ShowEng"
@ -130,7 +130,7 @@
Var Inst10CountCurrentMenuEnable = 0
GetFrameScrollBlockCount Inst10CountCurrentMenuEnable
GetCurrentEnableBlockCount Inst10CountMenuEnable
;DEBUGVAR Inst10CountMenuEnable
;DEBUGVAR Inst10CountMenuEnablePrev
;DEBUGVAR Inst10CountCurrentMenuEnable
@ -148,7 +148,7 @@
Var Inst10CountDownForOpenXML = 10
Var Inst10CountMenuEnablePrev = CountMenuEnable
EndIf
If Inst10CountMenuEnable = Inst10CountCurrentMenuEnable Then
Else
@ -159,7 +159,7 @@
EndIf
If Inst10CountCurrentMenuEnable = 0 Then
DEBUGVAR Inst10CountDownOpenXMLFromMenuZero
If Inst10CountDownOpenXMLFromMenuZero > 0 Then
@ -173,7 +173,7 @@
If Inst10CountMenuEnable = Inst10CountCurrentMenuEnable Then
If Inst10CountCurrentMenuEnable > 0 Then
Var Inst10MenuLoaded = "done"
Var Inst10MenuLoaded = "done"
EndIf
EndIf
@ -184,7 +184,7 @@
Open "ROOT/taobin_project/inter/tha/xml/multi/page_catalog_group_pepsi_7up.lxml"
EndIf
EndIf
TimerReset
</EventTimeout>
@ -196,10 +196,10 @@
<?hurr
<?hurr
#include=menu_new_layout_gen_v2.py
?>
<?hurr
<?hurr
#include=menu_new_layout_gen.py
?>

View file

@ -211,7 +211,7 @@
STRCONTAIN "1037" MaterialAvailable 7UpSyrupEnable
STRCONTAIN "1038" MaterialAvailable PepsiHighYSyrupEnable
STRCONTAIN "1052" MaterialAvailable CollagenPowderEnable
STRCONTAIN "1065" MaterialAvailable HaveIngredientOvaltine
;Var AppFastEnable = "false"
@ -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

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