diff --git a/image/collect_point1/text_4.png b/image/collect_point1/text_4.png new file mode 100644 index 00000000..1ff15746 Binary files /dev/null and b/image/collect_point1/text_4.png differ diff --git a/image/collect_point1_en/text_4.png b/image/collect_point1_en/text_4.png new file mode 100644 index 00000000..c78a0232 Binary files /dev/null and b/image/collect_point1_en/text_4.png differ diff --git a/image/collectiing/img_popupOreo1.png b/image/collectiing/img_popupOreo1.png index 14fc12a6..4e87b506 100644 Binary files a/image/collectiing/img_popupOreo1.png and b/image/collectiing/img_popupOreo1.png differ diff --git a/image/collectiing/img_popupSongkarn1.png b/image/collectiing/img_popupSongkarn1.png new file mode 100644 index 00000000..14fc12a6 Binary files /dev/null and b/image/collectiing/img_popupSongkarn1.png differ diff --git a/image/collectiing_en/img_popupOreo1.png b/image/collectiing_en/img_popupOreo1.png index ee102c4b..a20e158d 100644 Binary files a/image/collectiing_en/img_popupOreo1.png and b/image/collectiing_en/img_popupOreo1.png differ diff --git a/image/collectiing_en/img_popupSongkarn1.png b/image/collectiing_en/img_popupSongkarn1.png new file mode 100644 index 00000000..ee102c4b Binary files /dev/null and b/image/collectiing_en/img_popupSongkarn1.png differ diff --git a/image/display_get_free/img_popup6.png b/image/display_get_free/img_popup6.png index 4799394f..d938d7f5 100644 Binary files a/image/display_get_free/img_popup6.png and b/image/display_get_free/img_popup6.png differ diff --git a/image/display_get_free_en/img_popup6.png b/image/display_get_free_en/img_popup6.png index 49d177da..b4708461 100644 Binary files a/image/display_get_free_en/img_popup6.png and b/image/display_get_free_en/img_popup6.png differ diff --git a/image/display_point/imgCoupon112.png b/image/display_point/imgCoupon112.png new file mode 100644 index 00000000..87b613e7 Binary files /dev/null and b/image/display_point/imgCoupon112.png differ diff --git a/image/display_point_en/imgCoupon112.png b/image/display_point_en/imgCoupon112.png new file mode 100644 index 00000000..f80d1525 Binary files /dev/null and b/image/display_point_en/imgCoupon112.png differ diff --git a/image/page_payment/bn_accept.png b/image/page_payment/bn_accept.png new file mode 100644 index 00000000..c879ae85 Binary files /dev/null and b/image/page_payment/bn_accept.png differ diff --git a/image/page_payment/bn_back.png b/image/page_payment/bn_back.png new file mode 100644 index 00000000..82fab716 Binary files /dev/null and b/image/page_payment/bn_back.png differ diff --git a/image/page_payment/bp_accept.png b/image/page_payment/bp_accept.png new file mode 100644 index 00000000..b4ee2a56 Binary files /dev/null and b/image/page_payment/bp_accept.png differ diff --git a/image/page_payment/bp_back.png b/image/page_payment/bp_back.png new file mode 100644 index 00000000..1472c9c2 Binary files /dev/null and b/image/page_payment/bp_back.png differ diff --git a/image/page_payment/img_popup14.png b/image/page_payment/img_popup14.png new file mode 100644 index 00000000..685339cd Binary files /dev/null and b/image/page_payment/img_popup14.png differ diff --git a/image/page_payment/img_popup15.png b/image/page_payment/img_popup15.png new file mode 100644 index 00000000..fe274c2b Binary files /dev/null and b/image/page_payment/img_popup15.png differ diff --git a/image/page_payment/img_popup16-1.png b/image/page_payment/img_popup16-1.png new file mode 100644 index 00000000..ffd4f187 Binary files /dev/null and b/image/page_payment/img_popup16-1.png differ diff --git a/image/page_payment/img_popup16-2.png b/image/page_payment/img_popup16-2.png new file mode 100644 index 00000000..0a97bc6f Binary files /dev/null and b/image/page_payment/img_popup16-2.png differ diff --git a/image/page_payment/img_popup17.png b/image/page_payment/img_popup17.png new file mode 100644 index 00000000..7ba06312 Binary files /dev/null and b/image/page_payment/img_popup17.png differ diff --git a/image/page_payment/img_popup18.png b/image/page_payment/img_popup18.png new file mode 100644 index 00000000..4869341c Binary files /dev/null and b/image/page_payment/img_popup18.png differ diff --git a/image/page_payment_en/page_payment/bn_accept.png b/image/page_payment_en/page_payment/bn_accept.png new file mode 100644 index 00000000..d948c541 Binary files /dev/null and b/image/page_payment_en/page_payment/bn_accept.png differ diff --git a/image/page_payment_en/page_payment/bn_back.png b/image/page_payment_en/page_payment/bn_back.png new file mode 100644 index 00000000..ef9a7af7 Binary files /dev/null and b/image/page_payment_en/page_payment/bn_back.png differ diff --git a/image/page_payment_en/page_payment/bp_accept.png b/image/page_payment_en/page_payment/bp_accept.png new file mode 100644 index 00000000..1c663f54 Binary files /dev/null and b/image/page_payment_en/page_payment/bp_accept.png differ diff --git a/image/page_payment_en/page_payment/bp_back.png b/image/page_payment_en/page_payment/bp_back.png new file mode 100644 index 00000000..926b0640 Binary files /dev/null and b/image/page_payment_en/page_payment/bp_back.png differ diff --git a/image/page_payment_en/page_payment/bp_confirm.png b/image/page_payment_en/page_payment/bp_confirm.png new file mode 100644 index 00000000..1c663f54 Binary files /dev/null and b/image/page_payment_en/page_payment/bp_confirm.png differ diff --git a/image/page_payment_en/page_payment/img_popup14.png b/image/page_payment_en/page_payment/img_popup14.png new file mode 100644 index 00000000..c3c4f923 Binary files /dev/null and b/image/page_payment_en/page_payment/img_popup14.png differ diff --git a/image/page_payment_en/page_payment/img_popup15.png b/image/page_payment_en/page_payment/img_popup15.png new file mode 100644 index 00000000..fe274c2b Binary files /dev/null and b/image/page_payment_en/page_payment/img_popup15.png differ diff --git a/image/page_payment_en/page_payment/img_popup16-1.png b/image/page_payment_en/page_payment/img_popup16-1.png new file mode 100644 index 00000000..c719ad30 Binary files /dev/null and b/image/page_payment_en/page_payment/img_popup16-1.png differ diff --git a/image/page_payment_en/page_payment/img_popup16-2.png b/image/page_payment_en/page_payment/img_popup16-2.png new file mode 100644 index 00000000..a8003553 Binary files /dev/null and b/image/page_payment_en/page_payment/img_popup16-2.png differ diff --git a/image/page_payment_en/page_payment/img_popup17.png b/image/page_payment_en/page_payment/img_popup17.png new file mode 100644 index 00000000..95187fbb Binary files /dev/null and b/image/page_payment_en/page_payment/img_popup17.png differ diff --git a/image/page_payment_en/page_payment/img_popup18.png b/image/page_payment_en/page_payment/img_popup18.png new file mode 100644 index 00000000..eeb5ba64 Binary files /dev/null and b/image/page_payment_en/page_payment/img_popup18.png differ diff --git a/image/topping2/bp_childrenFree.png b/image/topping2/bp_childrenFree.png new file mode 100644 index 00000000..0d30f123 Binary files /dev/null and b/image/topping2/bp_childrenFree.png differ diff --git a/image/topping2_en/bp_childrenFree.png b/image/topping2_en/bp_childrenFree.png new file mode 100644 index 00000000..e61518d3 Binary files /dev/null and b/image/topping2_en/bp_childrenFree.png differ diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index e73cec1a..fe0056e6 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -914,7 +914,7 @@ If Seeker.PayWithQR = 0 Then If Seeker.CodeChannel = 1 Then Var SessionID2 = SessionID2 + "/" - Var SessionID2 = SessionID2 + Seeker.CodeNumber + Var SessionID2 = SessionID2 + "" Var SessionID2 = SessionID2 + "/" Var SessionID2 = SessionID2 + Seeker.VendingCode Var SessionID2 = SessionID2 + "/" @@ -1021,6 +1021,16 @@ Else + + If Seeker.VendingCode = "MKFO" Then + Var Cid = 29 + Var PointCrm = "2" + Var GetScore = "1" + Var TelephoneNumberx = "0899999999" + AddData Cid TelephoneNumberx Seeker.CodeNumber PointCrm GetScore + Var Seeker.CodeChannel = 0 + EndIf + If CoinAmount > 0 Then If ChangeFlag = 0 Then diff --git a/xml/page_brewing3Conti.xml b/xml/page_brewing3Conti.xml index d142f2ca..2e4a72c3 100644 --- a/xml/page_brewing3Conti.xml +++ b/xml/page_brewing3Conti.xml @@ -608,7 +608,7 @@ If Seeker.PayWithQR = 0 Then If Seeker.CodeChannel = 1 Then Var SessionID2 = SessionID2 + "/" - Var SessionID2 = SessionID2 + Seeker.CodeNumber + Var SessionID2 = SessionID2 + "" Var SessionID2 = SessionID2 + "/" Var SessionID2 = SessionID2 + Seeker.VendingCode Var SessionID2 = SessionID2 + "/" @@ -722,6 +722,15 @@ Else + If Seeker.VendingCode = "MKFO" Then + Var Cid = 29 + Var PointCrm = "2" + Var GetScore = "1" + Var TelephoneNumberx = "0899999999" + AddData Cid TelephoneNumberx Seeker.CodeNumber PointCrm GetScore + Var Seeker.CodeChannel = 0 + EndIf + If CoinAmount > 0 Then If ChangeFlag = 0 Then diff --git a/xml/page_cannotConti.xml b/xml/page_cannotConti.xml index 347dc06b..b1acc1ca 100644 --- a/xml/page_cannotConti.xml +++ b/xml/page_cannotConti.xml @@ -657,6 +657,15 @@ Else + If Seeker.VendingCode = "MKFO" Then + Var Cid = 29 + Var PointCrm = "2" + Var GetScore = "1" + Var TelephoneNumberx = "0899999999" + AddData Cid TelephoneNumberx Seeker.CodeNumber PointCrm GetScore + Var Seeker.CodeChannel = 0 + EndIf + If CoinAmount > 0 Then If ChangeFlag = 0 Then diff --git a/xml/page_check_member2.xml b/xml/page_check_member2.xml index 375c6016..10ff4d56 100644 --- a/xml/page_check_member2.xml +++ b/xml/page_check_member2.xml @@ -479,6 +479,9 @@ EndIf If CouponTypeA = "109" Then Var CouponNameA = "/imgCouponC33.png" + EndIf + If CouponTypeA = "112" Then + Var CouponNameA = "/imgCoupon112.png" EndIf INT CouponExireA_D @@ -585,6 +588,9 @@ If CouponTypeB = "109" Then Var CouponNameB = "/imgCouponC33.png" EndIf + If CouponTypeB = "112" Then + Var CouponNameB = "/imgCoupon112.png" + EndIf INT CouponExireB_D INT CouponExireB_Y @@ -696,6 +702,9 @@ If CouponTypeA = "109" Then Var CouponNameA = "/imgCouponC33.png" EndIf + If CouponTypeA = "112" Then + Var CouponNameA = "/imgCoupon112.png" + EndIf INT CouponExireA_D INT CouponExireA_Y @@ -800,6 +809,9 @@ If CouponTypeB = "109" Then Var CouponNameB = "/imgCouponC33.png" EndIf + If CouponTypeB = "112" Then + Var CouponNameB = "/imgCoupon112.png" + EndIf INT CouponExireB_D INT CouponExireB_Y diff --git a/xml/page_collect_point_1-2.xml b/xml/page_collect_point_1-2.xml index e8dbf70b..21fb13f5 100644 --- a/xml/page_collect_point_1-2.xml +++ b/xml/page_collect_point_1-2.xml @@ -23,6 +23,16 @@ Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png" EndIf + + If PromotionIDCurrentOrder = 2 Then + Var img_popup6 = "/img_popupOreo1.png" + EndIf + + + + If PromotionIDCurrentOrder = 3 Then + Var img_popup6 = "/img_popupSongkarn1.png" + EndIf @@ -61,7 +71,7 @@ 158 665 - Var( DirImage + "/img_popupOreo1.png") + Var( DirImage + img_popup6) diff --git a/xml/page_collect_point_1-3.xml b/xml/page_collect_point_1-3.xml index 8b825bd2..325ff5e3 100644 --- a/xml/page_collect_point_1-3.xml +++ b/xml/page_collect_point_1-3.xml @@ -143,6 +143,17 @@ EndIf + If PromotionIDCurrentOrder = 2 Then + Var text_x = "/text_4.png" + EndIf + + + + If PromotionIDCurrentOrder = 3 Then + Var text_x = "/text_3.png" + EndIf + + 1000 @@ -645,7 +656,7 @@ 188 699 - Var( DirImage + "/text_3.png") + Var( DirImage + text_x ) diff --git a/xml/page_identityChildren_consent.xml b/xml/page_identityChildren_consent.xml new file mode 100644 index 00000000..027db939 --- /dev/null +++ b/xml/page_identityChildren_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_popup17.png" ) + + + + + + + + + + + + + + + + diff --git a/xml/page_identityChildren_verification.xml b/xml/page_identityChildren_verification.xml new file mode 100644 index 00000000..76c9639a --- /dev/null +++ b/xml/page_identityChildren_verification.xml @@ -0,0 +1,518 @@ + + "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 + + Var load_gif_stage = "Invisible" + Var FailState = "Enable" + Var img_popup16 = "/img_popup16-2.png" + + 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 + + + If AgeNumber >= 15 Then + If AgeNumber = 15 Then + If sdatemonth > StrMon Then + Var Adult15 = 1 + Else + If sdatemonth = StrMon Then + If sdateday >= StrDay Then + Var Adult15 = 1 + EndIf + EndIf + EndIf + + Else + Var Adult15 = 1 + EndIf + Else + + EndIf + + If Adult15 = 0 Then + + If AgeNumber >= 7 Then + If AgeNumber = 7 Then + If sdatemonth > StrMon Then + Var Adult7 = 1 + Else + If sdatemonth = StrMon Then + If sdateday >= StrDay Then + Var Adult7 = 1 + EndIf + EndIf + EndIf + + Else + Var Adult7 = 1 + EndIf + Else + + EndIf + + + EndIf + + Var Adult7 = 1 + + If Adult7 = 1 Then + + + + GETACCEXT IDNum 27 + 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 + + + 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.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 ) + + + + + + + + + + + 123 + 598 + CameraStage + "ROOT/taobin_project/image/liveness/bg2.png" + + + + + + + + + + + + + + 196 + 737 + "ROOT/taobin_project/image/liveness/bg_21.png" + + + + + + + 423 + 909 + CameraStage + "ROOT/taobin_project/image/liveness/bg3.png" + + + + + +; +; 0 +; 1050 +; IDcardStageText +; 1080 +; Center +; 56 +; KanitMediumTTF +; 0xDE794E +; IDcardTextStatus +; + + + + + 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_identity_verification.xml b/xml/page_identity_verification.xml index 21d50fe0..5e9f3e79 100644 --- a/xml/page_identity_verification.xml +++ b/xml/page_identity_verification.xml @@ -98,7 +98,6 @@ EndIf EndIf - If IDCardStatus = "OK" Then If IDCardReady = "OK" Then If IDCardData = "ERROR" Then diff --git a/xml/page_payment.xml b/xml/page_payment.xml index a694fb3e..d158742e 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -6,6 +6,8 @@ ; On open + + ;Open "ROOT/taobin_project/xml/page_display_ExclusiveGift.xml" Var IndoQR = 0 @@ -255,6 +257,46 @@ + Var RemainAmountStr = "" + + + If ChildrenFree = 1 Then + + Var RemainAmountStr = "Free###size=150" + + Var Seeker.VendingCode = "MKFO" + Var Seeker.IntVendingCampaign = PriceDrink + Var Seeker.FreeVendingCampaign = 1 + Var Seeker.CodeChannel = 1 + Var Seeker.CodeNumber = IDNum + + + Var Cid = 29 + Var PointCrm = "1" + Var GetScore = "1" + AddData Cid TelephoneNumber IDNum PointCrm GetScore + + If Seeker = "curr" Then + + MakeDrinkV1 SelectDrink SelectSugarID + Var TxRef1 = "" + CreateTxRef1 TxRef1 + Else + Var TxRef1 = "" + CreateTxRef1 TxRef1 + + Var DrinkPaid = SelectDrink + Var PaidPaymentFromNextStage = 1 + + EndIf + Open "ROOT/taobin_project/xml/page_thankyou.xml" + + + + EndIf + + + ; Oreo free If PromotionIDOreoBuyTwoSaveMore = 1 Then Var PromotionIDOreoBuyTwoSaveMore = 0 @@ -265,6 +307,7 @@ SAVELOG "Promotion: Oreo Get 1 Free 1" EndIf DEBUGVAR PromotionIDCurrentOrder + 900 @@ -484,5 +527,17 @@ Var( DirImage + "/loadingText.png" ) + + 0 + 1041 + 144 + Center + 1080 + KanitRegularTTF + "Enable" + 0xDE794E + RemainAmountStr + + diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 4f10a959..d163ded3 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -316,8 +316,29 @@ EndIf - + If Seeker.FreeVendingCampaign = 1 Then + Var RemainAmountStr = "Free###size=150" + + CoinVending OFF + If Seeker = "curr" Then + + MakeDrinkV1 SelectDrink SelectSugarID + Var TxRef1 = "" + CreateTxRef1 TxRef1 + Else + Var TxRef1 = "" + CreateTxRef1 TxRef1 + + Var DrinkPaid = SelectDrink + Var PaidPaymentFromNextStage = 1 + + EndIf + Open "ROOT/taobin_project/xml/page_thankyou.xml" + + EndIf + + If CoinInOK = 0 Then Var RemainAmount = PayAmount - CoinAmount diff --git a/xml/page_topping_select6.xml b/xml/page_topping_select6.xml index 7bbc0d1e..8500f234 100644 --- a/xml/page_topping_select6.xml +++ b/xml/page_topping_select6.xml @@ -305,10 +305,17 @@ DEBUGVAR PromotionIDCurrentOrder - Var DiscountWithIdentifyState = "Invisible" + Var DiscountWithIdentifyState = "Enable" + + + ;Var DiscountWithIdentifyState = "Invisible" + DEBUGVAR Price5Active DEBUGVAR EnableLiveness + DEBUGVAR DiscountWithIdentifyState + + Var ChildrenFree = 0 If BackToSchoolForFreeEnable = 1 Then @@ -3278,8 +3285,8 @@ DiscountWithIdentifyState 285 1785 - Var( DirImage + "/bp_price5baht.png" ) - Var( DirImage + "/bp_price5baht.png" ) + Var( DirImage + "/bp_childrenFree.png" ) + Var( DirImage + "/bp_childrenFree.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -3473,7 +3480,8 @@ 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_identity_verification.xml" + Open "ROOT/taobin_project/xml/page_identityChildren_consent.xml" EndIf EndIf