THAI: Add pro Pepsi second cup 30 & change pepsi logo in menu

image/event/image_template3

@@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/pro_rerun.png
-normal_thai=ROOT/taobin_project/image/event/pro_rerun.png
-press_eng=ROOT/taobin_project/image/event/pro_rerun.png
-press_thai=ROOT/taobin_project/image/event/pro_rerun.png
-disable_eng=ROOT/taobin_project/image/event/pro_rerun.png
-disable_thai=ROOT/taobin_project/image/event/pro_rerun.png
+normal_eng=ROOT/taobin_project/image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30.png
+normal_thai=ROOT/taobin_project/image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30.png
+press_eng=ROOT/taobin_project/image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30.png
+press_thai=ROOT/taobin_project/image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30.png
+disable_eng=ROOT/taobin_project/image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30.png
+disable_thai=ROOT/taobin_project/image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30.png

xml/event/out_put_file3.txt

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

xml/event/pepsi_second_cup_30/page_got_discount_code_pepsi.xml

@@ -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>

xml/event/promotion_template3.inc

@@ -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>

xml/event/script_common_for_open_promotion_xml.ev

@@ -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

xml/event/tricker.ev

@@ -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
 

xml/menu_new_layout_gen.py

@@ -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:

xml/page_catalog_group_pro_pepsi_second_cup_30.skt

@@ -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>