do page_catalog.lxml

inter/tha/menu/lang.tsv

@@ -1099,7 +1099,7 @@
 1300003		Beans module	ชุดเมล็ดกาแฟ
 1300004		Bean tray	ถาดใส่เมล็ดกาแฟ
 1300005		Switch tray :	สวิตซ์ถาด :
-1300006		Check tray shutter	ตรวจสอบชัตเตอร์ของถาด
+1300006		Check tray shutter	ตรวจสอบชัตเตอร์ถาด
 1300007		Pay beans	จ่ายถั่ว
 1300008		1. Select beans	1. เลือกเมล็ดกาแฟ
 1300009		2. Select direction	2. เลือกทิศทาง
@@ -1112,7 +1112,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. ทดสอบการบด
@@ -1617,4 +1617,4 @@
 
 
 	EOF
-9999999		Load language finish	Load language finish
+9999999		Load language finish	Load language finish	Load language finish	Load language finish	Load language finish	Load language finish

inter/tha/xml/multi/menu_new_layout_gen_v2.py

@@ -1,5 +1,5 @@
   if "v2" in param:
-    def GenMenuProductCodeBlock( str_hot_product_code, str_cold_product_code, str_blend_product_code):
+    def GenMenuProductCodeBlock( str_hot_product_code, str_cold_product_code, str_blend_product_code, str_date_time_start, str_date_time_end, str_product_var):
         print(" size " + str( len(spl)) + " img=" + spl[ idx_img][1] )
         out_xml( '\t; ==================> Len = ' + str(len(spl)) + '\r\n')  
         menu_img = spl[ idx_img][1]
@@ -23,6 +23,15 @@
         
         if str_blend_product_code != '-':
           str_con += str_blend_product_code + '.Button,'
+
+        if str_date_time_start != '-':
+          str_con += 'DateTimeStart="' + str_date_time_start + '",'
+
+        if str_date_time_end != '-':
+          str_con += 'DateTimeEnd="' + str_date_time_end + '",'
+
+        if str_product_var != '-':
+          str_con += 'Var=' + str_product_var + ','
    
         if str_hot_product_code != '-':
           str_con_var += str_hot_product_code + '-'
@@ -32,6 +41,15 @@
         
         if str_blend_product_code != '-':
           str_con_var += str_blend_product_code + '-'
+
+        # if str_date_time_start != '-':
+        #   str_con_var += str_date_time_start + '-'
+
+        # if str_date_time_end != '-':
+        #   str_con_var += str_date_time_end + '-'
+
+        # if str_product_var != '-':
+        #   str_con_var += str_product_var + '-'
    
         str_con_var = str_con_var.replace("-", "")
         if touch_less_gen == True:
@@ -555,7 +573,7 @@
 
     
     def GenMenuBlock( idx_hot_product_code, idx_cold_product_code, idx_blend_product_code):
-        GenMenuProductCodeBlock( spl[ idx_name][ idx_hot_product_code], spl[ idx_name][ idx_cold_product_code] , spl[ idx_name][ idx_blend_product_code] )
+        GenMenuProductCodeBlock( spl[ idx_name][ idx_hot_product_code], spl[ idx_name][ idx_cold_product_code] , spl[ idx_name][ idx_blend_product_code],spl[ idx_name][ idx_date_time_start],spl[ idx_name][idx_date_time_end],spl[ idx_name][idx_product_var] )
         
     idx_lang_myanmar = 6
     idx_lang_malay = 5
@@ -573,6 +591,10 @@
     idx_hot_product_code = 7
     idx_cold_product_code = idx_hot_product_code + 1
     idx_blend_product_code = idx_cold_product_code + 1
+
+    idx_date_time_start = 17
+    idx_date_time_end = idx_date_time_start + 1
+    idx_product_var = idx_date_time_end + 1
     
     # 
     idx_hot_product_code2 = idx_blend_product_code + 1
@@ -679,6 +701,23 @@
             hot_pd = spl[ idx_name][ idx_hot_product_code].split(',')
             cold_pd = spl[ idx_name][ idx_cold_product_code].split(',')
             blend_pd = spl[ idx_name][ idx_blend_product_code].split(',')
+            date_time_start = spl[idx_name][idx_date_time_start]
+            date_time_end = spl[idx_name][idx_date_time_end]
+            product_var = spl[idx_name][idx_product_var]
+            # if len(spl) > idx_name and len(spl[idx_name]) > max(idx_date_time_start, idx_date_time_end, idx_product_var):
+            #   date_time_start = spl[idx_name][idx_date_time_start]
+            #   date_time_end = spl[idx_name][idx_date_time_end]
+            #   product_var = spl[idx_name][idx_product_var]
+            # else:
+            #     date_time_start = '-'
+            #     date_time_end = '-'
+            #     product_var = '-'
+            #     print(f"Index error: spl[{idx_name}] does not have enough elements")
+            #     continue
+
+            print(f"spl[{idx_name}] =", spl[idx_name])
+            print(f"Expected indices: date_time_start:{date_time_start}, date_time_end:{date_time_end}, product_var:{product_var}")
+
 
             #print(' size = ' + str( len( hot_pd)) + ' size = ' + str( len( cold_pd)) + ' size = ' + str( len( blend_pd))  + '\r\n')
             list_size = len( hot_pd)
@@ -688,7 +727,7 @@
                   print("\t\t==> ignore ")
               else:
                   print("\t\t==> gen ")
-                  GenMenuProductCodeBlock( hot_pd[ idx], cold_pd[ idx], blend_pd[ idx] )
+                  GenMenuProductCodeBlock( hot_pd[ idx], cold_pd[ idx], blend_pd[ idx], date_time_start, date_time_end, product_var )
         else:
             GenMenuBlock( idx_hot_product_code, idx_cold_product_code, idx_blend_product_code)
             #out_xml( '\t; parallel '+ spl[ idx_name][ idx_hot_product_code2] + ' ' + spl[ idx_name][ idx_cold_product_code2] + ' ' + spl[ idx_name][ idx_blend_product_code2] + ' \r\n')

inter/tha/xml/multi/page_catalog.lxml

@@ -18,6 +18,20 @@
 
 	DEBUGVAR ToppingNewShow
 
+	DEBUGVAR OpenFromPageBoard
+	If OpenFromPageBoard = 1 Then
+		Var OpenFromPageBoard = 0
+		Var langnext1 = "true"
+		Var langnext2 = "true"
+		Var langnext3 = "true"
+		Var langnext4 = "true"
+		Var langnext5 = "true"
+		Var langnext6 = "true"
+		Var langnext7 = "true"
+		Var langnext8 = "true"
+		SAVELOG "======================================= RefreshAll Languages ================================"
+	EndIf
+
 	Var NextPage = "-"
 
 	Var Seeker.thankLidFlag = 0
@@ -198,11 +212,6 @@
 	Var PromotionIDCurrentOrder = 0
 	RootLayoutVisible 3 "show"
 	
-	Var ButtonLanguageCurrentXPosition = 1005
-    Var ButtonLanguageCurrentYPosition = 458 - 38
-
-    Var ButtonLanguageListXPosition = 970  
-    Var ButtonLanguageListYPosition = 450 - 38
 
 	Var SelectedMenu = ""
 	Var MultiProcess = "Invisible"
@@ -560,15 +569,15 @@
 	<Volume> SoundVolume </Volume>
 	<EventClick> 
 
-		If Inst5MenuLoaded = "done" Then
-			TabMenuVisibleInst 2 
-			
-			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
-		Else
-			Var MultiProcessTimer = 0
-			Var MultiProcess = "Enable"
-			Var SelectedMenu = "coffee"
-		EndIf
+	If Inst5MenuLoaded = "done" Then
+		Var MultiProcess = "Invisible"
+        TabMenuVisibleInst 2 
+        OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
+    Else
+		Var MultiProcessTimer = 0
+        Var MultiProcess = "Enable"
+        Var SelectedMenu = "coffee"
+    EndIf
 
 	</EventClick>
 	<Language>
@@ -630,15 +639,16 @@
 	<Volume> SoundVolume </Volume>
 	<EventClick> 
 
-		If Inst6MenuLoaded = "done" Then
-			TabMenuVisibleInst 3 
-			
-			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
-		Else
-			Var MultiProcessTimer = 0
-			Var MultiProcess = "Enable"
-			Var SelectedMenu = "tea"  
-		EndIf
+	If Inst6MenuLoaded = "done" Then
+		Var MultiProcess = "Invisible"
+        TabMenuVisibleInst 3 
+        
+        OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
+    Else
+		Var MultiProcessTimer = 0
+        Var MultiProcess = "Enable"
+        Var SelectedMenu = "tea"  
+    EndIf
 
 	</EventClick>
 	<Language>
@@ -663,25 +673,25 @@
 	<Volume> SoundVolume </Volume>
 	<EventClick> 
 
-		If Inst7MenuLoaded = "done" Then
-			TabMenuVisibleInst 4 
-			
-			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
-		Else
-			Var MultiProcessTimer = 0
-			Var MultiProcess = "Enable"
-			Var SelectedMenu = "caramel"  
-		EndIf
-	</EventClick>
-	<Language>
-		<ID> 000007 </ID>
-		<X> 28 </X>
-		<Y> 193 </Y>
-		<Width> 241 </Width>
-		<Height> 72 </Height>
-	</Language>
-	</Button>
-</Block>
+	If Inst7MenuLoaded = "done" Then
+		Var MultiProcess = "Invisible"
+        TabMenuVisibleInst 4 
+        
+        OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
+    Else
+		Var MultiProcessTimer = 0
+        Var MultiProcess = "Enable"
+        Var SelectedMenu = "caramel"  
+    EndIf
+</EventClick>
+<Language>
+	<ID> 000007 </ID>
+	<X> 28 </X>
+	<Y> 193 </Y>
+	<Width> 241 </Width>
+	<Height> 72 </Height>
+</Language>
+</Button>
 
 
 <Block>
@@ -696,48 +706,46 @@
 	<Volume> SoundVolume </Volume>
 	<EventClick> 
 
-		If Inst11MenuLoaded = "done" Then
-			TabMenuVisibleInst 7
-			
-			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
-		Else
-			Var MultiProcessTimer = 0
-			Var MultiProcess = "Enable"
-			Var SelectedMenu = "soda"  
-		EndIf
-	</EventClick>
-	<Language>
-		<ID> 000009 </ID>
-		<X> 28 </X>
-		<Y> 211 </Y>
-		<Width> 241 </Width>
-		<Height> 72 </Height>
-	</Language>
-	</Button>
-</Block>
-
+	If Inst8MenuLoaded = "done" Then
+		Var MultiProcess = "Invisible"
+        TabMenuVisibleInst 5 
+        
+        OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
+    Else
+		Var MultiProcessTimer = 0
+        Var MultiProcess = "Enable"
+        Var SelectedMenu = "kidmenu"  
+    EndIf
+</EventClick>
+<Language>
+	<ID> 000011 </ID>
+	<X> 28 </X>
+	<Y> 211 </Y>
+	<Width> 241 </Width>
+	<Height> 72 </Height>
+</Language>
+</Button>
 
 <Block>
-	<Width> 296 </Width>
-	<Height> 344 </Height>
-	<MarginLeft> 42 </MarginLeft>
-	<State> "Enable" </State>
-	<Button>
-	<Filename> Var(DirImage + "/bn_Pepsi_7up.png") </Filename>
-	<FilenamePress> Var(DirImage + "/bp_Pepsi_7up.png") </FilenamePress>
-	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-	<Volume> SoundVolume </Volume>
-	<EventClick> 
-
-		If Inst10MenuLoaded = "done" Then
-			TabMenuVisibleInst 8
-			
-			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
-		Else
-			Var MultiProcessTimer = 0
-			Var MultiProcess = "Enable"
-			Var SelectedMenu = "pepsi"  
-		EndIf
+<Button>
+<X> 392 </X>
+<Y> 1532 </Y>
+<State>AppFastButtonState</State>
+<Filename> Var(DirImage + "/bn_appfast.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_appfast.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	If Inst8MenuLoaded = "done" Then
+		Var MultiProcess = "Invisible"
+        TabMenuVisibleInst 5 
+        
+        OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
+    Else
+		Var MultiProcessTimer = 0
+        Var MultiProcess = "Enable"
+        Var SelectedMenu = "appfast"  
+    EndIf
 
 	</EventClick>
 	<Language>
@@ -765,122 +773,137 @@
 	<Volume> SoundVolume </Volume>
 	<EventClick> 
 
-		If Inst8MenuLoaded = "done" Then
-			TabMenuVisibleInst 5 
-			
-			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
-		Else
-			Var MultiProcessTimer = 0
-			Var MultiProcess = "Enable"
-			Var SelectedMenu = "kidmenu"  
-		EndIf
-	</EventClick>
-	<Language>
-		<ID> 000011 </ID>
-		<X> 28 </X>
-		<Y> 211 </Y>
-		<Width> 241 </Width>
-		<Height> 72 </Height>
-	</Language>
-	</Button>
-</Block>
-
-<Block>
-	<Width> 296 </Width>
-	<Height> 344 </Height>
-	<MarginLeft> 42 </MarginLeft>
-	<State>AppFastButtonState</State>
-	<Button>
-	<State>AppFastButtonState</State>
-	<Filename> Var(DirImage + "/bn_appfast.png") </Filename>
-	<FilenamePress> Var(DirImage + "/bp_appfast.png") </FilenamePress>
-	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-	<Volume> SoundVolume </Volume>
-	<EventClick> 
-		If Inst8MenuLoaded = "done" Then
-			TabMenuVisibleInst 5 
-			
-			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
-		Else
-			Var MultiProcessTimer = 0
-			Var MultiProcess = "Enable"
-			Var SelectedMenu = "appfast"  
-		EndIf
-
-	</EventClick>
-	<Language>
-		<ID> 000012 </ID>
-		<X> 28 </X>
-		<Y> 211 </Y>
-		<Width> 241 </Width>
-		<Height> 72 </Height>
-	</Language>
-	</Button>
-</Block>
-
-<Block>
-	<Width> 296 </Width>
-	<Height> 344 </Height>
-	<MarginLeft> 42 </MarginLeft>
-	<State> WheyButtonState </State>
-	<Button>
-	<State>WheyButtonState</State>
-	<Filename> Var(DirImage + "/bn_protein.png") </Filename>
-	<FilenamePress> Var(DirImage + "/bp_protein.png") </FilenamePress>
-	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-	<Volume> SoundVolume </Volume>
-	<EventClick> 
-		TabMenuVisibleInst 5
-		OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
-
-	</EventClick>
-	<Language>
-		<ID> 000008 </ID>
-		<X> 28 </X>
-		<Y> 202 </Y>
-		<Width> 241 </Width>
-		<Height> 72 </Height>
-	</Language>
-	</Button>
-</Block>
-
-<Block>
-	<Width> 296 </Width>
-	<Height> 344 </Height>
-	<MarginLeft> 42 </MarginLeft>
-	<State> "Enable" </State>
-	<Button>
-	<State> "Enable" </State>
-	<Filename> Var(DirImage + "/bn_HealthyOption.png") </Filename>
-	<FilenamePress> Var(DirImage + "/bp_HealthyOption.png") </FilenamePress>
-	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-	<Volume> SoundVolume </Volume>
-	<EventClick> 
-		
-		If Inst9MenuLoaded = "done" Then
-			TabMenuVisibleInst 6
-			
-			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
-		Else
-			Var MultiProcessTimer = 0
-			Var MultiProcess = "Enable"
-			Var SelectedMenu = "healthy"  
-		EndIf
-
-	</EventClick>
-	<Language>
-		<ID> 000010 </ID>
-		<X> 28 </X>
-		<Y> 202 </Y>
-		<Width> 241 </Width>
-		<Height> 82 </Height>
-	</Language>
-	</Button>
+	If Inst11MenuLoaded = "done" Then
+		Var MultiProcess = "Invisible"
+        TabMenuVisibleInst 7
+        
+        OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
+    Else
+		Var MultiProcessTimer = 0
+        Var MultiProcess = "Enable"
+        Var SelectedMenu = "soda"  
+    EndIf
+</EventClick>
+<Language>
+	<ID> 000009 </ID>
+	<X> 28 </X>
+	<Y> 211 </Y>
+	<Width> 241 </Width>
+	<Height> 72 </Height>
+</Language>
+</Button>
 </Block>
+;###############################################################
 
 
 
-</FrameScroll>
+<Button>
+<X> 392 </X>
+<Y> 1532 </Y>
+<State>WheyButtonState</State>
+<Filename> Var(DirImage + "/bn_protein.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_protein.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	TabMenuVisibleInst 5
+    OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
+
+</EventClick>
+<Language>
+	<ID> 000008 </ID>
+	<X> 28 </X>
+	<Y> 202 </Y>
+	<Width> 241 </Width>
+	<Height> 72 </Height>
+</Language>
+</Button>
+
+
+<Button>
+<X> 736 </X>
+<Y> 1532 </Y>
+<State> "Enable" </State>
+<Filename> Var(DirImage + "/bn_HealthyOption.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_HealthyOption.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	
+	If Inst9MenuLoaded = "done" Then
+		Var MultiProcess = "Invisible"
+        TabMenuVisibleInst 6
+        
+        OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
+    Else
+		Var MultiProcessTimer = 0
+        Var MultiProcess = "Enable"
+        Var SelectedMenu = "healthy"  
+    EndIf
+
+</EventClick>
+<Language>
+	<ID> 000010 </ID>
+	<X> 28 </X>
+	<Y> 202 </Y>
+	<Width> 241 </Width>
+	<Height> 82 </Height>
+</Language>
+</Button>
+
+
+<Button>
+<X> 736 </X>
+<Y> 1532 </Y>
+<State> "Invisible" </State>
+<Filename> Var(DirImage + "/bn_winter_warmers.png") </Filename>
+<FilenamePress> Var(DirImage + "/bn_winter_warmers.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+	
+	;Open "ROOT/taobin_project/xml/page_catalog_group_winter_warmers.lxml" 
+	
+	
+	Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_winter_warmers_ignore.lxml"
+	Open OpenFileXML
+
+</EventClick>
+</Button>
+
+
+;###############################################################
+
+<Button>
+<X> 48 </X>
+<Y> 1532 </Y>
+<Filename> Var(DirImage + "/bn_Pepsi_7up.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_Pepsi_7up.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+
+	If Inst10MenuLoaded = "done" Then
+		Var MultiProcess = "Invisible"
+        TabMenuVisibleInst 8
+        
+        OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
+    Else
+		Var MultiProcessTimer = 0
+        Var MultiProcess = "Enable"
+        Var SelectedMenu = "pepsi"  
+    EndIf
+
+</EventClick>
+<Language>
+	<ID> 000025 </ID>
+	<X> 28 </X>
+	<Y> 202 </Y>
+	<Width> 241 </Width>
+	<Height> 82 </Height>
+</Language>
+</Button>
 
 <Button>
 <X> 225 </X>

inter/tha/xml/multi/page_catalog_group_coffee.lxml

@@ -1,272 +1,273 @@
-
-
-<Popup>
-<Cache> "Enable" </Cache>
-<Width> 1080 </Width>
-<Height> 1920 </Height>
-;<Background> "0xeae6e1" </Background>
-<Volume> SoundVolume </Volume>
-<EventOpen>
-	; On open
-	
-
-	If SlientRefreshIndex = 2 Then
-		Var SlientRefreshIndex = 3
-
-	EndIf
-
-</EventOpen>
-
-
-
-<EventOnShow>
-    ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"    
-    Var Menu2Selected = "PressForever"
-
-
-    ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
-
-    Var Timeout = 0
-
-
-    ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
-
-    SetInstanceIgnoreTouch
-
-    
-	DEBUGVAR SlientRefreshIndex
-</EventOnShow>
-
-<Timeout> 1000 </Timeout>
-<EventTimeout>
-    ;DEBUGVAR ICE_PROCESS_STATUS
-
-    If ICE_PROCESS_STATUS = 2 Then
-        Var ice_tab_process_show = "Enable"
-        Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
-    Else
-        Var ice_tab_process_show = "Invisible"
-    EndIf
-
-    
-    GetVisible inst_show2
-    ;DEBUGVAR inst_show2
-
-
-    If inst_show2 = 1 Then
-        InstanceGetString SaveStringInst
-        ;DEBUGVAR SaveStringInst
-        If SaveStringInst = "RefreshNow" Then
-            GetXMLFileNameCurrentRunning CurrentOpenFile
-            Open CurrentOpenFile
-
-            If show_eng = "true" Then 
-                InstanceSetString "ShowEng"
-            Else
-                InstanceSetString "ShowThai"
-            EndIf
-        EndIf
-    EndIf
-
-    ; setvarint SlientRefreshEnable 1
-    ;DEBUGVAR SlientRefreshEnable
-
-    If SlientRefreshEnable = 1 Then
-        If SaveStringInst = "RefreshNow" Then
-            GetXMLFileNameCurrentRunning CurrentOpenFile
-            Open CurrentOpenFile
-
-            If show_eng = "true" Then 
-                InstanceSetString "ShowEng"
-            Else
-                InstanceSetString "ShowThai"
-            EndIf
-       
-        EndIf
-    EndIf
-
-	 If SlientRefreshIndex = 2 Then
-		If inst_show2 = 0 Then
-			GetXMLFileNameCurrentRunning CurrentOpenFile2
-			Open CurrentOpenFile2
-			
-		Else
-			Var SlientRefreshIndex = 3
-		EndIf
-    EndIf
-
-     If inst_show2 = 1 Then
-        If langnext1 = "true" Then
-            Var langnext1 = "false"
-            DEBUGVAR langnext
-        EndIf
-    EndIf
-
-            
-
-
-
-    Var Inst5CountMenuEnable = 0
-    Var Inst5CountCurrentMenuEnable = 0
-    GetFrameScrollBlockCount Inst5CountCurrentMenuEnable
-    GetCurrentEnableBlockCount Inst5CountMenuEnable
-    
-    ;DEBUGVAR Inst5CountMenuEnable
-    ;DEBUGVAR Inst5CountMenuEnablePrev
-    ;DEBUGVAR Inst5CountCurrentMenuEnable
-
-    If Inst5CountMenuEnablePrev = "" Then
-        Var Inst5CountMenuEnablePrev = Inst5CountMenuEnable
-        Var Inst5CountDownForOpenXML = 0
-        Var Inst5CountDownOpenXMLFromMenuZero = 20
-    EndIf
-
-    If Inst5CountMenuEnable = Inst5CountMenuEnablePrev Then
-
-    Else
-        SAVELOG "Inst5 Refresh ===================================================================== Refresh"
-        Var Inst5CountDownForOpenXML = 10
-        Var Inst5CountMenuEnablePrev = CountMenuEnable
-    EndIf
-
-    If Inst5CountMenuEnable = Inst5CountCurrentMenuEnable Then
-
-    Else
-        If Inst5CountDownForOpenXML = 0 Then
-            SAVELOG "Inst5 Refresh =======================Inst5CountMenuEnable / Inst5CountCurrentMenuEnable ============================================== Refresh"
-            Var Inst5CountDownForOpenXML = 10
-        EndIf
-    EndIf
-
-    If Inst5CountCurrentMenuEnable = 0 Then
-        
-        DEBUGVAR Inst5CountDownOpenXMLFromMenuZero
-
-        If Inst5CountDownOpenXMLFromMenuZero > 0 Then
-            Var Inst5CountDownOpenXMLFromMenuZero = Inst5CountDownOpenXMLFromMenuZero - 1
-            If Inst5CountDownOpenXMLFromMenuZero = 0 Then
-                Var Inst5CountDownOpenXMLFromMenuZero = 20
-                SAVELOG "OPEN FROM 1"
-                Open "ROOT/taobin_project/inter/tha/xml/multi/page_catalog_group_coffee.lxml"
-            EndIf
-        EndIf
-    EndIf
-
-    If Inst5CountMenuEnable = Inst5CountCurrentMenuEnable Then
-        If Inst5CountCurrentMenuEnable > 0 Then
-            Var Inst5MenuLoaded = "done"  
-        EndIf
-    EndIf
-
-    If Inst5CountDownForOpenXML > 0 Then
-        Var Inst5CountDownForOpenXML = Inst5CountDownForOpenXML - 1
-        DEBUGVAR Inst5CountDownForOpenXML
-        If Inst5CountDownForOpenXML = 0 Then
-            SAVELOG "OPEN FROM 2"
-            Open "ROOT/taobin_project/inter/tha/xml/multi/page_catalog_group_coffee.lxml"
-        EndIf
-        InstanceGetString SaveStringInst
-		If SaveStringInst = "RefreshNow" Then
-		
-		Else
-			If LanguageShow = "ENG" Then
-				Var SaveStringInst = "ShowEng"
-				Var show_eng = "false"
-			EndIf
-			If LanguageShow = "THAI" Then
-				Var SaveStringInst = "ShowThai"
-				Var show_eng = "true"
-			EndIf
-			If LanguageShow = "MYANMAR" Then
-				Var show_eng = "false"
-				Var SaveStringInst = "ShowMYANMAR"
-			EndIf
-		EndIf
-    EndIf
-
-    ; setvarint RefreshCoffeeMenu 1
-    If RefreshCoffeeMenu = 1 Then
-        Var RefreshCoffeeMenu = 0
-        SAVELOG "OPEN FROM 3"
-        Open "ROOT/taobin_project/inter/tha/xml/multi/page_catalog_group_coffee.lxml"
-    EndIf 
-
-    ; setvarint ScriptCoffeeMenu 1
-    If ScriptCoffeeMenu = 1 Then
-        Var ScriptCoffeeMenu = 0
-        SAVELOG "Runscript 3"
-        Script "-" "-"
-    EndIf 
-    		
-
-    TimerReset
-</EventTimeout>
-
-<EventOnShow>
-    InstanceGetString SaveStringInst
-    DEBUGVAR SaveStringInst
-    DEBUGVAR show_eng
-
-
-    Var ButtonLanguageCurrentXPosition = 1005
-    Var ButtonLanguageCurrentYPosition = 458 - 38
-
-    Var ButtonLanguageListXPosition = 970  
-    Var ButtonLanguageListYPosition = 450 - 38
-
-	DEBUGVAR EnabledBlockUpdateInst6
-	DEBUGVAR EnabledBlocksDrawInst6
-	
-
-    If SaveStringInst = "RefreshNow" Then
-        GetXMLFileNameCurrentRunning CurrentOpenFile
-        Open CurrentOpenFile
-    EndIf
-	DEBUGVAR LanguageShow
-
-
-    If SaveStringInst = "ShowThai" Then
-        If LanguageShow = "THAI" Then
-
-        Else
-            Var show_eng = "true"
-            InstanceSetString "ShowMYANMAR"
-            GetXMLFileNameCurrentRunning CurrentOpenFile
-            Open CurrentOpenFile
-        EndIf
-    EndIf
-
-    If SaveStringInst = "ShowMYANMAR" Then
-        If LanguageShow = "MYANMAR" Then
-
-        Else
-            Var show_eng = "false"
-            InstanceSetString "ShowEng"
-            GetXMLFileNameCurrentRunning CurrentOpenFile
-            Open CurrentOpenFile
-        EndIf
-    EndIf
-
-    If SaveStringInst = "ShowEng" Then
-        If LanguageShow = "ENG" Then
-
-        Else
-            Var show_eng = "false"
-            InstanceSetString "ShowThai"
-            GetXMLFileNameCurrentRunning CurrentOpenFile
-            Open CurrentOpenFile
-        EndIf
-    EndIf
-
-	
-    
-
-</EventOnShow>
-
-;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new.lxml"
-
-
-
+
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	
+
+	If SlientRefreshIndex = 2 Then
+		Var SlientRefreshIndex = 3
+
+	EndIf
+
+</EventOpen>
+
+
+
+<EventOnShow>
+    ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"    
+    Var Menu2Selected = "PressForever"
+
+
+    ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
+
+    Var Timeout = 0
+
+
+    ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
+
+    SetInstanceIgnoreTouch
+
+    
+	DEBUGVAR SlientRefreshIndex
+</EventOnShow>
+
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+    ;DEBUGVAR ICE_PROCESS_STATUS
+
+    If ICE_PROCESS_STATUS = 2 Then
+        Var ice_tab_process_show = "Enable"
+        Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+    Else
+        Var ice_tab_process_show = "Invisible"
+    EndIf
+
+    
+    GetVisible inst_show2
+    ;DEBUGVAR inst_show2
+
+
+    If inst_show2 = 1 Then
+        InstanceGetString SaveStringInst
+        ;DEBUGVAR SaveStringInst
+        If SaveStringInst = "RefreshNow" Then
+            GetXMLFileNameCurrentRunning CurrentOpenFile
+            Open CurrentOpenFile
+
+            If show_eng = "true" Then 
+                InstanceSetString "ShowEng"
+            Else
+                InstanceSetString "ShowThai"
+            EndIf
+        EndIf
+    EndIf
+
+    ; setvarint SlientRefreshEnable 1
+    ;DEBUGVAR SlientRefreshEnable
+
+    If SlientRefreshEnable = 1 Then
+        If SaveStringInst = "RefreshNow" Then
+            GetXMLFileNameCurrentRunning CurrentOpenFile
+            Open CurrentOpenFile
+
+            If show_eng = "true" Then 
+                InstanceSetString "ShowEng"
+            Else
+                InstanceSetString "ShowThai"
+            EndIf
+       
+        EndIf
+    EndIf
+
+	 If SlientRefreshIndex = 2 Then
+		If inst_show2 = 0 Then
+			GetXMLFileNameCurrentRunning CurrentOpenFile2
+			Open CurrentOpenFile2
+			
+		Else
+			Var SlientRefreshIndex = 3
+		EndIf
+    EndIf
+
+     If inst_show2 = 1 Then
+        If langnext1 = "true" Then
+            Var langnext1 = "false"
+            DEBUGVAR langnext
+            RefreshAll
+        EndIf
+    EndIf
+
+            
+
+
+
+    Var Inst5CountMenuEnable = 0
+    Var Inst5CountCurrentMenuEnable = 0
+    GetFrameScrollBlockCount Inst5CountCurrentMenuEnable
+    GetCurrentEnableBlockCount Inst5CountMenuEnable
+    
+    ;DEBUGVAR Inst5CountMenuEnable
+    ;DEBUGVAR Inst5CountMenuEnablePrev
+    ;DEBUGVAR Inst5CountCurrentMenuEnable
+
+    If Inst5CountMenuEnablePrev = "" Then
+        Var Inst5CountMenuEnablePrev = Inst5CountMenuEnable
+        Var Inst5CountDownForOpenXML = 0
+        Var Inst5CountDownOpenXMLFromMenuZero = 20
+    EndIf
+
+    If Inst5CountMenuEnable = Inst5CountMenuEnablePrev Then
+
+    Else
+        SAVELOG "Inst5 Refresh ===================================================================== Refresh"
+        Var Inst5CountDownForOpenXML = 10
+        Var Inst5CountMenuEnablePrev = CountMenuEnable
+    EndIf
+
+    If Inst5CountMenuEnable = Inst5CountCurrentMenuEnable Then
+
+    Else
+        If Inst5CountDownForOpenXML = 0 Then
+            SAVELOG "Inst5 Refresh =======================Inst5CountMenuEnable / Inst5CountCurrentMenuEnable ============================================== Refresh"
+            Var Inst5CountDownForOpenXML = 10
+        EndIf
+    EndIf
+
+    If Inst5CountCurrentMenuEnable = 0 Then
+        
+        DEBUGVAR Inst5CountDownOpenXMLFromMenuZero
+
+        If Inst5CountDownOpenXMLFromMenuZero > 0 Then
+            Var Inst5CountDownOpenXMLFromMenuZero = Inst5CountDownOpenXMLFromMenuZero - 1
+            If Inst5CountDownOpenXMLFromMenuZero = 0 Then
+                Var Inst5CountDownOpenXMLFromMenuZero = 20
+                SAVELOG "OPEN FROM 1"
+                Open "ROOT/taobin_project/inter/tha/xml/multi/page_catalog_group_coffee.lxml"
+            EndIf
+        EndIf
+    EndIf
+
+    If Inst5CountMenuEnable = Inst5CountCurrentMenuEnable Then
+        If Inst5CountCurrentMenuEnable > 0 Then
+            Var Inst5MenuLoaded = "done"  
+        EndIf
+    EndIf
+
+    If Inst5CountDownForOpenXML > 0 Then
+        Var Inst5CountDownForOpenXML = Inst5CountDownForOpenXML - 1
+        DEBUGVAR Inst5CountDownForOpenXML
+        If Inst5CountDownForOpenXML = 0 Then
+            SAVELOG "OPEN FROM 2"
+            Open "ROOT/taobin_project/inter/tha/xml/multi/page_catalog_group_coffee.lxml"
+        EndIf
+        InstanceGetString SaveStringInst
+		If SaveStringInst = "RefreshNow" Then
+		
+		Else
+			If LanguageShow = "ENG" Then
+				Var SaveStringInst = "ShowEng"
+				Var show_eng = "false"
+			EndIf
+			If LanguageShow = "THAI" Then
+				Var SaveStringInst = "ShowThai"
+				Var show_eng = "true"
+			EndIf
+			If LanguageShow = "MYANMAR" Then
+				Var show_eng = "false"
+				Var SaveStringInst = "ShowMYANMAR"
+			EndIf
+		EndIf
+    EndIf
+
+    ; setvarint RefreshCoffeeMenu 1
+    If RefreshCoffeeMenu = 1 Then
+        Var RefreshCoffeeMenu = 0
+        SAVELOG "OPEN FROM 3"
+        Open "ROOT/taobin_project/inter/tha/xml/multi/page_catalog_group_coffee.lxml"
+    EndIf 
+
+    ; setvarint ScriptCoffeeMenu 1
+    If ScriptCoffeeMenu = 1 Then
+        Var ScriptCoffeeMenu = 0
+        SAVELOG "Runscript 3"
+        Script "-" "-"
+    EndIf 
+    		
+
+    TimerReset
+</EventTimeout>
+
+<EventOnShow>
+    InstanceGetString SaveStringInst
+    DEBUGVAR SaveStringInst
+    DEBUGVAR show_eng
+
+
+    Var ButtonLanguageCurrentXPosition = 1005
+    Var ButtonLanguageCurrentYPosition = 458 - 38
+
+    Var ButtonLanguageListXPosition = 970  
+    Var ButtonLanguageListYPosition = 450 - 38
+
+	DEBUGVAR EnabledBlockUpdateInst6
+	DEBUGVAR EnabledBlocksDrawInst6
+	
+
+    If SaveStringInst = "RefreshNow" Then
+        GetXMLFileNameCurrentRunning CurrentOpenFile
+        Open CurrentOpenFile
+    EndIf
+	DEBUGVAR LanguageShow
+
+
+    If SaveStringInst = "ShowThai" Then
+        If LanguageShow = "THAI" Then
+
+        Else
+            Var show_eng = "true"
+            InstanceSetString "ShowMYANMAR"
+            GetXMLFileNameCurrentRunning CurrentOpenFile
+            Open CurrentOpenFile
+        EndIf
+    EndIf
+
+    If SaveStringInst = "ShowMYANMAR" Then
+        If LanguageShow = "MYANMAR" Then
+
+        Else
+            Var show_eng = "false"
+            InstanceSetString "ShowEng"
+            GetXMLFileNameCurrentRunning CurrentOpenFile
+            Open CurrentOpenFile
+        EndIf
+    EndIf
+
+    If SaveStringInst = "ShowEng" Then
+        If LanguageShow = "ENG" Then
+
+        Else
+            Var show_eng = "false"
+            InstanceSetString "ShowThai"
+            GetXMLFileNameCurrentRunning CurrentOpenFile
+            Open CurrentOpenFile
+        EndIf
+    EndIf
+
+	
+    
+
+</EventOnShow>
+
+;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new.lxml"
+
+
+
 <FrameScroll> 
 <X> 10 </X>
 <Y> 497 </Y>
@@ -286,7 +287,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-01-01-0074.Button,12-01-02-0074.Button,12-01-03-0074.Button,$Sum120101007412010200741201030074) </State> 
+	<State> Flag( 12-01-01-0074.Button,12-01-02-0074.Button,12-01-03-0074.Button,DateTimeStart="2025/01/01T00:00:00",Var=StrawberrySeriesMenu,$Sum120101007412010200741201030074) </State> 
 	<Button>
 	<State> $Sum120101007412010200741201030074 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_Strawberry_caramel_latte.png" </Filename>
@@ -639,7 +640,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-21-01-0074.Button,12-21-02-0074.Button,12-21-03-0074.Button,$Sum122101007412210200741221030074) </State> 
+	<State> Flag( 12-21-01-0074.Button,12-21-02-0074.Button,12-21-03-0074.Button,DateTimeStart="2025/01/01T00:00:00",Var=StrawberrySeriesMenu,$Sum122101007412210200741221030074) </State> 
 	<Button>
 	<State> $Sum122101007412210200741221030074 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_Strawberry_caramel_latte.png" </Filename>
@@ -21358,7 +21359,6 @@
 	<Color> 0x6F5F51 </Color>
 	<WidthText> 128 </WidthText>
 	<Mode> "disable-show" </Mode>
-	<Refresh> "auto,value" </Refresh>
 	<State> $Sum122101000512310200021231030002 </State> 
 	<Script>
 		If $Sum122101000512310200021231030002 = "Disable" Then
@@ -21379,7 +21379,6 @@
 			If $Sum122101000512310200021231030002TextID != "" Then
 			  Var $Sum122101000512310200021231030002TextValue = ""
 			EndIf
-			; setvar Sum122101000512310200021231030002TextValue TESTTEST
 		EndIf
 	</Script>
 	<Language>
@@ -36197,10 +36196,10 @@
 	Open "ROOT/taobin_project/xml/page_payment_multi.xml"
 </EventClick>
 </Button>
-
-
-
-
-
-
-</Popup>
+
+
+
+
+
+
+</Popup>

inter/tha/xml/multi/page_catalog_group_coffee.skt

@@ -101,6 +101,7 @@
         If langnext1 = "true" Then
             Var langnext1 = "false"
             DEBUGVAR langnext
+            RefreshAll
         EndIf
     EndIf
 

inter/tha/xml/multi/page_catalog_group_forkid.lxml

@@ -293,7 +293,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-03-0094.Button,$Sum1203030094) </State> 
+	<State> Flag( 12-03-03-0094.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1203030094) </State> 
 	<Button>
 	<State> $Sum1203030094 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_Ovaltine_cocoa_smoothie.png" </Filename>
@@ -642,7 +642,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-03-0095.Button,$Sum1203030095) </State> 
+	<State> Flag( 12-03-03-0095.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1203030095) </State> 
 	<Button>
 	<State> $Sum1203030095 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png" </Filename>

inter/tha/xml/multi/page_catalog_group_milk.lxml

@@ -208,7 +208,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-03-0094.Button,$Sum1203030094) </State> 
+	<State> Flag( 12-03-03-0094.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1203030094) </State> 
 	<Button>
 	<State> $Sum1203030094 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_Ovaltine_cocoa_smoothie.png" </Filename>
@@ -557,7 +557,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-03-0095.Button,$Sum1203030095) </State> 
+	<State> Flag( 12-03-03-0095.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1203030095) </State> 
 	<Button>
 	<State> $Sum1203030095 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png" </Filename>
@@ -906,7 +906,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-03-0027.Button,$Sum1203030027) </State> 
+	<State> Flag( 12-03-03-0027.Button,DateTimeStart="2025/01/01T00:00:00",Var=StrawberrySeriesMenu,$Sum1203030027) </State> 
 	<Button>
 	<State> $Sum1203030027 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Strawberr_milk_Oreo_smoothie.png" </Filename>
@@ -1255,7 +1255,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-02-0081.Button,$Sum1203020081) </State> 
+	<State> Flag( 12-03-02-0081.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2025/01/06T23:59:59",$Sum1203020081) </State> 
 	<Button>
 	<State> $Sum1203020081 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_santa_ginger.png" </Filename>
@@ -1604,7 +1604,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-03-0088.Button,$Sum1203030088) </State> 
+	<State> Flag( 12-03-03-0088.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2025/01/06T23:59:59",$Sum1203030088) </State> 
 	<Button>
 	<State> $Sum1203030088 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_choco_snow_flake_smoothie.png" </Filename>
@@ -1953,7 +1953,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-03-0089.Button,$Sum1203030089) </State> 
+	<State> Flag( 12-03-03-0089.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2025/01/06T23:59:59",$Sum1203030089) </State> 
 	<Button>
 	<State> $Sum1203030089 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_reindeer_peppermint_smoothie.png" </Filename>
@@ -2302,7 +2302,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-01-02-0084.Button,$Sum1201020084) </State> 
+	<State> Flag( 12-01-02-0084.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2025/01/06T23:59:59",$Sum1201020084) </State> 
 	<Button>
 	<State> $Sum1201020084 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_christmas_cafe_latte.png" </Filename>
@@ -2651,7 +2651,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-21-02-0084.Button,$Sum1221020084) </State> 
+	<State> Flag( 12-21-02-0084.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2025/01/06T23:59:59",$Sum1221020084) </State> 
 	<Button>
 	<State> $Sum1221020084 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_christmas_cafe_latte.png" </Filename>
@@ -7208,7 +7208,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-01-0010.Button,12-03-02-0010.Button,12-03-03-0010.Button,$Sum120301001012030200101203030010) </State> 
+	<State> Flag( 12-03-01-0010.Button,12-03-02-0010.Button,12-03-03-0010.Button,DateTimeStart="2025/01/01T00:00:00",Var=StrawberrySeriesMenu,$Sum120301001012030200101203030010) </State> 
 	<Button>
 	<State> $Sum120301001012030200101203030010 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_Strawberry_cocoa.png" </Filename>
@@ -14922,7 +14922,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-03-0061.Button,$Sum1203030061) </State> 
+	<State> Flag( 12-03-03-0061.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1203030061) </State> 
 	<Button>
 	<State> $Sum1203030061 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Cocoa_Milk_Sugar_BISCOFF.png" </Filename>
@@ -15969,7 +15969,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-01-03-0085.Button,$Sum1201030085) </State> 
+	<State> Flag( 12-01-03-0085.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1201030085) </State> 
 	<Button>
 	<State> $Sum1201030085 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Coffee_Milk_Sugar_BISCOFF.png" </Filename>
@@ -16318,7 +16318,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-21-03-0085.Button,$Sum1221030085) </State> 
+	<State> Flag( 12-21-03-0085.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1221030085) </State> 
 	<Button>
 	<State> $Sum1221030085 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Coffee_Milk_Sugar_BISCOFF.png" </Filename>
@@ -16667,7 +16667,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-02-03-0086.Button,$Sum1202030086) </State> 
+	<State> Flag( 12-02-03-0086.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1202030086) </State> 
 	<Button>
 	<State> $Sum1202030086 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Thai_Tea_Milk_Sugar_BISCOFF.png" </Filename>
@@ -17016,7 +17016,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-02-03-0087.Button,$Sum1202030087) </State> 
+	<State> Flag( 12-02-03-0087.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1202030087) </State> 
 	<Button>
 	<State> $Sum1202030087 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Matcha_Milk_Sugar_BISCOFF.png" </Filename>
@@ -17365,7 +17365,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-03-0090.Button,$Sum1203030090) </State> 
+	<State> Flag( 12-03-03-0090.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1203030090) </State> 
 	<Button>
 	<State> $Sum1203030090 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Milk_Sugar_BISCOFF.png" </Filename>
@@ -17714,7 +17714,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-03-0091.Button,$Sum1203030091) </State> 
+	<State> Flag( 12-03-03-0091.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1203030091) </State> 
 	<Button>
 	<State> $Sum1203030091 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Sala_Milk_Sugar_BISCOFF.png" </Filename>
@@ -18063,7 +18063,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-03-0093.Button,$Sum1203030093) </State> 
+	<State> Flag( 12-03-03-0093.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1203030093) </State> 
 	<Button>
 	<State> $Sum1203030093 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Lychee_Milk_Sugar_BISCOFF.png" </Filename>
@@ -18412,7 +18412,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-03-0092.Button,$Sum1203030092) </State> 
+	<State> Flag( 12-03-03-0092.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1203030092) </State> 
 	<Button>
 	<State> $Sum1203030092 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_7UP_Milk_Sugar_BISCOFF.png" </Filename>

inter/tha/xml/multi/page_catalog_group_other.lxml

@@ -219,7 +219,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0143.Button,12-05-03-0143.Button,$Sum12050201431205030143) </State> 
+	<State> Flag( 12-05-02-0143.Button,12-05-03-0143.Button,DateTimeStart="2025/01/21T00:00:00",Var=TaobinEnergyDrinkMenu,$Sum12050201431205030143) </State> 
 	<Button>
 	<State> $Sum12050201431205030143 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_energy_drink_soda_Extra.png" </Filename>
@@ -568,7 +568,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0133.Button,$Sum1205020133) </State> 
+	<State> Flag( 12-05-02-0133.Button,DateTimeStart="2025/01/01T00:00:00",$Sum1205020133) </State> 
 	<Button>
 	<State> $Sum1205020133 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_pepsi_extra.png" </Filename>
@@ -917,7 +917,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0136.Button,12-05-03-0136.Button,$Sum12050201361205030136) </State> 
+	<State> Flag( 12-05-02-0136.Button,12-05-03-0136.Button,DateTimeStart="2025/01/21T00:00:00",Var=TaobinEnergyDrinkMenu,$Sum12050201361205030136) </State> 
 	<Button>
 	<State> $Sum12050201361205030136 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_energy_drink_Strawberry_soda.png" </Filename>
@@ -1266,7 +1266,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0137.Button,12-05-03-0137.Button,$Sum12050201371205030137) </State> 
+	<State> Flag( 12-05-02-0137.Button,12-05-03-0137.Button,DateTimeStart="2025/01/21T00:00:00",Var=TaobinEnergyDrinkMenu,$Sum12050201371205030137) </State> 
 	<Button>
 	<State> $Sum12050201371205030137 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_energy_drink_plum_soda.png" </Filename>
@@ -1615,7 +1615,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0138.Button,12-05-03-0138.Button,$Sum12050201381205030138) </State> 
+	<State> Flag( 12-05-02-0138.Button,12-05-03-0138.Button,DateTimeStart="2025/01/21T00:00:00",Var=TaobinEnergyDrinkMenu,$Sum12050201381205030138) </State> 
 	<Button>
 	<State> $Sum12050201381205030138 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_energy_drink_Lychee_soda.png" </Filename>
@@ -1964,7 +1964,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0139.Button,12-05-03-0139.Button,$Sum12050201391205030139) </State> 
+	<State> Flag( 12-05-02-0139.Button,12-05-03-0139.Button,DateTimeStart="2025/01/21T00:00:00",Var=TaobinEnergyDrinkMenu,$Sum12050201391205030139) </State> 
 	<Button>
 	<State> $Sum12050201391205030139 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_energy_drink_lime_soda.png" </Filename>
@@ -2313,7 +2313,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0140.Button,12-05-03-0140.Button,$Sum12050201401205030140) </State> 
+	<State> Flag( 12-05-02-0140.Button,12-05-03-0140.Button,DateTimeStart="2025/01/21T00:00:00",Var=TaobinEnergyDrinkMenu,$Sum12050201401205030140) </State> 
 	<Button>
 	<State> $Sum12050201401205030140 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_energy_drink_caramel_soda.png" </Filename>
@@ -2662,7 +2662,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0141.Button,12-05-03-0141.Button,$Sum12050201411205030141) </State> 
+	<State> Flag( 12-05-02-0141.Button,12-05-03-0141.Button,DateTimeStart="2025/01/21T00:00:00",Var=TaobinEnergyDrinkMenu,$Sum12050201411205030141) </State> 
 	<Button>
 	<State> $Sum12050201411205030141 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_energy_drink_salak_soda.png" </Filename>
@@ -3011,7 +3011,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0142.Button,12-05-03-0142.Button,$Sum12050201421205030142) </State> 
+	<State> Flag( 12-05-02-0142.Button,12-05-03-0142.Button,DateTimeStart="2025/01/21T00:00:00",Var=TaobinEnergyDrinkMenu,$Sum12050201421205030142) </State> 
 	<Button>
 	<State> $Sum12050201421205030142 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_energy_drink_Extra.png" </Filename>

inter/tha/xml/multi/page_catalog_group_other_other.lxml

@@ -48,13 +48,13 @@
 
     
     
-    GetVisible inst_show
-    ;DEBUGVAR inst_show
+    GetVisible inst_show7
+    ;DEBUGVAR inst_show7
 
     InstanceGetString SaveStringInst
     ;DEBUGVAR SaveStringInst
 
-    If inst_show = 1 Then
+    If inst_show7 = 1 Then
         If SaveStringInst = "RefreshNow" Then
             GetXMLFileNameCurrentRunning CurrentOpenFile
             Open CurrentOpenFile
@@ -86,13 +86,24 @@
     EndIf
 
 	If SlientRefreshIndex = 7 Then
-		If inst_show9 = 0 Then
-			GetXMLFileNameCurrentRunning CurrentOpenFile5
-			Open CurrentOpenFile5
+		If inst_show7 = 0 Then
+			GetXMLFileNameCurrentRunning CurrentOpenFile7
+			Open CurrentOpenFile7
 		Else
 			Var SlientRefreshIndex = 8
 		EndIf
     EndIf
+
+    If inst_show7 = 1 Then
+        If langnext6 = "true" Then
+            Var langnext6 = "false"
+            DEBUGVAR langnext
+            ;GetXMLFileNameCurrentRunning CurrentOpenFile
+            DEBUGVAR CurrentOpenFile4
+            Open "ROOT/taobin_project/inter/tha/xml/multi/page_catalog_group_other_other.lxml"
+            RefreshAll
+        EndIf
+    EndIf
     
 
     Var Inst11CountMenuEnable = 0
@@ -252,7 +263,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0143.Button,12-05-03-0143.Button,$Sum12050201431205030143) </State> 
+	<State> Flag( 12-05-02-0143.Button,12-05-03-0143.Button,DateTimeStart="2025/01/21T00:00:00",Var=TaobinEnergyDrinkMenu,$Sum12050201431205030143) </State> 
 	<Button>
 	<State> $Sum12050201431205030143 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_energy_drink_soda_Extra.png" </Filename>
@@ -601,7 +612,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0133.Button,$Sum1205020133) </State> 
+	<State> Flag( 12-05-02-0133.Button,DateTimeStart="2025/01/01T00:00:00",$Sum1205020133) </State> 
 	<Button>
 	<State> $Sum1205020133 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_pepsi_extra.png" </Filename>
@@ -1299,7 +1310,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0136.Button,12-05-03-0136.Button,$Sum12050201361205030136) </State> 
+	<State> Flag( 12-05-02-0136.Button,12-05-03-0136.Button,DateTimeStart="2025/01/21T00:00:00",Var=TaobinEnergyDrinkMenu,$Sum12050201361205030136) </State> 
 	<Button>
 	<State> $Sum12050201361205030136 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_energy_drink_Strawberry_soda.png" </Filename>
@@ -1648,7 +1659,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0137.Button,12-05-03-0137.Button,$Sum12050201371205030137) </State> 
+	<State> Flag( 12-05-02-0137.Button,12-05-03-0137.Button,DateTimeStart="2025/01/21T00:00:00",Var=TaobinEnergyDrinkMenu,$Sum12050201371205030137) </State> 
 	<Button>
 	<State> $Sum12050201371205030137 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_energy_drink_plum_soda.png" </Filename>
@@ -1997,7 +2008,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0138.Button,12-05-03-0138.Button,$Sum12050201381205030138) </State> 
+	<State> Flag( 12-05-02-0138.Button,12-05-03-0138.Button,DateTimeStart="2025/01/21T00:00:00",Var=TaobinEnergyDrinkMenu,$Sum12050201381205030138) </State> 
 	<Button>
 	<State> $Sum12050201381205030138 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_energy_drink_Lychee_soda.png" </Filename>
@@ -2346,7 +2357,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0139.Button,12-05-03-0139.Button,$Sum12050201391205030139) </State> 
+	<State> Flag( 12-05-02-0139.Button,12-05-03-0139.Button,DateTimeStart="2025/01/21T00:00:00",Var=TaobinEnergyDrinkMenu,$Sum12050201391205030139) </State> 
 	<Button>
 	<State> $Sum12050201391205030139 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_energy_drink_lime_soda.png" </Filename>
@@ -2695,7 +2706,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0140.Button,12-05-03-0140.Button,$Sum12050201401205030140) </State> 
+	<State> Flag( 12-05-02-0140.Button,12-05-03-0140.Button,DateTimeStart="2025/01/21T00:00:00",Var=TaobinEnergyDrinkMenu,$Sum12050201401205030140) </State> 
 	<Button>
 	<State> $Sum12050201401205030140 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_energy_drink_caramel_soda.png" </Filename>
@@ -3044,7 +3055,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0141.Button,12-05-03-0141.Button,$Sum12050201411205030141) </State> 
+	<State> Flag( 12-05-02-0141.Button,12-05-03-0141.Button,DateTimeStart="2025/01/21T00:00:00",Var=TaobinEnergyDrinkMenu,$Sum12050201411205030141) </State> 
 	<Button>
 	<State> $Sum12050201411205030141 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_energy_drink_salak_soda.png" </Filename>
@@ -3393,7 +3404,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0142.Button,12-05-03-0142.Button,$Sum12050201421205030142) </State> 
+	<State> Flag( 12-05-02-0142.Button,12-05-03-0142.Button,DateTimeStart="2025/01/21T00:00:00",Var=TaobinEnergyDrinkMenu,$Sum12050201421205030142) </State> 
 	<Button>
 	<State> $Sum12050201421205030142 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_energy_drink_Extra.png" </Filename>

inter/tha/xml/multi/page_catalog_group_other_other.skt

@@ -51,13 +51,13 @@
 
     
     
-    GetVisible inst_show
-    ;DEBUGVAR inst_show
+    GetVisible inst_show7
+    ;DEBUGVAR inst_show7
 
     InstanceGetString SaveStringInst
     ;DEBUGVAR SaveStringInst
 
-    If inst_show = 1 Then
+    If inst_show7 = 1 Then
         If SaveStringInst = "RefreshNow" Then
             GetXMLFileNameCurrentRunning CurrentOpenFile
             Open CurrentOpenFile
@@ -89,13 +89,24 @@
     EndIf
 
 	If SlientRefreshIndex = 7 Then
-		If inst_show9 = 0 Then
-			GetXMLFileNameCurrentRunning CurrentOpenFile5
-			Open CurrentOpenFile5
+		If inst_show7 = 0 Then
+			GetXMLFileNameCurrentRunning CurrentOpenFile7
+			Open CurrentOpenFile7
 		Else
 			Var SlientRefreshIndex = 8
 		EndIf
     EndIf
+
+    If inst_show7 = 1 Then
+        If langnext6 = "true" Then
+            Var langnext6 = "false"
+            DEBUGVAR langnext
+            ;GetXMLFileNameCurrentRunning CurrentOpenFile
+            DEBUGVAR CurrentOpenFile4
+            Open "ROOT/taobin_project/inter/tha/xml/multi/page_catalog_group_other_other.lxml"
+            RefreshAll
+        EndIf
+    EndIf
     
 
     Var Inst11CountMenuEnable = 0

inter/tha/xml/multi/page_catalog_group_pepsi_7up.lxml

@@ -270,7 +270,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0133.Button,$Sum1205020133) </State> 
+	<State> Flag( 12-05-02-0133.Button,DateTimeStart="2025/01/01T00:00:00",$Sum1205020133) </State> 
 	<Button>
 	<State> $Sum1205020133 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_pepsi_extra.png" </Filename>

inter/tha/xml/multi/page_catalog_group_recommend.lxml

@@ -216,7 +216,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0141.Button,12-05-03-0141.Button,Disable=Invisible,$Sum12050201411205030141) </State> 
+	<State> Flag( 12-05-02-0141.Button,12-05-03-0141.Button,DateTimeStart="2025/01/23T00:00:00",Var=TaobinEnergyDrinkRecommend,Disable=Invisible,$Sum12050201411205030141) </State> 
 	<Button>
 	<State> $Sum12050201411205030141 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_energy_drink_salak_soda.png" </Filename>
@@ -565,7 +565,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0137.Button,12-05-03-0137.Button,Disable=Invisible,$Sum12050201371205030137) </State> 
+	<State> Flag( 12-05-02-0137.Button,12-05-03-0137.Button,DateTimeStart="2025/01/23T00:00:00",Var=TaobinEnergyDrinkRecommend,Disable=Invisible,$Sum12050201371205030137) </State> 
 	<Button>
 	<State> $Sum12050201371205030137 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_energy_drink_plum_soda.png" </Filename>
@@ -914,7 +914,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0139.Button,12-05-03-0139.Button,Disable=Invisible,$Sum12050201391205030139) </State> 
+	<State> Flag( 12-05-02-0139.Button,12-05-03-0139.Button,DateTimeStart="2025/01/23T00:00:00",Var=TaobinEnergyDrinkMenu,Disable=Invisible,$Sum12050201391205030139) </State> 
 	<Button>
 	<State> $Sum12050201391205030139 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_energy_drink_lime_soda.png" </Filename>
@@ -1263,7 +1263,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0136.Button,12-05-03-0136.Button,Disable=Invisible,$Sum12050201361205030136) </State> 
+	<State> Flag( 12-05-02-0136.Button,12-05-03-0136.Button,DateTimeStart="2025/01/23T00:00:00",Var=TaobinEnergyDrinkMenu,Disable=Invisible,$Sum12050201361205030136) </State> 
 	<Button>
 	<State> $Sum12050201361205030136 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_energy_drink_Strawberry_soda.png" </Filename>
@@ -1965,7 +1965,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0143.Button,12-05-03-0143.Button,Disable=Invisible,$Sum12050201431205030143) </State> 
+	<State> Flag( 12-05-02-0143.Button,12-05-03-0143.Button,DateTimeStart="2025/01/23T00:00:00",Var=TaobinEnergyDrinkRecommend,Disable=Invisible,$Sum12050201431205030143) </State> 
 	<Button>
 	<State> $Sum12050201431205030143 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_energy_drink_soda_Extra.png" </Filename>
@@ -3016,7 +3016,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0133.Button,Disable=Invisible,$Sum1205020133) </State> 
+	<State> Flag( 12-05-02-0133.Button,DateTimeStart="2025/01/01T00:00:00",Disable=Invisible,$Sum1205020133) </State> 
 	<Button>
 	<State> $Sum1205020133 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_pepsi_extra.png" </Filename>
@@ -6855,7 +6855,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-03-0009.Button,Disable=Invisible,$Sum1203030009) </State> 
+	<State> Flag( 12-03-03-0009.Button,DateTimeStart="2025/01/01T00:00:00",Disable=Invisible,$Sum1203030009) </State> 
 	<Button>
 	<State> $Sum1203030009 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_smoothie_oreo.png" </Filename>

inter/tha/xml/multi/page_catalog_group_recommend_multi_pro.lxml

@@ -94,7 +94,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0141.Button,12-05-03-0141.Button,$Sum12050201411205030141) </State> 
+	<State> Flag( 12-05-02-0141.Button,12-05-03-0141.Button,DateTimeStart="2025/01/23T00:00:00",Var=TaobinEnergyDrinkRecommend,$Sum12050201411205030141) </State> 
 	<Button>
 	<State> $Sum12050201411205030141 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_energy_drink_salak_soda.png" </Filename>
@@ -443,7 +443,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0137.Button,12-05-03-0137.Button,$Sum12050201371205030137) </State> 
+	<State> Flag( 12-05-02-0137.Button,12-05-03-0137.Button,DateTimeStart="2025/01/23T00:00:00",Var=TaobinEnergyDrinkRecommend,$Sum12050201371205030137) </State> 
 	<Button>
 	<State> $Sum12050201371205030137 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_energy_drink_plum_soda.png" </Filename>
@@ -792,7 +792,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0139.Button,12-05-03-0139.Button,$Sum12050201391205030139) </State> 
+	<State> Flag( 12-05-02-0139.Button,12-05-03-0139.Button,DateTimeStart="2025/01/23T00:00:00",Var=TaobinEnergyDrinkMenu,$Sum12050201391205030139) </State> 
 	<Button>
 	<State> $Sum12050201391205030139 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_energy_drink_lime_soda.png" </Filename>
@@ -1141,7 +1141,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0136.Button,12-05-03-0136.Button,$Sum12050201361205030136) </State> 
+	<State> Flag( 12-05-02-0136.Button,12-05-03-0136.Button,DateTimeStart="2025/01/23T00:00:00",Var=TaobinEnergyDrinkMenu,$Sum12050201361205030136) </State> 
 	<Button>
 	<State> $Sum12050201361205030136 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_energy_drink_Strawberry_soda.png" </Filename>
@@ -1843,7 +1843,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0143.Button,12-05-03-0143.Button,$Sum12050201431205030143) </State> 
+	<State> Flag( 12-05-02-0143.Button,12-05-03-0143.Button,DateTimeStart="2025/01/23T00:00:00",Var=TaobinEnergyDrinkRecommend,$Sum12050201431205030143) </State> 
 	<Button>
 	<State> $Sum12050201431205030143 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_energy_drink_soda_Extra.png" </Filename>
@@ -2894,7 +2894,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0133.Button,$Sum1205020133) </State> 
+	<State> Flag( 12-05-02-0133.Button,DateTimeStart="2025/01/01T00:00:00",$Sum1205020133) </State> 
 	<Button>
 	<State> $Sum1205020133 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_pepsi_extra.png" </Filename>
@@ -6733,7 +6733,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-03-0009.Button,$Sum1203030009) </State> 
+	<State> Flag( 12-03-03-0009.Button,DateTimeStart="2025/01/01T00:00:00",$Sum1203030009) </State> 
 	<Button>
 	<State> $Sum1203030009 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_smoothie_oreo.png" </Filename>

inter/tha/xml/multi/page_catalog_group_tea.lxml

@@ -263,7 +263,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-02-01-0083.Button,12-02-02-0083.Button,12-02-03-0083.Button,$Sum120201008312020200831202030083) </State> 
+	<State> Flag( 12-02-01-0083.Button,12-02-02-0083.Button,12-02-03-0083.Button,DateTimeStart="2024/12/01T00:00:00",$Sum120201008312020200831202030083) </State> 
 	<Button>
 	<State> $Sum120201008312020200831202030083 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_southern_fusion_tea.png" </Filename>
@@ -616,7 +616,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-02-01-0084.Button,12-02-02-0084.Button,12-02-03-0084.Button,$Sum120201008412020200841202030084) </State> 
+	<State> Flag( 12-02-01-0084.Button,12-02-02-0084.Button,12-02-03-0084.Button,DateTimeStart="2024/12/01T00:00:00",$Sum120201008412020200841202030084) </State> 
 	<Button>
 	<State> $Sum120201008412020200841202030084 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_traditional_green_tea.png" </Filename>
@@ -969,7 +969,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-02-01-0085.Button,12-02-02-0085.Button,12-02-03-0085.Button,$Sum120201008512020200851202030085) </State> 
+	<State> Flag( 12-02-01-0085.Button,12-02-02-0085.Button,12-02-03-0085.Button,DateTimeStart="2024/12/01T00:00:00",$Sum120201008512020200851202030085) </State> 
 	<Button>
 	<State> $Sum120201008512020200851202030085 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_royal_milk_tea.png" </Filename>
@@ -14002,7 +14002,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-02-01-0022.Button,12-02-02-0022.Button,12-02-03-0022.Button,$Sum120201002212020200221202030022) </State> 
+	<State> Flag( 12-02-01-0022.Button,12-02-02-0022.Button,12-02-03-0022.Button,DateTimeStart="2025/01/01T00:00:00",Var=StrawberrySeriesMenu,$Sum120201002212020200221202030022) </State> 
 	<Button>
 	<State> $Sum120201002212020200221202030022 </State> 
 	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_strawberry_tea.png" </Filename>

inter/tha/xml/multi/page_catalog_group_whey.lxml

@@ -53,13 +53,13 @@
 
     
     
-    GetVisible inst_show8
-    ;DEBUGVAR inst_show8
+    GetVisible inst_show5
+    ;DEBUGVAR inst_show5
 
     InstanceGetString SaveStringInst
     ;DEBUGVAR SaveStringInst
 
-    If inst_show8 = 1 Then
+    If inst_show5 = 1 Then
         InstanceGetString SaveStringInst
         ;DEBUGVAR SaveStringInst
         If SaveStringInst = "RefreshNow" Then
@@ -94,15 +94,15 @@
 
 
 	If SlientRefreshIndex = 5 Then
-		If inst_show8 = 0 Then
-			GetXMLFileNameCurrentRunning CurrentOpenFile8
-			Open CurrentOpenFile8
+		If inst_show5 = 0 Then
+			GetXMLFileNameCurrentRunning CurrentOpenFile5
+			Open CurrentOpenFile5
 		Else
 			Var SlientRefreshIndex = 6
 		EndIf
     EndIf
 
-    If inst_show8 = 1 Then
+    If inst_show5 = 1 Then
         If langnext7 = "true" Then
             Var langnext7 = "false"
             DEBUGVAR langnext
@@ -158,12 +158,12 @@
         Var Inst8CountMenuEnablePrev = CountMenuEnable
     EndIf
     
-    If Inst6CountMenuEnable = Inst6CountCurrentMenuEnable Then
+    If Inst8CountMenuEnable = Inst8CountCurrentMenuEnable Then
 
     Else
-        If Inst6CountDownForOpenXML = 0 Then
-            SAVELOG "Inst6 Refresh =======================Inst6CountMenuEnable / Inst6CountCurrentMenuEnable ============================================== Refresh"
-            Var Inst6CountDownForOpenXML = 10
+        If Inst8CountDownForOpenXML = 0 Then
+            SAVELOG "Inst8 Refresh =======================Inst8CountMenuEnable / Inst8CountCurrentMenuEnable ============================================== Refresh"
+            Var Inst8CountDownForOpenXML = 10
         EndIf
     EndIf
 
@@ -180,6 +180,12 @@
         EndIf
     EndIf
 
+    If Inst8CountMenuEnable = Inst8CountCurrentMenuEnable Then
+        If Inst8CountCurrentMenuEnable > 0 Then
+            Var Inst8MenuLoaded = "done"  
+        EndIf
+    EndIf
+
     If Inst8CountDownForOpenXML > 0 Then
         Var Inst8CountDownForOpenXML = Inst8CountDownForOpenXML - 1
         DEBUGVAR Inst8CountDownForOpenXML

inter/tha/xml/multi/page_catalog_group_whey.skt

@@ -56,13 +56,13 @@
 
     
     
-    GetVisible inst_show8
-    ;DEBUGVAR inst_show8
+    GetVisible inst_show5
+    ;DEBUGVAR inst_show5
 
     InstanceGetString SaveStringInst
     ;DEBUGVAR SaveStringInst
 
-    If inst_show8 = 1 Then
+    If inst_show5 = 1 Then
         InstanceGetString SaveStringInst
         ;DEBUGVAR SaveStringInst
         If SaveStringInst = "RefreshNow" Then
@@ -97,15 +97,15 @@
 
 
 	If SlientRefreshIndex = 5 Then
-		If inst_show8 = 0 Then
-			GetXMLFileNameCurrentRunning CurrentOpenFile8
-			Open CurrentOpenFile8
+		If inst_show5 = 0 Then
+			GetXMLFileNameCurrentRunning CurrentOpenFile5
+			Open CurrentOpenFile5
 		Else
 			Var SlientRefreshIndex = 6
 		EndIf
     EndIf
 
-    If inst_show8 = 1 Then
+    If inst_show5 = 1 Then
         If langnext7 = "true" Then
             Var langnext7 = "false"
             DEBUGVAR langnext
@@ -161,12 +161,12 @@
         Var Inst8CountMenuEnablePrev = CountMenuEnable
     EndIf
     
-    If Inst6CountMenuEnable = Inst6CountCurrentMenuEnable Then
+    If Inst8CountMenuEnable = Inst8CountCurrentMenuEnable Then
 
     Else
-        If Inst6CountDownForOpenXML = 0 Then
-            SAVELOG "Inst6 Refresh =======================Inst6CountMenuEnable / Inst6CountCurrentMenuEnable ============================================== Refresh"
-            Var Inst6CountDownForOpenXML = 10
+        If Inst8CountDownForOpenXML = 0 Then
+            SAVELOG "Inst8 Refresh =======================Inst8CountMenuEnable / Inst8CountCurrentMenuEnable ============================================== Refresh"
+            Var Inst8CountDownForOpenXML = 10
         EndIf
     EndIf
 
@@ -183,6 +183,12 @@
         EndIf
     EndIf
 
+    If Inst8CountMenuEnable = Inst8CountCurrentMenuEnable Then
+        If Inst8CountCurrentMenuEnable > 0 Then
+            Var Inst8MenuLoaded = "done"  
+        EndIf
+    EndIf
+
     If Inst8CountDownForOpenXML > 0 Then
         Var Inst8CountDownForOpenXML = Inst8CountDownForOpenXML - 1
         DEBUGVAR Inst8CountDownForOpenXML

inter/tha/xml/page_topping_select6.lxml

@@ -583,17 +583,10 @@
 		EndIf
 	EndIf
 
-	;Var StringToppingOatMilkWithPrice = ""
-	Var StringToppingOreoWithPrice = ""
-	Var StringCoffeeLevelWithPrice0 = ""
-	Var StringCoffeeLevelWithPrice1 = ""
-	Var StringCoffeeLevelWithPrice2 = ""
-	Var StringCoffeeLevelWithPrice3 = ""
-	;Var StringToppingShotWithPrice = ""
-
 	DEBUGVAR SugarNormalCheck
 	DEBUGVAR SugarZeroCalCheck
-	Var SugarZeroCalOption = "Enable"
+	;test
+	;Var SugarZeroCalOption = "Enable"
 	
 
 </EventOpen>
@@ -1104,7 +1097,6 @@
 	EndIf
 	If LanguageShow = "MYANMAR" Then 
 		Var show_eng = "true"
-		DEBUGVAR show_eng
 		Var topping_shot_price_x = 630
 		Var text_x_add_oreo_price = 430
 		Var text_show_normal_x = 568
@@ -1114,7 +1106,6 @@
 		Var Text_SugarNormalPrice_Y = 80
 		Var text_cancel_xc = 5
 		Var text_cancel_yc = 30
-		Var show_eng = "true"
 		Var OatMilkPrice_X = 210
 		If show_name_len > 24 Then
 			Var showname = showname + "###size=54"
@@ -1128,30 +1119,6 @@
 		EndIf
 	EndIf
 
-	;Var StringToppingOatMilkWithPrice !assigned GetLanguageID( 000113, LanguageShowByIndex)
-	;DEBUGVAR StringToppingOatMilkWithPrice
-	;Var StringToppingOatMilkWithPrice = StringToppingOatMilkWithPrice + OatMilkPrice
-	;DEBUGVAR StringToppingOatMilkWithPrice
-
-	Var StringToppingOreoWithPrice !assigned GetLanguageID( 000101, LanguageShowByIndex)
-	Var StringToppingOreoWithPrice = StringToppingOreoWithPrice + text_price_6
-
-	;Var StringToppingShotWithPrice !assigned GetLanguageID( 000100, LanguageShowByIndex)
-	;Var StringToppingShotWithPrice = StringToppingShotWithPrice + text_price_topping
-
-	Var StringCoffeeLevelWithPrice0 !assigned GetLanguageID( 000108, LanguageShowByIndex)
-	Var StringCoffeeLevelWithPrice0 = StringCoffeeLevelWithPrice0 + CustomCoffeeLevelAdditionalPrice[0]
-
-	Var StringCoffeeLevelWithPrice1 !assigned GetLanguageID( 000109, LanguageShowByIndex)
-	Var StringCoffeeLevelWithPrice1 = StringCoffeeLevelWithPrice1 + CustomCoffeeLevelAdditionalPrice[1]
-
-	Var StringCoffeeLevelWithPrice2 !assigned GetLanguageID( 000110, LanguageShowByIndex)
-	Var StringCoffeeLevelWithPrice2 = StringCoffeeLevelWithPrice2 + CustomCoffeeLevelAdditionalPrice[2]
-
-	Var StringCoffeeLevelWithPrice3 !assigned GetLanguageID( 000111, LanguageShowByIndex)
-	Var StringCoffeeLevelWithPrice3 = StringCoffeeLevelWithPrice3 + CustomCoffeeLevelAdditionalPrice[3]
-
-
 	;Var showname = aliasName[LanguageShowByIndex]
 	;Var showdesc = aliasName[LanguageShowByIndex]
 
@@ -2209,7 +2176,7 @@
 			If SugarZeroCalEnable = "true" Then
 
 				Var SugarZeroCalPrice = 10
-				Var priceFormat = "(+฿%.0f)"
+				Var priceFormat = " (+฿%.0f)"
 				Var SugarZeroCalPriceStr !assigned StringFmt( SugarZeroCalPrice , priceFormat, PreScaleConvertShow)
 
 				Var SugarNormalCheck = "PressForever"
@@ -4277,24 +4244,15 @@
 <Text>
 <X> 95 </X>
 <Y> Text_SugarNormalPrice_Y </Y>
-<Width> 100 </Width>
+<Width> 200 </Width>
 <Height> 72 </Height>
 <Language>
 	<ID> 000068 </ID>
+	<SubValue> "(Free)" </SubValue>
+	<SubColor> 0x84776F </SubColor>
 </Language>
 </Text>
 
-<Text>
-<X> 171 </X>
-<Y> 75 </Y>
-<Width> 100 </Width>
-<Height> 34 </Height>
-<Font> KanitRegularTTF </Font>
-<Size> 28 </Size>
-<Color> 0x84776F </Color>
-<Value> "(Free)" </Value>
-</Text>
-
 <Text>
 <X> Text_SugarZeroCalPrice_X </X>
 <Y> 77 </Y>
@@ -4302,19 +4260,12 @@
 <Height> 120 </Height>
 <Language>
 	<ID> 000069 </ID>
+	<SubValue> SugarZeroCalPriceStr </SubValue>
+	<SubColor> 0x84776F </SubColor>
+	;<SubSize> 28 </SubSize>
 </Language>
 </Text>
 
-<Text>
-<X> SugarZeroCalPrice_X </X>
-<Y> 75 </Y>
-<Font> KanitRegularTTF </Font>
-<State> "Enable" </State>
-<Size> 28 </Size>
-<Color> 0x84776F </Color>
-<Value> SugarZeroCalPriceStr </Value>
-</Text>
-
 
 ; sugar1
 <Button>
@@ -5015,58 +4966,31 @@
 </Button>
 
 <Text>
-<X> 92 </X>
-<Y> 55 </Y>
-<Width> 150 </Width>
-<Height> 34 </Height>
+<X> 95 </X>
+<Y> Text_SugarNormalPrice_Y </Y>
+<Width> 200 </Width>
+<Height> 72 </Height>
 <Language>
-	<ID> 000105 </ID>
+	<ID> 000068 </ID>
+	<SubValue> "(Free)" </SubValue>
+	<SubColor> 0x84776F </SubColor>
 </Language>
 </Text>
 
 <Text>
-<X> 171 </X>
-<Y> 55 </Y>
-<Width> 100 </Width>
-<Height> 34 </Height>
-<Font> KanitRegularTTF </Font>
-<Size> 28 </Size>
-<Color> 0x84776F </Color>
-<Value> "(Free)" </Value>
-</Text>
-
-<Text>
-<X> 357 </X>
-<Y> 69 </Y>
-<Width> 250 </Width>
-<Height> 34 </Height>
-<Language>
-	<ID> 000106 </ID>
-</Language>
-</Text>
-
-<Text>
-<X> 357 </X>
-<Y> 96 </Y>
+<X> Text_SugarZeroCalPrice_X </X>
+<Y> 77 </Y>
 <Width> 600 </Width>
-<Height> 21 </Height>
+<Height> 120 </Height>
 <Language>
-	<ID> 000107 </ID>
+	<ID> 000069 </ID>
+	<SubValue> SugarZeroCalPriceStr </SubValue>
+	<SubColor> 0x84776F </SubColor>
+	;<SubSize> 28 </SubSize>
 </Language>
 </Text>
 
 
-<Text>
-<X> SugarZeroCalPrice_X </X>
-<Y> 67 </Y>
-<Font> KanitRegularTTF </Font>
-<State> "Enable" </State>
-<Size> 28 </Size>
-<Color> 0x84776F </Color>
-<Value> SugarZeroCalPriceStr </Value>
-</Text>
-
-
 ; sugar1
 <Button>
 <X> 149 </X>
@@ -5440,58 +5364,31 @@
 </Button>
 
 <Text>
-<X> 92 </X>
-<Y> 55 </Y>
-<Width> 150 </Width>
-<Height> 34 </Height>
+<X> 95 </X>
+<Y> Text_SugarNormalPrice_Y </Y>
+<Width> 200 </Width>
+<Height> 72 </Height>
 <Language>
-	<ID> 000105 </ID>
+	<ID> 000068 </ID>
+	<SubValue> "(Free)" </SubValue>
+	<SubColor> 0x84776F </SubColor>
 </Language>
 </Text>
 
 <Text>
-<X> 171 </X>
-<Y> 55 </Y>
-<Width> 100 </Width>
-<Height> 34 </Height>
-<Font> KanitRegularTTF </Font>
-<Size> 28 </Size>
-<Color> 0x84776F </Color>
-<Value> "(Free)" </Value>
-</Text>
-
-<Text>
-<X> 357 </X>
-<Y> 69 </Y>
-<Width> 250 </Width>
-<Height> 34 </Height>
-<Language>
-	<ID> 000106 </ID>
-</Language>
-</Text>
-
-<Text>
-<X> 357 </X>
-<Y> 96 </Y>
+<X> Text_SugarZeroCalPrice_X </X>
+<Y> 77 </Y>
 <Width> 600 </Width>
-<Height> 21 </Height>
+<Height> 120 </Height>
 <Language>
-	<ID> 000107 </ID>
+	<ID> 000069 </ID>
+	<SubValue> SugarZeroCalPriceStr </SubValue>
+	<SubColor> 0x84776F </SubColor>
+	;<SubSize> 28 </SubSize>
 </Language>
 </Text>
 
 
-<Text>
-<X> SugarZeroCalPrice_X </X>
-<Y> 67 </Y>
-<Font> KanitRegularTTF </Font>
-<State> "Enable" </State>
-<Size> 28 </Size>
-<Color> 0x84776F </Color>
-<Value> SugarZeroCalPriceStr </Value>
-</Text>
-
-
 ; sugar1
 <Button>
 <X> 149 </X>
@@ -6062,19 +5959,21 @@
 <Height> 65 </Height>
 <Language>
 	<ID> 000113 </ID>
-	;<SubValue> OatMilkPrice </SubValue>
+	<SubValue> OatMilkPrice </SubValue>
+	<SubColor> 0x84776F </SubColor>
+	<SubSize> 28 </SubSize>
 </Language>
 </Text>
 
-<Text>
-<X> OatMilkPrice_X </X>
-<Y> 77 </Y>
-<Font> KanitRegularTTF </Font>
-<State> "Enable" </State>
-<Size> 28 </Size>
-<Color> 0x84776F </Color>
-<Value> OatMilkPrice </Value>
-</Text>
+;<Text>
+;<X> OatMilkPrice_X </X>
+;<Y> 77 </Y>
+;<Font> KanitRegularTTF </Font>
+;<State> "Enable" </State>
+;<Size> 28 </Size>
+;<Color> 0x84776F </Color>
+;<Value> OatMilkPrice </Value>
+;</Text>
 
 </Block>
 ;
