diff --git a/inter/sgp/image/page_doing/img2_percent_eng.png b/inter/sgp/image/page_doing/img2_percent_eng.png new file mode 100644 index 00000000..0ad711e7 Binary files /dev/null and b/inter/sgp/image/page_doing/img2_percent_eng.png differ diff --git a/inter/sgp/image/page_member/ask_member_dialog.png b/inter/sgp/image/page_member/ask_member_dialog.png new file mode 100644 index 00000000..4b0ec1b8 Binary files /dev/null and b/inter/sgp/image/page_member/ask_member_dialog.png differ diff --git a/inter/sgp/image/page_member/bn_no.png b/inter/sgp/image/page_member/bn_no.png new file mode 100644 index 00000000..39cfe4b9 Binary files /dev/null and b/inter/sgp/image/page_member/bn_no.png differ diff --git a/inter/sgp/image/page_member/bn_yes.png b/inter/sgp/image/page_member/bn_yes.png new file mode 100644 index 00000000..85b6e3d9 Binary files /dev/null and b/inter/sgp/image/page_member/bn_yes.png differ diff --git a/inter/sgp/image/page_member/bp_no.png b/inter/sgp/image/page_member/bp_no.png new file mode 100644 index 00000000..fe7d9373 Binary files /dev/null and b/inter/sgp/image/page_member/bp_no.png differ diff --git a/inter/sgp/image/page_member/bp_yes.png b/inter/sgp/image/page_member/bp_yes.png new file mode 100644 index 00000000..24188209 Binary files /dev/null and b/inter/sgp/image/page_member/bp_yes.png differ diff --git a/inter/sgp/image/page_member/img2_sp_eng.png b/inter/sgp/image/page_member/img2_sp_eng.png new file mode 100644 index 00000000..01e06e52 Binary files /dev/null and b/inter/sgp/image/page_member/img2_sp_eng.png differ diff --git a/inter/sgp/image/page_member/qr_regis.png b/inter/sgp/image/page_member/qr_regis.png new file mode 100644 index 00000000..5db1d9a5 Binary files /dev/null and b/inter/sgp/image/page_member/qr_regis.png differ diff --git a/inter/sgp/xml/page_brewing3.lxml b/inter/sgp/xml/page_brewing3.lxml index 3639cbf0..73da9d0f 100644 --- a/inter/sgp/xml/page_brewing3.lxml +++ b/inter/sgp/xml/page_brewing3.lxml @@ -12,7 +12,7 @@ Var CountUpWhenBREW_CNT = 0 DEBUGVAR TxRef1 - SAVELOG "AUS page_brewing3.lxml" + SAVELOG "SGP page_brewing3.lxml" DEBUGVAR MachineStage Var PictureFileTextDesctionState = "Enable" @@ -426,6 +426,21 @@ Var ButtonGameCountDownState = "Invisible" Var ButtonGamePressToPlayState = "Invisible" + Var ShowPercent = "Invisible" + Var ShowCountdown = "Enable" + + If ShowCountDownAsPercent = 1 Then + Var ShowPercent = "Enable" + Var ShowCountdown = "Invisible" + + Var IMG_CNT = "ROOT/taobin_project/inter/sgp/image/page_doing/img2_percent_eng.png" + EndIf + + If XPercent = 0 Then + + Else + Var XPercent = 0 + EndIf CashlessReq SUCCESS @@ -611,6 +626,23 @@ Var ShowCountDownBrewing = CountDownBrewing + ; percent + If ShowCountDownAsPercent = 1 Then + Var XPercent = InitCNT - ShowCountDownBrewing + If ShowCountDownBrewing <= 5 Then + Var XPercent = 95 + If SetPercent100 = 1 Then + Var XPercent = 100 + EndIf + Else + Var XPercent = XPercent * 100 + DEBUGVAR XPercent + Var XPercent = XPercent / InitCNT + EndIf + + DEBUGVAR XPercent + EndIf + If Timeout > 540 Then SAVELOG "back_to_main from line > 217." @@ -903,6 +935,12 @@ If AddData = 1 Then Var Cid = 26 + + If UseSGPCollectFlag = 1 Then + Var Cid = 46 + Var Seeker.PointTaobinStr = "SG/" + Seeker.PointTaobinStr + EndIf + AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore EndIf @@ -1007,6 +1045,12 @@ If AddData = 1 Then Var Cid = 26 + + If UseSGPCollectFlag = 1 Then + Var Cid = 46 + Var Seeker.PointTaobinStr = "SG/" + Seeker.PointTaobinStr + EndIf + AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore EndIf @@ -1090,6 +1134,7 @@ EndIf If MachineStage = "drink-success" Then + ;Var SetPercent100 = 1 Var MachineState_Result = 1 EndIf @@ -1429,6 +1474,7 @@ If MachineStage = "drink-success" Then Var MachineState_Result = 1 + Var SetPercent100 = 1 EndIf @@ -1517,6 +1563,7 @@ XPosiShowCountDownBrew 470 + ShowCountdown End 153 88 @@ -1524,11 +1571,23 @@ 0x513C2F ShowCountDownBrewing +; + + XPosiShowCountDownBrew + 470 + ShowPercent + End + 153 + 88 + RobotoBold + 0x513C2F + XPercent + 816 429 - LanguageObjectShow + ShowCountdown 000405 @@ -1536,7 +1595,7 @@ 941 518 - LanguageObjectShow + ShowCountdown 000406 diff --git a/inter/sgp/xml/page_brewing3Conti.xml b/inter/sgp/xml/page_brewing3Conti.xml index 2c578ee8..03e7de5e 100644 --- a/inter/sgp/xml/page_brewing3Conti.xml +++ b/inter/sgp/xml/page_brewing3Conti.xml @@ -186,6 +186,22 @@ DEBUGVAR ButtonGameCountDownState + Var ShowPercent = "Invisible" + Var ShowCountdown = "Enable" + + If ShowCountDownAsPercent = 1 Then + Var ShowPercent = "Enable" + Var ShowCountdown = "Invisible" + + Var IMG_CNT = "ROOT/taobin_project/inter/sgp/image/page_doing/img2_percent_eng.png" + EndIf + + If XPercent = 0 Then + + Else + Var XPercent = 0 + EndIf + @@ -318,6 +334,20 @@ Var Timeout = Timeout + 1 + ; percent + If ShowCountDownAsPercent = 1 Then + Var XPercent = InitCNT - ShowCountDownBrewing + If ShowCountDownBrewing <= 5 Then + Var XPercent = 95 + Else + Var XPercent = XPercent * 100 + DEBUGVAR XPercent + Var XPercent = XPercent / InitCNT + EndIf + + DEBUGVAR XPercent + EndIf + If MOVE_CUP_TO_DOOR = "true" Then Var MOVE_CUP_TO_DOOR = "false" EndIf @@ -629,6 +659,11 @@ EndIf EndIf + If UseSGPCollectFlag = 1 Then + Var Cid = 46 + Var Seeker.PointTaobinStr = "SG/" + Seeker.PointTaobinStr + EndIf + AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore EndIf @@ -749,6 +784,11 @@ EndIf EndIf + If UseSGPCollectFlag = 1 Then + Var Cid = 46 + Var Seeker.PointTaobinStr = "SG/" + Seeker.PointTaobinStr + EndIf + AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore EndIf @@ -1055,6 +1095,7 @@ ; +; zone show time remaining 751 413 @@ -1064,6 +1105,7 @@ XPosiShowCountDownBrew 470 + ShowCountdown End 153 88 @@ -1071,6 +1113,18 @@ 0x513C2F ShowCountDownBrewing +; + + XPosiShowCountDownBrew + 470 + ShowPercent + End + 153 + 88 + RobotoBold + 0x513C2F + XPercent + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 873 + 1080 + Center + 62 + RobotoBlack + 0x513C2F + TelephoneNumber + Telnum-mask-3 + + + + + + + +; Border Edit + + 217 + 866 + "ROOT/taobin_project/image/collect_point1/img3.png" + + + + 157 + 868 + ShowTextNumber + Var( DirImage + "/text_edit.png") + + + + + 236 + 699 + eval( + If FromProThaiTea = 1 Then + Var return = "Invisible" + Else + If FromProYuzu = 1 Then + Var return = "Invisible" + Else + Var return = "Enable" + EndIf + EndIf +) + Var( DirImage + "/text_2.png") + + + + 236 + 699 + eval( + If FromProThaiTea = 1 Then + Var return = "Enable" + Else + If FromProYuzu = 1 Then + Var return = "Invisible" + Else + Var return = "Enable" + EndIf + EndIf +) + Var( DirImage + "/edit.png") + + +;include="ROOT/taobin_project/inc/video.inc" + + + + + + + + +; + + 751 + 413 + IMG_CNT + +; + + XPosiShowCountDownBrew + 470 + ShowCountdown + End + 153 + 88 + RobotoBold + 0x513C2F + ShowCountDownBrewing + +; + + XPosiShowCountDownBrew + 470 + ShowPercent + End + 153 + 88 + RobotoBold + 0x513C2F + XPercent + + + + + 152 + 955 + ShowErrorText + text_show_error + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + If MachineStage = "drink-success" Then + Var MachineState_Result = 1 + EndIf + + If MachineStage = "drink-failed" Then + Var MachineState_Result = 2 + EndIf + + + + + + \ No newline at end of file diff --git a/inter/sgp/xml/page_collect_point_2.lxml b/inter/sgp/xml/page_collect_point_2.lxml new file mode 100644 index 00000000..d1da7c93 --- /dev/null +++ b/inter/sgp/xml/page_collect_point_2.lxml @@ -0,0 +1,371 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + + ; On open + + Var Timeout = 0 + SAVELOG UnitTestType + + If UnitTestType = "1" Then + Var CoffeePoint = 10 + Open "ROOT/taobin_project/xml/page_show_consent.xml" + EndIf + + Var TaobinLevel = 0 + Var Point2X = 0 + + Var Seeker.TaobinErrorNetwork = 0 + + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_en" + + Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png" + + + Else + Var DirImage = "ROOT/taobin_project/image/collectiing" + + Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png" + EndIf + + DEBUGVAR PayOfflineMode + + If PayOfflineMode = 1 Then + Var Seeker.TaobinErrorNetwork = 1 + Var Seeker.PointTaobinStr = ParamCP + Var TelephoneNumber = TelephoneNumberX + Var Seeker.TNumberTaobinMember= TelephoneNumber + Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_error.lxml" + + EndIf + + Var ShowPercent = "Invisible" + Var ShowCountdown = "Enable" + + If ShowCountDownAsPercent = 1 Then + Var ShowPercent = "Enable" + Var ShowCountdown = "Invisible" + + Var IMG_CNT = "ROOT/taobin_project/inter/sgp/image/page_doing/img2_percent_eng.png" + EndIf + + + 1000 + + Var CountDownBrewing = BREW_CNT + + Var ShowCountDownBrewing = CountDownBrewing + + ; percent + If ShowCountDownAsPercent = 1 Then + Var XPercent = InitCNT - ShowCountDownBrewing + If ShowCountDownBrewing <= 5 Then + Var XPercent = 95 + Else + Var XPercent = XPercent * 100 + DEBUGVAR XPercent + Var XPercent = XPercent / InitCNT + EndIf + + DEBUGVAR XPercent + EndIf + + Var Timeout = Timeout + 1 + If Timeout > 30 Then + + + Var TaobinLevel = 0 + Var CoffeePoint = 1 + + Var Seeker.TaobinErrorNetwork = 1 + Var Seeker.PointTaobinStr = ParamCP + + Var TelephoneNumber = TelephoneNumberX + + Var Seeker.TNumberTaobinMember= TelephoneNumber + DEBUGVAR "Try open collect.error timeout30" + Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_error.lxml" + + + EndIf + + TimerReset + Refresh + + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + + If StepGetPoint = 0 Then + If PdpaAsk = 0 Then + Open "ROOT/taobin_project/xml/page_show_consent.xml" + Else + Var StepGetPoint = 1 + + Var TelephoneNumber = TelephoneNumberX + + If UseSGPCollectFlag = 1 Then + GETACCEXT Param1 35 + Else + GETACCEXT TelephoneNumber 14 + EndIf + + Var Ext1a = "" + Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_2.xml" + EndIf + Else + + + + + If Ext1a = "" Then + + Var Seeker.TaobinErrorNetwork = 1 + Var Seeker.PointTaobinStr = ParamCP + Var TelephoneNumber = TelephoneNumberX + Var Seeker.TNumberTaobinMember = TelephoneNumber + Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_error.lxml" + + Else + + If Ext1a = "ok" Then + + Var TaobinName = Ext1d + Var TaobinCoupons = Ext1g + Var TaobinExpire = Ext1f + Var TaobinLevel = Ext1e + Var TaobinPDPA = Ext1h + + Var TaobinPromoX = Ext1j + + DEBUGVAR TaobinPDPA + + Var PointTaobinTmp = Ext1i + + DEBUGVAR PointTaobinTmp + INT PointTaobinTmp + + INT TaobinPDPA + + + Var TelephoneNumber = TelephoneNumberX + Var TNumberTaobinMemberXXX = TelephoneNumber + + ;Var PointTaobinTmp = 4 + + Var PointTaobin = PointTaobinTmp + Var pTaobin = PointTaobin + + DEBUGVAR TaobinLevel + + If TaobinLevel = "1" Then + Var pTaobin = PayAmount / 20 + Else + Var pTaobin = PayAmount / 15 + EndIf + + If pTaobin > 0 Then + Var pTaobinX = PointTaobin / pTaobin + If pTaobinX >= 2 Then + Var Point2X = 1 + EndIf + EndIf + + + Var Seeker.PointTaobinStr = ParamCP + Var Seeker.TNumberTaobinMember = TelephoneNumberX + + + Var CoffeePointRank = Ext1b + INT CoffeePointRank + + Var CoffeePoint1 = Ext1c + INT CoffeePoint1 + + Var CoffeePoint = PointTaobin + CoffeePoint1 + Var CoffeePointOld = CoffeePoint1 + + If TaobinLevel = 1 Then + Var CoffeePointRank = CoffeePointRank + 0 + Else + Var CoffeePointRank = CoffeePointRank + PointTaobin + EndIf + + Var CoffeePointRankTmp = CoffeePointRank + + + DEBUGVAR Seeker.PointTaobinStr + DEBUGVAR Seeker.TNumberTaobinMember + If TaobinPDPA = 0 Then + + ;inter-xml-open + If CountryName = "Malaysia" Then + Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_3.xml" + EndIf + + ;inter-xml-open + If CountryName = "Indonesia" Then + Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_3.xml" + EndIf + + ;inter-xml-open + If CountryName = "Australia" Then + + If NewCollectPointFlag = 1 Then + Var pageCollectPoint = CountryRootPath + "/xml/page_collect_point_3.lxml" + Open pageCollectPoint + Else + Open "ROOT/taobin_project/xml/page_collect_point_3.xml" + EndIf + + EndIf + + ;inter-xml-open + If CountryName = "Singapore" Then + DEBUGVAR "Try open collect3.sgp" + Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_3.xml" + EndIf + + Open "ROOT/taobin_project/xml/page_show_consent.xml" + EndIf + + If PayAmount >= 20 Then + + If TaobinPromoX = "p2.no_otp" Then + Open "ROOT/taobin_project/xml/page_collect_point_extend1.xml" + EndIf + + If TaobinPromoX = "p2.unused" Then + Open "ROOT/taobin_project/xml/page_collect_point_extend1.xml" + EndIf + + EndIf + + If NewCollectPoint = 1 Then + Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml" + Else + Open "ROOT/taobin_project/xml/page_collect_point_3.xml" + EndIf + + + Else + + Var Seeker.TaobinErrorNetwork = 1 + + Var Seeker.PointTaobinStr = ParamCP + Var TelephoneNumber = TelephoneNumberX + Var Seeker.TNumberTaobinMember = TelephoneNumber + Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_error.lxml" + EndIf + + + + + EndIf + EndIf + + + + + + + + + Var Seeker.TaobinErrorNetwork = 1 + + Var Seeker.PointTaobinStr = ParamCP + Var TelephoneNumber = TelephoneNumberX + Var Seeker.TNumberTaobinMember= TelephoneNumber + Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_error.lxml" + + + + + + If MachineStage = "drink-success" Then + Var MachineState_Result = 1 + EndIf + + If MachineStage = "drink-failed" Then + Var MachineState_Result = 2 + EndIf + + + + + + 178 + 680 + Var( DirImage + "/text20.png" ) + + + +;include="ROOT/taobin_project/inc/video.inc" + + + + + + + + + + 0 + 873 + 1080 + Center + 62 + RobotoBlack + 0x513C2F + TelephoneNumber + Telnum-mask-3 + + + +; + + 751 + 413 + IMG_CNT + +; + + XPosiShowCountDownBrew + 470 + ShowCountdown + End + 153 + 88 + RobotoBold + 0x513C2F + ShowCountDownBrewing + +; + + XPosiShowCountDownBrew + 470 + ShowPercent + End + 153 + 88 + RobotoBold + 0x513C2F + XPercent + + + + + \ No newline at end of file diff --git a/inter/sgp/xml/page_collect_point_3.lxml b/inter/sgp/xml/page_collect_point_3.lxml new file mode 100644 index 00000000..01ba5e40 --- /dev/null +++ b/inter/sgp/xml/page_collect_point_3.lxml @@ -0,0 +1,1290 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + + ; On open + + Var Timeout = 0 + ;CoffeePoint + ;Var CoffeePoint = 30 + Var BmiYear = "0/0/0/0/0/0/0/0/0/1" + Var PointCrm = "pdpa1" + Var GetScore = "" + Var TelephoneNumber = TelephoneNumberX + Var Seeker.TNumberTaobinMember = TelephoneNumber + ;AddData 4 TelephoneNumber BmiYear PointCrm GetScore + ;Add after pay + + Var PointMaskState = "Invisible" + + Var CoffeePointStr = CoffeePoint + + DEBUGVAR TelephoneNumber + DEBUGVAR TelephoneNumberX + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/display_point_en" + Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" + + Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png" + + Else + Var DirImage = "ROOT/taobin_project/image/display_point" + Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" + + Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png" + EndIf + + Var CoffeePointTmp = CoffeePoint + + If CoffeePoint > 29 Then + Var Timeout = 18 + Var CoffeePointTmp = 30 + EndIf + + + + Var pImage = CoffeePointTmp * 20 + Var pImage = pImage / 30 + Var pImageStr = "/taobinPoint.png" + + Var pImageStr = "ROOT/taobin_project/image/display_point" + pImageStr + + Var pointStr = "" + Var pointStr = pointStr + CoffeePointTmp + Var pointStr = pointStr + "/" + Var pointStr = pointStr + "30" + + + ;Var PointDiff = 150 - CoffeePointRank + Var PointDiff = 0 + + + + + + + + Var TaobinExpireDay = "" + Var TaobinExpireMonth = "" + Var TaobinExpireMonthX = "" + Var TaobinExpireYear = "" + + + + SPLIT TaobinExpire "/" 1 TaobinExpireDay + SPLIT TaobinExpire "/" 2 TaobinExpireMonth + SPLIT TaobinExpire "/" 3 TaobinExpireYear + + + If show_eng = "true" Then + + If TaobinExpireMonth = "01" Then + Var TaobinExpireMonth = "Jan" + Var TaobinExpireMonthX = "January" + EndIf + + If TaobinExpireMonth = "02" Then + Var TaobinExpireMonth = "Feb" + Var TaobinExpireMonthX = "February" + EndIf + + If TaobinExpireMonth = "03" Then + Var TaobinExpireMonth = "Mar" + Var TaobinExpireMonthX = "March" + EndIf + + If TaobinExpireMonth = "04" Then + Var TaobinExpireMonth = "Apr" + Var TaobinExpireMonthX = "April" + EndIf + + If TaobinExpireMonth = "05" Then + Var TaobinExpireMonth = "May" + Var TaobinExpireMonthX = "May" + EndIf + + If TaobinExpireMonth = "06" Then + Var TaobinExpireMonth = "Jun" + Var TaobinExpireMonthX = "June" + EndIf + + If TaobinExpireMonth = "07" Then + Var TaobinExpireMonth = "Jul" + Var TaobinExpireMonthX = "July" + EndIf + + If TaobinExpireMonth = "08" Then + Var TaobinExpireMonth = "Aug" + Var TaobinExpireMonthX = "August" + EndIf + + If TaobinExpireMonth = "09" Then + Var TaobinExpireMonth = "Sep" + Var TaobinExpireMonthX = "September" + EndIf + + If TaobinExpireMonth = "10" Then + Var TaobinExpireMonth = "Oct" + Var TaobinExpireMonthX = "October" + EndIf + + If TaobinExpireMonth = "11" Then + Var TaobinExpireMonth = "Nov" + Var TaobinExpireMonthX = "November" + EndIf + + If TaobinExpireMonth = "12" Then + Var TaobinExpireMonth = "Dec" + Var TaobinExpireMonthX = "December" + EndIf + + INT TaobinExpireYear + INT TaobinExpireDay + + Var TaobinExpireYear = TaobinExpireYear + 0 + + Else + + If TaobinExpireMonth = "01" Then + Var TaobinExpireMonth = "ม.ค." + Var TaobinExpireMonthX = "มกราคม" + EndIf + + If TaobinExpireMonth = "02" Then + Var TaobinExpireMonth = "ก.พ." + Var TaobinExpireMonthX = "กุมภาพันธ์" + EndIf + + If TaobinExpireMonth = "03" Then + Var TaobinExpireMonth = "มี.ค." + Var TaobinExpireMonthX = "มีนาคม" + EndIf + + If TaobinExpireMonth = "04" Then + Var TaobinExpireMonth = "เม.ย." + Var TaobinExpireMonthX = "เมษายน" + EndIf + + If TaobinExpireMonth = "05" Then + Var TaobinExpireMonth = "พ.ค." + Var TaobinExpireMonthX = "พฤษภาคม" + EndIf + + If TaobinExpireMonth = "06" Then + Var TaobinExpireMonth = "มิ.ย." + Var TaobinExpireMonthX = "มิถุนายน" + EndIf + + If TaobinExpireMonth = "07" Then + Var TaobinExpireMonth = "ก.ค." + Var TaobinExpireMonthX = "กรกฎาคม" + EndIf + + If TaobinExpireMonth = "08" Then + Var TaobinExpireMonth = "ส.ค." + Var TaobinExpireMonthX = "สิงหาคม" + EndIf + + If TaobinExpireMonth = "09" Then + Var TaobinExpireMonth = "ก.ย." + Var TaobinExpireMonthX = "กันยายน" + EndIf + + If TaobinExpireMonth = "10" Then + Var TaobinExpireMonth = "ต.ค." + Var TaobinExpireMonthX = "ตุลาคม" + EndIf + + If TaobinExpireMonth = "11" Then + Var TaobinExpireMonth = "พ.ย." + Var TaobinExpireMonthX = "พฤศจิกายน" + EndIf + + If TaobinExpireMonth = "12" Then + Var TaobinExpireMonth = "ธ.ค." + Var TaobinExpireMonthX = "ธันวาคม" + EndIf + + INT TaobinExpireYear + INT TaobinExpireDay + + Var TaobinExpireYear = TaobinExpireYear + 543 + + EndIf + + + Var ExpireStrTmp = "" + Var ExpireStrTmp = ExpireStrTmp + TaobinExpireDay + Var ExpireStrTmp = ExpireStrTmp + " " + Var ExpireStrTmp = ExpireStrTmp + TaobinExpireMonth + Var ExpireStrTmp = ExpireStrTmp + " " + Var ExpireStrTmp = ExpireStrTmp + TaobinExpireYear + + + + + If TaobinLevel = "1" Then + Var PointMaskState = "Enable" + EndIf + + + + + If show_eng = "true" Then + + Var TaobinLevelDesc3 = "You have coupons " + Var TaobinLevelDesc3 = TaobinLevelDesc3 + TaobinCoupons + Var TaobinLevelDesc3 = TaobinLevelDesc3 + " numbers" + + If TaobinLevel = "1" Then + Var TaobinLevelDesc1 = "Shy turtle level" + Var TaobinLevelDesc2 = "" + + Var TaobinLeveImg = "/taoLevel1.png" + EndIf + + If TaobinLevel = "2" Then + Var TaobinLevelDesc1 = "Walking turtle level" + Var PointDiff = 150 - CoffeePointRank + Var TaobinLevelDesc2 = "Earn " + PointDiff + Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells " + Var TaobinLevelDesc2 = TaobinLevelDesc2 + "to move to Flying turtle level" + + Var TaobinLeveImg = "/taoLevel2.png" + + If CoffeePointRank > 149 Then + ;Var TaobinLeveImg = "/taoLevel3.png" + + ;Var TaobinLevelDesc1 = "Flying turtle level " + Var TaobinLevelDesc2 = "" + ;Var CoffeePointRank = CoffeePointRank - 150 + + EndIf + + EndIf + + If TaobinLevel = "3" Then + Var TaobinLevelDesc1 = "Flying turtle level until " + ExpireStrTmp + + Var PointDiff = 200 - CoffeePointRank + Var TaobinLevelDesc2 = "Earn " + PointDiff + Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells " + Var TaobinLevelDesc2 = TaobinLevelDesc2 + "to move to Master turtle level" + + Var TaobinLeveImg = "/taoLevel3.png" + + If CoffeePointRank > 199 Then + ;Var TaobinLeveImg = "/taoLevel4.png" + + ;Var TaobinLevelDesc1 = "Master turtle level " + Var TaobinLevelDesc2 = "" + ;Var CoffeePointRank = CoffeePointRank - 350 + + EndIf + + EndIf + + If TaobinLevel = "4" Then + Var TaobinLevelDesc1 = "Master turtle level until " + ExpireStrTmp + + Var TaobinLevelDesc2 = "" + + Var TaobinLeveImg = "/taoLevel4.png" + EndIf + + + + Else + + Var TaobinLevelDesc3 = "ตอนนี้คุณมีคูปองแลกเครื่องดื่มฟรีเหลืออยู่ " + Var TaobinLevelDesc3 = TaobinLevelDesc3 + TaobinCoupons + Var TaobinLevelDesc3 = TaobinLevelDesc3 + " ใบ" + + If TaobinLevel = "1" Then + Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าขี้อาย" + Var TaobinLevelDesc2 = "" + + Var TaobinLeveImg = "/taoLevel1.png" + EndIf + + If TaobinLevel = "2" Then + Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าเตาะแตะ" + Var PointDiff = 150 - CoffeePointRank + Var TaobinLevelDesc2 = "สะสมกระดองอีก " + PointDiff + Var TaobinLevelDesc2 = TaobinLevelDesc2 + " กระดอง " + Var TaobinLevelDesc2 = TaobinLevelDesc2 + "เพื่อเลื่อนขั้นเป็นเต่าติดปีก" + + Var TaobinLeveImg = "/taoLevel2.png" + + If CoffeePointRank > 149 Then + ;Var TaobinLeveImg = "/taoLevel3.png" + + ;Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าติดปีก " + Var TaobinLevelDesc2 = "" + ;Var CoffeePointRank = CoffeePointRank - 150 + + EndIf + + EndIf + + If TaobinLevel = "3" Then + Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าติดปีก จนถึง " + ExpireStrTmp + + Var PointDiff = 200 - CoffeePointRank + Var TaobinLevelDesc2 = "สะสมกระดองอีก " + PointDiff + Var TaobinLevelDesc2 = TaobinLevelDesc2 + " กระดอง " + Var TaobinLevelDesc2 = TaobinLevelDesc2 + "เพื่อเลื่อนขั้นเป็นผู้เฒ่าเต่า" + + Var TaobinLeveImg = "/taoLevel3.png" + + If CoffeePointRank > 199 Then + ;Var TaobinLeveImg = "/taoLevel4.png" + + ;Var TaobinLevelDesc1 = "ระดับสมาชิก ผู้เฒ่าเต่า " + Var TaobinLevelDesc2 = "" + ;Var CoffeePointRank = CoffeePointRank - 350 + + EndIf + + EndIf + + If TaobinLevel = "4" Then + Var TaobinLevelDesc1 = "ระดับสมาชิก ผู้เฒ่าเต่า จนถึง " + ExpireStrTmp + + Var TaobinLevelDesc2 = "" + + Var TaobinLeveImg = "/taoLevel4.png" + EndIf + + + EndIf + + + + + Var CheckCoupons = 0 + Var MakeDrinkState = 0 + + + Var taobinP1 = "Invisible" + Var taobinP2 = "Invisible" + Var taobinP3 = "Invisible" + Var taobinP4 = "Invisible" + Var taobinP5 = "Invisible" + Var taobinP6 = "Invisible" + Var taobinP7 = "Invisible" + Var taobinP8 = "Invisible" + Var taobinP9 = "Invisible" + Var taobinP10 = "Invisible" + Var taobinP11 = "Invisible" + Var taobinP12 = "Invisible" + Var taobinP13 = "Invisible" + Var taobinP14 = "Invisible" + Var taobinP15 = "Invisible" + Var taobinP16 = "Invisible" + Var taobinP17 = "Invisible" + Var taobinP18 = "Invisible" + Var taobinP19 = "Invisible" + Var taobinP20 = "Invisible" + Var taobinP21 = "Invisible" + Var taobinP22 = "Invisible" + Var taobinP23 = "Invisible" + Var taobinP24 = "Invisible" + Var taobinP25 = "Invisible" + Var taobinP26 = "Invisible" + Var taobinP27 = "Invisible" + Var taobinP28 = "Invisible" + Var taobinP29 = "Invisible" + Var taobinP30 = "Invisible" + + Var taobinImgP1 = "/taobinPN.png" + Var taobinImgP2 = "/taobinPN.png" + Var taobinImgP3 = "/taobinPN.png" + Var taobinImgP4 = "/taobinPN.png" + Var taobinImgP5 = "/taobinPN.png" + Var taobinImgP6 = "/taobinPN.png" + Var taobinImgP7 = "/taobinPN.png" + Var taobinImgP8 = "/taobinPN.png" + Var taobinImgP9 = "/taobinPN.png" + Var taobinImgP10 = "/taobinPN.png" + Var taobinImgP11 = "/taobinPN.png" + Var taobinImgP12 = "/taobinPN.png" + Var taobinImgP13 = "/taobinPN.png" + Var taobinImgP14 = "/taobinPN.png" + Var taobinImgP15 = "/taobinPN.png" + Var taobinImgP16 = "/taobinPN.png" + Var taobinImgP17 = "/taobinPN.png" + Var taobinImgP18 = "/taobinPN.png" + Var taobinImgP19 = "/taobinPN.png" + Var taobinImgP20 = "/taobinPN.png" + Var taobinImgP21 = "/taobinPN.png" + Var taobinImgP22 = "/taobinPN.png" + Var taobinImgP23 = "/taobinPN.png" + Var taobinImgP24 = "/taobinPN.png" + Var taobinImgP25 = "/taobinPN.png" + Var taobinImgP26 = "/taobinPN.png" + Var taobinImgP27 = "/taobinPN.png" + Var taobinImgP28 = "/taobinPN.png" + Var taobinImgP29 = "/taobinPN.png" + Var taobinImgP30 = "/taobinPN.png" + + + If CoffeePointOld >= 1 Then + Var taobinImgP1 = "/taobinPO.png" + EndIf + If CoffeePointOld >= 2 Then + Var taobinImgP2 = "/taobinPO.png" + EndIf + If CoffeePointOld >= 3 Then + Var taobinImgP3 = "/taobinPO.png" + EndIf + If CoffeePointOld >= 4 Then + Var taobinImgP4 = "/taobinPO.png" + EndIf + If CoffeePointOld >= 5 Then + Var taobinImgP5 = "/taobinPO.png" + EndIf + If CoffeePointOld >= 6 Then + Var taobinImgP6 = "/taobinPO.png" + EndIf + If CoffeePointOld >= 7 Then + Var taobinImgP7 = "/taobinPO.png" + EndIf + If CoffeePointOld >= 8 Then + Var taobinImgP8 = "/taobinPO.png" + EndIf + If CoffeePointOld >= 9 Then + Var taobinImgP9 = "/taobinPO.png" + EndIf + If CoffeePointOld >= 10 Then + Var taobinImgP10 = "/taobinPO.png" + EndIf + If CoffeePointOld >= 11 Then + Var taobinImgP11 = "/taobinPO.png" + EndIf + If CoffeePointOld >= 12 Then + Var taobinImgP12 = "/taobinPO.png" + EndIf + If CoffeePointOld >= 13 Then + Var taobinImgP13 = "/taobinPO.png" + EndIf + If CoffeePointOld >= 14 Then + Var taobinImgP14 = "/taobinPO.png" + EndIf + If CoffeePointOld >= 15 Then + Var taobinImgP15 = "/taobinPO.png" + EndIf + If CoffeePointOld >= 16 Then + Var taobinImgP16 = "/taobinPO.png" + EndIf + If CoffeePointOld >= 17 Then + Var taobinImgP17 = "/taobinPO.png" + EndIf + If CoffeePointOld >= 18 Then + Var taobinImgP18 = "/taobinPO.png" + EndIf + If CoffeePointOld >= 19 Then + Var taobinImgP19 = "/taobinPO.png" + EndIf + If CoffeePointOld >= 20 Then + Var taobinImgP20 = "/taobinPO.png" + EndIf + If CoffeePointOld >= 21 Then + Var taobinImgP21 = "/taobinPO.png" + EndIf + If CoffeePointOld >= 22 Then + Var taobinImgP22 = "/taobinPO.png" + EndIf + If CoffeePointOld >= 23 Then + Var taobinImgP23 = "/taobinPO.png" + EndIf + If CoffeePointOld >= 24 Then + Var taobinImgP24 = "/taobinPO.png" + EndIf + If CoffeePointOld >= 25 Then + Var taobinImgP25 = "/taobinPO.png" + EndIf + If CoffeePointOld >= 26 Then + Var taobinImgP26 = "/taobinPO.png" + EndIf + If CoffeePointOld >= 27 Then + Var taobinImgP27 = "/taobinPO.png" + EndIf + If CoffeePointOld >= 28 Then + Var taobinImgP28 = "/taobinPO.png" + EndIf + If CoffeePointOld >= 29 Then + Var taobinImgP29 = "/taobinPO.png" + EndIf + If CoffeePointOld >= 30 Then + Var taobinImgP30 = "/taobinPO.png" + EndIf + + If CoffeePoint >= 1 Then + Var taobinP1 = "Enable" + EndIf + If CoffeePoint >= 2 Then + Var taobinP2 = "Enable" + EndIf + If CoffeePoint >= 3 Then + Var taobinP3 = "Enable" + EndIf + If CoffeePoint >= 4 Then + Var taobinP4 = "Enable" + EndIf + If CoffeePoint >= 5 Then + Var taobinP5 = "Enable" + EndIf + If CoffeePoint >= 6 Then + Var taobinP6 = "Enable" + EndIf + If CoffeePoint >= 7 Then + Var taobinP7 = "Enable" + EndIf + If CoffeePoint >= 8 Then + Var taobinP8 = "Enable" + EndIf + If CoffeePoint >= 9 Then + Var taobinP9 = "Enable" + EndIf + If CoffeePoint >= 10 Then + Var taobinP10 = "Enable" + EndIf + If CoffeePoint >= 11 Then + Var taobinP11 = "Enable" + EndIf + If CoffeePoint >= 12 Then + Var taobinP12 = "Enable" + EndIf + If CoffeePoint >= 13 Then + Var taobinP13 = "Enable" + EndIf + If CoffeePoint >= 14 Then + Var taobinP14 = "Enable" + EndIf + If CoffeePoint >= 15 Then + Var taobinP15 = "Enable" + EndIf + If CoffeePoint >= 16 Then + Var taobinP16 = "Enable" + EndIf + If CoffeePoint >= 17 Then + Var taobinP17 = "Enable" + EndIf + If CoffeePoint >= 18 Then + Var taobinP18 = "Enable" + EndIf + If CoffeePoint >= 19 Then + Var taobinP19 = "Enable" + EndIf + If CoffeePoint >= 20 Then + Var taobinP20 = "Enable" + EndIf + If CoffeePoint >= 21 Then + Var taobinP21 = "Enable" + EndIf + If CoffeePoint >= 22 Then + Var taobinP22 = "Enable" + EndIf + If CoffeePoint >= 23 Then + Var taobinP23 = "Enable" + EndIf + If CoffeePoint >= 24 Then + Var taobinP24 = "Enable" + EndIf + If CoffeePoint >= 25 Then + Var taobinP25 = "Enable" + EndIf + If CoffeePoint >= 26 Then + Var taobinP26 = "Enable" + EndIf + If CoffeePoint >= 27 Then + Var taobinP27 = "Enable" + EndIf + If CoffeePoint >= 28 Then + Var taobinP28 = "Enable" + EndIf + If CoffeePoint >= 29 Then + Var taobinP29 = "Enable" + EndIf + If CoffeePoint >= 30 Then + Var taobinP30 = "Enable" + EndIf + + If Seeker = "curr" Then + Var CheckCouponState = "Enable" + Else + Var CheckCouponState = "Disable" + EndIf + + + Var PointEndDate = "" + GetDateEndOfMonth PointEndDate + DEBUGVAR PointEndDate + Var xPointEndDate = 570 + + If show_eng = "true" Then + Var xPointEndDate = 618 + EndIf + + Var Point2XState = "Invisible" + Var Point2XImage = "" + If Point2X = 1 Then + Var Point2XState = "Enable" + If Seeker.CampaignPayChanel = "kbank" Then + Var Point2XImage = "/text9.png" + EndIf + If Seeker.CampaignPayChanel = "true" Then + Var Point2XImage = "/text10.png" + EndIf + If Seeker.CampaignPayChanel = "dolfin" Then + Var Point2XImage = "/text11.png" + EndIf + + EndIf + + ;inter-from-consent + If CountryName = "Malaysia" Then + Var Seeker.FromConsent = 0 + EndIf + + ;inter-from-consent + If CountryName = "Indonesia" Then + Var Seeker.FromConsent = 0 + EndIf + + ;inter-from-consent + If CountryName = "Australia" Then + Var Seeker.FromConsent = 0 + EndIf + + ;inter-from-consent + If CountryName = "Singapore" Then + Var Seeker.FromConsent = 0 + EndIf + + Var ShowPercent = "Invisible" + Var ShowCountdown = "Enable" + + If ShowCountDownAsPercent = 1 Then + Var ShowPercent = "Enable" + Var ShowCountdown = "Invisible" + + Var IMG_CNT = "ROOT/taobin_project/inter/sgp/image/page_doing/img2_percent_eng.png" + EndIf + + + + 1000 + + + Var CountDownBrewing = BREW_CNT + + Var ShowCountDownBrewing = CountDownBrewing + + ;percent + If ShowCountDownAsPercent = 1 Then + Var XPercent = InitCNT - ShowCountDownBrewing + If ShowCountDownBrewing <= 5 Then + Var XPercent = 95 + Else + Var XPercent = XPercent * 100 + DEBUGVAR XPercent + Var XPercent = XPercent / InitCNT + EndIf + + DEBUGVAR XPercent + EndIf + + Var Timeout = Timeout + 1 + If Timeout > 5 Then + + ; goto lid straw + If CoffeePoint > 29 Then + Open "ROOT/taobin_project/xml/page_display_get_free.xml" + Else + If Seeker.FromConsent = 1 Then + Open "ROOT/taobin_project/xml/page_display_get_free.xml" + Else + + + + Open "ROOT/taobin_project/xml/page_lid_straw.xml" + EndIf + + EndIf + EndIf + + + + TimerReset + Refresh + + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + If CheckCoupons = 1 Then + Var MakeDrinkState = 1 + Var CouponPage = 1 + Var CouponInfo1 = Ext1a + Var CouponInfo2 = Ext1b + Var CouponInfo3 = Ext1c + Var CouponInfo4 = Ext1d + Var CouponInfo5 = Ext1e + Var CouponInfo6 = Ext1f + Var CouponInfo7 = Ext1g + Var CouponInfo8 = Ext1h + Var CouponInfo9 = Ext1i + Var CouponInfo10 = Ext1j + + Var TelephoneNumber = TelephoneNumberX + GETACCEXT TelephoneNumber 13 + Var CheckCoupons = 2 + + Else + + If CheckCoupons = 2 Then + + Var TaobinCredit = Ext1b + + If InternationalEnable = 1 Then + Var ChackMemberPage = CountryRootPath + "xml/page_check_member2.lxml" + + If CountryName = "Malaysia" Then + Open ChackMemberPage + EndIf + + If CountryName = "UnitedArabEmirates Dubai" Then + Open ChackMemberPage + EndIf + + + Else + Open "ROOT/taobin_project/xml/page_check_member2.xml" + EndIf + + + EndIf + + EndIf + + + + + + + If MachineStage = "drink-success" Then + Var MachineState_Result = 1 + EndIf + + If MachineStage = "drink-failed" Then + Var MachineState_Result = 2 + EndIf + + + + +;include="ROOT/taobin_project/inc/video.inc" + + + + + + + + + + 0 + 380 + "ROOT/taobin_project/image/display_point/alpha.png" + + + +; + + + + + 158 + 665 + Var( DirImage + "/img_popup1.png" ) + + + + 158 + 665 + Var( DirImage + "/img_popup3.png" ) + + + + + 243 + 722 + Var( DirImage + "/text7.png" ) + + + + + 243 + 860 + Var( DirImage + "/text4.png" ) + + + + + + + 625 + 734 + Var( DirImage + TaobinLeveImg ) + +; + + + + 240 + 1161 + pImageStr + + + + + + + + + +; +; 420 +; 638 +; 56 +; KanitBoldTTF +; 0x513C2F +; TelephoneNumber +; Telnum +; +; +; +; +; 323 +; 865 +; 434 +; Center +; 64 +; KanitSemiBoldTTF +; 0xDE794E +; CoffeePoint +; + +; +; 250 +; 1241 +; 434 +; 64 +; KanitSemiBoldTTF +; 0xDE794E +; pointStr +; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 250 + 745 + 35 + 1000 + KanitRegularTTF + 0x513C2F + TaobinName + + + + 250 + 790 + 20 + 1000 + KanitRegularTTF + 0x746253 + TNumberTaobinMemberXXX + Telnum-mask-3 + + + + 250 + 890 + 50 + 120 + KanitRegularTTF + 0xDE794E + CoffeePointRank + + + + + + 250 + 990 + 25 + 1000 + KanitRegularTTF + 0xDE794E + TaobinLevelDesc1 + + + + 250 + 1020 + 20 + 1000 + KanitRegularTTF + 0x746253 + TaobinLevelDesc2 + + + + 172 + 1570 + Var( DirImage + "/text8.png" ) + + + + xPointEndDate + 1576 + 25 + 500 + KanitRegularTTF + 0xDE794E + PointEndDate + + + + 310 + 1621 + 25 + 1000 + KanitRegularTTF + 0x746253 + TaobinLevelDesc3 + + + + + + +; + + 751 + 413 + IMG_CNT + +; + + XPosiShowCountDownBrew + 470 + ShowCountdown + End + 153 + 88 + RobotoBold + 0x513C2F + ShowCountDownBrewing + +; + + XPosiShowCountDownBrew + 470 + ShowPercent + End + 153 + 88 + RobotoBold + 0x513C2F + XPercent + + + + + + + \ No newline at end of file diff --git a/inter/sgp/xml/page_collect_point_error.lxml b/inter/sgp/xml/page_collect_point_error.lxml new file mode 100644 index 00000000..05be6c3e --- /dev/null +++ b/inter/sgp/xml/page_collect_point_error.lxml @@ -0,0 +1,112 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + + ; On open + + + Var Timeout = 0 + SAVELOG show_eng + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/display_get_free_en/" + Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" + + Else + Var DirImage = "ROOT/taobin_project/image/display_get_free/" + Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + EndIf + + 1000 + + + Var Timeout = Timeout + 1 + If Timeout > 5 Then + ; goto lid straw + + + + Open "ROOT/taobin_project/xml/page_lid_straw.xml" + EndIf + + TimerReset + Refresh + + + + If MachineStage = "drink-success" Then + Var MachineState_Result = 1 + EndIf + + If MachineStage = "drink-failed" Then + Var MachineState_Result = 2 + EndIf + + + + + + 0 + 380 + "ROOT/taobin_project/image/collectiing/alpha.png" + + + + + + + + + 158 + 665 + Var( DirImage + "/img_popup4.png" ) + + + + + + + +;include="ROOT/taobin_project/inc/video.inc" + + + + + + + + + + + + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + \ No newline at end of file diff --git a/inter/sgp/xml/page_member_prompt.lxml b/inter/sgp/xml/page_member_prompt.lxml new file mode 100644 index 00000000..50f00412 --- /dev/null +++ b/inter/sgp/xml/page_member_prompt.lxml @@ -0,0 +1,128 @@ + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + + Var DisplayPrompt = "Enable" + Var DisplayQR = "Invisible" + + ; img + Var ImgDir = CountryRootPath + "/image/page_member/" + Var PromptDialogImg = ImgDir + "ask_member_dialog.png" + Var YesButton = ImgDir + "bn_yes.png" + Var NoButton = ImgDir + "bn_no.png" + 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 + + Var IMG_CNT = ImgDir + "img2_sp_eng.png" + + + + 1000 + + + Var Timeout = Timeout + 1 + Var RemainingInThisPage = 25 - Timeout + If RemainingInThisPage <= 0 Then + Var RemainingInThisPage = 0 + EndIf + + DEBUGVAR Timeout + + If Timeout > 25 Then + Var Timeout = 0 + ; to-lid-straw + SAVELOG "member_prompt.Timeout" + ;Open "ROOT/taobin_project/xml/page_catalog.xml" + + + Open "ROOT/taobin_project/xml/page_lid_straw.xml" + EndIf + + Refresh + TimerReset + + + + + 150 + 618 + DisplayPrompt + 800 + 800 + SoundVolume + PromptDialogImg + + + + + + + + 751 + 413 + IMG_CNT + + + + 768 + 470 + End + 153 + 88 + RobotoBold + 0x513C2F + RemainingInThisPage + + + + 449 + 1065 + DisplayQR + QRImg + + +;include="ROOT/taobin_project/inc/video.inc" + + \ No newline at end of file diff --git a/inter/sgp/xml/page_remove_cup.lxml b/inter/sgp/xml/page_remove_cup.lxml index dab8db7d..94f1a638 100644 --- a/inter/sgp/xml/page_remove_cup.lxml +++ b/inter/sgp/xml/page_remove_cup.lxml @@ -10,9 +10,9 @@ Var countClick = 0 Var countClick2 = 0 - Var CountryName = "Australia" + Var CountryName = "Singapore" - DEBUGVAR "AUS Remove Cup" + DEBUGVAR "SGP Remove Cup" Var DirImage = "ROOT/taobin_project/inter/common/image/user_take_cup_en/" diff --git a/inter/sgp/xml/page_topping_select6.lxml b/inter/sgp/xml/page_topping_select6.lxml index 5711fee1..49816624 100644 --- a/inter/sgp/xml/page_topping_select6.lxml +++ b/inter/sgp/xml/page_topping_select6.lxml @@ -4134,5 +4134,12 @@ ; + + +DEBUGVAR SELLSTATUS +Var SELLSTATUS = "SELLNOCASH" +DEBUGVAR SELLSTATUS + + diff --git a/xml/page_board.xml b/xml/page_board.xml index 3e893f44..3f686fe9 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -830,7 +830,7 @@ Var CountryRootPath = "ROOT/taobin_project/inter/sgp/" Var CountryShortName = "sgp" - ar TextPriceMenuSize = 12 + Var TextPriceMenuSize = 12 Var TextPriceMenuY = 264 Var TextPriceMenuBlendX = 180 Var TextPriceMenuHotX = 48 @@ -857,13 +857,15 @@ Var SettingDisableTaobinCode = "false" ; Singapore disable point - Var SettingIgnoreCollectPoint = 1 + ;Var SettingIgnoreCollectPoint = 1 Var SettingVideoBrewingUseCommon = 1 Var MinPhoneNumber = 8 Var MaxPhoneNumber = 8 + Var ShowCountDownAsPercent = 1 + EndIf diff --git a/xml/page_drinkfail2.xml b/xml/page_drinkfail2.xml index 7c8cd62a..2819559a 100644 --- a/xml/page_drinkfail2.xml +++ b/xml/page_drinkfail2.xml @@ -581,11 +581,8 @@ Var VendingTSIDProblem = VendingTSID EndIf - ; server-rm-zero - If CountryName = "Singapore" Then - Var TelephoneNumberProblem = "0" + TelephoneNumberProblem - DEBUGVAR TelephoneNumberProblem - EndIf + ; sgp-server-rm-zero + PROBLEM2 TelephoneNumberProblem ProblemID ChooseProblem VendingTSIDProblem diff --git a/xml/page_payment_cash-SGP.xml b/xml/page_payment_cash-SGP.xml index acab9035..e40f91e0 100644 --- a/xml/page_payment_cash-SGP.xml +++ b/xml/page_payment_cash-SGP.xml @@ -7,6 +7,15 @@ PlaySoundLag + READ_FILE "/mnt/sdcard/coffeevending/sim_on" str_sim_on + DEBUGVAR str_sim_on + + Var SGPSimMode = "Invisible" + + If str_sim_on = "1" Then + Var SGPSimMode = "Enable" + EndIf + Var cash_disable = "0" READ_FILE "/mnt/sdcard/coffeevending/cash_disable" cash_disable DEBUGVAR cash_disable @@ -2454,6 +2463,32 @@ EndIf ShowNetworkProblemText + + + + 5 + 1880 + SGPSimMode + 24 + Center + 1080 + RobotoRegular + 0xFFFFFF + "Test Bypass Payment" + + @@ -2471,7 +2506,12 @@ Var PayState1 = "Enable" + +MakeDrinkV1 SelectDrink SelectSugarID +Open "ROOT/taobin_project/xml/page_thankyou.xml" + + diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index 3febc77e..a7277867 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -363,7 +363,13 @@ Open "ROOT/taobin_project/xml/page_lid_straw.xml" EndIf - Open "ROOT/taobin_project/xml/page_collect_point_1.xml" + If CountryName = "Singapore" Then + ; ask-if-member-yet + Var MemberPrompt = CountryRootPath + "xml/page_member_prompt.lxml" + Open MemberPrompt + Else + Open "ROOT/taobin_project/xml/page_collect_point_1.xml" + EndIf Else If Seeker.StoreCreditFlag = 1 Then @@ -409,9 +415,19 @@ If Seeker.FreeVendingCampaign = 1 Then If Seeker.CollectPointPromotion = 1 Then + If CountryName = "Singapore" Then + ; ask-if-member-yet + Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml" + Open MemberPrompt + EndIf Open "ROOT/taobin_project/xml/page_collect_point_1.xml" Else If Seeker.CollectPointMain = 1 Then + If CountryName = "Singapore" Then + ; ask-if-member-yet + Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml" + Open MemberPrompt + EndIf Open "ROOT/taobin_project/xml/page_collect_point_1.xml" EndIf EndIf @@ -420,6 +436,11 @@ If CART_INDEX >= 2 Then Open "ROOT/taobin_project/xml/page_lid_straw.xml" EndIf + If CountryName = "Singapore" Then + ; ask-if-member-yet + Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml" + Open MemberPrompt + EndIf Open "ROOT/taobin_project/xml/page_collect_point_1.xml" EndIf @@ -434,9 +455,19 @@ ;EndIf If Seeker.CollectPointPromotion = 1 Then + If CountryName = "Singapore" Then + ; ask-if-member-yet + Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml" + Open MemberPrompt + EndIf Open "ROOT/taobin_project/xml/page_collect_point_1.xml" Else If Seeker.CollectPointMain = 1 Then + If CountryName = "Singapore" Then + ; ask-if-member-yet + Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml" + Open MemberPrompt + EndIf Open "ROOT/taobin_project/xml/page_collect_point_1.xml" EndIf EndIf @@ -446,6 +477,11 @@ If CART_INDEX >= 2 Then Open "ROOT/taobin_project/xml/page_lid_straw.xml" EndIf + If CountryName = "Singapore" Then + ; ask-if-member-yet + Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml" + Open MemberPrompt + EndIf Open "ROOT/taobin_project/xml/page_collect_point_1.xml" EndIf EndIf