This commit is contained in:
kong 2021-09-25 22:27:55 +07:00
parent 5fbdc668d5
commit b222fd700f
51 changed files with 34 additions and 16 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

View file

@ -82,7 +82,7 @@
STRCONTAIN "whey" SaleProfile WheyShow STRCONTAIN "whey" SaleProfile WheyShow
STRCONTAIN "cocktail" SaleProfile CocktailShow STRCONTAIN "cocktail" SaleProfile CocktailShow
STRCONTAIN "roadshow" SaleProfile RoadShow ;STRCONTAIN "roadshow" SaleProfile RoadShow
Var TermTemOnline = "false" Var TermTemOnline = "false"
Var TaobinOnline = "false" Var TaobinOnline = "false"

View file

@ -7,9 +7,8 @@
<EventOpen> <EventOpen>
Var y_topping_bg = 912 Var y_topping_bg = 912
If ToppingNewEnable = "false" Then If ConfigNumer > 360 Then
SAVELOG "Recipe have smoothies"
Else
Open "ROOT/taobin_project/xml/page_topping_select2.xml" Open "ROOT/taobin_project/xml/page_topping_select2.xml"
EndIf EndIf

View file

@ -121,6 +121,10 @@
Var PriceDrinkTmp = "Free" Var PriceDrinkTmp = "Free"
EndIf EndIf
If ShowPrice = "Invisible" Then
Var PriceDrinkTmpShow = "Free"
EndIf
Var StateImgKeto = "Invisible" Var StateImgKeto = "Invisible"
@ -677,7 +681,8 @@
Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
SAVELOG PriceDrinkTmp SAVELOG PriceDrinkTmp
Refresh</EventClick> Refresh
</EventClick>
</Button> </Button>
<Button> <Button>
@ -690,14 +695,30 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
SAVELOG "Press Smoothies"
DEBUGVAR PriceDrinkNoTop
If blendedState = "Press" Then If blendedState = "Press" Then
Var PriceDrinkTmp = PriceDrinkTmp - PriceDiff
Var blendedState = "Enable" Var blendedState = "Enable"
Var UserSelectProductCode = SaveProductCodeSelect
Else Else
Var blendedState = "Press" Var blendedState = "Press"
Var PriceDrinkTmp = PriceDrinkTmp + PriceDiff
Var UserSelectProductCode = SubMenuProductCode1
EndIf EndIf
DEBUGVAR UserSelectProductCode
Var PriceDrinkNoTop = PriceDrinkTmp
Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
SAVELOG PriceDrinkTmp
Refresh Refresh
</EventClick> </EventClick>
</Button> </Button>
@ -709,12 +730,10 @@
<Width> 988 </Width> <Width> 988 </Width>
<Height> 156 </Height> <Height> 156 </Height>
<MarginTop> 20 </MarginTop> <MarginTop> 20 </MarginTop>
<State> "Enable" </State> <State> BGSugar </State>
;<State> BGSugar </State>
; sugar layout ; sugar layout
<Image> <Image>
<State> "Enable" </State> <State> BGSugar </State>
;<State> BGSugar </State>
<Filename> Var( DirImage + "/bg_sugar.png" )</Filename> <Filename> Var( DirImage + "/bg_sugar.png" )</Filename>
</Image> </Image>
@ -984,16 +1003,16 @@
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
SAVELOG "Press add shot 2" SAVELOG "Press add shot 2"
If showShotEnable = "Press" Then If showShotEnable = "Press" Then
Var showShotEnable = "Enable" Var showShotEnable = "Enable"
Var PriceDrinkTmp = PriceDrinkNoTop - toppingID2price2 Var PriceDrinkTmp = PriceDrinkTmp - toppingID2price2
Var topping2 = toppingID2index1 Var topping2 = toppingID2index1
Var DisableUsingCode = "false" Var DisableUsingCode = "false"
SAVELOG "Deselect add premium shot" SAVELOG "Deselect add premium shot"
Else Else
Var showShotEnable = "Press" Var showShotEnable = "Press"
Var PriceDrinkTmp = PriceDrinkNoTop + toppingID2price2 Var PriceDrinkTmp = PriceDrinkTmp + toppingID2price2
Var topping2 = toppingID2index2 Var topping2 = toppingID2index2
Var DisableUsingCode = "true" Var DisableUsingCode = "true"
SAVELOG "Select add premium shot" SAVELOG "Select add premium shot"
@ -1002,11 +1021,11 @@
Var PriceDrinkNoTop = PriceDrinkTmp Var PriceDrinkNoTop = PriceDrinkTmp
Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
SAVELOG PriceDrinkTmp SAVELOG PriceDrinkTmp
Refresh Refresh
</EventClick> </EventClick>
</Button> </Button>

View file

@ -95,7 +95,7 @@
Var RandomPromotionMyworld = 0 Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0 Var RandomSalePackage = 0
Var XMLPageVersion = "5.60" Var XMLPageVersion = "5.61"
</EventOpen> </EventOpen>