@@ -6159,6 +6058,8 @@
 <Y> 4 </Y>
 <Language>
 	<ID> 000102 </ID>
+	<SubValue> Var(" " + text_price_topping) </SubValue>
+	<SubColor> 0x84776F </SubColor>
 </Language>
 <Width> 800 </Width>
 <Height> 65 </Height>
@@ -6217,15 +6118,15 @@
 </EventClick>
 </Button>
 
-<Text>
-<X> topping_shot_price_x </X>
-<Y> 2 </Y>
-<Font> KanitRegularTTF </Font>
-<State> "ShotCoffeePremium"</State>
-<Size> 36 </Size>
-<Color> 0x84776F </Color>
-<Value> text_price_topping </Value>
-</Text>
+;<Text>
+;<X> topping_shot_price_x </X>
+;<Y> 2 </Y>
+;<Font> KanitRegularTTF </Font>
+;<State> "ShotCoffeePremium"</State>
+;<Size> 36 </Size>
+;<Color> 0x84776F </Color>
+;<Value> text_price_topping </Value>
+;</Text>
 
 </Row1>
 
@@ -6249,6 +6150,8 @@
 <Y> 4 </Y>
 <Language>
 	<ID> 000100 </ID>
+	<SubValue> Var(" " + text_shot_normal_add) </SubValue>
+	<SubColor> 0x84776F </SubColor>
 </Language>
 <Width> 800 </Width>
 <Height> 65 </Height>
@@ -6347,15 +6250,15 @@
 
 
 
-<Text>
-<X> text_show_normal_x </X>
-<Y> 4 </Y>
-<Font> KanitRegularTTF </Font>
-<State> "Enable" </State>
-<Size> 36 </Size>
-<Color> 0x84776F </Color>
-<Value> text_shot_normal_add </Value>
-</Text>
+;<Text>
+;<X> text_show_normal_x </X>
+;<Y> 4 </Y>
+;<Font> KanitRegularTTF </Font>
+;<State> "Enable" </State>
+;<Size> 36 </Size>
+;<Color> 0x84776F </Color>
+;<Value> text_shot_normal_add </Value>
+;</Text>
 
 
 
@@ -6383,7 +6286,7 @@
 <Mode> "No" </Mode>
 <Filename> "ROOT/taobin_project/image/topping2/bn_add_oreo.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/topping2/bp_add_oreo.png" </FilenamePress>
-<FilenameDisable> "ROOT/taobin_project/image/topping2/bd_add_oreo.png" ) </FilenameDisable>
+<FilenameDisable> "ROOT/taobin_project/image/topping2/bd_add_oreo.png" </FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
@@ -6463,11 +6366,12 @@
 <Text>
 <X> 120 </X>
 <Y> 12 </Y>
-<Font> KanitRegularTTF </Font>
-<State> "Enable" </State>
-<Size> 36 </Size>
-<Color> 0x513C2F </Color>
-<Value> StringToppingOreoWithPrice </Value>
+<Language>
+	<ID> 000101 </ID>
+	<SubValue> text_price_6 </SubValue>
+	<SubColor> 0x84776F </SubColor>
+	;<SubSize> 36 </SubSize>
+</Language>
 </Text>
 
 
@@ -7043,10 +6947,11 @@
 		<X> custom_coffee_level_medium_text_x </X>
 		<Y> CustomCoffeeTextY </Y>
 		<State> showCoffeeLevel </State>
-		<Font> KanitRegularTTF </Font>
-		<Size> 16 </Size>
-		<Color> 0x513C2F </Color>
-		<Value> StringCoffeeLevelWithPrice0 </Value>
+		<Language>
+			<ID> 000108 </ID>
+			<SubValue> CustomCoffeeLevelAdditionalPrice[0] </SubValue>
+			<SubColor> 0x84776F </SubColor>
+		</Language>
 	</Text>
 
 	;<Text>
@@ -7062,10 +6967,11 @@
 		<X> 676 </X>
 		<Y> CustomCoffeeTextY </Y>
 		<State> showCoffeeLevel </State>
-		<Font> KanitRegularTTF </Font>
-		<Size> 16 </Size>
-		<Color> 0x513C2F </Color>
-		<Value> StringCoffeeLevelWithPrice1 </Value>
+		<Language>
+			<ID> 000109 </ID>
+			<SubValue> CustomCoffeeLevelAdditionalPrice[1] </SubValue>
+			<SubColor> 0x84776F </SubColor>
+		</Language>
 	</Text>
 
 	;<Text>
@@ -7081,10 +6987,12 @@
 		<X> custom_coffee_level_dark_text_x </X>
 		<Y> CustomCoffeeTextY </Y>
 		<State> showCoffeeLevel </State>
-		<Font> KanitRegularTTF </Font>
-		<Size> 16 </Size>
-		<Color> 0x513C2F </Color>
-		<Value> StringCoffeeLevelWithPrice2 </Value>
+		<Language>
+			<ID> 000110 </ID>
+			<SubValue> CustomCoffeeLevelAdditionalPrice[2] </SubValue>
+			<SubColor> 0x84776F </SubColor>
+			;<SubSize> 28 </SubSize>
+		</Language>
 	</Text>
 
 	;<Text>
@@ -7100,10 +7008,12 @@
 		<X> custom_coffee_level_darker_text_x </X>
 		<Y> CustomCoffeeTextY </Y>
 		<State> showCoffeeLevel </State>
-		<Font> KanitRegularTTF </Font>
-		<Size> 16 </Size>
-		<Color> 0x513C2F </Color>
-		<Value> StringCoffeeLevelWithPrice3 </Value>
+		<Language>
+			<ID> 000111 </ID>
+			<SubValue> CustomCoffeeLevelAdditionalPrice[3] </SubValue>
+			<SubColor> 0x84776F </SubColor>
+			;<SubSize> 28 </SubSize>
+		</Language>
 	</Text>
 
 
@@ -8795,40 +8705,6 @@
 			Var SugarZeroCalCheck = "Enable"
 		EndIf
 	EndIf
-	
-	If OatMilkEnable = "Enable" Then
-		DEBUGVAR LanguageShowByIndex
-		Var StringToppingOatMilkWithPrice !assigned GetLanguageID( 000108, LanguageShowByIndex)
-		Var StringToppingOatMilkWithPrice = StringToppingOatMilkWithPrice + OatMilkPrice
-		DEBUGVAR StringToppingOatMilkWithPrice
-	EndIf
-
-	If showOreoAddEnable = "Enable" Then
-		DEBUGVAR LanguageShowByIndex
-		Var StringToppingOreoWithPrice !assigned GetLanguageID( 000101, LanguageShowByIndex)
-		Var StringToppingOreoWithPrice = StringToppingOreoWithPrice + text_price_6
-		DEBUGVAR StringToppingOreoWithPrice
-	EndIf
-
-	If ShotCoffeePremium = "Enable" Then
-		Var StringToppingShotWithPrice !assigned GetLanguageID( 000100, LanguageShowByIndex)
-		Var StringToppingShotWithPrice = StringToppingShotWithPrice + text_price_topping
-	EndIf
-
-	If showCoffeeLevel = "Enable" Then
-		Var StringCoffeeLevelWithPrice0 !assigned GetLanguageID( 000108, LanguageShowByIndex)
-		Var StringCoffeeLevelWithPrice0 = StringCoffeeLevelWithPrice0 + CustomCoffeeLevelAdditionalPrice[0]
-
-		Var StringCoffeeLevelWithPrice1 !assigned GetLanguageID( 000109, LanguageShowByIndex)
-		Var StringCoffeeLevelWithPrice1 = StringCoffeeLevelWithPrice1 + CustomCoffeeLevelAdditionalPrice[1]
-
-		Var StringCoffeeLevelWithPrice2 !assigned GetLanguageID( 000110, LanguageShowByIndex)
-		Var StringCoffeeLevelWithPrice2 = StringCoffeeLevelWithPrice2 + CustomCoffeeLevelAdditionalPrice[2]
-
-		Var StringCoffeeLevelWithPrice3 !assigned GetLanguageID( 000111, LanguageShowByIndex)
-		Var StringCoffeeLevelWithPrice3 = StringCoffeeLevelWithPrice3 + CustomCoffeeLevelAdditionalPrice[3]
-	EndIf
-
 
 	BackslashNToEnter showname
 	BackslashNToEnter showdesc

ui/lang.tsv

@@ -1099,7 +1099,7 @@
 1300003		Beans module	ชุดเมล็ดกาแฟ
 1300004		Bean tray	ถาดใส่เมล็ดกาแฟ
 1300005		Switch tray :	สวิตซ์ถาด :
-1300006		Check tray shutter	ตรวจสอบชัตเตอร์ของถาด
+1300006		Check tray shutter	ตรวจสอบชัตเตอร์ถาด
 1300007		Pay beans	จ่ายถั่ว
 1300008		1. Select beans	1. เลือกเมล็ดกาแฟ
 1300009		2. Select direction	2. เลือกทิศทาง
@@ -1112,7 +1112,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. ทดสอบการบด
@@ -1617,4 +1617,4 @@
 
 
 	EOF
-9999999		Load language finish	Load language finish
+9999999		Load language finish	Load language finish	Load language finish	Load language finish	Load language finish	Load language finish

xml/page_NewBrewing3.xml

@@ -119,6 +119,36 @@
 		Var XStraw = 142
 	EndIf
 
+	If LanguageShow = "MYANMAR" Then 
+
+		Play "ROOT/taobin_project/sound_eng/Wait_a_moment.mp3"
+
+		Var bnGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bn_get_more_straw.png"
+		Var bpGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bp_get_more_straw.png"
+
+		Var bnStrawProblemReport = DirImageDoing + "/bn_send_report_straw_mmr.png"
+		Var bpStrawProblemReport = DirImageDoing + "/bp_send_report_straw_mmr.png"
+
+		Var bnLidProblemReport = DirImageDoing + "/bn_send_report_lid_mmr.png"
+		Var bpLidProblemReport = DirImageDoing + "/bp_send_report_lid_mmr.png"
+
+
+		Var bn_get_lid_image = "ROOT/taobin_project/image/page_doing/bn_get_lid.png"
+		Var bp_get_lid_image = "ROOT/taobin_project/image/page_doing/bp_get_lid.png"
+
+		; wait for myanmar
+		Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv3_en.png"
+		Var brew_txt1 = "ROOT/taobin_project/video/brewing_txt_adv1_en.png"
+
+		;Var XStraw = 274
+		Var XStraw = 142
+	EndIf
+
+	If LanguageObjectShow = "Enable" Then
+		Var DirImageDoingInter = "ROOT/taobin_project/image/page_doing_inter/"
+		Var IMG_CNT = DirImageDoingInter + "/bg_show_time_remaining.png"
+	EndIf
+
 	Var waitAckPay = 0
 	Var VendingTSIDTmp = ""
 	Var VendingTSIDProblem = ""
@@ -164,7 +194,10 @@
 		Var DirImage2 = "ROOT/taobin_project/image/topping2"
 	EndIf
 
-	DEBUGVAR show_eng
+	If LanguageShow = "MYANMAR" Then 
+		Var DirImage = "ROOT/taobin_project/image/page_payment_mmr/page_payment"
+		Var DirImage2 = "ROOT/taobin_project/image/topping_mmr"
+	EndIf
 
 	Var next_pic_bn = DirImage + "/bn_add_order.png"
 	Var next_pic_bp = DirImage + "/bp_add_order.png"
@@ -389,6 +422,10 @@
 					Var LangString = "LANG: &#34TH&#34\r\n"
 				EndIf
 
+				If LanguageShow = "MYANMAR" Then 
+					Var LangString = "LANG: &#34TH&#34\r\n"
+				EndIf
+
 				Var BoxIDString !assigned SprintFmt("BOX_ID: &#34%s&#34\r\n", BoxID)
 
 				; reset
@@ -415,6 +452,10 @@
 					Var LangString = "LANG: &#34TH&#34\r\n"
 				EndIf
 
+				If LanguageShow = "MYANMAR" Then 
+					Var LangString = "LANG: &#34TH&#34\r\n"
+				EndIf
+
 				Var BoxIDString !assigned SprintFmt("BOX_ID: &#34%s&#34\r\n", BoxID)
 
 				; reset
@@ -691,6 +732,9 @@
 
 				PlayLong PlaySoundLag
 			EndIf
+			If LanguageShow = "MYANMAR" Then 
+				PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/next_drink.mp3"
+			EndIf
 		EndIf
 		If Timeout = 9 Then
 			If OpenFromCollectPoint3 = 0 Then
@@ -1402,6 +1446,24 @@
 <Value> ShowCountDownBrewing </Value>
 </Text>
 
+<Text>
+<X> 816 </X>
+<Y> 429 </Y>
+<State> LanguageObjectShow </State>
+<Language>
+	<ID> 000405 </ID>
+</Language>
+</Text>
+
+<Text>
+<X> 941 </X>
+<Y> 518 </Y>
+<State> LanguageObjectShow </State>
+<Language>
+	<ID> 000406 </ID>
+</Language>
+</Text>
+
 
 
 <EventUnitTest1>

xml/page_NewBrewing3Conti.xml

@@ -19,6 +19,16 @@
 		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
 	EndIf
 
+	If LanguageShow = "MYANMAR" Then 
+		Var DirImage = "ROOT/taobin_project/image/page_payment_mmr/page_payment"
+		Var DirImage2 = "ROOT/taobin_project/image/topping_mmr"
+	EndIf
+
+	If LanguageObjectShow = "Enable" Then
+		Var DirImageDoingInter = "ROOT/taobin_project/image/page_doing_inter/"
+		Var IMG_CNT = DirImageDoingInter + "/bg_show_time_remaining.png"
+	EndIf
+
 	Var next_pic_bn = DirImage + "/bn_add_order.png"
 	Var next_pic_bp = DirImage + "/bp_add_order.png"
 	Var text_next_order = DirImage + "/text_next_order.png"
@@ -779,6 +789,24 @@
 <Value> ShowCountDownBrewing </Value>
 </Text>
 
+<Text>
+<X> 816 </X>
+<Y> 429 </Y>
+<State> LanguageObjectShow </State>
+<Language>
+	<ID> 000405 </ID>
+</Language>
+</Text>
+
+<Text>
+<X> 941 </X>
+<Y> 518 </Y>
+<State> LanguageObjectShow </State>
+<Language>
+	<ID> 000406 </ID>
+</Language>
+</Text>
+
 <Button>
 <X> 792 </X>
 <Y> 1787 </Y>

xml/page_brewing3.xml

@@ -305,7 +305,7 @@
 
 	If LanguageShow = "MYANMAR" Then 
 		Var DirImage = "ROOT/taobin_project/image/page_payment_mmr/page_payment"
-		Var DirImage2 = "ROOT/taobin_project/image/topping2_mmr"
+		Var DirImage2 = "ROOT/taobin_project/image/topping_mmr"
 	EndIf
 
 	DEBUGVAR show_eng
@@ -527,6 +527,10 @@
 					Var LangString = "LANG: &#34TH&#34\r\n"
 				EndIf
 
+				If LanguageShow = "MYANMAR" Then 
+					Var LangString = "LANG: &#34TH&#34\r\n"
+				EndIf
+
 				Var BoxIDString !assigned SprintFmt("BOX_ID: &#34%s&#34\r\n", BoxID)
 
 				; reset
@@ -552,6 +556,9 @@
 				Else
 					Var LangString = "LANG: &#34TH&#34\r\n"
 				EndIf
+				If LanguageShow = "MYANMAR" Then 
+					Var LangString = "LANG: &#34TH&#34\r\n"
+				EndIf
 
 				Var BoxIDString !assigned SprintFmt("BOX_ID: &#34%s&#34\r\n", BoxID)
 
@@ -847,6 +854,9 @@
 
 				PlayLong PlaySoundLag
 			EndIf
+			If LanguageShow = "MYANMAR" Then 
+				PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/next_drink.mp3"
+			EndIf
 		EndIf
 		If Timeout = 9 Then
 			If OpenFromCollectPoint3 = 0 Then

xml/page_brewing3Conti.xml

@@ -49,7 +49,7 @@
 
 	If LanguageShow = "MYANMAR" Then 
 		Var DirImage = "ROOT/taobin_project/image/page_payment_mmr/page_payment"
-		Var DirImage2 = "ROOT/taobin_project/image/topping2_mmr"
+		Var DirImage2 = "ROOT/taobin_project/image/topping_mmr"
 		Var IMG_CNT = "ROOT/taobin_project/image/page_doing_mmr/img2_mmr.png"
 	EndIf
 

xml/page_catalog.lxml

@@ -14,6 +14,7 @@
 	If CountryName = "Thailand" Then
 		If InternationalEnable = 1 Then
 			If EnableMultiInstance = "true" Then
+				Var OpenFromPageBoard = 1
 				OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_catalog.lxml"
 			EndIf

xml/page_check_member2.xml

@@ -586,7 +586,7 @@
                 Var CouponExireB_M = "December"
             EndIf
 
-            
+            Var CouponExpireB =  ""
             Var CouponExpireB = CouponExpireB + CouponExireB_D
             Var CouponExpireB = CouponExpireB + "  "
             Var CouponExpireB = CouponExpireB + CouponExireB_M
@@ -960,7 +960,7 @@
                 Var CouponExireB_M = "ธันวาคม"
             EndIf
 
-            
+            Var CouponExpireB =  ""
             Var CouponExpireB = CouponExpireB + CouponExireB_D
             Var CouponExpireB = CouponExpireB + "  "
             Var CouponExpireB = CouponExpireB + CouponExireB_M
@@ -1045,30 +1045,26 @@
 
         Var TaobinExpireYear = TaobinExpireYear + 0
 
-        ;Var TaobinLevelDesc3 = "သင့်တွင် ကူပွန်များရှိသည်။ "
-        ;Var TaobinLevelDesc3 = TaobinLevelDesc3 + TaobinCoupons
-        ;Var TaobinLevelDesc3 = TaobinLevelDesc3 + " နံပါတ်များ"
-
         If TaobinLevel = "1" Then
-            Var TaobinLevelDesc1 = "ရှက်လိပ်အဆင့်"
+            Var TaobinLevelDesc1 = "ရှက်နေသောလိပ်အဆင့်"
             Var TaobinLevelDesc2 = ""
 
             Var TaobinLeveImg = "/taoLevel1.png"
         EndIf
 
         If TaobinLevel = "2" Then
-            Var TaobinLevelDesc1 = "လမ်းလျှောက်လိပ်အဆင့်"
+            Var TaobinLevelDesc1 = "လမ်းလျှောက်နေသောလိပ်အဆင့်"
             Var PointDiff = 150 - CoffeePointRank
-            Var TaobinLevelDesc2 = "Earn " + PointDiff
-            Var TaobinLevelDesc2 = TaobinLevelDesc2 + " အခွံများ "
-            Var TaobinLevelDesc2 = TaobinLevelDesc2 + "Flying turtle အဆင့်သို့ ရွှေ့ရန်"
+            Var TaobinLevelDesc2 = "ပိုစုဆောင်းပါ။ " + PointDiff
+            Var TaobinLevelDesc2 = TaobinLevelDesc2 + " လိပ်ခွံ "
+            Var TaobinLevelDesc2 = TaobinLevelDesc2 + "ပျံသန်းသောလိပ်အဆင့်သို့ တိုးတက်ရန်။"
 
             Var TaobinLeveImg = "/taoLevel2.png"
 
             If CoffeePointRank > 149 Then
                 ;Var TaobinLeveImg = "/taoLevel3.png"
 
-                ;Var TaobinLevelDesc1 =  "လိပ်အဆင့် "
+                ;Var TaobinLevelDesc1 =  "ပျံသန်းနေသောလိပ်အဆင့် "
                 Var TaobinLevelDesc2 = ""
                 ;Var CoffeePointRank = CoffeePointRank - 150
 
@@ -1077,19 +1073,19 @@
         EndIf
 
         If TaobinLevel = "3" Then
-            Var TaobinLevelDesc1 = "လိပ်ပျံအဆင့်အထိ " + ExpireStrTmp
+            Var TaobinLevelDesc1 = "ပျံသန်းသောလိပ်အဆင့်အထိ။ " + ExpireStrTmp
         
             Var PointDiff = 200 - CoffeePointRank
-            Var TaobinLevelDesc2 = "Earn " + PointDiff
-            Var TaobinLevelDesc2 = TaobinLevelDesc2 + " အခွံများ "
-            Var TaobinLevelDesc2 = TaobinLevelDesc2 + "Master လိပ်အဆင့်သို့ ပြောင်းရွှေ့ရန်"
+            Var TaobinLevelDesc2 = "ပိုစုဆောင်းပါ။ " + PointDiff
+            Var TaobinLevelDesc2 = TaobinLevelDesc2 + " လိပ်ခွံ "
+            Var TaobinLevelDesc2 = TaobinLevelDesc2 + "ဆရာလိပ်အဆင့်သို့ တိုးတက်ရန်။"
 
             Var TaobinLeveImg = "/taoLevel3.png"
 
             If CoffeePointRank > 199 Then
                 ;Var TaobinLeveImg = "/taoLevel4.png"
 
-                ;Var TaobinLevelDesc1 =  "သခင်လိပ်အဆင့် "
+                ;Var TaobinLevelDesc1 =  "ဆရာလိပ်အဆင့် "
                 Var TaobinLevelDesc2 = ""
                 ;Var CoffeePointRank = CoffeePointRank - 350
 
@@ -1098,7 +1094,7 @@
         EndIf
 
         If TaobinLevel = "4" Then
-            Var TaobinLevelDesc1 = "မာစတာလိပ်အဆင့်အထိ " + ExpireStrTmp
+            Var TaobinLevelDesc1 = "ဆရာလိပ်အဆင့်အထိ။ " + ExpireStrTmp
         
             Var TaobinLevelDesc2 = ""
 
@@ -1108,251 +1104,248 @@
         If CouponIDA = "" Then
         Else
             
-    
-                Var CouponSTA =  "Enable"
-                Var CouponExireA_D = ""
-                Var CouponExireA_M = ""
-                Var CouponExireA_Y = ""
-                Var CouponTypeA = ""
-                Var CouponNameA = ""
-    
-                SPLIT  CouponInfoA "/"  2  CouponTypeA
-                SPLIT  CouponInfoA "/"  4  CouponExireA_D
-                SPLIT  CouponInfoA "/"  5  CouponExireA_M
-                SPLIT  CouponInfoA "/"  6  CouponExireA_Y
-    
-                If CouponTypeA = "100" Then
-                    Var CouponNameA = "/imgCouponC33.png"
-                EndIf
-                If CouponTypeA = "101" Then
-                    Var CouponNameA = "/imgCouponC44.png"
-                EndIf 
-                If CouponTypeA = "102" Then
-                    Var CouponNameA = "/imgCouponC39.png"
-                EndIf
-                If CouponTypeA = "103" Then
-                    Var CouponNameA = "/imgCouponC40.png"
-                EndIf 
-                If CouponTypeA = "105" Then
-                    Var CouponNameA = "/imgCouponC38.png"
-                EndIf 
-                If CouponTypeA = "106" Then
-                    Var CouponNameA = "/imgCouponC41.png"
-                EndIf
-                If CouponTypeA = "107" Then
-                    Var CouponNameA = "/imgCouponC42.png"
-                EndIf 
-                If CouponTypeA = "109" Then
-                    Var CouponNameA = "/imgCouponC33.png"
-                EndIf
-                If CouponTypeA = "112" Then
-                    Var CouponNameA = "/imgCoupon112.png"
-                EndIf
-                If CouponTypeA = "113" Then
-                    Var CouponNameA = "/imgCoupon113.png"
-                EndIf
-    
-                If CouponTypeA = "120" Then
-                    Var CouponNameA = "/imgCoupon120.png"
-                EndIf
-                If CouponTypeA = "121" Then
-                    Var CouponNameA = "/imgCoupon121.png"
-                EndIf
-    
-                If CouponTypeA = "135" Then
-                    Var CouponNameA = "/imgCouponMKP1.png"
-                EndIf
-    
-                INT CouponExireA_D
-                INT CouponExireA_Y
-                Var CouponExireA_Y = CouponExireA_Y + 543
-    
-                If CouponExireA_M = "01" Then
-                    Var CouponExireA_M = "ဇန္နဝါရီလ"
-                EndIf
-    
-                If CouponExireA_M = "02" Then
-                    Var CouponExireA_M = "ေဖေဖာ္ဝါရီလ"
-                EndIf
-    
-                If CouponExireA_M = "03" Then
-                    Var CouponExireA_M = "မတ္လ"
-                EndIf
-    
-                If CouponExireA_M = "04" Then
-                    Var CouponExireA_M = "ဧျပီလ"
-                EndIf
-    
-                If CouponExireA_M = "05" Then
-                    Var CouponExireA_M = "ေမလ"
-                EndIf
-    
-                If CouponExireA_M = "06" Then
-                    Var CouponExireA_M = "ဇြန္လ"
-                EndIf
-    
-                If CouponExireA_M = "07" Then
-                    Var CouponExireA_M = "ဇူလိုင္လ"
-                EndIf
-    
-                If CouponExireA_M = "08" Then
-                    Var CouponExireA_M = "ၾသဂုတ္လ"
-                EndIf
-    
-                If CouponExireA_M = "09" Then
-                    Var CouponExireA_M = "စက္တင္ဘာလ"
-                EndIf
-    
-                If CouponExireA_M = "10" Then
-                    Var CouponExireA_M = "ေအာက္တိုဘာလ"
-                EndIf
-    
-                If CouponExireA_M = "11" Then
-                    Var CouponExireA_M = "ႏိုဝင္ဘာလ"
-                EndIf
-    
-                If CouponExireA_M = "12" Then
-                    Var CouponExireA_M = "ဒီဇင္ဘာလ"
-                EndIf
-    
-                Var CouponExpireA = ""
-                Var CouponExpireA = CouponExpireA + CouponExireA_D
-                Var CouponExpireA = CouponExpireA + "  "
-                Var CouponExpireA = CouponExpireA + CouponExireA_M
-                Var CouponExpireA = CouponExpireA + "  "
-                Var CouponExpireA = CouponExpireA + CouponExireA_Y
-    
-                Var CouponExpireA = "သက်တမ်းကုန် " +  CouponExpireA
-                Var CouponExpireAPosittion = 1400
-    
-            EndIf
-    
-            If CouponIDB = "" Then
-            Else
-            
-    
-                Var CouponSTB =  "Enable"
-                Var CouponExireB_D = ""
-                Var CouponExireB_M = ""
-                Var CouponExireB_Y = ""
-                Var CouponTypeB = ""
-                Var CouponNameB = ""
-    
-                SPLIT  CouponInfoB "/"  2  CouponTypeB
-                SPLIT  CouponInfoB "/"  4  CouponExireB_D
-                SPLIT  CouponInfoB "/"  5  CouponExireB_M
-                SPLIT  CouponInfoB "/"  6  CouponExireB_Y
-    
-                If CouponTypeB = "100" Then
-                    Var CouponNameB = "/imgCouponC33.png"
-                EndIf
-                If CouponTypeB = "101" Then
-                    Var CouponNameB = "/imgCouponC44.png"
-                EndIf 
-                If CouponTypeB = "102" Then
-                    Var CouponNameB = "/imgCouponC39.png"
-                EndIf
-                If CouponTypeB = "103" Then
-                    Var CouponNameB = "/imgCouponC40.png"
-                EndIf 
-                If CouponTypeB = "105" Then
-                    Var CouponNameB = "/imgCouponC38.png"
-                EndIf 
-                If CouponTypeB = "106" Then
-                    Var CouponNameB = "/imgCouponC41.png"
-                EndIf
-                If CouponTypeB = "107" Then
-                    Var CouponNameB = "/imgCouponC42.png"
-                EndIf
-                If CouponTypeB = "109" Then
-                    Var CouponNameB = "/imgCouponC33.png"
-                EndIf 
-                If CouponTypeB = "112" Then
-                    Var CouponNameB = "/imgCoupon112.png"
-                EndIf 
-                If CouponTypeB = "113" Then
-                    Var CouponNameB = "/imgCoupon113.png"
-                EndIf 
-    
-                If CouponTypeB = "120" Then
-                    Var CouponNameB = "/imgCoupon120.png"
-                EndIf
-                If CouponTypeB = "121" Then
-                    Var CouponNameB = "/imgCoupon121.png"
-                EndIf
-    
-                If CouponTypeB = "135" Then
-                    Var CouponNameB = "/imgCouponMKP1.png"
-                EndIf
-    
-                INT CouponExireB_D
-                INT CouponExireB_Y
-                Var CouponExireB_Y = CouponExireB_Y + 0
-    
-                If CouponExireB_M = "01" Then
-                    Var CouponExireB_M = "ဇန္နဝါရီလ"
-                EndIf
-    
-                If CouponExireB_M = "02" Then
-                    Var CouponExireB_M = "ေဖေဖာ္ဝါရီလ"
-                EndIf
-    
-                If CouponExireB_M = "03" Then
-                    Var CouponExireB_M = "မတ္လ"
-                EndIf
-    
-                If CouponExireB_M = "04" Then
-                    Var CouponExireB_M = "ဧျပီလ"
-                EndIf
-    
-                If CouponExireB_M = "05" Then
-                    Var CouponExireB_M = "ေမလ"
-                EndIf
-    
-                If CouponExireB_M = "06" Then
-                    Var CouponExireB_M = "ဇြန္လ"
-                EndIf
-    
-                If CouponExireB_M = "07" Then
-                    Var CouponExireB_M = "ဇူလိုင္လ"
-                EndIf
-    
-                If CouponExireB_M = "08" Then
-                    Var CouponExireB_M = "ၾသဂုတ္လ"
-                EndIf
-    
-                If CouponExireB_M = "09" Then
-                    Var CouponExireB_M = "စက္တင္ဘာလ"
-                EndIf
-    
-                If CouponExireB_M = "10" Then
-                    Var CouponExireB_M = "ေအာက္တိုဘာလ"
-                EndIf
-    
-                If CouponExireB_M = "11" Then
-                    Var CouponExireB_M = "ႏိုဝင္ဘာလ"
-                EndIf
-    
-                If CouponExireB_M = "12" Then
-                    Var CouponExireB_M = "ဒီဇင္ဘာလ"
-                EndIf
-    
-                
-                Var CouponExpireB = CouponExpireB + CouponExireB_D
-                Var CouponExpireB = CouponExpireB + "  "
-                Var CouponExpireB = CouponExpireB + CouponExireB_M
-                Var CouponExpireB = CouponExpireB + "  " 
-                Var CouponExpireB = CouponExpireB + CouponExireB_Y
-    
-                Var CouponExpireB = "သက်တမ်းကုန် " +  CouponExpireB
-    
-            EndIf
-    
-            Var CouponText = "ကူပွန်စုဆောင်းခြင်း။ (" + CouponNum
-            Var CouponText = CouponText + ")"
+            Var CouponSTA =  "Enable"
+            Var CouponExireA_D = ""
+            Var CouponExireA_M = ""
+            Var CouponExireA_Y = ""
+            Var CouponTypeA = ""
+            Var CouponNameA = ""
 
+            SPLIT  CouponInfoA "/"  2  CouponTypeA
+            SPLIT  CouponInfoA "/"  4  CouponExireA_D
+            SPLIT  CouponInfoA "/"  5  CouponExireA_M
+            SPLIT  CouponInfoA "/"  6  CouponExireA_Y
+
+            If CouponTypeA = "100" Then
+                Var CouponNameA = "/imgCouponC33.png"
+            EndIf
+            If CouponTypeA = "101" Then
+                Var CouponNameA = "/imgCouponC44.png"
+            EndIf 
+            If CouponTypeA = "102" Then
+                Var CouponNameA = "/imgCouponC39.png"
+            EndIf
+            If CouponTypeA = "103" Then
+                Var CouponNameA = "/imgCouponC40.png"
+            EndIf 
+            If CouponTypeA = "105" Then
+                Var CouponNameA = "/imgCouponC38.png"
+            EndIf 
+            If CouponTypeA = "106" Then
+                Var CouponNameA = "/imgCouponC41.png"
+            EndIf
+            If CouponTypeA = "107" Then
+                Var CouponNameA = "/imgCouponC42.png"
+            EndIf 
+            If CouponTypeA = "109" Then
+                Var CouponNameA = "/imgCouponC33.png"
+            EndIf
+            If CouponTypeA = "112" Then
+                Var CouponNameA = "/imgCoupon112.png"
+            EndIf
+            If CouponTypeA = "113" Then
+                Var CouponNameA = "/imgCoupon113.png"
+            EndIf
+
+            If CouponTypeA = "120" Then
+                Var CouponNameA = "/imgCoupon120.png"
+            EndIf
+            If CouponTypeA = "121" Then
+                Var CouponNameA = "/imgCoupon121.png"
+            EndIf
+
+            If CouponTypeA = "135" Then
+                Var CouponNameA = "/imgCouponMKP1.png"
+            EndIf
+
+            INT CouponExireA_D
+            INT CouponExireA_Y
+            Var CouponExireA_Y = CouponExireA_Y + 543
+
+            If CouponExireA_M = "01" Then
+                Var CouponExireA_M = "ဇန္နဝါရီလ"
+            EndIf
+
+            If CouponExireA_M = "02" Then
+                Var CouponExireA_M = "ေဖေဖာ္ဝါရီလ"
+            EndIf
+
+            If CouponExireA_M = "03" Then
+                Var CouponExireA_M = "မတ္လ"
+            EndIf
+
+            If CouponExireA_M = "04" Then
+                Var CouponExireA_M = "ဧျပီလ"
+            EndIf
+
+            If CouponExireA_M = "05" Then
+                Var CouponExireA_M = "ေမလ"
+            EndIf
+
+            If CouponExireA_M = "06" Then
+                Var CouponExireA_M = "ဇြန္လ"
+            EndIf
+
+            If CouponExireA_M = "07" Then
+                Var CouponExireA_M = "ဇူလိုင္လ"
+            EndIf
+
+            If CouponExireA_M = "08" Then
+                Var CouponExireA_M = "ၾသဂုတ္လ"
+            EndIf
+
+            If CouponExireA_M = "09" Then
+                Var CouponExireA_M = "စက္တင္ဘာလ"
+            EndIf
+
+            If CouponExireA_M = "10" Then
+                Var CouponExireA_M = "ေအာက္တိုဘာလ"
+            EndIf
+
+            If CouponExireA_M = "11" Then
+                Var CouponExireA_M = "ႏိုဝင္ဘာလ"
+            EndIf
+
+            If CouponExireA_M = "12" Then
+                Var CouponExireA_M = "ဒီဇင္ဘာလ"
+            EndIf
+
+            Var CouponExpireA = ""
+            Var CouponExpireA = CouponExpireA + CouponExireA_D
+            Var CouponExpireA = CouponExpireA + "  "
+            Var CouponExpireA = CouponExpireA + CouponExireA_M
+            Var CouponExpireA = CouponExpireA + "  "
+            Var CouponExpireA = CouponExpireA + CouponExireA_Y
+
+            Var CouponExpireA = "သက်တမ်းကုန် " +  CouponExpireA
+            Var CouponExpireAPosittion = 1400
+
+        EndIf
+
+        If CouponIDB = "" Then
+        Else
+        
+
+            Var CouponSTB =  "Enable"
+            Var CouponExireB_D = ""
+            Var CouponExireB_M = ""
+            Var CouponExireB_Y = ""
+            Var CouponTypeB = ""
+            Var CouponNameB = ""
+
+            SPLIT  CouponInfoB "/"  2  CouponTypeB
+            SPLIT  CouponInfoB "/"  4  CouponExireB_D
+            SPLIT  CouponInfoB "/"  5  CouponExireB_M
+            SPLIT  CouponInfoB "/"  6  CouponExireB_Y
+
+            If CouponTypeB = "100" Then
+                Var CouponNameB = "/imgCouponC33.png"
+            EndIf
+            If CouponTypeB = "101" Then
+                Var CouponNameB = "/imgCouponC44.png"
+            EndIf 
+            If CouponTypeB = "102" Then
+                Var CouponNameB = "/imgCouponC39.png"
+            EndIf
+            If CouponTypeB = "103" Then
+                Var CouponNameB = "/imgCouponC40.png"
+            EndIf 
+            If CouponTypeB = "105" Then
+                Var CouponNameB = "/imgCouponC38.png"
+            EndIf 
+            If CouponTypeB = "106" Then
+                Var CouponNameB = "/imgCouponC41.png"
+            EndIf
+            If CouponTypeB = "107" Then
+                Var CouponNameB = "/imgCouponC42.png"
+            EndIf
+            If CouponTypeB = "109" Then
+                Var CouponNameB = "/imgCouponC33.png"
+            EndIf 
+            If CouponTypeB = "112" Then
+                Var CouponNameB = "/imgCoupon112.png"
+            EndIf 
+            If CouponTypeB = "113" Then
+                Var CouponNameB = "/imgCoupon113.png"
+            EndIf 
+
+            If CouponTypeB = "120" Then
+                Var CouponNameB = "/imgCoupon120.png"
+            EndIf
+            If CouponTypeB = "121" Then
+                Var CouponNameB = "/imgCoupon121.png"
+            EndIf
+
+            If CouponTypeB = "135" Then
+                Var CouponNameB = "/imgCouponMKP1.png"
+            EndIf
+
+            INT CouponExireB_D
+            INT CouponExireB_Y
+            Var CouponExireB_Y = CouponExireB_Y + 0
+
+            If CouponExireB_M = "01" Then
+                Var CouponExireB_M = "ဇန္နဝါရီလ"
+            EndIf
+
+            If CouponExireB_M = "02" Then
+                Var CouponExireB_M = "ေဖေဖာ္ဝါရီလ"
+            EndIf
+
+            If CouponExireB_M = "03" Then
+                Var CouponExireB_M = "မတ္လ"
+            EndIf
+
+            If CouponExireB_M = "04" Then
+                Var CouponExireB_M = "ဧျပီလ"
+            EndIf
+
+            If CouponExireB_M = "05" Then
+                Var CouponExireB_M = "ေမလ"
+            EndIf
+
+            If CouponExireB_M = "06" Then
+                Var CouponExireB_M = "ဇြန္လ"
+            EndIf
+
+            If CouponExireB_M = "07" Then
+                Var CouponExireB_M = "ဇူလိုင္လ"
+            EndIf
+
+            If CouponExireB_M = "08" Then
+                Var CouponExireB_M = "ၾသဂုတ္လ"
+            EndIf
+
+            If CouponExireB_M = "09" Then
+                Var CouponExireB_M = "စက္တင္ဘာလ"
+            EndIf
+
+            If CouponExireB_M = "10" Then
+                Var CouponExireB_M = "ေအာက္တိုဘာလ"
+            EndIf
+
+            If CouponExireB_M = "11" Then
+                Var CouponExireB_M = "ႏိုဝင္ဘာလ"
+            EndIf
+
+            If CouponExireB_M = "12" Then
+                Var CouponExireB_M = "ဒီဇင္ဘာလ"
+            EndIf
+
+            Var CouponExpireB =  ""
+            Var CouponExpireB = CouponExpireB + CouponExireB_D
+            Var CouponExpireB = CouponExpireB + "  "
+            Var CouponExpireB = CouponExpireB + CouponExireB_M
+            Var CouponExpireB = CouponExpireB + "  " 
+            Var CouponExpireB = CouponExpireB + CouponExireB_Y
+
+            Var CouponExpireB = "သက်တမ်းကုန် " +  CouponExpireB
+
+        EndIf
+
+        Var CouponText = "ကူပွန်စုဆောင်းခြင်း။ (" + CouponNum
+        Var CouponText = CouponText + ")"
    
-            
 	EndIf
 
 	SAVELOG "EventLanguageOnChange menu -list"

xml/page_check_member2_campaign.xml

@@ -806,58 +806,58 @@ page_check_member2_campaign
                 Var TaobinExpireYear = TaobinExpireYear + 0
     
                 If TaobinLevel = "1" Then
-                    Var TaobinLevelDesc1 = "ရှက်လိပ်အဆင့်"
+                    Var TaobinLevelDesc1 = "ရှက်နေသောလိပ်အဆင့်"
                     Var TaobinLevelDesc2 = ""
-        
+
                     Var TaobinLeveImg = "/taoLevel1.png"
                 EndIf
-        
+
                 If TaobinLevel = "2" Then
-                    Var TaobinLevelDesc1 = "လမ်းလျှောက်လိပ်အဆင့်"
+                    Var TaobinLevelDesc1 = "လမ်းလျှောက်နေသောလိပ်အဆင့်"
                     Var PointDiff = 150 - CoffeePointRank
-                    Var TaobinLevelDesc2 = "Earn " + PointDiff
-                    Var TaobinLevelDesc2 = TaobinLevelDesc2 + " အခွံများ "
-                    Var TaobinLevelDesc2 = TaobinLevelDesc2 + "Flying turtle အဆင့်သို့ ရွှေ့ရန်"
-        
+                    Var TaobinLevelDesc2 = "ပိုစုဆောင်းပါ။ " + PointDiff
+                    Var TaobinLevelDesc2 = TaobinLevelDesc2 + " လိပ်ခွံ "
+                    Var TaobinLevelDesc2 = TaobinLevelDesc2 + "ပျံသန်းသောလိပ်အဆင့်သို့ တိုးတက်ရန်။"
+
                     Var TaobinLeveImg = "/taoLevel2.png"
-        
+
                     If CoffeePointRank > 149 Then
                         ;Var TaobinLeveImg = "/taoLevel3.png"
-        
-                        ;Var TaobinLevelDesc1 =  "လိပ်အဆင့် "
+
+                        ;Var TaobinLevelDesc1 =  "ပျံသန်းနေသောလိပ်အဆင့် "
                         Var TaobinLevelDesc2 = ""
                         ;Var CoffeePointRank = CoffeePointRank - 150
-        
+
                     EndIf
-        
+
                 EndIf
-        
+
                 If TaobinLevel = "3" Then
-                    Var TaobinLevelDesc1 = "လိပ်ပျံအဆင့်အထိ " + ExpireStrTmp
+                    Var TaobinLevelDesc1 = "ပျံသန်းသောလိပ်အဆင့်အထိ။ " + ExpireStrTmp
                 
                     Var PointDiff = 200 - CoffeePointRank
-                    Var TaobinLevelDesc2 = "Earn " + PointDiff
-                    Var TaobinLevelDesc2 = TaobinLevelDesc2 + " အခွံများ "
-                    Var TaobinLevelDesc2 = TaobinLevelDesc2 + "Master လိပ်အဆင့်သို့ ပြောင်းရွှေ့ရန်"
-        
+                    Var TaobinLevelDesc2 = "ပိုစုဆောင်းပါ။ " + PointDiff
+                    Var TaobinLevelDesc2 = TaobinLevelDesc2 + " လိပ်ခွံ "
+                    Var TaobinLevelDesc2 = TaobinLevelDesc2 + "ဆရာလိပ်အဆင့်သို့ တိုးတက်ရန်။"
+
                     Var TaobinLeveImg = "/taoLevel3.png"
-        
+
                     If CoffeePointRank > 199 Then
                         ;Var TaobinLeveImg = "/taoLevel4.png"
-        
-                        ;Var TaobinLevelDesc1 =  "သခင်လိပ်အဆင့် "
+
+                        ;Var TaobinLevelDesc1 =  "ဆရာလိပ်အဆင့် "
                         Var TaobinLevelDesc2 = ""
                         ;Var CoffeePointRank = CoffeePointRank - 350
-        
+
                     EndIf
-        
+
                 EndIf
-        
+
                 If TaobinLevel = "4" Then
-                    Var TaobinLevelDesc1 = "မာစတာလိပ်အဆင့်အထိ " + ExpireStrTmp
+                    Var TaobinLevelDesc1 = "ဆရာလိပ်အဆင့်အထိ။ " + ExpireStrTmp
                 
                     Var TaobinLevelDesc2 = ""
-        
+
                     Var TaobinLeveImg = "/taoLevel4.png"
                 EndIf
     

xml/page_check_member_point.xml

@@ -429,28 +429,27 @@
 	If LanguageShow = "MYANMAR" Then 
 		Var TaobinLevelDesc3 = "သင့်တွင် ကူပွန်များရှိသည်။ "
 		Var TaobinLevelDesc3 = TaobinLevelDesc3 + TaobinCoupons
-		Var TaobinLevelDesc3 = TaobinLevelDesc3 + " နံပါတ်များ"
 
 		If TaobinLevel = "1" Then
-            Var TaobinLevelDesc1 = "ရှက်လိပ်အဆင့်"
+            Var TaobinLevelDesc1 = "ရှက်နေသောလိပ်အဆင့်"
             Var TaobinLevelDesc2 = ""
 
             Var TaobinLeveImg = "/taoLevel1.png"
         EndIf
 
         If TaobinLevel = "2" Then
-            Var TaobinLevelDesc1 = "လမ်းလျှောက်လိပ်အဆင့်"
+            Var TaobinLevelDesc1 = "လမ်းလျှောက်နေသောလိပ်အဆင့်"
 			Var PointDiff = 150 - CoffeePointRank
-            Var TaobinLevelDesc2 = "Earn " + PointDiff
-            Var TaobinLevelDesc2 = TaobinLevelDesc2 + " အခွံများ "
-            Var TaobinLevelDesc2 = TaobinLevelDesc2 + "Flying turtle အဆင့်သို့ ရွှေ့ရန်"
+            Var TaobinLevelDesc2 = "ပိုစုဆောင်းပါ။ " + PointDiff
+            Var TaobinLevelDesc2 = TaobinLevelDesc2 + " လိပ်ခွံ "
+            Var TaobinLevelDesc2 = TaobinLevelDesc2 + "ပျံသန်းသောလိပ်အဆင့်သို့ တိုးတက်ရန်။"
 
             Var TaobinLeveImg = "/taoLevel2.png"
 
 			If CoffeePointRank > 149 Then
 				;Var TaobinLeveImg = "/taoLevel3.png"
 
-				;Var TaobinLevelDesc1 =  "လိပ်အဆင့် "
+				;Var TaobinLevelDesc1 =  "ပျံသန်းနေသောလိပ်အဆင့် "
             	Var TaobinLevelDesc2 = ""
 				;Var CoffeePointRank = CoffeePointRank - 150
 
@@ -459,19 +458,19 @@
         EndIf
 
         If TaobinLevel = "3" Then
-            Var TaobinLevelDesc1 = "လိပ်ပျံအဆင့်အထိ " + ExpireStrTmp
+            Var TaobinLevelDesc1 = "ပျံသန်းသောလိပ်အဆင့်အထိ။ " + ExpireStrTmp
         
             Var PointDiff = 200 - CoffeePointRank
-            Var TaobinLevelDesc2 = "Earn " + PointDiff
-            Var TaobinLevelDesc2 = TaobinLevelDesc2 + " အခွံများ "
-            Var TaobinLevelDesc2 = TaobinLevelDesc2 + "Master လိပ်အဆင့်သို့ ပြောင်းရွှေ့ရန်"
+            Var TaobinLevelDesc2 = "ပိုစုဆောင်းပါ။ " + PointDiff
+            Var TaobinLevelDesc2 = TaobinLevelDesc2 + " လိပ်ခွံ "
+            Var TaobinLevelDesc2 = TaobinLevelDesc2 + "ဆရာလိပ်အဆင့်သို့ တိုးတက်ရန်။"
 
             Var TaobinLeveImg = "/taoLevel3.png"
 
 			If CoffeePointRank > 199 Then
 				;Var TaobinLeveImg = "/taoLevel4.png"
 
-				;Var TaobinLevelDesc1 =  "သခင်လိပ်အဆင့် "
+				;Var TaobinLevelDesc1 =  "ဆရာလိပ်အဆင့် "
             	Var TaobinLevelDesc2 = ""
 				;Var CoffeePointRank = CoffeePointRank - 350
 
@@ -480,13 +479,13 @@
         EndIf
 
 		If TaobinLevel = "4" Then
-            Var TaobinLevelDesc1 = "မာစတာလိပ်အဆင့်အထိ " + ExpireStrTmp
+            Var TaobinLevelDesc1 = "ဆရာလိပ်အဆင့်အထိ။ " + ExpireStrTmp
         
             Var TaobinLevelDesc2 = ""
 
             Var TaobinLeveImg = "/taoLevel4.png"
         EndIf
-	EndIf  
+	EndIf
 
 
 	Var taobinP1 = "Invisible"

xml/page_collect_point_3.xml

@@ -40,6 +40,7 @@
 		Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
 
 		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
+		Var TaobinLevelDesc3X = 380
 		Var TextEndDateY = 1570
 
 	Else
@@ -47,11 +48,13 @@
 		Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
 
 		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
+		Var TaobinLevelDesc3X = 310
 		Var TextEndDateY = 1570
 	EndIf
 
 	If LanguageShow = "MYANMAR" Then 
 		Var DirImage = "ROOT/taobin_project/image/display_point_mmr"
+		Var TaobinLevelDesc3X = 380
 		Var TextEndDateY = 1580
 	EndIf
 
@@ -238,6 +241,73 @@
 
 	EndIf
 
+	If LanguageShow = "MYANMAR" Then  
+        If TaobinExpireMonth = "01" Then
+            Var TaobinExpireMonth = "Jan"
+            Var TaobinExpireMonthX = "ဇန္နဝါရီလ"
+        EndIf
+
+        If TaobinExpireMonth = "02" Then
+            Var TaobinExpireMonth = "Feb"
+            Var TaobinExpireMonthX = "ေဖေဖာ္ဝါရီလ"
+        EndIf
+
+        If TaobinExpireMonth = "03" Then
+            Var TaobinExpireMonth = "Mar"
+            Var TaobinExpireMonthX = "မတ္လ"
+        EndIf
+
+        If TaobinExpireMonth = "04" Then
+            Var TaobinExpireMonth = "Apr"
+            Var TaobinExpireMonthX = "ဧျပီလ"
+        EndIf
+
+        If TaobinExpireMonth = "05" Then
+            Var TaobinExpireMonth = "May"
+            Var TaobinExpireMonthX = "ေမလ"
+        EndIf
+
+        If TaobinExpireMonth = "06" Then
+            Var TaobinExpireMonth = "Jun"
+            Var TaobinExpireMonthX = "ဇြန္လ"
+        EndIf
+
+        If TaobinExpireMonth = "07" Then
+            Var TaobinExpireMonth = "Jul"
+            Var TaobinExpireMonthX = "ဇူလိုင္လ"
+        EndIf
+
+        If TaobinExpireMonth = "08" Then
+            Var TaobinExpireMonth = "Aug"
+            Var TaobinExpireMonthX = "ၾသဂုတ္လ"
+        EndIf
+
+        If TaobinExpireMonth = "09" Then
+            Var TaobinExpireMonth = "Sep"
+            Var TaobinExpireMonthX = "စက္တင္ဘာလ"
+        EndIf
+
+        If TaobinExpireMonth = "10" Then
+            Var TaobinExpireMonth = "Oct"
+            Var TaobinExpireMonthX = "ေအာက္တိုဘာလ"
+        EndIf
+
+        If TaobinExpireMonth = "11" Then
+            Var TaobinExpireMonth = "Nov"
+            Var TaobinExpireMonthX = "ႏိုဝင္ဘာလ"
+        EndIf
+
+        If TaobinExpireMonth = "12" Then
+            Var TaobinExpireMonth = "Dec"
+            Var TaobinExpireMonthX = "ဒီဇင္ဘာလ"
+        EndIf
+
+        INT TaobinExpireYear
+        INT TaobinExpireDay
+
+        Var TaobinExpireYear = TaobinExpireYear + 0
+    EndIf
+
 
 	Var ExpireStrTmp = ""
 	Var ExpireStrTmp = ExpireStrTmp + TaobinExpireDay
@@ -388,28 +458,27 @@
 	If LanguageShow = "MYANMAR" Then 
 		Var TaobinLevelDesc3 = "သင့်တွင် ကူပွန်များရှိသည်။ "
 		Var TaobinLevelDesc3 = TaobinLevelDesc3 + TaobinCoupons
-		Var TaobinLevelDesc3 = TaobinLevelDesc3 + " နံပါတ်များ"
 
 		If TaobinLevel = "1" Then
-            Var TaobinLevelDesc1 = "ရှက်လိပ်အဆင့်"
+            Var TaobinLevelDesc1 = "ရှက်နေသောလိပ်အဆင့်"
             Var TaobinLevelDesc2 = ""
 
             Var TaobinLeveImg = "/taoLevel1.png"
         EndIf
 
         If TaobinLevel = "2" Then
-            Var TaobinLevelDesc1 = "လမ်းလျှောက်လိပ်အဆင့်"
+            Var TaobinLevelDesc1 = "လမ်းလျှောက်နေသောလိပ်အဆင့်"
 			Var PointDiff = 150 - CoffeePointRank
-            Var TaobinLevelDesc2 = "Earn " + PointDiff
-            Var TaobinLevelDesc2 = TaobinLevelDesc2 + " အခွံများ "
-            Var TaobinLevelDesc2 = TaobinLevelDesc2 + "Flying turtle အဆင့်သို့ ရွှေ့ရန်"
+            Var TaobinLevelDesc2 = "ပိုစုဆောင်းပါ။ " + PointDiff
+            Var TaobinLevelDesc2 = TaobinLevelDesc2 + " လိပ်ခွံ "
+            Var TaobinLevelDesc2 = TaobinLevelDesc2 + "ပျံသန်းသောလိပ်အဆင့်သို့ တိုးတက်ရန်။"
 
             Var TaobinLeveImg = "/taoLevel2.png"
 
 			If CoffeePointRank > 149 Then
 				;Var TaobinLeveImg = "/taoLevel3.png"
 
-				;Var TaobinLevelDesc1 =  "လိပ်အဆင့် "
+				;Var TaobinLevelDesc1 =  "ပျံသန်းနေသောလိပ်အဆင့် "
             	Var TaobinLevelDesc2 = ""
 				;Var CoffeePointRank = CoffeePointRank - 150
 
@@ -418,19 +487,19 @@
         EndIf
 
         If TaobinLevel = "3" Then
-            Var TaobinLevelDesc1 = "လိပ်ပျံအဆင့်အထိ " + ExpireStrTmp
+            Var TaobinLevelDesc1 = "ပျံသန်းသောလိပ်အဆင့်အထိ။ " + ExpireStrTmp
         
             Var PointDiff = 200 - CoffeePointRank
-            Var TaobinLevelDesc2 = "Earn " + PointDiff
-            Var TaobinLevelDesc2 = TaobinLevelDesc2 + " အခွံများ "
-            Var TaobinLevelDesc2 = TaobinLevelDesc2 + "Master လိပ်အဆင့်သို့ ပြောင်းရွှေ့ရန်"
+            Var TaobinLevelDesc2 = "ပိုစုဆောင်းပါ။ " + PointDiff
+            Var TaobinLevelDesc2 = TaobinLevelDesc2 + " လိပ်ခွံ "
+            Var TaobinLevelDesc2 = TaobinLevelDesc2 + "ဆရာလိပ်အဆင့်သို့ တိုးတက်ရန်။"
 
             Var TaobinLeveImg = "/taoLevel3.png"
 
 			If CoffeePointRank > 199 Then
 				;Var TaobinLeveImg = "/taoLevel4.png"
 
-				;Var TaobinLevelDesc1 =  "သခင်လိပ်အဆင့် "
+				;Var TaobinLevelDesc1 =  "ဆရာလိပ်အဆင့် "
             	Var TaobinLevelDesc2 = ""
 				;Var CoffeePointRank = CoffeePointRank - 350
 
@@ -439,7 +508,7 @@
         EndIf
 
 		If TaobinLevel = "4" Then
-            Var TaobinLevelDesc1 = "မာစတာလိပ်အဆင့်အထိ " + ExpireStrTmp
+            Var TaobinLevelDesc1 = "ဆရာလိပ်အဆင့်အထိ။ " + ExpireStrTmp
         
             Var TaobinLevelDesc2 = ""
 
@@ -1303,7 +1372,7 @@
 </Text>
 
 <Text>
-<X> 310 </X>
+<X> TaobinLevelDesc3X </X>
 <Y> 1621 </Y>
 <Size> 25 </Size>
 <Width> 1000 </Width>

xml/page_collect_point_3_28.xml

@@ -31,16 +31,19 @@
 		Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
 
 		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
+		Var TextEndDateY = 1570
 
 	Else
 		Var DirImage = "ROOT/taobin_project/image/display_point"
 		Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
 
 		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
+		Var TextEndDateY = 1570
 	EndIf
 
 	If LanguageShow = "MYANMAR" Then 
 		Var DirImage = "ROOT/taobin_project/image/display_point_mmr/"
+		Var TextEndDateY = 1570
 	EndIf
 
 	If LanguageObjectShow = "Enable" Then
@@ -218,6 +221,73 @@
 
 	EndIf
 
+	If LanguageShow = "MYANMAR" Then  
+        If TaobinExpireMonth = "01" Then
+            Var TaobinExpireMonth = "Jan"
+            Var TaobinExpireMonthX = "ဇန္နဝါရီလ"
+        EndIf
+
+        If TaobinExpireMonth = "02" Then
+            Var TaobinExpireMonth = "Feb"
+            Var TaobinExpireMonthX = "ေဖေဖာ္ဝါရီလ"
+        EndIf
+
+        If TaobinExpireMonth = "03" Then
+            Var TaobinExpireMonth = "Mar"
+            Var TaobinExpireMonthX = "မတ္လ"
+        EndIf
+
+        If TaobinExpireMonth = "04" Then
+            Var TaobinExpireMonth = "Apr"
+            Var TaobinExpireMonthX = "ဧျပီလ"
+        EndIf
+
+        If TaobinExpireMonth = "05" Then
+            Var TaobinExpireMonth = "May"
+            Var TaobinExpireMonthX = "ေမလ"
+        EndIf
+
+        If TaobinExpireMonth = "06" Then
+            Var TaobinExpireMonth = "Jun"
+            Var TaobinExpireMonthX = "ဇြန္လ"
+        EndIf
+
+        If TaobinExpireMonth = "07" Then
+            Var TaobinExpireMonth = "Jul"
+            Var TaobinExpireMonthX = "ဇူလိုင္လ"
+        EndIf
+
+        If TaobinExpireMonth = "08" Then
+            Var TaobinExpireMonth = "Aug"
+            Var TaobinExpireMonthX = "ၾသဂုတ္လ"
+        EndIf
+
+        If TaobinExpireMonth = "09" Then
+            Var TaobinExpireMonth = "Sep"
+            Var TaobinExpireMonthX = "စက္တင္ဘာလ"
+        EndIf
+
+        If TaobinExpireMonth = "10" Then
+            Var TaobinExpireMonth = "Oct"
+            Var TaobinExpireMonthX = "ေအာက္တိုဘာလ"
+        EndIf
+
+        If TaobinExpireMonth = "11" Then
+            Var TaobinExpireMonth = "Nov"
+            Var TaobinExpireMonthX = "ႏိုဝင္ဘာလ"
+        EndIf
+
+        If TaobinExpireMonth = "12" Then
+            Var TaobinExpireMonth = "Dec"
+            Var TaobinExpireMonthX = "ဒီဇင္ဘာလ"
+        EndIf
+
+        INT TaobinExpireYear
+        INT TaobinExpireDay
+
+        Var TaobinExpireYear = TaobinExpireYear + 0
+    EndIf
+
 
 	Var ExpireStrTmp = ""
 	Var ExpireStrTmp = ExpireStrTmp + TaobinExpireDay
@@ -364,6 +434,67 @@
 
 	EndIf
 
