diff --git a/image/page_payment/bn_pay_with_code.png b/image/page_payment/bn_pay_with_code.png index e02d4a77..8d21c3df 100644 Binary files a/image/page_payment/bn_pay_with_code.png and b/image/page_payment/bn_pay_with_code.png differ diff --git a/image/page_payment/bp_pay_with_code.png b/image/page_payment/bp_pay_with_code.png index 617f3f62..408645c2 100644 Binary files a/image/page_payment/bp_pay_with_code.png and b/image/page_payment/bp_pay_with_code.png differ diff --git a/image/page_payment_en/page_payment/bn_pay_with_code.png b/image/page_payment_en/page_payment/bn_pay_with_code.png index 68ca3dd7..4614e691 100644 Binary files a/image/page_payment_en/page_payment/bn_pay_with_code.png and b/image/page_payment_en/page_payment/bn_pay_with_code.png differ diff --git a/image/page_payment_en/page_payment/bp_pay_with_code.png b/image/page_payment_en/page_payment/bp_pay_with_code.png index 754dd37b..bed500cc 100644 Binary files a/image/page_payment_en/page_payment/bp_pay_with_code.png and b/image/page_payment_en/page_payment/bp_pay_with_code.png differ diff --git a/xml/page_back_to_main.xml b/xml/page_back_to_main.xml index e70e5124..c8e61ffd 100644 --- a/xml/page_back_to_main.xml +++ b/xml/page_back_to_main.xml @@ -8,6 +8,22 @@ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml" TopView "hide" + + If TNumberTaobinMember = "" Then + + Else + If PayWithQR = 1 Then + Var VendingTSID = VendingTSIDTmp + EndIf + + Var BmiYear = PointTaobinStr + Var PointCrm = "pdpa1" + Var GetScore = VendingTSID + AddData 11 TNumberTaobinMember BmiYear PointCrm GetScore + Var TNumberTaobinMember = "" + Var VendingTSID = "" + + EndIf Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml" diff --git a/xml/page_board.xml b/xml/page_board.xml index 03902635..a05e4bdf 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -11,7 +11,7 @@ OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/topview_button_back_main.xml" Var FileNumber = 1 - Var taobin_version = "1.13" + Var taobin_version = "1.18" ; 1.00 is ; On open @@ -20,7 +20,6 @@ Var charOfBaht = "฿" Var KanitTTF = "ROOT/taobin_project/font/Kanit/Kanit-Light.ttf" Var KanitMediaTTF = "ROOT/taobin_project/font/Kanit/Kanit-Medium.ttf" - Var KanitBoldTTF = "ROOT/taobin_project/font/Kanit/Kanit-Bold.ttf" Var RobotoBold = "ROOT/taobin_project/font/Roboto/Roboto-Bold.ttf" @@ -46,7 +45,7 @@ Var ShowButtonClick = "Enable" Var ShowButtonClickFull = "Invisible" - SAVELOG DisplayType + ;SAVELOG DisplayType If DisplayType = "2" Then Var XPosiShowCountDownBrew = 693 @@ -64,14 +63,17 @@ EndIf + If NeedUpgrade = "true" Then + Open "ROOT/taobin_project/xml/page_show_error.xml" + EndIf Var TestLoopMakeDrink = 0 Var TestLoopSuccess = 0 Var TestLoopFailed = 0 - Var IgnoreNetCore = "false" - SAVELOG SaleProfile + ;Var IgnoreNetCore = "false" + ;SAVELOG SaleProfile STRCONTAIN "whey" SaleProfile WheyShow STRCONTAIN "cocktail" SaleProfile CocktailShow @@ -83,13 +85,25 @@ Var ShowPrice = "Invisible" EndIf - SAVELOG WheyShow - SAVELOG CocktailShow - SAVELOG RoadShow - SAVELOG ShowPrice + ;SAVELOG WheyShow + ;SAVELOG CocktailShow + ;SAVELOG RoadShow + ;SAVELOG ShowPrice Var CountDownShowButton = 35 + Var CountDownPauseVideo = 0 + Var NextPage = "-" + + If StartUpExt = "false" Then + + Else + Machine Initial + Var StartUpExt = "false" + EndIf + + StopLongPlay + 1000 @@ -127,10 +141,16 @@ EndIf - - Var CountDownShowButton = CountDownShowButton - 1 - + If NeedUpgrade = "true" Then + Open "ROOT/taobin_project/xml/page_show_error.xml" + EndIf + + If CountDownShowButton > 0 Then + Var CountDownShowButton = CountDownShowButton - 1 + EndIf + + ;SAVELOG MachineStage ;SAVELOG CountDownShowButton ;SAVELOG ShowButtonClickFull @@ -147,13 +167,29 @@ Refresh EndIf + If CountDownPauseVideo > 0 Then + ; ignore + ;Var CountDownPauseVideo = CountDownPauseVideo - 1 + If CountDownPauseVideo = 0 Then + + Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml" + + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_choose_drink1.xml" + + TopView "show" + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" + + EndIf + EndIf TimerReset - SAVELOG ShowButtonClick - Var CountDownShowButton = 35 + ;SAVELOG ShowButtonClick + Var CountDownShowButton = 35 + Var CountDownPauseVideo = 6 Refresh @@ -172,8 +208,8 @@ @@ -230,8 +266,14 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Open "ROOT/taobin_project/xml/page_board.xml" + + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_check_memeber.xml" + TopView "show" + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" + + diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 0c9d0684..4d9ba036 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -23,10 +23,20 @@ ;Var DirImage = "ROOT/taobin_project/image/collect_point1" EndIf + + Var waitAckPay = 0 + Var VendingTSIDTmp = "" + If PayWithQR = 1 Then + Var VendingTSIDTmp = VendingTSID + EndIf + + + + If ActionOKCase = 1 Then If CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" @@ -64,6 +74,7 @@ Var ActionOKCase = 2 Else + Open "ROOT/taobin_project/xml/page_back_to_main.xml" EndIf @@ -74,6 +85,12 @@ EndIf EndIf + + If waitAckPay = 1 Then + Open "ROOT/taobin_project/xml/page_drinkok.xml" + EndIf + + @@ -158,31 +175,56 @@ Var ChangeTimeout = ChangeTimeout + 1 EndIf + If waitAckPay = 1 Then + If Timeout > 60 Then + Var VendingTSID = "" + Open "ROOT/taobin_project/xml/page_drinkok.xml" + + EndIf + EndIf + If ChangeOK = 2 Then If ActionOKCase = 0 Then - Var TelephoneNumber = "0899999999" + + If TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + Else + Var TelephoneNumber = TNumberTaobinCredit + Var PayO2 = 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 - ;Open "ROOT/xml/page_closeMaintenance.xml" + Var ActionOKCase = 1 EndIf EndIf If ChangeTimeout > 30 Then If ActionOKCase = 0 Then + If TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + Else + Var TelephoneNumber = TNumberTaobinCredit + Var PayO2 = CoffeePinNumber + EndIf + Var VendingDiscount = 0 Var VendingCampaign = 0 - Var TelephoneNumber = "0899999999" + ;Var TelephoneNumber = "0899999999" Var ServiceType = "credit" Var SessionID2 = SelectDrink Var ServiceCredit = "coffee" Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate - ;Open "ROOT/xml/menu_closeMaintenance.xml" + Var ActionOKCase = 1 EndIf EndIf @@ -229,35 +271,30 @@ If MachineState_Result = 1 Then - Var Timeout = 0 - Var ProcessText = "" - Var TelephoneNumber = "0899999999" - Var ServiceType = "coffee" - Var ServiceCredit = SelectDrink - Var SuggestID = "" + If waitAckPay = 0 Then - If PayWithQR = 0 Then - If CodeChannel = 1 Then - Var SessionID2 = SessionID2 + "/" - Var SessionID2 = SessionID2 + CodeNumber - Var SessionID2 = SessionID2 + "/" - Var SessionID2 = SessionID2 + VendingCode - Var SessionID2 = SessionID2 + "/" - Var SessionID2 = SessionID2 + SelectDrink - Var SessionID2 = SessionID2 + "/" - Var SessionID2 = SessionID2 + BoxID - Var SessionID2 = SessionID2 + "/" - Var SessionID2 = SessionID2 + "S" - Var SessionID2 = SessionID2 + "/" - Var SessionID2 = SessionID2 + CodeNumber - Var SessionID2 = SessionID2 + "/" + Var waitAckPay = 1 + Var Timeout = 0 + Var ProcessText = "" - Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + If TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" Else - If CodeChannel = 2 Then + Var TelephoneNumber = TNumberTaobinCredit + Var PayO2 = CoffeePinNumber + EndIf + + + Var ServiceType = "coffee" + Var ServiceCredit = SelectDrink + Var SuggestID = "" + + If PayWithQR = 0 Then + If CodeChannel = 1 Then Var SessionID2 = SessionID2 + "/" - Var SessionID2 = SessionID2 + "" + Var SessionID2 = SessionID2 + CodeNumber Var SessionID2 = SessionID2 + "/" Var SessionID2 = SessionID2 + VendingCode Var SessionID2 = SessionID2 + "/" @@ -272,27 +309,67 @@ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate Else - Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + If CodeChannel = 2 Then + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + "" + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + VendingCode + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + SelectDrink + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + BoxID + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + "S" + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + CodeNumber + Var SessionID2 = SessionID2 + "/" + + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + Else + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + EndIf EndIf - EndIf - Else - If ChangeFlag2 = 1 Then - Var TelephoneNumber = "0899999999" - Var VendingDiscount = 0 - Var VendingCampaign = 0 - Var ServiceType = "credit" - Var SessionID2 = SelectDrink - Var ServiceCredit = "coffee" - Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + Else + If ChangeFlag2 = 1 Then + Var TelephoneNumber = "0899999999" + Var VendingDiscount = 0 + Var VendingCampaign = 0 + Var ServiceType = "credit" + Var SessionID2 = SelectDrink + Var ServiceCredit = "coffee" + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + Else + + If StoreCreditFlag = 1 Then + + + Var VendingDiscount = 0 + Var VendingCampaign = 0 + Var ServiceType = "credit" + Var SessionID2 = SelectDrink + Var ServiceCredit = "coffee" + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + + + Else + + ;no wait ack pay + Var waitAckPay = 0 + + EndIf + + + EndIf + EndIf - EndIf - Var ServiceSuccess = "yes" - Open "ROOT/taobin_project/xml/page_drinkok.xml" + If waitAckPay = 0 Then + Open "ROOT/taobin_project/xml/page_drinkok.xml" + EndIf EndIf @@ -306,7 +383,12 @@ If CodeChannel = 0 Then If ChangeFlag = 0 Then Var ChangeFlag = 1 - Change ServiceAmount2 + + If StoreCreditFlag = 1 Then + Var ChangeOK = 2 + Else + Change ServiceAmount2 + EndIf EndIf Else @@ -315,7 +397,12 @@ If ChangeFlag = 0 Then Var ChangeFlag = 1 Var ServiceAmount2 = ServiceAmount2 - IntVendingCampaign - Change ServiceAmount2 + + If StoreCreditFlag = 1 Then + Var ChangeOK = 2 + Else + Change ServiceAmount2 + EndIf EndIf Else @@ -342,7 +429,11 @@ If ChangeFlag = 0 Then Var ChangeFlag = 1 Var ServiceAmount2 = CoinAmount - Change CoinAmount + If StoreCreditFlag = 1 Then + Var ChangeOK = 2 + Else + Change ServiceAmount2 + EndIf EndIf Else @@ -359,7 +450,11 @@ If ChangeFlag = 0 Then Var ChangeFlag = 1 Var ServiceAmount2 = CoinAmount - Change CoinAmount + If StoreCreditFlag = 1 Then + Var ChangeOK = 2 + Else + Change ServiceAmount2 + EndIf EndIf Else diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml index 240c5002..a4ded5a0 100644 --- a/xml/page_catalog.xml +++ b/xml/page_catalog.xml @@ -223,7 +223,7 @@ SoundVolume ; eng - ;Open "ROOT/xml/service_menu.xml" + Open "ROOT/taobin_project/xml/page_check_member.xml" diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml index ccf2ef74..66409734 100644 --- a/xml/page_collect_point_1.xml +++ b/xml/page_collect_point_1.xml @@ -20,6 +20,11 @@ Var DirImage = "ROOT/taobin_project/image/collect_point1" EndIf + Var number7 = "" + Var number8 = "" + Var number9 = "" + Var number10 = "" + 1000 @@ -86,6 +91,23 @@ If TelNumLen >= 10 Then Var Tel_Confirm_State = "Enable" EndIf + + If TelNumLen = 7 Then + Var number7 = "1" + EndIf + + If TelNumLen = 8 Then + Var number8 = "1" + EndIf + + If TelNumLen = 9 Then + Var number9 = "1" + EndIf + + If TelNumLen = 10 Then + Var number10 = "1" + EndIf + @@ -106,6 +128,22 @@ If TelNumLen >= 10 Then Var Tel_Confirm_State = "Enable" EndIf + + If TelNumLen = 7 Then + Var number7 = "2" + EndIf + + If TelNumLen = 8 Then + Var number8 = "2" + EndIf + + If TelNumLen = 9 Then + Var number9 = "2" + EndIf + + If TelNumLen = 10 Then + Var number10 = "2" + EndIf @@ -126,6 +164,22 @@ If TelNumLen >= 10 Then Var Tel_Confirm_State = "Enable" EndIf + + If TelNumLen = 7 Then + Var number7 = "3" + EndIf + + If TelNumLen = 8 Then + Var number8 = "3" + EndIf + + If TelNumLen = 9 Then + Var number9 = "3" + EndIf + + If TelNumLen = 10 Then + Var number10 = "3" + EndIf @@ -146,6 +200,22 @@ If TelNumLen >= 10 Then Var Tel_Confirm_State = "Enable" EndIf + + If TelNumLen = 7 Then + Var number7 = "4" + EndIf + + If TelNumLen = 8 Then + Var number8 = "4" + EndIf + + If TelNumLen = 9 Then + Var number9 = "4" + EndIf + + If TelNumLen = 10 Then + Var number10 = "4" + EndIf @@ -166,6 +236,22 @@ If TelNumLen >= 10 Then Var Tel_Confirm_State = "Enable" EndIf + + If TelNumLen = 7 Then + Var number7 = "5" + EndIf + + If TelNumLen = 8 Then + Var number8 = "5" + EndIf + + If TelNumLen = 9 Then + Var number9 = "5" + EndIf + + If TelNumLen = 10 Then + Var number10 = "5" + EndIf @@ -186,6 +272,22 @@ If TelNumLen >= 10 Then Var Tel_Confirm_State = "Enable" EndIf + + If TelNumLen = 7 Then + Var number7 = "6" + EndIf + + If TelNumLen = 8 Then + Var number8 = "6" + EndIf + + If TelNumLen = 9 Then + Var number9 = "6" + EndIf + + If TelNumLen = 10 Then + Var number10 = "6" + EndIf @@ -206,6 +308,22 @@ If TelNumLen >= 10 Then Var Tel_Confirm_State = "Enable" EndIf + + If TelNumLen = 7 Then + Var number7 = "7" + EndIf + + If TelNumLen = 8 Then + Var number8 = "7" + EndIf + + If TelNumLen = 9 Then + Var number9 = "7" + EndIf + + If TelNumLen = 10 Then + Var number10 = "7" + EndIf @@ -226,6 +344,22 @@ If TelNumLen >= 10 Then Var Tel_Confirm_State = "Enable" EndIf + + If TelNumLen = 7 Then + Var number7 = "8" + EndIf + + If TelNumLen = 8 Then + Var number8 = "8" + EndIf + + If TelNumLen = 9 Then + Var number9 = "8" + EndIf + + If TelNumLen = 10 Then + Var number10 = "8" + EndIf @@ -246,6 +380,22 @@ If TelNumLen >= 10 Then Var Tel_Confirm_State = "Enable" EndIf + + If TelNumLen = 7 Then + Var number7 = "9" + EndIf + + If TelNumLen = 8 Then + Var number8 = "9" + EndIf + + If TelNumLen = 9 Then + Var number9 = "9" + EndIf + + If TelNumLen = 10 Then + Var number10 = "9" + EndIf @@ -269,6 +419,21 @@ TimerReset Refresh + If TelNumLen = 7 Then + Var number7 = "0" + EndIf + + If TelNumLen = 8 Then + Var number8 = "0" + EndIf + + If TelNumLen = 9 Then + Var number9 = "0" + EndIf + + If TelNumLen = 10 Then + Var number10 = "0" + EndIf @@ -364,7 +529,7 @@ 236 699 - Var( DirImage + "/text_1.png") + Var( DirImage + "/text_2.png") ; Advertise diff --git a/xml/page_collect_point_2.xml b/xml/page_collect_point_2.xml index ab9b6b9a..ec8e5e51 100644 --- a/xml/page_collect_point_2.xml +++ b/xml/page_collect_point_2.xml @@ -15,31 +15,24 @@ Var CoffeePoint = 10 Open "ROOT/taobin_project/xml/page_show_consent.xml" EndIf + + Var TaobinLevel = 0 1000 Var CountDownBrewing = CountDownBrewing - 1 - ; run test; - ;If CountDownBrewing = 40 Then - ; Open "ROOT/taobin_project/xml/page_drinkok.xml" - ;EndIf - ;If CountDownBrewing = 0 Then - ; Open "ROOT/taobin_project/xml/page_drinkok.xml" - ;EndIf - Var ShowCountDownBrewing = CountDownBrewing Var Timeout = Timeout + 1 If Timeout > 30 Then - ;Var CoffeePoint = 1 - ;Open "ROOT/taobin_project/xml/page_show_consent.xml" - + If StepGetPoint = 0 Then Open "ROOT/taobin_project/xml/page_show_consent.xml" Else + Var TaobinLevel = 0 Var CoffeePoint = 1 Open "ROOT/taobin_project/xml/page_collect_point_3.xml" EndIf @@ -65,21 +58,56 @@ Open "ROOT/taobin_project/xml/page_show_consent.xml" Else Var StepGetPoint = 1 - GETACCEXT TelephoneNumber 5 + GETACCEXT TelephoneNumber 14 Open "ROOT/taobin_project/xml/page_collect_point_2.xml" EndIf Else If Ext1a = "" Then - Var CoffeePoint = 1 + Var CoffeePoint = 0 Open "ROOT/taobin_project/xml/page_collect_point_3.xml" Else + + If Ext1a = "ok" Then + + Var TaobinName = Ext1d + Var TaobinCoupons = Ext1g + Var TaobinExpire = Ext1f + + Var TNumberTaobinMemberXXX = TelephoneNumber + + Trim TNumberTaobinMemberXXX 3 + Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + "-XXX-" + Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number7 + Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number8 + Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number9 + Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number10 + + + Var PointTaobin = PayAmount / 20 + + + Var PointTaobinStr = "" + PointTaobin + Var PointTaobinStr = PointTaobinStr + "/" + Var PointTaobinStr = PointTaobinStr + PointTaobin + + + Var CoffeePointRank = Ext1b + INT CoffeePointRank + + Var CoffeePoint1 = Ext1c + INT CoffeePoint1 + + Var CoffeePoint = PointTaobin + CoffeePoint1 + Open "ROOT/taobin_project/xml/page_collect_point_3.xml" + + Else + Var CoffeePoint = 0 + Open "ROOT/taobin_project/xml/page_collect_point_3.xml" + EndIf + - Var CoffeePoint1 = Ext27 - INT CoffeePoint1 - - Var CoffeePoint = 1 + CoffeePoint1 - Open "ROOT/taobin_project/xml/page_collect_point_3.xml" + EndIf EndIf diff --git a/xml/page_collect_point_3.xml b/xml/page_collect_point_3.xml index 8d398f16..65ede026 100644 --- a/xml/page_collect_point_3.xml +++ b/xml/page_collect_point_3.xml @@ -10,12 +10,13 @@ Var Timeout = 0 ;CoffeePoint - ;Var CoffeePoint = 5 + ;Var CoffeePoint = 30 Var BmiYear = "0/0/0/0/0/0/0/0/0/1" Var PointCrm = "pdpa1" Var GetScore = "" - AddData 4 TelephoneNumber BmiYear PointCrm GetScore - + Var TNumberTaobinMember = TelephoneNumber + ;AddData 4 TelephoneNumber BmiYear PointCrm GetScore + ;Add after pay Var CoffeePointStr = CoffeePoint @@ -30,101 +31,140 @@ Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" EndIf - Var stamp1 = "ROOT/taobin_project/image/display_point_en/btp_stamp_1.png" - - If CoffeePoint >= 2 Then - Var stamp2 = "ROOT/taobin_project/image/display_point_en/btp_stamp_2.png" - Else - Var stamp2 = "ROOT/taobin_project/image/display_point/btn_stamp_2.png" - EndIf - - If CoffeePoint >= 3 Then - Var stamp3 = "ROOT/taobin_project/image/display_point_en/btp_stamp_3.png" - Else - Var stamp3 = "ROOT/taobin_project/image/display_point/btn_stamp_3.png" - EndIf - - If CoffeePoint >= 4 Then - Var stamp4 = "ROOT/taobin_project/image/display_point_en/btp_stamp_4.png" - Else - Var stamp4 = "ROOT/taobin_project/image/display_point/btn_stamp_4.png" - EndIf - - If CoffeePoint >= 5 Then - Var stamp5 = "ROOT/taobin_project/image/display_point_en/btp_stamp_5.png" - Else - Var stamp5 = "ROOT/taobin_project/image/display_point/btn_stamp_5.png" - EndIf - - If CoffeePoint >= 6 Then - Var stamp6 = "ROOT/taobin_project/image/display_point_en/btp_stamp_6.png" - Else - Var stamp6 = "ROOT/taobin_project/image/display_point/btn_stamp_6.png" - EndIf - - If CoffeePoint >= 7 Then - Var stamp7 = "ROOT/taobin_project/image/display_point_en/btp_stamp_7.png" - Else - Var stamp7 = "ROOT/taobin_project/image/display_point/btn_stamp_7.png" + Var CoffeePointTmp = CoffeePoint + + If CoffeePoint > 29 Then + Var Timeout = 18 + Var CoffeePointTmp = 30 EndIf - If CoffeePoint >= 8 Then - Var stamp8 = "ROOT/taobin_project/image/display_point_en/btp_stamp_8.png" - Else - Var stamp8 = "ROOT/taobin_project/image/display_point/btn_stamp_8.png" - EndIf - If CoffeePoint >= 9 Then - Var stamp9 = "ROOT/taobin_project/image/display_point_en/btp_stamp_9.png" - Else - Var stamp9 = "ROOT/taobin_project/image/display_point/btn_stamp_9.png" - EndIf + Var pImage = CoffeePointTmp * 20 + Var pImage = pImage / 30 + Var pImageStr = "/taobinP" + Var pImageStr = pImageStr + pImage + + Var pImageStr = pImageStr + ".png" + + Var pointStr = "" + Var pointStr = pointStr + CoffeePointTmp + Var pointStr = pointStr + "/" + Var pointStr = pointStr + "30" + + + Var PointDiff = 400 - CoffeePointRank + + Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าเดิน จนถึง " + Var TaobinLevelDesc2 = "สะสมแสตมป์อีก " + + Var TaobinLevelDesc2 = TaobinLevelDesc2 + PointDiff + Var TaobinLevelDesc2 = TaobinLevelDesc2 + " ดวง ก่อน " + + + Var TaobinLevelDesc3 = "ตอนนี้คุณมีคูปองแลกเครื่องดื่มฟรีเหลืออยู่ " + Var TaobinLevelDesc3 = TaobinLevelDesc3 + TaobinCoupons + Var TaobinLevelDesc3 = TaobinLevelDesc3 + " ใบ" + + + Var TaobinExpireDay = "" + Var TaobinExpireMonth = "" + Var TaobinExpireYear = "" + - If CoffeePoint >= 10 Then - Var stamp10 = "ROOT/taobin_project/image/display_point_en/btp_stamp_10.png" - Else - Var stamp10 = "ROOT/taobin_project/image/display_point/btn_stamp_10.png" + SPLIT TaobinExpire "/" 1 TaobinExpireDay + SPLIT TaobinExpire "/" 2 TaobinExpireMonth + SPLIT TaobinExpire "/" 3 TaobinExpireYear + + If TaobinExpireMonth = "01" Then + Var TaobinExpireMonth = "ม.ค." EndIf - If CoffeePoint >= 11 Then - Var stamp11 = "ROOT/taobin_project/image/display_point_en/btp_stamp_11.png" - Else - Var stamp11 = "ROOT/taobin_project/image/display_point/btn_stamp_11.png" + If TaobinExpireMonth = "02" Then + Var TaobinExpireMonth = "ก.พ." EndIf - - Var stamp_free = "ROOT/taobin_project/image/display_point/btp_stamp_free.png" - - If CoffeePoint == 11 Then - Var Timeout = 8 + If TaobinExpireMonth = "03" Then + Var TaobinExpireMonth = "มี.ค." EndIf + + If TaobinExpireMonth = "04" Then + Var TaobinExpireMonth = "เม.ย." + EndIf + + If TaobinExpireMonth = "05" Then + Var TaobinExpireMonth = "พ.ค." + EndIf + + If TaobinExpireMonth = "06" Then + Var TaobinExpireMonth = "มิ.ย." + EndIf + + If TaobinExpireMonth = "07" Then + Var TaobinExpireMonth = "ก.ค." + EndIf + + If TaobinExpireMonth = "08" Then + Var TaobinExpireMonth = "ส.ค." + EndIf + + If TaobinExpireMonth = "09" Then + Var TaobinExpireMonth = "ก.ย." + EndIf + + If TaobinExpireMonth = "10" Then + Var TaobinExpireMonth = "ต.ค." + EndIf + + If TaobinExpireMonth = "11" Then + Var TaobinExpireMonth = "พ.ย." + EndIf + + If TaobinExpireMonth = "12" Then + Var TaobinExpireMonth = "ธ.ค." + EndIf + + INT TaobinExpireYear + INT TaobinExpireDay + + Var TaobinExpireYear = TaobinExpireYear + 543 + + + Var ExpireStrTmp = "" + Var ExpireStrTmp = ExpireStrTmp + TaobinExpireDay + Var ExpireStrTmp = ExpireStrTmp + " " + Var ExpireStrTmp = ExpireStrTmp + TaobinExpireMonth + Var ExpireStrTmp = ExpireStrTmp + " " + Var ExpireStrTmp = ExpireStrTmp + TaobinExpireYear + + Var TaobinLevelDesc1 = TaobinLevelDesc1 + ExpireStrTmp + Var TaobinLevelDesc2 = TaobinLevelDesc2 + ExpireStrTmp + Var TaobinLevelDesc2 = TaobinLevelDesc2 + " เพื่อเลื่อนขั้นเป็นเต่าบิน" + - ; for test - ;Var CoffeePoint = CoffeePoint + 1 + + + 1000 Var CountDownBrewing = CountDownBrewing - 1 - ; run test; - ;If CountDownBrewing = 40 Then - ; Open "ROOT/taobin_project/xml/page_drinkok.xml" - ;EndIf - ;If CountDownBrewing = 0 Then - ; Open "ROOT/taobin_project/xml/page_drinkok.xml" - ;EndIf + Var ShowCountDownBrewing = CountDownBrewing - ;Open "ROOT/taobin_project/xml/page_collect_point_3.xml" + Var Timeout = Timeout + 1 - If Timeout > 10 Then + If Timeout > 30 Then + + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + ; goto lid straw - If CoffeePoint == 11 Then + If CoffeePoint > 29 Then Open "ROOT/taobin_project/xml/page_display_get_free.xml" Else Open "ROOT/taobin_project/xml/page_lid_straw.xml" @@ -144,8 +184,7 @@ - ; - + ;Open "ROOT/taobin_project/xml/page_check_member2.xml" @@ -182,91 +221,53 @@ ; + + + 158 665 Var( DirImage + "/img_popup1.png" ) + + 158 + 665 + Var( DirImage + "/img_popup3.png" ) + + + + + 243 + 722 + Var( DirImage + "/text5.png" ) + + + + 243 + 857 + Var( DirImage + "/text4.png" ) + + + + + 624 + 734 + Var( DirImage + "/taoLevel1.png" ) + ; - - 253 - 992 - stamp1 - + - 445 - 992 - stamp2 + 252 + 1341 + Var( DirImage + pImageStr ) - - 637 - 992 - stamp3 - - -; - - 253 - 1152 - stamp4 - - - - 445 - 1152 - stamp5 - - - - 637 - 1152 - stamp6 - - -; - - 253 - 1322 - stamp7 - - - - 445 - 1322 - stamp8 - - - - 637 - 1322 - stamp9 - - -; - - 253 - 1463 - stamp10 - - - - 445 - 1463 - stamp11 - - - - 637 - 1463 - stamp_free - + + + ; ; 420 ; 638 @@ -301,6 +323,80 @@ ; CoffeePoint ; + + 250 + 1241 + 434 + 64 + KanitSemiBoldTTF + 0xDE794E + pointStr + + + + + + 250 + 745 + 35 + 1000 + KanitRegularTTF + 0x513C2F + TaobinName + + + + 250 + 800 + 20 + 1000 + KanitRegularTTF + 0x746253 + TNumberTaobinMemberXXX + + + + 250 + 890 + 50 + 120 + KanitRegularTTF + 0xDE794E + CoffeePointRank + + + + 250 + 990 + 25 + 1000 + KanitRegularTTF + 0xDE794E + TaobinLevelDesc1 + + + + 250 + 1020 + 20 + 1000 + KanitRegularTTF + 0x746253 + TaobinLevelDesc2 + + + + 300 + 1500 + 25 + 1000 + KanitRegularTTF + 0x746253 + TaobinLevelDesc3 + + + + ; 751 @@ -320,5 +416,7 @@ + + \ No newline at end of file diff --git a/xml/page_display_get_free.xml b/xml/page_display_get_free.xml index e53e5740..7a388502 100644 --- a/xml/page_display_get_free.xml +++ b/xml/page_display_get_free.xml @@ -16,23 +16,22 @@ Var DirImage = "ROOT/taobin_project/image/display_get_free" Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" EndIf + + Var TaobinLevel = 0 + + Var MemberState1 = "Enable" + Var MemberState2 = "Invisible" + 1000 Var CountDownBrewing = CountDownBrewing - 1 - ; run test; - ;If CountDownBrewing = 40 Then - ; Open "ROOT/taobin_project/xml/page_drinkok.xml" - ;EndIf - ;If CountDownBrewing = 0 Then - ; Open "ROOT/taobin_project/xml/page_drinkok.xml" - ;EndIf - + Var ShowCountDownBrewing = CountDownBrewing - ;Open "ROOT/taobin_project/xml/page_collect_point_3.xml" + Var Timeout = Timeout + 1 If Timeout > 10 Then @@ -93,14 +92,22 @@ 158 665 + MemberState1 Var( DirImage + "/img_popup1.png" ) + + 158 + 665 + MemberState2 + Var( DirImage + "/img_popup2.png" ) + + ; - - 751 - 413 - "ROOT/taobin_project/image/page_doing/img2.png" - +; +; 751 +; 413 +; "ROOT/taobin_project/image/page_doing/img2.png" +; ; - - XPosiShowCountDownBrew - 470 - End - 153 - 88 - RobotoBold - 0x513C2F - ShowCountDownBrewing - +; +; XPosiShowCountDownBrew +; 470 +; End +; 153 +; 88 +; RobotoBold +; 0x513C2F +; ShowCountDownBrewing +; diff --git a/xml/page_drinkfail.xml b/xml/page_drinkfail.xml index 0f3b2029..dbfa0141 100644 --- a/xml/page_drinkfail.xml +++ b/xml/page_drinkfail.xml @@ -23,63 +23,7 @@ 800 - If ChangeOK = 2 Then - If ActionOKCase = 0 Then - Var TelephoneNumber = "0899999999" - Var VendingDiscount = 0 - Var VendingCampaign = 0 - Var ServiceType = "credit" - Var SessionID2 = SelectDrink - Var ServiceCredit = "coffee" - Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate - ;Open "ROOT/xml/page_closeMaintenance.xml" - Var ActionOKCase = 1 - EndIf - EndIf - - If ChangeOK = 3 Then - Var Change3Timeout = Change3Timeout + 1 - If Change3Timeout > 3 Then - Open "ROOT/xml/page_closeMaintenance.xml" - EndIf - EndIf - - If ChangeOK = 4 Then - If ActionOKCase = 0 Then - Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + sugarID - Var SessionID2 = SessionID2 + "000" - 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 + "C00" - Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + CodeNumber - Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + "C" - 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 - Var ActionOKCase = 2 - EndIf - EndIf + diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml index fbf277a3..19de8633 100644 --- a/xml/page_drinkok.xml +++ b/xml/page_drinkok.xml @@ -23,6 +23,22 @@ Var VideoPlayFile = VideoPlayFile + "24" Var VideoPlayFile = VideoPlayFile + VideoFileEnd Var Timeout = 0 + + If TNumberTaobinMember = "" Then + + Else + If PayWithQR = 1 Then + Var VendingTSID = VendingTSIDTmp + EndIf + + Var BmiYear = PointTaobinStr + Var PointCrm = "pdpa1" + Var GetScore = VendingTSID + AddData 11 TNumberTaobinMember BmiYear PointCrm GetScore + Var TNumberTaobinMember = "" + Var VendingTSID = "" + EndIf + 500 diff --git a/xml/page_payment.xml b/xml/page_payment.xml index cd649e70..447308b9 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -37,6 +37,12 @@ Var FreeVendingCampaign = 0 Var CodeChannel = 0 Var CoinVendingOnFlag = 0 + + Var StoreCreditFlag = 0 + Var pageStoreCredit0 = 0 + Var TNumberTaobinCredit = "" + Var TNumberTaobinMember = "" + Var VendingTSIDTmp = "" If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment" @@ -67,11 +73,14 @@ Var CountStepPackPayment = CountStepPackPayment + 1 If CountStepPackPayment = 1 Then + Open "ROOT/taobin_project/xml/page_collect_point_1.xml" + SAVELOG ExtendData If GetPayInfoFlag = 0 Then If RoadShow = "false" Then - CoinVending ON + ;CoinVending ON + CoinVending XBILL EndIf diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 34a50089..2a17c5e6 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -29,6 +29,7 @@ ; On open Var alphaState = "Invisible" Var alphaState2 = "Invisible" + Var alphaState3 = "Invisible" Var CoinInFlag = 0 @@ -46,6 +47,8 @@ Var PayOK = 0 Var ChangeOK = 0 Var CoinInOK = 0 + + Var RemainAmountKeep = 0 Var showRemaining = charOfBaht + RemainAmountStr @@ -59,7 +62,7 @@ Var ServiceCharge = 0 Var Donate = "" Var SuggestID = "" - Var CancleState = "Enable" + Var CancleState = "Invisible" Var VendingDiscount = DiscountDrink @@ -114,6 +117,7 @@ Var PayState1 = "Enable" Var PayState2 = "Invisible" Var PayState3 = "Invisible" + Var PayState4 = "Invisible" Var showRemaining = "Free" Else @@ -124,10 +128,12 @@ Var PayState2 = "Disable" EndIf Var PayState3 = "Enable" + Var PayState4 = "Enable" If CoinAmount > 0 Then Var PayState2 = "Disable" Var PayState3 = "Disable" + Var PayState4 = "Disable" Var CoinInFlag = 1 EndIf Var showRemaining = charOfBaht + RemainAmountStr @@ -219,6 +225,9 @@ Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" EndIf + + Var EnoughChange = "yes" + @@ -372,7 +381,12 @@ If CancelCounter = CancelNumber Then ;Change CoinAmount If CoinAmount > 0 Then - Change CoinAmount + If StoreCreditFlag = 1 Then + Var ChangeOK = 1 + Else + Change CoinAmount + EndIf + Else If ActionOKCase = 0 Then Var ActionOKCase = 1 @@ -391,6 +405,15 @@ If ChangeOK = 1 Then If ActionOKCase = 0 Then + + If TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + Else + Var TelephoneNumber = TNumberTaobinCredit + Var PayO2 = CoffeePinNumber + EndIf + Var VendingDiscount = 0 Var VendingCampaign = 0 Var ServiceType = "credit" @@ -452,43 +475,71 @@ Var alphaState = "Invisible" EndIf - Var CoinInFlag = 1 + ;If StoreCreditFlag = 1 Then + ; Var ViewBill = 0 + ;EndIf + + If ViewBill > 0 Then - If CoinInOK = 0 Then Var RemainAmount = PayAmount - CoinAmount Var RemainAmount = RemainAmount - IntVendingCampaign - Var SumCoinAmount = CoinAmount + IntVendingCampaign - If SumCoinAmount >= PayAmount Then - ;Var VendingQRCode = "ERROR" - CoinVending OFF - VendingQR OFF - Var Canout = SumCoinAmount - PayAmount - If Canout = 0 Then - Var RemainAmountStr = 0 - Else - Var RemainAmountStr = "ทอน " + Canout - EndIf - - - Var CancleState = "Disable" - Var CoinInOK = 1 - Var CoinInCounter = 0 - + If ViewBill > RemainAmount Then + Var RemainAmountKeep = ViewBill - RemainAmount Else - Var RemainAmountStr = "" + RemainAmount + Var RemainAmountKeep = ViewBill EndIf - Var Timeout = 0 - ;Var RemainAmount = 0 - Var showRemaining = charOfBaht + RemainAmountStr - Var alphaState2 = "Enable" + + + Var alphaState3 = "Enable" + + + Else + Var CoinInFlag = 1 + + If CoinInOK = 0 Then + + Var RemainAmount = PayAmount - CoinAmount + Var RemainAmount = RemainAmount - IntVendingCampaign + Var SumCoinAmount = CoinAmount + IntVendingCampaign + If SumCoinAmount >= PayAmount Then + ;Var VendingQRCode = "ERROR" + CoinVending OFF + VendingQR OFF + Var Canout = SumCoinAmount - PayAmount + If Canout = 0 Then + Var RemainAmountStr = 0 + Else + Var RemainAmountStr = "ทอน " + Canout + EndIf + + + Var CancleState = "Disable" + Var CoinInOK = 1 + Var CoinInCounter = 0 + + + + Else + Var RemainAmountStr = "" + RemainAmount + EndIf + + Var Timeout = 0 + + ;Var RemainAmount = 0 + Var showRemaining = charOfBaht + RemainAmountStr + Var alphaState2 = "Enable" + + + EndIf + + EndIf - EndIf Refresh @@ -579,20 +630,25 @@ If alphaState = "Invisible" Then - ;Var PayState1 = "PressForever" - ;Var PayState2 = "Enable" - ;Var QRChannel = 0 - ;Open "ROOT/taobin_project/xml/page_payment_cash.xml" - Var alphaState2 = "Enable" - If RoadShow = "true" Then - Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" - Var MachineStage = "make-drink" - Var BrewingTextThai = "เตรียมแก้ว" - MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" - ;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate - + If EnoughChange = "yes" Then + + Var alphaState2 = "Enable" + + If RoadShow = "true" Then + Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + Var MachineStage = "make-drink" + Var BrewingTextThai = "เตรียมแก้ว" + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + ;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + + EndIf + Else + + Var alphaState3 = "Enable" + Refresh + EndIf EndIf @@ -600,7 +656,7 @@ + + + + 0 1041 @@ -837,6 +925,65 @@ ; 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 + + + + + 399 diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml index 7b300a88..65f9b35b 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -92,6 +92,7 @@ If IntVendingCampaign >= PayAmount Then ;Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Var VendingCampaign = PayAmount Var FreeVendingCampaign = 1 CoinVending OFF ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" @@ -142,10 +143,12 @@ Else Var FreeVendingCampaign = 1 + If VendingCode = "C24" Then + Var VendingCampaign = PayAmount CoinVending OFF ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" MakeDrinkV1 SelectDrink SelectSugarID @@ -153,6 +156,7 @@ EndIf If VendingCode = "C25" Then + Var VendingCampaign = PayAmount CoinVending OFF ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" MakeDrinkV1 SelectDrink SelectSugarID @@ -160,6 +164,7 @@ EndIf If VendingCode = "C30" Then + Var VendingCampaign = PayAmount CoinVending OFF ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" MakeDrinkV1 SelectDrink SelectSugarID @@ -167,6 +172,7 @@ EndIf If VendingCode = "C32" Then + Var VendingCampaign = PayAmount CoinVending OFF ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" MakeDrinkV1 SelectDrink SelectSugarID diff --git a/xml/page_show_consent.xml b/xml/page_show_consent.xml index ec1b76c8..a1e1f096 100644 --- a/xml/page_show_consent.xml +++ b/xml/page_show_consent.xml @@ -27,13 +27,8 @@ Var CountDownBrewing = CountDownBrewing - 1 - ; run test; - ;If CountDownBrewing = 40 Then - ; Open "ROOT/taobin_project/xml/page_drinkok.xml" - ;EndIf - If CountDownBrewing = 0 Then - Open "ROOT/taobin_project/xml/page_drinkok.xml" - EndIf + + Var ShowCountDownBrewing = CountDownBrewing @@ -71,7 +66,7 @@ 158 665 - Var( DirImage + "/img_popup1.png") + Var( DirImage + "/img_popup2.png") diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index 0c3eae84..30db3706 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -19,6 +19,10 @@ Var ChangeTimeout = 0 Var ChangeFlag2 = 0 + Var GotoStoreCredit0 = 0 + Var StoreCreditAmount = 0 + + If show_eng = "true" Then Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2_eng.png" Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" @@ -40,36 +44,46 @@ Var Timeout = Timeout + 1 If Timeout = 2 Then - If PayWithQR = 0 Then - If FreeVendingCampaign = 0 Then - If IntVendingCampaign < PayAmount Then - Var SumCoinAmount = CoinAmount + IntVendingCampaign - If SumCoinAmount >= PayAmount Then - Var Canout = SumCoinAmount - PayAmount - If Canout > 0 Then - Change Canout - Var ChangeFlag2 = 1 - EndIf - EndIf - EndIf - Else + + If PayWithQR = 0 Then + If FreeVendingCampaign = 0 Then + If IntVendingCampaign < PayAmount Then + Var SumCoinAmount = CoinAmount + IntVendingCampaign + If SumCoinAmount >= PayAmount Then + Var Canout = SumCoinAmount - PayAmount + If Canout > 0 Then + + ;Change Canout + ;Var ChangeFlag2 = 1 + Var GotoStoreCredit0 = 1 + Var StoreCreditAmount = Canout + + EndIf + EndIf + EndIf + Else - Var Canout = CoinAmount - If Canout > 0 Then - Change Canout - Var ChangeFlag2 = 1 - EndIf + Var Canout = CoinAmount + If Canout > 0 Then + ;Change Canout + ;Var ChangeFlag2 = 1 + Var GotoStoreCredit0 = 1 + Var StoreCreditAmount = Canout + EndIf - EndIf - Else + EndIf + Else - Var Canout = CoinAmount - If Canout > 0 Then - Change Canout - Var ChangeFlag2 = 1 - EndIf + Var Canout = CoinAmount + If Canout > 0 Then + ;Change Canout + ;Var ChangeFlag2 = 1 + Var GotoStoreCredit0 = 1 + Var StoreCreditAmount = Canout + EndIf - EndIf + EndIf + EndIf @@ -90,7 +104,16 @@ If RoadShow = "true" Then Open "ROOT/taobin_project/xml/page_lid_straw.xml" Else - Open "ROOT/taobin_project/xml/page_collect_point_1.xml" + If StoreCreditFlag = 1 Then + Open "ROOT/taobin_project/xml/page_collect_point_1.xml" + Else + If GotoStoreCredit0 = 1 Then + Open "ROOT/taobin_project/xml/page_payment_storeCredit0.xml" + Else + Open "ROOT/taobin_project/xml/page_collect_point_1.xml" + EndIf + + EndIf EndIf EndIf