From 9ca01baf962f2e04db4805171d94aca7b774cd26 Mon Sep 17 00:00:00 2001 From: miggaze Date: Thu, 5 Nov 2020 12:56:04 +0700 Subject: [PATCH 1/6] ... --- xml/page_board.xml | 2 +- xml/page_payment_code.xml | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/xml/page_board.xml b/xml/page_board.xml index 5e38dccd..28f03b1f 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -35,7 +35,7 @@ Var countClick = 0 - Var RoadShow = "true" + Var RoadShow = "false" Var IgnorePoint = "true" Var CountDownShowButton = 30 diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml index 746341ac..55c38a38 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -16,7 +16,7 @@ Var CodeChannel = 0 ;Var VendingQRCode = "ERROR" - VendingQR ON + ;VendingQR ON ;Var QRCODE99 = "" ;CoinVending OFF @@ -109,24 +109,28 @@ Var FreeVendingCampaign = 1 If VendingCode = "C13" Then + CoinVending OFF ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" MakeDrinkV1 SelectDrink SelectSugarID Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf If VendingCode = "C24" Then + CoinVending OFF ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" MakeDrinkV1 SelectDrink SelectSugarID Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf If VendingCode = "C25" Then + CoinVending OFF ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" MakeDrinkV1 SelectDrink SelectSugarID Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf If VendingCode = "C30" Then + CoinVending OFF ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" MakeDrinkV1 SelectDrink SelectSugarID Open "ROOT/taobin_project/xml/page_thankyou.xml" From 86dd371865fe1d9e7c6b857b1c914a12198e184b Mon Sep 17 00:00:00 2001 From: miggaze Date: Thu, 5 Nov 2020 14:16:23 +0700 Subject: [PATCH 2/6] fix bug --- xml/page_brewing2.xml | 14 +++++++++++--- xml/page_payment_code.xml | 7 ++++++- xml/page_thankyou.xml | 3 +++ 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/xml/page_brewing2.xml b/xml/page_brewing2.xml index e36ea202..543ac74a 100644 --- a/xml/page_brewing2.xml +++ b/xml/page_brewing2.xml @@ -277,8 +277,12 @@ EndIf Else - - Var ChangeOK = 4 + + If ChangeFlag2 = 1 Then + Var ChangeOK = 2 + Else + Var ChangeOK = 4 + EndIf EndIf @@ -308,7 +312,11 @@ EndIf Else - Var ChangeOK = 4 + If ChangeFlag2 = 1 Then + Var ChangeOK = 2 + Else + Var ChangeOK = 4 + EndIf EndIf EndIf diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml index 55c38a38..4038f71a 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -64,7 +64,12 @@ Var QRChannel = 0 If IntVendingCampaign >= PayAmount Then - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + ;Open "ROOT/taobin_project/xml/page_payment_cash.xml" + 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" EndIf diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index 7df35035..6cf9ab2e 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -15,6 +15,7 @@ Var ErrTimeout = 0 Var ActionOKCase = 0 Var ChangeTimeout = 0 + Var ChangeFlag2 = 0 1000 @@ -31,6 +32,7 @@ Var Canout = SumCoinAmount - PayAmount If Canout > 0 Then Change Canout + Var ChangeFlag2 = 1 EndIf EndIf EndIf @@ -39,6 +41,7 @@ Var Canout = CoinAmount If Canout > 0 Then Change Canout + Var ChangeFlag2 = 1 EndIf EndIf From 1e2b19dc5f08413134a7b7d565266d86e82b7c55 Mon Sep 17 00:00:00 2001 From: miggaze Date: Mon, 9 Nov 2020 18:45:33 +0700 Subject: [PATCH 3/6] ... --- xml/page_brewing2.xml | 39 ++++++++++++++++++++++++++++++++++++++- xml/page_payment.xml | 6 +++--- xml/page_payment_cash.xml | 26 ++++++++++++++------------ xml/page_payment_code.xml | 34 ++++++++++++++++++++++++++++++++-- xml/page_thankyou.xml | 26 ++++++++++++++++++-------- 5 files changed, 105 insertions(+), 26 deletions(-) diff --git a/xml/page_brewing2.xml b/xml/page_brewing2.xml index 543ac74a..868968de 100644 --- a/xml/page_brewing2.xml +++ b/xml/page_brewing2.xml @@ -246,12 +246,45 @@ 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 + If ChangeFlag2 = 1 Then + Var TelephoneNumber = "0899999999" + Var VendingDiscount = 0 + Var VendingCampaign = 0 + Var ServiceType = "credit" + Var SessionID2 = SelectDrink + Var ServiceCredit = "coffee" Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate EndIf + EndIf + Var ServiceSuccess = "yes" Open "ROOT/taobin_project/xml/page_drinkok.xml" + EndIf If MachineState_Result = 2 Then @@ -299,7 +332,11 @@ EndIf Else - Var ChangeOK = 3 + If ChangeFlag2 = 1 Then + Var ChangeOK = 2 + Else + Var ChangeOK = 3 + EndIf EndIf Else diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 29071bf7..96931dd3 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -26,10 +26,10 @@ Var QRCODE3 = "VDGN" Var QRCODE4 = BoxID Var QRCODE5 = SelectSlot - Var QRCODE6 = ServiceCredit - Var QRCODE7 = ServiceAmount2 + Var QRCODE6 = SelectDrink + Var QRCODE7 = PriceDrink Var QRCODE8 = "" - + Var CountStepPackPayment = 0 diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 599276de..7ad906cc 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -219,6 +219,7 @@ ;Var VendingQRCode = "ERROR" ;Coin STANDBY VendingQR OFF + CoinVending OFF ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" MakeDrinkV1 SelectDrink SelectSugarID @@ -335,7 +336,7 @@ If CancelFlag = 1 Then Var CancelCounter = CancelCounter + 1 - If CancelCounter = 3 Then + If CancelCounter = 2 Then ;Change CoinAmount If CoinAmount > 0 Then Change CoinAmount @@ -413,7 +414,7 @@ TimerReset If CoinInFlag = 0 Then - VendingQR OFF + ;VendingQR OFF EndIf Var CoinInFlag = 1 @@ -426,6 +427,7 @@ If SumCoinAmount >= PayAmount Then ;Var VendingQRCode = "ERROR" CoinVending OFF + VendingQR OFF Var Canout = SumCoinAmount - PayAmount If Canout = 0 Then Var RemainAmountStr = 0 @@ -460,9 +462,9 @@ CoinVending OFF Var CancelFlag = 1 Var CancelCounter = 0 - If CoinAmount = 0 Then - Open "ROOT/taobin_project/xml/page_catalog.xml" - EndIf + ;If CoinAmount = 0 Then + ; Open "ROOT/taobin_project/xml/page_catalog.xml" + ;EndIf Var showRemaining = "คืนเงิน" ;Open "ROOT/taobin_project/xml/page_catalog.xml" @@ -552,11 +554,11 @@ If CoinInFlag = 0 Then - + If CancelFlag = 0 Then Var TelephoneNumber = "" Var Tel_Confirm_State = "Disable" Open "ROOT/taobin_project/xml/page_payment_code.xml" - + EndIf EndIf @@ -572,6 +574,7 @@ If CoinInFlag = 0 Then + If CancelFlag = 0 Then Var alphaState = "Enable" ;CoinVending OFF VendingQR ON @@ -585,6 +588,7 @@ Var NoGotoMenupage = "true" EndIf + EndIf EndIf ; If CoinInFlag = 0 Then @@ -617,11 +621,7 @@ CoinVending OFF Var CancelFlag = 1 Var CancelCounter = 0 - If CoinAmount = 0 Then - If IntVendingCampaign = 0 Then - Open "ROOT/taobin_project/xml/page_catalog.xml" - EndIf - EndIf + EndIf EndIf @@ -654,6 +654,8 @@ showRemaining + + 0 938 diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml index 4038f71a..ab5db4d1 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -38,14 +38,41 @@ Var Timeout = Timeout + 1 If Timeout > 30 Then - VendingQR OFF - Open menu_back_to_main + ;VendingQR OFF + ;Open menu_back_to_main + + Var PayState1 = "PressForever" + Var PayState2 = "Enable" + Var QRChannel = 0 + Var CodeChannel = 0 + Open "ROOT/taobin_project/xml/page_payment_cash.xml" + EndIf TimerReset Refresh + + + + If IDCardStatus = "OK" Then + If IDCardReady = "OK" Then + If IDCardData = "DONE" Then + CoinVending OFF + Open "ROOT/taobin_project/xml/page_show_consent2.xml" + EndIf + EndIf + EndIf + + + + + + + + + @@ -71,6 +98,9 @@ MakeDrinkV1 SelectDrink SelectSugarID Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf + + + Var SessionID2 = SelectSlot + ":" diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index 6cf9ab2e..8b3252b4 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -25,16 +25,26 @@ Var Timeout = Timeout + 1 If Timeout = 3 Then - If FreeVendingCampaign = 0 Then - If IntVendingCampaign < PayAmount Then - Var SumCoinAmount = CoinAmount + IntVendingCampaign - If SumCoinAmount >= PayAmount Then - Var Canout = SumCoinAmount - PayAmount - If Canout > 0 Then - Change Canout - Var ChangeFlag2 = 1 + If PayWithQR = 0 Then + If FreeVendingCampaign = 0 Then + If IntVendingCampaign < PayAmount Then + Var SumCoinAmount = CoinAmount + IntVendingCampaign + If SumCoinAmount >= PayAmount Then + Var Canout = SumCoinAmount - PayAmount + If Canout > 0 Then + Change Canout + Var ChangeFlag2 = 1 + EndIf EndIf EndIf + Else + + Var Canout = CoinAmount + If Canout > 0 Then + Change Canout + Var ChangeFlag2 = 1 + EndIf + EndIf Else From 0f22c109fe3e7e9fafc2f41a84dea5ebe2dd1471 Mon Sep 17 00:00:00 2001 From: miggaze Date: Mon, 9 Nov 2020 18:45:55 +0700 Subject: [PATCH 4/6] ... --- xml/page_show_consent2.xml | 186 +++++++++++++++++++++++++++++++++++++ 1 file changed, 186 insertions(+) create mode 100644 xml/page_show_consent2.xml diff --git a/xml/page_show_consent2.xml b/xml/page_show_consent2.xml new file mode 100644 index 00000000..37192424 --- /dev/null +++ b/xml/page_show_consent2.xml @@ -0,0 +1,186 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + + ; On open + + + Var Timeout = 0 + SAVELOG show_eng + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/consent_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 DirImage = "ROOT/taobin_project/image/consent/" + 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 AcceptFlag = 0 + + 1000 + + + Var Timeout = Timeout + 1 + If Timeout > 30 Then + ; goto lid straw + Open "ROOT/taobin_project/xml/page_payment_cash.xml" + EndIf + + TimerReset + Refresh + + + + + + + + Var IDValid = "" + + SPLIT Ext1a "|" 1 IDValid + + If IDValid = "ok" Then + + Var FreeVendingCampaign = 1 + Var VendingCode = "C31" + Var CodeChannel = 2 + Var CodeNumber = IDNum + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + + Else + Var FreeVendingCampaign = 1 + Var VendingCode = "C31" + Var CodeChannel = 2 + Var CodeNumber = IDNum + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + Open "ROOT/taobin_project/xml/page_payment_cash.xml" + EndIf + + Refresh + + + + + + 0 + 380 + "ROOT/taobin_project/image/collectiing/alpha.png" + + + + + + + 158 + 665 + Var( DirImage + "/img_popup1.png") + + + + + + + + + + + + 0 + 0 + "ROOT/taobin_project/image/ad_medium_2.png" + + +; + + 751 + 413 + "ROOT/taobin_project/image/page_doing/img2.png" + +; + + + + + +; + + 751 + 413 + "ROOT/taobin_project/image/page_doing/img2.png" + +; +; + + + XPosiShowCountDownBrew + 470 + End + 153 + 88 + RobotoBold + 0x513C2F + AcceptFlag + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + From 1cae0470ab533fbe52176131165acb4d0047fd09 Mon Sep 17 00:00:00 2001 From: miggaze Date: Tue, 10 Nov 2020 17:25:15 +0700 Subject: [PATCH 5/6] IDCard --- xml/page_brewing2.xml | 7 ++++++- xml/page_payment_code.xml | 2 +- xml/page_show_consent2.xml | 20 ++++++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/xml/page_brewing2.xml b/xml/page_brewing2.xml index 868968de..4271bc2e 100644 --- a/xml/page_brewing2.xml +++ b/xml/page_brewing2.xml @@ -314,7 +314,12 @@ If ChangeFlag2 = 1 Then Var ChangeOK = 2 Else - Var ChangeOK = 4 + If CodeChannel = 1 Then + Var ChangeOK = 4 + Else + Var ChangeOK = 3 + EndIf + EndIf EndIf diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml index ab5db4d1..b9213e6e 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -58,7 +58,7 @@ If IDCardStatus = "OK" Then If IDCardReady = "OK" Then - If IDCardData = "DONE" Then + If IDCardData = "START" Then CoinVending OFF Open "ROOT/taobin_project/xml/page_show_consent2.xml" EndIf diff --git a/xml/page_show_consent2.xml b/xml/page_show_consent2.xml index 37192424..539eed32 100644 --- a/xml/page_show_consent2.xml +++ b/xml/page_show_consent2.xml @@ -24,6 +24,7 @@ EndIf Var AcceptFlag = 0 + Var AcceptState = "Disable" 1000 @@ -69,6 +70,24 @@ Refresh + + + + If IDCardStatus = "OK" Then + If IDCardReady = "OK" Then + If IDCardData = "DONE" Then + Var AcceptState = "Enable" + EndIf + EndIf + EndIf + + + + + + + + @@ -90,6 +109,7 @@