Merge branch 'masterpiece' of ssh://192.168.10.159/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
8962672163
271 changed files with 62547 additions and 14252 deletions
19296
xml/event/double_promotion_americano_and_apple_farm_festival.xml
Normal file
19296
xml/event/double_promotion_americano_and_apple_farm_festival.xml
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,30 @@
|
|||
[
|
||||
{
|
||||
"name": "americano",
|
||||
"template": "/event/promotion_video_template.inc",
|
||||
"config": {
|
||||
"normal_eng": "ROOT/taobin_project/image/event/americano/americano_banner.png",
|
||||
"normal_thai": "ROOT/taobin_project/image/event/americano/americano_banner.png",
|
||||
"press_eng": "ROOT/taobin_project/image/event/americano/americano_banner.png",
|
||||
"press_thai": "ROOT/taobin_project/image/event/americano/americano_banner.png",
|
||||
"disable_eng": "ROOT/taobin_project/image/event/americano/americano_banner.png",
|
||||
"disable_thai": "ROOT/taobin_project/image/event/americano/americano_banner.png",
|
||||
"video_eng": "ROOT/taobin_project/image/event/americano/americano_banner.mp4",
|
||||
"video_thai": "ROOT/taobin_project/image/event/americano/americano_banner.mp4",
|
||||
"event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_americano.xml"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "apple_farm_festival",
|
||||
"template": "/event/promotion_template.inc",
|
||||
"config": {
|
||||
"normal_eng": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
|
||||
"normal_thai": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
|
||||
"press_eng": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
|
||||
"press_thai": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
|
||||
"disable_eng": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
|
||||
"disable_thai": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
|
||||
"event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_apple_farm_festival.xml"
|
||||
}
|
||||
}
|
||||
]
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -5,10 +5,10 @@ DEBUGVAR CocktailShow
|
|||
DEBUGVAR OpenFromPageBoard
|
||||
|
||||
DEBUGVAR SchoolOvaltinePro
|
||||
DEBUGVAR AppleFarmFestivalPro
|
||||
DEBUGVAR HappyTriosPro
|
||||
DEBUGVAR TaiwaneseTeaPro
|
||||
DEBUGVAR AmericanoPro
|
||||
DEBUGVAR AppleFarmFestivalPro
|
||||
DEBUGVAR Discount7_7Pro
|
||||
|
||||
Var PromotionState1 = "Invisible"
|
||||
|
|
@ -75,6 +75,15 @@ Else
|
|||
Var PromotionState2 = "Enable"
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_americano_and_taiwanese_tea.xml"
|
||||
EndIf
|
||||
|
||||
If AppleFarmFestivalPro = 1 Then
|
||||
Var PromotionState2 = "Enable"
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_americano_and_apple_farm_festival.xml"
|
||||
EndIf
|
||||
Else
|
||||
If AppleFarmFestivalPro = 1 Then
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_apple_farm_festival.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
|
|
|||
|
|
@ -83,9 +83,6 @@ Var MatchaEveryDayPro = 0
|
|||
; Oreo volcano, 1 - 31 May
|
||||
Var OreoVolcanoPro = 0
|
||||
|
||||
; Apple Farm Festival, 1 - 30 June
|
||||
Var AppleFarmFestivalPro = 0
|
||||
|
||||
; Happy Trios, 1 - 30 June
|
||||
Var HappyTriosPro = 0
|
||||
|
||||
|
|
@ -101,6 +98,9 @@ Var AmericanoPro = 0
|
|||
;7.7 discount code, 7 - 13 July
|
||||
Var Discount7_7Pro = 0
|
||||
|
||||
; Apple Farm Festival, 15 - 31 July
|
||||
Var AppleFarmFestivalPro = 0
|
||||
|
||||
Var NewCollectPoint = 1
|
||||
Var PaymentCodeShouldCollectPromotionPoint = 0
|
||||
|
||||
|
|
@ -182,7 +182,6 @@ EndIf
|
|||
If SystemDateMonthInt = 7 Then
|
||||
|
||||
Var AmericanoPro = 1
|
||||
Var TaiwaneseTeaPro = 1
|
||||
|
||||
If SystemDateDayInt >= 7 Then
|
||||
If SystemDateDayInt <= 13 Then
|
||||
|
|
@ -190,6 +189,12 @@ If SystemDateMonthInt = 7 Then
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
If SystemDateDayInt >= 15 Then
|
||||
Var AppleFarmFestivalPro = 1
|
||||
Else
|
||||
Var TaiwaneseTeaPro = 1
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -625,9 +625,13 @@
|
|||
If POS_SELL_MODE = "NORMAL" Then
|
||||
|
||||
Else
|
||||
Var BackgroundColor = "0x2C2F4E"
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
|
||||
Open "ROOT/taobin_project/xml/page_pos_machine_midnight_close.xml"
|
||||
If POS_SELL_MODE = "CLOSE" Then
|
||||
Var BackgroundColor = "0x2C2F4E"
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
|
||||
Open "ROOT/taobin_project/xml/page_pos_machine_midnight_close.xml"
|
||||
Else
|
||||
OpenInst 0 "ROOT/taobin_project/xml/page_pos_machine_network_down.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
|
@ -2518,9 +2522,13 @@ PRICE "Reset" "-"
|
|||
If POS_SELL_MODE = "NORMAL" Then
|
||||
|
||||
Else
|
||||
Var BackgroundColor = "0x2C2F4E"
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
|
||||
Open "ROOT/taobin_project/xml/page_pos_machine_midnight_close.xml"
|
||||
If POS_SELL_MODE = "CLOSE" Then
|
||||
Var BackgroundColor = "0x2C2F4E"
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
|
||||
Open "ROOT/taobin_project/xml/page_pos_machine_midnight_close.xml"
|
||||
Else
|
||||
OpenInst 0 "ROOT/taobin_project/xml/page_pos_machine_network_down.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
|
|||
|
|
@ -459,6 +459,10 @@
|
|||
If SELLSTATUS = "SELLNOCASH" Then
|
||||
Var SELLONLINE = 1
|
||||
EndIf
|
||||
|
||||
If POS_SELL_MODE = "OFFLINE" Then
|
||||
Var SELLONLINE = 0
|
||||
EndIf
|
||||
|
||||
If SELLONLINE = 0 Then
|
||||
SAVELOG "POS-MACHINE: OFFLINE in page_payment.xml"
|
||||
|
|
|
|||
|
|
@ -32,7 +32,9 @@
|
|||
EndIf
|
||||
|
||||
If SELLONLINE = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_board.xml"
|
||||
If POS_SELL_MODE = "NORMAL" Then
|
||||
Open "ROOT/taobin_project/xml/page_board.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Var Timeout = 0
|
||||
|
|
|
|||
|
|
@ -1,16 +1,7 @@
|
|||
|
||||
If FrontDoorVersionInt > 19999 Then
|
||||
LEDv2 LedV4#103 On 200 20 0 255 10
|
||||
LEDv2 LedV4#104 On 200 20 0 255 10
|
||||
LEDv2 LedV4#105 On 200 20 0 255 10
|
||||
LEDv2 LedV4#106 On 200 20 0 255 10
|
||||
LEDv2 LedV4#107 On 200 20 0 255 10
|
||||
LEDv2 LedV4#108 On 200 20 0 255 10
|
||||
LEDv2 LedV4#109 On 200 20 0 255 10
|
||||
LEDv2 LedV4#110 On 200 20 0 255 10
|
||||
LEDv2 LedV4#111 On 200 20 0 255 10
|
||||
LEDv2 LedV4#112 On 200 20 0 255 10
|
||||
LEDv2 LedV4#113 On 200 20 0 255 10
|
||||
|
||||
LEDv2 LedDoorCupV2 On 200 20 0 255 10
|
||||
|
||||
SAVELOG "LEDv4.SlowBrinkHorizontal"
|
||||
EndIf
|
||||
|
|
@ -1,16 +1,6 @@
|
|||
DEBUGVAR "AllOffv4"
|
||||
If FrontDoorVersionInt > 19999 Then
|
||||
LEDv2 LedV4#103 Off 0 0 0 1 0
|
||||
LEDv2 LedV4#104 Off 0 0 0 1 0
|
||||
LEDv2 LedV4#105 Off 0 0 0 1 0
|
||||
LEDv2 LedV4#106 Off 0 0 0 1 0
|
||||
LEDv2 LedV4#107 Off 0 0 0 1 0
|
||||
LEDv2 LedV4#108 Off 0 0 0 1 0
|
||||
LEDv2 LedV4#109 Off 0 0 0 1 0
|
||||
LEDv2 LedV4#110 Off 0 0 0 1 0
|
||||
LEDv2 LedV4#111 Off 0 0 0 1 0
|
||||
LEDv2 LedV4#112 Off 0 0 0 1 0
|
||||
LEDv2 LedV4#113 Off 0 0 0 1 0
|
||||
LEDv2 LedDoorCupV2 Off 0 0 0 1 0
|
||||
|
||||
SAVELOG "LEDv4.AllOffHorizontal"
|
||||
EndIf
|
||||
|
|
@ -3,17 +3,7 @@ If FrontDoorVersionInt > 19999 Then
|
|||
|
||||
LEDv2 LedV4All On 100 20 0 255 0
|
||||
|
||||
LEDv2 LedV4#103 On 200 20 0 255 10
|
||||
LEDv2 LedV4#104 On 200 20 0 255 10
|
||||
LEDv2 LedV4#105 On 200 20 0 255 10
|
||||
LEDv2 LedV4#106 On 200 20 0 255 10
|
||||
LEDv2 LedV4#107 On 200 20 0 255 10
|
||||
LEDv2 LedV4#108 On 200 20 0 255 10
|
||||
LEDv2 LedV4#109 On 200 20 0 255 10
|
||||
LEDv2 LedV4#110 On 200 20 0 255 10
|
||||
LEDv2 LedV4#111 On 200 20 0 255 10
|
||||
LEDv2 LedV4#112 On 200 20 0 255 10
|
||||
LEDv2 LedV4#113 On 200 20 0 255 10
|
||||
LEDv2 LedDoorCupV2 On 200 20 0 255 10
|
||||
|
||||
SAVELOG "LEDv4.PageDrinkOk"
|
||||
EndIf
|
||||
|
|
@ -5,17 +5,7 @@ If FrontDoorVersionInt > 19999 Then
|
|||
LEDv2 LedV4Mid Blink 100 20 0 4 10
|
||||
LEDv2 LedV4Bottom On 100 20 0 255 0
|
||||
|
||||
LEDv2 LedV4#103 Blink 200 20 0 4 10
|
||||
LEDv2 LedV4#104 Blink 200 20 0 4 10
|
||||
LEDv2 LedV4#105 Blink 200 20 0 4 10
|
||||
LEDv2 LedV4#106 Blink 200 20 0 4 10
|
||||
LEDv2 LedV4#107 Blink 200 20 0 4 10
|
||||
LEDv2 LedV4#108 Blink 200 20 0 4 10
|
||||
LEDv2 LedV4#109 Blink 200 20 0 4 10
|
||||
LEDv2 LedV4#110 Blink 200 20 0 4 10
|
||||
LEDv2 LedV4#111 Blink 200 20 0 4 10
|
||||
LEDv2 LedV4#112 Blink 200 20 0 4 10
|
||||
LEDv2 LedV4#113 Blink 200 20 0 4 10
|
||||
LEDv2 LedDoorCupV2 Blink 200 20 0 4 10
|
||||
|
||||
SAVELOG "LEDv4.PageThankYou"
|
||||
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@
|
|||
|
||||
<FrameScroll>
|
||||
|
||||
<Max> 6 </Max>
|
||||
<Max> 10 </Max>
|
||||
<X> 280 </X>
|
||||
<Y> 200 </Y>
|
||||
<Width> 600 </Width>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue