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

Merge branch 'topping_custom_coffee_new' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project

Browse source
This commit is contained in:
kong 2023-09-12 10:42:10 +07:00
commit 2eff6b654b
1 changed files with 147 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

247
xml/page_topping_select8.xml
View file

@ -995,66 +995,6 @@
EndIf
EndIf
If TOPPING2 = "add-show-1009" Then
If toppingID2index3 = 1060 Then
Var CustomCoffeeEnable = "True"
Var showCustomCoffee = "Enable"
Var showCoffeeQuantity = "Enable"
If toppingID2Default = "" Then
Var CustomCoffeeQuantityState[0] = "PressForever"
Else
If toppingID2index1 = toppingID2Default Then
Var CurrentCoffeeQuantityId = toppingID2index1
Var CustomCoffeeQuantityState[0] = "PressForever"
Var CustomCoffeeQuantityState[1] = "Enable"
Var CustomCoffeeQuantityState[2] = "Enable"
EndIf
If toppingID2index3 = toppingID2Default Then
Var CurrentCoffeeQuantityId = toppingID2index3
Var CustomCoffeeQuantityState[0] = "Enable"
Var CustomCoffeeQuantityState[1] = "PressForever"
Var CustomCoffeeQuantityState[2] = "Enable"
EndIf
If toppingID2index4 = toppingID2Default Then
Var CurrentCoffeeQuantityId = toppingID2index4
Var CustomCoffeeQuantityState[0] = "Enable"
Var CustomCoffeeQuantityState[1] = "Enable"
Var CustomCoffeeQuantityState[2] = "PressForever"
EndIf
EndIf
If toppingID2price1 > 0 Then
Var priceFormated !assigned StringFmt( toppingID2price1 , PriceCustomCoffeeFormat, PreScaleConvertShow)
Var CustomCoffeeQuantityAdditionalPrice[0] = "(+" + priceFormated
Var CustomCoffeeQuantityAdditionalPrice[0] = CustomCoffeeQuantityAdditionalPrice[0] + ")"
Else
Var CustomCoffeeQuantityAdditionalPrice[0] = ""
EndIf
If toppingID2price3 > 0 Then
Var priceFormated !assigned StringFmt( toppingID2price3 , PriceCustomCoffeeFormat, PreScaleConvertShow)
Var CustomCoffeeQuantityAdditionalPrice[1] = "(+" + priceFormated
Var CustomCoffeeQuantityAdditionalPrice[1] = CustomCoffeeQuantityAdditionalPrice[1] + ")"
Else
Var CustomCoffeeQuantityAdditionalPrice[1] = ""
EndIf
If toppingID2price4 > 0 Then
Var priceFormated !assigned StringFmt( toppingID2price4 , PriceCustomCoffeeFormat, PreScaleConvertShow)
Var CustomCoffeeQuantityAdditionalPrice[2] = "(+" + priceFormated
Var CustomCoffeeQuantityAdditionalPrice[2] = CustomCoffeeQuantityAdditionalPrice[2] + ")"
Else
Var CustomCoffeeQuantityAdditionalPrice[2] = ""
EndIf
EndIf
EndIf
If TOPPING9 = "single-shot-espv2" Then
Var CustomCoffeeEnable = "True"
Var showCustomCoffee = "Enable"
@ -1782,27 +1722,39 @@
If TOPPING2 = "shot coffee 1003" Then
Var ShotCoffeePremium = "Enable"
Var showShotEnable = "Invisible"
Var ExtraTopping = "Enable"
If toppingID2index3 = "" Then
Var ShotCoffeePremium = "Enable"
Var showShotEnable = "Invisible"
Var ExtraTopping = "Enable"
Else
Var EnableLightRoast = "Enable"
EndIf
DEBUGVAR TOPPING2
Refresh
EndIf
If TOPPING2 = "shot coffee 1007" Then
Var ShotCoffeePremium = "Enable"
Var showShotEnable = "Invisible"
Var ExtraTopping = "Enable"
If toppingID2index3 = "" Then
Var ShotCoffeePremium = "Enable"
Var showShotEnable = "Invisible"
Var ExtraTopping = "Enable"
Else
Var EnableLightRoast = "Enable"
EndIf
DEBUGVAR TOPPING2
Refresh
EndIf
If TOPPING2 = "shot coffee 1008" Then
Var ShotCoffeePremium = "Enable"
Var showShotEnable = "Invisible"
Var ExtraTopping = "Enable"
If toppingID2index3 = "" Then
Var ShotCoffeePremium = "Enable"
Var showShotEnable = "Invisible"
Var ExtraTopping = "Enable"
Else
Var EnableLightRoast = "Enable"
EndIf
DEBUGVAR TOPPING2
Refresh
@ -1814,6 +1766,8 @@
Var ShotCoffeePremium = "Enable"
Var showShotEnable = "Invisible"
Var ExtraTopping = "Enable"
Else
Var EnableLightRoast = "Enable"
EndIf
DEBUGVAR TOPPING2
@ -1821,9 +1775,13 @@
EndIf
If TOPPING2 = "add-show-1101" Then
Var ShotCoffeePremium = "Enable"
Var showShotEnable = "Invisible"
Var ExtraTopping = "Enable"
If toppingID2index3 = "" Then
Var ShotCoffeePremium = "Enable"
Var showShotEnable = "Invisible"
Var ExtraTopping = "Enable"
Else
Var EnableLightRoast = "Enable"
EndIf
DEBUGVAR TOPPING2
Refresh
@ -1831,9 +1789,13 @@
If TOPPING2 = "add-show-1102" Then
Var ShotCoffeePremium = "Enable"
Var showShotEnable = "Invisible"
Var ExtraTopping = "Enable"
If toppingID2index3 = "" Then
Var ShotCoffeePremium = "Enable"
Var showShotEnable = "Invisible"
Var ExtraTopping = "Enable"
Else
Var EnableLightRoast = "Enable"
EndIf
DEBUGVAR TOPPING2
Refresh
@ -1841,18 +1803,26 @@
If TOPPING2 = "add-show-1103" Then
Var ShotCoffeePremium = "Enable"
Var showShotEnable = "Invisible"
Var ExtraTopping = "Enable"
If toppingID2index3 = "" Then
Var ShotCoffeePremium = "Enable"
Var showShotEnable = "Invisible"
Var ExtraTopping = "Enable"
Else
Var EnableLightRoast = "Enable"
EndIf
DEBUGVAR TOPPING2
Refresh
EndIf
If TOPPING2 = "add-show-1104" Then
Var ShotCoffeePremium = "Enable"
Var showShotEnable = "Invisible"
Var ExtraTopping = "Enable"
If toppingID2index3 = "" Then
Var ShotCoffeePremium = "Enable"
Var showShotEnable = "Invisible"
Var ExtraTopping = "Enable"
Else
Var EnableLightRoast = "Enable"
EndIf
DEBUGVAR TOPPING2
Refresh
@ -1860,9 +1830,13 @@
If TOPPING2 = "add-show-1105" Then
Var ShotCoffeePremium = "Enable"
Var showShotEnable = "Invisible"
Var ExtraTopping = "Enable"
If toppingID2index3 = "" Then
Var ShotCoffeePremium = "Enable"
Var showShotEnable = "Invisible"
Var ExtraTopping = "Enable"
Else
Var EnableLightRoast = "Enable"
EndIf
DEBUGVAR TOPPING2
Refresh
@ -1870,9 +1844,13 @@
If TOPPING2 = "add-show-1106" Then
Var ShotCoffeePremium = "Enable"
Var showShotEnable = "Invisible"
Var ExtraTopping = "Enable"
If toppingID2index3 = "" Then
Var ShotCoffeePremium = "Enable"
Var showShotEnable = "Invisible"
Var ExtraTopping = "Enable"
Else
Var EnableLightRoast = "Enable"
EndIf
DEBUGVAR TOPPING2
Refresh
@ -1880,9 +1858,13 @@
If TOPPING2 = "add-show-1107" Then
Var ShotCoffeePremium = "Enable"
Var showShotEnable = "Invisible"
Var ExtraTopping = "Enable"
If toppingID2index3 = "" Then
Var ShotCoffeePremium = "Enable"
Var showShotEnable = "Invisible"
Var ExtraTopping = "Enable"
Else
Var EnableLightRoast = "Enable"
EndIf
DEBUGVAR TOPPING2
Refresh
@ -1890,9 +1872,13 @@
If TOPPING2 = "add-show-1108" Then
Var ShotCoffeePremium = "Enable"
Var showShotEnable = "Invisible"
Var ExtraTopping = "Enable"
If toppingID2index3 = "" Then
Var ShotCoffeePremium = "Enable"
Var showShotEnable = "Invisible"
Var ExtraTopping = "Enable"
Else
Var EnableLightRoast = "Enable"
EndIf
DEBUGVAR TOPPING2
Refresh
@ -1907,6 +1893,65 @@
EndIf
If EnableLightRoast = "Enable" Then
Var CustomCoffeeEnable = "True"
Var showCustomCoffee = "Enable"
var showCoffeeQuantity = "Enable"
If toppingID2Default = "" Then
Var CustomCoffeeQuantityState[1] = "PressForever"
Else
If toppingID2index1 = toppingID2Default Then
Var CurrentCoffeeLevelId = toppingID2index1
Var CustomCoffeeQuantityState[0] = "PressForever"
Var CustomCoffeeQuantityState[1] = "Enable"
Var CustomCoffeeQuantityState[2] = "Enable"
EndIf
If toppingID2index2 = toppingID2Default Then
Var CurrentCoffeeLevelId = toppingID2index2
Var CustomCoffeeQuantityState[0] = "Enable"
Var CustomCoffeeQuantityState[1] = "PressForever"
Var CustomCoffeeQuantityState[2] = "Enable"
EndIf
If toppingID2index3 = toppingID2Default Then
Var CurrentCoffeeLevelId = toppingID2index3
Var CustomCoffeeQuantityState[0] = "Enable"
Var CustomCoffeeQuantityState[1] = "Enable"
Var CustomCoffeeQuantityState[2] = "PressForever"
EndIf
EndIf
If toppingID2price1 > 0 Then
Var priceFormated !assigned StringFmt( toppingID2price1 , PriceCustomCoffeeFormat, PreScaleConvertShow)
Var CustomCoffeeQuantityAdditionalPrice[0] = "(+" + priceFormated
Var CustomCoffeeQuantityAdditionalPrice[0] = CustomCoffeeQuantityAdditionalPrice[0] + ")"
Else
Var CustomCoffeeQuantityAdditionalPrice[0] = ""
EndIf
If toppingID2price2 > 0 Then
Var priceFormated !assigned StringFmt( toppingID2price2 , PriceCustomCoffeeFormat, PreScaleConvertShow)
Var CustomCoffeeQuantityAdditionalPrice[1] = "(+" + priceFormated
Var CustomCoffeeQuantityAdditionalPrice[1] = CustomCoffeeQuantityAdditionalPrice[1] + ")"
Else
Var CustomCoffeeQuantityAdditionalPrice[1] = ""
EndIf
If toppingID2price3 > 0 Then
Var priceFormated !assigned StringFmt( toppingID2price3 , PriceCustomCoffeeFormat, PreScaleConvertShow)
Var CustomCoffeeQuantityAdditionalPrice[2] = "(+" + priceFormated
Var CustomCoffeeQuantityAdditionalPrice[2] = CustomCoffeeQuantityAdditionalPrice[2] + ")"
Else
Var CustomCoffeeQuantityAdditionalPrice[2] = ""
EndIf
EndIf
;-END
If TOPPING3 = "Collagen" Then
Var CollagenState = "Enable"
@ -4936,13 +4981,14 @@
Var topping2 = toppingID2index1
EndIf
If CustomCoffeeQuantityState[1] = "PressForever" Then
Var topping2 = toppingID2index3
Var topping2 = toppingID2index2
EndIf
If CustomCoffeeQuantityState[2] = "PressForever" Then
Var topping2 = toppingID2index4
Var topping2 = toppingID2index3
EndIf
Else
If toppingID2index3 = 1060 Then
If toppingID2index3 = "" Then
Else
Var topping2 = 0
EndIf
EndIf
@ -4975,7 +5021,8 @@
Var topping10 = 0
EndIf
Else
If toppingID2index3 = 1060 Then
If toppingID2index3 = "" Then
Else
Var topping2 = 0
EndIf
Var topping7 = 0
@ -5519,10 +5566,10 @@
Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price1
EndIf
If CustomCoffeeQuantityState[1] = "PressForever" Then
Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price3
Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2
EndIf
If CustomCoffeeQuantityState[2] = "PressForever" Then
Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price4
Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price3
EndIf
If CustomCoffeeLevelState[0] = "PressForever" Then