diff --git a/inter/sgp/video/script_thank.ev b/inter/sgp/video/script_thank.ev new file mode 100644 index 00000000..a79dcdd2 --- /dev/null +++ b/inter/sgp/video/script_thank.ev @@ -0,0 +1,13 @@ +SAVELOG "For change size this file. New video" + +If EventTurnOn = 1 Then + + GetFileSizeK "taobin_project/inter/sgp/video/taobin_thank1_event.mp4" MainfileSize + DEBUGVAR MainfileSize + If MainfileSize = 6749397 Then + Var video_file_name = "ROOT/taobin_project/inter/sgp/video/taobin_thank1_event.mp4" + EndIf + +EndIf + + diff --git a/inter/sgp/video/script_video.ev b/inter/sgp/video/script_video.ev new file mode 100644 index 00000000..143f8b95 --- /dev/null +++ b/inter/sgp/video/script_video.ev @@ -0,0 +1,19 @@ +Var MainfileSize = 0 +Var EventTurnOn = 0 + + + + +DEBUGVAR MainfileSize +If SystemDateMonthInt = 12 Then + GetFileSizeK "taobin_project/inter/sgp/video/video_main_event.mp4" MainfileSize + DEBUGVAR MainfileSize + If MainfileSize = 9203607 Then + Var EventTurnOn = 1 + EndIf +EndIf + + +Var CountDownShowButton = 35 +Var ShowButtonClickFull = "Invisible" +Var VideoMainPage = "ROOT/taobin_project/inter/sgp/video/video_main.mp4" diff --git a/inter/sgp/video/taobin_thank1_event.mp4 b/inter/sgp/video/taobin_thank1_event.mp4 new file mode 100644 index 00000000..da4b90ff Binary files /dev/null and b/inter/sgp/video/taobin_thank1_event.mp4 differ diff --git a/inter/sgp/video/video_main.mp4 b/inter/sgp/video/video_main.mp4 new file mode 100644 index 00000000..cb1f6d59 Binary files /dev/null and b/inter/sgp/video/video_main.mp4 differ diff --git a/inter/sgp/video/video_main_event.mp4 b/inter/sgp/video/video_main_event.mp4 new file mode 100644 index 00000000..7c08a7b4 Binary files /dev/null and b/inter/sgp/video/video_main_event.mp4 differ diff --git a/inter/sgp/xml/event/script_common_for_open_promotion_xml.ev b/inter/sgp/xml/event/script_common_for_open_promotion_xml.ev index 80b25144..15ba0626 100644 --- a/inter/sgp/xml/event/script_common_for_open_promotion_xml.ev +++ b/inter/sgp/xml/event/script_common_for_open_promotion_xml.ev @@ -4,10 +4,10 @@ ; zone promote If OpenFromPageBoard = 1 Then - OpenInst 2 "ROOT/taobin_project/inter/aus/xml/page_catalog_group_recommend.lxml" + OpenInst 2 "ROOT/taobin_project/inter/sgp/xml/page_catalog_group_recommend.lxml" Else - Open "ROOT/taobin_project/inter/aus/xml/page_catalog_group_recommend.lxml" + Open "ROOT/taobin_project/inter/sgp/xml/page_catalog_group_recommend.lxml" EndIf Var OpenFromPageBoard = 0 diff --git a/inter/sgp/xml/event/tricker.ev b/inter/sgp/xml/event/tricker.ev index e2f87dcc..86028750 100644 --- a/inter/sgp/xml/event/tricker.ev +++ b/inter/sgp/xml/event/tricker.ev @@ -1,4 +1,4 @@ -; australia +; Singapore ;DEBUGVAR SystemDateMonthInt @@ -7,5 +7,3 @@ ; Reset flag away. -DEBUGVAR Propepsi99Enable -DEBUGVAR DisplayFormatFull \ No newline at end of file diff --git a/inter/sgp/xml/page_catalog_group_other.lxml b/inter/sgp/xml/page_catalog_group_other.lxml index f7d11108..336f2825 100644 --- a/inter/sgp/xml/page_catalog_group_other.lxml +++ b/inter/sgp/xml/page_catalog_group_other.lxml @@ -1181,7 +1181,7 @@ Var PD_CODE2 = "52-05-02-0035" Var PD_CODE3 = "52-05-03-0035" ; begin lang - Var aliasName[0] = "FLYING TURTLE\nENERGY DRINK SODA" + Var aliasName[0] = "TAO POWER DRINK\nSODA" Var aliasDesc[0] = "Energy drink, Soda, Ice" Var aliasName[1] = "เต่าทรงพลังโซดา" Var aliasDesc[1] = "เครื่องดื่มเต่าทรงพลัง โซดา" @@ -1201,7 +1201,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" - Var NameLang[1][0] = "FLYING TURTLE\nENERGY DRINK SODA" + Var NameLang[1][0] = "TAO POWER DRINK SODA" Var NameLang[1][1] = "เต่าทรงพลังโซดา" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -1268,9 +1268,9 @@ KanitMediumTTF 0x322B26 - FLYING TURTLE\nENERGY DRINK SODA + TAO POWER DRINK\nSODA เต่าทรงพลังโซดา - FLYING TURTLE\nENERGY DRINK SODA + TAO POWER DRINK\nSODA เต่าทรงพลังโซดา เต่าทรงพลังโซดา @@ -9827,7 +9827,7 @@ Var PD_CODE2 = "52-05-02-0034" Var PD_CODE3 = "52-05-03-0034" ; begin lang - Var aliasName[0] = "FLYING TURTLE\nENERGY DRINK" + Var aliasName[0] = "TAO POWER DRINK" Var aliasDesc[0] = "Energy drink & Ice" Var aliasName[1] = "เต่าทรงพลัง" Var aliasDesc[1] = "เครื่องดื่มเต่าทรงพลัง \n(มีคาเฟอีน)" @@ -9847,7 +9847,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" - Var NameLang[1][0] = "FLYING TURTLE ENERGY DRINK" + Var NameLang[1][0] = "TAO POWER DRINK" Var NameLang[1][1] = "เต่าทรงพลัง" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -9914,9 +9914,9 @@ KanitMediumTTF 0x322B26 - FLYING TURTLE\nENERGY DRINK + TAO POWER DRINK เต่าทรงพลัง - FLYING TURTLE\nENERGY DRINK + TAO POWER DRINK เต่าทรงพลัง เต่าทรงพลัง diff --git a/inter/sgp/xml/page_catalog_group_recommend.lxml b/inter/sgp/xml/page_catalog_group_recommend.lxml index 76896df6..792a0291 100644 --- a/inter/sgp/xml/page_catalog_group_recommend.lxml +++ b/inter/sgp/xml/page_catalog_group_recommend.lxml @@ -11274,7 +11274,7 @@ Var PD_CODE2 = "52-05-02-0035" Var PD_CODE3 = "52-05-03-0035" ; begin lang - Var aliasName[0] = "FLYING TURTLE\nENERGY DRINK SODA" + Var aliasName[0] = "TAO POWER DRINK\nSODA" Var aliasDesc[0] = "Energy drink, Soda, Ice" Var aliasName[1] = "เต่าทรงพลังโซดา" Var aliasDesc[1] = "เครื่องดื่มเต่าทรงพลัง โซดา" @@ -11294,7 +11294,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" - Var NameLang[1][0] = "FLYING TURTLE\nENERGY DRINK SODA" + Var NameLang[1][0] = "TAO POWER DRINK SODA" Var NameLang[1][1] = "เต่าทรงพลังโซดา" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -11361,9 +11361,9 @@ KanitMediumTTF 0x322B26 - FLYING TURTLE\nENERGY DRINK SODA + TAO POWER DRINK\nSODA เต่าทรงพลังโซดา - FLYING TURTLE\nENERGY DRINK SODA + TAO POWER DRINK\nSODA เต่าทรงพลังโซดา เต่าทรงพลังโซดา diff --git a/xml/menutab/start_up_inst_12.xml b/xml/menutab/start_up_inst_12.xml index 09c8ae34..6547c30d 100644 --- a/xml/menutab/start_up_inst_12.xml +++ b/xml/menutab/start_up_inst_12.xml @@ -3,6 +3,7 @@ 1920 + Var InstanceTabOpenFile12 = "ROOT/taobin_project/xml/menutab/start_up_inst_dummy.xml" 10000 diff --git a/xml/page_board.xml b/xml/page_board.xml index c7046065..b5014776 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -722,6 +722,10 @@ Var CountryName = "Australia" EndIf + If StrCountryShort = "SGP" Then + Var CountryName = "Singapore" + EndIf + EndIf @@ -745,6 +749,10 @@ TRY "/mnt/sdcard/coffeevending/taobin_project/inter/usaNY/video/script_video.ev" EndIf + If CountryName = "Singapore" Then + TRY "/mnt/sdcard/coffeevending/taobin_project/inter/sgp/video/script_video.ev" + EndIf + DEBUGVAR CountDownShowButton DEBUGVAR EventTurnOn @@ -894,6 +902,46 @@ EndIf + If CountryName = "Singapore" Then + + TRY "/mnt/sdcard/coffeevending/taobin_project/inter/sgp/video/script_video.ev" + + Var WebAppShow = "Invisible" + EnableLanguage "ENG" + SetLanguage "ENG" + LanguageControl "UpdateList" "-" + + Var InternationalEnable = 1 + Var show_eng = "true" + Var img_press_main_page = "ROOT/taobin_project/image/main_page_en/bp_main_page_start.png" + + Var ShowNetworkProblemText = "Network error. Payment Cash only." + + Var CountryRootPath = "ROOT/taobin_project/inter/sgp/" + + ar TextPriceMenuSize = 12 + Var TextPriceMenuY = 264 + Var TextPriceMenuBlendX = 180 + Var TextPriceMenuHotX = 48 + Var ShowButtonClick2 = "Enable" + Var ButtontoTopupMenu = "Invisible" + + Var PriceUnitText = "" + + Var MemberButtonFileName = "ROOT/taobin_project/image/main_page_en/bp_main_page_member.png" + Var show_eng_button_stage = "Invisible" + + Var CountDownShowButton = 35 + + Var XButtonMember = 384 + Var YButtonMember = 1695 + + If Not#LanguageLoaded = "" Then + LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/inter/sgp/menu/lang.tsv" + EndIf + + EndIf + DEBUGVAR InternationalEnable diff --git a/xml/page_payment_cash-SGP.xml b/xml/page_payment_cash-SGP.xml new file mode 100644 index 00000000..b7d6c929 --- /dev/null +++ b/xml/page_payment_cash-SGP.xml @@ -0,0 +1,2231 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + PlaySoundLag + + + SAVELOG "page_payment_cash-SGP.xml" + + Var cash_disable = "0" + READ_FILE "/mnt/sdcard/coffeevending/cash_disable" cash_disable + DEBUGVAR cash_disable + + ;If AdultFlag = 1 Then + ; Open "ROOT/taobin_project/xml/page_payment_camera.xml" + ;EndIf + + Var PreScaleCanculate = 100 + + Var CashlessPayFlag = 0 + Var RemainAmountStrENG = "" + Var AdultState = "Invisible" + Var AdultState1 = "Invisible" + Var AdultState2 = "Invisible" + Var AdultState3 = "Invisible" + + ;Var AdultFlag = 0 + Var AdultFlag2 = 0 + + If AdultFlag = 1 Then + + Var AdultFlag = 0 + + DEBUGVAR SystemDate + Var sdate = "" + Var sdate = SystemDate + Var sdateday = "" + Var sdatemonth = "" + Var sdateyear = "" + SPLIT sdate "/" 1 sdateday + SPLIT sdate "/" 2 sdatemonth + SPLIT sdate "/" 3 sdateyear + INT sdateday + INT sdatemonth + INT sdateyear + READCARDID + + Var AdultState = "Enable" + Var AdultState1 = "Enable" + + Var countAdultS2 = 0 + Var AdultFlag2 = 1 + EndIf + + Var ReqPayInfoFlag2 = 0 + + + DEBUGVAR QRCODETMP + + DEBUGVAR IsSmoRet + Var countClick2 = 0 + ;SAVELOG SelectDrink + ;SAVELOG NameDrink + ;SAVELOG NameDrinkTH + ;SAVELOG DrinkDescription + SAVELOG PriceDrink + ;SAVELOG topping1 + ;SAVELOG topping2 + ;SAVELOG topping3 + DEBUGVAR SelectDrink + + DEBUGVAR video_menu_0 + + + Var FlagQROpened = 0 + Var PayInfoCFlag = 0 + Var ActionOKCase = 0 + Var VendingCampaign = Seeker.IntVendingCampaign + Var Seeker.VendingCampaign = Seeker.IntVendingCampaign + + Var PayAmount = PriceDrink + + Var LOADING_STATE = "Invisible" + ; Below original + ; On open + + + + Var cancelState = "Invisible" + + + Var alphaState = "Invisible" + Var alphaState2 = "Invisible" + Var alphaState3 = "Invisible" + + + Var CoinInFlag = 0 + ;Var CoinAmount = 0 + Var CancelFlag = 0 + Var CancelCounter = 0 + Var CoinInCounter = 0 + Var CancelNumber = 3 + + + + Var PayAmount = PriceDrink + Var RemainAmount = PayAmount - Seeker.IntVendingCampaign + Var RemainAmount = RemainAmount - CoinAmount + Var RemainAmount = RemainAmount - Seeker.IntVendingCredit + Var RemainAmountStr = "" + RemainAmount + Var Timeout = 0 + Var PayOK = 0 + Var ChangeOK = 0 + Var CoinInOK = 0 + + Var RemainAmountKeep = 0 + + Var showRemaining = charOfBaht + RemainAmountStr + Var showRemaining !assigned StringFmt( RemainAmount, DisplayFormatFull, PreScaleConvertShow ) + + Var VendingREFID = "" + + Var TelephoneNumber = "0899999999" + Var ServiceType = "coffee" + + Var ServiceCredit = SelectDrink + Var ServiceAmount2 = PayAmount + Var Seeker.ServiceAmount2 = PayAmount + Var ServiceCharge = 0 + Var Donate = "" + Var SuggestID = "" + Var CancleState = "Enable" + + Var Seeker.VendingDiscount = DiscountDrink + + + Var CashTextWarning = "" + Var QRErrorState = "Invisible" + Var QRErrorFlag = 0 + + + SAVELOG SelectDrink + + SAVELOG QRChannel + SAVELOG QRCODE99 + DEBUGVAR QRCODE99 + + SAVELOG VendingCampaign + SAVELOG Seeker.VendingCode + SAVELOG Seeker.CodeChannel + + + If Seeker.VendingCode = "C00" Then + Var Seeker.CodeChannel = 0 + EndIf + + Var ExtendData = Seeker.ExtendData + + DEBUGVAR QRCODE99KBANK + + If RoadShow = "true" Then + Var PayState1 = "Enable" + Var PayState2 = "Invisible" + Var PayState3 = "Invisible" + Var PayState4 = "Invisible" + Var PayState5 = "Invisible" + Var PayState6 = "Invisible" + Var showRemaining = "Free" + + Else + Var PayState1 = "Enable" + + If cash_disable = "1" Then + Var PayState1 = "Press" + EndIf + + Var PayState3 = "Enable" + + If Seeker.IntVendingCampaign = 0 Then + Var PayState2 = "Enable" + Var PayState4 = "Enable" + Var PayState5 = "Enable" + Var PayState6 = "Enable" + Else + SAVELOG "Cash only IntVendingCampaign" + Var PayState2 = "Disable" + Var PayState4 = "Disable" + Var PayState5 = "Enable" + Var PayState6 = "Disable" + Var PayState3 = "Disable" + EndIf + + + + DEBUGVAR CoinAmount + If CoinAmount > 0 Then + SAVELOG "Cash only CoinAmount" + Var PayState2 = "Disable" + Var PayState3 = "Disable" + Var PayState4 = "Disable" + Var PayState5 = "Disable" + Var PayState6 = "Disable" + Var CoinInFlag = 1 + EndIf + + If Seeker.IntVendingCredit > 0 Then + SAVELOG "Cash only IntVendingCredit" + Var PayState2 = "Disable" + Var PayState4 = "Disable" + Var PayState5 = "Disable" + Var PayState6 = "Disable" + Var PayState3 = "Disable" + EndIf + + + + + Var showRemaining = charOfBaht + RemainAmountStr + + If show_eng = "true" Then + Var showRemaining = charOfBaht + RemainAmountStr + Else + Var showRemaining = RemainAmountStr + " บาท" + EndIf + + Var showRemaining !assigned StringFmt( RemainAmount, DisplayFormatFull, PreScaleConvertShow ) + + EndIf + + + + + Var Seeker.PayWithQR = 0 + Var NoGotoMenupage = "false" + 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 + + Var X_CASH = 216 + + If RoadShow = "true" Then + Var X_CASH = 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 + EndIf + + If GetFreeFromError = 1 Then + Var Seeker.FreeVendingCampaign = 1 + CoinVending OFF + If Seeker = "curr" Then + + MakeDrinkV1 SelectDrink SelectSugarID + Var TxRef1 = "" + CreateTxRef1 TxRef1 + Else + Var TxRef1 = "" + CreateTxRef1 TxRef1 + + Var DrinkPaid = SelectDrink + Var PaidPaymentFromNextStage = 1 + + EndIf + Open "ROOT/taobin_project/xml/page_thankyou.xml" + + EndIf + + + + If CoinInOK = 0 Then + + + + Var RemainAmount = PayAmount - CoinAmount + Var RemainAmount = RemainAmount - Seeker.IntVendingCampaign + Var RemainAmount = RemainAmount - Seeker.IntVendingCredit + Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign + Var SumCoinAmount = CoinAmount + Seeker.IntVendingCredit + If SumCoinAmount >= PayAmount Then + + SAVELOG "CoinInOk First" + DEBUGVAR CoinAmount + DEBUGVAR Seeker.IntVendingCampaign + DEBUGVAR Seeker.IntVendingCredit + + ;Var VendingQRCode = "ERROR" + CoinVending OFF + Var Canout = SumCoinAmount - PayAmount + If Canout = 0 Then + Var RemainAmountStr = 0 + Var RemainAmountStr !assigned StringFmt( Canout, DisplayFormatFull, PreScaleConvertShow ) + Else + + If show_eng = "true" Then + ;Var RemainAmountStr = "Change " + Canout + ;Var RemainAmountStr = RemainAmountStr + "###size=90" + Var RemainAmountStr !assigned StringFmt( Canout, DisplayFormatFull, PreScaleConvertShow ) + Var RemainAmountStr = "Change " + RemainAmountStr + Var RemainAmountStr = RemainAmountStr + "###size=90" + Else + Var RemainAmountStr = "ทอน " + Canout + EndIf + EndIf + + + Var CancleState = "Disable" + Var CoinInOK = 1 + Var CoinInCounter = 0 + + + + Else + Var RemainAmountStr = "" + RemainAmount + Var RemainAmountStr !assigned StringFmt( RemainAmount, DisplayFormatFull, PreScaleConvertShow ) + EndIf + + ;Var RemainAmount = 0 + + Var showRemaining = charOfBaht + RemainAmountStr + If RoadShow = "true" Then + Var showRemaining = "Free" + EndIf + + Var showRemaining !assigned StringFmt( RemainAmount, DisplayFormatFull, PreScaleConvertShow ) + + EndIf + + If show_eng = "true" Then + 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" + + Else + 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" + EndIf + + + Var EnoughChange = "yes" + + Var SELLONLINE = 0 + If SELLSTATUS = "SELLONLINE" Then + Var SELLONLINE = 1 + EndIf + If SELLSTATUS = "SELLNOCASH" Then + Var SELLONLINE = 1 + EndIf + + If SELLONLINE = 0 Then + SAVELOG "Cash only NetworkStatus down" + + Var PayState2 = "Disable" + Var PayState3 = "Disable" + Var PayState4 = "Disable" + Var PayState5 = "Disable" + Var PayState6 = "Disable" + + Var PayOfflineMode = 1 + + Var ShowNetworkProblem = "Enable" + Var ShowButtonClick2 = "Invisible" + Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด" + + Else + Var PayOfflineMode = 0 + + Var ShowNetworkProblem = "Invisible" + Var ShowNetworkProblemText = "" + EndIf + + DEBUGVAR NOCashFlag + + If NOCashFlag = 1 Then + Var PayState1 = "Disable" + EndIf + ; override + Var PayState1 = "Invisible" + + ;cancel order + If SELLSTATUS = "DEACTIVE" Then + Var SELLONLINE = 1 + EndIf + + ;If NetworkStatus = "ACTIVATE" Then + ; Var ShowNetworkProblem = "Invisible" + ; Var ShowNetworkProblemText = "" + ; + ;Else + ; Var ShowNetworkProblem = "Enable" + ; Var ShowButtonClick2 = "Invisible" + ; Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด" + ;EndIf + + + + Var pay_with_credit_image = DirImage + "/bp_pay_with_credit.png" + Var pay_with_chanel_text = DirImage + "/text_1.png" + + + ;If DisableUsingCode = "true" Then + If DisableUsingCode = "-" Then + SAVELOG "Diable code because using topping." + Var PayState2 = "Disable" + Var pay_with_code_image = DirImage + "/bd_pay_with_code.png" + Else + + If Seeker.IntVendingCredit > 0 Then + + Var pay_with_code_image = DirImage + "/bp_pay_with_code.png" + Var pay_with_credit_image = DirImage + "/bp_pay_with_credit.png" + + Var pay_with_chanel_text = DirImage + "/text_2.png" + + Else + + Var pay_with_code_image = DirImage + "/bp_pay_with_code.png" + EndIf + EndIf + + Machine DoorClose + + + If ShoppyPayEnable = "true" Then + Else + Var PayState5 = "Disable" + Var PayState6 = "Disable" + EndIf + + + If web_readyOK = "true" Then + + Var web_readyOK = "false" + + If web_payment = "CASH" Then + Var alphaState2 = "Enable" + EndIf + + EndIf + + __CMD "prepar-cup-from-order" 0 "-" "-" + + Var PayState5 = "Disable" + + ;Open "ROOT/taobin_project/xml/page_page_camera.xml" + + ;Var PayState4 = "Invisible" + + Var TOP_ROW = 1266 + Var BOT_ROW = 1488 + + Var X_PS2 = 324 + ;duit + Var X_PS3 = 199 + ;ali + Var X_PS4 = 434 + Var X_PS5 = 669 + Var X_PS6 = 554 + + + If EnableCash = "true" Then + Var PayState1 = "Enable" + Var TOP_ROW = 1276 + Var BOT_ROW = 1488 + + Var X_PS2 = 434 + Var X_PS3 = 434 + Var X_PS4 = 652 + Var X_PS5 = X_CASH + Var X_PS6 = 652 + EndIf + + + + + + Var VendingQRTypeResult = "" + + DEBUGVAR ECommerceQR + SPLIT ECommerceQR "/" 5 VendingQRTypeResult + + + If ActionOKCase = 0 Then + If VendingREFID = "" Then + SAVELOG "menu_page4-QR.xml > ActOK_REFID" + Refresh + Else + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + SAVELOG "menu_page4-QR.xml > ActOK_make" + ;Var VendingQRCode = "ERROR" + ;Coin STANDBY + VendingQR OFF + CoinVending OFF + + + If ReqPayInfoFlag2 = 1 Then + DEBUGVAR VendingBank + Var Seeker.CampaignPayChanel = "malaymbb" + EndIf + If ReqPayInfoFlag2 = 2 Then + Var Seeker.CampaignPayChanel = "alipay" + EndIf + + + If Seeker = "curr" Then + MakeDrinkV1 SelectDrink SelectSugarID + ;Var TxRef1 = "" + ;CreateTxRef1 TxRef1 + EndIf + Var Seeker.PayWithQR = 1 + Var Seeker.VendingTSID = VendingTSID + + + Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + Var BrewingTextThai = "เตรียมแก้ว" + Open "ROOT/taobin_project/xml/page_thankyou.xml" + + EndIf + + If ReqPayInfoFlag = 1 Then + If VendingQRTypeResult = "MBB:2" Then + Var CashTextWarning = "" + Var QRErrorState = "Invisible" + Var QRCODE99KBANK = SessionID + Var QRCODE99KBANK = QRCODE99KBANK + Ext1a + SAVELOG Ext1a + SAVELOG QRCODE99KBANK + Var QRCODE99KBANK = QRCODE99KBANK + Ext21 + Var QRCODETMP = QRCODE99KBANK + Var ReqPayInfoFlag = 0 + Var ReqPayInfoFlag2 = 1 + SAVELOG QRCODE99KBANK + SAVELOG Ext21 + + Var QRCODE99 = QRCODE99KBANK + Var LOADING_STATE = "Invisible" + + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_mobile.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_mobile.mp3" + EndIf + + EndIf + + EndIf + + If ReqPayInfoFlag = 2 Then + If VendingQRTypeResult = "ALI:2" Then + Var CashTextWarning = "" + Var QRErrorState = "Invisible" + Var QRCODE99Shoppy = SessionID + Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1a + SAVELOG Ext1a + SAVELOG QRCODE99Shoppy + Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21 + Var ReqPayInfoFlag = 0 + Var ReqPayInfoFlag2 = 2 + SAVELOG QRCODE99Shoppy + SAVELOG Ext21 + + Var QRCODE99 = QRCODE99Shoppy + Var LOADING_STATE = "Invisible" + + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + EndIf + + EndIf + EndIf + + Else + Var PayInfoCFlag = 1 + EndIf + + + If VendingCashless = "OK" Then + DEBUGVAR CashlessCode + Var Timeout = 0 + + Var QRErrorState = "Invisible" + Var LOADING_STATE = "Invisible" + + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + + VendingQR OFF + CoinVending OFF + Refresh + + If Seeker = "curr" Then + MakeDrinkV1 SelectDrink SelectSugarID + EndIf + Var Seeker.CreditCard = 1 + Var Seeker.CreditCardRef = CreditCardRef + + Open "ROOT/taobin_project/xml/page_thankyou.xml" + + EndIf + + + + + + If ActionOKCase = 0 Then + If ReqPayInfoFlag = 1 Then + Var QRErrorFlag = 1 + If alphaState = "Enable" Then + Var QRErrorState = "Enable" + Var LOADING_STATE = "Invisible" + EndIf + EndIf + If ReqPayInfoFlag = 2 Then + Var QRErrorFlag = 1 + If alphaState = "Enable" Then + Var QRErrorState = "Enable" + Var LOADING_STATE = "Invisible" + EndIf + EndIf + If ReqPayInfoFlag = 3 Then + Var QRErrorFlag = 1 + If alphaState = "Enable" Then + Var QRErrorState = "Enable" + Var LOADING_STATE = "Invisible" + EndIf + EndIf + If ReqPayInfoFlag = 4 Then + Var QRErrorFlag = 1 + If alphaState = "Enable" Then + Var QRErrorState = "Enable" + Var LOADING_STATE = "Invisible" + EndIf + EndIf + Else + Var PayInfoCFlag = 1 + EndIf + + + If VendingCashless = "ERROR" Then + Var Timeout = 0 + + ;Var QRErrorFlag = 1 + If alphaState = "Enable" Then + Var QRErrorState = "Enable" + Var LOADING_STATE = "Invisible" + EndIf + + EndIf + + + + Refresh + + + + + + Var CreditCardRef = "" + GenHashWithTimeStamp CreditCardRef + DEBUGVAR VendingCashless + + If VendingCashless = "READY" Then + Var QRCODE99 = "" + Var Timeout = 0 + Var QRErrorState = "Invisible" + Var QR_POPUP = "/img_popup8-2.png" + Var VendingCashless = "-" + Var LOADING_STATE = "Enable" + Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign + CashlessPay RemainAmountX CreditCardRef + Var CashlessPayFlag = 1 + EndIf + + Refresh + + + + + 1000 + + If ReadyForBrew = "false" Then + SAVELOG "Back to main1" + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + + EndIf + + + If CamFlag = 1 Then + Var CamCount = CamCount + 1 + If CamCount > 2 Then + facecompare 10 + Var CamFlag = 0 + Var CamCount = 0 + EndIf + EndIf + + + + If AdultState2 = "Enable" Then + Var countAdultS2 = countAdultS2 + 1 + + If countAdultS2 > 60 Then + Var AdultState2 = "Invisible" + Var AdultState3 = "Enable" + EndIf + Else + Var countAdultS2 = 0 + EndIf + + + Var Timeout = Timeout + 1 + + + If Timeout >= 120 Then + Var alphaState = "Invisible" + + + If RoadShow = "true" Then + Else + Var PayState3 = "Disable" + Var PayState5 = "Disable" + EndIf + + Var LOADING_STATE = "Invisible" + Var QRErrorState = "Invisible" + + EndIf + + + If Timeout > 210 Then + If ActionOKCase = 1 Then + Var PayInfoCFlag = 1 + EndIf + EndIf + + If PayInfoCFlag = 1 Then + If Seeker.CodeChannel = 1 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + Seeker.ExtendData + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumber = "0899999999" + Var ServiceType = "coffee" + Var ECommerce = "" + Var ECommerce = ECommerce + PriceDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + DiscountDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SessionID2 + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SelectDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.VendingCode + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.CodeNumber + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + "C:" + Var ECommerce = ECommerce + Seeker.IntVendingCampaign + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + ;Var Timeout = 0 + EndIf + If Seeker = "curr" Then + Open "ROOT/taobin_project/xml/page_catalog.xml" + Else + + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + EndIf + EndIf + + + If TestLoopMakeDrink = 1 Then + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf + + + + If CoinInOK = 1 Then + Var CoinInCounter = CoinInCounter + 1 + If CoinInCounter = 1 Then + + SAVELOG "CoinInOk OK" + + ;Var ChangeOK = 1 + Var Timeout = 180 + Var PayOK = 1 + + EndIf + EndIf + + Var stringLog = "Timeout " + Timeout + Var stringLog = stringLog + " PayOK" + Var stringLog = stringLog + PayOK + + + If Timeout > 180 Then + If PayOK = 1 Then + + If Seeker = "curr" Then + + MakeDrinkV1 SelectDrink SelectSugarID + Var TxRef1 = "" + CreateTxRef1 TxRef1 + Else + Var TxRef1 = "" + CreateTxRef1 TxRef1 + Var DrinkPaid = SelectDrink + Var PaidPaymentFromNextStage = 1 + + EndIf + + Open "ROOT/taobin_project/xml/page_thankyou.xml" + + Else + If CancelFlag = 0 Then + SAVELOG "Timeout > 180 s." + + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + + CoinVending OFF + Var CancelFlag = 1 + Var cancelState = "Enable" + + If CashlessPayFlag = 1 Then + Var CashlessPayFlag = 0 + CashlessReq FAIL + EndIf + + Var CancelCounter = 0 + If CoinAmount = 0 Then + + If Seeker.IntVendingCredit > 0 Then + Var BmiYear = Seeker.IntVendingCredit + Var GetScore = "useCredit" + AddData 24 Seeker.TNumberTaobinCredit BmiYear PointCrm GetScore + Var Seeker.IntVendingCredit = 0 + Var Seeker.CurrCreditUse = 0 + EndIf + + + + If Seeker.IntVendingCampaign = 0 Then + VendingQR OFF + If Seeker = "curr" Then + Open "ROOT/taobin_project/xml/page_catalog.xml" + Else + + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + EndIf + EndIf + EndIf + + EndIf + EndIf + EndIf + + + If CancelFlag = 1 Then + + If Seeker.IntVendingCredit > 0 Then + Var BmiYear = Seeker.IntVendingCredit + Var GetScore = "useCredit" + AddData 24 Seeker.TNumberTaobinCredit BmiYear PointCrm GetScore + Var Seeker.IntVendingCredit = 0 + Var Seeker.CurrCreditUse = 0 + EndIf + + Var CancelCounter = CancelCounter + 1 + If CancelCounter = CancelNumber Then + ;Change CoinAmount + If CoinAmount > 0 Then + If Seeker.StoreCreditFlag = 1 Then + Var ChangeOK = 1 + Else + Change CoinAmount + EndIf + + Else + If ActionOKCase = 0 Then + Var ActionOKCase = 1 + Var PayInfoCFlag = 1 + EndIf + EndIf + + VendingQR OFF + EndIf + + If CancelCounter >= 43 Then + Var ChangeOK = 1 + EndIf + + ; This copy in file menu_catalog.xml + + If ChangeOK = 1 Then + If ActionOKCase = 0 Then + + If Seeker.TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + Else + Var TelephoneNumber = Seeker.TNumberTaobinCredit + Var PayO2 = Seeker.CoffeePinNumber + EndIf + + Var VendingDiscount = 0 + Var VendingCampaign = 0 + Var ServiceType = "credit" + Var SessionID2 = SelectDrink + Var ServiceCredit = "coffee" + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + Var PayCredit = 1 + + Var ActionOKCase = 1 + If Seeker = "curr" Then + If Seeker.IntVendingCampaign = 0 Then + If Seeker = "curr" Then + Open "ROOT/taobin_project/xml/page_catalog.xml" + Else + + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + EndIf + EndIf + Else + ;wait ack + EndIf + EndIf + EndIf + + EndIf + + + Refresh + TimerReset + + + + If ChangeStatus = "payout-end" Then + Var ChangeOK = 1 + EndIf + + + + + DEBUGVAR IDCardStatus + DEBUGVAR IDCardReady + DEBUGVAR IDCardData + DEBUGVAR IDBirthdate + + If CancelFlag = 0 Then + + If AdultFlag2 = 1 Then + + If IDCardStatus = "OK" Then + If IDCardReady = "OK" Then + If IDCardData = "START" Then + + Var AdultState2 = "Enable" + Var AdultState1 = "Invisible" + Var AdultState3 = "Invisible" + + Refresh + EndIf + EndIf + EndIf + + If IDCardStatus = "OK" Then + If IDCardReady = "OK" Then + If IDCardData = "ERROR" Then + Var AdultState2 = "Invisible" + Var AdultState3 = "Enable" + + Refresh + EndIf + EndIf + EndIf + + If IDCardStatus = "ERROR" Then + Var AdultState2 = "Invisible" + Var AdultState3 = "Enable" + + Refresh + EndIf + + If IDCardStatus = "OK" Then + If IDCardReady = "OK" Then + If IDCardData = "DONE" Then + + ;Var birthDate = IDBirthdate + Var StrYear = "" + Var StrMon = "" + Var StrDay = "" + + SUBSTRING IDBirthdate 0 4 StrYear + SUBSTRING IDBirthdate 4 6 StrMon + SUBSTRING IDBirthdate 6 8 StrDay + + INT StrYear + INT StrMon + INT StrDay + + Var Adult20 = 0 + + + DEBUGVAR StrYear + DEBUGVAR StrMon + DEBUGVAR StrDay + + DEBUGVAR sdatemonth + DEBUGVAR sdateday + + Var sdateyear = sdateyear + 543 + Var AgeNumber = sdateyear - StrYear + DEBUGVAR AgeNumber + + If AgeNumber >= 20 Then + + If AgeNumber = 20 Then + If sdatemonth > StrMon Then + Var Adult20 = 1 + Else + If sdatemonth = StrMon Then + If sdateday >= StrDay Then + Var Adult20 = 1 + EndIf + EndIf + EndIf + Else + Var Adult20 = 1 + EndIf + + If Adult20 = 1 Then + Var AdultState3 = "Invisible" + Var AdultState2 = "Invisible" + Var AdultState1 = "Invisible" + Var AdultState = "Invisible" + ;CoinVending XBILL + Open "ROOT/taobin_project/xml/page_payment_camera.xml" + Refresh + + Else + Var AdultState2 = "Invisible" + Var AdultState3 = "Enable" + Refresh + EndIf + + Else + Var AdultState2 = "Invisible" + Var AdultState3 = "Enable" + Refresh + EndIf + + + Var AdultFlag2 = 1 + + EndIf + EndIf + EndIf + + + EndIf + + EndIf + + + + + + + TimerReset + + If CoinInFlag = 0 Then + ;VendingQR OFF + Var alphaState = "Invisible" + EndIf + + + + Var CoinInFlag = 1 + + + + If ViewBill > 0 Then + + If PayOfflineMode = 1 Then + CoinVending BILLREJECT + Else + + If Seeker.StoreCreditFlag = 1 Then + CoinVending BILLSTACKALL + Else + + + + Var RemainAmount = PayAmount - CoinAmount + Var RemainAmount = RemainAmount - Seeker.IntVendingCampaign + Var RemainAmount = RemainAmount - Seeker.IntVendingCredit + + If ViewBill > RemainAmount Then + Var RemainAmountKeep = ViewBill - RemainAmount + Else + Var RemainAmountKeep = ViewBill + EndIf + + Var Timeout = 0 + + + Var RemainAmountStr = "" + RemainAmount + Var showRemaining = charOfBaht + RemainAmountStr + + Var RemainAmountStr !assigned StringFmt( RemainAmount, DisplayFormatFull, PreScaleConvertShow ) + Var showRemaining !assigned StringFmt( RemainAmount, DisplayFormatFull, PreScaleConvertShow ) + + + + + Var alphaState3 = "Enable" + + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/The_change_has_run_out.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/The_change_has_run_out.mp3" + EndIf + + EndIf + + EndIf + + + Else + + + If CoinInOK = 0 Then + + + + + + Var RemainAmount = PayAmount - CoinAmount + Var RemainAmount = RemainAmount - Seeker.IntVendingCampaign + Var RemainAmount = RemainAmount - Seeker.IntVendingCredit + + Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign + Var SumCoinAmount = SumCoinAmount + Seeker.IntVendingCredit + If SumCoinAmount >= PayAmount Then + ;Var VendingQRCode = "ERROR" + CoinVending OFF + VendingQR OFF + Var Canout = SumCoinAmount - PayAmount + If Canout = 0 Then + Var RemainAmountStr = 0 + Var RemainAmountStr !assigned StringFmt( Canout, DisplayFormatFull, PreScaleConvertShow ) + Else + If show_eng = "true" Then + ;Var RemainAmountStr = "Change " + Canout + ;Var RemainAmountStr = RemainAmountStr + "###size=90" + Var RemainAmountStr !assigned StringFmt( Canout, DisplayFormatFull, PreScaleConvertShow ) + Var RemainAmountStr = "Change " + RemainAmountStr + Var RemainAmountStr = RemainAmountStr + "###size=90" + Else + Var RemainAmountStr = "ทอน " + Canout + EndIf + EndIf + + + Var CancleState = "Disable" + Var CoinInOK = 1 + Var CoinInCounter = 0 + + + + Else + Var RemainAmountStr = "" + RemainAmount + Var RemainAmountStr !assigned StringFmt( RemainAmount, DisplayFormatFull, PreScaleConvertShow ) + EndIf + + Var Timeout = 0 + + ;Var RemainAmount = 0 + Var showRemaining = charOfBaht + RemainAmountStr + Var showRemaining !assigned StringFmt( RemainAmount, DisplayFormatFull, PreScaleConvertShow ) + Var alphaState2 = "Enable" + + + EndIf + + EndIf + + + + + Refresh + + + If CoinInFlag = 1 Then + If CoinInOK = 0 Then + If CancelFlag = 0 Then + SAVELOG "VDCancle > Cancle Order." + Machine CancelWepApp + CoinVending OFF + Var CancelFlag = 1 + Var cancelState = "Enable" + Var CancelCounter = 0 + ;If CoinAmount = 0 Then + ; Open "ROOT/taobin_project/xml/page_catalog.xml" + ;EndIf + + Var showRemaining = "Refund" + ;Open "ROOT/taobin_project/xml/page_catalog.xml" + + If FlagQROpened = 1 Then + Var CancelNumber = 12 + EndIf + + EndIf + EndIf + ;VendingQR OFF + Refresh + + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + EndIf + + + + + + + + + 144 + 413 + pay_with_chanel_text + + + +; back + + + + + + 375 + 623 + 331 + 435 + PictureDrink + + + + + 375 + 623 + eval( + If IsSmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + + "ROOT/taobin_project/image/topping2/blender_icon.png" + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 1065 + 1080 + Center + 72 + KanitMediumTTF + 0xB78F24 + showRemaining + + + + + + 0 + 938 + 1080 + Center + 72 + KanitMediumTTF + 0x513C2F + showname + + + + 0 + 1022 + 1080 + Center + 24 + KanitLightTTF + 0x6F5F51 + showdesc + + +; QR popup + + 0 + 380 + alphaState + "ROOT/taobin_project/image/page_payment/alpha.png" + + + + 249 + 748 + alphaState + "ROOT/taobin_project/inter/mys/image/payment/img_popup1.png" + + + + + + 249 + 748 + alphaState + Var( DirImage + QR_POPUPX ) + + + + + 267 + 1065 + LOADING_STATE + Var( DirImage + "/loadingText.png" ) + + + + + + + + + + +; begin cash popup + + 0 + 380 + alphaState2 + "ROOT/taobin_project/image/page_payment/alpha.png" + + + + 182 + 748 + alphaState2 + Var( DirImage2 + "/img_popup11-MYR.png" ) + + + + + 0 + 380 + AdultState + "ROOT/taobin_project/image/page_payment/alpha.png" + + + + + 249 + 751 + AdultState1 + Var( DirImage + "/img_popup4.png" ) + + + + 838 + 1350 + eval( + Var return = "Invisible" + + If AdultState1 = "Enable" Then + If AdultState2 = "Invisible" Then + Var return = "Enable" + EndIf + EndIf + + ) + + + + "TimerSec=3" + + "ROOT/taobin_project/image/anmi/arrow_1.png" + + + + + + 249 + 751 + AdultState2 + Var( DirImage + "/img_popup4-2.png" ) + + + + 249 + 751 + AdultState3 + Var( DirImage + "/img_popup4-3.png" ) + + + + + + + + + + 0 + 1041 + 144 + Center + 1080 + KanitRegularTTF + alphaState2 + 0xDE794E + RemainAmountStr + +; end case popup + + + 0 + 380 + alphaState3 + "ROOT/taobin_project/image/page_payment/alpha.png" + + + + 182 + 748 + alphaState3 + Var( DirImage2 + "/img_popup12.png" ) + + + + + + +; +; 0 +; 1041 +; 100 +; Center +; 1080 +; KanitRegularTTF +; alphaState3 +; 0xDE794E +; RemainAmountKeep +; + + + + 270 + 1000 +550 + Center + 30 + KanitRegularTTF + alphaState + 0xFF0000 + CashTextWarning + + + + + 483 + 791 + alphaState + LOGO_CH + + + + + 445 + 958 + 170 + 170 + "0xFFFFFF" +; "0xE61A5F" + alphaState + testservice + + + + + + 0 + 380 + cancelState + Var( DirImage + "/CancelOrder.png" ) + + +; +; 493 +; 960 +; 94 +; 94 +; cancelState +; Var( DirImage + "/loading.gif" ) +; + +; +; 493 +; 1195 +; 94 +; 94 +; AdultState2 +; Var( DirImage + "/loading.gif" ) +; + + + 493 + 968 + 94 + 94 + LOADING_STATE + Var( DirImage + "/loading.gif" ) + + + + + + Open "/media/bt/xml/security_alarm.xml" + + +; +; 0 +; 1880 +; 14 +; "Left" +; 1080 +; KanitThinTTF +; 0x513C2F +; SelectDrink +; + + + + + + + 5 + 1880 + 24 + Center + 1080 + RobotoRegular + 0xFFFFFF + ShowNetworkProblemText + + + + +; Test QR + + Var QR_POPUP = "/img_popup12.png" + + Var QRCODE99 = "" + + Var LOADING_STATE = "Invisible" + + Var FlagQROpened = 1 + Var PayInfoCFlag = 0 + + Var testservice = "Herr" + Var alphaState = "Enable" + Refresh + + + + + Var testservice = "Herr" + Open CurrentXMLFileName2 + + + + + + diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index be836b92..3cae55e5 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -28,6 +28,10 @@ Open "ROOT/taobin_project/xml/page_payment_cash-AUS.xml" EndIf + If CountryName = "Singapore" Then + Open "ROOT/taobin_project/xml/page_payment_cash-SGP.xml" + EndIf + Var PreScaleCanculate = 1 diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 7d6dfc18..96250cba 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "8.10" - Var XMLPageVersionInt = 810 + Var XMLPageVersion = "8.12" + Var XMLPageVersionInt = 812 ;Oreo Var OreoGuarantee = 0