diff --git a/image/collect_point1/bn_back.png b/image/collect_point1/bn_back.png
new file mode 100644
index 00000000..ee1a9f3b
Binary files /dev/null and b/image/collect_point1/bn_back.png differ
diff --git a/image/collect_point1/bp_back.png b/image/collect_point1/bp_back.png
new file mode 100644
index 00000000..c0ff09bb
Binary files /dev/null and b/image/collect_point1/bp_back.png differ
diff --git a/image/collect_point1/text_6.png b/image/collect_point1/text_6.png
new file mode 100644
index 00000000..196d5c30
Binary files /dev/null and b/image/collect_point1/text_6.png differ
diff --git a/image/collect_point1_en/bn_back.png b/image/collect_point1_en/bn_back.png
new file mode 100644
index 00000000..f707c046
Binary files /dev/null and b/image/collect_point1_en/bn_back.png differ
diff --git a/image/collect_point1_en/bp_back.png b/image/collect_point1_en/bp_back.png
new file mode 100644
index 00000000..e910d85d
Binary files /dev/null and b/image/collect_point1_en/bp_back.png differ
diff --git a/image/collect_point1_en/bp_positive.png b/image/collect_point1_en/bp_positive.png
index 5264463e..78a8608d 100644
Binary files a/image/collect_point1_en/bp_positive.png and b/image/collect_point1_en/bp_positive.png differ
diff --git a/image/collect_point1_en/text_6.png b/image/collect_point1_en/text_6.png
new file mode 100644
index 00000000..523ce149
Binary files /dev/null and b/image/collect_point1_en/text_6.png differ
diff --git a/image/collectiing/img_popupTrue.png b/image/collectiing/img_popupTrue.png
deleted file mode 100644
index 15d707a3..00000000
Binary files a/image/collectiing/img_popupTrue.png and /dev/null differ
diff --git a/image/collectiing_en/img_popupTrue.png b/image/collectiing_en/img_popupTrue.png
deleted file mode 100644
index 911cffc2..00000000
Binary files a/image/collectiing_en/img_popupTrue.png and /dev/null differ
diff --git a/image/page_payment/img_popup18-2.png b/image/page_payment/img_popup18-2.png
new file mode 100644
index 00000000..42a8009d
Binary files /dev/null and b/image/page_payment/img_popup18-2.png differ
diff --git a/image/page_payment/img_popup19-2.png b/image/page_payment/img_popup19-2.png
new file mode 100644
index 00000000..96ad22cd
Binary files /dev/null and b/image/page_payment/img_popup19-2.png differ
diff --git a/image/page_payment_en/page_payment/img_popup18-2.png b/image/page_payment_en/page_payment/img_popup18-2.png
new file mode 100644
index 00000000..5cceb2b9
Binary files /dev/null and b/image/page_payment_en/page_payment/img_popup18-2.png differ
diff --git a/image/page_payment_en/page_payment/img_popup19-2.png b/image/page_payment_en/page_payment/img_popup19-2.png
new file mode 100644
index 00000000..ba8c9bf1
Binary files /dev/null and b/image/page_payment_en/page_payment/img_popup19-2.png differ
diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml
index e7c2b197..28ec233f 100644
--- a/xml/page_brewing3.xml
+++ b/xml/page_brewing3.xml
@@ -1031,8 +1031,8 @@
Else
- If Seeker.VendingCode = "MKFO" Then
- Var Cid = 29
+ If Seeker.VendingCode = "MKFOO" Then
+ Var Cid = 31
Var PointCrm = "2"
Var GetScore = "1"
Var TelephoneNumberx = "0899999999"
diff --git a/xml/page_brewing3Conti.xml b/xml/page_brewing3Conti.xml
index 2e4a72c3..8db9907d 100644
--- a/xml/page_brewing3Conti.xml
+++ b/xml/page_brewing3Conti.xml
@@ -722,8 +722,8 @@
Else
- If Seeker.VendingCode = "MKFO" Then
- Var Cid = 29
+ If Seeker.VendingCode = "MKFOO" Then
+ Var Cid = 31
Var PointCrm = "2"
Var GetScore = "1"
Var TelephoneNumberx = "0899999999"
diff --git a/xml/page_identityMember_consent.xml b/xml/page_identityMember_consent.xml
new file mode 100644
index 00000000..3e79ed01
--- /dev/null
+++ b/xml/page_identityMember_consent.xml
@@ -0,0 +1,176 @@
+
+ "Enable"
+ 1080
+ 1920
+ "0xeae6e1"
+ SoundVolume
+
+
+ Var CamFlag = 0
+ Var CamCount = 0
+ Var Timeout = 0
+ Var ShutterResult = "-"
+
+ Var AdultFlag = 1
+
+ If AdultFlag = 1 Then
+
+ Var AdultFlag = 0
+
+ DEBUGVAR SystemDate
+ Var sdate = ""
+ Var sdate = SystemDate
+ Var sdateday = ""
+ Var sdatemonth = ""
+ Var sdateyear = ""
+ SPLIT sdate "/" 1 sdateday
+ SPLIT sdate "/" 2 sdatemonth
+ SPLIT sdate "/" 3 sdateyear
+ INT sdateday
+ INT sdatemonth
+ INT sdateyear
+ Var AdultState = "Enable"
+ Var AdultState1 = "Enable"
+
+ Var countAdultS2 = 0
+ Var AdultFlag2 = 1
+ EndIf
+
+ If show_eng = "true" Then
+ Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
+ Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_en"
+ Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
+
+ Else
+ Var DirImage = "ROOT/taobin_project/image/page_payment"
+ Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend"
+ Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
+ EndIf
+
+
+ If CameraCount = 1 Then
+
+ EndIf
+
+ Var IDBirthdate = ""
+
+ Var LivenessResult = ""
+
+ Var CountDownDelayReadCardID = 5
+ DEBUGVAR CameraCount
+ ;STOPCARDID
+ Var LivenessShowString = ""
+
+ Var CameraStage = "Invisible"
+ Var IDcardStage = "Enable"
+ Var IDcardStageText = "Enable"
+ Var load_gif_stage = "Invisible"
+ Var IDcardTextStatus = "โปรดเสียบบัตรประชาชน \nเพื่อดำเนินการต่อ"
+
+ Var LivenessRestartCount = 0
+ Var FailTrickCount = 0
+
+ Var FailState = "Invisible"
+
+ Var StepGetServer = 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1000
+
+
+
+ DEBUGVAR Timeout
+ Var Timeout = Timeout + 1
+
+ If Timeout > 120 Then
+ Open "ROOT/taobin_project/xml/page_catalog2.xml"
+ EndIf
+
+
+ Refresh
+ TimerReset
+
+
+
+
+
+; back
+
+
+
+ 75
+ 408
+ "Enable"
+ Var( DirImage + "/img_popup19-2.png" )
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/xml/page_identityMember_number.xml b/xml/page_identityMember_number.xml
new file mode 100644
index 00000000..51ea0781
--- /dev/null
+++ b/xml/page_identityMember_number.xml
@@ -0,0 +1,503 @@
+
+ "Enable"
+ 1080
+ 1920
+ "0xeae6e1"
+ SoundVolume
+; "Partial"
+
+ ; On open
+
+
+
+ Var ShowErrorText = "Invisible"
+
+ Var Tel_Confirm_State = "Invisible"
+ Var ShowTextNumber = "Enable"
+ Var Timeout = 0
+ Var TelephoneNumber = ""
+ Var TelephoneNumberX = ""
+
+ Var TimeOutPlay = 0
+
+ If show_eng = "true" Then
+ Var DirImage = "ROOT/taobin_project/image/collect_point1_en"
+ ;Play "ROOT/taobin_project/sound_eng/Reward_final.mp3"
+
+ Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
+ Else
+ Var DirImage = "ROOT/taobin_project/image/collect_point1"
+ ;Play "ROOT/taobin_project/sound_thai/dontforget_number.mp3"
+
+ Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
+ EndIf
+
+
+
+
+
+
+ Var Tel_Confirm_Flag = 1
+
+ Var MaxNumber = 10
+
+ If CountryName = "Malaysia" Then
+ Var MaxNumber = 11
+ EndIf
+
+ If CountryName = "Indonesia" Then
+ Var MaxNumber = 12
+ EndIf
+
+
+
+ 1000
+
+
+
+ StrLen TelephoneNumber TelNumLen
+ If TelNumLen > 0 Then
+ Var ShowTextNumber = "Invisible"
+ EndIf
+
+ DEBUGVAR Timeout
+
+ Var Timeout = Timeout + 1
+ If Timeout > 30 Then
+
+
+ Open "ROOT/taobin_project/xml/page_catalog2.xml"
+ EndIf
+
+
+
+ Refresh
+ TimerReset
+
+
+
+
+
+ 0
+ 380
+ "ROOT/taobin_project/image/collectiing/alpha.png"
+
+
+
+
+
+
+ 158
+ 665
+ "ROOT/taobin_project/image/collectiing/img_popup1.png"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 873
+ 1080
+ Center
+ 62
+ RobotoBlack
+ 0x513C2F
+ TelephoneNumber
+ Telnum-mask-1
+
+
+
+
+
+
+
+; Border Edit
+
+ 217
+ 866
+ "ROOT/taobin_project/image/collect_point1/img3.png"
+
+
+
+ 157
+ 868
+ ShowTextNumber
+ Var( DirImage + "/text_edit.png")
+
+
+
+
+ 188
+ 699
+ Var( DirImage + "/text_6.png")
+
+
+
+
+
+
+
+
+
+
+
+ Open "/media/bt/xml/security_alarm.xml"
+
+
+
+
+
+
+
diff --git a/xml/page_identityMember_verification.xml b/xml/page_identityMember_verification.xml
new file mode 100644
index 00000000..8feaf412
--- /dev/null
+++ b/xml/page_identityMember_verification.xml
@@ -0,0 +1,459 @@
+
+ "Enable"
+ 1080
+ 1920
+ "0xeae6e1"
+ SoundVolume
+
+
+ Var CamFlag = 0
+ Var CamCount = 0
+ Var Timeout = 0
+ Var ShutterResult = "-"
+
+ Var AdultFlag = 1
+
+ If AdultFlag = 1 Then
+
+ Var AdultFlag = 0
+
+ DEBUGVAR SystemDate
+ Var sdate = ""
+ Var sdate = SystemDate
+ Var sdateday = ""
+ Var sdatemonth = ""
+ Var sdateyear = ""
+ SPLIT sdate "/" 1 sdateday
+ SPLIT sdate "/" 2 sdatemonth
+ SPLIT sdate "/" 3 sdateyear
+ INT sdateday
+ INT sdatemonth
+ INT sdateyear
+ Var AdultState = "Enable"
+ Var AdultState1 = "Enable"
+
+ Var countAdultS2 = 0
+ Var AdultFlag2 = 1
+ EndIf
+
+ If show_eng = "true" Then
+ Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
+ Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_en"
+ Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
+
+ Else
+ Var DirImage = "ROOT/taobin_project/image/page_payment"
+ Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend"
+ Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
+ EndIf
+
+
+ If CameraCount = 1 Then
+
+ EndIf
+
+ Var IDBirthdate = ""
+
+ Var LivenessResult = ""
+
+ Var CountDownDelayReadCardID = 5
+ DEBUGVAR CameraCount
+ ;STOPCARDID
+ Var LivenessShowString = ""
+
+ Var CameraStage = "Invisible"
+ Var IDcardStage = "Enable"
+ Var IDcardStageText = "Enable"
+ Var load_gif_stage = "Invisible"
+ Var IDcardTextStatus = "โปรดเสียบบัตรประชาชน \nเพื่อดำเนินการต่อ"
+
+ Var LivenessRestartCount = 0
+ Var FailTrickCount = 0
+
+ Var FailState = "Invisible"
+
+ Var StepGetServer = 0
+
+ Var Cid = 29
+ Var PointCrm = "2"
+ Var GetScore = "1"
+ Var IDNumx = "2640100003053"
+ ;AddData Cid TelephoneNumber IDNumx PointCrm GetScore
+
+
+
+
+
+ DEBUGVAR Ext1a
+
+
+ If StepGetServer = 1 Then
+
+ If Ext1a = "ok" Then
+ Var ChildrenFree = 1
+ Open "ROOT/taobin_project/xml/page_payment.xml"
+ Else
+
+
+
+
+ If Ext1a = "limit" Then
+ Var load_gif_stage = "Invisible"
+ Var FailState = "Enable"
+ Var img_popup16 = "/img_popup16-3.png"
+
+ WRITE_FILE "/mnt/sdcard/oreo_for_free_limit" "true"
+
+ Else
+
+ Var errorX = 0
+
+ If Ext1a = "invalid_mobile" Then
+ Var errorX = 1
+ EndIf
+
+ If Ext1a = "not_found" Then
+ Var errorX = 1
+ EndIf
+
+ If errorX = 1 Then
+ Var load_gif_stage = "Invisible"
+ Var FailState = "Enable"
+ Var img_popup16 = "/img_popup16-1.png"
+
+
+ Else
+
+
+ Var load_gif_stage = "Invisible"
+ Var FailState = "Enable"
+ Var img_popup16 = "/img_popup16-2.png"
+ EndIf
+
+ EndIf
+
+ Refresh
+
+ EndIf
+
+ EndIf
+
+
+
+
+
+
+
+
+
+ DEBUGVAR IDCardStatus
+ DEBUGVAR IDCardReady
+ DEBUGVAR IDCardData
+ DEBUGVAR IDBirthdate
+ DEBUGVAR IDFullNameEng
+
+
+ If IDCardStatus = "OK" Then
+ If IDCardReady = "OK" Then
+ If IDCardData = "START" Then
+ Var load_gif_stage = "Enable"
+ Var IDcardStageText = "Invisible"
+ Var FailState = "Invisible"
+ ;Var img_popup16 = "/img_popup16-1.png"
+ RefreshAll
+ Var Timeout = 90
+ EndIf
+ EndIf
+ EndIf
+
+
+
+
+ If IDCardStatus = "OK" Then
+ If IDCardReady = "OK" Then
+ If IDCardData = "ERROR" Then
+ Var load_gif_stage = "Invisible"
+ Var IDcardStageText = "Enable"
+ Var IDcardTextStatus = "อ่านบัตรไม่ได้"
+
+ Var FailState = "Enable"
+ Var img_popup16 = "/img_popup16-1.png"
+
+ Refresh
+ EndIf
+ EndIf
+ EndIf
+
+ If IDCardStatus = "ERROR" Then
+ Var load_gif_stage = "Invisible"
+ Var IDcardStageText = "Enable"
+ Var IDcardTextStatus = "อ่านบัตรไม่ได้"
+
+ Var FailState = "Enable"
+ Var img_popup16 = "/img_popup16-1.png"
+ Refresh
+ EndIf
+
+ If IDCardStatus = "ERROR" Then
+ If IDCardReady = "ERROR" Then
+ If IDCardData = "ERROR" Then
+ Var FailState = "Invisible"
+ EndIf
+ EndIf
+ EndIf
+
+ If IDCardStatus = "OK" Then
+ If IDCardReady = "OK" Then
+ If IDCardData = "DONE" Then
+
+ ;Var birthDate = IDBirthdate
+ Var StrYear = ""
+ Var StrMon = ""
+ Var StrDay = ""
+
+ SUBSTRING IDBirthdate 0 4 StrYear
+ SUBSTRING IDBirthdate 4 6 StrMon
+ SUBSTRING IDBirthdate 6 8 StrDay
+
+ INT StrYear
+ INT StrMon
+ INT StrDay
+
+ Var Adult7 = 0
+ Var Adult15 = 0
+
+ DEBUGVAR StrYear
+ DEBUGVAR StrMon
+ DEBUGVAR StrDay
+
+ DEBUGVAR sdatemonth
+ DEBUGVAR sdateday
+
+ Var sdateyear = sdateyear + 543
+ Var AgeNumber = sdateyear - StrYear
+ DEBUGVAR AgeNumber
+
+ Var Adult7 = 1
+ If Adult7 = 1 Then
+
+ Var Input1 = TelephoneNumber + "/"
+
+ Var Input1 = Input1 + IDNum
+
+ GETACCEXT Input1 28
+ Var StepGetServer = 1
+
+ Else
+
+
+ Var load_gif_stage = "Invisible"
+ Var FailState = "Enable"
+ Var img_popup16 = "/img_popup16-1.png"
+
+ Refresh
+
+ EndIf
+
+
+ EndIf
+ EndIf
+ EndIf
+
+
+
+
+
+
+
+
+
+ 1000
+
+ DEBUGVAR IDCardStatus
+ DEBUGVAR IDCardReady
+ DEBUGVAR IDCardData
+ DEBUGVAR IDBirthdate
+ DEBUGVAR CountDownDelayReadCardID
+ DEBUGVAR ShutterResult
+ DEBUGVAR IDCardState
+ DEBUGVAR load_gif_stage
+
+ If IDBirthdate = "" Then
+ Var CountDownDelayReadCardID = CountDownDelayReadCardID - 1
+ If CountDownDelayReadCardID = 0 Then
+ READCARDID
+ Var CountDownDelayReadCardID = 600
+ EndIf
+ EndIf
+
+ DEBUGVAR Timeout
+ Var Timeout = Timeout + 1
+
+ If Timeout > 120 Then
+ Open "ROOT/taobin_project/xml/page_catalog2.xml"
+ EndIf
+
+ If IDCardState = "PRESENT" Then
+ If IDCardStatus = "ERROR" Then
+ Var load_gif_stage = "Invisible"
+ Var IDcardStageText = "Enable"
+ Var IDcardTextStatus = "อ่านบัตรไม่ได้อะ"
+ Refresh
+ EndIf
+ EndIf
+
+
+
+
+
+ Refresh
+ TimerReset
+
+
+
+
+
+; back
+
+
+
+
+
+
+
+
+ 75
+ 493
+ "Enable"
+ Var( DirImage + "/img_popup18-2.png" )
+
+
+
+
+
+
+
+ 0
+ 380
+ load_gif_stage
+ "ROOT/taobin_project/image/page_payment/alpha.png"
+
+
+
+ 0
+ 380
+ FailState
+ "ROOT/taobin_project/image/page_payment/alpha.png"
+
+
+
+ 249
+ 751
+ load_gif_stage
+ Var( DirImage + "/img_popup15.png" )
+
+
+
+ 249
+ 751
+ FailState
+ Var( DirImage + img_popup16 )
+
+
+
+
+
+
+
+
+
+ 440
+ 988
+ load_gif_stage
+ "ROOT/taobin_project/image/page_payment/loading.gif"
+
+
+
+ Var IDCardStatus = "OK"
+ Var IDCardReady = "OK"
+ Var IDCardData = "START"
+ EventEvaluate "EventIDCard"
+
+
+
+ Var IDBirthdate = 25271014
+ Var IDCardStatus = "OK"
+ Var IDCardReady = "OK"
+ Var IDCardData = "DONE"
+ EventEvaluate "EventIDCard"
+
+
+ Var LivenessResult = "pass"
+ EventEvaluate "EventLivenessState"
+
+
+
+ Var IDCardState = "PRESENT"
+ Var IDCardStatus = "ERROR"
+ Var IDCardReady = "ERROR"
+ Var IDCardData = "ERROR"
+
+
+
+
+
diff --git a/xml/page_payment.xml b/xml/page_payment.xml
index e3497f37..98fb9fd0 100644
--- a/xml/page_payment.xml
+++ b/xml/page_payment.xml
@@ -256,14 +256,14 @@
Var RemainAmountStr = "Free###size=150"
- Var Seeker.VendingCode = "MKFO"
+ Var Seeker.VendingCode = "MKFOO"
Var Seeker.IntVendingCampaign = PriceDrink
Var Seeker.FreeVendingCampaign = 1
Var Seeker.CodeChannel = 1
Var Seeker.CodeNumber = IDNum
- Var Cid = 29
+ Var Cid = 31
Var PointCrm = "1"
Var GetScore = "1"
AddData Cid TelephoneNumber IDNum PointCrm GetScore
diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml
index 08050bb3..4e74342f 100644
--- a/xml/page_thankyou.xml
+++ b/xml/page_thankyou.xml
@@ -365,9 +365,9 @@
Else
If Seeker.FreeVendingCampaign = 1 Then
- If ChildrenFree = 1 Then
- Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
- EndIf
+ ;If ChildrenFree = 1 Then
+ ; Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
+ ;EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else
diff --git a/xml/page_topping_select6.xml b/xml/page_topping_select6.xml
index efac7020..9fbf979a 100644
--- a/xml/page_topping_select6.xml
+++ b/xml/page_topping_select6.xml
@@ -4451,7 +4451,7 @@
If SelectDrinkType = 1 Then
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
;Open "ROOT/taobin_project/xml/page_identity_verification.xml"
- Open "ROOT/taobin_project/xml/page_identityChildren_consent.xml"
+ Open "ROOT/taobin_project/xml/page_identityMember_consent.xml"
EndIf
EndIf
diff --git a/xml/page_topping_select7.xml b/xml/page_topping_select7.xml
index 3d7cf574..0ed16db2 100644
--- a/xml/page_topping_select7.xml
+++ b/xml/page_topping_select7.xml
@@ -4450,7 +4450,7 @@
If SelectDrinkType = 1 Then
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
;Open "ROOT/taobin_project/xml/page_identity_verification.xml"
- Open "ROOT/taobin_project/xml/page_identityChildren_consent.xml"
+ Open "ROOT/taobin_project/xml/page_identityMember_number.xml"
EndIf
EndIf