From 91cc9acbacb3253312f09f258453374558d2304f Mon Sep 17 00:00:00 2001 From: Ittipat Lusuk Date: Mon, 2 Dec 2024 15:34:27 +0700 Subject: [PATCH] THAI INTER: Fix payment_cash.ev, x_blend --- inter/tha/xml/page_topping_select6.lxml | 2 +- xml/page_payment_cash.xml | 54 +------------------------ xml/payment_cash.ev | 12 ------ 3 files changed, 3 insertions(+), 65 deletions(-) diff --git a/inter/tha/xml/page_topping_select6.lxml b/inter/tha/xml/page_topping_select6.lxml index a45c06fc..1c4917c8 100644 --- a/inter/tha/xml/page_topping_select6.lxml +++ b/inter/tha/xml/page_topping_select6.lxml @@ -935,7 +935,7 @@ Var topping_shot_price_x = 630 Var text_x_add_oreo_price = 430 Var text_show_normal_x = 568 - Var text_show_blend_x = 892 + Var text_show_blend_x = 903 Var SugarZeroCalPrice_X = 540 Var Text_SugarZeroCalPrice_X = 360 Var Text_SugarNormalPrice_Y = 80 diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 5d7b4eff..51ff0026 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -16,59 +16,9 @@ ;Cash for any lang ;include="ROOT/taobin_project/xml/payment_cash.ev" - - payment_cash.ev -If LanguageShow = "ENG" Then - Var show_eng = "true" -EndIf -If LanguageShow = "THAI" Then - Var show_eng = "false" -EndIf - -DEBUGVAR show_eng -DEBUGVAR LanguageShow - -If show_eng = "true" Then - Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png" - Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash.png" - Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment" - Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_en" - Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" - Var LOADING_STATE_X = 267 -Else - Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash.png" - Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash.png" - Var DirImage = "ROOT/taobin_project/image/page_payment" - Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend" - Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" - Var LOADING_STATE_X = 267 -EndIf - -If LanguageShow = "MYANMAR" Then - Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_mmr/page_payment/bn_cash.png" - Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_mmr/page_payment/bp_cash.png" - Var DirImage = "ROOT/taobin_project/image/page_payment_mmr/page_payment" - Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_mmr" - Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" - Var LOADING_STATE_X = 335 -EndIf - -If RoadShow = "true" Then - Var X_CASH1 = 287 - If show_eng = "true" Then - Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png" - Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash.png" - Else - Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash.png" - Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash.png" - EndIf - - If LanguageShow = "MYANMAR" Then - Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_mmr/page_payment/bn_cash.png" - Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_mmr/page_payment/bp_cash.png" - EndIf -EndIf + DEBUGVAR show_eng + DEBUGVAR LanguageShow diff --git a/xml/payment_cash.ev b/xml/payment_cash.ev index 11be845d..789719a6 100644 --- a/xml/payment_cash.ev +++ b/xml/payment_cash.ev @@ -1,15 +1,3 @@ -payment_cash.ev -If LanguageShow = "ENG" Then - Var show_eng = "true" -EndIf - -If LanguageShow = "THAI" Then - Var show_eng = "false" -EndIf - -DEBUGVAR show_eng -DEBUGVAR LanguageShow - If show_eng = "true" Then Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png" Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash.png"