diff --git a/animation01/play_list.tsv b/animation01/play_list.tsv index 08da1b67..257313be 100644 --- a/animation01/play_list.tsv +++ b/animation01/play_list.tsv @@ -233,16 +233,20 @@ PEPSI YUZU 12-05-02-0053 1 14 53 23 13 24 120 4:00 23 PEPSI BANANA 12-05-02-0054 1 14 56 23 13 24 120 4:00 23 PEPSI LYCHEE 12-05-02-0048 1 14 11 23 13 24 120 4:00 23 -เป๊ปดี จี่ก็ว่าดี 12-05-02-0057 1 14 11 23 13 24 120 7:00 23 -เข้มจัดเลยพี่เป๊ปซี่กาแฟ 12-01-02-0056 1 14 3 4 5 23 13 24 120 8:00 23 -ชาดำครับจารย์ 12-02-02-0048 1 14 10 23 13 24 120 9:00 23 -เป๊ปซี่นมแน่นะวิ 12-03-02-0027 1 14 7 23 13 24 120 10:00 23 -น้ำแดงอยู่ข้างเป๊ปซี่นะคะ 12-05-02-0058 1 14 21 23 13 24 120 11:00 23 + +น้ำแดงอยู่ข้างเป๊ปซี่นะคะ 12-99-02-0009 1 14 21 23 13 24 120 12:00 23 +ชาดำครับจารย์ 12-99-02-0002 1 14 10 23 13 24 120 12:00 23 +ถ้าเป๊ปดื้อ ยูจะดุไหม 12-99-02-0006 1 14 53 23 13 24 120 13:00 23 +นี่นะหรือเป๊ปซี่กล้วย 12-99-02-0007 1 14 56 23 13 24 120 14:00 23 +เป๊ปดี จี่ก็ว่าดี 12-99-02-0008 1 14 11 23 13 24 120 15:00 23 +เข้มจัดเลยพี่เป๊ปซี่กาแฟ 12-99-02-0001 1 14 3 4 5 23 13 24 120 16:00 23 +เป๊ปซี่นมแน่นะวิ 12-99-02-0003 1 14 7 23 13 24 120 17:00 23 +เป๊ปซี่อย่าชี้หน้าเมล่อน 12-99-02-0005 1 14 52 23 13 24 120 18:00 23 +เป๊ปซี่อย่าวีนบ๊วย 12-99-02-0004 1 14 33 23 13 24 120 19:00 23 + + - 24 120 12:00 23 - 24 120 13:00 23 - 24 120 14:00 23 diff --git a/image/page_drink_n/bn_PEPSI_BANANA.png b/image/page_drink_n/bn_PEPSI_BANANA.png index fc9527d2..6988e350 100644 Binary files a/image/page_drink_n/bn_PEPSI_BANANA.png and b/image/page_drink_n/bn_PEPSI_BANANA.png differ diff --git a/image/page_drink_n/bn_PEPSI_COFFEE.png b/image/page_drink_n/bn_PEPSI_COFFEE.png index 2faf3182..01f858fd 100644 Binary files a/image/page_drink_n/bn_PEPSI_COFFEE.png and b/image/page_drink_n/bn_PEPSI_COFFEE.png differ diff --git a/image/page_drink_n/bn_PEPSI_LYCHEE.png b/image/page_drink_n/bn_PEPSI_LYCHEE.png index 9456b285..ee107853 100644 Binary files a/image/page_drink_n/bn_PEPSI_LYCHEE.png and b/image/page_drink_n/bn_PEPSI_LYCHEE.png differ diff --git a/image/page_drink_n/bn_PEPSI_MELON.png b/image/page_drink_n/bn_PEPSI_MELON.png index 5663c859..76a0bb3b 100644 Binary files a/image/page_drink_n/bn_PEPSI_MELON.png and b/image/page_drink_n/bn_PEPSI_MELON.png differ diff --git a/image/page_drink_n/bn_PEPSI_MILK.png b/image/page_drink_n/bn_PEPSI_MILK.png index 17f0b094..358f46f9 100644 Binary files a/image/page_drink_n/bn_PEPSI_MILK.png and b/image/page_drink_n/bn_PEPSI_MILK.png differ diff --git a/image/page_drink_n/bn_PEPSI_PLUM.png b/image/page_drink_n/bn_PEPSI_PLUM.png index c80d0997..ae849836 100644 Binary files a/image/page_drink_n/bn_PEPSI_PLUM.png and b/image/page_drink_n/bn_PEPSI_PLUM.png differ diff --git a/image/page_drink_n/bn_PEPSI_SALA.png b/image/page_drink_n/bn_PEPSI_SALA.png index 206af4d2..4aafb954 100644 Binary files a/image/page_drink_n/bn_PEPSI_SALA.png and b/image/page_drink_n/bn_PEPSI_SALA.png differ diff --git a/image/page_drink_n/bn_PEPSI_TEA.png b/image/page_drink_n/bn_PEPSI_TEA.png index 5860baad..88e1f756 100644 Binary files a/image/page_drink_n/bn_PEPSI_TEA.png and b/image/page_drink_n/bn_PEPSI_TEA.png differ diff --git a/image/page_drink_n/bn_PEPSI_YUZU.png b/image/page_drink_n/bn_PEPSI_YUZU.png index 2e890533..b8b30f0e 100644 Binary files a/image/page_drink_n/bn_PEPSI_YUZU.png and b/image/page_drink_n/bn_PEPSI_YUZU.png differ diff --git a/ui/lang.tsv b/ui/lang.tsv index 510d07e4..86c842d2 100644 --- a/ui/lang.tsv +++ b/ui/lang.tsv @@ -52,11 +52,11 @@ TextID Note English Thai China Japan Malaysia Font=Kanit,Type=Regular,Size=14,Color=0xEEEEEE,Align=Center Font=Kanit,Type=Regular,Size=14,Color=0xEEEEEE,Align=Center Font=Kanit,Type=Regular,Size=14,Color=0xEEEEEE,Align=Center Font=Kanit,Type=Regular,Size=14,Color=0xCFCFCF,Align=Center Font=Kanit,Type=Regular,Size=14,Color=0xCFCFCF,Align=Center Font=Kanit,Type=Regular,Size=14,Color=0xCFCFCF,Align=Center 000046 0% 0% 0% -000047 30% 30% 30% -000048 60% 60% 60% -000049 100% 100% 100% -000050 120% 120% 120% -000051 140% 140% 140% +000047 30% 30% 20% +000048 60% 60% 40% +000049 100% 100% 60% +000050 120% 120% 80% +000051 140% 140% 100% Font=Kanit,Type=Regular,Size=24,Color=0x513C2F,Align=Center Font=Kanit,Type=Regular,Size=24,Color=0x513C2F,Align=Center Font=Kanit,Type=Regular,Size=24,Color=0x513C2F,Align=Center Font=Kanit,Type=Bold,Size=24,Color=0x513C2F,Align=Center Font=Kanit,Type=Bold,Size=24,Color=0x513C2F,Align=Center Font=Kanit,Type=Bold,Size=24,Color=0x513C2F,Align=Center 000052 No added sugar ไม่ใส่น้ำตาล No added sugar diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index 1cc4b210..89eb2f6d 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -69,6 +69,12 @@ EndIf If BoxID = 172644 Then Var PepsiProEnable = 1 EndIf +If BoxID = 173149 Then + Var PepsiProEnable = 1 +EndIf +If BoxID = 172527 Then + Var PepsiProEnable = 1 +EndIf DEBUGVAR PepsiProEnable diff --git a/xml/page_board.xml b/xml/page_board.xml index cc3a1f4f..106f1970 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -681,6 +681,7 @@ Var VideoMainPage = "ROOT/taobin_project/video/main_page_en.mp4" Var img_press_main_page = "ROOT/taobin_project/image/main_page_en/bp_main_page_start.png" + Var ShowNetworkProblemText = "Network error. Payment Cash only." If Not#LanguageLoaded = "" Then LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/ui/lang.tsv" @@ -712,10 +713,10 @@ Var CountDownCheckCamera = 10 - DEBUGVAR EnableLiveness + ;DEBUGVAR EnableLiveness DEBUGVAR LivenessLicenseFailNumber - DEBUGVAR LivenessControlVersion - DEBUGVAR Not#CameraSettingStatus + ;DEBUGVAR LivenessControlVersion + ;DEBUGVAR Not#CameraSettingStatus RootLayoutVisible 3 "hide" diff --git a/xml/page_catalog_group_coffee.lxml b/xml/page_catalog_group_coffee.lxml index e63c38d6..9c70dccb 100644 --- a/xml/page_catalog_group_coffee.lxml +++ b/xml/page_catalog_group_coffee.lxml @@ -19624,7 +19624,7 @@ Var aliasDesc[2] = "-" Var aliasName[3] = "-" Var aliasDesc[3] = "-" - Var aliasName[4] = "LATTE PISANG TOKYO" + Var aliasName[4] = "LATTE PISANG\nTOKYO" Var aliasDesc[4] = "Espresso, Sirap Pisang Tokyo, Gula, Air" Var NameLang[0][0] = "Hot TOKYO BANANA \nLATTE" Var NameLang[0][1] = "ลาเต้โตเกียวบานาน่าร้อน" @@ -19707,7 +19707,7 @@ ลาเต้โตเกียวบานาน่า TOKYO BANANA \nLATTE ลาเต้โตเกียวบานาน่า - LATTE PISANG TOKYO + LATTE PISANG\nTOKYO ลาเต้โตเกียวบานาน่า @@ -19890,7 +19890,7 @@ Var aliasDesc[2] = "-" Var aliasName[3] = "-" Var aliasDesc[3] = "-" - Var aliasName[4] = "LATTE PISANG TOKYO" + Var aliasName[4] = "LATTE PISANG\nTOKYO" Var aliasDesc[4] = "Espresso, Sirap Pisang Tokyo, Gula, Air" Var NameLang[0][0] = "" Var NameLang[0][1] = "" @@ -19973,7 +19973,7 @@ ลาเต้โตเกียวบานาน่า TOKYO BANANA \nLATTE ลาเต้โตเกียวบานาน่า - LATTE PISANG TOKYO + LATTE PISANG\nTOKYO ลาเต้โตเกียวบานาน่า @@ -20156,7 +20156,7 @@ Var aliasDesc[2] = "-" Var aliasName[3] = "-" Var aliasDesc[3] = "-" - Var aliasName[4] = "LATTE CHAM TAIWAN" + Var aliasName[4] = "LATTE CHAM\nTAIWAN" Var aliasDesc[4] = "Espresso, Teh Taiwan, Susu, Gula" Var NameLang[0][0] = "Hot TAIWANESE TEACAFÉ LATTE" Var NameLang[0][1] = "กาแฟชานมไต้หวันร้อน" @@ -20239,7 +20239,7 @@ กาแฟชานมไต้หวัน TAIWANESE TEA\nCAFÉ LATTE กาแฟชานมไต้หวัน - LATTE CHAM TAIWAN + LATTE CHAM\nTAIWAN กาแฟชานมไต้หวัน @@ -20422,7 +20422,7 @@ Var aliasDesc[2] = "-" Var aliasName[3] = "-" Var aliasDesc[3] = "-" - Var aliasName[4] = "LATTE CHAM TAIWAN" + Var aliasName[4] = "LATTE CHAM\nTAIWAN" Var aliasDesc[4] = "Espresso, Teh Taiwan, Susu, Gula" Var NameLang[0][0] = "" Var NameLang[0][1] = "" @@ -20505,7 +20505,7 @@ กาแฟชานมไต้หวัน TAIWANESE TEA\nCAFÉ LATTE กาแฟชานมไต้หวัน - LATTE CHAM TAIWAN + LATTE CHAM\nTAIWAN กาแฟชานมไต้หวัน diff --git a/xml/page_catalog_group_health.lxml b/xml/page_catalog_group_health.lxml index 97a868dc..53f1c8db 100644 --- a/xml/page_catalog_group_health.lxml +++ b/xml/page_catalog_group_health.lxml @@ -4523,7 +4523,7 @@ Var aliasDesc[2] = "-" Var aliasName[3] = "-" Var aliasDesc[3] = "-" - Var aliasName[4] = "THE O'AIS \nLIMAU THAI" + Var aliasName[4] = "TEH O'AIS \nLIMAU THAI" Var aliasDesc[4] = "Teh Thai, Sirap Limau, Air" Var NameLang[0][0] = "Hot THAI TEA LIMENADE" Var NameLang[0][1] = "ชาดำมะนาวร้อน" @@ -4606,7 +4606,7 @@ ชาดำมะนาว THAI TEA \nLIMENADE ชาดำมะนาว - THE O'AIS \nLIMAU THAI + TEH O'AIS \nLIMAU THAI ชาดำมะนาว diff --git a/xml/page_catalog_group_milk.lxml b/xml/page_catalog_group_milk.lxml index e79f6535..e51203b7 100644 --- a/xml/page_catalog_group_milk.lxml +++ b/xml/page_catalog_group_milk.lxml @@ -3405,268 +3405,6 @@ center-vertical-horizontal - - ; ==================> Len = 3 - ; - - 12-03-03-0032 - - 33 - 22 - 225 - 296 - Flag( 12-03-03-0032.Button,$Sum1203030032) - - - 16 - 164 - 22 - 222 - "multi2" - KanitMediumTTF - 0x322B26 - - SUPER OREO \nVOLCANO - ซูเปอร์โอริภูเขาไฟ - SUPER OREO \nVOLCANO - ซูเปอร์โอริภูเขาไฟ - SUPER OREO VOLCANO - ซูเปอร์โอริภูเขาไฟ - - - - 16 - 220 - 14 - 222 - KanitMediumTTF - 0x6F5F51 - - Milk, Sugar, Oreo - นม น้ำตาล โอริโอ้ \n - Milk, Sugar, Oreo - นม น้ำตาล โอริโอ้ \n - Susu, Gula, Oreo - นม น้ำตาล โอริโอ้ \n - - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - "Invisible" - - - 113 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - $12-03-03-0032.Button - - - 174 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-03-0032.Button - StringFmt( $12-03-03-0032.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - Var ice_tab_process_show = "Invisible" - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum1203030032 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable - STRCONTAIN "ERR" $12-03-03-0032.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - "disable-show" - $Sum1203030032 - - 000013 - - center-vertical-horizontal - ; ==================> Len = 3 ; - - 12-03-03-0021 @@ -4495,7 +4233,7 @@ Var aliasDesc[2] = "-" Var aliasName[3] = "-" Var aliasDesc[3] = "-" - Var aliasName[4] = "SUSU PINK OREO VOLCANO" + Var aliasName[4] = "SUSU PINK\nOREO VOLCANO" Var aliasDesc[4] = "Sirap Salak, Susu, Gula, Oreo" Var NameLang[0][0] = "" Var NameLang[0][1] = "" @@ -4578,7 +4316,7 @@ นมชมพูปั่น\nโอริโอ้ภูเขาไฟ PINK MILK\nOREO VOLCANO นมชมพูปั่น\nโอริโอ้ภูเขาไฟ - SUSU PINK OREO VOLCANO + SUSU PINK\nOREO VOLCANO นมชมพูปั่น\nโอริโอ้ภูเขาไฟ @@ -5023,7 +4761,7 @@ Var aliasDesc[2] = "-" Var aliasName[3] = "-" Var aliasDesc[3] = "-" - Var aliasName[4] = "SUSU KOKO PISANG TOKYO" + Var aliasName[4] = "SUSU KOKO PISANG\nTOKYO" Var aliasDesc[4] = "Sirap Pisang Tokyo, Susu, Gula" Var NameLang[0][0] = "Hot Lychee MILK" Var NameLang[0][1] = "นมลิ้นจี่ร้อน" @@ -5106,7 +4844,7 @@ นมช็อกโกโตเกียว\nบานาน่า CHOCO TOKYO\nBANANA MILK นมช็อกโกโตเกียว\nบานาน่า - SUSU KOKO PISANG TOKYO + SUSU KOKO PISANG\nTOKYO นมช็อกโกโตเกียว\nบานาน่า @@ -5255,268 +4993,6 @@ center-vertical-horizontal - - ; ==================> Len = 3 - ; - - 12-03-03-0026 - - 33 - 22 - 225 - 296 - Flag( 12-03-03-0026.Button,$Sum1203030026) - - - 16 - 164 - 22 - 222 - "multi2" - KanitMediumTTF - 0x322B26 - - Pink milk\nOreo Vocalno - นมชมพูปั่น\nโอริโอ้ภูเขาไฟ - Pink milk\nOreo Vocalno - นมชมพูปั่น\nโอริโอ้ภูเขาไฟ - SUSU PINK OREO VOLCANO - นมชมพูปั่น\nโอริโอ้ภูเขาไฟ - - - - 16 - 220 - 14 - 222 - KanitMediumTTF - 0x6F5F51 - - Salak Syrup, Milk,\nSugar Oreo - น้ำแดงกลิ่นสละ นม น้ำตาล \n Oreo - Salak Syrup, Milk,\nSugar Oreo - น้ำแดงกลิ่นสละ นม น้ำตาล \n Oreo - Sirap Salak, Susu, Gula, Oreo - น้ำแดงกลิ่นสละ นม น้ำตาล \n Oreo - - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - "Invisible" - - - 113 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - $12-03-03-0026.Button - - - 174 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-03-0026.Button - StringFmt( $12-03-03-0026.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - Var ice_tab_process_show = "Invisible" - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum1203030026 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable - STRCONTAIN "ERR" $12-03-03-0026.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - "disable-show" - $Sum1203030026 - - 000013 - - center-vertical-horizontal - ; Cart diff --git a/xml/page_catalog_group_pepsi_pro.xml b/xml/page_catalog_group_pepsi_pro.xml index a9157c5b..2f4184fd 100644 --- a/xml/page_catalog_group_pepsi_pro.xml +++ b/xml/page_catalog_group_pepsi_pro.xml @@ -536,35 +536,35 @@ ; menu_new_list 9 ; ==================> Len = 11 - ; - 12-05-02-0046 - + ; - 12-99-02-0009 - 33 22 225 296 - Flag( 12-05-02-0046.Button,$Sum1205020046) + Flag( 12-99-02-0009.Button,$Sum1299020009) - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "น้ำแดงอยู่ข้างเป๊ปซี่นะคะ" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "เป๊ปซี่ น้ำเชื่อมสตรอเบอรี่ โซดา" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "HIGH-KEY" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Pepsi, Strawberry Syrup& Ice" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $12-05-02-0058.Button - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-05-02-0058.Button - StringFmt( $12-05-02-0058.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - Var ice_tab_process_show = "Invisible" - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum1205020058 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $12-05-02-0058.TAG tag2_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum1205020058 - text_unavailable - center-vertical-horizontal - - - ; - - - - ; ==================> Len = 11 - ; - 12-02-02-0048 - - - 33 - 22 - 225 - 296 - Flag( 12-02-02-0048.Button,$Sum1202020048) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "ชาดำครับจารย์" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "ชาไทย เป๊ปซี่" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "ON FLEEK" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Thai tea, Pepsi" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $12-02-02-0048.Button - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-02-02-0048.Button - StringFmt( $12-02-02-0048.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - Var ice_tab_process_show = "Invisible" - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum1202020048 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $12-02-02-0048.TAG tag2_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum1202020048 - text_unavailable - center-vertical-horizontal - - - ; - - - - ; ==================> Len = 11 - ; - 12-01-02-0056 - - - 33 - 22 - 225 - 296 - Flag( 12-01-02-0056.Button,$Sum1201020056) - + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เป๊ปซี่อยู่ข้างล่อนนะคะ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เป๊ปซี่ น้ำเชื่อมเมล่อน โซดา" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "DONT MESS +WITH MELON" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Pepsi, Melon Syrup& Ice" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-99-02-0005.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-99-02-0005.Button + StringFmt( $12-99-02-0005.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum1299020005 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-99-02-0005.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1299020005 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 11 + ; - 12-99-02-0004 - + + 33 + 22 + 225 + 296 + Flag( 12-99-02-0004.Button,$Sum1299020004) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เป๊ปซี่อย่าวีนบ๊วย" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เป๊ปซี่ น้ำเชื่อมบ๊วย โซดา " + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "SLAY TO YOUR +QUEEN" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Pepsi, Ume Syrup & Ice" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-99-02-0004.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-99-02-0004.Button + StringFmt( $12-99-02-0004.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum1299020004 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-99-02-0004.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1299020004 text_unavailable center-vertical-horizontal diff --git a/xml/page_catalog_group_recommend.lxml b/xml/page_catalog_group_recommend.lxml index 1d59e119..e51383d1 100644 --- a/xml/page_catalog_group_recommend.lxml +++ b/xml/page_catalog_group_recommend.lxml @@ -549,7 +549,7 @@ Var aliasDesc[2] = "-" Var aliasName[3] = "-" Var aliasDesc[3] = "-" - Var aliasName[4] = "Susu Pink Oreo Volcano" + Var aliasName[4] = "Susu Pink\nOreo Volcano" Var aliasDesc[4] = "Sirap Salak, Susu, Gula, Oreo" Var NameLang[0][0] = "" Var NameLang[0][1] = "" @@ -632,7 +632,7 @@ นมชมพูปั่น\nโอริโอ้ภูเขาไฟ Pink milk\nOreo Vocalno นมชมพูปั่น\nโอริโอ้ภูเขาไฟ - Susu Pink Oreo Volcano + Susu Pink\nOreo Volcano นมชมพูปั่น\nโอริโอ้ภูเขาไฟ @@ -9319,7 +9319,7 @@ Var aliasDesc[2] = "-" Var aliasName[3] = "-" Var aliasDesc[3] = "-" - Var aliasName[4] = "SMOOTHIE SUSU STRAWBERI" + Var aliasName[4] = "SMOOTHIE\nSUSU STRAWBERI" Var aliasDesc[4] = "Susu, Sirap Strawberi" Var NameLang[0][0] = "" Var NameLang[0][1] = "" @@ -9402,7 +9402,7 @@ นมสตอเบอร์รี่ปั่น STRAWMILK \nSMOOTHIE นมสตอเบอร์รี่ปั่น - SMOOTHIE SUSU STRAWBERI + SMOOTHIE\nSUSU STRAWBERI นมสตอเบอร์รี่ปั่น @@ -9847,7 +9847,7 @@ Var aliasDesc[2] = "-" Var aliasName[3] = "-" Var aliasDesc[3] = "-" - Var aliasName[4] = "SMOOTHIE OREO VOLCANO" + Var aliasName[4] = "SMOOTHIE\nOREO VOLCANO" Var aliasDesc[4] = "Susu, Gula, Oreo" Var NameLang[0][0] = "" Var NameLang[0][1] = "" @@ -9930,7 +9930,7 @@ โอริโอ้ปั่นภูเขาไฟ OREO SMOOTHIE \nVOLCANO โอริโอ้ปั่นภูเขาไฟ - SMOOTHIE OREO VOLCANO + SMOOTHIE\nOREO VOLCANO โอริโอ้ปั่นภูเขาไฟ @@ -10109,7 +10109,7 @@ Var aliasDesc[2] = "-" Var aliasName[3] = "-" Var aliasDesc[3] = "-" - Var aliasName[4] = "SMOOTHIE OVALTINE VOLCANO" + Var aliasName[4] = "SMOOTHIE\nOVALTINE VOLCANO" Var aliasDesc[4] = "Ovaltine, Gula, Susu" Var NameLang[0][0] = "" Var NameLang[0][1] = "" @@ -10192,7 +10192,7 @@ โอวัลตินปั่นภูเขาไฟ OVALTINE SMOOTHIE \nVOLCANO โอวัลตินปั่นภูเขาไฟ - SMOOTHIE OVALTINE VOLCANO + SMOOTHIE\nOVALTINE VOLCANO โอวัลตินปั่นภูเขาไฟ diff --git a/xml/page_catalog_group_tea.lxml b/xml/page_catalog_group_tea.lxml index 1acad1c0..b14ddeac 100644 --- a/xml/page_catalog_group_tea.lxml +++ b/xml/page_catalog_group_tea.lxml @@ -10380,7 +10380,7 @@ Var aliasDesc[2] = "-" Var aliasName[3] = "-" Var aliasDesc[3] = "-" - Var aliasName[4] = "THE O THAI LIMAU AIS" + Var aliasName[4] = "TEH O THAI LIMAU AIS" Var aliasDesc[4] = "Teh Thai, Sirap Limau, Air" Var NameLang[0][0] = "Hot THAI TEA LIMENADE" Var NameLang[0][1] = "ชาดำมะนาวร้อน" @@ -10463,7 +10463,7 @@ ชาดำมะนาว THAI TEA \nLIMENADE ชาดำมะนาว - THE O THAI LIMAU AIS + TEH O THAI LIMAU AIS ชาดำมะนาว diff --git a/xml/page_identity_verification.xml b/xml/page_identity_verification.xml index 0fa3f2a6..c1169608 100644 --- a/xml/page_identity_verification.xml +++ b/xml/page_identity_verification.xml @@ -488,6 +488,7 @@ DEBUGVAR SoundWavFileName DEBUGVAR PrevSoundWavFileName + If PrevSoundWavFileName = SoundWavFileName Then Else diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 29aef3b1..c2f656a5 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -228,28 +228,31 @@ If PepsiProEnable = 1 Then - If UserSelectProductCode = "12-05-02-0046" Then + If UserSelectProductCode = "12-99-02-0009" Then Var PromotionIDCurrentOrder = 5 EndIf - If UserSelectProductCode = "12-05-02-0047" Then + If UserSelectProductCode = "12-99-02-0002" Then Var PromotionIDCurrentOrder = 5 EndIf - If UserSelectProductCode = "12-05-02-0053" Then + If UserSelectProductCode = "12-99-02-0006" Then Var PromotionIDCurrentOrder = 5 EndIf - If UserSelectProductCode = "12-05-02-0054" Then + If UserSelectProductCode = "12-99-02-0007" Then Var PromotionIDCurrentOrder = 5 EndIf - If UserSelectProductCode = "12-05-02-0057" Then + If UserSelectProductCode = "12-99-02-0008" Then Var PromotionIDCurrentOrder = 5 EndIf - If UserSelectProductCode = "12-05-02-0058" Then + If UserSelectProductCode = "12-99-02-0001" Then Var PromotionIDCurrentOrder = 5 EndIf - If UserSelectProductCode = "12-02-02-0048" Then + If UserSelectProductCode = "12-99-02-0003" Then Var PromotionIDCurrentOrder = 5 EndIf - If UserSelectProductCode = "12-01-02-0056" Then + If UserSelectProductCode = "12-99-02-0005" Then + Var PromotionIDCurrentOrder = 5 + EndIf + If UserSelectProductCode = "12-99-02-0004" Then Var PromotionIDCurrentOrder = 5 EndIf