diff --git a/image/collectiing/imgDrinkFailed.png b/image/collectiing/imgDrinkFailed.png new file mode 100644 index 00000000..dbd82f34 Binary files /dev/null and b/image/collectiing/imgDrinkFailed.png differ diff --git a/image/collectiing/text_16.png b/image/collectiing/text_16.png index 94adb586..20af1041 100644 Binary files a/image/collectiing/text_16.png and b/image/collectiing/text_16.png differ diff --git a/image/collectiing/txtDrinkFailed.png b/image/collectiing/txtDrinkFailed.png new file mode 100644 index 00000000..fa0935c2 Binary files /dev/null and b/image/collectiing/txtDrinkFailed.png differ diff --git a/image/collectiing_en/imgDrinkFailed.png b/image/collectiing_en/imgDrinkFailed.png new file mode 100644 index 00000000..dbd82f34 Binary files /dev/null and b/image/collectiing_en/imgDrinkFailed.png differ diff --git a/image/collectiing_en/txtDrinkFailed.png b/image/collectiing_en/txtDrinkFailed.png new file mode 100644 index 00000000..76133f44 Binary files /dev/null and b/image/collectiing_en/txtDrinkFailed.png differ diff --git a/image/complete/Preparing.png b/image/complete/Preparing.png new file mode 100644 index 00000000..0355e833 Binary files /dev/null and b/image/complete/Preparing.png differ diff --git a/image/complete/imgDrinkFailed.png b/image/complete/imgDrinkFailed.png new file mode 100644 index 00000000..dbd82f34 Binary files /dev/null and b/image/complete/imgDrinkFailed.png differ diff --git a/image/complete/txtDrinkFailed.png b/image/complete/txtDrinkFailed.png new file mode 100644 index 00000000..f50d51bb Binary files /dev/null and b/image/complete/txtDrinkFailed.png differ diff --git a/image/complete_en/Preparing.png b/image/complete_en/Preparing.png new file mode 100644 index 00000000..b7684f57 Binary files /dev/null and b/image/complete_en/Preparing.png differ diff --git a/image/complete_en/imgDrinkFailed.png b/image/complete_en/imgDrinkFailed.png new file mode 100644 index 00000000..dbd82f34 Binary files /dev/null and b/image/complete_en/imgDrinkFailed.png differ diff --git a/image/complete_en/txtDrinkFailed.png b/image/complete_en/txtDrinkFailed.png new file mode 100644 index 00000000..ff405766 Binary files /dev/null and b/image/complete_en/txtDrinkFailed.png differ diff --git a/image/page_payment/Rectangle.png b/image/page_payment/Rectangle.png new file mode 100644 index 00000000..cb8fb3cf Binary files /dev/null and b/image/page_payment/Rectangle.png differ diff --git a/image/page_payment/Rectangle0.png b/image/page_payment/Rectangle0.png new file mode 100644 index 00000000..417df99b Binary files /dev/null and b/image/page_payment/Rectangle0.png differ diff --git a/image/page_payment/bn_add_order.png b/image/page_payment/bn_add_order.png new file mode 100644 index 00000000..4df5e9e8 Binary files /dev/null and b/image/page_payment/bn_add_order.png differ diff --git a/image/page_payment/bn_cancel_all.png b/image/page_payment/bn_cancel_all.png new file mode 100644 index 00000000..5b97a149 Binary files /dev/null and b/image/page_payment/bn_cancel_all.png differ diff --git a/image/page_payment/bn_pay_with_codeSmall.png b/image/page_payment/bn_pay_with_codeSmall.png new file mode 100644 index 00000000..71add30e Binary files /dev/null and b/image/page_payment/bn_pay_with_codeSmall.png differ diff --git a/image/page_payment/bn_pay_with_codeSmall_error.png b/image/page_payment/bn_pay_with_codeSmall_error.png new file mode 100644 index 00000000..87ebe495 Binary files /dev/null and b/image/page_payment/bn_pay_with_codeSmall_error.png differ diff --git a/image/page_payment/bp_cancel_all.png b/image/page_payment/bp_cancel_all.png new file mode 100644 index 00000000..67b4cef4 Binary files /dev/null and b/image/page_payment/bp_cancel_all.png differ diff --git a/image/page_payment/bp_pay_with_codeSmall.png b/image/page_payment/bp_pay_with_codeSmall.png new file mode 100644 index 00000000..8dfd0926 Binary files /dev/null and b/image/page_payment/bp_pay_with_codeSmall.png differ diff --git a/image/page_payment/bp_pay_with_codeSmall_error.png b/image/page_payment/bp_pay_with_codeSmall_error.png new file mode 100644 index 00000000..87ebe495 Binary files /dev/null and b/image/page_payment/bp_pay_with_codeSmall_error.png differ diff --git a/image/page_payment_en/page_payment/Rectangle.png b/image/page_payment_en/page_payment/Rectangle.png new file mode 100644 index 00000000..cb8fb3cf Binary files /dev/null and b/image/page_payment_en/page_payment/Rectangle.png differ diff --git a/image/page_payment_en/page_payment/Rectangle0.png b/image/page_payment_en/page_payment/Rectangle0.png new file mode 100644 index 00000000..417df99b Binary files /dev/null and b/image/page_payment_en/page_payment/Rectangle0.png differ diff --git a/image/page_payment_en/page_payment/bn_add_order.png b/image/page_payment_en/page_payment/bn_add_order.png new file mode 100644 index 00000000..df5b1306 Binary files /dev/null and b/image/page_payment_en/page_payment/bn_add_order.png differ diff --git a/image/page_payment_en/page_payment/bn_cancel_all.png b/image/page_payment_en/page_payment/bn_cancel_all.png new file mode 100644 index 00000000..aa2b8e0c Binary files /dev/null and b/image/page_payment_en/page_payment/bn_cancel_all.png differ diff --git a/image/page_payment_en/page_payment/bn_cashSmall.png b/image/page_payment_en/page_payment/bn_cashSmall.png new file mode 100644 index 00000000..699adb5c Binary files /dev/null and b/image/page_payment_en/page_payment/bn_cashSmall.png differ diff --git a/image/page_payment_en/page_payment/bn_pay_with_codeSmall.png b/image/page_payment_en/page_payment/bn_pay_with_codeSmall.png new file mode 100644 index 00000000..2a4353f9 Binary files /dev/null and b/image/page_payment_en/page_payment/bn_pay_with_codeSmall.png differ diff --git a/image/page_payment_en/page_payment/bn_pay_with_codeSmall_error.png b/image/page_payment_en/page_payment/bn_pay_with_codeSmall_error.png new file mode 100644 index 00000000..72177541 Binary files /dev/null and b/image/page_payment_en/page_payment/bn_pay_with_codeSmall_error.png differ diff --git a/image/page_payment_en/page_payment/bn_pay_with_creditSmall.png b/image/page_payment_en/page_payment/bn_pay_with_creditSmall.png new file mode 100644 index 00000000..c4f548c7 Binary files /dev/null and b/image/page_payment_en/page_payment/bn_pay_with_creditSmall.png differ diff --git a/image/page_payment_en/page_payment/bn_prompt_paySmall.png b/image/page_payment_en/page_payment/bn_prompt_paySmall.png new file mode 100644 index 00000000..d6fd32cf Binary files /dev/null and b/image/page_payment_en/page_payment/bn_prompt_paySmall.png differ diff --git a/image/page_payment_en/page_payment/bp_cancel_all.png b/image/page_payment_en/page_payment/bp_cancel_all.png new file mode 100644 index 00000000..b58a0794 Binary files /dev/null and b/image/page_payment_en/page_payment/bp_cancel_all.png differ diff --git a/image/page_payment_en/page_payment/bp_cashSmall.png b/image/page_payment_en/page_payment/bp_cashSmall.png new file mode 100644 index 00000000..a8cd685f Binary files /dev/null and b/image/page_payment_en/page_payment/bp_cashSmall.png differ diff --git a/image/page_payment_en/page_payment/bp_pay_with_codeSmall.png b/image/page_payment_en/page_payment/bp_pay_with_codeSmall.png new file mode 100644 index 00000000..92552e22 Binary files /dev/null and b/image/page_payment_en/page_payment/bp_pay_with_codeSmall.png differ diff --git a/image/page_payment_en/page_payment/bp_pay_with_codeSmall_error.png b/image/page_payment_en/page_payment/bp_pay_with_codeSmall_error.png new file mode 100644 index 00000000..72177541 Binary files /dev/null and b/image/page_payment_en/page_payment/bp_pay_with_codeSmall_error.png differ diff --git a/image/page_payment_en/page_payment/bp_pay_with_creditSmall.png b/image/page_payment_en/page_payment/bp_pay_with_creditSmall.png new file mode 100644 index 00000000..ed0ee382 Binary files /dev/null and b/image/page_payment_en/page_payment/bp_pay_with_creditSmall.png differ diff --git a/image/page_payment_en/page_payment/bp_prompt_paySmall.png b/image/page_payment_en/page_payment/bp_prompt_paySmall.png new file mode 100644 index 00000000..bac2049e Binary files /dev/null and b/image/page_payment_en/page_payment/bp_prompt_paySmall.png differ diff --git a/image/topping/bn_add.png b/image/topping/bn_add.png new file mode 100644 index 00000000..fa6518f1 Binary files /dev/null and b/image/topping/bn_add.png differ diff --git a/image/topping/bn_next.png b/image/topping/bn_next.png index 8b9d2140..d59e0fe5 100644 Binary files a/image/topping/bn_next.png and b/image/topping/bn_next.png differ diff --git a/image/topping/bp_add.png b/image/topping/bp_add.png new file mode 100644 index 00000000..66f3377b Binary files /dev/null and b/image/topping/bp_add.png differ diff --git a/image/topping/bp_next.png b/image/topping/bp_next.png index 14bc829a..7fe9ba40 100644 Binary files a/image/topping/bp_next.png and b/image/topping/bp_next.png differ diff --git a/image/topping_en/bn_add.png b/image/topping_en/bn_add.png new file mode 100644 index 00000000..21ed6b89 Binary files /dev/null and b/image/topping_en/bn_add.png differ diff --git a/image/topping_en/bn_next.png b/image/topping_en/bn_next.png index 3b020d61..eccf142b 100644 Binary files a/image/topping_en/bn_next.png and b/image/topping_en/bn_next.png differ diff --git a/image/topping_en/bp_add.png b/image/topping_en/bp_add.png new file mode 100644 index 00000000..34e026a4 Binary files /dev/null and b/image/topping_en/bp_add.png differ diff --git a/image/topping_en/bp_next.png b/image/topping_en/bp_next.png index 98a0f92a..eb77676b 100644 Binary files a/image/topping_en/bp_next.png and b/image/topping_en/bp_next.png differ diff --git a/xml/page_back_to_remove_cup.xml b/xml/page_back_to_remove_cup.xml index 4e908086..06927f52 100644 --- a/xml/page_back_to_remove_cup.xml +++ b/xml/page_back_to_remove_cup.xml @@ -14,33 +14,7 @@ TopView "hide" - If TNumberTaobinMember = "" Then - - Else - If PayWithQR = 1 Then - Var VendingTSID = VendingTSIDTmp - EndIf - - - Var BmiYear = PointTaobinStr - Var PointCrm = "" - - If FromConsent = 1 Then - Var PointCrm = "pdpa1" - EndIf - - Var GetScore = VendingTSID - If TaobinErrorNetwork = 0 Then - AddData 11 TNumberTaobinMember BmiYear PointCrm GetScore - Else - Var PointCrm = "" - AddData 14 TNumberTaobinMember BmiYear PointCrm GetScore - EndIf - - 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 5c8424fe..79d9a14b 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -15,6 +15,10 @@ Var GetFreeFromError = 0 Var taobin_version = "1.53" + + Cart "DeleteMenuID" "ALL" + Var MultiPayEnable = "true" + Var PayType = "" ; On open Var menu_back_to_main = "ROOT/taobin_project/xml/page_back_to_main.xml" diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 7541ffb0..58a74b3a 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -5,6 +5,16 @@ "0xeae6e1" SoundVolume + + + If CART_COUNT >= 1 Then + Open "ROOT/taobin_project/xml/page_brewing3Multi.xml" + Else + Var PayReference = "" + Var PayType = "" + EndIf + + ; On open move from page_brewing3.xml Var countClick2 = 0 @@ -127,6 +137,9 @@ EndIf + + + @@ -595,6 +608,9 @@ EndIf If MachineState_Result = 2 Then + + SAVELOG MachineStage + If ErrTimeout = 0 Then Var ErrTimeout = 1 diff --git a/xml/page_brewing3Multi.xml b/xml/page_brewing3Multi.xml new file mode 100644 index 00000000..9a4756ee --- /dev/null +++ b/xml/page_brewing3Multi.xml @@ -0,0 +1,933 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + + ; On open move from page_brewing3.xml + + If CART_INDEX = 1 Then + + Var ServiceAmount2 = CART1_PRICE + Var SelectDrink = CART1_PDCODE + Var ExtendData = CART1_ONTOP + + EndIf + + If CART_INDEX = 2 Then + + Var ServiceAmount2 = CART2_PRICE + Var SelectDrink = CART2_PDCODE + Var ExtendData = CART2_ONTOP + + EndIf + + If CART_INDEX = 3 Then + + Var ServiceAmount2 = CART3_PRICE + Var SelectDrink = CART3_PDCODE + Var ExtendData = CART3_ONTOP + + EndIf + + Var SessionID2 = "" + CART_INDEX + Var SessionID2 = SessionID2 + ":" + Var SessionID2 = SessionID2 + ExtendData + + + + Var countClick2 = 0 + + Var Timeout = 0 + + Var PrintCoinAmount = 0 + + + If show_eng = "true" Then + ;Var DirImage = "ROOT/taobin_project/image/collect_point1_en" + Play "ROOT/taobin_project/sound_eng/Wait_a_moment.mp3" + Else + ;Var DirImage = "ROOT/taobin_project/image/collect_point1" + Play "ROOT/taobin_project/sound_thai/thankyou.mp3" + EndIf + + Var waitAckPay = 0 + Var VendingTSIDTmp = "" + Var VendingTSIDProblem = "" + + + + + If PayWithQR = 1 Then + Var VendingTSIDTmp = VendingTSID + + If TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + Else + Var TelephoneNumber = TNumberTaobinCredit + Var PayO2 = CoffeePinNumber + EndIf + + Var PayType = "" + + If ChangeFlag2 = 1 Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + Var VendingDiscount = 0 + Var VendingCampaign = 0 + Var ServiceType = "credit" + Var SessionID2 = SelectDrink + Var ServiceCredit = "coffee" + Var PayReferenceTmp = PayReference + Var PayReference = "" + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + Var PayReference = PayReferenceTmp + Else + + If StoreCreditFlag = 1 Then + If CoinAmount > 0 Then + Var VendingDiscount = 0 + Var VendingCampaign = 0 + Var ServiceType = "credit" + Var SessionID2 = SelectDrink + Var ServiceCredit = "coffee" + Var PayReferenceTmp = PayReference + Var PayReference = "" + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + Var PayReference = PayReferenceTmp + EndIf + + EndIf + EndIf + EndIf + + If TNumberTaobinCredit = "" Then + + If TNumberTaobinMember = "" Then + Var TelephoneNumberProblem = "" + Else + Var TelephoneNumberProblem = TNumberTaobinMember + EndIf + + Else + Var TelephoneNumberProblem = TNumberTaobinCredit + EndIf + + If TelephoneNumberProblem = "" Then + ;Var TelephoneNumberProblem = "" + Var ShowTextNumber = "Enable" + Var Tel_Confirm_State = "Disable" + Else + Var ShowTextNumber = "Invisible" + Var Tel_Confirm_State = "Enable" + EndIf + + + + If TNumberTaobinMember = "" Then + + Else + If PayWithQR = 1 Then + Var VendingTSID = VendingTSIDTmp + Else + Var VendingTSID = "" + EndIf + + + Var BmiYear = PointTaobinStr + Var PointCrm = "" + If FromConsent = 1 Then + Var PointCrm = "pdpa1" + EndIf + Var GetScore = VendingTSID + + If AddPointFlag = 0 Then + Var AddPointFlag = 1 + If TaobinErrorNetwork = 0 Then + AddData 11 TNumberTaobinMember BmiYear PointCrm GetScore + Else + Var PointCrm = "" + AddData 14 TNumberTaobinMember BmiYear PointCrm GetScore + EndIf + EndIf + + Var VendingTSID = "" + EndIf + + + If GetFreeFromError = 1 Then + ;Var GetFreeFromError = 0 + Var TelephoneNumberProblem = TelephoneNumberGOTFree + + EndIf + + + If LedLidBlink = "true" Then + Var LedLidBlink = "no" + LED LedDoorLid Blink 255 255 255 255 + EndIf + + + Var PayType = "multi" + + + + + + + + + If ActionOKCase = 1 Then + If CodeChannel = 1 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumber2 = "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 TelephoneNumber2 ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + ;Var Timeout = 0 + Var ActionOKCase = 2 + + SAVELOG "back_to_main from line > 142." + Open "ROOT/taobin_project/xml/page_drinkfail2Multi.xml" + + Else + + SAVELOG "back_to_main from line > 147." + Open "ROOT/taobin_project/xml/page_drinkfail2Multi.xml" + EndIf + + Else + + + + EndIf + + If waitAckPay = 1 Then + Open "ROOT/taobin_project/xml/page_drinkok.xml" + + EndIf + + + + + If ActionOKCase = 1 Then + If CodeChannel = 1 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumber2 = "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 TelephoneNumber2 ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + ;Var Timeout = 0 + Var ActionOKCase = 2 + + SAVELOG "back_to_main from line > 204." + Open "ROOT/taobin_project/xml/page_drinkfail2Multi.xml" + + Else + SAVELOG "back_to_main from line > 173." + Open "ROOT/taobin_project/xml/page_drinkfail2Multi.xml" + EndIf + + Else + + + + EndIf + + + + 1000 + + + Var Timeout = Timeout + 1 + + If CountDownBrewing > 0 Then + Var CountDownBrewing = CountDownBrewing - 1 + EndIf + + If Simulation = "true" Then + If CountDownBrewing = 0 Then + ;Open "ROOT/taobin_project/xml/page_drinkok.xml" + EndIf + EndIf + + If Timeout = 4 Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sounds/music1.mp3" + EndIf + + ; 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 + + + If Timeout > 540 Then + SAVELOG "back_to_main from line > 217." + Open "ROOT/taobin_project/xml/page_drinkfail2Multi.xml" + EndIf + + + If Timeout > 480 Then + Var MachineState_Result = 2 + EndIf + + If ChangeFlag = 1 Then + 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 waitAckPay = 2 Then + If Timeout > 10 Then + + If CodeChannel = 1 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumber2 = "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 TelephoneNumber2 ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + ;Var Timeout = 0 + EndIf + + SAVELOG "back_to_main from line > 309." + Open "ROOT/taobin_project/xml/page_drinkfail2Multi.xml" + EndIf + EndIf + + + If ChangeOK = 2 Then + If ActionOKCase = 0 Then + + If TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + + If TNumberTaobinMember = "" Then + Else + Var TelephoneNumber = TNumberTaobinMember + EndIf + + Else + Var TelephoneNumber = TNumberTaobinCredit + Var PayO2 = CoffeePinNumber + EndIf + + + Var PayDetail = "1/" + HURR_FOREVER + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + SAMESALARY + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + NOBONUS + + + + ;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1" + + Var ServiceType = "coffee" + Var ServiceCredit = SelectDrink + Var SuggestID = "" + Var SessionID2 = "" + + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + + + ;If CodeChannel = 0 Then + ; SAVELOG "back_to_main from line > 315." + ; Open "ROOT/taobin_project/xml/page_drinkfail2Multi.xml" + ;EndIf + + Var waitAckPay = 2 + Var Timeout = 5 + Var ActionOKCase = 1 + + EndIf + EndIf + + If ChangeTimeout > 30 Then + If ActionOKCase = 0 Then + If TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + + If TNumberTaobinMember = "" Then + Else + Var TelephoneNumber = TNumberTaobinMember + EndIf + + Else + Var TelephoneNumber = TNumberTaobinCredit + Var PayO2 = CoffeePinNumber + EndIf + + Var PayDetail = "1/" + HURR_FOREVER + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + SAMESALARY + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + NOBONUS + + ;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1" + + + Var ServiceType = "coffee" + Var ServiceCredit = SelectDrink + Var SuggestID = "" + Var SessionID2 = "" + + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + + ;If CodeChannel = 0 Then + ; SAVELOG "back_to_main from line > 357." + ; Open "ROOT/taobin_project/xml/page_drinkfail2Multi.xml" + ;EndIf + + Var waitAckPay = 2 + Var Timeout = 5 + Var ActionOKCase = 1 + + EndIf + EndIf + + + + + + If MachineState_Result = 1 Then + If waitAckPay = 0 Then + + Var waitAckPay = 0 + Var Timeout = 0 + + Var ProcessText = "" + + If TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + + If TNumberTaobinMember = "" Then + Else + Var TelephoneNumber = TNumberTaobinMember + EndIf + + Else + Var TelephoneNumber = TNumberTaobinCredit + Var PayO2 = CoffeePinNumber + EndIf + + + + + Var ServiceType = "coffee" + Var ServiceCredit = SelectDrink + Var SuggestID = "" + + Var PayDetail = "1/" + HURR_FOREVER + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + SAMESALARY + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + NOBONUS + + + ;Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1" + + If GetFreeFromError = 1 Then + Var CodeChannel = 1 + Var VendingCode = "C48" + Var CodeNumber = "0000000000" + Var VendingCampaign = ServiceAmount2 + EndIf + + 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 + "/" + + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + Else + 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 + + + Else + + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + + EndIf + + EndIf + + Var ServiceSuccess = "yes" + If waitAckPay = 0 Then + + + Open "ROOT/taobin_project/xml/page_drinkok.xml" + EndIf + + EndIf + + If MachineState_Result = 2 Then + If ErrTimeout = 0 Then + Var ErrTimeout = 1 + + + If PayWithQR = 0 Then + If CodeChannel = 0 Then + If ChangeFlag = 0 Then + Var ChangeFlag = 1 + + If StoreCreditFlag = 1 Then + Var ChangeOK = 2 + Else + Change ServiceAmount2 + EndIf + + EndIf + Else + + If CoinAmount > 0 Then + + If ChangeFlag = 0 Then + Var ChangeFlag = 1 + Var ServiceAmount3 = ServiceAmount2 - IntVendingCampaign + + If StoreCreditFlag = 1 Then + Var ChangeOK = 2 + Else + Change ServiceAmount3 + EndIf + + EndIf + Else + Var ChangeOK = 2 + EndIf + + EndIf + + + + Else + Var ChangeOK = 2 + EndIf + + + + + + + + + + + + ;OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_drinkfail.xml" + + ;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + + ;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml" + ;Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml" + + EndIf + EndIf + + + If MachineStage = "show-menu" Then + If MachineState_Result = 0 Then + SAVELOG "back_to_main from line > 655." + ;Open "ROOT/taobin_project/xml/page_drinkok.xml" + Var MachineState_Result = 1 + EndIf + EndIf + + If MachineStage = "close-maintenance" Then + If MachineState_Result = 0 Then + SAVELOG "back_to_main from line > 663." + Var MachineState_Result = 2 + ;Open "ROOT/taobin_project/xml/page_drinkfail2Multi.xml" + EndIf + EndIf + + If MachineStage = "drink-success" Then + Var MachineState_Result = 1 + EndIf + + If MachineStage = "drink-failed" Then + If RoadShow = "true" Then + Open "ROOT/taobin_project/xml/page_back_to_error.xml" + Else + Var MachineState_Result = 2 + EndIf + EndIf + + DEBUGVAR CountUpBrewing + ; animation video loop + If AnimationOn = "true" Then + Var CountUpBrewing = CountUpBrewing + 1 + + Var SlotVideo = CountUpBrewing / AnimationVideoPlayTime + + If PreviseStepVideo = SlotVideo Then + ;SAVELOG SlotVideo + Else + Var PreviseStepVideo = SlotVideo + ;SAVELOG PreviseStepVideo + ;SAVELOG SlotVideo + ;SAVELOG CountUpBrewing + + ;Var CountDownVideoTime = CountDownVideoTimeReload + + Var StepVideo = SlotVideo + 2 + + ;SAVELOG StepVideo + + If StepVideo = 1 Then + Var videoID = VideoID1 + EndIf + If StepVideo = 2 Then + Var videoID = VideoID2 + EndIf + If StepVideo = 3 Then + Var videoID = VideoID3 + EndIf + If StepVideo = 4 Then + Var videoID = VideoID4 + EndIf + If StepVideo = 5 Then + Var videoID = VideoID5 + EndIf + If StepVideo = 6 Then + Var videoID = VideoID6 + EndIf + If StepVideo = 7 Then + Var videoID = VideoID7 + EndIf + If StepVideo = 8 Then + Var videoID = VideoID8 + EndIf + If StepVideo = 9 Then + Var videoID = VideoID9 + EndIf + + ;SAVELOG videoID + + If videoID = 0 Then + + Else + If videoID = "---" Then + + Else + + Var VideoPlayFile = VideoPath + Var VideoPlayFile = VideoPlayFile + VideoFileBegin + Var VideoPlayFile = VideoPlayFile + videoID + Var VideoPlayFile = VideoPlayFile + VideoFileEnd + + Var PictureFile = PicturePath + Var PictureFile = PictureFile + PictureBegin + Var PictureFile = PictureFile + videoID + Var PictureFile = PictureFile + PictureEnd + + DEBUGVAR VideoPlayFile + DEBUGVAR PictureFile + EndIf + EndIf + EndIf + EndIf + + + If IgnoreNetCore = "true" Then + If CountDownBrewing = 0 Then + Open "ROOT/taobin_project/xml/page_drinkok.xml" + EndIf + EndIf + + + Refresh + TimerReset + + + + + + ;If MachineStage = "drink-success" Then + ; Open "ROOT/taobin_project/xml/page_drinkok.xml" + ;EndIf + ;If MachineStage = "drink-failed" Then + ; Open "ROOT/taobin_project/xml/page_drinkfail.xml" + ;EndIf + + If MachineStage = "drink-success" Then + Var MachineState_Result = 1 + EndIf + + If MachineStage = "drink-failed" Then + If RoadShow = "true" Then + Open "ROOT/taobin_project/xml/page_back_to_error.xml" + Else + Var MachineState_Result = 2 + EndIf + EndIf + + Refresh + + + +; this copy in file menu_brew2.xml and menu_lid_straw.xml + + If ChangeStatus = "payout-end" Then + If ChangeFlag = 1 Then + Var ChangeOK = 2 + EndIf + EndIf + + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + + + + + 60 + 1290 + PictureFile + + + + 60 + 1649 + BottomText + + + + +; + + 751 + 413 + "ROOT/taobin_project/image/page_doing/img2.png" + +; + + XPosiShowCountDownBrew + 470 + End + 153 + 88 + RobotoBold + 0x513C2F + ShowCountDownBrewing + + +; +; 100 +; 470 +; End +; 153 +; 30 +; RobotoBold +; 0x513C2F +; MachineStage +; +; + + +; +; 0 +; 1880 +; 30 +; Center +; 1080 +; KanitThinTTF +; 0x513C2F +; MachineStage +; + + +; + + + + diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml index e2a31f88..58562c37 100644 --- a/xml/page_catalog.xml +++ b/xml/page_catalog.xml @@ -367,7 +367,10 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Open "ROOT/taobin_project/xml/page_payment_multi.xml" + + + Open "ROOT/taobin_project/xml/page_payment_multi.xml" + diff --git a/xml/page_catalog_choose_drink3.xml b/xml/page_catalog_choose_drink3.xml index ae51ca32..39d2b590 100644 --- a/xml/page_catalog_choose_drink3.xml +++ b/xml/page_catalog_choose_drink3.xml @@ -1,265 +1,262 @@ - - - - - "Enable" - 1080 - 1920 - "0xeae6e1" - SoundVolume - - ; On open - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" - EndIf - - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "PressForever" - Var Menu4Selected = "Enable" - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - Var Menu8Selected = "Invisible" - - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - Var Timeout = 0 - - - - - - 1000 - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - Open NextPage - EndIf - Else - If Timeout > 30 Then - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - - - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - - - - - - - - - - - - - -; obselete -; - - - - - - + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + ; On open + + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" + + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + EndIf + + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "PressForever" + Var Menu4Selected = "Enable" + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "Enable" + Var Menu8Selected = "Invisible" + + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + Var Timeout = 0 + + + + + + 1000 + + If NextPage = "-" Then + + Else + If CupOnArm = "true" Then + If Timeout > 9 Then + Open NextPage + EndIf + Else + If Timeout > 30 Then + Open NextPage + EndIf + EndIf + EndIf + + If Timeout > 60 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + Var Timeout = Timeout + 1 + TimerReset + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + +; + + + + + + + + + + + + + + +; obselete +; + + + + + + 10 497 @@ -363,12 +360,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0001.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -469,12 +466,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0002.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -575,12 +572,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0020.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0020.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -681,12 +678,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0003.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -787,12 +784,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0004.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -893,12 +890,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0006.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0006.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -999,12 +996,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0021.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0021.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1105,12 +1102,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0007.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0007.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1211,12 +1208,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0008.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0008.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1317,12 +1314,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0019.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0019.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1423,12 +1420,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0009.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0009.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1529,12 +1526,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0022.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0022.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1635,12 +1632,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0010.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0010.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1741,12 +1738,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0011.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0011.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1847,12 +1844,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0012.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0012.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1953,12 +1950,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0017.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0017.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2059,12 +2056,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-02-0020.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-02-0020.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2165,12 +2162,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-02-0001.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-02-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2271,12 +2268,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-02-0002.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-02-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2377,12 +2374,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-02-0003.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-02-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2483,12 +2480,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-02-0004.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-02-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2589,12 +2586,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-02-0005.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-02-0005.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2695,12 +2692,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-02-0006.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-02-0006.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2801,12 +2798,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-02-0007.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-02-0007.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2907,12 +2904,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-02-0008.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-02-0008.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3013,12 +3010,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-02-0019.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-02-0019.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3119,12 +3116,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-02-0009.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-02-0009.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3225,12 +3222,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-02-0022.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-02-0022.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3331,12 +3328,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-02-0010.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-02-0010.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3437,12 +3434,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-02-0011.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-02-0011.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3543,12 +3540,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-02-0012.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-02-0012.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3649,21 +3646,34 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0027.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0027.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" - - - - - - - + + + +; Cart + + + + diff --git a/xml/page_check_member.xml b/xml/page_check_member.xml index c342e380..ef971e3f 100644 --- a/xml/page_check_member.xml +++ b/xml/page_check_member.xml @@ -95,7 +95,7 @@ Var CoffeePointRank = Ext1b INT CoffeePointRank - + Var CoffeePointRankTmp = CoffeePointRank GETACCEXT TelephoneNumber 15 diff --git a/xml/page_check_member2.xml b/xml/page_check_member2.xml index 919e03df..9ed10616 100644 --- a/xml/page_check_member2.xml +++ b/xml/page_check_member2.xml @@ -30,10 +30,11 @@ EndIf - + Var CoffeePointRank = CoffeePointRankTmp ;Var PointDiff = 150 - CoffeePointRank + Var TaobinExpireDay = "" Var TaobinExpireMonth = "" Var TaobinExpireMonthX = "" @@ -216,11 +217,11 @@ Var TaobinLeveImg = "/taoLevel2.png" If CoffeePointRank > 149 Then - Var TaobinLeveImg = "/taoLevel3.png" + ;Var TaobinLeveImg = "/taoLevel3.png" - Var TaobinLevelDesc1 = "Flying turtle level " + ;Var TaobinLevelDesc1 = "Flying turtle level " Var TaobinLevelDesc2 = "" - Var CoffeePointRank = CoffeePointRank - 150 + ;Var CoffeePointRank = CoffeePointRank - 150 EndIf @@ -237,11 +238,11 @@ Var TaobinLeveImg = "/taoLevel3.png" If CoffeePointRank > 349 Then - Var TaobinLeveImg = "/taoLevel4.png" + ;Var TaobinLeveImg = "/taoLevel4.png" - Var TaobinLevelDesc1 = "Master turtle level " + ;Var TaobinLevelDesc1 = "Master turtle level " Var TaobinLevelDesc2 = "" - Var CoffeePointRank = CoffeePointRank - 350 + ;Var CoffeePointRank = CoffeePointRank - 350 EndIf @@ -277,11 +278,11 @@ Var TaobinLeveImg = "/taoLevel2.png" If CoffeePointRank > 149 Then - Var TaobinLeveImg = "/taoLevel3.png" + ;Var TaobinLeveImg = "/taoLevel3.png" - Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าติดปีก " + ;Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าติดปีก " Var TaobinLevelDesc2 = "" - Var CoffeePointRank = CoffeePointRank - 150 + ;Var CoffeePointRank = CoffeePointRank - 150 EndIf EndIf @@ -298,11 +299,11 @@ Var TaobinLeveImg = "/taoLevel3.png" If CoffeePointRank > 349 Then - Var TaobinLeveImg = "/taoLevel4.png" + ;Var TaobinLeveImg = "/taoLevel4.png" - Var TaobinLevelDesc1 = "ระดับสมาชิก ผู้เฒ่าเต่า " + ;Var TaobinLevelDesc1 = "ระดับสมาชิก ผู้เฒ่าเต่า " Var TaobinLevelDesc2 = "" - Var CoffeePointRank = CoffeePointRank - 350 + ;Var CoffeePointRank = CoffeePointRank - 350 EndIf EndIf diff --git a/xml/page_collect_point_2.xml b/xml/page_collect_point_2.xml index a2b5f421..5d55a9b6 100644 --- a/xml/page_collect_point_2.xml +++ b/xml/page_collect_point_2.xml @@ -130,6 +130,7 @@ Var CoffeePoint = PointTaobin + CoffeePoint1 Var CoffeePointOld = CoffeePoint1 Var CoffeePointRank = CoffeePointRank + PointTaobin + Var CoffeePointRankTmp = CoffeePointRank Open "ROOT/taobin_project/xml/page_collect_point_3.xml" diff --git a/xml/page_collect_point_3.xml b/xml/page_collect_point_3.xml index 70a03f6b..0059d8f4 100644 --- a/xml/page_collect_point_3.xml +++ b/xml/page_collect_point_3.xml @@ -246,11 +246,11 @@ Var TaobinLeveImg = "/taoLevel2.png" If CoffeePointRank > 149 Then - Var TaobinLeveImg = "/taoLevel3.png" + ;Var TaobinLeveImg = "/taoLevel3.png" - Var TaobinLevelDesc1 = "Flying turtle level " + ;Var TaobinLevelDesc1 = "Flying turtle level " Var TaobinLevelDesc2 = "" - Var CoffeePointRank = CoffeePointRank - 150 + ;Var CoffeePointRank = CoffeePointRank - 150 EndIf @@ -267,11 +267,11 @@ Var TaobinLeveImg = "/taoLevel3.png" If CoffeePointRank > 349 Then - Var TaobinLeveImg = "/taoLevel4.png" + ;Var TaobinLeveImg = "/taoLevel4.png" - Var TaobinLevelDesc1 = "Master turtle level " + ;Var TaobinLevelDesc1 = "Master turtle level " Var TaobinLevelDesc2 = "" - Var CoffeePointRank = CoffeePointRank - 350 + ;Var CoffeePointRank = CoffeePointRank - 350 EndIf @@ -310,11 +310,11 @@ Var TaobinLeveImg = "/taoLevel2.png" If CoffeePointRank > 149 Then - Var TaobinLeveImg = "/taoLevel3.png" + ;Var TaobinLeveImg = "/taoLevel3.png" - Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าติดปีก " + ;Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าติดปีก " Var TaobinLevelDesc2 = "" - Var CoffeePointRank = CoffeePointRank - 150 + ;Var CoffeePointRank = CoffeePointRank - 150 EndIf @@ -331,11 +331,11 @@ Var TaobinLeveImg = "/taoLevel3.png" If CoffeePointRank > 349 Then - Var TaobinLeveImg = "/taoLevel4.png" + ;Var TaobinLeveImg = "/taoLevel4.png" - Var TaobinLevelDesc1 = "ระดับสมาชิก ผู้เฒ่าเต่า " + ;Var TaobinLevelDesc1 = "ระดับสมาชิก ผู้เฒ่าเต่า " Var TaobinLevelDesc2 = "" - Var CoffeePointRank = CoffeePointRank - 350 + ;Var CoffeePointRank = CoffeePointRank - 350 EndIf diff --git a/xml/page_drinkfail2.xml b/xml/page_drinkfail2.xml index 558f3158..1e5c3b33 100644 --- a/xml/page_drinkfail2.xml +++ b/xml/page_drinkfail2.xml @@ -25,6 +25,13 @@ DEBUGVAR ERROR_BREW_CAUSE_THAI + If FailedCount > 0 Then + Var ERROR_PAY_TIMEOUT = "false" + DEBUGVAR FailedCount + DEBUGVAR ERROR_PAY_TIMEOUT + EndIf + + If ERROR_PAY_TIMEOUT = "true" Then If NumberFailed = "false" Then @@ -138,17 +145,12 @@ 1000 - + SAVELOG MachineStage Var Timeout = Timeout + 1 If Timeout > 60 Then - - - - - If MachineStage = "remove-cup" Then Open "ROOT/taobin_project/xml/page_drinkfail3.xml" Else diff --git a/xml/page_drinkfail2Multi.xml b/xml/page_drinkfail2Multi.xml new file mode 100644 index 00000000..535bfaba --- /dev/null +++ b/xml/page_drinkfail2Multi.xml @@ -0,0 +1,335 @@ + + "Enable" + 1080 + 1920 + "0xEFEDEA" + SoundVolume + "Partial" + + ; On open + + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/complete_en/" + + Else + Var DirImage = "ROOT/taobin_project/image/complete/" + EndIf + + Var Timeout = 0 + Var Timeout2 = 0 + StopLongPlay + + + Var FailedCount = FailedCount + 1 + + Var MachineErrorDetailAll = MachineErrorDetail + " / " + Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng + + Var ServiceAmountSum = ServiceAmountSum - ServiceAmount2 + + Var sendPayMultiFlag = 0 + Var next_pic = "" + Var next_name = "" + Var nextCount = "" + Var next_pic_bg = "" + Var next_ready = "true" + Var cart_next = 0 + + If show_eng = "true" Then + If CART_COUNT > 0 Then + If CART_INDEX < CART_COUNT Then + + Var next_pic_bg = DirImage + "/Preparing.png" + + Var cart_next = CART_INDEX + 1 + Var nextCount = "" + cart_next + Var nextCount = nextCount + "/" + Var nextCount = nextCount + CART_COUNT + + If cart_next = 2 Then + Var next_pic = "ROOT/taobin_project/image/page_drink/" + CART2_PICTURE + Var next_name = CART2_NAME_ENG + Var next_ready = CART2_READY + + SAVELOG cart_next + + EndIf + + If cart_next = 3 Then + Var next_pic = "ROOT/taobin_project/image/page_drink/" + CART3_PICTURE + Var next_name = CART3_NAME_ENG + Var next_ready = CART3_READY + + EndIf + EndIf + EndIf + + Else + + If CART_COUNT > 0 Then + If CART_INDEX < CART_COUNT Then + + Var next_pic_bg = DirImage + "/Preparing.png" + + Var cart_next = CART_INDEX + 1 + Var nextCount = "" + cart_next + Var nextCount = nextCount + "/" + Var nextCount = nextCount + CART_COUNT + + If cart_next = 2 Then + Var next_pic = "ROOT/taobin_project/image/page_drink/" + CART2_PICTURE + Var next_name = CART2_NAME_THAI + Var next_ready = CART2_READY + + SAVELOG cart_next + + EndIf + + If cart_next = 3 Then + Var next_pic = "ROOT/taobin_project/image/page_drink/" + CART3_PICTURE + Var next_name = CART3_NAME_THAI + Var next_ready = CART3_READY + + EndIf + EndIf + EndIf + + EndIf + + + SAVELOG next_ready + + + + If next_ready = "false" Then + Var next_pic = "" + Var next_name = "" + Var nextCount = "" + Var next_pic_bg = "" + + + If cart_next = 2 Then + If TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + If TNumberTaobinMember = "" Then + Else + Var TelephoneNumber = TNumberTaobinMember + EndIf + Else + Var TelephoneNumber = TNumberTaobinCredit + Var PayO2 = CoffeePinNumber + EndIf + + Var PayDetail="1/F:0/0/" + Var ServiceType = "coffee" + Var ServiceCredit = CART2_PDCODE + Var SuggestID = "" + Var SessionID2 = + + Var ServiceAmount2 = CART2_PRICE + + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + EndIf + + If cart_next < CART_COUNT Then + Var cart_next = cart_next + 1 + EndIf + + If cart_next = 3 Then + If TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + If TNumberTaobinMember = "" Then + Else + Var TelephoneNumber = TNumberTaobinMember + EndIf + Else + Var TelephoneNumber = TNumberTaobinCredit + Var PayO2 = CoffeePinNumber + EndIf + + Var PayDetail="1/F:0/0/" + Var ServiceType = "coffee" + Var ServiceCredit = CART3_PDCODE + Var SuggestID = "" + Var SessionID2 = + + Var ServiceAmount2 = CART3_PRICE + + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + EndIf + + + + Var CART_INDEX = CART_COUNT + + EndIf + + + + + If CART_INDEX = CART_COUNT Then + + ;Pay Multi + If sendPayMultiFlag = 0 Then + + If PayWithQR = 0 Then + Var ServiceType = "coffee-multi" + Else + Var ServiceType = "coffee-multiQR" + EndIf + + If TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + If TNumberTaobinMember = "" Then + Else + Var TelephoneNumber = TNumberTaobinMember + EndIf + Else + Var TelephoneNumber = TNumberTaobinCredit + Var PayO2 = CoffeePinNumber + EndIf + + Var ServiceCredit = "00-00-00-0000" + Var SuggestID = "" + Var PayDetail="1/S:0/0/" + Var SessionID3 = "" + CART_COUNT + Var SessionID3 = SessionID3 + ":00000" + + + SAVELOG PayO2 + + Var PayType = "" + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID3 ServiceAmountSum ServiceCharge Donate + + + Var sendPayMultiFlag = 1 + EndIf + EndIf + + + + + 1000 + + + SAVELOG MachineStage + + Var Timeout = Timeout + 1 + + If MachineStage = "show-menu" Then + + If CART_INDEX < CART_COUNT Then + + Var CART_INDEX = CART_INDEX + 1 + Cart "PreparID" CART_INDEX + Open "ROOT/taobin_project/xml/page_thankyouMore.xml" + + Else + If sendPayMultiFlag = 1 Then + Var TNumberTaobinMember = "" + ;Open "ROOT/taobin_project/xml/page_back_to_main.xml" + Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + EndIf + EndIf + + EndIf + + If MachineStage = "remove-cup" Then + ;Open "ROOT/taobin_project/xml/page_drinkfail3.xml" + + Var Timeout2 = Timeout2 + 1 + + If Timeout2 > 15 Then + Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3" + Var Timeout2 = 0 + EndIf + + Else + ;Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + + + + + + Refresh + TimerReset + + + + + + + + + + + + 46 + 592 + Var( DirImage + "/imgDrinkFailed.png" ) + + + + 22 + 1384 + Var( DirImage + "/txtDrinkFailed.png" ) + + + + 757 + 424 + next_pic_bg + + + + 757 + 448 + 20 + 280 + Center + RobotoBlack + 0x513C2F + nextCount + + + + 757 + 538 + 20 + 280 + Center + RobotoBlack + 0x513C2F + next_name + + + + 823 + 600 + 148 + 200 + next_pic + + + + + + + + + + + diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml index 07682eb1..7f67c873 100644 --- a/xml/page_drinkok.xml +++ b/xml/page_drinkok.xml @@ -36,47 +36,171 @@ Var VideoPlayFile = VideoPlayFile + "24" Var VideoPlayFile = VideoPlayFile + VideoFileEnd Var Timeout = 0 - - Var TNumberTaobinMember = "" - - If TNumberTaobinMember = "" Then - - Else - If PayWithQR = 1 Then - Var VendingTSID = VendingTSIDTmp - EndIf - - - Var BmiYear = PointTaobinStr - Var PointCrm = "" - If FromConsent = 1 Then - Var PointCrm = "pdpa1" - EndIf - Var GetScore = VendingTSID - If TaobinErrorNetwork = 0 Then - AddData 11 TNumberTaobinMember BmiYear PointCrm GetScore - Else - Var PointCrm = "" - AddData 14 TNumberTaobinMember BmiYear PointCrm GetScore - EndIf - Var TNumberTaobinMember = "" - Var VendingTSID = "" - EndIf + Var Timeout2 = 0 StopLongPlay Var show_eng = "false" + + Var sendPayMultiFlag = 0 + Var next_pic = "" + Var next_name = "" + Var nextCount = "" + Var next_pic_bg = "" + + + If show_eng = "true" Then + If CART_COUNT > 0 Then + If CART_INDEX < CART_COUNT Then + + Var next_pic_bg = DirImage + "/Preparing.png" + + Var cart_next = CART_INDEX + 1 + Var nextCount = "" + cart_next + Var nextCount = nextCount + "/" + Var nextCount = nextCount + CART_COUNT + + If cart_next = 2 Then + Var next_pic = "ROOT/taobin_project/image/page_drink/" + CART2_PICTURE + Var next_name = CART2_NAME_ENG + + EndIf + + If cart_next = 3 Then + Var next_pic = "ROOT/taobin_project/image/page_drink/" + CART3_PICTURE + Var next_name = CART3_NAME_ENG + + EndIf + EndIf + + EndIf + + + Else + + If CART_COUNT > 0 Then + If CART_INDEX < CART_COUNT Then + + Var next_pic_bg = DirImage + "/Preparing.png" + + Var cart_next = CART_INDEX + 1 + Var nextCount = "" + cart_next + Var nextCount = nextCount + "/" + Var nextCount = nextCount + CART_COUNT + + If cart_next = 2 Then + Var next_pic = "ROOT/taobin_project/image/page_drink/" + CART2_PICTURE + Var next_name = CART2_NAME_THAI + + EndIf + + If cart_next = 3 Then + Var next_pic = "ROOT/taobin_project/image/page_drink/" + CART3_PICTURE + Var next_name = CART3_NAME_THAI + + EndIf + EndIf + + EndIf + + EndIf + + + If CART_COUNT = 0 Then + Var sendPayMultiFlag = 1 + Else + If CART_INDEX = CART_COUNT Then + + ;Pay Multi + If sendPayMultiFlag = 0 Then + + If PayWithQR = 0 Then + Var ServiceType = "coffee-multi" + Else + Var ServiceType = "coffee-multiQR" + EndIf + + If TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + If TNumberTaobinMember = "" Then + Else + Var TelephoneNumber = TNumberTaobinMember + EndIf + Else + Var TelephoneNumber = TNumberTaobinCredit + Var PayO2 = CoffeePinNumber + EndIf + + Var ServiceCredit = "00-00-00-0000" + Var SuggestID = "" + Var PayDetail="1/S:0/0/" + Var SessionID3 = "" + CART_COUNT + Var SessionID3 = SessionID3 + ":00000" + + SAVELOG PayO2 + + Var VendingCampaign = IntVendingCampaign + + Var PayType = "" + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID3 ServiceAmountSum ServiceCharge Donate + + Var sendPayMultiFlag = 1 + EndIf + EndIf + EndIf + + + + 500 - + + SAVELOG MachineStage + If HaveCup = "false" Then - Open "ROOT/taobin_project/xml/page_back_to_main.xml" + + If MachineStage = "show-menu" Then + + If CART_INDEX < CART_COUNT Then + + Var CART_INDEX = CART_INDEX + 1 + Cart "PreparID" CART_INDEX + Open "ROOT/taobin_project/xml/page_thankyouMore.xml" + + Else + If sendPayMultiFlag = 1 Then + Var TNumberTaobinMember = "" + + If FailedCount > 0 Then + Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + Else + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + EndIf + + EndIf + + + EndIf If MachineStage = "remove-cup" Then - Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" + If CART_COUNT = 0 Then + Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" + Else + + Var Timeout2 = Timeout2 + 1 + + If Timeout2 > 15 Then + Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3" + Var Timeout2 = 0 + EndIf + + EndIf EndIf @@ -163,4 +287,42 @@ countClick2 + + + 757 + 424 + next_pic_bg + + + + 757 + 448 + 20 + 280 + Center + RobotoBlack + 0x513C2F + nextCount + + + + 757 + 538 + 20 + 280 + Center + RobotoBlack + 0x513C2F + next_name + + + + 823 + 600 + 148 + 200 + next_pic + + + diff --git a/xml/page_payment.xml b/xml/page_payment.xml index c31a0064..26271ed1 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -49,6 +49,7 @@ Var TNumberTaobinMember = "" Var VendingTSIDTmp = "" + Var PayType = "" If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment" @@ -77,6 +78,10 @@ EndIf Var MachineStage = "-" + + Var PayReference = "" + + 900 diff --git a/xml/page_payment_cashMore.xml b/xml/page_payment_cashMore.xml new file mode 100644 index 00000000..b9677410 --- /dev/null +++ b/xml/page_payment_cashMore.xml @@ -0,0 +1,1589 @@ + + "Enable" + 1080 + 1920 + "0xFFFFFF" + SoundVolume + PlaySoundLag + + Var countClick2 = 0 + ;SAVELOG SelectDrink + ;SAVELOG NameDrink + ;SAVELOG NameDrinkTH + ;SAVELOG DrinkDescription + SAVELOG PriceDrink + ;SAVELOG topping1 + ;SAVELOG topping2 + ;SAVELOG topping3 + + DEBUGVAR video_menu_0 + + + Var FlagQROpened = 0 + Var PayInfoCFlag = 0 + Var ActionOKCase = 0 + Var VendingCampaign = IntVendingCampaign + + Var PayAmount = PriceDrink + + ; Below original + ; On open + 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 = 2 + + Var PayAmount = PriceDrink + Var RemainAmount = PayAmount - IntVendingCampaign + Var RemainAmount = RemainAmount - CoinAmount + Var RemainAmount = RemainAmount - IntVendingCredit + Var RemainAmountStr = "" + RemainAmount + Var Timeout = 0 + Var PayOK = 0 + Var ChangeOK = 0 + Var CoinInOK = 0 + + Var RemainAmountKeep = 0 + + Var showRemaining = charOfBaht + RemainAmountStr + + + + Var VendingREFID = "" + + Var TelephoneNumber = "0899999999" + Var ServiceType = "coffee" + + Var ServiceCredit = SelectDrink + Var ServiceAmount2 = PayAmount + Var ServiceCharge = 0 + Var Donate = "" + Var SuggestID = "" + Var CancleState = "Invisible" + + Var VendingDiscount = DiscountDrink + + + Var CashTextWarning = "" + Var QRErrorState = "Invisible" + + + SAVELOG SelectDrink + + SAVELOG QRChannel + SAVELOG QRCODE99 + + SAVELOG VendingCampaign + SAVELOG VendingCode + SAVELOG CodeChannel + + + If VendingCode = "C00" Then + Var CodeChannel = 0 + EndIf + + + If RoadShow = "false" Then + If QRChannel = 0 Then + ;Var VendingQRCode = "ERROR" + VendingQR ON + If CoinVendingOnFlag = 0 Then + ;CoinVending ON + Var CoinVendingOnFlag = 1 + Else + + + + EndIf + ;Var QRCODE99 = "" + + + Else + ;Var VendingQRCode = "OK" + VendingQR ON + CoinVending OFF + Var QRCODE99 = QRCODETMP + Var RemainAmountStr = "" + Var CashTextWarning = "" + + + If QRCODE99 = "" Then + Var CashTextWarning = "ระบบ Promtpay ไม่สามารถใช้งานได้ในขณะนี้" + Var QRErrorState = "Enable" + Else + Var QRErrorState = "Invisible" + EndIf + + + + EndIf + EndIf + + + If RoadShow = "true" Then + Var PayState1 = "Enable" + Var PayState2 = "Invisible" + Var PayState3 = "Invisible" + Var PayState4 = "Invisible" + Var showRemaining = "Free" + + Else + Var PayState1 = "Enable" + If IntVendingCampaign = 0 Then + Var PayState2 = "Enable" + Var PayState4 = "Enable" + Else + Var PayState2 = "Disable" + Var PayState4 = "Disable" + EndIf + Var PayState3 = "Enable" + + + If CoinAmount > 0 Then + Var PayState2 = "Disable" + Var PayState3 = "Disable" + Var PayState4 = "Disable" + Var CoinInFlag = 1 + EndIf + + If IntVendingCredit > 0 Then + Var PayState2 = "Disable" + Var PayState4 = "Disable" + EndIf + + + Var showRemaining = charOfBaht + RemainAmountStr + + If show_eng = "true" Then + Var showRemaining = charOfBaht + RemainAmountStr + Else + Var showRemaining = RemainAmountStr + " บาท" + EndIf + + EndIf + + + + + Var PayWithQR = 0 + Var NoGotoMenupage = "false" + If show_eng = "true" Then + Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cashSmall.png" + Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cashSmall.png" + Else + Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cashSmall.png" + Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cashSmall.png" + + EndIf + + If RoadShow = "true" Then + If show_eng = "true" Then + Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash_2.png" + Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash_2.png" + Else + Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash_2.png" + Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash_2.png" + EndIf + EndIf + + If GetFreeFromError = 1 Then + Var FreeVendingCampaign = 1 + CoinVending OFF + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + + EndIf + + If IntVendingCampaign >= PayAmount Then + Var RemainAmount = 0 + Var RemainAmountStr = "" + RemainAmount + CoinVending OFF + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + + EndIf + + If CoinInOK = 0 Then + + Var RemainAmount = PayAmount - CoinAmount + Var RemainAmount = RemainAmount - IntVendingCampaign + Var RemainAmount = RemainAmount - IntVendingCredit + Var SumCoinAmount = CoinAmount + IntVendingCampaign + If SumCoinAmount >= PayAmount Then + ;Var VendingQRCode = "ERROR" + CoinVending 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 RemainAmount = 0 + + Var showRemaining = charOfBaht + RemainAmountStr + If RoadShow = "true" Then + Var showRemaining = "Free" + EndIf + + 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" + + + + If NetworkStatus = "DOWN" Then + + Var PayState2 = "Disable" + Var PayState3 = "Disable" + Var PayState4 = "Disable" + + Var PayOfflineMode = 1 + Else + Var PayOfflineMode = 0 + 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 + SAVELOG "Diable code because using topping." + Var PayState2 = "Disable" + Var pay_with_code_image = DirImage + "/bp_pay_with_code_error.png" + Else + + If IntVendingCredit > 0 Then + + Var pay_with_code_image = DirImage + "/bp_pay_with_code_error2.png" + Var pay_with_credit_image = DirImage + "/bp_pay_with_credit_error2.png" + + Var pay_with_chanel_text = DirImage + "/text_2.png" + + Else + + Var pay_with_code_image = DirImage + "/bp_pay_with_code.png" + EndIf + EndIf + + + If CART_COUNT = 1 Then + Var pay_with_code_imagebn = "/bn_pay_with_codeSmall.png" + Var pay_with_code_imagebp = "/bp_pay_with_codeSmall.png" + Else + Var pay_with_code_imagebn = "/bn_pay_with_codeSmall_error.png" + Var pay_with_code_imagebp = "/bp_pay_with_codeSmall_error.png" + Var PayState2 = "Disable" + EndIf + + + Var cartNumText = "" + CART_COUNT + If show_eng = "true" Then + Var cartNumText = cartNumText + " cups" + Else + Var cartNumText = cartNumText + " แก้ว" + EndIf + Var PrepareFlag = 0 + Var PrepareTime = 0 + + + + + + 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 + + + Cart "PreparID" 1 + Var CART_INDEX = 1 + Var PayReference = MultiTSID + ;GenHashWithTimeStamp PayReference + Var PayWithQR = 1 + 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 + Var CashTextWarning = "" + Var QRErrorState = "Invisible" + Var QRCODE99 = SessionID + Var QRCODE99 = QRCODE99 + Ext1a + SAVELOG Ext1a + SAVELOG QRCODE99 + Var QRCODE99 = QRCODE99 + Ext21 + Var QRCODETMP = QRCODE99 + Var ReqPayInfoFlag = 0 + SAVELOG QRCODE99 + SAVELOG Ext21 + EndIf + Else + Var PayInfoCFlag = 1 + EndIf + + + + + 1000 + + If ReadyForBrew = "false" Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + + EndIf + + SAVELOG Timeout + + + Var Timeout = Timeout + 1 + + + If Timeout >= 120 Then + Var alphaState = "Invisible" + Var PayState3 = "Disable" + EndIf + + + If Timeout > 210 Then + If ActionOKCase = 1 Then + Var PayInfoCFlag = 1 + EndIf + EndIf + + If PayInfoCFlag = 1 Then + If CodeChannel = 1 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + 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 + "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 + EndIf + Open "ROOT/taobin_project/xml/page_catalog.xml" + 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 + + 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 PrepareFlag = 0 Then + + ;MakeDrinkV1 SelectDrink SelectSugarID + Cart "PreparID" 1 + Var CART_INDEX = 1 + Var PayReference = "" + GenHashWithTimeStamp PayReference + Open "ROOT/taobin_project/xml/page_thankyou.xml" + + EndIf + + Else + If CancelFlag = 0 Then + SAVELOG "Timeout > 180 s." + Cart "DeleteMenuID" "ALL" + + + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + + CoinVending OFF + Var CancelFlag = 1 + Var CancelCounter = 0 + If CoinAmount = 0 Then + If IntVendingCampaign = 0 Then + VendingQR OFF + + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + EndIf + EndIf + EndIf + + + If CancelFlag = 1 Then + + Var CancelCounter = CancelCounter + 1 + If CancelCounter = CancelNumber Then + ;Change CoinAmount + If CoinAmount > 0 Then + If 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 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 + + Var ActionOKCase = 1 + If IntVendingCampaign = 0 Then + + Open "ROOT/taobin_project/xml/page_catalog.xml" + EndIf + + EndIf + EndIf + + EndIf + + ;Var CoinInCounter = CoinInCounter + 1 + ;If CoinInOK = 1 Then + ; If CoinInCounter = 3 Then + ; + ; Var RemainAmount = PayAmount - CoinAmount + ; If CoinAmount >= PayAmount Then + ; Var Canout = CoinAmount - PayAmount + ; If Canout > 0 Then + ; Change Canout + ; Else + ; Var ChangeOK = 1 + ; EndIf + ; + ; Var Timeout = 118 + ; Var PayOK = 1 + ; + ; MakeDrinkV1 SelectDrink SelectSugarID + ; + ; Open "ROOT/taobin_project/xml/page_thankyou.xml" + ; + ; EndIf + ; EndIf + ;EndIf + + Refresh + TimerReset + + + + If ChangeStatus = "payout-end" Then + Var ChangeOK = 1 + EndIf + + + + TimerReset + + If CoinInFlag = 0 Then + ;VendingQR OFF + Var alphaState = "Invisible" + EndIf + + ;If StoreCreditFlag = 1 Then + ; Var ViewBill = 0 + ;EndIf + + Var CoinInFlag = 1 + + + + If ViewBill > 0 Then + + If PayOfflineMode = 1 Then + CoinVending BILLREJECT + Else + + + Var RemainAmount = PayAmount - CoinAmount + Var RemainAmount = RemainAmount - IntVendingCampaign + Var RemainAmount = RemainAmount - 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 alphaState3 = "Enable" + EndIf + + + Else + + + If CoinInOK = 0 Then + + Var RemainAmount = PayAmount - CoinAmount + Var RemainAmount = RemainAmount - IntVendingCampaign + Var RemainAmount = RemainAmount - IntVendingCredit + + Var SumCoinAmount = CoinAmount + IntVendingCampaign + Var SumCoinAmount = SumCoinAmount + IntVendingCredit + 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 + + + + + Refresh + + + If CoinInFlag = 1 Then + Cart "DeleteMenuID" "ALL" + If CoinInOK = 0 Then + If CancelFlag = 0 Then + SAVELOG "VDCancle > Cancle Order." + CoinVending OFF + Var CancelFlag = 1 + Var CancelCounter = 0 + + ;Var showRemaining = "คืนเงิน" + ;Open "ROOT/taobin_project/xml/page_catalog.xml" + + Var showRemaining = charOfBaht + "0" + + If FlagQROpened = 1 Then + Var CancelNumber = 12 + EndIf + + EndIf + EndIf + ;VendingQR OFF + Refresh + + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + EndIf + + + + + + VendingQR OFF + + DEBUGVAR CART1_PICTURE + DEBUGVAR CART2_PICTURE + DEBUGVAR CART3_PICTURE + + DEBUGVAR CART1_PDCODE + DEBUGVAR CART2_PDCODE + DEBUGVAR CART3_PDCODE + + DEBUGVAR CART1_NAME_ENG + DEBUGVAR CART2_NAME_ENG + DEBUGVAR CART3_NAME_ENG + + DEBUGVAR CART1_NAME_THAI + DEBUGVAR CART2_NAME_THAI + DEBUGVAR CART3_NAME_THAI + + + DEBUGVAR CART1_PRICE + DEBUGVAR CART2_PRICE + DEBUGVAR CART3_PRICE + + + Var cartNumText = "" + CART_COUNT + If show_eng = "true" Then + Var cartNumText = cartNumText + " cups" + Else + Var cartNumText = cartNumText + " แก้ว" + EndIf + + Var cart1_pic = "" + Var cart2_pic = "" + Var cart3_pic = "" + + Var cart1_name = "" + Var cart2_name = "" + Var cart3_name = "" + + Var cart1_price = "" + Var cart2_price = "" + Var cart3_price = "" + + Var cart1_en = "Invisible" + Var cart2_en = "Invisible" + Var cart3_en = "Invisible" + + + Var PriceDrink = 0 + + + + If CART_COUNT >= 1 Then + Var cart1_pic = "ROOT/taobin_project/image/page_drink/" + CART1_PICTURE + Var cart1_name = CART1_NAME_THAI + Var cart1_price = "" + CART1_PRICE + Var cart1_en = "Enable" + + Var PriceDrink = CART1_PRICE + EndIf + + If CART_COUNT >= 2 Then + Var cart2_pic = "ROOT/taobin_project/image/page_drink/" + CART2_PICTURE + Var cart2_name = CART2_NAME_THAI + Var cart2_price = "" + CART2_PRICE + Var cart2_en = "Enable" + + Var PriceDrink = PriceDrink + CART2_PRICE + EndIf + + If CART_COUNT = 3 Then + Var cart3_pic = "ROOT/taobin_project/image/page_drink/" + CART3_PICTURE + Var cart3_name = CART3_NAME_THAI + Var cart3_price = "" + CART3_PRICE + Var cart3_en = "Enable" + + Var PriceDrink = PriceDrink + CART3_PRICE + EndIf + + + + + Var ServiceAmountSum = PriceDrink + + If CART_COUNT >= 1 Then + + Var SelectDrink = "00-00-00-0000" + Var DiscountDrink = 0 + Var SelectSlot = "" + CART_COUNT + + SAVELOG BoxID + + Var QRCODE1 = "A000000677010112" + Var QRCODE2 = "010755600066301" + Var QRCODE3 = "VDGN" + Var QRCODE4 = BoxID + Var QRCODE5 = SelectSlot + Var QRCODE6 = SelectDrink + Var QRCODE7 = PriceDrink + Var QRCODE8 = "" + + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + "00000" + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumberQR = "0899999999" + Var ServiceType = "coffee-multi" + Var ECommerceQR = "" + Var ECommerceQR = ECommerceQR + PriceDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + "KBA:2" + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + + + GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + Var Timeout = 0 + + Var QRCODE99 = "" + Var QRCODETMP = "" + Var ReqPayInfoFlag = 1 + + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + + Else + + ;Open "ROOT/taobin_project/xml/page_catalog.xml" + Var showRemaining = charOfBaht + "0" + Refresh + EndIf + + + + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + + + +; back +; + + + 0 + 1172 + Var( DirImage + "/Rectangle0.png" ) + + + + 0 + 1012 + Var( DirImage + "/Rectangle.png" ) + + + + + + + + + + + + + + + + + + + + 60 + 412 + 148 + 200 + cart1_pic + + + + 876 + 467 + 1080 + 50 + KanitMediumTTF + 0xDE794E + cart1_price + + + + 236 + 470 + 1080 + 50 + KanitMediumTTF + 0x513C2F + cart1_name + + + + + + 60 + 612 + 148 + 200 + cart2_pic + + + + 876 + 667 + 1080 + 50 + KanitMediumTTF + 0xDE794E + cart2_price + + + + 236 + 670 + 1080 + 50 + KanitMediumTTF + 0x513C2F + cart2_name + + + + + + + 60 + 812 + 148 + 200 + cart3_pic + + + + 876 + 872 + 1080 + 50 + KanitMediumTTF + 0xDE794E + cart3_price + + + + 236 + 872 + 1080 + 50 + KanitMediumTTF + 0x513C2F + cart3_name + + + + + + 876 + 1038 + 1080 + 72 + KanitMediumTTF + 0xDE794E + showRemaining + + + + 80 + 1038 + 1080 + 72 + KanitMediumTTF + 0x513C2F + cartNumText + + + + +; QR popup + + 0 + 380 + alphaState + "ROOT/taobin_project/image/page_payment/alpha.png" + + + + 249 + 748 + alphaState + Var( DirImage + "/img_popup1.png" ) + + + + +; begin cash popup + + 0 + 380 + alphaState2 + "ROOT/taobin_project/image/page_payment/alpha.png" + + + + 182 + 748 + alphaState2 + Var( DirImage2 + "/img_popup11.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 + + + + + 399 + 912 + WQR + HQR + alphaState + testservice + + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + +; +; 0 +; 1880 +; 14 +; "Left" +; 1080 +; KanitThinTTF +; 0x513C2F +; SelectDrink +; + + + + + + + 5 + 1880 + 24 + Center + 1080 + RobotoRegular + 0xFFFFFF + ShowNetworkProblemText + + + + + + + + + + + diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml index bc0937a1..9e673915 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -48,7 +48,11 @@ Var PayState2 = "Enable" Var QRChannel = 0 Var CodeChannel = 0 - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + If CART_COUNT >= 1 Then + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + Else + Open "ROOT/taobin_project/xml/page_payment_cash.xml" + EndIf Refresh EndIf @@ -107,7 +111,6 @@ SAVELOG VendingCode SAVELOG VendingCampaignRI3 - If VendingCode = "C00" Then @@ -128,8 +131,19 @@ Var FreeVendingCampaign = 1 CoinVending OFF ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" - MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" + If CART_COUNT >= 1 Then + + Cart "PreparID" 1 + Var CART_INDEX = 1 + Var PayReference = "" + GenHashWithTimeStamp PayReference + Open "ROOT/taobin_project/xml/page_thankyou.xml" + Else + Var CART_INDEX = 0 + + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf EndIf @@ -272,7 +286,11 @@ Var QRCODETMP = QRCODE99 Var CodeChannel = 1 - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + If CART_COUNT >= 1 Then + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + Else + Open "ROOT/taobin_project/xml/page_payment_cash.xml" + EndIf EndIf @@ -303,7 +321,11 @@ Var CodeChannel = 1 Var QRCODE99 = "" Var QRCODETMP = "" - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + If CART_COUNT >= 1 Then + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + Else + Open "ROOT/taobin_project/xml/page_payment_cash.xml" + EndIf EndIf @@ -585,7 +607,11 @@ Var PayState2 = "Enable" Var QRChannel = 0 Var CodeChannel = 0 - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + If CART_COUNT >= 1 Then + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + Else + Open "ROOT/taobin_project/xml/page_payment_cash.xml" + EndIf @@ -605,11 +631,11 @@ If UnitTestType = "2" Then - If TelephoneNumber = "00000000" Then + If TelephoneNumber = "00000001" Then Var ShowErrorText = "Enable" EndIf Else - If TelephoneNumber = "00000000" Then + If TelephoneNumber = "00000002" Then Var ShowErrorText = "Enable" EndIf If TelephoneNumber = "99999999" Then diff --git a/xml/page_payment_credit.xml b/xml/page_payment_credit.xml index d238db06..628880b0 100644 --- a/xml/page_payment_credit.xml +++ b/xml/page_payment_credit.xml @@ -47,7 +47,11 @@ Var PayState2 = "Enable" Var QRChannel = 0 Var CodeChannel = 0 - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + If CART_COUNT >= 1 Then + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + Else + Open "ROOT/taobin_project/xml/page_payment_cash.xml" + EndIf EndIf @@ -553,7 +557,11 @@ Var PayState2 = "Enable" Var QRChannel = 0 Var CodeChannel = 0 - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + If CART_COUNT >= 1 Then + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + Else + Open "ROOT/taobin_project/xml/page_payment_cash.xml" + EndIf diff --git a/xml/page_payment_credit2.xml b/xml/page_payment_credit2.xml index 9823c91f..ac9fb503 100644 --- a/xml/page_payment_credit2.xml +++ b/xml/page_payment_credit2.xml @@ -52,7 +52,11 @@ Var PayState2 = "Enable" Var QRChannel = 0 Var CodeChannel = 0 - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + If CART_COUNT >= 1 Then + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + Else + Open "ROOT/taobin_project/xml/page_payment_cash.xml" + EndIf EndIf If StateBGetSMS = "Disable" Then @@ -753,7 +757,7 @@ 188 - 626 + 699 Var( DirImage + "/text_16.png" ) diff --git a/xml/page_payment_credit3.xml b/xml/page_payment_credit3.xml index d0ef470d..49beecbd 100644 --- a/xml/page_payment_credit3.xml +++ b/xml/page_payment_credit3.xml @@ -19,6 +19,7 @@ INT CoffeeCredit Var SumCreditAmount = CoffeeCredit + ;Var SumCreditAmount = 5 Var NotEnoughFlag = 0 @@ -37,6 +38,10 @@ Else Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + + Var PrepareFlag = 0 + Var PrepareTime = 0 + 1000 @@ -113,7 +118,11 @@ Var PayState2 = "Enable" Var QRChannel = 0 Var CodeChannel = 0 - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + If CART_COUNT >= 1 Then + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + Else + Open "ROOT/taobin_project/xml/page_payment_cash.xml" + EndIf @@ -141,9 +150,20 @@ Var CoffeePinNumber = PinNumber Var StoreCreditFlag = 1 + + If CART_COUNT >= 1 Then + + Cart "PreparID" 1 + Var CART_INDEX = 1 + Var PayReference = "" + GenHashWithTimeStamp PayReference + Open "ROOT/taobin_project/xml/page_thankyou.xml" + Else + Var CART_INDEX = 0 - MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf Else @@ -164,7 +184,11 @@ Var CreditAmount1 = "" Var ServiceAmountFlow = "" Var TelephoneNumberQR = "0899999999" - Var ServiceType = "coffee" + If CART_COUNT >= 1 Then + Var ServiceType = "coffee-multi" + Else + Var ServiceType = "coffee" + EndIf Var ECommerceQR = "" Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" @@ -199,7 +223,11 @@ Var StoreCreditFlag = 1 - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + If CART_COUNT >= 1 Then + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + Else + Open "ROOT/taobin_project/xml/page_payment_cash.xml" + EndIf EndIf diff --git a/xml/page_payment_multi.xml b/xml/page_payment_multi.xml index ed4f0e8c..5c93ba4f 100644 --- a/xml/page_payment_multi.xml +++ b/xml/page_payment_multi.xml @@ -2,8 +2,119 @@ "Enable" 1080 1920 - "0xeae6e1" + "0xFFFFFF" + + DEBUGVAR CART1_PICTURE + DEBUGVAR CART2_PICTURE + DEBUGVAR CART3_PICTURE + + DEBUGVAR CART1_PDCODE + DEBUGVAR CART2_PDCODE + DEBUGVAR CART3_PDCODE + + DEBUGVAR CART1_NAME_ENG + DEBUGVAR CART2_NAME_ENG + DEBUGVAR CART3_NAME_ENG + + DEBUGVAR CART1_NAME_THAI + DEBUGVAR CART2_NAME_THAI + DEBUGVAR CART3_NAME_THAI + + + DEBUGVAR CART1_PRICE + DEBUGVAR CART2_PRICE + DEBUGVAR CART3_PRICE + + Var cart1_pic = "" + Var cart2_pic = "" + Var cart3_pic = "" + + Var cart1_name = "" + Var cart2_name = "" + Var cart3_name = "" + + Var cart1_price = "" + Var cart2_price = "" + Var cart3_price = "" + + Var cart1_en = "Invisible" + Var cart2_en = "Invisible" + Var cart3_en = "Invisible" + + Var PriceDrink = 0 + + + + If show_eng = "true" Then + + If CART_COUNT >= 1 Then + Var cart1_pic = "ROOT/taobin_project/image/page_drink/" + CART1_PICTURE + Var cart1_name = CART1_NAME_ENG + Var cart1_price = "" + CART1_PRICE + Var cart1_en = "Enable" + + Var PriceDrink = PriceDrink + CART1_PRICE + + EndIf + + If CART_COUNT >= 2 Then + Var cart2_pic = "ROOT/taobin_project/image/page_drink/" + CART2_PICTURE + Var cart2_name = CART2_NAME_ENG + Var cart2_price = "" + CART2_PRICE + Var cart2_en = "Enable" + + Var PriceDrink = PriceDrink + CART2_PRICE + + EndIf + + If CART_COUNT = 3 Then + Var cart3_pic = "ROOT/taobin_project/image/page_drink/" + CART3_PICTURE + Var cart3_name = CART3_NAME_ENG + Var cart3_price = "" + CART3_PRICE + Var cart3_en = "Enable" + + Var PriceDrink = PriceDrink + CART3_PRICE + EndIf + + + Else + + + + If CART_COUNT >= 1 Then + Var cart1_pic = "ROOT/taobin_project/image/page_drink/" + CART1_PICTURE + Var cart1_name = CART1_NAME_THAI + Var cart1_price = "" + CART1_PRICE + Var cart1_en = "Enable" + + Var PriceDrink = PriceDrink + CART1_PRICE + + EndIf + + If CART_COUNT >= 2 Then + Var cart2_pic = "ROOT/taobin_project/image/page_drink/" + CART2_PICTURE + Var cart2_name = CART2_NAME_THAI + Var cart2_price = "" + CART2_PRICE + Var cart2_en = "Enable" + + Var PriceDrink = PriceDrink + CART2_PRICE + + EndIf + + If CART_COUNT = 3 Then + Var cart3_pic = "ROOT/taobin_project/image/page_drink/" + CART3_PICTURE + Var cart3_name = CART3_NAME_THAI + Var cart3_price = "" + CART3_PRICE + Var cart3_en = "Enable" + + Var PriceDrink = PriceDrink + CART3_PRICE + EndIf + EndIf + + Var ServiceAmountSum = PriceDrink + + ; On open Var GetPayInfoFlag = 0 Var SessionID2 = "" @@ -14,10 +125,11 @@ Var QRChannel = 0 Var HaveCup = "true" - ;Var PriceDrink = 5 - + + + Var SelectDrink = "00-00-00-0000" Var DiscountDrink = 0 - Var SelectSlot = "1" + Var SelectSlot = "" + CART_COUNT SAVELOG BoxID @@ -47,8 +159,12 @@ Var TNumberTaobinMember = "" Var VendingTSIDTmp = "" - Var TNumberTaobinMember = "" - Var VendingTSIDTmp = "" + + Var MultiTSID = "" + Var PayReference = "" + + Var AddPointFlag = 0 + Var PayType = "" If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment" @@ -79,34 +195,90 @@ Var MachineStage = "-" - DEBUGVAR CART1_PICTURE - DEBUGVAR CART2_PICTURE - DEBUGVAR CART3_PICTURE + Var cartNumText = "" + CART_COUNT + If show_eng = "true" Then + Var cartNumText = cartNumText + " cups" + Else + Var cartNumText = cartNumText + " แก้ว" + EndIf - DEBUGVAR CART1_PDCODE - DEBUGVAR CART2_PDCODE - DEBUGVAR CART3_PDCODE + Var PayAmount = PriceDrink + Var RemainAmountStr = "" + PayAmount + Var showRemaining = charOfBaht + RemainAmountStr - DEBUGVAR CART1_NAME_ENG - DEBUGVAR CART2_NAME_ENG - DEBUGVAR CART3_NAME_ENG - - DEBUGVAR CART1_NAME_THAI - DEBUGVAR CART2_NAME_THAI - DEBUGVAR CART3_NAME_THAI - - - DEBUGVAR CART1_PRICE - DEBUGVAR CART2_PRICE - DEBUGVAR CART3_PRICE - -Open "ROOT/taobin_project/xml/page_back_to_main.xml" - 5000 - Open "ROOT/taobin_project/xml/page_back_to_main.xml" + + If ReadyForBrew = "false" Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + Var ReadyForBrew = "false" + EndIf + + If MachineStage = "remove-cup" Then + Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" + + EndIf + + Var CountStepPackPayment = CountStepPackPayment + 1 + If CountStepPackPayment = 1 Then + + + + SAVELOG ExtendData + + If GetPayInfoFlag = 0 Then + If RoadShow = "false" Then + ;CoinVending ON + CoinVending XBILL + EndIf + + + Var RemainAmount = 0 + + + + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + "00000" + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumberQR = "0899999999" + Var ServiceType = "coffee-multi" + Var ECommerceQR = "" + Var ECommerceQR = ECommerceQR + PriceDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + "KBA:2" + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + + + GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + Var Timeout = 0 + Var GetPayInfoFlag = 1 + Var ReqPayInfoFlag = 1 + + EndIf + + ; Reset + Var MachineState_Result = 0 + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + + EndIf + TimerReset Refresh @@ -128,45 +300,156 @@ Open "ROOT/taobin_project/xml/page_back_to_main.xml" + - 375 - 623 - 331 - 435 - PictureDrink - - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - - + 0 + 1172 + Var( DirImage + "/Rectangle0.png" ) + + + + 0 + 1012 + Var( DirImage + "/Rectangle.png" ) + + + + + 60 + 412 + 148 + 200 + cart1_pic - 0 - 938 + 876 + 467 + 1080 + 50 + KanitMediumTTF + 0xDE794E + cart1_price + + + + 236 + 470 + 1080 + 50 + KanitMediumTTF + 0x513C2F + cart1_name + + + + + + 60 + 612 + 148 + 200 + cart2_pic + + + + 876 + 667 + 1080 + 50 + KanitMediumTTF + 0xDE794E + cart2_price + + + + 236 + 670 + 1080 + 50 + KanitMediumTTF + 0x513C2F + cart2_name + + + + + + 60 + 812 + 148 + 200 + cart3_pic + + + + 876 + 872 + 1080 + 50 + KanitMediumTTF + 0xDE794E + cart3_price + + + + 236 + 872 + 1080 + 50 + KanitMediumTTF + 0x513C2F + cart3_name + + + + + + + 876 + 1038 + 1080 + 72 + KanitMediumTTF + 0xDE794E + showRemaining + + + + 80 + 1038 1080 - Center 72 KanitMediumTTF 0x513C2F - showname + cartNumText - - 0 - 1022 - 1080 - Center - 24 - KanitLightTTF - 0x6F5F51 - showdesc - - - - 144 - 413 - Var( DirImage + "/text_1.png" ) - - diff --git a/xml/page_payment_storeCredit3.xml b/xml/page_payment_storeCredit3.xml index 9b583143..02b193c8 100644 --- a/xml/page_payment_storeCredit3.xml +++ b/xml/page_payment_storeCredit3.xml @@ -49,12 +49,19 @@ Else - - ;Var TNumberTaobinCredit = TelephoneNumber - ;Var CoffeePinNumber = PinNumber + If CART_COUNT >= 1 Then - MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" + Cart "PreparID" 1 + Var CART_INDEX = 1 + Var PayReference = "" + GenHashWithTimeStamp PayReference + Open "ROOT/taobin_project/xml/page_thankyou.xml" + Else + Var CART_INDEX = 0 + + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf EndIf diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index e0f771b8..d169acab 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -7,7 +7,7 @@ SoundVolume ; On open - Var CountDownThankyou = 2 + Var CountDownThankyou = 3 Var CountDownBrewing = BrewTime Var CountUpBrewing = 0 SAVELOG BrewTime @@ -21,6 +21,10 @@ Var GotoStoreCredit0 = 0 Var StoreCreditAmount = 0 + + Var MachineState_Result = 0 + + Var FailedCount = 0 If show_eng = "true" Then @@ -54,7 +58,12 @@ Var CountDownThankyou = CountDownThankyou - 1 Var Timeout = Timeout + 1 - If Timeout = 2 Then + If Timeout = 3 Then + + If CART_INDEX = 0 Then + Else + Cart "MakeID" CART_INDEX + EndIf If PayWithQR = 0 Then If FreeVendingCampaign = 0 Then @@ -130,6 +139,10 @@ EndIf + If CART_INDEX >= 2 Then + Open "ROOT/taobin_project/xml/page_lid_straw.xml" + EndIf + Open "ROOT/taobin_project/xml/page_collect_point_1.xml" Else @@ -137,6 +150,10 @@ If FreeVendingCampaign = 1 Then Open "ROOT/taobin_project/xml/page_lid_straw.xml" Else + If CART_INDEX >= 2 Then + Open "ROOT/taobin_project/xml/page_lid_straw.xml" + EndIf + Open "ROOT/taobin_project/xml/page_collect_point_1.xml" EndIf Else @@ -146,6 +163,9 @@ If FreeVendingCampaign = 1 Then Open "ROOT/taobin_project/xml/page_lid_straw.xml" Else + If CART_INDEX >= 2 Then + Open "ROOT/taobin_project/xml/page_lid_straw.xml" + EndIf Open "ROOT/taobin_project/xml/page_collect_point_1.xml" EndIf EndIf diff --git a/xml/page_thankyouMore.xml b/xml/page_thankyouMore.xml new file mode 100644 index 00000000..606ca201 --- /dev/null +++ b/xml/page_thankyouMore.xml @@ -0,0 +1,148 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + "ROOT/taobin_project/sounds/chaching.mp3" + SoundVolume + + ; On open + Var CountDownThankyou = 3 + Var CountDownBrewing = BrewTime + Var CountUpBrewing = 0 + SAVELOG BrewTime + Var ShowCountDownBrewing = CountDownBrewing + Var Timeout = 0 + Var ChangeFlag = 0 + Var ErrTimeout = 0 + Var ActionOKCase = 0 + Var ChangeTimeout = 0 + Var ChangeFlag2 = 0 + + Var GotoStoreCredit0 = 0 + Var StoreCreditAmount = 0 + + Var MachineState_Result = 0 + Var ChangeOK = 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" + Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" + + Else + Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2.png" + Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + EndIf + + DEBUGVAR StarwState + DEBUGVAR LidState + + If StarwState = "Press" Then + Machine StrawWithDelay + LED LedDoorLid Blink 255 255 255 255 + EndIf + If LidState = "Press" Then + Machine LidWithDelay + LED LedDoorLid Blink 255 255 255 255 + EndIf + + + + + + If CART_INDEX = 2 Then + Var showname = CART2_NAME_THAI + Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + CART2_PICTURE + + EndIf + + If CART_INDEX = 3 Then + Var showname = CART3_NAME_THAI + Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + CART3_PICTURE + + EndIf + + + + + + + 1000 + + Var CountDownBrewing = CountDownBrewing - 1 + Var CountDownThankyou = CountDownThankyou - 1 + + Var Timeout = Timeout + 1 + If Timeout = 3 Then + + If CART_INDEX = 0 Then + Else + Cart "MakeID" CART_INDEX + EndIf + + EndIf + + + ; run test; + If CountDownThankyou = 0 Then + + Var CountDownBrewing = BrewTime + Var CountUpBrewing = 0 + SAVELOG BrewTime + Var ShowCountDownBrewing = CountDownBrewing + + Open "ROOT/taobin_project/xml/page_brewing3Multi.xml" + + EndIf + + Var ShowCountDownBrewing = CountDownBrewing + Refresh + TimerReset + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + + + 375 + 623 + 331 + 435 + PictureDrink + + + + 0 + 938 + 1080 + Center + 72 + KanitMediumTTF + 0x513C2F + showname + + + + + If ChangeStatus = "payout-end" Then + + EndIf + + + + diff --git a/xml/page_topping_select.xml b/xml/page_topping_select.xml index 02f70d99..f9e181a6 100644 --- a/xml/page_topping_select.xml +++ b/xml/page_topping_select.xml @@ -115,6 +115,8 @@ Var ToppingGotoPayment = "true" + + Var ButtonNext = "false" 2000 @@ -522,6 +524,22 @@ + + ;Var BugFlag = 1 + If CartUpdate = "true" Then + Var CartUpdate = "-" + If CART_COUNT = 3 Then + Open "ROOT/taobin_project/xml/page_payment_multi.xml" + Else + If ButtonNext = "true" Then + Open "ROOT/taobin_project/xml/page_payment_multi.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog.xml" + EndIf + EndIf + EndIf + + @@ -575,8 +593,8 @@ -; next + +; add backet - Open "ROOT/taobin_project/xml/page_payment.xml" +; next + diff --git a/xml/page_topping_select2.xml b/xml/page_topping_select2.xml index f8bf066a..a9cff3d1 100644 --- a/xml/page_topping_select2.xml +++ b/xml/page_topping_select2.xml @@ -148,7 +148,7 @@ EndIf EndIf - + Var NextButton = "false" 2000 @@ -611,7 +611,11 @@ If CART_COUNT = 3 Then Open "ROOT/taobin_project/xml/page_payment_multi.xml" Else - Open "ROOT/taobin_project/xml/page_catalog.xml" + If NextButton = "true" Then + Open "ROOT/taobin_project/xml/page_payment_multi.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog.xml" + EndIf EndIf EndIf @@ -1551,8 +1555,24 @@ ; Pack Topping "Pack" ExtendData - - Open "ROOT/taobin_project/xml/page_payment.xml" + If CART_COUNT = 0 Then + Open "ROOT/taobin_project/xml/page_payment.xml" + Else + If CART1_STATUS = "EMPTY" Then + Cart "AddMenuID" 1 + Else + If CART2_STATUS = "EMPTY" Then + Cart "AddMenuID" 2 + Else + If CART3_STATUS = "EMPTY" Then + Cart "AddMenuID" 3 + EndIf + EndIf + EndIf + + Var CartUpdate = "true" + Var NextButton = "true" + EndIf