Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

This commit is contained in:
Pakin 2024-10-17 16:39:04 +07:00
commit 23ecbc3827
2 changed files with 11 additions and 5 deletions

View file

@ -1320,7 +1320,7 @@ and 7Up" </Value>
<EventOnClick>
Var NameDrink = "Foul Metta"
Var NameDrinkTH = "เมตามหาโสมม"
Var DrinkDescriptionTH = "ชามะลิ น้ำเชี่มสละ 7up และโซดา"
Var DrinkDescriptionTH = "ชามะลิ น้ำเชี่มสละ 7up และโซดา"
Var DrinkDescription = "Jasmine tea, Ume syrup, 7Up and Soda"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_7UP_Jasmin_Plum_Soda_halloween.png"
Var OpenFromXML = CurrentXMLFileName2
@ -1403,7 +1403,7 @@ and 7Up" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0xFFFFFF </Color>
<State> showthaiText </State>
<Value> "ชามะลิ น้ำเชี่มสละ 7up และโซดา" </Value>
<Value> "ชามะลิ น้ำเชี่มสละ 7up และโซดา" </Value>
</Text>
<Text>
<X> 16 </X>

View file

@ -35,6 +35,7 @@
STRCONTAIN "AllPriceUp05" XMLProfile AllPriceUp05
STRCONTAIN "AllPriceUp10" XMLProfile AllPriceUp10
Var SpiralPriceOrigin = "true"
STRCONTAIN "SpiralPriceUp15" XMLProfile SpiralPriceUp15
STRCONTAIN "SpiralPriceUp45" XMLProfile SpiralPriceUp45
STRCONTAIN "SpiralPriceRetail" XMLProfile SpiralPriceRetail
@ -111,20 +112,25 @@
;spiral price
If SpiralPriceUp15 = "true" Then
Var SpiralPriceOrigin = "false"
__CMD "invoke-all-up-priceSpiral-15" "-" "-" "-"
EndIf
If SpiralPriceUp45 = "true" Then
Var SpiralPriceOrigin = "false"
__CMD "invoke-all-up-priceSpiral-45" "-" "-" "-"
EndIf
If SpiralPriceRetail = "true" Then
Var SpiralPriceOrigin = "false"
__CMD "invoke-all-up-priceSpiral-Retail" "-" "-" "-"
EndIf
If SpiralPriceOrigin = "true" Then
__CMD "invoke-all-up-priceSpiral-Origin" "-" "-" "-"
EndIf