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

6.74

Browse source
This commit is contained in:
kong 2022-11-07 14:13:14 +07:00
parent 647c06c12c
commit fdd2b59366
13 changed files with 380 additions and 374 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/page_campaign/text_desc.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 25 KiB

BIN
image/page_campaign/video_desc.mp4 Normal file
View file

Binary file not shown.

BIN
image/page_campaign_en/text_desc.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 26 KiB

BIN
image/topping2_en/text8.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.1 KiB

12
xml/menu_new_layout_gen.py
View file

@ -331,7 +331,7 @@
#out_xml( '\t<Value> Var( "฿" + $' + spl[4] + '.Price ) </Value>\r\n') #out_xml( '\t<Value> Var( "฿" + $' + spl[4] + '.Price ) </Value>\r\n')
if "inter" in param: if "inter" in param:
out_xml( '\t<Value> IntFormat( $' + spl[4] + '.Price , DisplayFormat, /100) </Value>; test\r\n') out_xml( '\t<Value> IntFormat( $' + spl[4] + '.Price , DisplayFormat, PreScaleConvert) </Value>; test\r\n')
else: else:
out_xml( '\t<Value> Var( "฿" + $' + spl[4] + '.Price ) </Value>\r\n') out_xml( '\t<Value> Var( "฿" + $' + spl[4] + '.Price ) </Value>\r\n')
out_xml( '\t</Text>\r\n') out_xml( '\t</Text>\r\n')
@ -373,7 +373,7 @@
out_xml( '\t<ColorDisable> 0xEAE6E1 </ColorDisable>\r\n') out_xml( '\t<ColorDisable> 0xEAE6E1 </ColorDisable>\r\n')
out_xml( '\t<State> ' + shw + ' </State>\r\n') out_xml( '\t<State> ' + shw + ' </State>\r\n')
if "inter" in param: if "inter" in param:
out_xml( '\t<Value> IntFormat( $' + spl[5] + '.Price , DisplayFormat, /100) </Value>; test\r\n') out_xml( '\t<Value> IntFormat( $' + spl[5] + '.Price , DisplayFormat, PreScaleConvert) </Value>; test\r\n')
else: else:
out_xml( '\t<Value> Var( "฿" + $' + spl[5] + '.Price ) </Value>\r\n') out_xml( '\t<Value> Var( "฿" + $' + spl[5] + '.Price ) </Value>\r\n')
out_xml( '\t</Text>\r\n') out_xml( '\t</Text>\r\n')
@ -417,7 +417,7 @@
out_xml( '\t<ColorDisable> 0xEAE6E1 </ColorDisable>\r\n') out_xml( '\t<ColorDisable> 0xEAE6E1 </ColorDisable>\r\n')
out_xml( '\t<State> ' + shw + ' </State>\r\n') out_xml( '\t<State> ' + shw + ' </State>\r\n')
if "inter" in param: if "inter" in param:
out_xml( '\t<Value> IntFormat( $' + spl[6] + '.Price , DisplayFormat, /100) </Value>; test\r\n') out_xml( '\t<Value> IntFormat( $' + spl[6] + '.Price , DisplayFormat, PreScaleConvert) </Value>; test\r\n')
else: else:
out_xml( '\t<Value> Var( "฿" + $' + spl[6] + '.Price ) </Value>\r\n') out_xml( '\t<Value> Var( "฿" + $' + spl[6] + '.Price ) </Value>\r\n')
out_xml( '\t</Text>\r\n') out_xml( '\t</Text>\r\n')
@ -773,7 +773,7 @@
out_xml( '\t<State> ' + shw + ' </State>\r\n') out_xml( '\t<State> ' + shw + ' </State>\r\n')
if "inter" in param: if "inter" in param:
out_xml( '\t<Value> IntFormat( $' + spl[8] + '.Price , DisplayFormat, /100) </Value>; test\r\n') out_xml( '\t<Value> IntFormat( $' + spl[8] + '.Price , DisplayFormat, PreScaleConvert) </Value>; test\r\n')
else: else:
out_xml( '\t<Value> Var( "฿" + $' + spl[8] + '.Price ) </Value>\r\n') out_xml( '\t<Value> Var( "฿" + $' + spl[8] + '.Price ) </Value>\r\n')
@ -817,7 +817,7 @@
out_xml( '\t<ColorDisable> 0xEAE6E1 </ColorDisable>\r\n') out_xml( '\t<ColorDisable> 0xEAE6E1 </ColorDisable>\r\n')
out_xml( '\t<State> ' + shw + ' </State>\r\n') out_xml( '\t<State> ' + shw + ' </State>\r\n')
if "inter" in param: if "inter" in param:
out_xml( '\t<Value> IntFormat( $' + spl[9] + '.Price , DisplayFormat, /100) </Value>; test\r\n') out_xml( '\t<Value> IntFormat( $' + spl[9] + '.Price , DisplayFormat, PreScaleConvert) </Value>; test\r\n')
else: else:
out_xml( '\t<Value> Var( "฿" + $' + spl[9] + '.Price ) </Value>\r\n') out_xml( '\t<Value> Var( "฿" + $' + spl[9] + '.Price ) </Value>\r\n')
@ -860,7 +860,7 @@
out_xml( '\t<ColorDisable> 0xEAE6E1 </ColorDisable>\r\n') out_xml( '\t<ColorDisable> 0xEAE6E1 </ColorDisable>\r\n')
out_xml( '\t<State> ' + shw + ' </State>\r\n') out_xml( '\t<State> ' + shw + ' </State>\r\n')
if "inter" in param: if "inter" in param:
out_xml( '\t<Value> IntFormat( $' + spl[10] + '.Price , DisplayFormat, /100) </Value>; test\r\n') out_xml( '\t<Value> IntFormat( $' + spl[10] + '.Price , DisplayFormat, PreScaleConvert) </Value>; test\r\n')
else: else:
out_xml( '\t<Value> Var( "฿" + $' + spl[10] + '.Price ) </Value>\r\n') out_xml( '\t<Value> Var( "฿" + $' + spl[10] + '.Price ) </Value>\r\n')

