Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

inter/aus/xml/page_catalog_group_dessert.lxml

@@ -604,7 +604,7 @@
 		Var PD_CODE2 = "##-##-##-####"
 		Var PD_CODE3 = "51-03-03-0027"
 		; begin lang 
-		Var aliasName[0] = "Strawberry\nOreo Valcano"
+		Var aliasName[0] = "Strawberry\nOreo Volcano"
 		Var aliasDesc[0] = "Milk,Sugar,\nStrawberry Syrup, Oreo"
 		Var aliasName[1] = ""
 		Var aliasDesc[1] = ""
@@ -699,9 +699,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Strawberry\nOreo Valcano</LanguageSlot1>
+		<LanguageSlot1>Strawberry\nOreo Volcano</LanguageSlot1>
 		<LanguageSlot2></LanguageSlot2>
-		<LanguageSlot3>Strawberry\nOreo Valcano</LanguageSlot3>
+		<LanguageSlot3>Strawberry\nOreo Volcano</LanguageSlot3>
 		<LanguageSlot4></LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6></LanguageSlot6>
@@ -3034,7 +3034,7 @@
 		Var PD_CODE2 = "##-##-##-####"
 		Var PD_CODE3 = "51-03-03-0047"
 		; begin lang 
-		Var aliasName[0] = "Mint Milk\nBiscoff Volcano"
+		Var aliasName[0] = "Mint\nBiscoff Volcano"
 		Var aliasDesc[0] = "Mint Syrup, Milk,\nSugar, Biscof"
 		Var aliasName[1] = ""
 		Var aliasDesc[1] = ""
@@ -3129,9 +3129,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Mint Milk\nBiscoff Volcano</LanguageSlot1>
+		<LanguageSlot1>Mint\nBiscoff Volcano</LanguageSlot1>
 		<LanguageSlot2></LanguageSlot2>
-		<LanguageSlot3>Mint Milk\nBiscoff Volcano</LanguageSlot3>
+		<LanguageSlot3>Mint\nBiscoff Volcano</LanguageSlot3>
 		<LanguageSlot4></LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6></LanguageSlot6>

inter/tha/xml/page_help_center.lxml

@@ -18,6 +18,8 @@
     DEBUGVAR FromSmoothieProcess
 	DEBUGVAR FromBrewingProcess
 
+	Var ChooseProblem = ""
+
 	Var show_btn_next_help = "Invisible"
 
     Var Problem_Cash_State[0] = "Enable"
@@ -56,6 +58,7 @@
 			Var ButtonLanguageListXPosition = 970
 			Var ButtonLanguageListYPosition = 590
 			OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
+			OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/page_catalog.lxml" 
 			OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
 		Else
         	OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
@@ -117,10 +120,6 @@
 <Volume> SoundVolume </Volume>
 <EventClick>
 
-	If  Seeker = "next" Then
-		RootLayoutVisible 3 "hide"
-        Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
-    Else
 	If BaseOnPageBoard = 1 Then
 		Var BaseOnPageBoard = 0
 		Var LanguageButtonEnable = "Enable"
@@ -129,11 +128,12 @@
 		Var ButtonLanguageListXPosition = 970
 		Var ButtonLanguageListYPosition = 590
 		OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
+		OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/page_catalog.lxml" 
 		OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
 	Else
 		OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
 	EndIf
-    EndIf
+
 </EventClick>
 </Button>
 
@@ -200,6 +200,8 @@
 
 			Var show_btn_next_help = "Enable"
 
+			Var ChooseProblem = "Inserted money, amount unchanged"
+			
 			Refresh
         </EventClick>
 	</Button>
@@ -220,6 +222,8 @@
 
 			Var show_btn_next_help = "Enable"
 
+			Var ChooseProblem = "Bill was rejected by the machine"
+
 			Refresh
         </EventClick>
 	</Button>
@@ -240,6 +244,8 @@
 
 			Var show_btn_next_help = "Enable"
 
+			Var ChooseProblem = "Other"
+
 			Refresh
         </EventClick>
 	</Button>
@@ -307,6 +313,8 @@
 
 			Var show_btn_next_help = "Enable"
 
+			Var ChooseProblem = "Found a foreign object"
+			
 			Refresh
         </EventClick>
 	</Button>
@@ -333,6 +341,8 @@
 
 			Var show_btn_next_help = "Enable"
 
+			Var ChooseProblem = "Some ingredients missing"
+			
 			Refresh
         </EventClick>
 	</Button>
@@ -359,6 +369,8 @@
 
 			Var show_btn_next_help = "Enable"
 
+			Var ChooseProblem = "Under-filled cup"
+			
 			Refresh
         </EventClick>
 	</Button>
@@ -385,6 +397,8 @@
 
 			Var show_btn_next_help = "Enable"
 
+			Var ChooseProblem = "Wrong item received"
+			
 			Refresh
         </EventClick>
 	</Button>
@@ -411,6 +425,8 @@
 
 			Var show_btn_next_help = "Enable"
 
+			Var ChooseProblem = "Drink wasn’t blended"
+			
 			Refresh
         </EventClick>
 	</Button>
@@ -437,6 +453,8 @@
 
 			Var show_btn_next_help = "Enable"
 
+			Var ChooseProblem = "Drink didn’t dissolve properly"
+			
 			Refresh
         </EventClick>
 	</Button>
@@ -463,6 +481,8 @@
 
 			Var show_btn_next_help = "Enable"
 
+			Var ChooseProblem = "Cup is messy/dirty"
+			
 			Refresh
         </EventClick>
 	</Button>
@@ -489,6 +509,8 @@
 
 			Var show_btn_next_help = "Enable"
 
+			Var ChooseProblem = "The cup tipped over / drink spilled"
+			
 			Refresh
         </EventClick>
 	</Button>
@@ -515,6 +537,8 @@
 
 			Var show_btn_next_help = "Enable"
 
+			Var ChooseProblem = "Other"
+			
 			Refresh
         </EventClick>
 	</Button>
@@ -625,28 +649,30 @@
 	<Height> "auto" </Height>
     <State> FromSmoothieProcess </State>
 
+    ;<Button>
+		;<X> 0 </X>
+		;<Y> 0 </Y>
+		;<State> Problem_Process_State[0] </State>
+		;<Filename> "ROOT/taobin_project/image/page_help_center/cb_uncheck_problem.png" </Filename>
+		;<FilenamePress> "ROOT/taobin_project/image/page_help_center/cb_checked_problem.png" </FilenamePress>
+		;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+		;<Volume> SoundVolume </Volume>
+		;<EventClick>
+            
+            ;Var Problem_Process_State[0] = "PressForever"
+            ;Var Problem_Process_State[1] = "Enable"
+
+			;Var show_btn_next_help = "Enable"
+
+			;Var ChooseProblem = "Item not received"
+			
+			;Refresh
+        ;</EventClick>
+	;</Button>
+
     <Button>
 		<X> 0 </X>
 		<Y> 0 </Y>
-		<State> Problem_Process_State[0] </State>
-		<Filename> "ROOT/taobin_project/image/page_help_center/cb_uncheck_problem.png" </Filename>
-		<FilenamePress> "ROOT/taobin_project/image/page_help_center/cb_checked_problem.png" </FilenamePress>
-		<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-		<Volume> SoundVolume </Volume>
-		<EventClick>
-            
-            Var Problem_Process_State[0] = "PressForever"
-            Var Problem_Process_State[1] = "Enable"
-
-			Var show_btn_next_help = "Enable"
-			
-			Refresh
-        </EventClick>
-	</Button>
-
-    <Button>
-		<X> 0 </X>
-		<Y> 100 </Y>
 		<State> Problem_Process_State[1] </State>
 		<Filename> "ROOT/taobin_project/image/page_help_center/cb_uncheck_problem.png" </Filename>
 		<FilenamePress> "ROOT/taobin_project/image/page_help_center/cb_checked_problem.png" </FilenamePress>
@@ -659,24 +685,26 @@
 
 			Var show_btn_next_help = "Enable"
 
+			Var ChooseProblem = "Other"
+
 			Refresh
         </EventClick>
 	</Button>
 
-    <Text>
-		<X> 100 </X>
-		<Y> 0 </Y>
-		<Width> 500 </Width>
-		<Height> 75 </Height>
-		<State> Problem_Process_State[0] </State>
-		<Language>
-			<ID> 002312 </ID>
-		</Language>
-	</Text>
+    ;<Text>
+		;<X> 100 </X>
+		;<Y> 0 </Y>
+		;<Width> 500 </Width>
+		;<Height> 75 </Height>
+		;<State> Problem_Process_State[0] </State>
+		;<Language>
+			;<ID> 002312 </ID>
+		;</Language>
+	;</Text>
 
     <Text>
 		<X> 100 </X>
-		<Y> 100 </Y>
+		<Y> 0 </Y>
 		<Width> 500 </Width>
 		<Height> 75 </Height>
 		<State> Problem_Process_State[1] </State>

inter/tha/xml/page_help_center_sending.lxml

@@ -30,18 +30,25 @@
 	If Timeout > 300 Then
 
         If MachineStage = "remove-cup" Then
-			Open "ROOT/taobin_project/xml/page_drinkfail3.xml"
+			OpenInst 2 "ROOT/taobin_project/xml/page_drinkfail3.xml"
 		Else
-			If  NextOrder = "true" Then
-				Var NextOrder = "false"
-
-				TransferVar "next" "curr"
-				Var Seeker = "curr"
-
-				Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
+			If Seeker = "next" Then
+				RootLayoutVisible 3 "hide"
+				OpenInst 2 "ROOT/taobin_project/xml/page_brewing3Conti.xml"
 			Else
-				;Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+				If BaseOnPageBoard = 1 Then
+					Var BaseOnPageBoard = 0
+					Var LanguageButtonEnable = "Enable"
+					Var ButtonLanguageCurrentXPosition = 990
+					Var ButtonLanguageCurrentYPosition = 608
+					Var ButtonLanguageListXPosition = 970
+					Var ButtonLanguageListYPosition = 590
+					OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
+					OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/page_catalog.lxml" 
 					OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
+				Else
+					OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
+				EndIf
 			EndIf
 		EndIf
 	EndIf
@@ -97,17 +104,10 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
-	If  Seeker = "next" Then
-		RootLayoutVisible 3 "hide"
-        Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
-    Else
-        If BoxID = 210699 Then
+
 	OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
 	OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_help_center.lxml"
-        Else
-            Open "ROOT/taobin_project/xml/page_back_to_main.xml"
-        EndIf
-    EndIf
+
 </EventClick>
 </Button>
 
@@ -505,8 +505,20 @@
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
+	StrLen TelephoneNumber TelNumLen
+	If TelNumLen >= MinPhoneNumber Then
 
-	Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
+		DEBUGVAR TelephoneNumber
+		DEBUGVAR ChooseProblem
+
+		PROBLEM TelephoneNumber ChooseProblem
+
+		If MachineStage = "remove-cup" Then
+			OpenInst 2 "ROOT/taobin_project/xml/page_drinkfail3.xml"
+		Else
+			Open "ROOT/taobin_project/inter/tha/xml/page_help_center_sending_conti.lxml"
+		EndIf
+	EndIf
 
 </EventClick>
 </Button>

inter/tha/xml/page_help_center_sending_conti.lxml

@@ -0,0 +1,99 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+;<Sound> "ROOT/taobin_project/sounds/chaching.mp3" </Sound>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	
+    Var Timeout = 0
+
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+		
+	Var Timeout = Timeout + 1
+
+    If Timeout > 5 Then
+        If Seeker = "next" Then
+            RootLayoutVisible 3 "hide"
+            OpenInst 2 "ROOT/taobin_project/xml/page_brewing3Conti.xml"
+        Else
+            Var LanguageButtonEnable = "Enable"
+            Var ButtonLanguageCurrentXPosition = 990
+            Var ButtonLanguageCurrentYPosition = 608
+            Var ButtonLanguageListXPosition = 970
+            Var ButtonLanguageListYPosition = 590
+            OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
+            OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/page_catalog.lxml"
+            OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
+        EndIf
+    EndIf
+
+	TimerReset
+	Refresh
+</EventTimeout> 
+
+
+
+<EventActionOk>
+</EventActionOk>
+
+;include="ROOT/taobin_project/inc/video.inc"
+
+;<Video>
+;<X> 0 </X>
+;<Y> 0 </Y>
+;<Refresh> "Reload" </Refresh>
+;<Loop> "true" </Loop>
+;<Filename> "ROOT/taobin_project/video/taobin_thank2.mp4" </Filename>
+;</Video>
+
+<Image>
+<X> 380 </X>
+<Y> 724 </Y>
+<Width> 911 </Width>
+<Height> 265 </Height>
+<Width> 361 </Width>
+<Height> 486 </Height>
+<Filename> "ROOT/taobin_project/image/collectiing/Businessman_sorry.png" </Filename>
+</Image>
+
+<Image>
+<X> 84 </X>
+<Y> 1314 </Y>
+<Width> 911 </Width>
+<Height> 265 </Height>
+<Filename> "ROOT/taobin_project/image/smoothie/proccess/bg_empty.png" </Filename>
+</Image>
+
+<Text>
+<X> 0 </X>
+<Y> 1344 </Y>
+<Width> 1080 </Width>
+<Height> 85 </Height>
+<Align> Center </Align>
+<Language>
+	<ID> 002354 </ID>
+</Language>
+</Text>
+
+<Text>
+<X> 0 </X>
+<Y> 1430 </Y>
+<Align> Center </Align>
+<Language>
+	<ID> 002355 </ID>
+</Language>
+</Text>
+
+;include="ROOT/taobin_project/inc/video.inc"
+
+
+
+
+
+
+
+</Popup>

inter/tha/xml/page_smoothie_suggest_and_process.xml

@@ -60,6 +60,7 @@
 	Var FromSmoothieProcess = "Enable"
 	Var FromPaymentCash = "Invisible"
 	Var FromBrewingProcess = "Invisible"
+	Var BaseOnPageBoard = 0
 
 	Var TimeOutHandPoint = 0
 	Var ShowHandPoint = "Invisible"

xml/page_back_to_main.xml

