THAI: Added Happy Trios, Free Jemila topping, Free Sugar zero cal

image/event/image_template4

@@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/robinson_beauty/robinson_beauty_en.png
+normal_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios.png
-normal_thai=ROOT/taobin_project/image/event/robinson_beauty/robinson_beauty_th.png
+normal_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios.png
-press_eng=ROOT/taobin_project/image/event/robinson_beauty/robinson_beauty_en.png
+press_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios.png
-press_thai=ROOT/taobin_project/image/event/robinson_beauty/robinson_beauty_th.png
+press_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios.png
-disable_eng=ROOT/taobin_project/image/event/robinson_beauty/robinson_beauty_en.png
+disable_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios.png
-disable_thai=ROOT/taobin_project/image/event/robinson_beauty/robinson_beauty_th.png
+disable_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios.png

xml/event/happy_trios/page_sending_discount_code.xml

@@ -0,0 +1,153 @@
+<Popup>
+    <Width> 1080 </Width>
+    <Height> 1920 </Height>
+    <Volume> SoundVolume </Volume>
+
+    <EventOpen>
+        Var Timeout = 0
+        Var ImageDir = "ROOT/taobin_project/image/event/happy_trios/"
+
+        If show_eng = "true" Then
+            Var Image = ImageDir + "send_code_pending_en.png"
+        Else
+            Var Image = ImageDir + "send_code_pending_th.png"
+        EndIf
+
+        Var CodeIsSended = 0
+
+        DEBUGVAR Image
+        DEBUGVAR TelephoneNumber
+
+        Var Param1 = "152"
+        Var Param2 = ""
+        Var Param3 = ""
+        AddData 43 TelephoneNumber Param1 Param2 Param3
+    </EventOpen>
+
+
+    <Timeout> 1000 </Timeout>
+    <EventTimeout>
+
+        Var Timeout = Timeout + 1
+
+        If Timeout > 5 Then
+            If CodeIsSended = 1 Then
+                If CoffeePoint >= 28 Then
+                    If GetDrink5Bath = 1 Then
+                        Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml"
+                    Else
+                        If Seeker.IsLineMember = 0 Then
+                            If LuckyDrawCampaign = 1 Then
+                                Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+                            Else
+                                Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+                            EndIf
+                        Else
+                            Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+                        EndIf
+                    EndIf
+                Else
+                    If Seeker.IsLineMember = 0 Then
+                        If LuckyDrawCampaign = 1 Then
+                            Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+                        Else
+                            Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+                        EndIf
+                    Else
+                        Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+                    EndIf
+                EndIf
+            Else
+
+                If show_eng = "true" Then
+                    Var Image = ImageDir + "send_code_fail_en.png"
+                Else
+                    Var Image = ImageDir + "send_code_fail_th.png"
+                EndIf
+
+                Var Timeout = 0
+
+            EndIf
+        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
+            If show_eng = "true" Then
+                Var Image = ImageDir + "send_code_complate_en.png"
+            Else
+                Var Image = ImageDir + "send_code_complate_th.png"
+            EndIf
+
+            Var CodeIsSended = 1
+        Else
+            Var Seeker.TaobinErrorNetwork = 1
+            Var Seeker.PointTaobinStr = ParamCP
+            Var TelephoneNumber = TelephoneNumberX
+            Var Seeker.TNumberTaobinMember= TelephoneNumber
+
+            If show_eng = "true" Then
+                Var Image = ImageDir + "send_code_fail_en.png"
+            Else
+                Var Image = ImageDir + "send_code_fail_th.png"
+            EndIf
+
+        EndIf
+
+        Var Timeout = 0
+
+        Refresh
+    </EventActionOk>
+
+    <EventActionError>
+        Var Seeker.TaobinErrorNetwork = 1
+
+		Var Seeker.PointTaobinStr = ParamCP
+		Var TelephoneNumber = TelephoneNumberX
+		Var Seeker.TNumberTaobinMember= TelephoneNumber
+
+		If show_eng = "true" Then
+            Var Image = ImageDir + "send_code_fail_en.png"
+        Else
+            Var Image = ImageDir + "send_code_fail_th.png"
+        EndIf
+
+        Var Timeout = 0
+
+        Refresh
+    </EventActionError>
+
+
+;include="ROOT/taobin_project/inc/video.inc"
+
+    <Image>
+    <X> 0 </X>
+    <Y> 380 </Y>
+    <Filename> "ROOT/taobin_project/image/collectiing/alpha.png" </Filename>
+    </Image>
+
+    <Image>
+    <X> 158 </X>
+    <Y> 607 </Y>
+    <Filename> Image </Filename>
+    </Image>
+
+</Popup>