9
xml/page_board.xml
View file

@ -214,7 +214,11 @@
EndIf EndIf
If SystemDateMonth = 1 Then
If SystemDateDay = 1 Then
WRITE_FILE "/mnt/sdcard/coffeevending/CampaignEnable" "off"
EndIf
EndIf
If EventTurnOn = 1 Then If EventTurnOn = 1 Then
@ -228,6 +232,7 @@
Var VideoMainPage = "ROOT/taobin_project/video/main_page_event_alter.mp4" Var VideoMainPage = "ROOT/taobin_project/video/main_page_event_alter.mp4"
EndIf EndIf
EndIf EndIf
If TermTemOnline = "true" Then If TermTemOnline = "true" Then
Var CountDownShowButton = 28 Var CountDownShowButton = 28
@ -601,6 +606,7 @@
DEBUGVAR LanguageShow DEBUGVAR LanguageShow
DEBUGVAR DisplayFormat DEBUGVAR DisplayFormat
DEBUGVAR PreScaleConvert DEBUGVAR PreScaleConvert
DEBUGVAR UnitPostDisplay
</EventOpen> </EventOpen>
@ -862,6 +868,7 @@
;<Loop>"true"</Loop> ;<Loop>"true"</Loop>
;<Volume> 80 </Volume> ;<Volume> 80 </Volume>
<Filename> VideoMainPage </Filename> <Filename> VideoMainPage </Filename>
<FilenameAlternate> "ROOT/taobin_project/video/main_page.mp4" </FilenameAlternate>
</Video> </Video>

198
xml/page_brewing3.xml
View file

@ -58,6 +58,8 @@
Var bnStrawProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_straw_en.png" Var bnStrawProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_straw_en.png"
Var bpStrawProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_straw_en.png" Var bpStrawProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_straw_en.png"
Var CampaingFilename = "ROOT/taobin_project/image/page_campaign_en"
Var XStraw = 336 Var XStraw = 336
Else Else
;Var DirImage = "ROOT/taobin_project/image/collect_point1" ;Var DirImage = "ROOT/taobin_project/image/collect_point1"
@ -72,6 +74,8 @@
Var bnStrawProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_straw.png" Var bnStrawProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_straw.png"
Var bpStrawProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_straw.png" Var bpStrawProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_straw.png"
Var CampaingFilename = "ROOT/taobin_project/image/page_campaign"
Var XStraw = 382 Var XStraw = 382
EndIf EndIf
@ -278,6 +282,18 @@
Var CreditCardVoid = 0 Var CreditCardVoid = 0
READ_FILE "/mnt/sdcard/coffeevending/CampaignEnable" CampaignEnableStr
If CampaignEnableStr = "true" Then
Var CampaignEnable = 1
Var CampaignVideoTimeCountDown = 14
Var PictureFile = CampaingFilename + "/text_desc.png"
Var VideoPlayFile = "ROOT/taobin_project/image/page_campaign/video_desc.mp4"
Else
Var CampaignEnable = 0
EndIf
</EventOpen> </EventOpen>
@ -971,76 +987,87 @@
DEBUGVAR CountUpBrewing DEBUGVAR CountUpBrewing
; animation video loop ; animation video loop
If AnimationOn = "true" Then If AnimationOn = "true" Then
Var CountUpBrewing = CountUpBrewing + 1 If CampaignEnable = 1 Then
If CampaignVideoTimeCountDown > 0 Then
Var SlotVideo = CountUpBrewing / AnimationVideoPlayTime Var CampaignVideoTimeCountDown = CampaignVideoTimeCountDown - 1
EndIf
If PreviseStepVideo = SlotVideo Then If CampaignVideoTimeCountDown = 0 Then
;SAVELOG SlotVideo Var CampaignEnable = 0
EndIf
Else Else
Var PreviseStepVideo = SlotVideo Var CountUpBrewing = CountUpBrewing + 1
;SAVELOG PreviseStepVideo
;SAVELOG SlotVideo
;SAVELOG CountUpBrewing
;Var CountDownVideoTime = CountDownVideoTimeReload ;CampaignEnable
Var SlotVideo = CountUpBrewing / AnimationVideoPlayTime
Var StepVideo = SlotVideo + 2 If PreviseStepVideo = SlotVideo Then
;SAVELOG SlotVideo
;SAVELOG StepVideo
If StepVideo = 1 Then
Var videoID = VideoID1
EndIf
If StepVideo = 2 Then
Var videoID = VideoID2
EndIf
If StepVideo = 3 Then
Var videoID = VideoID3
EndIf
If StepVideo = 4 Then
Var videoID = VideoID4
EndIf
If StepVideo = 5 Then
Var videoID = VideoID5
EndIf
If StepVideo = 6 Then
Var videoID = VideoID6
EndIf
If StepVideo = 7 Then
Var videoID = VideoID7
EndIf
If StepVideo = 8 Then
Var videoID = VideoID8
EndIf
If StepVideo = 9 Then
Var videoID = VideoID9
EndIf
;SAVELOG videoID
If videoID = 0 Then
Else Else
If videoID = "---" Then Var PreviseStepVideo = SlotVideo
;SAVELOG PreviseStepVideo
;SAVELOG SlotVideo
;SAVELOG CountUpBrewing
;Var CountDownVideoTime = CountDownVideoTimeReload
Var StepVideo = SlotVideo + 2
;SAVELOG StepVideo
If StepVideo = 1 Then
Var videoID = VideoID1
EndIf
If StepVideo = 2 Then
Var videoID = VideoID2
EndIf
If StepVideo = 3 Then
Var videoID = VideoID3
EndIf
If StepVideo = 4 Then
Var videoID = VideoID4
EndIf
If StepVideo = 5 Then
Var videoID = VideoID5
EndIf
If StepVideo = 6 Then
Var videoID = VideoID6
EndIf
If StepVideo = 7 Then
Var videoID = VideoID7
EndIf
If StepVideo = 8 Then
Var videoID = VideoID8
EndIf
If StepVideo = 9 Then
Var videoID = VideoID9
EndIf
;SAVELOG videoID
If videoID = 0 Then
Else Else
If videoID = "---" Then
Var VideoPlayFile = VideoPath Else
Var VideoPlayFile = VideoPlayFile + VideoFileBegin
Var VideoPlayFile = VideoPlayFile + videoID
Var VideoPlayFile = VideoPlayFile + VideoFileEnd
Var PictureFile = PicturePath Var VideoPlayFile = VideoPath
Var PictureFile = PictureFile + PictureBegin Var VideoPlayFile = VideoPlayFile + VideoFileBegin
Var PictureFile = PictureFile + videoID Var VideoPlayFile = VideoPlayFile + videoID
Var PictureFile = PictureFile + PictureEnd Var VideoPlayFile = VideoPlayFile + VideoFileEnd
DEBUGVAR VideoPlayFile Var PictureFile = PicturePath
DEBUGVAR PictureFile Var PictureFile = PictureFile + PictureBegin
Var PictureFile = PictureFile + videoID
Var PictureFile = PictureFile + PictureEnd
DEBUGVAR VideoPlayFile
DEBUGVAR PictureFile
EndIf
EndIf EndIf
EndIf EndIf
EndIf EndIf
; CampaignEnable
EndIf EndIf
@ -1134,12 +1161,6 @@
<Filename> VideoPlayFile </Filename> <Filename> VideoPlayFile </Filename>
</Video> </Video>
;<Image>
;<X> 0 </X>
;<Y> 0 </Y>
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
;</Image>
<Video> <Video>
<X> 0 </X> <X> 0 </X>
<Y> 0 </Y> <Y> 0 </Y>
@ -1197,51 +1218,6 @@
<Value> ShowCountDownBrewing </Value> <Value> ShowCountDownBrewing </Value>
</Text> </Text>
;<Text>
;<X> 100 </X>
;<Y> 470 </Y>
;<Align> End </Align>
;<Width> 153 </Width>
;<Size> 30 </Size>
;<Font> RobotoBold </Font>
;<Color> 0x513C2F </Color>
;<Value> MachineStage </Value>
;</Text>
;
;<Text>
;<X> 0 </X>
;<Y> 1880 </Y>
;<Size> 30 </Size>
;<Align> Center </Align>
;<Width> 1080 </Width>
;<Font> KanitThinTTF </Font>
;<Color> 0x513C2F </Color>
;<Value> MachineStage </Value>
;</Text>
;<Button>
;<X> 0 </X>
;<Y> 1860 </Y>
;<Width> 200 </Width>
;<Height> 50 </Height>
;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
;<Volume> SoundVolume </Volume>
;<EventClick>
; Var countClick = countClick + 1
; If countClick = 3 Then
;
; EndIf
;
; If countClick = 5 Then
; Var countClick = 0
; MainMenu
; EndIf
; Refresh
;</EventClick>
;</Button>
<Button> <Button>
<X> 870 </X> <X> 870 </X>

20
xml/page_catalog_group_coffee.xml
View file

@ -6849,7 +6849,7 @@ AMERICANO" </Value>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventOnClick> <EventOnClick>
Var NameDrink = "ROSALYN ROSALYN" Var NameDrink = "ROSALYN AMERICANO"
Var NameDrinkTH = "อเมริกาโน ROSALYN" Var NameDrinkTH = "อเมริกาโน ROSALYN"
Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (washed process) กลิ่นกุหลาบ และ เบอร์รี่" Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (washed process) กลิ่นกุหลาบ และ เบอร์รี่"
Var DrinkDescription = "Light Roast (natural process) Pink​ Rose & Berry" Var DrinkDescription = "Light Roast (natural process) Pink​ Rose & Berry"
@ -6944,7 +6944,7 @@ ROSALYN" </Value>
<Color> 0x322B26 </Color> <Color> 0x322B26 </Color>
<State> showengText </State> <State> showengText </State>
<Value> "ROSALYN <Value> "ROSALYN
ROSALYN" </Value> AMERICANO" </Value>
</Text> </Text>
<Text> <Text>
<X> 16 </X> <X> 16 </X>
@ -9855,7 +9855,7 @@ ICED ESPRESSO" </Value>
<EventOnClick> <EventOnClick>
Var NameDrink = "LATTE" Var NameDrink = "LATTE"
Var NameDrinkTH = "ลาเต้" Var NameDrinkTH = "ลาเต้"
Var DrinkDescriptionTH = "กาแฟ นม และ นม" Var DrinkDescriptionTH = "กาแฟ นม และ ฟองนม"
Var DrinkDescription = "Espresso, Milk, Foamed milk" Var DrinkDescription = "Espresso, Milk, Foamed milk"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_latte.png" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_latte.png"
Var OpenFromXML = CurrentXMLFileName2 Var OpenFromXML = CurrentXMLFileName2
@ -9934,7 +9934,7 @@ ICED ESPRESSO" </Value>
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<State> showthaiText </State> <State> showthaiText </State>
<Value> "กาแฟ นม และ นม" </Value> <Value> "กาแฟ นม และ ฟองนม" </Value>
</Text> </Text>
<Text> <Text>
<X> 16 </X> <X> 16 </X>
@ -10104,7 +10104,7 @@ ICED ESPRESSO" </Value>
<EventOnClick> <EventOnClick>
Var NameDrink = "LATTE" Var NameDrink = "LATTE"
Var NameDrinkTH = "ลาเต้" Var NameDrinkTH = "ลาเต้"
Var DrinkDescriptionTH = "กาแฟ นม และ นม" Var DrinkDescriptionTH = "กาแฟ นม และ ฟองนม"
Var DrinkDescription = "Espresso, Milk, Foamed milk" Var DrinkDescription = "Espresso, Milk, Foamed milk"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_latte.png" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_latte.png"
Var OpenFromXML = CurrentXMLFileName2 Var OpenFromXML = CurrentXMLFileName2
@ -10183,7 +10183,7 @@ ICED ESPRESSO" </Value>
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<State> showthaiText </State> <State> showthaiText </State>
<Value> "กาแฟ นม และ นม" </Value> <Value> "กาแฟ นม และ ฟองนม" </Value>
</Text> </Text>
<Text> <Text>
<X> 16 </X> <X> 16 </X>
@ -10354,7 +10354,7 @@ ICED ESPRESSO" </Value>
<EventOnClick> <EventOnClick>
Var NameDrink = "CAPPUCINO" Var NameDrink = "CAPPUCINO"
Var NameDrinkTH = "คาปูชิโน่" Var NameDrinkTH = "คาปูชิโน่"
Var DrinkDescriptionTH = "กาแฟ นม และ นม" Var DrinkDescriptionTH = "กาแฟ นม และ ฟองนม"
Var DrinkDescription = "Espresso, Milk, Foamed milk" Var DrinkDescription = "Espresso, Milk, Foamed milk"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_cappuccino.png" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_cappuccino.png"
Var OpenFromXML = CurrentXMLFileName2 Var OpenFromXML = CurrentXMLFileName2
@ -10433,7 +10433,7 @@ ICED ESPRESSO" </Value>
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<State> showthaiText </State> <State> showthaiText </State>
<Value> "กาแฟ นม และ นม" </Value> <Value> "กาแฟ นม และ ฟองนม" </Value>
</Text> </Text>
<Text> <Text>
<X> 16 </X> <X> 16 </X>
@ -10603,7 +10603,7 @@ ICED ESPRESSO" </Value>
<EventOnClick> <EventOnClick>
Var NameDrink = "CAPPUCINO" Var NameDrink = "CAPPUCINO"
Var NameDrinkTH = "คาปูชิโน่" Var NameDrinkTH = "คาปูชิโน่"
Var DrinkDescriptionTH = "กาแฟ นม และ นม" Var DrinkDescriptionTH = "กาแฟ นม และ ฟองนม"
Var DrinkDescription = "Espresso, Milk, Foamed milk" Var DrinkDescription = "Espresso, Milk, Foamed milk"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_cappuccino.png" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_cappuccino.png"
Var OpenFromXML = CurrentXMLFileName2 Var OpenFromXML = CurrentXMLFileName2
@ -10682,7 +10682,7 @@ ICED ESPRESSO" </Value>
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<State> showthaiText </State> <State> showthaiText </State>
<Value> "กาแฟ นม และ นม" </Value> <Value> "กาแฟ นม และ ฟองนม" </Value>
</Text> </Text>
<Text> <Text>
<X> 16 </X> <X> 16 </X>

8
xml/page_catalog_group_health.xml
View file

@ -785,7 +785,7 @@
<EventOnClick> <EventOnClick>
Var NameDrink = "CAFE' LATTE" Var NameDrink = "CAFE' LATTE"
Var NameDrinkTH = "ลาเต้" Var NameDrinkTH = "ลาเต้"
Var DrinkDescriptionTH = "กาแฟ นม และ นม" Var DrinkDescriptionTH = "กาแฟ นม และ ฟองนม"
Var DrinkDescription = "Espresso, Milk, Foamed milk" Var DrinkDescription = "Espresso, Milk, Foamed milk"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_latte_Healthy.png" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_latte_Healthy.png"
Var OpenFromXML = CurrentXMLFileName2 Var OpenFromXML = CurrentXMLFileName2
@ -864,7 +864,7 @@
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<State> showthaiText </State> <State> showthaiText </State>
<Value> "กาแฟ นม และ นม" </Value> <Value> "กาแฟ นม และ ฟองนม" </Value>
</Text> </Text>
<Text> <Text>
<X> 16 </X> <X> 16 </X>
@ -1290,7 +1290,7 @@ Milk, Sugar" </Value>
<EventOnClick> <EventOnClick>
Var NameDrink = "CAPPUCINO" Var NameDrink = "CAPPUCINO"
Var NameDrinkTH = "คาปูชิโน่" Var NameDrinkTH = "คาปูชิโน่"
Var DrinkDescriptionTH = "กาแฟ นม และ นม" Var DrinkDescriptionTH = "กาแฟ นม และ ฟองนม"
Var DrinkDescription = "Espresso, Milk, Foamed milk" Var DrinkDescription = "Espresso, Milk, Foamed milk"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_Cappu_Healthy.png" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_Cappu_Healthy.png"
Var OpenFromXML = CurrentXMLFileName2 Var OpenFromXML = CurrentXMLFileName2
@ -1369,7 +1369,7 @@ Milk, Sugar" </Value>
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<State> showthaiText </State> <State> showthaiText </State>
<Value> "กาแฟ นม และ นม" </Value> <Value> "กาแฟ นม และ ฟองนม" </Value>
</Text> </Text>
<Text> <Text>
<X> 16 </X> <X> 16 </X>

4
xml/page_catalog_group_recommend.xml
View file

@ -6398,7 +6398,7 @@ AMERICANO" </Value>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventOnClick> <EventOnClick>
Var NameDrink = "ROSALYN ROSALYN" Var NameDrink = "ROSALYN AMERICANO"
Var NameDrinkTH = "อเมริกาโน ROSALYN" Var NameDrinkTH = "อเมริกาโน ROSALYN"
Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (washed process) กลิ่นกุหลาบ และ เบอร์รี่" Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (washed process) กลิ่นกุหลาบ และ เบอร์รี่"
Var DrinkDescription = "Light Roast (natural process) Pink​ Rose & Berry" Var DrinkDescription = "Light Roast (natural process) Pink​ Rose & Berry"
@ -6493,7 +6493,7 @@ ROSALYN" </Value>
<Color> 0x322B26 </Color> <Color> 0x322B26 </Color>
<State> showengText </State> <State> showengText </State>
<Value> "ROSALYN <Value> "ROSALYN
ROSALYN" </Value> AMERICANO" </Value>
</Text> </Text>
<Text> <Text>
<X> 16 </X> <X> 16 </X>

172
xml/page_topping_select5.xml
View file

@ -1482,93 +1482,93 @@
<Block> ;<Block>
<Width> 986 </Width> ;<Width> 986 </Width>
<Height> 160 </Height> ;<Height> 160 </Height>
<MarginTop> 20 </MarginTop> ;<MarginTop> 20 </MarginTop>
<State> blendedStateShow </State> ;<State> blendedStateShow </State>
<Image> ;<Image>
<Filename> Var( DirImage + "/bg_blended.png" )</Filename> ;<Filename> Var( DirImage + "/bg_blended.png" )</Filename>
</Image> ;</Image>
;
;<Button>
;<X> 40 </X>
;<Y> 72 </Y>
;<State> blendedState </State>
;<Mode> "No" </Mode>
;<Animation>
; <Style> "shake-text" </Style>
; <OnEvent> "OnValueChange" </OnEvent>
;</Animation>
;<Filename> Var( DirImage + "/bn_blended.png" ) </Filename>
;<FilenamePress> Var( DirImage + "/bp_blended.png" ) </FilenamePress>
;<FilenameDisable> Var( DirImage + "/bd_blended.png" ) </FilenameDisable>
;<FilenameForce> Var( DirImage + "/bp_blended.png" ) </FilenameForce>
;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
;<Volume> SoundVolume </Volume>
;<EventClick>
;
; SAVELOG "Press Smoothies"
;
; If blendedState = "Press" Then
; Var blendedState = "Enable"
; Else
; Var blendedState = "Press"
; EndIf
;
; Function 1
;
; Refresh
;</EventClick>
;</Button>
<Button> ;<Button>
<X> 40 </X> ;<X> 896 </X>
<Y> 72 </Y> ;<Y> 79 </Y>
<State> blendedState </State> ;<State> blendedState </State>
<Mode> "No" </Mode> ;<Mode> "No" </Mode>
<Animation> ;<Animation>
<Style> "shake-text" </Style> ; <Style> "shake-text" </Style>
<OnEvent> "OnValueChange" </OnEvent> ; <OnEvent> "OnValueChange" </OnEvent>
</Animation> ;</Animation>
<Filename> Var( DirImage + "/bn_blended.png" ) </Filename> ;<Filename> Var( DirImage + "/cb_notcheck.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bp_blended.png" ) </FilenamePress> ;<FilenamePress> Var( DirImage + "/cb_checked.png" ) </FilenamePress>
<FilenameDisable> Var( DirImage + "/bd_blended.png" ) </FilenameDisable> ;<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
<FilenameForce> Var( DirImage + "/bp_blended.png" ) </FilenameForce> ;<FilenameForce> Var( DirImage + "/cb_force_checked.png" ) </FilenameForce>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> ;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> ;<Volume> SoundVolume </Volume>
<EventClick> ;<EventClick>
;
SAVELOG "Press Smoothies" ; SAVELOG "Press Smoothies"
;
If blendedState = "Press" Then ; If blendedState = "Press" Then
Var blendedState = "Enable" ; Var blendedState = "Enable"
Else ; Else
Var blendedState = "Press" ; Var blendedState = "Press"
EndIf ; EndIf
;
Function 1 ; Function 1
;
Refresh ; Refresh
</EventClick> ;
</Button> ;</EventClick>
;</Button>
<Button> ;
<X> 896 </X> ;<Image>
<Y> 79 </Y> ;<State> showText7 </State>
<State> blendedState </State> ;<X> 602 </X>
<Mode> "No" </Mode> ;<Y> 64 </Y>
<Animation> ;<Filename> Var( DirImage + "/text7.png" ) </Filename>
<Style> "shake-text" </Style> ;</Image>
<OnEvent> "OnValueChange" </OnEvent> ;
</Animation> ;<Image>
<Filename> Var( DirImage + "/cb_notcheck.png" ) </Filename> ;<State> blendedStateTxt </State>
<FilenamePress> Var( DirImage + "/cb_checked.png" ) </FilenamePress> ;<X> 602 </X>
<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable> ;<Y> 64 </Y>
<FilenameForce> Var( DirImage + "/cb_force_checked.png" ) </FilenameForce> ;<Filename> Var( DirImage + "/text5.png" ) </Filename>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> ;</Image>
<Volume> SoundVolume </Volume> ;
<EventClick> ;</Block>
SAVELOG "Press Smoothies"
If blendedState = "Press" Then
Var blendedState = "Enable"
Else
Var blendedState = "Press"
EndIf
Function 1
Refresh
</EventClick>
</Button>
<Image>
<State> showText7 </State>
<X> 602 </X>
<Y> 64 </Y>
<Filename> Var( DirImage + "/text7.png" ) </Filename>
</Image>
<Image>
<State> blendedStateTxt </State>
<X> 602 </X>
<Y> 64 </Y>
<Filename> Var( DirImage + "/text5.png" ) </Filename>
</Image>
</Block>
; ;
; ;
; ;

327
xml/page_topping_select6.xml
View file

