Skip to content
Snippets Groups Projects
Commit 3b001be9 authored by clairezed's avatar clairezed
Browse files

update: display money amount values calculated back-end

parent e8fc9751
No related branches found
No related tags found
No related merge requests found
...@@ -97,6 +97,13 @@ sib-display [name="invoice-header"], [name="freelance-invoice-header"] { ...@@ -97,6 +97,13 @@ sib-display [name="invoice-header"], [name="freelance-invoice-header"] {
justify-content: space-between; justify-content: space-between;
} }
/* Totals section (#invoice-list and #show-invoice) */
#invoice-list [name="ht-total"], #invoice-list [name="tva-total"], #invoice-list [name="ttc-total"], #show-invoice [name="ht-total"], #show-invoice [name="tva-total"], #show-invoice [name="ttc-total"] {
display: flex;
justify-content: space-between;
}
/* Tasks list =========================== */ /* Tasks list =========================== */
.tasks-list { .tasks-list {
width: 100%; width: 100%;
...@@ -107,9 +114,7 @@ sib-display [name="invoice-header"], [name="freelance-invoice-header"] { ...@@ -107,9 +114,7 @@ sib-display [name="invoice-header"], [name="freelance-invoice-header"] {
justify-content: space-between; justify-content: space-between;
} }
/* Invoice show ========================== */ .invoices_list [name="invoice-totals"] {
border: 1px solid #ccc;
#show-invoice [name="ht-total"], #show-invoice [name="tva-total"], #show-invoice [name="ttc-total"] { margin-bottom: 0.5em;
display: flex;
justify-content: space-between;
} }
\ No newline at end of file
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
data-fields="title, identifier, creationDate, htAmount, tvaRate" data-fields="title, identifier, creationDate, htAmount, tvaRate"
next="invoice-list" next="invoice-list"
></sib-form> ></sib-form>
<sib-form <sib-form
id="edit-invoice" id="edit-invoice"
data-fields="title, identifier, creationDate, htAmount, tvaRate" data-fields="title, identifier, creationDate, htAmount, tvaRate"
...@@ -92,14 +92,24 @@ ...@@ -92,14 +92,24 @@
<sib-display <sib-display
id="invoice-list" id="invoice-list"
data-src="http://invoicing-module.happy-dev.fr/invoices/client-invoices/" data-src="http://invoicing-module.happy-dev.fr/invoices/client-invoices/"
data-fields="invoice-section, batches" data-fields="invoice-section, batches, invoice-totals"
set-invoice-section="invoice-main, invoice-aside" set-invoice-section="invoice-main, invoice-aside"
set-invoice-main="invoice-header, invoice-footer" set-invoice-main="invoice-header, invoice-footer"
set-invoice-aside="state" set-invoice-aside="state"
set-invoice-header="title, identifier" set-invoice-header="title, identifier"
set-invoice-footer="creationDate, htAmount" set-invoice-footer="invoicingDate, htAmount"
set-invoice-totals="totals-header, ht-total, tva-total, ttc-total"
value-totals-header="TOTAL DE LA FACTURE"
set-ht-total="ht-label, htAmount"
value-ht-label="Total HT"
set-tva-total="tvaRate, tvaAmount"
set-ttc-total="ttc-label, ttcAmount"
value-ttc-label="Total TTC"
template-batches="batches-template"
template-htAmount="money-template" template-htAmount="money-template"
template-batches="batches-template" template-tvaAmount="money-template"
template-ttcAmount="money-template"
template-tvaRate="tva-rate-template"
></sib-display> ></sib-display>
<sib-display <sib-display
...@@ -112,8 +122,8 @@ ...@@ -112,8 +122,8 @@
set-invoice-totals="ht-total, tva-total, ttc-total" set-invoice-totals="ht-total, tva-total, ttc-total"
set-ht-total="ht-label, htAmount" set-ht-total="ht-label, htAmount"
value-ht-label="Total HT" value-ht-label="Total HT"
set-tva-total="tvaRate, htAmount" set-tva-total="tvaRate, tvaAmount"
set-ttc-total="ttc-label, htAmount" set-ttc-total="ttc-label, ttcAmount"
value-ttc-label="Total TTC" value-ttc-label="Total TTC"
set-invoice-footer="hd-address, hd-legal" set-invoice-footer="hd-address, hd-legal"
value-hd-address="Happy Dev adresse / TODO" value-hd-address="Happy Dev adresse / TODO"
...@@ -122,6 +132,8 @@ ...@@ -122,6 +132,8 @@
template-invoicingDate="date-template" template-invoicingDate="date-template"
template-batches="batches-template" template-batches="batches-template"
template-htAmount="money-template" template-htAmount="money-template"
template-tvaAmount="money-template"
template-ttcAmount="money-template"
template-tvaRate="tva-rate-template" template-tvaRate="tva-rate-template"
bind-resources bind-resources
></sib-display> ></sib-display>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment