From 35bd82c9cbd0cbb2786d9d58864321fdf1ab6948 Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Wed, 6 Feb 2019 10:53:12 +0100 Subject: [PATCH] item summary fix & css report fixes --- modules/client/front/sample/create/style.scss | 27 +++++++++++- modules/item/front/descriptor/index.html | 2 +- modules/item/front/summary/index.html | 2 +- modules/item/front/tags/index.js | 6 ++- .../css/style.css => common/css/email.css} | 2 +- print/common/css/layout.css | 5 +-- print/common/css/report.css | 10 +++++ print/config/routes.json | 1 + .../claim-pickup-order/assets/css/index.js | 3 +- print/report/claim-pickup-order/index.html | 4 ++ .../report/client-welcome/assets/css/index.js | 3 +- .../client-welcome/assets/css/style.css | 40 ------------------ print/report/client-welcome/index.html | 4 ++ .../letter-debtor-nd/assets/css/index.js | 3 +- .../letter-debtor-nd/assets/css/style.css | 42 ------------------- print/report/letter-debtor-nd/index.html | 1 - .../letter-debtor-st/assets/css/index.js | 3 +- .../letter-debtor-st/assets/css/style.css | 42 ------------------- print/report/letter-debtor-st/index.html | 1 - .../report/payment-update/assets/css/index.js | 3 +- .../payment-update/assets/css/style.css | 39 ----------------- print/report/payment-update/index.html | 1 - .../report/printer-setup/assets/css/index.js | 3 +- .../report/printer-setup/assets/css/style.css | 40 ------------------ print/report/printer-setup/index.html | 1 - .../assets/css/index.js | 1 + .../assets/css/style.css | 11 ----- .../report/rpt-claim-pickup-order/index.html | 7 +++- .../rpt-delivery-note/assets/css/index.js | 1 + .../rpt-delivery-note/assets/css/style.css | 11 ----- print/report/rpt-delivery-note/index.html | 18 ++++++-- print/report/rpt-delivery-note/index.js | 12 +++++- print/report/rpt-informe/assets/css/index.js | 8 ++++ print/report/rpt-informe/assets/css/style.css | 3 ++ print/report/rpt-informe/index.html | 39 +++++++++++++++++ print/report/rpt-informe/index.js | 32 ++++++++++++++ print/report/rpt-informe/locale.js | 11 +++++ .../rpt-letter-debtor/assets/css/index.js | 1 + .../rpt-letter-debtor/assets/css/style.css | 11 ----- print/report/rpt-letter-debtor/index.html | 9 ++-- .../report/rpt-sepa-core/assets/css/index.js | 1 + .../report/rpt-sepa-core/assets/css/style.css | 11 ----- print/report/rpt-sepa-core/index.html | 9 ++-- .../report/sample-report/assets/css/index.js | 1 + print/report/sample-report/index.html | 6 ++- print/report/sepa-core/assets/css/index.js | 3 +- print/report/sepa-core/assets/css/style.css | 40 ------------------ print/report/sepa-core/index.html | 4 +- 48 files changed, 215 insertions(+), 323 deletions(-) rename print/{report/claim-pickup-order/assets/css/style.css => common/css/email.css} (99%) create mode 100644 print/common/css/report.css delete mode 100644 print/report/client-welcome/assets/css/style.css delete mode 100644 print/report/letter-debtor-nd/assets/css/style.css delete mode 100644 print/report/letter-debtor-st/assets/css/style.css delete mode 100644 print/report/payment-update/assets/css/style.css delete mode 100644 print/report/printer-setup/assets/css/style.css create mode 100644 print/report/rpt-informe/assets/css/index.js create mode 100644 print/report/rpt-informe/assets/css/style.css create mode 100644 print/report/rpt-informe/index.html create mode 100755 print/report/rpt-informe/index.js create mode 100644 print/report/rpt-informe/locale.js delete mode 100644 print/report/sepa-core/assets/css/style.css diff --git a/modules/client/front/sample/create/style.scss b/modules/client/front/sample/create/style.scss index eecc8ad09..a958e264b 100644 --- a/modules/client/front/sample/create/style.scss +++ b/modules/client/front/sample/create/style.scss @@ -5,7 +5,32 @@ vn-client-sample-create { } tpl-body { - min-width: 800px + min-width: 800px; + + .container, .container h1 { + font-family: "Roboto","Helvetica","Arial",sans-serif; + font-size: 1em !important; + + h1 { + font-weight: bold; + margin: auto + } + + p { + margin: 1em 0 + } + + footer p { + font-size: 10px !important; + line-height: 10px + } + } + + + .title h1 { + font-size: 2em !important; + margin: 0 + } } } } \ No newline at end of file diff --git a/modules/item/front/descriptor/index.html b/modules/item/front/descriptor/index.html index 3210366d0..afcc2f87f 100644 --- a/modules/item/front/descriptor/index.html +++ b/modules/item/front/descriptor/index.html @@ -46,7 +46,7 @@
{{$ctrl.item.id}}
+ value="{{$ctrl.item.name}}"> diff --git a/modules/item/front/summary/index.html b/modules/item/front/summary/index.html index 429feff3e..cca2cf410 100644 --- a/modules/item/front/summary/index.html +++ b/modules/item/front/summary/index.html @@ -36,7 +36,7 @@ value="{{$ctrl.summary.item.origin.name}}"> + value="{{$ctrl.summary.item.stems}}"> diff --git a/modules/item/front/tags/index.js b/modules/item/front/tags/index.js index 2fc30e1ac..b187e5baf 100644 --- a/modules/item/front/tags/index.js +++ b/modules/item/front/tags/index.js @@ -67,6 +67,7 @@ class Controller { this.$scope.model.save().then(() => { this.$scope.watcher.notifySaved(); this.$scope.model.refresh(); + this.card.reload(); }); } } @@ -75,5 +76,8 @@ Controller.$inject = ['$stateParams', '$scope']; ngModule.component('vnItemTags', { template: require('./index.html'), - controller: Controller + controller: Controller, + require: { + card: '^vnItemCard' + } }); diff --git a/print/report/claim-pickup-order/assets/css/style.css b/print/common/css/email.css similarity index 99% rename from print/report/claim-pickup-order/assets/css/style.css rename to print/common/css/email.css index a197ee5cd..6b15fbcba 100644 --- a/print/report/claim-pickup-order/assets/css/style.css +++ b/print/common/css/email.css @@ -37,4 +37,4 @@ body { font-size: 32px; color: #333; margin: 0 -} \ No newline at end of file +} diff --git a/print/common/css/layout.css b/print/common/css/layout.css index 216d9fcae..ee5a189d6 100644 --- a/print/common/css/layout.css +++ b/print/common/css/layout.css @@ -1,7 +1,6 @@ .container { - font-family: arial, sans-serif; - font-size: 16px; - zoom: 0.55 + font-family: "Roboto", "Helvetica", "Arial", sans-serif; + font-size: 16px } .columns { diff --git a/print/common/css/report.css b/print/common/css/report.css new file mode 100644 index 000000000..24b20c330 --- /dev/null +++ b/print/common/css/report.css @@ -0,0 +1,10 @@ +body { + zoom: 0.55 +} + +.title { + margin-bottom: 20px; + font-weight: 100; + margin-top: 0; + font-size: 2em +} \ No newline at end of file diff --git a/print/config/routes.json b/print/config/routes.json index 4fa82eea3..c8326effa 100644 --- a/print/config/routes.json +++ b/print/config/routes.json @@ -11,6 +11,7 @@ {"type": "report", "name": "rpt-claim-pickup-order"}, {"type": "report", "name": "rpt-letter-debtor"}, {"type": "report", "name": "rpt-sepa-core"}, + {"type": "report", "name": "rpt-informe"}, {"type": "static", "name": "email-header"}, {"type": "static", "name": "email-footer"}, {"type": "static", "name": "report-header"}, diff --git a/print/report/claim-pickup-order/assets/css/index.js b/print/report/claim-pickup-order/assets/css/index.js index c1943eee1..321c632dc 100644 --- a/print/report/claim-pickup-order/assets/css/index.js +++ b/print/report/claim-pickup-order/assets/css/index.js @@ -2,5 +2,6 @@ const CssReader = require(`${appPath}/lib/cssReader`); module.exports = new CssReader([ `${appPath}/common/css/layout.css`, - `${__dirname}/style.css`]) + `${appPath}/common/css/email.css`, + `${appPath}/common/css/misc.css`]) .mergeStyles(); diff --git a/print/report/claim-pickup-order/index.html b/print/report/claim-pickup-order/index.html index 4790693f5..fa2b0c530 100644 --- a/print/report/claim-pickup-order/index.html +++ b/print/report/claim-pickup-order/index.html @@ -5,7 +5,9 @@
+ +
@@ -26,7 +28,9 @@

{{$t('sections.howToBuy.stock')}}

{{$t('sections.howToBuy.delivery')}}

-->
+ +
\ No newline at end of file diff --git a/print/report/client-welcome/assets/css/index.js b/print/report/client-welcome/assets/css/index.js index c1943eee1..321c632dc 100644 --- a/print/report/client-welcome/assets/css/index.js +++ b/print/report/client-welcome/assets/css/index.js @@ -2,5 +2,6 @@ const CssReader = require(`${appPath}/lib/cssReader`); module.exports = new CssReader([ `${appPath}/common/css/layout.css`, - `${__dirname}/style.css`]) + `${appPath}/common/css/email.css`, + `${appPath}/common/css/misc.css`]) .mergeStyles(); diff --git a/print/report/client-welcome/assets/css/style.css b/print/report/client-welcome/assets/css/style.css deleted file mode 100644 index a197ee5cd..000000000 --- a/print/report/client-welcome/assets/css/style.css +++ /dev/null @@ -1,40 +0,0 @@ -body { - background-color: #EEE -} - -.container { - max-width: 600px; - min-width: 320px; - margin: 0 auto; - color: #555 -} - -.main { - background-color: #FFF; - padding: 20px -} - -.main a { - color: #8dba25 -} - -.main h1 { - color: #999 -} - -.main h3 { - font-size: 16px -} - -.title { - background-color: #95d831; - text-transform: uppercase; - text-align: center; - padding: 35px 0 -} - -.title h1 { - font-size: 32px; - color: #333; - margin: 0 -} \ No newline at end of file diff --git a/print/report/client-welcome/index.html b/print/report/client-welcome/index.html index 28c36bd1a..d6643e978 100644 --- a/print/report/client-welcome/index.html +++ b/print/report/client-welcome/index.html @@ -5,7 +5,9 @@
+ +
@@ -62,7 +64,9 @@

+ + \ No newline at end of file diff --git a/print/report/letter-debtor-nd/assets/css/index.js b/print/report/letter-debtor-nd/assets/css/index.js index c1943eee1..321c632dc 100644 --- a/print/report/letter-debtor-nd/assets/css/index.js +++ b/print/report/letter-debtor-nd/assets/css/index.js @@ -2,5 +2,6 @@ const CssReader = require(`${appPath}/lib/cssReader`); module.exports = new CssReader([ `${appPath}/common/css/layout.css`, - `${__dirname}/style.css`]) + `${appPath}/common/css/email.css`, + `${appPath}/common/css/misc.css`]) .mergeStyles(); diff --git a/print/report/letter-debtor-nd/assets/css/style.css b/print/report/letter-debtor-nd/assets/css/style.css deleted file mode 100644 index 8f5acd032..000000000 --- a/print/report/letter-debtor-nd/assets/css/style.css +++ /dev/null @@ -1,42 +0,0 @@ -body { - background-color: #EEE -} - -.container { - font-family: arial, sans-serif; - max-width: 600px; - min-width: 320px; - font-size: 16px; - margin: 0 auto; - color: #555 -} - -.main { - background-color: #FFF; - padding: 20px -} - -.main a { - color: #8dba25 -} - -.main h1 { - color: #999 -} - -.main h3 { - font-size: 16px -} - -.title { - background-color: #95d831; - text-transform: uppercase; - text-align: center; - padding: 35px 0 -} - -.title h1 { - font-size: 32px; - color: #333; - margin: 0 -} \ No newline at end of file diff --git a/print/report/letter-debtor-nd/index.html b/print/report/letter-debtor-nd/index.html index f7d4c39b3..e1daa91a6 100644 --- a/print/report/letter-debtor-nd/index.html +++ b/print/report/letter-debtor-nd/index.html @@ -8,7 +8,6 @@ -
diff --git a/print/report/letter-debtor-st/assets/css/index.js b/print/report/letter-debtor-st/assets/css/index.js index c1943eee1..321c632dc 100644 --- a/print/report/letter-debtor-st/assets/css/index.js +++ b/print/report/letter-debtor-st/assets/css/index.js @@ -2,5 +2,6 @@ const CssReader = require(`${appPath}/lib/cssReader`); module.exports = new CssReader([ `${appPath}/common/css/layout.css`, - `${__dirname}/style.css`]) + `${appPath}/common/css/email.css`, + `${appPath}/common/css/misc.css`]) .mergeStyles(); diff --git a/print/report/letter-debtor-st/assets/css/style.css b/print/report/letter-debtor-st/assets/css/style.css deleted file mode 100644 index 8f5acd032..000000000 --- a/print/report/letter-debtor-st/assets/css/style.css +++ /dev/null @@ -1,42 +0,0 @@ -body { - background-color: #EEE -} - -.container { - font-family: arial, sans-serif; - max-width: 600px; - min-width: 320px; - font-size: 16px; - margin: 0 auto; - color: #555 -} - -.main { - background-color: #FFF; - padding: 20px -} - -.main a { - color: #8dba25 -} - -.main h1 { - color: #999 -} - -.main h3 { - font-size: 16px -} - -.title { - background-color: #95d831; - text-transform: uppercase; - text-align: center; - padding: 35px 0 -} - -.title h1 { - font-size: 32px; - color: #333; - margin: 0 -} \ No newline at end of file diff --git a/print/report/letter-debtor-st/index.html b/print/report/letter-debtor-st/index.html index e87a2f9f1..f9c915072 100644 --- a/print/report/letter-debtor-st/index.html +++ b/print/report/letter-debtor-st/index.html @@ -8,7 +8,6 @@ -
diff --git a/print/report/payment-update/assets/css/index.js b/print/report/payment-update/assets/css/index.js index c1943eee1..321c632dc 100644 --- a/print/report/payment-update/assets/css/index.js +++ b/print/report/payment-update/assets/css/index.js @@ -2,5 +2,6 @@ const CssReader = require(`${appPath}/lib/cssReader`); module.exports = new CssReader([ `${appPath}/common/css/layout.css`, - `${__dirname}/style.css`]) + `${appPath}/common/css/email.css`, + `${appPath}/common/css/misc.css`]) .mergeStyles(); diff --git a/print/report/payment-update/assets/css/style.css b/print/report/payment-update/assets/css/style.css deleted file mode 100644 index f6f42c447..000000000 --- a/print/report/payment-update/assets/css/style.css +++ /dev/null @@ -1,39 +0,0 @@ -body { - background-color: #EEE -} - -.container { - max-width: 600px; - min-width: 320px; - margin: 0 auto; - color: #555 -} -.main { - background-color: #FFF; - padding: 20px -} - -.main a { - color: #8dba25 -} - -.main h1 { - color: #999 -} - -.main h3 { - font-size: 16px -} - -.title { - background-color: #95d831; - text-transform: uppercase; - text-align: center; - padding: 35px 0 -} - -.title h1 { - font-size: 32px; - color: #333; - margin: 0 -} \ No newline at end of file diff --git a/print/report/payment-update/index.html b/print/report/payment-update/index.html index 2f0f130ed..bd4b9a0db 100644 --- a/print/report/payment-update/index.html +++ b/print/report/payment-update/index.html @@ -8,7 +8,6 @@ -
diff --git a/print/report/printer-setup/assets/css/index.js b/print/report/printer-setup/assets/css/index.js index c1943eee1..321c632dc 100644 --- a/print/report/printer-setup/assets/css/index.js +++ b/print/report/printer-setup/assets/css/index.js @@ -2,5 +2,6 @@ const CssReader = require(`${appPath}/lib/cssReader`); module.exports = new CssReader([ `${appPath}/common/css/layout.css`, - `${__dirname}/style.css`]) + `${appPath}/common/css/email.css`, + `${appPath}/common/css/misc.css`]) .mergeStyles(); diff --git a/print/report/printer-setup/assets/css/style.css b/print/report/printer-setup/assets/css/style.css deleted file mode 100644 index a197ee5cd..000000000 --- a/print/report/printer-setup/assets/css/style.css +++ /dev/null @@ -1,40 +0,0 @@ -body { - background-color: #EEE -} - -.container { - max-width: 600px; - min-width: 320px; - margin: 0 auto; - color: #555 -} - -.main { - background-color: #FFF; - padding: 20px -} - -.main a { - color: #8dba25 -} - -.main h1 { - color: #999 -} - -.main h3 { - font-size: 16px -} - -.title { - background-color: #95d831; - text-transform: uppercase; - text-align: center; - padding: 35px 0 -} - -.title h1 { - font-size: 32px; - color: #333; - margin: 0 -} \ No newline at end of file diff --git a/print/report/printer-setup/index.html b/print/report/printer-setup/index.html index 52a0535a4..0b62f5919 100644 --- a/print/report/printer-setup/index.html +++ b/print/report/printer-setup/index.html @@ -8,7 +8,6 @@ -
diff --git a/print/report/rpt-claim-pickup-order/assets/css/index.js b/print/report/rpt-claim-pickup-order/assets/css/index.js index d40ab4984..515dea750 100644 --- a/print/report/rpt-claim-pickup-order/assets/css/index.js +++ b/print/report/rpt-claim-pickup-order/assets/css/index.js @@ -2,6 +2,7 @@ const CssReader = require(`${appPath}/lib/cssReader`); module.exports = new CssReader([ `${appPath}/common/css/layout.css`, + `${appPath}/common/css/report.css`, `${appPath}/common/css/misc.css`, `${__dirname}/style.css`]) .mergeStyles(); diff --git a/print/report/rpt-claim-pickup-order/assets/css/style.css b/print/report/rpt-claim-pickup-order/assets/css/style.css index 21b89e27b..c3b21a257 100644 --- a/print/report/rpt-claim-pickup-order/assets/css/style.css +++ b/print/report/rpt-claim-pickup-order/assets/css/style.css @@ -1,14 +1,3 @@ -.container { - color: #000 -} - -.title { - font-weight: 100; - margin-top: 0; - margin-bottom: 20px; - font-size: 2em -} - table.column-oriented { margin-top: 50px !important } diff --git a/print/report/rpt-claim-pickup-order/index.html b/print/report/rpt-claim-pickup-order/index.html index 568d972d9..42a8f9096 100644 --- a/print/report/rpt-claim-pickup-order/index.html +++ b/print/report/rpt-claim-pickup-order/index.html @@ -2,7 +2,9 @@
- + + +
@@ -72,12 +74,13 @@

- + +
\ No newline at end of file diff --git a/print/report/rpt-delivery-note/assets/css/index.js b/print/report/rpt-delivery-note/assets/css/index.js index d40ab4984..515dea750 100644 --- a/print/report/rpt-delivery-note/assets/css/index.js +++ b/print/report/rpt-delivery-note/assets/css/index.js @@ -2,6 +2,7 @@ const CssReader = require(`${appPath}/lib/cssReader`); module.exports = new CssReader([ `${appPath}/common/css/layout.css`, + `${appPath}/common/css/report.css`, `${appPath}/common/css/misc.css`, `${__dirname}/style.css`]) .mergeStyles(); diff --git a/print/report/rpt-delivery-note/assets/css/style.css b/print/report/rpt-delivery-note/assets/css/style.css index 05dbab652..e621f3e23 100644 --- a/print/report/rpt-delivery-note/assets/css/style.css +++ b/print/report/rpt-delivery-note/assets/css/style.css @@ -1,14 +1,3 @@ -.container { - color: #000 -} - -.title { - font-weight: 100; - margin-top: 0; - margin-bottom: 20px; - font-size: 2em -} - table.column-oriented { margin-top: 50px !important } \ No newline at end of file diff --git a/print/report/rpt-delivery-note/index.html b/print/report/rpt-delivery-note/index.html index fb59a88e1..36a2f1e11 100644 --- a/print/report/rpt-delivery-note/index.html +++ b/print/report/rpt-delivery-note/index.html @@ -1,8 +1,10 @@ -
- +
+ + +
@@ -74,13 +76,21 @@ --> -
+
+
Firma digital
+ +
{{dmsCreated}}
+
+
+
+ +
\ No newline at end of file diff --git a/print/report/rpt-delivery-note/index.js b/print/report/rpt-delivery-note/index.js index 1056fb1d1..52b3d90d7 100755 --- a/print/report/rpt-delivery-note/index.js +++ b/print/report/rpt-delivery-note/index.js @@ -33,11 +33,17 @@ module.exports = { data() { return {totalBalance: 0.00}; }, + computed: { + dmsPath() { + return `http://windows.verdnatura.es/signatures/tickets/1161229.png`; + } + }, methods: { fetchClient(ticketFk) { return database.pool.query( `SELECT c.id clientId, + t.id ticketId, u.lang locale, c.email AS recipient, c.socialName AS clientName, @@ -46,12 +52,16 @@ module.exports = { c.city, c.fi, p.name AS province, - ct.country + ct.country, + dt.dmsFk, + d.created AS dmsCreated FROM ticket t JOIN client c ON c.id = t.clientFk JOIN account.user u ON u.id = c.id JOIN country ct ON ct.id = c.countryFk LEFT JOIN province p ON p.id = c.provinceFk + LEFT JOIN dmsTicket dt ON dt.ticketFk = t.id + LEFT JOIN dms d ON d.id = dt.dmsFk WHERE t.id = ?`, [ticketFk]); }, fetchSales(clientFk, companyFk) { diff --git a/print/report/rpt-informe/assets/css/index.js b/print/report/rpt-informe/assets/css/index.js new file mode 100644 index 000000000..515dea750 --- /dev/null +++ b/print/report/rpt-informe/assets/css/index.js @@ -0,0 +1,8 @@ +const CssReader = require(`${appPath}/lib/cssReader`); + +module.exports = new CssReader([ + `${appPath}/common/css/layout.css`, + `${appPath}/common/css/report.css`, + `${appPath}/common/css/misc.css`, + `${__dirname}/style.css`]) + .mergeStyles(); diff --git a/print/report/rpt-informe/assets/css/style.css b/print/report/rpt-informe/assets/css/style.css new file mode 100644 index 000000000..e621f3e23 --- /dev/null +++ b/print/report/rpt-informe/assets/css/style.css @@ -0,0 +1,3 @@ +table.column-oriented { + margin-top: 50px !important +} \ No newline at end of file diff --git a/print/report/rpt-informe/index.html b/print/report/rpt-informe/index.html new file mode 100644 index 000000000..9a60114fd --- /dev/null +++ b/print/report/rpt-informe/index.html @@ -0,0 +1,39 @@ + + + +
+ + + +
+ +

{{$t('title')}}

+

{{$t('date')}} {{dated()}}

+ + + + + + + + + + + + + + + +
Id{{$t('concept')}}{{$t('quantity')}}
{{sale.id}}{{sale.concept}}{{sale.quantity}}
+ +
+ + + + +
+ + \ No newline at end of file diff --git a/print/report/rpt-informe/index.js b/print/report/rpt-informe/index.js new file mode 100755 index 000000000..8338e2df7 --- /dev/null +++ b/print/report/rpt-informe/index.js @@ -0,0 +1,32 @@ +const strftime = require('strftime'); + +module.exports = { + name: 'rpt-informe', + created() { + if (this.locale) + this.$i18n.locale = this.locale; + }, + data() { + return { + client: { + id: 10252, + name: 'Batman', + }, + sales: [ + {id: 1, concept: 'My item 1', quantity: 25}, + {id: 2, concept: 'My item 2', quantity: 50}, + {id: 3, concept: 'My item 3', quantity: 150} + ], + locale: 'es' + }; + }, + methods: { + dated: () => { + return strftime('%d-%m-%Y', new Date()); + }, + }, + components: { + 'report-header': require('../report-header'), + 'report-footer': require('../report-footer'), + }, +}; diff --git a/print/report/rpt-informe/locale.js b/print/report/rpt-informe/locale.js new file mode 100644 index 000000000..d231e10ff --- /dev/null +++ b/print/report/rpt-informe/locale.js @@ -0,0 +1,11 @@ +module.exports = { + messages: { + es: { + title: 'Sample report', + date: 'Fecha', + quantity: 'Cantidad', + concept: 'Concepto', + client: 'Cliente {0}', + }, + }, +}; diff --git a/print/report/rpt-letter-debtor/assets/css/index.js b/print/report/rpt-letter-debtor/assets/css/index.js index d40ab4984..515dea750 100644 --- a/print/report/rpt-letter-debtor/assets/css/index.js +++ b/print/report/rpt-letter-debtor/assets/css/index.js @@ -2,6 +2,7 @@ const CssReader = require(`${appPath}/lib/cssReader`); module.exports = new CssReader([ `${appPath}/common/css/layout.css`, + `${appPath}/common/css/report.css`, `${appPath}/common/css/misc.css`, `${__dirname}/style.css`]) .mergeStyles(); diff --git a/print/report/rpt-letter-debtor/assets/css/style.css b/print/report/rpt-letter-debtor/assets/css/style.css index 05dbab652..e621f3e23 100644 --- a/print/report/rpt-letter-debtor/assets/css/style.css +++ b/print/report/rpt-letter-debtor/assets/css/style.css @@ -1,14 +1,3 @@ -.container { - color: #000 -} - -.title { - font-weight: 100; - margin-top: 0; - margin-bottom: 20px; - font-size: 2em -} - table.column-oriented { margin-top: 50px !important } \ No newline at end of file diff --git a/print/report/rpt-letter-debtor/index.html b/print/report/rpt-letter-debtor/index.html index 6ced7b98a..6e8b681ba 100644 --- a/print/report/rpt-letter-debtor/index.html +++ b/print/report/rpt-letter-debtor/index.html @@ -2,7 +2,9 @@
- + + +
@@ -71,12 +73,13 @@
- + +
\ No newline at end of file diff --git a/print/report/rpt-sepa-core/assets/css/index.js b/print/report/rpt-sepa-core/assets/css/index.js index d40ab4984..515dea750 100644 --- a/print/report/rpt-sepa-core/assets/css/index.js +++ b/print/report/rpt-sepa-core/assets/css/index.js @@ -2,6 +2,7 @@ const CssReader = require(`${appPath}/lib/cssReader`); module.exports = new CssReader([ `${appPath}/common/css/layout.css`, + `${appPath}/common/css/report.css`, `${appPath}/common/css/misc.css`, `${__dirname}/style.css`]) .mergeStyles(); diff --git a/print/report/rpt-sepa-core/assets/css/style.css b/print/report/rpt-sepa-core/assets/css/style.css index a2d4ed818..056a89b69 100644 --- a/print/report/rpt-sepa-core/assets/css/style.css +++ b/print/report/rpt-sepa-core/assets/css/style.css @@ -1,14 +1,3 @@ -.container { - color: #000 -} - -.title { - margin-bottom: 10px; - font-weight: 100; - font-size: 1.5em; - margin-top: 0 -} - .payment-type { width: auto } diff --git a/print/report/rpt-sepa-core/index.html b/print/report/rpt-sepa-core/index.html index 220346946..ec82a61d2 100644 --- a/print/report/rpt-sepa-core/index.html +++ b/print/report/rpt-sepa-core/index.html @@ -2,7 +2,9 @@
- + + +

{{$t('title')}}

@@ -139,12 +141,13 @@

{{$t('mandatoryFields')}}

{{$t('sendOrder')}}

- + +
\ No newline at end of file diff --git a/print/report/sample-report/assets/css/index.js b/print/report/sample-report/assets/css/index.js index d40ab4984..515dea750 100644 --- a/print/report/sample-report/assets/css/index.js +++ b/print/report/sample-report/assets/css/index.js @@ -2,6 +2,7 @@ const CssReader = require(`${appPath}/lib/cssReader`); module.exports = new CssReader([ `${appPath}/common/css/layout.css`, + `${appPath}/common/css/report.css`, `${appPath}/common/css/misc.css`, `${__dirname}/style.css`]) .mergeStyles(); diff --git a/print/report/sample-report/index.html b/print/report/sample-report/index.html index f77ef0014..9a60114fd 100644 --- a/print/report/sample-report/index.html +++ b/print/report/sample-report/index.html @@ -1,8 +1,10 @@ -
+
+ +

{{$t('title')}}

@@ -25,11 +27,13 @@
+ +
\ No newline at end of file diff --git a/print/report/sepa-core/assets/css/index.js b/print/report/sepa-core/assets/css/index.js index c1943eee1..321c632dc 100644 --- a/print/report/sepa-core/assets/css/index.js +++ b/print/report/sepa-core/assets/css/index.js @@ -2,5 +2,6 @@ const CssReader = require(`${appPath}/lib/cssReader`); module.exports = new CssReader([ `${appPath}/common/css/layout.css`, - `${__dirname}/style.css`]) + `${appPath}/common/css/email.css`, + `${appPath}/common/css/misc.css`]) .mergeStyles(); diff --git a/print/report/sepa-core/assets/css/style.css b/print/report/sepa-core/assets/css/style.css deleted file mode 100644 index a197ee5cd..000000000 --- a/print/report/sepa-core/assets/css/style.css +++ /dev/null @@ -1,40 +0,0 @@ -body { - background-color: #EEE -} - -.container { - max-width: 600px; - min-width: 320px; - margin: 0 auto; - color: #555 -} - -.main { - background-color: #FFF; - padding: 20px -} - -.main a { - color: #8dba25 -} - -.main h1 { - color: #999 -} - -.main h3 { - font-size: 16px -} - -.title { - background-color: #95d831; - text-transform: uppercase; - text-align: center; - padding: 35px 0 -} - -.title h1 { - font-size: 32px; - color: #333; - margin: 0 -} \ No newline at end of file diff --git a/print/report/sepa-core/index.html b/print/report/sepa-core/index.html index 6c1355708..c41c18593 100644 --- a/print/report/sepa-core/index.html +++ b/print/report/sepa-core/index.html @@ -8,7 +8,6 @@ -
@@ -19,10 +18,9 @@

{{$t('description.dear')}},

{{$t('description.instructions')}}

{{$t('description.conclusion')}}

-
- +