THAI: add quota check, fix back button, add energy drink selection

xml/event/powerup_free_1/page_powerup_bridge.xml

@@ -6,70 +6,7 @@
     ;<Background> "0xeae6e1" </Background>
 
     <EventOpen>
-        Var NameDrink = "TAO POWER DRINK"
+		Open "ROOT/taobin_project/xml/event/powerup_free_1/page_powerup_catalog.xml"
-		Var NameDrinkTH = "เต่าทรงพลัง"
-		Var DrinkDescriptionTH = "เครื่องดื่มเต่าทรงพลัง   (มีคาเฟอีน)"
-		Var DrinkDescription = "Medicine drink & Ice"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_energy_drink.png"
-		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $-.Price
-		Var PriceD2 = $12-05-02-0034.Price
-		Var PriceD3 = $12-05-03-0034.Price
-		Var PD_CODE1 = "##-##-##-####"
-		Var PD_CODE2 = "12-05-02-0034"
-		Var PD_CODE3 = "12-05-03-0034"
-		Var PD_STAGE_1 = "Disable2"
-		Var PD_STAGE_2 = $12-05-02-0034.Button
-		Var PD_STAGE_3 = $12-05-03-0034.Button
-		Var OverlayMenuFilter !assigned xmlpro( 12-05-03-0034, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
-		DEBUGVAR OverlayMenuFilter
-		Var SelectCountDrinkType = 0
-		Var DefaultDrinkType = 0
-		If PD_STAGE_1 = "Enable" Then
-			Var SelectCountDrinkType = SelectCountDrinkType + 1
-			Var DefaultDrinkType = 1
-		EndIf
-		If PD_STAGE_2 = "Enable" Then
-			Var SelectCountDrinkType = SelectCountDrinkType + 1
-			Var DefaultDrinkType = 2
-		EndIf
-		If PD_STAGE_3 = "Enable" Then
-			Var SelectCountDrinkType = SelectCountDrinkType + 1
-			Var DefaultDrinkType = 3
-		EndIf
-		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0034"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
-			Topping "Load" "12-05-03-0034"
-			EndIf
-		EndIf
-		Var menu_name_eng_hot = $##-##-##-####.NameE
-		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
-		Var menu_name_thai_hot = $##-##-##-####.Name
-		Var menu_desc_thai_hot = $##-##-##-####.description
-		
-		Var menu_name_eng_cold = $12-05-02-0034.NameE
-		Var menu_desc_eng_cold = $12-05-02-0034.descriptionE
-		Var menu_name_thai_cold = $12-05-02-0034.Name
-		Var menu_desc_thai_cold = $12-05-02-0034.description
-		
-		Var menu_name_eng_blender = $12-05-03-0034.NameE
-		Var menu_desc_eng_blender = $12-05-03-0034.descriptionE
-		Var menu_name_thai_blender = $12-05-03-0034.Name
-		Var menu_desc_thai_blender = $12-05-03-0034.description
-		
-		DEBUGVAR PD_STAGE_1
-		DEBUGVAR PD_STAGE_2
-		DEBUGVAR PD_STAGE_3
-		Var SelectDrinkType = 0
-
-		Var FromPowerUpPro = 1
-		
-		
-		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
     </EventOpen>
 
     ; ads

xml/event/powerup_free_1/page_powerup_identity.xml

@@ -81,6 +81,9 @@
     Var IDNumx = "2640100003053"
 	;AddData Cid TelephoneNumber  IDNumx PointCrm GetScore
 
+    ; Reset 
+    Var IDNum = ""
+
 </EventOpen>
 
 <EventActionOk>
@@ -91,9 +94,8 @@
 
     If StepGetServer = 1 Then
 
-        If Ext1a = "0" Then
+        If Ext1a = "ok" Then
             If LegitAge = "true" Then
-                Var RoadShow = "true"
                 Open "ROOT/taobin_project/xml/page_payment.xml"
             Else
                 Var load_gif_stage = "Invisible"
@@ -101,6 +103,7 @@
             EndIf
             Refresh
         Else
+            ; Error
             Var FullQuotaState = "Enable"
         EndIf
 
@@ -247,12 +250,10 @@
 
                 If AgeNumber >= 18 Then
                     ; TODO: check quota --- AddData; Wait for new add num
-
                     Var LegitAge = "true"
-
+                    DEBUGVAR IDNum
-                    ; Then enable RoadShow
+                    GETACCEXT IDNum 33 
-                    ;Var RoadShow = "true"
+                    Var StepGetServer = 1
-                    ;Open "ROOT/taobin_project/xml/page_payment.xml"
                 EndIf
 
 
@@ -280,6 +281,8 @@
     DEBUGVAR IDCardState
     DEBUGVAR load_gif_stage
     DEBUGVAR img_popup16
+    DEBUGVAR IDNum
+    DEBUGVAR LegitAge
 
     If IDBirthdate = "" Then
         Var CountDownDelayReadCardID = CountDownDelayReadCardID - 1
@@ -384,7 +387,6 @@ eval(
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-    Var RoadShow = ""
 	Open "ROOT/taobin_project/xml/page_catalog2.xml" 
 </EventClick>
 </Button>
@@ -399,7 +401,6 @@ eval(
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-    Var RoadShow = ""
 	Open "ROOT/taobin_project/xml/page_catalog2.xml" 
 </EventClick>
 </Button>

xml/event/script_common_for_open_promotion_xml.ev

@@ -21,6 +21,20 @@ If CocktailShow = "true" Then
 Else
 	; check profile to enable free energy drink promotion
 	STRCONTAIN "ProEnergyDrinkFreePerCardID" XMLProfile EnableFreeEnergyDrink
+
+	; Debug
+	If BoxID = 177746 Then
+		Var EnableFreeEnergyDrink = "true"
+		Var PepsiSecondCup30Enable = 0
+	EndIf
+
+
+	If EnableFreeEnergyDrink = "true" Then
+		Var FreeEnergyDrink = 1
+	EndIf
+
+	DEBUGVAR FreeEnergyDrink
+
 	;Var EnableFreeEnergyDrink = "true"
 	DEBUGVAR EnableFreeEnergyDrink
 	; zone promote

xml/page_payment.xml

@@ -336,6 +336,23 @@
 		Var Seeker.CampaignPPrice = PriceDrink - PriceDiff
 	EndIf
 
+	If FromPowerUpPro = 1 Then
+
+		If FreeEnergyDrink = 1 Then
+			If SelectDrink = "" Then
+				Var PriceDiff = PriceDrink - 1
+				Var Seeker.VendingCode = "FIX1"
+				Var Seeker.IntVendingCampaign = PriceDiff
+				Var Seeker.FreeVendingCampaign = 0
+				Var Seeker.CodeChannel = 1
+				Var Seeker.CodeNumber = IDNum
+				Var Seeker.VendingCampaignRI3 = PriceDiff
+				Var Seeker.CampaignPPrice = 1
+			EndIf
+		EndIf
+
+	EndIf
+
 	If ChildrenFree = 1 Then
 
 		Var RemainAmountStr = "Free###size=150"

xml/page_thankyou.xml

@@ -280,12 +280,12 @@
 		If RoadShow = "true" Then
 
 			If FreeEnergyDrink = 1 Then
-				; reset
-				Var RoadShow = ""
 				; AddData
 
 				; +1 in quota in this id card
-				AddData <ID> <user-id> <menu?>
+				AddData 44 IDNum
+				; clear id
+				Var IDNum = ""
 			EndIf
 			Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 		Else
@@ -401,13 +401,6 @@
 					EndIf
 
 					If Seeker.FreeVendingCampaign = 1 Then
-						If Seeker.CollectPointPromotion = 1 Then
-							Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
-						Else
-							If Seeker.CollectPointMain = 1 Then
-								Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
-							EndIf
-						EndIf
 						Open "ROOT/taobin_project/xml/page_lid_straw.xml"  
 					Else
 						If 	CART_INDEX >= 2  Then   
@@ -426,14 +419,6 @@
 							;	Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
 							;EndIf
 
-							If Seeker.CollectPointPromotion = 1 Then
-								Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
-							Else
-								If Seeker.CollectPointMain = 1 Then
-									Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
-								EndIf
-							EndIf
-
 							Open "ROOT/taobin_project/xml/page_lid_straw.xml"  
 						Else
 							If 	CART_INDEX >= 2  Then   

xml/page_topping_select8.xml

@@ -763,6 +763,13 @@
 	
 		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog2.xml"
 	EndIf
+
+	If FreeEnergyDrink = 1 Then
+		OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+	
+		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog2.xml"
+
+	EndIf
 	
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"