diff --git a/image/cart_en/additem_bd.png b/image/cart_en/additem_bd.png new file mode 100644 index 00000000..bc6a8490 Binary files /dev/null and b/image/cart_en/additem_bd.png differ diff --git a/image/cart_en/additem_bn.png b/image/cart_en/additem_bn.png new file mode 100644 index 00000000..ae896162 Binary files /dev/null and b/image/cart_en/additem_bn.png differ diff --git a/image/cart_en/additem_bp.png b/image/cart_en/additem_bp.png new file mode 100644 index 00000000..9cee212c Binary files /dev/null and b/image/cart_en/additem_bp.png differ diff --git a/image/cart_th/additem_bd.png b/image/cart_th/additem_bd.png new file mode 100644 index 00000000..4f3a2212 Binary files /dev/null and b/image/cart_th/additem_bd.png differ diff --git a/image/cart_th/additem_bn.png b/image/cart_th/additem_bn.png new file mode 100644 index 00000000..30129290 Binary files /dev/null and b/image/cart_th/additem_bn.png differ diff --git a/image/cart_th/additem_bp.png b/image/cart_th/additem_bp.png new file mode 100644 index 00000000..4f3a2212 Binary files /dev/null and b/image/cart_th/additem_bp.png differ diff --git a/image/cart_uti/cartBottom.png b/image/cart_uti/cartBottom.png new file mode 100644 index 00000000..548fb50b Binary files /dev/null and b/image/cart_uti/cartBottom.png differ diff --git a/image/cart_uti/cartTop.png b/image/cart_uti/cartTop.png new file mode 100644 index 00000000..9f0fa111 Binary files /dev/null and b/image/cart_uti/cartTop.png differ diff --git a/image/cart_uti/clear_slip_bn.png b/image/cart_uti/clear_slip_bn.png new file mode 100644 index 00000000..a3be9925 Binary files /dev/null and b/image/cart_uti/clear_slip_bn.png differ diff --git a/image/cart_uti/clear_slip_bp.png b/image/cart_uti/clear_slip_bp.png new file mode 100644 index 00000000..22888cdb Binary files /dev/null and b/image/cart_uti/clear_slip_bp.png differ diff --git a/image/cart_uti/line.png b/image/cart_uti/line.png new file mode 100644 index 00000000..064fdb09 Binary files /dev/null and b/image/cart_uti/line.png differ diff --git a/image/cart_uti/plus_slip_bd.png b/image/cart_uti/plus_slip_bd.png new file mode 100644 index 00000000..becdbe59 Binary files /dev/null and b/image/cart_uti/plus_slip_bd.png differ diff --git a/image/cart_uti/plus_slip_bn.png b/image/cart_uti/plus_slip_bn.png new file mode 100644 index 00000000..301756cf Binary files /dev/null and b/image/cart_uti/plus_slip_bn.png differ diff --git a/image/cart_uti/plus_slip_bp.png b/image/cart_uti/plus_slip_bp.png new file mode 100644 index 00000000..becdbe59 Binary files /dev/null and b/image/cart_uti/plus_slip_bp.png differ diff --git a/inc/button_topping_select_confirm_order_cart.inc b/inc/button_topping_select_confirm_order_cart.inc new file mode 100644 index 00000000..33a785c0 --- /dev/null +++ b/inc/button_topping_select_confirm_order_cart.inc @@ -0,0 +1,421 @@ + +;Var Seeker = "curr" +Var Timeout = 0 + +If showOvaltineEnable = "Press" Then + ;Var CustomOvaltineCheckState = "Press" + Var SelectToppingType = 1 +EndIf + +If showOreoAddEnable = "Press" Then + ;Var CustomOreoCheckState = "Press" + Var SelectToppingType = 1 +EndIf + +If showCocoaEnable = "Press" Then + ;Var CustomCocoaCheckState = "Press" + Var SelectToppingType = 1 +EndIf + + + DEBUGVAR PriceDrinkTmp + + ;Var Seeker.PriceDrink = PriceDrinkTmp + + Var PriceDrink = PriceDrinkTmp + + SAVELOG "USER press next ( topping ) - newwwwww CART" + + If CustomSweetState[0] = "PressForever" Then + If ShiftSugarStep = 1 Then + Var topping1 = toppingID1index1 + EndIf + EndIf + + If CustomSweetState[1] = "PressForever" Then + If ShiftSugarStep = 1 Then + Var topping1 = toppingID1index2 + EndIf + If ShiftSugarStep = 2 Then + Var topping1 = toppingID1index1 + EndIf + + EndIf + + If CustomSweetState[2] = "PressForever" Then + If ShiftSugarStep = 1 Then + Var topping1 = toppingID1index3 + EndIf + If ShiftSugarStep = 2 Then + Var topping1 = toppingID1index2 + EndIf + If ShiftSugarStep = 3 Then + Var topping1 = toppingID1index1 + EndIf + + EndIf + + If CustomSweetState[2] = "PressForever" Then + If ShiftSugarStep = 1 Then + Var topping1 = toppingID1index3 + EndIf + If ShiftSugarStep = 2 Then + Var topping1 = toppingID1index2 + EndIf + If ShiftSugarStep = 3 Then + Var topping1 = toppingID1index1 + EndIf + + EndIf + + If CustomMilkState[0] = "PressForever" Then + Var topping11 = toppingID11index1 + EndIf + If CustomMilkState[1] = "PressForever" Then + Var topping11 = toppingID11index2 + EndIf + If CustomMilkState[2] = "PressForever" Then + Var topping11 = toppingID11index3 + EndIf + + + + + + + If showShotSodaEnable = "Enable" Then + If showShotNormalSoda = "Press" Then + Var topping13 = toppingID13index1 + EndIf + + If showShotEnableSoda = "Press" Then + Var topping13 = toppingID13index2 + Else + Var topping13 = toppingID13index1 + EndIf + Else + Var topping13 = 0 + EndIf + + + If showEnergyEnable = "Enable" Then + If CustomEnergyState[0] = "Press" Then + Var topping12 = toppingID12index2 + Else + If CustomEnergyState[1] = "Press" Then + + Else + Var topping12 = toppingID12index1 + EndIf + EndIf + + If CustomEnergyState[1] = "Press" Then + Var topping12 = toppingID12index3 + Else + If CustomEnergyState[0] = "Press" Then + + Else + Var topping12 = toppingID12index1 + EndIf + EndIf + Else + Var topping12 = 0 + EndIf + DEBUGVAR topping12 + DEBUGVAR toppingID12index1 + DEBUGVAR toppingID12index2 + + If CustomSweetState[3] = "PressForever" Then + If ShiftSugarStep = 1 Then + Var topping1 = toppingID1index4 + EndIf + If ShiftSugarStep = 2 Then + Var topping1 = toppingID1index3 + EndIf + If ShiftSugarStep = 3 Then + Var topping1 = toppingID1index2 + EndIf + + EndIf + + If CustomSweetState[4] = "PressForever" Then + If ShiftSugarStep = 1 Then + Var topping1 = toppingID1index5 + EndIf + If ShiftSugarStep = 2 Then + Var topping1 = toppingID1index4 + EndIf + If ShiftSugarStep = 3 Then + Var topping1 = toppingID1index3 + EndIf + + EndIf + + If showCustomCoffee = "Enable" Then + If showCoffeeWater = "Enable" Then + If CustomCoffeeWaterState[0] = "PressForever" Then + Var topping7 = toppingID7index1 + EndIf + If CustomCoffeeWaterState[1] = "PressForever" Then + Var topping7 = toppingID7index2 + EndIf + If CustomCoffeeWaterState[2] = "PressForever" Then + Var topping7 = toppingID7index3 + EndIf + If CustomCoffeeWaterState[3] = "PressForever" Then + Var topping7 = toppingID7index4 + EndIf + If CustomCoffeeWaterState[4] = "PressForever" Then + Var topping7 = toppingID7index5 + EndIf + Else + Var topping7 = 0 + EndIf + + If showCoffeeQuantity = "Enable" Then + If CustomCoffeeQuantityState[0] = "PressForever" Then + Var topping2 = toppingID2index1 + EndIf + If CustomCoffeeQuantityState[1] = "PressForever" Then + Var topping2 = toppingID2index2 + EndIf + If CustomCoffeeQuantityState[2] = "PressForever" Then + Var topping2 = toppingID2index3 + EndIf + Else + If toppingID2index3 = "" Then + Else + Var topping2 = 0 + EndIf + EndIf + + If showCoffeeLevel = "Enable" Then + If CustomCoffeeLevelState[0] = "PressForever" Then + Var topping9 = toppingID9index1 + EndIf + If CustomCoffeeLevelState[1] = "PressForever" Then + Var topping9 = toppingID9index2 + EndIf + If CustomCoffeeLevelState[2] = "PressForever" Then + Var topping9 = toppingID9index3 + EndIf + If CustomCoffeeLevelState[3] = "PressForever" Then + Var topping9 = toppingID9index4 + EndIf + Else + Var topping9 = 0 + EndIf + + If showCoffeeTamping = "Enable" Then + If CustomCoffeeTampingState[0] = "PressForever" Then + Var topping8 = toppingID8index1 + EndIf + If CustomCoffeeTampingState[1] = "PressForever" Then + Var topping8 = toppingID8index2 + EndIf + If CustomCoffeeTampingState[2] = "PressForever" Then + Var topping8 = toppingID8index3 + EndIf + Else + Var topping8 = 0 + EndIf + Else + If toppingID2index3 = "" Then + Else + Var topping2 = 0 + EndIf + Var topping7 = 0 + Var topping8 = 0 + Var topping9 = 0 + Var topping10 = 0 + EndIf + + ; Post Topping + DEBUGVAR SugarZeroCalEnable + DEBUGVAR SugarZeroCalCheck + If SugarZeroCalEnable = "true" Then + Var sugarToppingID = 1000 + If SugarZeroCalCheck = "PressForever" Then + Var sugarToppingID = 1001 + Else + Var sugarToppingID = 1000 + EndIf + EndIf + + DEBUGVAR sugarToppingID + + If Seeker = "next" Then + SAVELOG "NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT " + EndIf + + Var Seeker.topping1 = topping1 + Var Seeker.topping2 = topping2 + Var Seeker.topping3 = topping3 + Var Seeker.topping6 = topping6 + Var Seeker.topping7 = topping7 + Var Seeker.topping8 = topping8 + Var Seeker.topping9 = topping9 + Var Seeker.topping10 = topping10 + Var Seeker.topping11 = topping11 + Var Seeker.topping12 = topping12 + Var Seeker.topping13 = topping13 + + Var Seeker.PostTopping1 = sugarToppingID + + Var Seeker.get_a_straw = StrawState + Var Seeker.get_a_lid = LidState + + Var Seeker.strMulti6_1 = strMulti6_1 + Var Seeker.strMulti6_2 = strMulti6_2 + Var Seeker.strMulti6_3 = strMulti6_3 + Var Seeker.strMulti6_4 = strMulti6_4 + Var Seeker.strMulti6_5 = strMulti6_5 + Var Seeker.strMulti6_6 = strMulti6_6 + + + + DEBUGVAR Seeker.topping1 + DEBUGVAR Seeker.topping2 + DEBUGVAR Seeker.topping3 + DEBUGVAR Seeker.topping6 + DEBUGVAR Seeker.topping7 + DEBUGVAR Seeker.topping8 + DEBUGVAR Seeker.topping9 + DEBUGVAR Seeker.topping10 + DEBUGVAR Seeker.topping11 + DEBUGVAR Seeker.topping12 + DEBUGVAR Seeker.topping13 + DEBUGVAR Seeker.get_a_straw + DEBUGVAR Seeker.get_a_lid + + DEBUGVAR Seeker.strMulti6_1 + DEBUGVAR Seeker.strMulti6_2 + DEBUGVAR Seeker.strMulti6_3 + DEBUGVAR Seeker.strMulti6_4 + DEBUGVAR Seeker.strMulti6_5 + + DEBUGVAR LidState + DEBUGVAR StrawState + DEBUGVAR UserSelectProductCode + + + If StrawState = "Press" Then + Machine StrawOrder + EndIf + + If LidState = "Press" Then + Machine LidOrder + Var LedLidBlink = "true" + Var bg_lidProblem_ST = "Enable" + Else + If LidState = "Disable" Then + Var bg_lidProblem_ST = "Disable" + Else + Var bg_lidProblem_ST = "Invisible" + EndIf + EndIf + + If SelectDrinkType = 0 Then + + Else + Var StrawState = "Enable" + Var LidState = "Enable" + EndIf + ; + + + DEBUGVAR PromotionIDCurrentOrder + + + Var SelectDrink = UserSelectProductCode + + Var Seeker.selected_a_drink = UserSelectProductCode + DEBUGVAR Seeker.selected_a_drink + + + DEBUGVAR Seeker + DEBUGVAR Seeker.ExtendData + + Var Seeker.PictureDrink = PictureDrink + Var Seeker.showname = showname + + DEBUGVAR MenuCautionImageStage0 + DEBUGVAR CustomerFilterEnable + DEBUGVAR CustomerFilterType + + +GetLongTimeInMinute LastTimeClickOrder + + + If UserSelectProductCode = "-" Then + + Else + + + If SelectDrinkType = 1 Then + ; Move to MenuReady + ;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" + ;Open "ROOT/taobin_project/xml/page_payment.xml" + EndIf + EndIf + + DEBUGVAR SelectToppingType + If SelectDrinkType = 0 Then + Var high_light_drink_type = "Enable" + Else + If SelectToppingType = 0 Then + If blend_button_state = "PressForever" Then + Var toppingSelectState = "Enable" + If toppingSelectState = "Enable" Then + + + + + Var PopupToppingSelect = "Enable" + + + If toppingID6index2 = 321 Then + If toppingID6index2Status = "Enable" Then + Var CustomOreoCheckState = "Enable" + Var CustomOreoState = "Enable" + Else + Var CustomOreoCheckState = "Disable" + Var CustomOreoState = "Enable" + EndIf + Else + Var CustomOreoCheckState = "Invisible" + EndIf + + If toppingID6index3 = 322 Then + If toppingID6index3Status = "Enable" Then + Var CustomCocoaCheckState = "Enable" + Var CustomCocoaState = "Enable" + Else + Var CustomCocoaCheckState = "Disable" + Var CustomCocoaState = "Enable" + EndIf + Else + Var CustomCocoaCheckState = "Invisible" + EndIf + + If toppingID6index4 = 323 Then + If toppingID6index4Status = "Enable" Then + Var CustomOvaltineCheckState = "Enable" + Var CustomOvaltineState = "Enable" + Else + Var CustomOvaltineCheckState = "Disable" + Var CustomOvaltineState = "Enable" + EndIf + Else + Var CustomOvaltineCheckState = "Invisible" + EndIf + EndIf + EndIf + EndIf + EndIf + + + + + +Var LastTimeClickOrder = 0 diff --git a/xml/page_payment_cashMore.xml b/xml/page_payment_cashMore.xml index a6f7eb85..d11f0504 100644 --- a/xml/page_payment_cashMore.xml +++ b/xml/page_payment_cashMore.xml @@ -235,7 +235,7 @@ Var Seeker.FreeVendingCampaign = 1 CoinVending OFF MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" + ;Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf @@ -415,8 +415,21 @@ Else Var PayState5 = "Disable" EndIf + + If CART_COUNT >= 1 Then + Var cart1_pic = "ROOT/taobin_project/image/page_drink/" + carttaobin1_pic + Var cart1_name = carttaobin1_name + Var cart1_price = "" + CART1_PRICE + Var cart1_en = "Enable" + Var PriceDrinkMulti = CART1_PRICE + + Var cardBottomY = 760 + Var lineBottomY = 750 + Var subtotalBottomY = 810 + + EndIf @@ -452,7 +465,7 @@ Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" Var BrewingTextThai = "เตรียมแก้ว" Cart "MakeID" CART_INDEX - Open "ROOT/taobin_project/xml/page_thankyou.xml" + ;Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf @@ -622,7 +635,7 @@ If TestLoopMakeDrink = 1 Then MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" + ;Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf @@ -656,7 +669,7 @@ Var PayReference = "" GenHashWithTimeStamp PayReference Cart "MakeID" CART_INDEX - Open "ROOT/taobin_project/xml/page_thankyou.xml" + ;Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf @@ -984,10 +997,9 @@ Var PriceDrinkMulti = 0 - If CART_COUNT >= 1 Then - Var cart1_pic = "ROOT/taobin_project/image/page_drink/" + CART1_PICTURE - Var cart1_name = CART1_NAME_THAI + Var cart1_pic = "ROOT/taobin_project/image/page_drink/" + carttaobin1_pic + Var cart1_name = carttaobin1_name Var cart1_price = "" + CART1_PRICE Var cart1_en = "Enable" @@ -1239,7 +1251,7 @@ Var MachineStage = "make-drink" Var BrewingTextThai = "เตรียมแก้ว" MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" + ;Open "ROOT/taobin_project/xml/page_thankyou.xml" ;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate EndIf @@ -2344,7 +2356,7 @@ ; make drink MakeDrinkV1 SelectDrink Seeker.ExtendData - Open "ROOT/taobin_project/xml/page_thankyou.xml" + ;Open "ROOT/taobin_project/xml/page_thankyou.xml" ;Var UnitTestType = "1" Var UnitTestType = "2"