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

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