2 Commits

15 changed files with 143 additions and 24813 deletions

View File

@@ -1,115 +1,7 @@
[COMMON]
com_port_name=/dev/ttyS1
com_baud_rate=9600
lang1=lt_LT
lang2=en_GB
lang3=de_DE
lang4=ru_RU
lang5=
defaultLanguage=1
CharacterSet="ISO 8859-13"
showInfoButton=false
showHelpButton=false
#useLanguage=[128+][64+][32+][16]
useLanguage=240
#usePayment=[128+][64+][32+][16]
usePayment=96
#useVehicle=[128+][64+][32+][16+][8]
useVehicle=192
#useProduct=[128+][64+][32+][16+][8]
useProduct=192
textfile=/opt/app/ATBAPP/text/HMI_Texte.xml
logfile=/var/log/atbqt.log
alternativeLogoFile=/opt/app/ATBAPP/logo/logo_klaipeda2.png
feature_Log=off
feature_TouchFeedback=off
feature_StartButton=on
feature_selfOOO=off
feature_ShowParkingTime=off
suspend_methode=sysfs
suspend_program=
suspend_time=8
touch_feedback_gpio=121
touch_feedback_on_value=1
touch_feedback_off_value=0
#ooo_mode={useDisk|otherMachine}
ooo_mode=otherMachine
sellTimeout_time=60
showInfoButton=false
showHelpButton=false
useAppStates=1
statefile=/opt/app/ATBAPP/states/APP_States.xml
[SCREENCONFIG]
sc_31="1,1,0"
sc_33="1,0,1"
sc_3F="1,0,0"
sc_40="1,0,1"
sc_41="1,0,0"
sc_35="0,0,0"
sc_51="1,0,1"
sc_52="1,0,0"
sc_53="1,0,0"
[PLUGINS]
CCPlugin=AsyncPOS_CCPlugin
CalculatePricePlugin=MOBILISIS_CalculatePricePlugin
DeviceControllerPlugin=ATBDeviceControllerPlugin
[IngenicoISelf_CCPlugin]
debug=1
PortName=/dev/ttymxc0
ZVT=DE
sleep=1
sleepExtended=1
Currency=HUF
[TCP_CONTROL]
enable=1
[PAYMENT]
currencySymbol=
currencyISOCode=EUR
cashVariant=CoinsAndNotes
paymentPointInTime=poa
useDecimal=yes
[MOBILISIS_CalculatePricePlugin]
useDebug=1
tariffFileName=/etc/psa_tariff/tariff01.json
[ATBDeviceControllerPlugin] [ATBDeviceControllerPlugin]
printerEncoding=Windows-1257
printerLocale=lt_LT
serialPort=ttymxc2 serialPort=ttymxc2
printerEncoding="Windows-1257"
printerLocale="lt_LT"
[TCP_ZVT_CCPlugin]
CurrencyCode=EUR
debug=1
IP=192.168.6.242
Port=22000
SSL=0
ZVT=DE
sleep=1
printIntermediateStatus=1
Password=277296
NumberOfChars=37
dcHours="0"
[AsyncPOS_CCPlugin] [AsyncPOS_CCPlugin]
APAK=8AC304380E0E476BA2558B75DB9E2516 APAK=8AC304380E0E476BA2558B75DB9E2516
@@ -123,3 +15,101 @@ parity=0
sleep=0 sleep=0
stopBits=1 stopBits=1
terminalPowerOnOffHours="06:00:00,22:00:00" terminalPowerOnOffHours="06:00:00,22:00:00"
[COMMON]
%23ooo_mode={useDisk|otherMachine}
%23useLanguage=[128+][64+][32+][16]
%23usePayment=[128+][64+][32+][16]
%23useProduct=[128+][64+][32+][16+][8]
%23useVehicle=[128+][64+][32+][16+][8]
CharacterSet=ISO 8859-13
alternativeLogoFile=/opt/app/ATBAPP/logo/logo_Palanga.png
com_baud_rate=9600
com_port_name=/dev/ttyS1
defaultLanguage=1
feature_DBusDisplayControl=on
feature_DBusDisplayDimLow=off
feature_DBusSuspendControl=off
feature_Log=off
feature_ShowParkingTime=off
feature_StartButton=on
feature_TouchFeedback=off
feature_selfOOO=off
lang1=lt_LT
lang2=en_GB
lang3=de_DE
lang4=ru_RU
lang5=
logfile=/var/log/atbqt.log
ooo_alternativeLocation=
ooo_mode=otherMachine
ooo_serviceEmail=
ooo_serviceNumber=
sellTimeout_time=60
showHelpButton=false
showInfoButton=false
statefile=/etc/atbapp/states/APP_States.xml
suspend_methode=sysfs
suspend_program=
suspend_time=8
textfile=/etc/atbapp/text/HMI_Texte.xml
touch_feedback_gpio=121
touch_feedback_off_value=0
touch_feedback_on_value=1
useAppStates=1
useLanguage=240
usePayment=96
useProduct=192
useVehicle=192
[IngenicoISelf_CCPlugin]
Currency=HUF
PortName=/dev/ttymxc0
ZVT=DE
debug=1
sleep=1
sleepExtended=1
[MOBILISIS_CalculatePricePlugin]
tariffFileName=/etc/psa_tariff/tariff01.json
useDebug=1
[PAYMENT]
cashVariant=CoinsAndNotes
currencyISOCode=EUR
currencySymbol=
paymentPointInTime=poa
useDecimal=yes
useHonestPayment=on
[PLUGINS]
CCPlugin=AsyncPOS_CCPlugin
CalculatePricePlugin=MOBILISIS_CalculatePricePlugin
DeviceControllerPlugin=ATBDeviceControllerPlugin
[SCREENCONFIG]
sc_31="1,1,0"
sc_33="1,0,1"
sc_35="0,0,0"
sc_3F="1,0,0"
sc_40="1,0,1"
sc_41="1,0,0"
sc_51="1,0,1"
sc_52="1,0,0"
sc_53="1,0,0"
[TCP_CONTROL]
enable=1
[TCP_ZVT_CCPlugin]
CurrencyCode=EUR
IP=192.168.6.242
NumberOfChars=37
Password=277296
Port=22000
SSL=0
ZVT=DE
dcHours=0
debug=1
printIntermediateStatus=1
sleep=1

View File

@@ -940,74 +940,6 @@
<ru_RU>Минимальная плата за парковку</ru_RU> <ru_RU>Минимальная плата за парковку</ru_RU>
</Text> </Text>
</Screen> </Screen>
<Screen name="OVERPAID" screennr="0xB1">
<Text textnr="0x30">
<lt_LT>Stovėjimo laiko pabaiga:</lt_LT>
<en_GB>End of Parking time:</en_GB>
<de_DE>Parkende:</de_DE>
<ru_RU>Окончание времени парковки:</ru_RU>
</Text>
<Text textnr="0x31">
<lt_LT> </lt_LT>
<en_GB> </en_GB>
<de_DE> </de_DE>
<ru_RU> </ru_RU>
</Text>
<Text textnr="0x32">
<lt_LT>Suma:</lt_LT>
<en_GB>Amount:</en_GB>
<de_DE>Betrag:</de_DE>
<ru_RU>Сумма:</ru_RU>
</Text>
<Text textnr="0x33">
<lt_LT> </lt_LT>
<en_GB> </en_GB>
<de_DE> </de_DE>
<ru_RU> </ru_RU>
</Text>
<Text textnr="0x34">
<lt_LT>Spausdinti kvitą?</lt_LT>
<en_GB>Print receipt?</en_GB>
<de_DE>Quittung drucken?</de_DE>
<ru_RU>Распечатать квитанцию?</ru_RU>
</Text>
<Text textnr="0x35">
<lt_LT>ATŠAUKTI</lt_LT>
<en_GB>NO</en_GB>
<de_DE>NEIN</de_DE>
<ru_RU>НЕТ</ru_RU>
</Text>
<Text textnr="0x36">
<lt_LT>TĘSTI</lt_LT>
<en_GB>YES</en_GB>
<de_DE>JA</de_DE>
<ru_RU>ДА</ru_RU>
</Text>
<Text textnr="0x37">
<lt_LT> </lt_LT>
<en_GB> </en_GB>
<de_DE> </de_DE>
<ru_RU> </ru_RU>
</Text>
<Text name="user_message_01" textnr="0x81">
<lt_LT>Permoka!</lt_LT>
<en_GB>Overpaid</en_GB>
<de_DE>Überbezahlt</de_DE>
<ru_RU>Переплата!</ru_RU>
</Text>
<Text name="user_message_02" textnr="0x82">
<lt_LT>Pasiektas maksimalus monetų kiekis!</lt_LT>
<en_GB>Reached maximum number of coins.!</en_GB>
<de_DE>Maximalanzahl der Münzen erreicht!</de_DE>
<ru_RU>Достигнуто максимальное количество монет!</ru_RU>
</Text>
<Text name="user_message_04" textnr="0x84">
<lt_LT>Minimalus stovėjimo mokestis</lt_LT>
<en_GB>Minimum parking fee</en_GB>
<de_DE>Mindestparkgebühr</de_DE>
<ru_RU>Минимальная плата за парковку</ru_RU>
</Text>
</Screen>
<Screen name="Welcome2" screennr="0x3d"> <Screen name="Welcome2" screennr="0x3d">
<Text textnr="0x30"> <Text textnr="0x30">
<lt_LT>Sveiki!</lt_LT> <lt_LT>Sveiki!</lt_LT>
@@ -2568,61 +2500,5 @@
<de_DE>880012344</de_DE> <de_DE>880012344</de_DE>
<ru_RU>880012344</ru_RU> <ru_RU>880012344</ru_RU>
</Text> </Text>
</Screen> </Screen>
<Screen name="COMMON_USER_MESSAGES" screennr="0xF3">
<Text name="PAY_MORE" textnr="0x30">
<lt_LT>Mokėti daugiau</lt_LT>
<en_GB>pay more…</en_GB>
<de_DE>mehr zahlen…</de_DE>
<ru_RU>платить больше</ru_RU>
</Text>
<Text name="PAY_APPROPRIATELY" textnr="0x31">
<lt_LT>suteikite tikslią sumą…</lt_LT>
<en_GB>give the exact money…</en_GB>
<de_DE>passend zahlen…</de_DE>
<ru_RU>предоставьте точную сумму…</ru_RU>
</Text>
<Text name="NO_CANGE" textnr="0x32">
<lt_LT> </lt_LT>
<en_GB> </en_GB>
<de_DE> </de_DE>
<ru_RU> </ru_RU>
</Text>
<Text name="MINIMUM_PRICE" textnr="0x33">
<lt_LT>Minimalus stovėjimo mokestis</lt_LT>
<en_GB>Minimum parking fee</en_GB>
<de_DE>Mindestparkgebühr</de_DE>
<ru_RU>Минимальная плата за парковку</ru_RU>
</Text>
<Text name="MAXIMUM_PRICE" textnr="0x34">
<lt_LT>Maksimali bilieto suma</lt_LT>
<en_GB>Max. Ticket amount</en_GB>
<de_DE>Höchstparkdauer erreicht</de_DE>
<ru_RU>Максимальная сумма билета</ru_RU>
</Text>
<Text name="CARDPAYMENT_ONLY" textnr="0x35">
<lt_LT> </lt_LT>
<en_GB> </en_GB>
<de_DE> </de_DE>
<ru_RU> </ru_RU>
</Text>
<Text name="CASHPAYMENT_ONLY" textnr="0x36">
<lt_LT> </lt_LT>
<en_GB> </en_GB>
<de_DE> </de_DE>
<ru_RU> </ru_RU>
</Text>
<Text name="OVERPAID" textnr="0x37">
<lt_LT>Permoka!</lt_LT>
<en_GB>Overpaid</en_GB>
<de_DE>Überbezahlt</de_DE>
<ru_RU>Переплата!</ru_RU>
</Text>
<Text name="MAXIMUM_NUM_OF_COINS" textnr="0x38">
<lt_LT> </lt_LT>
<en_GB> </en_GB>
<de_DE> </de_DE>
<ru_RU> </ru_RU>
</Text>
</Screen>
</ATB_Text> </ATB_Text>

