merge
This commit is contained in:
parent
5d733eca34
commit
8b562200a4
1 changed files with 19 additions and 37 deletions
|
|
@ -198,7 +198,8 @@
|
||||||
Var custom_coffee_level_dark_text_x = 785
|
Var custom_coffee_level_dark_text_x = 785
|
||||||
|
|
||||||
Var SugarZeroCalPrice_X = 540
|
Var SugarZeroCalPrice_X = 540
|
||||||
|
Var Text_SugarZeroCalPrice_X = 380
|
||||||
|
Var Text_SugarNormalPrice_Y = 75
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
If LanguageShow = "THAI" Then
|
If LanguageShow = "THAI" Then
|
||||||
|
|
@ -239,7 +240,8 @@
|
||||||
Var custom_coffee_level_dark_text_x = 790
|
Var custom_coffee_level_dark_text_x = 790
|
||||||
|
|
||||||
Var SugarZeroCalPrice_X = 495
|
Var SugarZeroCalPrice_X = 495
|
||||||
|
Var Text_SugarZeroCalPrice_X = 380
|
||||||
|
Var Text_SugarNormalPrice_Y = 75
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -281,6 +283,7 @@
|
||||||
|
|
||||||
Var SugarZeroCalPrice_X = 540
|
Var SugarZeroCalPrice_X = 540
|
||||||
Var Text_SugarZeroCalPrice_X = 480
|
Var Text_SugarZeroCalPrice_X = 480
|
||||||
|
Var Text_SugarNormalPrice_Y = 80
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1771,16 +1774,6 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
; No 2 right steps
|
|
||||||
;If NoSugarStepRight2 = "true" Then
|
|
||||||
|
|
||||||
; Var SugarState5 = "Disable"
|
|
||||||
; Var SugarState6 = "Disable"
|
|
||||||
|
|
||||||
;EndIf
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
If sugar_default_flag = 0 Then
|
If sugar_default_flag = 0 Then
|
||||||
Var SugarState1 = "PressForever"
|
Var SugarState1 = "PressForever"
|
||||||
|
|
@ -1824,13 +1817,7 @@
|
||||||
Var sugar_default_flag = 1
|
Var sugar_default_flag = 1
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
; No 2 right steps
|
|
||||||
;If NoSugarStepRight2 = "true" Then
|
|
||||||
|
|
||||||
; Var SugarState5 = "Disable"
|
|
||||||
; Var SugarState6 = "Disable"
|
|
||||||
|
|
||||||
;EndIf
|
|
||||||
|
|
||||||
If sugar_default_flag = 0 Then
|
If sugar_default_flag = 0 Then
|
||||||
Var SugarState1 = "PressForever"
|
Var SugarState1 = "PressForever"
|
||||||
|
|
@ -7319,6 +7306,8 @@
|
||||||
;
|
;
|
||||||
;
|
;
|
||||||
;
|
;
|
||||||
|
|
||||||
|
|
||||||
</FrameScroll>
|
</FrameScroll>
|
||||||
|
|
||||||
<EventSecurity>
|
<EventSecurity>
|
||||||
|
|
@ -7395,14 +7384,7 @@
|
||||||
|
|
||||||
__CMD "statement" 0 StatementCheckMenu "-"
|
__CMD "statement" 0 StatementCheckMenu "-"
|
||||||
|
|
||||||
;If HalfPrice = "true" Then
|
|
||||||
; ; Discount 50
|
|
||||||
; DEBUGVAR HalfPrice
|
|
||||||
; __CMD "invoke-discount-50" UserSelectProductCode "-" "-"
|
|
||||||
;
|
|
||||||
;Else
|
|
||||||
; Var PriceDrink = PriceDrinkTmp
|
|
||||||
;EndIf
|
|
||||||
|
|
||||||
DEBUGVAR PriceDrinkTmp
|
DEBUGVAR PriceDrinkTmp
|
||||||
|
|
||||||
|
|
@ -8816,12 +8798,12 @@
|
||||||
EndIf
|
EndIf
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
;If OatMilkEnable = "Enable" Then
|
If OatMilkEnable = "Enable" Then
|
||||||
;DEBUGVAR LanguageShowByIndex
|
DEBUGVAR LanguageShowByIndex
|
||||||
;Var StringToppingOatMilkWithPrice !assigned GetLanguageID( 000108, LanguageShowByIndex)
|
Var StringToppingOatMilkWithPrice !assigned GetLanguageID( 000108, LanguageShowByIndex)
|
||||||
;Var StringToppingOatMilkWithPrice = StringToppingOatMilkWithPrice + OatMilkPrice
|
Var StringToppingOatMilkWithPrice = StringToppingOatMilkWithPrice + OatMilkPrice
|
||||||
;DEBUGVAR StringToppingOatMilkWithPrice
|
DEBUGVAR StringToppingOatMilkWithPrice
|
||||||
;EndIf
|
EndIf
|
||||||
|
|
||||||
If showOreoAddEnable = "Enable" Then
|
If showOreoAddEnable = "Enable" Then
|
||||||
DEBUGVAR LanguageShowByIndex
|
DEBUGVAR LanguageShowByIndex
|
||||||
|
|
@ -8830,10 +8812,10 @@
|
||||||
DEBUGVAR StringToppingOreoWithPrice
|
DEBUGVAR StringToppingOreoWithPrice
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
;If ShotCoffeePremium = "Enable" Then
|
If ShotCoffeePremium = "Enable" Then
|
||||||
;Var StringToppingShotWithPrice !assigned GetLanguageID( 000100, LanguageShowByIndex)
|
Var StringToppingShotWithPrice !assigned GetLanguageID( 000100, LanguageShowByIndex)
|
||||||
;Var StringToppingShotWithPrice = StringToppingShotWithPrice + text_price_topping
|
Var StringToppingShotWithPrice = StringToppingShotWithPrice + text_price_topping
|
||||||
;EndIf
|
EndIf
|
||||||
|
|
||||||
If showCoffeeLevel = "Enable" Then
|
If showCoffeeLevel = "Enable" Then
|
||||||
Var StringCoffeeLevelWithPrice0 !assigned GetLanguageID( 000108, LanguageShowByIndex)
|
Var StringCoffeeLevelWithPrice0 !assigned GetLanguageID( 000108, LanguageShowByIndex)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue