From eaa428b70711bb13ba805ff01b5f58d43c73268a Mon Sep 17 00:00:00 2001 From: Pakin Date: Fri, 5 Jul 2024 08:31:35 +0700 Subject: [PATCH] SGP: WIP member prompt page & change brew time to percent --- .../sgp/image/page_doing/img2_percent_eng.png | Bin 0 -> 3823 bytes .../image/page_member/ask_member_dialog.png | Bin 0 -> 29132 bytes inter/sgp/image/page_member/bn_no.png | Bin 0 -> 1507 bytes inter/sgp/image/page_member/bn_yes.png | Bin 0 -> 1597 bytes inter/sgp/image/page_member/bp_no.png | Bin 0 -> 1692 bytes inter/sgp/image/page_member/bp_yes.png | Bin 0 -> 1691 bytes inter/sgp/image/page_member/img2_sp_eng.png | Bin 0 -> 5346 bytes inter/sgp/image/page_member/qr_regis.png | Bin 0 -> 1956 bytes inter/sgp/xml/page_brewing3.lxml | 65 +- inter/sgp/xml/page_brewing3Conti.xml | 54 + inter/sgp/xml/page_check_member1.lxml | 12 +- inter/sgp/xml/page_check_newmember2.lxml | 10 +- inter/sgp/xml/page_collect_point_1.lxml | 1137 +++++++++++++++ inter/sgp/xml/page_collect_point_2.lxml | 371 +++++ inter/sgp/xml/page_collect_point_3.lxml | 1290 +++++++++++++++++ inter/sgp/xml/page_collect_point_error.lxml | 112 ++ inter/sgp/xml/page_member_prompt.lxml | 128 ++ inter/sgp/xml/page_remove_cup.lxml | 4 +- inter/sgp/xml/page_topping_select6.lxml | 7 + xml/page_board.xml | 6 +- xml/page_drinkfail2.xml | 7 +- xml/page_payment_cash-SGP.xml | 40 + xml/page_thankyou.xml | 38 +- 23 files changed, 3266 insertions(+), 15 deletions(-) create mode 100644 inter/sgp/image/page_doing/img2_percent_eng.png create mode 100644 inter/sgp/image/page_member/ask_member_dialog.png create mode 100644 inter/sgp/image/page_member/bn_no.png create mode 100644 inter/sgp/image/page_member/bn_yes.png create mode 100644 inter/sgp/image/page_member/bp_no.png create mode 100644 inter/sgp/image/page_member/bp_yes.png create mode 100644 inter/sgp/image/page_member/img2_sp_eng.png create mode 100644 inter/sgp/image/page_member/qr_regis.png create mode 100644 inter/sgp/xml/page_collect_point_1.lxml create mode 100644 inter/sgp/xml/page_collect_point_2.lxml create mode 100644 inter/sgp/xml/page_collect_point_3.lxml create mode 100644 inter/sgp/xml/page_collect_point_error.lxml create mode 100644 inter/sgp/xml/page_member_prompt.lxml 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 0000000000000000000000000000000000000000..0ad711e783607dbf1bc65f0ab244d012e8aca799 GIT binary patch literal 3823 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 NK;QUom9BmC{{W~TRPF!( literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4b0ec1b83670823e99faf437e7e00003345a6986 GIT binary patch literal 29132 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 JPDHLkV1kt+%-{e3 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..85b6e3d90d13c45b6cc0fa56e1748d4fce5315fa GIT binary patch literal 1597 zcmV-D2EzG?P)Xvop?ac9WgGW%m1lWyhU&Mlbv0 zd7gI`9f>LTlIzNIk`+f>nUjnFSl&`n5??$?OR-S&yf~LSjV#J#-OSvq^f`|7n7_ys z0LkQtXF}nk36qgV!er3^F~Q-=Q#tPYCO81J7DvXMw47KhNYeFA?Cfy+Oto>|ygCIy zE6SQNMNj+M%wun=RIIh2W`LORIBrUlA#=D=0JJjAfc+cRWaOWz(zWW73j$>4R`+ug z9s>dZWhN7H8`fqrCPc18Kd%Uoa^*pI09e3eLuYj*5)M&w9d6DSxhep#2ooB+3b(z2 z9;bp2eMim+04yPz6*fR}TV0;-0MHnd6*e=Z93ZB3IW7RuAm5jF_1(#3-K;+=e+U4? zptF#a%*uWNfcSDL)4p^G0L0}>Hsv@BPXWZ|r{v|7&+ZF=W|-_q2>>*S00Gc60t7(Q z2oL~GTOmlCw$-bpt!=eEo|&1Jnd#|8*RNauVt73H=z#!@q5?@GU*zi_ew6c9ewD%D z(~BD~_Oj89Oy%g9nI%07)nfgD*e()E;X{bRX=kIInY(X!Vi5G+y&Qx=ydx z_eSaZ=v)QK#Sk^YuK)6r6mQF3>&>)_dC4{fPG)9NFFMXgd6*6#J;z!nhyoF?uBO+iH5<%y*uH0 z4Ugf`?`+^yhrz~8TWmX2-4f~A!yg~3S#{_&ZL3xZl8Fi=;j{wLkl4Gg+f)dL>~OW` zgFYK5N~?pYp7;CgmtGAWJz^_|U^b#vh6aV+t9bLbuo4M^Nn0Upn}R^npwdv8eDqL| zOaw>^&@c6lU3+YGarmS808nG6h8H~d5uDR-sBTrp&yAXPXuIs#y~hqMtZFN=>ghBq&g_`$@Ru|QuY2`9Fa@zhKafYr~zNkQ2gl_9D zwQU=nRcM!=m{64ZE|V zYJI7Lxrnk4pKX(d=uS(2?*SVe(VZBrMD(StQZUR#vJfB$P29g59uFNmVgsj9^DWV+ zeQ7JBK@zk}x=VBY>dzIsJxB%u1fj`?5A1UyI={%ivR(2Q$D6v3RwUZiOx(L`cWurfO&@=)B zK-2X9#`OdM;xgHx6-ZG4ASTDx0P*Ed0f6|fX$4Xc0Eo+%i;li`b+}i}TTTF=5oZ2z z?UvVWcVWyR^{fCugG}XdqWnIuYpeUWDM?%bfW?%n4?PT@12GfTUIBn5M6)6t9C%YD zuYFBME0UZ5Kn>cu6mENC!JpI7lO{w8CPbb$hn)fd5hgrFOn3}LKTB6HG9i+u5&;lZ zt~>^+KTp?MY%7ss{wPF5PHfpZVTgtSwDe z0JIiI#+&sbLA;X2DS6Xtt#AL(dsi{aD v6C`tz5dh0uN=ha)Jo!(Gg?pYC=hFWHu0s|wU}(;Y00000NkvXXu0mjfNJ-zD literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fe7d93736200e671c49d7d926b1a33df4ad22635 GIT binary patch literal 1692 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5db1d9a55d29811cf60c7b11b74b389afff05598 GIT binary patch literal 1956 zcmcIleM}o=7{AGw+YrV~oT7CwlbNuA+}b&4Efh8g5TOX;%OGDu$6$ehN6SZPONOy( zNEy*>P&zt4(r&N;`(R~s&=@wrF?(hwbc{h&0_PPhTM9XQ?X@17h)&MvAHK<(C(rx5 z&wJ0u@A=(FZ}DTjx4yU)008g!xabrB*bub3H*ca&Y9tCFB{mjCB}M_jJ!)t}6z44dA4Gd7x%)UqGa%P6s> zJnn6Xl6k-FN5>Ar)GbYXbX02fgP*6P${vRKMkb5FP;k+qhP`q>E7~{8Y~HSXO==$~ z{WiGcQeAoSxpx1ik=ZQ)->WfCpzd_u2EP-Yg`0Pr+?5&m!T+ZW8xXHw=BS0u&KA`A zO>uWN@mvm@&2|s%en;ZA5LLOdaSPGyTt;#I{rq)`sek6HrPE~mVo7#~F}{ZeIEvOGWqX6N9lFskoxAzDA=_+a-@w>i(+h1b zXVvAQzhjqb;A{)~B4#^n9dwPe&mm}~2ENLX7)xr6kLV_3b-I>oVlp&vma_c|HaVcE zQa5D1PU7}Gba}Aky<(q2VxYQnp)F!tvF@-ji#Ut1ujt(*kFMkB2<8Fuq9s11IGLyp z72yjRG{~;FTay_Q5|ZTa?~jb#KeBSO6SFmn;AEw zT2{FBK={+W4%@#V3@8psM^zRm1%b-6Jv893SKtj_)=$xx*GO=Uy`H4U|7>x244Wci zr|!))QopXh53~NPQiNuN&rldxjz^T4F*}MAd|ylbM}Sp1wjr7e!aVn`4@-M a 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