+	If LanguageShow = "MYANMAR" Then 
+		Var TaobinLevelDesc3 = "သင့်တွင် ကူပွန်များရှိသည်။ "
+		Var TaobinLevelDesc3 = TaobinLevelDesc3 + TaobinCoupons
+
+		If TaobinLevel = "1" Then
+            Var TaobinLevelDesc1 = "ရှက်နေသောလိပ်အဆင့်"
+            Var TaobinLevelDesc2 = ""
+
+            Var TaobinLeveImg = "/taoLevel1.png"
+        EndIf
+
+        If TaobinLevel = "2" Then
+            Var TaobinLevelDesc1 = "လမ်းလျှောက်နေသောလိပ်အဆင့်"
+			Var PointDiff = 150 - CoffeePointRank
+            Var TaobinLevelDesc2 = "ပိုစုဆောင်းပါ။ " + PointDiff
+            Var TaobinLevelDesc2 = TaobinLevelDesc2 + " လိပ်ခွံ "
+            Var TaobinLevelDesc2 = TaobinLevelDesc2 + "ပျံသန်းသောလိပ်အဆင့်သို့ တိုးတက်ရန်။"
+
+            Var TaobinLeveImg = "/taoLevel2.png"
+
+			If CoffeePointRank > 149 Then
+				;Var TaobinLeveImg = "/taoLevel3.png"
+
+				;Var TaobinLevelDesc1 =  "ပျံသန်းနေသောလိပ်အဆင့် "
+            	Var TaobinLevelDesc2 = ""
+				;Var CoffeePointRank = CoffeePointRank - 150
+
+			EndIf
+
+        EndIf
+
+        If TaobinLevel = "3" Then
+            Var TaobinLevelDesc1 = "ပျံသန်းသောလိပ်အဆင့်အထိ။ " + ExpireStrTmp
+        
+            Var PointDiff = 200 - CoffeePointRank
+            Var TaobinLevelDesc2 = "ပိုစုဆောင်းပါ။ " + PointDiff
+            Var TaobinLevelDesc2 = TaobinLevelDesc2 + " လိပ်ခွံ "
+            Var TaobinLevelDesc2 = TaobinLevelDesc2 + "ဆရာလိပ်အဆင့်သို့ တိုးတက်ရန်။"
+
+            Var TaobinLeveImg = "/taoLevel3.png"
+
+			If CoffeePointRank > 199 Then
+				;Var TaobinLeveImg = "/taoLevel4.png"
+
+				;Var TaobinLevelDesc1 =  "ဆရာလိပ်အဆင့် "
+            	Var TaobinLevelDesc2 = ""
+				;Var CoffeePointRank = CoffeePointRank - 350
+
+			EndIf
+
+        EndIf
+
+		If TaobinLevel = "4" Then
+            Var TaobinLevelDesc1 = "ဆရာလိပ်အဆင့်အထိ။ " + ExpireStrTmp
+        
+            Var TaobinLevelDesc2 = ""
+
+            Var TaobinLeveImg = "/taoLevel4.png"
+        EndIf
+	EndIf
+
 
 
 
@@ -668,6 +799,10 @@
 		Var xPointEndDate = 575
 		Var yPointEndDate = 1563
 	EndIf
+	If LanguageShow = "MYANMAR" Then 
+		Var xPointEndDate = 520
+		Var yPointEndDate = 1568
+	EndIf
 
 
 

xml/page_collect_point_3_28_lucky_draw_campaign.xml

@@ -33,16 +33,19 @@
 		Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
 
 		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
+		Var TextEndDateY = 1570
 
 	Else
 		Var DirImage = "ROOT/taobin_project/image/display_point"
 		Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
 
 		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
+		Var TextEndDateY = 1570
 	EndIf
 
 	If LanguageShow = "MYANMAR" Then 
 		Var DirImage = "ROOT/taobin_project/image/display_point_mmr/"
+		Var TextEndDateY = 1580
 	EndIf
 
 	If LanguageObjectShow = "Enable" Then
@@ -220,6 +223,73 @@
 
 	EndIf
 
+	If LanguageShow = "MYANMAR" Then  
+        If TaobinExpireMonth = "01" Then
+            Var TaobinExpireMonth = "Jan"
+            Var TaobinExpireMonthX = "ဇန္နဝါရီလ"
+        EndIf
+
+        If TaobinExpireMonth = "02" Then
+            Var TaobinExpireMonth = "Feb"
+            Var TaobinExpireMonthX = "ေဖေဖာ္ဝါရီလ"
+        EndIf
+
+        If TaobinExpireMonth = "03" Then
+            Var TaobinExpireMonth = "Mar"
+            Var TaobinExpireMonthX = "မတ္လ"
+        EndIf
+
+        If TaobinExpireMonth = "04" Then
+            Var TaobinExpireMonth = "Apr"
+            Var TaobinExpireMonthX = "ဧျပီလ"
+        EndIf
+
+        If TaobinExpireMonth = "05" Then
+            Var TaobinExpireMonth = "May"
+            Var TaobinExpireMonthX = "ေမလ"
+        EndIf
+
+        If TaobinExpireMonth = "06" Then
+            Var TaobinExpireMonth = "Jun"
+            Var TaobinExpireMonthX = "ဇြန္လ"
+        EndIf
+
+        If TaobinExpireMonth = "07" Then
+            Var TaobinExpireMonth = "Jul"
+            Var TaobinExpireMonthX = "ဇူလိုင္လ"
+        EndIf
+
+        If TaobinExpireMonth = "08" Then
+            Var TaobinExpireMonth = "Aug"
+            Var TaobinExpireMonthX = "ၾသဂုတ္လ"
+        EndIf
+
+        If TaobinExpireMonth = "09" Then
+            Var TaobinExpireMonth = "Sep"
+            Var TaobinExpireMonthX = "စက္တင္ဘာလ"
+        EndIf
+
+        If TaobinExpireMonth = "10" Then
+            Var TaobinExpireMonth = "Oct"
+            Var TaobinExpireMonthX = "ေအာက္တိုဘာလ"
+        EndIf
+
+        If TaobinExpireMonth = "11" Then
+            Var TaobinExpireMonth = "Nov"
+            Var TaobinExpireMonthX = "ႏိုဝင္ဘာလ"
+        EndIf
+
+        If TaobinExpireMonth = "12" Then
+            Var TaobinExpireMonth = "Dec"
+            Var TaobinExpireMonthX = "ဒီဇင္ဘာလ"
+        EndIf
+
+        INT TaobinExpireYear
+        INT TaobinExpireDay
+
+        Var TaobinExpireYear = TaobinExpireYear + 0
+    EndIf
+
 
 	Var ExpireStrTmp = ""
 	Var ExpireStrTmp = ExpireStrTmp + TaobinExpireDay
@@ -367,6 +437,68 @@
 
 	EndIf
 
+	If LanguageShow = "MYANMAR" Then 
+		Var TaobinLevelDesc3 = TaobinCoupons
+		Var TaobinLevelDesc3 = TaobinLevelDesc3 + " သင့်အတွက် ကူပွန်များရရှိနိုင်ပါသည်။"
+
+		If TaobinLevel = "1" Then
+            Var TaobinLevelDesc1 = "ရှက်နေသောလိပ်အဆင့်"
+            Var TaobinLevelDesc2 = ""
+			Var CurrentLevel = "ရှက်နေသောလိပ်"
+            Var TaobinLeveImg = "/level1.png"
+        EndIf
+
+        If TaobinLevel = "2" Then
+            Var TaobinLevelDesc1 = "လမ်းလျှောက်နေသောလိပ်အဆင့်"
+			Var PointDiff = 150 - CoffeePointRank
+            Var TaobinLevelDesc2 = "ပိုစုဆောင်းပါ။ " + PointDiff
+            Var TaobinLevelDesc2 = TaobinLevelDesc2 + " လိပ်ခွံ "
+            Var TaobinLevelDesc2 = TaobinLevelDesc2 + "\nပျံသန်းသောလိပ်အဆင့်သို့ တိုးတက်ရန်။"
+			Var CurrentLevel = "လမ်းလျှောက်နေသောလိပ်"
+            Var TaobinLeveImg = "/level2.png"
+
+			If CoffeePointRank > 149 Then
+				;Var TaobinLeveImg = "/taoLevel3.png"
+
+				;Var TaobinLevelDesc1 =  "ပျံသန်းနေသောလိပ်အဆင့် "
+            	Var TaobinLevelDesc2 = ""
+				;Var CoffeePointRank = CoffeePointRank - 150
+
+			EndIf
+
+        EndIf
+
+        If TaobinLevel = "3" Then
+            Var TaobinLevelDesc1 = "ပျံသန်းသောလိပ်အဆင့်အထိ။ " + ExpireStrTmp
+
+            Var PointDiff = 200 - CoffeePointRank
+            Var TaobinLevelDesc2 = "ပိုစုဆောင်းပါ။ " + PointDiff
+            Var TaobinLevelDesc2 = TaobinLevelDesc2 + " လိပ်ခွံ "
+			Var TaobinLevelDesc2 = TaobinLevelDesc2 + "အားဖြင့် "
+			Var TaobinLevelDesc2 = TaobinLevelDesc2 + ExpireStrTmp
+            Var TaobinLevelDesc2 = TaobinLevelDesc2 + "\nဆရာလိပ်အဆင့်သို့ တိုးတက်ရန်။"
+			Var CurrentLevel = "ပျံသန်းနေသောလိပ်"
+            Var TaobinLeveImg = "/level3.png"
+
+			If CoffeePointRank > 199 Then
+				;Var TaobinLeveImg = "/taoLevel4.png"
+
+				;Var TaobinLevelDesc1 =  "ဆရာလိပ် "
+            	Var TaobinLevelDesc2 = ""
+				;Var CoffeePointRank = CoffeePointRank - 350
+
+			EndIf
+
+        EndIf
+
+		If TaobinLevel = "4" Then
+            Var TaobinLevelDesc1 = "ဆရာလိပ်အဆင့်အထိ။ " + ExpireStrTmp
+			Var CurrentLevel = "ဆရာလိပ်"
+            Var TaobinLevelDesc2 = ""
+
+            Var TaobinLeveImg = "/level4.png"
+        EndIf
+	EndIf
 
 
 
@@ -670,6 +802,10 @@
 		Var xPointEndDate = 575
 		Var yPointEndDate = 1563
 	EndIf
+	If LanguageShow = "MYANMAR" Then 
+		Var xPointEndDate = 520
+		Var yPointEndDate = 1578
+	EndIf
 
 	Var LuckyDrawTicketFormat = "%03.0f"
 	Var ShowLuckyDrawTicketState = "Enable"
@@ -932,8 +1068,13 @@
 <Value>
 	eval(
 		If show_eng = "true" Then
-			Var return = "" + dayDiff
-			Var return = return + " days left to WIN a chance!"
+			If LanguageShow = "MYANMAR" Then 
+				Var return = "ကံထူးရန်" + dayDiff
+				Var return = return + " ရက်သာ လိုတော့သည်"
+			Else
+				Var return = "" + dayDiff
+				Var return = return + " days left to WIN a chance!"
+			EndIf
 		Else
 			Var return = "เหลืออีก " + dayDiff
 			Var return = return + " วันก่อนจับรางวัล"
@@ -952,7 +1093,11 @@
 <Value>
 	eval(
 		If show_eng = "true" Then
-			Var return = "Buy more, WIN more! Tesla await!"
+			If LanguageShow = "MYANMAR" Then 
+				Var return = "များများဝယ်ပါ၊ များများအနိုင်ရပါ။ Tesla က စောင့်မျှော်နေပါတယ်။"
+			Else
+				Var return = "Buy more, WIN more! Tesla await!"
+			EndIf
 		Else
 			Var return = "ยิ่งดื่ม ยิ่งมีโชค ยิ่งได้ลุ้น! Tesla รออยู่!"
 		EndIf
@@ -985,7 +1130,11 @@
 	<Value>
 		eval(
 			If show_eng = "true" Then
-				Var return = "MEMBERSHIP STATUS"
+				If LanguageShow = "MYANMAR" Then 
+					Var return = "အဖွဲ့ဝင်အခြေအနေ"
+				Else
+					Var return = "MEMBERSHIP STATUS"
+				EndIf
 			Else
 				Var return = "สถานะสมาชิก"
 			EndIf
@@ -1011,7 +1160,11 @@
 	<Value>
 		eval(
 			If show_eng = "true" Then
-				Var return = "TOTAL SHELL BALANCE:"
+				If LanguageShow = "MYANMAR" Then 
+					Var return = "စုစုပေါင်း Shell လက်ကျန်:"
+				Else
+					Var return = "TOTAL SHELL BALANCE:"
+				EndIf
 			Else
 				Var return = "ยอดกระดองสะสม:"
 			EndIf
@@ -1331,7 +1484,7 @@
 
 <Image>
 <X> 172 </X>
-<Y> 1570 </Y>
+<Y> TextEndDateY </Y>
 <Filename> Var( DirImage + "/text8_28.png" )</Filename>
 </Image>
 

xml/page_drinkfail2.xml

@@ -9,6 +9,7 @@
 	; On open
 
 	RootLayoutVisible 3 "hide"
+
 	
 	Var Seeker.TNumberTaobinMember = ""
 

xml/page_lid_straw.xml

@@ -120,8 +120,8 @@
 
 			Var PicturePath = "/mnt/sdcard/coffeevending/taobin_project/image/page_doing_mmr/"
 			Var PictureBegin = "txt_"
-			;Var PictureEnd = "_mmr.png"
-			Var PictureEnd = "_en.png"
+			Var PictureEnd = "_mmr.png"
+			;Var PictureEnd = "_en.png"
 		EndIf
 
 	Else

xml/page_payment_credit3-TopupCash.xml

@@ -61,6 +61,8 @@
 		Var img_popup15 = "/img_popup15-AUS.png"
 	EndIf
 
+    
+    
 	Var CreditAmount = SumCreditAmount
 	Var RemainAmountStr !assigned StringFmt( CreditAmount, DisplayFormat, PreScaleConvertShow )
 	Var showRemaining = charOfBaht + RemainAmountStr

xml/page_show_error.lxml

@@ -24,6 +24,7 @@
 		EndIf
 	EndIf
 
+
 	DEBUGVAR MachineStage
 	DEBUGVAR stop_now
 	DEBUGVAR LanguageShow
@@ -209,7 +210,62 @@
 <Function2>
 	DEBUGVAR MachineStage
 	DEBUGVAR stop_now
-	Var DirImage = "ROOT/taobin_project/image/vending_error_en"
+	If InternationalEnable = 1 Then
+		Var DirImage = "ROOT/taobin_project/image/vending_error_en"
+	Else
+		Var DirImage = "ROOT/taobin_project/image/vending_error"
+	EndIf
+
+	If LanguageShow = "THAI" Then
+		Var DirImage = "ROOT/taobin_project/image/vending_error"
+	EndIf
+	If LanguageShow = "ENG" Then
+		Var DirImage = CountryRootPath + "image/vending_error_en"
+	EndIf
+	If LanguageShow = "JAPAN" Then
+		Var DirImage = CountryRootPath + "image/vending_error_en"
+	EndIf
+	If LanguageShow = "CHINA" Then
+		Var DirImage = CountryRootPath + "image/vending_error_en"
+	EndIf
+	If LanguageShow = "MALAY" Then
+		Var DirImage = CountryRootPath + "image/vending_error_en"
+	EndIf
+	If LanguageShow = "UAE_DUBAI" Then
+		Var DirImage = CountryRootPath + "image/vending_error_en"
+	EndIf
+	If LanguageShow = "MYANMAR" Then
+		Var DirImage = "ROOT/taobin_project/image/vending_error_mmr"
+	EndIf
+
+	If InternationalEnable = 1 Then
+		If CountryName = "Thailand" Then
+			If MachineStage = "show-menu" Then
+				If LanguageShow = "THAI" Then
+					Var DirImage = "ROOT/taobin_project/image/vending_error"
+				EndIf
+				If LanguageShow = "ENG" Then
+					Var DirImage = CountryRootPath + "image/vending_error_en"
+				EndIf
+				If LanguageShow = "JAPAN" Then
+					Var DirImage = CountryRootPath + "image/vending_error_en"
+				EndIf
+				If LanguageShow = "CHINA" Then
+					Var DirImage = CountryRootPath + "image/vending_error_en"
+				EndIf
+				If LanguageShow = "MALAY" Then
+					Var DirImage = CountryRootPath + "image/vending_error_en"
+				EndIf
+				If LanguageShow = "UAE_DUBAI" Then
+					Var DirImage = CountryRootPath + "image/vending_error_en"
+				EndIf
+				If LanguageShow = "MYANMAR" Then
+					Var DirImage = "ROOT/taobin_project/image/vending_error_mmr"
+				EndIf
+			EndIf
+		EndIf
+	EndIf
+
 	If MachineStage = "mcu-upgrade" Then
 		If LanguageShow = "THAI" Then
 			Var DirImage = "ROOT/taobin_project/image/vending_error"

xml/page_thankyou.xml

@@ -73,9 +73,11 @@
 
 		Var BottomText = PicturePath + "text_bottom_eng.png"
 
-		Var DirImage = "ROOT/taobin_project/image/page_thankyou_en"
+		Var DirImage = "ROOT/taobin_project/image/page_thankyou_mmr"
 	EndIf
 
+
+
 	DEBUGVAR StarwState
 	DEBUGVAR LidState
 	DEBUGVAR BottomText
@@ -169,8 +171,12 @@
 	If SaveTheWorldCount < 2  Then
 
 		If InternationalEnable = 1 Then
-			Var script_thankyou = CountryRootPath + "video/script_thank.ev"
-			TRY script_thankyou
+			If CountryName = "Thailand" Then
+				TRY "/mnt/sdcard/coffeevending/taobin_project/video/script2.ev"
+			Else
+				Var script_thankyou = CountryRootPath + "video/script_thank.ev"
+				TRY script_thankyou
+			EndIf
 		Else
 			TRY "/mnt/sdcard/coffeevending/taobin_project/video/script2.ev"
 		EndIf

xml/page_thankyouConti.xml

@@ -305,13 +305,13 @@
 					__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 				EndIf
 				MakeDrinkV1  Seeker.selected_a_drink SelectSugarID
-			
+
 				If CountryName = "Thailand" Then
 
-					If New_Payment = 1 Then 
-						Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"  
+					If New_Payment = 1 Then
+						Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"
 					Else
-						Open "ROOT/taobin_project/xml/page_brewing3.xml"  
+						Open "ROOT/taobin_project/xml/page_brewing3.xml"
 					EndIf
 				Else
 
@@ -320,12 +320,12 @@
 						Open Brew3Inter
 					Else
 						;obsolete
-						If New_Payment = 1 Then 
-							Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"  
+						If New_Payment = 1 Then
+							Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"
 						Else
-							Open "ROOT/taobin_project/xml/page_brewing3.xml"  
+							Open "ROOT/taobin_project/xml/page_brewing3.xml"
 						EndIf
-					EndIf  
+					EndIf
 				EndIf
 			EndIf
      	EndIf
@@ -401,7 +401,6 @@
 		Else
 			Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ"
 		EndIf
-
 		If LanguageShow = "MYANMAR" Then 
 			Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
 		EndIf
@@ -411,7 +410,6 @@
 				Var MachineErrorDetailAll = " Please take a cup."
 			Else
 				Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ"
-
 			EndIf 
 			If LanguageShow = "MYANMAR" Then 
 				Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"

xml/payment_cash.ev

@@ -1,4 +1,11 @@
-If show_eng = "true" Then
+If LanguageShow = "ENG" Then 
+    Var show_eng = "true"
+EndIf
+If LanguageShow = "THAI" Then
+    Var show_eng = "false"
+EndIf
+
+If show_eng = "true" Then 
     Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png"
     Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash.png"
     Var FilenameShowbuttonCashBD = "ROOT/taobin_project/image/page_payment_en/page_payment/bd_cash.png"

xml/process/discount_from_promotion.ev

@@ -102,6 +102,10 @@ EndIf
 
 
 If InternationalEnable = 1 Then
-    Var discount_promo_file = CountryRootPath + "/xml/process/discount_from_promotion.ev"
-    TRY discount_promo_file
+    If CountryName = "Thailand" Then
+        ;do not thing
+    Else
+        Var discount_promo_file = CountryRootPath + "/xml/process/discount_from_promotion.ev"
+        TRY discount_promo_file
+    EndIf
 EndIf