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

Fix many bug 6.32

Browse source
This commit is contained in:
kong 2022-04-26 10:32:01 +07:00
parent efbc49ce98
commit 6dc2c89b7a
10 changed files with 60 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
animation01/TaoBin2_draft02_art49.mp4 Normal file
View file

Binary file not shown.

BIN
image/page_drink_disable_n/bn_hot_limeblack tea.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
image/page_drink_n/bn_hot_limeblack tea.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
image/page_drink_picture2_n/bn_hot_limeblack tea.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
image/page_drink_press_n/bn_hot_limeblack tea.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

27
xml/page_catalog_group_coffee.xml
View file

@ -2316,8 +2316,8 @@ ESPRESSO" </Value>
<EventOnClick> <EventOnClick>
Var NameDrink = "GEISHA ESPRESSO" Var NameDrink = "GEISHA ESPRESSO"
Var NameDrinkTH = "เอสเพรสโซ่ช็อต GEISHA" Var NameDrinkTH = "เอสเพรสโซ่ช็อต GEISHA"
Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ"
Var DrinkDescription = "Light roast (natural process) Note: Floral & Tropical fruit" Var DrinkDescription = "Light Roast (natural process) Lemon, Peach, Honey, Jasmin"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_geisha.png" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_geisha.png"
Var OpenFromXML = CurrentXMLFileName2 Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $12-01-01-0036.Price Var PriceD1 = $12-01-01-0036.Price
@ -2385,8 +2385,7 @@ GEISHA" </Value>
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<State> showthaiText </State> <State> showthaiText </State>
<Value> "กาแฟคั่วอ่อน (natural process) <Value> "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ" </Value>
กลิ่นดอกไม้ ผลไม้เขตร้อน" </Value>
</Text> </Text>
<Text> <Text>
<X> 16 </X> <X> 16 </X>
@ -2407,7 +2406,7 @@ GEISHA" </Value>
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<State> showengText </State> <State> showengText </State>
<Value> "Light roast (natural process) Note: Floral & Tropical fruit" </Value> <Value> "Light Roast (natural process) Lemon, Peach, Honey, Jasmin" </Value>
</Text> </Text>
<Image> <Image>
<X> 16 </X> <X> 16 </X>
@ -3689,8 +3688,8 @@ AMERICANO" </Value>
<EventOnClick> <EventOnClick>
Var NameDrink = "GEISHA AMERICANO" Var NameDrink = "GEISHA AMERICANO"
Var NameDrinkTH = "อเมริกาโน GEISHA" Var NameDrinkTH = "อเมริกาโน GEISHA"
Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ"
Var DrinkDescription = "Light roast (natural process) Note: Floral & Tropical fruit" Var DrinkDescription = "Light Roast (natural process) Lemon, Peach, Honey, Jasmin"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_geisha.png" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_geisha.png"
Var OpenFromXML = CurrentXMLFileName2 Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $12-01-01-0035.Price Var PriceD1 = $12-01-01-0035.Price
@ -3758,8 +3757,7 @@ GEISHA" </Value>
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<State> showthaiText </State> <State> showthaiText </State>
<Value> "กาแฟคั่วอ่อน (natural process) <Value> "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ" </Value>
กลิ่นดอกไม้ ผลไม้เขตร้อน" </Value>
</Text> </Text>
<Text> <Text>
<X> 16 </X> <X> 16 </X>
@ -3781,7 +3779,7 @@ AMERICANO" </Value>
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<State> showengText </State> <State> showengText </State>
<Value> "Light roast (natural process) Note: Floral & Tropical fruit" </Value> <Value> "Light Roast (natural process) Lemon, Peach, Honey, Jasmin" </Value>
</Text> </Text>
<Image> <Image>
<X> 16 </X> <X> 16 </X>
@ -5063,8 +5061,8 @@ ALMOST DIRTY" </Value>
<EventOnClick> <EventOnClick>
Var NameDrink = "GEISHA ALMOST DIRTY" Var NameDrink = "GEISHA ALMOST DIRTY"
Var NameDrinkTH = "GEISHA ALMOST DIRTY" Var NameDrinkTH = "GEISHA ALMOST DIRTY"
Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ"
Var DrinkDescription = "Light roast (natural process) Note: Floral & Tropical fruit" Var DrinkDescription = "Light Roast (natural process) Lemon, Peach, Honey, Jasmin"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_dirty_light_geisha.png" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_dirty_light_geisha.png"
Var OpenFromXML = CurrentXMLFileName2 Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price Var PriceD1 = $-.Price
@ -5132,8 +5130,7 @@ ALMOST DIRTY" </Value>
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<State> showthaiText </State> <State> showthaiText </State>
<Value> "กาแฟคั่วอ่อน (natural process) <Value> "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ" </Value>
กลิ่นดอกไม้ ผลไม้เขตร้อน" </Value>
</Text> </Text>
<Text> <Text>
<X> 16 </X> <X> 16 </X>
@ -5155,7 +5152,7 @@ ALMOST DIRTY" </Value>
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<State> showengText </State> <State> showengText </State>
<Value> "Light roast (natural process) Note: Floral & Tropical fruit" </Value> <Value> "Light Roast (natural process) Lemon, Peach, Honey, Jasmin" </Value>
</Text> </Text>
<Image> <Image>
<X> 16 </X> <X> 16 </X>

27
xml/page_catalog_group_recommend.xml
View file

@ -3536,8 +3536,8 @@ ESPRESSO" </Value>
<EventOnClick> <EventOnClick>
Var NameDrink = "GEISHA ESPRESSO" Var NameDrink = "GEISHA ESPRESSO"
Var NameDrinkTH = "เอสเพรสโซ่ช็อต GEISHA" Var NameDrinkTH = "เอสเพรสโซ่ช็อต GEISHA"
Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ"
Var DrinkDescription = "Light roast (natural process) Note: Floral & Tropical fruit" Var DrinkDescription = "Light Roast (natural process) Lemon, Peach, Honey, Jasmin"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_geisha.png" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_geisha.png"
Var OpenFromXML = CurrentXMLFileName2 Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $12-01-01-0036.Price Var PriceD1 = $12-01-01-0036.Price
@ -3605,8 +3605,7 @@ GEISHA" </Value>
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<State> showthaiText </State> <State> showthaiText </State>
<Value> "กาแฟคั่วอ่อน (natural process) <Value> "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ" </Value>
กลิ่นดอกไม้ ผลไม้เขตร้อน" </Value>
</Text> </Text>
<Text> <Text>
<X> 16 </X> <X> 16 </X>
@ -3627,7 +3626,7 @@ GEISHA" </Value>
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<State> showengText </State> <State> showengText </State>
<Value> "Light roast (natural process) Note: Floral & Tropical fruit" </Value> <Value> "Light Roast (natural process) Lemon, Peach, Honey, Jasmin" </Value>
</Text> </Text>
<Image> <Image>
<X> 16 </X> <X> 16 </X>
@ -4909,8 +4908,8 @@ AMERICANO" </Value>
<EventOnClick> <EventOnClick>
Var NameDrink = "GEISHA AMERICANO" Var NameDrink = "GEISHA AMERICANO"
Var NameDrinkTH = "อเมริกาโน GEISHA" Var NameDrinkTH = "อเมริกาโน GEISHA"
Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ"
Var DrinkDescription = "Light roast (natural process) Note: Floral & Tropical fruit" Var DrinkDescription = "Light Roast (natural process) Lemon, Peach, Honey, Jasmin"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_geisha.png" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_geisha.png"
Var OpenFromXML = CurrentXMLFileName2 Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $12-01-01-0035.Price Var PriceD1 = $12-01-01-0035.Price
@ -4978,8 +4977,7 @@ GEISHA" </Value>
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<State> showthaiText </State> <State> showthaiText </State>
<Value> "กาแฟคั่วอ่อน (natural process) <Value> "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ" </Value>
กลิ่นดอกไม้ ผลไม้เขตร้อน" </Value>
</Text> </Text>
<Text> <Text>
<X> 16 </X> <X> 16 </X>
@ -5001,7 +4999,7 @@ AMERICANO" </Value>
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<State> showengText </State> <State> showengText </State>
<Value> "Light roast (natural process) Note: Floral & Tropical fruit" </Value> <Value> "Light Roast (natural process) Lemon, Peach, Honey, Jasmin" </Value>
</Text> </Text>
<Image> <Image>
<X> 16 </X> <X> 16 </X>
@ -6283,8 +6281,8 @@ ALMOST DIRTY" </Value>
<EventOnClick> <EventOnClick>
Var NameDrink = "GEISHA ALMOST DIRTY" Var NameDrink = "GEISHA ALMOST DIRTY"
Var NameDrinkTH = "GEISHA ALMOST DIRTY" Var NameDrinkTH = "GEISHA ALMOST DIRTY"
Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ"
Var DrinkDescription = "Light roast (natural process) Note: Floral & Tropical fruit" Var DrinkDescription = "Light Roast (natural process) Lemon, Peach, Honey, Jasmin"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_dirty_light_geisha.png" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_dirty_light_geisha.png"
Var OpenFromXML = CurrentXMLFileName2 Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price Var PriceD1 = $-.Price
@ -6352,8 +6350,7 @@ ALMOST DIRTY" </Value>
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<State> showthaiText </State> <State> showthaiText </State>
<Value> "กาแฟคั่วอ่อน (natural process) <Value> "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ" </Value>
กลิ่นดอกไม้ ผลไม้เขตร้อน" </Value>
</Text> </Text>
<Text> <Text>
<X> 16 </X> <X> 16 </X>
@ -6375,7 +6372,7 @@ ALMOST DIRTY" </Value>
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<State> showengText </State> <State> showengText </State>
<Value> "Light roast (natural process) Note: Floral & Tropical fruit" </Value> <Value> "Light Roast (natural process) Lemon, Peach, Honey, Jasmin" </Value>
</Text> </Text>
<Image> <Image>
<X> 16 </X> <X> 16 </X>

42
xml/page_drinkok.xml
View file

@ -250,6 +250,7 @@
DEBUGVAR CupChecking DEBUGVAR CupChecking
DEBUGVAR MaybeHaveCup DEBUGVAR MaybeHaveCup
DEBUGVAR NextOrder DEBUGVAR NextOrder
DEBUGVAR DoorCupPosition
; Do not change ; Do not change
; ;
@ -269,31 +270,34 @@
Else Else
If HaveCup = "true" Then If HaveCup = "true" Then
Var buttonRemoveCup = "Enable" If CupChecking = "true" Then
Else
Var buttonRemoveCup = "Invisible" Else
Var buttonRemoveCup = "Enable"
EndIf
EndIf EndIf
If CupOnArm = "true" Then If CupOnArm = "true" Then
Var buttonRemoveCup = "Enable" Var buttonRemoveCup = "Enable"
Else
Var buttonRemoveCup = "Invisible"
EndIf EndIf
EndIf EndIf
Else Else
If sendPayMultiFlag = 1 Then If sendPayMultiFlag = 1 Then
Var buttonRemoveCup = "Invisible"
If HaveCup = "true" Then If HaveCup = "true" Then
Var buttonRemoveCup = "Enable" If CupChecking = "true" Then
Else
Var buttonRemoveCup = "Invisible" Else
Var buttonRemoveCup = "Enable"
EndIf
EndIf EndIf
If CupOnArm = "true" Then If CupOnArm = "true" Then
Var buttonRemoveCup = "Enable" Var buttonRemoveCup = "Enable"
Else
Var buttonRemoveCup = "Invisible"
EndIf EndIf
Var Seeker.TNumberTaobinMember = "" Var Seeker.TNumberTaobinMember = ""
@ -314,13 +318,19 @@
Else Else
If CupOnArm = "false" Then If CupOnArm = "false" Then
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
SAVELOG "Make next order by take-cup"
Open "ROOT/taobin_project/xml/page_thankyouConti.xml" If DoorCupPosition = "bottom" Then
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
SAVELOG "Make next order by take-cup"
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
Else
Machine DoorLidClose
EndIf
EndIf EndIf
EndIf EndIf
EndIf EndIf

16
xml/page_thankyouConti.xml
View file

@ -216,14 +216,14 @@
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename> ;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
;</Image> ;</Image>
<Video> ;<Video>
<X> 0 </X> ;<X> 0 </X>
<Y> 0 </Y> ;<Y> 0 </Y>
<Width> 1080</Width> ;<Width> 1080</Width>
<Height> 380 </Height> ;<Height> 380 </Height>
<Loop> "true" </Loop> ;<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename> ;<Filename> video_menu_0 </Filename>
</Video> ;</Video>
<Image> <Image>

4
xml_main/startup.xml
View file

@ -95,8 +95,8 @@
Var RandomPromotionMyworld = 0 Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0 Var RandomSalePackage = 0
Var XMLPageVersion = "6.29" Var XMLPageVersion = "6.32"
Var XMLPageVersionInt = 629 Var XMLPageVersionInt = 632
</EventOpen> </EventOpen>
<Text> <Text>