Merge branch 'master' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project

image/event/image_template2

@@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/pro_tamatian_en.png
+normal_eng=ROOT/taobin_project/image/event/pro_15THB_en.png
-normal_thai=ROOT/taobin_project/image/event/pro_tamatian_th.png
+normal_thai=ROOT/taobin_project/image/event/pro_15THB_th.png
-press_eng=ROOT/taobin_project/image/event/pro_tamatian_en.png
+press_eng=ROOT/taobin_project/image/event/pro_15THB_en.png
-press_thai=ROOT/taobin_project/image/event/pro_tamatian_th.png
+press_thai=ROOT/taobin_project/image/event/pro_15THB_th.png
-disable_eng=ROOT/taobin_project/image/event/pro_tamatian_en.png
+disable_eng=ROOT/taobin_project/image/event/pro_15THB_en.png
-disable_thai=ROOT/taobin_project/image/event/pro_tamatian_th.png
+disable_thai=ROOT/taobin_project/image/event/pro_15THB_th.png

menu/new-layout.tsv

@@ -417,8 +417,18 @@ Name=pepween,file=page_catalog_group_pro_pepween.skt
 		อาถรรพ์คืนวันพุธ	Midnight's Enigma	เป๊ปซี่ น้ำเชื่อมบ๊วย มะนาว  และโซดา	Pepsi Plum Lime and Soda	-	12-99-05-0064	-	bn_midnight_enigma.png	-	-	-
 		ล่า ท้า หลอน	Unbelievers' Demise	เป๊ปซี่ ชามะลิ น้ำเชื่อมเมล่อน  และโซดา	Pepsi Jasmine Melon and Soda	-	12-99-05-0065	-	bn_unbelievers_demise.png	-	-	-
 		ดิน 7 ป่าช้า	7 Haunted Woods	เป๊ปซี่ นม และโอริโอ้	Pepsi, Milk, Oreo and Ice	-	-	12-99-03-0066	bn_haunted_woods.png	-	-	-
-		น้ำตาหมาดำ	Midnight Hound's Sorrow	เป๊ปซี่ โกโก้ นม และโอริโอ้	Pepsi, Cocoa, Milk, Oreo and Ice			12-99-03-0067
+		น้ำตาหมาดำ	Midnight Hound's Sorrow	เป๊ปซี่ โกโก้ นม และโอริโอ้	Pepsi, Cocoa, Milk, Oreo and Ice	-	-	12-99-03-0067	bn_Midnight_Hound_Sorrow.png	-	-	-
 
+Name=Pro15THB,file=page_catalog_group_pro_15THB.skt
+		น้ำมะนาว	LIMENADE	น้ำมะนาว น้ำตาล	Limenade, Sugar	-	12-05-02-0001	-	15THB/bn_iced_lime.png	-	-	-
+		น้ำแดง	SALAK DRINK	น้ำแดงกลิ่นสละ \n	Salak Syrup & Ice	-	12-05-02-0002	-	15THB/bn_sala.png	-	-	-
+		เป็ปซี่น้ำแข็ง	PEPSI	เป๊ปซี่	Pepsi, Ice	-	12-05-02-0007	-	15THB/bn_iced_pepsi.png	-	-	-
+		เต่าทรงพลัง	TAO POWER DRINK	เครื่องดื่มเต่าทรงพลัง  \n(มีคาเฟอีน)	Medicine drink & Ice	-	12-05-02-0034	-	15THB/bn_iced_energy_drink.png	-	-	-
+		เต่าทรงพลังโซดา	TAO POWER \nDRINK SODA	เครื่องดื่มเต่าทรงพลัง  โซดา	Medicine drink, Soda	-	12-05-02-0035	-	15THB/bn_iced_energy_drink_soda.png	-	-	-
+		ชาเขียวญี่ปุ่น	MATCHA	ชาเชียว และน้ำ	Matcha & Water	12-02-01-0027	12-02-02-0027	-	15THB/bn_hot_matcha_tea.png	-	-	-
+		ชามะลิ	JASMINE TEA	ชามะลิ น้ำ	Jasmine Tea ,Water	12-02-01-0045	12-02-02-0045	-	15THB/bn_hot_jasmine_tea.png	-	-	-
+		ชามะลิมะนาว	JASMINE LIME	ชามะลิ น้ำมะนาว น้ำ	Jasmine Tea, Limenade, Water	12-02-01-0048	12-02-02-0049	-	15THB/bn_jasmine_lime_tea.png	-	-	-
+		ชาดำ	THAI BLACK TEA	ชาไทย และน้ำ	Thai Tea & Water	12-02-01-0047	12-02-02-0047	-	15THB/bn_hot_black_thai_tea.png	-	-	-
 
 Name=CockTail,file=page_catalog_group_cocktail.skt
 		STX On The Beach	STX On The Beach	Pineapple juice, Limeade, \nSoda, Ice, Malibu	Pineapple juice, Limeade, \nSoda, Ice, Malibu	-	11-99-05-0001	-	bn_Alcohol_ILYSB.png	-	-	-	-	#N/A	-	#N/A	#N/A

xml/event/out_put_file2.txt

