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

This commit is contained in:
wanlop run 2024-02-28 14:03:32 +07:00
commit c2370f6ead
112 changed files with 15890 additions and 49 deletions

View file

@ -1 +1 @@
/event/promotion_rerun.xml
/event/promotion_pepsi_second_cup_30.xml

View file

@ -0,0 +1,114 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Volume> SoundVolume </Volume>
<EventOpen>
Var Timeout = 0
Var ImageDir = "ROOT/taobin_project/image/event/pepsi_second_cup_30/"
If show_eng = "true" Then
Var GotDiscountImg = ImageDir + "got_discount_code_pepsi_en.png"
Else
Var GotDiscountImg = ImageDir + "got_discount_code_pepsi_th.png"
EndIf
DEBUGVAR GotDiscountImg
DEBUGVAR PepsiSecondCup30Enable
DEBUGVAR TelephoneNumber
Var Param1 = ""
Var Param2 = ""
Var Param3 = ""
AddData 43 TelephoneNumber Param1 Param2 Param3
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
Var CountDownBrewing = BREW_CNT
Var ShowCountDownBrewing = CountDownBrewing
Var Timeout = Timeout + 1
If Timeout > 5 Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
TimerReset
Refresh
</EventTimeout>
<EventMachine>
If MachineStage = "drink-success" Then
Var MachineState_Result = 1
EndIf
If MachineStage = "drink-failed" Then
Var MachineState_Result = 2
EndIf
</EventMachine>
<EventSecurity>
Open "/media/bt/xml/security_alarm.xml"
</EventSecurity>
<EventActionOk>
If Ext1a = "ok" Then
Else
Var Seeker.TaobinErrorNetwork = 1
Var Seeker.PointTaobinStr = ParamCP
Var TelephoneNumber = TelephoneNumberX
Var Seeker.TNumberTaobinMember= TelephoneNumber
Open "ROOT/taobin_project/xml/event/pepsi_second_cup_30/page_got_discount_code_pepsi.xml"
EndIf
</EventActionOk>
<EventActionError>
Var Seeker.TaobinErrorNetwork = 1
Var Seeker.PointTaobinStr = ParamCP
Var TelephoneNumber = TelephoneNumberX
Var Seeker.TNumberTaobinMember= TelephoneNumber
Open "ROOT/taobin_project/xml/event/pepsi_second_cup_30/page_got_discount_code_pepsi.xml"
</EventActionError>
<Video>
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>
<Image>
<X> 0 </X>
<Y> 380 </Y>
<Filename> GotDiscountImg </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>
</Popup>

File diff suppressed because it is too large Load diff

View file

@ -33,7 +33,7 @@
</FilenameDisable>
<EventOnClick>
Open "ROOT/taobin_project/xml/page_catalog_group_pro_rerun.xml"
Open "ROOT/taobin_project/xml/page_catalog_group_pro_pepsi_second_cup_30.xml"
</EventOnClick>
@ -53,7 +53,7 @@
EndIf
)
</State>
<Filename> "ROOT/taobin_project/image/event/pro_rerun.mp4" </Filename>
<Filename> "ROOT/taobin_project/image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30_th.mp4" </Filename>
</Video>
<Video>
@ -71,7 +71,7 @@
)
</State>
<Loop> "true" </Loop>
<Filename> "ROOT/taobin_project/image/event/pro_rerun.mp4" </Filename>
<Filename> "ROOT/taobin_project/image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30_en.mp4" </Filename>
</Video>
</Button>

View file

@ -16,15 +16,15 @@ Else
; zone promote
If OpenFromPageBoard = 1 Then
If ProBadValentineEnable = 1 Then
If PepsiSecondCup30Enable = 1 Then
Var BigButtonEnable = "Enable"
OpenInst 2 "ROOT/taobin_project/xml/event/promotion_bad_valentine.xml"
OpenInst 2 "ROOT/taobin_project/xml/event/promotion_pepsi_second_cup_30.xml"
Var OpenFromPageBoard = 0
Else
If ProPeachEnable = 1 Then
If ProBadValentineEnable = 1 Then
Var BigButtonEnable = "Enable"
OpenInst 2 "ROOT/taobin_project/xml/event/promotion_peach.xml"
OpenInst 2 "ROOT/taobin_project/xml/event/promotion_bad_valentine.xml"
Var OpenFromPageBoard = 0
Else
@ -33,14 +33,14 @@ Else
EndIf
EndIf
Else
If ProBadValentineEnable = 1 Then
If PepsiSecondCup30Enable = 1 Then
Var BigButtonEnable = "Enable"
Open "ROOT/taobin_project/xml/event/promotion_bad_valentine.xml"
Open "ROOT/taobin_project/xml/event/promotion_pepsi_second_cup_30.xml"
Else
If ProPeachEnable = 1 Then
If ProBadValentineEnable = 1 Then
Var BigButtonEnable = "Enable"
Open "ROOT/taobin_project/xml/event/promotion_peach.xml"
Open "ROOT/taobin_project/xml/event/promotion_bad_valentine.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf

View file

@ -64,6 +64,11 @@ Var ProPeachEnable = 0
Var ProBadValentineEnable = 0
Var FromBadValentinePro = 0
; Enable Pepsi Second Cup 30, Mar 1 - 17, but get discount code only 4-8 and 11-15 Mar
Var PepsiSecondCup30Enable = 0
Var PepsiSecondCup30DiscountEnable = 0
Var FromPepsiSecondCup30 = 0
Var NewCollectPoint = 1
Var NewFlowPaymentCode = 0
@ -126,16 +131,40 @@ If SystemDateMonthInt = 2 Then
EndIf
If SystemDateMonthInt = 3 Then
If SystemDateDayInt >= 1 Then
If SystemDateDayInt <= 17 Then
Var PepsiSecondCup30Enable = 1
If SystemDateDayInt >= 4 Then
If SystemDateDayInt <= 8 Then
Var PepsiSecondCup30DiscountEnable = 1
EndIf
EndIf
If SystemDateDayInt >= 11 Then
If SystemDateDayInt <= 15 Then
Var PepsiSecondCup30DiscountEnable = 1
EndIf
EndIf
EndIf
EndIf
EndIf
If BoxID = 173149 Then
Var ProPeachEnable = 0
Var ProBadValentineEnable = 1
Var ProBadValentineEnable = 0
Var PepsiSecondCup30Enable = 1
Var PepsiSecondCup30DiscountEnable = 1
Var NewFlowPaymentCode = 1
EndIf
If BoxID = 200435 Then
Var ProPeachEnable = 1
Var ProBadValentineEnable = 0
Var PepsiSecondCup30Enable = 1
Var PepsiSecondCup30DiscountEnable = 1
Var NewFlowPaymentCode = 1
EndIf
@ -145,7 +174,9 @@ If BoxID = 201316 Then
EndIf
If BoxID = 105005 Then
Var ProBadValentineEnable = 1
Var ProBadValentineEnable = 0
Var PepsiSecondCup30Enable = 1
Var PepsiSecondCup30DiscountEnable = 1
Var NewFlowPaymentCode = 1
EndIf

View file

@ -114,6 +114,11 @@
else:
from_bad_valentine = False
if current_file_name == "page_catalog_group_pro_pepsi_second_cup_30.skt":
from_pepsi_second_cup_30 = True
else:
from_pepsi_second_cup_30 = False
#print ("######################################################################################################")
idx_of_eng = 2
out_xml('<FrameScroll> \r\n')
@ -395,6 +400,9 @@
if from_bad_valentine:
out_xml( '\t\tVar FromBadValentinePro = 1 \r\n')
if from_pepsi_second_cup_30:
out_xml( '\t\tVar FromPepsiSecondCup30 = 1 \r\n')
out_xml( '\t\t\r\n')
out_xml( '\t\t\r\n')
@ -916,6 +924,9 @@
if from_bad_valentine:
out_xml( '\t\tVar FromBadValentinePro = 1 \r\n')
if from_pepsi_second_cup_30:
out_xml( '\t\tVar FromPepsiSecondCup30 = 1 \r\n')
out_xml( '\t\t\r\n')
out_xml( '\t\t\r\n')
if "inter" in param:

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.py
?>
Var Timeout = 0
Var FromPepsiSecondCup30 = 0
<?hurr
#include=menu_catalog_new_menu.py
?>
</EventOpen>
<?hurr
#include=menu_catalog_new.py
?>
<?hurr
#include=menu_new_layout_gen_v2.py
?>
<?hurr
#include=menu_new_layout_gen.py
?>
</Popup>

File diff suppressed because it is too large Load diff

View file