xml/event/ignore_multi_promotion_config_happy_trios_weekday_discount_oreo11.json

@@ -0,0 +1,41 @@
+[
+  {
+    "name": "happy_trios",
+    "template": "/event/promotion_template.inc",
+    "config": {
+      "normal_eng": "ROOT/taobin_project/image/event/happy_trios/happy_trios.png",
+      "normal_thai": "ROOT/taobin_project/image/event/happy_trios/happy_trios.png",
+      "press_eng": "ROOT/taobin_project/image/event/happy_trios/happy_trios.png",
+      "press_thai": "ROOT/taobin_project/image/event/happy_trios/happy_trios.png",
+      "disable_eng": "ROOT/taobin_project/image/event/happy_trios/happy_trios.png",
+      "disable_thai": "ROOT/taobin_project/image/event/happy_trios/happy_trios.png",
+      "event_on_click": "ROOT/taobin_project/xml/event/happy_trios/page_catalog_group_pro_happy_trios.xml"
+    }
+  },
+  {
+    "name": "weekday_discount",
+    "template": "/event/promotion_template.inc",
+    "config": {
+      "normal_eng": "ROOT/taobin_project/image/event/weekday_discount/weekday_discount_en.png",
+      "normal_thai": "ROOT/taobin_project/image/event/weekday_discount/weekday_discount_th.png",
+      "press_eng": "ROOT/taobin_project/image/event/weekday_discount/weekday_discount_en.png",
+      "press_thai": "ROOT/taobin_project/image/event/weekday_discount/weekday_discount_th.png",
+      "disable_eng": "ROOT/taobin_project/image/event/weekday_discount/weekday_discount_en.png",
+      "disable_thai": "ROOT/taobin_project/image/event/weekday_discount/weekday_discount_th.png",
+      "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_weekday_discount_event_on.xml"
+    }
+  },
+  {
+    "name": "oreo_11",
+    "template": "/event/promotion_template.inc",
+    "config": {
+      "normal_eng": "ROOT/taobin_project/image/event/oreo_11/oreo_11_th.png",
+      "normal_thai": "ROOT/taobin_project/image/event/oreo_11/oreo_11_th.png",
+      "press_eng": "ROOT/taobin_project/image/event/oreo_11/oreo_11_th.png",
+      "press_thai": "ROOT/taobin_project/image/event/oreo_11/oreo_11_th.png",
+      "disable_eng": "ROOT/taobin_project/image/event/oreo_11/oreo_11_th.png",
+      "disable_thai": "ROOT/taobin_project/image/event/oreo_11/oreo_11_th.png",
+      "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_oreo_11_fixed.xml"
+    }
+  }
+]

xml/event/out_put_file4.txt

@@ -1 +1 @@
-/event/promotion_robinson_beauty.xml
+/event/promotion_happy_trios.xml

xml/event/script_common_for_open_promotion_xml.ev

@@ -7,6 +7,7 @@ DEBUGVAR OpenFromPageBoard
 DEBUGVAR WeekdayDiscountPro
 DEBUGVAR WeekdayDiscountProEventOn
 DEBUGVAR OreoDiscount11Pro
+DEBUGVAR HappyTriosPro
 
 Var PromotionState1 = "Invisible"
 Var PromotionState2 = "Invisible"
@@ -28,49 +29,68 @@ Else
 
 	; zone promote
 
-    If HalloweenPro = 1 Then
+
+    If HappyTriosPro = 1 Then
         Var PromotionState1 = "Enable"
-        Var ProEnableCount = 1
+        Var CountEnablePromotion = 1
-        If JemilaPro = 1 Then
+
+        If WeekdayDiscountProEventOn = 1 Then
             Var PromotionState2 = "Enable"
-            Var ProEnableCount = ProEnableCount + 1
+            Var CountEnablePromotion = CountEnablePromotion + 1
         EndIf
 
-        If ProEnableCount > 1 Then
-            Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_halloween_and_jemila.xml"
-        Else
-            Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_halloween.xml"
-        EndIf
-    EndIf
-
-    If WeekdayDiscountPro = 1 Then
-        Var ProEnableCount = 1
-        Var PromotionState1 = "Enable"
-
         If OreoDiscount11Pro = 1 Then
-            Var PromotionState2 = "Enable"
+            Var PromotionState3 = "Enable"
-            Var ProEnableCount = ProEnableCount + 1
+            Var CountEnablePromotion = CountEnablePromotion + 1
         EndIf
 
-        Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/weekday_discount/promotion_weekday_discount.xml"
 
-        If ProEnableCount > 1 Then
 
+        If CountEnablePromotion > 1 Then
             If WeekdayDiscountProEventOn = 1 Then
-                Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/weekday_discount/multi_promotion_weekday_discount_event_on.xml"
+                Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/triple_promotion_happy_trios_and_weekday_discount_and_oreo_11_event_on.xml"
             Else
-                Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/weekday_discount/promotion_oreo_discount_11.xml"
+                Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/triple_promotion_happy_trios_and_weekday_discount_and_oreo_11.xml"
+            EndIf
+        Else
+            Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_happy_trios.xml"
+        EndIf
+    Else
+        If WeekdayDiscountPro = 1 Then
+            Var ProEnableCount = 1
+            Var PromotionState1 = "Enable"
+
+            If OreoDiscount11Pro = 1 Then
+                Var PromotionState2 = "Enable"
+                Var ProEnableCount = ProEnableCount + 1
             EndIf
 
-        Else
+            Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/weekday_discount/promotion_weekday_discount.xml"
-            If WeekdayDiscountProEventOn = 1 Then
+
-                Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/weekday_discount/promotion_weekday_discount_event_on.xml"
+            If ProEnableCount > 1 Then
+
+                If WeekdayDiscountProEventOn = 1 Then
+                    Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/weekday_discount/multi_promotion_weekday_discount_event_on.xml"
+                Else
+                    Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/weekday_discount/promotion_oreo_discount_11_event_on.xml"
+                EndIf
+
             Else
-                Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/weekday_discount/promotion_weekday_discount.xml"
+                If WeekdayDiscountProEventOn = 1 Then
+                    Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/weekday_discount/promotion_weekday_discount_event_on.xml"
+                Else
+                    Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/weekday_discount/promotion_weekday_discount.xml"
+                EndIf
+            EndIf
+        Else
+            If OreoDiscount11Pro = 1 Then
+                Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_oreo_discount_11.xml"
             EndIf
         EndIf
     EndIf
 
+
+
 	If OpenFromPageBoard = 1 Then
 		DEBUGVAR FreeEnergyDrink
 		DEBUGVAR BigButtonEnable

xml/event/tricker.ev

@@ -149,6 +149,17 @@ Var FromOreoDiscount11Pro = 0
 Var Seeker.BuyOreo11ProFlag = 0
 Var FromBeforeGoToOreo = 0
 
+; Happy trios, 21 - 30 Nov
+Var HappyTriosPro = 0
+Var FromHappyTrios = 0
+
+; Jemila Topping Free every Wednesday, start 20 Nov
+Var JemilaToppingFlag = 0
+Var JemilaToppingFreeFlag = 0
+
+; Sugar Zero Cal Free every day, start 20 Nov
+Var SugarZeroCalFreeFlag = 0
+
 Var NewCollectPoint = 1
 Var PayMentCodeShouldCollectPromotionPoint = 0
 Var NotCollectPointPromotion = 0
@@ -258,6 +269,20 @@ If SystemDateMonthInt = 11 Then
         EndIf
     EndIf
 
+    If SystemDateDayInt >= 20 Then
+        Var JemilaToppingFlag = 1
+        Var SugarZeroCalFreeFlag = 1
+
+        If SystemDateDayOfWeek = "Wednesday" Then
+            Var JemilaToppingFreeFlag = 1
+        EndIf
+
+    EndIf
+
+    If SystemDateDayInt >= 21 Then
+        Var HappyTriosPro = 1
+    EndIf
+
 
     If WeekdayDiscountPro = 1 Then
         If SystemTimeHourInt >= 16 Then
@@ -281,6 +306,11 @@ If BoxID = 105005 Then
 	Var WeekdayDiscountPro = 1
 	Var WeekdayDiscountProEventOn = 1
 	Var OreoDiscount11Pro = 1
+	Var HappyTriosPro = 1
+
+	Var JemilaToppingFlag = 1
+	Var JemilaToppingFreeFlag = 1
+	Var SugarZeroCalFreeFlag = 1
 EndIf
 
 If BoxID = 172331 Then
@@ -481,6 +511,7 @@ If OreoEnable = "true" Then
 
 Else
     Var OreoDiscount11Pro = 0
+    Var HappyTriosPro = 0
 EndIf
 
 
@@ -572,3 +603,5 @@ READ_FILE "/mnt/sdcard/coffeevending/app_manager/app_list/king_power_service/ena
 If POSMachineFlag = 1 Then
     Var ConnectWithPOSMachine = 1
 EndIf
+
+DEBUGVAR SystemDateDayOfWeek

xml/menu_new_layout_gen.py

@@ -287,6 +287,10 @@
         from_oreo_11 = True
     else:
         from_oreo_11 = False
+    if current_file_name == "page_catalog_group_pro_happy_trios.skt":
+        from_happy_trios = True
+    else:
+        from_happy_trios = False
 
     #print ("######################################################################################################")
     idx_of_eng = 2
@@ -641,6 +645,9 @@
         if from_oreo_11:
           out_xml( '\t\tVar FromOreoDiscount11Pro = 1 \r\n')
 
+        if from_happy_trios:
+          out_xml( '\t\tVar FromHappyTriosPro = 1 \r\n')
+
         out_xml( '\t\t\r\n')
         out_xml( '\t\t'+ button_add_string +'\r\n')
         out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_select5.xml"\r\n')
@@ -1291,6 +1298,9 @@
           if from_oreo_11:
             out_xml( '\t\tVar FromOreoDiscount11Pro = 1 \r\n')
 
+          if from_happy_trios:
+            out_xml( '\t\tVar FromHappyTriosPro = 1 \r\n')
+
           out_xml( '\t\t\r\n')
           out_xml( '\t\t\r\n')
 

xml/page_catalog_group_pro_happy_trios.skt

@@ -0,0 +1,37 @@
+<?hurr
+    #include=menu_head.py
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
+
+
+    Var Timeout = 0
+    Var FromHappyTrios = 0
+
+
+    ;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
+</EventOpen>
+
+
+;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
+
+
+
+<?hurr
+    #include=menu_new_layout_gen_v2.py
+?>
+<?hurr
+    #include=menu_new_layout_gen.py
+?>
+
+
+
+</Popup>

xml/page_collect_point_3_28.xml

@@ -675,34 +675,8 @@
 	Var Timeout = Timeout + 1
 	If Timeout > 5 Then
 
-    	; goto lid straw
+    	; process next page
-    	
+    	Function 2
-
-		If CoffeePoint >= 28 Then
-			If GetDrink5Bath = 1 Then
-				Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml"
-			Else
-				If Seeker.IsLineMember = 0 Then
-					If LuckyDrawCampaign = 1 Then
-						Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
-					Else
-						Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-					EndIf
-				Else
-					Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-				EndIf
-			EndIf
-		Else
-			If Seeker.IsLineMember = 0 Then
-				If LuckyDrawCampaign = 1 Then
-					Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
-				Else
-					Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-				EndIf
-			Else
-				Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-			EndIf
-		EndIf
 	EndIf
 
 
@@ -763,6 +737,46 @@
 	EndIf
 </EventMachine>
 
+
+<Function2>
+
+    If FromHappyTriosPro = 1 Then
+        If Seeker.VendingCode = "PX6" Then
+
+        Else
+            Open "ROOT/taobin_project/xml/event/happy_trios/page_sending_discount_code.xml"
+        EndIf
+    EndIf
+
+    If CoffeePoint >= 28 Then
+        If GetDrink5Bath = 1 Then
+            Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml"
+        Else
+            If Seeker.IsLineMember = 0 Then
+                If LuckyDrawCampaign = 1 Then
+                    Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+                Else
+                    Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+                EndIf
+            Else
+                Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+            EndIf
+        EndIf
+    Else
+        If Seeker.IsLineMember = 0 Then
+            If LuckyDrawCampaign = 1 Then
+                Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+            Else
+                Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+            EndIf
+        Else
+            Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+        EndIf
+    EndIf
+</Function2>
+
+
+
 ;include="ROOT/taobin_project/inc/video.inc"
 
 
@@ -838,31 +852,9 @@
 <EventClick>
 	; goto lid straw
 	;Open "ROOT/taobin_project/xml/page_back_to_main.xml"
-	If CoffeePoint >= 28 Then
+
-		If GetDrink5Bath = 1 Then
+	; process next page
-			Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml"
+    Function 2
-		Else
-			If Seeker.IsLineMember = 0 Then
-				If LuckyDrawCampaign = 1 Then
-					Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
-				Else
-					Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-				EndIf
-			Else
-				Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-			EndIf
-		EndIf
-	Else
-		If Seeker.IsLineMember = 0 Then
-			If LuckyDrawCampaign = 1 Then
-				Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
-			Else
-				Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-			EndIf
-		Else
-			Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-		EndIf
-	EndIf
 
 </EventClick>
 </Button>
@@ -1242,4 +1234,3 @@
 
 
 </Popup>
-	

xml/page_collect_point_3_28_lucky_draw_campaign.xml

@@ -773,31 +773,8 @@
     	; goto lid straw
 
 
-		If CoffeePoint >= 28 Then
+        ; process next page
-			If GetDrink5Bath = 1 Then
+    	Function 2
-				Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml"
-			Else
-				If Seeker.IsLineMember = 0 Then
-					If LuckyDrawCampaign = 1 Then
-						Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
-					Else
-						Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-					EndIf
-				Else
-					Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-				EndIf
-			EndIf
-		Else
-			If Seeker.IsLineMember = 0 Then
-				If LuckyDrawCampaign = 1 Then
-					Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
-				Else
-					Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-				EndIf
-			Else
-				Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-			EndIf
-		EndIf
 	EndIf
 
 
@@ -825,6 +802,44 @@
 	EndIf
 </EventMachine>
 
+
+<Function2>
+
+    If FromHappyTriosPro = 1 Then
+        If Seeker.VendingCode = "PX6" Then
+
+        Else
+            Open "ROOT/taobin_project/xml/event/happy_trios/page_sending_discount_code.xml"
+        EndIf
+    EndIf
+
+    If CoffeePoint >= 28 Then
+        If GetDrink5Bath = 1 Then
+            Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml"
+        Else
+            If Seeker.IsLineMember = 0 Then
+                If LuckyDrawCampaign = 1 Then
+                    Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+                Else
+                    Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+                EndIf
+            Else
+                Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+            EndIf
+        EndIf
+    Else
+        If Seeker.IsLineMember = 0 Then
+            If LuckyDrawCampaign = 1 Then
+                Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+            Else
+                Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+            EndIf
+        Else
+            Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+        EndIf
+    EndIf
+</Function2>
+
 ;include="ROOT/taobin_project/inc/video.inc"
 
 
@@ -1023,31 +1038,9 @@
 <EventClick>
 	; goto lid straw
 	;Open "ROOT/taobin_project/xml/page_back_to_main.xml"
