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

This commit is contained in:
wanlop run 2024-09-10 15:30:37 +07:00
commit bb2750295d
4 changed files with 74 additions and 4 deletions

View file

@ -69,9 +69,17 @@
EndIf
If CountryName = "Malaysia" Then
DEBUGVAR PromotionOreoToppingFreeEnable
DEBUGVAR ProReducedPriceEnable
DEBUGVAR UseSlideShowVideo
If PromotionOreoToppingFreeEnable = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_21.mp4"
EndIf
If ProReducedPriceEnable = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
EndIf
If UseSlideShowVideo = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
EndIf
@ -103,17 +111,26 @@
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
EndIf
DEBUGVAR DisplayAds
If CountryName = "Malaysia" Then
DEBUGVAR PromotionOreoToppingFreeEnable
DEBUGVAR ProReducedPriceEnable
DEBUGVAR UseSlideShowVideo
If PromotionOreoToppingFreeEnable = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_21.mp4"
EndIf
If ProReducedPriceEnable = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
EndIf
If UseSlideShowVideo = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
EndIf
EndIf
DEBUGVAR DisplayAds
</EventOpen>
<EventVideoEnd>
@ -168,9 +185,17 @@
EndIf
If CountryName = "Malaysia" Then
DEBUGVAR PromotionOreoToppingFreeEnable
DEBUGVAR ProReducedPriceEnable
DEBUGVAR UseSlideShowVideo
If PromotionOreoToppingFreeEnable = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_21.mp4"
EndIf
If ProReducedPriceEnable = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
EndIf
If UseSlideShowVideo = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
EndIf
@ -212,9 +237,19 @@
DEBUGVAR DisplayAds
If CountryName = "Malaysia" Then
DEBUGVAR PromotionOreoToppingFreeEnable
DEBUGVAR ProReducedPriceEnable
DEBUGVAR UseSlideShowVideo
If PromotionOreoToppingFreeEnable = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_21.mp4"
EndIf
If ProReducedPriceEnable = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
EndIf
If UseSlideShowVideo = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
EndIf
@ -222,6 +257,7 @@
Var XMLFileVideo = "false"
DEBUGVAR XMLFileVideo
DEBUGVAR DisplayAds
</EventVideoEnd>
<Filename> DisplayAds </Filename>

Binary file not shown.

View file

@ -24,6 +24,15 @@ Var FromProYuzu = 0
; Pro free oreo topping
Var PromotionOreoToppingFreeEnable = 0
; Pro reduce price
Var SetProReduceByBO = 0
Var ProReducedPriceEnable = 0
If XMLProfile = "PromoReduced" Then
Var SetProReduceByBO = 1
EndIf
DEBUGVAR SetProReduceByBO
; Pay later mode
Var EnablePayLaterMode = 0
@ -65,21 +74,46 @@ EndIf
If SystemDateMonthInt = 9 Then
If SystemDateDayInt < 17 Then
Var PromotionOreoToppingFreeEnable = 1
If SetProReduceByBO = 1 Then
Var ProReducedPriceEnable = 1
EndIf
Else
Var PromotionOreoToppingFreeEnable = 0
If SystemDateDayInt >= 16 Then
If SetProReduceByBO = 1 Then
Var ProReducedPriceEnable = 1
EndIf
Else
Var ProReducedPriceEnable = 0
EndIf
EndIf
EndIf
If SystemDateMonthInt = 10 Then
If SetProReduceByBO = 1 Then
Var ProReducedPriceEnable = 1
EndIf
EndIf
If SystemDateMonthInt = 11 Then
If SetProReduceByBO = 1 Then
Var ProReducedPriceEnable = 1
EndIf
EndIf
If BoxID = 177746 Then
Var ProThaiTeaEnable = 1
Var ProYuzuEnable = 1
Var PromotionOreoToppingFreeEnable = 1
Var PromotionOreoToppingFreeEnable = 0
Var EnablePayLaterMode = 1
;Var AdvertiseProfile = "00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00"
Var UseSlideShowVideo = 1
Var UseSlideShowVideo = 0
EndIf
If BoxID = 210037 Then

View file

@ -1386,7 +1386,7 @@
</EventUnitTest7>
<EventUnitTest8>
Var XMLProfile = "Discount50"
Var XMLProfile = "PromoReduced"
Var TimeProfilePrice = 0
</EventUnitTest8>