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

THAI INTER: Merge branch masterpiece -> th_mmr

Browse source
This commit is contained in:
Ittipat Lusuk 2024-12-12 17:35:05 +07:00
commit 3c994e2ed1
548 changed files with 161156 additions and 52934 deletions
Download patch file Download diff file Expand all files Collapse all files

60
inter/tha/xml/page_topping_select6.lxml
View file

@ -198,7 +198,8 @@
Var custom_coffee_level_dark_text_x = 785
Var SugarZeroCalPrice_X = 540
Var Text_SugarZeroCalPrice_X = 380
Var Text_SugarNormalPrice_Y = 75
EndIf
If LanguageShow = "THAI" Then
@ -239,7 +240,8 @@
Var custom_coffee_level_dark_text_x = 790
Var SugarZeroCalPrice_X = 495
Var Text_SugarZeroCalPrice_X = 380
Var Text_SugarNormalPrice_Y = 75
EndIf
@ -281,6 +283,7 @@
Var SugarZeroCalPrice_X = 540
Var Text_SugarZeroCalPrice_X = 480
Var Text_SugarNormalPrice_Y = 80
EndIf
@ -1770,16 +1773,6 @@
; No 2 right steps
;If NoSugarStepRight2 = "true" Then
; Var SugarState5 = "Disable"
; Var SugarState6 = "Disable"
;EndIf
If sugar_default_flag = 0 Then
Var SugarState1 = "PressForever"
@ -1823,13 +1816,7 @@
Var sugar_default_flag = 1
EndIf
; No 2 right steps
;If NoSugarStepRight2 = "true" Then
; Var SugarState5 = "Disable"
; Var SugarState6 = "Disable"
;EndIf
If sugar_default_flag = 0 Then
Var SugarState1 = "PressForever"
@ -6075,6 +6062,7 @@
<Height> 65 </Height>
<Language>
<ID> 000113 </ID>
;<SubValue> OatMilkPrice </SubValue>
</Language>
</Text>
@ -7317,6 +7305,8 @@
;
;
;
</FrameScroll>
<EventSecurity>
@ -7393,14 +7383,7 @@
__CMD "statement" 0 StatementCheckMenu "-"
;If HalfPrice = "true" Then
; ; Discount 50
; DEBUGVAR HalfPrice
; __CMD "invoke-discount-50" UserSelectProductCode "-" "-"
;
;Else
; Var PriceDrink = PriceDrinkTmp
;EndIf
DEBUGVAR PriceDrinkTmp
@ -7637,7 +7620,7 @@
DEBUGVAR PromotionIDCurrentOrder
Var SelectDrink = UserSelectProductCode
@ -7645,7 +7628,6 @@
DEBUGVAR Seeker.selected_a_drink
; Set drink
If Seeker = "curr" Then
;include="ROOT/taobin_project/inc/select_drink_current.inc"
@ -8814,12 +8796,12 @@
EndIf
EndIf
;If OatMilkEnable = "Enable" Then
;DEBUGVAR LanguageShowByIndex
;Var StringToppingOatMilkWithPrice !assigned GetLanguageID( 000108, LanguageShowByIndex)
;Var StringToppingOatMilkWithPrice = StringToppingOatMilkWithPrice + OatMilkPrice
;DEBUGVAR StringToppingOatMilkWithPrice
;EndIf
If OatMilkEnable = "Enable" Then
DEBUGVAR LanguageShowByIndex
Var StringToppingOatMilkWithPrice !assigned GetLanguageID( 000108, LanguageShowByIndex)
Var StringToppingOatMilkWithPrice = StringToppingOatMilkWithPrice + OatMilkPrice
DEBUGVAR StringToppingOatMilkWithPrice
EndIf
If showOreoAddEnable = "Enable" Then
DEBUGVAR LanguageShowByIndex
@ -8828,10 +8810,10 @@
DEBUGVAR StringToppingOreoWithPrice
EndIf
;If ShotCoffeePremium = "Enable" Then
;Var StringToppingShotWithPrice !assigned GetLanguageID( 000100, LanguageShowByIndex)
;Var StringToppingShotWithPrice = StringToppingShotWithPrice + text_price_topping
;EndIf
If ShotCoffeePremium = "Enable" Then
Var StringToppingShotWithPrice !assigned GetLanguageID( 000100, LanguageShowByIndex)
Var StringToppingShotWithPrice = StringToppingShotWithPrice + text_price_topping
EndIf
If showCoffeeLevel = "Enable" Then
Var StringCoffeeLevelWithPrice0 !assigned GetLanguageID( 000108, LanguageShowByIndex)