-	If CoffeePoint >= 28 Then
+
-		If GetDrink5Bath = 1 Then
+	; process next page
-			Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml"
+   	Function 2
-		Else
-			If Seeker.IsLineMember = 0 Then
-				If LuckyDrawCampaign = 1 Then
-					Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
-				Else
-					Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-				EndIf
-			Else
-				Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-			EndIf
-		EndIf
-	Else
-		If Seeker.IsLineMember = 0 Then
-			If LuckyDrawCampaign = 1 Then
-				Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
-			Else
-				Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-			EndIf
-		Else
-			Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-		EndIf
-	EndIf
 
 </EventClick>
 </Button>
@@ -1392,4 +1385,3 @@
 
 
 </Popup>
-	

xml/page_topping_select7.xml

@@ -1035,6 +1035,9 @@
 	DEBUGVAR toppingID2index4
 	DEBUGVAR toppingID2index5
 
+	DEBUGVAR toppingID3index1
+	DEBUGVAR toppingID3index2
+
 	DEBUGVAR toppingID6index1
 	DEBUGVAR toppingID6index2
 	DEBUGVAR toppingID6index3
@@ -1396,6 +1399,8 @@
 			If showOreoAddEnable = "Press" Then
 				Var showOreoAddEnable = "Disable"
 			EndIf
+
+			Var CollagenState = "Disable"
 		EndIf
 
 		; i f cold menu disable away
@@ -2005,7 +2010,18 @@
 
 				Var SugarZeroCalPrice = 10
 				Var priceFormat = "(+฿%.0f)"
-				Var SugarZeroCalPriceStr !assigned StringFmt( SugarZeroCalPrice , priceFormat, PreScaleConvertShow)
+
+                Var SugarZeroCalState = "Invisible"
+				Var SugarZeroCalFreeState = "Invisible"
+
+				If SugarZeroCalFreeFlag = 1 Then
+					Var SugarZeroCalFreeState = "Enable"
+				    Var SugarZeroCalPrice = 0
+				Else
+				    Var SugarZeroCalState = "Enable"
+				    Var SugarZeroCalPriceStr !assigned StringFmt( SugarZeroCalPrice , priceFormat, PreScaleConvertShow)
+				EndIf
+
 
 				Var SugarNormalCheck = "PressForever"
 			Else
@@ -2339,13 +2355,30 @@
 			EndIf
 
 		;-END
-			If TOPPING3 = "Collagen" Then
+		    DEBUGVAR TOPPING3
+			If TOPPING3 = "Collagen(mix)" Then
 				Var CollagenState = "Enable"
+				Var ExtraTopping = "Enable"
 			Else
 				Var CollagenState = "Invisible"
 				Var ShowCollagenOnly = "Invisible"
 			EndIf
 
+			If JemilaToppingFlag = 1 Then
+    			If CollagenState = "Enable" Then
+    			    If JemilaToppingFreeFlag = 1 Then
+    					Var CollagenToppingBg = "/bg_top_jemila_free.png"
+    					Var CollagenToppingPrice = 0
+    				Else
+    				    Var CollagenToppingBg = "/bg_top_jemila.png"
+    					Var CollagenToppingPrice = 5
+    				EndIf
+    			EndIf
+			Else
+			    Var CollagenState = "Invisible"
+			EndIf
+
+
 		EndIf
 		;topping_price_refresh = 0
 
@@ -3811,12 +3844,18 @@
 <X> SugarZeroCalPrice_X </X>
 <Y> 67 </Y>
 <Font> KanitRegularTTF </Font>
-<State> "Enable" </State>
+<State> SugarZeroCalState </State>
 <Size> 28 </Size>
 <Color> 0x84776F </Color>
 <Value> SugarZeroCalPriceStr </Value>
 </Text>
 
+<Image>
+    <X> SugarZeroCalPrice_X </X>
+    <Y> 75 </Y>
+    <State> SugarZeroCalFreeState </State>
+    <Filename> Var( DirImage + "/free.png" ) </Filename>
+</Image>
 
 ; sugar1
 <Button>
