From a1d9e30269092384d0ac13627d12a8ecd1da3435 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Thu, 16 Nov 2023 09:48:59 +0100 Subject: [PATCH 01/18] Add opkg_commands file. --- etc/psa_update/opkg_commands | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100755 etc/psa_update/opkg_commands diff --git a/etc/psa_update/opkg_commands b/etc/psa_update/opkg_commands new file mode 100755 index 0000000..13c1190 --- /dev/null +++ b/etc/psa_update/opkg_commands @@ -0,0 +1,20 @@ +############################################################################### +# !!! NOTE !!! +############################################################################### +# opkg-commands added to this file will be executed by ATBUpdateTool. +############################################################################### +# +opkg info atbqt +opkg info atbupdatetool +opkg update +opkg install prepare-update +opkg install atbupdatetool +# opkg remove atb-accountingtool +# opkg install atb-accountingtool +opkg --cache /var/cache/opkg --download-only upgrade +opkg --cache /var/cache/opkg upgrade +# opkg remove apism +# opkg install apism +opkg info apism +opkg info atbqt +opkg info atbupdatetool From 98310cd13d212c789c0cb4ba71d6dec51c332c2c Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Mon, 20 Nov 2023 13:08:28 +0100 Subject: [PATCH 02/18] Add config files for schoenau. --- etc/psa_config/DC2C_cash.json | 18 +++++++++++++ etc/psa_config/DC2C_conf.json | 12 +++++++++ etc/psa_config/DC2C_device.json | 27 +++++++++++++++++++ etc/psa_config/DC2C_print01.json | 46 ++++++++++++++++++++++++++++++++ etc/psa_config/DC2C_print02.json | 32 ++++++++++++++++++++++ etc/psa_config/DC2C_print03.json | 35 ++++++++++++++++++++++++ etc/psa_config/DC2C_print04.json | 6 +++++ etc/psa_config/DC2C_print31.json | 40 +++++++++++++++++++++++++++ etc/psa_config/DC2C_print32.json | 42 +++++++++++++++++++++++++++++ 9 files changed, 258 insertions(+) create mode 100755 etc/psa_config/DC2C_cash.json create mode 100755 etc/psa_config/DC2C_conf.json create mode 100755 etc/psa_config/DC2C_device.json create mode 100755 etc/psa_config/DC2C_print01.json create mode 100755 etc/psa_config/DC2C_print02.json create mode 100755 etc/psa_config/DC2C_print03.json create mode 100755 etc/psa_config/DC2C_print04.json create mode 100755 etc/psa_config/DC2C_print31.json create mode 100755 etc/psa_config/DC2C_print32.json diff --git a/etc/psa_config/DC2C_cash.json b/etc/psa_config/DC2C_cash.json new file mode 100755 index 0000000..00e0bcb --- /dev/null +++ b/etc/psa_config/DC2C_cash.json @@ -0,0 +1,18 @@ +{ +"title":"DC2C_cash ", +"project":"Schoenau", +"version":"15.10.2023 14:55 02.00.06", +"CoinDenom(15..0)":[200,100,50,0,0,0,0,0,0,255,200,100,50,20,10,5], +"CoinValue(15..0)":[0,380,0,0,0,0,0,0,0,3,200,100,50,20,10,5], +"CoinAccept(15..0)":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1], +"ExchangeRate":1, +"TokenChannel":6, +"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0], +"BillAccept(15..0)":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1], +"LocalTaxRate":19, +"ForeignTaxRate":0, +"Surcharge":0, +"Discount":0 +} +#"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,10000,5000,2000,1000,500], + diff --git a/etc/psa_config/DC2C_conf.json b/etc/psa_config/DC2C_conf.json new file mode 100755 index 0000000..bee0a61 --- /dev/null +++ b/etc/psa_config/DC2C_conf.json @@ -0,0 +1,12 @@ +{ +"title":"DC2C_config", +"project":"Schoenau", +"version":"15.11.2023 00001", +"custNum":332, +"machNum":1000, +"borough":0, +"zone":0, +"alias":0, +"location":"Vorplatz 1" +} + diff --git a/etc/psa_config/DC2C_device.json b/etc/psa_config/DC2C_device.json new file mode 100755 index 0000000..b71753e --- /dev/null +++ b/etc/psa_config/DC2C_device.json @@ -0,0 +1,27 @@ +{ +"title":"DC2C_device", +"project":"Schoenau", +"Version":"15.11.2023 00102", +"printer":1, +"coinChk":3, +"mifRd":1, +"solarPwr":0, +"modem":0, +"creditCard":1, +"escrow":0, +"RejMotor":0, +"shutter":1, +"billRd":1, +"vaultLock":0, +"autoAlarm":1, +"autoOpen":1, +"AccPrint":1, +"DorPrint":1, +"TokPrint":1, +"CBwarnLev":1600, +"CBerrLev":1900, +"BattWarn":11800, +"BattErr":11200, +"foreign":1, +"refPrint":1 +} diff --git a/etc/psa_config/DC2C_print01.json b/etc/psa_config/DC2C_print01.json new file mode 100755 index 0000000..48ad85f --- /dev/null +++ b/etc/psa_config/DC2C_print01.json @@ -0,0 +1,46 @@ +{ +"title":"DC2C_pri01", +"project":"Schoenau", +"Version":"15.11.2023 00001", +"styl":"font 10", +"styl":"size 11", +"styl":"align c", +"feed":"margin02", +"feed":"rim02", +"text":"PARKTICKET", +"styl":"size 00", +"feed":"nl", +"text":"Bitte gut sichtbar", +"feed":"nl", +"text":"hinter die Scheibe", +"feed":"nl", +"text":"legen", +"feed":"nl", +"feed":"nl", +"styl":"align l", +"text":"Ihr Kennzeichen: ", +"feed":"nl", +"styl":"size 11", +"vari":"Dynamic01", +"styl":"size 00", +"feed":"nl", +"text":"Parkende: ", +"feed":"nl", +"styl":"size 11", +"vari":"Dynamic04", +"vari":"Dynamic03", +"styl":"size 00", +"feed":"nl" +} + + + + + + + + + + + + diff --git a/etc/psa_config/DC2C_print02.json b/etc/psa_config/DC2C_print02.json new file mode 100755 index 0000000..25dfd76 --- /dev/null +++ b/etc/psa_config/DC2C_print02.json @@ -0,0 +1,32 @@ +{ +"title":"DC2C_pri02", +"project":"Schoenau", +"Version":"15.11.2023 00001", +"issued":"13.11.2023 01.01", +"text":"Standort: ", +"feed":"nl", +"vari":"location", +"feed":"nl", +"text":"Bezahlt: ", +"styl":"size 11", +"vari":"Dynamic07", +"text":"€", +"feed":"nl", +"styl":"size 00", +"text":"Gedruckt am: ", +"vari":"wday deu short", +"vari":"date ge", +"vari":"time long" +} + + + + + + + + + + + + diff --git a/etc/psa_config/DC2C_print03.json b/etc/psa_config/DC2C_print03.json new file mode 100755 index 0000000..3ee8468 --- /dev/null +++ b/etc/psa_config/DC2C_print03.json @@ -0,0 +1,35 @@ +{ +"title":"DC2C_pri03", +"project":"Schoenau", +"Version":"15.11.2023 00001", +"feed":"nl", +"styl":"size 00", +"text":"Automat: ", +"vari":"manu", +"text":"Gruppe: ", +"vari":"group", +"text":"Zone: ", +"vari":"zone", +"feed":"nl", +"text":"Ort: ", +"vari":"location", +"styl":"align c", +"text":"Schönau am Königsee", +"feed":"nl", +"text":"Automatentechnik ", +"feed":"nl", +"text":"Baumann GmbH", +"feed":"eject" +} + + + + + + + + + + + + diff --git a/etc/psa_config/DC2C_print04.json b/etc/psa_config/DC2C_print04.json new file mode 100755 index 0000000..c330d4d --- /dev/null +++ b/etc/psa_config/DC2C_print04.json @@ -0,0 +1,6 @@ +{ +"title":"DC2C_pri04", +"project":"Schoenau", +"Version":"15.11.2023 01.01", +"text":""; +} \ No newline at end of file diff --git a/etc/psa_config/DC2C_print31.json b/etc/psa_config/DC2C_print31.json new file mode 100755 index 0000000..bdc8844 --- /dev/null +++ b/etc/psa_config/DC2C_print31.json @@ -0,0 +1,40 @@ +{ +"title":"DC2C_pri31", +"project":"door close print", +"Version":"15.11.2023 00001", +"styl":"font 08", +"styl":"size 10", +"feed":"margin02", +"feed":"rim02", +"feed":"speed10", +"styl":"size 11", +"feed":"nl", +"text":"Türöffnung um:", +"feed":"nl", +"styl":"size 00", +"vari":"date ge", +"vari":"time long", +"feed":"nl", +"text":"KuNu: ", +"vari":"cunu", +"text":"MaNu: ", +"vari":"manu", +"text":"Ort: ", +"vari":"location", +"text":"Gruppe: ", +"vari":"group", +"text":"Zone: ", +"vari":"zone", +"text":"Name: ", +"vari":"alias", +"feed":"nl", +"text":"**Automatentechnik ", +"feed":"nl", +"text":" Baumann GmbH ***", +"feed":"nl", +"text":" * * * * * * * * * ", +"feed":"nl", +"feed":"eject" +} + + diff --git a/etc/psa_config/DC2C_print32.json b/etc/psa_config/DC2C_print32.json new file mode 100755 index 0000000..2f1c024 --- /dev/null +++ b/etc/psa_config/DC2C_print32.json @@ -0,0 +1,42 @@ +{ +"title":"DC2C_pri32", +"project":"refund reciept", +"Version":"15.11.2023 00001", +"styl":"font 08", +"styl":"size 10", +"feed":"margin02", +"feed":"rim02", +"feed":"speed10", +"styl":"size 11", +"text":"Ersatzbeleg", +"feed":"nl", +"styl":"size 00", +"text":"Erstattungsbetrag: ", +"feed":"nl", +"vari":"Dynamic07", +"text":"€", +"feed":"nl", +"text":"KuNu: ", +"vari":"cunu", +"text":"MaNu: ", +"vari":"manu", +"text":"Ort: ", +"vari":"location", +"text":"Gruppe: ", +"vari":"group", +"text":"Zone: ", +"vari":"zone", +"text":"Name: ", +"vari":"alias", +"text":"Am: ", +"vari":"date us", +"text":"Um: ", +"vari":"time long", +"feed":"nl", +"text":" * * * * * * * * ", +"feed":"nl", +"feed":"nl", +"feed":"eject" +} + + From 92b813ea23ed06177ae728e16653ef741c086a55 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Mon, 20 Nov 2023 15:00:41 +0100 Subject: [PATCH 03/18] Testing without prepare-update. --- etc/psa_update/opkg_commands | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_update/opkg_commands b/etc/psa_update/opkg_commands index 13c1190..ec8b579 100755 --- a/etc/psa_update/opkg_commands +++ b/etc/psa_update/opkg_commands @@ -7,7 +7,7 @@ opkg info atbqt opkg info atbupdatetool opkg update -opkg install prepare-update +# opkg install prepare-update opkg install atbupdatetool # opkg remove atb-accountingtool # opkg install atb-accountingtool From 58ab99e33c56ed518fe33cd4716adcb2b62fad17 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Mon, 20 Nov 2023 15:01:42 +0100 Subject: [PATCH 04/18] testing --- etc/psa_config/DC2C_print01.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_config/DC2C_print01.json b/etc/psa_config/DC2C_print01.json index 48ad85f..261be5b 100755 --- a/etc/psa_config/DC2C_print01.json +++ b/etc/psa_config/DC2C_print01.json @@ -1,7 +1,7 @@ { "title":"DC2C_pri01", "project":"Schoenau", -"Version":"15.11.2023 00001", +"Version":"15.11.2023 00002", "styl":"font 10", "styl":"size 11", "styl":"align c", From 88bf5c05cdbe6c9521b5f20e7b690a5922e20b1c Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Mon, 20 Nov 2023 15:05:56 +0100 Subject: [PATCH 05/18] readd prepare-update.w --- etc/psa_update/opkg_commands | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_update/opkg_commands b/etc/psa_update/opkg_commands index ec8b579..13c1190 100755 --- a/etc/psa_update/opkg_commands +++ b/etc/psa_update/opkg_commands @@ -7,7 +7,7 @@ opkg info atbqt opkg info atbupdatetool opkg update -# opkg install prepare-update +opkg install prepare-update opkg install atbupdatetool # opkg remove atb-accountingtool # opkg install atb-accountingtool From 400a6da94f6545745b47703a24fdf74c94e07041 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Mon, 20 Nov 2023 15:08:14 +0100 Subject: [PATCH 06/18] testing --- etc/psa_config/DC2C_print01.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_config/DC2C_print01.json b/etc/psa_config/DC2C_print01.json index 261be5b..46caec0 100755 --- a/etc/psa_config/DC2C_print01.json +++ b/etc/psa_config/DC2C_print01.json @@ -1,7 +1,7 @@ { "title":"DC2C_pri01", "project":"Schoenau", -"Version":"15.11.2023 00002", +"Version":"15.11.2023 00003", "styl":"font 10", "styl":"size 11", "styl":"align c", From 2b8d45d6e7c34f5eb3c12f93d9b0c6ef1cead184 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 21 Nov 2023 10:49:12 +0100 Subject: [PATCH 07/18] Set machine id = 1001 for testing. --- etc/psa_config/DC2C_conf.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_config/DC2C_conf.json b/etc/psa_config/DC2C_conf.json index bee0a61..f7b2094 100755 --- a/etc/psa_config/DC2C_conf.json +++ b/etc/psa_config/DC2C_conf.json @@ -3,7 +3,7 @@ "project":"Schoenau", "version":"15.11.2023 00001", "custNum":332, -"machNum":1000, +"machNum":1001, "borough":0, "zone":0, "alias":0, From 8129998ead1053ed2e0b8546b8c300aa97a00e87 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 21 Nov 2023 11:07:19 +0100 Subject: [PATCH 08/18] set mach-id = 1000 for testing --- etc/psa_config/DC2C_conf.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_config/DC2C_conf.json b/etc/psa_config/DC2C_conf.json index f7b2094..bee0a61 100755 --- a/etc/psa_config/DC2C_conf.json +++ b/etc/psa_config/DC2C_conf.json @@ -3,7 +3,7 @@ "project":"Schoenau", "version":"15.11.2023 00001", "custNum":332, -"machNum":1001, +"machNum":1000, "borough":0, "zone":0, "alias":0, From b48d9f80bff8b6d2981bce2425a861db38bc8b0b Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 21 Nov 2023 11:12:53 +0100 Subject: [PATCH 09/18] set mach-id = 991 for testing --- etc/psa_config/DC2C_conf.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_config/DC2C_conf.json b/etc/psa_config/DC2C_conf.json index bee0a61..3cd58e4 100755 --- a/etc/psa_config/DC2C_conf.json +++ b/etc/psa_config/DC2C_conf.json @@ -3,7 +3,7 @@ "project":"Schoenau", "version":"15.11.2023 00001", "custNum":332, -"machNum":1000, +"machNum":991, "borough":0, "zone":0, "alias":0, From 597b509e10b555f0b4c7a9da25923d123dff57ae Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 21 Nov 2023 11:22:25 +0100 Subject: [PATCH 10/18] set zone = 1 for testing --- etc/psa_config/DC2C_conf.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_config/DC2C_conf.json b/etc/psa_config/DC2C_conf.json index 3cd58e4..2544d25 100755 --- a/etc/psa_config/DC2C_conf.json +++ b/etc/psa_config/DC2C_conf.json @@ -5,7 +5,7 @@ "custNum":332, "machNum":991, "borough":0, -"zone":0, +"zone":1, "alias":0, "location":"Vorplatz 1" } From 7227f0a33dc462e2e31d5266d548681b518e7c17 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 21 Nov 2023 11:34:31 +0100 Subject: [PATCH 11/18] set mach-id = 1000 for testing --- etc/psa_config/DC2C_conf.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/psa_config/DC2C_conf.json b/etc/psa_config/DC2C_conf.json index 2544d25..bee0a61 100755 --- a/etc/psa_config/DC2C_conf.json +++ b/etc/psa_config/DC2C_conf.json @@ -3,9 +3,9 @@ "project":"Schoenau", "version":"15.11.2023 00001", "custNum":332, -"machNum":991, +"machNum":1000, "borough":0, -"zone":1, +"zone":0, "alias":0, "location":"Vorplatz 1" } From bfb05e696a8199709f7b89441c2562722769c8ab Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 21 Nov 2023 11:39:09 +0100 Subject: [PATCH 12/18] set zone = 1 for testing --- etc/psa_config/DC2C_conf.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_config/DC2C_conf.json b/etc/psa_config/DC2C_conf.json index bee0a61..2fd7682 100755 --- a/etc/psa_config/DC2C_conf.json +++ b/etc/psa_config/DC2C_conf.json @@ -5,7 +5,7 @@ "custNum":332, "machNum":1000, "borough":0, -"zone":0, +"zone":1, "alias":0, "location":"Vorplatz 1" } From 94701c0022cfa94cd19d156ff14d9be1682abb60 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 21 Nov 2023 11:43:42 +0100 Subject: [PATCH 13/18] set mach-id = 1111 for testing --- etc/psa_config/DC2C_conf.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_config/DC2C_conf.json b/etc/psa_config/DC2C_conf.json index 2fd7682..28b7005 100755 --- a/etc/psa_config/DC2C_conf.json +++ b/etc/psa_config/DC2C_conf.json @@ -3,7 +3,7 @@ "project":"Schoenau", "version":"15.11.2023 00001", "custNum":332, -"machNum":1000, +"machNum":1111, "borough":0, "zone":1, "alias":0, From 73f4acf321572b98115e5f797c0b6be87c7394a8 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 22 Nov 2023 09:42:51 +0100 Subject: [PATCH 14/18] set mach-id to 100 for testing --- etc/psa_config/DC2C_conf.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_config/DC2C_conf.json b/etc/psa_config/DC2C_conf.json index 28b7005..2fd7682 100755 --- a/etc/psa_config/DC2C_conf.json +++ b/etc/psa_config/DC2C_conf.json @@ -3,7 +3,7 @@ "project":"Schoenau", "version":"15.11.2023 00001", "custNum":332, -"machNum":1111, +"machNum":1000, "borough":0, "zone":1, "alias":0, From 0a790a2042488df8864cf3a63df122eae85e3365 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 22 Nov 2023 09:47:23 +0100 Subject: [PATCH 15/18] set mach-id to 1001 for testing --- etc/psa_config/DC2C_conf.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_config/DC2C_conf.json b/etc/psa_config/DC2C_conf.json index 2fd7682..6cd196c 100755 --- a/etc/psa_config/DC2C_conf.json +++ b/etc/psa_config/DC2C_conf.json @@ -3,7 +3,7 @@ "project":"Schoenau", "version":"15.11.2023 00001", "custNum":332, -"machNum":1000, +"machNum":1001, "borough":0, "zone":1, "alias":0, From 4d9c93f7ed97fd944298bf01e9865a4881b36ba3 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 22 Nov 2023 10:03:07 +0100 Subject: [PATCH 16/18] set mach-id to 1002 for testing --- etc/psa_config/DC2C_conf.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_config/DC2C_conf.json b/etc/psa_config/DC2C_conf.json index 6cd196c..1a3e501 100755 --- a/etc/psa_config/DC2C_conf.json +++ b/etc/psa_config/DC2C_conf.json @@ -3,7 +3,7 @@ "project":"Schoenau", "version":"15.11.2023 00001", "custNum":332, -"machNum":1001, +"machNum":1002, "borough":0, "zone":1, "alias":0, From c7891ec6dd256d84a95de1f9791ad66a37f0d580 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 22 Nov 2023 10:17:05 +0100 Subject: [PATCH 17/18] set mach-id to 1004 for testing --- etc/psa_config/DC2C_conf.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_config/DC2C_conf.json b/etc/psa_config/DC2C_conf.json index 1a3e501..8a6b619 100755 --- a/etc/psa_config/DC2C_conf.json +++ b/etc/psa_config/DC2C_conf.json @@ -3,7 +3,7 @@ "project":"Schoenau", "version":"15.11.2023 00001", "custNum":332, -"machNum":1002, +"machNum":1004, "borough":0, "zone":1, "alias":0, From 1ec8e279712c5b652d4cc8c946af1cf64a63a282 Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Wed, 22 Nov 2023 17:10:30 +0100 Subject: [PATCH 18/18] Price in cents --- etc/psa_tariff/tariff01.json | 20 ++++++++++---------- etc/psa_tariff/tariff02.json | 8 ++++---- etc/psa_tariff/tariff03.json | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/etc/psa_tariff/tariff01.json b/etc/psa_tariff/tariff01.json index 4e406c1..a629b64 100644 --- a/etc/psa_tariff/tariff01.json +++ b/etc/psa_tariff/tariff01.json @@ -39,7 +39,7 @@ "pop_price_night": 0, "pop_min_time": 60, "pop_max_time": 10080, - "pop_min_price": 3, + "pop_min_price": 300, "pop_carry_over": 1, "pop_daily_card_price": 0, "pop_multi_hour_price": 8 @@ -49,47 +49,47 @@ { "pra_payment_option_id": 1099, "pra_payment_unit_id": 1, - "pra_price": 3 + "pra_price": 300 }, { "pra_payment_option_id": 1099, "pra_payment_unit_id": 6, - "pra_price": 7 + "pra_price": 700 }, { "pra_payment_option_id": 1099, "pra_payment_unit_id": 5, - "pra_price": 8 + "pra_price": 800 }, { "pra_payment_option_id": 1099, "pra_payment_unit_id": 7, - "pra_price": 16 + "pra_price": 1600 }, { "pra_payment_option_id": 1099, "pra_payment_unit_id": 8, - "pra_price": 24 + "pra_price": 2400 }, { "pra_payment_option_id": 1099, "pra_payment_unit_id": 9, - "pra_price": 32 + "pra_price": 3200 }, { "pra_payment_option_id": 1099, "pra_payment_unit_id": 10, - "pra_price": 40 + "pra_price": 4000 }, { "pra_payment_option_id": 1099, "pra_payment_unit_id": 11, - "pra_price": 48 + "pra_price": 4800 }, { "pra_payment_option_id": 1099, "pra_payment_unit_id": 12, - "pra_price": 56 + "pra_price": 5600 } ], "Duration": [ diff --git a/etc/psa_tariff/tariff02.json b/etc/psa_tariff/tariff02.json index bbbd672..8e776b9 100644 --- a/etc/psa_tariff/tariff02.json +++ b/etc/psa_tariff/tariff02.json @@ -39,7 +39,7 @@ "pop_price_night": 0, "pop_min_time": 60, "pop_max_time": 1440, - "pop_min_price": 2, + "pop_min_price": 200, "pop_carry_over": 1, "pop_daily_card_price": 0, "pop_multi_hour_price": 5 @@ -49,17 +49,17 @@ { "pra_payment_option_id": 1100, "pra_payment_unit_id": 1, - "pra_price": 2 + "pra_price": 200 }, { "pra_payment_option_id": 1100, "pra_payment_unit_id": 6, - "pra_price": 4 + "pra_price": 400 }, { "pra_payment_option_id": 1100, "pra_payment_unit_id": 5, - "pra_price": 5 + "pra_price": 500 } ], "Duration": [ diff --git a/etc/psa_tariff/tariff03.json b/etc/psa_tariff/tariff03.json index bbbd672..8e776b9 100644 --- a/etc/psa_tariff/tariff03.json +++ b/etc/psa_tariff/tariff03.json @@ -39,7 +39,7 @@ "pop_price_night": 0, "pop_min_time": 60, "pop_max_time": 1440, - "pop_min_price": 2, + "pop_min_price": 200, "pop_carry_over": 1, "pop_daily_card_price": 0, "pop_multi_hour_price": 5 @@ -49,17 +49,17 @@ { "pra_payment_option_id": 1100, "pra_payment_unit_id": 1, - "pra_price": 2 + "pra_price": 200 }, { "pra_payment_option_id": 1100, "pra_payment_unit_id": 6, - "pra_price": 4 + "pra_price": 400 }, { "pra_payment_option_id": 1100, "pra_payment_unit_id": 5, - "pra_price": 5 + "pra_price": 500 } ], "Duration": [