@ -250,22 +250,19 @@
If hot_button_state = "Disable2" Then If hot_button_state = "Disable2" Then
Var text_price_d1 = "" Var text_price_d1 = ""
Else Else
Var text_price_d1 = "(฿" + PriceD1 Var text_price_d1 !assigned IntFormat( PriceD1 , DisplayFormat, PreScaleConvert)
Var text_price_d1 = text_price_d1 + ")"
EndIf EndIf
If cold_button_state = "Disable2" Then If cold_button_state = "Disable2" Then
Var text_price_d2 = "" Var text_price_d2 = ""
Else Else
Var text_price_d2 = "(฿" + PriceD2 Var text_price_d2 !assigned IntFormat( PriceD2 , DisplayFormat, PreScaleConvert)
Var text_price_d2 = text_price_d2 + ")"
EndIf EndIf
If blend_button_state = "Disable2" Then If blend_button_state = "Disable2" Then
Var text_price_d3 = "" Var text_price_d3 = ""
Else Else
Var text_price_d3 = "(฿" + PriceD3 Var text_price_d3 !assigned IntFormat( PriceD3 , DisplayFormat, PreScaleConvert)
Var text_price_d3 = text_price_d3 + ")"
EndIf EndIf
DEBUGVAR PD_CODE1 DEBUGVAR PD_CODE1
@ -423,9 +420,7 @@
EndIf EndIf
EndIf EndIf
If new_layout = "true" Then Function 2
Function 2
EndIf
RefreshAll RefreshAll
@ -550,7 +545,19 @@
EndIf EndIf
DEBUGVAR SubMenuGroupIDSlot6_1 DEBUGVAR SubMenuGroupIDSlot6_1
; i f Hot menu disable away
If hot_button_state = "PressForever" Then
If showOreoAddEnable = "Enable" Then
Var showOreoAddEnable = "Disable"
EndIf
If showOreoAddEnable = "Press" Then
Var showOreoAddEnable = "Disable"
EndIf
EndIf
; first time.
If blend_button_state = "PressForever" Then If blend_button_state = "PressForever" Then
Else Else
@ -665,7 +672,6 @@
EndIf EndIf
If UserSeletedSugar = 0 Then If UserSeletedSugar = 0 Then
If SugarModeUpdateWhenChangeDrinkType = 1 Then If SugarModeUpdateWhenChangeDrinkType = 1 Then
Var SugarModeUpdateWhenChangeDrinkType = 0 Var SugarModeUpdateWhenChangeDrinkType = 0
@ -819,6 +825,8 @@
Var SugarState4 = "Enable" Var SugarState4 = "Enable"
Var SugarState5 = "Enable" Var SugarState5 = "Enable"
DEBUGVAR "set default Powder Sugar"
If toppingID1index1 = toppingID1Default Then If toppingID1index1 = toppingID1Default Then
Var SugarState1 = "PressForever" Var SugarState1 = "PressForever"
Var sugar_default_flag = 1 Var sugar_default_flag = 1
@ -847,6 +855,9 @@
If sugar_default_flag = 0 Then If sugar_default_flag = 0 Then
Var SugarState1 = "PressForever" Var SugarState1 = "PressForever"
EndIf EndIf
DEBUGVAR toppingID1Default
DEBUGVAR SugarState1
EndIf EndIf
@ -986,6 +997,8 @@
EndIf EndIf
EndIf EndIf
DEBUGVAR SelectDrinkType
If SelectDrinkType = 0 Then If SelectDrinkType = 0 Then
Var SugarState1 = "Enable" Var SugarState1 = "Enable"
Var SugarState2 = "Enable" Var SugarState2 = "Enable"
@ -1150,9 +1163,10 @@
DEBUGVAR showShotEnable DEBUGVAR showShotEnable
DEBUGVAR showOreoAddEnable DEBUGVAR showOreoAddEnable
DEBUGVAR ShotCoffeePremium DEBUGVAR ShotCoffeePremium
SAVELOG toppingID2price1 DEBUGVAR toppingID2price1
SAVELOG toppingID2price2 DEBUGVAR toppingID2price2
SAVELOG toppingID2price3 DEBUGVAR toppingID2price3
Function 2
EndIf EndIf
@ -1281,6 +1295,7 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
Var SelectDrinkType = 1
SAVELOG "Press hot" SAVELOG "Press hot"
@ -1314,9 +1329,9 @@
Var high_light_drink_type = "Invisible" Var high_light_drink_type = "Invisible"
Function 2 ;Function 2
Refresh ;Refresh
</EventClick> </EventClick>
@ -1337,6 +1352,7 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
Var SelectDrinkType = 1
SAVELOG "Press cold" SAVELOG "Press cold"
@ -1366,9 +1382,9 @@
Var topping_price_refresh = 0 Var topping_price_refresh = 0
Topping "Load" PD_CODE2 Topping "Load" PD_CODE2
Function 2 ;Function 2
Refresh ;Refresh
</EventClick> </EventClick>
</Button> </Button>
@ -1389,6 +1405,7 @@
<EventClick> <EventClick>
SAVELOG "Press blend" SAVELOG "Press blend"
Var SelectDrinkType = 1
Var blend_button_state = "PressForever" Var blend_button_state = "PressForever"
@ -1416,9 +1433,9 @@
Var topping_price_refresh = 0 Var topping_price_refresh = 0
Topping "Load" PD_CODE3 Topping "Load" PD_CODE3
Function 2 ;Function 2
Refresh ;Refresh
</EventClick> </EventClick>
</Button> </Button>
@ -1462,93 +1479,93 @@
<Block> ;<Block>
<Width> 986 </Width> ;<Width> 986 </Width>
<Height> 160 </Height> ;<Height> 160 </Height>
<MarginTop> 20 </MarginTop> ;<MarginTop> 20 </MarginTop>
<State> blendedStateShow </State> ;<State> blendedStateShow </State>
<Image> ;<Image>
<Filename> Var( DirImage + "/bg_blended.png" )</Filename> ;<Filename> Var( DirImage + "/bg_blended.png" )</Filename>
</Image> ;</Image>
;
<Button> ;<Button>
<X> 40 </X> ;<X> 40 </X>
<Y> 72 </Y> ;<Y> 72 </Y>
<State> blendedState </State> ;<State> blendedState </State>
<Mode> "No" </Mode> ;<Mode> "No" </Mode>
<Animation> ;<Animation>
<Style> "shake-text" </Style> ; <Style> "shake-text" </Style>
<OnEvent> "OnValueChange" </OnEvent> ; <OnEvent> "OnValueChange" </OnEvent>
</Animation> ;</Animation>
<Filename> Var( DirImage + "/bn_blended.png" ) </Filename> ;<Filename> Var( DirImage + "/bn_blended.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bp_blended.png" ) </FilenamePress> ;<FilenamePress> Var( DirImage + "/bp_blended.png" ) </FilenamePress>
<FilenameDisable> Var( DirImage + "/bd_blended.png" ) </FilenameDisable> ;<FilenameDisable> Var( DirImage + "/bd_blended.png" ) </FilenameDisable>
<FilenameForce> Var( DirImage + "/bp_blended.png" ) </FilenameForce> ;<FilenameForce> Var( DirImage + "/bp_blended.png" ) </FilenameForce>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> ;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> ;<Volume> SoundVolume </Volume>
<EventClick> ;<EventClick>
;
SAVELOG "Press Smoothies" ; SAVELOG "Press Smoothies"
;
If blendedState = "Press" Then ; If blendedState = "Press" Then
Var blendedState = "Enable" ; Var blendedState = "Enable"
Else ; Else
Var blendedState = "Press" ; Var blendedState = "Press"
EndIf ; EndIf
;
Function 1 ; Function 1
;
Refresh ; Refresh
</EventClick> ;</EventClick>
</Button> ;</Button>
;
<Button> ;<Button>
<X> 896 </X> ;<X> 896 </X>
<Y> 79 </Y> ;<Y> 79 </Y>
<State> blendedState </State> ;<State> blendedState </State>
<Mode> "No" </Mode> ;<Mode> "No" </Mode>
<Animation> ;<Animation>
<Style> "shake-text" </Style> ; <Style> "shake-text" </Style>
<OnEvent> "OnValueChange" </OnEvent> ; <OnEvent> "OnValueChange" </OnEvent>
</Animation> ;</Animation>
<Filename> Var( DirImage + "/cb_notcheck.png" ) </Filename> ;<Filename> Var( DirImage + "/cb_notcheck.png" ) </Filename>
<FilenamePress> Var( DirImage + "/cb_checked.png" ) </FilenamePress> ;<FilenamePress> Var( DirImage + "/cb_checked.png" ) </FilenamePress>
<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable> ;<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
<FilenameForce> Var( DirImage + "/cb_force_checked.png" ) </FilenameForce> ;<FilenameForce> Var( DirImage + "/cb_force_checked.png" ) </FilenameForce>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> ;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> ;<Volume> SoundVolume </Volume>
<EventClick> ;<EventClick>
;
SAVELOG "Press Smoothies" ; SAVELOG "Press Smoothies"
;
If blendedState = "Press" Then ; If blendedState = "Press" Then
Var blendedState = "Enable" ; Var blendedState = "Enable"
Else ; Else
Var blendedState = "Press" ; Var blendedState = "Press"
EndIf ; EndIf
;
Function 1 ; Function 1
;
Refresh ; Refresh
;
</EventClick> ;</EventClick>
</Button> ;</Button>
;
<Image> ;<Image>
<State> showText7 </State> ;<State> showText7 </State>
<X> 602 </X> ;<X> 602 </X>
<Y> 64 </Y> ;<Y> 64 </Y>
<Filename> Var( DirImage + "/text7.png" ) </Filename> ;<Filename> Var( DirImage + "/text7.png" ) </Filename>
</Image> ;</Image>
;
<Image> ;<Image>
<State> blendedStateTxt </State> ;<State> blendedStateTxt </State>
<X> 602 </X> ;<X> 602 </X>
<Y> 64 </Y> ;<Y> 64 </Y>
<Filename> Var( DirImage + "/text5.png" ) </Filename> ;<Filename> Var( DirImage + "/text5.png" ) </Filename>
</Image> ;</Image>
;
</Block> ;</Block>
; ;
; ;
; ;
@ -2524,7 +2541,7 @@
<Height> 64 </Height> <Height> 64 </Height>
<State> ExtraTopping </State> <State> ExtraTopping </State>
<Image> <Image>
<Filename> "ROOT/taobin_project/image/topping2/bg_top.png" </Filename> <Filename> Var( DirImage + "/bg_top.png" ) </Filename>
</Image> </Image>
</Row1> </Row1>
; ;
@ -2553,27 +2570,16 @@
<EventClick> <EventClick>
SAVELOG "premium shot press" SAVELOG "premium shot press"
If ShotCoffeePremium = "Press" Then If ShotCoffeePremium = "Press" Then
Var ShotCoffeePremium = "Enable" Var ShotCoffeePremium = "Enable"
Var PriceDrinkTmp = PriceDrinkTmp - toppingID2price2
Var topping2 = toppingID2index1
Var DisableUsingCode = "false"
SAVELOG "Deselect add premium shot"
Else Else
Var ShotCoffeePremium = "Press" Var ShotCoffeePremium = "Press"
Var PriceDrinkTmp = PriceDrinkTmp + toppingID2price2
Var topping2 = toppingID2index2
Var DisableUsingCode = "true"
SAVELOG "Select add premium shot"
EndIf EndIf
Var PriceDrinkNoTop = PriceDrinkTmp Function 2
Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
SAVELOG PriceDrinkTmp
Refresh Refresh
</EventClick> </EventClick>
</Button> </Button>
@ -2590,25 +2596,15 @@
<EventClick> <EventClick>
SAVELOG "premium shot press" SAVELOG "premium shot press"
If ShotCoffeePremium = "Press" Then If ShotCoffeePremium = "Press" Then
Var ShotCoffeePremium = "Enable" Var ShotCoffeePremium = "Enable"
Var PriceDrinkTmp = PriceDrinkTmp - toppingID2price2
Var topping2 = toppingID2index1
Var DisableUsingCode = "false"
SAVELOG "Deselect add premium shot"
Else Else
Var ShotCoffeePremium = "Press" Var ShotCoffeePremium = "Press"
Var PriceDrinkTmp = PriceDrinkTmp + toppingID2price2
Var topping2 = toppingID2index2
Var DisableUsingCode = "true"
SAVELOG "Select add premium shot"
EndIf EndIf
Var PriceDrinkNoTop = PriceDrinkTmp Function 2
Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
SAVELOG PriceDrinkTmp
Refresh Refresh
@ -2639,7 +2635,7 @@
<Image> <Image>
<X> 0 </X> <X> 0 </X>
<Y> 0 </Y> <Y> 0 </Y>
<Filename> Var( DirImage + "/bg_top_shot2.png") </Filename> <Filename> Var( DirImage + "/bg_top_shot.png") </Filename>
</Image> </Image>
; ;
<Button> <Button>
@ -2725,7 +2721,7 @@
<Image> <Image>
<X> 0 </X> <X> 0 </X>
<Y> 0 </Y> <Y> 0 </Y>
<Filename> Var( DirImage + "/bg_top_oreo2.png") </Filename> <Filename> Var( DirImage + "/bg_top_oreo.png") </Filename>
</Image> </Image>
; ;
<Button> <Button>
@ -3590,18 +3586,16 @@
DEBUGVAR PriceDrinkNoTop DEBUGVAR PriceDrinkNoTop
DEBUGVAR PriceDiff DEBUGVAR PriceDiff
DEBUGVAR showShotEnable DEBUGVAR showShotEnable
Var TOPPING_PRICE = 0
If ShotCoffeePremium = "Press" Then
If showShotEnable = "Press" Then
If blendedState = "Press" Then If blendedState = "Press" Then
Var PriceDrinkTmp = PriceDrinkNoTop Var PriceDrinkTmp = PriceDrinkNoTop
EndIf EndIf
Var blendedState = "Disable" Var blendedState = "Disable"
Var TOPPING_PRICE = 0 Var TOPPING_PRICE = 0
;Var PriceDrinkTmp = PriceDrinkNoTop + toppingID2price2
Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2 Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2
Var topping2 = toppingID2index2 Var topping2 = toppingID2index2
@ -3610,31 +3604,57 @@
Var showText7 = "Enable" Var showText7 = "Enable"
SAVELOG "Select add normal shot" SAVELOG "Select premi normal shot"
Else Else
If blendedState = "Disable" Then
Var blendedState = "Enable" If showShotEnable = "Press" Then
If blendedState = "Press" Then
Var PriceDrinkTmp = PriceDrinkNoTop
EndIf
Var blendedState = "Disable"
Var TOPPING_PRICE = 0
;Var PriceDrinkTmp = PriceDrinkNoTop + toppingID2price2
Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2
Var topping2 = toppingID2index2
Var DisableUsingCode = "true"
Var showText7 = "Enable"
SAVELOG "Select add normal shot"
Else
If blendedState = "Disable" Then
Var blendedState = "Enable"
EndIf
Var PriceDrinkTmp = PriceDrinkNoTop
Var topping2 = toppingID2index1
Var DisableUsingCode = "false"
SAVELOG "Deselect add normal shot"
Var showText7 = "Invisible"
EndIf EndIf
Var PriceDrinkTmp = PriceDrinkNoTop
Var topping2 = toppingID2index1
Var DisableUsingCode = "false"
SAVELOG "Deselect add normal shot"
Var showText7 = "Invisible"
EndIf EndIf
DEBUGVAR showOreoAddEnable DEBUGVAR showOreoAddEnable
DEBUGVAR TOPPING_PRICE
If showOreoAddEnable = "Press" Then If showOreoAddEnable = "Press" Then
Var TOPPING_PRICE = TOPPING_PRICE + toppingID6price2 Var TOPPING_PRICE = TOPPING_PRICE + toppingID6price2
Var topping6 = toppingID6index2 Var topping6 = toppingID6index2
Var DisableUsingCode = "true" Var DisableUsingCode = "true"
Else Else
Var PriceDrinkTmp = PriceDrinkNoTop
;Var PriceDrinkTmp = PriceDrinkNoTop
Var topping6 = toppingID6index1 Var topping6 = toppingID6index1
@ -3646,13 +3666,15 @@
DEBUGVAR SelectDrinkType DEBUGVAR SelectDrinkType
DEBUGVAR showShotEnable DEBUGVAR showShotEnable
DEBUGVAR blendedState DEBUGVAR PriceDrinkTmpShow
Var PriceDrinkTmp = PriceDrinkNoTop + TOPPING_PRICE Var PriceDrinkTmp = PriceDrinkNoTop + TOPPING_PRICE
Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
If SelectDrinkType = 0 Then If SelectDrinkType = 0 Then
Var PriceDrinkTmpShow = "---" Var PriceDrinkTmpShow = "---"
Else
Var PriceDrinkTmpShow !assigned IntFormat( PriceDrinkTmpShow , DisplayFormat, PreScaleConvert)
EndIf EndIf
SAVELOG PriceDrinkTmp SAVELOG PriceDrinkTmp
@ -3664,6 +3686,7 @@
Var Timeout = 0 Var Timeout = 0
RefreshAll RefreshAll
</Function2> </Function2>

4
xml_main/startup.xml
View file

@ -106,8 +106,8 @@
Var RandomPromotionMyworld = 0 Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0 Var RandomSalePackage = 0
Var XMLPageVersion = "6.72" Var XMLPageVersion = "6.74"
Var XMLPageVersionInt = 672 Var XMLPageVersionInt = 674
</EventOpen> </EventOpen>
<Text> <Text>