DUBAI: done catalog group, WIP payment

2024-09-30 17:28:24 +07:00 · 2024-09-30 17:28:24 +07:00 · 6348890a34
commit 6348890a34
parent fff39356d6
16 changed files with 577 additions and 608 deletions
--- a/inter/uae_dubai/xml/menu_catalog_new.lxml
+++ b/inter/uae_dubai/xml/menu_catalog_new.lxml
@ -114,18 +114,38 @@
    EndIf
    ;inter-image
 	If CountryName = "UnitedArabEmirates Dubai" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        ;Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/image/page3_en"
        Var ice_tab_text =  "Ice will be ready at "
    EndIf

    If LanguageShow = "UAE_DUBAI" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImage = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
+        ;Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+    EndIf
+
+    If UsePepsiTheme = 1 Then
+        Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+        Var DirImage2 = DirImage2 + "/image/drink_option_en/"
+        If LanguageShow = "UAE_DUBAI" Then
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3/"
+        Else
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2_en/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3_en/"
+
+            Var ice_tab_text =  "Ice will be ready at "
+        EndIf
    EndIf

    SAVELOG "EventLanguageOnChange menu -list"
--- a/inter/uae_dubai/xml/page_catalog_group_appfast.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_appfast.lxml
@ -295,18 +295,38 @@
    EndIf
    ;inter-image
 	If CountryName = "UnitedArabEmirates Dubai" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        ;Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/image/page3_en"
        Var ice_tab_text =  "Ice will be ready at "
    EndIf

    If LanguageShow = "UAE_DUBAI" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImage = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
+        ;Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+    EndIf
+
+    If UsePepsiTheme = 1 Then
+        Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+        Var DirImage2 = DirImage2 + "/image/drink_option_en/"
+        If LanguageShow = "UAE_DUBAI" Then
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3/"
+        Else
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2_en/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3_en/"
+
+            Var ice_tab_text =  "Ice will be ready at "
+        EndIf
    EndIf

    SAVELOG "EventLanguageOnChange menu -list"
--- a/inter/uae_dubai/xml/page_catalog_group_cocktail.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_cocktail.lxml
@ -261,18 +261,38 @@
    EndIf
    ;inter-image
 	If CountryName = "UnitedArabEmirates Dubai" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        ;Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/image/page3_en"
        Var ice_tab_text =  "Ice will be ready at "
    EndIf

    If LanguageShow = "UAE_DUBAI" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImage = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
+        ;Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+    EndIf
+
+    If UsePepsiTheme = 1 Then
+        Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+        Var DirImage2 = DirImage2 + "/image/drink_option_en/"
+        If LanguageShow = "UAE_DUBAI" Then
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3/"
+        Else
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2_en/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3_en/"
+
+            Var ice_tab_text =  "Ice will be ready at "
+        EndIf
    EndIf

    SAVELOG "EventLanguageOnChange menu -list"
--- a/inter/uae_dubai/xml/page_catalog_group_coffee.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_coffee.lxml
@ -287,18 +287,38 @@
    EndIf
    ;inter-image
 	If CountryName = "UnitedArabEmirates Dubai" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        ;Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/image/page3_en"
        Var ice_tab_text =  "Ice will be ready at "
    EndIf

    If LanguageShow = "UAE_DUBAI" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImage = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
+        ;Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+    EndIf
+
+    If UsePepsiTheme = 1 Then
+        Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+        Var DirImage2 = DirImage2 + "/image/drink_option_en/"
+        If LanguageShow = "UAE_DUBAI" Then
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3/"
+        Else
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2_en/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3_en/"
+
+            Var ice_tab_text =  "Ice will be ready at "
+        EndIf
    EndIf

    SAVELOG "EventLanguageOnChange menu -list"
--- a/inter/uae_dubai/xml/page_catalog_group_forkid.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_forkid.lxml
@ -296,18 +296,38 @@
    EndIf
    ;inter-image
 	If CountryName = "UnitedArabEmirates Dubai" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        ;Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/image/page3_en"
        Var ice_tab_text =  "Ice will be ready at "
    EndIf

    If LanguageShow = "UAE_DUBAI" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImage = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
+        ;Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+    EndIf
+
+    If UsePepsiTheme = 1 Then
+        Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+        Var DirImage2 = DirImage2 + "/image/drink_option_en/"
+        If LanguageShow = "UAE_DUBAI" Then
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3/"
+        Else
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2_en/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3_en/"
+
+            Var ice_tab_text =  "Ice will be ready at "
+        EndIf
    EndIf

    SAVELOG "EventLanguageOnChange menu -list"
--- a/inter/uae_dubai/xml/page_catalog_group_health.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_health.lxml
@ -287,18 +287,38 @@
    EndIf
    ;inter-image
 	If CountryName = "UnitedArabEmirates Dubai" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        ;Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/image/page3_en"
        Var ice_tab_text =  "Ice will be ready at "
    EndIf

    If LanguageShow = "UAE_DUBAI" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImage = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
+        ;Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+    EndIf
+
+    If UsePepsiTheme = 1 Then
+        Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+        Var DirImage2 = DirImage2 + "/image/drink_option_en/"
+        If LanguageShow = "UAE_DUBAI" Then
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3/"
+        Else
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2_en/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3_en/"
+
+            Var ice_tab_text =  "Ice will be ready at "
+        EndIf
    EndIf

    SAVELOG "EventLanguageOnChange menu -list"
--- a/inter/uae_dubai/xml/page_catalog_group_milk.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_milk.lxml
@ -285,18 +285,38 @@
    EndIf
    ;inter-image
 	If CountryName = "UnitedArabEmirates Dubai" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        ;Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/image/page3_en"
        Var ice_tab_text =  "Ice will be ready at "
    EndIf

    If LanguageShow = "UAE_DUBAI" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImage = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
+        ;Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+    EndIf
+
+    If UsePepsiTheme = 1 Then
+        Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+        Var DirImage2 = DirImage2 + "/image/drink_option_en/"
+        If LanguageShow = "UAE_DUBAI" Then
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3/"
+        Else
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2_en/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3_en/"
+
+            Var ice_tab_text =  "Ice will be ready at "
+        EndIf
    EndIf

    SAVELOG "EventLanguageOnChange menu -list"
--- a/inter/uae_dubai/xml/page_catalog_group_other.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_other.lxml
@ -286,18 +286,38 @@
    EndIf
    ;inter-image
 	If CountryName = "UnitedArabEmirates Dubai" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        ;Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/image/page3_en"
        Var ice_tab_text =  "Ice will be ready at "
    EndIf

    If LanguageShow = "UAE_DUBAI" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImage = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
+        ;Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+    EndIf
+
+    If UsePepsiTheme = 1 Then
+        Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+        Var DirImage2 = DirImage2 + "/image/drink_option_en/"
+        If LanguageShow = "UAE_DUBAI" Then
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3/"
+        Else
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2_en/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3_en/"
+
+            Var ice_tab_text =  "Ice will be ready at "
+        EndIf
    EndIf

    SAVELOG "EventLanguageOnChange menu -list"
--- a/inter/uae_dubai/xml/page_catalog_group_recommend.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_recommend.lxml
@ -278,18 +278,38 @@
    EndIf
    ;inter-image
 	If CountryName = "UnitedArabEmirates Dubai" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        ;Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/image/page3_en"
        Var ice_tab_text =  "Ice will be ready at "
    EndIf

    If LanguageShow = "UAE_DUBAI" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImage = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
+        ;Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+    EndIf
+
+    If UsePepsiTheme = 1 Then
+        Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+        Var DirImage2 = DirImage2 + "/image/drink_option_en/"
+        If LanguageShow = "UAE_DUBAI" Then
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3/"
+        Else
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2_en/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3_en/"
+
+            Var ice_tab_text =  "Ice will be ready at "
+        EndIf
    EndIf

    SAVELOG "EventLanguageOnChange menu -list"
--- a/inter/uae_dubai/xml/page_catalog_group_tea.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_tea.lxml
@ -287,18 +287,38 @@
    EndIf
    ;inter-image
 	If CountryName = "UnitedArabEmirates Dubai" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        ;Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/image/page3_en"
        Var ice_tab_text =  "Ice will be ready at "
    EndIf

    If LanguageShow = "UAE_DUBAI" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImage = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
+        ;Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+    EndIf
+
+    If UsePepsiTheme = 1 Then
+        Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+        Var DirImage2 = DirImage2 + "/image/drink_option_en/"
+        If LanguageShow = "UAE_DUBAI" Then
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3/"
+        Else
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2_en/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3_en/"
+
+            Var ice_tab_text =  "Ice will be ready at "
+        EndIf
    EndIf

    SAVELOG "EventLanguageOnChange menu -list"
--- a/inter/uae_dubai/xml/page_catalog_group_whey.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_whey.lxml
@ -292,18 +292,38 @@
    EndIf
    ;inter-image
 	If CountryName = "UnitedArabEmirates Dubai" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        ;Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/image/page3_en"
        Var ice_tab_text =  "Ice will be ready at "
    EndIf

    If LanguageShow = "UAE_DUBAI" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImage = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
+        ;Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+    EndIf
+
+    If UsePepsiTheme = 1 Then
+        Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+        Var DirImage2 = DirImage2 + "/image/drink_option_en/"
+        If LanguageShow = "UAE_DUBAI" Then
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3/"
+        Else
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2_en/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3_en/"
+
+            Var ice_tab_text =  "Ice will be ready at "
+        EndIf
    EndIf

    SAVELOG "EventLanguageOnChange menu -list"