@@ -4425,12 +4464,19 @@
 <X> SugarZeroCalPrice_X </X>
 <Y> 67 </Y>
 <Font> KanitRegularTTF </Font>
-<State> "Enable" </State>
+<State> SugarZeroCalState </State>
 <Size> 28 </Size>
 <Color> 0x84776F </Color>
 <Value> SugarZeroCalPriceStr </Value>
 </Text>
 
+<Image>
+    <X> SugarZeroCalPrice_X </X>
+    <Y> 75 </Y>
+    <State> SugarZeroCalFreeState </State>
+    <Filename> Var( DirImage + "/free.png" ) </Filename>
+</Image>
+
 
 ; sugar1
 <Button>
@@ -4741,12 +4787,19 @@
 <X> SugarZeroCalPrice_X </X>
 <Y> 67 </Y>
 <Font> KanitRegularTTF </Font>
-<State> "Enable" </State>
+<State> SugarZeroCalState </State>
 <Size> 28 </Size>
 <Color> 0x84776F </Color>
 <Value> SugarZeroCalPriceStr </Value>
 </Text>
 
+<Image>
+    <X> SugarZeroCalPrice_X </X>
+    <Y> 75 </Y>
+    <State> SugarZeroCalFreeState </State>
+    <Filename> Var( DirImage + "/free.png" ) </Filename>
+</Image>
+
 
 ; sugar1
 <Button>
@@ -5535,6 +5588,82 @@
 
 </Row1>
 
+<Row1>
+<Width> 986 </Width>
+<Height> "auto" </Height>
+<State> CollagenState </State>
+;
+<Image>
+	<X> 0 </X>
+	<Y> 0 </Y>
+	<Filename> Var( DirImage + CollagenToppingBg ) </Filename>
+</Image>
+;
+<Button>
+<X> 40 </X>
+<Y> 5 </Y>
+<State> CollagenState </State>
+<Mode> "No" </Mode>
+<Filename> "ROOT/taobin_project/image/topping2/bn_add_jemila.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/topping2/bp_add_jemila.png" </FilenamePress>
+<FilenameDisable> "ROOT/taobin_project/image/topping2/bd_add_jemila.png" ) </FilenameDisable>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+	SAVELOG "Press add jemila"
+
+	If CollagenState = "Press" Then
+		Var CollagenState = "Enable"
+	Else
+		Var CollagenState = "Press"
+	EndIf
+
+	Function 2
+
+	Refresh
+
+</EventClick>
+<Animation>
+	<Style> "shake-text" </Style>
+	<OnEvent> "OnValueChange" </OnEvent>
+</Animation>
+</Button>
+
+;
+<Button>
+<X> 896 </X>
+<Y> 14 </Y>
+<State> CollagenState </State>
+<Mode> "No" </Mode>
+<Filename> Var( DirImage + "/cb_notcheck.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/cb_checked.png" ) </FilenamePress>
+<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+
+	SAVELOG "Press add jemila"
+
+	If CollagenState = "Press" Then
+		Var CollagenState = "Enable"
+	Else
+		Var CollagenState = "Press"
+	EndIf
+
+	Function 2
+
+
+
+	Refresh
+
+</EventClick>
+<Animation>
+	<Style> "shake-text" </Style>
+	<OnEvent> "OnValueChange" </OnEvent>
+</Animation>
+</Button>
+</Row1>
+
 
 ;
 ;
@@ -7607,6 +7736,15 @@
 
 	EndIf
 
+    If CollagenState = "Press" Then
+        Var TOPPING_PRICE = TOPPING_PRICE + CollagenToppingPrice
+        Var topping3 = toppingID3index2
+        Var DisableUsingCode = "true"
+    Else
+        Var topping3 = toppingID3index1
+        Var DisableUsingCode = "false"
+    EndIf
+
 
 	If SugarZeroCalEnable = "true" Then
 		If SugarZeroCalOption = "Enable" Then