diff --git a/image/display_point_en/imgCouponC38.png b/image/display_point_en/imgCouponC38.png index 0845e89b..6423d9bf 100644 Binary files a/image/display_point_en/imgCouponC38.png and b/image/display_point_en/imgCouponC38.png differ diff --git a/image/topping2/bg_strawProblem.png b/image/topping2/bg_strawProblem.png new file mode 100644 index 00000000..8980a1df Binary files /dev/null and b/image/topping2/bg_strawProblem.png differ diff --git a/image/topping2/bg_strawSmall.png b/image/topping2/bg_strawSmall.png new file mode 100644 index 00000000..759575e3 Binary files /dev/null and b/image/topping2/bg_strawSmall.png differ diff --git a/image/topping2/bg_strawlidSmall.png b/image/topping2/bg_strawlidSmall.png new file mode 100644 index 00000000..cd453e1c Binary files /dev/null and b/image/topping2/bg_strawlidSmall.png differ diff --git a/image/topping2_en/bg_strawProblem.png b/image/topping2_en/bg_strawProblem.png new file mode 100644 index 00000000..0ec615c9 Binary files /dev/null and b/image/topping2_en/bg_strawProblem.png differ diff --git a/image/topping2_en/bg_strawSmall.png b/image/topping2_en/bg_strawSmall.png new file mode 100644 index 00000000..7959b96e Binary files /dev/null and b/image/topping2_en/bg_strawSmall.png differ diff --git a/image/topping2_en/bg_strawlidSmall.png b/image/topping2_en/bg_strawlidSmall.png new file mode 100644 index 00000000..2bf27023 Binary files /dev/null and b/image/topping2_en/bg_strawlidSmall.png differ diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 129caaca..aa104280 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -166,6 +166,19 @@ Var next_pic_bg = DirImage + "/bn_add_order.png" Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png" + + Var bg_strawlid_ST = "Enable" + + Var Seeker.strawAction = 0 + Var Seeker.lidAction = 0 + + If Seeker.thankLidFlag = 1 Then + Var bg_strawlid = DirImage2 + "/bg_strawSmall.png" + Var LidStateX = "Invisible" + Var Seeker.lidAction = 2 + EndIf + + If LastMakeDrinkResult = "success" Then @@ -1068,100 +1081,115 @@ -; -; -; -;; straw left -; -; -; -; -; -; -;; LID left -; -; -; + + +; straw left + + + + + + +; LID left + + + diff --git a/xml/page_brewing3Conti.xml b/xml/page_brewing3Conti.xml index 8de61ee3..7326a253 100644 --- a/xml/page_brewing3Conti.xml +++ b/xml/page_brewing3Conti.xml @@ -13,8 +13,17 @@ CoinBack EndIf + If show_eng = "true" Then + Var DirImage2 = "ROOT/taobin_project/image/topping2_en" + Else + Var DirImage2 = "ROOT/taobin_project/image/topping2" + EndIf - + Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png" + If Seeker.thankLidFlag = 1 Then + Var bg_strawlid = DirImage2 + "/bg_strawSmall.png" + Var LidStateX = "Invisible" + EndIf Var TimeoutWaitPay = 10 @@ -844,4 +853,114 @@ ShowCountDownBrewing + + +; straw left + + + + + + +; LID left + + + + diff --git a/xml/page_brewing3Multi.xml b/xml/page_brewing3Multi.xml index 03a9f348..a3832546 100644 --- a/xml/page_brewing3Multi.xml +++ b/xml/page_brewing3Multi.xml @@ -172,6 +172,30 @@ Var PayType = "multi" + If show_eng = "true" Then + Var DirImage2 = "ROOT/taobin_project/image/topping2_en" + Else + Var DirImage2 = "ROOT/taobin_project/image/topping2" + EndIf + + Var StrawStateX = "Enable" + Var LidStateX = "Enable" + Var Seeker.thankLidFlag = 0 + Var Seeker.thankStrawFlag = 0 + + Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png" + + Var bg_strawlid_ST = "Enable" + + Var Seeker.strawAction = 0 + Var Seeker.lidAction = 0 + + If Seeker.thankLidFlag = 1 Then + Var bg_strawlid = DirImage2 + "/bg_strawSmall.png" + Var LidStateX = "Invisible" + Var Seeker.lidAction = 2 + EndIf + @@ -938,4 +962,116 @@ + + + +; straw left + + + + + + +; LID left + + + + + diff --git a/xml/page_check_member2.xml b/xml/page_check_member2.xml index 54d9c66f..fe886d4f 100644 --- a/xml/page_check_member2.xml +++ b/xml/page_check_member2.xml @@ -573,7 +573,7 @@ If CouponTypeB = "103" Then Var CouponNameB = "/imgCouponC40.png" EndIf - If CouponTypeB = "103" Then + If CouponTypeB = "105" Then Var CouponNameB = "/imgCouponC38.png" EndIf If CouponTypeB = "106" Then diff --git a/xml/page_check_newmember2.xml b/xml/page_check_newmember2.xml index fd13f902..967e3eb3 100644 --- a/xml/page_check_newmember2.xml +++ b/xml/page_check_newmember2.xml @@ -51,7 +51,7 @@ Var Timeout = Timeout + 1 - If Timeout > 30 Then + If Timeout > 40 Then Open "ROOT/taobin_project/xml/page_check_member.xml" EndIf @@ -75,14 +75,6 @@ Var TNumberTaobinMemberXXX = TelephoneNumber - Trim TNumberTaobinMemberXXX 3 - Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + "-XXX-" - Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number7 - Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number8 - Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number9 - Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number10 - - Var CoffeePointRank = Ext1b INT CoffeePointRank Var CoffeePointRankTmp = CoffeePointRank @@ -118,6 +110,8 @@ Var CouponInfo9 = Ext1i Var CouponInfo10 = Ext1j + Var GetAccFlag = 0 + Open "ROOT/taobin_project/xml/page_check_member2.xml" EndIf @@ -126,16 +120,45 @@ If GetAccFlag = 1 Then - Var GetAccFlag = 0 + Var GetAccFlag = 2 If Ext1a = "ok" Then + Var TaobinName = "" + Var TaobinCoupons = "" + Var TaobinExpire = "" + Var TaobinLevel = "" + + Var TNumberTaobinMemberXXX = TelephoneNumber + + Var CoffeePointRank = 0 + INT CoffeePointRank + Var CoffeePointRankTmp = CoffeePointRank + + Var PolygonST1 = "Invisible" + Var PolygonST2 = "Invisible" + Var CouponSTA = "Invisible" + Var CouponSTB = "Invisible" + + Var CouponPage = 1 + Var MakeDrinkState = 0 + Var CouponInfo1 = "" + Var CouponInfo2 = "" + Var CouponInfo3 = "" + Var CouponInfo4 = "" + Var CouponInfo5 = "" + Var CouponInfo6 = "" + Var CouponInfo7 = "" + Var CouponInfo8 = "" + Var CouponInfo9 = "" + Var CouponInfo10 = "" + Var TaobinCredit = 0 - ;GETACCEXT TelephoneNumber 14 - ;Var StepX = 1 - ;Var Ext1a = "ok" + GETACCEXT TelephoneNumber 14 + Var StepX = 1 + Var Ext1a = "ok" - Open "ROOT/taobin_project/xml/page_check_member2.xml" + ;Open "ROOT/taobin_project/xml/page_check_member2.xml" Else Var ShowErrorText = "Enable" Var ShowText = "Invisible" @@ -154,7 +177,7 @@ - If GetAccFlag = 1 Then + If GetAccFlag > 0 Then Var ShowErrorText = "Enable" Var ShowText = "Invisible" Var GetAccFlag = 0 diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml index fd7cb774..80f9eaf9 100644 --- a/xml/page_drinkok.xml +++ b/xml/page_drinkok.xml @@ -8,8 +8,40 @@ DEBUGVAR StarwState DEBUGVAR LidState - + + If show_eng = "true" Then + Var DirImage2 = "ROOT/taobin_project/image/topping2_en" + Else + Var DirImage2 = "ROOT/taobin_project/image/topping2" + EndIf + + Var bg_strawlid_ST = "Enable" + Var bg_strawProblem_ST = "Invisible" + Var bg_strawProblem_Y = 1470 + Var bg_strawProblem = DirImage2 + "/bg_strawProblem.png" + Var straw_problem_flag = 0 + + If Seeker.strawAction = 1 Then + Machine Straw + ;Var bg_strawlid = DirImage2 + "/bg_strawProblem.png" + Var bg_strawProblem_ST = "Enable" + + + If Seeker.lidAction = 0 Then + Else + Var bg_strawProblem_Y = 1680 + Var bg_strawlid_ST = "Invisible" + Var LidStateX = "Invisible" + Var StrawStateX = "Invisible" + EndIf + EndIf + + If Seeker.lidAction = 1 Then + Machine Lid + + EndIf + ;If StarwState = "Press" Then ; Machine Straw ; LED LedDoorLid Blink 255 255 255 255 @@ -454,5 +486,169 @@ +;500 +;1180 + + + + +; straw left + + + + + + +; LID left + + + + + diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 44bb31f1..1b1c8ddf 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -172,6 +172,9 @@ Var CountStepPackPayment = CountStepPackPayment + 1 EndIf + ;Var CountStepPackPayment = 1 + + If CountStepPackPayment = 1 Then DEBUGVAR Seeker DEBUGVAR HaveCup DEBUGVAR CupChecking diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 81050699..6676b2af 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -198,6 +198,7 @@ Var RemainAmount = RemainAmount - Seeker.IntVendingCampaign Var RemainAmount = RemainAmount - Seeker.IntVendingCredit Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign + Var SumCoinAmount = CoinAmount + Seeker.IntVendingCredit If SumCoinAmount >= PayAmount Then SAVELOG "CoinInOk First" diff --git a/xml/page_payment_cashMore.xml b/xml/page_payment_cashMore.xml index c8fe2a58..7adef233 100644 --- a/xml/page_payment_cashMore.xml +++ b/xml/page_payment_cashMore.xml @@ -1191,6 +1191,14 @@ 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 + ":" diff --git a/xml/page_payment_credit.xml b/xml/page_payment_credit.xml index 7d1f8c06..8568ff82 100644 --- a/xml/page_payment_credit.xml +++ b/xml/page_payment_credit.xml @@ -156,7 +156,8 @@ Refresh StrLen TelephoneNumber TelNumLen If TelNumLen >= 10 Then - Var Tel_Confirm_State = "Enable" + ;Var Tel_Confirm_State = "Enable" + Function 2 EndIf Var ShowErrorText = "Invisible" @@ -197,7 +198,8 @@ Refresh StrLen TelephoneNumber TelNumLen If TelNumLen >= 10 Then - Var Tel_Confirm_State = "Enable" + ;Var Tel_Confirm_State = "Enable" + Function 2 EndIf Var ShowErrorText = "Invisible" @@ -238,7 +240,8 @@ Refresh StrLen TelephoneNumber TelNumLen If TelNumLen >= 10 Then - Var Tel_Confirm_State = "Enable" + ;Var Tel_Confirm_State = "Enable" + Function 2 EndIf Var ShowErrorText = "Invisible" @@ -279,7 +282,8 @@ Refresh StrLen TelephoneNumber TelNumLen If TelNumLen >= 10 Then - Var Tel_Confirm_State = "Enable" + ;Var Tel_Confirm_State = "Enable" + Function 2 EndIf Var ShowErrorText = "Invisible" @@ -320,7 +324,8 @@ Refresh StrLen TelephoneNumber TelNumLen If TelNumLen >= 10 Then - Var Tel_Confirm_State = "Enable" + ;Var Tel_Confirm_State = "Enable" + Function 2 EndIf Var ShowErrorText = "Invisible" @@ -361,7 +366,8 @@ Refresh StrLen TelephoneNumber TelNumLen If TelNumLen >= 10 Then - Var Tel_Confirm_State = "Enable" + ;Var Tel_Confirm_State = "Enable" + Function 2 EndIf Var ShowErrorText = "Invisible" @@ -402,7 +408,8 @@ Refresh StrLen TelephoneNumber TelNumLen If TelNumLen >= 10 Then - Var Tel_Confirm_State = "Enable" + ;Var Tel_Confirm_State = "Enable" + Function 2 EndIf Var ShowErrorText = "Invisible" @@ -443,7 +450,8 @@ Refresh StrLen TelephoneNumber TelNumLen If TelNumLen >= 10 Then - Var Tel_Confirm_State = "Enable" + ;Var Tel_Confirm_State = "Enable" + Function 2 EndIf Var ShowErrorText = "Invisible" @@ -484,7 +492,8 @@ Refresh StrLen TelephoneNumber TelNumLen If TelNumLen >= 10 Then - Var Tel_Confirm_State = "Enable" + ;Var Tel_Confirm_State = "Enable" + Function 2 EndIf Var ShowErrorText = "Invisible" @@ -522,7 +531,8 @@ Trim TelephoneNumber 10 StrLen TelephoneNumber TelNumLen If TelNumLen >= 10 Then - Var Tel_Confirm_State = "Enable" + ;Var Tel_Confirm_State = "Enable" + Function 2 EndIf Var ShowTextNumber = "Invisible" @@ -577,7 +587,7 @@