SGP: add not member check & drink fail
This commit is contained in:
parent
d6939b2c5a
commit
ceae589565
9 changed files with 361 additions and 14 deletions
|
|
@ -862,6 +862,14 @@
|
|||
Var SettingIgnoreCollectPoint = 0
|
||||
EndIf
|
||||
|
||||
READ_FILE "/mnt/sdcard/coffeevending/use_pt_dev" use_pt_dev
|
||||
STRCONTAIN "1" use_pt_dev enable_pt_mode_by_cfg
|
||||
|
||||
If enable_pt_mode_by_cfg = "true" Then
|
||||
DEBUGVAR enable_pt_mode_by_cfg
|
||||
Var SettingIgnoreCollectPoint = 0
|
||||
EndIf
|
||||
|
||||
Var SettingVideoBrewingUseCommon = 1
|
||||
|
||||
Var MinPhoneNumber = 8
|
||||
|
|
@ -1280,7 +1288,7 @@
|
|||
DEBUGVAR ProfileIndex[9]
|
||||
DEBUGVAR ProfileIndex[10]
|
||||
PRICE "Reload" ""
|
||||
</EventUnitTest5>
|
||||
</EventUnitTest5>
|
||||
|
||||
|
||||
<EventUnitTest6>
|
||||
|
|
@ -1325,6 +1333,28 @@
|
|||
|
||||
</EventUnitTest7>
|
||||
|
||||
<EventUnitTest8>
|
||||
Var XMLProfile = "$Discount90Per"
|
||||
CacheVarStr "put" XMLProfile
|
||||
PRICE "Reset" "-"
|
||||
PRICE "Load" "-"
|
||||
PRICE "CheckAndApply" XMLProfile
|
||||
|
||||
DEBUGVAR ProfileIndex[0]
|
||||
DEBUGVAR ProfileIndex[1]
|
||||
DEBUGVAR ProfileIndex[2]
|
||||
DEBUGVAR ProfileIndex[3]
|
||||
DEBUGVAR ProfileIndex[4]
|
||||
DEBUGVAR ProfileIndex[5]
|
||||
DEBUGVAR ProfileIndex[6]
|
||||
DEBUGVAR ProfileIndex[7]
|
||||
DEBUGVAR ProfileIndex[8]
|
||||
DEBUGVAR ProfileIndex[9]
|
||||
DEBUGVAR ProfileIndex[10]
|
||||
PRICE "Reload" ""
|
||||
|
||||
</EventUnitTest8>
|
||||
|
||||
<EventDrink>
|
||||
SAVELOG "EventDrink EventDrink EventDrink EventDrink EventDrink "
|
||||
</EventDrink>
|
||||
|
|
|
|||
|
|
@ -15,7 +15,9 @@
|
|||
DEBUGVAR Seeker.PromotionIDCurrentOrder
|
||||
|
||||
|
||||
|
||||
If CountryName = "Singapore" Then
|
||||
Open "ROOT/taobin_project/inter/sgp/xml/page_drinkfail_sg.lxml"
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
|
@ -67,14 +69,22 @@
|
|||
If CountryName = "Malaysia" Then
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail5.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml"
|
||||
If CountryName = "Singapore" Then
|
||||
Open "ROOT/taobin_project/inter/sgp/xml/page_drinkfail_sg.lxml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
Else
|
||||
;inter-xml-open
|
||||
If CountryName = "Malaysia" Then
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail5.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml"
|
||||
If CountryName = "Singapore" Then
|
||||
Open "ROOT/taobin_project/inter/sgp/xml/page_drinkfail_sg.lxml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
|
@ -595,15 +605,19 @@
|
|||
If CountryName = "Malaysia" Then
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail5.xml"
|
||||
Else
|
||||
If NextOrder = "true" Then
|
||||
Var NextOrder = "false"
|
||||
|
||||
TransferVar "next" "curr"
|
||||
Var Seeker = "curr"
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
|
||||
If CountryName = "Singapore" Then
|
||||
Open "ROOT/taobin_project/inter/sgp/xml/page_drinkfail_sg.lxml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
If NextOrder = "true" Then
|
||||
Var NextOrder = "false"
|
||||
|
||||
TransferVar "next" "curr"
|
||||
Var Seeker = "curr"
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue