dorsale 2.1.15 → 2.2.0

data/app/views/dorsale/billing_machine/invoices/_form.html.slim

@@ -1,70 +1,120 @@
-#invoice.edit
-  = horizontal_form_for @invoice, as: :invoice do |f|
-    .well
-      - if @invoice.persisted?
-        .form-group
-          label.control-label.col-sm-3
-            = Dorsale::BillingMachine::Invoice.t(:tracking_id)
-          .col-sm-9
-            .form-control-static.invoice-unique-index
-              = @invoice.tracking_id
-
-      = f.input :label
-      = f.input :date, html5: true
-      = f.input :payment_term_id, collection: @payment_terms
-      = f.input :due_date, html5: true
-      = f.input :paid, as: :select, include_blank: false
-      = f.input :customer_guid, collection: @people.map{ |e| [e.name, e.guid] }
-      = f.input :vat_rate, as: :string
-      = f.input :advance, as: :string
-      = f.input :commercial_discount, as: :string
-
-      - if @id_cards.one?
-        = f.hidden_field :id_card_id
-      - else
-        = f.input :id_card_id, collection: @id_cards
-
-    #invoice-lines
-      = f.simple_fields_for :lines do |l|
-        = render "line_fields", f: l
-
-      p.center
-        = link_to_add_association t("actions.add_line"), f, :lines, class: "btn btn-primary", id: "add-new-line"
-
-    .total.well
-      .row
-        label.col-sm-3.control-label
-          = @invoice.t(:commercial_discount)
-          = " : "
-        .col-sm-9
-          .form-control-static#invoice-commercial_discount
-
-      .row
-        label.col-sm-3.control-label
-          = @invoice.t(:total_duty)
-          = " : "
-        .col-sm-9
-          .form-control-static#invoice-total_duty
-
-      .row
-        label.col-sm-3.control-label
-          = @invoice.t(:vat_rate)
-          = " : "
-        .col-sm-9
-          .form-control-static#invoice-vat_amount
-
-      .row
-        label.col-sm-3.control-label
-          = @invoice.t(:total_all_taxes)
-          = " : "
-        .col-sm-9
-          .form-control-static#invoice-total_all_taxes
-
-      .row
-        label.col-sm-3.control-label
-          = @invoice.t(:balance)
-          = " : "
-        .col-sm-9
-          .form-control-static#invoice-balance
+- vat_mode      = ::Dorsale::BillingMachine.vat_mode
+- document_type = document.class.to_s.split("::").last.downcase.to_sym
+
+#billing_machine-form
+  = horizontal_form_for document, as: document_type do |f|
+    h1
+      = document.class.t.capitalize
+      - if document.tracking_id.present?
+        = " n° "
+        = document.tracking_id
+
+    .row
+      .col-md-6
+        .well
+          - if @id_cards.one?
+            = f.hidden_field :id_card_id
+          - else
+            = f.input :id_card_id, collection: @id_cards
+
+        = f.input :label
+
+      .col-md-6
+        .well
+          = f.input :date, html5: true
+          hr
+          = f.input :customer_guid, collection: @people.map{ |e| [e.name, e.guid] }
+
+    table#lines-table
+      thead
+        tr
+          th.actions
+          th.line-label      = Dorsale::BillingMachine::InvoiceLine.t(:label)
+          th.line-quantity   = Dorsale::BillingMachine::InvoiceLine.t(:quantity)
+          th.line-unit       = Dorsale::BillingMachine::InvoiceLine.t(:unit)
+          - if vat_mode == :multiple
+            th.line-vat_rate   = Dorsale::BillingMachine::InvoiceLine.t(:vat_rate)
+          th.line-unit_price = Dorsale::BillingMachine::InvoiceLine.t(:unit_price)
+          th.line-total      = Dorsale::BillingMachine::InvoiceLine.t(:total)
+
+      tbody
+        = f.simple_fields_for :lines do |lf|
+          = render "line_fields", f: lf
+
+    .row
+      .col-sm-6
+        = link_to_add_association t("actions.add_line"), f, :lines, class: "btn btn-success btn-sm", id: "add-new-line", "data-association-insertion-node" => "#lines-table tbody", "data-association-insertion-method" => "append"
+
+        = f.input :payment_term_id, collection: @payment_terms
+
+        - if document_type == :invoice
+          = f.input :due_date, html5: true
+          = f.input :paid, as: :select, include_blank: false
+
+        - if document_type == :quotation
+          = f.input :state, collection: billing_machine_quotation_states_for_select
+          = f.input :expires_at, html5: true
+          = f.input :comments
+
+      .col-sm-6
+        table#totals-table
+          tbody
+            tr
+              th.commercial_discount-label
+                = document.class.t(:commercial_discount)
+
+              td.commercial_discount
+                = f.text_field :commercial_discount, class: "number"
+                span.unit = "€"
+
+            tr
+              th.total_excluding_taxes-label
+                = document.class.t(:total_excluding_taxes)
+
+              td.total_excluding_taxes
+                = f.text_field :total_excluding_taxes, class: "number", disabled: true
+                span.unit = "€"
+
+            - if vat_mode == :single
+              tr
+                th.vat_rate-label
+                  = document.class.t(:vat_rate)
+
+                td.vat_rate
+                  = f.text_field :vat_rate, class: "number"
+                  span.unit = "%"
+
+            tr
+              th.vat_amount-label
+                = document.class.t(:vat_amount)
+
+              td.vat_amount
+                = f.text_field :vat_amount, class: "number", disabled: true
+                span.unit = "€"
+
+            tr
+              th.total_including_taxes-label
+                = document.class.t(:total_including_taxes)
+
+              td.total_including_taxes
+                = f.text_field :total_including_taxes, class: "number", disabled: true
+                span.unit = "€"
+
+            - if document.respond_to?(:advance)
+              tr
+                th.advance-label
+                  = document.class.t(:advance)
+
+                td.advance
+                  = f.text_field :advance, class: "number"
+                  span.unit = "€"
+
+              tr
+                th.balance-label
+                  = document.class.t(:balance)
+
+                td.balance
+                  = f.text_field :balance, class: "number", disabled: true
+                  span.unit = "€"
 
     = form_buttons

data/app/views/dorsale/billing_machine/invoices/_line_details.html.slim

@@ -0,0 +1,19 @@
+tr.line
+  td.line-label
+    = text2html line.label
+
+  td.line-quantity
+    = number line.quantity
+
+  td.line-unit
+    = line.unit
+
+  - if ::Dorsale::BillingMachine.vat_mode == :multiple
+    td.line-vat_rate
+      = percentage(line.vat_rate)
+
+  td.line-unit_price
+    = euros line.unit_price
+
+  td.line-total
+    = euros line.total

data/app/views/dorsale/billing_machine/invoices/_line_fields.html.slim

@@ -1,23 +1,27 @@
-.well.nested-fields.invoice-line
-  .row
-    .col-sm-12
-      = f.input :label, as: :string, input_html: {class: "line-label"}
+tr.line
+  td.actions
+    a.delete href="#"
+      span.fa.fa-fw.fa-trash
+    = f.hidden_field :_destroy
 
-    .col-sm-12
-      .col-sm-3
-      .col-sm-3
-        = f.input :quantity, as: :string, input_html: {class: "line-quantity"}
-      .col-sm-3
-        = f.input :unit, as: :string, input_html: {class: "line-unit"}
-      .col-sm-3
-        = f.input :unit_price, as: :string, input_html: {class: "line-unit_price"}
+  td.line-label
+    = f.text_area :label, rows: 1
 
-    .col-sm-12
-      .col-sm-3.remove-line
-        = link_to_remove_association t("actions.remove_line"), f, class: "btn btn-danger btn-xs remove-line"
+  td.line-quantity
+    = f.text_field :quantity, class: "number"
 
-      .col-sm-9
-        label.line-total-label
-          = ::Dorsale::BillingMachine::InvoiceLine.t(:total)
-          = " : "
-        span.line-total
+  td.line-unit
+    = f.text_field :unit
+
+  - if ::Dorsale::BillingMachine.vat_mode == :multiple
+    td.line-vat_rate
+      = f.text_field :vat_rate, class: "number"
+      span.unit = "%"
+
+  td.line-unit_price
+    = f.text_field :unit_price, class: "number"
+    span.unit = "€"
+
+  td.line-total
+    = f.text_field :total, class: "number", disabled: true
+    span.unit = "€"

data/app/views/dorsale/billing_machine/invoices/_list.html.slim

@@ -11,10 +11,10 @@ table.default.invoices
         = ::Dorsale::BillingMachine::Invoice.t(:customer)
 
       th
-        = ::Dorsale::BillingMachine::Invoice.t(:total_duty)
+        = ::Dorsale::BillingMachine::Invoice.t(:total_excluding_taxes)
 
       th.hidden-xs
-        = ::Dorsale::BillingMachine::Invoice.t(:total_all_taxes)
+        = ::Dorsale::BillingMachine::Invoice.t(:total_including_taxes)
 
       th
         = t("actions.actions")
@@ -31,11 +31,11 @@ table.default.invoices
         td.customer_name
           = invoice.customer.try(:name)
 
-        td.total_duty
-          = euros(invoice.total_duty)
+        td.total_excluding_taxes
+          = euros(invoice.total_excluding_taxes)
 
-        td.hidden-xs.total_all_taxes
-          = euros(invoice.total_all_taxes)
+        td.hidden-xs.total_including_taxes
+          = euros(invoice.total_including_taxes)
 
         td.actions
           = read_button dorsale.billing_machine_invoice_path(invoice)

data/app/views/dorsale/billing_machine/invoices/edit.html.slim

@@ -1,2 +1,2 @@
 .billing_machine
-  = render "form"
+  = render "form", document: @invoice

data/app/views/dorsale/billing_machine/invoices/new.html.slim

@@ -1,2 +1,2 @@
 .billing_machine
-  = render "form"
+  = render "form", document: @invoice

data/app/views/dorsale/billing_machine/invoices/show.html.slim

@@ -10,49 +10,4 @@
       - if can?(:pay, @invoice)
         = dorsale_button dorsale.pay_billing_machine_invoice_path(@invoice), icon: :check, action: :pay, method: :patch
 
-    - if @invoice.customer
-      .row
-        .col-xs-12.col-sm-6
-        .col-xs-12.col-sm-6
-          .well
-            .customer-name     = @invoice.customer.name
-            .customer-address1 = @invoice.customer.address.street
-            .customer-address2 = @invoice.customer.address.street_bis
-            .customer-zip      = @invoice.customer.address.zip
-            .customer-city     = @invoice.customer.address.city
-            .customer-country  = @invoice.customer.address.country
-
-    .well: .row
-      .col-xs-12.col-sm-6
-        = info @invoice, :tracking_id
-        = info @invoice, :label
-        = info @invoice, :date,                date(@invoice.date)
-        = info @invoice, :due_date,            date(@invoice.due_date)
-        = info @invoice, :payment_term,        @invoice.payment_term.try(:label)
-        = info @invoice, :vat_rate,            percentage(@invoice.vat_rate)
-        = info @invoice, :payment_status
-        = info @invoice, :commercial_discount, euros(@invoice.commercial_discount)
-        = info @invoice, :total_duty,          euros(@invoice.total_duty)
-        = info @invoice, :vat_amount,          euros(@invoice.vat_amount)
-        = info @invoice, :advance,             euros(@invoice.advance)
-        = info @invoice, :total_all_taxes,     euros(@invoice.total_all_taxes)
-        = info @invoice, :balance,             euros(@invoice.balance)
-
-    - @invoice.lines.each do |line|
-      .panel.panel-default
-        .panel-heading
-          .panel-title
-            = line.label
-
-        .panel-body
-          .col-xs-12.col-sm-4
-            = info line, :quantity
-
-          .col-xs-12.col-sm-4
-            = info line, :unit_price, euros(line.unit_price)
-
-          .col-xs-12.col-sm-4
-            = info line, :unit
-
-        .panel-footer
-          = info line, :total, euros(line.total)
+  = render "details", document: @invoice

data/app/views/dorsale/billing_machine/quotations/_data_context.html.slim

@@ -1,6 +1,6 @@
 .quotation-context: .context
   = context_title ::Dorsale::BillingMachine::Quotation.t(:data)
 
-  = context_info ::Dorsale::BillingMachine::Quotation.t(:total_duty), euros(@total_duty)
+  = context_info ::Dorsale::BillingMachine::Quotation.t(:total_excluding_taxes), euros(@total_excluding_taxes)
   = context_info ::Dorsale::BillingMachine::Quotation.t(:vat_amount), euros(@vat_amount)
-  = context_info ::Dorsale::BillingMachine::Quotation.t(:total_all_taxes), euros(@total_all_taxes)
+  = context_info ::Dorsale::BillingMachine::Quotation.t(:total_including_taxes), euros(@total_including_taxes)

data/app/views/dorsale/billing_machine/quotations/_form.html.slim

@@ -1,64 +1 @@
-#quotation.edit
-  = horizontal_form_for @quotation, as: :quotation do |f|
-    .well
-      - if @quotation.persisted?
-        .form-group
-          label.control-label.col-sm-3
-            = @quotation.t(:tracking_id)
-          .col-sm-9
-            .form-control-static.quotation-unique-index
-              = @quotation.tracking_id
-
-      = f.input :label
-      = f.input :state, collection: billing_machine_quotation_states_for_select
-      = f.input :date, html5: true
-      = f.input :expires_at, html5: true
-      = f.association :payment_term, collection: @payment_terms
-      = f.input :customer_guid, collection: @people.map{ |e| [e.name, e.guid] }
-      = f.input :vat_rate, as: :string
-      = f.input :commercial_discount, as: :string
-
-      - if @id_cards.one?
-        = f.hidden_field :id_card_id
-      - else
-        = f.input :id_card_id, collection: @id_cards
-
-      = f.input :comments
-
-    #quotation-lines
-      = f.simple_fields_for :lines do |l|
-        = render "line_fields", f: l
-
-      p.center
-        = link_to_add_association t("actions.add_line"), f, :lines, class: "btn btn-primary", id: "add-new-line"
-
-    .total.well
-      .row
-        label.col-sm-3.control-label
-          = @quotation.t(:commercial_discount)
-          = " : "
-        .col-sm-9
-          .form-control-static#quotation-commercial_discount
-
-      .row
-        label.col-sm-3.control-label
-          = @quotation.t(:total_duty)
-          = " : "
-        .col-sm-9
-          .form-control-static#quotation-total_duty
-
-      .row
-        label.col-sm-3.control-label
-          = @quotation.t(:vat_rate)
-          = " : "
-        .col-sm-9
-          .form-control-static#quotation-vat_amount
-
-      .row
-        label.col-sm-3.control-label
-          = @quotation.t(:total_all_taxes)
-          = " : "
-        .col-sm-9
-          .form-control-static#quotation-total_all_taxes
-
-    = form_buttons
+= render "dorsale/billing_machine/invoices/form", document: @quotation

data/app/views/dorsale/billing_machine/quotations/_line_details.html.slim

@@ -0,0 +1 @@
+= render "dorsale/billing_machine/invoices/line_details", line: line

data/app/views/dorsale/billing_machine/quotations/_line_fields.html.slim

@@ -1,23 +1 @@
-.well.nested-fields.quotation-line
-  .row
-    .col-sm-12
-      = f.input :label, as: :string, input_html: {class: "line-label"}
-
-    .col-sm-12
-      .col-sm-3
-      .col-sm-3
-        = f.input :quantity, as: :string, input_html: {class: "line-quantity"}
-      .col-sm-3
-        = f.input :unit, as: :string, input_html: {class: "line-unit"}
-      .col-sm-3
-        = f.input :unit_price, as: :string, input_html: {class: "line-unit_price"}
-
-    .col-sm-12
-      .col-sm-3.remove-line
-        = link_to_remove_association t("actions.remove_line"), f, class: "btn btn-danger btn-xs remove-line"
-
-      .col-sm-9
-        label.line-total-label
-          = ::Dorsale::BillingMachine::InvoiceLine.t(:total)
-          = " : "
-        span.line-total
+= render "dorsale/billing_machine/invoices/line_fields", f: f