This commit is contained in:
kong 2023-02-21 16:15:00 +07:00
parent ea6015ad27
commit bc76948f65
14 changed files with 1125 additions and 79 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 55 KiB

After

Width:  |  Height:  |  Size: 55 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 56 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 34 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Before After
Before After

View file

@ -160,7 +160,10 @@
out_xml( '\t\tVar DrinkDescriptionTH = "' + spl[2].replace("\\n", " ") + '"\r\n')
out_xml( '\t\tVar DrinkDescription = "' + spl[3].replace("\\n", " ") + '"\r\n')
out_xml( '\t\tVar PictureDrink = "' + new_default_dir2 + '" + \"' + menu_img + '\"\r\n')
if menu_img.startswith("#"):
out_xml( '\t\tVar PictureDrink = bn_oreo_vo_get1_full_path\r\n')
else:
out_xml( '\t\tVar PictureDrink = "' + new_default_dir2 + '" + \"' + menu_img + '\"\r\n')
out_xml( '\t\tVar OpenFromXML = CurrentXMLFileName2\r\n')

View file

@ -670,6 +670,9 @@
If SystemDateDayInt = 21 Then
Var PromotionOreoVolcanoEnable = 1
EndIf
If SystemDateDayInt = 22 Then
Var PromotionOreoVolcanoEnable = 1
EndIf
If SystemDateDayInt = 27 Then
Var PromotionOreoVolcanoEnable = 1
EndIf
@ -699,6 +702,12 @@
If SystemDateDayInt = 22 Then
Var PromotionOreoToppingFreeEnable = 1
EndIf
If SystemDateDayInt = 23 Then
Var PromotionOreoToppingFreeEnable = 1
EndIf
If SystemDateDayInt = 24 Then
Var PromotionOreoToppingFreeEnable = 1
EndIf
EndIf
If SystemDateMonthInt = 3 Then
@ -723,10 +732,27 @@
DEBUGVAR $12-03-03-0009.Button
If $12-03-03-0009.Button = "Enable" Then
If PromotionOreoVolcanoEnable = 1 Then
Var bn_oreo_vo_get1_full_path = "ROOT/taobin_project/image/page_drink_picture2_n//bn_oreo_vo_get1.png"
Var smoothie_oreo_resting = "ROOT/taobin_project/image/page_drink_n//bn_oreo_vo_get1.png"
Var smoothie_oreo_press = "ROOT/taobin_project/image/page_drink_press_n//bn_oreo_vo_get1.png"
Var smoothie_oreo_disable = "ROOT/taobin_project/image/page_drink_disable_n2//bn_oreo_vo_get1.png"
Else
Var smoothie_oreo_resting = "ROOT/taobin_project/image/page_drink_n//bn_smoothie_oreo.png"
Var smoothie_oreo_press = "ROOT/taobin_project/image/page_drink_press_n//bn_smoothie_oreo.png"
Var smoothie_oreo_disable = "ROOT/taobin_project/image/page_drink_disable_n2//bn_smoothie_oreo.png"
Var bn_oreo_vo_get1_full_path = "ROOT/taobin_project/image/page_drink_picture2_n//bn_smoothie_oreo.png"
EndIf
; cut off
If $12-03-03-0009.Button = "Enable" Then
Else
Var PromotionOreoVolcanoEnable = 0
EndIf

View file

@ -6,20 +6,7 @@
<Volume> SoundVolume </Volume>
<EventOpen>
If $12-03-03-0009.Button = "Enable" Then
Var smoothie_oreo_resting = "ROOT/taobin_project/image/page_drink_n//bn_oreo_vo_get1.png"
Var smoothie_oreo_press = "ROOT/taobin_project/image/page_drink_press_n//bn_oreo_vo_get1.png"
Var smoothie_oreo_disable = "ROOT/taobin_project/image/page_drink_disable_n2//bn_oreo_vo_get1.png"
Else
Var PromotionOreoVolcanoEnable = 0
Var smoothie_oreo_resting = "ROOT/taobin_project/image/page_drink_n//bn_smoothie_oreo.png"
Var smoothie_oreo_press = "ROOT/taobin_project/image/page_drink_press_n//bn_smoothie_oreo.png"
Var smoothie_oreo_disable = "ROOT/taobin_project/image/page_drink_disable_n2//bn_smoothie_oreo.png"
EndIf
Var PromotionIDCurrentOrder = 0
If SpiralOnline = "true" Then
If Seeker = "next" Then

View file

@ -3795,9 +3795,9 @@ VOLCANO" </Value>
<State> Flag( 12-03-03-0009.Button,$Sum1203030009) </State>
<Button>
<State> $Sum1203030009 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_smoothie_oreo.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_smoothie_oreo.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_smoothie_oreo.png" </FilenameDisable>
<Filename> smoothie_oreo_resting </Filename>
<FilenamePress> smoothie_oreo_press </FilenamePress>
<FilenameDisable> smoothie_oreo_disable </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
@ -3805,7 +3805,7 @@ VOLCANO" </Value>
Var NameDrinkTH = "โอริโอ้ปั่นภูเขาไฟ"
Var DrinkDescriptionTH = "นม น้ำตาล โอริโอ้ "
Var DrinkDescription = "Milk, Sugar, Oreo, Ice"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_oreo.png"
Var PictureDrink = bn_oreo_vo_get1_full_path
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD2 = $-.Price

View file

@ -2552,7 +2552,7 @@ SMOOTHIE" </Value>
Var NameDrinkTH = "โอริโอ้ปั่นภูเขาไฟ"
Var DrinkDescriptionTH = "นม น้ำตาล โอริโอ้ "
Var DrinkDescription = "Milk, Sugar, Oreo, Ice"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "#smoothie_oreo"
Var PictureDrink = bn_oreo_vo_get1_full_path
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD2 = $-.Price

View file

@ -0,0 +1,45 @@
<?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 Timeout = 0
<?hurr
#include=menu_catalog_new_menu.xml
?>
</EventOpen>
<?hurr
#include=menu_catalog_inc.py
?>
<?hurr
#include=menu_new_layout_gen_v2.py
?>
<?hurr
#include=menu_new_layout_gen.py
?>
</Popup>

File diff suppressed because it is too large Load diff

View file

@ -11457,66 +11457,10 @@ LIMENADE SODA" </Value>
<Filename> "ROOT/taobin_project/image/page3/bn_oreo_vo_get1.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page3/bp_oreo_vo_get1.png" </FilenameDisable>
<EventOnClick>
Var NameDrink = "OREO SMOOTHIE VOLCANO"
Var NameDrinkTH = "โอริโอ้ปั่นภูเขาไฟ"
Var DrinkDescriptionTH = "นม น้ำตาล โอริโอ้ "
Var DrinkDescription = "Milk, Sugar, Oreo"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_oreo_vo_get1.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD2 = $-.Price
Var PriceD3 = $12-03-03-0009.Price
Var PD_CODE1 = "##-##-##-####"
Var PD_CODE2 = "##-##-##-####"
Var PD_CODE3 = "12-03-03-0009"
Var PD_STAGE_1 = "Disable2"
Var PD_STAGE_2 = "Disable2"
Var PD_STAGE_3 = $12-03-03-0009.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" "-"
Else
If PD_STAGE_1 = "Enable" Then
Topping "Load" "-"
Else
Topping "Load" "12-03-03-0009"
EndIf
EndIf
Var menu_name_eng_hot = $##-##-##-####.NameE
Var menu_desc_eng_hot = $##-##-##-####.descriptionE
Var menu_name_thai_hot = $##-##-##-####.Name
Var menu_desc_thai_hot = $##-##-##-####.description
Var menu_name_eng_cold = $##-##-##-####.NameE
Var menu_desc_eng_cold = $##-##-##-####.descriptionE
Var menu_name_thai_cold = $##-##-##-####.Name
Var menu_desc_thai_cold = $##-##-##-####.description
Var menu_name_eng_blender = $12-03-03-0009.NameE
Var menu_desc_eng_blender = $12-03-03-0009.descriptionE
Var menu_name_thai_blender = $12-03-03-0009.Name
Var menu_desc_thai_blender = $12-03-03-0009.description
DEBUGVAR PD_STAGE_1
DEBUGVAR PD_STAGE_2
DEBUGVAR PD_STAGE_3
Var SelectDrinkType = 0
Open "ROOT/taobin_project/xml/page_topping_select5.xml"
Open "ROOT/taobin_project/xml/page_catalog_group_oreo.xml"
</EventOnClick>
</Button>