pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

SGP: WIP member prompt page & change brew time to percent

Browse source
This commit is contained in:
Pakin 2024-07-05 08:31:35 +07:00
parent b6e6011eb0
commit eaa428b707
23 changed files with 3266 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
inter/sgp/image/page_doing/img2_percent_eng.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
inter/sgp/image/page_member/ask_member_dialog.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 28 KiB

BIN
inter/sgp/image/page_member/bn_no.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
inter/sgp/image/page_member/bn_yes.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
inter/sgp/image/page_member/bp_no.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
inter/sgp/image/page_member/bp_yes.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
inter/sgp/image/page_member/img2_sp_eng.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
inter/sgp/image/page_member/qr_regis.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.9 KiB

65
inter/sgp/xml/page_brewing3.lxml
View file

@ -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 @@
<Text>
<X> XPosiShowCountDownBrew </X>
<Y> 470 </Y>
<State> ShowCountdown </State>
<Align> End </Align>
<Width> 153 </Width>
<Size> 88 </Size>
@ -1524,11 +1571,23 @@
<Color> 0x513C2F </Color>
<Value> ShowCountDownBrewing </Value>
</Text>
;
<Text>
<X> XPosiShowCountDownBrew </X>
<Y> 470 </Y>
<State> ShowPercent </State>
<Align> End </Align>
<Width> 153 </Width>
<Size> 88 </Size>
<Font> RobotoBold </Font>
<Color> 0x513C2F </Color>
<Value> XPercent </Value>
</Text>
<Text>
<X> 816 </X>
<Y> 429 </Y>
<State> LanguageObjectShow </State>
<State> ShowCountdown </State>
<Language>
<ID> 000405 </ID>
</Language>
@ -1536,7 +1595,7 @@
<Text>
<X> 941 </X>
<Y> 518 </Y>
<State> LanguageObjectShow </State>
<State> ShowCountdown </State>
<Language>
<ID> 000406 </ID>
</Language>

54
inter/sgp/xml/page_brewing3Conti.xml
View file

@ -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
</EventOpen>
@ -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
<Image>
<X> 751 </X>
<Y> 413 </Y>
@ -1064,6 +1105,7 @@
<Text>
<X> XPosiShowCountDownBrew </X>
<Y> 470 </Y>
<State> ShowCountdown </State>
<Align> End </Align>
<Width> 153 </Width>
<Size> 88 </Size>
@ -1071,6 +1113,18 @@
<Color> 0x513C2F </Color>
<Value> ShowCountDownBrewing </Value>
</Text>
;
<Text>
<X> XPosiShowCountDownBrew </X>
<Y> 470 </Y>
<State> ShowPercent </State>
<Align> End </Align>
<Width> 153 </Width>
<Size> 88 </Size>
<Font> RobotoBold </Font>
<Color> 0x513C2F </Color>
<Value> XPercent </Value>
</Text>
<Button>
<X> 792 </X>

12
inter/sgp/xml/page_check_member1.lxml
View file

@ -120,7 +120,17 @@
If Ext1a = "ok" Then
Var TaobinCredit = Ext1b
GETACCEXT TelephoneNumber 14
If UseSGPCollectFlag = 1 Then
Var param1 = "SG/" + TelephoneNumber
GETACCEXT param1 35
Else
GETACCEXT TelephoneNumber 14
EndIf
Var StepX = 1
Var Ext1a = ""

10
inter/sgp/xml/page_check_newmember2.lxml
View file

@ -151,7 +151,15 @@
Var CouponInfo10 = ""
Var TaobinCredit = 0
GETACCEXT TelephoneNumber 14
If UseSGPCollectFlag = 1 Then
Var param1 = "SG/" + TelephoneNumber
GETACCEXT param1 35
Else
GETACCEXT TelephoneNumber 14
EndIf
Var StepX = 1
Var Ext1a = "ok"

1137
inter/sgp/xml/page_collect_point_1.lxml Normal file
View file

File diff suppressed because it is too large Load diff

371
inter/sgp/xml/page_collect_point_2.lxml Normal file
View file

@ -0,0 +1,371 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; 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
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
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
</EventTimeout>
<EventSecurity>
Open "/media/bt/xml/security_alarm.xml"
</EventSecurity>
<EventActionOk>
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
</EventActionOk>
<EventActionError>
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"
</EventActionError>
<EventMachine>
If MachineStage = "drink-success" Then
Var MachineState_Result = 1
EndIf
If MachineStage = "drink-failed" Then
Var MachineState_Result = 2
EndIf
</EventMachine>
<Image>
<X> 178 </X>
<Y> 680 </Y>
<Filename> Var( DirImage + "/text20.png" ) </Filename>
</Image>
;include="ROOT/taobin_project/inc/video.inc"
<Text>
<X> 0 </X>
<Y> 873 </Y>
<Width> 1080 </Width>
<Align> Center </Align>
<Size> 62 </Size>
<Font> RobotoBlack </Font>
<Color> 0x513C2F </Color>
<Value> TelephoneNumber </Value>
<Format> Telnum-mask-3 </Format>
</Text>
;
<Image>
<X> 751 </X>
<Y> 413 </Y>
<Filename> IMG_CNT </Filename>
</Image>
;
<Text>
<X> XPosiShowCountDownBrew </X>
<Y> 470 </Y>
<State> ShowCountdown </State>
<Align> End </Align>
<Width> 153 </Width>
<Size> 88 </Size>
<Font> RobotoBold </Font>
<Color> 0x513C2F </Color>
<Value> ShowCountDownBrewing </Value>
</Text>
;
<Text>
<X> XPosiShowCountDownBrew </X>
<Y> 470 </Y>
<State> ShowPercent </State>
<Align> End </Align>
<Width> 153 </Width>
<Size> 88 </Size>
<Font> RobotoBold </Font>
<Color> 0x513C2F </Color>
<Value> XPercent </Value>
</Text>
</Popup>

1290
inter/sgp/xml/page_collect_point_3.lxml Normal file
View file

File diff suppressed because it is too large Load diff

112
inter/sgp/xml/page_collect_point_error.lxml Normal file
View file

@ -0,0 +1,112 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; 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
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
Var Timeout = Timeout + 1
If Timeout > 5 Then
; goto lid straw
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
TimerReset
Refresh
</EventTimeout>
<EventMachine>
If MachineStage = "drink-success" Then
Var MachineState_Result = 1
EndIf
If MachineStage = "drink-failed" Then
Var MachineState_Result = 2
EndIf
</EventMachine>
<Image>
<X> 0 </X>
<Y> 380 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/alpha.png" </Filename>
</Image>
<Image>
<X> 158 </X>
<Y> 665 </Y>
<Filename> Var( DirImage + "/img_popup4.png" )</Filename>
</Image>
<Button>
<X> 397 </X>
<Y> 1680 </Y>
<Filename> Var( DirImage + "/bn_accept.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bp_accept.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
; goto lid straw
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
</EventClick>
</Button>
;include="ROOT/taobin_project/inc/video.inc"
<EventSecurity>
Open "/media/bt/xml/security_alarm.xml"
</EventSecurity>
</Page>

128
inter/sgp/xml/page_member_prompt.lxml Normal file
View file

@ -0,0 +1,128 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
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"
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
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
</EventTimeout>
<Image>
<X> 150 </X>
<Y> 618 </Y>
<State> DisplayPrompt </State>
<Height> 800 </Height>
<Width> 800 </Width>
<Volume> SoundVolume </Volume>
<Filename> PromptDialogImg </Filename>
</Image>
<Button>
<X> 250 </X>
<Y> 1065 </Y>
<State> DisplayPrompt </State>
<Filename> NoButton </Filename>
<FilenamePress> NoPressButton </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
; show-qr
Var DisplayPrompt = "Invisible"
Var DisplayQR = "Enable"
Var Timeout = 18
</EventClick>
</Button>
<Button>
<X> 600 </X>
<Y> 1065 </Y>
<State> DisplayPrompt </State>
<Filename> YesButton </Filename>
<FilenamePress> YesPressButton </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
Var UseSGPCollectFlag = 1
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
</EventClick>
</Button>
<Image>
<X> 751 </X>
<Y> 413 </Y>
<Filename> IMG_CNT </Filename>
</Image>
<Text>
<X> 768 </X>
<Y> 470 </Y>
<Align> End </Align>
<Width> 153 </Width>
<Size> 88 </Size>
<Font> RobotoBold </Font>
<Color> 0x513C2F </Color>
<Value> RemainingInThisPage </Value>
</Text>
<Image>
<X> 449 </X>
<Y> 1065 </Y>
<State> DisplayQR </State>
<Filename> QRImg </Filename>
</Image>
;include="ROOT/taobin_project/inc/video.inc"
</Popup>

4
inter/sgp/xml/page_remove_cup.lxml
View file

@ -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/"

7
inter/sgp/xml/page_topping_select6.lxml
View file

@ -4134,5 +4134,12 @@
</Text>
;
<EventUnitTest1>
DEBUGVAR SELLSTATUS
Var SELLSTATUS = "SELLNOCASH"
DEBUGVAR SELLSTATUS
</EventUnitTest1>
</Page>

6
xml/page_board.xml
View file

@ -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

7
xml/page_drinkfail2.xml
View file

@ -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

40
xml/page_payment_cash-SGP.xml
View file

@ -7,6 +7,15 @@
<Sound> PlaySoundLag </Sound>
<EventOpen>
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
<Value> ShowNetworkProblemText </Value>
</Text>
<Button>
<X> 0 </X>
<Y> 1870 </Y>
<State> SGPSimMode </State>
<Color> "0xFFBF00" </Color>
<Width> 1080 </Width>
<Height> 60 </Height>
<EventClick>
DEBUGVAR SGPSimMode
MakeDrinkV1 SelectDrink SelectSugarID
Open "ROOT/taobin_project/xml/page_thankyou.xml"
</EventClick>
</Button>
<Text>
<X> 5 </X>
<Y> 1880 </Y>
<State> SGPSimMode </State>
<Size> 24 </Size>
<Align> Center </Align>
<Width> 1080 </Width>
<Font> RobotoRegular </Font>
<Color> 0xFFFFFF </Color>
<Value> "Test Bypass Payment" </Value>
</Text>
<EventUnitTest1>
@ -2471,7 +2506,12 @@ Var PayState1 = "Enable"
</EventUnitTest2>
<EventUnitTest3>
MakeDrinkV1 SelectDrink SelectSugarID
Open "ROOT/taobin_project/xml/page_thankyou.xml"
</EventUnitTest3>
</Popup>

38
xml/page_thankyou.xml
View file

@ -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