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

inter/mys/image/event/image_template4

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

inter/mys/xml/event/dummy_layout_promotion.py

@@ -164,3 +164,56 @@ file_xml3_out_content = file_xml3_out_content.replace("\n", "")
 file_xml3 = open(directory_to_process + file_xml3_out_content, 'w')
 file_xml3.write( content_data)
 file_xml3.close()
+
+
+# promotion 4
+file_inc3 = open(directory_to_process + "/event/promotion_template4.inc", 'r')
+file_inc3_content = file_inc3.read()
+file_inc_img = open(directory_to_process + "/../image/event/image_template4", 'r')
+file_inc3_img_content = file_inc_img.read()
+
+# replace key.
+
+sp_key = file_inc3_img_content.split("\n")
+print("sp_key = " + str(len( sp_key)))
+for sp_line in sp_key:
+	sp_line = sp_line.strip()
+	key_val = sp_line.split("=")
+	print("Kenta420:", key_val)
+	if len( key_val) == 2:
+		print("k = " + key_val[0] + " val=" + key_val[1])
+		file_inc3_content = file_inc3_content.replace( "###" + key_val[0], '"' + key_val[1].strip() + '"')
+
+
+file_inc_event_click = open(directory_to_process + "/event/promotion_onclick4.inc", 'r')
+file_inc_event_click_content = file_inc_event_click.read()
+
+file_inc3_content = file_inc3_content.replace("###EventOnClick", file_inc_event_click_content)
+
+
+print(file_inc3_content)
+
+#print( file_inc_content)
+content_data_was_repack = file_content_main.replace(";dummy_layout.inc", file_inc_content)
+content_data = content_data_was_repack.replace(";BigLogoLayout", file_inc3_content)
+
+begin_text = content_data.index(";TAGESP")
+end_text = content_data.index(";TAGESP", begin_text + 7)
+#print("sub text = " + str(begin_text) + " end = " + str(end_text))
+tmp1 = content_data[: begin_text - 7]
+
+tmp3 = content_data[ end_text:-1]
+#print("tmp1=" + tmp1)
+#print("tmp3=" + tmp3)
+
+content_data = tmp1 + tmp3	
+
+file_xml3_out = open(directory_to_process + "/event/out_put_file4.txt", 'r')
+file_xml3_out_content = file_xml3_out.read()
+file_xml3_out_content = file_xml3_out_content.strip()
+file_xml3_out_content = file_xml3_out_content.replace("\r", "")
+file_xml3_out_content = file_xml3_out_content.replace("\n", "")
+
+file_xml3 = open(directory_to_process + file_xml3_out_content, 'w')
+file_xml3.write( content_data)
+file_xml3.close()

inter/mys/xml/event/out_put_file4.txt

@@ -0,0 +1 @@
+/event/promotion_fruit_raya.xml

inter/mys/xml/event/promotion_onclick4.inc

@@ -0,0 +1 @@
+    Open "ROOT/taobin_project/inter/mys/xml/page_catalog_fruity_raya.xml"

inter/mys/xml/event/promotion_template4.inc

@@ -0,0 +1,55 @@
+;
+;
+;
+;
+; Big button for mys event
+;
+;
+;
+
+<Button>
+    <X> 42 </X>
+    <Y> 520 </Y>
+    <State> BigButtonEnable </State>
+    <Filename> 
+     eval( 
+        If show_eng = "true" Then 
+            Var return = ###normal_eng
+        Else
+            Var return = ###normal_thai
+        EndIf
+        )
+     </Filename>
+    <FilenamePress> 
+     eval( 
+        If show_eng = "true" Then 
+            Var return = ###press_eng    
+        Else
+            Var return = ###press_thai
+        EndIf
+        )
+     </FilenamePress>
+    <FilenameDisable> 
+     eval( 
+        If show_eng = "true" Then 
+            Var return = ###disable_eng
+        Else
+            Var return = ###disable_thai
+        EndIf
+        )
+     </FilenameDisable>
+<EventOnClick> 
+
+        ###EventOnClick
+        
+</EventOnClick>
+</Button>
+
+<EventUnitTest1>
+    Var BigButtonEnable = "Enable"  
+    Refresh
+</EventUnitTest1>
+<EventUnitTest2>
+    Var BigButtonEnable = "Invisible"
+    Refresh
+</EventUnitTest2>

inter/mys/xml/event/tricker.ev

@@ -8,15 +8,17 @@
 
 Var Propepsi99Enable = 0
 
+; FruityRaya Promo
+Var FruityRayaEnable = 0
+Var FromFruityRaya = 0
 
-If SystemDateMonthInt = 8 Then
+If SystemDateMonthInt = 3 Then
-	If SystemDateDayInt > 29 Then
+	If SystemDateDayInt >= 25 Then
-		Var Propepsi99Enable = 1
+		Var FruityRayaEnable = 1
 	EndIf
 EndIf
-If SystemDateMonthInt = 9 Then
+
-	Var Propepsi99Enable = 1
+If SystemDateMonthInt = 4 Then
+	Var FruityRayaEnable = 1
 EndIf
 
-DEBUGVAR Propepsi99Enable
-DEBUGVAR DisplayFormatFull

inter/mys/xml/page_catalog_group_fruity_raya.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.xml
+    ?>
+    
+    Var FromFruityRaya = 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>

xml/event/lipit/page_collect_point_pro_lipit_3.xml

@@ -17,6 +17,7 @@
 
 	Var PointMaskState = "Invisible"
 	Var showRandomBtnState = "Invisible"
+	Var showCloseBtnState = "Enable"
 
     Var CoffeePointStr = CoffeePoint
 
@@ -191,6 +192,7 @@
 
 	If PointCount = 10 Then
 		Var showRandomBtnState = "Enable"
+		Var showCloseBtnState = "Invisible"
 	EndIf
 
 	Var CurrentPointSlot = newPointIndex + 1
@@ -578,6 +580,25 @@
 </Button>
 
 
+<Button>
+<X> 610 </X>
+<Y> 1660 </Y>
+<State> showCloseBtnState </State>
+<Filename> Var( DirImage + "/bn_close.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bp_close.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	; goto lid straw
+
+	Var CurrentPointCheck = "check"
+	Var val3 = "X"
+	AddData 37 TelephoneNumber CurrentPointSlot CurrentPointCheck val3
+	Var UpdatePoint = 1
+
+</EventClick>
+</Button>
+
 
 ;
 <Image>

xml/page_brewing3.xml

@@ -243,6 +243,24 @@
 		EndIf
 	EndIf
 
+	If FreeEnergyDrink = 1 Then
+		If FromPowerUpPro = 1 Then
+				; AddData
+
+			; +1 in quota in this id card
+			Var Param1 = ""
+			Var Param2 = ""
+			Var Param3 = ""
+
+			AddData 44 TelephoneNumber IDNum Param1 Param2
+			; clear id
+			Var IDNum = ""
+			Var FromPowerUpPro = 0
+			Var AddData = 0
+			Var DisableFromPowerup = "true"
+		EndIf
+	EndIf
+
 	If GetFreeFromError = 1 Then
 		;Var GetFreeFromError = 0
 		Var TelephoneNumberProblem = TelephoneNumberGOTFree
@@ -314,6 +332,11 @@
 		Var SelectMenuBetweenBrewEnable1 = "Invisible"
 	EndIf
 
+	If DisableFromPowerup = "true" Then
+		Var SelectMenuBetweenBrewEnable1 = "Invisible"
+		Var SelectMenuBetweenBrewEnable1Text = "Invisible"
+	EndIf
+
 	If SelectMenuBetweenBrewEnable1 = "Enable" Then 
 		Var EnableGetMoreStrawFileName = "Enable"
 		Var SelectMenuBetweenBrewEnable1Blink = "Enable"
@@ -1407,6 +1430,11 @@
 		Var SelectMenuBetweenBrewEnable1Text = "Invisible"
 	EndIf
 
+	If DisableFromPowerup = "true" Then
+		Var SelectMenuBetweenBrewEnable1 = "Invisible"
+		Var SelectMenuBetweenBrewEnable1Text = "Invisible"
+	EndIf
+
 	If SelectMenuBetweenBrewEnable1 = "Enable" Then 
 		If SelectMenuBetweenBrewEnable1Blink = "Enable" Then 
 			Var SelectMenuBetweenBrewEnable1Blink = "Invisible"

xml/page_payment_cash-MYR.xml

@@ -6,6 +6,10 @@
 <Volume> SoundVolume </Volume>
 <Sound> PlaySoundLag </Sound>
 <EventOpen>
+
+	; force 
+	; TODO: test
+	CoinVending OFF
 	
 
 	Var cash_disable = "0"

xml/page_thankyou.xml

@@ -277,23 +277,6 @@
 		SAVELOG BrewTime
 		Var ShowCountDownBrewing = CountDownBrewing
 
-		If FreeEnergyDrink = 1 Then
-			If FromPowerUpPro = 1 Then
-					; AddData
-
-				; +1 in quota in this id card
-				Var Param1 = ""
-				Var Param2 = ""
-				Var Param3 = ""
-				Var TelephoneNumber = "0899999999"
-
-				AddData 44 TelephoneNumber IDNum Param1 Param2
-				; clear id
-				Var IDNum = ""
-				Var FromPowerUpPro = 0
-			EndIf
-		EndIf
-
 
 		If RoadShow = "true" Then