@ -682,10 +682,38 @@
If GetDrink5Bath = 1 Then
Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
If PepsiSecondCup30Enable = 1 Then
If PepsiSecondCup30DiscountEnable = 1 Then
If FromPepsiSecondCup30 = 1 Then
If Seeker.VendingCode = "PMX10" Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else
Open "ROOT/taobin_project/xml/event/pepsi_second_cup_30/page_got_discount_code_pepsi.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
If PepsiSecondCup30Enable = 1 Then
If PepsiSecondCup30DiscountEnable = 1 Then
If FromPepsiSecondCup30 = 1 Then
If Seeker.VendingCode = "PMX10" Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else
Open "ROOT/taobin_project/xml/event/pepsi_second_cup_30/page_got_discount_code_pepsi.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
EndIf
@ -832,10 +860,38 @@
If GetDrink5Bath = 1 Then
Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
If PepsiSecondCup30Enable = 1 Then
If PepsiSecondCup30DiscountEnable = 1 Then
If FromPepsiSecondCup30 = 1 Then
If Seeker.VendingCode = "PMX10" Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else
Open "ROOT/taobin_project/xml/event/pepsi_second_cup_30/page_got_discount_code_pepsi.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
If PepsiSecondCup30Enable = 1 Then
If PepsiSecondCup30DiscountEnable = 1 Then
If FromPepsiSecondCup30 = 1 Then
If Seeker.VendingCode = "PMX10" Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else
Open "ROOT/taobin_project/xml/event/pepsi_second_cup_30/page_got_discount_code_pepsi.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
</EventClick>

View file

@ -36,7 +36,21 @@
EndIf
Else
If Timeout > 5 Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
If PepsiSecondCup30Enable = 1 Then
If PepsiSecondCup30DiscountEnable = 1 Then
If FromPepsiSecondCup30 = 1 Then
If Seeker.VendingCode = "PMX10" Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else
Open "ROOT/taobin_project/xml/event/pepsi_second_cup_30/page_got_discount_code_pepsi.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
EndIf
@ -151,7 +165,21 @@
If FromCheckMemberPoint = 1 Then
Open "ROOT/taobin_project/xml/page_check_member2.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
If PepsiSecondCup30Enable = 1 Then
If PepsiSecondCup30DiscountEnable = 1 Then
If FromPepsiSecondCup30 = 1 Then
If Seeker.VendingCode = "PMX10" Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else
Open "ROOT/taobin_project/xml/event/pepsi_second_cup_30/page_got_discount_code_pepsi.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
</EventClick>
</Button>
@ -170,7 +198,21 @@
If FromCheckMemberPoint = 1 Then
Open "ROOT/taobin_project/xml/page_check_member2.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
If PepsiSecondCup30Enable = 1 Then
If PepsiSecondCup30DiscountEnable = 1 Then
If FromPepsiSecondCup30 = 1 Then
If Seeker.VendingCode = "PMX10" Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else
Open "ROOT/taobin_project/xml/event/pepsi_second_cup_30/page_got_discount_code_pepsi.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
</EventClick>

View file

@ -52,7 +52,21 @@
If FromCheckMemberPoint = 1 Then
Open "ROOT/taobin_project/xml/page_check_member2.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
If PepsiSecondCup30Enable = 1 Then
If PepsiSecondCup30DiscountEnable = 1 Then
If FromPepsiSecondCup30 = 1 Then
If Seeker.VendingCode = "PMX10" Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else
Open "ROOT/taobin_project/xml/event/pepsi_second_cup_30/page_got_discount_code_pepsi.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
EndIf
EndIf
@ -148,7 +162,21 @@
If FromCheckMemberPoint = 1 Then
Open "ROOT/taobin_project/xml/page_check_member2.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
If PepsiSecondCup30Enable = 1 Then
If PepsiSecondCup30DiscountEnable = 1 Then
If FromPepsiSecondCup30 = 1 Then
If Seeker.VendingCode = "PMX10" Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else
Open "ROOT/taobin_project/xml/event/pepsi_second_cup_30/page_got_discount_code_pepsi.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
EndIf
</EventClick>

View file

@ -244,7 +244,7 @@
Else
SAVELOG "Cash only IntVendingCampaign"
Var PayState2 = "Disable"
Var PayState4 = "Disable"
Var PayState4 = "Enable"
Var PayState5 = "Enable"
Var PayState6 = "Disable"

View file

@ -91,7 +91,7 @@
Var PayState1 = "PressForever"
Var PayState2 = "Enable"
Var QRChannel = 0
Var Seeker.CodeChannel = 0
;Var Seeker.CodeChannel = 0
If CART_COUNT >= 1 Then
Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
Else
@ -533,7 +533,7 @@
Var PayState1 = "PressForever"
Var PayState2 = "Enable"
Var QRChannel = 0
Var Seeker.CodeChannel = 0
;Var Seeker.CodeChannel = 0
If CART_COUNT >= 1 Then
Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
Else

