diff --git a/image/page_payment/bn_cancel_all.png b/image/page_payment/bn_cancel_all.png index a83224b0..2b40c986 100644 Binary files a/image/page_payment/bn_cancel_all.png and b/image/page_payment/bn_cancel_all.png differ diff --git a/image/page_payment/bp_cancel_all.png b/image/page_payment/bp_cancel_all.png index 4a531240..4618c965 100644 Binary files a/image/page_payment/bp_cancel_all.png and b/image/page_payment/bp_cancel_all.png differ diff --git a/image/page_payment/img_popup4-2.png b/image/page_payment/img_popup4-2.png new file mode 100644 index 00000000..b94f41b6 Binary files /dev/null and b/image/page_payment/img_popup4-2.png differ diff --git a/image/page_payment/img_popup4-3.png b/image/page_payment/img_popup4-3.png new file mode 100644 index 00000000..41af1c3b Binary files /dev/null and b/image/page_payment/img_popup4-3.png differ diff --git a/image/page_payment/img_popup4.png b/image/page_payment/img_popup4.png new file mode 100644 index 00000000..eecf2f59 Binary files /dev/null and b/image/page_payment/img_popup4.png differ diff --git a/image/page_payment_en/page_payment/bn_cancel_all.png b/image/page_payment_en/page_payment/bn_cancel_all.png index 05076f91..a301199a 100644 Binary files a/image/page_payment_en/page_payment/bn_cancel_all.png and b/image/page_payment_en/page_payment/bn_cancel_all.png differ diff --git a/image/page_payment_en/page_payment/bp_cancel_all.png b/image/page_payment_en/page_payment/bp_cancel_all.png index 35bcc758..1ce24642 100644 Binary files a/image/page_payment_en/page_payment/bp_cancel_all.png and b/image/page_payment_en/page_payment/bp_cancel_all.png differ diff --git a/image/page_payment_en/page_payment/img_popup4-2.png b/image/page_payment_en/page_payment/img_popup4-2.png new file mode 100644 index 00000000..eabfd0f4 Binary files /dev/null and b/image/page_payment_en/page_payment/img_popup4-2.png differ diff --git a/image/page_payment_en/page_payment/img_popup4-3.png b/image/page_payment_en/page_payment/img_popup4-3.png new file mode 100644 index 00000000..b228f7d0 Binary files /dev/null and b/image/page_payment_en/page_payment/img_popup4-3.png differ diff --git a/image/page_payment_en/page_payment/img_popup4.png b/image/page_payment_en/page_payment/img_popup4.png new file mode 100644 index 00000000..63a90484 Binary files /dev/null and b/image/page_payment_en/page_payment/img_popup4.png differ diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 59f1a660..2e36bd55 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -22,6 +22,24 @@ Var ServiceCharge = 0 + Var AdultFlag = 0 + + If SelectDrink = "12-05-02-0028" Then + Var AdultFlag = 1 + EndIf + + If SelectDrink = "12-05-02-0029" Then + Var AdultFlag = 1 + EndIf + + If SelectDrink = "12-05-03-0028" Then + Var AdultFlag = 1 + EndIf + + If SelectDrink = "12-05-03-0029" Then + Var AdultFlag = 1 + EndIf + Var QRCODE1 = "A000000677010112" Var QRCODE2 = "010755600066301" Var QRCODE3 = "VDGN" @@ -219,7 +237,13 @@ SaveLog "RoadShow test" If RoadShow = "false" Then ;CoinVending ON - CoinVending XBILL + + + If AdultFlag = 1 Then + Var CoinAmount = 0 + Else + CoinVending XBILL + EndIf ;Var CoinAmount = 0 Var Delay = 1 Else diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index a6ced20a..fa243d8d 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -7,6 +7,46 @@ PlaySoundLag + + + + + Var AdultState = "Invisible" + Var AdultState1 = "Invisible" + Var AdultState2 = "Invisible" + Var AdultState3 = "Invisible" + + ;Var AdultFlag = 0 + Var AdultFlag2 = 0 + + 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 + READCARDID + + Var AdultState = "Enable" + Var AdultState1 = "Enable" + + Var countAdultS2 = 0 + Var AdultFlag2 = 1 + EndIf + + + + DEBUGVAR QRCODETMP DEBUGVAR IsSmoRet @@ -585,6 +625,19 @@ EndIf + + + If AdultState2 = "Enable" Then + Var countAdultS2 = countAdultS2 + 1 + + If countAdultS2 > 60 Then + Var AdultState2 = "Invisible" + Var AdultState3 = "Enable" + EndIf + Else + Var countAdultS2 = 0 + EndIf + @@ -839,6 +892,126 @@ EndIf + + + DEBUGVAR IDCardStatus + DEBUGVAR IDCardReady + DEBUGVAR IDCardData + DEBUGVAR IDBirthdate + + If AdultFlag2 = 1 Then + + If IDCardStatus = "OK" Then + If IDCardReady = "OK" Then + If IDCardData = "START" Then + + Var AdultState2 = "Enable" + Var AdultState1 = "Invisible" + + Refresh + EndIf + EndIf + EndIf + + If IDCardStatus = "OK" Then + If IDCardReady = "OK" Then + If IDCardData = "ERROR" Then + Var AdultState2 = "Invisible" + Var AdultState3 = "Enable" + + Refresh + EndIf + EndIf + EndIf + + If IDCardStatus = "ERROR" Then + Var AdultState2 = "Invisible" + Var AdultState3 = "Enable" + + Refresh + 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 Adult20 = 0 + + + DEBUGVAR StrYear + DEBUGVAR StrMon + DEBUGVAR StrDay + + DEBUGVAR sdatemonth + DEBUGVAR sdateday + + Var sdateyear = sdateyear + 543 + Var AgeNumber = sdateyear - StrYear + DEBUGVAR AgeNumber + + If AgeNumber >= 20 Then + + If AgeNumber = 20 Then + If sdatemonth > StrMon Then + Var Adult20 = 1 + Else + If sdatemonth = StrMon Then + If sdateday >= StrDay Then + Var Adult20 = 1 + EndIf + EndIf + EndIf + Else + Var Adult20 = 1 + EndIf + + If Adult20 = 1 Then + Var AdultState3 = "Invisible" + Var AdultState2 = "Invisible" + Var AdultState1 = "Invisible" + Var AdultState = "Invisible" + CoinVending XBILL + Refresh + + Else + Var AdultState2 = "Invisible" + Var AdultState3 = "Enable" + Refresh + EndIf + + Else + Var AdultState2 = "Invisible" + Var AdultState3 = "Enable" + Refresh + EndIf + + + Var AdultFlag2 = 1 + + EndIf + EndIf + EndIf + + + EndIf + + + + + TimerReset @@ -1440,7 +1613,7 @@ + + + 249 + 751 + AdultState2 + Var( DirImage + "/img_popup4-2.png" ) + + + + 249 + 751 + AdultState3 + Var( DirImage + "/img_popup4-3.png" ) + + +