diff --git a/xml/page_board.xml b/xml/page_board.xml index 6b57ce0c..9576df4a 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -65,7 +65,7 @@ Cart "DeleteMenuID" "ALL" - Var MultiPayEnable = "false" + ;Var MultiPayEnable = "false" ;Var MultiPayEnable = "true" Var PayType = "" @@ -406,7 +406,7 @@ - + CartTaoBin "CLEAR" "-" "-" "-" @@ -1337,6 +1337,12 @@ TRY "ROOT/taobin_project/inter/tha/configure.ev" + If BoxID = 173372 Then + Var SpiralOnline = "true" + + Var InternationalShow = 1 + EndIf + If EnableMultiInstanceFromBoxID = 1 Then If CountryName = "Thailand" Then @@ -1388,6 +1394,7 @@ Var InternationalShow = 0 EndIf + If BoxID = 210699 Then Var SpiralOnline = "true" Var SpiralModeFrozenFruit = 1 @@ -1744,6 +1751,8 @@ OpenInst 2 PepsiFullScreenPageBoard EndIf + + @@ -2224,6 +2233,44 @@ PRICE "Reset" "-" EndIf + DEBUGVAR startTaobinML + DEBUGVAR CountDownOpenTaobinML + + If CountDownOpenTaobinML > 0 Then + + Else + Var CountDownOpenTaobinML = 0 + EndIf + + If EnableCameraStraw = "true" Then + + If startTaobinML = "true" Then + + Else + Var CountDownOpenTaobinML = CountDownOpenTaobinML + 1 + + If CountDownOpenTaobinML = 70 Then + TrickTaoBinML "START" + Var startTaobinML = "true" + DEBUGVAR startTaobinML + EndIf + + + EndIf + + DEBUGVAR NeedTrickTaobinML + + If NeedTrickTaobinML = "true" Then + + TrickTaoBinML "TRICKER" + Var NeedTrickTaobinML = "false" + DEBUGVAR NeedTrickTaobinML + + EndIf + EndIf + + + If CupOnArm = "true" Then diff --git a/xml/page_payment_cashMore.xml b/xml/page_payment_cashMore.xml index 27c47c75..a6f7eb85 100644 --- a/xml/page_payment_cashMore.xml +++ b/xml/page_payment_cashMore.xml @@ -2,7 +2,7 @@ "Enable" 1080 1920 - "0xFFFFFF" + "0xeae6e1" SoundVolume PlaySoundLag @@ -290,15 +290,31 @@ EndIf + Var PathAlarm = "" + Var ordersummaryText = "" + Var subtotalText = "" + Var itemText = "" + Var backtext = "" + If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment" Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_en" Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" + Var PathAlarm = "ROOT/taobin_project/image/cart_en" + Var ordersummaryText = "Order Summary" + Var subtotalText = "Subtotal (" + Var itemText = "Items )" + Var backtext = "Back" Else Var DirImage = "ROOT/taobin_project/image/page_payment" Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend" Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" + Var PathAlarm = "ROOT/taobin_project/image/cart_th" + Var ordersummaryText = "รายการสินค้า" + Var subtotalText = "รวมสินค้า (" + Var itemText = "ชิ้น )" + Var backtext = "กลับ" EndIf ;inter-image @@ -400,6 +416,8 @@ Var PayState5 = "Disable" EndIf + + @@ -780,6 +798,10 @@ EndIf + + Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" + + TimerReset @@ -970,6 +992,11 @@ Var cart1_en = "Enable" Var PriceDrinkMulti = CART1_PRICE + + Var cardBottomY = 760 + Var lineBottomY = 750 + Var subtotalBottomY = 810 + EndIf If CART_COUNT >= 2 Then @@ -979,6 +1006,10 @@ Var cart2_en = "Enable" Var PriceDrinkMulti = PriceDrinkMulti + CART2_PRICE + + Var cardBottomY = 910 + Var lineBottomY = 900 + Var subtotalBottomY = 960 EndIf If CART_COUNT = 3 Then @@ -988,6 +1019,10 @@ Var cart3_en = "Enable" Var PriceDrinkMulti = PriceDrinkMulti + CART3_PRICE + + Var cardBottomY = 1050 + Var lineBottomY = 1040 + Var subtotalBottomY = 1100 EndIf @@ -1119,17 +1154,7 @@ ; ; - - 0 - 1172 - Var( DirImage + "/Rectangle0.png" ) - - - 0 - 1012 - Var( DirImage + "/Rectangle.png" ) - +; card head - 60 - 412 - 148 - 200 - cart1_pic + 40 + 480 + 1000 + 150 + "/mnt/sdcard/coffeevending/taobin_project/image/cart_uti/cartTop.png" - - 876 - 467 - 1080 - 50 - KanitMediumTTF - 0xDE794E - cart1_price - - - - 236 - 470 - 1080 - 50 - KanitMediumTTF - 0x513C2F - cart1_name - - - 60 - 612 - 148 - 200 - cart2_pic - - - 876 - 667 - 1080 - 50 - KanitMediumTTF - 0xDE794E - cart2_price - - - - 236 - 670 - 1080 - 50 + 100 + 520 + 500 + 37 KanitMediumTTF 0x513C2F - cart2_name + ordersummaryText - - - 60 - 812 - 148 - 200 - cart3_pic + 50 + 590 + 980 + 50 + "/mnt/sdcard/coffeevending/taobin_project/image/cart_uti/line.png" - - 876 - 872 - 1080 - 50 - KanitMediumTTF - 0xDE794E - cart3_price - - - 236 - 872 - 1080 - 50 - KanitMediumTTF - 0x513C2F - cart3_name - - + + 50 + 0 + 250 + 100 + "Enable" + cart1_pic + + + 350 + 30 + 500 + 32 + ; "multi2" + KanitMediumTTF + 0x322B26 + "Enable" + cart1_name + + + 950 + 5 + 28 + "multi2" + KanitMediumTTF + 0xDE794E + "Enable" + cart1_price + + + + + + + + + + 840 + 5 + 30 + "multi2" + KanitMediumTTF + 0xDE794E + "Enable" + "1" + + + + + + + 0 + 0 + 1080 + "auto" + cart2_en + + + 30 + 0 + 1000 + 150 + "0xFFFFFF" + + + + 50 + 0 + 250 + 100 + "Enable" + cart2_pic + + + 350 + 30 + 500 + 32 + ; "multi2" + KanitMediumTTF + 0x322B26 + "Enable" + cart2_name + + + 950 + 5 + 28 + "multi2" + KanitMediumTTF + 0xDE794E + "Enable" + cart2_price + + + + + + + + + + 840 + 5 + 30 + "multi2" + KanitMediumTTF + 0xDE794E + "Enable" + "1" + + + + + + + 0 + 0 + 1080 + "auto" + cart3_en + + + 30 + 0 + 1000 + 150 + "0xFFFFFF" + + + + 50 + 0 + 250 + 100 + "Enable" + cart3_pic + + + 350 + 30 + 500 + 32 + ; "multi2" + KanitMediumTTF + 0x322B26 + "Enable" + cart3_name + + + 950 + 5 + 28 + "multi2" + KanitMediumTTF + 0xDE794E + "Enable" + cart3_price + + + + + + + + + + 840 + 5 + 30 + "multi2" + KanitMediumTTF + 0xDE794E + "Enable" + "1" + + + + + + + + +; cartBottom + + + + 40 + cardBottomY + 1000 + 150 + "/mnt/sdcard/coffeevending/taobin_project/image/cart_uti/cartBottom.png" + + + +; line buttom + + + 50 + lineBottomY + 980 + 50 + "/mnt/sdcard/coffeevending/taobin_project/image/cart_uti/line.png" + + + +; Subtotal + - 876 - 1038 - 1080 - 72 + 100 + subtotalBottomY + 37 KanitMediumTTF - 0xDE794E + 0x513C2F + "Enable" + subtotalText + + + + 270 + subtotalBottomY + 37 + KanitMediumTTF + 0x513C2F + "Enable" + CART_COUNT + + + + + 310 + subtotalBottomY + 37 + KanitMediumTTF + 0x513C2F + "Enable" + itemText + + + + + 900 + subtotalBottomY + 37 + KanitMediumTTF + 0x513C2F + "Enable" showRemaining - - 80 - 1038 - 1080 - 72 - KanitMediumTTF - 0x513C2F - cartNumText - + +; +; 80 +; 1038 +; 1080 +; 72 +; KanitMediumTTF +; 0x513C2F +; cartNumText +; diff --git a/xml/page_payment_multi.xml b/xml/page_payment_multi.xml index 29ebe6c3..b067eae7 100644 --- a/xml/page_payment_multi.xml +++ b/xml/page_payment_multi.xml @@ -45,6 +45,10 @@ Var PriceDrinkMulti = 0 Var CART_INDEX = 0 + Var cardBottomY = 0 + Var lineBottomY = 0 + Var subtotalBottomY = 0 + If show_eng = "true" Then @@ -56,6 +60,9 @@ Var cart1_en = "Enable" Var PriceDrinkMulti = PriceDrinkMulti + CART1_PRICE + Var cardBottomY = 760 + Var lineBottomY = 750 + Var subtotalBottomY = 810 EndIf @@ -67,6 +74,10 @@ Var PriceDrinkMulti = PriceDrinkMulti + CART2_PRICE + Var cardBottomY = 910 + Var lineBottomY = 900 + Var subtotalBottomY = 960 + EndIf If CART_COUNT = 3 Then @@ -76,6 +87,11 @@ Var cart3_en = "Enable" Var PriceDrinkMulti = PriceDrinkMulti + CART3_PRICE + + Var cardBottomY = 1050 + Var lineBottomY = 1040 + Var subtotalBottomY = 1100 + EndIf @@ -91,6 +107,10 @@ Var PriceDrinkMulti = PriceDrinkMulti + CART1_PRICE + Var cardBottomY = 760 + Var lineBottomY = 750 + Var subtotalBottomY = 810 + EndIf If CART_COUNT >= 2 Then @@ -101,6 +121,10 @@ Var PriceDrinkMulti = PriceDrinkMulti + CART2_PRICE + Var cardBottomY = 910 + Var lineBottomY = 900 + Var subtotalBottomY = 960 + EndIf If CART_COUNT = 3 Then @@ -110,6 +134,10 @@ Var cart3_en = "Enable" Var PriceDrinkMulti = PriceDrinkMulti + CART3_PRICE + + Var cardBottomY = 1050 + Var lineBottomY = 1040 + Var subtotalBottomY = 1100 EndIf EndIf diff --git a/xml/page_topping_select7.xml b/xml/page_topping_select7.xml index b30ac62a..f57fada8 100644 --- a/xml/page_topping_select7.xml +++ b/xml/page_topping_select7.xml @@ -320,6 +320,8 @@ EndIf EndIf + DEBUGVAR btnAddCart + Var LidDeactiveButton = "Invisible" Var StrawDeactiveButton = "Invisible" @@ -8020,6 +8022,75 @@ +; add cart +