View file

@ -116,7 +116,7 @@
Var PayState1 = "PressForever"
Var PayState2 = "Enable"
Var QRChannel = 0
Var Seeker.CodeChannel = 0
;Var Seeker.CodeChannel = 0
If CART_COUNT >= 1 Then
Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
Else

View file

@ -50,7 +50,7 @@
Var PayState1 = "PressForever"
Var PayState2 = "Enable"
Var QRChannel = 0
Var Seeker.CodeChannel = 0
;Var Seeker.CodeChannel = 0
If CART_COUNT >= 1 Then
Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
Else
@ -171,7 +171,7 @@
Var PayState1 = "PressForever"
Var PayState2 = "Enable"
Var QRChannel = 0
Var Seeker.CodeChannel = 0
;Var Seeker.CodeChannel = 0
SAVELOG "payment_credit3-p121."
If CART_COUNT >= 1 Then
Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"

View file

@ -47,7 +47,7 @@
Var PayState1 = "PressForever"
Var PayState2 = "Enable"
Var QRChannel = 0
Var Seeker.CodeChannel = 0
;Var Seeker.CodeChannel = 0
If CART_COUNT >= 1 Then
Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
Else
@ -170,7 +170,7 @@
Var PayState1 = "PressForever"
Var PayState2 = "Enable"
Var QRChannel = 0
Var Seeker.CodeChannel = 0
;Var Seeker.CodeChannel = 0
SAVELOG "payment_credit3-p121."
If CART_COUNT >= 1 Then
Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"

View file

@ -126,7 +126,7 @@
Var PayState1 = "PressForever"
Var PayState2 = "Enable"
Var QRChannel = 0
Var Seeker.CodeChannel = 0
;Var Seeker.CodeChannel = 0
If CART_COUNT >= 1 Then
Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
Else

View file

@ -15,7 +15,7 @@
Var Timeout = 0
Var GetPayInfoFlag = 0
Var Seeker.CodeChannel = 0
;Var Seeker.CodeChannel = 0
;Var VendingQRCode = "ERROR"
;VendingQR ON
@ -121,7 +121,7 @@
Var goBackBtnState = "Enable"
Var text_show_error = DirImage + "/text_show_error.png"
Var GetPayInfoFlag = 0
Var Seeker.CodeChannel = 0
;Var Seeker.CodeChannel = 0
EndIf
EndIf
@ -161,7 +161,7 @@
EndIf
Var GetPayInfoFlag = 0
Var Seeker.CodeChannel = 0
;Var Seeker.CodeChannel = 0
Var Tel_Confirm_State = "Disable"
Refresh
EndIf

View file

@ -54,7 +54,7 @@
Var PayState1 = "PressForever"
Var PayState2 = "Enable"
Var QRChannel = 0
Var Seeker.CodeChannel = 0
;Var Seeker.CodeChannel = 0
If CART_COUNT >= 1 Then
Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
Else
@ -70,7 +70,7 @@
Var PayState1 = "PressForever"
Var PayState2 = "Enable"
Var QRChannel = 0
Var Seeker.CodeChannel = 0
;Var Seeker.CodeChannel = 0
If CART_COUNT >= 1 Then
Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
Else

View file

@ -143,7 +143,7 @@
Var PayState1 = "PressForever"
Var PayState2 = "Enable"
Var QRChannel = 0
Var Seeker.CodeChannel = 0
;Var Seeker.CodeChannel = 0
If CART_COUNT >= 1 Then
Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
Else
@ -208,7 +208,7 @@
Var PayState1 = "PressForever"
Var PayState2 = "Enable"
Var QRChannel = 0
Var Seeker.CodeChannel = 0
;Var Seeker.CodeChannel = 0
Var Seeker.TNumberTaobinCredit = TelephoneNumber
Var Seeker.CoffeePinNumber = PinNumber
@ -261,7 +261,7 @@
Var PayState1 = "PressForever"
Var PayState2 = "Enable"
Var QRChannel = 0
Var Seeker.CodeChannel = 0
;Var Seeker.CodeChannel = 0
If CART_COUNT >= 1 Then
Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
Else
@ -311,7 +311,7 @@
Var PayState1 = "PressForever"
Var PayState2 = "Enable"
Var QRChannel = 0
Var Seeker.CodeChannel = 0
;Var Seeker.CodeChannel = 0
SAVELOG "payment_credit3-p121."
If CART_COUNT >= 1 Then
Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"