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

This commit is contained in:
worawut 2023-04-26 10:44:21 +07:00
commit 2cc40347a6
244 changed files with 22862 additions and 2014 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 188 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 185 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

View file

@ -223,6 +223,38 @@
"header2E": "Allergen Contains:",
"detail2E": "May Contains: Egg, treenuts, gluten, milk, Soybean, peanuts, oat, sesame seeds, fish, squid, sulphites.",
"price": 40
},
{
"id": 15,
"code": "03-02-01-0013",
"name": "บลูเบอรี่ พายป๊อปคอร์น",
"nameE": "Blueberry Pie\nPopcorn",
"desc": "TAO BIN SNACK STATION",
"descE": "TAO BIN SNACK STATION",
"image": "03-02-01-0013.png",
"detail1": "ป๊อปคอร์นแฮนด์เมดเคลือบบลูเบอรี่กรุบกรอบและหอมเนย",
"header2": "ข้อมูลสำหรับผู้แพ้อาหาร:",
"detail2": "",
"detail1E": "Handctafted in old-fashioned popcorn one batch at a time, this popcorn is a crunchy and butter Blueberry delight.",
"header2E": "Allergen Contains:",
"detail2E": "",
"price": 55
},
{
"id": 16,
"code": "03-02-01-0014",
"name": "สตรอเบอร์รี่ ซันเดย์\nป๊อปคอร์น",
"nameE": "Strawberry Sundea\nPopcorn",
"desc": "TAO BIN SNACK STATION",
"descE": "TAO BIN SNACK STATION",
"image": "03-02-01-0014.png",
"detail1": "ป๊อปคอร์นแฮนด์เมดเคลือบสตรอเบอร์รี่กรุบกรอบและหอมเนย",
"header2": "ข้อมูลสำหรับผู้แพ้อาหาร:",
"detail2": "",
"detail1E": "Handctafted in old-fashioned popcorn one batch at a time, this popcorn is a crunchy and butter Strawberry delight.",
"header2E": "Allergen Contains:",
"detail2E": "",
"price": 55
}
]
}

View file

@ -251,8 +251,17 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
If ShowPromoitonOreo = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
If SongkranEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf
EndIf
</EventClick>
</Button>
@ -1851,6 +1860,321 @@
</Block>
; button i=1 03-02-01-0013
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> $03-02-01-0013.Button </State>
<Button>
<State> $03-02-01-0013.Button </State>
<Filename> Var( "ROOT/taobin_project/spiral/image/page_spiral/" + $03-02-01-0013.image ) </Filename>
<FilenamePress> Var( "ROOT/taobin_project/spiral/image/page_spiral_press/" + $03-02-01-0013.image ) " </FilenamePress>
<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_press/" + $03-02-01-0013.image ) " </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var SpiralSelectdetail1 = $03-02-01-0013.detail1
Var SpiralSelectheader2 = $03-02-01-0013.header2
Var SpiralSelectdetail2 = $03-02-01-0013.detail2
Var SpiralSelectdetail1E = $03-02-01-0013.detail1E
Var SpiralSelectheader2E = $03-02-01-0013.header2E
Var SpiralSelectdetail2E = $03-02-01-0013.detail2E
Var ServiceCredit = "03-02-01-0013"
Var SelectDrink = $03-02-01-0013.Self
Var NameDrink = $03-02-01-0013.NameE
Var NameDrinkTH = $03-02-01-0013.Name
Var DrinkDescriptionTH = $03-02-01-0013.description
Var DrinkDescription = $03-02-01-0013.descriptionE
Var PriceDrink = $03-02-01-0013.Price
Var SpiralProduct = "ROOT/taobin_project/spiral/image/page_spiral/spiral_product_" + $03-02-01-0013.image
Var Spiraldetail = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_detail_" + $03-02-01-0013.image
SAVELOG NameDrink
Var PriceShowValue = charOfBaht + PriceDrink
SPIRAL_VERIFY ServiceCredit SpiralRef
Open "ROOT/taobin_project/spiral/xml/page_spiral_check.xml"
</EventOnClick>
</Button>
<Image>
<X> 49 </X>
<Y> 117 </Y>
<State>
eval(
If $03-02-01-0013.Button = "Disable" Then
Var return = "Enable"
Else
Var return = "Invisible"
EndIf
)
</State>
<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
</Image>
<Text>
<X> 48 </X>
<Y> 116 </Y>
<Size> 32 </Size>
<Width>128</Width>
<Height>64</Height>
<Font> MITRegularTTF </Font>
<Color> 0x5A5A5A </Color>
<Mode> "disable-show" </Mode>
<State> $03-02-01-0013.Button </State>
<Value> text_unavailable </Value>
<Align> center-vertical-horizontal </Align>
</Text>
<Image>
<X> 10 </X>
<Y> 251 </Y>
<State> ShowPrice </State>
<Width> 67 </Width>
<Height> 62 </Height>
<Filename> ImageShowPrice </Filename>
</Image>
<Text>
<X> 57 </X>
<Y> 260 </Y>
<State> ShowPrice </State>
<Align> "Hurr" </Align>
<Width>150</Width>
<Size> 17 </Size>
<Font> KanitMediumTTF </Font>
<Color> ColorBrown2 </Color>
<Value> $03-02-01-0013.Price </Value>
</Text>
<Text>
<X> 45 </X>
<Y> 260 </Y>
<State> ShowPrice </State>
<Width>20</Width>
<Size> 17 </Size>
<Font> KanitMediumTTF </Font>
<Color> ColorBrown2 </Color>
<Value> "฿"" </Value>
</Text>
<Text>
<X> 16 </X>
<Y> 180 </Y>
<Size> 22 </Size>
<Width>220</Width>
<Mode> "multi2" </Mode>
<Font> KanitMediumTTF </Font>
<Color> ColorBlack1 </Color>
<State> showthaiText </State>
<Value> $03-02-01-0013.Name </Value>
</Text>
<Text>
<X> 16 </X>
<Y> 240 </Y>
<Size> 14 </Size>
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> ColorBrown </Color>
<State> showthaiText </State>
<Value> $03-02-01-0013.description </Value>
</Text>
<Text>
<X> 16 </X>
<Y> 180 </Y>
<Size> 22 </Size>
<Width>220</Width>
<Mode> "multi2" </Mode>
<Font> KanitMediumTTF </Font>
<Color> ColorBlack1 </Color>
<State> showengText </State>
<Value> $03-02-01-0013.NameE </Value>
</Text>
<Text>
<X> 16 </X>
<Y> 240 </Y>
<Size> 14 </Size>
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> ColorBrown </Color>
<State> showengText </State>
<Value> $03-02-01-0013.descriptionE </Value>
</Text>
</Block>
; button i=1 03-02-01-0014
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> $03-02-01-0014.Button </State>
<Button>
<State> $03-02-01-0014.Button </State>
<Filename> Var( "ROOT/taobin_project/spiral/image/page_spiral/" + $03-02-01-0014.image ) </Filename>
<FilenamePress> Var( "ROOT/taobin_project/spiral/image/page_spiral_press/" + $03-02-01-0014.image ) " </FilenamePress>
<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_press/" + $03-02-01-0014.image ) " </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var SpiralSelectdetail1 = $03-02-01-0014.detail1
Var SpiralSelectheader2 = $03-02-01-0014.header2
Var SpiralSelectdetail2 = $03-02-01-0014.detail2
Var SpiralSelectdetail1E = $03-02-01-0014.detail1E
Var SpiralSelectheader2E = $03-02-01-0014.header2E
Var SpiralSelectdetail2E = $03-02-01-0014.detail2E
Var ServiceCredit = "03-02-01-0014"
Var SelectDrink = $03-02-01-0014.Self
Var NameDrink = $03-02-01-0014.NameE
Var NameDrinkTH = $03-02-01-0014.Name
Var DrinkDescriptionTH = $03-02-01-0014.description
Var DrinkDescription = $03-02-01-0014.descriptionE
Var PriceDrink = $03-02-01-0014.Price
Var SpiralProduct = "ROOT/taobin_project/spiral/image/page_spiral/spiral_product_" + $03-02-01-0014.image
Var Spiraldetail = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_detail_" + $03-02-01-0014.image
SAVELOG NameDrink
Var PriceShowValue = charOfBaht + PriceDrink
SPIRAL_VERIFY ServiceCredit SpiralRef
Open "ROOT/taobin_project/spiral/xml/page_spiral_check.xml"
</EventOnClick>
</Button>
<Image>
<X> 49 </X>
<Y> 117 </Y>
<State>
eval(
If $03-02-01-0014.Button = "Disable" Then
Var return = "Enable"
Else
Var return = "Invisible"
EndIf
)
</State>
<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
</Image>
<Text>
<X> 48 </X>
<Y> 116 </Y>
<Size> 32 </Size>
<Width>128</Width>
<Height>64</Height>
<Font> MITRegularTTF </Font>
<Color> 0x5A5A5A </Color>
<Mode> "disable-show" </Mode>
<State> $03-02-01-0014.Button </State>
<Value> text_unavailable </Value>
<Align> center-vertical-horizontal </Align>
</Text>
<Image>
<X> 10 </X>
<Y> 251 </Y>
<State> ShowPrice </State>
<Width> 67 </Width>
<Height> 62 </Height>
<Filename> ImageShowPrice </Filename>
</Image>
<Text>
<X> 57 </X>
<Y> 260 </Y>
<State> ShowPrice </State>
<Align> "Hurr" </Align>
<Width>150</Width>
<Size> 17 </Size>
<Font> KanitMediumTTF </Font>
<Color> ColorBrown2 </Color>
<Value> $03-02-01-0014.Price </Value>
</Text>
<Text>
<X> 45 </X>
<Y> 260 </Y>
<State> ShowPrice </State>
<Width>20</Width>
<Size> 17 </Size>
<Font> KanitMediumTTF </Font>
<Color> ColorBrown2 </Color>
<Value> "฿"" </Value>
</Text>
<Text>
<X> 16 </X>
<Y> 180 </Y>
<Size> 22 </Size>
<Width>220</Width>
<Mode> "multi2" </Mode>
<Font> KanitMediumTTF </Font>
<Color> ColorBlack1 </Color>
<State> showthaiText </State>
<Value> $03-02-01-0014.Name </Value>
</Text>
<Text>
<X> 16 </X>
<Y> 240 </Y>
<Size> 14 </Size>
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> ColorBrown </Color>
<State> showthaiText </State>
<Value> $03-02-01-0014.description </Value>
</Text>
<Text>
<X> 16 </X>
<Y> 180 </Y>
<Size> 22 </Size>
<Width>220</Width>
<Mode> "multi2" </Mode>
<Font> KanitMediumTTF </Font>
<Color> ColorBlack1 </Color>
<State> showengText </State>
<Value> $03-02-01-0014.NameE </Value>
</Text>
<Text>
<X> 16 </X>
<Y> 240 </Y>
<Size> 14 </Size>
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> ColorBrown </Color>
<State> showengText </State>
<Value> $03-02-01-0014.descriptionE </Value>
</Text>
</Block>
; button i=1 03-02-01-0010
<Block>
<MarginLeft> 33 </MarginLeft>
@ -2634,6 +2958,7 @@
</Block>
; button i=1 01-00-00-0015
<Block>
<MarginLeft> 33 </MarginLeft>
@ -2645,7 +2970,7 @@
<State> $01-00-00-0015.Button </State>
<Filename> Var( "ROOT/taobin_project/spiral/image/page_spiral/" + $01-00-00-0015.image ) </Filename>
<FilenamePress> Var( "ROOT/taobin_project/spiral/image/page_spiral_press/" + $01-00-00-0015.image ) " </FilenamePress>
;<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $01-00-00-0015.image ) " </FilenameDisable>
;<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_press/" + $01-00-00-0015.image ) " </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
@ -2759,9 +3084,6 @@
</Block>
</FrameScroll>
; Cart
<Button>

View file

@ -75,7 +75,7 @@
Var SpiralSelectdetail = SpiralSelectdetail1E
Var SpiralSelectheader = SpiralSelectheader2E
Var SpiralSelectdetail = SpiralSelectdetail2E
Var SpiralSelectdetai2 = SpiralSelectdetail2E
Var DirImage = "ROOT/taobin_project/image/topping_en"
Var DirImage2 = "ROOT/taobin_project/spiral/image/page_spiral"
@ -93,7 +93,7 @@
Var SpiralSelectdetail = SpiralSelectdetail1
Var SpiralSelectheader = SpiralSelectheader2
Var SpiralSelectdetail = SpiralSelectdetail2
Var SpiralSelectdetai2 = SpiralSelectdetail2
Var DirImage = "ROOT/taobin_project/image/topping"
Var DirImage2 = "ROOT/taobin_project/spiral/image/page_spiral"
@ -575,7 +575,7 @@ EndIf
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> ColorBrown2 </Color>
<Value> SpiralSelectdetail </Value>
<Value> SpiralSelectdetai2 </Value>
</Text>