@@ -1 +1 @@
-/event/promotion_Tamatian.xml
+/event/promotion_15THB.xml

xml/event/promotion_onclick2.inc

@@ -1 +1 @@
-Open "ROOT/taobin_project/xml/page_catalog_group_pro_melon.xml"
+Open "ROOT/taobin_project/xml/page_catalog_group_pro_15THB.xml"

xml/event/script_common_for_open_promotion_xml.ev

@@ -13,28 +13,41 @@ Else
 	; zone promote
 	If OpenFromPageBoard = 1 Then
 
-		If PepweenEnable = 1 Then
+		If pro15THBEnable = 1 Then
 			Var BigButtonEnable = "Enable"
-			OpenInst 2 "ROOT/taobin_project/xml/event/promotion_pepween.xml"
+			OpenInst 2 "ROOT/taobin_project/xml/event/promotion_15THB.xml"
-		    Var OpenFromPageBoard = 0
+			Var OpenFromPageBoard = 0
 		
 		Else
-			OpenInst 2 "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+			If PepweenEnable = 1 Then
-		    
+				Var BigButtonEnable = "Enable"
+				OpenInst 2 "ROOT/taobin_project/xml/event/promotion_pepween.xml"
+				Var OpenFromPageBoard = 0
+			
+			Else
+				OpenInst 2 "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+				
+			EndIf
 		EndIf
 	Else
-		If PepweenEnable = 1 Then
+		If pro15THBEnable = 1 Then
+
 			; Temporary debug
 			Var BigButtonEnable = "Enable"
-			Open "ROOT/taobin_project/xml/event/promotion_pepween.xml"
+			Open "ROOT/taobin_project/xml/event/promotion_15THB.xml"
 
 		Else
-
+			If PepweenEnable = 1 Then
-			Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+			Var BigButtonEnable = "Enable"
+			Open "ROOT/taobin_project/xml/event/promotion_pepween.xml"
+		
+			Else
+				Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+			EndIf
 
 		EndIf
 
-		
+			
 	EndIf
 EndIf
 Var OpenFromPageBoard = 0

xml/event/tricker.ev

@@ -45,6 +45,10 @@ Var MayDayRunEnable = 0
 Var MilkChoiceVeganEnable = 0
 
 
+; Enable pro 15 THB, November 1 - 30
+Var pro15THBEnable = 0
+Var From15THBPro = 0
+
 
 If SystemDateMonthInt = 10 Then
 
@@ -63,7 +67,7 @@ EndIf
 
 If SystemDateMonthInt = 11 Then
 	Var PepweenEnable = 0
-
+	Var pro15THBEnable = 1
 	If SystemDateDayInt = 1 Then
 		If SystemTimeHourInt < 5 Then
 			Var PepweenEnable = 1
@@ -78,6 +82,7 @@ EndIf
 If BoxID = 173149 Then
 	Var PepweenEnable = 1
 	Var MilkChoiceVeganEnable = 1
+	Var pro15THBEnable = 1
 EndIf
 
 If BoxID = 176757 Then

xml/menu_new_layout_gen.py

@@ -6,6 +6,11 @@
     else:
       touch_less_gen = False
 
+    if current_file_name == "page_catalog_group_pro_15THB.skt":
+      fixed_price = 15
+    else:
+      fixed_price = 0
+
     print ("######################################################################################################")
     idx_of_eng = 2
     out_xml('<FrameScroll> \r\n')
@@ -248,6 +253,9 @@
         out_xml( '\t\tDEBUGVAR PD_STAGE_2\r\n')
         out_xml( '\t\tDEBUGVAR PD_STAGE_3\r\n')
         out_xml( '\t\tVar SelectDrinkType = 0\r\n')
+        
+        if fixed_price > 0:
+          out_xml( '\t\tVar From15THBPro = 1 \r\n')
 
         
         out_xml( '\t\t\r\n')
@@ -369,9 +377,15 @@
             if "free" in param:
               out_xml( '\t<Value> "Free" </Value>\r\n')
             else:
-              out_xml( '\t<Value> StringFmt(  $' + spl[4] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
+              if fixed_price > 0:
+                out_xml( '\t<Value> StringFmt(  15 , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
+              else:
+                out_xml( '\t<Value> StringFmt(  $' + spl[4] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
           else:
-            out_xml( '\t<Value> Var( "฿" + $' + spl[4] + '.Price ) </Value>\r\n')
+            if fixed_price > 0:
+              out_xml( '\t<Value> "฿15" </Value>\r\n')
+            else:
+              out_xml( '\t<Value> Var( "฿" + $' + spl[4] + '.Price ) </Value>\r\n')
           out_xml( '\t</Text>\r\n')
           
           ice_tab_ice_show = True
@@ -414,9 +428,15 @@
             if "free" in param:
               out_xml( '\t<Value> "Free" </Value>\r\n')
             else:
-              out_xml( '\t<Value> StringFmt( $' + spl[5] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
+              if fixed_price > 0:
+                out_xml( '\t<Value> StringFmt(  15 , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
+              else:
+                out_xml( '\t<Value> StringFmt( $' + spl[5] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
           else:
-            out_xml( '\t<Value> Var( "฿" + $' + spl[5] + '.Price ) </Value>\r\n')
+            if fixed_price > 0:
+              out_xml( '\t<Value> "฿15" </Value>\r\n')
+            else:
+              out_xml( '\t<Value> Var( "฿" + $' + spl[5] + '.Price ) </Value>\r\n')
           out_xml( '\t</Text>\r\n')
       
           ice_tab_blend_show = True
@@ -461,9 +481,15 @@
             if "free" in param:
               out_xml( '\t<Value> "Free" </Value>\r\n')
             else:
-              out_xml( '\t<Value> StringFmt(  $' + spl[6] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
+              if fixed_price > 0:
+                out_xml( '\t<Value> StringFmt(  15 , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
+              else:
+                out_xml( '\t<Value> StringFmt(  $' + spl[6] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
           else:
-            out_xml( '\t<Value> Var( "฿" + $' + spl[6] + '.Price ) </Value>\r\n')
+            if fixed_price > 0:
+              out_xml( '\t<Value> "฿15" </Value>\r\n')
+            else:
+              out_xml( '\t<Value> Var( "฿" + $' + spl[6] + '.Price ) </Value>\r\n')
           out_xml( '\t</Text>\r\n')
           
           out_xml( '\t<Image>\r\n')

xml/page_catalog_group_pro_15THB.skt

@@ -0,0 +1,84 @@
+<?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 Menu1Selected = "PressForever"
+
+    Var OreoBigButtonEnable = "Enable"
+    Var From15THBPro = 0
+
+    If $12-01-01-0001.Button = "Invisible" Then
+        Var esp102101001Enable = "Invisible"
+        Var esp122101001Enable = "Enable"
+
+    Else
+        Var esp102101001Enable = "Enable"
+        Var esp122101001Enable = "Invisible"
+
+    EndIf
+    
+    SAVELOG PreviseXMLFileName2
+
+    Var Timeout = 0
+
+    If show_eng = "true" Then 
+    
+        Var text_unavailable = "UNAVAILABLE###size=16"
+    Else
+        Var text_unavailable = "หมด###size=32"
+    
+    EndIf
+
+    <?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
+?>
+
+<Button>
+<X> 780 </X>
+<Y> 500 </Y>
+<State> buttonRemoveCup </State>
+;<Color> "0x00BDFF" </Color>
+<Interval> 500 </Interval>
+<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
+<EventClick> 
+    Machine RemoveCup
+    Machine DoorLidOpen
+    Var buttonRemoveCup = "Invisible"
+</EventClick>
+</Button>
+
+
+
+;BigLogoLayout
+
+</Popup>
+
+

xml/page_payment.xml

@@ -272,6 +272,17 @@
 		EndIf
 	EndIf
 
+	If From15THBPro = 1 Then
+		Var PriceDrink = OriginalPrice
+		Var PriceDiff = OriginalPrice - 15
+		Var Seeker.VendingCode = "FIX15"
+		Var Seeker.IntVendingCampaign = PriceDiff
+		Var Seeker.FreeVendingCampaign = 0
+		Var Seeker.CodeChannel = 1
+		Var Seeker.CodeNumber = IDNum
+		Var Seeker.VendingCampaignRI3 = 15
+	EndIf
+
 	If ChildrenFree = 1 Then
 
 		Var RemainAmountStr = "Free###size=150"

xml/page_topping_select7.xml

@@ -263,6 +263,21 @@
 	DEBUGVAR PriceD2
 	DEBUGVAR PriceD3
 
+	If From15THBPro = 1 Then
+		If PriceD1 > 0 Then
+			Var OriginalPriceD1 = PriceD1
+			Var PriceD1 = 15
+		EndIf
+		If PriceD2 > 0 Then
+			Var OriginalPriceD2 = PriceD2
+			Var PriceD2 = 15
+		EndIf
+		If PriceD3 > 0 Then
+			Var OriginalPriceD3 = PriceD3
+			Var PriceD3 = 15
+		EndIf
+	EndIf
+
 	If hot_button_state = "Disable2" Then
 		Var text_price_d1 = ""
 	Else
@@ -4133,6 +4148,7 @@
 
 	If hot_button_state = "PressForever" Then
 		Var PriceDrinkNoTop = PriceD1
+		Var OriginalPrice = OriginalPriceD1
 		Var UserSelectProductCode = PD_CODE1
 
 		If showShotEnable = "Disable" Then
@@ -4159,6 +4175,7 @@
 	
 	If cold_button_state = "PressForever" Then
 		Var PriceDrinkNoTop = PriceD2
+		Var OriginalPrice = OriginalPriceD2
 		Var UserSelectProductCode = PD_CODE2
 
 		If showShotEnable = "Disable" Then
@@ -4185,6 +4202,7 @@
 	
 	If blend_button_state = "PressForever" Then
 		Var PriceDrinkNoTop = PriceD3
+		Var OriginalPrice = OriginalPriceD3
 		Var UserSelectProductCode = PD_CODE3
 
 		If showShotEnable = "Invisible" Then