diff --git a/animation01/play_list.tsv b/animation01/play_list.tsv
index 6405f287..2a5363b4 100644
--- a/animation01/play_list.tsv
+++ b/animation01/play_list.tsv
@@ -1350,3 +1350,10 @@ Macallan Lumina Mizuwari 11-99-05-0055 1 27 28 24 100 7:40 32
เป๊ปซี่ทรอปิคอล 12-05-02-0148 1 14 34 62 23 24 100 7:40 32
เป๊ปซี่มะนาว 12-05-02-0149 1 14 13 12 23 24 100 7:40 32
เป๊ปซี่คาราเมล 12-05-02-0150 1 14 13 22 23 24 100 7:40 32
+
+มัทฉะลาเต้พรีเมียมร้อน 12-02-01-0103 1 8 9 70 24 100 7:40 32
+มัทฉะลาเต้พรีเมียมเย็น 12-02-02-0103 1 8 9 70 23 24 100 7:40 32
+มัทฉะลาเต้พรีเมียมปั่น 12-02-03-0103 1 8 9 70 23 41 24 100 7:40 32
+มัทฉะลาเต้ คูณ 3 ร้อน 12-02-01-0104 1 8 9 70 24 100 7:40 32
+มัทฉะลาเต้ คูณ 3 เย็น 12-02-02-0104 1 8 9 70 23 24 100 7:40 32
+มัทฉะลาเต้ คูณ 3 ปั่น 12-02-03-0104 1 8 9 70 23 41 24 100 7:40 32
diff --git a/image/smoothie/proccess/bp_main_button.png b/image/smoothie/proccess/bp_main_button.png
index b58894b9..4ea2dbf5 100644
Binary files a/image/smoothie/proccess/bp_main_button.png and b/image/smoothie/proccess/bp_main_button.png differ
diff --git a/inc/button_next.inc b/inc/button_next.inc
deleted file mode 100644
index 8d945402..00000000
--- a/inc/button_next.inc
+++ /dev/null
@@ -1,409 +0,0 @@
-
-
- ;Var Seeker = "curr"
- Var Timeout = 0
-
- Var StatementCheckMenu = "ProductCodeCheck=" + UserSelectProductCode
-
- __CMD "statement" 0 StatementCheckMenu "-"
-
-
- DEBUGVAR PriceDrinkTmp
-
- ;Var Seeker.PriceDrink = PriceDrinkTmp
-
- Var PriceDrink = PriceDrinkTmp
-
- SAVELOG "USER press next ( topping ) - new"
-
- 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 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
- If SugarZeroCalEnable = "true" Then
- Var sugarToppingID = 1000
- If SugarZeroCalCheck = "PressForever" Then
- Var sugarToppingID = 1001
- Else
- Var sugarToppingID = 1000
- EndIf
- EndIf
-
-
-
- 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
-
-
- 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 LidState
- DEBUGVAR StrawState
- DEBUGVAR UserSelectProductCode
-
-
- If StrawState = "Press" Then
- Machine StrawOrder
- Var LedLidBlink = "true"
- 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
- ;
-
- 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 PromotionIDCurrentOrder
-
-
- Var SelectDrink = UserSelectProductCode
-
- Var Seeker.selected_a_drink = UserSelectProductCode
- DEBUGVAR Seeker.selected_a_drink
-
- ; Set drink
-
- If Seeker = "curr" Then
-
- ;include="ROOT/taobin_project/inc/select_drink_current.inc"
-
- If SelectToppingType = 0 Then
-
- Else
- Topping "Select" UserSelectProductCode
-
- Topping "ClearMultiTopping" "Test 4"
-
- Topping "Multiply6-ID" strMulti6_1
- Topping "Multiply6-ID" strMulti6_2
- Topping "Multiply6-ID" strMulti6_3
- Topping "Multiply6-ID" strMulti6_5
- Topping "Multiply6-ID" strMulti6_6
-
- Topping "Pack" ExtendDataCurr
- EndIf
-
- Else
- Topping "SetNextOrder" UserSelectProductCode
-
-
- Topping "__select" UserSelectProductCode
- ; Set option toppinng and pack
- Topping "__select1-id" topping1
- Topping "__select2-id" topping2
- Topping "__select3-id" topping3
- Topping "__select6-id" topping6
- Topping "__select7-id" topping7
- Topping "__select8-id" topping8
- Topping "__select9-id" topping9
- Topping "__select10-id" topping10
- Topping "__select11-id" topping11
- Topping "__select12-id" topping12
- Topping "__select13-id" topping13
-
- Topping "__posttopping1-ID" sugarToppingID
- ; Pack
- Topping "__pack" ExtendDataNext
-
- Var NextUserSelectDrinkFromPaid = UserSelectProductCode
- Var NextUserSelecttopping1Paid = topping1
- Var NextUserSelecttopping2Paid = topping2
- Var NextUserSelecttopping3Paid = topping3
- Var NextUserSelecttopping6Paid = topping6
- Var NextUserSelecttopping7Paid = topping7
- Var NextUserSelecttopping8Paid = topping8
- Var NextUserSelecttopping9Paid = topping9
- Var NextUserSelecttopping10Paid = topping10
- Var NextUserSelecttopping11Paid = topping11
- Var NextUserSelecttopping12Paid = topping12
- Var NextUserSelecttopping13Paid = topping13
-
-
- EndIf
-
- DEBUGVAR Seeker
- DEBUGVAR Seeker.ExtendData
-
- Var Seeker.PictureDrink = PictureDrink
- Var Seeker.showname = showname
-
- DEBUGVAR MenuCautionImageStage0
- DEBUGVAR CustomerFilterEnable
- DEBUGVAR CustomerFilterType
-
-
- GetLongTimeInMinute LastTimeClickOrder
-
- If CART_COUNT = 0 Then
- 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 CustomOreoState = "Enable"
- Var CustomOvaltineState = "Enable"
- Var CustomCocoaState = "Enable"
-
- Var PopupToppingSelect = "Enable"
-
-
- Var CustomOreoCheckState = "Enable"
- Var CustomOvaltineCheckState = "Enable"
- Var CustomCocoaCheckState = "Enable"
- EndIf
- EndIf
- EndIf
- EndIf
-
- Else
-
- If CART1_STATUS = "EMPTY" Then
- Cart "AddMenuID" 1
- Else
- If CART2_STATUS = "EMPTY" Then
- Cart "AddMenuID" 2
- Else
- If CART3_STATUS = "EMPTY" Then
- Cart "AddMenuID" 3
- EndIf
- EndIf
- EndIf
-
- Var CartUpdate = "true"
- Var ButtonNext = "true"
-
- EndIf
-
-
-
- Var LastTimeClickOrder = 0
diff --git a/inc/select_drink_current.inc b/inc/select_drink_current.inc
index 42be13d3..f830aeeb 100644
--- a/inc/select_drink_current.inc
+++ b/inc/select_drink_current.inc
@@ -22,7 +22,8 @@
Topping "PostTopping1-ID" Seeker.PostTopping1
; Pack
Topping "Pack" ExtendDataCurr
-
+ Var Seeker.orderFromNewTopping = 0
+
If SaveOrderNameAndPictureEnable = 1 Then
Menu "set-name" Seeker.showname
Menu "set-image" Seeker.PictureDrink
diff --git a/inc/select_drink_current_multi_topping.inc b/inc/select_drink_current_multi_topping.inc
index e9e66dd5..5d15e054 100644
--- a/inc/select_drink_current_multi_topping.inc
+++ b/inc/select_drink_current_multi_topping.inc
@@ -23,14 +23,18 @@
Topping "ClearMultiTopping" "Current"
+
+ DEBUGVAR Seeker.orderFromNewTopping
+
+ If Seeker.orderFromNewTopping = 1 Then
+ Var Seeker.orderFromNewTopping = 0
+ Topping "Multiply6-ID" Seeker.strMulti6_5
+ Topping "Multiply6-ID" Seeker.strMulti6_6
- Topping "Multiply6-ID" Seeker.strMulti6_5
- Topping "Multiply6-ID" Seeker.strMulti6_6
-
- Topping "Multiply6-ID" Seeker.strMulti6_1
- Topping "Multiply6-ID" Seeker.strMulti6_2
- Topping "Multiply6-ID" Seeker.strMulti6_3
-
+ Topping "Multiply6-ID" Seeker.strMulti6_1
+ Topping "Multiply6-ID" Seeker.strMulti6_2
+ Topping "Multiply6-ID" Seeker.strMulti6_3
+ EndIf
Topping "Pack" ExtendDataCurr
diff --git a/inter/tha/animation01/play_list.tsv b/inter/tha/animation01/play_list.tsv
index 6405f287..2a5363b4 100644
--- a/inter/tha/animation01/play_list.tsv
+++ b/inter/tha/animation01/play_list.tsv
@@ -1350,3 +1350,10 @@ Macallan Lumina Mizuwari 11-99-05-0055 1 27 28 24 100 7:40 32
เป๊ปซี่ทรอปิคอล 12-05-02-0148 1 14 34 62 23 24 100 7:40 32
เป๊ปซี่มะนาว 12-05-02-0149 1 14 13 12 23 24 100 7:40 32
เป๊ปซี่คาราเมล 12-05-02-0150 1 14 13 22 23 24 100 7:40 32
+
+มัทฉะลาเต้พรีเมียมร้อน 12-02-01-0103 1 8 9 70 24 100 7:40 32
+มัทฉะลาเต้พรีเมียมเย็น 12-02-02-0103 1 8 9 70 23 24 100 7:40 32
+มัทฉะลาเต้พรีเมียมปั่น 12-02-03-0103 1 8 9 70 23 41 24 100 7:40 32
+มัทฉะลาเต้ คูณ 3 ร้อน 12-02-01-0104 1 8 9 70 24 100 7:40 32
+มัทฉะลาเต้ คูณ 3 เย็น 12-02-02-0104 1 8 9 70 23 24 100 7:40 32
+มัทฉะลาเต้ คูณ 3 ปั่น 12-02-03-0104 1 8 9 70 23 41 24 100 7:40 32
diff --git a/inter/tha/menu/lang.tsv b/inter/tha/menu/lang.tsv
index 7dfca37f..420f6d01 100644
--- a/inter/tha/menu/lang.tsv
+++ b/inter/tha/menu/lang.tsv
@@ -159,9 +159,9 @@
000123 Cocoa X2 โกโก้ X2 可可 X2
000124 Cocoa X3 โกโก้ X3 可可 X3
000125 Cocoa X10 โกโก้ X10 可可 X10
-000126 Light Milk ไลท์ 低脂牛奶
-000127 Normal ปกติ 全脂牛奶
-000128 Condensed milk [(+5฿)###Font=KanitLight,Size=13] ข้นมัน [(+5฿)###Font=KanitLight,Size=13] 甜炼乳
+000126 Light Milk ไลท์ 低脂牛奶 နို့နည်း
+000127 Normal ปกติ 全脂牛奶 ပုံမှန်
+000128 Rich ข้นมัน 甜炼乳 နို့ပြည့်
000129 Ovaltine X2 โอวัลติน X2 阿华田 X2 Ovaltine X2
000130 Ovaltine X3 โอวัลติน X3 阿华田 X3 Ovaltine X3
000131 Ovaltine X10 โอวัลติน X10 阿华田 X10 Ovaltine X10
@@ -214,13 +214,21 @@
Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center Font=Kanit,Type=Light,Size=64,Color=0x513C2F,Align=Center Font=Kanit,Type=Medium,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center
-001201 blended fruit ผลไม้ปั่น
- Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center Font=Kanit,Type=Light,Size=64,Color=0x513C2F,Align=Center Font=Kanit,Type=Medium,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center
+001201 blended fruit ผลไม้ปั่น blended fruit blended fruit blended fruit
+
+ Font=Montserrat,Type=Bold,Size=64,Color=0xFFFFFF,Align=Center Font=Kanit,Type=Light,Size=64,Color=0xFFFFFF,Align=Center Font=Kanit,Type=Medium,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center
001202 Press to open the door กดเพื่อเปิดประตู
001203 Checking Cup ตรวจสอบแก้ว
- Font=Kanit,Type=Regular,Size=36,Color=0x746253,Align=Center Font=Kanit,Type=Regular,Size=36,Color=0x746253,Align=Center Font=Kanit,Type=Regular,Size=36,Color=0x746253,Align=Center Font=Kanit,Type=Regular,Size=36,Color=0x746253,Align=Center Font=Kanit,Type=Regular,Size=36,Color=0x746254,Align=Center
+001204 Insert cup ใส่แก้วไว้ที่ฐานแก้ว
+001205 Closing the door กำลังปิดประตู
+001206 Blend now ดำเนินการปั่นผลไม้
+
+
+
+
+ Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF,Align=Center Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF,Align=Center Font=Kanit,Type=Regular,Size=36,Color=0x746253,Align=Center Font=Kanit,Type=Regular,Size=36,Color=0x746253,Align=Center Font=Kanit,Type=Regular,Size=36,Color=0x746254,Align=Center
Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF,Align=Center Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF,Align=Center Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF,Align=Center Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF,Align=Center Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF,Align=Center
-001204 Cancel ยกเลิก 取消 Cancel ပယ်ပါ
+001210 Cancel ยกเลิก 取消 Cancel ပယ်ပါ
@@ -258,36 +266,36 @@
002005 Reward Points / Top up credit เติมเงินเข้าเครดิต / เช็คคูปองสะสม 账户充值 / 奖励积分 ဆုအမှတ်များ / ငွေဖြည့်ခရက်ဒစ်
New Topping
Font=Kanit,Type=Medium,Size=36,Color=0xEE8C62,LineHeight=46 Font=Kanit,Type=Medium,Size=36,Color=0xEE8C62,LineHeight=46 Font=Kanit,Type=Medium,Size=36,Color=0xEE8C62,LineHeight=46
-002020 Adjust Recipe ปรับสูตร 调整配方
-002021 Add up an extra yummy topping [(max 2)###Font=KanitLight,Size=13] เพิ่มส่วนผสมพิเศษ [(เลือกสูงสุด 2 ข้อ)###Font=KanitLight,Size=13] 添加额外美味配料 [(最多可选 2 项)###Font=KanitLight,Size=13]
-002022 D.I.Y. your cup, your style [(max 1)###Font=KanitLight,Size=13] เพิ่่มไซรัปฉ่ำๆ D.I.Y ความอร่อยได้เลย [(เลือกสูงสุด 1 ข้อ)###Font=KanitLight,Size=13] 自定义你的杯子,你的风格 [(最多可选 1 项)###Font=KanitLight,Size=13]
+002020 Adjust Recipe ปรับสูตร 调整配方 အရသာ ပြင်မယ်
+002021 Add up an extra yummy topping [(max 2)###Font=KanitLight,Size=20] เพิ่มส่วนผสมพิเศษ [(เลือกสูงสุด 2 ข้อ)###Font=KanitLight,Size=20] 添加额外美味配料 [(最多可选 2 项)###Font=KanitLight,Size=20] အရသာရှိတဲ့ ထပ်ထည့်မှု[(၂ မျိုး များဆုံး)###Font=KanitLight,Size=20]
+002022 D.I.Y. your cup, your style [(max 1)###Font=KanitLight,Size=20] เพิ่่มไซรัปฉ่ำๆ D.I.Y ความอร่อยได้เลย [(เลือกสูงสุด 1 ข้อ)###Font=KanitLight,Size=20] 自定义你的杯子,你的风格 [(最多可选 1 项)###Font=KanitLight,Size=20] ကိုယ်ပိုင်စတိုင်နဲ့ ခွက်လုပ်ပါ[(အများဆုံး ၁ အချက်)###Font=KanitLight,Size=20]
Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46 Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46 Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46 Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46
-002029 Sugar type ประเภทน้ำตาล 糖类选择
-002030 Sweetness ความหวาน 甜度
-002031 Espresso Shot เอสเพรสโซ่ช็อต 浓缩咖啡份数
-002032 Milk Intensity ความเข้มข้นของนม 牛奶浓度
-002033 Cocoa Intensity ความข้นของโกโก้ 可可浓度
-002034 Ovaltine Intensity ความข้นของโอวัลติน 阿华田浓度
-002035 Energy Shot เอเนอร์จี้ช็อต 能量饮品添加
-002036 Jemila Collagen 2000mg\n[Japanese & Danish ingredients for healthy skin.###Font=KanitLight,Size=15] Jemila Collagen 2000mg\n[ผิวสุขภาพดีด้วยสารสกัดจาก 3 ประเทศ ได้แก่ คอลลาเจน จากญี่ปุ่น และ ผงมะเขือเทศจากเดนมาร์ก ###Font=KanitLight,Size=15] Jemila 胶原蛋白 2000mg\n[日本 & 丹麦原料,呵护健康肌肤。###Font=KanitLight,Size=15]
-002037 Oreo Volcano Topping\n[The perfect blend of cookie and cream.###Font=KanitLight,Size=15] ท็อปปิ้งโอริโอภูเขาไฟ\n[บิด ชิมครีม จุ่มนมในคำเดียว ไม่ลองไม่ได้แล้ว!###Font=KanitLight,Size=15] 奥利奥火山配料\n[曲奇与奶油的完美融合。###Font=KanitLight,Size=15]
-002038 Ovaltine Volcano Topping\n[Crunchy Ovaltine goodness in every sip.###Font=KanitLight,Size=15] ท็อปปิ้งโอวัลตินภูเขาไฟ\n[อร่อย กรุบกรอบ ได้รสชาติโอวัลตินแบบเต็ม ๆ คำ###Font=KanitLight,Size=15] 阿华田火山配料\n[每一口都充满香脆阿华田美味。###Font=KanitLight,Size=15]
-002039 Cocoa Volcano Topping\n[The perfect blend of cocoa###Font=KanitLight,Size=15] ท็อปปิ้งโกโก้ภูเขาไฟ\n[ระเบิดความเข้ม อร่อยเต็มคำกับภูเขาไฟโกโก้###Font=KanitLight,Size=15] 可可火山配料\n[可可的完美融合。###Font=KanitLight,Size=15]
-002040 Strawberry syrup\n[Sweet and tart strawberry syrup! A must-have for berry lovers.###Font=KanitLight,Size=15] เพิ่มสตรอว์เบอรี่ไซรัป\n[เปรี้ยวนิด ๆ หวานหน่อย ๆ ตอบโจทย์สายสตรอว์เบอร์รี่เลิฟเวอร์###Font=KanitLight,Size=15] 草莓糖浆\n[酸甜可口的草莓糖浆!莓果爱好者必试!###Font=KanitLight,Size=15]
-002041 Yuzu syrup\n[Discover the bright and tangy taste of our yuzu syrup.###Font=KanitLight,Size=15] เพิ่มยูซุไซรัป\n[กลิ่นหอม รสชาติที่สดชื่น เปรี้ยวหวานลงตัวใส่กับเมนูไหนก็เข้ากัน###Font=KanitLight,Size=15] 柚子糖浆\n[感受柚子糖浆的清新酸甜风味。###Font=KanitLight,Size=15]
+002029 Sugar type ประเภทน้ำตาล 糖类选择 သကြား အမျိုးအစား
+002030 Sweetness ความหวาน 甜度 အချိုချင်း
+002031 Espresso Shot เอสเพรสโซ่ช็อต 浓缩咖啡份数 အီစပရိုဆို ရိုက်ခြင်း
+002032 Milk Intensity ความเข้มข้นของนม 牛奶浓度 နို့ပေါ် အင်တင်စတီ
+002033 Cocoa Intensity ความข้นของโกโก้ 可可浓度 ကိုကိုအင်တင်စတီ
+002034 Ovaltine Intensity ความข้นของโอวัลติน 阿华田浓度 အော်ဗယ်တင်း အင်တင်စတီ
+002035 Energy Shot เอเนอร์จี้ช็อต 能量饮品添加 စွမ်းအင် ရိုက်ခြင်း
+002036 Jemila Collagen 2000mg\n[Japanese & Danish ingredients for healthy skin.###Font=KanitLight,Size=15] Jemila Collagen 2000mg\n[ผิวสุขภาพดีด้วยสารสกัดจาก 3 ประเทศ ได้แก่ คอลลาเจน จากญี่ปุ่น และ ผงมะเขือเทศจากเดนมาร์ก ###Font=KanitLight,Size=15] Jemila 胶原蛋白 2000mg\n[日本 & 丹麦原料,呵护健康肌肤。###Font=KanitLight,Size=15] Jemila ကော်လာဂျင် 2000mg\n[ဂျပန်နှင့်ဒန်မတ်ပါဝင်သော ပြန်ရန် ကျန်းမာသော အသားအရည်###Font=KanitLight,Size=15]
+002037 Oreo Volcano Topping\n[The perfect blend of cookie and cream.###Font=KanitLight,Size=15] ท็อปปิ้งโอริโอภูเขาไฟ\n[บิด ชิมครีม จุ่มนมในคำเดียว ไม่ลองไม่ได้แล้ว!###Font=KanitLight,Size=15] 奥利奥火山配料\n[曲奇与奶油的完美融合。###Font=KanitLight,Size=15] အော်ရီယို ဗော်ကာနို တိုပပင်၊\n[ကောက်ကီနှင့် ကရိမ်တို့၏ အပြည့်အစုံပေါင်းစပ်မှု###Font=KanitLight,Size=15]
+002038 Ovaltine Volcano Topping\n[Crunchy Ovaltine goodness in every sip.###Font=KanitLight,Size=15] ท็อปปิ้งโอวัลตินภูเขาไฟ\n[อร่อย กรุบกรอบ ได้รสชาติโอวัลตินแบบเต็ม ๆ คำ###Font=KanitLight,Size=15] 阿华田火山配料\n[每一口都充满香脆阿华田美味。###Font=KanitLight,Size=15] အော်ဗယ်တင်း ဗော်ကာနို တိုပပင်၊\n[အချိုလေးကြဲသော အော်ဗယ်တင်းအရသာကို လုံးဝခံစားနိုင်ပါသည်###Font=KanitLight,Size=15]
+002039 Cocoa Volcano Topping\n[The perfect blend of cocoa###Font=KanitLight,Size=15] ท็อปปิ้งโกโก้ภูเขาไฟ\n[ระเบิดความเข้ม อร่อยเต็มคำกับภูเขาไฟโกโก้###Font=KanitLight,Size=15] 可可火山配料\n[可可的完美融合。###Font=KanitLight,Size=15] ကိုကို ဗော်ကာနို တိုပပင်၊\n[ကိုကိုအရသာနှင့် အပြည့်အစုံပေါင်းစပ်မှု###Font=KanitLight,Size=15]
+002040 Strawberry syrup\n[Sweet and tart strawberry syrup! A must-have for berry lovers.###Font=KanitLight,Size=15] เพิ่มสตรอว์เบอรี่ไซรัป\n[เปรี้ยวนิด ๆ หวานหน่อย ๆ ตอบโจทย์สายสตรอว์เบอร์รี่เลิฟเวอร์###Font=KanitLight,Size=15] 草莓糖浆\n[酸甜可口的草莓糖浆!莓果爱好者必试!###Font=KanitLight,Size=15] စတောဘဲရီဆီရပ်၊\n[ချိုမြိန်နှင့် တင်းမာသောအရသာ။###Font=KanitLight,Size=15]
+002041 Yuzu syrup\n[Discover the bright and tangy taste of our yuzu syrup.###Font=KanitLight,Size=15] เพิ่มยูซุไซรัป\n[กลิ่นหอม รสชาติที่สดชื่น เปรี้ยวหวานลงตัวใส่กับเมนูไหนก็เข้ากัน###Font=KanitLight,Size=15] 柚子糖浆\n[感受柚子糖浆的清新酸甜风味。###Font=KanitLight,Size=15] ရူးဇူးဆီရပ်၊\n[ကျွန်ုပ်တို့၏ ရူးဇူးဆီရပ်၏ အသက်သွင်းသော အရသာကို ရှာဖွေပါ။###Font=KanitLight,Size=15]
Topping new
Topping top
Font=Kanit,Type=Bold,Size=36,Color=0x513C2F,LineHeight=46 Font=Kanit,Type=Bold,Size=36,Color=0x513C2F,LineHeight=46 Font=Kanit,Type=Bold,Size=36,Color=0x513C2F,LineHeight=46 Font=Kanit,Type=Bold,Size=36,Color=0x513C2F,LineHeight=46
-002042 Make it extra special เพิ่มความอร่อยหน่อยไหม
+002042 Make it extra special เพิ่มความอร่อยหน่อยไหม 讓它變得更加特別 ပိုပြီးထူးခြားအောင်လုပ်ပါ။
Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46 Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46 Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46 Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46
-002043 Oreo Topping\n[Cookie Bliss!###Font=KanitLight,Size=15] ท็อปปิ้งโอริโอภูเขาไฟ\n[(กรุบกรอบเคี้ยวเพลิน)###Font=KanitLight,Size=15]
-002044 Ovaltine Topping\n[Malt Madness!###Font=KanitLight,Size=15] ท็อปปิ้งโอวัลตินภูเขาไฟ\n[(ฟินจริง ๆ ท้าให้ลอง)###Font=KanitLight,Size=15]
-002045 Cocoa Topping\n[Rich & Decadent!###Font=KanitLight,Size=15] ท็อปปิ้งโกโก้ภูเขาไฟ\n[(ระเบิดความเข้ม อร่อยเต็มคำกับภูเขาไฟโกโก้)###Font=KanitLight,Size=15]
+002043 Oreo Topping\n[Cookie Bliss!###Font=KanitLight,Size=15] ท็อปปิ้งโอริโอภูเขาไฟ\n[(กรุบกรอบเคี้ยวเพลิน)###Font=KanitLight,Size=15] Oreo 配料\n[酥脆美味!###Font=KanitLight,Size=15] Oreo ထပ်ထည့်မှု၊\n[ကူကီးအရသာကို စိတ်ကြွနေစေမယ်!###Font=KanitLight,Size=15]
+002044 Ovaltine Topping\n[Malt Madness!###Font=KanitLight,Size=15] ท็อปปิ้งโอวัลตินภูเขาไฟ\n[(ฟินจริง ๆ ท้าให้ลอง)###Font=KanitLight,Size=15] Ovaltine 配料\n[麦芽狂欢!###Font=KanitLight,Size=15] Ovaltine ထပ်ထည့်မှု၊\n[မော့စ်အရသာ အရမ်းပြင်းထန်တယ်။###Font=KanitLight,Size=15]
+002045 Cocoa Topping\n[Rich & Decadent!###Font=KanitLight,Size=15] ท็อปปิ้งโกโก้ภูเขาไฟ\n[(ระเบิดความเข้ม อร่อยเต็มคำกับภูเขาไฟโกโก้)###Font=KanitLight,Size=15] 可可配料\n[浓郁奢华享受!###Font=KanitLight,Size=15] Cocoa ထပ်ထည့်မှု၊\n[အရသာပြင်းပြပြီး ခံစားခွင့်ကြီးတယ်။###Font=KanitLight,Size=15]
-002046 Ring it up. ซื้อเลย
-002047 Just this,(no toppings) ซื้อเลย (ไม่รับท็อปปิ้ง)
+002046 Ring it up. ซื้อเลย 马上购买 ဝယ်လိုက်ပါ
+002047 Just this,(no toppings) ซื้อเลย (ไม่รับท็อปปิ้ง) 马上购买(不加配料) ဝယ်လိုက်ပါ (တော့ပင်းမထည့်ပါ)
Sugar healthy
Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18 Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18 Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18 Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18 Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18
Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18 Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18 Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18 Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18 Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18
@@ -302,8 +310,12 @@
002054 =+ SUGAR 7 g (26 cal) =+ น้ำตาล 7 g (26 cal) 糖 7 克(26 卡路里) =+ SUGAR 7 g (26 cal) =+ သကြား 7 ဂရမ် (26 ကယ်လိုရီ)
002055 =+ SUGAR 10 g (38 cal) =+ น้ำตาล 10 g (38 cal) 糖 10 克(38 卡路里) =+ SUGAR 10 g (38 cal) =+ သကြား 10 g (38 ကယ်လိုရီ)
Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18 Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18 Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18 Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18 Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18
-002056 Sugar น้ำตาล [(0%)###Font=KanitLight,Size=15] သကြား
-002057 0 cal sugar น้ำตาล 0 cal သကြား 0 cal ရည်\n[သွေးတွင်းသကြားဓာတ်အဆင့်ကို အတက်အကျ မဖြစ်စေသောကြောင့် ဆီးချိုရောဂါနှင့် ကီတို-အတည်ပြုထားသည်။###Font=KanitLight,Size=15]
+002056 Sugar น้ำตาล 糖 သကြား
+002057 0 cal sugar น้ำตาล 0 cal 糖 0卡路里 သကြား 0 cal ရည်\n[သွေးတွင်းသကြားဓာတ်အဆင့်ကို အတက်အကျ မဖြစ်စေသောကြောင့် ဆီးချိုရောဂါနှင့် ကီတို-အတည်ပြုထားသည်။###Font=KanitLight,Size=15]
+002058 Not added ไม่เติม 未添加 မထည့်ပါ
+002059 Normal ปกติ 全脂牛奶 ပုံမှန်
+002060 1 Shot 1 ช็อต 单份浓缩 1 ခွက်
+002061 2 Shot 2 ช็อต 双份浓缩 2 ခွက်
Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18 Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18 Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18 Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18 Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18
Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18 Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18 Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18 Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18 Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18
@@ -314,15 +326,16 @@
002074 Extra จึ้ง 非常甜 Extra အချိုများ
002075 Sweetest สุขิต 超级甜 Sweetest အချိုဆုံး
-000046 0% 0% 0% 0% 0%
-000047 30% 30% 30% 20% 20%
-000048 60% 60% 60% 40% 40%
-000049 100% 100% 100% 60% 60%
-000050 120% 120% 120% 80% 80%
-000051 140% 140% 140% 100% 100%
+ Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18 Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18 Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18 Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18 Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18
+002080 Light เบา 轻度 အသေးစား
+002081 Medium ปานกลาง 中度 အလယ်အလတ်
+002082 Hight เน้น 高度 အထက်တန်း
+ Font=Kanit,Type=Regular,Size=36,Color=0x513C2F Font=Kanit,Type=Regular,Size=36,Color=0x513C2F Font=Kanit,Type=Regular,Size=36,Color=0x513C2F Font=Kanit,Type=Regular,Size=36,Color=0x513C2F Font=Kanit,Type=Regular,Size=36,Color=0x513C2F
+002090 Straw หลอด 要管子 I want a straw မြောင်း
+002091 Lid ฝา 要盖子 I want a lid အဖုံး
@@ -1188,7 +1201,7 @@
1300003 Beans module ชุดเมล็ดกาแฟ
1300004 Bean tray ถาดใส่เมล็ดกาแฟ
1300005 Switch tray : สวิตซ์ถาด :
-1300006 Check tray shutter ตรวจสอบชัตเตอร์ถาด
+1300006 Check tray shutter ตรวจสอบชัตเตอร์ของถาด
1300007 Pay beans จ่ายถั่ว
1300008 1. Select beans 1. เลือกเมล็ดกาแฟ
1300009 2. Select direction 2. เลือกทิศทาง
diff --git a/inter/tha/xml/multi/v3/page_catalog_group_other.lxml b/inter/tha/xml/multi/v3/page_catalog_group_other.lxml
index 206ee950..dacf7b3f 100644
--- a/inter/tha/xml/multi/v3/page_catalog_group_other.lxml
+++ b/inter/tha/xml/multi/v3/page_catalog_group_other.lxml
@@ -20556,9 +20556,9 @@
; 12-06-01-0002 - -
-
- ; ==================> Len = 3
- ; - 12-05-02-0016 -
-
diff --git a/inter/tha/xml/multi/v3/page_catalog_group_other_other.lxml b/inter/tha/xml/multi/v3/page_catalog_group_other_other.lxml
index d1b168f2..af4dbc83 100644
--- a/inter/tha/xml/multi/v3/page_catalog_group_other_other.lxml
+++ b/inter/tha/xml/multi/v3/page_catalog_group_other_other.lxml
@@ -3940,15 +3940,16 @@
Var SelectCountDrinkType = SelectCountDrinkType + 1
Var DefaultDrinkType = 3
EndIf
- If PD_STAGE_2 = "Enable" Then
- Topping "Load" "12-05-02-0040"
- Else
- If PD_STAGE_1 = "Enable" Then
- Topping "Load" "12-05-01-0040"
- Else
+ ; default topping 3
+ If PD_STAGE_3 = "Enable" Then
Topping "Load" "12-05-03-0040"
- EndIf
- EndIf
+ Else
+ If PD_STAGE_2 = "Enable" Then
+ Topping "Load" "12-05-02-0040"
+ Else
+ Topping "Load" "12-05-01-0040"
+ EndIf
+ EndIf
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_other_other.lxml"
@@ -4167,15 +4168,16 @@
Var SelectCountDrinkType = SelectCountDrinkType + 1
Var DefaultDrinkType = 3
EndIf
- If PD_STAGE_2 = "Enable" Then
- Topping "Load" "12-05-02-0041"
- Else
- If PD_STAGE_1 = "Enable" Then
- Topping "Load" "-"
- Else
+ ; default topping 3
+ If PD_STAGE_3 = "Enable" Then
Topping "Load" "12-05-03-0041"
- EndIf
- EndIf
+ Else
+ If PD_STAGE_2 = "Enable" Then
+ Topping "Load" "12-05-02-0041"
+ Else
+ Topping "Load" "-"
+ EndIf
+ EndIf
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_other_other.lxml"
@@ -4394,15 +4396,16 @@
Var SelectCountDrinkType = SelectCountDrinkType + 1
Var DefaultDrinkType = 3
EndIf
- If PD_STAGE_2 = "Enable" Then
- Topping "Load" "12-05-02-0023"
- Else
- If PD_STAGE_1 = "Enable" Then
- Topping "Load" "-"
- Else
+ ; default topping 3
+ If PD_STAGE_3 = "Enable" Then
Topping "Load" "12-05-03-0023"
- EndIf
- EndIf
+ Else
+ If PD_STAGE_2 = "Enable" Then
+ Topping "Load" "12-05-02-0023"
+ Else
+ Topping "Load" "-"
+ EndIf
+ EndIf
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_other_other.lxml"
@@ -15137,233 +15140,6 @@
-
-
-
- ; ==================> Len = 3
- ; - 12-05-02-0016 -
-
diff --git a/inter/tha/xml/multi/v3/page_catalog_group_tea.lxml b/inter/tha/xml/multi/v3/page_catalog_group_tea.lxml
index cb4d72bf..e3920488 100644
--- a/inter/tha/xml/multi/v3/page_catalog_group_tea.lxml
+++ b/inter/tha/xml/multi/v3/page_catalog_group_tea.lxml
@@ -1086,6 +1086,1368 @@
+
+
+
+ ; ==================> Len = 3
+ ; 12-02-01-0103 12-02-02-0103 12-02-03-0103
+
+
+ ; ==================> Len = 3
+ ; 12-02-01-0104 12-02-02-0104 12-02-03-0104
+
+
+ ; ==================> Len = 3
+ ; - 12-02-02-0099 -
+
+
+ ; ==================> Len = 3
+ ; 12-02-01-0097 12-02-02-0097 12-02-03-0097
+
+
+ ; ==================> Len = 3
+ ; - 12-02-02-0098 -
+
+
+ ; ==================> Len = 3
+ ; - - 12-03-03-0106
+
@@ -2448,914 +3810,6 @@
-
-
-
- ; ==================> Len = 3
- ; - 12-02-02-0099 -
-
-
- ; ==================> Len = 3
- ; 12-02-01-0097 12-02-02-0097 12-02-03-0097
-
-
- ; ==================> Len = 3
- ; - 12-02-02-0098 -
-
-
- ; ==================> Len = 3
- ; - - 12-03-03-0106
-
diff --git a/inter/tha/xml/page_payment_pack_and_send.xml b/inter/tha/xml/page_payment_pack_and_send.xml
index e69de29b..9b765086 100644
--- a/inter/tha/xml/page_payment_pack_and_send.xml
+++ b/inter/tha/xml/page_payment_pack_and_send.xml
@@ -0,0 +1,51 @@
+
+
+; Request
+; - Product Code
+; - ** topping.
+; - TelephoneNumber
+; - Market Code
+; -
+
+; Set
+; - Amount 0 baht
+;
+
+
+ "Enable"
+ 1080
+ 1920
+; "0xeae6e1"
+ SoundVolume
+
+
+ SAVELOG "======================================= page_payment_pack_and_send.xml ================================"
+ ; On open
+
+
+ Var ProcessCupDebugText = ""
+ Var TimeOutSmoothiesProcess = 3
+
+ 1000
+
+
+ ;SAVELOG SoundPlaying
+
+ If TimeOutSmoothiesProcess > 0 Then
+ Var TimeOutSmoothiesProcess = countDownRetrun - 1
+
+ EndIf
+
+
+ If TimeOutSmoothiesProcess = 0 Then
+ Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+ EndIf
+
+
+
+ Refresh
+ TimerReset
+
+
+
+
diff --git a/inter/tha/xml/page_smoothie_suggest_and_process.xml b/inter/tha/xml/page_smoothie_suggest_and_process.xml
index fbf10a49..3489226d 100644
--- a/inter/tha/xml/page_smoothie_suggest_and_process.xml
+++ b/inter/tha/xml/page_smoothie_suggest_and_process.xml
@@ -53,14 +53,21 @@
Var ProcessCupDebugText = ""
Var TimeOutSmoothiesProcess = 120
+
+ Var TextDoorButtonID = 001201
+
+ Var SmoothieProcessState = "idle"
+ Var CountDownCertainConfuse = 5
+
1000
;SAVELOG SoundPlaying
+ DEBUGVAR TimeOutSmoothiesProcess
If TimeOutSmoothiesProcess > 0 Then
- Var TimeOutSmoothiesProcess = countDownRetrun - 1
+ Var TimeOutSmoothiesProcess = TimeOutSmoothiesProcess - 1
EndIf
If TimeOutSmoothiesProcess = 0 Then
@@ -68,12 +75,83 @@
EndIf
+ DEBUGVAR CH9991_Status
+ DEBUGVAR CH9992_Status
+ DEBUGVAR CH9993_Status
+ DEBUGVAR CH9994_Status
+
+ DEBUGVAR HaveCup
+ DEBUGVAR CupOnArm
+ DEBUGVAR DoorCupPosition
+ DEBUGVAR CupChecking
+ DEBUGVAR CupArmMove
+ DEBUGVAR buttonRemoveCup
+ DEBUGVAR SmoothieProcessState
+ DEBUGVAR AnyArmConfuse
+ DEBUGVAR SensorDoorCupStatus
+
+ If CH9992_Status = "READY" Then
+
+ If DoorCupPosition = "bottom" Then
+ If SmoothieProcessState = "idle" Then
+ Var TextDoorButtonID = 001202
+ Else
+ If SmoothieProcessState = "insert" Then
+ Var TextDoorButtonID = 001203
+
+ Else
+
+ EndIf
+ EndIf
+ Else
+ If DoorCupPosition = "top" Then
+ Var TextDoorButtonID = 001204
+ If SmoothieProcessState = "press" Then
+ Var SmoothieProcessState = "insert"
+ EndIf
+ Else
+ If SmoothieProcessState = "idle" Then
+
+ Else
+ If SmoothieProcessState = "press" Then
+
+ Else
+ Var TextDoorButtonID = 001205
+ EndIf
+
+ EndIf
+ EndIf
+ EndIf
+
+
+ If AnyArmConfuse = 1 Then
+ If CountDownCertainConfuse > 0 Then
+ Var CountDownCertainConfuse = CountDownCertainConfuse - 1
+
+ If CountDownCertainConfuse = 0 Then
+ Machine DoorClose
+ EndIf
+ EndIf
+ EndIf
+ Else
+
+ If CH9992_Status = "RUNNING" Then
+ Var SmoothieProcessState = "blendnow"
+ EndIf
+ EndIf
+
+ If SmoothieProcessState = "blendnow" Then
+ Var TextDoorButtonID = 001206
+ EndIf
+
+ DEBUGVAR TextDoorButtonID
Refresh
TimerReset
+;DEBUGVAR Var [CH9992_Status] = RUNNING
0
@@ -134,7 +212,7 @@
85
Center
- 001201
+ 1201
@@ -145,11 +223,13 @@
77
1531
Var(DirImage + "/bn_main_button.png")
- Var(DirImage + "/pn_main_button.png")
+ Var(DirImage + "/bp_main_button.png")
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
-
+ Var SmoothieProcessState = "press"
+ __CMD "UseArm" "2" "-" "-"
+ Machine InsertCupAndOpen
@@ -158,13 +238,14 @@
1571
1080
85
+ Center
- 001202
+ TextDoorButtonID
-
+; cancel