From 8f307dff6f227c7bc31526abe11dca12d93d6984 Mon Sep 17 00:00:00 2001 From: Kenta420 Date: Mon, 16 Sep 2024 18:24:06 +0700 Subject: [PATCH 1/7] DUBAI: Fix topping price position --- .../img_popup12_uae.png | Bin 0 -> 25578 bytes inter/uae_dubai/xml/page_topping_select6.lxml | 29 +++++-------- xml/page_payment_cash-UAE.xml | 38 +++++++++--------- 3 files changed, 30 insertions(+), 37 deletions(-) create mode 100644 image/page_payment_cash_extend_en/img_popup12_uae.png diff --git a/image/page_payment_cash_extend_en/img_popup12_uae.png b/image/page_payment_cash_extend_en/img_popup12_uae.png new file mode 100644 index 0000000000000000000000000000000000000000..d75d186347f77f56ac9bcf0fb9897e39ce6f1d68 GIT binary patch literal 25578 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 182 748 alphaState3 - Var( DirImage + "/img_popup12.png" ) + Var( DirImage2 + "/img_popup12_uae.png" ) - +; + + + + 70 + 932 + Var( DirImage + imgGetChange ) + + + + + 0 + 1123 + 144 + Center + 1080 + KanitRegularTTF + PopupBodyTextColor + StoreCreditAmountStr + + + \ No newline at end of file diff --git a/xml/page_lid_straw.xml b/xml/page_lid_straw.xml index 5ec103c9..1bb8ea0c 100644 --- a/xml/page_lid_straw.xml +++ b/xml/page_lid_straw.xml @@ -150,7 +150,16 @@ EndIf Else - Open "ROOT/taobin_project/xml/page_get_yourchange.xml" + + If UsePepsiTheme = 1 Then + If CountryName = "Singapore" Then + Open "ROOT/taobin_project/inter/whatthecup/sgp/xml/page_get_yourchange-SGP_blue.xml" + EndIf + Else + Open "ROOT/taobin_project/xml/page_get_yourchange.xml" + EndIf + + EndIf Else @@ -180,7 +189,13 @@ Open "ROOT/taobin_project/xml/page_brewing3.xml" EndIf Else - Open "ROOT/taobin_project/xml/page_get_yourchange.xml" + If UsePepsiTheme = 1 Then + If CountryName = "Singapore" Then + Open "ROOT/taobin_project/inter/whatthecup/sgp/xml/page_get_yourchange-SGP_blue.xml" + EndIf + Else + Open "ROOT/taobin_project/xml/page_get_yourchange.xml" + EndIf EndIf EndIf From 38e4f5eb4965c8f315a16148fd4458b6d3d9b798 Mon Sep 17 00:00:00 2001 From: Kenta420 Date: Tue, 17 Sep 2024 13:11:25 +0700 Subject: [PATCH 3/7] DUBAI: hide lang toggle button --- xml/page_get_yourchange.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xml/page_get_yourchange.xml b/xml/page_get_yourchange.xml index 4c68e904..ccac8116 100644 --- a/xml/page_get_yourchange.xml +++ b/xml/page_get_yourchange.xml @@ -18,6 +18,10 @@ If CountryName = "HongKong" Then Var LangButtonEnable = "Invisible" EndIf + + If CountryName = "UnitedArabEmirates Dubai" Then + Var LangButtonEnable = "Invisible" + EndIf DEBUGVAR LangButtonEnable From a4f13be9ef03c512e3a923c0887d0dad9019556e Mon Sep 17 00:00:00 2001 From: Kenta420 Date: Tue, 17 Sep 2024 13:19:49 +0700 Subject: [PATCH 4/7] AUS: update currency --- image/collectiing_en/img_popup11-AUS.png | Bin 0 -> 13253 bytes image/collectiing_en/img_popup15-AUS.png | Bin 0 -> 14917 bytes inter/aus/xml/page_brewing3.lxml | 18 ++++++++++-------- xml/page_payment_cash-AUS.xml | 2 +- xml/page_payment_credit3-TopupCash.xml | 6 ++++++ xml/page_payment_credit3.xml | 5 +++++ xml/page_topup_credit3-TopupCash.xml | 6 ++++++ 7 files changed, 28 insertions(+), 9 deletions(-) create mode 100644 image/collectiing_en/img_popup11-AUS.png create mode 100644 image/collectiing_en/img_popup15-AUS.png diff --git a/image/collectiing_en/img_popup11-AUS.png b/image/collectiing_en/img_popup11-AUS.png new file mode 100644 index 0000000000000000000000000000000000000000..354116ea8be0aa0ab44671c6c35c7a8e02658ff5 GIT binary patch literal 13253 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 literal 0 HcmV?d00001 diff --git a/image/collectiing_en/img_popup15-AUS.png b/image/collectiing_en/img_popup15-AUS.png new file mode 100644 index 0000000000000000000000000000000000000000..0c0c24fec78911fe68ccf616a6aa308793f06298 GIT binary patch literal 14917 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 literal 0 HcmV?d00001 diff --git a/inter/aus/xml/page_brewing3.lxml b/inter/aus/xml/page_brewing3.lxml index 5ef342da..25e7e9e2 100644 --- a/inter/aus/xml/page_brewing3.lxml +++ b/inter/aus/xml/page_brewing3.lxml @@ -449,6 +449,7 @@ DEBUGVAR Seeker If game_mode_enable = "true" Then + CheckApp "com.NDF.taobin" GameInstalled DEBUGVAR GameInstalled @@ -721,14 +722,15 @@ Var Timeout = Timeout + 1 If Timeout < 2 Then - If Game01Enable = 0 Then - If game_mode_enable = "true" Then - If BREW_CNT > 75 Then - SAVELOG "Button game enable from EventTimeout" - Var Game01Enable = 1 - Var ButtonGameCountDownState = "Invisible" - Var ButtonGamePressToPlayState = "Enable" - + If GameInstalled = "true" Then + If Game01Enable = 0 Then + If game_mode_enable = "true" Then + If BREW_CNT > 75 Then + SAVELOG "Button game enable from EventTimeout" + Var Game01Enable = 1 + Var ButtonGameCountDownState = "Invisible" + Var ButtonGamePressToPlayState = "Enable" + EndIf EndIf EndIf EndIf diff --git a/xml/page_payment_cash-AUS.xml b/xml/page_payment_cash-AUS.xml index 05d1457c..e4409e04 100644 --- a/xml/page_payment_cash-AUS.xml +++ b/xml/page_payment_cash-AUS.xml @@ -1646,7 +1646,7 @@ EndIf 748 ;inter-image alphaState2 - Var( DirImage2 + "/img_popup11-MYR.png" ) + Var( DirImage2 + "/img_popup11-AUS.png" ) diff --git a/xml/page_payment_credit3-TopupCash.xml b/xml/page_payment_credit3-TopupCash.xml index fa6162dd..0d791293 100644 --- a/xml/page_payment_credit3-TopupCash.xml +++ b/xml/page_payment_credit3-TopupCash.xml @@ -67,6 +67,12 @@ Var img_popup15 = "/img_popup15-HKG.png" EndIf + ;inter-image + If CountryName = "Australia" Then + Var img_popup11 = "/img_popup11-AUS.png" + Var img_popup15 = "/img_popup15-AUS.png" + EndIf + Var CreditAmount = SumCreditAmount diff --git a/xml/page_payment_credit3.xml b/xml/page_payment_credit3.xml index cb5eec2a..8790e1cf 100644 --- a/xml/page_payment_credit3.xml +++ b/xml/page_payment_credit3.xml @@ -105,6 +105,11 @@ Var img_popup11 = "/img_popup11-HKG.png" EndIf + ;inter-image + If CountryName = "Australia" Then + Var img_popup11 = "/img_popup11-AUS.png" + EndIf + 1000 diff --git a/xml/page_topup_credit3-TopupCash.xml b/xml/page_topup_credit3-TopupCash.xml index b116b590..a39cae52 100644 --- a/xml/page_topup_credit3-TopupCash.xml +++ b/xml/page_topup_credit3-TopupCash.xml @@ -69,6 +69,12 @@ Var img_popup15 = "/img_popup15-HKG.png" EndIf + ;inter-image + If CountryName = "Australia" Then + Var img_popup11 = "/img_popup11-AUS.png" + Var img_popup15 = "/img_popup15-AUS.png" + EndIf + Var CreditAmount = 0 From f6218c1bda934e669991bd49b6ec7177068dfc3e Mon Sep 17 00:00:00 2001 From: thanawat saiyota Date: Tue, 17 Sep 2024 14:24:50 +0700 Subject: [PATCH 5/7] delete VideoAdvert --- xml/page_board.xml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/xml/page_board.xml b/xml/page_board.xml index 51186411..04abbb37 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -925,7 +925,7 @@ Var UsePepsiTheme = 1 Var TargetThemeNum = 2 - Var VideoAdvert = "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + ;Var VideoAdvert = "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml" @@ -1341,7 +1341,7 @@ Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml" - OpenInst 1 VideoAdvert + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" Var OpenFromPageBoard = 1 @@ -1597,7 +1597,8 @@ Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml" - OpenInst 1 VideoAdvert + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" + Var OpenFromPageBoard = 1 @@ -1795,10 +1796,10 @@ ; Handle penetrator If Only18 = "true" Then - OpenInst 1 VideoAdvert + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" OpenInst 2 "ROOT/taobin_project/xml/page_identity18_verification.xml" Else - OpenInst 1 VideoAdvert + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" EndIf @@ -1834,7 +1835,7 @@ SoundVolume - OpenInst 1 VideoAdvert + ;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" If CocktailShow = "true" Then OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml" Else @@ -1872,7 +1873,7 @@ Var NextPage = "-" - OpenInst 1 VideoAdvert + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" If InternationalEnable = 1 Then ;inter-xml-open @@ -1926,7 +1927,7 @@ SAVELOG "click ShowButtonClickFull" Var NextPage = "-" - OpenInst 1 VideoAdvert + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" If SpiralOnline = "true" Then OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_with_vending.xml" @@ -1997,7 +1998,7 @@ If IgnoreNetCore = "true" Then Var NextPage = "-" - OpenInst 1 VideoAdvert + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.lxml" @@ -2020,7 +2021,7 @@ Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml" - OpenInst 1 VideoAdvert + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" Var OpenFromPageBoard = 1 From 0d1a92e0465a54260479db1aeaa5957b8cb7e565 Mon Sep 17 00:00:00 2001 From: Pakin Date: Tue, 17 Sep 2024 15:05:46 +0700 Subject: [PATCH 6/7] SGP+WTC: fix get your change --- inter/whatthecup/sgp/xml/page_get_yourchange-SGP_blue.xml | 2 +- inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/inter/whatthecup/sgp/xml/page_get_yourchange-SGP_blue.xml b/inter/whatthecup/sgp/xml/page_get_yourchange-SGP_blue.xml index 21ec49b7..874b39b3 100644 --- a/inter/whatthecup/sgp/xml/page_get_yourchange-SGP_blue.xml +++ b/inter/whatthecup/sgp/xml/page_get_yourchange-SGP_blue.xml @@ -34,7 +34,7 @@ - Var DirImage = "ROOT/taobin_project/image/page_thankyou_en" + Var DirImage = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_thankyou_en" Else Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" diff --git a/inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml b/inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml index cac367af..c2fe3177 100644 --- a/inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml +++ b/inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml @@ -2484,6 +2484,8 @@ Var SELLONLINE = 1 Var EnoughChange = "yes" Var PayState1 = "Enable" +Var CoinAmount = 300 + From 685fae11ba9d5e58d3b0d83dbd8fc7973f0910e3 Mon Sep 17 00:00:00 2001 From: Pakin Date: Tue, 17 Sep 2024 15:55:27 +0700 Subject: [PATCH 7/7] SGP: Fix video not correct path --- inc/video.inc | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/inc/video.inc b/inc/video.inc index d8588235..fdbd8630 100644 --- a/inc/video.inc +++ b/inc/video.inc @@ -90,18 +90,33 @@ DEBUGVAR a_video_menu[ads_idx] If CountryName = "Singapore" Then If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then - Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + a_video_menu[ads_idx] + Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + a_video_menu[ads_idx] + Var DisplayAds = AdvTaobinMenu + ".mp4" + + DEBUGVAR PreviseXMLFileName2 + + If PreviseXMLFileName2 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml" Then + + DEBUGVAR CurrentXMLFileName2 + DEBUGVAR CurrentXMLFileName2 + DEBUGVAR PreviseXMLFileName2 + + Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] Var DisplayAds = AdvTaobinMenu + ".mp4" + EndIf + Else Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] Var DisplayAds = AdvTaobinMenu + ".mp4" EndIf If CurrentXMLFileName2 = "" Then + DEBUGVAR CountDownPauseVideo2 If CountDownPauseVideo2 < 2 Then Var AdvTaobinMenu = "/mnt/sdcard Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] Var DisplayAds = AdvTaobinMenu + ".mp4" Else + DEBUGVAR CurrentXMLFileName2 Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + a_video_menu[ads_idx] Var DisplayAds = AdvTaobinMenu + ".mp4" EndIf