@@ -11,7 +11,17 @@
 		Var routeManTest = CountryRootPath + "/xml/route_man_test.lxml"
  		OpenInst 0 routeManTest
 	Else
+		If EnableHelperShow = 1 Then
+			Var LanguageButtonEnable = "Enable"
+			Var ButtonLanguageCurrentXPosition = 990
+			Var ButtonLanguageCurrentYPosition = 608
+			Var ButtonLanguageListXPosition = 970
+			Var ButtonLanguageListYPosition = 590
+			OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
 			OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml"
+		Else
+			OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml"
+		EndIf
 	EndIf
 	
 	If showMultiAds = "true" Then

xml/page_board.xml

@@ -2122,6 +2122,9 @@ PRICE "Reset" "-"
 
 				Var BaseOnPageBoard = 0
 				
+				If CurrHelpCenter = 1 Then
+					; do not thing when open the helper
+				Else
 					If InternationalEnable = 1 Then
 						If CountryName = "Thailand" Then
 							SAVELOG " Thailand Thailand Thailand Thailand Pooon Pooon Pooon Pooon Pooon"
@@ -2150,6 +2153,8 @@ PRICE "Reset" "-"
 					OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
 
 				EndIf
+
+			EndIf
 		EndIf
 
 	EndIf
@@ -2595,6 +2600,9 @@ PRICE "Reset" "-"
 
 	Var OpenFromPageBoard = 1
 
+	If CurrHelpCenter = 1 Then
+		; do not thing when open the helper
+	Else
 		If InternationalEnable = 1 Then
 
 			If CountryName = "Thailand" Then
@@ -2620,6 +2628,7 @@ PRICE "Reset" "-"
 
 		TopView "show"
 		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
+	EndIf
 
 </EventClick>
 </Button>

xml/page_payment_cash.xml

@@ -1292,6 +1292,7 @@
 	Var FromSmoothieProcess = "Invisible"
 	Var FromPaymentCash = "Enable"
 	Var FromBrewingProcess = "Invisible"
+	Var BaseOnPageBoard = 0
 
 	If EnableHelperShow = 1 Then
 		Var Showhelper = "Enable"

xml/page_thankyouConti.xml

@@ -36,7 +36,11 @@
 	DEBUGVAR MachineStage
 	DEBUGVAR NextOrderStatus
 
+	Var text_id_001525 = 001525
+	Var text_id_001526 = 001526
 
+	Var TEXT_ID_STRING_001525 !assigned GetLanguageID(text_id_001525, LanguageShowByIndex)
+	Var TEXT_ID_STRING_001526 !assigned GetLanguageID(text_id_001526, LanguageShowByIndex)
 
 	If show_eng = "true" Then
 		Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2_eng.png"
@@ -414,54 +418,12 @@
     EndIf
 
 	If buttonRemoveCup = "Invisible" Then
-		If show_eng = "true" Then
-			Var MachineErrorDetailAll = " Please take cup."
-		Else
-			Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ"
-		EndIf
-		;inter-text
-		If LanguageShow = "MYANMAR" Then
-			Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
-		EndIf
-		If LanguageShow = "MSC" Then
-			Var MachineErrorDetailAll = " 请拿杯子。"
-		EndIf
-		If LanguageShow = "MTC" Then
-			Var MachineErrorDetailAll = " 請拿杯子。"
-		EndIf
+		Var MachineErrorDetailAll = TEXT_ID_STRING_001525
 	Else
 		If CupChecking = "true" Then
-			If show_eng = "true" Then
-				Var MachineErrorDetailAll = " Please take a cup."
+			Var MachineErrorDetailAll = TEXT_ID_STRING_001525
 		Else
-				Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ"
-			EndIf
-			;inter-text
-			If LanguageShow = "MYANMAR" Then
-				Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
-			EndIf
-			If LanguageShow = "MSC" Then
-				Var MachineErrorDetailAll = " 请拿杯子。"
-			EndIf
-			If LanguageShow = "MTC" Then
-				Var MachineErrorDetailAll = " 請拿杯子。"
-			EndIf
-		Else
-			If show_eng = "true" Then
-				Var MachineErrorDetailAll = " Press button for take a cup."
-			Else
-				Var MachineErrorDetailAll = " กรุณากดปุ่ม แล้วนำแก้วออกก่อนครับ/คะ"
-			EndIf
-			;inter-text
-			If LanguageShow = "MYANMAR" Then
-				Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
-			EndIf
-			If LanguageShow = "MSC" Then
-				Var MachineErrorDetailAll = " 按按钮取杯子。"
-			EndIf
-			If LanguageShow = "MTC" Then
-				Var MachineErrorDetailAll = " 按按鈕取杯子。"
-			EndIf
+			Var MachineErrorDetailAll = TEXT_ID_STRING_001526
 		EndIf
 	EndIf