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

This commit is contained in:
Pakin 2024-06-20 17:43:58 +07:00
commit 8e58752297
86 changed files with 5031 additions and 2464 deletions

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before After
Before After

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: 14 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 16 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.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 14 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.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before After
Before After

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: 14 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 15 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.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 16 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.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 36 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 40 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 38 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 37 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 40 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 38 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 33 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 32 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 35 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 35 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 33 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 32 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 32 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 15 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.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 16 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

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -15,7 +15,7 @@ IGNORE เป๊ปซี่นม Pepsi milk เป๊ปซี่ นม Peps
นมคาราเมล\nบิสคอฟ CARAMEL MILK \nBISCOFF VOLCANO น้ำเชื่อมคาราเมล นม น้ำตาล \n บิสคอฟ Caramel Syrup, Milk,\nSugar, Biscof - - 12-03-03-0041 bn_CARAMEL_MILK _BISCOFF.png - - - posi1 นมคาราเมล\nบิสคอฟ CARAMEL MILK \nBISCOFF VOLCANO น้ำเชื่อมคาราเมล นม น้ำตาล \n บิสคอฟ Caramel Syrup, Milk,\nSugar, Biscof - - 12-03-03-0041 bn_CARAMEL_MILK _BISCOFF.png - - - posi1
นมสตรอเบอร์รี่\nบิสคอฟ STRAWBERRY MILK \nBISCOFF VOLCANO น้ำเชื่อมสตรอเบอร์รี่ นม น้ำตาล \n บิสคอฟ Strawberry Syrup, Milk,\nSugar, Biscof - - 12-03-03-0042 bn_STRAWBERRY_MILK_MINT_BISCOFF.png - - - posi1 นมสตรอเบอร์รี่\nบิสคอฟ STRAWBERRY MILK \nBISCOFF VOLCANO น้ำเชื่อมสตรอเบอร์รี่ นม น้ำตาล \n บิสคอฟ Strawberry Syrup, Milk,\nSugar, Biscof - - 12-03-03-0042 bn_STRAWBERRY_MILK_MINT_BISCOFF.png - - - posi1
นมมินต์\nบิสคอฟ Mint MILK \nBISCOFF VOLCANO น้ำเชื่อมมินต์ นม น้ำตาล \n บิสคอฟ Mint Syrup, Milk,\nSugar, Biscof - - 12-03-03-0043 bn_STRAWBERRY_MILK_BISCOFF.png - - - posi1 นมมินต์\nบิสคอฟ Mint MILK \nBISCOFF VOLCANO น้ำเชื่อมมินต์ นม น้ำตาล \n บิสคอฟ Mint Syrup, Milk,\nSugar, Biscof - - 12-03-03-0043 bn_STRAWBERRY_MILK_BISCOFF.png - - - posi1
โกโก้\nบิสคอฟ COCOA MILK \nBISCOFF VOLCANO โกโก้ นม น้ำตาล \n บิสคอฟ Cocoa, Milk,\nSugar, Biscof - - 12-03-03-0061 bn_cocoa_MILK_BISCOFF - - - posi1 โกโก้\nบิสคอฟ COCOA MILK \nBISCOFF VOLCANO โกโก้ นม น้ำตาล \n บิสคอฟ Cocoa, Milk,\nSugar, Biscof - - 12-03-03-0061 bn_cocoa_MILK_BISCOFF.png - - - posi1
มัทฉะลาเต้ไข่มุก MATCHA LATTE BUBBLE ชาเชียว นม ไข่มุก Green Tea, Milk, Sugar, Ice, Bubble - 12-02-62-0026 12-02-63-0026 bn_matcha_bubble.png - - - posi1 มัทฉะลาเต้ไข่มุก MATCHA LATTE BUBBLE ชาเชียว นม ไข่มุก Green Tea, Milk, Sugar, Ice, Bubble - 12-02-62-0026 12-02-63-0026 bn_matcha_bubble.png - - - posi1
ชานมไทยไข่มุก THAI MILK TEA BUBBLE ชาไทย นม ไข่มุก Thai tea, Sugar, milk, Bubble - 12-02-62-0039 12-02-63-0039 bn_thaitea_bubble.png - - - posi1 ชานมไทยไข่มุก THAI MILK TEA BUBBLE ชาไทย นม ไข่มุก Thai tea, Sugar, milk, Bubble - 12-02-62-0039 12-02-63-0039 bn_thaitea_bubble.png - - - posi1
@ -187,13 +187,11 @@ IGNORE ไมโลปั่นภูเขาไฟ MILO SMOOTHIE \nVOLCANO
นมคาราเมล\nบิสคอฟ CARAMEL MILK \nBISCOFF VOLCANO น้ำเชื่อมคาราเมล นม น้ำตาล \n บิสคอฟ Caramel Syrup, Milk,\nSugar, Biscof - - 12-03-03-0041 bn_CARAMEL_MILK _BISCOFF.png - - - posi1 นมคาราเมล\nบิสคอฟ CARAMEL MILK \nBISCOFF VOLCANO น้ำเชื่อมคาราเมล นม น้ำตาล \n บิสคอฟ Caramel Syrup, Milk,\nSugar, Biscof - - 12-03-03-0041 bn_CARAMEL_MILK _BISCOFF.png - - - posi1
นมสตรอเบอร์รี่\nบิสคอฟ STRAWBERRY MILK \nBISCOFF VOLCANO น้ำเชื่อมสตรอเบอร์รี่ นม น้ำตาล \n บิสคอฟ Strawberry Syrup, Milk,\nSugar, Biscof - - 12-03-03-0042 bn_STRAWBERRY_MILK_MINT_BISCOFF.png - - - posi1 นมสตรอเบอร์รี่\nบิสคอฟ STRAWBERRY MILK \nBISCOFF VOLCANO น้ำเชื่อมสตรอเบอร์รี่ นม น้ำตาล \n บิสคอฟ Strawberry Syrup, Milk,\nSugar, Biscof - - 12-03-03-0042 bn_STRAWBERRY_MILK_MINT_BISCOFF.png - - - posi1
นมมินต์\nบิสคอฟ Mint MILK \nBISCOFF VOLCANO น้ำเชื่อมมินต์ นม น้ำตาล \n บิสคอฟ Mint Syrup, Milk,\nSugar, Biscof - - 12-03-03-0043 bn_STRAWBERRY_MILK_BISCOFF.png - - - posi1 นมมินต์\nบิสคอฟ Mint MILK \nBISCOFF VOLCANO น้ำเชื่อมมินต์ นม น้ำตาล \n บิสคอฟ Mint Syrup, Milk,\nSugar, Biscof - - 12-03-03-0043 bn_STRAWBERRY_MILK_BISCOFF.png - - - posi1
โกโก้\nบิสคอฟ COCOA MILK \nBISCOFF VOLCANO โกโก้ นม น้ำตาล \n บิสคอฟ Cocoa, Milk,\nSugar, Biscof - - 12-03-03-0061 bn_cocoa_MILK_BISCOFF.png - - - posi1
มะพร้าวน้ำหอมปั่น\nนมนิวซีแลนด์ COCONUT MILK น้ำเชื่อมมะพร้าว นม และน้ำ Coconut syrup, Milk,\nWater - 12-03-02-0058 12-03-03-0058 bn_iced_milk_coconut.png - - - posi1 มะพร้าวน้ำหอมปั่น\nนมนิวซีแลนด์ COCONUT MILK น้ำเชื่อมมะพร้าว นม และน้ำ Coconut syrup, Milk,\nWater - 12-03-02-0058 12-03-03-0058 bn_iced_milk_coconut.png - - - posi1
มะพร้าวโกโก้ปั่น\nนมนิวซีแลนด์ COCONUT \NCHOCOLATE MILK น้ำเชื่อมมะพร้าว โกโก้ นม และน้ำ Coconut syrup, Cocoa, Milk,\nWater - 12-03-02-0059 12-03-03-0059 bn_iced_Cocoa_coconut.png - - - posi1 มะพร้าวโกโก้ปั่น\nนมนิวซีแลนด์ COCONUT \NCHOCOLATE MILK น้ำเชื่อมมะพร้าว โกโก้ นม และน้ำ Coconut syrup, Cocoa, Milk,\nWater - 12-03-02-0059 12-03-03-0059 bn_iced_Cocoa_coconut.png - - - posi1
IGNORE มะพร้าวน้ำหอมโตเกียว\nบานาน่า COCONUT TOKYO\NBANANA MILK น้ำเชื่อมมะพร้าว น้ำเชื่อมโตเกียวบานาน่า นม และน้ำ Coconut syrup, Tokyo Banana Syrup, Milk,\nWater - - 12-03-03-0060 - - - posi1 IGNORE มะพร้าวน้ำหอมโตเกียว\nบานาน่า COCONUT TOKYO\NBANANA MILK น้ำเชื่อมมะพร้าว น้ำเชื่อมโตเกียวบานาน่า นม และน้ำ Coconut syrup, Tokyo Banana Syrup, Milk,\nWater - - 12-03-03-0060 - - - posi1
นมคาราเมล\nบิสคอฟ CARAMEL MILK \nBISCOFF VOLCANO น้ำเชื่อมคาราเมล นม น้ำตาล \n บิสคอฟ Caramel Syrup, Milk,\nSugar, Biscof - - 12-03-03-0041 bn_CARAMEL_MILK _BISCOFF.png - - - posi1
นมสตรอเบอร์รี่\nบิสคอฟ STRAWBERRY MILK \nBISCOFF VOLCANO น้ำเชื่อมสตรอเบอร์รี่ นม น้ำตาล \n บิสคอฟ Strawberry Syrup, Milk,\nSugar, Biscof - - 12-03-03-0042 bn_STRAWBERRY_MILK_MINT_BISCOFF.png - - - posi1
นมมินต์\nบิสคอฟ Mint MILK \nBISCOFF VOLCANO น้ำเชื่อมมินต์ นม น้ำตาล \n บิสคอฟ Mint Syrup, Milk,\nSugar, Biscof - - 12-03-03-0043 bn_STRAWBERRY_MILK_BISCOFF.png - - - posi1
โกโก้\nบิสคอฟ COCOA MILK \nBISCOFF VOLCANO โกโก้ นม น้ำตาล \n บิสคอฟ Cocoa, Milk,\nSugar, Biscof - - 12-03-03-0061 bn_cocoa_MILK_BISCOFF - - - posi1
Name=Tea,file=page_catalog_group_tea.skt Name=Tea,file=page_catalog_group_tea.skt
เก็กฮวย CHRYSANTHS TEA น้ำเก๊กฮวย น้ำตาล Chrysanthemum & Water 12-02-01-0001 12-02-02-0001 12-02-03-0001 bn_hot_chrysanthemum_tea.png - - - posi1 เก็กฮวย CHRYSANTHS TEA น้ำเก๊กฮวย น้ำตาล Chrysanthemum & Water 12-02-01-0001 12-02-02-0001 12-02-03-0001 bn_hot_chrysanthemum_tea.png - - - posi1
@ -517,10 +515,10 @@ Name=KidMenu,file=page_catalog_group_forkid.skt
posi1 posi1
นมโตเกียวบานาน่า TOKYO\nBANANA MILK น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล Tokyo Banana Syrup, Milk, Sugar 12-03-01-0023 12-03-02-0023 12-03-03-0023 bn_Banana_milk.png - - - posi1 นมโตเกียวบานาน่า TOKYO\nBANANA MILK น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล Tokyo Banana Syrup, Milk, Sugar 12-03-01-0023 12-03-02-0023 12-03-03-0023 bn_Banana_milk.png - - - posi1
นมช็อกโกโตเกียว\nบานาน่า CHOCO TOKYO\nBANANA MILK โกโก้ น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล Tokyo Banana Syrup, Milk, Sugar 12-03-01-0024 12-03-02-0024 12-03-03-0024 bn_ChocoBanana_milk.png - - - posi1 นมช็อกโกโตเกียว\nบานาน่า CHOCO TOKYO\nBANANA MILK โกโก้ น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล Tokyo Banana Syrup, Milk, Sugar 12-03-01-0024 12-03-02-0024 12-03-03-0024 bn_ChocoBanana_milk.png - - - posi1
นมคาราเมล\nบิสคอฟ CARAMEL MILK \nBISCOFF VOLCANO น้ำเชื่อมคาราเมล นม น้ำตาล \n บิสคอฟ Caramel Syrup, Milk,\nSugar, Biscof - - 12-03-03-0041 bn_CARAMEL_MILK _BISCOFF.png - - - posi1 #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF!
นมสตรอเบอร์รี่\nบิสคอฟ STRAWBERRY MILK \nBISCOFF VOLCANO น้ำเชื่อมสตรอเบอร์รี่ นม น้ำตาล \n บิสคอฟ Strawberry Syrup, Milk,\nSugar, Biscof - - 12-03-03-0042 bn_STRAWBERRY_MILK_MINT_BISCOFF.png - - - posi1 #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF!
นมมินต์\nบิสคอฟ Mint MILK \nBISCOFF VOLCANO น้ำเชื่อมมินต์ นม น้ำตาล \n บิสคอฟ Mint Syrup, Milk,\nSugar, Biscof - - 12-03-03-0043 bn_STRAWBERRY_MILK_BISCOFF.png - - - posi1 #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF! #REF!
โกโก้\nบิสคอฟ COCOA MILK \nBISCOFF VOLCANO โกโก้ นม น้ำตาล \n บิสคอฟ Cocoa, Milk,\nSugar, Biscof - - 12-03-03-0061 bn_cocoa_MILK_BISCOFF - - - posi1 โกโก้\nบิสคอฟ COCOA MILK \nBISCOFF VOLCANO โกโก้ นม น้ำตาล \n บิสคอฟ Cocoa, Milk,\nSugar, Biscof - - 12-03-03-0061 bn_cocoa_MILK_BISCOFF.png - - - posi1

Can't render this file because it has a wrong number of fields in line 3.

View file

@ -3629,9 +3629,9 @@ Sugar, Biscof" </Value>
<State> Flag( 12-03-03-0061.Button,Disable=Invisible,$Sum1203030061) </State> <State> Flag( 12-03-03-0061.Button,Disable=Invisible,$Sum1203030061) </State>
<Button> <Button>
<State> $Sum1203030061 </State> <State> $Sum1203030061 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_cocoa_MILK_BISCOFF" </Filename> <Filename> "ROOT/taobin_project/image/page_drink_n//bn_cocoa_MILK_BISCOFF.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_cocoa_MILK_BISCOFF" </FilenamePress> <FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_cocoa_MILK_BISCOFF.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_cocoa_MILK_BISCOFF" </FilenameDisable> <FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_cocoa_MILK_BISCOFF.png" </FilenameDisable>
<OverlayImage> xmlpro( 12-03-03-0061, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage> <OverlayImage> xmlpro( 12-03-03-0061, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
@ -3640,7 +3640,7 @@ Sugar, Biscof" </Value>
Var NameDrinkTH = "โกโก้ บิสคอฟ" Var NameDrinkTH = "โกโก้ บิสคอฟ"
Var DrinkDescriptionTH = "โกโก้ นม น้ำตาล บิสคอฟ" Var DrinkDescriptionTH = "โกโก้ นม น้ำตาล บิสคอฟ"
Var DrinkDescription = "Cocoa, Milk, Sugar, Biscof" Var DrinkDescription = "Cocoa, Milk, Sugar, Biscof"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_cocoa_MILK_BISCOFF" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_cocoa_MILK_BISCOFF.png"
Var OpenFromXML = CurrentXMLFileName2 Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price Var PriceD1 = $-.Price
Var PriceD2 = $-.Price Var PriceD2 = $-.Price

View file

@ -4177,9 +4177,9 @@ Sugar, Biscof" </Value>
<State> Flag( 12-03-03-0061.Button,Disable=Invisible,$Sum1203030061) </State> <State> Flag( 12-03-03-0061.Button,Disable=Invisible,$Sum1203030061) </State>
<Button> <Button>
<State> $Sum1203030061 </State> <State> $Sum1203030061 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_cocoa_MILK_BISCOFF" </Filename> <Filename> "ROOT/taobin_project/image/page_drink_n//bn_cocoa_MILK_BISCOFF.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_cocoa_MILK_BISCOFF" </FilenamePress> <FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_cocoa_MILK_BISCOFF.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_cocoa_MILK_BISCOFF" </FilenameDisable> <FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_cocoa_MILK_BISCOFF.png" </FilenameDisable>
<OverlayImage> xmlpro( 12-03-03-0061, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage> <OverlayImage> xmlpro( 12-03-03-0061, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
@ -4188,7 +4188,7 @@ Sugar, Biscof" </Value>
Var NameDrinkTH = "โกโก้ บิสคอฟ" Var NameDrinkTH = "โกโก้ บิสคอฟ"
Var DrinkDescriptionTH = "โกโก้ นม น้ำตาล บิสคอฟ" Var DrinkDescriptionTH = "โกโก้ นม น้ำตาล บิสคอฟ"
Var DrinkDescription = "Cocoa, Milk, Sugar, Biscof" Var DrinkDescription = "Cocoa, Milk, Sugar, Biscof"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_cocoa_MILK_BISCOFF" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_cocoa_MILK_BISCOFF.png"
Var OpenFromXML = CurrentXMLFileName2 Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $-.Price Var PriceD1 = $-.Price

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -3200,9 +3200,9 @@ Sugar, Biscof" </Value>
<State> Flag( 12-03-03-0061.Button,Disable=Invisible,$Sum1203030061) </State> <State> Flag( 12-03-03-0061.Button,Disable=Invisible,$Sum1203030061) </State>
<Button> <Button>
<State> $Sum1203030061 </State> <State> $Sum1203030061 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_cocoa_MILK_BISCOFF" </Filename> <Filename> "ROOT/taobin_project/image/page_drink_n//bn_cocoa_MILK_BISCOFF.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_cocoa_MILK_BISCOFF" </FilenamePress> <FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_cocoa_MILK_BISCOFF.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_cocoa_MILK_BISCOFF" </FilenameDisable> <FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_cocoa_MILK_BISCOFF.png" </FilenameDisable>
<OverlayImage> xmlpro( 12-03-03-0061, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage> <OverlayImage> xmlpro( 12-03-03-0061, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
@ -3211,7 +3211,7 @@ Sugar, Biscof" </Value>
Var NameDrinkTH = "โกโก้ บิสคอฟ" Var NameDrinkTH = "โกโก้ บิสคอฟ"
Var DrinkDescriptionTH = "โกโก้ นม น้ำตาล บิสคอฟ" Var DrinkDescriptionTH = "โกโก้ นม น้ำตาล บิสคอฟ"
Var DrinkDescription = "Cocoa, Milk, Sugar, Biscof" Var DrinkDescription = "Cocoa, Milk, Sugar, Biscof"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_cocoa_MILK_BISCOFF" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_cocoa_MILK_BISCOFF.png"
Var OpenFromXML = CurrentXMLFileName2 Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $-.Price Var PriceD1 = $-.Price

View file

@ -1205,13 +1205,14 @@
</EventUnitTest2> </EventUnitTest2>
<EventUnitTest3> <EventUnitTest3>
Var XMLProfile = "AllPriceUp10" ;Var XMLProfile = "AllPriceUp10"
Open CurrentXMLFileName0 ;Open CurrentXMLFileName0
PRICE "Reload" "-"
</EventUnitTest3> </EventUnitTest3>
<EventUnitTest4> <EventUnitTest4>
Var XMLProfile = "Discount50" PRICE "Load" "-"
Open CurrentXMLFileName0 PRICE "Check" XMLProfile
</EventUnitTest4> </EventUnitTest4>
<EventDrink> <EventDrink>

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -2650,9 +2650,9 @@ Sugar, Biscof" </Value>
<State> Flag( 12-03-03-0061.Button,Disable=Invisible,$Sum1203030061) </State> <State> Flag( 12-03-03-0061.Button,Disable=Invisible,$Sum1203030061) </State>
<Button> <Button>
<State> $Sum1203030061 </State> <State> $Sum1203030061 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_cocoa_MILK_BISCOFF" </Filename> <Filename> "ROOT/taobin_project/image/page_drink_n//bn_cocoa_MILK_BISCOFF.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_cocoa_MILK_BISCOFF" </FilenamePress> <FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_cocoa_MILK_BISCOFF.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_cocoa_MILK_BISCOFF" </FilenameDisable> <FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_cocoa_MILK_BISCOFF.png" </FilenameDisable>
<OverlayImage> xmlpro( 12-03-03-0061, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage> <OverlayImage> xmlpro( 12-03-03-0061, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
@ -2661,7 +2661,7 @@ Sugar, Biscof" </Value>
Var NameDrinkTH = "โกโก้ บิสคอฟ" Var NameDrinkTH = "โกโก้ บิสคอฟ"
Var DrinkDescriptionTH = "โกโก้ นม น้ำตาล บิสคอฟ" Var DrinkDescriptionTH = "โกโก้ นม น้ำตาล บิสคอฟ"
Var DrinkDescription = "Cocoa, Milk, Sugar, Biscof" Var DrinkDescription = "Cocoa, Milk, Sugar, Biscof"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_cocoa_MILK_BISCOFF" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_cocoa_MILK_BISCOFF.png"
Var OpenFromXML = CurrentXMLFileName2 Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price Var PriceD1 = $-.Price
Var PriceD2 = $-.Price Var PriceD2 = $-.Price

View file

@ -108,8 +108,8 @@
Var RandomPromotionMyworld = 0 Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0 Var RandomSalePackage = 0
Var XMLPageVersion = "8.59" Var XMLPageVersion = "8.60"
Var XMLPageVersionInt = 859 Var XMLPageVersionInt = 860
;Oreo ;Oreo
Var OreoGuarantee = 0 Var OreoGuarantee = 0