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

Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
wanlop run 2024-09-16 12:40:17 +07:00
commit 4ab0e1feeb
31 changed files with 198 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/before_member/bn_change_pass.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.2 KiB

BIN
image/before_member/bn_change_pass_en.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.1 KiB

BIN
image/before_member/bn_check_coupon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.8 KiB

BIN
image/before_member/bn_check_coupon_en.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.2 KiB

BIN
image/before_member/bn_topup_credit.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
image/before_member/bn_topup_credit_en.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.8 KiB

BIN
image/before_member/bp_change_pass.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.7 KiB

BIN
image/before_member/bp_change_pass_en.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
image/before_member/bp_check_coupon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9.5 KiB

BIN
image/before_member/bp_check_coupon_en.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.9 KiB

BIN
image/before_member/bp_topup_credit.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.3 KiB

BIN
image/before_member/bp_topup_credit_en.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.4 KiB

0
inter/uae_dubai/image/page_payment_cash/bn_pay_wtih_code.png → inter/uae_dubai/image/page_payment_cash/bn_pay_with_code.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

Before After
Before After

4
inter/uae_dubai/menu/lang.tsv
View file

@ -1018,7 +1018,7 @@ TextID Note English arabic
1300003 Beans module ชุดเมล็ดกาแฟ
1300004 Bean tray ถาดใส่เมล็ดกาแฟ
1300005 Switch tray : สวิตซ์ถาด :
1300006 Check tray shutter ตรวจสอบชัตเตอร์ของถาด
1300006 Check tray shutter ตรวจสอบชัตเตอร์ถาด
1300007 Pay beans จ่ายถั่ว
1300008 1. Select beans 1. เลือกเมล็ดกาแฟ
1300009 2. Select direction 2. เลือกทิศทาง
@ -1031,7 +1031,7 @@ TextID Note English arabic
1300016 Brew time:sec เวลาชง: วินาที
1300017 Test grind sizes ทดสอบขนาดบด
1300018 Coffee module type : ประเภทชุดกาแฟ :
1300019 1. Select grind sizes 1. เลือกขนาดบด
1300019 1. Select grind sizes 1. เลือกขนาดการบด
1300020 More coarse หยาบขึ้น
1300021 More fine ละเอียดขึ้น
1300022 2. Test grinding 2. ทดสอบการบด

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

14
inter/uae_dubai/xml/page_catalog_group_coffee.lxml
View file

@ -3469,7 +3469,7 @@
Var NameLang[0][4] = ""
Var NameLang[0][5] = ""
Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
Var DescLang[0][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[0][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[0][2] = ""
Var DescLang[0][3] = ""
Var DescLang[0][4] = ""
@ -6755,7 +6755,7 @@
Var DescLang[0][4] = ""
Var DescLang[0][5] = ""
Var NameLang[1][0] = "MANDARINE \nIced AMERICANO"
Var NameLang[1][1] = "مندرين \nأمريكان مثلج"
Var NameLang[1][1] = "مندرين \nأمريكانو مثلج"
Var NameLang[1][2] = ""
Var NameLang[1][3] = ""
Var NameLang[1][4] = ""
@ -7023,7 +7023,7 @@
Var NameLang[0][4] = ""
Var NameLang[0][5] = ""
Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
Var DescLang[0][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[0][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[0][2] = ""
Var DescLang[0][3] = ""
Var DescLang[0][4] = ""
@ -7035,7 +7035,7 @@
Var NameLang[1][4] = ""
Var NameLang[1][5] = ""
Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
Var DescLang[1][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[1][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[1][2] = ""
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""
@ -10311,7 +10311,7 @@
Var NameLang[1][4] = ""
Var NameLang[1][5] = ""
Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
Var DescLang[1][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[1][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[1][2] = ""
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""
@ -14645,7 +14645,7 @@
Var DescLang[0][4] = ""
Var DescLang[0][5] = ""
Var NameLang[1][0] = "Iced MOCHA"
Var NameLang[1][1] = "موكا مثلجة"
Var NameLang[1][1] = "موكا مثلج"
Var NameLang[1][2] = ""
Var NameLang[1][3] = ""
Var NameLang[1][4] = ""
@ -18219,7 +18219,7 @@
Var DescLang[1][4] = ""
Var DescLang[1][5] = ""
Var NameLang[2][0] = "THAI TEA CAFÉ LATTE SMOOTHIE"
Var NameLang[2][1] = "عصير الشاي التايلاندي والقهوة واللاتيه"
Var NameLang[2][1] = "شاي تاي كافيه لاتيه سموثي"
Var NameLang[2][2] = ""
Var NameLang[2][3] = ""
Var NameLang[2][4] = ""

10
inter/uae_dubai/xml/page_catalog_group_health.lxml
View file

@ -1828,7 +1828,7 @@
Var DescLang[0][4] = ""
Var DescLang[0][5] = ""
Var NameLang[1][0] = "Iced MOCHA"
Var NameLang[1][1] = "موكا مثلجة"
Var NameLang[1][1] = "موكا مثلج"
Var NameLang[1][2] = ""
Var NameLang[1][3] = ""
Var NameLang[1][4] = ""
@ -2102,7 +2102,7 @@
Var DescLang[0][4] = ""
Var DescLang[0][5] = ""
Var NameLang[1][0] = "Iced MOCHA"
Var NameLang[1][1] = "موكا مثلجة"
Var NameLang[1][1] = "موكا مثلج"
Var NameLang[1][2] = ""
Var NameLang[1][3] = ""
Var NameLang[1][4] = ""
@ -5384,7 +5384,7 @@
Var NameLang[0][4] = ""
Var NameLang[0][5] = ""
Var DescLang[0][0] = "Taiwan tea, Limenade, Water, and Ice"
Var DescLang[0][1] = "شاي تايوان، ليمون، ماء وثلج"
Var DescLang[0][1] = "شاي تايوان والليمون والماء والثلج"
Var DescLang[0][2] = ""
Var DescLang[0][3] = ""
Var DescLang[0][4] = ""
@ -5396,7 +5396,7 @@
Var NameLang[1][4] = ""
Var NameLang[1][5] = ""
Var DescLang[1][0] = "Taiwan tea, Limenade, Water, and Ice"
Var DescLang[1][1] = "شاي تايوان، ليمون، ماء وثلج"
Var DescLang[1][1] = "شاي تايوان والليمون والماء والثلج"
Var DescLang[1][2] = ""
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""
@ -7040,7 +7040,7 @@
Var NameLang[1][4] = ""
Var NameLang[1][5] = ""
Var DescLang[1][0] = "Thai tea, Limenade, Water, Ice"
Var DescLang[1][1] = "شاي تايلاندي، ليمون، ماء، ثلج"
Var DescLang[1][1] = "الشاي التايلاندي، الليمونيد، الماء، الثلج"
Var DescLang[1][2] = ""
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""

92
inter/uae_dubai/xml/page_catalog_group_other.lxml
View file

@ -955,15 +955,15 @@
</Text>
</Block>
; ==================> Len = 3
; - 53-05-02-0062 53-05-03-0062
; - 53-05-02-0062 -
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 53-05-02-0062.Button,53-05-03-0062.Button,$Sum53050200625305030062) </State>
<State> Flag( 53-05-02-0062.Button,$Sum5305020062) </State>
<Button>
<State> $Sum53050200625305030062 </State>
<State> $Sum5305020062 </State>
<Filename> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_n//bn_iced_pepsi_Black.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_press_n//bn_iced_pepsi_Black.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_disable_n2//bn_iced_pepsi_Black.png" </FilenameDisable>
@ -974,10 +974,10 @@
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD2 = $53-05-02-0062.Price
Var PriceD3 = $53-05-03-0062.Price
Var PriceD3 = $-.Price
Var PD_CODE1 = "##-##-##-####"
Var PD_CODE2 = "53-05-02-0062"
Var PD_CODE3 = "53-05-03-0062"
Var PD_CODE3 = "##-##-##-####"
; begin lang
Var aliasName[0] = "PEPSI Black"
Var aliasDesc[0] = "Pepsi Black, Ice"
@ -1015,13 +1015,13 @@
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""
Var DescLang[1][5] = ""
Var NameLang[2][0] = "PEPSI Black Smoothie"
Var NameLang[2][0] = ""
Var NameLang[2][1] = ""
Var NameLang[2][2] = ""
Var NameLang[2][3] = ""
Var NameLang[2][4] = ""
Var NameLang[2][5] = ""
Var DescLang[2][0] = "Pepsi, Ice"
Var DescLang[2][0] = ""
Var DescLang[2][1] = ""
Var DescLang[2][2] = ""
Var DescLang[2][3] = ""
@ -1030,7 +1030,7 @@
; end lang
Var PD_STAGE_1 = "Disable2"
Var PD_STAGE_2 = $53-05-02-0062.Button
Var PD_STAGE_3 = $53-05-03-0062.Button
Var PD_STAGE_3 = "Disable2"
Var SelectCountDrinkType = 0
Var DefaultDrinkType = 0
If PD_STAGE_1 = "Enable" Then
@ -1051,7 +1051,7 @@
If PD_STAGE_1 = "Enable" Then
Topping "Load" "-"
Else
Topping "Load" "53-05-03-0062"
Topping "Load" "-"
EndIf
EndIf
@ -1144,7 +1144,7 @@
<Y> 264 </Y>
<Filename> Var( DirImage2 + "blend.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
<State> $53-05-03-0062.Button </State>
<State> "Invisible" </State>
</Image>
<Text>
<X> TextPriceMenuBlendX </X>
@ -1154,8 +1154,8 @@
<Font> KanitRegularTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> $53-05-03-0062.Button </State>
<Value> StringFmt( $53-05-03-0062.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
<State> "Invisible" </State>
<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text>
<Image>
<X> 81 </X>
@ -1180,10 +1180,10 @@
<Y> 117 </Y>
<State>
eval(
If $Sum53050200625305030062 = "Disable" Then
If $Sum5305020062 = "Disable" Then
STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
STRCONTAIN "ERR" $53-05-02-0062.TAG tag2_is_disable
STRCONTAIN "ERR" $53-05-03-0062.TAG tag3_is_disable
STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
Var return = "Invisible"
If tag1_is_disable = "true" Then
Var return = "Enable"
@ -1217,7 +1217,7 @@
<Width>128</Width>
<Height>64</Height>
<Mode> "disable-show" </Mode>
<State> $Sum53050200625305030062 </State>
<State> $Sum5305020062 </State>
<Language>
<ID> 000013 </ID>
</Language>
@ -5870,7 +5870,7 @@
Var NameLang[1][4] = ""
Var NameLang[1][5] = ""
Var DescLang[1][0] = "Pepsi, Banana Syrup& Ice"
Var DescLang[1][1] = "بيبسي، شراب موز و ثلج"
Var DescLang[1][1] = "بيبسي، شراب الموز والثلج"
Var DescLang[1][2] = ""
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""
@ -6085,15 +6085,15 @@
</Text>
</Block>
; ==================> Len = 3
; - 53-05-02-0074 53-05-03-0074
; - 53-05-02-0074 -
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 53-05-02-0074.Button,53-05-03-0074.Button,$Sum53050200745305030074) </State>
<State> Flag( 53-05-02-0074.Button,$Sum5305020074) </State>
<Button>
<State> $Sum53050200745305030074 </State>
<State> $Sum5305020074 </State>
<Filename> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_n//bn_iced_pepsi_plum.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_press_n//bn_iced_pepsi_plum.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_disable_n2//bn_iced_pepsi_plum.png" </FilenameDisable>
@ -6104,10 +6104,10 @@
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD2 = $53-05-02-0074.Price
Var PriceD3 = $53-05-03-0074.Price
Var PriceD3 = $-.Price
Var PD_CODE1 = "##-##-##-####"
Var PD_CODE2 = "53-05-02-0074"
Var PD_CODE3 = "53-05-03-0074"
Var PD_CODE3 = "##-##-##-####"
; begin lang
Var aliasName[0] = "PEPSI Black PLUM"
Var aliasDesc[0] = "Pepsi Black, Ume Syrup & Ice"
@ -6145,13 +6145,13 @@
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""
Var DescLang[1][5] = ""
Var NameLang[2][0] = "PEPSI Black PLUM Smoothie"
Var NameLang[2][0] = ""
Var NameLang[2][1] = ""
Var NameLang[2][2] = ""
Var NameLang[2][3] = ""
Var NameLang[2][4] = ""
Var NameLang[2][5] = ""
Var DescLang[2][0] = "Pepsi Black, Ume Syrup & Ice"
Var DescLang[2][0] = ""
Var DescLang[2][1] = ""
Var DescLang[2][2] = ""
Var DescLang[2][3] = ""
@ -6160,7 +6160,7 @@
; end lang
Var PD_STAGE_1 = "Disable2"
Var PD_STAGE_2 = $53-05-02-0074.Button
Var PD_STAGE_3 = $53-05-03-0074.Button
Var PD_STAGE_3 = "Disable2"
Var SelectCountDrinkType = 0
Var DefaultDrinkType = 0
If PD_STAGE_1 = "Enable" Then
@ -6181,7 +6181,7 @@
If PD_STAGE_1 = "Enable" Then
Topping "Load" "-"
Else
Topping "Load" "53-05-03-0074"
Topping "Load" "-"
EndIf
EndIf
@ -6274,7 +6274,7 @@
<Y> 264 </Y>
<Filename> Var( DirImage2 + "blend.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
<State> $53-05-03-0074.Button </State>
<State> "Invisible" </State>
</Image>
<Text>
<X> TextPriceMenuBlendX </X>
@ -6284,8 +6284,8 @@
<Font> KanitRegularTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> $53-05-03-0074.Button </State>
<Value> StringFmt( $53-05-03-0074.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
<State> "Invisible" </State>
<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text>
<Image>
<X> 81 </X>
@ -6310,10 +6310,10 @@
<Y> 117 </Y>
<State>
eval(
If $Sum53050200745305030074 = "Disable" Then
If $Sum5305020074 = "Disable" Then
STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
STRCONTAIN "ERR" $53-05-02-0074.TAG tag2_is_disable
STRCONTAIN "ERR" $53-05-03-0074.TAG tag3_is_disable
STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
Var return = "Invisible"
If tag1_is_disable = "true" Then
Var return = "Enable"
@ -6347,7 +6347,7 @@
<Width>128</Width>
<Height>64</Height>
<Mode> "disable-show" </Mode>
<State> $Sum53050200745305030074 </State>
<State> $Sum5305020074 </State>
<Language>
<ID> 000013 </ID>
</Language>
@ -6355,15 +6355,15 @@
</Text>
</Block>
; ==================> Len = 3
; - 53-05-02-0075 53-05-03-0075
; - 53-05-02-0075 -
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 53-05-02-0075.Button,53-05-03-0075.Button,$Sum53050200755305030075) </State>
<State> Flag( 53-05-02-0075.Button,$Sum5305020075) </State>
<Button>
<State> $Sum53050200755305030075 </State>
<State> $Sum5305020075 </State>
<Filename> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_n//bn_iced_pepsi_Melon.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_press_n//bn_iced_pepsi_Melon.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_disable_n2//bn_iced_pepsi_Melon.png" </FilenameDisable>
@ -6374,10 +6374,10 @@
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD2 = $53-05-02-0075.Price
Var PriceD3 = $53-05-03-0075.Price
Var PriceD3 = $-.Price
Var PD_CODE1 = "##-##-##-####"
Var PD_CODE2 = "53-05-02-0075"
Var PD_CODE3 = "53-05-03-0075"
Var PD_CODE3 = "##-##-##-####"
; begin lang
Var aliasName[0] = "PEPSI Black MELON"
Var aliasDesc[0] = "Pepsi Black, Melon Syrup& Ice"
@ -6415,13 +6415,13 @@
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""
Var DescLang[1][5] = ""
Var NameLang[2][0] = "PEPSI Black MELON Smoothie"
Var NameLang[2][0] = ""
Var NameLang[2][1] = ""
Var NameLang[2][2] = ""
Var NameLang[2][3] = ""
Var NameLang[2][4] = ""
Var NameLang[2][5] = ""
Var DescLang[2][0] = "Pepsi Black, Melon Syrup& Ice"
Var DescLang[2][0] = ""
Var DescLang[2][1] = ""
Var DescLang[2][2] = ""
Var DescLang[2][3] = ""
@ -6430,7 +6430,7 @@
; end lang
Var PD_STAGE_1 = "Disable2"
Var PD_STAGE_2 = $53-05-02-0075.Button
Var PD_STAGE_3 = $53-05-03-0075.Button
Var PD_STAGE_3 = "Disable2"
Var SelectCountDrinkType = 0
Var DefaultDrinkType = 0
If PD_STAGE_1 = "Enable" Then
@ -6451,7 +6451,7 @@
If PD_STAGE_1 = "Enable" Then
Topping "Load" "-"
Else
Topping "Load" "53-05-03-0075"
Topping "Load" "-"
EndIf
EndIf
@ -6544,7 +6544,7 @@
<Y> 264 </Y>
<Filename> Var( DirImage2 + "blend.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
<State> $53-05-03-0075.Button </State>
<State> "Invisible" </State>
</Image>
<Text>
<X> TextPriceMenuBlendX </X>
@ -6554,8 +6554,8 @@
<Font> KanitRegularTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> $53-05-03-0075.Button </State>
<Value> StringFmt( $53-05-03-0075.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
<State> "Invisible" </State>
<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text>
<Image>
<X> 81 </X>
@ -6580,10 +6580,10 @@
<Y> 117 </Y>
<State>
eval(
If $Sum53050200755305030075 = "Disable" Then
If $Sum5305020075 = "Disable" Then
STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
STRCONTAIN "ERR" $53-05-02-0075.TAG tag2_is_disable
STRCONTAIN "ERR" $53-05-03-0075.TAG tag3_is_disable
STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
Var return = "Invisible"
If tag1_is_disable = "true" Then
Var return = "Enable"
@ -6617,7 +6617,7 @@
<Width>128</Width>
<Height>64</Height>
<Mode> "disable-show" </Mode>
<State> $Sum53050200755305030075 </State>
<State> $Sum5305020075 </State>
<Language>
<ID> 000013 </ID>
</Language>

6
inter/uae_dubai/xml/page_catalog_group_recommend.lxml
View file

@ -6201,7 +6201,7 @@
Var DescLang[0][4] = ""
Var DescLang[0][5] = ""
Var NameLang[1][0] = "MANDARINE \nIced AMERICANO"
Var NameLang[1][1] = "مندرين \nأمريكان مثلج"
Var NameLang[1][1] = "مندرين \nأمريكانو مثلج"
Var NameLang[1][2] = ""
Var NameLang[1][3] = ""
Var NameLang[1][4] = ""
@ -6469,7 +6469,7 @@
Var NameLang[0][4] = ""
Var NameLang[0][5] = ""
Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
Var DescLang[0][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[0][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[0][2] = ""
Var DescLang[0][3] = ""
Var DescLang[0][4] = ""
@ -6481,7 +6481,7 @@
Var NameLang[1][4] = ""
Var NameLang[1][5] = ""
Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
Var DescLang[1][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[1][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[1][2] = ""
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""

6
inter/uae_dubai/xml/page_catalog_group_recommend_multi_pro.lxml
View file

@ -5582,7 +5582,7 @@
Var DescLang[0][4] = ""
Var DescLang[0][5] = ""
Var NameLang[1][0] = "MANDARINE \nIced AMERICANO"
Var NameLang[1][1] = "مندرين \nأمريكان مثلج"
Var NameLang[1][1] = "مندرين \nأمريكانو مثلج"
Var NameLang[1][2] = ""
Var NameLang[1][3] = ""
Var NameLang[1][4] = ""
@ -5850,7 +5850,7 @@
Var NameLang[0][4] = ""
Var NameLang[0][5] = ""
Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
Var DescLang[0][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[0][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[0][2] = ""
Var DescLang[0][3] = ""
Var DescLang[0][4] = ""
@ -5862,7 +5862,7 @@
Var NameLang[1][4] = ""
Var NameLang[1][5] = ""
Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
Var DescLang[1][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[1][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[1][2] = ""
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""

10
inter/uae_dubai/xml/page_catalog_group_tea.lxml
View file

@ -2923,7 +2923,7 @@
Var NameLang[0][4] = ""
Var NameLang[0][5] = ""
Var DescLang[0][0] = "Thai Tea, Limenade, Sugar & Water"
Var DescLang[0][1] = "الشاي التايلاندي والليمون والسكر والماء"
Var DescLang[0][1] = "شاي تايلاندي، ليمون، سكر وماء"
Var DescLang[0][2] = ""
Var DescLang[0][3] = ""
Var DescLang[0][4] = ""
@ -2935,7 +2935,7 @@
Var NameLang[1][4] = ""
Var NameLang[1][5] = ""
Var DescLang[1][0] = "Thai Tea, Limenade, Sugar & Water"
Var DescLang[1][1] = "الشاي التايلاندي والليمون والسكر والماء"
Var DescLang[1][1] = "شاي تايلاندي، ليمون، سكر وماء"
Var DescLang[1][2] = ""
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""
@ -2947,7 +2947,7 @@
Var NameLang[2][4] = ""
Var NameLang[2][5] = ""
Var DescLang[2][0] = "Thai Tea, Limenade, Sugar & Water"
Var DescLang[2][1] = "الشاي التايلاندي والليمون والسكر والماء"
Var DescLang[2][1] = "شاي تايلاندي، ليمون، سكر وماء"
Var DescLang[2][2] = ""
Var DescLang[2][3] = ""
Var DescLang[2][4] = ""
@ -11143,7 +11143,7 @@
Var NameLang[0][4] = ""
Var NameLang[0][5] = ""
Var DescLang[0][0] = "Taiwan tea, Limenade, Water, and Ice"
Var DescLang[0][1] = "شاي تايوان، ليمون، ماء وثلج"
Var DescLang[0][1] = "شاي تايوان والليمون والماء والثلج"
Var DescLang[0][2] = ""
Var DescLang[0][3] = ""
Var DescLang[0][4] = ""
@ -11155,7 +11155,7 @@
Var NameLang[1][4] = ""
Var NameLang[1][5] = ""
Var DescLang[1][0] = "Taiwan tea, Limenade, Water, and Ice"
Var DescLang[1][1] = "شاي تايوان، ليمون، ماء وثلج"
Var DescLang[1][1] = "شاي تايوان والليمون والماء والثلج"
Var DescLang[1][2] = ""
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""

4
inter/uae_dubai/xml/page_topping_select6.lxml
View file

@ -485,7 +485,6 @@
Var topping_shot_price_x = 630
Var text_x_add_oreo_price = 510
Var text_show_normal_x = 408
Var text_show_blend_x = 872
Var text_milk_choice_price_x = 265
Var SugarZeroCalPrice_X = 540
@ -498,7 +497,6 @@
Var topping_shot_price_x = 630
Var text_x_add_oreo_price = 600
Var text_show_normal_x = 528
Var text_show_blend_x = 872
Var text_milk_choice_price_x = 295
Var SugarZeroCalPrice_X = 540
EndIf
@ -1773,7 +1771,7 @@
; x for blend rng.
<Text>
<X> text_show_blend_x </X>
<X> 860 </X>
<Y> 85 </Y>
<Font> KanitRegularTTF </Font>
<Size> 23 </Size>

33
xml/page_before_check_member.xml
View file

@ -9,6 +9,7 @@
Var OpenTopupCredit = 0
Var OpenCheckCoupon = 0
Var ChangeMemberPassword = 0
; Default language (Thai).
@ -95,12 +96,14 @@
<Button>
<X> 286 </X>
<Y> 824 </Y>
<Filename> Var( "ROOT/taobin_project/image/event/lucky_draw_ads/bn_topup_credit" + Extension ) </Filename>
<FilenamePress> Var( "ROOT/taobin_project/image/event/lucky_draw_ads/bp_topup_credit" + Extension ) </FilenamePress>
<FilenameDisable> Var( "ROOT/taobin_project/image/event/lucky_draw_ads/bp_topup_credit" + Extension ) </FilenameDisable>
<Filename> Var( "ROOT/taobin_project/image/before_member/bn_topup_credit" + Extension ) </Filename>
<FilenamePress> Var( "ROOT/taobin_project/image/before_member/bp_topup_credit" + Extension ) </FilenamePress>
<FilenameDisable> Var( "ROOT/taobin_project/image/before_member/bp_topup_credit" + Extension ) </FilenameDisable>
<EventClick>
Var OpenTopupCredit = 1
Var CheckMemberTitleTH = "กรุณาใส่เบอร์มือถือ\nเพื่อเติมเต่าบินเครดิต"
Var CheckMemberTitleEN = "Please enter your mobile number\nto topup Tao bin credit."
Open "ROOT/taobin_project/xml/page_check_member.xml"
</EventClick>
@ -109,12 +112,30 @@
<Button>
<X> 286 </X>
<Y> 976 </Y>
<Filename> Var( "ROOT/taobin_project/image/event/lucky_draw_ads/bn_check_coupon" + Extension ) </Filename>
<FilenamePress> Var( "ROOT/taobin_project/image/event/lucky_draw_ads/bp_check_coupon" + Extension ) </FilenamePress>
<FilenameDisable> Var( "ROOT/taobin_project/image/event/lucky_draw_ads/bp_check_coupon" + Extension ) </FilenameDisable>
<Filename> Var( "ROOT/taobin_project/image/before_member/bn_check_coupon" + Extension ) </Filename>
<FilenamePress> Var( "ROOT/taobin_project/image/before_member/bp_check_coupon" + Extension ) </FilenamePress>
<FilenameDisable> Var( "ROOT/taobin_project/image/before_member/bp_check_coupon" + Extension ) </FilenameDisable>
<EventClick>
Var OpenCheckCoupon = 1
Var CheckMemberTitleTH = "กรุณาใส่เบอร์มือถือ\nเพื่อเช็กคะแนนสะสมของคุณ"
Var CheckMemberTitleEN = "Please enter your mobile number\nto check reward point."
Open "ROOT/taobin_project/xml/page_check_member.xml"
</EventClick>
</Button>
<Button>
<X> 286 </X>
<Y> 1128 </Y>
<Filename> Var( "ROOT/taobin_project/image/before_member/bn_change_pass" + Extension ) </Filename>
<FilenamePress> Var( "ROOT/taobin_project/image/before_member/bp_change_pass" + Extension ) </FilenamePress>
<FilenameDisable> Var( "ROOT/taobin_project/image/before_member/bp_change_pass" + Extension ) </FilenameDisable>
<EventClick>
Var ChangeMemberPassword = 1
Var CheckMemberTitleTH = "กรุณาใส่เบอร์มือถือ\nเพื่อเปลี่ยนรหัสผ่าน"
Var CheckMemberTitleEN = "Please enter your mobile number\nto change password."
Open "ROOT/taobin_project/xml/page_check_member.xml"
</EventClick>

50
xml/page_check_member.xml
View file

@ -24,21 +24,25 @@
If show_eng = "true" Then
Var CheckMemberTitle = CheckMemberTitleEN
Var DirImage = "ROOT/taobin_project/image/collectiing_en"
Var Xtext19 = 154
Else
Var DirImage = "ROOT/taobin_project/image/collectiing"
EndIf
If show_eng = "true" Then
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_enter_your_mobile_to_credit_balance.mp3"
Else
Var CheckMemberTitle = CheckMemberTitleTH
Var DirImage = "ROOT/taobin_project/image/collectiing"
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_enter_your_mobile_to_credit_balance.mp3"
EndIf
@ -50,12 +54,6 @@
Var TaobinCredit = 0
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_enter_your_mobile_to_credit_balance.mp3"
Else
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_enter_your_mobile_to_credit_balance.mp3"
EndIf
Var show_eng_button_stage = "Enable"
;inter-max-number
@ -191,6 +189,11 @@
;Open "ROOT/taobin_project/xml/page_check_member1.xml"
If Ext1a = "ok" Then
If ChangeMemberPassword = 1 Then
Open "ROOT/taobin_project/xml/page_payment_changePin1.xml"
EndIf
Open "ROOT/taobin_project/xml/page_check_member1.xml"
Else
If Ext1a = "new customer" Then
@ -632,11 +635,22 @@
<Image>
<X> Xtext19 </X>
<Y> 521 </Y>
<Filename> Var( DirImage + "/text_19.png" )</Filename>
</Image>
;<Image>
;<X> Xtext19 </X>
;<Y> 521 </Y>
;<Filename> Var( DirImage + "/text_19.png" )</Filename>
;</Image>
<Text>
<X> 0 </X>
<Y> 521 </Y>
<Width> 1080 </Width>
<Align> Center </Align>
<Font> KanitRegularTTF </Font>
<Color> 0x513C2F </Color>
<Size> 51 </Size>
<Value> CheckMemberTitle </Value>
</Text>
<Image>
<X> 430 </X>

4
xml/page_payment_cash-UAE.xml
View file

@ -384,6 +384,10 @@
Var SELLONLINE = 1
EndIf
If IgnoreNetCore = "true" Then
Var SELLONLINE = 1
EndIf
If SELLONLINE = 0 Then
SAVELOG "Cash only NetworkStatus down"

6
xml/page_payment_changePin1.xml
View file

@ -738,7 +738,11 @@
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_check_member2.xml"
If ChangeMemberPassword = 1 Then
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
Else
Open "ROOT/taobin_project/xml/page_check_member2.xml"
EndIf
</EventClick>
</Button>

12
xml/page_payment_changePin2.xml
View file

@ -52,7 +52,11 @@
Var Timeout = Timeout + 1
If Timeout > 30 Then
If ReqFlag = 0 Then
Open "ROOT/taobin_project/xml/page_check_member2.xml"
If ChangeMemberPassword = 1 Then
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
Else
Open "ROOT/taobin_project/xml/page_check_member2.xml"
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_payment_changePinFailed.xml"
EndIf
@ -750,7 +754,11 @@
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_check_member2.xml"
If ChangeMemberPassword = 1 Then
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
Else
Open "ROOT/taobin_project/xml/page_check_member2.xml"
EndIf
</EventClick>
</Button>

12
xml/page_payment_changePinFailed.xml
View file

@ -29,7 +29,11 @@
Var Timeout = Timeout + 1
If Timeout > 30 Then
Open "ROOT/taobin_project/xml/page_check_member2.xml"
If ChangeMemberPassword = 1 Then
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
Else
Open "ROOT/taobin_project/xml/page_check_member2.xml"
EndIf
EndIf
TimerReset
@ -103,7 +107,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_check_member2.xml"
If ChangeMemberPassword = 1 Then
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
Else
Open "ROOT/taobin_project/xml/page_check_member2.xml"
EndIf
</EventClick>
</Button>

12
xml/page_payment_changePinSMS.xml
View file

@ -40,7 +40,11 @@
If PinSMSFlag = 1 Then
Open "ROOT/taobin_project/xml/page_check_member1.xml"
Else
Open "ROOT/taobin_project/xml/page_check_member2.xml"
If ChangeMemberPassword = 1 Then
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
Else
Open "ROOT/taobin_project/xml/page_check_member2.xml"
EndIf
EndIf
EndIf
@ -105,7 +109,11 @@
If PinSMSFlag = 1 Then
Open "ROOT/taobin_project/xml/page_check_member1.xml"
Else
Open "ROOT/taobin_project/xml/page_check_member2.xml"
If ChangeMemberPassword = 1 Then
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
Else
Open "ROOT/taobin_project/xml/page_check_member2.xml"
EndIf
EndIf
</EventClick>
</Button>

12
xml/page_payment_changePinSuccess.xml
View file

@ -29,7 +29,11 @@
Var Timeout = Timeout + 1
If Timeout > 30 Then
Open "ROOT/taobin_project/xml/page_check_member2.xml"
If ChangeMemberPassword = 1 Then
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
Else
Open "ROOT/taobin_project/xml/page_check_member2.xml"
EndIf
EndIf
TimerReset
@ -101,7 +105,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_check_member2.xml"
If ChangeMemberPassword = 1 Then
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
Else
Open "ROOT/taobin_project/xml/page_check_member2.xml"
EndIf
</EventClick>
</Button>

7
xml/page_payment_credit.xml
View file

@ -633,7 +633,12 @@
Var Tel2DFlag = 0
TRY "ROOT/taobin_project/xml/verify_number.ev"
If InternationalEnable = 1 Then
Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev"
TRY verifyNumberEV
Else
TRY "ROOT/taobin_project/xml/verify_number.ev"
EndIf
If Tel2DFlag = 1 Then

12
xml/page_show_error.lxml
View file

@ -213,6 +213,9 @@
If LanguageShow = "MALAY" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If LanguageShow = "UAE_DUBAI" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
EndIf
If NeedUpgrade = "true" Then
@ -231,6 +234,9 @@
If LanguageShow = "MALAY" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If LanguageShow = "UAE_DUBAI" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
EndIf
DEBUGVAR MachineStage
@ -253,6 +259,9 @@
If LanguageShow = "MALAY" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If LanguageShow = "UAE_DUBAI" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
Else
Var show_error_normal = "Enable"
Var show_error_sp1 = "Invisible"
@ -272,6 +281,9 @@
If LanguageShow = "MALAY" Then
Var DirImage = CountryRootPath + "image/close_en"
EndIf
If LanguageShow = "UAE_DUBAI" Then
Var DirImage = CountryRootPath + "image/close_en"
EndIf
EndIf
EndIf