Merge

inc/video.inc

@@ -41,7 +41,10 @@
             If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then
                  
                  If CountDownPauseVideo2 < 2 Then
+<<<<<<< HEAD
                     
+=======
+>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
                     Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" +  a_video_menu[ads_idx]
                     Var DisplayAds = AdvTaobinMenu + ".mp4"
                 Else
@@ -54,7 +57,10 @@
             EndIf
             If CurrentXMLFileName2 = "" Then
                  If CountDownPauseVideo2 < 2 Then
+<<<<<<< HEAD
                     
+=======
+>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
                     Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" +  a_video_menu[ads_idx]
                     Var DisplayAds = AdvTaobinMenu + ".mp4"
                 Else
@@ -112,7 +118,10 @@
             If CurrentXMLFileName2 = "" Then
                 DEBUGVAR CountDownPauseVideo2
                  If CountDownPauseVideo2 < 2 Then
+<<<<<<< HEAD
                  
+=======
+>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
                     Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" +  a_video_menu[ads_idx]
                     Var DisplayAds = AdvTaobinMenu + ".mp4"
                 Else
@@ -178,7 +187,10 @@
         If CountryName = "Singapore" Then
             If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then
                  If CountDownPauseVideo2 < 2 Then
+<<<<<<< HEAD
                     
+=======
+>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
                     Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" +  a_video_menu[ads_idx]
                     Var DisplayAds = AdvTaobinMenu + ".mp4"
                 Else
@@ -191,7 +203,10 @@
             EndIf
             If CurrentXMLFileName2 = "" Then
                  If CountDownPauseVideo2 < 2 Then
+<<<<<<< HEAD
                    
+=======
+>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
                     Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" +  a_video_menu[ads_idx]
                     Var DisplayAds = AdvTaobinMenu + ".mp4"
                 Else
@@ -227,7 +242,10 @@
         If CountryName = "Singapore" Then
             If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then
                  If CountDownPauseVideo2 < 1 Then
+<<<<<<< HEAD
                     
+=======
+>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
                     Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" +  a_video_menu[ads_idx]
                     Var DisplayAds = AdvTaobinMenu + ".mp4"
                 Else
@@ -240,7 +258,10 @@
             EndIf
             If CurrentXMLFileName2 = "" Then
                  If CountDownPauseVideo2 < 2 Then
+<<<<<<< HEAD
                    
+=======
+>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
                     Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" +  a_video_menu[ads_idx]
                     Var DisplayAds = AdvTaobinMenu + ".mp4"
                 Else

inter/mys/animation01/play_list.tsv

@@ -925,3 +925,4 @@ ICED GINGER YUZU TEA	12-02-02-0054	1	10	53	23						24	120	15:00	23
 ICED GINGER MATCHA	12-02-02-0055	1	8	9	10	23					24	120	15:00	23
 GINGER MILK TEA SMOOTHIE	12-02-03-0053	1	6	10	23	41					24	120	15:00	23
 GINGER MILK TEA OREO SMOOTHIE	12-02-03-0056	1	6	10	40	23	40	41			24	120	15:00	23
+	12-03-03-0061	1	7	15							24	120	12:00	23

inter/mys/xml/process/discount_from_promotion.ev

@@ -0,0 +1,39 @@
+; fruit_raya
+If FromFruityRaya = 1 Then
+    Var Seeker.VendingCode = "RAYA"
+    Var Seeker.FreeVendingCampaign = 0
+EndIf
+
+; mys pro thai tea
+If FromProThaiTea = 1 Then
+    Var Seeker.VendingCode = "TT1F1"
+    Var Seeker.FreeVendingCampaign = 0
+EndIf
+
+; mys pro yuzu
+If FromProYuzu = 1 Then
+    Var Seeker.VendingCode = "YZ1F1"
+    Var Seeker.FreeVendingCampaign = 0
+EndIf
+
+; mys mode pay later
+If EnablePayLaterMode = 1 Then
+    Var PriceDiff = PriceDrink
+
+    Var Seeker.VendingCode = "PL"
+    Var Seeker.IntVendingCampaign = PriceDiff
+
+EndIf
+
+; promotion reduce price
+; REPR
+If ProReducedPriceEnable = 1 Then
+    Var Seeker.VendingCode = "REPR"
+EndIf
+
+
+; promotion yuzu 250
+; YUZU25
+If ProYuzu250Enable = 1 Then
+    Var Seeker.VendingCode = "YUZU25"
+EndIf

inter/tha/.special/RoadShow.ev

@@ -0,0 +1,45 @@
+
+SAVELOG "RoadShow.ev  Sep 18 19"
+
+Var RoadShow = "false"
+
+DEBUGVAR SystemDateDayInt
+
+If SystemDateYearInt = 2024 Then
+	
+	If SystemDateMonthInt = 9 Then
+
+		DEBUGVAR SystemTimeMinuteInt
+		DEBUGVAR SystemTimeHourInt
+		
+		If BoxID = 201193 Then
+			If SystemDateDayInt = 18 Then
+				Var RoadShow = "true"
+			EndIf
+		EndIf
+
+		If BoxID = 201316 Then
+			If SystemDateDayInt = 18 Then
+				Var RoadShow = "true"
+			EndIf
+		EndIf
+		
+		If BoxID = 201193 Then
+			If SystemDateDayInt = 19 Then
+				Var RoadShow = "true"
+			EndIf
+		EndIf
+
+		If BoxID = 201316 Then
+			If SystemDateDayInt = 19 Then
+				Var RoadShow = "true"
+			EndIf
+		EndIf
+	EndIf
+
+
+EndIf
+
+DEBUGVAR RoadShow
+
+DEBUGVAR RobinsonBeautyPro