diff --git a/spiral/image/page_spiral/bd_toppingice.png b/spiral/image/page_spiral/bd_toppingice.png new file mode 100644 index 00000000..fec80feb Binary files /dev/null and b/spiral/image/page_spiral/bd_toppingice.png differ diff --git a/spiral/image/page_spiral/bn_toppingice.png b/spiral/image/page_spiral/bn_toppingice.png new file mode 100644 index 00000000..a6018763 Binary files /dev/null and b/spiral/image/page_spiral/bn_toppingice.png differ diff --git a/spiral/image/page_spiral/en_spiral_option_ice.png b/spiral/image/page_spiral/en_spiral_option_ice.png new file mode 100644 index 00000000..57d81f28 Binary files /dev/null and b/spiral/image/page_spiral/en_spiral_option_ice.png differ diff --git a/spiral/image/page_spiral/en_spiral_text_fail.png b/spiral/image/page_spiral/en_spiral_text_fail.png new file mode 100644 index 00000000..815bc824 Binary files /dev/null and b/spiral/image/page_spiral/en_spiral_text_fail.png differ diff --git a/spiral/image/page_spiral/en_unavalible.png b/spiral/image/page_spiral/en_unavalible.png new file mode 100644 index 00000000..5ecc99e9 Binary files /dev/null and b/spiral/image/page_spiral/en_unavalible.png differ diff --git a/spiral/image/page_spiral/spiral_option_ice.png b/spiral/image/page_spiral/spiral_option_ice.png new file mode 100644 index 00000000..3c0a4194 Binary files /dev/null and b/spiral/image/page_spiral/spiral_option_ice.png differ diff --git a/spiral/image/page_spiral/text21.png b/spiral/image/page_spiral/text21.png new file mode 100644 index 00000000..0360c597 Binary files /dev/null and b/spiral/image/page_spiral/text21.png differ diff --git a/spiral/image/page_spiral/unavalible.png b/spiral/image/page_spiral/unavalible.png new file mode 100644 index 00000000..c1c0971b Binary files /dev/null and b/spiral/image/page_spiral/unavalible.png differ diff --git a/spiral/xml/page_catalog_vending_machine.xml b/spiral/xml/page_catalog_vending_machine.xml index 1e0f9e54..cc8e1a05 100644 --- a/spiral/xml/page_catalog_vending_machine.xml +++ b/spiral/xml/page_catalog_vending_machine.xml @@ -9,6 +9,7 @@ "0xeae6e1" SoundVolume + Var SpiralOption = 0 Var SpiralSoftwareVersion = "1.04" Var ColorBrown = 0x746253 Var ColorBrown2 = 0x513C2F @@ -2333,6 +2334,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var SpiralOption = 1 Var SpiralSelectdetail1 = $03-01-01-0039.detail1 Var SpiralSelectheader2 = $03-01-01-0039.header2 Var SpiralSelectdetail2 = $03-01-01-0039.detail2 @@ -2491,6 +2493,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var SpiralOption = 1 Var SpiralSelectdetail1 = $03-01-01-0040.detail1 Var SpiralSelectheader2 = $03-01-01-0040.header2 Var SpiralSelectdetail2 = $03-01-01-0040.detail2 diff --git a/spiral/xml/page_spiral_check_cash.xml b/spiral/xml/page_spiral_check_cash.xml index 083414f8..5daa2644 100644 --- a/spiral/xml/page_spiral_check_cash.xml +++ b/spiral/xml/page_spiral_check_cash.xml @@ -10,10 +10,27 @@ Var GotoStoreCredit0 = 0 Var LastMakeSpiralResult = 0 Var MachineSpiralStage = "" + If SellLeaw = 0 Then SPIRAL_SELL ServiceCredit SpiralRef Var TestSellSpiral = 1 DEBUGVAR TestSellSpiral + If Seeker.thankToppingFlag = 1 Then + If StrawState = "Press" Then + Machine StrawOrder + Var LedLidBlink = "true" + EndIf + + If LidState = "Press" Then + Machine LidOrder + Var LedLidBlink = "true" + EndIf + + Var SelectDrink = "12-05-02-0017" + Var SelectSugarID = 0 + MakeDrinkV1 SelectDrink SelectSugarID + EndIf + Var SellLeaw = 1 EndIf diff --git a/spiral/xml/page_spiral_failmuti.xml b/spiral/xml/page_spiral_failmuti.xml new file mode 100644 index 00000000..a4e9a334 --- /dev/null +++ b/spiral/xml/page_spiral_failmuti.xml @@ -0,0 +1,988 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + "ROOT/taobin_project/sounds/chaching.mp3" + SoundVolume + + Var SetPayMuti = 0 + Var Timeout3 = 0 + ;Var LastMakeDrinkResult = "-" + ;Var MachineState_Result = 2 + + Var ChangeFlag3 = 0 + Var ChangeFailSpiral = 0 + Var ChangeFailCoffee = 0 + Var SpiralText1 = 0 + Var MultiGo = 0 + DEBUGVAR SpiralText1 + Var Timeout = 0 + Var ShowPictureFail = 0 + If ChangeOK = 1 Then + Var ChangeOK = 2 + EndIf + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/complete_en/text_bottom.png" + Var DirImage1 = "ROOT/taobin_project/spiral/image/page_spiral/en_spiral_text_fail.png" + Else + Var DirImage = "ROOT/taobin_project/image/complete/text_bottom.png" + Var DirImage1 = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_fail.png" + EndIf + + + Var SpiralPickDrink = "Invisible" + + 1000 + + + If CreditCardVoid = 1 Then + Var ChangeOK = 3 + EndIf + + If Seeker.thankToppingFlag = 1 Then + Else + If SpiralCodeOk = 1 Then + If CheckAckCode = 1 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + DEBUGVAR SessionID2 + + DEBUGVAR SessionID2 + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumber = "0899999999" + Var ServiceType = "locker" + Var ECommerce = "" + Var ECommerce = "locker5/" + Var ECommerce = ECommerce + PriceDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + DiscountDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SessionID2 + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SelectDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.VendingCode + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.CodeNumber + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + "C:" + Var ECommerce = ECommerce + Seeker.IntVendingCampaign + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + + GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + + Var SpiralCodeOk = 2 + + Open "ROOT/taobin_project/spiral/xml/page_spiral_fail2.xml" + EndIf + EndIf + EndIf + + + + + + DEBUGVAR LastMakeSpiralResult + DEBUGVAR LastMakeDrinkResult + DEBUGVAR MachineState_Result + DEBUGVAR MachineStage + DEBUGVAR SpiralPickDrink + +; DEBUGVAR waitAckPay +; DEBUGVAR Timeout +; DEBUGVAR sendPayMultiFlag +; DEBUGVAR PayOk +; DEBUGVAR SetPayMuti +; DEBUGVAR MultiGo +; DEBUGVAR ChangeOK +; DEBUGVAR ChangeStatus +; DEBUGVAR Seeker.TNumberTaobinCredit +; DEBUGVAR Seeker.StoreCreditFlag +; DEBUGVAR Seeker.PayWithQR +; DEBUGVAR Seeker.CodeChannel +; DEBUGVAR CheckAckCodeTimer +; +; DEBUGVAR Seeker.pageStoreCredit0 +; +; DEBUGVAR SpiralCodeOk +; DEBUGVAR CheckAckCode +; DEBUGVAR CheckAckCodeTimer + + Var Timeout = Timeout + 1 + + Var ChangeTimeout = ChangeTimeout - 1 + Var CheckAckCodeTimer = CheckAckCodeTimer - 1 + + If MachineStage = "pickup-cup" Then + Var SpiralPickDrink = "Enable" + Else + Var SpiralPickDrink = "Invisible" + EndIf + + If ChangeTimeout < 1 Then + If ChangeOK = 1 Then + Var ChangeOK = 2 + Var ChangeTimeout = 30 + EndIf + EndIf + If ChangeTimeout < 1 Then + If ChangeFlag2 = 1 Then + Var ChangeOK = 3 + Var ChangeFlag2 = 2 + Var ChangeTimeout = 30 + EndIf + EndIf + + If SpiralCodeOk = 1 Then + If CheckAckCode = 1 Then + If LastMakeSpiralResult = 2 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + DEBUGVAR SessionID2 + + DEBUGVAR SessionID2 + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumber = "0899999999" + Var ServiceType = "locker" + Var ECommerce = "" + Var ECommerce = "locker5/" + Var ECommerce = ECommerce + PriceDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + DiscountDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SessionID2 + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SelectDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.VendingCode + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.CodeNumber + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + "C:" + Var ECommerce = ECommerce + Seeker.IntVendingCampaign + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + + GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + + Var SpiralCodeOk = 2 + + EndIf + EndIf + EndIf + + If PayOk = 9 Then + Var SetPayMuti = SetPayMuti + 1 + If SetPayMuti = 2 Then + Var PayOk = 2 + Var SetPayMuti = 0 + EndIf + EndIf + + If PayOk = 8 Then + Var SetPayMuti = SetPayMuti + 1 + If SetPayMuti = 2 Then + Var PayOk = 3 + Var SetPayMuti = 0 + EndIf + EndIf + + If PayOk = 7 Then + Var SetPayMuti = SetPayMuti + 1 + If SetPayMuti = 2 Then + Var PayOk = 5 + Var SetPayMuti = 0 + EndIf + EndIf + + If LastMakeSpiralResult = 2 Then + If ChangeOK = 3 Then + If PayOk = 0 Then + Var PayOk = 9 + Var SessionID4 = MachineSpiralID + Var SessionID4 = SessionID4 + ":" + Var SessionID4 = SessionID4 + MachineSpiralSlotID + + Var SessionID3 = SessionID3 + MachineSpiralID + Var SessionID3 = SessionID3 + "/" + Var SessionID3 = SessionID3 + MachineSpiralSlotID + + If SpiralCodeOk = 1 Then + Var SessionID3 = SessionID3 + "/" + Var SessionID3 = SessionID3 + Seeker.VendingCode + Var SessionID3 = SessionID3 + "/" + Var SessionID3 = SessionID3 + Seeker.CodeNumber + EndIf + + + ;Var PayDetail="1/F:1221/0/" + Var PayDetail="1/F:" + Var PayDetail = PayDetail + MachineSpiralErrorCode + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + SessionID4 + + If Seeker.PayWithQR = 1 Then + ;If waitAckPay = 0 Then + ; Var waitAckPay = 1 + ; Var SVT = "locker" + ; Var ACC = "0899999999" + ; Var DEE = PayDetail + + If Seeker.TNumberTaobinCredit = "" Then + Else + Var ACC = Seeker.TNumberTaobinCredit + EndIf + ;PAYEXT SVT ACC VendingTSIDTmp DEE + + Var ServiceCredit = KeepServiceCredit + Var ServiceType = "locker" + + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID3 PriceDrink ServiceCharge Donate + If SpiralCodeOk = 1 Then + Var CheckAckCode = 1 + Var CheckAckCodeTimer = 10 + Else + Var ShowPictureFail = 1 + EndIf + ;EndIf + Else + + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID3 PriceDrink ServiceCharge Donate + If SpiralCodeOk = 1 Then + Var CheckAckCode = 1 + Var CheckAckCodeTimer = 10 + Else + Var ShowPictureFail = 1 + EndIf + EndIf + EndIf + EndIf + EndIf + + + If LastMakeSpiralResult = 2 Then + If Seeker.PayWithQR = 0 Then + If Seeker.CreditCard = 1 Then + If CreditCardVoid = 0 Then + + Var ChangeFlag = 1 + Var CreditCardVoid = 1 + ; Var ChangeOK = 3 + EndIf + + If CoinAmount > 0 Then + If ChangeFlag = 0 Then + Var ChangeFlag = 1 + Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign + + If Seeker.StoreCreditFlag = 1 Then + Var ChangeOK = 2 + Else + Change ServiceAmount3 + Var ChangeFlag2 = 1 + Var ChangeTimeout = 30 + EndIf + EndIf + ;Else + ; Var ChangeOK = 3 + EndIf + + Else + If Seeker.CodeChannel = 0 Then + If ChangeFlag = 0 Then + Var ChangeFlag = 1 + If Seeker.StoreCreditFlag = 1 Then + Var ChangeOK = 3 + Else + Var ChangeFailSpiral = 1 + ;Var ServiceAmount2 = ServiceAmount2 - PriceDrinkTopping + ;Change ServiceAmount2 + Var ChangeTimeout = 30 + Var ChangeFlag2 = 1 + EndIf + EndIf + Else + If CoinAmount > 0 Then + If ChangeFlag = 0 Then + Var ChangeFlag = 1 + Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign + If Seeker.StoreCreditFlag = 1 Then + Var ChangeOK = 3 + ; test edit + Else + Change ServiceAmount3 + Var ChangeFlag2 = 1 + Var ChangeTimeout = 30 + EndIf + EndIf + Else + If ChangeOK = 3 Then + Else + Var ChangeOK = 2 + EndIf + EndIf + EndIf + EndIf + Else + Var ChangeOK = 3 + EndIf + EndIf + +If Seeker.thankToppingFlag = 1 Then + If MachineStage = "close-maintenance" Then + If MachineState_Result = 0 Then + SAVELOG "back_to_main from line > 663." + Var MachineState_Result = 2 + 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 + SAVELOG " drink-failed...." + Var MachineState_Result = 2 + EndIf + EndIf + + If MachineState_Result > 0 Then + Var EnableSelectMenuBetweenBrew = "Invisible" + EndIf + + + + If LastMakeDrinkResult = "success" Then + Var MachineState_Result = 1 + EndIf + + If MultiGo = 0 Then + If MachineState_Result = 2 Then + If SaveCoinAmount > 0 Then + If Seeker.TNumberTaobinCredit = "" Then + Change PriceDrinkTopping + Var MultiGo = 1 + Else + Var MultiGo = 2 + EndIf + Else + Var MultiGo = 2 + EndIf + EndIf + EndIf + + + If LastMakeDrinkResult = "success" Then + Var MachineState_Result = 1 + EndIf + + + If PayOk = 2 Then + If MultiGo = 2 Then + If waitAckPay = 0 Then + If MachineState_Result = 2 Then + If Timeout3 = 0 Then + Var waitAckPay = 1 + Var PayOk = 8 + If Seeker.TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + If Seeker.TNumberTaobinMember = "" Then + Else + Var TelephoneNumber = Seeker.TNumberTaobinMember + EndIf + Else + Var TelephoneNumber = Seeker.TNumberTaobinCredit + Var PayO2 = Seeker.CoffeePinNumber + EndIf + + Var PayDetail= "1/F:1221/0/" + Var ServiceType = "coffee" + + Var SuggestID = "" + Var SessionID2 = "" + Var ServiceCredit = SelectDrink + + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 PriceDrinkTopping ServiceCharge Donate + Var sendPayMultiFlag = 2 + If Seeker.PayWithQR = 0 Then + If Seeker.CodeChannel = 0 Then + If Seeker.StoreCreditFlag = 1 Then + + Else + Var ChangeAmountSum = ChangeAmountSum + ServiceAmount2 + ;Var MultiGo = 0 + EndIf + EndIf + EndIf + EndIf + EndIf + EndIf + EndIf + EndIf + + + If PayOk = 2 Then + If MachineState_Result = 1 Then + DEBUGVAR PaySuccessWithDaemonTask + + If waitAckPay = 0 Then + Var PayOk = 8 + Var waitAckPay = 1 + Var Timeout = 0 + Var Timeout3 = 2 + Var ProcessText = "" + + If Seeker.TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + + If Seeker.TNumberTaobinMember = "" Then + Else + Var TelephoneNumber = Seeker.TNumberTaobinMember + EndIf + + Else + Var TelephoneNumber = Seeker.TNumberTaobinCredit + Var PayO2 = Seeker.CoffeePinNumber + EndIf + + + Var ServiceType = "coffee" + Var ServiceCredit = SelectDrink + Var SuggestID = "" + + Var PayDetail = "2/" + HURR_FOREVER + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + SAMESALARY + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + NOBONUS + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel + + + + If GetFreeFromError = 1 Then + Var Seeker.CodeChannel = 1 + Var Seeker.VendingCode = "FAU" + Var Seeker.CodeNumber = "0000000000" + Var VendingCampaign = ServiceAmount2 + EndIf + + If Seeker.PayWithQR = 0 Then + If Seeker.CodeChannel = 1 Then + ;Var SessionID2 = SessionID2 + "/" + ;Var SessionID2 = SessionID2 + Seeker.CodeNumber + ;Var SessionID2 = SessionID2 + "/" + ;Var SessionID2 = SessionID2 + Seeker.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 + Seeker.CodeNumber + ;Var SessionID2 = SessionID2 + "/" + + If Seeker.CreditCard = 1 Then + + CashlessReq SUCCESS + ;CashlessReq FAIL + + EndIf + + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 PriceDrinkTopping ServiceCharge Donate + Var sendPayMultiFlag = 2 + Else + + If Seeker.CreditCard = 1 Then + + CashlessReq SUCCESS + ;CashlessReq FAIL + + EndIf + + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 PriceDrinkTopping ServiceCharge Donate + Var sendPayMultiFlag = 2 + + + EndIf + + + Else + + ;no wait ack pay + Var waitAckPay = 1 + + Var SVT = "coffee" + Var ACC = "0899999999" + Var DEE = PayDetail + + If Seeker.TNumberTaobinMember = "" Then + Else + Var ACC = Seeker.TNumberTaobinMember + EndIf + + ;PAYEXT SVT ACC VendingTSIDTmp DEE + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 PriceDrinkTopping ServiceCharge Donate + Var sendPayMultiFlag = 2 + + + EndIf + + EndIf + + __CMD "clear-stock-data" 0 "-" "-" + + + Var ServiceSuccess = "yes" + If waitAckPay = 1 Then + SAVELOG "waitAckPay=0" + ; Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + EndIf + EndIf + + If Seeker.PayWithQR = 0 Then + If ChangeFlag3 = 0 Then + If MachineState_Result = 2 Then + Var ChangeFailCoffee = 1 + Var ChangeMuti = ServiceAmountSum - Seeker.VendingCampaign + Var ChangeFlag3 = 1 + EndIf + If MachineState_Result = 1 Then + Var ChangeFailCoffee = 1 + Var ChangeMuti = ServiceAmountSum - Seeker.VendingCampaign + ;Var ChangeMuti = ServiceAmountSum - PriceDrinkTopping + Var ChangeFlag3 = 1 + EndIf + EndIf + + If ChangeFlag3 = 1 Then + If Seeker.TNumberTaobinCredit = "" Then + Change ChangeMuti + Var ChangeFlag3 = 2 + EndIf + EndIf + EndIf + + If PayOk = 3 Then + If ChangeOK = 3 Then + If sendPayMultiFlag = 2 Then + Var PayOk = 7 + If Seeker.PayWithQR = 0 Then + Var ServiceType = "coffee-multi" + Else + Var ServiceType = "coffee-multiQR" + EndIf + + If Seeker.TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + If Seeker.TNumberTaobinMember = "" Then + Else + Var TelephoneNumber = Seeker.TNumberTaobinMember + EndIf + Else + Var TelephoneNumber = Seeker.TNumberTaobinCredit + Var PayO2 = Seeker.CoffeePinNumber + EndIf + ; Var ServiceType = "coffee-multi" + + Var ServiceCredit = "00-00-00-0000" + Var SuggestID = "" + + + If LastMakeSpiralResult = 1 Then + Var PayDetail="1/S:0/0/" + Else + Var PayDetail="1/F:0/0/" + EndIf + + + Var CART_COUNT = "2" + Var SessionID3 = "" + CART_COUNT + Var SessionID3 = SessionID3 + ":00000" + + SAVELOG PayO2 + + Var VendingCampaign = IntVendingCampaign + Var CreditReference = Seeker.CreditReferenceTmp + + If LastMakeSpiralResult = 2 Then + Var ServiceAmountSum = ServiceAmountSum - PriceDrink + Var ServiceAmountSum = ServiceAmountSum - PriceDrinkTopping + EndIf + ;If MachineState_Result = 2 Then + ; Var ServiceAmountSum = ServiceAmountSum - PriceDrinkTopping + ;EndIf + Var PayType = "" + + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID3 ServiceAmountSum ServiceCharge Donate + + + If Seeker.PayWithQR = 1 Then + Var SVT = "coffee-multi" + + If Seeker.TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + If Seeker.TNumberTaobinMember = "" Then + Else + Var TelephoneNumber = Seeker.TNumberTaobinMember + EndIf + Else + Var TelephoneNumber = Seeker.TNumberTaobinCredit + EndIf + + Var DEE = PayDetail + + PAYEXT SVT TelephoneNumber Seeker.VendingTSID DEE + EndIf + + Var sendPayMultiFlag = 1 + EndIf + EndIf + EndIf +EndIf + + + + + + If PayOk = 5 Then + If sendPayMultiFlag = 1 Then + If MachineStage = "remove-cup" Then + Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" + EndIf + If MachineStage = "close-maintenance" Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + If MachineStage = "show-menu" Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + EndIf + + If Timeout >= 120 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + + Refresh + TimerReset + + + + + + If ChangeOK = 2 Then + If ChangeStatus = "payout-end" Then + Var ChangeOK = 3 + Var MultiGo = 2 + EndIf + EndIf + If ChangeOK = 1 Then + If ChangeStatus = "payout-end" Then + Var ChangeOK = 2 + Var ChangeTimeout = 999 + EndIf + EndIf + + + + + + + + 89 + 400 + 902 + 902 + "ROOT/taobin_project/spiral/image/page_spiral/spiral_fail.png" + + + + 84 + 1100 + 911 + 265 + DirImage1 + + + + + + 0 + 1418 + SpiralPickDrink + DirImage + + + +; +; 92 +; 1121 +;150 +; 40 +; KanitTTF +; 0xB78F24 +; Timeout +; +; +; +; 92 +; 1181 +; 40 +; KanitTTF +; 0xB78F24 +; ChangeTimeout +; +; +; +; +; 92 +; 650 +; 40 +; KanitTTF +; 0xB78F24 +; LastMakeSpiralResult +; +; +; +; +; +; 292 +; 1250 +; 40 +; KanitTTF +; 0xB78F24 +; "Seeker.CreditCard" +; +; +; +; +; 92 +; 1250 +; 40 +; KanitTTF +; 0xB78F24 +; Seeker.CreditCard +; +; +; +; +; 292 +; 1350 +; 40 +; KanitTTF +; 0xB78F24 +; "PayOk" +; +; +; +; +; 92 +; 1350 +; 40 +; KanitTTF +; 0xB78F24 +; PayOk +; +; +; +; 292 +; 1400 +; 40 KanitTTF +; 0xB78F24 +; "ChangeOK" +; +; +; +; 92 +; 1400 +; 40 +; KanitTTF +; 0xB78F24 +; ChangeOK +; +; +; +; 292 +; 1450 +; 40 +; KanitTTF +; 0xB78F24 +; "Seeker.StoreCreditFlag" +; +; +; +; 92 +; 1450 +; 40 +; KanitTTF +; 0xB78F24 +; Seeker.StoreCreditFlag +; +; +; +; 292 +; 1500 +; 40 +; KanitTTF +; 0xB78F24 +; "ChangeFlag2" +; +; +; +; +; 92 +; 1500 +; 40 +; KanitTTF +; 0xB78F24 +; ChangeFlag2 +; +; +; +; +; 292 +; 1550 +; 40 +; KanitTTF +; 0xB78F24 +; "Seeker.PayWithQR" +; +; +; +; +; 92 +; 1550 +; 40 +; KanitTTF +; 0xB78F24 +; Seeker.PayWithQR +; +; +; +; 292 +; 1600 +; 40 +; KanitTTF +; 0xB78F24 +; "Seeker.CodeChannel" +; +; +; +; 92 +; 1600 +; 40 +; KanitTTF +; 0xB78F24 +; Seeker.CodeChannel +; +; +; +; 292 +; 1650 +; 40 +; KanitTTF +; 0xB78F24 +; "ChangeFlag" +; +; +; +; 92 +; 1650 +; 40 +; KanitTTF +; 0xB78F24 +; ChangeFlag +; +; +; +; 292 +; 1700 +; 40 +; KanitTTF +; 0xB78F24 +; "Canout" +; +; +; +; 92 +; 1700 +; 40 +; KanitTTF +; 0xB78F24 +; Canout +; +; +; +; 292 +; 1750 +; 40 +; KanitTTF +; 0xB78F24 +; "SpiralCodeOk" +; +; +; +; 92 +; 1750 +; 40 +; KanitTTF +; 0xB78F24 +; SpiralCodeOk +; +; +; +; 292 +; 1800 +; 40 +; KanitTTF +; 0xB78F24 +; "CoinAmount" +; +; +; +; 92 +; 1800 +; 40 +; KanitTTF +; 0xB78F24 +; CoinAmount +; + + diff --git a/spiral/xml/page_spiral_payment.xml b/spiral/xml/page_spiral_payment.xml index 4c2a207c..a15b89da 100644 --- a/spiral/xml/page_spiral_payment.xml +++ b/spiral/xml/page_spiral_payment.xml @@ -18,7 +18,7 @@ Var DiscountDrink = 0 Var SelectSlot = "1" Var SpiralCodeOk = 0 - + Var LastMakeDrinkResult = "-" SAVELOG BoxID Var SpiralKeepCredit = 0 Var QRCODE1 = "A000000677010112" @@ -195,9 +195,13 @@ EndIf EndIf - - Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" - + If Seeker.thankToppingFlag = 1 Then + Var QRCODE5 = "2" + Var QRCODE6 = "00-00-00-0000" + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" + Else + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" + EndIf EndIf TimerReset diff --git a/spiral/xml/page_spiral_payment_cash.xml b/spiral/xml/page_spiral_payment_cash.xml index 3934fdef..5c034993 100644 --- a/spiral/xml/page_spiral_payment_cash.xml +++ b/spiral/xml/page_spiral_payment_cash.xml @@ -976,7 +976,7 @@ Var CoinInFlag = 1 - + DEBUGVAR ViewBill If ViewBill > 0 Then @@ -1792,8 +1792,14 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - - Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_storeCredit.xml" + If SpiralKeepCredit = 1 Then + CoinVending BILLSTACKALL + Var CoffeeCreditKeep = RemainAmountKeep + + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_storeCredit3.xml" + Else + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_storeCredit.xml" + EndIf diff --git a/spiral/xml/page_spiral_payment_cashMore.xml b/spiral/xml/page_spiral_payment_cashMore.xml new file mode 100644 index 00000000..5f80efe6 --- /dev/null +++ b/spiral/xml/page_spiral_payment_cashMore.xml @@ -0,0 +1,1959 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + PlaySoundLag + + Var SellLeaw = 0 + Var sendPayMultiFlag = 0 + DEBUGVAR QRCODETMP + DEBUGVAR PayType + DEBUGVAR IsSmoRet + Var countClick2 = 0 + ;SAVELOG SelectDrink + ;SAVELOG NameDrink + ;SAVELOG NameDrinkTH + ;SAVELOG DrinkDescription + SAVELOG PriceDrink + ;SAVELOG topping1 + ;SAVELOG topping2 + ;SAVELOG topping3 + DEBUGVAR SelectDrink + + DEBUGVAR video_menu_0 + Var CashlessPayFlag = 0 + Var PayDetail = "" + Var FlagQROpened = 0 + Var PayInfoCFlag = 0 + Var ActionOKCase = 0 + Var VendingCampaign = Seeker.IntVendingCampaign + Var Seeker.VendingCampaign = Seeker.IntVendingCampaign + + Var PayAmount = PriceDrink + + Var LOADING_STATE = "Invisible" + ; Below original + ; On open + + + + Var cancelState = "Invisible" + + + Var alphaState = "Invisible" + Var alphaState2 = "Invisible" + Var FlagalphaState2 = 0 + Var alphaState2t = alphaState2 + Var alphaState3 = "Invisible" + + + Var CoinInFlag = 0 + ;Var CoinAmount = 0 + Var CancelFlag = 0 + Var CancelCounter = 0 + Var CoinInCounter = 0 + Var CancelNumber = 3 + + Var PayAmount = PriceDrink + Var RemainAmount = PayAmount - Seeker.IntVendingCampaign + Var RemainAmount = RemainAmount - CoinAmount + Var RemainAmount = RemainAmount - Seeker.IntVendingCredit + Var RemainAmountStr = "" + RemainAmount + Var Timeout = 0 + Var PayOK = 0 + Var ChangeOK = 0 + Var CoinInOK = 0 + + Var RemainAmountKeep = 0 + + Var showRemaining = charOfBaht + RemainAmountStr + + Var VendingREFID = "" + + Var TelephoneNumber = "0899999999" + Var ServiceType = "coffee" + +; Var ServiceCredit = SelectDrink + Var ServiceAmount2 = PayAmount + Var Seeker.ServiceAmount2 = PayAmount + Var ServiceCharge = 0 + Var Donate = "" + Var SuggestID = "" + Var CancleState = "Enable" + + Var Seeker.VendingDiscount = DiscountDrink + + + Var CashTextWarning = "" + Var QRErrorState = "Invisible" + Var QRErrorFlag = 0 + + + SAVELOG SelectDrink + + SAVELOG QRChannel + SAVELOG QRCODE99 + DEBUGVAR QRCODE99 + + SAVELOG VendingCampaign + SAVELOG Seeker.VendingCode + SAVELOG Seeker.CodeChannel + + + If Seeker.VendingCode = "C00" Then + Var Seeker.CodeChannel = 0 + EndIf + + DEBUGVAR QRCODE99KBANK + + If RoadShow = "true" Then + Var PayState1 = "Enable" + Var PayState2 = "Invisible" + Var PayState3 = "Invisible" + Var PayState4 = "Invisible" + Var PayState5 = "Invisible" + Var showRemaining = "Free" + + Else + Var PayState1 = "Enable" + If Seeker.IntVendingCampaign = 0 Then + Var PayState2 = "Enable" + Var PayState4 = "Enable" + Var PayState5 = "Enable" + Else + SAVELOG "Cash only IntVendingCampaign" + Var PayState2 = "Disable" + Var PayState4 = "Disable" + Var PayState5 = "Disable" + EndIf + Var PayState3 = "Enable" + + + DEBUGVAR CoinAmount + If CoinAmount > 0 Then + SAVELOG "Cash only CoinAmount" + Var PayState2 = "Disable" + Var PayState3 = "Disable" + Var PayState4 = "Disable" + Var PayState5 = "Disable" + Var CoinInFlag = 1 + EndIf + + If Seeker.IntVendingCredit > 0 Then + SAVELOG "Cash only IntVendingCredit" + Var PayState2 = "Disable" + Var PayState4 = "Disable" + Var PayState5 = "Disable" + EndIf + + + Var showRemaining = charOfBaht + RemainAmountStr + + If show_eng = "true" Then + Var showRemaining = charOfBaht + RemainAmountStr + Else + Var showRemaining = RemainAmountStr + " บาท" + EndIf + + EndIf + + + + + Var Seeker.PayWithQR = 0 + Var NoGotoMenupage = "false" + If show_eng = "true" Then + Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png" + Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash.png" + Else + Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash.png" + Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash.png" + + EndIf + + 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 Seeker.FreeVendingCampaign = 1 + CoinVending OFF + If Seeker = "curr" Then + ; MakeDrinkV1 SelectDrink SelectSugarID + EndIf + Open "ROOT/taobin_project/xml/page_thankyou.xml" + + EndIf + + + + If CoinInOK = 0 Then + + Var RemainAmount = PayAmount - CoinAmount + Var RemainAmount = RemainAmount - Seeker.IntVendingCampaign + Var RemainAmount = RemainAmount - Seeker.IntVendingCredit + Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign + Var SumCoinAmount = CoinAmount + Seeker.IntVendingCredit + + If SumCoinAmount >= PayAmount Then + ;Var VendingQRCode = "ERROR" + CoinVending OFF + Var Canout = SumCoinAmount - PayAmount + If Canout = 0 Then + Var RemainAmountStr = 0 + Else + Var FlagalphaState2 = 1 + 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 ShowHeadSpiralSelect = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_detail_en.png" + Var ShowHeadSpiralCash = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_choose_money_en.png" + Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_en" + Var DirImage3 = "ROOT/taobin_project/spiral/image/page_spiral" + Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" + + Else + Var ShowHeadSpiralSelect = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_detail.png" + Var ShowHeadSpiralCash = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_choose_money.png" + Var DirImage = "ROOT/taobin_project/image/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend" + Var DirImage3 = "ROOT/taobin_project/spiral/image/page_spiral" + Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" + EndIf + + + Var EnoughChange = "yes" + + + Var SELLONLINE = 0 + If SELLSTATUS = "SELLONLINE" Then + Var SELLONLINE = 1 + EndIf + If SELLSTATUS = "SELLNOCASH" Then + Var SELLONLINE = 1 + EndIf + + If SELLONLINE = 0 Then + SAVELOG "Cash only NetworkStatus down" + + Var PayState2 = "Disable" + Var PayState3 = "Disable" + Var PayState4 = "Disable" + Var PayState5 = "Disable" + Var PayState6 = "Disable" + + Var PayOfflineMode = 1 + + Var ShowNetworkProblem = "Enable" + Var ShowButtonClick2 = "Invisible" + Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด" + + Else + Var PayOfflineMode = 0 + + Var ShowNetworkProblem = "Invisible" + Var ShowNetworkProblemText = "" + EndIf + + If NOCashFlag = 1 Then + Var PayState1 = "Disable" + EndIf + + + + + + ;If NetworkStatus = "DOWN" Then + ; SAVELOG "Cash only NetworkStatus down" + ; + ; Var PayState2 = "Disable" + ; Var PayState3 = "Disable" + ; Var PayState4 = "Disable" + ; Var PayState5 = "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 + "/bn_pay_with_codeSmall_error.png" + Else + + If Seeker.IntVendingCredit > 0 Then + + Var pay_with_code_image = DirImage + "/bp_pay_with_code.png" + Var pay_with_credit_image = DirImage + "/bp_pay_with_credit.png" + + Var pay_with_chanel_text = DirImage + "/text_2.png" + + Else + + Var pay_with_code_image = DirImage + "/bp_pay_with_code.png" + EndIf + EndIf + + Machine DoorClose + + + If ShoppyPayEnable = "true" Then + Else + Var PayState5 = "Disable" + EndIf + + + If web_readyOK = "true" Then + + Var web_readyOK = "false" + + If web_payment = "CASH" Then + Var alphaState2 = "Enable" + Var alphaState2t = alphaState2 + EndIf + + If web_payment = "QR" Then + + Var QR_POPUP = "/img_popup1.png" + Var LOADING_STATE = "Enable" + + Var FlagQROpened = 1 + Var alphaState = "Enable" + ;CoinVending OFF + VendingQR ON + + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumberQR = "0899999999" + Var ServiceType = "coffee" + 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/" + + + + If Seeker.IntVendingCampaign > 0 Then + Var ECommerceQR = ECommerceQR + Seeker.VendingCode + Var ECommerceQR = ECommerceQR + ":" + Var ECommerceQR = ECommerceQR + Seeker.CodeNumber + Var ECommerceQR = ECommerceQR + ":" + Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3 + EndIf + + If Seeker.IntVendingCredit > 0 Then + Var ECommerceQR = ECommerceQR + "CRD" + Var ECommerceQR = ECommerceQR + ":" + Var ECommerceQR = ECommerceQR + Seeker.TNumberTaobinCredit + Var ECommerceQR = ECommerceQR + ":" + Var ECommerceQR = ECommerceQR + Seeker.IntVendingCredit + EndIf + + + 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 ReqPayInfoFlag = 1 + EndIf + + If web_payment = "SHOPEE" Then + + Var QR_POPUP = "/img_popup2.png" + Var LOADING_STATE = "Enable" + + Var FlagQROpened = 1 + Var alphaState = "Enable" + ;CoinVending OFF + VendingQR ON + + + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumberQR = "0899999999" + Var ServiceType = "coffee" + 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 + "AIR:2/" + + + + ;If Seeker.IntVendingCampaign > 0 Then + ; Var ECommerceQR = ECommerceQR + Seeker.VendingCode + ; Var ECommerceQR = ECommerceQR + ":" + ; Var ECommerceQR = ECommerceQR + Seeker.CodeNumber + ; Var ECommerceQR = ECommerceQR + ":" + ; Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3 + ;EndIf + + 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 ReqPayInfoFlag = 2 + EndIf + + EndIf + + __CMD "prepar-cup-from-order" 0 "-" "-" + + If ReqPayInfoFromCashOther = 1 Then + Var LOADING_STATE = "Enable" + + Var FlagQROpened = 1 + Var alphaState = "Enable" + + VendingQR ON + + Var ReqPayInfoFromCashOther = 0 + EndIf + If ReqPayInfoFromCashOther = 2 Then + Var alphaState = "Enable" + Var ReqPayInfoFromCashOther = 0 + EndIf + + + + + Var VendingQRTypeResult = "" + + DEBUGVAR ECommerceQR + DEBUGVAR ReqPayInfoFlag + + + + SPLIT ECommerceQR "/" 5 VendingQRTypeResult + + + DEBUGVAR VendingQRTypeResult + DEBUGVAR ActionOKCase + + If ActionOKCase = 0 Then + DEBUGVAR VendingREFID + If VendingREFID = "" Then + SAVELOG "menu_page4-QR.xml > ActOK_REFID" + Refresh + Else + Var sendPayMultiFlag = 0 + DEBUGVAR VendingREFID + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + SAVELOG "menu_page4-QR.xml > ActOK_make" + ;Var VendingQRCode = "ERROR" + ;Coin STANDBY + VendingQR OFF + CoinVending OFF + + Var PayReference = MultiTSID + Var Seeker.PayWithQR = 1 + Var Seeker.VendingTSID = VendingTSID + + + Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + Var BrewingTextThai = "เตรียมแก้ว" + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou_qr.xml" + + EndIf + + + If ReqPayInfoFlag = 1 Then + If VendingQRTypeResult = "KBA:2" Then + Var CashTextWarning = "" + Var QRErrorState = "Invisible" + Var QRCODE99KBANK = "" + Var QRCODE99KBANK = SessionID + Var QRCODE99KBANK = QRCODE99KBANK + Ext1a + SAVELOG Ext1a + SAVELOG QRCODE99KBANK + Var QRCODE99KBANK = QRCODE99KBANK + Ext21 + Var QRCODETMP = QRCODE99KBANK + Var ReqPayInfoFlag = 0 + SAVELOG QRCODE99KBANK + SAVELOG Ext21 + + Var QRCODE99 = QRCODE99KBANK + Var LOADING_STATE = "Invisible" + EndIf + EndIf + + If ReqPayInfoFlag = 2 Then + If VendingQRTypeResult = "AIR:2" Then + Var CashTextWarning = "" + Var QRErrorState = "Invisible" + Var QRCODE99Shoppy = "" + Var QRCODE99Shoppy = SessionID + Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1a + SAVELOG Ext1 + SAVELOG QRCODE99Shoppy + Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21 + Var ReqPayInfoFlag = 0 + SAVELOG QRCODE99Shoppy + SAVELOG Ext2 + + Var QRCODE99 = QRCODE99Shoppy + Var LOADING_STATE = "Invisible" + EndIf + EndIf + + If ReqPayInfoFlag = 3 Then + If VendingQRTypeResult = "TWN:2" Then + Var CashTextWarning = "" + Var QRErrorState = "Invisible" + Var QRCODE99Shoppy = "" + Var QRCODE99Shoppy = SessionID + Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1a + DEBUGVAR Ext2 + SAVELOG Ext1 + SAVELOG QRCODE99Shoppy + Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21 + Var ReqPayInfoFlag = 0 + Var ReqPayInfoFlag2 = 3 + SAVELOG QRCODE99Shoppy + SAVELOG Ext2 + + Var QRCODE99 = QRCODE99Shoppy + Var LOADING_STATE = "Invisible" + EndIf + EndIf + + If ReqPayInfoFlag = 4 Then + If VendingQRTypeResult = "DOL:2" Then + Var CashTextWarning = "" + Var QRErrorState = "Invisible" + Var QRCODE99Shoppy = "" + Var QRCODE99Shoppy = SessionID + Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1a + SAVELOG Ext1 + SAVELOG QRCODE99Shoppy + Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21 + Var ReqPayInfoFlag = 0 + Var ReqPayInfoFlag2 = 4 + SAVELOG QRCODE99Shoppy + SAVELOG Ext2 + + Var QRCODE99 = QRCODE99Shoppy + Var LOADING_STATE = "Invisible" + EndIf + EndIf + + If ReqPayInfoFlag = 5 Then + If VendingQRTypeResult = "LPY:2" Then + Var CashTextWarning = "" + Var QRErrorState = "Invisible" + Var QRCODE99Shoppy = "" + Var QRCODE99Shoppy = SessionID + Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1a + SAVELOG Ext1 + SAVELOG QRCODE99Shoppy + Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21 + Var ReqPayInfoFlag = 0 + Var ReqPayInfoFlag2 = 5 + SAVELOG QRCODE99Shoppy + SAVELOG Ext2 + + Var QRCODE99 = QRCODE99Shoppy + Var LOADING_STATE = "Invisible" + EndIf + EndIf + + Else + Var PayInfoCFlag = 1 + EndIf + + + If VendingCashless = "OK" Then + DEBUGVAR CashlessCode + Var Timeout = 0 + + Var QRErrorState = "Invisible" + Var LOADING_STATE = "Invisible" + + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + + VendingQR OFF + CoinVending OFF + Refresh + + If Seeker = "curr" Then + ; MakeDrinkV1 SelectDrink SelectSugarID + EndIf + Var Seeker.CreditCard = 1 + Var Seeker.CreditCardRef = CreditCardRef + + + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou_creditcard.xml" + + EndIf + + + + + + If ActionOKCase = 0 Then + If ReqPayInfoFlag = 1 Then + Var QRErrorFlag = 1 + If alphaState = "Enable" Then + Var QRErrorState = "Enable" + Var LOADING_STATE = "Invisible" + EndIf + EndIf + If ReqPayInfoFlag = 2 Then + Var QRErrorFlag = 1 + If alphaState = "Enable" Then + Var QRErrorState = "Enable" + Var LOADING_STATE = "Invisible" + EndIf + EndIf + If ReqPayInfoFlag = 3 Then + Var QRErrorFlag = 1 + If alphaState = "Enable" Then + Var QRErrorState = "Enable" + Var LOADING_STATE = "Invisible" + EndIf + EndIf + If ReqPayInfoFlag = 4 Then + Var QRErrorFlag = 1 + If alphaState = "Enable" Then + Var QRErrorState = "Enable" + Var LOADING_STATE = "Invisible" + EndIf + EndIf + If ReqPayInfoFlag = 5 Then + Var QRErrorFlag = 1 + If alphaState = "Enable" Then + Var QRErrorState = "Enable" + Var LOADING_STATE = "Invisible" + EndIf + EndIf + Else + Var PayInfoCFlag = 1 + EndIf + + Refresh + + + + + + Var CreditCardRef = "" + GenHashWithTimeStamp CreditCardRef + DEBUGVAR VendingCashless + + If VendingCashless = "READY" Then + Var QRCODE99 = "" + Var Timeout = 0 + Var QRErrorState = "Invisible" + Var QR_POPUP = "/img_popup8-2.png" + Var VendingCashless = "-" + Var LOADING_STATE = "Enable" + Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign + CashlessPay RemainAmountX CreditCardRef + Var CashlessPayFlag = 1 + EndIf + + Refresh + + + + + + 1000 + + + DEBUGVAR SpiralKeepCredit + If ReadyForBrew = "false" Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + + EndIf + + + + + Var Timeout = Timeout + 1 + + + If Timeout >= 120 Then + Var alphaState = "Invisible" + Var PayState3 = "Disable" + Var PayState5 = "Disable" + + Var LOADING_STATE = "Invisible" + Var QRErrorState = "Invisible" + + EndIf + + + If Timeout > 210 Then + If ActionOKCase = 1 Then + Var PayInfoCFlag = 1 + EndIf + EndIf + + If PayInfoCFlag = 1 Then + If Seeker.CodeChannel = 1 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumber = "0899999999" + Var ServiceType = "locker" + Var ECommerce = "" + Var ECommerce = "locker5/" + 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 + Seeker.CodeNumber + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + "C:" + Var ECommerce = ECommerce + Seeker.IntVendingCampaign + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + ;Var Timeout = 0 + EndIf + If Seeker = "curr" Then + Open "ROOT/taobin_project/xml/page_catalog.xml" + Else + + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + EndIf + EndIf + + + If TestLoopMakeDrink = 1 Then + ; MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf + + + + If CoinInOK = 1 Then + Var CoinInCounter = CoinInCounter + 1 + If CoinInCounter = 1 Then + + ;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 + + + Open "ROOT/taobin_project/spiral/xml/page_spiral_check_cash.xml" + + Else + If CancelFlag = 0 Then + SAVELOG "Timeout > 180 s." + + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + + CoinVending OFF + Var CancelFlag = 1 + Var cancelState = "Enable" + + If CashlessPayFlag = 1 Then + Var CashlessPayFlag = 0 + CashlessReq FAIL + EndIf + + Var CancelCounter = 0 + If CoinAmount = 0 Then + + If Seeker.IntVendingCredit > 0 Then + Var BmiYear = Seeker.IntVendingCredit + Var GetScore = "useCredit" + AddData 24 Seeker.TNumberTaobinCredit BmiYear PointCrm GetScore + Var Seeker.IntVendingCredit = 0 + EndIf + + + + If Seeker.IntVendingCampaign = 0 Then + VendingQR OFF + If Seeker = "curr" Then + Open "ROOT/taobin_project/xml/page_catalog.xml" + Else + + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + EndIf + EndIf + EndIf + + EndIf + EndIf + EndIf + + + If CancelFlag = 1 Then + + If Seeker.IntVendingCredit > 0 Then + Var BmiYear = Seeker.IntVendingCredit + Var GetScore = "useCredit" + AddData 24 Seeker.TNumberTaobinCredit BmiYear PointCrm GetScore + Var Seeker.IntVendingCredit = 0 + EndIf + + Var CancelCounter = CancelCounter + 1 + If CancelCounter = CancelNumber Then + ;Change CoinAmount + If CoinAmount > 0 Then + If Seeker.StoreCreditFlag = 1 Then + Var ChangeOK = 1 + Else + Change CoinAmount + EndIf + + Else + If ActionOKCase = 0 Then + Var ActionOKCase = 1 + Var PayInfoCFlag = 1 + EndIf + EndIf + + VendingQR OFF + EndIf + + If CancelCounter >= 43 Then + Var ChangeOK = 1 + EndIf + + ; This copy in file menu_catalog.xml + + If ChangeOK = 1 Then + If ActionOKCase = 0 Then + + If Seeker.TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + Else + Var TelephoneNumber = Seeker.TNumberTaobinCredit + Var PayO2 = Seeker.CoffeePinNumber + EndIf + + Var VendingDiscount = 0 + Var VendingCampaign = 0 + Var ServiceType = "credit" + Var SessionID2 = SelectDrink + Var ServiceCredit = "locker" + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + Var PayCredit = 1 + + Var ActionOKCase = 1 + If Seeker = "curr" Then + If Seeker.IntVendingCampaign = 0 Then + If Seeker = "curr" Then + Open "ROOT/taobin_project/xml/page_catalog.xml" + Else + + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + EndIf + EndIf + Else + ;wait ack + EndIf + EndIf + EndIf + + EndIf + + + Refresh + TimerReset + + + + If ChangeStatus = "payout-end" Then + Var ChangeOK = 1 + EndIf + + + + TimerReset + + If CoinInFlag = 0 Then + ;VendingQR OFF + Var alphaState = "Invisible" + EndIf + + + + Var CoinInFlag = 1 + + DEBUGVAR ViewBill + + If ViewBill > 0 Then + + If PayOfflineMode = 1 Then + CoinVending BILLREJECT + Else + + + Var RemainAmount = PayAmount - CoinAmount + Var RemainAmount = RemainAmount - Seeker.IntVendingCampaign + Var RemainAmount = RemainAmount - Seeker.IntVendingCredit + + If ViewBill > RemainAmount Then + Var RemainAmountKeep = ViewBill - RemainAmount + Else + Var RemainAmountKeep = ViewBill + EndIf + + Var Timeout = 0 + + + Var RemainAmountStr = "" + RemainAmount + Var showRemaining = charOfBaht + RemainAmountStr + + + + + Var alphaState3 = "Enable" + EndIf + + + Else + + + If CoinInOK = 0 Then + + Var RemainAmount = PayAmount - CoinAmount + Var RemainAmount = RemainAmount - Seeker.IntVendingCampaign + Var RemainAmount = RemainAmount - Seeker.IntVendingCredit + + Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign + Var SumCoinAmount = SumCoinAmount + Seeker.IntVendingCredit + If SumCoinAmount >= PayAmount Then + ;Var VendingQRCode = "ERROR" + CoinVending OFF + VendingQR OFF + Var Canout = SumCoinAmount - PayAmount + If Canout = 0 Then + Var RemainAmountStr = 0 + Else + Var FlagalphaState2 = 1 + 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" + Var alphaState2t = alphaState2 + If FlagalphaState2 = 1 Then + Var alphaState2t = "Invisible" + EndIf + + EndIf + + EndIf + + + + + Refresh + + + If CoinInFlag = 1 Then + If CoinInOK = 0 Then + If CancelFlag = 0 Then + SAVELOG "VDCancle > Cancle Order." + Machine CancelWepApp + CoinVending OFF + Var CancelFlag = 1 + Var cancelState = "Enable" + Var CancelCounter = 0 + ;If CoinAmount = 0 Then + ; Open "ROOT/taobin_project/xml/page_catalog.xml" + ;EndIf + + Var showRemaining = "คืนเงิน" + ;Open "ROOT/taobin_project/xml/page_catalog.xml" + + If FlagQROpened = 1 Then + Var CancelNumber = 12 + EndIf + + EndIf + EndIf + ;VendingQR OFF + Refresh + + If ViewBill > 0 Then + CoinVending BILLREJECT + EndIf + EndIf + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + + + 0 + 380 + 1080 + 864 + 0xFFFFFF + + + +; +; 155 +; 991 +; 774 +; 129 +; "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_appfast.png" +; + + + + 143 + 360 + ShowHeadSpiralCash + + + +;; back +; +; + + +; +; 375 +; 623 +; 331 +; 435 +; PictureDrink +; + + + + 375 + 623 + eval( + If IsSmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + + "ROOT/taobin_project/image/topping2/blender_icon.png" + + + + + + + + + + + + +; +; 184 +; 1530 +; Var( DirImage3 + "/spiral_payment_bd_code.png") +; + + + + + + +; +; 680 +; 1530 +; Var( DirImage3 + "/bd_pay_with_codeOther.png") +; + + + + + +;; + + + + + + 0 + 555 + 1080 + 437 + SpiralProduct + + + + 0 + 1127 + 1080 + Center + 80 + KanitMediumTTF + ColorOrange + showRemaining + + + + + + 0 + 982 + 1080 + Center + 65 + KanitMediumTTF + ColorBrown2 + showname + + + + + 0 + 1058 + 1080 + Center + 40 + KanitTTF + ColorBrown + showdesc + + +; QR popup + + 0 + 380 + alphaState + "ROOT/taobin_project/image/page_payment/alpha.png" + + + + 249 + 748 + alphaState + Var( DirImage + QR_POPUP ) + + + + 493 + 968 + 94 + 94 + LOADING_STATE + Var( DirImage + "/loading.gif" ) + + + + 267 + 1065 + LOADING_STATE + Var( DirImage + "/loadingText.png" ) + + + + + + +; begin cash popup + + 0 + 380 + alphaState2 + "ROOT/taobin_project/image/page_payment/alpha.png" + + + + 182 + 748 + alphaState2 + Var( DirImage2 + "/img_popup11.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 + 905 + WQR + HQR + alphaState + testservice + + + + + + 0 + 380 + cancelState + Var( DirImage + "/CancelOrder.png" ) + + + + 493 + 960 + 94 + 94 + cancelState + Var( DirImage + "/loading.gif" ) + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + 100 + 1880 + 14 + "Left" + 1080 + KanitThinTTF + 0x513C2F + "55555" + + + + + + + + 5 + 1880 + 24 + Center + 1080 + RobotoRegular + 0xFFFFFF + ShowNetworkProblemText + + + +; +; 92 +; 600 +; 60 +; KanitTTF +; 0xB78F24 +; Seeker.TNumberTaobinMember +; +; +; +; 92 +; 700 +; 60 +; KanitTTF +; 0xB78F24 +; Seeker.TNumberTaobinCredit +; + + + diff --git a/spiral/xml/page_spiral_payment_cashOther.xml b/spiral/xml/page_spiral_payment_cashOther.xml index b5cea362..1451292d 100644 --- a/spiral/xml/page_spiral_payment_cashOther.xml +++ b/spiral/xml/page_spiral_payment_cashOther.xml @@ -53,8 +53,8 @@ Var PayState2 = "Enable" Var QRChannel = 0 Var Seeker.CodeChannel = 0 - If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + If Seeker.thankToppingFlag = 1 Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" Else Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" EndIf @@ -116,14 +116,39 @@ ;CoinVending OFF VendingQR ON - - Var SessionID2 = "1:00000" + + If Seeker.thankToppingFlag = 1 Then + Var SelectSlot = "2" + Var SessionID2 = SelectSlot + ":00000" + ;Var SessionID2 = "1:00000" + Var SelectDrink = "00-00-00-0000" + Var DiscountDrink = 0 + + + 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 + "TWN:2/" + + Else + Var SessionID2 = "1:00000" Var CreditAmount1 = "" Var ServiceAmountFlow = "" Var TelephoneNumberQR = "0899999999" Var ServiceType = "locker" Var ECommerceQR = "locker5/" + Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + DiscountDrink @@ -132,7 +157,8 @@ Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + ServiceCredit Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + "TWN:2/" + Var ECommerceQR = ECommerceQR + "TWN:2/" + EndIf @@ -170,7 +196,11 @@ Var ReqPayInfoFlag = 3 Var ReqPayInfoFromCashOther = 1 - Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" + If Seeker.thankToppingFlag = 1 Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" + Else + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" + EndIf @@ -196,14 +226,37 @@ ;CoinVending OFF VendingQR ON - - Var SessionID2 = "1:00000" + If Seeker.thankToppingFlag = 1 Then + Var SelectSlot = "2" + Var SessionID2 = SelectSlot + ":00000" + ;Var SessionID2 = "1:00000" + Var SelectDrink = "00-00-00-0000" + Var DiscountDrink = 0 + + 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 + "AIR:2/" + + Else + Var SessionID2 = "1:00000" Var CreditAmount1 = "" Var ServiceAmountFlow = "" Var TelephoneNumberQR = "0899999999" Var ServiceType = "locker" Var ECommerceQR = "locker5/" + Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + DiscountDrink @@ -212,7 +265,9 @@ Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + ServiceCredit Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + "AIR:2/" + Var ECommerceQR = ECommerceQR + "AIR:2/" + EndIf + @@ -250,7 +305,11 @@ Var ReqPayInfoFlag = 2 Var ReqPayInfoFromCashOther = 1 - Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" + If Seeker.thankToppingFlag = 1 Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" + Else + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" + EndIf @@ -277,14 +336,36 @@ ;CoinVending OFF VendingQR ON - - Var SessionID2 = "1:00000" + If Seeker.thankToppingFlag = 1 Then + Var SelectSlot = "2" + Var SessionID2 = SelectSlot + ":00000" + ;Var SessionID2 = "1:00000" + Var SelectDrink = "00-00-00-0000" + Var DiscountDrink = 0 + + 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 + "DOL:2/" + Else + Var SessionID2 = "1:00000" Var CreditAmount1 = "" Var ServiceAmountFlow = "" Var TelephoneNumberQR = "0899999999" Var ServiceType = "locker" Var ECommerceQR = "locker5/" + Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + DiscountDrink @@ -293,7 +374,9 @@ Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + ServiceCredit Var ECommerceQR = ECommerceQR + "/" - Var ECommerceQR = ECommerceQR + "DOL:2/" + Var ECommerceQR = ECommerceQR + "DOL:2/" + EndIf + @@ -331,7 +414,11 @@ Var ReqPayInfoFlag = 4 Var ReqPayInfoFromCashOther = 1 - Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" + If Seeker.thankToppingFlag = 1 Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" + Else + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" + EndIf @@ -360,14 +447,37 @@ VendingQR ON - - Var SessionID2 = "1:00000" + If Seeker.thankToppingFlag = 1 Then + Var SelectSlot = "2" + Var SessionID2 = SelectSlot + ":00000" + Var SelectDrink = "00-00-00-0000" + Var DiscountDrink = 0 + + + 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 + "LPY:2/" + Else + + Var SessionID2 = "1:00000" Var CreditAmount1 = "" Var ServiceAmountFlow = "" Var TelephoneNumberQR = "0899999999" Var ServiceType = "locker" Var ECommerceQR = "locker5/" + Var ECommerceQR = ECommerceQR + PriceDrink Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + DiscountDrink @@ -377,7 +487,7 @@ Var ECommerceQR = ECommerceQR + ServiceCredit Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "LPY:2/" - + EndIf If Seeker.IntVendingCampaign > 0 Then Var ECommerceQR = ECommerceQR + Seeker.VendingCode @@ -412,7 +522,11 @@ Var ReqPayInfoFlag = 5 Var ReqPayInfoFromCashOther = 1 - Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" + If Seeker.thankToppingFlag = 1 Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" + Else + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" + EndIf @@ -442,11 +556,15 @@ SoundVolume - Var QR_POPUP = "/img_popup8.png" - Var alphaState = "Enable" - Coin CARD - Var ReqPayInfoFromCashOther = 2 - Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" + Var QR_POPUP = "/img_popup8.png" + Var alphaState = "Enable" + Coin CARD + Var ReqPayInfoFromCashOther = 2 + If Seeker.thankToppingFlag = 1 Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" + Else + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" + EndIf @@ -497,8 +615,8 @@ Var PayState2 = "Enable" Var QRChannel = 0 Var Seeker.CodeChannel = 0 - If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + If Seeker.thankToppingFlag = 1 Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" Else Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" EndIf diff --git a/spiral/xml/page_spiral_payment_code.xml b/spiral/xml/page_spiral_payment_code.xml index 6b37986a..c951b74c 100644 --- a/spiral/xml/page_spiral_payment_code.xml +++ b/spiral/xml/page_spiral_payment_code.xml @@ -27,6 +27,12 @@ Var ShowErrorText = "Invisible" Var Tel_Confirm_State = "Invisible" Var ErrorCause = "" + Var Seeker.ExtendData = "" + + If Seeker.thankToppingFlag = 1 Then + Var Seeker.ExtendData = "10000" + EndIf + If show_eng = "true" Then @@ -53,6 +59,7 @@ Var RemainAmount = 0 ;PrepareDrink SelectDrink SelectSugarID + Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData @@ -80,6 +87,10 @@ Var GetScore = "" Var OperatorName = "" Var SessionID = "" + + DEBUGVAR SessionID2 + DEBUGVAR Seeker.ExtendData + DEBUGVAR Seeker.thankToppingFlag GetPayInfo TelephoneNumber2 ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc @@ -99,6 +110,9 @@ 1000 ;Open "ROOT/xml/page_board.xml" + DEBUGVAR SessionID2 + DEBUGVAR Seeker.ExtendData + DEBUGVAR Seeker.thankToppingFlag @@ -111,8 +125,8 @@ Var PayState2 = "Enable" Var QRChannel = 0 Var Seeker.CodeChannel = 0 - If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + If Seeker.thankToppingFlag = 1 Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" Else Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" EndIf @@ -147,7 +161,10 @@ - + DEBUGVAR SessionID2 + DEBUGVAR Seeker.ExtendData + DEBUGVAR Seeker.thankToppingFlag + If Seeker.CodeChannel = 1 Then @@ -244,8 +261,9 @@ Var Seeker.CodeChannel = 1 - If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + If Seeker.thankToppingFlag = 1 Then + Var SpiralCodeOk = 1 + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" Else Var SpiralCodeOk = 1 Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" @@ -317,8 +335,8 @@ Var Seeker.CodeChannel = 1 Var QRCODE99 = "" Var QRCODETMP = "" - If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + If Seeker.thankToppingFlag = 1 Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" Else Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" EndIf @@ -672,8 +690,8 @@ Var PayState2 = "Enable" Var QRChannel = 0 Var Seeker.CodeChannel = 0 - If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + If Seeker.thankToppingFlag = 1 Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" Else Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" EndIf diff --git a/spiral/xml/page_spiral_payment_codeAIS.xml b/spiral/xml/page_spiral_payment_codeAIS.xml index 4ff4a406..5b8e9169 100644 --- a/spiral/xml/page_spiral_payment_codeAIS.xml +++ b/spiral/xml/page_spiral_payment_codeAIS.xml @@ -156,8 +156,9 @@ Var Seeker.CodeChannel = 1 - If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + If Seeker.thankToppingFlag = 1 Then + Var SpiralCodeOk = 1 + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" Else Var SpiralCodeOk = 1 Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" diff --git a/spiral/xml/page_spiral_payment_codeDtac.xml b/spiral/xml/page_spiral_payment_codeDtac.xml index 68fde42e..53804113 100644 --- a/spiral/xml/page_spiral_payment_codeDtac.xml +++ b/spiral/xml/page_spiral_payment_codeDtac.xml @@ -159,8 +159,9 @@ Var Seeker.CodeChannel = 1 - If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + If Seeker.thankToppingFlag = 1 Then + Var SpiralCodeOk = 1 + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" Else Var SpiralCodeOk = 1 Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" diff --git a/spiral/xml/page_spiral_payment_codeGLX.xml b/spiral/xml/page_spiral_payment_codeGLX.xml index 4a1c7b1a..87ebb634 100644 --- a/spiral/xml/page_spiral_payment_codeGLX.xml +++ b/spiral/xml/page_spiral_payment_codeGLX.xml @@ -159,8 +159,9 @@ Var Seeker.CodeChannel = 1 - If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + If Seeker.thankToppingFlag = 1 Then + Var SpiralCodeOk = 1 + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" Else Var SpiralCodeOk = 1 Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" diff --git a/spiral/xml/page_spiral_payment_codeLH.xml b/spiral/xml/page_spiral_payment_codeLH.xml index faa3fbf4..4059a3c7 100644 --- a/spiral/xml/page_spiral_payment_codeLH.xml +++ b/spiral/xml/page_spiral_payment_codeLH.xml @@ -156,8 +156,9 @@ Var Seeker.CodeChannel = 1 - If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + If Seeker.thankToppingFlag = 1 Then + Var SpiralCodeOk = 1 + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" Else Var SpiralCodeOk = 1 Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" diff --git a/spiral/xml/page_spiral_payment_codeLotus.xml b/spiral/xml/page_spiral_payment_codeLotus.xml index 53873c9d..8922a9ca 100644 --- a/spiral/xml/page_spiral_payment_codeLotus.xml +++ b/spiral/xml/page_spiral_payment_codeLotus.xml @@ -159,8 +159,9 @@ Var Seeker.CodeChannel = 1 - If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + If Seeker.thankToppingFlag = 1 Then + Var SpiralCodeOk = 1 + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" Else Var SpiralCodeOk = 1 Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" diff --git a/spiral/xml/page_spiral_payment_codeOther.xml b/spiral/xml/page_spiral_payment_codeOther.xml index e05b578e..3dca9bd1 100644 --- a/spiral/xml/page_spiral_payment_codeOther.xml +++ b/spiral/xml/page_spiral_payment_codeOther.xml @@ -51,8 +51,8 @@ Var PayState2 = "Enable" Var QRChannel = 0 Var Seeker.CodeChannel = 0 - If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + If Seeker.thankToppingFlag = 1 Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" Else Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" EndIf @@ -251,8 +251,8 @@ Var PayState2 = "Enable" Var QRChannel = 0 Var Seeker.CodeChannel = 0 - If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + If Seeker.thankToppingFlag = 1 Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" Else Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" EndIf diff --git a/spiral/xml/page_spiral_payment_codeSCG.xml b/spiral/xml/page_spiral_payment_codeSCG.xml index 1d7b3e56..b1b5e2de 100644 --- a/spiral/xml/page_spiral_payment_codeSCG.xml +++ b/spiral/xml/page_spiral_payment_codeSCG.xml @@ -159,8 +159,9 @@ Var Seeker.CodeChannel = 1 - If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + If Seeker.thankToppingFlag = 1 Then + Var SpiralCodeOk = 1 + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" Else Var SpiralCodeOk = 1 Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" diff --git a/spiral/xml/page_spiral_payment_codeThe1.xml b/spiral/xml/page_spiral_payment_codeThe1.xml index f741a5e6..28da755e 100644 --- a/spiral/xml/page_spiral_payment_codeThe1.xml +++ b/spiral/xml/page_spiral_payment_codeThe1.xml @@ -159,8 +159,9 @@ Var Seeker.CodeChannel = 1 - If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + If Seeker.thankToppingFlag = 1 Then + Var SpiralCodeOk = 1 + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" Else Var SpiralCodeOk = 1 Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" diff --git a/spiral/xml/page_spiral_payment_codeTrue.xml b/spiral/xml/page_spiral_payment_codeTrue.xml index d04cbb9b..283c5776 100644 --- a/spiral/xml/page_spiral_payment_codeTrue.xml +++ b/spiral/xml/page_spiral_payment_codeTrue.xml @@ -159,8 +159,9 @@ Var Seeker.CodeChannel = 1 - If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + If Seeker.thankToppingFlag = 1 Then + Var SpiralCodeOk = 1 + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" Else Var SpiralCodeOk = 1 Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" diff --git a/spiral/xml/page_spiral_payment_credit.xml b/spiral/xml/page_spiral_payment_credit.xml index 3fca4fd3..71299ccb 100644 --- a/spiral/xml/page_spiral_payment_credit.xml +++ b/spiral/xml/page_spiral_payment_credit.xml @@ -70,8 +70,8 @@ Var PayState2 = "Enable" Var QRChannel = 0 Var Seeker.CodeChannel = 0 - If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + If Seeker.thankToppingFlag = 1 Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" Else Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" EndIf @@ -612,8 +612,8 @@ Var PayState2 = "Enable" Var QRChannel = 0 Var Seeker.CodeChannel = 0 - If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + If Seeker.thankToppingFlag = 1 Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" Else Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" EndIf diff --git a/spiral/xml/page_spiral_payment_credit2.xml b/spiral/xml/page_spiral_payment_credit2.xml index bb5a2c90..69d416ce 100644 --- a/spiral/xml/page_spiral_payment_credit2.xml +++ b/spiral/xml/page_spiral_payment_credit2.xml @@ -103,8 +103,8 @@ Var PayState2 = "Enable" Var QRChannel = 0 Var Seeker.CodeChannel = 0 - If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + If Seeker.thankToppingFlag = 1 Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" Else Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" EndIf diff --git a/spiral/xml/page_spiral_payment_credit3.xml b/spiral/xml/page_spiral_payment_credit3.xml index e18ba15e..5f95bbe4 100644 --- a/spiral/xml/page_spiral_payment_credit3.xml +++ b/spiral/xml/page_spiral_payment_credit3.xml @@ -106,8 +106,8 @@ Var PayState2 = "Enable" Var QRChannel = 0 Var Seeker.CodeChannel = 0 - If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + If Seeker.thankToppingFlag = 1 Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" Else Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" EndIf @@ -178,8 +178,9 @@ Var Seeker.StoreCreditFlag = 1 - If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + If Seeker.thankToppingFlag = 1 Then + Var SpiralKeepCredit = 1 + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" Else Var SpiralKeepCredit = 1 Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" @@ -252,8 +253,8 @@ Var QRChannel = 0 Var Seeker.CodeChannel = 0 SAVELOG "payment_credit3-p121." - If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + If Seeker.thankToppingFlag = 1 Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" Else Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" EndIf diff --git a/spiral/xml/page_spiral_payment_storeCredit.xml b/spiral/xml/page_spiral_payment_storeCredit.xml index 6a2caa11..7e299a57 100644 --- a/spiral/xml/page_spiral_payment_storeCredit.xml +++ b/spiral/xml/page_spiral_payment_storeCredit.xml @@ -53,8 +53,8 @@ EndIf Else CoinVending BILLREJECT - If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + If Seeker.thankToppingFlag = 1 Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" Else Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" EndIf @@ -64,8 +64,8 @@ If FlagWaitUpdateCoinAmount = 1 Then If Timeout > 2 Then - If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + If Seeker.thankToppingFlag = 1 Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" Else Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" EndIf @@ -107,7 +107,7 @@ If ViewBill < RemainAmount Then CoinVending BILLSTACKALL - + Var SpiralKeepCredit = 1 Var FlagWaitUpdateCoinAmount = 1 Var Timeout = 0 Else @@ -627,8 +627,8 @@ EndIf Else CoinVending BILLREJECT - If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + If Seeker.thankToppingFlag = 1 Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" Else Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" EndIf diff --git a/spiral/xml/page_spiral_payment_storeCredit2-2.xml b/spiral/xml/page_spiral_payment_storeCredit2-2.xml index 19b4ef8e..a23d5210 100644 --- a/spiral/xml/page_spiral_payment_storeCredit2-2.xml +++ b/spiral/xml/page_spiral_payment_storeCredit2-2.xml @@ -56,8 +56,8 @@ If FlagWaitUpdateCoinAmount = 1 Then If Timeout > 2 Then - If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + If Seeker.thankToppingFlag = 1 Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" Else Open "ROOT/taobin_project/xml/page_payment_cash.xml" EndIf diff --git a/spiral/xml/page_spiral_payment_storeCredit2.xml b/spiral/xml/page_spiral_payment_storeCredit2.xml index 036f484a..5bcab783 100644 --- a/spiral/xml/page_spiral_payment_storeCredit2.xml +++ b/spiral/xml/page_spiral_payment_storeCredit2.xml @@ -47,8 +47,8 @@ If FlagWaitUpdateCoinAmount = 1 Then If Timeout > 2 Then - If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + If Seeker.thankToppingFlag = 1 Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cashMore.xml" Else Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_cash.xml" EndIf diff --git a/spiral/xml/page_spiral_select.xml b/spiral/xml/page_spiral_select.xml index dacf39b5..4d9a7845 100644 --- a/spiral/xml/page_spiral_select.xml +++ b/spiral/xml/page_spiral_select.xml @@ -5,16 +5,36 @@ "0xeae6e1" SoundVolume + Var PayType = "" + Var PayReference = "" + Var ServiceAmountSum = 0 + + Var Seeker.thankToppingFlag = 0 Var y_topping_bg = 912 WEB "DISABLE" ; Var DrinkDescriptionTH = $01-00-00-0001.description + Var PicSpiralOption = "Invisible" + Var StrawState = "Invisible" + Var LidDeactiveButton = "Invisible" + Var SpiralIce_STAGE = $12-05-02-0017.Button + Var PriceDrinkTopping = 10 - + If SpiralOption = 1 Then + Var PicSpiralOption = "Enable" + Var StrawState = "Enable" + Var LidDeactiveButton = "Invisible" + If SpiralIce_STAGE = "Disable" Then + Var StrawState = "Disable" + Var LidDeactiveButton = "Enable" + EndIf + EndIf + + DEBUGVAR video_menu_0 - + Var DisableUsingCode = "false" Var ShowLidStraw = "Invisible" Var ShowLidOnly = "Invisible" @@ -58,6 +78,8 @@ Var SpiralSelectdetail = SpiralSelectdetail2E Var DirImage = "ROOT/taobin_project/image/topping_en" + Var DirImage2 = "ROOT/taobin_project/spiral/image/page_spiral" + Var DirImage3 = "ROOT/taobin_project/spiral/image/page_spiral/en_" Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" Var showname = NameDrink @@ -74,6 +96,8 @@ Var SpiralSelectdetail = SpiralSelectdetail2 Var DirImage = "ROOT/taobin_project/image/topping" + Var DirImage2 = "ROOT/taobin_project/spiral/image/page_spiral" + Var DirImage3 = "ROOT/taobin_project/spiral/image/page_spiral/" Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" Var showname = NameDrinkTH @@ -98,7 +122,9 @@ ;- Begin Var PriceDrinkNoTop = PriceDrink Var PriceDrinkTmp = PriceDrink + Var PriceDrinkTmp2 = PriceDrink Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp + Var PriceDrinkTmpShow2 = charOfBaht + PriceDrinkTmp Var Timeout = 0 SAVELOG PriceDrinkTmp @@ -252,7 +278,7 @@ 80 KanitMediumTTF ColorOrange - PriceDrinkTmpShow + PriceDrinkTmpShow2 @@ -265,8 +291,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Open "ROOT/taobin_project/xml/page_catalog.xml" - + Open "ROOT/taobin_project/xml/page_catalog.xml" @@ -340,6 +365,71 @@ ; ; + +; SpiralOption + + 52 + 1610 + PicSpiralOption + Var( DirImage3 + "spiral_option_ice.png" ) + + + +; topping left + + + + + + ; next @@ -508,12 +607,56 @@ Else Var show_eng = "true" EndIf - Open CurrentXMLFileName2 + + If show_eng = "true" Then + + Var SpiralSelectdetail = SpiralSelectdetail1E + Var SpiralSelectheader = SpiralSelectheader2E + Var SpiralSelectdetail = SpiralSelectdetail2E + + Var DirImage = "ROOT/taobin_project/image/topping_en" + Var DirImage2 = "ROOT/taobin_project/spiral/image/page_spiral" + Var DirImage3 = "ROOT/taobin_project/spiral/image/page_spiral/en_" + Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" + Var showname = NameDrink + Var showdesc = DrinkDescription + Var ShowHeadSpiralSelect = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_detail_en.png" + Var ShowHeadSpiralCash = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_choose_money_en.png" + + Var lid_straw_bg_iamge = DirImage + "/block_strawonly.png" + + Else + + Var SpiralSelectdetail = SpiralSelectdetail1 + Var SpiralSelectheader = SpiralSelectheader2 + Var SpiralSelectdetail = SpiralSelectdetail2 + + Var DirImage = "ROOT/taobin_project/image/topping" + Var DirImage2 = "ROOT/taobin_project/spiral/image/page_spiral" + Var DirImage3 = "ROOT/taobin_project/spiral/image/page_spiral/" + Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + Var showname = NameDrinkTH + Var showdesc = DrinkDescriptionTH + Var ShowHeadSpiralSelect = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_detail.png" + Var ShowHeadSpiralCash = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_choose_money.png + + EndIf + + + CRLFToSpace showname + RefreshAll + - - + + LidDeactiveButton + 650 + 1677 + Var( DirImage3 + "unavalible.png" ) + Open "/media/bt/xml/security_alarm.xml" diff --git a/spiral/xml/page_spiral_select_topping.xml b/spiral/xml/page_spiral_select_topping.xml new file mode 100644 index 00000000..f54d91f4 --- /dev/null +++ b/spiral/xml/page_spiral_select_topping.xml @@ -0,0 +1,544 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" +; "ROOT/taobin_project/sounds/chaching.mp3" + SoundVolume + + Var Timeout = 0 + Var StrawState = "Enable" + Var LidState = "Enable" + Topping "Load" "12-05-02-0017" + + If show_eng = "true" Then + + Var DirImage = "ROOT/taobin_project/image/topping2_en" + Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" + + Var text_show_thai = "Invisible" + Var text_show_eng = "Enable" + + Var topping_shot_price_x = 630 + Var text_x_add_oreo_price = 510 + Var text_show_normal_x = 408 + Else + + Var DirImage = "ROOT/taobin_project/image/topping2" + Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + + Var text_show_thai = "Enable" + Var text_show_eng = "Invisible" + + Var topping_shot_price_x = 600 + Var text_x_add_oreo_price = 490 + Var text_show_normal_x = 386 + + EndIf + + Var bg_strawlid = DirImage + "/bg_strawlid.png" + Var bg_straw_only = DirImage + "/bg_straw_only.png" + Var bg_lid_only = DirImage + "/bg_lid_only.png" + + If IgnoreLidStraw = "true" Then + Var IgnoreLidStraw = "false" + Var ShowLidStraw = "Invisible" + Var ShowLidOnly = "Invisible" + Var ShowStrawOnly = "Invisible" + + + Else + Var ShowLidStraw = "Enable" + + + If StrawState = "Press" Then + Var Seeker.thankStrawFlag = 1 + Else + Var Seeker.thankStrawFlag = 0 + EndIf + + + If LidState = "Enable" Then + If MAT_ID_9601 = "Enable" Then + Var LidState = MAT_ID_9601 + Else + Var LidState = MAT_ID_9601 + EndIf + EndIf + + EndIf + + ; Override all + If Service_LidStraw = "Disable" Then + Var ShowLidStraw = "Enable" + ;Var ShowLidOnly = "Invisible" + ;Var ShowStawOnly = "Invisible" + + + Var StrawState = "Disable" + Var LidState = "Disable" + + EndIf + + If StrawState = "Enable" Then + Var StrawDeactiveButton = "Invisible" + Else + If StrawState = "Press" Then + Var StrawDeactiveButton = "Invisible" + Else + Var StrawDeactiveButton = "Enable" + EndIf + EndIf + + + If LidState = "Enable" Then + Var LidDeactiveButton = "Invisible" + Else + If LidState = "Press" Then + Var LidDeactiveButton = "Invisible" + Else + Var LidDeactiveButton = "Enable" + EndIf + EndIf + + + DEBUGVAR StrawDeactiveButton + DEBUGVAR LidDeactiveButton + DEBUGVAR StrawState + + + 1000 + + Var Timeout = Timeout + 1 + + + If Timeout > 30 Then + Var Timeout = 0 + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + Refresh + TimerReset + + + + 0 + 380 + 1080 + 864 + 0xFFFFFF + + + + 0 + 555 + 1080 + 437 + SpiralProduct + + + + 143 + 360 + ShowHeadSpiralSelect + + + + + + 0 + 982 + 1080 + Center + 65 + KanitMediumTTF + ColorBrown2 + showname + + + + + 0 + 1058 + 1080 + Center + 40 + KanitTTF + ColorBrown + showdesc + + + + + + 85 + 1232 + 956 + 405 + Spiraldetail + + + + + +;-BEGIN Lid straw + + 47 + 1307 + 986 + 240 + 20 + bg_strawlid + + +; straw left + + + +; straw + + + +; LID left + + +; LID + + + + + + StrawDeactiveButton + 643 + 1252 + Var( DirImage + "/text20.png" ) + + + + + LidDeactiveButton + 643 + 1452 + Var( DirImage + "/text21.png" ) + + + +; back + + +; next + + + + 0 + 1127 + 1080 + Center + 80 + KanitMediumTTF + ColorOrange + PriceDrinkTmpShow2 + + + + 924 + 1804 + KanitTTF + 36 + 1080 + 0xFFFFFF + + + "OnValueChange" + + PriceDrinkTmpShow + + + + + + diff --git a/spiral/xml/page_spiral_thankyou.xml b/spiral/xml/page_spiral_thankyou.xml index 119a4e3b..85a58236 100644 --- a/spiral/xml/page_spiral_thankyou.xml +++ b/spiral/xml/page_spiral_thankyou.xml @@ -6,13 +6,16 @@ ; "ROOT/taobin_project/sounds/chaching.mp3" SoundVolume - - + Var Rraiwa = "Young" + Var SaveCoinAmount = 0 + Var SaveCoinAmount = CoinAmount + Var MachineState_Result = 0 Var SwapVDO = 0 Var TimeSwapVDO = 0 Var ShowSwapVDO = "ROOT/taobin_project/spiral/video/sp01.mp4" - - + Var CheckCoin = 0 + Var KeepServiceCredit = "" + Var KeepServiceCredit = ServiceCredit Var PayFlagCoinQR = 0 Var SetFlagCoinQR = 0 Var SetFlagCoinQRTimer = 999999 @@ -20,6 +23,7 @@ Var Timeout = 0 Var ServiceType = "locker" Var ServiceCharge = 0 + Var PayReferenceTmp = "" If TelephoneNumber = "" Then Var TelephoneNumber = "0899999999" EndIf @@ -30,7 +34,22 @@ Var VendingCampaign = IntVendingCampaign Var PayType = "" - + If Seeker.thankToppingFlag = 1 Then + Var PayType = "multi" + ;Var PayReference = "123456" + + If Seeker.PayWithQR = 1 Then + DEBUGVAR PayReference + Else + Var PayReference = "" + GenHashWithTimeStamp PayReference + EndIf + + + Var PriceDrink = PriceDrinkTmp2 + Var ServiceAmountSum = PriceDrinkTmp2 + PriceDrinkTopping + EndIf + Var PayOk = 0 Var ChangeFlag = 0 @@ -79,6 +98,16 @@ Var CreditReference = Seeker.CreditReferenceTmp Var VendingDiscount = Seeker.VendingDiscount Var VendingCampaign = Seeker.VendingCampaign + + If Seeker.thankToppingFlag = 1 Then + If SpiralCodeOk = 1 Then + If Seeker.VendingCampaign >= PayAmount Then + Var VendingCampaign = Seeker.VendingCampaign - PriceDrinkTopping + Else + Var VendingCampaign = 0 + EndIf + EndIf + EndIf ;SendSpiralResult = spiral-success , spiral-failed , spiral-valid , spiral-invalid If SellLeaw = 1 Then @@ -88,11 +117,46 @@ Var TestSellSpiral = 2 DEBUGVAR TestSellSpiral Var SellLeaw = 1 + If Seeker.thankToppingFlag = 1 Then + Topping "Select" SelectDrink + ; Pack + Topping "Pack" ExtendDataCurr + + + If StrawState = "Press" Then + Machine StrawOrder + Var LedLidBlink = "true" + EndIf + + If LidState = "Press" Then + Machine LidOrder + Var LedLidBlink = "true" + EndIf + Var SelectDrink = "12-05-02-0017" + Var SelectSugarID = 0 + MakeDrinkV1 SelectDrink SelectSugarID + EndIf EndIf 1000 DEBUGVAR LastMakeSpiralResult + DEBUGVAR LastMakeDrinkResult + DEBUGVAR MachineState_Result + DEBUGVAR MachineStage + + DEBUGVAR Seeker.thankToppingFlag + DEBUGVAR VendingCampaign + DEBUGVAR Seeker.VendingCampaign + DEBUGVAR SpiralCodeOk + DEBUGVAR SetFlagCoinQR + DEBUGVAR Rraiwa + DEBUGVAR Seeker.StoreCreditFlag + DEBUGVAR SetFlagCoinQR + DEBUGVAR CheckCoin + DEBUGVAR KeepServiceCredit + DEBUGVAR ChangeOK + Var Timeout = Timeout + 1 Var ChangeTimeout = ChangeTimeout - 1 Var CheckAckCodeTimer = CheckAckCodeTimer - 1 @@ -179,13 +243,29 @@ ;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate Else If Seeker.StoreCreditFlag = 1 Then - Var VendingDiscount = 0 - Var VendingCampaign = 0 - Var CreditReference = "" - Var ServiceType = "credit" - Var SessionID2 = SelectDrink - Var ServiceCredit = "locker" - Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + + Var CheckCoin = CoinAmount + If CheckCoin > 0 Then + Var VendingDiscount = 0 + Var VendingCampaign = 0 + Var CreditReference = "" + Var ServiceType = "credit" + Var SessionID2 = SelectDrink + Var ServiceCredit = "locker" + Var Rraiwa = "PAY" + Var PayReferenceTmp = PayReference + Var PayReference = "" + Var PayType = "" + + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + + + Var ServiceCredit = KeepServiceCredit + Var ServiceType = "locker" + Var PayReference = PayReferenceTmp + Var PayType = "multi" + + EndIf EndIf EndIf EndIf @@ -212,6 +292,7 @@ EndIf If SetFlagCoinQR = 2 Then + DEBUGVAR "tube2" Var SetFlagCoinQR = 3 Var TelephoneNumber = "0899999999" @@ -222,7 +303,19 @@ Var ServiceType = "credit" Var SessionID2 = SelectDrink Var ServiceCredit = "locker" + Var Rraiwa = "PAY2" + + Var PayReferenceTmp = PayReference + Var PayReference = "" + Var PayType = "" + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + + Var PayReference = PayReferenceTmp + Var PayType = "multi" + Var ServiceCredit = KeepServiceCredit + Var ServiceType = "locker" + EndIf If LastMakeSpiralResult = 1 Then @@ -237,10 +330,14 @@ Var SessionID3 = SessionID3 + MachineSpiralSlotID If SpiralCodeOk = 1 Then - Var SessionID3 = SessionID3 + "/" - Var SessionID3 = SessionID3 + Seeker.VendingCode - Var SessionID3 = SessionID3 + "/" - Var SessionID3 = SessionID3 + Seeker.CodeNumber + If Seeker.thankToppingFlag = 1 Then + Var VendingCampaign = 0 + Else + Var SessionID3 = SessionID3 + "/" + Var SessionID3 = SessionID3 + Seeker.VendingCode + Var SessionID3 = SessionID3 + "/" + Var SessionID3 = SessionID3 + Seeker.CodeNumber + EndIf EndIf Var PayOk = 1 @@ -258,12 +355,22 @@ Else Var ACC = Seeker.TNumberTaobinCredit EndIf - PAYEXT SVT ACC VendingTSIDTmp DEE - Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou2.xml" + + If Seeker.thankToppingFlag = 1 Then + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID3 PriceDrink ServiceCharge Donate + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou3.xml" + Else + PAYEXT SVT ACC VendingTSIDTmp DEE + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou2.xml" + EndIf EndIf Else Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID3 PriceDrink ServiceCharge Donate - Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou2.xml" + If Seeker.thankToppingFlag = 1 Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou3.xml" + Else + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou2.xml" + EndIf EndIf EndIf EndIf @@ -301,12 +408,24 @@ Else Var ACC = Seeker.TNumberTaobinCredit EndIf - PAYEXT SVT ACC VendingTSIDTmp DEE - Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou2.xml" + + If Seeker.thankToppingFlag = 1 Then + ;edit test + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID3 PriceDrink ServiceCharge Donate + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou3.xml" + Else + ;edit test + PAYEXT SVT ACC VendingTSIDTmp DEE + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou2.xml" + EndIf EndIf Else Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID3 PriceDrink ServiceCharge Donate - Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou2.xml" + If Seeker.thankToppingFlag = 1 Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou3.xml" + Else + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou2.xml" + EndIf EndIf EndIf @@ -361,7 +480,11 @@ EndIf If LastMakeSpiralResult = 2 Then - Open "ROOT/taobin_project/spiral/xml/page_spiral_fail.xml" + If Seeker.thankToppingFlag = 1 Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_failmuti.xml" + Else + Open "ROOT/taobin_project/spiral/xml/page_spiral_fail.xml" + EndIf EndIf ;If LastMakeSpiralResult = 2 Then @@ -425,7 +548,12 @@ If Timeout > 180 Then Var LastMakeSpiralResult = 2 SAVELOG "Spiral Timeout 180 sec" - Open "ROOT/taobin_project/spiral/xml/page_spiral_fail.xml" + + If Seeker.thankToppingFlag = 1 Then + Open "ROOT/taobin_project/spiral/xml/page_spiral_failmuti.xml" + Else + Open "ROOT/taobin_project/spiral/xml/page_spiral_fail.xml" + EndIf EndIf @@ -500,12 +628,9 @@ "Reload" "true" ShowSwapVDO -;Filename> "ROOT/taobin_project/spiral/video/sp01.mp4" +; "ROOT/taobin_project/spiral/video/sp01.mp4" - - - If SpiralCodeOk = 1 Then @@ -555,14 +680,6 @@ -; -; 89 -; 700 -; 902 -; 902 -; "ROOT/taobin_project/spiral/image/page_spiral/thankyou.png" -; -