SGP: disable all blend menus, update remove cup button
This commit is contained in:
parent
db68244735
commit
21dbd367e6
14 changed files with 150999 additions and 143915 deletions
|
|
@ -885,3 +885,9 @@ PEPSI Max BANANA 52-05-02-0077 1 14 56 23 13 24 120 14:00 23
|
||||||
PEPSI Max YUZU 52-05-02-0076 1 14 53 23 13 24 120 4:00 23
|
PEPSI Max YUZU 52-05-02-0076 1 14 53 23 13 24 120 4:00 23
|
||||||
PEPSI MINT 52-05-02-0068 1 14 59 12 23 24 120 15:00 23
|
PEPSI MINT 52-05-02-0068 1 14 59 12 23 24 120 15:00 23
|
||||||
Almost Dirty 52-21-02-0071 1 2 3 4 5 6 7 24 66 6:06 32
|
Almost Dirty 52-21-02-0071 1 2 3 4 5 6 7 24 66 6:06 32
|
||||||
|
ICED SANTA GINGER 12-03-02-0081 1 7 22 23 24 49 10:01 23
|
||||||
|
ICED SANTA GINGER 12-23-02-0081 1 7 22 23 24 49 10:01 23
|
||||||
|
CHOCO SNOWFLAKE SMOOTHIE 12-03-03-0088 1 15 7 22 40 41 24 49 10:01 23
|
||||||
|
REINDEER PEPPERMINT SMOOTHIE 12-03-03-0089 1 59 7 19 41 24 49 10:01 23
|
||||||
|
ICED CHRISTMAS CAFE LATTE 12-01-02-0084 1 6 7 12 22 23 24 49 10:01 23
|
||||||
|
ICED CHRISTMAS CAFE LATTE 12-21-02-0084 1 6 7 12 22 23 24 49 10:01 23
|
||||||
|
|
|
||||||
|
Can't render this file because it has a wrong number of fields in line 40.
|
|
|
@ -22,6 +22,8 @@
|
||||||
Var ice_tab_process_show = "Invisible"
|
Var ice_tab_process_show = "Invisible"
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
|
;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
|
||||||
|
|
||||||
|
|
||||||
If NextPage = "-" Then
|
If NextPage = "-" Then
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -850,6 +850,8 @@
|
||||||
})
|
})
|
||||||
|
|
||||||
def GenMenuBlock(spl, idx_hot_product_code, idx_cold_product_code, idx_blend_product_code):
|
def GenMenuBlock(spl, idx_hot_product_code, idx_cold_product_code, idx_blend_product_code):
|
||||||
|
if "skip_blend" in param:
|
||||||
|
spl[ idx_name][ idx_blend_product_code] = "-"
|
||||||
GenMenuProductCodeBlock(spl, spl[ idx_name][ idx_hot_product_code], spl[ idx_name][ idx_cold_product_code] , spl[ idx_name][ idx_blend_product_code] )
|
GenMenuProductCodeBlock(spl, spl[ idx_name][ idx_hot_product_code], spl[ idx_name][ idx_cold_product_code] , spl[ idx_name][ idx_blend_product_code] )
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1027,6 +1029,8 @@
|
||||||
print("\t\t==> ignore ")
|
print("\t\t==> ignore ")
|
||||||
else:
|
else:
|
||||||
print("\t\t==> gen ")
|
print("\t\t==> gen ")
|
||||||
|
if "skip_blend" in param:
|
||||||
|
blend_pd[ idx] = "-"
|
||||||
GenMenuProductCodeBlock(spl, hot_pd[ idx], cold_pd[ idx], blend_pd[ idx] )
|
GenMenuProductCodeBlock(spl, hot_pd[ idx], cold_pd[ idx], blend_pd[ idx] )
|
||||||
else:
|
else:
|
||||||
GenMenuBlock(spl, idx_hot_product_code, idx_cold_product_code, idx_blend_product_code)
|
GenMenuBlock(spl, idx_hot_product_code, idx_cold_product_code, idx_blend_product_code)
|
||||||
|
|
@ -1092,6 +1096,8 @@
|
||||||
out_xml('\tOpen "ROOT/taobin_project/xml/page_payment_multi.xml"\r\n')
|
out_xml('\tOpen "ROOT/taobin_project/xml/page_payment_multi.xml"\r\n')
|
||||||
out_xml('</EventClick>\r\n')
|
out_xml('</EventClick>\r\n')
|
||||||
out_xml('</Button>\r\n')
|
out_xml('</Button>\r\n')
|
||||||
|
|
||||||
|
out_xml(';include="ROOT/taobin_project/inc/button_remove_cup.inc"\r\n')
|
||||||
# if "v2" in param:
|
# if "v2" in param:
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -219,6 +219,8 @@
|
||||||
Var ice_tab_process_show = "Invisible"
|
Var ice_tab_process_show = "Invisible"
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
|
;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
|
||||||
|
|
||||||
|
|
||||||
If NextPage = "-" Then
|
If NextPage = "-" Then
|
||||||
|
|
||||||
|
|
@ -2089,6 +2091,7 @@
|
||||||
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
|
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
|
||||||
</EventClick>
|
</EventClick>
|
||||||
</Button>
|
</Button>
|
||||||
|
;include="ROOT/taobin_project/inc/button_remove_cup.inc"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -211,6 +211,8 @@
|
||||||
Var ice_tab_process_show = "Invisible"
|
Var ice_tab_process_show = "Invisible"
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
|
;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
|
||||||
|
|
||||||
|
|
||||||
If NextPage = "-" Then
|
If NextPage = "-" Then
|
||||||
|
|
||||||
|
|
@ -8190,6 +8192,7 @@
|
||||||
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
|
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
|
||||||
</EventClick>
|
</EventClick>
|
||||||
</Button>
|
</Button>
|
||||||
|
;include="ROOT/taobin_project/inc/button_remove_cup.inc"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -216,6 +216,8 @@
|
||||||
Var ice_tab_process_show = "Invisible"
|
Var ice_tab_process_show = "Invisible"
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
|
;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
|
||||||
|
|
||||||
|
|
||||||
If NextPage = "-" Then
|
If NextPage = "-" Then
|
||||||
|
|
||||||
|
|
@ -5465,6 +5467,7 @@
|
||||||
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
|
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
|
||||||
</EventClick>
|
</EventClick>
|
||||||
</Button>
|
</Button>
|
||||||
|
;include="ROOT/taobin_project/inc/button_remove_cup.inc"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -229,23 +229,7 @@
|
||||||
EndIf
|
EndIf
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
|
;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
|
||||||
|
|
||||||
; zone cup on arm
|
|
||||||
If CupOnArm = "true" Then
|
|
||||||
|
|
||||||
If CheckCupStateDoorCupClose = "" Then
|
|
||||||
Var buttonRemoveCup = "Enable"
|
|
||||||
EndIf
|
|
||||||
|
|
||||||
If CheckCupStateDoorCupClose = "done" Then
|
|
||||||
Var buttonRemoveCup = "Enable"
|
|
||||||
EndIf
|
|
||||||
Else
|
|
||||||
If buttonRemoveCup = "Enable" Then
|
|
||||||
Var buttonRemoveCup = "Invisible"
|
|
||||||
EndIf
|
|
||||||
EndIf
|
|
||||||
|
|
||||||
|
|
||||||
Refresh
|
Refresh
|
||||||
|
|
@ -711,6 +695,8 @@
|
||||||
<Value> ShowNetworkProblemText </Value>
|
<Value> ShowNetworkProblemText </Value>
|
||||||
</Text>
|
</Text>
|
||||||
|
|
||||||
|
;include="ROOT/taobin_project/inc/button_remove_cup.inc"
|
||||||
|
|
||||||
; Cart
|
; Cart
|
||||||
<Button>
|
<Button>
|
||||||
<X> 915 </X>
|
<X> 915 </X>
|
||||||
|
|
@ -801,5 +787,6 @@
|
||||||
DEBUGVAR buttonRemoveCup
|
DEBUGVAR buttonRemoveCup
|
||||||
</EventUnitTest3>
|
</EventUnitTest3>
|
||||||
|
|
||||||
|
;include="ROOT/inc/remove_cup_tag_on_arm.inc"
|
||||||
|
|
||||||
</Popup>
|
</Popup>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue