Merge branch 'masterpiece' of ssh://kong:/1TBHDD/ikong/taobin_project into masterpiece

2024-09-05 15:51:11 +07:00 · 2024-09-05 15:51:11 +07:00 · feb2abe587
commit feb2abe587
parent a06c11514e 800b10e03a
101 changed files with 23255 additions and 319 deletions
--- a/animation01/TaoBinShowCoffeeProcess.mp4
+++ b/animation01/TaoBinShowCoffeeProcess.mp4
--- a/animation01/sync_1.file
+++ b/animation01/sync_1.file
@ -1,4 +1,4 @@
-total 241268
+total 241224
 -rw-rw---- 1 root sdcard_rw   948282 2023-09-18 18:44 TaoBin2_draft02_art1.mp4
 -rw-rw---- 1 root sdcard_rw  3603060 2023-09-18 18:44 TaoBin2_draft02_art10.mp4
 -rw-rw---- 1 root sdcard_rw  3166935 2023-09-18 18:44 TaoBin2_draft02_art11.mp4
@ -57,5 +57,5 @@ total 241268
 -rw-rw---- 1 root sdcard_rw  3616423 2023-09-18 18:44 TaoBin2_draft02_art9.mp4
 -rw-rw---- 1 root sdcard_rw  9159102 2024-08-19 12:59 TaoBinShowCoffeeProcess.mp4
 -rw-rw---- 1 root sdcard_rw      326 2024-08-26 13:31 last-cmd
-rw-rw---- 1 root sdcard_rw    69541 2024-08-24 18:46 play_list.tsv
-rw-rw---- 1 root sdcard_rw        0 2024-08-26 13:32 sync_1.file
+-rw-rw---- 1 root sdcard_rw    69541 2024-08-31 09:10 play_list.tsv
+-rw-rw---- 1 root sdcard_rw        0 2024-08-22 23:16 sync_1.file
--- a/image/event/image_template2
+++ b/image/event/image_template2
@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_en.png
-normal_thai=ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_th.png
-press_eng=ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_en.png
-press_thai=ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_th.png
-disable_eng=ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_en.png
-disable_thai=ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_th.png
+normal_eng=ROOT/taobin_project/image/event/jemila/jemila.png
+normal_thai=ROOT/taobin_project/image/event/jemila/jemila.png
+press_eng=ROOT/taobin_project/image/event/jemila/jemila.png
+press_thai=ROOT/taobin_project/image/event/jemila/jemila.png
+disable_eng=ROOT/taobin_project/image/event/jemila/jemila.png
+disable_thai=ROOT/taobin_project/image/event/jemila/jemila.png
--- a/image/event/jemila/jemila.png
+++ b/image/event/jemila/jemila.png
--- a/image/page_doing/brewing_txt_adv11.png
+++ b/image/page_doing/brewing_txt_adv11.png
--- a/image/page_doing/brewing_txt_adv11_en.png
+++ b/image/page_doing/brewing_txt_adv11_en.png
--- a/image/page_doing/brewing_txt_adv12.png
+++ b/image/page_doing/brewing_txt_adv12.png
--- a/image/page_doing/brewing_txt_adv12_en.png
+++ b/image/page_doing/brewing_txt_adv12_en.png
--- a/image/page_doing/brewing_txt_adv13.png
+++ b/image/page_doing/brewing_txt_adv13.png
--- a/image/page_doing/brewing_txt_adv13_en.png
+++ b/image/page_doing/brewing_txt_adv13_en.png
--- a/image/page_drink_disable_n2/bn_hot_Ginger_tea_jemila.png
+++ b/image/page_drink_disable_n2/bn_hot_Ginger_tea_jemila.png
--- a/image/page_drink_disable_n2/bn_hot_america_no_jemila.png
+++ b/image/page_drink_disable_n2/bn_hot_america_no_jemila.png
--- a/image/page_drink_disable_n2/bn_hot_thai_milk_tea_jemila.png
+++ b/image/page_drink_disable_n2/bn_hot_thai_milk_tea_jemila.png
--- a/image/page_drink_disable_n2/bn_iced_7up_jemila.png
+++ b/image/page_drink_disable_n2/bn_iced_7up_jemila.png
--- a/image/page_drink_disable_n2/bn_iced_cocoa_jemila.png
+++ b/image/page_drink_disable_n2/bn_iced_cocoa_jemila.png
--- a/image/page_drink_disable_n2/bn_iced_lemonade_jemila.png
+++ b/image/page_drink_disable_n2/bn_iced_lemonade_jemila.png
--- a/image/page_drink_disable_n2/bn_iced_milk_jemila.png
+++ b/image/page_drink_disable_n2/bn_iced_milk_jemila.png
--- a/image/page_drink_disable_n2/bn_jasmine_tea_jemila.png
+++ b/image/page_drink_disable_n2/bn_jasmine_tea_jemila.png
--- a/image/page_drink_disable_n2/bn_soda_jemila.png
+++ b/image/page_drink_disable_n2/bn_soda_jemila.png
--- a/image/page_drink_disable_n2/bn_water_roomtemp_jemila.png
+++ b/image/page_drink_disable_n2/bn_water_roomtemp_jemila.png
--- a/image/page_drink_n/bn_hot_Ginger_tea_jemila.png
+++ b/image/page_drink_n/bn_hot_Ginger_tea_jemila.png
--- a/image/page_drink_n/bn_hot_america_no_jemila.png
+++ b/image/page_drink_n/bn_hot_america_no_jemila.png
--- a/image/page_drink_n/bn_hot_thai_milk_tea_jemila.png
+++ b/image/page_drink_n/bn_hot_thai_milk_tea_jemila.png
--- a/image/page_drink_n/bn_iced_7up_jemila.png
+++ b/image/page_drink_n/bn_iced_7up_jemila.png
--- a/image/page_drink_n/bn_iced_cocoa_jemila.png
+++ b/image/page_drink_n/bn_iced_cocoa_jemila.png
--- a/image/page_drink_n/bn_iced_lemonade_jemila.png
+++ b/image/page_drink_n/bn_iced_lemonade_jemila.png
--- a/image/page_drink_n/bn_iced_milk_jemila.png
+++ b/image/page_drink_n/bn_iced_milk_jemila.png
--- a/image/page_drink_n/bn_jasmine_tea_jemila.png
+++ b/image/page_drink_n/bn_jasmine_tea_jemila.png
--- a/image/page_drink_n/bn_soda_jemila.png
+++ b/image/page_drink_n/bn_soda_jemila.png
--- a/image/page_drink_n/bn_water_roomtemp_jemila.png
+++ b/image/page_drink_n/bn_water_roomtemp_jemila.png
--- a/image/page_drink_picture2_n/bn_hot_Ginger_tea_jemila.png
+++ b/image/page_drink_picture2_n/bn_hot_Ginger_tea_jemila.png
--- a/image/page_drink_picture2_n/bn_hot_america_no_jemila.png
+++ b/image/page_drink_picture2_n/bn_hot_america_no_jemila.png
--- a/image/page_drink_picture2_n/bn_hot_thai_milk_tea_jemila.png
+++ b/image/page_drink_picture2_n/bn_hot_thai_milk_tea_jemila.png
--- a/image/page_drink_picture2_n/bn_iced_7up_jemila.png
+++ b/image/page_drink_picture2_n/bn_iced_7up_jemila.png
--- a/image/page_drink_picture2_n/bn_iced_cocoa_jemila.png
+++ b/image/page_drink_picture2_n/bn_iced_cocoa_jemila.png
--- a/image/page_drink_picture2_n/bn_iced_lemonade_jemila.png
+++ b/image/page_drink_picture2_n/bn_iced_lemonade_jemila.png
--- a/image/page_drink_picture2_n/bn_iced_milk_jemila.png
+++ b/image/page_drink_picture2_n/bn_iced_milk_jemila.png
--- a/image/page_drink_picture2_n/bn_jasmine_tea_jemila.png
+++ b/image/page_drink_picture2_n/bn_jasmine_tea_jemila.png
--- a/image/page_drink_picture2_n/bn_soda_jemila.png
+++ b/image/page_drink_picture2_n/bn_soda_jemila.png
--- a/image/page_drink_picture2_n/bn_water_roomtemp_jemila.png
+++ b/image/page_drink_picture2_n/bn_water_roomtemp_jemila.png
--- a/image/page_drink_press_n/bn_hot_Ginger_tea_jemila.png
+++ b/image/page_drink_press_n/bn_hot_Ginger_tea_jemila.png
--- a/image/page_drink_press_n/bn_hot_america_no_jemila.png
+++ b/image/page_drink_press_n/bn_hot_america_no_jemila.png
--- a/image/page_drink_press_n/bn_hot_thai_milk_tea_jemila.png
+++ b/image/page_drink_press_n/bn_hot_thai_milk_tea_jemila.png
--- a/image/page_drink_press_n/bn_iced_7up_jemila.png
+++ b/image/page_drink_press_n/bn_iced_7up_jemila.png
--- a/image/page_drink_press_n/bn_iced_cocoa_jemila.png
+++ b/image/page_drink_press_n/bn_iced_cocoa_jemila.png
--- a/image/page_drink_press_n/bn_iced_lemonade_jemila.png
+++ b/image/page_drink_press_n/bn_iced_lemonade_jemila.png
--- a/image/page_drink_press_n/bn_iced_milk_jemila.png
+++ b/image/page_drink_press_n/bn_iced_milk_jemila.png
--- a/image/page_drink_press_n/bn_jasmine_tea_jemila.png
+++ b/image/page_drink_press_n/bn_jasmine_tea_jemila.png
--- a/image/page_drink_press_n/bn_soda_jemila.png
+++ b/image/page_drink_press_n/bn_soda_jemila.png
--- a/image/page_drink_press_n/bn_water_roomtemp_jemila.png
+++ b/image/page_drink_press_n/bn_water_roomtemp_jemila.png
--- a/inc/remove_cup_event_open.inc
+++ b/inc/remove_cup_event_open.inc
@ -4,4 +4,11 @@ Var CheckCupStateDoorCupClose = "-"
 Var CheckCupStateDoorCupCloseCnt = 0
 Var CoundUpDelayCertainStage = 0
 Var TimeoutForProtectButtonHideLongTime = 0
-Var Timeout = 0
+Var Timeout = 0
+
+
+If show_eng = "true" Then 
+
+Else
+    Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3" 
+EndIf
--- a/inc/remove_cup_step.inc
+++ b/inc/remove_cup_step.inc
@ -29,7 +29,7 @@
 	If show_eng = "true" Then 

 	Else
-		If Timeout = 0 Then
+		If Timeout = 14 Then
 			If buttonRemoveCup = "Enable" Then
 				If CupChecking = "false" Then
 					If DoorCupPosition = "bottom" Then
--- a/inter/aus/menu/lang.tsv
+++ b/inter/aus/menu/lang.tsv
@ -176,7 +176,7 @@ TextID	Note	English	Thai
 		Font=Roboto,Type=Bold,Size=80,Color=0x513C2F,Align=Center,LineHeight=90	Font=Roboto,Type=Bold,Size=80,Color=0x513C2F,Align=Center,LineHeight=90
 000409		The Previous Drink\nHas Not Been Collected	มีเครื่องดื่มค้างอยู่\nในช่องรับเครื่องดื่ม
 		Font=Roboto,Type=Regular,Size=36,Color=0x513C2F,Align=Center,LineHeight=50	Font=Roboto,Type=Regular,Size=43,Color=0x513C2F,Align=Center,LineHeight=40
-000410		Please press the button below to open the door.\nTake the drink out.\nAnd start odering your drink.	กรุณกดปุ่มเปิดช่องรับเครื่องดื่ม\nนำเครื่องดื่มที่ค้างอยู่ออกจากช่อง\nก่อนเริ่มสั่งเครื่องดื่มของคุณ
+000410		Please press the button below to open the door.\nTake the drink out.\nAnd start ordering your drink.	กรุณกดปุ่มเปิดช่องรับเครื่องดื่ม\nนำเครื่องดื่มที่ค้างอยู่ออกจากช่อง\nก่อนเริ่มสั่งเครื่องดื่มของคุณ
 		Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50	Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50
 000411		Press Here	กดที่นี่

@ -329,6 +329,8 @@ TextID	Note	English	Thai
 800073		Restart Shot coffee count
 800074		Disc module not close completely	แขนปิดไม่สนิท
 800075		Adjust ice weight	Adjust ice weight
+800076
+800077



@ -356,6 +358,7 @@ TextID	Note	English	Thai
 800120		Voltage	แรงดันไฟฟ้า
 800121		Current	กระแสไฟฟ้า
 800122		Soda	โซดา
+800123		Start Defrost. Wait check	ละลายน้ำแข็ง			Start Defrost
 	Test
 800200		Status	สถานะ
 800201		Boiler	หม้อต้ม
@ -676,6 +679,18 @@ TextID	Note	English	Thai
 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
+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	เติมแบบหยอด

 800600		Turn around	หมุนกลับ
 800601		Call arm	Call แขน
@ -820,6 +835,16 @@ TextID	Note	English	Thai
 800764		Did you change module or not?	เปลียนอุปกรณ์หรือไม่
 800765		Did you clean module or not?	ทำความสะอาดหรือไม่
 800766		SerialNumber	ตัวเลขประจำอุปกรณ์
+800767		Please Select Option	กรุณาเลือก
+800768		Normal	ปกติ
+800769		Not Normal	ไม่ปกติ
+800770		Ice Module	ชุดหัวน้ำแข็ง
+800771		Type number.	ใส่ตัวเลข
+800772
+800773		Exhaust Fan Test	ทดสอบพัดลมดูดอากาศ
+800774
+800775
+800776



@ -852,6 +877,82 @@ TextID	Note	English	Thai
 810029		Close	ปิด
 810030		Disable	ปิดการใช้งาน
 810031		Enable	เปิดการใช้งาน
+810032		Unit in second	หน่วยวินาที
+810033		Unit in minute	หน่วยนาที
+810034		Hot Water volume	ปริมาณน้ำร้อน ml
+810035		Preheat when after make espresso ( minute )	pre-heat เมื่อหลังทำกาแฟ( นาที )
+810036
+810037
+810038
+810039
+810040
+810041
+810042
+810043
+810044
+810045
+810046
+810047
+810099		Operation: Ice will be dispensed 3 times. Please bring 2 glasses to hold the ice.	การทำงาน จะทำการจ่ายน้ำแข็ง 3 ครั้ง กรุณานำแก้วมารองรับน้ำแข็งจำนวน 2 ใบ 
+810100		Waste Water Tank	ถังน้ำทิ้ง
+810101		Coffee Grounds Compressor	เครื่องอัดกาแฟ
+810102		Ice Module	ชุดทำน้ำแข็ง
+810103		Whipper Module	ชุดหัวชง
+810104		Washing Cup	ถ้วยล้าง
+810105		Arm Module	ชุดแขน
+810106		Disc Powder	ฐานจานผง
+810107		Coffee Grinder	เครื่องบดกาแฟ
+810108		Soda Bath	ถังแช่โซดา
+810109		Arm Weight Scale	เครื่องชั่งน้ำหนักแขน
+810110		Bean Weight Scale	เครื่องชั่งน้ำหนักเมล็ดกาแฟ
+810111		Ice Weight Scale	เครื่องชั่งน้ำหนักน้ำแข็ง
+810112		Powder Canister	กล่องผง
+810113		Syrup Buffer	ถังไซรับ
+810114		Bean Canister	กล่องเมล็ด
+810115		Maintenance	Maintenance (ซ่อมบำรุง)
+810116		BACK	BACK / กลับสู่เมนู
+810117		WORK ORDER	MAINTAIN / ใบงาน
+810118		SAVE	SAVE / บันทึก
+810119		CANCEL	CANCEL / ยกเลิก
+810120		CLEAN	ทำความสะอาด
+810121		CHANGE	เปลี่ยน
+810122		CLEAN/CHANGE	ทำความสะอาด/เปลี่ยน
+810123		CALIBRATE	CALIBRATE
+810124		Type	ประเภท
+810125		Soda Status	สถานะโซดา
+810126		Do you want to calibrate?	ต้องการ Calibrate ใช่หรือไม่
+810127		Please take the glass out of arm	กรุณานำแก้วออกจากแขน
+810128		Please place the 200g object on the weight scale and press 'Yes'	กรุุณานำวัตถุ 200g วางที่เครื่องชั่งและกด Yes
+810129		Yes	Yes
+810130		No	No
+810131		Alert	ออกจากเมนู
+810132		Do you want to exit the maintenance menu?	ต้องการออกจากเมนูซ่อมบำรุงใช่หรือไม่?
+810133		Confirm Maintenance	ยืนยันการซ่อมบำรุง
+810134		Check the maintenance list carefully	ตรวจสอบรายการซ่อมบำรุงให้เรียบร้อย
+810135		before pressing the confirmation button	ก่อนกดปุ่มยืนยัน
+810136		No	No\n(ลำดับ)
+810137		Name	Name\n(ชื่ออุปกรณ์)
+810138		Detail	Detail\n(ข้อมูล)
+810139		Last Action	Last Action\n(เวลาที่ทำล่าสุด)
+810140		Status	Status\n(สถานะ)
+810141		SUBMIT	SUBMIT / ยืนยัน
+810142		clean	ทำความสะอาด
+810143		change	เปลี่่ยน
+810144		normal	ปกติ
+810145		abnormal	ไม่ปกติ
+810146		YES	YES / ใช่
+810147		NO	NO / ไม่ใช่
+810148		Alert	ตรวจสอบใบงาน
+810149		Please check the last 4 digits of refill order before press submit.	ตรวจสอบเลขท้าย4ตัวของใบงานแล้วกดยืนยัน
+810150		Volume	ปริมาณ
+810151		Water Tank	ถังน้ำดี
+810152		Day	วันที่
+810153
+810154
+810155
+810156
+810157
+810199



@ -872,3 +973,310 @@ TextID	Note	English	Thai
 900010		Espress clean station 2	ล้างกาแฟ 2
 900011		Espress clean station 3	ล้างกาแฟ 3  (ฝั่งนอกตู้)
 900012		Please select espresso path	กรุณาเลือกสายของกาแฟ
+1000000		System Test	ทดสอบระบบ
+1000001		Select testing lists	เลือก test ที่จะทดสอบ
+1000002		Full test	ทดสอบทั้งระบบ
+1000003		All	ทั้งหมด
+1000004		Main Test	ทดสอบหลัก
+1000005		Cup & Arms, Coffee, Whipper, Powder, Door cup, Door lid, Front door, Module disc	แก้ว & แขน, กาแฟ, หัวชง, ผง, ประตูแก้ว, ประตูฝา, ประตูหน้า, ฐานจานหมุน
+1000006		Ice Test	ทดสอบน้ำแข็ง
+1000007		Bucket, Shutter, Motor	ถัง, ชัตเตอร์, มอเตอร์
+1000008		Connection Test	ทดสอบการสื่อสาร
+1000009		Top, Bottom, Front door, Ice board	บน, ล่าง, ประตูหน้า, น้ำแข็ง
+1000010		Test	ทดสอบ
+1000011		Cancel	ยกเลิก
+1000012		Sec	วินาที
+1000013		Close	ปิด
+1000014		Test again	ทดสอบอีกครั้ง
+1000015		Test result	ผลการทดสอบ
+1000016		Confirm	ยืนยัน
+1000017		Wait a moment	รอสักครู่
+1000018		The machine is testing	เครื่องกำลังทดสอบ
+1000019		The machine is working	เครื่องกำลังทำงาน
+1000020
+1000021
+1100000		Calibrate	คาลิเบรท
+1100001		Select Module	เลือกชุด
+1100002		Module	ชุด
+1100003		Please check that there is no object on the selected module	ตรวจสอบว่าไม่มีวัตถุอยู่บนชุดที่เลือก
+1100004		Put weight 200 g on the selected module	วางน้ำหนัก 200 กรัมลงบนชุดที่เลือก
+1100005		Calibrate failed	คาริเบรทล้มเหลว
+1100006		Calibrate again	คาริเบรทอีกครั้ง
+1100007		Arms	แขน
+1100008		Coffee	กาแฟ
+1100009		Ice	น้ำแข็ง
+1100010		weight	น้ำหนัก
+1100011		Timeout	หมดเวลา
+1100012		Board offline	บอร์ดออฟไลน์
+1100013		Make sure weight 200 g is \n	ตรวจสอบว่าน้ำหนัก 200 กรัม \n
+1100014		properly placed on 	ได้วางลงบน
+1100015		Calibrate successfully	คาริเบรทสำเร็จ
+1100016		selected arm	แขนที่เลือก
+1200000		Cups & Arms	แก้ว & แขน
+1200001		Move & Pay	หมุน & จ่าย
+1200002		Set Arms	ตั้งค่าแขน
+1200003		Move arms & pay cups	หมุนแขน & จ่ายแก้ว
+1200004		Move all arms	หมุนทุกแขน
+1200005		1. Select arm	1. เลือกแขน
+1200006		2. Select cup slot	2. เลือกแก้ว
+1200007		Paper Cup	แก้วกระดาษ
+1200008		Shot Cup	แก้วช็อต
+1200009		Plastic Cup	แก้วพลาสติก
+1200010		3. Select position	3. เลือกตำแหน่ง
+1200011		Serve & brew	เสิร์ฟ & ชง
+1200012		Pay ingredient	จ่ายวัตถุดิบ
+1200013		Maintain	เก็บ
+1200014		Current position	ตำแหน่งปัจจุบัน
+1200015		Pick-up	หยิบ
+1200016		Whipper	หัวชง
+1200017		Powder	ผง
+1200018		Ice	นำ้แข็ง
+1200019		Soda / Mix 1	โซดา / มิกซ์ 1
+1200020		Water / Coffee / Syrup	น้ำ / กาแฟ / ไซรัป
+1200021		Check Cup	เช็คแก้ว
+1200022		Clean	ล้าง
+1200023		Waste	ทิ้ง
+1200024		Arms operation	ปิด-เปิดแขน
+1200025		Close Arm 	ปิดแขน
+1200026		Open Arm 	เปิดแขน
+1200027		The selected arm will * operate \n	แขนทีถูกเลือกจะ * ทำงาน \n
+1200028		while the machine is open for sale	ในขณะที่เครื่องกำลังเปิดการขาย
+1200029		Opening and closing arms will affect machine's service when it is open for sale	การเปิดและปิดแขนจะส่งผลต่อการบริการของเครื่องในขณะที่กำลังเปิดขาย
+1300000		Coffee	กาแฟ
+1300001		Pay & Grind	จ่าย & บด
+1300002		Brew test	ทดสอบชง
+1300003		Beans module	ชุดเมล็ดกาแฟ
+1300004		Bean tray	ถาดใส่เมล็ดกาแฟ
+1300005		Switch tray :	สวิตซ์ถาด :
+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	ขนาดบด
+1300013		Standard	มาตรฐาน
+1300014		Result	ผลลัพธ์
+1300015		Bean weight:g	น้ำหนักถั่ว:กรัม
+1300016		Brew time:sec	เวลาชง: วินาที
+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. ทดสอบการชงกาแฟ
+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	กำหนดขนาดบด
+1300030		Set as default	ตั้งให้เป็นค่าเริ่มต้น
+1300031		(Set as default when meet standard)	(ตั้งเป็นค่าเริ่มต้นเมื่อเป็นไปตามมาตรฐาน)
+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	ใส่ถ้วยด้วยตนเอง
+1300040		2. Select arm	2. เลือกแขน
+1300041		3. Please insert cup into selected arm	3. กรุณาใส่ถ้วยลงในแขนที่เลือก
+1300042		Test	ทดสอบ
+1300043		Grind	บด
+1300044		Pay beans from slot *	จ่ายเมล็ดกาแฟจาก *
+1300045		Draw back from slot *	หมุนกลับจาก *
+1300046		Grind beans for * sec.	บดเมล็ดกาแฟ * วินาที
+1400000		Whipper	หัวชง
+1400001		Move	เคลื่อน
+1400002		Speed	ความเร็ว
+1400003		Blend test	ทดสอบหัวชง
+1400004		Latest cycles number :	จำนวนรอบการหมุนล่าสุด :
+1400005		rounds/minute	รอบ/นาที
+1400006		Moving test	ทดสอบการเคลื่อนที่
+1400007		Current position & level :	ตำแหน่งปัจจุบัน & ระดับ
+1400008		1. Select position	1. เลือกตำแหน่ง
+1400009		Brew	ชง
+1400010		Clean	ล้าง
+1400011		2. Select level	2. เลือกระดับ
+1400012		Check level	ระดับตรวจสอบ
+1400013		Blend level	ระดับปั่น
+1400014		Maintain level	ระดับเก็บ
+1400015		Home	Home
+1400016		Hot	Hot
+1400017		Cold	Cold
+1400018		Speed test	ทดสอบความเร็ว
+1400019		Standard speed: 	ความเร็วมาตรฐาน:
+1400020		Please enter an odd number for testing	กรุณาใส่เลขคี่เพื่อทดสอบ
+1400021		Direction	ทิศทาง
+1400022		Brew	ชง
+1400023		Cycles : rounds/minute	รอบ : รอบ/นาที
+1400024		Blending	การปั่น
+1400025		Blend now	Blend now
+1400026		Blend * sec with speed * %	ปั่น * วินาที ด้วยความเร็ว * %
+1400027		Please be careful and step away	โปรดระวังและออกห่าง
+1400028		from mechanism before starting away	จากกลไกก่อนที่จะเริ่ม
+1400029		Blend test don’t pass the standard. Please check the whipper, maybe it's time to replace
+1400030		1. Recheck brew recipes	1. ตรวจสอบสูตรชงอีกครั้ง
+1400031
+1400032
+1400033
+1400034
+1400035
+1500000		Soda & Syrup	โซดา & ไซรัป
+1500001		Pay	จ่าย
+1500002		Set soda	ตั้งค่าโซดา
+1500003		Pay soda & syrup	จ่ายโซดา & ไซรัป
+1500004		1. Select stock type	1. เลือกประเภทสต็อก
+1500005		Count stock	นับสต็อก
+1500006		Not count stock	ไม่นับสต็อก
+1500007		2. Select slot	2. เลือกช่อง
+1500008		3. Select pay option	3. เลือกตัวเลือกการจ่าย
+1500009		Please ensure there is always a cup or container available to receive the syrup	กรุณาตรวจสอบว่ามีแก้วหรือภาชนะพร้อมสำหรับการรับไซรัป
+1500010		Clean pipe	ล้างท่อ
+1500011		Select pipe	เลือกท่อ
+1500012		Pipe	ท่อ
+1500013		Cleaning time	ระยะเวลาการล้าง
+1500014		4. Select arm & cup	4. เลือกแก้ว & แขน
+1500015		* syrup with #	* ไซรัปด้วย #
+1500016		* syrup from #	* ไซรัปจากช่อง #
+1500017		Soda module	ชุดโซดา
+1500018		Soda quantity	ปริมาณโซดา
+1500019		Probe 1	Probe 1
+1500020		Probe 2	Probe 2
+1500021		Water probe	Water probe
+1500022		Temperature	อุณหภูมิ
+1500023		Pressure	ความดัน
+1500024		P1 always more than P2	P1 ต้องมากกว่า P2 เสมอ
+1500025		Standard value not more than 100 - 200	ค่ามาตรฐานต้องไม่มากกว่า 100 ถึง 200
+1500026		Module shutdown automatic when reaches 2 °C	ชุดโซดาจะปิดการทำงานอัตโนมัติเมื่ออุณหภูมิถึง 2 °C
+1500027		Standard value around 85 psi	ค่ามาตรฐานควรอยู่ประมาณ 85 psi
+1500028		Defrost cooling tank	ละลายถังทำความเย็น
+1500029		More soda log detail - view factory config	รายละเอียดบันทึกโซดาเพิ่มเติม - ดูการตั้งค่าโรงงาน
+1500030		View	ดู
+1500031		idle	idle
+1500032
+1600000		Powder	ผง
+1600001		Moving test	ทดสอบการย้าย
+1600002		1. Select powder slot	1. เลือกสล็อตผง
+1600003		2. Select position	2. เลือกตำแหน่ง
+1600004		Pay	จ่าย
+1600005		Change	เปลี่ยน
+1600006		Pay powder	จ่ายผง
+1600007
+1700000		Water	น้ำ
+1700001
+1700002
+1700003
+1700004
+1700005
+1700006
+1700007
+1800000		Ice	น้ำแข็ง
+1800001		Move & Pay	ย้าย & จ่าย
+1800002		Set Ice	ตั้งน้ำแข็ง
+1800003		Moving Test
+1800004		Check bucket position	ตรวจสอบตำแหน่งถัง
+1800005		Check bucket shutter	ตรวจสอบชัตเตอร์ถัง
+1800006		Bucket move to fill ice success	ถังน้ำแข็งเคลื่อนที่เพื่อเติมน้ำแข็งสำเร็จ
+1800007		Weight scale motor move timeout	มอเตอร์เครื่องชั่งน้ำหนักหมดเวลา
+1800008		Bucket move to pay ice success	ถังน้ำแข็งเคลื่อนที่เพื่อจ่ายน้ำแข็งสำเร็จ
+1800009		Weighscale motor timeout	มอเตอร์เครื่องชั่งน้ำหนักหมดเวลา
+1800010		Shutter open timeout	ชัตเตอร์เปิดหมดเวลา
+1800011		Shutter close timeout	ชัตเตอร์ปิดหมดเวลา
+1800012		Huge weight difference bucket and arm	น้ำหนักถังกับแขนต่างกันมาก
+1800013		Open shutter success	เปิดชัดเตอร์สำเร็จ
+1800014		Open shutter fail	เปิดชัดเตอร์ล้มเหลว
+1800015		Close shutter success	ปิดชัดเตอร์สำเร็จ
+1800016		Close shutter fail	ปิดชัดเตอร์ล้มเหลว
+1800017		Pay Ice	จ่ายน้ำแข็ง
+1800018		Pay ice 180 g for brewing	จ่ายน้ำแข็ง 180 กรัม เพื่อชง
+1800019		Pay ice 310 g for ice only	จ่ายน้ำแข็ง 310 กรัม น้ำแข็งล้วน
+1800020		Pay ice 100 g for test	จ่ายน้ำแข็ง 100 กรัม เพื่อทดสอบ
+1800021		Ice module configuration	กำหนดค่าโมดูลน้ำแข็ง
+1800022		Temperature	อุณหภูมิ
+1800023		Current weight	น้ำหนักปัจจุบัน
+1800024		Ice quantity	ปริมาณน้ำแข็ง
+1800025
+1800026
+1800027
+1900000		Front Door	ประตูหน้า
+1900001		Lid & straw test	ทดสอบฝา & หลอด
+1900002		Door test	ทดสอบประตู
+1900003		Pay lid	จ่ายฝา
+1900004		Pay straw	จ่ายหลอด
+1900005		Lid	ฝา
+1900006		Straw	หลอด
+1900007		UV light	แสง UV
+1900008		Check door lid	ตรวจสอบประตูฝา
+1900009		Check door cup	ตรวจสอบประตูแก้ว
+1900010
+1900011
+1900012
+2000000		Mechanism	กลไก
+2000001
+2000002
+2000003
+2000004
+2000005
+2000006
+2000007
+2100000		Setting	ตั้งค่า
+2100001		Overall mechanism	Overall mechanism
+2100002		Pulse hot	Pulse hot
+2100003		Pulse cold	Pulse cold
+2100004		Boiler temperature	Boiler temperature
+2100005		Powder disc cam	Powder disc cam
+2100006		Gear grinder value	Gear grinder value
+2100007		PWM value	PWM value
+2100008		Door cup	Door cup
+2100009		Door lid	Door lid
+2100010		Sound volume	Sound volume
+2100011		More machine configuration	More machine configuration
+2100012		View & config	View & config
+2100013		Restore default	Restore default
+2100014		Set %s from %s to %s	Set %s from %s to %s
+2100015		Restore %s to default	Restore %s to default
+2100016		Sorry, your account cannot access this page	Sorry, your account cannot access this page
+2100017		Please contact %s to request access permission	Please contact %s to request access permission
+2100018		Machine configuration	Machine configuration
+2100019		Machine ID	Machine ID
+2100020		Machine model	Machine model
+2100021		Lid & straw module	Lid & straw module
+2100022		Lid sensor	Lid sensor
+2100023		Request straw button	Request straw button
+2100024		Water	Water
+2100025		Water source	Water source
+2100026		Boiler	Boiler
+2100027		Whipper module	Whipper module
+2100028		Whipper type	Whipper type
+2100029		Cleaning cup type	Cleaning cup type
+2100030		Ice module	Ice module
+2100031		Ice module type	Ice module type
+2100032		Ice module serial number	Ice module serial number
+2100033		Ice gear type	Ice gear type
+2100034		Ice board type	Ice board type
+2100035		Ice bucket type	Ice bucket type
+2100036		Ice bucket limit switch	Ice bucket limit switch
+2100037		Ice pipeline type	Ice pipeline type
+2100038		Water in ice core	Water in ice core
+2100039		Compressor type	Compressor type
+2100040		Pulse compressor	Pulse compressor
+2100041		Sleep mode	Sleep mode
+2100042		Soda module	Soda module
+2100043		Soda freezer probe	Soda freezer probe
+2100044		Soda tank mode	Soda tank mode
+2100045		Coffee module	Coffee module
+2100046		Cofee module type	Cofee module type
+2100047		Coffee module serial number	Coffee module serial number
+2100048		Lid sensor will be inactive when machine operating	Lid sensor will be inactive  when machine operating
+2100049		Lid sensor will be active when machine operating	Lid sensor will be active  when machine operating
+2100050		Request straw button will appear on machine's sale screen	Request straw button will appear  on machine's sale screen
+2100051		Request straw button will disappear on machine's sale screen	Request straw button will disappear  on machine's sale screen
+2100052		Pulse compressor will be active when machine operating.	Pulse compressor will be active  when machine operating.
+2100053		Pulse compressor will be inactive when machine operating.	Pulse compressor will be inactive  when machine operating.
+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
--- a/inter/mys/xml/page_collect_point_1.lxml
+++ b/inter/mys/xml/page_collect_point_1.lxml
--- a/inter/mys/xml/page_collect_point_2.lxml
+++ b/inter/mys/xml/page_collect_point_2.lxml
@ -0,0 +1,363 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+
+<EventOpen>
+	; On open
+
+	Var Timeout = 0
+	SAVELOG UnitTestType
+	
+	If UnitTestType = "1" Then
+		Var CoffeePoint = 10
+		Open "ROOT/taobin_project/xml/page_show_consent.xml"
+	EndIf
+
+	Var TaobinLevel = 0
+	Var Point2X = 0
+
+	Var Seeker.IsLineMember = 0
+	Var Seeker.TaobinErrorNetwork = 0
+
+
+	 If show_eng = "true" Then 
+		Var DirImage = "ROOT/taobin_project/image/collectiing_en"
+		
+		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
+
+		
+	Else
+		Var DirImage = "ROOT/taobin_project/image/collectiing"
+
+		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
+	EndIf
+
+	If PayOfflineMode = 1 Then
+		Var Seeker.TaobinErrorNetwork = 1
+		Var Seeker.PointTaobinStr = ParamCP
+		Var TelephoneNumber = TelephoneNumberX
+		Var Seeker.TNumberTaobinMember= TelephoneNumber
+		Open "ROOT/taobin_project/inter/mys/xml/page_collect_point_error.lxml"
+
+	EndIf
+
+	Var GetLuckyDraw = 0
+		
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+	Var CountDownBrewing = BREW_CNT
+
+	Var ShowCountDownBrewing = CountDownBrewing
+
+
+	Var Timeout = Timeout + 1
+	If Timeout > 30 Then
+      
+		
+			Var TaobinLevel = 0
+			Var CoffeePoint = 1 
+
+			Var Seeker.TaobinErrorNetwork = 1
+			Var Seeker.PointTaobinStr = ParamCP
+			
+				Var TelephoneNumber = TelephoneNumberX
+			
+			Var Seeker.TNumberTaobinMember= TelephoneNumber
+			Open "ROOT/taobin_project/inter/mys/xml/page_collect_point_error.lxml"
+		
+		
+	EndIf
+
+	TimerReset
+	Refresh
+</EventTimeout> 
+
+
+
+
+			
+<EventSecurity> 
+	Open "/media/bt/xml/security_alarm.xml" 
+</EventSecurity>
+
+<EventActionOk>
+
+	If StepGetPoint = 0 Then
+		If PdpaAsk = 0 Then
+			Open "ROOT/taobin_project/xml/page_show_consent.xml" 
+		Else
+			Var StepGetPoint = 1
+		
+				Var TelephoneNumber = TelephoneNumberX
+			
+    		GETACCEXT TelephoneNumber 14
+			Var Ext1a = ""
+			Open "ROOT/taobin_project/inter/mys/xml/page_collect_point_2.xml"  
+		EndIf
+	Else
+
+		
+
+
+		If Ext1a = "" Then
+			
+			Var Seeker.TaobinErrorNetwork = 1
+			Var Seeker.PointTaobinStr = ParamCP
+			Var TelephoneNumber = TelephoneNumberX
+			Var Seeker.TNumberTaobinMember = TelephoneNumber
+			Open "ROOT/taobin_project/inter/mys/xml/page_collect_point_error.lxml"
+			
+		Else
+
+			If GetLuckyDraw = 1 Then
+				If Ext1a = "ok" Then
+					DEBUGVAR Ext1h
+					DEBUGVAR Ext1i
+					Var luckyDrawTicket = Ext1h
+					INT luckyDrawTicket
+					Var luckyDrawAlredyGotReward = Ext1i
+					If luckyDrawAlredyGotReward = 1 Then
+						Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
+					Else
+						Open "ROOT/taobin_project/xml/page_collect_point_3_28_lucky_draw_campaign.xml"
+					EndIf
+				Else
+					
+					Var Seeker.TaobinErrorNetwork = 1
+					
+					Var Seeker.PointTaobinStr = ParamCP
+					Var TelephoneNumber = TelephoneNumberX
+					Var Seeker.TNumberTaobinMember = TelephoneNumber
+					Open "ROOT/taobin_project/inter/mys/xml/page_collect_point_error.lxml"
+				EndIf
+			EndIf
+			
+
+			If GetLuckyDraw = 0 Then
+				If Ext1a = "ok" Then
+
+					Var TaobinName = Ext1d
+					Var TaobinCoupons = Ext1g
+					Var TaobinExpire = Ext1f
+					Var TaobinLevel = Ext1e
+					Var TaobinPDPA = Ext1h
+
+					Var TaobinPromoX = Ext1j
+
+					DEBUGVAR TaobinPDPA
+
+					Var PointTaobinTmp = Ext1i
+
+					DEBUGVAR PointTaobinTmp
+					INT PointTaobinTmp
+
+					INT TaobinPDPA
+
+					If TaobinName = "-" Then
+						Var Seeker.IsLineMember = 0
+					Else
+						Var Seeker.IsLineMember = 1
+					EndIf
+					
+
+					Var TelephoneNumber = TelephoneNumberX
+					Var TNumberTaobinMemberXXX = TelephoneNumber
+
+					;Var PointTaobinTmp = 4
+					
+					Var PointTaobin = PointTaobinTmp
+					Var pTaobin = PointTaobin
+
+					DEBUGVAR  TaobinLevel
+
+					If TaobinLevel = "1" Then
+						Var pTaobin = PayAmount / 20
+					Else
+						Var pTaobin = PayAmount / 15
+					EndIf
+
+					If pTaobin > 0 Then
+						Var pTaobinX = PointTaobin / pTaobin
+						If pTaobinX >= 2 Then
+							Var Point2X = 1
+						EndIf
+					EndIf
+
+
+					Var Seeker.PointTaobinStr = ParamCP
+					Var Seeker.TNumberTaobinMember = TelephoneNumberX
+					
+
+					Var CoffeePointRank = Ext1b
+					INT CoffeePointRank
+
+					Var CoffeePoint1 = Ext1c
+					INT CoffeePoint1
+				
+					Var CoffeePoint = PointTaobin + CoffeePoint1
+					Var CoffeePointOld = CoffeePoint1
+
+					If TaobinLevel = 1 Then
+						Var CoffeePointRank = CoffeePointRank + 0
+					Else
+						Var CoffeePointRank = CoffeePointRank + PointTaobin
+					EndIf 
+
+					Var CoffeePointRankTmp = CoffeePointRank
+
+
+					DEBUGVAR Seeker.PointTaobinStr
+					DEBUGVAR Seeker.TNumberTaobinMember
+					If TaobinPDPA = 0 Then
+
+						;inter-xml-open
+						If CountryName = "Malaysia" Then
+							Open "ROOT/taobin_project/inter/mys/xml/page_collect_point_3.xml" 
+						EndIf
+
+						;inter-xml-open
+						If CountryName = "Indonesia" Then
+							Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
+						EndIf 
+
+						;inter-xml-open
+						If CountryName = "Australia" Then
+
+							If NewCollectPointFlag = 1 Then
+								Var pageCollectPoint = CountryRootPath + "/xml/page_collect_point_3.lxml"
+								Open pageCollectPoint
+							Else
+								Open "ROOT/taobin_project/xml/page_collect_point_3.lxml" 
+							EndIf
+							
+						EndIf
+
+						;inter-xml-open
+						If CountryName = "Singapore" Then
+							Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
+						EndIf 
+
+						Open "ROOT/taobin_project/xml/page_show_consent.xml" 
+					EndIf
+
+					If PayAmount >= 20 Then
+
+						If TaobinPromoX = "p2.no_otp" Then
+							Open "ROOT/taobin_project/xml/page_collect_point_extend1.xml" 
+						EndIf
+
+						If TaobinPromoX = "p2.unused" Then
+							Open "ROOT/taobin_project/xml/page_collect_point_extend1.xml" 
+						EndIf
+						
+					EndIf
+
+					If NewCollectPoint = 1 Then
+						If LuckyDrawCampaign = 1 Then
+							Var GetLuckyDraw = 1
+							GETACCEXT TelephoneNumber 14
+						Else
+							Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
+						EndIf
+					Else
+						Open "ROOT/taobin_project/inter/mys/xml/page_collect_point_3.lxml" 
+					EndIf
+
+
+				Else
+					
+					Var Seeker.TaobinErrorNetwork = 1
+					
+					Var Seeker.PointTaobinStr = ParamCP
+					Var TelephoneNumber = TelephoneNumberX
+					Var Seeker.TNumberTaobinMember = TelephoneNumber
+					Open "ROOT/taobin_project/inter/mys/xml/page_collect_point_error.lxml"
+				EndIf
+			EndIf
+
+		EndIf
+	EndIf
+
+</EventActionOk>
+
+<EventActionError> 
+
+
+	
+		
+		Var Seeker.TaobinErrorNetwork = 1
+	
+		Var Seeker.PointTaobinStr = ParamCP
+		Var TelephoneNumber = TelephoneNumberX
+		Var Seeker.TNumberTaobinMember= TelephoneNumber
+		Open "ROOT/taobin_project/inter/mys/xml/page_collect_point_error.lxml"
+	
+
+</EventActionError> 
+
+<EventMachine>
+	If MachineStage = "drink-success" Then
+		Var MachineState_Result = 1
+	EndIf
+
+	If MachineStage = "drink-failed" Then
+		Var MachineState_Result = 2
+	EndIf
+</EventMachine>
+
+
+
+<Image>
+<X> 178 </X>
+<Y> 680 </Y>
+<Filename> Var( DirImage + "/text20.png" ) </Filename>
+</Image>
+
+
+;include="ROOT/taobin_project/inc/video.inc"
+
+
+
+
+
+
+
+
+<Text>
+<X> 0 </X>
+<Y> 873 </Y>
+<Width> 1080 </Width>
+<Align> Center </Align>
+<Size> 62 </Size>
+<Font> RobotoBlack </Font>
+<Color> 0x513C2F </Color>
+<Value> TelephoneNumber </Value>
+<Format> Telnum-mask-1 </Format>
+</Text>
+
+
+;
+<Image>
+<X> 751 </X>
+<Y> 413 </Y>
+<Filename> IMG_CNT </Filename>
+</Image>
+;
+<Text>
+<X> XPosiShowCountDownBrew </X>
+<Y> 470 </Y>
+<Align> End </Align>
+<Width> 153 </Width>
+<Size> 88 </Size>
+<Font> RobotoBold </Font>
+<Color> 0x513C2F </Color>
+<Value> ShowCountDownBrewing </Value>
+</Text>
+
+
+</Popup>
+	
--- a/inter/mys/xml/page_collect_point_3.lxml
+++ b/inter/mys/xml/page_collect_point_3.lxml
--- a/inter/mys/xml/page_collect_point_error.lxml
+++ b/inter/mys/xml/page_collect_point_error.lxml
@ -0,0 +1,112 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+
+<EventOpen>
+	; On open
+	
+
+	Var Timeout = 0
+	SAVELOG show_eng
+	
+    If show_eng = "true" Then 
+		Var DirImage = "ROOT/taobin_project/image/display_get_free_en/"
+		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+
+	Else
+		Var DirImage = "ROOT/taobin_project/image/display_get_free/"
+		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+	EndIf
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+
+	Var Timeout = Timeout + 1
+	If Timeout > 5 Then
+        ; goto lid straw
+
+		
+
+		Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+	EndIf
+
+	TimerReset
+	Refresh
+</EventTimeout> 
+
+<EventMachine>
+	If MachineStage = "drink-success" Then
+		Var MachineState_Result = 1
+	EndIf
+
+	If MachineStage = "drink-failed" Then
+		Var MachineState_Result = 2
+	EndIf
+</EventMachine>
+
+
+
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/alpha.png" </Filename>
+</Image>
+
+
+
+
+
+
+<Image>
+<X> 158 </X>
+<Y> 665 </Y>
+<Filename> Var( DirImage + "/img_popup4.png" )</Filename>
+</Image>
+
+
+<Button>
+<X> 397 </X>
+<Y> 1680 </Y>
+<Filename> Var( DirImage + "/bn_accept.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/bp_accept.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	; goto lid straw
+
+	
+	Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+
+</EventClick>
+</Button>
+
+
+
+;include="ROOT/taobin_project/inc/video.inc"
+
+
+
+
+
+
+
+		
+
+
+			
+
+
+
+
+			
+<EventSecurity> 
+	Open "/media/bt/xml/security_alarm.xml" 
+</EventSecurity>
+
+
+</Page>
--- a/menu/new-layout.tsv
+++ b/menu/new-layout.tsv
@ -900,7 +900,7 @@ Name=BeautyRobinson,file=page_catalog_group_pro_robinson_beauty.skt
 		โรสตรอว์มัทฉะ	ICED RO STRAW\nMATCHA	Straw + Matcha + Milk	Straw + Matcha + Milk	-	12-02-02-0067	-	bn_Straw_Matcha_milk_robinson_beauty.png	-	-	-	posi1
 		บินสตรอว์คาเฟ่ลาเต้	ICED BIN STRAW\nCAFE LATTE	Cafe latte + Straw	Cafe latte + Straw	-	12-01-02-0074	-	bn_hot_LATTE_Straw_robinson_beauty.png	-	12-21-02-0074	-	posi1
 		สันจัสชี่	ICED SON JAS\nCHEE TEA	Jasmine tea + Lychee	Jasmine tea + Lychee	-	-	12-02-03-0053	bn_HOT_JASMINE_Lychee_robinson_beauty.png	-	-	-	posi1
-
+		โรบินสันอัพชี่	ROBINSON UP CHEE SMOOTHIE	เซเว่น อัพ ลิ้นจี่ มะนาว โซดา 	7Up Lychee Lime Soda	-	-	12-05-03-0115	bn_iced_7UP_Lychee_SODA_robinson_beauty.png	-	-	-	posi1

 Name=banana_and_mint_lucky_draw_x3,file=page_catalog_group_pro_banana_mint_lucky_draw_x3.skt
 		กาแฟมินต์ลาเต้	MINT CAFE LATTE	กาแฟ น้ำ นม และ มินต์	Espresso, Mint Syrup,\nSugar, Milk	-	12-01-02-0057	-	bn_Iced_Mint_Latte_passion.png	-	12-21-02-0057	-	posi1
@ -928,6 +928,17 @@ Name=banana_and_mint_lucky_draw_x3,file=page_catalog_group_pro_banana_mint_lucky
 		นมโตเกียวบานาน่าเย็น	TOKYO BANANA MILK	น้ำเชื่อมโตเกียวบานาน่า นม น้ำตาลและน้ำแข็ง	Tokyo Banana Syrup, Milk, Sugar, Ice	-	12-03-02-0023	12-03-03-0023		-	-	-	posi1
 		เต่าทรงพลังโตเกียวบานาน่าโซดาเย็น	TOKYO BANANA POWER DRINK SODA	น้ำเชื่อมกล้วย เต่าทรงพลัง (มีคาเฟอีน)	Banana Syrup, Medicine drink, Soda and Ice	-	12-05-02-0078	-		-	-	-	posi1

+Name=jemila,file=page_catalog_group_pro_jemila.skt
+		เจมิลานม	Jemila Milk	เจมิลา นม และน้ำแข็ง	Jemila, Milk and Ice	-	12-03-02-0075	-	bn_iced_milk_jemila.png	-	-	-	posi1
+		เจมิลาออรจินอล	Jemila Original	เจมิลา น้ำ และน้ำแข็ง	Jemila, Water and Ice	-	12-05-02-0124	-	bn_water_roomtemp_jemila.png	-	-	-	posi1
+		เจมิลาชาไทย	Jemila Thai tea	เจมิลา ชาไทย และน้ำแข็ง	Jemila, Thai tea and Ice	-	12-02-02-0068	-	bn_hot_thai_milk_tea_jemila.png	-	-	-	posi1
+		เจมิลาโซดา	Jemila Soda	เจมิลา โซดา และน้ำแข็ง	Jemila, Soda and Ice	-	12-05-02-0125	-	bn_soda_jemila.png	-	-	-	posi1
+		เจมิลากาโน่	Jemila Americano	เจมิลา กาแฟ และน้ำแข็ง	Jemila, Espresso and Ice	-	12-01-02-0075	-	bn_hot_america_no_jemila.png	-	12-21-02-0075	-	posi1
+		เจมิลาโกโก้	Jemila Cocoa	เจมิลา โกโก้ และน้ำแข็ง	Jemila, Cocoa and Ice	-	12-03-02-0076	-	bn_iced_cocoa_jemila.png	-	-	-	posi1
+		เจมิลาขิง	Jemila Ginger	เจมิลา ขิง และน้ำแข็ง	Jemila, Ginger and Ice	-	12-02-02-0069	-	bn_hot_Ginger_tea_jemila.png	-	-	-	posi1
+		เจมิลาเซเว่นอัพโซดา	Jemila 7UP soda	เจมิลา 7up และน้ำแข็ง	Jemila, 7 up and Ice	-	12-05-02-0126	-	bn_iced_7up_jemila.png	-	-	-	posi1
+		เจมิลามะนาว	Jemila Lime	เจมิลา มะนาว และน้ำแข็ง	Jemila, Lime and Ice	-	12-05-02-0127	-	bn_iced_lemonade_jemila.png	-	-	-	posi1
+		เจมิลามะลิ	Jemila Jasmine	เจมิลา ชามะลิ และน้ำแข็ง	Jemila, Jasmine tea and Ice	-	12-02-02-0070	-	bn_jasmine_tea_jemila.png	-	-	-	posi1

 Name=bubble tea,file=page_catalog_group_pro_buble_tea.skt
 		ลาเต้	LATTE	กาแฟ นม และ ฟองนม	Espresso, Milk, Foamed milk	-	12-21-62-0002	12-21-63-0002
--- a/ui/lang.tsv
+++ b/ui/lang.tsv
@ -948,7 +948,7 @@
 810150		Volume	ปริมาณ
 810151		Water Tank	ถังน้ำดี
 810152		Day	วันที่
-810153
+810153		Weight	น้ำหนัก
 810154
 810155
 810156
@ -1076,7 +1076,7 @@
 1300016		Brew time:sec	เวลาชง: วินาที
 1300017		Test grind sizes	ทดสอบขนาดบด
 1300018		Coffee module type :	ประเภทชุดกาแฟ :
-1300019		1. Select grind sizes	1. เลือกขนาดการบด
+1300019		1. Select grind sizes	1. เลือกขนาดบด
 1300020		More coarse	หยาบขึ้น
 1300021		More fine	ละเอียดขึ้น
 1300022		2. Test grinding	2. ทดสอบการบด
--- a/video/brewing_adv11.mp4
+++ b/video/brewing_adv11.mp4
--- a/video/brewing_adv12.mp4
+++ b/video/brewing_adv12.mp4
--- a/video/brewing_adv13.mp4
+++ b/video/brewing_adv13.mp4
--- a/video/brewing_txt_adv11.png
+++ b/video/brewing_txt_adv11.png
--- a/video/brewing_txt_adv11_en.png
+++ b/video/brewing_txt_adv11_en.png
--- a/video/brewing_txt_adv12.png
+++ b/video/brewing_txt_adv12.png
--- a/video/brewing_txt_adv12_en.png
+++ b/video/brewing_txt_adv12_en.png
--- a/video/brewing_txt_adv13.png
+++ b/video/brewing_txt_adv13.png
--- a/video/brewing_txt_adv13_en.png
+++ b/video/brewing_txt_adv13_en.png
--- a/video/script3_brew.ev
+++ b/video/script3_brew.ev
@ -1,30 +1,70 @@
 ; Need var brew_vdo2 
 ; Need var brew_txt2

-
-DEBUGVAR 7UpLuckyDrawX2Pro
-; disable
-If 7UpLuckyDrawX2Pro = 1 Then
+DEBUGVAR script3_brewing_ignore
+If script3_brewing_ignore = "" Then
 	
-
-	GetFileSizeK "taobin_project/video/brewing_adv4.mp4" brewing_adv_size	
-	DEBUGVAR brewing_adv_size
-	If brewing_adv_size = 9368231 Then
 	
-		Var adver_brewing_play_index = 1
-		Var adver_brewing_count_down = 16
-
-		Var brew_vdo2 = "ROOT/taobin_project/video/brewing_adv4.mp4"
-		Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv4.png"
-		SAVELOG "Play adv4 7UpLuckyDrawX2Pro "
+	If BoxID = 175689 Then
+		Var ShopeePayLaterOn = 1
+	EndIf
+	If BoxID = 173873 Then
+		Var ShopeePayLaterOn = 1
+	EndIf
+	If BoxID = 173149 Then
+		Var ShopeePayLaterOn = 1
+	EndIf
+	If BoxID = 200001 Then
+		Var ShopeePayLaterOn = 1
 	EndIf

-	; comment for change this file size

-EndIf	
+	If SystemDateMonthInt = 9 Then
+		Var ShopeePayLaterOn = 1

-Var adver_brewing_play_index = 1
-		Var adver_brewing_count_down = 16
-Var brew_vdo2 = "ROOT/taobin_project/video/video_test1.mp4"
-Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv4.png"
+		If SystemDateDayInt > 14 Then
+			Var EDC_ThailandOn = 1
+		EndIf
+	EndIf

+
+	If SystemDateMonthInt = 10 Then
+
+		Var EDC_ThailandOn = 1
+	EndIf
+
+	If SystemDateMonthInt = 11 Then
+
+		Var EDC_ThailandOn = 1
+	EndIf
+
+	
+	If ShopeePayLaterOn = 1 Then
+
+
+		GetFileSizeK "taobin_project/video/brewing_adv12.mp4" brewing_adv_size	
+		DEBUGVAR brewing_adv_size
+		If brewing_adv_size = 3687715 Then
+		
+			Var adver_brewing_play_index = 1
+			Var adver_brewing_count_down = 15
+
+			Var brew_vdo2 = "ROOT/taobin_project/video/brewing_adv12.mp4"
+			If show_eng = "true" Then
+				Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv12_en.png"
+			Else
+				Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv12.png"
+			EndIf
+			SAVELOG "Play adv11 ShopeePayLaterOn "
+		EndIf
+
+		; comment for change this file size
+
+	EndIf	
+Else
+	Var adver_brewing_play_index = 1
+	Var adver_brewing_count_down = 0
+	Var SelectMenuBetweenBrewEnable1Blink = "Enable" 
+	Var SelectMenuBetweenBrewEnable1Text = "Enable"
+
+EndIf
--- a/video/script3_first_brewing.ev
+++ b/video/script3_first_brewing.ev
@ -0,0 +1,189 @@
+; Need var brew_vdo1
+; Need var brew_txt1
+
+If BrewingAdvertiseShowSlot = "" Then
+    Var BrewingAdvertiseShowSlot = 0
+EndIf
+
+
+If SystemDateMonthInt = 9 Then
+	Var ShopeePayLaterOn = 1
+
+    If SystemDateDayInt > 14 Then
+        Var EDC_ThailandOn = 1
+    EndIf
+EndIf
+
+
+If SystemDateMonthInt = 10 Then
+
+	Var EDC_ThailandOn = 1
+EndIf
+
+If SystemDateMonthInt = 11 Then
+
+	Var EDC_ThailandOn = 1
+EndIf
+
+;
+;
+;
+;
+Var EDC_ThailandOn = 1
+
+;
+;
+;
+;
+;
+
+Var BrewingAdvertiseEnable[0] = 0
+Var BrewingAdvertiseEnable[1] = 0
+Var BrewingAdvertiseEnable[2] = 0
+Var BrewingAdvertiseEnable[3] = 0
+Var BrewingAdvertiseEnable[4] = 0
+Var BrewingAdvertiseEnable[5] = 0
+
+
+DEBUGVAR RobinsonBeautyPro
+DEBUGVAR EDC_ThailandOn
+DEBUGVAR ShopeePayLaterOn
+Var BrewingAdvertiseRunSlot = 0
+
+
+Var BrewingAdvertiseEnable[ BrewingAdvertiseRunSlot] = 1
+Var BrewingAdvertiseVideo[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/image/page_doing/tao_adv1.png";
+If show_eng = "true" Then
+	Var BrewingAdvertiseImage[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv1_en.png"
+Else
+	Var BrewingAdvertiseImage[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv1.png"
+EndIf
+
+Var BrewingAdvertiseDurationTime[BrewingAdvertiseShowSlot] = 10
+Var BrewingAdvertiseShowTextNextToOrder[ BrewingAdvertiseRunSlot] = 1
+
+Var BrewingAdvertiseRunSlot = BrewingAdvertiseRunSlot + 1
+
+; RobinsonBeautyPro for test
+;If brewing_adv11_size = "" Then
+;	GetFileSizeK "taobin_project/video/brewing_adv11.mp4" brewing_adv11_size	
+;EndIf
+
+DEBUGVAR brewing_adv11_size
+If brewing_adv11_size = 9358730 Then
+	If RobinsonBeautyPro = 1 Then
+		Var BrewingAdvertiseEnable[ BrewingAdvertiseRunSlot] = 1
+		Var BrewingAdvertiseVideo[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_adv11.mp4";
+		If show_eng = "true" Then
+			Var BrewingAdvertiseImage[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv11_en.png"
+		Else
+			Var BrewingAdvertiseImage[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv11.png"
+		EndIf
+	
+		Var BrewingAdvertiseDurationTime[BrewingAdvertiseShowSlot] = 15
+		Var BrewingAdvertiseShowTextNextToOrder[ BrewingAdvertiseRunSlot] = 0
+
+		Var BrewingAdvertiseRunSlot = BrewingAdvertiseRunSlot + 1
+	EndIf
+EndIf
+
+DEBUGVAR BrewingAdvertiseRunSlot
+
+If brewing_adv12_size = "" Then
+	GetFileSizeK "taobin_project/video/brewing_adv12.mp4" brewing_adv12_size	
+EndIf
+
+DEBUGVAR brewing_adv12_size
+If brewing_adv12_size = 3687715 Then
+	If ShopeePayLaterOn = 1 Then
+		Var BrewingAdvertiseEnable[ BrewingAdvertiseRunSlot] = 1
+		Var BrewingAdvertiseVideo[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_adv12.mp4";
+		If show_eng = "true" Then
+			Var BrewingAdvertiseImage[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv12_en.png"
+		Else
+			Var BrewingAdvertiseImage[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv12.png"
+		EndIf
+	
+		Var BrewingAdvertiseDurationTime[BrewingAdvertiseShowSlot] = 15
+		Var BrewingAdvertiseShowTextNextToOrder[ BrewingAdvertiseRunSlot] = 0
+
+		Var BrewingAdvertiseRunSlot = BrewingAdvertiseRunSlot + 1
+	EndIf
+EndIf
+
+DEBUGVAR BrewingAdvertiseRunSlot
+
+If brewing_adv13_size = "" Then
+	GetFileSizeK "taobin_project/video/brewing_adv13.mp4" brewing_adv13_size	
+EndIf
+
+DEBUGVAR brewing_adv_size
+If brewing_adv13_size = 9295686 Then
+	If EDC_ThailandOn = 1 Then
+		Var BrewingAdvertiseEnable[ BrewingAdvertiseRunSlot] = 1
+		Var BrewingAdvertiseVideo[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_adv13.mp4";
+		If show_eng = "true" Then
+			Var BrewingAdvertiseImage[BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv13_en.png"
+		Else
+			Var BrewingAdvertiseImage[BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv13.png"
+		EndIf
+
+		Var BrewingAdvertiseDurationTime[BrewingAdvertiseShowSlot] = 12
+		Var BrewingAdvertiseShowTextNextToOrder[ BrewingAdvertiseRunSlot] = 0
+		
+		Var BrewingAdvertiseRunSlot = BrewingAdvertiseRunSlot + 1
+	EndIf
+EndIf
+
+DEBUGVAR BrewingAdvertiseShowSlot
+
+Var brew_vdo1 = BrewingAdvertiseVideo[BrewingAdvertiseShowSlot]
+Var brew_txt1 = BrewingAdvertiseImage[BrewingAdvertiseShowSlot]
+
+Var adver_brewing_count_down = BrewingAdvertiseDurationTime[BrewingAdvertiseShowSlot]
+
+DEBUGVAR BrewingAdvertiseShowTextNextToOrder[BrewingAdvertiseShowSlot]
+
+If BrewingAdvertiseShowTextNextToOrder[BrewingAdvertiseShowSlot] = 1 Then
+
+	Var SelectMenuBetweenBrewEnable1Blink = "Enable" 
+	Var SelectMenuBetweenBrewEnable1Text = "Enable"
+Else
+	Var SelectMenuBetweenBrewEnable1Blink = "Invisible" 
+	Var SelectMenuBetweenBrewEnable1Text = "Invisible"
+
+EndIf
+
+DEBUGVAR brew_vdo1 
+DEBUGVAR brew_txt1 
+DEBUGVAR SelectMenuBetweenBrewEnable1Blink
+DEBUGVAR SelectMenuBetweenBrewEnable1Text
+
+
+
+DEBUGVAR BrewingAdvertiseEnable[0]
+DEBUGVAR BrewingAdvertiseEnable[1]
+DEBUGVAR BrewingAdvertiseEnable[2]
+DEBUGVAR BrewingAdvertiseEnable[3]
+DEBUGVAR BrewingAdvertiseEnable[4]
+
+DEBUGVAR BrewingAdvertiseVideo[0]
+DEBUGVAR BrewingAdvertiseVideo[1]
+DEBUGVAR BrewingAdvertiseVideo[2]
+DEBUGVAR BrewingAdvertiseVideo[3]
+DEBUGVAR BrewingAdvertiseVideo[4]
+
+
+Var BrewingAdvertiseShowSlot = BrewingAdvertiseShowSlot + 1
+
+DEBUGVAR BrewingAdvertiseEnable[BrewingAdvertiseShowSlot]
+If BrewingAdvertiseEnable[BrewingAdvertiseShowSlot] = 0 Then
+	Var BrewingAdvertiseShowSlot = 0
+EndIf
+If BrewingAdvertiseEnable[BrewingAdvertiseShowSlot] = "" Then
+	Var BrewingAdvertiseShowSlot = 0
+EndIf
+
+DEBUGVAR BrewingAdvertiseShowSlot
+
+Var script3_brewing_ignore = "set"
--- a/video/sync_1.file
+++ b/video/sync_1.file
@ -1,7 +1,16 @@
-total 144260
+total 166396
+-rw-rw---- 1 root sdcard_rw  9358730 2024-08-21 16:00 brewing_adv11.mp4
+-rw-rw---- 1 root sdcard_rw  3687715 2024-08-19 16:53 brewing_adv12.mp4
+-rw-rw---- 1 root sdcard_rw  9295686 2024-08-27 11:33 brewing_adv13.mp4
 -rw-rw---- 1 root sdcard_rw  9526548 2023-09-18 18:44 brewing_adv3.mp4
 -rw-rw---- 1 root sdcard_rw  9368231 2024-07-19 15:00 brewing_adv4.mp4
 -rw-rw---- 1 root sdcard_rw    23569 2023-09-18 18:44 brewing_txt_adv1.png
+-rw-rw---- 1 root sdcard_rw    51866 2024-08-29 11:30 brewing_txt_adv11.png
+-rw-rw---- 1 root sdcard_rw    50184 2024-08-29 11:31 brewing_txt_adv11_en.png
+-rw-rw---- 1 root sdcard_rw    43166 2024-08-29 11:31 brewing_txt_adv12.png
+-rw-rw---- 1 root sdcard_rw    42692 2024-08-29 11:31 brewing_txt_adv12_en.png
+-rw-rw---- 1 root sdcard_rw    53750 2024-08-29 11:30 brewing_txt_adv13.png
+-rw-rw---- 1 root sdcard_rw    48681 2024-08-29 11:30 brewing_txt_adv13_en.png
 -rw-rw---- 1 root sdcard_rw    28097 2023-09-18 18:44 brewing_txt_adv1_en.png
 -rw-rw---- 1 root sdcard_rw    30982 2023-09-18 18:44 brewing_txt_adv3.png
 -rw-rw---- 1 root sdcard_rw    35550 2023-09-18 18:44 brewing_txt_adv3_en.png
@ -11,8 +20,9 @@ total 144260
 -rw-rw---- 1 root sdcard_rw  9673549 2024-07-25 10:29 main_page_event.mp4
 -rw-rw---- 1 root sdcard_rw     1217 2024-07-25 11:20 script1.ev
 -rw-rw---- 1 root sdcard_rw      288 2024-07-24 21:21 script2.ev
-rw-rw---- 1 root sdcard_rw      548 2024-07-19 18:26 script3_brew.ev
-rw-rw---- 1 root sdcard_rw        0 2024-07-25 11:27 sync_1.file
+-rw-rw---- 1 root sdcard_rw     1401 2024-09-02 10:37 script3_brew.ev
+-rw-rw---- 1 root sdcard_rw     5481 2024-09-02 14:25 script3_first_brewing.ev
+-rw-rw---- 1 root sdcard_rw        0 2024-09-02 21:02 sync_1.file
 -rw-rw---- 1 root sdcard_rw  4806758 2023-09-18 18:44 taobin_save_world1.mp4
 -rw-rw---- 1 root sdcard_rw  6428830 2023-09-18 18:44 taobin_save_world2.mp4
 -rw-rw---- 1 root sdcard_rw  4634942 2023-09-18 18:44 taobin_save_world3.mp4
--- a/xml/default_color_settings.ev
+++ b/xml/default_color_settings.ev
@ -4,4 +4,5 @@ Var WelcomeColor = "0xEE8C62"
 Var BackgroundColor = "0xeae6e1"
 Var HeadlineColor = "0x513C2F"
 Var SubHeadlineColor = "0x6F5F51"
-Var PopupBodyTextColor = "0xB78F24"
+Var PopupBodyTextColor = "0xB78F24"
+Var BodyTextColor = HeadlineColor
--- a/xml/event/collect_promotion_point_condition.ev
+++ b/xml/event/collect_promotion_point_condition.ev
@ -0,0 +1,11 @@
+If RobinsonBeautyPro = 1 Then
+    If Seeker.VendingCode = "MKF" Then
+        Var Seeker.CollectPointPromotion = 1
+    EndIf
+EndIf
+
+If JemilaPro = 1 Then
+    If Seeker.VendingCode = "MKF" Then
+        Var Seeker.CollectPointPromotion = 1
+    EndIf
+EndIf
--- a/xml/event/out_put_file2.txt
+++ b/xml/event/out_put_file2.txt
@ -1 +1 @@
-/event/promotion_7up_lucky_draw_x2.xml
+/event/promotion_jemila.xml
--- a/xml/event/promotion_jemila.xml
+++ b/xml/event/promotion_jemila.xml
--- a/xml/event/promotion_onclick2.inc
+++ b/xml/event/promotion_onclick2.inc
@ -1 +1 @@
-                Var BigButtonEnable = "Invisible"
+        Open "ROOT/taobin_project/xml/page_catalog_group_pro_jemila.xml"
--- a/xml/event/promotion_template2.inc
+++ b/xml/event/promotion_template2.inc
@ -33,47 +33,10 @@
     </FilenameDisable>
 <EventOnClick> 

-        Open "ROOT/taobin_project/xml/page_catalog_group_pro_7up_lucky_draw_x2_ignore.xml"
+        ###EventOnClick
        
 </EventOnClick>

-
-<Video>
-    <X> 42 </X>
-    <Y> 518 </Y>
-    <Width> 484 </Width>
-    <Height> 616 </Height>
-    <Loop> "true" </Loop>
-    <State> 
-        eval(
-            If show_eng = "true" Then
-                Var return = "Invisible"
-            Else
-                Var return  = "Enable"
-            EndIf
-        ) 
-    </State>
-    <Filename> "ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_th.mp4" </Filename>
-</Video>
-
-<Video>
-    <X> 42 </X>
-    <Y> 518 </Y>
-    <Width> 484 </Width>
-    <Height> 616 </Height>
-    <State> 
-        eval(
-            If show_eng = "true" Then
-                Var return = "Enable"
-            Else
-                Var return  = "Invisible"
-            EndIf
-        ) 
-    </State>
-    <Loop> "true" </Loop>
-    <Filename> "ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_en.mp4" </Filename>
-</Video>
-
 </Button>

 <EventUnitTest1>
--- a/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml
+++ b/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml
@ -158,16 +158,16 @@
            Var PointState[8] = 0
            Var PointState[9] = 0

-            Var PointNameIndex[0] = -1
-            Var PointNameIndex[1] = -1
-            Var PointNameIndex[2] = -1
-            Var PointNameIndex[3] = -1
-            Var PointNameIndex[4] = -1
-            Var PointNameIndex[5] = -1
-            Var PointNameIndex[6] = -1
-            Var PointNameIndex[7] = -1
-            Var PointNameIndex[8] = -1
-            Var PointNameIndex[9] = -1
+            Var PointImage[0] = "/no_point.png"
+            Var PointImage[1] = "/no_point.png"
+            Var PointImage[2] = "/no_point.png"
+            Var PointImage[3] = "/no_point.png"
+            Var PointImage[4] = "/no_point.png"
+            Var PointImage[5] = "/no_point.png"
+            Var PointImage[6] = "/no_point.png"
+            Var PointImage[7] = "/no_point.png"
+            Var PointImage[8] = "/no_point.png"
+            Var PointImage[9] = "/no_point.png"



@ -337,61 +337,101 @@
            If MenuPoint[0] = 1 Then
                Var CurrentIndexPoint = CurrentIndexPoint + 1
                Var PointState[CurrentIndexPoint] = 1
-                Var PointNameIndex[CurrentIndexPoint] = 0
+                If show_eng = "true" Then
+                    Var PointImage[CurrentIndexPoint] = "/point_1_en.png"
+                Else
+                    Var PointImage[CurrentIndexPoint] = "/point_1.png"
+                EndIf
            EndIf

            If MenuPoint[1] = 1 Then	
                Var CurrentIndexPoint = CurrentIndexPoint + 1
                Var PointState[CurrentIndexPoint] = 1
-                Var PointNameIndex[CurrentIndexPoint] = 1
+                If show_eng = "true" Then
+                    Var PointImage[CurrentIndexPoint] = "/point_2_en.png"
+                Else
+                    Var PointImage[CurrentIndexPoint] = "/point_2.png"
+                EndIf
            EndIf

            If MenuPoint[2] = 1 Then	
                Var CurrentIndexPoint = CurrentIndexPoint + 1
                Var PointState[CurrentIndexPoint] = 1
-                Var PointNameIndex[CurrentIndexPoint] = 2
+                If show_eng = "true" Then
+                    Var PointImage[CurrentIndexPoint] = "/point_3_en.png"
+                Else
+                    Var PointImage[CurrentIndexPoint] = "/point_3.png"
+                EndIf
            EndIf

            If MenuPoint[3] = 1 Then	
                Var CurrentIndexPoint = CurrentIndexPoint + 1
                Var PointState[CurrentIndexPoint] = 1
-                Var PointNameIndex[CurrentIndexPoint] = 3
+                If show_eng = "true" Then
+                    Var PointImage[CurrentIndexPoint] = "/point_4_en.png"
+                Else
+                    Var PointImage[CurrentIndexPoint] = "/point_4.png"
+                EndIf
            EndIf

            If MenuPoint[4] = 1 Then	
                Var CurrentIndexPoint = CurrentIndexPoint + 1
                Var PointState[CurrentIndexPoint] = 1
-                Var PointNameIndex[CurrentIndexPoint] = 4
+                If show_eng = "true" Then
+                    Var PointImage[CurrentIndexPoint] = "/point_5_en.png"
+                Else
+                    Var PointImage[CurrentIndexPoint] = "/point_5.png"
+                EndIf
            EndIf

            If MenuPoint[5] = 1 Then	
                Var CurrentIndexPoint = CurrentIndexPoint + 1
                Var PointState[CurrentIndexPoint] = 1
-                Var PointNameIndex[CurrentIndexPoint] = 5
+                If show_eng = "true" Then
+                    Var PointImage[CurrentIndexPoint] = "/point_6_en.png"
+                Else
+                    Var PointImage[CurrentIndexPoint] = "/point_6.png"
+                EndIf
            EndIf

            If MenuPoint[6] = 1 Then	
                Var CurrentIndexPoint = CurrentIndexPoint + 1
                Var PointState[CurrentIndexPoint] = 1
-                Var PointNameIndex[CurrentIndexPoint] = 6
+                If show_eng = "true" Then
+                    Var PointImage[CurrentIndexPoint] = "/point_7_en.png"
+                Else
+                    Var PointImage[CurrentIndexPoint] = "/point_7.png"
+                EndIf
            EndIf

            If MenuPoint[7] = 1 Then	
                Var CurrentIndexPoint = CurrentIndexPoint + 1
                Var PointState[CurrentIndexPoint] = 1
-                Var PointNameIndex[CurrentIndexPoint] = 7
+                If show_eng = "true" Then
+                    Var PointImage[CurrentIndexPoint] = "/point_8_en.png"
+                Else
+                    Var PointImage[CurrentIndexPoint] = "/point_8.png"
+                EndIf
            EndIf

            If MenuPoint[8] = 1 Then	
                Var CurrentIndexPoint = CurrentIndexPoint + 1
                Var PointState[CurrentIndexPoint] = 1
-                Var PointNameIndex[CurrentIndexPoint] = 8
+                If show_eng = "true" Then
+                    Var PointImage[CurrentIndexPoint] = "/point_9_en.png"
+                Else
+                    Var PointImage[CurrentIndexPoint] = "/point_9.png"
+                EndIf
            EndIf

            If MenuPoint[9] = 1 Then	
                Var CurrentIndexPoint = CurrentIndexPoint + 1
                Var PointState[CurrentIndexPoint] = 1
-                Var PointNameIndex[CurrentIndexPoint] = 9
+                If show_eng = "true" Then
+                    Var PointImage[CurrentIndexPoint] = "/point_10_en.png"
+                Else
+                    Var PointImage[CurrentIndexPoint] = "/point_10.png"
+                EndIf
            EndIf

            DEBUGVAR Seeker.selected_a_drink
--- a/xml/event/robinson_beauty/page_collect_point_robinson_beauty_3.xml
+++ b/xml/event/robinson_beauty/page_collect_point_robinson_beauty_3.xml
@ -35,16 +35,6 @@
 	Var CheckCoupons = 0
 	Var MakeDrinkState = 0

-	Var taobinImgPoint[0] = "/no_point.png"
-	Var taobinImgPoint[1]= "/no_point.png"
-	Var taobinImgPoint[2]= "/no_point.png"
-	Var taobinImgPoint[3]= "/no_point.png"
-	Var taobinImgPoint[4]= "/no_point.png"
-	Var taobinImgPoint[5]= "/no_point.png"
-	Var taobinImgPoint[6]= "/no_point.png"
-	Var taobinImgPoint[7]= "/no_point.png"
-	Var taobinImgPoint[8]= "/no_point.png"
-
 	Var PointCount = 0

 	DEBUGVAR PointState[0]
@ -56,96 +46,47 @@
 	DEBUGVAR PointState[6]
 	DEBUGVAR PointState[7]
 	DEBUGVAR PointState[8]
+	DEBUGVAR PointState[9]

-	Var PointNameIndex0 = PointNameIndex[0]
-	Var PointNameIndex1 = PointNameIndex[1]
-	Var PointNameIndex2 = PointNameIndex[2]
-	Var PointNameIndex3 = PointNameIndex[3]
-	Var PointNameIndex4 = PointNameIndex[4]
-	Var PointNameIndex5 = PointNameIndex[5]
-	Var PointNameIndex6 = PointNameIndex[6]
-	Var PointNameIndex7 = PointNameIndex[7]
-	Var PointNameIndex8 = PointNameIndex[8]
+	Var taobinImgPoint[0] = PointImage[0]
+	Var taobinImgPoint[1] = PointImage[1]
+	Var taobinImgPoint[2] = PointImage[2]
+	Var taobinImgPoint[3] = PointImage[3]
+	Var taobinImgPoint[4] = PointImage[4]
+	Var taobinImgPoint[5] = PointImage[5]
+	Var taobinImgPoint[6] = PointImage[6]
+	Var taobinImgPoint[7] = PointImage[7]
+	Var taobinImgPoint[8] = PointImage[8]

 	If PointState[0] = 1 Then
 		Var PointCount = PointCount + 1
-        If show_eng = "true" Then
-            Var taobinImgPoint[0] = "/point_1_en.png"
-        Else
-		    Var taobinImgPoint[0] = "/point_1.png"
-        EndIf
 	EndIf
 	If PointState[1] = 1 Then
 		Var PointCount = PointCount + 1
-        If show_eng = "true" Then
-            Var taobinImgPoint[1] = "/point_2_en.png"
-        Else
-		    Var taobinImgPoint[1] = "/point_2.png"
-        EndIf
 	EndIf
 	If PointState[2] = 1 Then
 		Var PointCount = PointCount + 1
-        If show_eng = "true" Then
-            Var taobinImgPoint[2] = "/point_3_en.png"
-        Else
-		    Var taobinImgPoint[2] = "/point_3.png"
-        EndIf
 	EndIf
 	If PointState[3] = 1 Then
 		Var PointCount = PointCount + 1
-        If show_eng = "true" Then
-            Var taobinImgPoint[3] = "/point_4_en.png"
-        Else
-		    Var taobinImgPoint[3] = "/point_4.png"
-        EndIf
 	EndIf
 	If PointState[4] = 1 Then
 		Var PointCount = PointCount + 1
-        If show_eng = "true" Then
-            Var taobinImgPoint[4] = "/point_5_en.png"
-        Else
-		    Var taobinImgPoint[4] = "/point_5.png"
-        EndIf
 	EndIf
 	If PointState[5] = 1 Then
 		Var PointCount = PointCount + 1
-        If show_eng = "true" Then
-            Var taobinImgPoint[5] = "/point_6_en.png"
-        Else
-		    Var taobinImgPoint[5] = "/point_6.png"
-        EndIf
 	EndIf
 	If PointState[6] = 1 Then
 		Var PointCount = PointCount + 1
-        If show_eng = "true" Then
-            Var taobinImgPoint[6] = "/point_7_en.png"
-        Else
-		    Var taobinImgPoint[6] = "/point_7.png"
-        EndIf
 	EndIf
 	If PointState[7] = 1 Then
 		Var PointCount = PointCount + 1
-        If show_eng = "true" Then
-            Var taobinImgPoint[7] = "/point_8_en.png"
-        Else
-		    Var taobinImgPoint[7] = "/point_8.png"
-        EndIf
 	EndIf
 	If PointState[8] = 1 Then
 		Var PointCount = PointCount + 1
-		If MenuPoint[9] = 1 Then
-			If show_eng = "true" Then
-				Var taobinImgPoint[8] = "/point_10_en.png"
-			Else
-				Var taobinImgPoint[8] = "/point_10.png"
-			EndIf
-		Else
-			If show_eng = "true" Then
-				Var taobinImgPoint[8] = "/point_9_en.png"
-			Else
-				Var taobinImgPoint[8] = "/point_9.png"
-			EndIf
-		EndIf
+	EndIf
+	If PointState[9] = 1 Then
+		Var PointCount = PointCount + 1
 	EndIf

 	Var PointDiff = 9 - PointCount
@ -176,7 +117,7 @@
 		
 	EndIf

-    If PointCount = 9 Then
+    If PointCount >= 9 Then
        Var CloseBtnImg = PointRootDir + "/bn_random.png"
    EndIf

--- a/xml/event/robinson_beauty/page_robinson_beauty_random_result.xml
+++ b/xml/event/robinson_beauty/page_robinson_beauty_random_result.xml
@ -24,10 +24,10 @@
        If CodeType = "138" Then
            Var RewardText = DirImage + "/reward_lip_tint_oil_name.png"
            Var RewardImage = DirImage + "/reward_lip_tint_oil.png"
-            Var RewardText_X = 18
-            Var RewardText_Y = 923
-            Var RewardImage_X = 169
-            Var RewardImage_Y = 578
+            Var RewardText_X = 169
+            Var RewardText_Y = 578
+            Var RewardImage_X = 18
+            Var RewardImage_Y = 923
        EndIf

        If CodeType = "139" Then
--- a/xml/event/script_common_for_open_promotion_xml.ev
+++ b/xml/event/script_common_for_open_promotion_xml.ev
@ -6,6 +6,7 @@ DEBUGVAR OpenFromPageBoard

 DEBUGVAR MomCocoaPro
 DEBUGVAR RobinsonBeautyPro
+DEBUGVAR JemilaPro

 Var PromotionState1 = "Invisible"
 Var PromotionState2 = "Invisible"
@ -26,6 +27,10 @@ Else
 	Var FileRecommendToOpen = "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
 	; zone promote

+	If JemilaPro = 1 Then
+		Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_jemila.xml"
+	EndIf
+
 	If RobinsonBeautyPro = 1 Then
 		Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_robinson_beauty.xml"
 	Else
--- a/xml/event/tricker.ev
+++ b/xml/event/tricker.ev
@ -129,6 +129,9 @@ Var Seeker.BuyMomCocoaProFlag = 0
 Var RobinsonBeautyPro = 0
 Var FromRobinsonBeautyPro = 0

+; Enable Jemila promotion, 1 - 18 Oct
+Var JemilaPro = 0
+
 Var NewCollectPoint = 1
 Var ShouldCollectPromotionPoint = 0

@ -198,6 +201,12 @@ If SystemDateMonthInt = 9 Then
 	EndIf
 EndIf

+If SystemDateMonthInt = 10 Then
+	If SystemDateDayInt <= 18 Then
+		Var JemilaPro = 1
+	EndIf
+EndIf
+

 If BoxID = 105005 Then
 	Var NewFlowPaymentCode = 1
@ -211,9 +220,26 @@ If BoxID = 105005 Then
 	Var RobinsonBeautyPro = 1
 EndIf

+If BoxID = 172331 Then
+	Var MomCocoaPro = 0
+	Var MomCocoaProDiscountEnable = 0
+	Var RobinsonBeautyPro = 0
+	Var JemilaPro = 1
+EndIf

+If BoxID = 172232 Then
+	Var MomCocoaPro = 0
+	Var MomCocoaProDiscountEnable = 0
+	Var RobinsonBeautyPro = 0
+	Var JemilaPro = 1
+EndIf

-
+If BoxID = 172053 Then
+	Var MomCocoaPro = 0
+	Var MomCocoaProDiscountEnable = 0
+	Var RobinsonBeautyPro = 0
+	Var JemilaPro = 1
+EndIf

 Var XMLLiveInfoEnable = 1

@ -288,6 +314,7 @@ If taobin_nopro = "true" Then
 	Var PassionMintPro = 0
 	Var MomCocoaPro = 0
 	Var RobinsonBeautyPro = 0
+	Var JemilaPro = 0
 	
 	Var AdvertiseProfile = "00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00"

@ -364,11 +391,12 @@ If BoxID = 200000 Then
 	Var NewFlowPaymentCode = 1
 EndIf

-If BoxID > 200000 Then
-	If BoxID < 200030 Then
-		Var New_Payment = 1
-		Var NewFlowPaymentCode = 1
-	EndIf
-EndIf
-
+;
+;If BoxID > 200000 Then
+;	If BoxID < 200030 Then
+;		Var New_Payment = 1
+;		Var NewFlowPaymentCode = 1
+;	EndIf
+;EndIf
+;

--- a/xml/menutab/page_catalog.xml
+++ b/xml/menutab/page_catalog.xml
@ -212,6 +212,8 @@

 	TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"

+	TRY "ROOT/taobin_project/xml/sometime/RoadShow.ev"
+
 	; zone cup on arm
 	If CupOnArm = "true" Then

--- a/xml/menutab/page_catalog_group_pro_jemila.skt
+++ b/xml/menutab/page_catalog_group_pro_jemila.skt
@ -0,0 +1,45 @@
+<?hurr 
+    #include=menu_head.py 
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	<?hurr
+        #include=menu_catalog_default_init.py
+    ?>
+    
+
+
+    Var Timeout = 0
+
+
+    <?hurr 
+        #include=menu_catalog_new_menu.py
+    ?>
+
+</EventOpen>
+
+
+<?hurr 
+    #include=menu_catalog_new.py
+?>
+
+
+
+
+<?hurr 
+    #include=menu_new_layout_gen_v2.py
+?>
+<?hurr 
+    #include=menu_new_layout_gen.py
+?>
+
+
+
+</Popup>
--- a/xml/menutab/page_catalog_group_pro_jemila.xml
+++ b/xml/menutab/page_catalog_group_pro_jemila.xml
--- a/xml/menutab/page_catalog_group_pro_robinson_beauty.xml
+++ b/xml/menutab/page_catalog_group_pro_robinson_beauty.xml
@ -585,7 +585,7 @@
 	 Var block_index_override = 0
 	 Var block_index_move = 0
 </Script>
-; menu_new_list 9
+; menu_new_list 10
 	; ==================> Len = 12
 	; - - 12-05-03-0064 
 <Block>
@ -3377,6 +3377,259 @@ CHEE TEA" </Value>
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
+</Block>
+	; - - - 
+	; ==================> Len = 12
+	; - - 12-05-03-0115 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-05-03-0115.Button,$Sum1205030115) </State> 
+	<Button>
+	<State> $Sum1205030115 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_7UP_Lychee_SODA_robinson_beauty.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_7UP_Lychee_SODA_robinson_beauty.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_7UP_Lychee_SODA_robinson_beauty.png" </FilenameDisable>
+	<OverlayImage> xmlpro( 12-05-03-0115, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var NameDrink = "ROBINSON UP CHEE SMOOTHIE"
+		Var NameDrinkTH = "โรบินสันอัพชี่"
+		Var DrinkDescriptionTH = "เซเว่น อัพ ลิ้นจี่ มะนาว โซดา "
+		Var DrinkDescription = "7Up Lychee Lime Soda"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_7UP_Lychee_SODA_robinson_beauty.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		GetInstanceIDMenuTab OpenFromInstMenuTab
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $-.Price
+		Var PriceD3 = $12-05-03-0115.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "##-##-##-####"
+		Var PD_CODE3 = "12-05-03-0115"
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = "Disable2"
+		Var PD_STAGE_3 = $12-05-03-0115.Button
+		Var OverlayMenuFilter !assigned xmlpro( 12-05-03-0115, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		DEBUGVAR OverlayMenuFilter
+		Var SelectCountDrinkType = 0
+		Var DefaultDrinkType = 0
+		If PD_STAGE_1 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 1
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 2
+		EndIf
+		If PD_STAGE_3 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 3
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0115"
+			EndIf
+		EndIf
+		Var menu_name_eng_hot = $##-##-##-####.NameE
+		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
+		Var menu_name_thai_hot = $##-##-##-####.Name
+		Var menu_desc_thai_hot = $##-##-##-####.description
+		
+		Var menu_name_eng_cold = $##-##-##-####.NameE
+		Var menu_desc_eng_cold = $##-##-##-####.descriptionE
+		Var menu_name_thai_cold = $##-##-##-####.Name
+		Var menu_desc_thai_cold = $##-##-##-####.description
+		
+		Var menu_name_eng_blender = $12-05-03-0115.NameE
+		Var menu_desc_eng_blender = $12-05-03-0115.descriptionE
+		Var menu_name_thai_blender = $12-05-03-0115.Name
+		Var menu_desc_thai_blender = $12-05-03-0115.description
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		
+		
+		TabMenuVisibleInst 99
+		OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> "โรบินสันอัพชี่" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> "เซเว่น อัพ ลิ้นจี่ มะนาว โซดา " </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 164 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> "ROBINSON UP CHEE SMOOTHIE" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> "7Up Lychee Lime Soda" </Value>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> "Invisible" </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> 50 </X>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> Var( "฿" + $-.Price ) </Value>
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<State> "Invisible" </State>
+	</Image>
+	<Text>
+	<X> 115 </X>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> Var( "฿" + $-.Price ) </Value>
+	</Text>
+	<Image>
+	<X> 146 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<State> $12-05-03-0115.Button </State>
+	</Image>
+	<Text>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $12-05-03-0115.Button </State>
+	<Value> Var( "฿" + $12-05-03-0115.Price ) </Value>
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			Var ice_tab_process_show = "Invisible"
+		
+		Else
+			Var ice_tab_process_show = "Invisible"
+		EndIf
+		Var return = ice_tab_process_show
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
+	</Image>
+	<Image>
+	<X> 49 </X>
+	<Y> 117 </Y>
+	<State> 
+		eval( 
+			If $Sum1205030115 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
+				STRCONTAIN "ERR" $12-05-03-0115.TAG tag3_is_disable
+				Var return = "Invisible"
+				If tag1_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag2_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag3_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+			Else
+					Var return = "Invisible"
+			EndIf
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
+	</Image>
+	<Text>
+	<X> 84 </X>
+	<Y> 266 </Y>
+	<Size> 10 </Size>
+	<Font> OpunMediumTTF </Font>
+	<Color> 0xDE794E </Color>
+	<State> ice_tab_process_show </State>
+	<Value> ice_show_open </Value>
+	</Text>
+	<Text>
+	<X> 48 </X>
+	<Y> 116 </Y>
+	<Size> 32 </Size>
+	<Width>128</Width>
+	<Height>64</Height>
+	<Font> MITRegularTTF </Font>
+	<Color> 0x5A5A5A </Color>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum1205030115 </State> 
+	<Value> text_unavailable </Value>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
 </Block>
 	; - - - 
 </FrameScroll>
--- a/xml/open_page_collect_point.ev
+++ b/xml/open_page_collect_point.ev
@ -6,6 +6,10 @@ If CountryName = "Australia" Then
    Var PageCollectPoint1 = "ROOT/taobin_project/inter/aus/xml/page_collect_point_1.lxml"
 EndIf

+If CountryName = "Malaysia" Then
+    Var PageCollectPoint1 = "ROOT/taobin_project/inter/mys/xml/page_collect_point_1.lxml"
+EndIf
+
 If CountryName = "Singapore" Then
    ; ask-if-member-yet
    Var MemberPrompt = CountryRootPath + "xml/page_member_prompt.lxml"
--- a/xml/page_NewBrewing3.xml
+++ b/xml/page_NewBrewing3.xml
@ -286,13 +286,6 @@
 		RootLayoutVisible 3 "hide"
 	EndIf

-	If adver_brewing_en = 1 Then
-		Var adver_brewing_playing = 1
-		Var adver_brewing_play_index = 2
-		Var adver_brewing_count_down = 10
-		Var VideoPlayFile = "ROOT/taobin_project/image/page_doing/tao_adv1.png"
-		Var PictureFile = brew_txt1
-	EndIf

 	Var CampaignEnable = 0

@ -304,7 +297,7 @@

 	If bg_lidProblem_ST = "Enable" Then
 		Var EnableTopupCreditBetweenBrew = "Invisible"
-		Var EnableGetMore
+		Var GetLidButtonState = "Invisible"
 	EndIf

 	If bg_strawProblem_ST = "Enable" Then
@ -491,6 +484,22 @@
 		EndIf
 	EndIf

+	If adver_brewing_en = 1 Then
+		Var adver_brewing_playing = 1
+		Var adver_brewing_play_index = 2
+		Var adver_brewing_count_down = 10
+		Var brew_vdo1 = "ROOT/taobin_project/image/page_doing/tao_adv1.png"
+	
+		TRY "ROOT/taobin_project/video/script3_first_brewing.ev"
+
+
+		Var VideoPlayFile = brew_vdo1
+		Var PictureFile = brew_txt1
+		
+	
+
+	EndIf
+
 	
 </EventOpen>
 <EventLanguageOnChange>
@ -810,6 +819,8 @@
 			Var SuggestID  = ""
 			Var SessionID2 = ""

+			Var VendingDiscount = 0
+			Var VendingCampaign = 0
 			Var PayDetail = ""
 			Var PayDetail2 = ""
 			Var VendingOrderID = Seeker.ORDER_ID
@ -846,6 +857,8 @@
 			Var SuggestID  = ""
 			Var SessionID2 = ""

+			Var VendingDiscount = 0
+			Var VendingCampaign = 0
 			Var PayDetail = ""
 			Var PayDetail2 = ""
 			Var VendingOrderID = Seeker.ORDER_ID
--- a/xml/page_NewBrewing3Conti.xml
+++ b/xml/page_NewBrewing3Conti.xml
@ -370,6 +370,8 @@
 			Var SuggestID  = ""
 			Var SessionID2 = ""

+			Var VendingDiscount = 0
+			Var VendingCampaign = 0
 			Var PayDetail = ""
 			Var PayDetail2 = ""
 			Var VendingOrderID = Seeker.ORDER_ID
@ -406,6 +408,8 @@
 			Var SuggestID  = ""
 			Var SessionID2 = ""

+			Var VendingDiscount = 0
+			Var VendingCampaign = 0
 			Var PayDetail = ""
 			Var PayDetail2 = ""
 			Var VendingOrderID = Seeker.ORDER_ID
--- a/xml/page_NewCannotConti.xml
+++ b/xml/page_NewCannotConti.xml
@ -359,6 +359,8 @@
 			Var SuggestID  = ""
 			Var SessionID2 = ""

+			Var VendingDiscount = 0
+			Var VendingCampaign = 0
 			Var PayDetail = ""
 			Var PayDetail2 = ""
 			Var VendingOrderID = Seeker.ORDER_ID
@ -393,6 +395,8 @@
 			Var SuggestID  = ""
 			Var SessionID2 = ""

+			Var VendingDiscount = 0
+			Var VendingCampaign = 0
 			Var PayDetail = ""
 			Var PayDetail2 = ""
 			Var VendingOrderID = Seeker.ORDER_ID
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@ -1349,23 +1349,8 @@
 </EventUnitTest3>

 <EventUnitTest4>
-	Var XMLProfile = "School-Tier3"
-	PRICE "Reset" "-"
-	PRICE "Load" "-"
-	PRICE "CheckAndApply" XMLProfile
+	Var XMLProfile = "ProfileIncrease15"

-	DEBUGVAR ProfileIndex[0]
-	DEBUGVAR ProfileIndex[1]
-	DEBUGVAR ProfileIndex[2]
-	DEBUGVAR ProfileIndex[3]
-	DEBUGVAR ProfileIndex[4]
-	DEBUGVAR ProfileIndex[5]
-	DEBUGVAR ProfileIndex[6]
-	DEBUGVAR ProfileIndex[7]
-	DEBUGVAR ProfileIndex[8]
-	DEBUGVAR ProfileIndex[9]
-	DEBUGVAR ProfileIndex[10]
-	PRICE "Reload" ""
 </EventUnitTest4>

 <EventUnitTest5>
--- a/xml/page_brewing3.xml
+++ b/xml/page_brewing3.xml
@ -383,22 +383,7 @@


 	Var CreditCardVoid = 0
-	If InternationalEnable = 1 Then
-		Var adver_brewing_en = 0
-		RootLayoutVisible 3 "hide"
-	EndIf

-	If adver_brewing_en = 1 Then
-		Var adver_brewing_playing = 1
-		Var adver_brewing_play_index = 2
-		Var adver_brewing_count_down = 10
-		Var VideoPlayFile = "ROOT/taobin_project/image/page_doing/tao_adv1.png"
-		Var PictureFile = brew_txt1
-		
-		TRY "ROOT/taobin_project/video/script3_frist_brewing.ev"	
-
-	
-	EndIf

 	Var CampaignEnable = 0

@ -409,7 +394,7 @@

 	If bg_lidProblem_ST = "Enable" Then
 		Var EnableTopupCreditBetweenBrew = "Invisible"
-		Var EnableGetMore
+		Var GetLidButtonState = "Invisible"
 	EndIf

 	If bg_strawProblem_ST = "Enable" Then
@ -594,7 +579,32 @@
 		EndIf
 	EndIf

+		
+
+
+	If InternationalEnable = 1 Then
+		Var adver_brewing_en = 0
+		RootLayoutVisible 3 "hide"
+	EndIf
+
+
+	If adver_brewing_en = 1 Then
+		Var adver_brewing_playing = 1
+		Var adver_brewing_play_index = 2
+		Var adver_brewing_count_down = 10
+		Var brew_vdo1 = "ROOT/taobin_project/image/page_doing/tao_adv1.png"
 	
+		TRY "ROOT/taobin_project/video/script3_first_brewing.ev"
+
+
+		Var VideoPlayFile = brew_vdo1
+		Var PictureFile = brew_txt1
+		
+	
+
+	EndIf
+
+
 </EventOpen>
 <EventLanguageOnChange>
 	Var XPosiShowCountDownBrew = 768
@ -1456,8 +1466,6 @@
 					Var PictureFile = brew_txt2
 					Var PictureFileTextDesctionState = "Invisible"

-					Var SelectMenuBetweenBrewEnable1Blink = "Invisible" 
-					Var SelectMenuBetweenBrewEnable1Text = "Invisible" 
 				EndIf

 				
--- a/xml/page_catalog_group_pro_jemila.skt
+++ b/xml/page_catalog_group_pro_jemila.skt
@ -0,0 +1,54 @@
+<?hurr 
+    #include=menu_head.py 
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"    
+    Var FromMyMintPro = 0
+
+    Var Timeout = 0
+
+
+    ;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
+
+</EventOpen>
+
+
+;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
+
+<?hurr 
+    #include=menu_new_layout_gen_v2.py
+?>
+<?hurr 
+    #include=menu_new_layout_gen.py
+?>
+
+<Button>
+<X> 780 </X>
+<Y> 500 </Y>
+<State> buttonRemoveCup </State>
+;<Color> "0x00BDFF" </Color>
+<Interval> 500 </Interval>
+<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
+<EventClick> 
+    Machine RemoveCup
+    Machine DoorLidOpen
+    Var buttonRemoveCup = "Invisible"
+</EventClick>
+</Button>
+
+
+
+;BigLogoLayout
+
+</Popup>
+
+
--- a/xml/page_catalog_group_pro_jemila.xml
+++ b/xml/page_catalog_group_pro_jemila.xml
--- a/xml/page_catalog_group_pro_robinson_beauty.xml
+++ b/xml/page_catalog_group_pro_robinson_beauty.xml
@ -55,8 +55,8 @@
 	<EventOnClick> 
 		Var NameDrink = "ICED REVLON STRAW CHEE SODA"
 		Var NameDrinkTH = "เรฟลอนสตรอว์ชี่ โซดา"
-		Var DrinkDescriptionTH = "Straw + Lychee + Soda"
-		Var DrinkDescription = "Straw + Lychee + Soda"
+		Var DrinkDescriptionTH = "น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมลิ้นจี่ และโซดา"
+		Var DrinkDescription = "Strawberry Syrup, Lychee Syrup &Soda"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Lychee_straw_soda_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -139,7 +139,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Straw + Lychee + Soda" </Value>
+	<Value> "น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมลิ้นจี่ และโซดา" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -161,7 +161,7 @@ STRAW CHEE SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Straw + Lychee + Soda" </Value>
+	<Value> "Strawberry Syrup, Lychee Syrup &Soda" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -291,38 +291,38 @@ STRAW CHEE SODA" </Value>
 </Block>
 	; - - - 
 	; ==================> Len = 12
-	; - 12-99-05-0059 - 
+	; - 12-99-05-0073 - 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-99-05-0059.Button,$Sum1299050059) </State> 
+	<State> Flag( 12-99-05-0073.Button,$Sum1299050073) </State> 
 	<Button>
-	<State> $Sum1299050059 </State> 
+	<State> $Sum1299050073 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_Lychee_Lime_robinson_beauty.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_Lychee_Lime_robinson_beauty.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_pepsi_Lychee_Lime_robinson_beauty.png" </FilenameDisable>
-	<OverlayImage> xmlpro( 12-99-05-0059, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<OverlayImage> xmlpro( 12-99-05-0073, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var NameDrink = "ICED ARTY PEP LYCHEE SODA"
 		Var NameDrinkTH = "อาร์ตี้เป๊ปลิ้นจี่โซดา"
-		Var DrinkDescriptionTH = "Lychee + Pepsi + Lime"
-		Var DrinkDescription = "Lychee + Pepsi + Lime"
+		Var DrinkDescriptionTH = "น้ำเชื่ื่อมลิ้นจี่ เป๊ปซี่ ผงมะนาว และโซดา"
+		Var DrinkDescription = "Lychee Syrup, Pepsi , Lime &Soda"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_Lychee_Lime_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
-		Var PriceD2 = $12-99-05-0059.Price
+		Var PriceD2 = $12-99-05-0073.Price
 		Var PriceD3 = $-.Price
 		Var PD_CODE1 = "##-##-##-####"
-		Var PD_CODE2 = "12-99-05-0059"
+		Var PD_CODE2 = "12-99-05-0073"
 		Var PD_CODE3 = "##-##-##-####"
 		Var PD_STAGE_1 = "Disable2"
-		Var PD_STAGE_2 = $12-99-05-0059.Button
+		Var PD_STAGE_2 = $12-99-05-0073.Button
 		Var PD_STAGE_3 = "Disable2"
-		Var OverlayMenuFilter !assigned xmlpro( 12-99-05-0059, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		Var OverlayMenuFilter !assigned xmlpro( 12-99-05-0073, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
 		DEBUGVAR OverlayMenuFilter
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
@ -339,7 +339,7 @@ STRAW CHEE SODA" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-99-05-0059"
+			Topping "Load" "12-99-05-0073"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@ -352,10 +352,10 @@ STRAW CHEE SODA" </Value>
 		Var menu_name_thai_hot = $##-##-##-####.Name
 		Var menu_desc_thai_hot = $##-##-##-####.description
 		
-		Var menu_name_eng_cold = $12-99-05-0059.NameE
-		Var menu_desc_eng_cold = $12-99-05-0059.descriptionE
-		Var menu_name_thai_cold = $12-99-05-0059.Name
-		Var menu_desc_thai_cold = $12-99-05-0059.description
+		Var menu_name_eng_cold = $12-99-05-0073.NameE
+		Var menu_desc_eng_cold = $12-99-05-0073.descriptionE
+		Var menu_name_thai_cold = $12-99-05-0073.Name
+		Var menu_desc_thai_cold = $12-99-05-0073.description
 		
 		Var menu_name_eng_blender = $##-##-##-####.NameE
 		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
@ -392,7 +392,7 @@ STRAW CHEE SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Lychee + Pepsi + Lime" </Value>
+	<Value> "น้ำเชื่ื่อมลิ้นจี่ เป๊ปซี่ ผงมะนาว และโซดา" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -414,7 +414,7 @@ LYCHEE SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Lychee + Pepsi + Lime" </Value>
+	<Value> "Lychee Syrup, Pepsi , Lime &Soda" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -444,7 +444,7 @@ LYCHEE SODA" </Value>
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
-	<State> $12-99-05-0059.Button </State>
+	<State> $12-99-05-0073.Button </State>
 	</Image>
 	<Text>
 	<X> 115 </X>
@ -454,8 +454,8 @@ LYCHEE SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-99-05-0059.Button </State>
-	<Value> StringFmt( $12-99-05-0059.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<State> $12-99-05-0073.Button </State>
+	<Value> StringFmt( $12-99-05-0073.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 146 </X>
@ -498,9 +498,9 @@ LYCHEE SODA" </Value>
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum1299050059 = "Disable" Then
+			If $Sum1299050073 = "Disable" Then
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
-				STRCONTAIN "ERR" $12-99-05-0059.TAG tag2_is_disable
+				STRCONTAIN "ERR" $12-99-05-0073.TAG tag2_is_disable
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
@ -537,7 +537,7 @@ LYCHEE SODA" </Value>
 	<Font> MITRegularTTF </Font>
 	<Color> 0x5A5A5A </Color>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum1299050059 </State> 
+	<State> $Sum1299050073 </State> 
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
@ -562,8 +562,8 @@ LYCHEE SODA" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED SIVANNA STRAW CHEE TEA"
 		Var NameDrinkTH = "ซีเวนน่าสตรอว์ ชี่ชาไทย"
-		Var DrinkDescriptionTH = "Straw + lychee + Thai tea"
-		Var DrinkDescription = "Straw + lychee + Thai tea"
+		Var DrinkDescriptionTH = "น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมลิ้นจี่ และชาไทย"
+		Var DrinkDescription = "Strawberry Syrup, Lychee Syrup, Thai Tea"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Straw_Lychee_Thaitea_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -646,7 +646,7 @@ LYCHEE SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Straw + lychee + Thai tea" </Value>
+	<Value> "น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมลิ้นจี่ และชาไทย" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -668,7 +668,7 @@ STRAW CHEE TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Straw + lychee + Thai tea" </Value>
+	<Value> "Strawberry Syrup, Lychee Syrup, Thai Tea" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -816,8 +816,8 @@ STRAW CHEE TEA" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED ESTEE LYCHEE STRAW CANO"
 		Var NameDrinkTH = "เอสเต้ดับเบิ้ลลิ้นจี่ สตอว์กาโน่"
-		Var DrinkDescriptionTH = "Lychee + Straw + Americano"
-		Var DrinkDescription = "Lychee + Straw + Americano"
+		Var DrinkDescriptionTH = "น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมลิ้นจี่ และกาแฟ"
+		Var DrinkDescription = "Strawberry Syrup, Lychee Syrup, Espresso"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Straw_Lychee_Americano_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -900,7 +900,7 @@ STRAW CHEE TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Lychee + Straw + Americano" </Value>
+	<Value> "น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมลิ้นจี่ และกาแฟ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -922,7 +922,7 @@ STRAW CANO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Lychee + Straw + Americano" </Value>
+	<Value> "Strawberry Syrup, Lychee Syrup, Espresso" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -1068,8 +1068,8 @@ STRAW CANO" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED ESTEE LYCHEE STRAW CANO"
 		Var NameDrinkTH = "เอสเต้ดับเบิ้ลลิ้นจี่ สตอว์กาโน่"
-		Var DrinkDescriptionTH = "Lychee + Straw + Americano"
-		Var DrinkDescription = "Lychee + Straw + Americano"
+		Var DrinkDescriptionTH = "น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมลิ้นจี่ และกาแฟ"
+		Var DrinkDescription = "Strawberry Syrup, Lychee Syrup, Espresso"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Straw_Lychee_Americano_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -1152,7 +1152,7 @@ STRAW CANO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Lychee + Straw + Americano" </Value>
+	<Value> "น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมลิ้นจี่ และกาแฟ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1174,7 +1174,7 @@ STRAW CANO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Lychee + Straw + Americano" </Value>
+	<Value> "Strawberry Syrup, Lychee Syrup, Espresso" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -1321,8 +1321,8 @@ STRAW CANO" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED CLARINS PLUM CARA MILK"
 		Var NameDrinkTH = "คลาแรงส์พลัม คารามิลล์"
-		Var DrinkDescriptionTH = "Plum + Caramel + Milk"
-		Var DrinkDescription = "Plum + Caramel + Milk"
+		Var DrinkDescriptionTH = "น้ำเชื่อมบ๊วย น้ำเชื่อมคาราเมล นมและน้ำแข็ง"
+		Var DrinkDescription = "Ume Syrup, Caramel Syrup, Milk ,Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Caramel_Plum_Milk_caramel_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -1405,7 +1405,7 @@ STRAW CANO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Plum + Caramel + Milk" </Value>
+	<Value> "น้ำเชื่อมบ๊วย น้ำเชื่อมคาราเมล นมและน้ำแข็ง" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1427,7 +1427,7 @@ PLUM CARA MILK" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Plum + Caramel + Milk" </Value>
+	<Value> "Ume Syrup, Caramel Syrup, Milk ,Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -1575,8 +1575,8 @@ PLUM CARA MILK" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED CALVIN KLEIN COCOA CHEE"
 		Var NameDrinkTH = "คลาวิน ไคลน์ โกโก้ชี่"
-		Var DrinkDescriptionTH = "Cocoa + Lychee + Milk"
-		Var DrinkDescription = "Cocoa + Lychee + Milk"
+		Var DrinkDescriptionTH = "น้ำเชื่อมลิ้นจี่ โกโก้  และนม "
+		Var DrinkDescription = "Lychee Syrup, Cocoa , Milk "
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Cocoa_Lychee_Milk_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -1658,7 +1658,7 @@ PLUM CARA MILK" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Cocoa + Lychee + Milk" </Value>
+	<Value> "น้ำเชื่อมลิ้นจี่ โกโก้  และนม " </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1680,7 +1680,7 @@ KLEIN COCOA CHEE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Cocoa + Lychee + Milk" </Value>
+	<Value> "Lychee Syrup, Cocoa , Milk " </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -1828,8 +1828,8 @@ KLEIN COCOA CHEE" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED RO STRAW MATCHA"
 		Var NameDrinkTH = "โรสตรอว์มัทฉะ"
-		Var DrinkDescriptionTH = "Straw + Matcha + Milk"
-		Var DrinkDescription = "Straw + Matcha + Milk"
+		Var DrinkDescriptionTH = "น้ำเชื่อมสตรอเบอร์รี่ ชาเขียว และนม "
+		Var DrinkDescription = "Strawberry Syrup , Matcha, Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Straw_Matcha_milk_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -1911,7 +1911,7 @@ KLEIN COCOA CHEE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Straw + Matcha + Milk" </Value>
+	<Value> "น้ำเชื่อมสตรอเบอร์รี่ ชาเขียว และนม " </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1933,7 +1933,7 @@ MATCHA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Straw + Matcha + Milk" </Value>
+	<Value> "Strawberry Syrup , Matcha, Milk" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -2081,8 +2081,8 @@ MATCHA" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED BIN STRAW CAFE LATTE"
 		Var NameDrinkTH = "บินสตรอว์คาเฟ่ลาเต้"
-		Var DrinkDescriptionTH = "Cafe latte + Straw"
-		Var DrinkDescription = "Cafe latte + Straw"
+		Var DrinkDescriptionTH = "น้ำเชื่อมสตรอเบอร์รี่ กาแฟและนม "
+		Var DrinkDescription = "Strawberry Syrup , Espresso, Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_LATTE_Straw_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -2164,7 +2164,7 @@ MATCHA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Cafe latte + Straw" </Value>
+	<Value> "น้ำเชื่อมสตรอเบอร์รี่ กาแฟและนม " </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2186,7 +2186,7 @@ CAFE LATTE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Cafe latte + Straw" </Value>
+	<Value> "Strawberry Syrup , Espresso, Milk" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -2332,8 +2332,8 @@ CAFE LATTE" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED BIN STRAW CAFE LATTE"
 		Var NameDrinkTH = "บินสตรอว์คาเฟ่ลาเต้"
-		Var DrinkDescriptionTH = "Cafe latte + Straw"
-		Var DrinkDescription = "Cafe latte + Straw"
+		Var DrinkDescriptionTH = "น้ำเชื่อมสตรอเบอร์รี่ กาแฟและนม "
+		Var DrinkDescription = "Strawberry Syrup , Espresso, Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_LATTE_Straw_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -2415,7 +2415,7 @@ CAFE LATTE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Cafe latte + Straw" </Value>
+	<Value> "น้ำเชื่อมสตรอเบอร์รี่ กาแฟและนม " </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2437,7 +2437,7 @@ CAFE LATTE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Cafe latte + Straw" </Value>
+	<Value> "Strawberry Syrup , Espresso, Milk" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -2584,8 +2584,8 @@ CAFE LATTE" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED SON JAS CHEE TEA"
 		Var NameDrinkTH = "สันจัสชี่"
-		Var DrinkDescriptionTH = "Jasmine tea + Lychee"
-		Var DrinkDescription = "Jasmine tea + Lychee"
+		Var DrinkDescriptionTH = "น้ำเชื่อมลิ้นจี่ ชามะลิ  และน้ำ"
+		Var DrinkDescription = "Lychee Syrup, Jasmine Tea, Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_HOT_JASMINE_Lychee_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -2667,7 +2667,7 @@ CAFE LATTE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Jasmine tea + Lychee" </Value>
+	<Value> "น้ำเชื่อมลิ้นจี่ ชามะลิ  และน้ำ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2689,7 +2689,7 @@ CHEE TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Jasmine tea + Lychee" </Value>
+	<Value> "Lychee Syrup, Jasmine Tea, Water" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -2837,8 +2837,8 @@ CHEE TEA" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ROBINSON UP CHEE SMOOTHIE"
 		Var NameDrinkTH = "โรบินสันอัพชี่"
-		Var DrinkDescriptionTH = "เซเว่น อัพ ลิ้นจี่ มะนาว โซดา "
-		Var DrinkDescription = "7Up Lychee Lime Soda"
+		Var DrinkDescriptionTH = "7up น้ำเชื่อมลิ้นจี่ ผงมะนาว และโซดา "
+		Var DrinkDescription = "7Up, Lychee Syrup, Lime &Soda"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_7UP_Lychee_SODA_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -2920,7 +2920,7 @@ CHEE TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "เซเว่น อัพ ลิ้นจี่ มะนาว โซดา " </Value>
+	<Value> "7up น้ำเชื่อมลิ้นจี่ ผงมะนาว และโซดา " </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2941,7 +2941,7 @@ CHEE TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "7Up Lychee Lime Soda" </Value>
+	<Value> "7Up, Lychee Syrup, Lime &Soda" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
--- a/xml/page_payment_cash-MYR.xml
+++ b/xml/page_payment_cash-MYR.xml
@ -770,6 +770,7 @@
 	;DEBUGVAR alphaState3

 	DEBUGVAR CashlessPayFlag
+	DEBUGVAR ReadyForBrew

 	If ReadyForBrew = "false" Then
 		SAVELOG "Back to main1"
@ -1716,6 +1717,7 @@ If alphaState = "Invisible" Then
 			DEBUGVAR VendingCashless

            Var ReqPayInfoFromCashOther = 2
+			WRITE_FILE "/mnt/sdcard/app_run_flag" "1"
        EndIf
 	EndIf

--- a/xml/page_payment_cash.xml
+++ b/xml/page_payment_cash.xml
@ -2897,27 +2897,6 @@
 <Filename> Var( DirImage + "/img_popup4.png" )</Filename>
 </Image>

-<Image>
-<X> 838 </X>
-<Y> 1350 </Y>
-<State> eval(  
-	 Var return = "Invisible"
-
-	 If AdultState1 = "Enable" Then
-	 	If AdultState2 = "Invisible" Then
-	 		Var return = "Enable"
-	 	EndIf
- 	EndIf
- 	DEBUGVAR return
-	)  
-</State>
-<Animation>
-	<Style> "Bounce" </Style>
-	<OnEvent> "TimerSec=3" </OnEvent>
-</Animation>
-<Filename> "ROOT/taobin_project/image/anmi/arrow_1.png" </Filename>
-</Image>
-
 <Button>
 <X> 360 </X>
 <Y> 1373 </Y>
--- a/xml/page_payment_code.xml
+++ b/xml/page_payment_code.xml
@ -237,6 +237,8 @@
 						EndIf
 					EndIf

+					TRY "ROOT/taobin_project/xml/event/collect_promotion_point_condition.ev"
+

 					;Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
 					Var Seeker.VendingCampaign = PayAmount
--- a/xml/topview2.xml
+++ b/xml/topview2.xml
@ -85,9 +85,12 @@
 		EndIf

 	EndIf
+	If CountryRootPath = "" Then

-	Var exhaust_fan_schedule = CountryRootPath + "/hardware/exhaust_fan_schedule.ev"
-
+		Var exhaust_fan_schedule = "ROOT/taobin_project/inter/tha/hardware/exhaust_fan_schedule.ev"
+	Else
+		Var exhaust_fan_schedule = CountryRootPath + "/hardware/exhaust_fan_schedule.ev"
+	EndIf
 	TRY exhaust_fan_schedule
 </EventOpen>
 <Timeout> 1000 </Timeout>
--- a/xml/verify_number.ev
+++ b/xml/verify_number.ev
@ -17,4 +17,10 @@ EndIf

 If Tel2D = "09" Then
    Var Tel2DFlag = 1
+EndIf
+
+If InternationalEnable = 1 Then
+    Var VerifyFile = CountryRootPath + "/xml/verify_number.ev"
+
+    TRY VerifyFile
 EndIf
--- a/Show more
+++ b/Show more