Merge branch 'masterpiece' into sgp_blue

This commit is contained in:
Pakin 2024-09-16 17:19:08 +07:00
commit 84445e1be4
78 changed files with 15546 additions and 492 deletions

View file

@ -1,6 +1,6 @@
normal_eng=ROOT/taobin_project/inter/mys/image/event/bn_MerdekaPromotionPepsi1.png
normal_thai=ROOT/taobin_project/inter/mys/image/event/bn_MerdekaPromotionPepsi1.png
press_eng=ROOT/taobin_project/inter/mys/image/event/bn_MerdekaPromotionPepsi1.png
press_thai=ROOT/taobin_project/inter/mys/image/event/bn_MerdekaPromotionPepsi1.png
disable_eng=ROOT/taobin_project/inter/mys/image/event/bd_MerdekaPromotionPepsi1.png
disable_thai=ROOT/taobin_project/inter/mys/image/event/bd_MerdekaPromotionPepsi1.png
normal_eng=ROOT/taobin_project/inter/mys/image/event/pro_yuzu_250/pro_yuzu_250.png
normal_thai=ROOT/taobin_project/inter/mys/image/event/pro_yuzu_250/pro_yuzu_250.png
press_eng=ROOT/taobin_project/inter/mys/image/event/pro_yuzu_250/pro_yuzu_250.png
press_thai=ROOT/taobin_project/inter/mys/image/event/pro_yuzu_250/pro_yuzu_250.png
disable_eng=ROOT/taobin_project/inter/mys/image/event/pro_yuzu_250/pro_yuzu_250.png
disable_thai=ROOT/taobin_project/inter/mys/image/event/pro_yuzu_250/pro_yuzu_250.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 273 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 9.2 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 9.3 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 9.3 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

View file

@ -0,0 +1,33 @@
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/mys/xml/event/tricker.ev"
Var XMLProfilePreEvent = XMLProfile
DEBUGVAR XMLProfile
STRCONTAIN "PromoYuzu250" XMLProfile HasProYuzu250Concat
STRCONTAIN "PromoReduced" XMLProfile IsProfileReduce
DEBUGVAR HasProYuzu250Concat
DEBUGVAR ProReducedPriceEnable
DEBUGVAR ProYuzu250Enable
If ProReducedPriceEnable = 1 Then
Else
; case-pro-reduce-end
If ProYuzu250Enable = 1 Then
; concat-profile
If HasProYuzu250Concat = "true" Then
Else
If IsProfileReduce = "true" Then
Else
CacheVarStr "put" XMLProfilePreEvent
Var XMLProfile = XMLProfile + "-"
Var XMLProfile = XMLProfile + "PromoYuzu250"
EndIf
EndIf
EndIf
EndIf

View file

@ -1 +1 @@
/event/promotion_pepsi_099.lxml
/event/promotion_yuzu_250.lxml

View file

