diff --git a/inter/mys/menu/lang.tsv b/inter/mys/menu/lang.tsv
index 13effad0..3391b53c 100644
--- a/inter/mys/menu/lang.tsv
+++ b/inter/mys/menu/lang.tsv
@@ -263,6 +263,7 @@ TextID Note English Thai China Japan Malaysia
800026 Do you cut-off cash box? ทำการตัดยอดหรือไม่? Do you cut-off cash box?
800027 Please Open door cash box กรุณาเปิดประตูเก็บเงินก่อน Please Open door cash box
800028 Internal Communcation fail. ระบบสื่อสารมีปัญหาภายในตู้ Internal Communcation fail.
+800029 Next ถัดไป 下一步
@@ -312,6 +313,16 @@ TextID Note English Thai China Japan Malaysia
800072 Water Tank restart.
800073 Restart Shot coffee count
+800074 Disc module not close completely แขนปิดไม่สนิท 圆盘模块未完全关闭
+800075 Adjust ice weight Adjust ice weight 调整冰量
+800076 Ice: water pump timeout น้ำหมด 制冰：水泵超时
+800077 Ice: Lack of ice failure ล้มเหลวขาดน้ำแข็ง 制冰：缺冰故障
+800078 Ice out timeout จ่ายน้ำแข็งไม่ได้ 出冰超时
+800079 Load cell fail! วัดน้ำหนักเสีย Load cell fail!
+800080 Weighing Motor forward timeout การชั่งน้ำหนักมอเตอร์หมดเวลาเดินหน้า Weighing Motor forward timeout
+800081 Weighing Motor reverse timeout การชั่งน้ำหนักมอเตอร์หมดเวลาถอยหลัง Weighing Motor reverse timeout
+800082 ICE turning forward timeout ICE กำลังหมุนตัวไปข้างหน้าจนหมดเวลา ICE turning forward timeout
+800083 ICE reverses timeout ICE ย้อนเวลาหมดเวลา ICE reverses timeout
Soda System
@@ -338,6 +349,18 @@ TextID Note English Thai China Japan Malaysia
800120 Voltage แรงดันไฟฟ้า Voltage
800121 Current กระแสไฟฟ้า Current
800122 Soda โซดา Soda
+800123 Start Defrost. Wait check ละลายน้ำแข็ง Start Defrost. Wait check Start Defrost
+800124 Start Agitator soda หมุนมอเตอร์คนโซดา 启动搅拌器苏打 Start Agitator soda
+800125 Stop Agitator soda หยุดมอเตอร์คนโซดา 停止搅拌器苏打 Stop Agitator soda
+800126 Start/Stop Agitator soda หมุน/หยุดมอเตอร์คนโซดา 启动/停止搅拌器苏打 Start/Stop Agitator soda
+800127 Stop หยุด 停止 Stop
+800128 Low Speed หมุนช้า 低速 Low Speed
+800129 Hight Speed หมุนเร็ว 高速 Hight Speed
+800130 Compressor fan speed control ควบคุมพัลดคอมเพสเซอร์ 压缩机风扇速度控制 Compressor fan speed control
+800131 Waiting for defrost check ละลายน้ำแข็งรอตรวจสอบ 等待除霜检查
+800132 to ถึง 至
+800133 Minute นาที 分钟
+800134 Time ระยะ 时间
Test
800200 Status สถานะ Status
800201 Boiler หม้อต้ม Boiler
@@ -658,6 +681,21 @@ TextID Note English Thai China Japan Malaysia
800516 Last version เวอร์ชันล่าสุด
800517 Upgrade status สถานะอัพเกรด
800518 Select file เลือกไฟล์
+800519 Alert ยกเลิกการเติมวัตถุ 警报
+800520 Do you want to cancel the material refill ต้องการยกเลิกการเติมวัตถุช่อง 您要取消材料补充吗
+800521 Weighed over limit ชั่งน้ำหนักเกินลิมิต 称重超限
+800522 The weighing result is 0. ชั่งน้ำหนักเป็น 0 称重结果为0。
+800523 Abnormal weighing was detected. ตรวจพบการชั่งน้ำหนักผิดปกติ 检测到异常称重。
+800524 Check the weighed value before confirming. ตรวจสอบค่าที่ชั่งน้ำหนักก่อนยืนยัน 确认前请检查称重值。
+800525 Error พบข้อผิดพลาด 错误
+800526 Other อื่นๆ 其他
+800527 Full fill ใส่เต็ม 完全填充
+800528 Auto adjustment ปรับอัตโนมัติ 自动调整
+800529 Disable ปิดการใช้งาน 禁用
+800530 Partial Refill เติมแบบหยอด 部分重新填充
+800531 Alert ยืนยันการเคลียร์วัตถุดิบทั้งหมด 警报
+800532 Please type the word 'taobin'\nto confirm clearing all materials. กรุณาพิมพ์คำว่า 'taobin'\nเพื่อยืนยันการเคลียร์วัตถุดิบทั้งหมด 请输入单词'taobin'\n以确认清除所有材料。
+800533 You typed the confirmation text incorrectly. คุณพิมข้อความยืนยันผิด 您输入的确认文本不正确。
800600 Turn around หมุนกลับ
800601 Call arm Call แขน
@@ -728,6 +766,12 @@ TextID Note English Thai China Japan Malaysia
800661 Shutter ชัตเตอร์
800662 Motor แกนมอเตอร์
800663 Whipper clean water
+800664 Please waiting Please waiting 请等待
+800665 Self test .... Self test .... 自我测试....
+800666 Top board Top board 顶部面板
+800667 Bottom board Bottom board 底部面板
+800668 Front board Front board 前面板
+800669 Ice board Ice board 冰面板
Test (New UI)
800700 Active ทำงาน
@@ -923,9 +967,21 @@ TextID Note English Thai China Japan Malaysia
810152 Day วันที่
810153 Weight น้ำหนัก
810154 calibrate calibrate
-810155
-810156
-810157
+810155 TV ทีวี 电视
+810156 Door Key กุญแจประตู 门钥匙
+810157 Espresso Module Gear เฟืองเครื่องอัดกาแฟ 意式咖啡模块齿轮
+810158 Espresso Module Cover ตัวครอบเครื่องอัดกาแฟ 意式咖啡模块盖
+810159 Gas Pressure Connector ข้อต่อตัววัดแรงดันแก๊ส 气压连接器
+810160 TV Cooling Fan พัดลมระบายความร้อนทีวี 电视散热风扇
+810161 Ice Weight Scale Cover ตัวครอบเครื่องชั่งน้ำหนักน้ำแข็ง 冰重量秤盖
+810162 Ice Shaver Motor มอเตอร์ของกะโหลกน้ำแข็ง 刨冰机电机
+810163 Ice Shutter Motor มอเตอร์ Shutter น้ำแข็ง 冰闸门电机
+810164 Cooling Tank Stirring Motor มอเตอร์กวนน้ำในถังหล่อเย็น 冷却槽搅拌电机
+810165 Cup Dispenser Plastic Cover C2 พลาสติกครอบตัวจ่ายแก้ว C2 杯子分配器塑料盖C2
+810166 Coffee Grinder Cover ตัวครอบเครื่องบดกาแฟ 咖啡研磨机盖
+810167 Coffee Line B3 สายกาแฟ B3 咖啡线B3
+810168 Ice Limit Switch ชุด Limit Switch น้ำแข็ง 冰量限制开关
+810169 Done ทำแล้ว 完成
810199
@@ -973,8 +1029,14 @@ TextID Note English Thai China Japan Malaysia
1000017 Wait a moment รอสักครู่
1000018 The machine is testing เครื่องกำลังทดสอบ
1000019 The machine is working เครื่องกำลังทำงาน
-1000020
-1000021
+1000020 testing testing 测试中
+1000021 fail ( timeout ) fail ( timeout ) 失败（超时）
+1000022 reset reset 重置
+1000023 padding padding 填充
+1000024 Slip Ring Test Slip Ring Test 滑环测试
+1000025 Slip Ring Slip Ring 滑环
+1000026 Average testing time: 7 minutes ใช้เวลาในการทดสอบประมาณ 7 นาที 平均测试时间：7分钟
+1000027 Connection Test Connection Test 连接测试
@@ -1037,16 +1099,16 @@ TextID Note English Thai China Japan Malaysia
1300004 Bean tray ถาดใส่เมล็ดกาแฟ
1300005 Switch tray : สวิตซ์ถาด :
1300006 Check tray shutter ตรวจสอบถาดชัตเตอร์
-1300007 Pay beans จ่ายถั่ว
+1300007 Pay beans ถั่วจ่าย
1300008 1. Select beans 1. เลือกเมล็ดกาแฟ
1300009 2. Select direction 2. เลือกทิศทาง
1300010 Draw back หมุนกลับ
-1300011 Grind beans บดเมล็ดถั่ว
+1300011 Grind beans บดเมล็ดกาแฟ
1300012 Grind sizes ขนาดการบด
1300013 Standard มาตรฐาน
1300014 Result ผลลัพธ์
1300015 Bean weight:g น้ำหนักถั่ว:กรัม
-1300016 Brew time:sec เวลาการชง: วินาที
+1300016 Brew time:sec เวลาชง: วินาที
1300017 Test grind sizes ขนาดการบดทดสอบ
1300018 Coffee module type : ประเภทชุดกาแฟ :
1300019 1. Select grind sizes 1. เลือกขนาดการบด
@@ -1062,7 +1124,7 @@ TextID Note English Thai China Japan Malaysia
1300029 Set grind sizes ตั้งค่าขนาดการบด
1300030 Set as default ตั้งให้เป็นค่าเริ่มต้น
1300031 (Set as default when meet standard) (ตั้งเป็นค่าเริ่มต้นเมื่อเป็นไปตามมาตรฐาน)
-1300032 Brew recipes สูตรการชง
+1300032 Brew recipes สูตรชงเครื่องดื่ม
1300033 Brew order ลำดับการชง
1300034 Ingredient วัตถุดิบ
1300035 Recipes สูตรอาหาร
@@ -1071,7 +1133,7 @@ TextID Note English Thai China Japan Malaysia
1300038 1. Recheck selected grind sizes and brew recipes 1. ตรวจสอบขนาดการบดและสูตรการชงที่เลือกอีกครั้ง
1300039 Insert cup manually ใส่ถ้วยด้วยมือ
1300040 2. Select arm 2. เลือกแขน
-1300041 3. Please insert cup into selected arm 3. กรุณาใส่ถ้วยเข้าในแขนที่เลือก
+1300041 3. Please insert cup into selected arm 3. กรุณาใส่ถ้วยเข้าไปในแขนที่เลือก
1300042 Test ทดสอบ
1300043 Grind บด
1300044 Pay beans from slot * จ่ายเมล็ดกาแฟจาก *
@@ -1286,9 +1348,318 @@ TextID Note English Thai China Japan Malaysia
2100055 Sleep mode will be turn off
when machine operating. Sleep mode will be turn off
when machine operating.
2100056 Please check before confirming Please check before confirming
2100057 Fan module Fan module
+2100101 Water น้ำ
+2100102 Whipper & Clean หัวชงและถ้วยล้าง
+2100103 Ice น้ำแข็ง
+2100104 Espresso Module โมดูลเอสเพรสโซ่
+2100105 Generation รุ่น
+2100106 Sensor Lid เซนเซอร์ฝา
+2100107 Straw หลอด
+2100108 Heat system ระบบทำความร้อน
+2100109 SleepTime Setting SleepTime Setting
+2100110 Camera Straw กล้องส่องหลอด
+2100111 Exhaust Fan system ระบบพัดลมดูดอากาศ
+2100112 Time start ตั้งเวลาทำงาน
+2100113 Cam ลูกเบี้ยว
+2100114 Powder ผง
+2100115 Powder Setting Powder Setting
+2100116 Powder low value Powder low value
+2100117 Powder low value ( milliseconds ) Powder low value ( milliseconds )
+2100150 Water Source Type ประเภทแหล่งน้ำ
+2100151 Refill RO แบบเติมน้ำ RO
+2100152 Filter RO แบบต่อเครื่องกรองน้ำ RO
+2100153 Filte normal แบบต่อเครื่องกรองน้ำธรรมดา
+2100170 Wash Brew head version ชนิดถ้วยล้าง
+2100171 SPINNING-WASHING-BOWL แบบที่ 1
+2100172 V2-SPINNING-WASHING-BOWL แบบที่ 2
+2100173 V3-CLEANING-MIXING-BOWL แบบที่ 3 ( พลาสติก )
+2100190 Whipper type ชนิดหัวชง
+2100191 Whipper only หัวชงรุ่นเก่า(ไม่มี encoder)
+2100192 Whipper with encoder หัวชงรุ่นใหม่(มี encoder)
+2100193 Whipper version Rev15 no-encoder หัวชงแบบใหม่ Rev15 no-en
+2100194 Whipper version Rev15 หัวชงแบบใหม่ Rev15 no-en
+2100195 Whipper fool หัวชงแบบใหม่ RevNN
+2100220 ICE gear system ชนิดเกียร์น้ำแข็ง
+2100221 Gear 6.8 RPM 80W เกียร์ 6.8 RPM 80W
+2100222 Gear 9.6 RPM 80W เกียร์ 9.6 RPM 80W
+2100223 Gear 13.4 RPM 120W เกียร์ 13.4 RPM 120W
+2100224 Taobin Gear 13.4 RPM เต่าบิน เกียร์ 13.4 RPM
+2100225 Taobin Gear 11 RPM 120W เต่าบิน เกียร์ 11 RPM 120W
+2100226 Taobin Gear 9.6 RPM 120W เต่าบิน เกียร์ 9.6 RPM 120W
+2100240 ICE water input with cool น้ำเข้าแกนน้ำแข็งผ่านหล่อเย็น
+2100241 Not install ไม่ผ่านหล่อเย็น
+2100242 installed ผ่านหล่อเย็น
+2100260 ICE board control type ชนิดบอร์ดน้ำแข็ง
+2100261 REV.C1-02 Modify REV.C1-02 Modify
+2100262 REV.C1-01 REV.C1-01
+2100280 ICE Bucket type ชนิดกระบะน้ำแข็ง
+2100281 Original model แบบเก่า
+2100282 New model แบบใหม่ (พลาสติก)
+2100300 ICE Pipe type ชนิดของท่อส่งน้ำแข็ง
+2100301 Original model แบบเก่า
+2100302 New model แบบใหม่
+2100320 ICE Compressor type ชนิดคอมเพสเซอร์
+2100321 HARN 0.75 HP HARN 0.75 HP
+2100322 sangchai 0.75 HP sangchai 0.75 HP
+2100323 Hitachi Scroll 1.00 HP Hitachi Scroll 1.00 HP
+2100324 Embraco 1.25 HP Embraco 1.25 HP
+2100340 Model by Compressor Type รุ่นขาน้ำแข็ง
+2100341 Not specified ยังไม่ได้กำหนด
+2100342 EC-14.28-1C10IG2 EC-14.28-1C10IG2
+2100343 GC-11.88-1C10IMG2 GC-11.88-1C10IMG2
+2100344 CL-15.33-1C10IMG2 CL-15.33-1C10IMG2
+2100345 EC-27.8-2C10IMG2 EC-27.8-2C10IMG2
+2100346 HS-15.9-2C10IMG2 HS-15.9-2C10IMG2
+2100347 HS-15.9-1C10IG2 HS-15.9-1C10IG2
+2100348 EC-27.8-1C15IG2 EC-27.8-1C15IG2
+2100349 KT-22.3-1C10IG2 KT-22.3-1C10IG2
+2100350 EC-27.8-1C20IG2 EC-27.8-1C20IG2
+2100351 EC-27.8-1C20IG3 EC-27.8-1C20IG3
+2100352 DF-18.00-1C10IMG2-RW DF-18.00-1C10IMG2-RW
+2100353 DF-18.00-1C10IG2-RW DF-18.00-1C10IG2-RW
+2100354 EC-14.28-1C10IG2-RW EC-14.28-1C10IG2-RW
+2100355 DF-18.00-1C10IG2-RW (5R) DF-18.00-1C10IG2-RW (5R)
+2100356 DF-16.15-1C10IG2-RW (5R) DF-16.15-1C10IG2-RW (5R)
+2100357 DF-23.20-1C10IG2-RW (5R) DF-23.20-1C10IG2-RW (5R)
+2100358 DF-16.15-1C20IG2-RW (2F-C3R) DF-16.15-1C20IG2-RW (2F-C3R)
+2100359 DF-23.20-1C20IG2-RW (2F-C3R) DF-23.20-1C20IG2-RW (2F-C3R)
+2100360 EC-16.80-1C20IG2-RW (2F-C3R) EC-16.80-1C20IG2-RW (2F-C3R)
+2100361 EC-16.80-1C10IG2-RW(5R) EC-16.80-1C10IG2-RW(5R)
+2100362 EC-17.39-1C20IG2-RW(2F-C3R) EC-17.39-1C20IG2-RW(2F-C3R)
+2100380 Compressor Pressure Sensor คอมเพสเซอร์แรงดัน
+2100381 On เปิด
+2100382 Off ปิด
+2100400 Sleep mode Sleep mode
+2100401 Disable ปิด
+2100402 Enable เปิด
+2100410 Limit switch Ice Cover ลิมิตสวิทซ์ฝาถังน้ำแข็ง
+2100411 NC NC
+2100412 NO NO
+2100420 Ice Comressor fan type ชนิดของพัดลม
+2100421 Fix Speed Fix Speed
+2100422 AC/DC Auto speed AC/DC Auto speed
+2100430 Soda Start Freeze mode ระดับโพรบ เริ่มทำหล่อเย็น
+2100431 P1-600 P1-600
+2100432 P2-300 P2-300
+2100433 P1-1900 P1-1900
+2100434 P1-1200 P1-1200
+2100450 Soda Stop Freeze mode ระดับโพรบ หยุดทำหล่อเย็น
+2100451 P2-2100 P2-2100
+2100452 P2-1500 P2-1500
+2100453 P2-1000 P2-1000
+2100454 P2-300 P2-300
+2100455 P1-2100 P1-2100
+2100470 Soda Freeze mode โหมดแช่โซดา
+2100471 P1-600 P1-600
+2100472 P2-300 P2-300
+2100473 P1-1900 P1-1900
+2100474 P1-1200 P1-1200
+2100480 Soda agitator always on มอเตอร์กวนน้ำถังหล่อเย็น
+2100481 Alway on เปิดตลอดเวลา
+2100482 Follow Setting เปิดปิดตามเวลา
+2100490 Time turn on เวลาเปิด
+2100491 Time turn off เวลาปิด
+2100500 Soda CO2 tank mode โหมดถังแก๊สโซดา
+2100501 NO-Config NO-Config
+2100502 Tank 1 Tank 1
+2100503 Tank 2 Tank 2
+2100520 Espresso module version ชุดทำกาแฟ
+2100521 ver 1(F) ver 1(F)
+2100522 ver 2 ver 2
+2100523 ver 1(F/R) ver 1(F/R)
+2100540 Espresso Tray Bean ชุดทำถาดกาแฟ
+2100541 Original Original
+2100542 Version 1 Version 1
+2100550 Espresso module serial number ชุดทำกาแฟ serial number
+2100560 Hardware generation รุ่นของตู้
+2100561 Gen 2.6 รุ่น 2.6
+2100562 Gen 2.7 รุ่น 2.7
+2100563 Gen 2.9 รุ่น 2.9
+2100564 Gen 3.2 รุ่น 3.2
+2100565 Gen 3.1 รุ่น 3.1
+2100566 Gen 3.X รุ่น 3.X
+2100567 Gen 4.X รุ่น 4.X
+2100600 Use เปิดใช้งาน
+2100601 Ignore ปิดใช้งาน
+2100610 Straw Request Button ปุ่มขอหลอดเพิ่ม
+2100611 Close ปิด
+2100612 Open เปิด
+2100620 Preheat after make espresso pre-heat หลังจากทำกาแฟ
+2100625 Value for water Preheat ประมาณน้ำร้อน
+2100630 Boiler sleep หม้อต้ม sleep
+2100635 Sleep Time Sleep Time
+2100636 SleepTime Setting SleepTime Setting
+2100640 Exhaust Auto/Server Exhaust Auto/Server
+2100641 Auto Auto
+2100642 Server control Server control
+2100643 Manual, 4AM to Auto Manual, 4AM to Auto
+2100644 ExhaustFan ExhaustFan
+2100650 Time เวลา
+2100655 Mode โหมด
+2100656 Close ปิด
+2100657 Open away เปิดตลอด
+2100658 Open pay hot water เปิดตอนจ่ายน้ำร้อน
+2100659 Open when blender and clean เปิดตอนชง เปิดหลังล้าง
+2100660 Exhaust Fan Time โหมดพัดลมดูดอากาศ
+2100670 Powder Cam Type ลูกเบี้ยวจ่ายผง
+2100671 Orignal 1 side แบบเก่า 1 ด้าน
+2100672 2 side แบบ 2 ด้าน
+2100673 Steel แบบ เหล็ก
+2100674 aluminum แบบ อลู
+2100675 titanium ไทเทเนียม
+2100676 viberium ไวเบอเนียม
+2100677 diamond เพชร
+2100690 Powder Push High Powder Push High
+2100691 Powder Push low Powder Push low
+2100692 Powder Low Time Powder Low Time
+2100693 Powder backward Turn on Powder backward Turn on
+2100694 Powder push mode Powder push mode
+2100695 Normal Normal
+2100696 2 Level 2 Level
+2100697 2 Level 5ms 2 Level 5ms
+2100710 Powder Pay push low turn on เปิดโหมดปั่นผง
+2100711 Turn on Turn on
+2100712 Turn off Turn off
+2100713 Nozzle ตำแหน่งหัวจ่าย
+2100714 Nozzle version แบบหัวจ่ายเวอร์ชัน
+2100715 Nozzle Coffee front position กาแฟอยู่ข้างหน้า
+2100716 Nozzle Coffee behind position กาแฟอยู่ข้างหลัง
+2100720
Fan
2200000 Fan พัดลม
+3000001 Taobin operating in power saving mode ตู้เต่าบินอยู่ในโหมดประหยัดพลังงาน
+3000002 Exiting power saving page กำลังออกจากหน้าโหมดประหยัดพลังงาน
+3000003 Exiting in กำลังออกจากหน้านี้ ภายใน
+3000004 Exiting in กำลังออกจากหน้าโหมดประหยัดพลังงาน ภายใน
+3000005 Exiting Power Saving Mode กำลังออกจาก โหมดประหยัดพลังงาน
+3000006 Leave page ออกจากหน้านี้
+3000007 Cancel Sleep ยกเลิก Sleep
+3000008 Cancel ยกเลิก
+3000009 Warning คำเตือน
+3000010 If you press Exit from Power Saving Mode หากท่านกดออกจาก โหมดประหยัดพลังงาน
+3000011 Hot menu will be available in เมนูร้อนจะสามารถให้บริการได้ใน
+3000012 Cold menu, Soda will be available in เมนูเย็น,โซดา จะสามารถให้บริการได้ใน
+3000013 Confirm ตกลง
+3000014 Close ปิด
+3000100 Ingredient management จัดการส่วนผสม
+3000101 Ice cream ไอศกรีม
+3000110 GO TO MENU GO TO MENU
+3000111 SHUTDOWN SHUTDOWN
+3000112 EXIT PROGRAM EXIT PROGRAM
+3000113 You want to shut down right ? ต้องการ Shut down หรือไม่
+3000114 Noted Noted
+3000115 Don't care Don't care
+3000116 Copy that Copy that
+3000200 Main menu เมนูหลัก
+3000201 Sub menu เมนูย่อย
+3000202 Add menu เพิ่มเมนู
+3000203 More. เพิ่มเติม
+3000204 Show filter แสดงตัวกรอง
+3000205 Filter by name กรองโดยชื่อ
+3000206 Show all แสดงทั้งหมด
+3000207 Apply Filter ใช้ตัวกรอง
+3000208 Clear Filter ล้างตัวกรอง
+3000209 Close ปิด
+3000210 Check ตรวจสอบ
+3000211 Brew now เริ่มชง
+3000250 Save now บันทึก
+3000251 Name ชื่อ
+3000252 Price ราคา
+3000253 times ครั้ง
+3000254 rounds รอบ
+3000255 msec msec
+3000257 Order Order
+3000258 Material Material
+3000259 Volume= Volume=
+3000260 Adjust กดเพื่อปรับ
+3000261 Default ค่าเริ่มต้น
+3000262 Test brew ทดสอบชง
+3000263 Hot= ร้อน=
+3000264 Cold= เย็น=
+3000265 Mix= ชง=
+3000266 Clean= ล้าง=
+3000280 Select topping ( Default ) เลือกท๊อปปิ้ง ( default )
+3000281 Select topping ( For test brew ) เลือกท๊อปปิ้ง ( สำหรับทดสอบชง )
+3000282 Select cleaning mode เลือกโหมดการล้าง
+3000283 Select เลือก
+3000284 Use cup in arm use cup in arm
+3000285 Not save ไม่ Save
+3000286 Want to save ? ต้องการ save ?
+3000287 Do you want to save? (It takes 1 minute) ต้องการบันทึกหรือไม่ ( ใช้เวลา 1 นาที )
+3000300 Syrup box กล่องไซรัป
+3000301 Coffee bean box กล่องเมล็ดกาแฟ
+3000400 Set Pulse Hot Set Pulse Hot
+3000401 Set Pulse Cold Set Pulse Cold
+3000402 Temperature อุณหภูมิ
+3000403 Calibration Calibration
+3000404 Set Zero Set Zero
+3000405 Home Home
+3000406 Un-lock Un-lock
+3000500 Material วัตถุดิบ ( Material )
+3000501 List รายการ
+3000700 Running result ผลการดำเนินการ
+3000701 Idle waiting ปกติ
+3000702 It is ice กำลังจ่ายน้ำแข็ง
+3000703 ICE is successfull จ่ายน้ำแข็งสำเร็จ
+3000704 Failed ICE จ่ายน้ำแข็งล้มเหลว
+3000705 Ice being drained ระบายน้ำแข็งออก
+3000706 The coefficient is being corrected ค่าสัมประสิทธิ์กำลังปรับแก้ไข
+3000707 The calibration was successful การปรับเทียบสำเร็จ
+3000708 Ice status สถานะน้ำแข็ง
+3000709 Full เต็ม
+3000710 Not full ยังไม่เต็ม
+3000711 Ice data ข้อมูลน้ำแข็ง
+3000712 Max rate Max rate
+3000713 Pay rate Pay rate
+3000714 Max pay rate Max pay rate
+3000715 Restart Machine รีสตาร์ทเครื่อง
+3000716 Reset stage machine รีเซ็ทสเตจเครื่อง
+3000717 Maintenance mode โหมดการบำรุงรักษา
+3000718 Clear time Clear time
+3000719 Clear temp Clear temp
+3000720 Clear ice rate Clear ice rate
+3000721 Reset PWM SM1 ( mix1) Reset PWM SM1 ( mix1)
+3000722 Reset PWM SM2 ( mix2) Reset PWM SM2 ( mix2)
+3000723 Reset pay rate Reset pay rate
+3000724 Reset Flow rate Reset Flow rate
+3000725 Reset Bucket Move Time Reset Bucket Move Time
+3000726 Reset Last Ice rate Reset Last Ice rate
+3000727 Reset Bucket PWM Reset Bucket PWM
+3000728 Not found Not found
+3000729 Adjust Ice Weight Adjust Ice Weight
+3000900 Electricity consumption ปริมาณใช้ไฟฟ้า
+3000901 Electricity consumption ปริมาณใช้ไฟฟ้า
+3000902 Voltage แรงดันไฟฟ้า
+3000903 Electric current กระแสไฟฟ้า
+3000904 AC Control Current AC Control Current
+3000905 UV Current UV Current
+3000906 Monitor Current Monitor Current
+3000907 Powder Module Current Powder Module Current
+3000908 Ice Soda Current Ice Soda Current
+3000915 Clear data ลบข้อมูล
+3000916 Yes ใช่
+3000917 No ไม่
+3000918 Back กลับ
+3000919 Do you want to clear all data? ต้องการลบข้อมูลทั้งหมดหรือไม่
+3001001 เหรียญ 1 ทอนปัจจุบัน =
+3001002 เหรียญ 2 ทอนปัจจุบัน =
+3001003 เหรียญ 5 ทอนปัจจุบัน =
+3001004 เหรียญ 10 ทอนปัจจุบัน =
+3001005 Reset All Reset All / เริ่มนับใหม่
+3001050 Add เพิ่ม
+3001051 Filter ตัวกรอง
+3001052 Status สถานะ
+3001053 Bean เมล็ด
+3001054 Leaves ใบ
+3001055 Powder ผง
+3001056 Soda โซดา
+3001057 Syrup ไซรัป
+3001058 Type ประเภท
+3001059 Cup แก้ว
+3001060 Lid ฝา
+3001061 Straw หลอด
+3001062 Whipper หัวชง
diff --git a/inter/mys/xml/event/tricker.ev b/inter/mys/xml/event/tricker.ev
index 72dc346a..8ff48d98 100644
--- a/inter/mys/xml/event/tricker.ev
+++ b/inter/mys/xml/event/tricker.ev
@@ -23,6 +23,10 @@ Var ProReducedPriceEnable = 0
Var ProMysteryCup = 0
+
+; new_payment
+Var New_PaymentInter = 0
+
If SystemDateMonthInt = 6 Then
If SystemDateDayInt >= 17 Then
@@ -92,9 +96,13 @@ If BoxID = 210011 Then
Var UseSlideShowVideo = 1
EndIf
-;If BoxID = 200002 Then
-; Var UseSlideShowVideo = 1
-;EndIf
+If BoxID = 200002 Then
+ Var New_PaymentInter = 1
+EndIf
+
+If BoxID = 210055 Then
+ Var New_PaymentInter = 1
+EndIf
;If BoxID = Something Then
; Var EnablePayLaterMode = 1
@@ -106,4 +114,7 @@ If ProMysteryCup = 1 Then
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/mys/xml/event/mystery_cup/random_list.ev"
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/mys/xml/event/mystery_cup/check_menu.ev"
DEBUGVAR "Syncing Pool Done!"
-EndIf
\ No newline at end of file
+EndIf
+
+
+DEBUGVAR New_PaymentInter
\ No newline at end of file
diff --git a/inter/mys/xml/page_brewing3.lxml b/inter/mys/xml/page_brewing3.lxml
index e95b4a95..c923bf90 100644
--- a/inter/mys/xml/page_brewing3.lxml
+++ b/inter/mys/xml/page_brewing3.lxml
@@ -5,6 +5,17 @@
"0xeae6e1"
SoundVolume
+
+ If New_PaymentInter = 1 Then
+ RootLayoutVisible 3 "hide"
+ TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payext_setup.ev"
+ SAVELOG "MYS page_brewing3.lxml NEW_PAYMENT"
+ Else
+ SAVELOG "MYS page_brewing3.lxml"
+ EndIf
+
+
+
Var SendNotiPaySuccess = 2
Var GetMoreStrawCount = 3
@@ -12,8 +23,12 @@
Var CountUpWhenBREW_CNT = 0
DEBUGVAR TxRef1
- SAVELOG "MYS page_brewing3.lxml"
+
DEBUGVAR MachineStage
+ If New_PaymentInter = 1 Then
+ DEBUGVAR Seeker.ORDER_ID
+ __CMD "PayWasSent" Seeker.ORDER_ID "-" "-"
+ EndIf
Var PictureFileTextDesctionState = "Enable"
@@ -31,6 +46,9 @@
Var ExtendData = Seeker.ExtendData
Var ServiceAmount2 = Seeker.ServiceAmount2
+ If New_PaymentInter = 1 Then
+ Var PriceDrink = Seeker.ServiceAmount2
+ EndIf
DEBUGVAR Seeker
DEBUGVAR Seeker.selected_a_drink
@@ -38,6 +56,7 @@
DEBUGVAR PayAmount
DEBUGVAR Seeker.CreditCard
DEBUGVAR Seeker.CodeNumber
+ DEBUGVAR Seeker.CashlessVendingTrackNumber
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + ExtendData
@@ -124,39 +143,40 @@
If Seeker.PayWithQR = 1 Then
Var VendingTSIDTmp = Seeker.VendingTSID
+ If New_PaymentInter = 1 Then
- If Seeker.TNumberTaobinCredit = "" Then
- Var TelephoneNumber = "0899999999"
- Var PayO2 = ""
- Else
- Var TelephoneNumber = Seeker.TNumberTaobinCredit
- Var PayO2 = Seeker.CoffeePinNumber
- EndIf
+ Else
+
+ If Seeker.TNumberTaobinCredit = "" Then
+ Var TelephoneNumber = "0899999999"
+ Var PayO2 = ""
+ Else
+ Var TelephoneNumber = Seeker.TNumberTaobinCredit
+ Var PayO2 = Seeker.CoffeePinNumber
+ EndIf
- If ChangeFlag2 = 1 Then
- Var TelephoneNumber = "0899999999"
- Var PayO2 = ""
- Var VendingDiscount = 0
- Var VendingCampaign = 0
- Var ServiceType = "credit"
- Var SessionID2 = SelectDrink
- Var ServiceCredit = "coffee"
- Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+ If ChangeFlag2 = 1 Then
+ Var TelephoneNumber = "0899999999"
+ Var PayO2 = ""
+ Var VendingDiscount = 0
+ Var VendingCampaign = 0
+ Var ServiceType = "credit"
+ Var SessionID2 = SelectDrink
+ Var ServiceCredit = "coffee"
+ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
- Else
-
- If Seeker.StoreCreditFlag = 1 Then
- 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
+ Else
+ If Seeker.StoreCreditFlag = 1 Then
+ 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
+ EndIf
EndIf
If Seeker.TNumberTaobinCredit = "" Then
@@ -171,53 +191,58 @@
Var TelephoneNumberProblem = Seeker.TNumberTaobinCredit
EndIf
- If TelephoneNumberProblem = "" Then
- ;Var TelephoneNumberProblem = ""
- Var ShowTextNumber = "Enable"
- Var Tel_Confirm_State = "Disable"
- Else
- Var ShowTextNumber = "Invisible"
- Var Tel_Confirm_State = "Enable"
- EndIf
+ If New_PaymentInter = 1 Then
- Var AddData = 0
+ Else
+ If TelephoneNumberProblem = "" Then
+ ;Var TelephoneNumberProblem = ""
+ Var ShowTextNumber = "Enable"
+ Var Tel_Confirm_State = "Disable"
+ Else
+ Var ShowTextNumber = "Invisible"
+ Var Tel_Confirm_State = "Enable"
+ EndIf
- DEBUGVAR Seeker.TNumberTaobinMember
- DEBUGVAR Seeker.PointTaobinStr
+ Var AddData = 0
+
+ DEBUGVAR Seeker.TNumberTaobinMember
+ DEBUGVAR Seeker.PointTaobinStr
- If Seeker.TNumberTaobinMember = "" Then
+ If Seeker.TNumberTaobinMember = "" Then
- Else
- If Seeker.PayWithQR = 1 Then
- Var VendingTSID = VendingTSIDTmp
- Else
- Var VendingTSID = ""
- EndIf
+ Else
+ If Seeker.PayWithQR = 1 Then
+ Var VendingTSID = VendingTSIDTmp
+ Else
+ Var VendingTSID = ""
+ EndIf
- Var BmiYear = Seeker.PointTaobinStr
- Var PointCrm = ""
- If Seeker.FromConsent = 1 Then
- Var PointCrm = "pdpa1"
- EndIf
- Var GetScore = VendingTSID
- If Seeker.TaobinErrorNetwork = 0 Then
- Var Cid = 11
- Var AddData = 1
- ;AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore
- Else
- Var PointCrm = ""
- Var Cid = 14
- Var AddData = 1
- ;AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore
- EndIf
+ Var BmiYear = Seeker.PointTaobinStr
+ Var PointCrm = ""
+ If Seeker.FromConsent = 1 Then
+ Var PointCrm = "pdpa1"
+ EndIf
+ Var GetScore = VendingTSID
+ If Seeker.TaobinErrorNetwork = 0 Then
+ Var Cid = 11
+ Var AddData = 1
+ ;AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore
+ Else
+ Var PointCrm = ""
+ Var Cid = 14
+ Var AddData = 1
+ ;AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore
+ EndIf
- Var VendingTSID = ""
- EndIf
+ Var VendingTSID = ""
+ EndIf
+
+ If Seeker.VendingCode = "MKFOO" Then
+ Var AddData = 0
+ EndIf
- If Seeker.VendingCode = "MKFOO" Then
- Var AddData = 0
EndIf
@@ -234,13 +259,16 @@
EndIf
- Var CreditReference = Seeker.CreditReferenceTmp
- Var VendingDiscount = Seeker.VendingDiscount
- Var VendingCampaign = Seeker.VendingCampaign
- Var TxReference = Seeker.TxRef1
- DEBUGVAR TxReference
- DEBUGVAR Seeker.VendingCampaign
+ If New_PaymentInter = 1 Then
+ Else
+ Var CreditReference = Seeker.CreditReferenceTmp
+ Var VendingDiscount = Seeker.VendingDiscount
+ Var VendingCampaign = Seeker.VendingCampaign
+ Var TxReference = Seeker.TxRef1
+ DEBUGVAR TxReference
+ DEBUGVAR Seeker.VendingCampaign
+ EndIf
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
@@ -637,6 +665,15 @@
DEBUGVAR SelectMenuBetweenBrewEnable1
DEBUGVAR SelectMenuBetweenBrewEnable2
+ If New_PaymentInter = 1 Then
+ __CMD "SetErrorCodeHandleByXML" 1028 "-" "-"
+ __CMD "SetErrorCodeHandleByXML" 1029 "-" "-"
+ __CMD "SetErrorCodeHandleByXML" 1030 "-" "-"
+ __CMD "SetErrorCodeHandleByXML" 1031 "-" "-"
+
+ EndIf
+
+
Var XPosiShowCountDownBrew = 768
@@ -766,7 +803,11 @@
Var Seeker = "next"
Var MultiPayEnable = "false"
- CoinPause
+ If New_PaymentInter = 1 Then
+
+ Else
+ CoinPause
+ EndIf
Open "ROOT/taobin_project/xml/page_catalog.xml"
EndIf
@@ -785,7 +826,11 @@
Var Seeker = "next"
Var MultiPayEnable = "false"
- CoinPause
+ If New_PaymentInter = 1 Then
+
+ Else
+ CoinPause
+ EndIf
Open "ROOT/taobin_project/xml/page_catalog.xml"
EndIf
diff --git a/inter/mys/xml/page_brewing3Conti.xml b/inter/mys/xml/page_brewing3Conti.xml
index 66170d78..38e301f1 100644
--- a/inter/mys/xml/page_brewing3Conti.xml
+++ b/inter/mys/xml/page_brewing3Conti.xml
@@ -9,9 +9,13 @@
Var ActionOKCase = 0
Var Seeker = "curr"
- If PayCredit = 0 Then
- Var PayCredit = 1
- CoinBack
+ If New_PaymentInter = 1 Then
+
+ Else
+ If PayCredit = 0 Then
+ Var PayCredit = 1
+ CoinBack
+ EndIf
EndIf
;Var PayCredit = 0
@@ -116,6 +120,10 @@
Var SelectDrink = Seeker.selected_a_drink
Var ServiceAmount2 = Seeker.ServiceAmount2
+ If New_PaymentInter = 1 Then
+ Var PriceDrink = Seeker.ServiceAmount2
+ EndIf
+
DEBUGVAR Seeker
DEBUGVAR Seeker.selected_a_drink
DEBUGVAR Seeker.ServiceAmount2
@@ -133,66 +141,77 @@
Var PrintCoinAmount = 0
- Var AddData = 0
+ If New_PaymentInter = 1 Then
+
+ Else
+ Var AddData = 0
+ EndIf
DEBUGVAR Seeker.TNumberTaobinMember
DEBUGVAR Seeker.PointTaobinStr
- If Seeker.TNumberTaobinMember = "" Then
+ If New_PaymentInter = 1 Then
+
Else
- If Seeker.PayWithQR = 1 Then
- Var VendingTSIDTmp1 = VendingTSIDTmp
- Else
- Var VendingTSIDTmp1 = ""
- EndIf
+ If Seeker.TNumberTaobinMember = "" Then
+
+ Else
+ If Seeker.PayWithQR = 1 Then
+ Var VendingTSIDTmp1 = VendingTSIDTmp
+ Else
+ Var VendingTSIDTmp1 = ""
+ EndIf
- Var BmiYear = Seeker.PointTaobinStr
- Var PointCrm = ""
- If Seeker.FromConsent = 1 Then
- Var PointCrm = "pdpa1"
- EndIf
- Var GetScore = VendingTSIDTmp1
- If Seeker.TaobinErrorNetwork = 0 Then
- Var Cid = 11
- Var AddData = 1
- ;AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore
- Else
- Var PointCrm = ""
- Var Cid = 14
- Var AddData = 1
- ;AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore
- EndIf
+ Var BmiYear = Seeker.PointTaobinStr
+ Var PointCrm = ""
+ If Seeker.FromConsent = 1 Then
+ Var PointCrm = "pdpa1"
+ EndIf
+ Var GetScore = VendingTSIDTmp1
+ If Seeker.TaobinErrorNetwork = 0 Then
+ Var Cid = 11
+ Var AddData = 1
+ ;AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore
+ Else
+ Var PointCrm = ""
+ Var Cid = 14
+ Var AddData = 1
+ ;AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore
+ EndIf
- Var VendingTSIDTmp1 = ""
- EndIf
+ Var VendingTSIDTmp1 = ""
+ EndIf
- If Seeker.VendingCode = "MKFOO" Then
- Var AddData = 0
- EndIf
+ If Seeker.VendingCode = "MKFOO" Then
+ Var AddData = 0
+ EndIf
- If MyMintEnable = 1 Then
- If FromMyMintPro = 1 Then
- Var AddData = 0
- EndIf
- EndIf
+ If MyMintEnable = 1 Then
+ If FromMyMintPro = 1 Then
+ Var AddData = 0
+ EndIf
+ EndIf
+
+ If ProBadValentineEnable = 1 Then
+ If FromBadValentinePro = 1 Then
+ Var AddData = 0
+ EndIf
+ EndIf
+
+ If LipitPro = 1 Then
+ If FromLipitPro = 1 Then
+ If Seeker.CodeChannel = 1 Then
+ If Seeker.CollectPointMain = 1 Then
+ Else
+ Var AddData = 0
+ EndIf
+ EndIf
+ EndIf
+ EndIf
- If ProBadValentineEnable = 1 Then
- If FromBadValentinePro = 1 Then
- Var AddData = 0
- EndIf
- EndIf
- If LipitPro = 1 Then
- If FromLipitPro = 1 Then
- If Seeker.CodeChannel = 1 Then
- If Seeker.CollectPointMain = 1 Then
- Else
- Var AddData = 0
- EndIf
- EndIf
- EndIf
EndIf
If LedLidBlink = "true" Then
@@ -221,6 +240,11 @@
DEBUGVAR ButtonGameCountDownState
+ If New_PaymentInter = 1 Then
+ SAVELOG "Brewing3 Conti NEW_PAYMENT"
+
+ EndIf
+
@@ -309,7 +333,11 @@
Var Seeker = "next"
Var MultiPayEnable = "false"
- CoinPause
+ If New_PaymentInter = 1 Then
+
+ Else
+ CoinPause
+ EndIf
Var PayCredit = 0
Open "ROOT/taobin_project/xml/page_catalog.xml"
@@ -340,7 +368,11 @@
SAVELOG "User click topup-credit button"
Var Seeker = "topupCredit"
- CoinPause
+ If New_PaymentInter = 1 Then
+
+ Else
+ CoinPause
+ EndIf
Var PayCredit = 0
If TelephoneNumber = "" Then
diff --git a/inter/mys/xml/page_brewing3Conti_event.lxml b/inter/mys/xml/page_brewing3Conti_event.lxml
index befe37fc..c4f66ab8 100644
--- a/inter/mys/xml/page_brewing3Conti_event.lxml
+++ b/inter/mys/xml/page_brewing3Conti_event.lxml
@@ -37,6 +37,9 @@
Var ECommerce = ECommerce + Seeker.IntVendingCampaign
Var ServiceParameter = "max"
Var ServiceCharge = 0
+ If New_PaymentInter = 1 Then
+ Var ServiceCharge = Seeker.ServiceCharge
+ EndIf
Var AccountType = "new"
Var testservice = "kbank"
Var tc = ""
@@ -63,15 +66,19 @@
EndIf
- If waitAckPay = 1 Then
- SAVELOG "waitAckPay = 1"
+ If New_PaymentInter = 1 Then
- If Seeker.e_receipt = "true" Then
- Open "ROOT/taobin_project/inter/mys/xml/e_receipt/page_show_e_receipt.lxml"
- EndIf
+ Else
+ If waitAckPay = 1 Then
+ SAVELOG "waitAckPay = 1"
- Open "ROOT/taobin_project/xml/page_drinkok.xml"
+ If Seeker.e_receipt = "true" Then
+ Open "ROOT/taobin_project/inter/mys/xml/e_receipt/page_show_e_receipt.lxml"
+ EndIf
+ Open "ROOT/taobin_project/xml/page_drinkok.xml"
+
+ EndIf
EndIf
@@ -105,6 +112,9 @@
Var ECommerce = ECommerce + Seeker.IntVendingCampaign
Var ServiceParameter = "max"
Var ServiceCharge = 0
+ If New_PaymentInter = 1 Then
+ Var ServiceCharge = Seeker.ServiceCharge
+ EndIf
Var AccountType = "new"
Var testservice = "kbank"
Var tc = ""
@@ -185,18 +195,22 @@
Var ChangeTimeout = ChangeTimeout + 1
EndIf
- If waitAckPay = 1 Then
- If Timeout > 60 Then
- Var VendingTSIDTmp1 = ""
- SAVELOG "waitAckPay = 1 tineout > 60"
+ If New_PaymentInter = 1 Then
- If Seeker.e_receipt = "true" Then
- Open "ROOT/taobin_project/inter/mys/xml/e_receipt/page_show_e_receipt.lxml"
- EndIf
+ Else
+ If waitAckPay = 1 Then
+ If Timeout > 60 Then
+ Var VendingTSIDTmp1 = ""
+ SAVELOG "waitAckPay = 1 tineout > 60"
- Open "ROOT/taobin_project/xml/page_drinkok.xml"
+ If Seeker.e_receipt = "true" Then
+ Open "ROOT/taobin_project/inter/mys/xml/e_receipt/page_show_e_receipt.lxml"
+ EndIf
- EndIf
+ Open "ROOT/taobin_project/xml/page_drinkok.xml"
+
+ EndIf
+ EndIf
EndIf
If waitAckPay = 2 Then
@@ -229,6 +243,9 @@
Var ECommerce = ECommerce + Seeker.IntVendingCampaign
Var ServiceParameter = "max"
Var ServiceCharge = 0
+ If New_PaymentInter = 1 Then
+ Var ServiceCharge = Seeker.ServiceCharge
+ EndIf
Var AccountType = "new"
Var testservice = "kbank"
Var tc = ""
@@ -264,38 +281,57 @@
EndIf
- If HURR_FOREVER = "S:0" Then
- Var HURR_FOREVER = "F:1303"
+ If New_PaymentInter = 1 Then
+ Var ServiceType = "coffee-refund"
+ Var ServiceCredit = SelectDrink
+ Var SuggestID = ""
+ Var SessionID2 = ""
+
+ Var VendingDiscount = 0
+ Var VendingCampaign = 0
+ Var PayDetail = ""
+ Var PayDetail2 = ""
+ Var VendingOrderID = Seeker.ORDER_ID
+ Var ServiceRefund = 0
+ Var ServiceCharge = Seeker.ServiceCharge
+ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceRefund ServiceCharge Donate
+
+ Else
+
+ If HURR_FOREVER = "S:0" Then
+ Var HURR_FOREVER = "F:1303"
+ EndIf
+
+
+ Var PayDetail = "2/" + HURR_FOREVER
+ Var PayDetail = PayDetail + "/"
+ Var PayDetail = PayDetail + SAMESALARY
+ Var PayDetail = PayDetail + "/"
+ Var PayDetail = PayDetail + NOBONUS
+ Var PayDetail = PayDetail + "/XML|"
+ Var PayDetail = PayDetail + Seeker.OrderChanel
+
+
+
+ ;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
+
+ Var ServiceType = "coffee"
+ Var ServiceCredit = SelectDrink
+ Var SuggestID = ""
+ Var SessionID2 = ""
+
+
+ Var PayDetail2 = Seeker.PayDetail2
+ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+
+
+ ;If Seeker.CodeChannel = 0 Then
+ ; SAVELOG "back_to_main from line > 315."
+ ; Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+ ;EndIf
+
EndIf
-
- Var PayDetail = "2/" + HURR_FOREVER
- Var PayDetail = PayDetail + "/"
- Var PayDetail = PayDetail + SAMESALARY
- Var PayDetail = PayDetail + "/"
- Var PayDetail = PayDetail + NOBONUS
- Var PayDetail = PayDetail + "/XML|"
- Var PayDetail = PayDetail + Seeker.OrderChanel
-
-
-
- ;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
-
- Var ServiceType = "coffee"
- Var ServiceCredit = SelectDrink
- Var SuggestID = ""
- Var SessionID2 = ""
-
-
- Var PayDetail2 = Seeker.PayDetail2
- Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
-
-
- ;If Seeker.CodeChannel = 0 Then
- ; SAVELOG "back_to_main from line > 315."
- ; Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
- ;EndIf
-
Var waitAckPay = 2
Var TimeoutWaitPay = 45
Var Timeout = 5
@@ -347,35 +383,54 @@
EndIf
- If HURR_FOREVER = "S:0" Then
- Var HURR_FOREVER = "F:1303"
+ If New_PaymentInter = 1 Then
+ Var ServiceType = "coffee-refund"
+ Var ServiceCredit = SelectDrink
+ Var SuggestID = ""
+ Var SessionID2 = ""
+
+ Var VendingDiscount = 0
+ Var VendingCampaign = 0
+ Var PayDetail = ""
+ Var PayDetail2 = ""
+ Var VendingOrderID = Seeker.ORDER_ID
+ Var ServiceRefund = 0
+ Var ServiceCharge = Seeker.ServiceCharge
+ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceRefund ServiceCharge Donate
+
+ Else
+
+ If HURR_FOREVER = "S:0" Then
+ Var HURR_FOREVER = "F:1303"
+ EndIf
+
+ Var PayDetail = "2/" + HURR_FOREVER
+ Var PayDetail = PayDetail + "/"
+ Var PayDetail = PayDetail + SAMESALARY
+ Var PayDetail = PayDetail + "/"
+ Var PayDetail = PayDetail + NOBONUS
+ Var PayDetail = PayDetail + "/XML|"
+ Var PayDetail = PayDetail + Seeker.OrderChanel
+
+ ;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
+
+
+ Var ServiceType = "coffee"
+ Var ServiceCredit = SelectDrink
+ Var SuggestID = ""
+ Var SessionID2 = ""
+
+
+ Var PayDetail2 = Seeker.PayDetail2
+ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+
+ ;If Seeker.CodeChannel = 0 Then
+ ; SAVELOG "back_to_main from line > 357."
+ ; Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+ ;EndIf
+
EndIf
- Var PayDetail = "2/" + HURR_FOREVER
- Var PayDetail = PayDetail + "/"
- Var PayDetail = PayDetail + SAMESALARY
- Var PayDetail = PayDetail + "/"
- Var PayDetail = PayDetail + NOBONUS
- Var PayDetail = PayDetail + "/XML|"
- Var PayDetail = PayDetail + Seeker.OrderChanel
-
- ;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
-
-
- Var ServiceType = "coffee"
- Var ServiceCredit = SelectDrink
- Var SuggestID = ""
- Var SessionID2 = ""
-
-
- Var PayDetail2 = Seeker.PayDetail2
- Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
-
- ;If Seeker.CodeChannel = 0 Then
- ; SAVELOG "back_to_main from line > 357."
- ; Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
- ;EndIf
-
Var waitAckPay = 2
Var TimeoutWaitPay = 45
Var Timeout = 5
@@ -387,37 +442,44 @@
If ChangeOK = 3 Then
If ActionOKCase = 0 Then
- Var SVT = "coffee"
- Var ACC = "0899999999"
+ If New_PaymentInter = 1 Then
+
- If Seeker.TNumberTaobinMember = "" Then
Else
- Var ACC = Seeker.TNumberTaobinMember
+ Var SVT = "coffee"
+ Var ACC = "0899999999"
+
+ If Seeker.TNumberTaobinMember = "" Then
+ Else
+ Var ACC = Seeker.TNumberTaobinMember
+ EndIf
+
+
+ If HURR_FOREVER = "S:0" Then
+ Var HURR_FOREVER = "F:1303"
+ EndIf
+
+ Var PayDetail = "2/" + HURR_FOREVER
+ Var PayDetail = PayDetail + "/"
+ Var PayDetail = PayDetail + SAMESALARY
+ Var PayDetail = PayDetail + "/"
+ Var PayDetail = PayDetail + NOBONUS
+ Var PayDetail = PayDetail + "/XML|"
+ Var PayDetail = PayDetail + Seeker.OrderChanel
+
+
+
+
+ Var DEE = PayDetail
+
+ PAYEXT SVT ACC VendingTSIDTmp DEE
+
+ CoinBack
+
+
EndIf
- If HURR_FOREVER = "S:0" Then
- Var HURR_FOREVER = "F:1303"
- EndIf
-
- Var PayDetail = "2/" + HURR_FOREVER
- Var PayDetail = PayDetail + "/"
- Var PayDetail = PayDetail + SAMESALARY
- Var PayDetail = PayDetail + "/"
- Var PayDetail = PayDetail + NOBONUS
- Var PayDetail = PayDetail + "/XML|"
- Var PayDetail = PayDetail + Seeker.OrderChanel
-
-
-
-
- Var DEE = PayDetail
-
- PAYEXT SVT ACC VendingTSIDTmp DEE
-
- CoinBack
-
-
Var ActionOKCase = 1
If Seeker.CodeChannel = 0 Then
SAVELOG "back_to_main from line > 391."
@@ -448,119 +510,136 @@
Var waitAckPay = 0
Var Timeout = 0
- Var ProcessText = ""
-
- If Seeker.TNumberTaobinCredit = "" Then
- Var TelephoneNumber = "0899999999"
- Var PayO2 = ""
-
- If Seeker.TNumberTaobinMember = "" Then
- Else
- Var TelephoneNumber = Seeker.TNumberTaobinMember
- EndIf
-
- Else
- Var TelephoneNumber = Seeker.TNumberTaobinCredit
- Var PayO2 = Seeker.CoffeePinNumber
- EndIf
-
- If AddData = 1 Then
- Var Cid = 26
- DEBUGVAR "Brewing3Conti"
- DEBUGVAR Seeker
- DEBUGVAR Seeker.UseGet15Discount
- If NewCollectPoint = 1 Then
- If Seeker.UseGet15Discount = 1 Then
- Var Cid = 39
- Else
- Var Cid = 40
- Var PreviousSeeker.UseGetDrink5Bath = 0
- EndIf
- EndIf
-
- AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
- EndIf
-
- Var ServiceType = "coffee"
- Var ServiceCredit = SelectDrink
- Var SuggestID = ""
-
- Var PayDetail = "2/" + HURR_FOREVER
- Var PayDetail = PayDetail + "/"
- Var PayDetail = PayDetail + SAMESALARY
- Var PayDetail = PayDetail + "/"
- Var PayDetail = PayDetail + NOBONUS
- Var PayDetail = PayDetail + "/XML|"
- Var PayDetail = PayDetail + Seeker.OrderChanel
-
-
- ;Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
-
- If GetFreeFromError = 1 Then
- Var Seeker.CodeChannel = 1
- Var Seeker.VendingCode = "C48"
- Var Seeker.CodeNumber = "0000000000"
- Var VendingCampaign = ServiceAmount2
- EndIf
-
- If Seeker.PayWithQR = 0 Then
- If Seeker.CodeChannel = 1 Then
- Var SessionID2 = SessionID2 + "/"
- Var SessionID2 = SessionID2 + ""
- Var SessionID2 = SessionID2 + "/"
- Var SessionID2 = SessionID2 + Seeker.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 + Seeker.CodeNumber
- Var SessionID2 = SessionID2 + "/"
-
- If Seeker.CreditCard = 1 Then
-
- CashlessReq SUCCESS ""
- ;CashlessReq FAIL ""
-
- EndIf
- Var PayDetail2 = Seeker.PayDetail2
- Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
- Else
-
-
- If Seeker.CreditCard = 1 Then
-
-
- CashlessReq SUCCESS ""
- ;CashlessReq FAIL ""
-
- EndIf
- Var PayDetail2 = Seeker.PayDetail2
- Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
-
-
- EndIf
+ If New_PaymentInter = 1 Then
Else
- ;no wait ack pay
- Var waitAckPay = 0
+ Var ProcessText = ""
- Var SVT = "coffee"
- Var ACC = "0899999999"
- Var DEE = PayDetail
+ If Seeker.TNumberTaobinCredit = "" Then
+ Var TelephoneNumber = "0899999999"
+ Var PayO2 = ""
- If Seeker.TNumberTaobinMember = "" Then
- Else
- Var ACC = Seeker.TNumberTaobinMember
- EndIf
+ If Seeker.TNumberTaobinMember = "" Then
+ Else
+ Var TelephoneNumber = Seeker.TNumberTaobinMember
+ EndIf
- PAYEXT SVT ACC VendingTSIDTmp DEE
+ Else
+ Var TelephoneNumber = Seeker.TNumberTaobinCredit
+ Var PayO2 = Seeker.CoffeePinNumber
+ EndIf
- CoinBack
+ If AddData = 1 Then
+ Var Cid = 26
+ DEBUGVAR "Brewing3Conti"
+ DEBUGVAR Seeker
+ DEBUGVAR Seeker.UseGet15Discount
+ If NewCollectPoint = 1 Then
+ If Seeker.UseGet15Discount = 1 Then
+ Var Cid = 39
+ Else
+ Var Cid = 40
+ Var PreviousSeeker.UseGetDrink5Bath = 0
+ EndIf
+ EndIf
+
+ AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
+ EndIf
+
+ Var ServiceType = "coffee"
+ Var ServiceCredit = SelectDrink
+ Var SuggestID = ""
+
+ Var PayDetail = "2/" + HURR_FOREVER
+ Var PayDetail = PayDetail + "/"
+ Var PayDetail = PayDetail + SAMESALARY
+ Var PayDetail = PayDetail + "/"
+ Var PayDetail = PayDetail + NOBONUS
+ Var PayDetail = PayDetail + "/XML|"
+ Var PayDetail = PayDetail + Seeker.OrderChanel
+
+
+ ;Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
+
+ If GetFreeFromError = 1 Then
+ Var Seeker.CodeChannel = 1
+ Var Seeker.VendingCode = "C48"
+ Var Seeker.CodeNumber = "0000000000"
+ Var VendingCampaign = ServiceAmount2
+ EndIf
+
+ EndIf
+
+ If New_PaymentInter = 1 Then
+ If Seeker.PayWithQR = 0 Then
+ If Seeker.CreditCard = 1 Then
+ CashlessReq SUCCESS Seeker.CashlessVendingTrackNumber
+ EndIf
+ EndIf
+ Else
+ If Seeker.PayWithQR = 0 Then
+ If Seeker.CodeChannel = 1 Then
+ Var SessionID2 = SessionID2 + "/"
+ Var SessionID2 = SessionID2 + ""
+ Var SessionID2 = SessionID2 + "/"
+ Var SessionID2 = SessionID2 + Seeker.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 + Seeker.CodeNumber
+ Var SessionID2 = SessionID2 + "/"
+
+ If Seeker.CreditCard = 1 Then
+
+ CashlessReq SUCCESS ""
+ ;CashlessReq FAIL ""
+
+ EndIf
+ Var PayDetail2 = Seeker.PayDetail2
+ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+ Else
+
+
+ If Seeker.CreditCard = 1 Then
+
+
+ CashlessReq SUCCESS ""
+ ;CashlessReq FAIL ""
+
+ EndIf
+ Var PayDetail2 = Seeker.PayDetail2
+ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+
+
+ EndIf
+
+
+ Else
+
+ ;no wait ack pay
+ Var waitAckPay = 0
+
+ Var SVT = "coffee"
+ Var ACC = "0899999999"
+ Var DEE = PayDetail
+
+ If Seeker.TNumberTaobinMember = "" Then
+ Else
+ Var ACC = Seeker.TNumberTaobinMember
+ EndIf
+
+ PAYEXT SVT ACC VendingTSIDTmp DEE
+
+ CoinBack
+
+
+ EndIf
EndIf
@@ -590,19 +669,24 @@
If ErrTimeout = 0 Then
Var ErrTimeout = 1
- If AddData = 1 Then
- Var Cid = 26
+ If New_PaymentInter = 1 Then
- If NewCollectPoint = 1 Then
- If Seeker.UseGet15Discount = 1 Then
- Var Cid = 39
- Else
- Var Cid = 40
- Var PreviousSeeker.UseGetDrink5Bath = 0
- EndIf
- EndIf
- AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
+ Else
+ If AddData = 1 Then
+ Var Cid = 26
+
+ If NewCollectPoint = 1 Then
+ If Seeker.UseGet15Discount = 1 Then
+ Var Cid = 39
+ Else
+ Var Cid = 40
+ Var PreviousSeeker.UseGetDrink5Bath = 0
+ EndIf
+ EndIf
+
+ AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
+ EndIf
EndIf
@@ -635,30 +719,49 @@
Else
- If Seeker.VendingCode = "MKFOO" Then
- Var Cid = 33
- Var PointCrm = "0"
- Var GetScore = "1"
- Var TelephoneNumberx = "0899999999"
- AddData Cid Seeker.TNumberTaobinMember Seeker.CodeNumber PointCrm GetScore
- Var Seeker.CodeChannel = 0
- EndIf
+ If New_PaymentInter = 1 Then
- If CoinAmount > 0 Then
-
- If ChangeFlag = 0 Then
+ If ChangeFlag = 0 Then
Var ChangeFlag = 1
Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign
If Seeker.StoreCreditFlag = 1 Then
- Var ChangeOK = 2
+ Var ChangeOK = 2
Else
- Change ServiceAmount3
+ Change ServiceAmount3
EndIf
- EndIf
+ EndIf
+
Else
- Var ChangeOK = 2
+
+ If Seeker.VendingCode = "MKFOO" Then
+ Var Cid = 33
+ Var PointCrm = "0"
+ Var GetScore = "1"
+ Var TelephoneNumberx = "0899999999"
+ AddData Cid Seeker.TNumberTaobinMember Seeker.CodeNumber PointCrm GetScore
+ Var Seeker.CodeChannel = 0
+ EndIf
+
+ If CoinAmount > 0 Then
+
+ If ChangeFlag = 0 Then
+ Var ChangeFlag = 1
+ Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign
+
+ If Seeker.StoreCreditFlag = 1 Then
+ Var ChangeOK = 2
+ Else
+ Change ServiceAmount3
+ EndIf
+
+ EndIf
+ Else
+ Var ChangeOK = 2
+ EndIf
+
+
EndIf
diff --git a/inter/mys/xml/page_brewing3_event.lxml b/inter/mys/xml/page_brewing3_event.lxml
index d323f135..9ede9682 100644
--- a/inter/mys/xml/page_brewing3_event.lxml
+++ b/inter/mys/xml/page_brewing3_event.lxml
@@ -1,5 +1,22 @@
+ DEBUGVAR Seeker.VendingTSID
+ DEBUGVAR VendingTSID
+ If Seeker.VendingTSID = "" Then
+ DEBUGVAR Seeker.VendingTSID
+ DEBUGVAR VendingTSID
+ If VendingTSID = "" Then
+
+
+ Else
+ Var Seeker.VendingTSID = VendingTSID
+ EndIf
+
+ DEBUGVAR Seeker.VendingTSID
+ DEBUGVAR VendingTSID
+
+ EndIf
+
If CreditCardVoid = 1 Then
Var ChangeOK = 2
; check-if-void-switch-finish
@@ -39,6 +56,10 @@
Var ECommerce = ECommerce + Seeker.IntVendingCampaign
Var ServiceParameter = "max"
Var ServiceCharge = 0
+ If New_PaymentInter = 1 Then
+ Var ServiceCharge = Seeker.ServiceCharge
+ EndIf
+
Var AccountType = "new"
Var testservice = "kbank"
Var tc = ""
@@ -65,18 +86,25 @@
EndIf
- If waitAckPay = 1 Then
+ If New_PaymentInter = 1 Then
- ; temp:redirect-show-qr
- If Seeker.e_receipt = "true" Then
- Open "ROOT/taobin_project/inter/mys/xml/e_receipt/page_show_e_receipt.lxml"
- EndIf
+ Else
- SAVELOG "waitAckPay = 1"
- Open "ROOT/taobin_project/xml/page_drinkok.xml"
+ If waitAckPay = 1 Then
- EndIf
+ ; temp:redirect-show-qr
+
+ If Seeker.e_receipt = "true" Then
+ Open "ROOT/taobin_project/inter/mys/xml/e_receipt/page_show_e_receipt.lxml"
+ EndIf
+
+ SAVELOG "waitAckPay = 1"
+ Open "ROOT/taobin_project/xml/page_drinkok.xml"
+
+ EndIf
+
+ EndIf
@@ -110,6 +138,9 @@
Var ECommerce = ECommerce + Seeker.IntVendingCampaign
Var ServiceParameter = "max"
Var ServiceCharge = 0
+ If New_PaymentInter = 1 Then
+ Var ServiceCharge = Seeker.ServiceCharge
+ EndIf
Var AccountType = "new"
Var testservice = "kbank"
Var tc = ""
@@ -141,6 +172,7 @@
DEBUGVAR DirImage
+ DEBUGVAR CashlessAmount
Var Timeout = Timeout + 1
@@ -270,21 +302,25 @@
Var ChangeTimeout = ChangeTimeout + 1
EndIf
- If waitAckPay = 1 Then
- If Timeout > 60 Then
+ If New_PaymentInter = 1 Then
- ; temp:redirect-show-qr
+ Else
+ If waitAckPay = 1 Then
+ If Timeout > 60 Then
- If Seeker.e_receipt = "true" Then
- Open "ROOT/taobin_project/inter/mys/xml/e_receipt/page_show_e_receipt.lxml"
- EndIf
+ ; temp:redirect-show-qr
+
+ If Seeker.e_receipt = "true" Then
+ Open "ROOT/taobin_project/inter/mys/xml/e_receipt/page_show_e_receipt.lxml"
+ EndIf
- Var VendingTSID = ""
- SAVELOG "TIMEOUT=60"
- Open "ROOT/taobin_project/xml/page_drinkok.xml"
+ Var VendingTSID = ""
+ SAVELOG "TIMEOUT=60"
+ Open "ROOT/taobin_project/xml/page_drinkok.xml"
- EndIf
+ EndIf
+ EndIf
EndIf
If waitAckPay = 2 Then
@@ -316,6 +352,9 @@
Var ECommerce = ECommerce + Seeker.IntVendingCampaign
Var ServiceParameter = "max"
Var ServiceCharge = 0
+ If New_PaymentInter = 1 Then
+ Var ServiceCharge = Seeker.ServiceCharge
+ EndIf
Var AccountType = "new"
Var testservice = "kbank"
Var tc = ""
@@ -351,46 +390,67 @@
EndIf
- If NextOrderStatus = "Disable" Then
- Var PayDetail="2/F:1221/0/"
- Var PayDetail = PayDetail + "/XML|"
- Var PayDetail = PayDetail + Seeker.OrderChanel
+ If New_PaymentInter = 1 Then
+
+ Var ServiceType = "coffee-refund"
+ Var ServiceCredit = SelectDrink
+ Var SuggestID = ""
+ Var SessionID2 = ""
+
+ Var VendingDiscount = 0
+ Var VendingCampaign = 0
+ Var PayDetail = ""
+ Var PayDetail2 = ""
+ Var VendingOrderID = Seeker.ORDER_ID
+ Var ServiceRefund = 0
+ Var ServiceCharge = Seeker.ServiceCharge
+ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceRefund ServiceCharge Donate
+
+
Else
+ If NextOrderStatus = "Disable" Then
+ Var PayDetail="2/F:1221/0/"
+ Var PayDetail = PayDetail + "/XML|"
+ Var PayDetail = PayDetail + Seeker.OrderChanel
+ Else
- If HURR_FOREVER = "S:0" Then
- Var HURR_FOREVER = "F:1303"
- EndIf
+ If HURR_FOREVER = "S:0" Then
+ Var HURR_FOREVER = "F:1303"
+ EndIf
- Var PayDetail = "2/" + HURR_FOREVER
- Var PayDetail = PayDetail + "/"
- Var PayDetail = PayDetail + SAMESALARY
- Var PayDetail = PayDetail + "/"
- Var PayDetail = PayDetail + NOBONUS
- Var PayDetail = PayDetail + "/XML|"
- Var PayDetail = PayDetail + Seeker.OrderChanel
+ Var PayDetail = "2/" + HURR_FOREVER
+ Var PayDetail = PayDetail + "/"
+ Var PayDetail = PayDetail + SAMESALARY
+ Var PayDetail = PayDetail + "/"
+ Var PayDetail = PayDetail + NOBONUS
+ Var PayDetail = PayDetail + "/XML|"
+ Var PayDetail = PayDetail + Seeker.OrderChanel
+
+ EndIf
+
+
+
+ ;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
+
+ Var ServiceType = "coffee"
+ Var ServiceCredit = SelectDrink
+ Var SuggestID = ""
+ Var SessionID2 = ""
+
+
+ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+
+
+ ;If Seeker.CodeChannel = 0 Then
+ ; SAVELOG "back_to_main from line > 315."
+ ; Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+ ;EndIf
+
EndIf
-
-
- ;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
-
- Var ServiceType = "coffee"
- Var ServiceCredit = SelectDrink
- Var SuggestID = ""
- Var SessionID2 = ""
-
-
- Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
-
-
- ;If Seeker.CodeChannel = 0 Then
- ; SAVELOG "back_to_main from line > 315."
- ; Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
- ;EndIf
-
Var waitAckPay = 2
Var Timeout = 5
Var ActionOKCase = 1
@@ -489,42 +549,49 @@
If ChangeOK = 3 Then
If ActionOKCase = 0 Then
- Var SVT = "coffee"
- Var ACC = "0899999999"
+ If New_PaymentInter = 1 Then
+
- If Seeker.TNumberTaobinMember = "" Then
Else
- Var ACC = Seeker.TNumberTaobinMember
- EndIf
+ Var SVT = "coffee"
+ Var ACC = "0899999999"
+
+ If Seeker.TNumberTaobinMember = "" Then
+ Else
+ Var ACC = Seeker.TNumberTaobinMember
+ EndIf
- If NextOrderStatus = "Disable" Then
- Var PayDetail="2/F:1221/0/"
- Var PayDetail = PayDetail + "/XML|"
- Var PayDetail = PayDetail + Seeker.OrderChanel
- Else
+ If NextOrderStatus = "Disable" Then
+ Var PayDetail="2/F:1221/0/"
+ Var PayDetail = PayDetail + "/XML|"
+ Var PayDetail = PayDetail + Seeker.OrderChanel
+ Else
- If HURR_FOREVER = "S:0" Then
- Var HURR_FOREVER = "F:1303"
- EndIf
+ If HURR_FOREVER = "S:0" Then
+ Var HURR_FOREVER = "F:1303"
+ EndIf
+
+ Var PayDetail = "2/" + HURR_FOREVER
+ Var PayDetail = PayDetail + "/"
+ Var PayDetail = PayDetail + SAMESALARY
+ Var PayDetail = PayDetail + "/"
+ Var PayDetail = PayDetail + NOBONUS
+ Var PayDetail = PayDetail + "/XML|"
+ Var PayDetail = PayDetail + Seeker.OrderChanel
+
+ EndIf
+
+
+
+
+ Var DEE = PayDetail
+
+ PAYEXT SVT ACC VendingTSIDTmp DEE
- Var PayDetail = "2/" + HURR_FOREVER
- Var PayDetail = PayDetail + "/"
- Var PayDetail = PayDetail + SAMESALARY
- Var PayDetail = PayDetail + "/"
- Var PayDetail = PayDetail + NOBONUS
- Var PayDetail = PayDetail + "/XML|"
- Var PayDetail = PayDetail + Seeker.OrderChanel
EndIf
-
-
-
- Var DEE = PayDetail
-
- PAYEXT SVT ACC VendingTSIDTmp DEE
-
Var ActionOKCase = 1
SAVELOG "ActionOKCase = change OK 3"
If Seeker.CodeChannel = 0 Then
@@ -553,110 +620,120 @@
Var waitAckPay = 0
Var Timeout = 0
- Var ProcessText = ""
-
- If Seeker.TNumberTaobinCredit = "" Then
- Var TelephoneNumber = "0899999999"
- Var PayO2 = ""
-
- If Seeker.TNumberTaobinMember = "" Then
- Else
- Var TelephoneNumber = Seeker.TNumberTaobinMember
- EndIf
+ If New_PaymentInter = 1 Then
+ If Seeker.CreditCard = 1 Then
+ WRITE_FILE "/mnt/sdcard/app_run_flag" "1"
+ CashlessReq SUCCESS Seeker.CashlessVendingTrackNumber
+ EndIf
Else
- Var TelephoneNumber = Seeker.TNumberTaobinCredit
- Var PayO2 = Seeker.CoffeePinNumber
+ Var ProcessText = ""
+
+ If Seeker.TNumberTaobinCredit = "" Then
+ Var TelephoneNumber = "0899999999"
+ Var PayO2 = ""
+
+ If Seeker.TNumberTaobinMember = "" Then
+ Else
+ Var TelephoneNumber = Seeker.TNumberTaobinMember
+ EndIf
+
+ Else
+ Var TelephoneNumber = Seeker.TNumberTaobinCredit
+ Var PayO2 = Seeker.CoffeePinNumber
+ EndIf
+
+
+
+ If AddData = 1 Then
+ Var Cid = 26
+ AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
+ EndIf
+
+ Var ServiceType = "coffee"
+ Var ServiceCredit = SelectDrink
+ Var SuggestID = ""
+
+ Var PayDetail = "2/" + HURR_FOREVER
+ Var PayDetail = PayDetail + "/"
+ Var PayDetail = PayDetail + SAMESALARY
+ Var PayDetail = PayDetail + "/"
+ Var PayDetail = PayDetail + NOBONUS
+ Var PayDetail = PayDetail + "/XML|"
+ Var PayDetail = PayDetail + Seeker.OrderChanel
+
+
+ ;Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
+
+ If GetFreeFromError = 1 Then
+ Var Seeker.CodeChannel = 1
+ Var Seeker.VendingCode = "FAU"
+ Var Seeker.CodeNumber = "0000000000"
+ Var VendingCampaign = ServiceAmount2
+ EndIf
+
+ If Seeker.PayWithQR = 0 Then
+ If Seeker.CodeChannel = 1 Then
+ Var SessionID2 = SessionID2 + "/"
+ Var SessionID2 = SessionID2 + ""
+ Var SessionID2 = SessionID2 + "/"
+ Var SessionID2 = SessionID2 + Seeker.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 + Seeker.CodeNumber
+ Var SessionID2 = SessionID2 + "/"
+
+ If Seeker.CreditCard = 1 Then
+
+ WRITE_FILE "/mnt/sdcard/app_run_flag" "1"
+ CashlessReq SUCCESS ""
+ ;CashlessReq FAIL ""
+
+ EndIf
+
+ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+ Else
+
+ If Seeker.CreditCard = 1 Then
+
+ WRITE_FILE "/mnt/sdcard/app_run_flag" "1"
+ CashlessReq SUCCESS ""
+ ;CashlessReq FAIL ""
+
+ EndIf
+
+ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+
+
+ EndIf
+
+
+ Else
+
+ ;no wait ack pay
+ Var waitAckPay = 0
+
+ Var SVT = "coffee"
+ Var ACC = "0899999999"
+ Var DEE = PayDetail
+
+ If Seeker.TNumberTaobinMember = "" Then
+ Else
+ Var ACC = Seeker.TNumberTaobinMember
+ EndIf
+
+ PAYEXT SVT ACC VendingTSIDTmp DEE
+
+ EndIf
EndIf
- If AddData = 1 Then
- Var Cid = 26
- AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
- EndIf
-
- Var ServiceType = "coffee"
- Var ServiceCredit = SelectDrink
- Var SuggestID = ""
-
- Var PayDetail = "2/" + HURR_FOREVER
- Var PayDetail = PayDetail + "/"
- Var PayDetail = PayDetail + SAMESALARY
- Var PayDetail = PayDetail + "/"
- Var PayDetail = PayDetail + NOBONUS
- Var PayDetail = PayDetail + "/XML|"
- Var PayDetail = PayDetail + Seeker.OrderChanel
-
-
- ;Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
-
- If GetFreeFromError = 1 Then
- Var Seeker.CodeChannel = 1
- Var Seeker.VendingCode = "FAU"
- Var Seeker.CodeNumber = "0000000000"
- Var VendingCampaign = ServiceAmount2
- EndIf
-
- If Seeker.PayWithQR = 0 Then
- If Seeker.CodeChannel = 1 Then
- Var SessionID2 = SessionID2 + "/"
- Var SessionID2 = SessionID2 + ""
- Var SessionID2 = SessionID2 + "/"
- Var SessionID2 = SessionID2 + Seeker.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 + Seeker.CodeNumber
- Var SessionID2 = SessionID2 + "/"
-
- If Seeker.CreditCard = 1 Then
-
- WRITE_FILE "/mnt/sdcard/app_run_flag" "1"
- CashlessReq SUCCESS ""
- ;CashlessReq FAIL ""
-
- EndIf
-
- Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
- Else
-
- If Seeker.CreditCard = 1 Then
-
- WRITE_FILE "/mnt/sdcard/app_run_flag" "1"
- CashlessReq SUCCESS ""
- ;CashlessReq FAIL ""
-
- EndIf
-
- Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
-
-
- EndIf
-
-
- Else
-
- ;no wait ack pay
- Var waitAckPay = 0
-
- Var SVT = "coffee"
- Var ACC = "0899999999"
- Var DEE = PayDetail
-
- If Seeker.TNumberTaobinMember = "" Then
- Else
- Var ACC = Seeker.TNumberTaobinMember
- EndIf
-
- PAYEXT SVT ACC VendingTSIDTmp DEE
-
- EndIf
-
EndIf
__CMD "clear-stock-data" 0 "-" "-"
@@ -685,9 +762,13 @@
If ErrTimeout = 0 Then
Var ErrTimeout = 1
- If AddData = 1 Then
- Var Cid = 26
- AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
+ If New_PaymentInter = 1 Then
+
+ Else
+ If AddData = 1 Then
+ Var Cid = 26
+ AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
+ EndIf
EndIf
@@ -725,31 +806,44 @@
Else
-
- If Seeker.VendingCode = "MKFOO" Then
- Var Cid = 33
- Var PointCrm = "0"
- Var GetScore = "1"
- Var TelephoneNumberx = "0899999999"
- AddData Cid Seeker.TNumberTaobinMember Seeker.CodeNumber PointCrm GetScore
- Var Seeker.CodeChannel = 0
- EndIf
-
- If CoinAmount > 0 Then
-
- If ChangeFlag = 0 Then
+ If New_PaymentInter = 1 Then
+ If ChangeFlag = 0 Then
Var ChangeFlag = 1
Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign
If Seeker.StoreCreditFlag = 1 Then
- Var ChangeOK = 2
+ Var ChangeOK = 2
Else
- Change ServiceAmount3
+ Change ServiceAmount3
EndIf
- EndIf
- Else
- Var ChangeOK = 2
+ EndIf
+ Else
+ If Seeker.VendingCode = "MKFOO" Then
+ Var Cid = 33
+ Var PointCrm = "0"
+ Var GetScore = "1"
+ Var TelephoneNumberx = "0899999999"
+ AddData Cid Seeker.TNumberTaobinMember Seeker.CodeNumber PointCrm GetScore
+ Var Seeker.CodeChannel = 0
+ EndIf
+
+ If CoinAmount > 0 Then
+
+ If ChangeFlag = 0 Then
+ Var ChangeFlag = 1
+ Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign
+
+ If Seeker.StoreCreditFlag = 1 Then
+ Var ChangeOK = 2
+ Else
+ Change ServiceAmount3
+ EndIf
+
+ EndIf
+ Else
+ Var ChangeOK = 2
+ EndIf
EndIf
diff --git a/inter/mys/xml/page_void_credit_card.lxml b/inter/mys/xml/page_void_credit_card.lxml
index 0169e458..6c771f50 100644
--- a/inter/mys/xml/page_void_credit_card.lxml
+++ b/inter/mys/xml/page_void_credit_card.lxml
@@ -14,7 +14,7 @@
DEBUGVAR "Credit::void.switch(app: finexus)"
WRITE_FILE "/mnt/sdcard/app_run_flag" "1"
- CashlessReq FAIL ""
+ CashlessReq FAIL Seeker.CashlessVendingTrackNumber
Var ChangeFlag = 1
Var CreditCardVoid = 1
diff --git a/inter/mys/xml/process/payment.ev b/inter/mys/xml/process/payment.ev
new file mode 100644
index 00000000..c831fb7e
--- /dev/null
+++ b/inter/mys/xml/process/payment.ev
@@ -0,0 +1,133 @@
+DEBUGVAR " payment ev evaluate "
+DEBUGVAR CashlessAmount
+If Seeker.PayWithQR = 1 Then
+
+ Var ServiceAmount2 = Seeker.ServiceAmount2
+ Var CreditReference = ""
+ Var TxReference = ""
+ Var VendingDiscount = 0
+ Var VendingCampaign = 0
+ Var SelectDrink = Seeker.selected_a_drink
+ Var SuggestID = ""
+ Var ServiceCharge = Seeker.ServiceCharge
+
+ If ChangeFlag2 = 1 Then
+ Var TelephoneNumber = "0899999999"
+ Var PayO2 = ""
+ Var ServiceType = "credit"
+ Var SessionID2 = SelectDrink
+ Var ServiceCredit = "coffee"
+ Var PayDetail = ""
+ Var PayDetail2 = ""
+ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+
+ Else
+
+ If Seeker.StoreCreditFlag = 1 Then
+ Var TelephoneNumber = Seeker.TNumberTaobinCredit
+ Var PayO2 = Seeker.CoffeePinNumber
+ Var ServiceType = "credit"
+ Var SessionID2 = SelectDrink
+ Var ServiceCredit = "coffee"
+ Var PayDetail = ""
+ Var PayDetail2 = ""
+ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+
+ EndIf
+ EndIf
+
+ TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/addpoint.ev"
+
+ If ConnectWithPOSMachine = 1 Then
+ Var SelectDrink = Seeker.selected_a_drink
+ Var ExtendData = Seeker.ExtendData
+ Var ServiceAmount2 = Seeker.ServiceAmount2
+ Var SessionID2 = SelectSlot + ":"
+ Var SessionID2 = SessionID2 + ExtendData
+
+ Var CreditReference = Seeker.CreditReferenceTmp
+ Var VendingDiscount = Seeker.VendingDiscount
+ Var VendingCampaign = Seeker.VendingCampaign
+ Var TxReference = Seeker.TxRef1
+ Var VendingOrderID = Seeker.ORDER_ID
+ Var PayType = "newpay"
+
+ Var ServiceType = "coffee-payment"
+ Var ServiceCredit = SelectDrink
+ Var SuggestID = ""
+
+ Var ServiceCharge = Seeker.ServiceCharge
+
+ Var PayDetail = "2/S:0/0//XML|" + Seeker.OrderChanel
+
+ If GetFreeFromError = 1 Then
+ Var Seeker.CodeChannel = 1
+ Var Seeker.VendingCode = "FAU"
+ Var Seeker.CodeNumber = "0000000000"
+ Var VendingCampaign = ServiceAmount2
+ EndIf
+
+ Var PayDetail2 = Seeker.PayDetail2
+ POSPay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+ EndIf
+
+
+ Else
+
+ TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/addpoint.ev"
+
+
+ Var SelectDrink = Seeker.selected_a_drink
+ Var ExtendData = Seeker.ExtendData
+ Var ServiceAmount2 = Seeker.ServiceAmount2
+ Var SessionID2 = SelectSlot + ":"
+ Var SessionID2 = SessionID2 + ExtendData
+
+ Var CreditReference = Seeker.CreditReferenceTmp
+ Var VendingDiscount = Seeker.VendingDiscount
+ Var VendingCampaign = Seeker.VendingCampaign
+ Var TxReference = Seeker.TxRef1
+ Var VendingOrderID = Seeker.ORDER_ID
+ Var PayType = "newpay"
+
+ Var ServiceType = "coffee-payment"
+ Var ServiceCredit = SelectDrink
+ Var SuggestID = ""
+
+ Var ServiceCharge = Seeker.ServiceCharge
+
+ Var PayDetail = "2/S:0/0//XML|" + Seeker.OrderChanel
+
+ If GetFreeFromError = 1 Then
+ Var Seeker.CodeChannel = 1
+ Var Seeker.VendingCode = "FAU"
+ Var Seeker.CodeNumber = "0000000000"
+ Var VendingCampaign = ServiceAmount2
+ EndIf
+
+ If Seeker.CodeChannel = 1 Then
+ Var SessionID2 = SessionID2 + "/"
+ Var SessionID2 = SessionID2 + ""
+ Var SessionID2 = SessionID2 + "/"
+ Var SessionID2 = SessionID2 + Seeker.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 + Seeker.CodeNumber
+ Var SessionID2 = SessionID2 + "/"
+
+
+ Var PayDetail2 = Seeker.PayDetail2
+ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+ Else
+
+
+ Var PayDetail2 = Seeker.PayDetail2
+ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+
+ EndIf
+ EndIf
diff --git a/inter/sgp/menu/lang.tsv b/inter/sgp/menu/lang.tsv
index 105de3db..11986f66 100644
--- a/inter/sgp/menu/lang.tsv
+++ b/inter/sgp/menu/lang.tsv
@@ -276,6 +276,7 @@ TextID Note English Thai
800026 Do you cut-off cash box? ทำการตัดยอดหรือไม่? Do you cut-off cash box?
800027 Please Open door cash box กรุณาเปิดประตูเก็บเงินก่อน Please Open door cash box
800028 Internal Communcation fail. ระบบสื่อสารมีปัญหาภายในตู้ Internal Communcation fail.
+800029 Next ถัดไป 下一步
@@ -327,8 +328,14 @@ TextID Note English Thai
800073 Restart Shot coffee count Restart Shot coffee count
800074 Disc module not close completely แขนปิดไม่สนิท Disc module not close completely
800075 Adjust ice weight Adjust ice weight Adjust ice weight
-800076
-800077
+800076 Ice: water pump timeout น้ำหมด 制冰：水泵超时
+800077 Ice: Lack of ice failure ล้มเหลวขาดน้ำแข็ง 制冰：缺冰故障
+800078 Ice out timeout จ่ายน้ำแข็งไม่ได้ 出冰超时
+800079 Load cell fail! วัดน้ำหนักเสีย Load cell fail!
+800080 Weighing Motor forward timeout การชั่งน้ำหนักมอเตอร์หมดเวลาเดินหน้า Weighing Motor forward timeout
+800081 Weighing Motor reverse timeout การชั่งน้ำหนักมอเตอร์หมดเวลาถอยหลัง Weighing Motor reverse timeout
+800082 ICE turning forward timeout ICE กำลังหมุนตัวไปข้างหน้าจนหมดเวลา ICE turning forward timeout
+800083 ICE reverses timeout ICE ย้อนเวลาหมดเวลา ICE reverses timeout
@@ -357,6 +364,17 @@ TextID Note English Thai
800121 Current กระแสไฟฟ้า Current
800122 Soda โซดา Soda
800123 Start Defrost. Wait check ละลายน้ำแข็ง Start Defrost
+800124 Start Agitator soda หมุนมอเตอร์คนโซดา 启动搅拌器苏打 Start Agitator soda
+800125 Stop Agitator soda หยุดมอเตอร์คนโซดา 停止搅拌器苏打 Stop Agitator soda
+800126 Start/Stop Agitator soda หมุน/หยุดมอเตอร์คนโซดา 启动/停止搅拌器苏打 Start/Stop Agitator soda
+800127 Stop หยุด 停止 Stop
+800128 Low Speed หมุนช้า 低速 Low Speed
+800129 Hight Speed หมุนเร็ว 高速 Hight Speed
+800130 Compressor fan speed control ควบคุมพัลดคอมเพสเซอร์ 压缩机风扇速度控制 Compressor fan speed control
+800131 Waiting for defrost check ละลายน้ำแข็งรอตรวจสอบ 等待除霜检查
+800132 to ถึง 至
+800133 Minute นาที 分钟
+800134 Time ระยะ 时间
Test
800200 Status สถานะ Status
800201 Boiler หม้อต้ม Boiler
@@ -689,6 +707,9 @@ TextID Note English Thai
800528 Auto adjustment ปรับอัตโนมัติ
800529 Disable ปิดการใช้งาน
800530 Partial Refill เติมแบบหยอด
+800531 Alert ยืนยันการเคลียร์วัตถุดิบทั้งหมด 警报
+800532 Please type the word 'taobin'\nto confirm clearing all materials. กรุณาพิมพ์คำว่า 'taobin'\nเพื่อยืนยันการเคลียร์วัตถุดิบทั้งหมด 请输入单词'taobin'\n以确认清除所有材料。
+800533 You typed the confirmation text incorrectly. คุณพิมข้อความยืนยันผิด 您输入的确认文本不正确。
800600 Turn around หมุนกลับ
800601 Call arm Call แขน
@@ -760,6 +781,12 @@ TextID Note English Thai
800661 Shutter ชัตเตอร์
800662 Motor แกนมอเตอร์
800663 Whipper clean water น้ำล้างหัวชง
+800664 Please waiting Please waiting 请等待
+800665 Self test .... Self test .... 自我测试....
+800666 Top board Top board 顶部面板
+800667 Bottom board Bottom board 底部面板
+800668 Front board Front board 前面板
+800669 Ice board Ice board 冰面板
@@ -962,9 +989,21 @@ TextID Note English Thai
810152 Day วันที่
810153 Weight น้ำหนัก
810154 calibrate calibrate
-810155
-810156
-810157
+810155 TV ทีวี 电视
+810156 Door Key กุญแจประตู 门钥匙
+810157 Espresso Module Gear เฟืองเครื่องอัดกาแฟ 意式咖啡模块齿轮
+810158 Espresso Module Cover ตัวครอบเครื่องอัดกาแฟ 意式咖啡模块盖
+810159 Gas Pressure Connector ข้อต่อตัววัดแรงดันแก๊ส 气压连接器
+810160 TV Cooling Fan พัดลมระบายความร้อนทีวี 电视散热风扇
+810161 Ice Weight Scale Cover ตัวครอบเครื่องชั่งน้ำหนักน้ำแข็ง 冰重量秤盖
+810162 Ice Shaver Motor มอเตอร์ของกะโหลกน้ำแข็ง 刨冰机电机
+810163 Ice Shutter Motor มอเตอร์ Shutter น้ำแข็ง 冰闸门电机
+810164 Cooling Tank Stirring Motor มอเตอร์กวนน้ำในถังหล่อเย็น 冷却槽搅拌电机
+810165 Cup Dispenser Plastic Cover C2 พลาสติกครอบตัวจ่ายแก้ว C2 杯子分配器塑料盖C2
+810166 Coffee Grinder Cover ตัวครอบเครื่องบดกาแฟ 咖啡研磨机盖
+810167 Coffee Line B3 สายกาแฟ B3 咖啡线B3
+810168 Ice Limit Switch ชุด Limit Switch น้ำแข็ง 冰量限制开关
+810169 Done ทำแล้ว 完成
810199
900001 Clean Espresso path? ล้าง espresso เส้นไหน ?
900002 Clean esp drop at station 2 ลงชุดชง 2
@@ -998,8 +1037,14 @@ TextID Note English Thai
1000017 Wait a moment รอสักครู่
1000018 The machine is testing เครื่องกำลังทดสอบ
1000019 The machine is working เครื่องกำลังทำงาน
-1000020
-1000021
+1000020 testing testing 测试中
+1000021 fail ( timeout ) fail ( timeout ) 失败（超时）
+1000022 reset reset 重置
+1000023 padding padding 填充
+1000024 Slip Ring Test Slip Ring Test 滑环测试
+1000025 Slip Ring Slip Ring 滑环
+1000026 Average testing time: 7 minutes ใช้เวลาในการทดสอบประมาณ 7 นาที 平均测试时间：7分钟
+1000027 Connection Test Connection Test 连接测试
1100000 Calibrate คาลิเบรท
1100001 Select Module เลือกชุด
1100002 Module ชุด
@@ -1286,7 +1331,316 @@ TextID Note English Thai
2100055 Sleep mode will be turn off
when machine operating. Sleep mode will be turn off
when machine operating.
2100056 Please check before confirming Please check before confirming
2100057 Fan module Fan module
+2100101 Water น้ำ
+2100102 Whipper & Clean หัวชงและถ้วยล้าง
+2100103 Ice น้ำแข็ง
+2100104 Espresso Module โมดูลเอสเพรสโซ่
+2100105 Generation รุ่น
+2100106 Sensor Lid เซนเซอร์ฝา
+2100107 Straw หลอด
+2100108 Heat system ระบบทำความร้อน
+2100109 SleepTime Setting SleepTime Setting
+2100110 Camera Straw กล้องส่องหลอด
+2100111 Exhaust Fan system ระบบพัดลมดูดอากาศ
+2100112 Time start ตั้งเวลาทำงาน
+2100113 Cam ลูกเบี้ยว
+2100114 Powder ผง
+2100115 Powder Setting Powder Setting
+2100116 Powder low value Powder low value
+2100117 Powder low value ( milliseconds ) Powder low value ( milliseconds )
+2100150 Water Source Type ประเภทแหล่งน้ำ
+2100151 Refill RO แบบเติมน้ำ RO
+2100152 Filter RO แบบต่อเครื่องกรองน้ำ RO
+2100153 Filte normal แบบต่อเครื่องกรองน้ำธรรมดา
+2100170 Wash Brew head version ชนิดถ้วยล้าง
+2100171 SPINNING-WASHING-BOWL แบบที่ 1
+2100172 V2-SPINNING-WASHING-BOWL แบบที่ 2
+2100173 V3-CLEANING-MIXING-BOWL แบบที่ 3 ( พลาสติก )
+2100190 Whipper type ชนิดหัวชง
+2100191 Whipper only หัวชงรุ่นเก่า(ไม่มี encoder)
+2100192 Whipper with encoder หัวชงรุ่นใหม่(มี encoder)
+2100193 Whipper version Rev15 no-encoder หัวชงแบบใหม่ Rev15 no-en
+2100194 Whipper version Rev15 หัวชงแบบใหม่ Rev15 no-en
+2100195 Whipper fool หัวชงแบบใหม่ RevNN
+2100220 ICE gear system ชนิดเกียร์น้ำแข็ง
+2100221 Gear 6.8 RPM 80W เกียร์ 6.8 RPM 80W
+2100222 Gear 9.6 RPM 80W เกียร์ 9.6 RPM 80W
+2100223 Gear 13.4 RPM 120W เกียร์ 13.4 RPM 120W
+2100224 Taobin Gear 13.4 RPM เต่าบิน เกียร์ 13.4 RPM
+2100225 Taobin Gear 11 RPM 120W เต่าบิน เกียร์ 11 RPM 120W
+2100226 Taobin Gear 9.6 RPM 120W เต่าบิน เกียร์ 9.6 RPM 120W
+2100240 ICE water input with cool น้ำเข้าแกนน้ำแข็งผ่านหล่อเย็น
+2100241 Not install ไม่ผ่านหล่อเย็น
+2100242 installed ผ่านหล่อเย็น
+2100260 ICE board control type ชนิดบอร์ดน้ำแข็ง
+2100261 REV.C1-02 Modify REV.C1-02 Modify
+2100262 REV.C1-01 REV.C1-01
+2100280 ICE Bucket type ชนิดกระบะน้ำแข็ง
+2100281 Original model แบบเก่า
+2100282 New model แบบใหม่ (พลาสติก)
+2100300 ICE Pipe type ชนิดของท่อส่งน้ำแข็ง
+2100301 Original model แบบเก่า
+2100302 New model แบบใหม่
+2100320 ICE Compressor type ชนิดคอมเพสเซอร์
+2100321 HARN 0.75 HP HARN 0.75 HP
+2100322 sangchai 0.75 HP sangchai 0.75 HP
+2100323 Hitachi Scroll 1.00 HP Hitachi Scroll 1.00 HP
+2100324 Embraco 1.25 HP Embraco 1.25 HP
+2100340 Model by Compressor Type รุ่นขาน้ำแข็ง
+2100341 Not specified ยังไม่ได้กำหนด
+2100342 EC-14.28-1C10IG2 EC-14.28-1C10IG2
+2100343 GC-11.88-1C10IMG2 GC-11.88-1C10IMG2
+2100344 CL-15.33-1C10IMG2 CL-15.33-1C10IMG2
+2100345 EC-27.8-2C10IMG2 EC-27.8-2C10IMG2
+2100346 HS-15.9-2C10IMG2 HS-15.9-2C10IMG2
+2100347 HS-15.9-1C10IG2 HS-15.9-1C10IG2
+2100348 EC-27.8-1C15IG2 EC-27.8-1C15IG2
+2100349 KT-22.3-1C10IG2 KT-22.3-1C10IG2
+2100350 EC-27.8-1C20IG2 EC-27.8-1C20IG2
+2100351 EC-27.8-1C20IG3 EC-27.8-1C20IG3
+2100352 DF-18.00-1C10IMG2-RW DF-18.00-1C10IMG2-RW
+2100353 DF-18.00-1C10IG2-RW DF-18.00-1C10IG2-RW
+2100354 EC-14.28-1C10IG2-RW EC-14.28-1C10IG2-RW
+2100355 DF-18.00-1C10IG2-RW (5R) DF-18.00-1C10IG2-RW (5R)
+2100356 DF-16.15-1C10IG2-RW (5R) DF-16.15-1C10IG2-RW (5R)
+2100357 DF-23.20-1C10IG2-RW (5R) DF-23.20-1C10IG2-RW (5R)
+2100358 DF-16.15-1C20IG2-RW (2F-C3R) DF-16.15-1C20IG2-RW (2F-C3R)
+2100359 DF-23.20-1C20IG2-RW (2F-C3R) DF-23.20-1C20IG2-RW (2F-C3R)
+2100360 EC-16.80-1C20IG2-RW (2F-C3R) EC-16.80-1C20IG2-RW (2F-C3R)
+2100361 EC-16.80-1C10IG2-RW(5R) EC-16.80-1C10IG2-RW(5R)
+2100362 EC-17.39-1C20IG2-RW(2F-C3R) EC-17.39-1C20IG2-RW(2F-C3R)
+2100380 Compressor Pressure Sensor คอมเพสเซอร์แรงดัน
+2100381 On เปิด
+2100382 Off ปิด
+2100400 Sleep mode Sleep mode
+2100401 Disable ปิด
+2100402 Enable เปิด
+2100410 Limit switch Ice Cover ลิมิตสวิทซ์ฝาถังน้ำแข็ง
+2100411 NC NC
+2100412 NO NO
+2100420 Ice Comressor fan type ชนิดของพัดลม
+2100421 Fix Speed Fix Speed
+2100422 AC/DC Auto speed AC/DC Auto speed
+2100430 Soda Start Freeze mode ระดับโพรบ เริ่มทำหล่อเย็น
+2100431 P1-600 P1-600
+2100432 P2-300 P2-300
+2100433 P1-1900 P1-1900
+2100434 P1-1200 P1-1200
+2100450 Soda Stop Freeze mode ระดับโพรบ หยุดทำหล่อเย็น
+2100451 P2-2100 P2-2100
+2100452 P2-1500 P2-1500
+2100453 P2-1000 P2-1000
+2100454 P2-300 P2-300
+2100455 P1-2100 P1-2100
+2100470 Soda Freeze mode โหมดแช่โซดา
+2100471 P1-600 P1-600
+2100472 P2-300 P2-300
+2100473 P1-1900 P1-1900
+2100474 P1-1200 P1-1200
+2100480 Soda agitator always on มอเตอร์กวนน้ำถังหล่อเย็น
+2100481 Alway on เปิดตลอดเวลา
+2100482 Follow Setting เปิดปิดตามเวลา
+2100490 Time turn on เวลาเปิด
+2100491 Time turn off เวลาปิด
+2100500 Soda CO2 tank mode โหมดถังแก๊สโซดา
+2100501 NO-Config NO-Config
+2100502 Tank 1 Tank 1
+2100503 Tank 2 Tank 2
+2100520 Espresso module version ชุดทำกาแฟ
+2100521 ver 1(F) ver 1(F)
+2100522 ver 2 ver 2
+2100523 ver 1(F/R) ver 1(F/R)
+2100540 Espresso Tray Bean ชุดทำถาดกาแฟ
+2100541 Original Original
+2100542 Version 1 Version 1
+2100550 Espresso module serial number ชุดทำกาแฟ serial number
+2100560 Hardware generation รุ่นของตู้
+2100561 Gen 2.6 รุ่น 2.6
+2100562 Gen 2.7 รุ่น 2.7
+2100563 Gen 2.9 รุ่น 2.9
+2100564 Gen 3.2 รุ่น 3.2
+2100565 Gen 3.1 รุ่น 3.1
+2100566 Gen 3.X รุ่น 3.X
+2100567 Gen 4.X รุ่น 4.X
+2100600 Use เปิดใช้งาน
+2100601 Ignore ปิดใช้งาน
+2100610 Straw Request Button ปุ่มขอหลอดเพิ่ม
+2100611 Close ปิด
+2100612 Open เปิด
+2100620 Preheat after make espresso pre-heat หลังจากทำกาแฟ
+2100625 Value for water Preheat ประมาณน้ำร้อน
+2100630 Boiler sleep หม้อต้ม sleep
+2100635 Sleep Time Sleep Time
+2100636 SleepTime Setting SleepTime Setting
+2100640 Exhaust Auto/Server Exhaust Auto/Server
+2100641 Auto Auto
+2100642 Server control Server control
+2100643 Manual, 4AM to Auto Manual, 4AM to Auto
+2100644 ExhaustFan ExhaustFan
+2100650 Time เวลา
+2100655 Mode โหมด
+2100656 Close ปิด
+2100657 Open away เปิดตลอด
+2100658 Open pay hot water เปิดตอนจ่ายน้ำร้อน
+2100659 Open when blender and clean เปิดตอนชง เปิดหลังล้าง
+2100660 Exhaust Fan Time โหมดพัดลมดูดอากาศ
+2100670 Powder Cam Type ลูกเบี้ยวจ่ายผง
+2100671 Orignal 1 side แบบเก่า 1 ด้าน
+2100672 2 side แบบ 2 ด้าน
+2100673 Steel แบบ เหล็ก
+2100674 aluminum แบบ อลู
+2100675 titanium ไทเทเนียม
+2100676 viberium ไวเบอเนียม
+2100677 diamond เพชร
+2100690 Powder Push High Powder Push High
+2100691 Powder Push low Powder Push low
+2100692 Powder Low Time Powder Low Time
+2100693 Powder backward Turn on Powder backward Turn on
+2100694 Powder push mode Powder push mode
+2100695 Normal Normal
+2100696 2 Level 2 Level
+2100697 2 Level 5ms 2 Level 5ms
+2100710 Powder Pay push low turn on เปิดโหมดปั่นผง
+2100711 Turn on Turn on
+2100712 Turn off Turn off
+2100713 Nozzle ตำแหน่งหัวจ่าย
+2100714 Nozzle version แบบหัวจ่ายเวอร์ชัน
+2100715 Nozzle Coffee front position กาแฟอยู่ข้างหน้า
+2100716 Nozzle Coffee behind position กาแฟอยู่ข้างหลัง
+2100720
2200000 Fan พัดลม
+3000001 Taobin operating in power saving mode ตู้เต่าบินอยู่ในโหมดประหยัดพลังงาน
+3000002 Exiting power saving page กำลังออกจากหน้าโหมดประหยัดพลังงาน
+3000003 Exiting in กำลังออกจากหน้านี้ ภายใน
+3000004 Exiting in กำลังออกจากหน้าโหมดประหยัดพลังงาน ภายใน
+3000005 Exiting Power Saving Mode กำลังออกจาก โหมดประหยัดพลังงาน
+3000006 Leave page ออกจากหน้านี้
+3000007 Cancel Sleep ยกเลิก Sleep
+3000008 Cancel ยกเลิก
+3000009 Warning คำเตือน
+3000010 If you press Exit from Power Saving Mode หากท่านกดออกจาก โหมดประหยัดพลังงาน
+3000011 Hot menu will be available in เมนูร้อนจะสามารถให้บริการได้ใน
+3000012 Cold menu, Soda will be available in เมนูเย็น,โซดา จะสามารถให้บริการได้ใน
+3000013 Confirm ตกลง
+3000014 Close ปิด
+3000100 Ingredient management จัดการส่วนผสม
+3000101 Ice cream ไอศกรีม
+3000110 GO TO MENU GO TO MENU
+3000111 SHUTDOWN SHUTDOWN
+3000112 EXIT PROGRAM EXIT PROGRAM
+3000113 You want to shut down right ? ต้องการ Shut down หรือไม่
+3000114 Noted Noted
+3000115 Don't care Don't care
+3000116 Copy that Copy that
+3000200 Main menu เมนูหลัก
+3000201 Sub menu เมนูย่อย
+3000202 Add menu เพิ่มเมนู
+3000203 More. เพิ่มเติม
+3000204 Show filter แสดงตัวกรอง
+3000205 Filter by name กรองโดยชื่อ
+3000206 Show all แสดงทั้งหมด
+3000207 Apply Filter ใช้ตัวกรอง
+3000208 Clear Filter ล้างตัวกรอง
+3000209 Close ปิด
+3000210 Check ตรวจสอบ
+3000211 Brew now เริ่มชง
+3000250 Save now บันทึก
+3000251 Name ชื่อ
+3000252 Price ราคา
+3000253 times ครั้ง
+3000254 rounds รอบ
+3000255 msec msec
+3000257 Order Order
+3000258 Material Material
+3000259 Volume= Volume=
+3000260 Adjust กดเพื่อปรับ
+3000261 Default ค่าเริ่มต้น
+3000262 Test brew ทดสอบชง
+3000263 Hot= ร้อน=
+3000264 Cold= เย็น=
+3000265 Mix= ชง=
+3000266 Clean= ล้าง=
+3000280 Select topping ( Default ) เลือกท๊อปปิ้ง ( default )
+3000281 Select topping ( For test brew ) เลือกท๊อปปิ้ง ( สำหรับทดสอบชง )
+3000282 Select cleaning mode เลือกโหมดการล้าง
+3000283 Select เลือก
+3000284 Use cup in arm use cup in arm
+3000285 Not save ไม่ Save
+3000286 Want to save ? ต้องการ save ?
+3000287 Do you want to save? (It takes 1 minute) ต้องการบันทึกหรือไม่ ( ใช้เวลา 1 นาที )
+3000300 Syrup box กล่องไซรัป
+3000301 Coffee bean box กล่องเมล็ดกาแฟ
+3000400 Set Pulse Hot Set Pulse Hot
+3000401 Set Pulse Cold Set Pulse Cold
+3000402 Temperature อุณหภูมิ
+3000403 Calibration Calibration
+3000404 Set Zero Set Zero
+3000405 Home Home
+3000406 Un-lock Un-lock
+3000500 Material วัตถุดิบ ( Material )
+3000501 List รายการ
+3000700 Running result ผลการดำเนินการ
+3000701 Idle waiting ปกติ
+3000702 It is ice กำลังจ่ายน้ำแข็ง
+3000703 ICE is successfull จ่ายน้ำแข็งสำเร็จ
+3000704 Failed ICE จ่ายน้ำแข็งล้มเหลว
+3000705 Ice being drained ระบายน้ำแข็งออก
+3000706 The coefficient is being corrected ค่าสัมประสิทธิ์กำลังปรับแก้ไข
+3000707 The calibration was successful การปรับเทียบสำเร็จ
+3000708 Ice status สถานะน้ำแข็ง
+3000709 Full เต็ม
+3000710 Not full ยังไม่เต็ม
+3000711 Ice data ข้อมูลน้ำแข็ง
+3000712 Max rate Max rate
+3000713 Pay rate Pay rate
+3000714 Max pay rate Max pay rate
+3000715 Restart Machine รีสตาร์ทเครื่อง
+3000716 Reset stage machine รีเซ็ทสเตจเครื่อง
+3000717 Maintenance mode โหมดการบำรุงรักษา
+3000718 Clear time Clear time
+3000719 Clear temp Clear temp
+3000720 Clear ice rate Clear ice rate
+3000721 Reset PWM SM1 ( mix1) Reset PWM SM1 ( mix1)
+3000722 Reset PWM SM2 ( mix2) Reset PWM SM2 ( mix2)
+3000723 Reset pay rate Reset pay rate
+3000724 Reset Flow rate Reset Flow rate
+3000725 Reset Bucket Move Time Reset Bucket Move Time
+3000726 Reset Last Ice rate Reset Last Ice rate
+3000727 Reset Bucket PWM Reset Bucket PWM
+3000728 Not found Not found
+3000729 Adjust Ice Weight Adjust Ice Weight
+3000900 Electricity consumption ปริมาณใช้ไฟฟ้า
+3000901 Electricity consumption ปริมาณใช้ไฟฟ้า
+3000902 Voltage แรงดันไฟฟ้า
+3000903 Electric current กระแสไฟฟ้า
+3000904 AC Control Current AC Control Current
+3000905 UV Current UV Current
+3000906 Monitor Current Monitor Current
+3000907 Powder Module Current Powder Module Current
+3000908 Ice Soda Current Ice Soda Current
+3000915 Clear data ลบข้อมูล
+3000916 Yes ใช่
+3000917 No ไม่
+3000918 Back กลับ
+3000919 Do you want to clear all data? ต้องการลบข้อมูลทั้งหมดหรือไม่
+3001001 เหรียญ 1 ทอนปัจจุบัน =
+3001002 เหรียญ 2 ทอนปัจจุบัน =
+3001003 เหรียญ 5 ทอนปัจจุบัน =
+3001004 เหรียญ 10 ทอนปัจจุบัน =
+3001005 Reset All Reset All / เริ่มนับใหม่
+3001050 Add เพิ่ม
+3001051 Filter ตัวกรอง
+3001052 Status สถานะ
+3001053 Bean เมล็ด
+3001054 Leaves ใบ
+3001055 Powder ผง
+3001056 Soda โซดา
+3001057 Syrup ไซรัป
+3001058 Type ประเภท
+3001059 Cup แก้ว
+3001060 Lid ฝา
+3001061 Straw หลอด
+3001062 Whipper หัวชง
diff --git a/inter/sgp/xml/event/tricker.ev b/inter/sgp/xml/event/tricker.ev
index db1a062f..b8e277c4 100644
--- a/inter/sgp/xml/event/tricker.ev
+++ b/inter/sgp/xml/event/tricker.ev
@@ -9,25 +9,6 @@
Var SeasonPassMode = 0
-If SystemDateMonthInt = 7 Then
- If SystemDateDayInt > 28 Then
- Var SeasonPassMode = 1
- Else
- Var SeasonPassMode = 0
- EndIf
-EndIf
-
-If SystemDateMonthInt = 8 Then
- Var SeasonPassMode = 1
-EndIf
-
-If SystemDateMonthInt = 9 Then
- Var SeasonPassMode = 1
- If SystemDateDayInt > 8 Then
- Var SeasonPassMode = 0
- EndIf
-EndIf
-
If BoxID = "177746" Then
Var SeasonPassMode = 1
diff --git a/inter/uae_dubai/menu/export-id2.tsv b/inter/uae_dubai/menu/export-id2.tsv
new file mode 100644
index 00000000..12d4d887
--- /dev/null
+++ b/inter/uae_dubai/menu/export-id2.tsv
@@ -0,0 +1,448 @@
+Name Price ProductCode Select-ID
+WARM MILK 5.00 53-03-01-0005 8
+HOT COCOA 10.00 53-03-01-0002 12
+HOT WATER 3.00 53-05-01-0002 14
+ICED COCOA 10.00 53-03-02-0002 33
+COCOA SMOOTHIE 10.00 53-03-03-0002 34
+ICED THAI MILK TEA 7.00 53-02-02-0002 37
+THAI MILK TEA SMOOTHIE 7.00 53-02-03-0002 38
+HOT LIMENADE 7.00 53-05-01-0001 43
+HOT LIME TEA 7.00 53-02-01-0007 44
+ICED TAIWANESE TEA 3.00 53-02-02-0003 45
+TAIWANESE TEA SMOOTHIE 3.00 53-02-03-0003 46
+ICED LIME TEA 7.00 53-02-02-0007 47
+LIME TEA SMOOTHIE 7.00 53-02-03-0007 48
+ICED LIMENADE SODA 7.00 53-05-02-0010 49
+LIMENADE SODA SMOOTHIE 7.00 53-05-03-0010 50
+PEPSI 3.00 53-05-02-0007 51
+TAO SLUSHIE 5.00 53-05-03-0007 52
+SPRITE 3.00 53-05-02-0020 55
+QUEEN BERRY ALMOST DIRTY 3.00 53-01-02-0018 58
+TAO POWER DRINK SODA 15.00 53-05-02-0035 60
+TAO POWER DRINK 10.00 53-05-02-0034 64
+ICED LIMENADE 7.00 53-05-02-0001 66
+LIMENADE SMOOTHIE 7.00 53-05-03-0001 67
+HOT TAIWANESE TEA 3.00 53-02-01-0003 68
+ICED PINK MILK 7.00 53-03-02-0006 69
+PINK MILK SMOOTHIE 7.00 53-03-03-0006 70
+PINK MILK OREO VOCALNO 15.00 53-03-03-0026 71
+ICED SALAK 7.00 53-05-02-0002 75
+SALAK SMOOTHIE 7.00 53-05-03-0002 76
+ICED LIME SALAK 7.00 53-05-02-0003 77
+LIME SALAK SMOOTHIE 7.00 53-05-03-0003 78
+ICED LIMESALAK SODA 7.00 53-05-02-0009 79
+LIME SALAK SODA SMOOTHIE 7.00 53-05-03-0009 80
+ICED SALAK SODA 7.00 53-05-02-0008 81
+SALAK SODA SMOOTHIE 7.00 53-05-03-0008 82
+ICE SODA 3.00 53-05-02-0015 83
+ICED CARAMEL MILK 7.00 53-03-02-0001 84
+CARAMEL MILK SMOOTHIE 10.00 53-03-03-0001 85
+ICED BLUEBERRY TEA 3.00 53-02-02-0010 88
+ICED STRAWBERRY TEA 7.00 53-02-02-0009 89
+HOT CARAMEL COCOA 10.00 53-03-01-0004 90
+HOT CARAMEL MILK 7.00 53-03-01-0001 92
+CHOCOLATE SHAKE 15.00 53-04-02-0002 94
+ICE 3.00 53-05-02-0017 96
+SODA 3.00 53-05-02-0014 97
+HOT CHRYSANTHS TEA 3.00 53-02-01-0001 98
+ICED CHRYSANTHS TEA 3.00 53-02-02-0001 99
+CHRYSANTHS TEA SMOOTHIE 3.00 53-02-03-0001 100
+ICE WATER 3.00 53-05-02-0018 101
+DRINKING WATER 3.00 53-05-02-0016 102
+ICED MATCHA LATTE 10.00 53-02-02-0004 111
+MATCHA LATTE SMOOTHIE 15.00 53-02-03-0004 112
+COKE 3.00 53-05-02-0019 113
+TAO SLUSHIE 10.00 53-05-03-0019 114
+ICED STRAWBERRY SODA 7.00 53-05-02-0012 115
+ICED LYCHEE SODA 7.00 53-05-02-0011 116
+LYCHEE SODA SMOOTHIE 7.00 53-05-03-0011 117
+ICED BLUEBERRY SODA 3.00 53-05-02-0013 118
+ICED LYCHEE 7.00 53-05-02-0004 119
+LYCHEE SMOOTHIE 7.00 53-05-03-0004 120
+HOT MATCHA LATTE 10.00 53-02-01-0004 121
+ICED LYCHEE TEA 7.00 53-02-02-0008 122
+LYCHEE TEA SMOOTHIE 7.00 53-02-03-0008 123
+ICED BROWN SUGAR TEA 3.00 53-02-02-0006 124
+BROWN SUGAR TEA SMOOTHIE 3.00 53-02-03-0006 125
+ICED BLUEBERRY 3.00 53-05-02-0006 126
+HOT BROWN SUGAR MILK 3.00 53-03-01-0003 130
+HOT THAI MILK TEA 7.00 53-02-01-0002 131
+HOT BROWN SUGAR TEA 3.00 53-02-01-0006 132
+HOT LYCHEE TEA 7.00 53-02-01-0008 133
+HOT STRAWBERRY TEA 7.00 53-02-01-0009 134
+HOT BLUEBERRY TEA 3.00 53-02-01-0010 135
+MATCHA SHAKE 15.00 53-04-02-0001 136
+ICED BROWN SUGAR MILK 3.00 53-03-02-0003 143
+BROWN SUGAR SMOOTHIE 3.00 53-03-03-0003 144
+ICED CARAMEL COCOA 10.00 53-03-02-0004 145
+CARAMEL COCOA SMOOTHIE 10.00 53-03-03-0004 146
+MILK WITH ICED 5.00 53-03-02-0005 149
+MILK SMOOTHIE 7.00 53-03-03-0005 150
+STRAWBERRY SHAKE 15.00 53-04-02-0003 153
+TAIWANESE TEA SHAKE 3.00 53-04-02-0008 154
+THAI TEA SHAKE 15.00 53-04-02-0005 157
+BROWN SUGAR SHAKE 3.00 53-04-02-0006 158
+BLUEBERRY SHAKE 3.00 53-04-02-0007 159
+CARAMEL SHAKE 15.00 53-04-02-0009 160
+MILK SHAKE 15.00 53-04-02-0010 162
+PLAIN PROTEIN 15.00 53-04-02-0011 164
+HOT MATCHA 7.00 53-02-01-0011 166
+ICED MATCHA LIMENADE 10.00 53-02-02-0012 167
+MATCHA LIMENADE SMOOTHIE 15.00 53-02-03-0012 168
+HOT MATCHA LIMENADE 10.00 53-02-01-0012 169
+ICED MANGO MILK 1.71 53-03-02-0007 170
+ICED MATCHA 10.00 53-02-02-0011 171
+MATCHA SMOOTHIE 10.00 53-02-03-0011 172
+HOT AMERICANO QUEEN BERRY 3.00 53-01-01-0014 173
+ICED AMERICANO ETHIOPAI GUJI 3.00 53-01-02-0011 174
+ICED LYCHEE LIMENADE SODA 7.00 53-05-02-0022 175
+LYCHEE LIMENADE SODA SMOOTHIE 7.00 53-05-03-0022 176
+ESPRESSO QUEEN BERRY 3.00 53-01-01-0013 177
+HOT PLUM TEA 7.00 53-02-01-0016 182
+HOT CANNABIS 3.00 53-02-01-0017 183
+ICED PLUM TEA 1.29 53-02-02-0017 184
+PLUM TEA SMOOTHIE 7.00 53-02-03-0017 185
+ICED PLUM SODA 7.00 53-05-02-0024 186
+PLUM SODA SMOOTHIE 7.00 53-05-03-0024 187
+ICED PLUM LIMENADE SODA 7.00 53-05-02-0025 188
+PLUM LIMENADE SODA SMOOTHIE 7.00 53-05-03-0025 189
+ICED PLUM 7.00 53-05-02-0026 190
+PLUM SMOOTHIE 7.00 53-05-03-0026 191
+ICED CANNABIS 3.00 53-05-02-0027 192
+CANNABIS SMOOTHIE 3.00 53-05-03-0027 193
+ICED CANNABIS SODA 3.00 53-05-02-0028 194
+CANNABIS SODA SMOOTHIE 3.00 53-05-03-0028 195
+ICED LIMENADE CANNABIS SODA 3.00 53-05-02-0029 196
+LIME CANNABIS SODA SMOOTHIE 3.00 53-05-03-0029 197
+ICED MANGO 3.00 53-05-02-0030 198
+ICED MANGO SODA 3.00 53-05-02-0031 199
+ICED LYCHEE 7.00 53-05-02-0032 200
+LYCHEE SMOOTHIE 7.00 53-05-03-0032 201
+ICED LYCHEE SODA 7.00 53-05-02-0033 202
+LYCHEE SODA SMOOTHIE 7.00 53-05-03-0033 203
+HOT LYCHEE TEA 7.00 53-02-01-0019 204
+ICED LYCHEE TEA 7.00 53-02-02-0019 205
+LYCHEE TEA SMOOTHIE 7.00 53-02-03-0019 206
+HOT GINGER TEA 7.00 53-02-01-0020 211
+HOT LIME GINGER TEA 7.00 53-02-01-0021 212
+ICED GINGER TEA 7.00 53-02-02-0020 213
+GINGER SMOOTHIE 7.00 53-02-03-0020 214
+GINGER SODA 7.00 53-05-02-0038 215
+GINGER SODA SMOOTHIE 7.00 53-05-03-0038 216
+GINGER LIME SODA SMOOTHIE 7.00 53-05-02-0039 217
+GINGER LIME SODA 7.00 53-05-03-0039 218
+ICED STRAWBERRY SODA 7.00 53-05-02-0041 219
+STRAWBERRY SODA SMOOTHIE 7.00 53-05-03-0041 220
+STRAWBERRY SHAKE 15.00 53-04-02-0013 221
+ICED STRAWBERRY TEA 7.00 53-02-02-0022 223
+STRAWBERRY TEA SMOOTHIE 7.00 53-02-03-0022 224
+HOT STRAWBERRY TEA 7.00 53-02-01-0022 225
+BLUE DADDY ALMOST DIRTY 3.00 53-01-02-0020 226
+BLUE DADDY HOT AMERICANO 3.00 53-01-01-0019 228
+BLUE DADDY ICED AMERICANO 3.00 53-01-02-0019 229
+BLUE DADDY ESPRESSO 3.00 53-01-01-0020 231
+OREO SMOOTHIE VOLCANO 15.00 53-03-03-0009 232
+MOZART ALMOST DIRTY 3.00 53-01-02-0022 234
+MOZART HOT AMERICANO 3.00 53-01-01-0021 236
+MOZART ICED AMERICANO 3.00 53-01-02-0021 237
+MOZART ESPRESSO 3.00 53-01-01-0022 238
+STRAWCOCOA SMOOTHIE 10.00 53-03-03-0010 240
+STRAWMILK SMOOTHIE 10.00 53-03-03-0011 246
+CONGEE WITH PLANTBASED PROTEIN 3.00 53-06-01-0001 251
+HONGKONG CONGEE 3.00 53-06-01-0002 252
+WHISKY DUDE ALMOST DIRTY 3.00 53-01-02-0026 253
+WHISKY DUDE HOT AMERICANO 3.00 53-01-01-0025 255
+WHISKY DUDE ICED AMERICANO 3.00 53-01-02-0025 256
+WHISKY DUDE ESPRESSO 3.00 53-01-01-0026 257
+SNOWWHITE ALMOST DIRTY 3.00 53-01-02-0024 258
+SNOWWHITE HOT AMERICANO 3.00 53-01-01-0023 260
+SNOWWHITE ICED AMERICANO 3.00 53-01-02-0023 261
+SNOWWHITE ESPRESSO 3.00 53-01-01-0024 262
+PEACHER ALMOST DIRTY 3.00 53-01-02-0028 263
+PEACHER HOT AMERICANO 3.00 53-01-01-0027 265
+PEACHER ICED AMERICANO 3.00 53-01-02-0027 266
+PEACHER ESPRESSO 3.00 53-01-01-0028 267
+HOT THAI MILK TEA 7.00 53-02-01-0024 283
+HOT TAIWANESE TEA 3.00 53-02-01-0025 284
+HOT MATCHA LATTE 10.00 53-02-01-0026 286
+HOT MATCHA 7.00 53-02-01-0027 288
+HOT MATCHA LIMENADE 10.00 53-02-01-0028 289
+ICED THAI MILK TEA 7.00 53-02-02-0024 290
+THAI MILK TEA SMOOTHIE 7.00 53-02-03-0024 291
+ICED TAIWANESE TEA 3.00 53-02-02-0025 292
+TAIWANESE TEA SMOOTHIE 3.00 53-02-03-0025 293
+ICED MATCHA LATTE 10.00 53-02-02-0026 296
+MATCHA LATTE SMOOTHIE 15.00 53-02-03-0026 297
+ICED MATCHA 10.00 53-02-02-0027 300
+MATCHA SMOOTHIE 10.00 53-02-03-0027 301
+ICED MATCHA LIMENADE 10.00 53-02-02-0028 302
+MATCHA LIMENADE SMOOTHIE 15.00 53-02-03-0028 303
+ICED THAI TEA 5.00 53-02-02-0029 304
+ICED THAI TEA LIMENADE 7.00 53-02-02-0030 305
+ICED TAIWANESE TEA 3.00 53-02-02-0031 306
+ICED TAIWANESE LIME TEA 3.00 53-02-02-0032 307
+THAI TEA SHAKE 15.00 53-04-02-0015 308
+MATCHA SHAKE 15.00 53-04-02-0016 309
+TAIWANESE TEA SHAKE 3.00 53-04-02-0017 311
+APP FAST ORIGINAL 3.00 53-04-02-1018 313
+APP FAST CHOCOLATE 3.00 53-04-02-1020 315
+APP FAST THAI TEA 3.00 53-04-02-1021 316
+APP FAST MATCHA 3.00 53-04-02-1022 317
+PURE BEAUTY ALMOST DIRTY 3.00 53-01-02-0033 318
+PURE BEAUTY HOT AMERICANO 3.00 53-01-01-0032 320
+PURE BEAUTY ICED AMERICANO 3.00 53-01-02-0032 321
+PURE BEAUTY ESPRESSO 3.00 53-01-01-0033 322
+HOT TAIWANESE LBLACK TEA 3.30 53-02-01-0032 336
+HOT TAIWANESE TEA 3.00 53-02-01-0031 337
+HOT THAI TEA 5.00 53-02-01-0029 341
+HOT THAI TEA LIMENADE 7.00 53-02-01-0030 342
+GEISHA ALMOST DIRTY 3.00 53-01-02-0036 343
+GEISHA AMERICANO 3.00 53-01-01-0035 345
+GEISHA ICED AMERICANO 3.00 53-01-02-0035 346
+GEISHA ESPRESSO 3.00 53-01-01-0036 347
+OVALTINE SMOOTHIE VOLCANO 3.00 53-03-03-0020 348
+HOT OVALTINE 7.00 53-03-01-0019 350
+ICED OVALTINE 3.00 53-03-02-0019 352
+OVALTINE SMOOTHIE 3.00 53-03-03-0019 353
+ROSALYN ALMOST DIRTY 3.00 53-01-02-0037 356
+ROSALYN HOT AMERICANO 3.00 53-01-01-0038 358
+ROSALYN ICED AMERICANO 3.00 53-01-02-0038 359
+ROSALYN ESPRESSO 3.00 53-01-01-0037 360
+MELON MILK SMOOTHIE 3.00 53-03-03-0022 361
+COCOA OVALTINE FLAKE VOLCANO 3.00 53-03-03-0021 363
+HOT MELON MILK 3.00 53-03-01-0022 365
+ICED MELON MILK 3.00 53-03-02-0022 367
+PEPSI PLUM 5.00 53-05-02-0046 372
+PEPSI PLUM SMOOTHIE 7.00 53-05-03-0046 373
+PEPSI MELON 3.00 53-05-02-0047 374
+PEPSI MELON SMOOTHIE 3.00 53-05-03-0047 375
+MELON SODA 3.00 53-05-02-0044 377
+MELON SHAKE 3.00 53-04-02-0018 383
+YUZU SODA 7.00 53-05-02-0045 386
+ICED TAIWANESE TEA 3.00 53-02-02-1025 398
+ICED MATCHA LATTE 10.00 53-02-02-1026 400
+ICED MATCHA 10.00 53-02-02-1027 402
+ICED THAI TEA LIMENADE 7.00 53-02-02-1030 403
+ICED THAI MILK TEA 7.00 53-02-02-1024 404
+HOT COCOA 10.00 53-03-01-1002 405
+ICED COCOA 10.00 53-03-02-1002 407
+ICED LIMENADE SODA 7.00 53-05-02-1010 409
+HOT THAI MILK TEA 7.00 53-02-01-1024 412
+HOT TAIWANESE TEA 3.00 53-02-01-1025 413
+HOT MATCHA LATTE 10.00 53-02-01-1026 415
+HOT THAI TEA 5.00 53-02-01-1029 417
+HOT THAI TEA LIMENADE 7.00 53-02-01-1030 418
+HOT TAIWANESE TEA 3.00 53-02-01-1031 419
+HOT MATCHA 7.00 53-02-01-1027 420
+ICED THAI TEA 5.00 53-02-02-1029 421
+ICED TAIWANESE TEA 3.00 53-02-02-1031 422
+WARM MILK 5.00 53-03-01-1005 423
+MILK WITH ICED 5.00 53-03-02-1005 425
+HOT LIMENADE 7.00 53-05-01-1001 427
+ICED LIMENADE 7.00 53-05-02-1001 428
+ESPRESSO 5.00 53-21-01-0001 433
+HOT CAFE' LATTE 10.00 53-21-01-0004 434
+HOT CAPPUCINO 10.00 53-21-01-0005 436
+HOT MOCHA 10.00 53-21-01-0006 438
+HOT CARAMEL LATTE 10.00 53-21-01-0007 440
+HOT MATCHACAFÉ LATTE 10.00 53-21-01-0008 442
+HOT TAIWANESE TEACAFÉ LATTE 3.00 53-21-01-0009 443
+HOT THAI TEACAFÉ LATTE 10.00 53-21-01-0010 444
+HOT BROWN SUGAR LATTE 3.00 53-21-01-0011 445
+HOTLYCHEE AMERICANO 3.00 53-21-01-0012 446
+HOT THAI TEACAFÉ LATTE 10.00 53-21-01-0029 447
+HOT TAIWANESE TEACAFÉ LATTE 3.00 53-21-01-0030 448
+HOT MATCHACAFÉ LATTE 10.00 53-21-01-0031 450
+HOT MELON CAFÉ LATTE 3.00 53-21-01-0039 452
+ICED AMERICANO 7.00 53-21-02-0001 454
+ICED CAFE LATTE 10.00 53-21-02-0002 455
+CAFE LATTE SMOOTHIE 10.00 53-21-03-0002 456
+ICED MOCHA 10.00 53-21-02-0003 459
+MOCHA SMOOTHIE 15.00 53-21-03-0003 460
+ICED CARAMELCAFÉ LATTE 10.00 53-21-02-0004 463
+CARAMEL LATTE SMOOTHIE 10.00 53-21-03-0004 464
+ICED MATCHACAFÉ LATTE 10.00 53-21-02-0005 467
+MATCHA CAFÉ LATTE SMOOTHIE 15.00 53-21-03-0005 468
+ICED TAIWANESE TEACAFÉ LATTE 3.00 53-21-02-0006 469
+TAIWANESE TEACAFÉ SMOOTHIE 3.00 53-21-03-0006 470
+ICED THAI TEACAFÉ LATTE 10.00 53-21-02-0007 471
+THAI TEA CAFÉ SMOOTHIE 3.00 53-21-03-0007 472
+ICED BROWN SUGAR LATTE 3.00 53-21-02-0008 473
+BROWN SUGAR CAFÉ SMOOTHIE 3.00 53-21-03-0008 474
+ICED THAI TEACAFÉ LATTE 10.00 53-21-02-0029 475
+ICED TAIWANESE TEACAFÉ LATTE 3.00 53-21-02-0030 477
+TAIWANESE TEACAFÉ SMOOTHIE 3.00 53-21-03-0030 478
+ICED MATCHACAFÉ LATTE 10.00 53-21-02-0031 481
+MATCHA CAFÉ LATTE SMOOTHIE 15.00 53-21-03-0031 482
+ICED MELON CAFÉ LATTE 3.00 53-21-02-0039 485
+ICED AMERICANO SODA 10.00 53-21-02-0041 487
+DOUBLE ESPRESSO 7.00 53-31-01-0001 488
+THAI ICED ESPRESSO 7.00 53-31-02-0001 489
+THAI ICED ESPRESSO SMOOTHIE 7.00 53-31-03-0001 490
+ICED CAPPUCCINO 10.00 53-31-02-0002 493
+CAPPUCCINO SMOOTHIE 10.00 53-31-03-0002 494
+HOT AMERICANO 7.00 53-21-01-0003 497
+HOTLYCHEE AMERICANO 10.00 53-21-01-0017 498
+ICED LYCHEEAMERICANO 10.00 53-21-02-0017 499
+HOT HOJICHA LATTE 3.00 53-02-01-0037 500
+ICED HOJICHA LATTE 3.00 53-02-02-0037 502
+HOJICHA LATTESMOOTHIE 3.00 53-02-03-0037 503
+HOT HOJICHA LATTE 3.00 53-02-01-1037 506
+ICEDHOJICHA LATTE 3.00 53-02-02-1037 508
+HOT AMERICANO 7.00 53-21-01-1003 510
+HOT CAFE' LATTE 10.00 53-21-01-1004 511
+HOT MOCHA 10.00 53-21-01-1006 513
+HOT CAPPUCINO 10.00 53-21-01-1099 515
+ICED AMERICANO 7.00 53-21-02-1001 517
+ICED CAFE LATTE 10.00 53-21-02-1002 518
+ICED MOCHA 10.00 53-21-02-1003 520
+ICED CAPPUCCINO 10.00 53-21-02-1099 522
+HOT YUZU TEA 7.00 53-02-01-0038 526
+ICED YUZU TEA 7.00 53-02-02-0038 527
+ICED COCOA YUZU 10.00 53-03-02-0025 528
+HOT COCOA YUZU 10.00 53-03-01-0025 530
+COCOA YUZU SMOOTHIE 10.00 53-03-03-0025 532
+HOT YUZU AMERICANO 10.00 53-21-01-0040 540
+ICED YUZU AMERICANO 10.00 53-21-02-0040 541
+STRAWBERRY SMOOTHIE 10.00 53-05-03-0040 542
+CHOPIN ALMOST DIRTY 3.00 53-01-02-0045 543
+CHOPIN HOT AMERICANO 3.00 53-01-01-0044 545
+CHOPIN ICED AMERICANO 3.00 53-01-02-0044 546
+CHOPIN ESPRESSO 3.00 53-01-01-0043 547
+HOT TOKYO BANANA MILK 10.00 53-03-01-0023 548
+HOT CHOCO TOKYO BANANA MILK 10.00 53-03-01-0024 550
+ICED TOKYO BANANA MILK 10.00 53-03-02-0023 552
+CHOCO TOKYO BANANA MILKSMOOTHIE 10.00 53-03-03-0024 554
+ICED CHOCO TOKYO BANANA MILK 10.00 53-03-02-0024 556
+TOKYO BANANA MILKSMOOTHIE 10.00 53-03-03-0023 558
+HOT TOKYO BANANA LATTE 10.00 53-21-01-0042 560
+ICED TOKYO BANANA LATTE 10.00 53-21-02-0042 562
+TOKYO BANANA LATTE SMOOTHIE 10.00 53-21-03-0042 563
+STRAWBERRY MILK OREO VOLCANO 15.00 53-03-03-0027 564
+MELON MILK OREO VOLCANO 3.00 53-03-03-0028 566
+BANANA MILK OREO VOLCANO 15.00 53-03-03-0029 568
+CHOCO OREO VOLCANO 15.00 53-03-03-0030 570
+CARAMEL MILK OREO VOLCANO 15.00 53-03-03-0031 572
+CAFE LATTE OREO SMOOTHIE 15.00 53-01-03-0043 574
+HOJICHA OREO SMOOTHIE 3.00 53-02-03-0043 576
+THAI MILK TEA OREO SMOOTHIE 15.00 53-02-03-0044 578
+PEPSI YUZU 5.00 53-05-02-0053 581
+PEPSI BANANA 5.00 53-05-02-0054 582
+MANDARINE ALMOST DIRTY 3.00 53-01-02-0048 583
+MANDARINE HOT AMERICANO 3.00 53-01-01-0047 585
+MANDARINE ICED AMERICANO 3.00 53-01-02-0047 586
+MANDARINE ESPRESSO 3.00 53-01-01-0046 587
+OPUS ONE ALMOST DIRTY 3.00 53-01-02-0051 588
+OPUS ONE HOT AMERICANO 3.00 53-01-01-0050 590
+OPUS ONE ICED AMERICANO 3.00 53-01-02-0050 591
+OPUS ONE ESPRESSO 3.00 53-01-01-0049 592
+SNAKE WIFE AMERICANO 3.00 53-01-02-0054 593
+SEXY DANCE AMERICANO 3.00 53-01-02-0053 594
+PAPONG TEA SODA 3.00 53-02-02-0043 595
+MATCHA HAUNTED HOUSE 3.00 53-02-02-0044 596
+MINI VAN OVANTINE 3.00 53-03-02-0026 597
+WISHING TREE SODA 3.00 53-05-02-0055 599
+BUCKET POPSICLE PEPSI 3.00 53-05-02-0056 600
+HOT GINGER TEA 5.00 53-02-01-0041 601
+HOT LIME GINGER TEA 7.00 53-02-01-0042 602
+ICED GINGER TEA 5.00 53-02-02-0041 603
+GINGER SMOOTHIE 5.00 53-02-03-0041 604
+ICED LIME GINGER TEA 7.00 53-02-02-0042 605
+GINGER LEMON TEA SMOOTHIE 7.00 53-02-03-0042 606
+GINGER SODA 7.00 53-05-02-0051 607
+GINGER LIME SODA 7.00 53-05-02-0052 608
+HOT JASMINE TEA 5.00 53-02-01-0045 611
+HOT JASMINE MILK TEA 7.00 53-02-01-0046 613
+ICED JASMINE TEA 5.00 53-02-02-0045 616
+ICED JASMINE MILK TEA 7.00 53-02-02-0046 618
+HOT THAI MILK TEA 7.00 53-02-01-0039 621
+ICED THAI MILK TEA 7.00 53-02-02-0039 623
+ICED LIME TEA 7.00 53-02-02-0040 625
+THAI MILK TEA SMOOTHIE 7.00 53-02-03-0039 626
+HOT LIME TEA 7.00 53-02-01-0040 629
+LIME TEA SMOOTHIE 7.00 53-02-03-0040 630
+HOT THAI BLACK TEA 5.00 53-02-01-0047 631
+HOT THAI MILK TEA 7.00 53-02-01-1038 632
+HOT BLACK TEA 5.00 53-02-01-1039 634
+HOT BLACK TEA LIMENADE 7.00 53-02-01-1040 635
+ICED THAI MILK TEA 7.00 53-02-02-1038 636
+ICED BLACK TEA 5.00 53-02-02-1039 638
+ICED BLACK TEA LIMENADE 7.00 53-02-02-1040 639
+ICED THAI BLACK TEA 5.00 53-02-02-0047 640
+THAI TEA SHAKE 15.00 53-04-02-0055 647
+HOT THAI TEACAFÉ LATTE 10.00 53-21-01-0055 649
+ICED THAI TEACAFÉ LATTE 10.00 53-21-02-0055 651
+THAI TEA CAFÉ SMOOTHIE 10.00 53-21-03-0055 652
+PEPSI MAX 3.00 53-05-02-0062 709
+MINT LIME SODA 7.00 53-05-02-0060 711
+STRAWBERRY MINT SODA 7.00 53-05-02-0063 712
+HOT MINT CAFE LATTE 10.00 53-21-01-0057 713
+ICED MINT CAFE LATTE 10.00 53-21-02-0057 714
+ MINT CAFE LATTESMOOTHIE 10.00 53-21-03-0057 715
+ MATCHA LATTE MINT 15.00 53-02-02-0050 718
+YUZU MINT SODA 7.00 53-05-02-0064 719
+PLUM LIMENADE MINT SODA 7.00 53-05-02-0065 720
+ICED MINTCANO 10.00 53-21-02-0058 721
+HOT MINTCANO 10.00 53-21-01-0058 738
+ MATCHA LATTE MINT 15.00 53-02-01-0050 740
+HOT COCOA MINT 10.00 53-03-01-0035 741
+HOT MINT MILK 7.00 53-03-01-0036 742
+MINT LYCHEE LEMON SODA 7.00 53-05-02-0066 743
+PEPSI MINT 5.00 53-05-02-0067 744
+ICED COCOA MINT 10.00 53-03-02-0035 745
+ICED MINT MILK 7.00 53-03-02-0036 746
+ ICED STRAWBERRY MINT MILK 10.00 53-03-02-0037 747
+HOT PEACH CAFE LATTE 10.00 53-21-01-0060 759
+ICED PEACH COCAO MILK 10.00 53-03-02-0039 766
+PEACH OREO 10.00 53-03-03-0040 771
+PEACH DRINK 3.00 53-05-02-0068 772
+ICED PEACH CAFE LATTE 10.00 53-21-02-0060 776
+PEACH CAFE LATTESMOOTHIE 10.00 53-21-03-0060 777
+PEACH COCAO MILKSMOOTHIE 10.00 53-03-03-0039 782
+MINT OREO VOLCANO 15.00 53-03-03-0034 784
+ MATCHA LATTE MINT 15.00 53-02-03-0050 785
+COCOA MINTSMOOTHIE 10.00 53-03-03-0035 786
+MINT MILKSMOOTHIE 10.00 53-03-03-0036 787
+ STRAWBERRY MINT MILKSMOOTHIE 10.00 53-03-03-0037 788
+CARAMEL MILK BISCOFF VOLCANO 10.00 53-03-03-0041 814
+STRAWBERRY MILK BISCOFF VOLCANO 10.00 53-03-03-0042 815
+CHOCO FONDANT 10.00 53-03-02-0040 831
+HOT SALTED CARAMELLATTE (S) 10.00 53-21-01-0072 850
+ICED SALTEDCARAMELCAFÉ LATTE (S) 10.00 53-21-02-0072 851
+SALTED CARAMELLATTE FRAPPE (S) 10.00 53-21-03-0072 852
+HOT SALTEDCARAMEL MILK 10.00 53-03-01-0062 853
+HOT CARAMEL COCOA 10.00 53-03-01-0063 854
+ICED CARAMEL MILK 7.00 53-03-02-0062 855
+ICED CARAMELMILK FRAPPE 10.00 53-03-03-0062 856
+ICED CARAMEL COCOA 10.00 53-03-02-0063 857
+ICED COCOACARAMEL FRAPPE 10.00 53-03-03-0063 858
+CARAMEL MILK OREOFRAPPE 15.00 53-03-03-0064 859
+COCONUT AMERICANO 10.00 53-21-02-0068 863
+ICED COCONUT MILK 10.00 53-03-02-0058 865
+COCONUT MILK SMOOTHIE 10.00 53-03-03-0058 866
+ICED COCONUT CHOCOLATE MILK 10.00 53-03-02-0059 868
+COCONUT CHOCOLATE MILK SMOOTHIE 10.00 53-03-03-0059 869
+ICED COCONUT MATCHA LATTE 10.00 53-02-02-0060 870
+ICED COCONUT MATCHA 10.00 53-02-02-0061 871
+ICED COCONUT THAI MILK TEA 10.00 53-02-02-0062 872
+ICED COCONUT THAI BLACK TEA 7.00 53-02-02-0063 873
+COCONUT JASMINE MILK TEA 7.00 53-02-02-0064 874
+COCONUT JASMINE TEA 7.00 53-02-02-0065 875
+COCONUT SODA 7.00 53-05-02-0090 876
+COCONUT PEPSI 7.00 53-05-02-0091 877
+COCONUT MATCHA LATTE SMOOTHIE 10.00 53-02-03-0060 879
+COCONUT MATCHA SMOOTHIE 10.00 53-02-03-0061 880
+COCONUT THAI MILK TEA SMOOTHIE 10.00 53-02-03-0062 881
+COCONUT THAI BLACK TEA SMOOTHIE 10.00 53-02-03-0063 882
+COCONUT JASMINE MILK TEA 7.00 53-02-03-0064 883
+COCONUT JASMINE TEA 7.00 53-02-03-0065 884
+COCONUT LYCHEE SODA 7.00 53-05-02-0093 890
+COCONUT SMOOTHIE 10.00 53-05-03-0092 891
+COCONUT PEPSI 7.00 53-05-02-0114 893
+PEPSI MAX PLUM 5.00 53-05-02-0074 896
+PEPSI MAX PLUM SMOOTHIE 5.00 53-05-03-0074 897
+PEPSI MAX MELON 3.00 53-05-02-0075 898
+PEPSI MAX MELON SMOOTHIE 3.00 53-05-03-0075 899
+PEPSI MAX YUZU 5.00 53-05-02-0076 900
+PEPSI MAX BANANA 5.00 53-05-02-0077 901
+ESPRESSO SHAKE 15.00 53-04-02-0021 903
diff --git a/inter/uae_dubai/menu/lang.tsv b/inter/uae_dubai/menu/lang.tsv
index 2179b718..2c409122 100644
--- a/inter/uae_dubai/menu/lang.tsv
+++ b/inter/uae_dubai/menu/lang.tsv
@@ -124,10 +124,10 @@ TextID Note English arabic
Text topping extra
Font=Kanit,Type=Regular,Size=36,Color=0x0025FF,LineHeight=46 Font=Kanit,Type=Regular,Size=36,Color=0x0025FF,LineHeight=47
-000100 1 Shot of Espresso\n[1 minutes will be added to the process.###Font=KanitLight,Size=15] جرعة واحدة من قهوة الإسبريسو\n[ستتم إضافة دقيقة واحدة إلى العملية.###Font=KanitLight,Size=15]
+000100 1 Shot of Espresso\n[1 minutes will be added to the process.###Font=KanitLight,Size=15] 1 جرعة من الإسبريسو\n[سيتم إضافة دقيقة واحدة إلى العملية.###Font=KanitLight,Size=15]
000101 Add extra Oreo crunchy أضف كمية إضافية من الأوريو المقرمش
-000102 1 Shot of Single Origin Espresso\n[1 minutes will be added to the process.###Font=KanitLight,Size=15] جرعة واحدة من قهوة الإسبريسو ذات الأصل الواحد\n[ستتم إضافة دقيقة واحدة إلى العملية.###Font=KanitLight,Size=15]
-000104 Oat milk\n[100% PLANT-BASED , No artificial colour or flavors, No preservatives, rich in dietary fiber###Font=KanitLight,Size=15] حليب الشوفان\n[نباتي 100%، بدون ألوان أو نكهات صناعية، بدون مواد حافظة، غني بالألياف الغذائية###Font=KanitLight,Size=15]
+000102 1 Shot of Single Origin Espresso\n[1 minutes will be added to the process.###Font=KanitLight,Size=15] جرعة واحدة من قهوة الإسبريسو من مصدر واحد\n[سيتم إضافة دقيقة واحدة إلى العملية.###Font=KanitLight,Size=15]
+000104 Oat milk\n[100% PLANT-BASED , No artificial colour or flavors, No preservatives, rich in dietary fiber###Font=KanitLight,Size=15] حليب الشوفان [100% نباتي، بدون ألوان أو نكهات اصطناعية، بدون مواد حافظة، غني بالألياف الغذائية###الخط=KanitLight، الحجم=15]
@@ -269,6 +269,7 @@ TextID Note English arabic
800026 Do you cut-off cash box?
800027 Please Open door cash box
800028 Internal Communcation fail.
+800029 Next ถัดไป 下一步
@@ -319,8 +320,14 @@ TextID Note English arabic
800073 Restart Shot coffee count เริ่มนับใหม่ Restart Shot coffee count
800074 Disc module not close completely แขนปิดไม่สนิท
800075 Adjust ice weight Adjust ice weight
-800076
-800077
+800076 Ice: water pump timeout น้ำหมด 制冰：水泵超时
+800077 Ice: Lack of ice failure ล้มเหลวขาดน้ำแข็ง 制冰：缺冰故障
+800078 Ice out timeout จ่ายน้ำแข็งไม่ได้ 出冰超时
+800079 Load cell fail! วัดน้ำหนักเสีย Load cell fail!
+800080 Weighing Motor forward timeout การชั่งน้ำหนักมอเตอร์หมดเวลาเดินหน้า Weighing Motor forward timeout
+800081 Weighing Motor reverse timeout การชั่งน้ำหนักมอเตอร์หมดเวลาถอยหลัง Weighing Motor reverse timeout
+800082 ICE turning forward timeout ICE กำลังหมุนตัวไปข้างหน้าจนหมดเวลา ICE turning forward timeout
+800083 ICE reverses timeout ICE ย้อนเวลาหมดเวลา ICE reverses timeout
Soda System
@@ -348,6 +355,17 @@ TextID Note English arabic
800121 Current
800122 Soda
800123 Start Defrost. Wait check ละลายน้ำแข็ง Start Defrost
+800124 Start Agitator soda หมุนมอเตอร์คนโซดา 启动搅拌器苏打 Start Agitator soda
+800125 Stop Agitator soda หยุดมอเตอร์คนโซดา 停止搅拌器苏打 Stop Agitator soda
+800126 Start/Stop Agitator soda หมุน/หยุดมอเตอร์คนโซดา 启动/停止搅拌器苏打 Start/Stop Agitator soda
+800127 Stop หยุด 停止 Stop
+800128 Low Speed หมุนช้า 低速 Low Speed
+800129 Hight Speed หมุนเร็ว 高速 Hight Speed
+800130 Compressor fan speed control ควบคุมพัลดคอมเพสเซอร์ 压缩机风扇速度控制 Compressor fan speed control
+800131 Waiting for defrost check ละลายน้ำแข็งรอตรวจสอบ 等待除霜检查
+800132 to ถึง 至
+800133 Minute นาที 分钟
+800134 Time ระยะ 时间
Test
800200 Status
800201 Boiler
@@ -680,6 +698,9 @@ TextID Note English arabic
800528 Auto adjustment ปรับอัตโนมัติ
800529 Disable ปิดการใช้งาน
800530 Partial Refill เติมแบบหยอด
+800531 Alert ยืนยันการเคลียร์วัตถุดิบทั้งหมด 警报
+800532 Please type the word 'taobin'\nto confirm clearing all materials. กรุณาพิมพ์คำว่า 'taobin'\nเพื่อยืนยันการเคลียร์วัตถุดิบทั้งหมด 请输入单词'taobin'\n以确认清除所有材料。
+800533 You typed the confirmation text incorrectly. คุณพิมข้อความยืนยันผิด 您输入的确认文本不正确。
800600 Turn around
800601 Call arm
@@ -758,6 +779,12 @@ TextID Note English arabic
800661 Shutter
800662 Motor
800663 Whipper clean water
+800664 Please waiting Please waiting 请等待
+800665 Self test .... Self test .... 自我测试....
+800666 Top board Top board 顶部面板
+800667 Bottom board Bottom board 底部面板
+800668 Front board Front board 前面板
+800669 Ice board Ice board 冰面板
Test (New UI)
800700 Active
@@ -815,7 +842,7 @@ TextID Note English arabic
800751 Do you clean Soda bath?
800752 Change / Clean
- k
+
800753 Powder Canister
800754 Syrup buffer
800755 Bean Canister
@@ -875,7 +902,7 @@ TextID Note English arabic
810034 Hot Water volume ปริมาณน้ำร้อน ml
810035 Preheat when after make espresso ( minute ) pre-heat เมื่อหลังทำกาแฟ( นาที )
810036
-810037
+810037 Time to Test จำนวนครั้ง 测试时间
810038
810039
810040
@@ -969,9 +996,21 @@ TextID Note English arabic
810152 Day วันที่
810153 Weight น้ำหนัก
810154 calibrate calibrate
-810155
-810156
-810157
+810155 TV ทีวี 电视
+810156 Door Key กุญแจประตู 门钥匙
+810157 Espresso Module Gear เฟืองเครื่องอัดกาแฟ 意式咖啡模块齿轮
+810158 Espresso Module Cover ตัวครอบเครื่องอัดกาแฟ 意式咖啡模块盖
+810159 Gas Pressure Connector ข้อต่อตัววัดแรงดันแก๊ส 气压连接器
+810160 TV Cooling Fan พัดลมระบายความร้อนทีวี 电视散热风扇
+810161 Ice Weight Scale Cover ตัวครอบเครื่องชั่งน้ำหนักน้ำแข็ง 冰重量秤盖
+810162 Ice Shaver Motor มอเตอร์ของกะโหลกน้ำแข็ง 刨冰机电机
+810163 Ice Shutter Motor มอเตอร์ Shutter น้ำแข็ง 冰闸门电机
+810164 Cooling Tank Stirring Motor มอเตอร์กวนน้ำในถังหล่อเย็น 冷却槽搅拌电机
+810165 Cup Dispenser Plastic Cover C2 พลาสติกครอบตัวจ่ายแก้ว C2 杯子分配器塑料盖C2
+810166 Coffee Grinder Cover ตัวครอบเครื่องบดกาแฟ 咖啡研磨机盖
+810167 Coffee Line B3 สายกาแฟ B3 咖啡线B3
+810168 Ice Limit Switch ชุด Limit Switch น้ำแข็ง 冰量限制开关
+810169 Done ทำแล้ว 完成
810199
@@ -1019,8 +1058,14 @@ TextID Note English arabic
1000017 Wait a moment รอสักครู่
1000018 The machine is testing เครื่องกำลังทดสอบ
1000019 The machine is working เครื่องกำลังทำงาน
-1000020
-1000021
+1000020 testing testing 测试中
+1000021 fail ( timeout ) fail ( timeout ) 失败（超时）
+1000022 reset reset 重置
+1000023 padding padding 填充
+1000024 Slip Ring Test Slip Ring Test 滑环测试
+1000025 Slip Ring Slip Ring 滑环
+1000026 Average testing time: 7 minutes ใช้เวลาในการทดสอบประมาณ 7 นาที 平均测试时间：7分钟
+1000027 Connection Test Connection Test 连接测试
@@ -1082,42 +1127,42 @@ TextID Note English arabic
1300003 Beans module ชุดเมล็ดกาแฟ
1300004 Bean tray ถาดใส่เมล็ดกาแฟ
1300005 Switch tray : สวิตซ์ถาด :
-1300006 Check tray shutter ตรวจสอบชัตเตอร์ของถาด
-1300007 Pay beans จ่ายถั่ว
+1300006 Check tray shutter ตรวจสอบถาดชัตเตอร์
+1300007 Pay beans ถั่วจ่าย
1300008 1. Select beans 1. เลือกเมล็ดกาแฟ
1300009 2. Select direction 2. เลือกทิศทาง
1300010 Draw back หมุนกลับ
-1300011 Grind beans บดถั่ว
-1300012 Grind sizes ขนาดบด
+1300011 Grind beans บดเมล็ดกาแฟ
+1300012 Grind sizes ขนาดการบด
1300013 Standard มาตรฐาน
1300014 Result ผลลัพธ์
1300015 Bean weight:g น้ำหนักถั่ว:กรัม
1300016 Brew time:sec เวลาชง: วินาที
-1300017 Test grind sizes ทดสอบขนาดบด
+1300017 Test grind sizes ขนาดการบดทดสอบ
1300018 Coffee module type : ประเภทชุดกาแฟ :
1300019 1. Select grind sizes 1. เลือกขนาดการบด
1300020 More coarse หยาบขึ้น
1300021 More fine ละเอียดขึ้น
1300022 2. Test grinding 2. ทดสอบการบด
1300023 (To see grind sizes fineness before brewing.) (เพื่อดูความละเอียดของขนาดบดก่อนปรุง)
-1300024 3. Test brew coffee 3. ทดสอบการชงกาแฟ
+1300024 3. Test brew coffee 3. ทดลองชงกาแฟ
1300025 View recipes ดูสูตร
1300026 Brew now Brew now
1300027 4. Adjust grind sizes and test again if results (weight, brewing\n 4. ปรับขนาดการบดและทดสอบอีกครั้งว่าได้ผล (น้ำหนัก การชง\n
1300028 time) aren't up to standard. เวลา) ตามมาตรฐานหรือไม่
-1300029 Set grind sizes กำหนดขนาดบด
+1300029 Set grind sizes ตั้งค่าขนาดการบด
1300030 Set as default ตั้งให้เป็นค่าเริ่มต้น
1300031 (Set as default when meet standard) (ตั้งเป็นค่าเริ่มต้นเมื่อเป็นไปตามมาตรฐาน)
-1300032 Brew recipes สูตรชง
+1300032 Brew recipes สูตรชงเครื่องดื่ม
1300033 Brew order ลำดับการชง
1300034 Ingredient วัตถุดิบ
1300035 Recipes สูตรอาหาร
1300036 Save editing บันทึกการแก้ไข
1300037 Cancel edting ยกเลิกการแก้ไข
-1300038 1. Recheck selected grind sizes and brew recipes 1. ตรวจสอบขนาดการบดที่เลือกและสูตรการชงอีกครั้ง
-1300039 Insert cup manually ใส่ถ้วยด้วยตนเอง
+1300038 1. Recheck selected grind sizes and brew recipes 1. ตรวจสอบขนาดการบดและสูตรการชงที่เลือกอีกครั้ง
+1300039 Insert cup manually ใส่ถ้วยด้วยมือ
1300040 2. Select arm 2. เลือกแขน
-1300041 3. Please insert cup into selected arm 3. กรุณาใส่ถ้วยลงในแขนที่เลือก
+1300041 3. Please insert cup into selected arm 3. กรุณาใส่ถ้วยเข้าไปในแขนที่เลือก
1300042 Test ทดสอบ
1300043 Grind บด
1300044 Pay beans from slot * จ่ายเมล็ดกาแฟจาก *
@@ -1331,6 +1376,316 @@ TextID Note English arabic
2100054 Sleep mode will be turn on
when machine operating. Sleep mode will be turn on
when machine operating.
2100055 Sleep mode will be turn off
when machine operating. Sleep mode will be turn off
when machine operating.
2100056 Please check before confirming Please check before confirming
+2100057 Fan module Fan module
+2100101 Water Water
+2100102 Whipper & Clean Whipper & Clean
+2100103 Ice Ice
+2100104 Espresso Module Espresso Module
+2100105 Generation Generation
+2100106 Sensor Lid Sensor Lid
+2100107 Straw Straw
+2100108 Heat system Heat system
+2100109 SleepTime Setting SleepTime Setting
+2100110 Camera Straw Camera Straw
+2100111 Exhaust Fan system Exhaust Fan system
+2100112 Time start Time start
+2100113 Cam Cam
+2100114 Powder Powder
+2100115 Powder Setting Powder Setting
+2100116 Powder low value Powder low value
+2100117 Powder low value ( milliseconds ) Powder low value ( milliseconds )
+2100150 Water Source Type Water Source Type
+2100151 Refill RO Refill RO
+2100152 Filter RO Filter RO
+2100153 Filte normal Filte normal
+2100170 Wash Brew head version Wash Brew head version
+2100171 SPINNING-WASHING-BOWL SPINNING-WASHING-BOWL
+2100172 V2-SPINNING-WASHING-BOWL V2-SPINNING-WASHING-BOWL
+2100173 V3-CLEANING-MIXING-BOWL V3-CLEANING-MIXING-BOWL
+2100190 Whipper type Whipper type
+2100191 Whipper only Whipper only
+2100192 Whipper with encoder Whipper with encoder
+2100193 Whipper version Rev15 no-encoder Whipper version Rev15 no-encoder
+2100194 Whipper version Rev15 Whipper version Rev16
+2100195 Whipper fool Whipper fool
+2100220 ICE gear system ICE gear system
+2100221 Gear 6.8 RPM 80W Gear 6.8 RPM 80W
+2100222 Gear 9.6 RPM 80W Gear 9.6 RPM 80W
+2100223 Gear 13.4 RPM 120W Gear 13.4 RPM 120W
+2100224 Taobin Gear 13.4 RPM Taobin Gear 13.4 RPM
+2100225 Taobin Gear 11 RPM 120W Taobin Gear 11 RPM 120W
+2100226 Taobin Gear 9.6 RPM 120W Taobin Gear 9.6 RPM 120W
+2100240 ICE water input with cool ICE water input with cool
+2100241 Not install Not install
+2100242 installed installed
+2100260 ICE board control type ICE board control type
+2100261 REV.C1-02 Modify REV.C1-02 Modify
+2100262 REV.C1-01 REV.C1-02
+2100280 ICE Bucket type ICE Bucket type
+2100281 Original model Original model
+2100282 New model New model
+2100300 ICE Pipe type ICE Pipe type
+2100301 Original model Original model
+2100302 New model New model
+2100320 ICE Compressor type ICE Compressor type
+2100321 HARN 0.75 HP HARN 0.75 HP
+2100322 sangchai 0.75 HP sangchai 0.75 HP
+2100323 Hitachi Scroll 1.00 HP Hitachi Scroll 1.00 HP
+2100324 Embraco 1.25 HP Embraco 1.25 HP
+2100340 Model by Compressor Type Model by Compressor Type
+2100341 Not specified Not specified
+2100342 EC-14.28-1C10IG2 EC-14.28-1C10IG3
+2100343 GC-11.88-1C10IMG2 GC-11.88-1C10IMG3
+2100344 CL-15.33-1C10IMG2 CL-15.33-1C10IMG3
+2100345 EC-27.8-2C10IMG2 EC-27.8-2C10IMG3
+2100346 HS-15.9-2C10IMG2 HS-15.9-2C10IMG3
+2100347 HS-15.9-1C10IG2 HS-15.9-1C10IG3
+2100348 EC-27.8-1C15IG2 EC-27.8-1C15IG3
+2100349 KT-22.3-1C10IG2 KT-22.3-1C10IG3
+2100350 EC-27.8-1C20IG2 EC-27.8-1C20IG3
+2100351 EC-27.8-1C20IG3 EC-27.8-1C20IG4
+2100352 DF-18.00-1C10IMG2-RW DF-18.00-1C10IMG2-RW
+2100353 DF-18.00-1C10IG2-RW DF-18.00-1C10IG2-RW
+2100354 EC-14.28-1C10IG2-RW EC-14.28-1C10IG2-RW
+2100355 DF-18.00-1C10IG2-RW (5R) DF-18.00-1C10IG2-RW (5R)
+2100356 DF-16.15-1C10IG2-RW (5R) DF-16.15-1C10IG2-RW (5R)
+2100357 DF-23.20-1C10IG2-RW (5R) DF-23.20-1C10IG2-RW (5R)
+2100358 DF-16.15-1C20IG2-RW (2F-C3R) DF-16.15-1C20IG2-RW (2F-C3R)
+2100359 DF-23.20-1C20IG2-RW (2F-C3R) DF-23.20-1C20IG2-RW (2F-C3R)
+2100360 EC-16.80-1C20IG2-RW (2F-C3R) EC-16.80-1C20IG2-RW (2F-C3R)
+2100361 EC-16.80-1C10IG2-RW(5R) EC-16.80-1C10IG2-RW(5R)
+2100362 EC-17.39-1C20IG2-RW(2F-C3R) EC-17.39-1C20IG2-RW(2F-C3R)
+2100380 Compressor Pressure Sensor Compressor Pressure Sensor
+2100381 On On
+2100382 Off Off
+2100400 Sleep mode Sleep mode
+2100401 Disable Disable
+2100402 Enable Enable
+2100410 Limit switch Ice Cover Limit switch Ice Cover
+2100411 NC NC
+2100412 NO NO
+2100420 Ice Comressor fan type Ice Comressor fan type
+2100421 Fix Speed Fix Speed
+2100422 AC/DC Auto speed AC/DC Auto speed
+2100430 Soda Start Freeze mode Soda Start Freeze mode
+2100431 P1-600 P1-601
+2100432 P2-300 P2-301
+2100433 P1-1900 P1-1901
+2100434 P1-1200 P1-1201
+2100450 Soda Stop Freeze mode Soda Stop Freeze mode
+2100451 P2-2100 P2-2101
+2100452 P2-1500 P2-1501
+2100453 P2-1000 P2-1001
+2100454 P2-300 P2-301
+2100455 P1-2100 P1-2101
+2100470 Soda Freeze mode Soda Freeze mode
+2100471 P1-600 P1-601
+2100472 P2-300 P2-301
+2100473 P1-1900 P1-1901
+2100474 P1-1200 P1-1201
+2100480 Soda agitator always on Soda agitator always on
+2100481 Alway on Alway on
+2100482 Follow Setting Follow Setting
+2100490 Time turn on Time turn on
+2100491 Time turn off Time turn off
+2100500 Soda CO2 tank mode Soda CO2 tank mode
+2100501 NO-Config NO-Config
+2100502 Tank 1 Tank 2
+2100503 Tank 2 Tank 3
+2100520 Espresso module version Espresso module version
+2100521 ver 1(F) ver 1(F)
+2100522 ver 2 ver 3
+2100523 ver 1(F/R) ver 1(F/R)
+2100540 Espresso Tray Bean Espresso Tray Bean
+2100541 Original Original
+2100542 Version 1 Version 2
+2100550 Espresso module serial number Espresso module serial number
+2100560 Hardware generation Hardware generation
+2100561 Gen 2.6 Gen 2.7
+2100562 Gen 2.7 Gen 2.8
+2100563 Gen 2.9 Gen 2.10
+2100564 Gen 3.2 Gen 3.3
+2100565 Gen 3.1 Gen 3.2
+2100566 Gen 3.X Gen 3.X
+2100567 Gen 4.X Gen 4.X
+2100600 Use Use
+2100601 Ignore Ignore
+2100610 Straw Request Button Straw Request Button
+2100611 Close Close
+2100612 Open Open
+2100620 Preheat after make espresso Preheat after make espresso
+2100625 Value for water Preheat Value for water Preheat
+2100630 Boiler sleep Boiler sleep
+2100635 Sleep Time Sleep Time
+2100636 SleepTime Setting SleepTime Setting
+2100640 Exhaust Auto/Server Exhaust Auto/Server
+2100641 Auto Auto
+2100642 Server control Server control
+2100643 Manual, 4AM to Auto Manual, 4AM to Auto
+2100644 ExhaustFan ExhaustFan
+2100650 Time Time
+2100655 Mode Mode
+2100656 Close Close
+2100657 Open away Open away
+2100658 Open pay hot water Open pay hot water
+2100659 Open when blender and clean Open when blender and clean
+2100660 Exhaust Fan Time Exhaust Fan Time
+2100670 Powder Cam Type Powder Cam Type
+2100671 Orignal 1 side Orignal 1 side
+2100672 2 side 3 side
+2100673 Steel Steel
+2100674 aluminum aluminum
+2100675 titanium titanium
+2100676 viberium viberium
+2100677 diamond diamond
+2100690 Powder Push High Powder Push High
+2100691 Powder Push low Powder Push low
+2100692 Powder Low Time Powder Low Time
+2100693 Powder backward Turn on Powder backward Turn on
+2100694 Powder push mode Powder push mode
+2100695 Normal Normal
+2100696 2 Level 3 Level
+2100697 2 Level 5ms 3 Level 5ms
+2100710 Powder Pay push low turn on Powder Pay push low turn on
+2100711 Turn on Turn on
+2100712 Turn off Turn off
+2100713 Nozzle Nozzle
+2100714 Nozzle version Nozzle version
+2100715 Nozzle Coffee front position Nozzle Coffee front position
+2100716 Nozzle Coffee behind position Nozzle Coffee behind position
+2100720
+2200000 Fan Fan
+3000001 Taobin operating in power saving mode Taobin operating in power saving mode
+3000002 Exiting power saving page Exiting power saving page
+3000003 Exiting in Exiting in
+3000004 Exiting in Exiting in
+3000005 Exiting Power Saving Mode Exiting Power Saving Mode
+3000006 Leave page Leave page
+3000007 Cancel Sleep Cancel Sleep
+3000008 Cancel Cancel
+3000009 Warning Warning
+3000010 If you press Exit from Power Saving Mode If you press Exit from Power Saving Mode
+3000011 Hot menu will be available in Hot menu will be available in
+3000012 Cold menu, Soda will be available in Cold menu, Soda will be available in
+3000013 Confirm Confirm
+3000014 Close Close
+3000100 Ingredient management Ingredient management
+3000110 GO TO MENU GO TO MENU
+3000111 SHUTDOWN SHUTDOWN
+3000112 EXIT PROGRAM EXIT PROGRAM
+3000113 You want to shut down right ? You want to shut down right ?
+3000114 Noted Noted
+3000115 Don't care Don't care
+3000116 Copy that Copy that
+3000200 Main menu Main menu
+3000201 Sub menu Sub menu
+3000202 Add menu Add menu
+3000203 More. More.
+3000204 Show filter Show filter
+3000205 Filter by name Filter by name
+3000206 Show all Show all
+3000207 Apply Filter Apply Filter
+3000208 Clear Filter Clear Filter
+3000209 Close Close
+3000210 Check Check
+3000211 Brew now Brew now
+3000250 Save now Save now
+3000251 Name Name
+3000252 Price Price
+3000253 times times
+3000254 rounds rounds
+3000255 msec msec
+3000257 Order Order
+3000258 Material Material
+3000259 Volume= Volume=
+3000260 Adjust Adjust
+3000261 Default Default
+3000262 Test brew Test brew
+3000263 Hot= Hot=
+3000264 Cold= Cold=
+3000265 Mix= Mix=
+3000266 Clean= Clean=
+3000280 Select topping ( Default ) Select topping ( Default )
+3000281 Select topping ( For test brew ) Select topping ( For test brew )
+3000282 Select cleaning mode Select cleaning mode
+3000283 Select Select
+3000284 Use cup in arm Use cup in arm
+3000285 Not save Not save
+3000286 Want to save ? Want to save ?
+3000287 Do you want to save? (It takes 1 minute) Do you want to save? (It takes 1 minute)
+3000300 Syrup box Syrup box
+3000301 Coffee bean box Coffee bean box
+3000400 Set Pulse Hot Set Pulse Hot
+3000401 Set Pulse Cold Set Pulse Cold
+3000402 Temperature Temperature
+3000403 Calibration Calibration
+3000404 Set Zero Set Zero
+3000405 Home Home
+3000406 Un-lock Un-lock
+3000500 Material Material
+3000501 List List
+3000700 Running result Running result
+3000701 Idle waiting Idle waiting
+3000702 It is ice It is ice
+3000703 ICE is successfull ICE is successfull
+3000704 Failed ICE Failed ICE
+3000705 Ice being drained Ice being drained
+3000706 The coefficient is being corrected The coefficient is being corrected
+3000707 The calibration was successful The calibration was successful
+3000708 Ice status Ice status
+3000709 Full Full
+3000710 Not full Not full
+3000711 Ice data Ice data
+3000712 Max rate Max rate
+3000713 Pay rate Pay rate
+3000714 Max pay rate Max pay rate
+3000715 Restart Machine Restart Machine
+3000716 Reset stage machine Reset stage machine
+3000717 Maintenance mode Maintenance mode
+3000718 Clear time Clear time
+3000719 Clear temp Clear temp
+3000720 Clear ice rate Clear ice rate
+3000721 Reset PWM SM1 ( mix1) Reset PWM SM1 ( mix1)
+3000722 Reset PWM SM2 ( mix2) Reset PWM SM2 ( mix2)
+3000723 Reset pay rate Reset pay rate
+3000724 Reset Flow rate Reset Flow rate
+3000725 Reset Bucket Move Time Reset Bucket Move Time
+3000726 Reset Last Ice rate Reset Last Ice rate
+3000727 Reset Bucket PWM Reset Bucket PWM
+3000728 Not found Not found
+3000729 Adjust Ice Weight Adjust Ice Weight
+3000900 Electricity consumption Electricity consumption
+3000901 Electricity consumption Electricity consumption
+3000902 Voltage Voltage
+3000903 Electric current Electric current
+3000904 AC Control Current AC Control Current
+3000905 UV Current UV Current
+3000906 Monitor Current Monitor Current
+3000907 Powder Module Current Powder Module Current
+3000908 Ice Soda Current Ice Soda Current
+3000915 Clear data Clear data
+3000916 Yes Yes
+3000917 No No
+3000918 Back Back
+3000919 Do you want to clear all data? Do you want to clear all data?
+3001001 เหรียญ 1 ทอนปัจจุบัน = เหรียญ 1 ทอนปัจจุบัน =
+3001002 เหรียญ 2 ทอนปัจจุบัน = เหรียญ 2 ทอนปัจจุบัน =
+3001003 เหรียญ 5 ทอนปัจจุบัน = เหรียญ 5 ทอนปัจจุบัน =
+3001004 เหรียญ 10 ทอนปัจจุบัน = เหรียญ 10 ทอนปัจจุบัน =
+3001005 Reset All Reset All
+3001050 Add Add
+3001051 Filter Filter
+3001052 Status Status
+3001053 Bean Bean
+3001054 Leaves Leaves
+3001055 Powder Powder
+3001056 Soda Soda
+3001057 Syrup Syrup
+3001058 Type Type
+3001059 Cup Cup
+3001060 Lid Lid
+3001061 Straw Straw
+3001062 Whipper Whipper
diff --git a/xml/page_board.xml b/xml/page_board.xml
index dff2edbc..02c0eec5 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -67,7 +67,7 @@
DEBUGVAR web_pin
Var web_telnumOK = ""
-
+
DEBUGVAR web_readyOK
Var web_readyOK = "false"
@@ -191,7 +191,7 @@
STRCONTAIN "1060" MaterialAvailable TaiwanesePowderEnable
-
+
If XMLProfile = "" Then
CacheVarStr "get" XMLProfile
@@ -743,7 +743,7 @@
;inter-page-board
-
+
If CountryName = "Malaysia" Then
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/mys/video/script_video.ev"
@@ -1876,7 +1876,12 @@
Else
; tap screen for press popup when app hang
- TapScreen 860 1004
+
+ If UsePepsiTheme = 1 Then
+
+ Else
+ TapScreen 860 1004
+ EndIf
EndIf
Var buttonRemoveCupOnArm = "Invisible"
@@ -1890,6 +1895,15 @@
TRY "ROOT/taobin_project/xml/process/temp_ledv4_offall_horizontal.ev"
EndIf
+ ; aidl
+ If EnableBrewIPC = "" Then
+ Var EnableBrewIPC = "false"
+ EndIf
+
+ If EnableBrewIPC = "true" Then
+ StartBrewIPCService
+ EndIf
+
diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml
index 88cd1c61..e7face2e 100644
--- a/xml/page_drinkok.xml
+++ b/xml/page_drinkok.xml
@@ -349,6 +349,20 @@
DEBUGVAR VendingTSID
DEBUGVAR Seeker.VendingTSID
+
+ If Seeker.VendingTSID = "" Then
+ If VendingTSID = "" Then
+
+ Else
+ Var Seeker.VendingTSID = VendingTSID
+ If New_PaymentInter = 1 Then
+ __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
+ EndIf
+
+ EndIf
+ EndIf
+
+
DEBUGVAR HaveCup
DEBUGVAR CHECKCUP
DEBUGVAR CupChecking
diff --git a/xml/page_get_yourchange.xml b/xml/page_get_yourchange.xml
index 77b2aafd..262cf8c5 100644
--- a/xml/page_get_yourchange.xml
+++ b/xml/page_get_yourchange.xml
@@ -162,6 +162,12 @@
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
EndIf
+ If New_PaymentInter = 1 Then
+
+ Var PaymentEv = CountryRootPath + "/xml/process/payment.ev"
+ TRY PaymentEv
+ EndIf
+
If Seeker = "next" Then
;CoinBack
If New_Payment = 1 Then
@@ -175,7 +181,7 @@
Else
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
Var Brew3ConInter = CountryRootPath + "/xml/page_brewing3Conti.xml"
-
+
If Seeker = "next" Then
;CoinBack
Open Brew3ConInter
diff --git a/xml/page_lid_straw.xml b/xml/page_lid_straw.xml
index fca7a02e..5445952a 100644
--- a/xml/page_lid_straw.xml
+++ b/xml/page_lid_straw.xml
@@ -226,10 +226,15 @@
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
EndIf
+ If New_PaymentInter = 1 Then
+ Var PaymentEV = CountryRootPath + "/xml/process/payment.ev"
+ TRY PaymentEV
+ EndIf
+
If Seeker.SmoothieToPayment = 1 Then
Open "ROOT/taobin_project/xml/page_spiral_before_conti.xml"
EndIf
-
+
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
EndIf
@@ -273,6 +278,20 @@
Open "ROOT/taobin_project/xml/page_brewing3.xml"
Else
+
+ If New_PaymentInter = 1 Then
+ If UsePepsiTheme = 1 Then
+
+ If CountryName = "Singapore" Then
+ TRY "/mnt/sdcard/coffeevending/taobin_project/inter/whatthecup/sgp/xml/process/payment.ev"
+ EndIf
+
+ Else
+ Var PaymentEV = CountryRootPath + "/xml/process/payment.ev"
+ TRY PaymentEV
+ EndIf
+ EndIf
+
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
Open Brew3Inter
EndIf
@@ -287,6 +306,11 @@
Else
If UsePepsiTheme = 1 Then
If CountryName = "Singapore" Then
+
+ If New_PaymentInter = 1 Then
+ TRY "/mnt/sdcard/coffeevending/taobin_project/inter/whatthecup/sgp/xml/process/payment.ev"
+ EndIf
+
Open "ROOT/taobin_project/inter/whatthecup/sgp/xml/page_get_yourchange-SGP_blue.xml"
EndIf
If CountryName = "UnitedArabEmirates Dubai" Then
diff --git a/xml/page_payment.xml b/xml/page_payment.xml
index 77942630..fce20d2e 100644
--- a/xml/page_payment.xml
+++ b/xml/page_payment.xml
@@ -184,7 +184,6 @@
Var Seeker.IntVendingCredit = 0
Var EMAMemberID = ""
- Var UKBMemberID = ""
Var Seeker.StoreCreditFlag = 0
Var Seeker.pageStoreCredit0 = 0
@@ -352,6 +351,12 @@
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
+ If New_PaymentInter = 1 Then
+ Var Seeker.ORDER_ID = ""
+ GenHashWithTimeStamp Seeker.ORDER_ID
+ __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
+ EndIf
+
Open "ROOT/taobin_project/xml/page_payment_cash.xml"
@@ -379,6 +384,12 @@
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
+ If New_PaymentInter = 1 Then
+ Var Seeker.ORDER_ID = ""
+ GenHashWithTimeStamp Seeker.ORDER_ID
+ __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
+ EndIf
+
Open "ROOT/taobin_project/xml/page_payment_cash.xml"
@@ -408,15 +419,14 @@
DEBUGVAR Seeker.NameDrinkTH
DEBUGVAR Seeker.NameDrinkEN
- DEBUGVAR Seeker.NameDrinkPOS
Var param1 = Seeker.ORDER_ID
- Var param2 = Seeker.NameDrinkPOS
+ Var param2 = Seeker.NameDrinkEN
Var param3 = DiscountCampaignCode
- STRCONTAIN "size" Seeker.NameDrinkPOS SizeFromSheet
+ STRCONTAIN "size" Seeker.NameDrinkEN SizeFromSheet
If SizeFromSheet = "true" Then
- SPLIT Seeker.NameDrinkPOS "###" 1 PureName
+ SPLIT Seeker.NameDrinkEN "###" 1 PureName
Var param2 = PureName
EndIf
@@ -430,6 +440,32 @@
EndIf
+ If New_PaymentInter = 1 Then
+ Var Seeker.ORDER_ID = ""
+ GenHashWithTimeStamp Seeker.ORDER_ID
+
+ DEBUGVAR Seeker.NameDrinkTH
+ DEBUGVAR Seeker.NameDrinkEN
+
+ Var param1 = Seeker.ORDER_ID
+ Var param2 = Seeker.NameDrinkEN
+ Var param3 = DiscountCampaignCode
+
+ STRCONTAIN "size" Seeker.NameDrinkEN SizeFromSheet
+ If SizeFromSheet = "true" Then
+ SPLIT Seeker.NameDrinkEN "###" 1 PureName
+ Var param2 = PureName
+ EndIf
+
+ If ConnectWithPOSMachine = 1 Then
+ Var WaitPOSStatus = 1
+ Var TimeWaitPOSStatus = 0
+ Var POS_SELL_STATUS = "-"
+ GetPOSStatus param1 param2 param3
+ EndIf
+
+ EndIf
+
900
@@ -459,7 +495,7 @@
If SELLSTATUS = "SELLNOCASH" Then
Var SELLONLINE = 1
EndIf
-
+
If POS_SELL_MODE = "OFFLINE" Then
Var SELLONLINE = 0
EndIf
diff --git a/xml/page_payment_cash-MYR.xml b/xml/page_payment_cash-MYR.xml
index c11ce7ac..c3ece176 100644
--- a/xml/page_payment_cash-MYR.xml
+++ b/xml/page_payment_cash-MYR.xml
@@ -269,20 +269,7 @@
If GetFreeFromError = 1 Then
Var Seeker.FreeVendingCampaign = 1
CoinVending OFF
- If Seeker = "curr" Then
-
- MakeDrinkV1 SelectDrink SelectSugarID
- Var TxRef1 = ""
- CreateTxRef1 TxRef1
- Else
- Var TxRef1 = ""
- CreateTxRef1 TxRef1
-
- Var DrinkPaid = SelectDrink
- Var PaidPaymentFromNextStage = 1
-
- EndIf
- Open "ROOT/taobin_project/xml/page_thankyou.xml"
+ ;include="ROOT/taobin_project/xml/sometime/make_drink.xml"
EndIf
@@ -530,6 +517,15 @@
EndIf
+ If RoadShow = "true" Then
+ Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
+ Var MachineStage = "make-drink"
+ Var BrewingTextThai = "เตรียมแก้ว"
+ MakeDrinkV1 SelectDrink SelectSugarID
+ Open "ROOT/taobin_project/xml/page_thankyou.xml"
+
+ EndIf
+
@@ -564,18 +560,14 @@
EndIf
- If Seeker = "curr" Then
- MakeDrinkV1 SelectDrink SelectSugarID
- ;Var TxRef1 = ""
- ;CreateTxRef1 TxRef1
- EndIf
+
Var Seeker.PayWithQR = 1
Var Seeker.VendingTSID = VendingTSID
+ ;include="ROOT/taobin_project/xml/sometime/make_drink.xml"
Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
Var BrewingTextThai = "เตรียมแก้ว"
- Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
@@ -665,13 +657,10 @@
CoinVending OFF
Refresh
- If Seeker = "curr" Then
- MakeDrinkV1 SelectDrink SelectSugarID
- EndIf
Var Seeker.CreditCard = 1
Var Seeker.CreditCardRef = CreditCardRef
- Open "ROOT/taobin_project/xml/page_thankyou.xml"
+ ;include="ROOT/taobin_project/xml/sometime/make_drink.xml"
EndIf
@@ -747,6 +736,7 @@
Var CreditCardRef = ""
GenHashWithTimeStamp CreditCardRef
DEBUGVAR VendingCashless
+ DEBUGVAR CashlessAmount
If VendingCashless = "READY" Then
Var QRCODE99 = ""
@@ -758,6 +748,18 @@
Var alphaState = "Enable"
DEBUGVAR PayAmount
DEBUGVAR Seeker.IntVendingCampaign
+
+ DEBUGVAR CashlessAmount
+ If PayAmount = CashlessAmount Then
+
+ Else
+ DEBUGVAR "Detect cashless amount not equal, fix now"
+ Var CashlessAmount = PayAmount
+
+ EndIf
+
+ DEBUGVAR CashlessAmount
+
Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
CashlessPay RemainAmountX CreditCardRef
Var CashlessPayFlag = 1
@@ -778,6 +780,7 @@
DEBUGVAR CashlessPayFlag
DEBUGVAR ReadyForBrew
+ DEBUGVAR CashlessAmount
If ReadyForBrew = "false" Then
SAVELOG "Back to main1"
@@ -912,6 +915,13 @@
If Seeker = "curr" Then
+
+ If New_PaymentInter = 1 Then
+ __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
+ EndIf
+
+
+
MakeDrinkV1 SelectDrink SelectSugarID
Var TxRef1 = ""
CreateTxRef1 TxRef1
@@ -1720,6 +1730,18 @@ If alphaState = "Invisible" Then
If CancelFlag = 0 Then
Var QR_POPUP = "/img_popup8.png"
Var alphaState = "Enable"
+
+ DEBUGVAR CashlessAmount
+ If PayAmount = CashlessAmount Then
+
+ Else
+ DEBUGVAR "Detect cashless amount not equal, fix now"
+ Var CashlessAmount = PayAmount
+
+ EndIf
+
+ DEBUGVAR CashlessAmount
+
Coin CARDON
Var CardOnActed = "true"
DEBUGVAR CardOnActed
diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml
index b0839881..be170058 100644
--- a/xml/page_payment_cash.xml
+++ b/xml/page_payment_cash.xml
@@ -447,6 +447,9 @@
If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
+ If New_PaymentInter = 1 Then
+ __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
+ EndIf
If Seeker.SmoothieToPayment = 1 Then
; do nothing
Else
diff --git a/xml/page_thankyouConti.xml b/xml/page_thankyouConti.xml
index 5758b5a4..82ba6b51 100644
--- a/xml/page_thankyouConti.xml
+++ b/xml/page_thankyouConti.xml
@@ -251,6 +251,10 @@
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
+ If New_PaymentInter = 1 Then
+ __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
+ EndIf
+
Open "ROOT/taobin_project/xml/page_cannotConti.xml "
EndIf
@@ -275,6 +279,10 @@
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
+ If New_PaymentInter = 1 Then
+ __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
+ EndIf
+
Var LastMakeDrinkResult = "fail"
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
@@ -296,6 +304,10 @@
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
+ If New_PaymentInter = 1 Then
+ __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
+ EndIf
+
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
EndIf
EndIf
@@ -304,6 +316,10 @@
__CMD "check-cup" Seeker.selected_a_drink "-" "-"
EndIf
+ If New_PaymentInter = 1 Then
+ __CMD "check-cup" Seeker.selected_a_drink "-" "-"
+ EndIf
+
; old condition
If HaveCup = "false" Then
If MachineStage = "show-menu" Then
@@ -365,6 +381,10 @@
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
+ If New_PaymentInter = 1 Then
+ __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
+ EndIf
+
; smoothie next
DEBUGVAR Seeker
DEBUGVAR Seeker.SmoothieToPayment
@@ -443,7 +463,7 @@
DEBUGVAR MenuErrorCode
If MenuReadyForCup = "YES" Then
-
+
If DoorCupPosition = "bottom" Then
; new payment not enable. use have cup false only.
If New_Payment = 1 Then
@@ -501,6 +521,10 @@
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
+ If New_PaymentInter = 1 Then
+ __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
+ EndIf
+
Var LastMakeDrinkResult = "fail"
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
diff --git a/xml/sometime/make_drink.xml b/xml/sometime/make_drink.xml
index 8b4a9546..298adef1 100644
--- a/xml/sometime/make_drink.xml
+++ b/xml/sometime/make_drink.xml
@@ -5,6 +5,11 @@ If Seeker = "curr" Then
If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
+
+ If New_PaymentInter = 1 Then
+ __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
+ EndIf
+
If Seeker.SmoothieToPayment = 1 Then
; do nothing
Else
diff --git a/xml/vending_info2.xml b/xml/vending_info2.xml
index 13f3367b..f84853e4 100644
--- a/xml/vending_info2.xml
+++ b/xml/vending_info2.xml
@@ -186,17 +186,13 @@
Var AlphaState = "Invisible"
Var LoginReadyState = "Enable"
- Var NewUiBSM = "Offline"
+ If NewUiBSM = "Online" Then
- If EnableBrewIPC = "" Then
- Var EnableBrewIPC = "false"
+ Else
+ Var NewUiBSM = "Offline"
EndIf
- If EnableBrewIPC = "true" Then
- StartBrewIPCService
- EndIf
-
1000