THAI INTER: Fix Sugar 0 cal enable, catalog to recommend fix path

inter/tha/menu/lang.tsv

@@ -81,6 +81,9 @@
 000065		Sweetness level	ระดับความหวาน	甜度		Sweetness level	ချိုမြိန်မှုအဆင့်
 000066		Straw and Lid	หลอด และ ฝา	吸管和盖子		Straw and Lid	ကောက်ရိုးနှင့်အဖုံး
 000067		Drink Type	ประเภทเครื่องดื่ม	饮料菜单		Drink Type	သောက်ရန်အမျိုးအစား
+		Font=Kanit,Type=Medium,Size=22,Color=0x513C2F,LineHeight=32	Font=Kanit,Type=Medium,Size=24,Color=0x513C2F,LineHeight=32			Font=Kanit,Type=Medium,Size=22,Color=0x513C2F,Align=Center	Font=Kanit,Type=Medium,Size=22,Color=0x513C2F,LineHeight=32
+000068		Sugar	น้ำตาล				သကြား
+000069		0 cal sugar syrup\n[Diabetes-friendly and keto-approved as it does not cause any fluctuations in blood sugar levels.###Font=KanitLight,Size=14]	น้ำตาล 0 cal\n[ไม่มีผลต่อน้ำตาลในเลือด คีโต และ เบาหวานทานได้###Font=KanitLight,Size=15]				သကြား 0 cal ရည်\n[သွေးတွင်းသကြားဓာတ်အဆင့်ကို အတက်အကျ မဖြစ်စေသောကြောင့် ဆီးချိုရောဂါနှင့် ကီတို-အတည်ပြုထားသည်။###Font=KanitLight,Size=15]
 							
 	Text 						
 		Font=Kanit,Type=Regular,Size=36,Color=0x513C2F	Font=Kanit,Type=Regular,Size=36,Color=0x513C2F			Font=Kanit,Type=Regular,Size=36,Color=0x513C2F	Font=Kanit,Type=Regular,Size=36,Color=0x513C2F
@@ -1088,7 +1091,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. ทดสอบการบด				

inter/tha/xml/multi/page_catalog.lxml

@@ -348,7 +348,7 @@
 <EventClick> 
 	
 	Var OpenFromMulti = 1
-	TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
+	TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/event/script_common_for_open_promotion_xml.ev"
 	RootLayoutVisible 3 "hide"
 	RootLayoutVisible 13 "hide"
 	

inter/tha/xml/page_topping_select6.lxml

@@ -238,7 +238,7 @@
 		Var custom_coffee_level_darker_text_x = 880
 		Var custom_coffee_level_dark_text_x = 790
 
-		Var SugarZeroCalPrice_X = 482
+		Var SugarZeroCalPrice_X = 495
 
 	EndIf
 
@@ -280,6 +280,7 @@
 		Var custom_coffee_level_dark_text_x = 785
 
 		Var SugarZeroCalPrice_X = 540
+		Var Text_SugarZeroCalPrice_X = 480
 	EndIf
 
 
@@ -587,6 +588,11 @@
 	Var StringCoffeeLevelWithPrice3 = ""
 	;Var StringToppingShotWithPrice = ""
 
+	DEBUGVAR SugarNormalCheck
+	DEBUGVAR SugarZeroCalCheck
+	Var SugarZeroCalOption = "Enable"
+	
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout>
@@ -887,6 +893,11 @@
 		Var SugarZeroCalPrice_X = 540
 		Var text_cancel_xc = 53
 		Var text_cancel_yc = 16
+		Var Text_SugarZeroCalPrice_X = 360
+		Var Text_SugarNormalPrice_Y = 80
+		If show_name_len > 24 Then
+			Var showname = showname + "###size=54"
+		EndIf
 		If BGSugar = "Enable" Then
 			Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3"
 		EndIf
@@ -902,9 +913,14 @@
 		Var text_x_add_oreo_price = 420
 		Var text_show_normal_x = 386
 		Var text_show_blend_x = 852
-		Var SugarZeroCalPrice_X = 482
+		Var SugarZeroCalPrice_X = 495
 		Var text_cancel_xc = 53
 		Var text_cancel_yc = 16
+		Var Text_SugarZeroCalPrice_X = 360
+		Var Text_SugarNormalPrice_Y = 75
+		If show_name_len > 0 Then
+			Var showname = showname + "###size=68"
+		EndIf
 		Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3"
 		If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then
 			Var ShowTextSelfTestCountDown ="กรุณารอสักครู่ (" + MACHINE_SELF_TEST_COUNT_DOWN
@@ -921,8 +937,14 @@
 		Var text_show_normal_x = 568
 		Var text_show_blend_x = 892
 		Var SugarZeroCalPrice_X = 540
+		Var Text_SugarZeroCalPrice_X = 360
+		Var Text_SugarNormalPrice_Y = 80
 		Var text_cancel_xc = 5
 		Var text_cancel_yc = 30
+		Var show_eng = "true"
+		If show_name_len > 24 Then
+			Var showname = showname + "###size=54"
+		EndIf
 		Var DirImage = "ROOT/taobin_project/image/topping_mmr"
 		If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then
 			Var ShowTextSelfTestCountDown = "ခဏစောင့်ပါ။ (" + MACHINE_SELF_TEST_COUNT_DOWN
@@ -954,9 +976,17 @@
 	Var StringCoffeeLevelWithPrice3 = StringCoffeeLevelWithPrice3 + CustomCoffeeLevelAdditionalPrice[3]
 
 
-	Var showname = aliasName[LanguageShowByIndex]
+	;Var showname = aliasName[LanguageShowByIndex]
-	Var showdesc = aliasName[LanguageShowByIndex]
+	;Var showdesc = aliasName[LanguageShowByIndex]
 
+	If SelectDrinkType = 1 Then
+		Var showname = NameLang[IndexDrinktType][LanguageShowByIndex]
+		Var showdesc = DescLang[IndexDrinktType][LanguageShowByIndex]
+	Else
+		Var showname = aliasName[LanguageShowByIndex]
+		Var showdesc = aliasName[LanguageShowByIndex]
+		
+	EndIf
 		
 
 	DEBUGVAR showname
@@ -1068,7 +1098,7 @@
 		Var custom_coffee_level_darker_text_x = 880
 		Var custom_coffee_level_dark_text_x = 790
 
-		Var SugarZeroCalPrice_X = 482
+		Var SugarZeroCalPrice_X = 495
 
 	EndIf
 
@@ -1147,95 +1177,6 @@
 </EventClick>
 </LangSwitch>
 
-<EventLanguageOnChange>
-	DEBUGVAR LanguageShowByIndex
-	DEBUGVAR LanguageShow
-
-	If LanguageShow = "ENG" Then
-		Var topping_shot_price_x = 630
-		Var text_x_add_oreo_price = 510
-		Var text_show_normal_x = 408
-		Var text_show_blend_x = 872
-		Var SugarZeroCalPrice_X = 540
-		If BGSugar = "Enable" Then
-			Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3"
-		EndIf
-	EndIf
-	If LanguageShow = "THAI" Then
-		Var topping_shot_price_x = 600
-		Var text_x_add_oreo_price = 490
-		Var text_show_normal_x = 386
-		Var text_show_blend_x = 852
-		Var SugarZeroCalPrice_X = 482
-		Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3"
-	EndIf
-	If LanguageShow = "MALAY" Then
-		Var topping_shot_price_x = 630
-		Var text_x_add_oreo_price = 510
-		Var text_show_normal_x = 408
-		Var text_show_blend_x = 872
-		Var SugarZeroCalPrice_X = 540
-		Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3"
-	EndIf
-	If LanguageShow = "MYANMAR" Then 
-		Var show_eng = "true"
-		DEBUGVAR show_eng
-		Var topping_shot_price_x = 630
-		Var text_x_add_oreo_price = 470
-		Var text_show_normal_x = 568
-		Var text_show_blend_x = 872
-		Var SugarZeroCalPrice_X = 540
-		Var DirImage = "ROOT/taobin_project/image/topping_mmr"
-	EndIf
-	
-	If SelectDrinkType = 1 Then
-		Var showname = NameLang[IndexDrinktType][LanguageShowByIndex]
-		Var showdesc = DescLang[IndexDrinktType][LanguageShowByIndex]
-	Else
-		Var showname = aliasName[LanguageShowByIndex]
-		Var showdesc = aliasName[LanguageShowByIndex]
-		
-	EndIf
-
-	DEBUGVAR showname
-	DEBUGVAR showdesc
-	
-	BackslashNToEnter showname
-	BackslashNToEnter showdesc
-	CRLFToSpace showname
-	CRLFToSpace showdesc
-
-	If LanguageShow = "ENG" Then
-		If show_name_len > 24 Then
-			Var showname = showname + "###size=54"
-		EndIf
-
-    EndIf
-    If LanguageShow = "THAI" Then
-		If show_name_len > 0 Then
-			Var showname = showname + "###size=68"
-		EndIf
-    EndIf
-    If LanguageShow = "MYANMAR" Then 
-		Var show_eng = "true"
-		DEBUGVAR show_eng
-		If show_name_len > 24 Then
-			Var showname = showname + "###size=54"
-		EndIf
-	EndIf
-
-	
-	Var Timeout = 0
-
-	OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
-	
-
-	RefreshAll
-
-</EventLanguageOnChange>
-
-
-
 ; back
 <Button>
 <X> 19 </X>
@@ -3071,14 +3012,12 @@
 			Var return = "Invisible"
 		EndIf
 	EndIf
-
-	Var SugarZeroCalOption = "Invisible"
 )
 </State>
 ; sugar layout
 <Image>
 <State> "Enable" </State>
-<Filename> "ROOT/taobin_project/image/topping_inter//bg_sugar_bank_button.png" </Filename>
+<Filename> "ROOT/taobin_project/image/topping_inter/bg_sugar_bank_button.png" </Filename>
 </Image>
 
 <Text>
@@ -4343,18 +4282,18 @@
 </Button>
 
 <Text>
-<X> 92 </X>
+<X> 95 </X>
-<Y> 55 </Y>
+<Y> Text_SugarNormalPrice_Y </Y>
-<Width> 150 </Width>
+<Width> 100 </Width>
-<Height> 34 </Height>
+<Height> 72 </Height>
 <Language>
-	<ID> 000105 </ID>
+	<ID> 000068 </ID>
 </Language>
 </Text>
 
 <Text>
 <X> 171 </X>
-<Y> 55 </Y>
+<Y> 75 </Y>
 <Width> 100 </Width>
 <Height> 34 </Height>
 <Font> KanitRegularTTF </Font>
@@ -4364,28 +4303,18 @@
 </Text>
 
 <Text>
-<X> 357 </X>
+<X> Text_SugarZeroCalPrice_X </X>
-<Y> 69 </Y>
+<Y> 77 </Y>
-<Width> 250 </Width>
-<Height> 34 </Height>
-<Language>
-	<ID> 000106 </ID>
-</Language>
-</Text>
-
-<Text>
-<X> 357 </X>
-<Y> 96 </Y>
 <Width> 600 </Width>
-<Height> 21 </Height>
+<Height> 120 </Height>
 <Language>
-	<ID> 000107 </ID>
+	<ID> 000069 </ID>
 </Language>
 </Text>
 
 <Text>
 <X> SugarZeroCalPrice_X </X>
-<Y> 67 </Y>
+<Y> 75 </Y>
 <Font> KanitRegularTTF </Font>
 <State> "Enable" </State>
 <Size> 28 </Size>