@ -1,84 +1 @@
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD2 = 99
Var PriceD3 = $12-05-03-0007.Price
Var PD_CODE1 = "##-##-##-####"
Var PD_CODE2 = "12-05-02-0007"
Var PD_CODE3 = "12-05-03-0007"
; begin lang
Var aliasName[0] = "PEPSI"
Var aliasDesc[0] = "Pepsi & Ice"
Var aliasName[1] = "เป๊ปซี่น้ำแข็ง"
Var aliasDesc[1] = "เป๊ปซี่"
Var aliasName[2] = "-"
Var aliasDesc[2] = "-"
Var aliasName[3] = "-"
Var aliasDesc[3] = "-"
Var aliasName[4] = "PEPSI"
Var aliasDesc[4] = "Pepsi, Ais"
Var NameLang[0][0] = ""
Var NameLang[0][1] = ""
Var NameLang[0][2] = ""
Var NameLang[0][3] = ""
Var NameLang[0][4] = ""
Var DescLang[0][0] = ""
Var DescLang[0][1] = ""
Var DescLang[0][2] = ""
Var DescLang[0][3] = ""
Var DescLang[0][4] = ""
Var NameLang[1][0] = "PEPSI"
Var NameLang[1][1] = "เป๊ปซี่น้ำแข็ง"
Var NameLang[1][2] = ""
Var NameLang[1][3] = ""
Var NameLang[1][4] = "PEPSI"
Var DescLang[1][0] = "Pepsi, Ice"
Var DescLang[1][1] = "เป๊ปซี่ และน้ำแข็ง"
Var DescLang[1][2] = ""
Var DescLang[1][3] = ""
Var DescLang[1][4] = "Pepsi, Ais"
Var NameLang[2][0] = "TAO SLUSHIE"
Var NameLang[2][1] = "เต่าสลัชชี่"
Var NameLang[2][2] = ""
Var NameLang[2][3] = ""
Var NameLang[2][4] = "TAO SLUSHIE"
Var DescLang[2][0] = "Pepsi, Ice"
Var DescLang[2][1] = "เป๊ปซี่ และน้ำแข็ง"
Var DescLang[2][2] = ""
Var DescLang[2][3] = ""
Var DescLang[2][4] = "Pepsi, Ais"
; end lang
Var PD_STAGE_1 = "Disable2"
Var PD_STAGE_2 = $12-05-02-0007.Button
Var PD_STAGE_3 = $12-05-03-0007.Button
Var SelectCountDrinkType = 0
Var DefaultDrinkType = 0
If PD_STAGE_1 = "Enable" Then
Var SelectCountDrinkType = SelectCountDrinkType + 1
Var DefaultDrinkType = 1
EndIf
If PD_STAGE_2 = "Enable" Then
Var SelectCountDrinkType = SelectCountDrinkType + 1
Var DefaultDrinkType = 2
EndIf
If PD_STAGE_3 = "Enable" Then
Var SelectCountDrinkType = SelectCountDrinkType + 1
Var DefaultDrinkType = 3
EndIf
If PD_STAGE_2 = "Enable" Then
Topping "Load" "12-05-02-0007"
Else
If PD_STAGE_1 = "Enable" Then
Topping "Load" "-"
Else
Topping "Load" "12-05-03-0007"
EndIf
EndIf
DEBUGVAR PD_STAGE_1
DEBUGVAR PD_STAGE_2
DEBUGVAR PD_STAGE_3
Var SelectDrinkType = 0
Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
Open "ROOT/taobin_project/inter/mys/xml/page_catalog_group_pro_yuzu_250.lxml"

File diff suppressed because it is too large Load diff

View file

@ -5,36 +5,13 @@
DEBUGVAR FruityRayaEnable
DEBUGVAR ProThaiTeaEnable
DEBUGVAR ProYuzuEnable
Var CountEnablePromotion = 0
Var PromotionState1 = "Invisible"
Var PromotionState2 = "Invisible"
If ProThaiTeaEnable = 1 Then
Var PromotionState1 = "Enable"
Var CountEnablePromotion = CountEnablePromotion + 1
EndIf
If ProYuzuEnable = 1 Then
Var PromotionState2 = "Enable"
Var CountEnablePromotion = CountEnablePromotion + 1
EndIf
DEBUGVAR CountEnablePromotion
DEBUGVAR ProYuzu250Enable
If OpenFromPageBoard = 1 Then
; has-ongoing-pro
If CountEnablePromotion >= 1 Then
Var BigButtonEnable = "Enable"
If CountEnablePromotion = 1 Then
OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_thai_tea.lxml"
EndIf
If CountEnablePromotion = 2 Then
OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/double_promotion_thai_tea_and_yuzu.lxml"
EndIf
If ProYuzu250Enable = 1 Then
OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_yuzu_250.lxml"
Var OpenFromPageBoard = 0
Else
@ -42,21 +19,13 @@ If OpenFromPageBoard = 1 Then
EndIf
Else
; has-ongoing-pro
If CountEnablePromotion >= 1 Then
Var BigButtonEnable = "Enable"
; has-ongoing-pro
If ProYuzu250Enable = 1 Then
OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_yuzu_250.lxml"
If CountEnablePromotion = 1 Then
OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_thai_tea.lxml"
EndIf
If CountEnablePromotion = 2 Then
OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/double_promotion_thai_tea_and_yuzu.lxml"
EndIf
Var OpenFromPageBoard = 0
Else
OpenInst 2 "ROOT/taobin_project/inter/mys/xml/page_catalog_group_recommend.lxml"
EndIf
Var OpenFromPageBoard = 0
Else
OpenInst 2 "ROOT/taobin_project/inter/mys/xml/page_catalog_group_recommend.lxml"
EndIf
EndIf
Var OpenFromPageBoard = 0

View file

@ -20,6 +20,10 @@ Var FromProThaiTea = 0
Var ProYuzuEnable = 0
Var FromProYuzu = 0
; Yuzu Promo
Var ProYuzu250Enable = 0
Var FromProYuzu250 = 0
; Pro free oreo topping
Var PromotionOreoToppingFreeEnable = 0
@ -40,37 +44,6 @@ Var EnablePayLaterMode = 0
; Slide show Video
Var UseSlideShowVideo = 0
If SystemDateMonthInt = 6 Then
If SystemDateDayInt >= 15 Then
Var ProThaiTeaEnable = 1
Else
Var ProThaiTeaEnable = 0
EndIf
EndIf
If SystemDateMonthInt = 7 Then
Var ProThaiTeaEnable = 1
If SystemDateDayInt >= 15 Then
Var ProYuzuEnable = 1
Else
Var ProYuzuEnable = 0
EndIf
EndIf
If SystemDateMonthInt = 8 Then
If SystemDateDayInt < 31 Then
Var ProThaiTeaEnable = 1
Var ProYuzuEnable = 1
Else
Var ProThaiTeaEnable = 0
Var ProYuzuEnable = 0
Var PromotionOreoToppingFreeEnable = 1
EndIf
EndIf
If SystemDateMonthInt = 9 Then
If SystemDateDayInt < 17 Then
Var PromotionOreoToppingFreeEnable = 1
@ -86,16 +59,29 @@ If SystemDateMonthInt = 10 Then
If SetProReduceByBO = 1 Then
Var ProReducedPriceEnable = 1
EndIf
Var ProYuzu250Enable = 1
EndIf
If SystemDateMonthInt = 11 Then
If SetProReduceByBO = 1 Then
Var ProReducedPriceEnable = 1
EndIf
Var ProYuzu250Enable = 1
EndIf
If SystemDateMonthInt = 12 Then
Var ProYuzu250Enable = 1
EndIf
If SystemDateMonthInt = 1 Then
If SystemDateDayInt < 16 Then
Var ProYuzu250Enable = 1
Else
Var ProYuzu250Enable = 0
EndIf
EndIf
If BoxID = 177746 Then
Var ProThaiTeaEnable = 1
@ -107,6 +93,9 @@ If BoxID = 177746 Then
;Var AdvertiseProfile = "00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00"
Var UseSlideShowVideo = 0
Var ProReducedPriceEnable = 0
Var ProYuzu250Enable = 1
EndIf
If BoxID = 210037 Then
@ -124,4 +113,4 @@ EndIf
;If BoxID = Something Then
; Var EnablePayLaterMode = 1
;
;EndIf
;EndIf

View file

@ -189,8 +189,11 @@
if "thai_tea" in current_file_name:
out_xml( '\t\tVar FromProThaiTea = 1 \r\n')
if "yuzu" in current_file_name:
if "yuzu" in current_file_name and "250" not in current_file_name:
out_xml( '\t\tVar FromProYuzu = 1 \r\n')
if "yuzu_250" in current_file_name:
out_xml( '\t\tVar FromProYuzu250 = 1 \r\n')
out_xml( '\t\t\r\n')

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,46 @@
<?hurr
#include=menu_head.py
?>
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
<?hurr
#include=menu_catalog_default_init.xml
?>
Var FromProYuzu250 = 0
Var Timeout = 0
<?hurr
#include=menu_catalog_new_menu.xml
?>
</EventOpen>
<?hurr
#include=menu_catalog_new.py
?>
<?hurr
#include=menu_new_layout_gen_v2.py
?>
<?hurr
#include=menu_new_layout_gen.py
?>
</Popup>

View file

