diff --git a/inter/sgp/image/collectiing/QR_contract.png b/inter/sgp/image/collectiing/QR_contract.png
new file mode 100644
index 00000000..5a6aee0b
Binary files /dev/null and b/inter/sgp/image/collectiing/QR_contract.png differ
diff --git a/inter/sgp/image/collectiing/bn_close.png b/inter/sgp/image/collectiing/bn_close.png
new file mode 100644
index 00000000..74a26717
Binary files /dev/null and b/inter/sgp/image/collectiing/bn_close.png differ
diff --git a/inter/sgp/image/collectiing/text_11.png b/inter/sgp/image/collectiing/text_11.png
new file mode 100644
index 00000000..86b76c05
Binary files /dev/null and b/inter/sgp/image/collectiing/text_11.png differ
diff --git a/inter/sgp/xml/page_brewing3.lxml b/inter/sgp/xml/page_brewing3.lxml
index 50b3e1f4..0e01c76c 100644
--- a/inter/sgp/xml/page_brewing3.lxml
+++ b/inter/sgp/xml/page_brewing3.lxml
@@ -1614,6 +1614,14 @@
Var BREW_COUNT_DOWN_FROM_APP = "off"
Var CountDownBrewing = 2
+
+ Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+
+
+ ; test drinkfail with phone number
+ Var TelephoneNumberProblem = "12345678"
+ Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+
;
;
;
diff --git a/inter/sgp/xml/page_collect_point_2.lxml b/inter/sgp/xml/page_collect_point_2.lxml
index 84f3d8e6..bb4934ca 100644
--- a/inter/sgp/xml/page_collect_point_2.lxml
+++ b/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
diff --git a/inter/sgp/xml/page_drinkfail_sg.lxml b/inter/sgp/xml/page_drinkfail_sg.lxml
new file mode 100644
index 00000000..49c79863
--- /dev/null
+++ b/inter/sgp/xml/page_drinkfail_sg.lxml
@@ -0,0 +1,267 @@
+
+ "Enable"
+ 1080
+ 1920
+ "0xEFEDEA"
+ SoundVolume
+ "Partial"
+
+ ; 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 = ""
+
+
+ 1000
+
+
+
+
+ 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
+
+
+
+
+
+;include="ROOT/taobin_project/inc/video.inc"
+
+
+
+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
+
+
+
+
+
+
+If StepX = 1 Then
+
+ SAVELOG "ActionError show QR"
+ Var ShowQRByNoMember = "Enable"
+
+EndIf
+
+
+
+
+
+
+
+
+
+
+
+
+ 43
+ 428
+ Var( DirImage + "/text_11.png" )
+
+
+
+ 429
+ 1301
+ ShowQRByNoMember
+ Var( DirImage + "/QR_contract.png" )
+
+
+;
+; 190
+; 1548
+; Var( DirImage + "/text13.png" )
+;
+
+
+
+
+
+ 5
+ 1868
+ 24
+ Center
+ 1080
+ RobotoRegular
+ 0xDE794E
+ MachineErrorDetailAll
+
+
+
+
\ No newline at end of file
diff --git a/inter/sgp/xml/page_member_prompt.lxml b/inter/sgp/xml/page_member_prompt.lxml
index 5f9dfe7e..bb907fef 100644
--- a/inter/sgp/xml/page_member_prompt.lxml
+++ b/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"
@@ -17,8 +28,7 @@
Var YesPressButton = ImgDir + "bp_yes.png"
Var NoPressButton = ImgDir + "bp_no.png"
Var QRImg = ImgDir + "qr_regis.png"
-
- Var Timeout = 0
+
Var UseSGPCollectFlag = 0
DEBUGVAR YesButton
diff --git a/xml/page_board.xml b/xml/page_board.xml
index 848b6363..57a69609 100644
--- a/xml/page_board.xml
+++ b/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" ""
-
+
@@ -1325,6 +1333,28 @@
+
+ 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" ""
+
+
+
SAVELOG "EventDrink EventDrink EventDrink EventDrink EventDrink "
diff --git a/xml/page_drinkfail2.xml b/xml/page_drinkfail2.xml
index 2819559a..b81f6ecf 100644
--- a/xml/page_drinkfail2.xml
+++ b/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
- Var NextOrder = "false"
-
- TransferVar "next" "curr"
- Var Seeker = "curr"
-
- Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
+ If CountryName = "Singapore" Then
+ Open "ROOT/taobin_project/inter/sgp/xml/page_drinkfail_sg.lxml"
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