SGP: add not member check & drink fail

inter/sgp/xml/page_brewing3.lxml

@@ -1614,6 +1614,14 @@
 	Var BREW_COUNT_DOWN_FROM_APP = "off"
 	Var CountDownBrewing = 2
 </EventUnitTest2>
+<EventUnitTest3>
+	Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+</EventUnitTest3>
+<EventUnitTest4>
+	; test drinkfail with phone number
+	Var TelephoneNumberProblem = "12345678"
+	Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+</EventUnitTest4>
 ;
 ;
 ;

inter/sgp/xml/page_collect_point_2.lxml

@@ -162,6 +162,24 @@
 
 				INT TaobinPDPA
 				
+				DEBUGVAR TaobinName
+				Var CatchNotMember = 0
+				If TaobinName = "" Then
+					Var CatchNotMember = 1
+				Endif
+				If TaobinName = "-" Then
+					Var CatchNotMember = 1
+				EndIf
+
+				DEBUGVAR CatchNotMember
+
+				If CatchNotMember = 1 Then
+					Var TaobinName = ""
+					DEBUGVAR MemberPrompt
+					Open MemberPrompt
+				EndIf
+
+
 
 				Var TelephoneNumber = TelephoneNumberX
 				Var TNumberTaobinMemberXXX = TelephoneNumber

inter/sgp/xml/page_drinkfail_sg.lxml

@@ -0,0 +1,267 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xEFEDEA" </Background>
+<Volume> SoundVolume </Volume>
+<Refresh> "Partial" </Refresh>
+<EventOpen>
+	; On open
+
+	Var DirImage = CountryRootPath + "/image/collectiing/"
+
+	
+	Var Timeout = 0
+	StopLongPlay
+
+    Var MachineErrorDetailAll = MachineErrorDetail + " / "
+	Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
+
+	
+
+	DEBUGVAR TelephoneNumberProblem
+
+    ; try-get-user
+    Var payload = "SG/" + TelephoneNumberProblem
+    Var payload = payload + "/-"
+    Var payload = payload + "/-"
+    Var payload = payload + "/-"
+    Var payload = payload + "/-"
+
+    DEBUGVAR payload
+
+    Var Seeker.IsMember = 0
+    Var SendProblemOfMember = 0
+    Var ShowQRByNoMember = "Invisible"
+
+    Var TaobinName = ""
+    
+    If TelephoneNumberProblem = "" Then
+        Var ShowQRByNoMember = "Enable"
+    Else
+        GETACCEXT payload 35
+    EndIf
+
+
+    Var StepX = 1
+    Var Ext1a = ""
+	
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+	
+	
+
+    Var Timeout = Timeout + 1
+
+	If Timeout > 30 Then
+
+        If SendProblemOfMember = 1 Then
+
+            DEBUGVAR TelephoneNumberProblem
+
+            StrLen TelephoneNumberProblem TelNumLen
+            If TelNumLen >= MinPhoneNumber Then  
+
+                Var ProblemID = 7
+
+                Var ChooseProblem = "taobin purchasing problems"
+
+                If Seeker.PayWithQR = 1 Then
+                    Var  VendingTSIDProblem = VendingTSIDTmp
+                    If Seeker.CampaignPayChanel = "promptpay" Then
+                        Var ProblemID = 8
+                        Var ChooseProblem = "taobin purchasing problems(Void Failed)"
+                    EndIf
+                Else
+                    Var VendingTSIDProblem = VendingTSID
+                EndIf
+
+                
+                PROBLEM2  TelephoneNumberProblem ProblemID ChooseProblem VendingTSIDProblem 
+
+            EndIf
+
+        EndIf
+
+
+
+
+
+        If MachineStage = "remove-cup" Then
+			Open "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" 
+			Else
+				Open "ROOT/taobin_project/xml/page_back_to_main.xml"  
+			EndIf
+		EndIf
+	EndIf
+
+	
+
+	TimerReset
+
+</EventTimeout> 
+
+
+
+;include="ROOT/taobin_project/inc/video.inc"
+
+<EventActionOk>
+
+If StepX = 1 Then
+    If Ext1a = "ok" Then
+        Var TaobinName = Ext1d
+
+        If TaobinName = "" Then
+            Var Seeker.IsMember = 0
+        Else
+            If TaobinName = "-" Then
+                Var Seeker.IsMember = 0
+            Else
+                Var Seeker.IsMember = 1
+            EndIf
+        EndIf
+
+        DEBUGVAR Seeker.IsMember
+
+        If Seeker.IsMember = 1 Then
+            SAVELOG "Already member, will send problem"
+            Var SendProblemOfMember = 1
+        Else
+            SAVELOG "Not member, show QR"
+            Var SendProblemOfMember = 0
+            Var ShowQRByNoMember = "Enable"
+        EndIf
+
+    Else
+        Var Seeker.IsMember = 0
+        SAVELOG "StepX.error, show QR"
+        Var ShowQRByNoMember = "Enable"
+    EndIf
+
+EndIf
+
+
+</EventActionOk>
+
+<EventActionError>
+
+If StepX = 1 Then
+
+    SAVELOG "ActionError show QR"
+    Var ShowQRByNoMember = "Enable"
+
+EndIf
+
+
+</EventActionError>
+
+
+
+
+
+
+
+
+<Image>
+<X> 43 </X>
+<Y> 428 </Y>
+<Filename> Var( DirImage + "/text_11.png" ) </Filename>
+</Image>
+
+<Image>
+<X> 429 </X>
+<Y> 1301 </Y>
+<State> ShowQRByNoMember </State>
+<Filename> Var( DirImage + "/QR_contract.png" ) </Filename>
+</Image>
+
+;<Image>
+;<X> 190 </X>
+;<Y> 1548 </Y>
+;<Filename> Var( DirImage + "/text13.png" ) </Filename>
+;</Image>
+
+
+<Button>
+<X> 392 </X>
+<Y> 1720 </Y>
+<Filename> Var( DirImage + "/bn_close.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bp_close.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+
+	StrLen TelephoneNumberProblem TelNumLen
+
+    If SendProblemOfMember = 1 Then
+
+        If TelNumLen >= MinPhoneNumber Then 
+
+            Var ProblemID = 7
+
+            Var ChooseProblem = "taobin purchasing problems" 
+
+            If Seeker.PayWithQR = 1 Then
+                Var  VendingTSIDProblem = VendingTSIDTmp
+
+                If Seeker.CampaignPayChanel = "promptpay" Then
+                    Var ProblemID = 8
+                    Var ChooseProblem = "taobin purchasing problems(Void Failed)"
+                EndIf
+            Else
+                Var VendingTSIDProblem = VendingTSID
+            EndIf
+
+            
+            PROBLEM2  TelephoneNumberProblem ProblemID ChooseProblem VendingTSIDProblem 
+
+        EndIf
+
+    EndIf
+
+
+
+
+			
+	If MachineStage = "remove-cup" Then
+		Open "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" 
+		Else
+			Open "ROOT/taobin_project/xml/page_back_to_main.xml"  
+		EndIf
+	EndIf
+
+
+</EventClick>
+</Button>
+
+<Text>
+<X> 5 </X>
+<Y> 1868 </Y>
+<Size> 24 </Size>
+<Align> Center </Align>
+<Width> 1080 </Width>
+<Font> RobotoRegular </Font>
+<Color> 0xDE794E </Color>
+<Value> MachineErrorDetailAll </Value>
+</Text>
+
+
+</Popup>

inter/sgp/xml/page_member_prompt.lxml

@@ -9,6 +9,17 @@
     Var DisplayPrompt = "Enable"
     Var DisplayQR = "Invisible"
 
+    If CatchNotMember = 1 Then
+        Var DisplayPrompt = "Invisible"
+        Var DisplayQR = "Enable"
+
+        Var Timeout = 10
+        Var CatchNotMember = 0
+    Else
+
+        Var Timeout = 0
+    EndIf
+
     ; img
     Var ImgDir = CountryRootPath + "/image/page_member/"
     Var PromptDialogImg = ImgDir + "ask_member_dialog.png"
@@ -18,7 +29,6 @@
     Var NoPressButton = ImgDir + "bp_no.png"
     Var QRImg = ImgDir + "qr_regis.png"
     
-    Var Timeout = 0
     Var UseSGPCollectFlag = 0
 
     DEBUGVAR YesButton

xml/page_board.xml

@@ -862,6 +862,14 @@
 			Var SettingIgnoreCollectPoint = 0
 		EndIf
 
+		READ_FILE "/mnt/sdcard/coffeevending/use_pt_dev" use_pt_dev
+		STRCONTAIN "1" use_pt_dev enable_pt_mode_by_cfg
+
+		If enable_pt_mode_by_cfg = "true" Then
+			DEBUGVAR enable_pt_mode_by_cfg
+			Var SettingIgnoreCollectPoint = 0
+		EndIf
+
 		Var SettingVideoBrewingUseCommon = 1
 
 		Var MinPhoneNumber = 8
@@ -1280,7 +1288,7 @@
 	DEBUGVAR ProfileIndex[9]
 	DEBUGVAR ProfileIndex[10]
 	PRICE "Reload" ""
- </EventUnitTest5>
+</EventUnitTest5>
 
 
 <EventUnitTest6>
@@ -1325,6 +1333,28 @@
 	
  </EventUnitTest7>
 
+ <EventUnitTest8>
+	Var XMLProfile = "$Discount90Per"
+	CacheVarStr "put" XMLProfile
+	PRICE "Reset" "-"
+	PRICE "Load" "-"
+	PRICE "CheckAndApply" XMLProfile
+
+	DEBUGVAR ProfileIndex[0]
+	DEBUGVAR ProfileIndex[1]
+	DEBUGVAR ProfileIndex[2]
+	DEBUGVAR ProfileIndex[3]
+	DEBUGVAR ProfileIndex[4]
+	DEBUGVAR ProfileIndex[5]
+	DEBUGVAR ProfileIndex[6]
+	DEBUGVAR ProfileIndex[7]
+	DEBUGVAR ProfileIndex[8]
+	DEBUGVAR ProfileIndex[9]
+	DEBUGVAR ProfileIndex[10]
+	PRICE "Reload" ""
+	
+ </EventUnitTest8>
+
 <EventDrink>
 	SAVELOG "EventDrink EventDrink EventDrink EventDrink EventDrink "
 </EventDrink>

xml/page_drinkfail2.xml

@@ -15,7 +15,9 @@
 	DEBUGVAR Seeker.PromotionIDCurrentOrder
 
 
-	
+	If CountryName = "Singapore" Then
+		Open "ROOT/taobin_project/inter/sgp/xml/page_drinkfail_sg.lxml"
+	EndIf
 
 
 
@@ -67,14 +69,22 @@
 			If CountryName = "Malaysia" Then
 				Open "ROOT/taobin_project/xml/page_drinkfail5.xml"
 			Else
-				Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml" 
+				If CountryName = "Singapore" Then
+					Open "ROOT/taobin_project/inter/sgp/xml/page_drinkfail_sg.lxml"
+				Else
+					Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml" 
+				EndIf
 			EndIf
 		Else
 			;inter-xml-open
 			If CountryName = "Malaysia" Then
 				Open "ROOT/taobin_project/xml/page_drinkfail5.xml"
 			Else
-				Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml" 
+				If CountryName = "Singapore" Then
+					Open "ROOT/taobin_project/inter/sgp/xml/page_drinkfail_sg.lxml"
+				Else
+					Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml" 
+				EndIf
 			EndIf
 
 		EndIf
@@ -595,15 +605,19 @@
 			If CountryName = "Malaysia" Then
 				Open "ROOT/taobin_project/xml/page_drinkfail5.xml"
 			Else
-				If  NextOrder = "true" Then
+				If CountryName = "Singapore" Then
-					Var NextOrder = "false"
+					Open "ROOT/taobin_project/inter/sgp/xml/page_drinkfail_sg.lxml"
-
-					TransferVar "next" "curr"
-					Var Seeker = "curr"
-							
-					Open "ROOT/taobin_project/xml/page_thankyouConti.xml" 
 				Else
-					Open "ROOT/taobin_project/xml/page_back_to_main.xml"  
+					If  NextOrder = "true" Then
+						Var NextOrder = "false"
+
+						TransferVar "next" "curr"
+						Var Seeker = "curr"
+								
+						Open "ROOT/taobin_project/xml/page_thankyouConti.xml" 
+					Else
+						Open "ROOT/taobin_project/xml/page_back_to_main.xml"  
+					EndIf
 				EndIf
 			EndIf
 		EndIf