@ -1,174 +1,174 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
Var NextPage = "-"
DEBUGVAR ICE_PROCESS_STATUS
DEBUGVAR ICE_PROCESS_TXT
DEBUGVAR LanguageShow
DEBUGVAR CountryName
If LanguageShow = "ENG" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
EndIf
If LanguageShow = "THAI" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
Var DirImage = "ROOT/taobin_project/image/page3"
EndIf
;inter-image
If CountryName = "Malaysia" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
EndIf
;inter-image
If CountryName = "Australia" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
EndIf
If ICE_PROCESS_STATUS = 2 Then
Var ice_tab_process_show = "Enable"
Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
Else
Var ice_tab_process_show = "Invisible"
EndIf
; SpiralOnline
Var MenuVSelected2 = "Invisible"
Var Menu1Selected2 = "Invisible"
Var Menu2Selected2 = "Invisible"
Var Menu3Selected2 = "Invisible"
Var Menu4Selected2 = "Invisible"
Var Menu6Selected2 = "Invisible"
Var Menu7Selected2 = "Invisible"
Var MenuVSelected2 = "Invisible"
Var Menu11Selected2 = "Invisible"
Var Menu21Selected2 = "Invisible"
Var MenuVSelected2 = "Invisible"
If SpiralOnline = "true" Then
If Seeker = "curr" Then
Var MenuVSelected2 = "Enable"
EndIf
EndIf
; init default
Var Menu1Selected = "Enable"
Var Menu2Selected = "Enable"
Var Menu3Selected = "Enable"
Var Menu4Selected = "Enable"
; 5 fruit
Var Menu5Selected = "Invisible"
Var Menu6Selected = "Enable"
Var Menu7Selected = "Enable"
; 8 cocktail
Var Menu8Selected = "Invisible"
If CocktailShow = "true" Then
Var Menu7Selected = "Invisible"
Var Menu8Selected = "Enable"
EndIf
If AppFastEnable = "true" Then
Var Menu11Selected = "Enable"
Var Menu21Selected = "Invisible"
Var Menu7Selected = "Invisible"
Else
If MenuKidEnable = "true" Then
Var Menu11Selected = "Invisible"
Var Menu21Selected = "Enable"
Var Menu7Selected = "Invisible"
Else
Var Menu11Selected = "Invisible"
Var Menu21Selected = "Invisible"
Var Menu7Selected = "Enable"
EndIf
EndIf
If CocktailShow = "true" Then
Var Menu7Selected = "Invisible"
EndIf
If RecipeTag1 = "HealthTurnOn" Then
Var Menu22Selected = "Enable"
Else
Var Menu22Selected = "Invisible"
EndIf
;
Var Menu1Selected = "PressForever"
Var OreoBigButtonEnable = "Enable"
If $12-01-01-0001.Button = "Invisible" Then
Var esp102101001Enable = "Invisible"
Var esp122101001Enable = "Enable"
Else
Var esp102101001Enable = "Enable"
Var esp122101001Enable = "Invisible"
EndIf
SAVELOG PreviseXMLFileName2
Var Timeout = 0
If show_eng = "true" Then
Var text_unavailable = "UNAVAILABLE###size=16"
Else
Var text_unavailable = "หมด###size=32"
EndIf
If show_eng = "true" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Else
Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
EndIf
</EventOpen>
;include="ROOT/taobin_project/inter/mys/xml/menu_catalog_new.lxml"
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
Var NextPage = "-"
DEBUGVAR ICE_PROCESS_STATUS
DEBUGVAR ICE_PROCESS_TXT
DEBUGVAR LanguageShow
DEBUGVAR CountryName
If LanguageShow = "ENG" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
EndIf
If LanguageShow = "THAI" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
Var DirImage = "ROOT/taobin_project/image/page3"
EndIf
;inter-image
If CountryName = "Malaysia" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
EndIf
;inter-image
If CountryName = "Australia" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
EndIf
If ICE_PROCESS_STATUS = 2 Then
Var ice_tab_process_show = "Enable"
Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
Else
Var ice_tab_process_show = "Invisible"
EndIf
; SpiralOnline
Var MenuVSelected2 = "Invisible"
Var Menu1Selected2 = "Invisible"
Var Menu2Selected2 = "Invisible"
Var Menu3Selected2 = "Invisible"
Var Menu4Selected2 = "Invisible"
Var Menu6Selected2 = "Invisible"
Var Menu7Selected2 = "Invisible"
Var MenuVSelected2 = "Invisible"
Var Menu11Selected2 = "Invisible"
Var Menu21Selected2 = "Invisible"
Var MenuVSelected2 = "Invisible"
If SpiralOnline = "true" Then
If Seeker = "curr" Then
Var MenuVSelected2 = "Enable"
EndIf
EndIf
; init default
Var Menu1Selected = "Enable"
Var Menu2Selected = "Enable"
Var Menu3Selected = "Enable"
Var Menu4Selected = "Enable"
; 5 fruit
Var Menu5Selected = "Invisible"
Var Menu6Selected = "Enable"
Var Menu7Selected = "Enable"
; 8 cocktail
Var Menu8Selected = "Invisible"
If CocktailShow = "true" Then
Var Menu7Selected = "Invisible"
Var Menu8Selected = "Enable"
EndIf
If AppFastEnable = "true" Then
Var Menu11Selected = "Enable"
Var Menu21Selected = "Invisible"
Var Menu7Selected = "Invisible"
Else
If MenuKidEnable = "true" Then
Var Menu11Selected = "Invisible"
Var Menu21Selected = "Enable"
Var Menu7Selected = "Invisible"
Else
Var Menu11Selected = "Invisible"
Var Menu21Selected = "Invisible"
Var Menu7Selected = "Enable"
EndIf
EndIf
If CocktailShow = "true" Then
Var Menu7Selected = "Invisible"
EndIf
If RecipeTag1 = "HealthTurnOn" Then
Var Menu22Selected = "Enable"
Else
Var Menu22Selected = "Invisible"
EndIf
;
Var Menu1Selected = "PressForever"
Var OreoBigButtonEnable = "Enable"
If $12-01-01-0001.Button = "Invisible" Then
Var esp102101001Enable = "Invisible"
Var esp122101001Enable = "Enable"
Else
Var esp102101001Enable = "Enable"
Var esp122101001Enable = "Invisible"
EndIf
SAVELOG PreviseXMLFileName2
Var Timeout = 0
If show_eng = "true" Then
Var text_unavailable = "UNAVAILABLE###size=16"
Else
Var text_unavailable = "หมด###size=32"
EndIf
If show_eng = "true" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Else
Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
EndIf
</EventOpen>
;include="ROOT/taobin_project/inter/mys/xml/menu_catalog_new.lxml"
<FrameScroll>
<Max> 4 </Max>
<X> 10 </X>
@ -46160,27 +46160,27 @@
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
</EventClick>
</Button>
;BigLogoLayout
<Button>
<X> 780 </X>
<Y> 500 </Y>
<State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval>
<Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
<EventClick>
Machine RemoveCup
Machine DoorLidOpen
Var buttonRemoveCup = "Invisible"
</EventClick>
</Button>
</Popup>
;BigLogoLayout
<Button>
<X> 780 </X>
<Y> 500 </Y>
<State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval>
<Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
<EventClick>
Machine RemoveCup
Machine DoorLidOpen
Var buttonRemoveCup = "Invisible"
</EventClick>
</Button>
</Popup>

View file

@ -127,15 +127,12 @@
DEBUGVAR PepweenCollectPoint
DEBUGVAR ProBadValentineEnable
DEBUGVAR FromBadValentinePro
DEBUGVAR LipitPro
DEBUGVAR FromLipitPro
DEBUGVAR FruityRayaEnable
DEBUGVAR FromFruityRaya
DEBUGVAR ProThaiTeaEnable
DEBUGVAR FromProThaiTea
DEBUGVAR FromProYuzu
DEBUGVAR FromProYuzu250
If Seeker.TNumberTaobinCredit = "" Then

View file

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

Before After
Before After

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.

View file

@ -6,6 +6,7 @@
; Reset flag away.
Var SettingIgnoreCollectPoint = 1
DEBUGVAR Propepsi99Enable
DEBUGVAR DisplayFormatFull

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] = ""

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] = ""

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>

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] = ""

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] = ""

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] = ""

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>