View File

@@ -2206,12 +2206,6 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 240, "prepaid_duration": 240,
"prepaid_start" : "20:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
@@ -2232,13 +2226,6 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120,
"carry_over_start" : "12:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 240, "carry_over_duration": 240,
"carry_over_start" : "20:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
@@ -2251,14 +2238,8 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 360,
"service_start" : "14:00:00",
"service_end": "20:00:00" "service_end": "20:00:00"
} }
] ]
@@ -2289,12 +2270,6 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 240, "prepaid_duration": 240,
"prepaid_start" : "20:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
@@ -2315,13 +2290,6 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120,
"carry_over_start" : "12:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 240, "carry_over_duration": 240,
"carry_over_start" : "20:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
@@ -2334,14 +2302,8 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 360,
"service_start" : "14:00:00",
"service_end": "20:00:00" "service_end": "20:00:00"
} }
] ]
@@ -2453,12 +2415,6 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 240, "prepaid_duration": 240,
"prepaid_start" : "20:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
@@ -2479,13 +2435,6 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120,
"carry_over_start" : "12:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 240, "carry_over_duration": 240,
"carry_over_start" : "20:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
@@ -2498,14 +2447,8 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 360,
"service_start" : "14:00:00",
"service_end": "20:00:00" "service_end": "20:00:00"
} }
] ]
@@ -2536,12 +2479,6 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 240, "prepaid_duration": 240,
"prepaid_start" : "20:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
@@ -2562,13 +2499,6 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120,
"carry_over_start" : "12:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 240, "carry_over_duration": 240,
"carry_over_start" : "20:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
@@ -2581,14 +2511,8 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 360,
"service_start" : "14:00:00",
"service_end": "20:00:00" "service_end": "20:00:00"
} }
] ]
@@ -2619,12 +2543,6 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 240, "prepaid_duration": 240,
"prepaid_start" : "20:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
@@ -2645,13 +2563,6 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120,
"carry_over_start" : "12:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 240, "carry_over_duration": 240,
"carry_over_start" : "20:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
@@ -2664,14 +2575,8 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 360,
"service_start" : "14:00:00",
"service_end": "20:00:00" "service_end": "20:00:00"
} }
] ]
@@ -2702,12 +2607,6 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 240, "prepaid_duration": 240,
"prepaid_start" : "20:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
@@ -2728,13 +2627,6 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120,
"carry_over_start" : "12:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 240, "carry_over_duration": 240,
"carry_over_start" : "20:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
@@ -2747,14 +2639,8 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 360,
"service_start" : "14:00:00",
"service_end": "20:00:00" "service_end": "20:00:00"
} }
] ]
@@ -2785,12 +2671,6 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 240, "prepaid_duration": 240,
"prepaid_start" : "20:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
@@ -2811,13 +2691,6 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120,
"carry_over_start" : "12:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 240, "carry_over_duration": 240,
"carry_over_start" : "20:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
@@ -2830,14 +2703,8 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 360,
"service_start" : "14:00:00",
"service_end": "20:00:00" "service_end": "20:00:00"
} }
] ]

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1045,12 +1045,6 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 360, "prepaid_duration": 360,
"prepaid_start" : "18:00:00", "prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
@@ -1071,13 +1065,6 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120,
"carry_over_start" : "12:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 360, "carry_over_duration": 360,
"carry_over_start" : "18:00:00", "carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
@@ -1090,14 +1077,8 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 600,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00" "service_end": "18:00:00"
} }
] ]
@@ -1206,12 +1187,6 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 360, "prepaid_duration": 360,
"prepaid_start" : "18:00:00", "prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
@@ -1232,13 +1207,6 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120,
"carry_over_start" : "12:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 360, "carry_over_duration": 360,
"carry_over_start" : "18:00:00", "carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
@@ -1251,14 +1219,8 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 600,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00" "service_end": "18:00:00"
} }
] ]
@@ -1367,12 +1329,6 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 360, "prepaid_duration": 360,
"prepaid_start" : "18:00:00", "prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
@@ -1393,13 +1349,6 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120,
"carry_over_start" : "12:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 360, "carry_over_duration": 360,
"carry_over_start" : "18:00:00", "carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
@@ -1412,14 +1361,8 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 600,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00" "service_end": "18:00:00"
} }
] ]
@@ -1528,12 +1471,6 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 360, "prepaid_duration": 360,
"prepaid_start" : "18:00:00", "prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
@@ -1554,13 +1491,6 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120,
"carry_over_start" : "12:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 360, "carry_over_duration": 360,
"carry_over_start" : "18:00:00", "carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
@@ -1573,14 +1503,8 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 600,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00" "service_end": "18:00:00"
} }
] ]
@@ -1650,12 +1574,6 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 360, "prepaid_duration": 360,
"prepaid_start" : "18:00:00", "prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
@@ -1676,13 +1594,6 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120,
"carry_over_start" : "12:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 360, "carry_over_duration": 360,
"carry_over_start" : "18:00:00", "carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
@@ -1695,14 +1606,8 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 600,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00" "service_end": "18:00:00"
} }
] ]

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -2245,14 +2245,8 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120, "prepaid_duration": 240,
"prepaid_start" : "12:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 360,
"prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
} }
] ]
@@ -2271,15 +2265,8 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120, "carry_over_duration": 240,
"carry_over_start" : "12:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 360,
"carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
} }
] ]
@@ -2290,15 +2277,9 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00" "service_end": "20:00:00"
},
{
"service_id" : 2,
"service_duration": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00"
} }
] ]
} }
@@ -2406,14 +2387,8 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120, "prepaid_duration": 240,
"prepaid_start" : "12:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 360,
"prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
} }
] ]
@@ -2432,15 +2407,8 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120, "carry_over_duration": 240,
"carry_over_start" : "12:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 360,
"carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
} }
] ]
@@ -2451,15 +2419,9 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00" "service_end": "20:00:00"
},
{
"service_id" : 2,
"service_duration": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00"
} }
] ]
} }
@@ -2567,14 +2529,8 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120, "prepaid_duration": 240,
"prepaid_start" : "12:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 360,
"prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
} }
] ]
@@ -2593,15 +2549,8 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120, "carry_over_duration": 240,
"carry_over_start" : "12:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 360,
"carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
} }
] ]
@@ -2612,15 +2561,9 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00" "service_end": "20:00:00"
},
{
"service_id" : 2,
"service_duration": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00"
} }
] ]
} }
@@ -2728,14 +2671,8 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120, "prepaid_duration": 240,
"prepaid_start" : "12:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 360,
"prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
} }
] ]
@@ -2754,15 +2691,8 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120, "carry_over_duration": 240,
"carry_over_start" : "12:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 360,
"carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
} }
] ]
@@ -2773,15 +2703,9 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00" "service_end": "20:00:00"
},
{
"service_id" : 2,
"service_duration": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00"
} }
] ]
} }
@@ -2850,14 +2774,8 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120, "prepaid_duration": 240,
"prepaid_start" : "12:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 360,
"prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
} }
] ]
@@ -2876,15 +2794,8 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120, "carry_over_duration": 240,
"carry_over_start" : "12:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "14:00:00"
},
{
"carry_over_id" : 3,
"carry_over_if": "always",
"carry_over_duration": 360,
"carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
} }
] ]
@@ -2895,15 +2806,9 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00" "service_end": "20:00:00"
},
{
"service_id" : 2,
"service_duration": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00"
} }
] ]
} }

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff