From e66cd5aaa3e1479971207584efb3684a5a950537 Mon Sep 17 00:00:00 2001 From: Mohamed ABDELLANI Date: Tue, 27 Jun 2023 10:46:52 +0100 Subject: [PATCH 1/5] add order number & invoice number to invoices --- app/models/invoice/data_presenter.rb | 4 ++++ app/views/spree/admin/orders/invoice3.html.haml | 10 ++++++++++ config/locales/en.yml | 2 ++ 3 files changed, 16 insertions(+) diff --git a/app/models/invoice/data_presenter.rb b/app/models/invoice/data_presenter.rb index e8c7b3656b..3fbdd2f7dd 100644 --- a/app/models/invoice/data_presenter.rb +++ b/app/models/invoice/data_presenter.rb @@ -86,6 +86,10 @@ class Invoice date end + def invoice_number + invoice.number + end + def paid? data[:payment_state] == 'paid' || data[:payment_state] == 'credit_owed' end diff --git a/app/views/spree/admin/orders/invoice3.html.haml b/app/views/spree/admin/orders/invoice3.html.haml index 6fff210069..a4af40bcd2 100644 --- a/app/views/spree/admin/orders/invoice3.html.haml +++ b/app/views/spree/admin/orders/invoice3.html.haml @@ -7,6 +7,16 @@ %h6 = "#{t('spree.admin.orders.invoice.issued_on')}: " = l @order.invoice_date + %tr{ valign: "top" } + %td{ :align => "left", colspan: 3 } + %h6 + = "#{t('spree.admin.orders.invoice.order_number')}: " + = @order.number + %tr{ valign: "top" } + %td{ :align => "left", colspan: 3 } + %h6 + = "#{t('spree.admin.orders.invoice.invoice_number')}: " + = @order.invoice_number %tr{ valign: "top" } %td{ :align => "left" } %h4 diff --git a/config/locales/en.yml b/config/locales/en.yml index 21a9671552..78f1d75ad6 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -4106,6 +4106,8 @@ See the %{link} to find out more about %{sitename}'s features and to start using from: "From" to: "Bill to" shipping: "Shipping" + order_number: "Order Number" + invoice_number: "Invoice Number" note: note_label: "Note:" no_note_present: "No note provided." From 8abb9d2ecf27a721d04c7c4ecc0a4e72c009ddda Mon Sep 17 00:00:00 2001 From: Mohamed ABDELLANI Date: Tue, 27 Jun 2023 10:58:30 +0100 Subject: [PATCH 2/5] add invoice number to alternative invoices --- app/views/spree/admin/orders/invoice4.html.haml | 3 +++ config/locales/en.yml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/spree/admin/orders/invoice4.html.haml b/app/views/spree/admin/orders/invoice4.html.haml index 1031d33ea3..113a6886c7 100644 --- a/app/views/spree/admin/orders/invoice4.html.haml +++ b/app/views/spree/admin/orders/invoice4.html.haml @@ -43,6 +43,9 @@ %td{ :align => "left", colspan: 2 }   %tr{ valign: "top" } %td{ :align => "left" } + %br + = "#{t :invoice_number}:" + = @order.invoice_number %br = t :invoice_issued_on = l @order.invoice_date diff --git a/config/locales/en.yml b/config/locales/en.yml index 78f1d75ad6..58b843e6fd 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1834,7 +1834,7 @@ en: abn: "ABN:" acn: "ACN:" invoice_issued_on: "Invoice issued on:" - order_number: "Invoice number:" + order_number: "Order number:" date_of_transaction: "Date of transaction:" menu_1_title: "Shops" From 0ce8fae7c9def9de0780cb741f37b458c340a577 Mon Sep 17 00:00:00 2001 From: Mohamed ABDELLANI Date: Wed, 5 Jul 2023 16:30:19 +0100 Subject: [PATCH 3/5] replace invoice_number method with delegate --- app/models/invoice/data_presenter.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/models/invoice/data_presenter.rb b/app/models/invoice/data_presenter.rb index 3fbdd2f7dd..65cffe82f6 100644 --- a/app/models/invoice/data_presenter.rb +++ b/app/models/invoice/data_presenter.rb @@ -5,6 +5,7 @@ class Invoice attr_reader :invoice delegate :data, :date, to: :invoice + delegate :number, to: :invoice, prefix: true FINALIZED_NON_SUCCESSFUL_STATES = %w(canceled returned).freeze @@ -86,10 +87,6 @@ class Invoice date end - def invoice_number - invoice.number - end - def paid? data[:payment_state] == 'paid' || data[:payment_state] == 'credit_owed' end From 760b17042bc1397b895c8d33697712d098eb6888 Mon Sep 17 00:00:00 2001 From: Mohamed ABDELLANI Date: Wed, 5 Jul 2023 17:54:25 +0100 Subject: [PATCH 4/5] fix existing tests --- spec/system/admin/orders_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/system/admin/orders_spec.rb b/spec/system/admin/orders_spec.rb index 2696a84687..b36baaaa32 100644 --- a/spec/system/admin/orders_spec.rb +++ b/spec/system/admin/orders_spec.rb @@ -208,7 +208,7 @@ describe ' end it "filter by invoice number" do - fill_in "Invoice number:", with: order2.number + fill_in "Order number:", with: order2.number page.find('.filter-actions .button[type=submit]').click @@ -835,7 +835,7 @@ describe ' # Specify each filters uncheck 'Only show complete orders' - fill_in "Invoice number", with: "R123456" + fill_in "Order number", with: "R123456" tomselect_multiselect order_cycle.name, from: 'q[order_cycle_id_in][]' tomselect_multiselect distributor.name, from: 'q[distributor_id_in][]' tomselect_search_and_select shipping_method.name, from: 'shipping_method_id' @@ -854,7 +854,7 @@ describe ' # Check every filters to be equal expect(find_field("Only show complete orders")).not_to be_checked - expect(find_field("Invoice number").value).to eq "R123456" + expect(find_field("Order number").value).to eq "R123456" expect(find("#shipping_method_id-ts-control .item").text).to eq shipping_method.name expect(find("#q_state_eq-ts-control .item").text).to eq "complete" expect(find("#q_distributor_id_in").value).to eq [distributor.id.to_s] @@ -870,7 +870,7 @@ describe ' it "and clear filters" do find("#clear_filters_button").click expect(find_field("Only show complete orders")).to be_checked - expect(find_field("Invoice number").value).to eq "" + expect(find_field("Order number").value).to eq "" expect(find("#shipping_method_id").value).to be_empty expect(find("#q_state_eq").value).to be_empty expect(find("#q_distributor_id_in").value).to be_empty From 7d38a7b38162377278a22518582cce2178c0bbe6 Mon Sep 17 00:00:00 2001 From: Mohamed ABDELLANI Date: Mon, 31 Jul 2023 17:01:36 +0100 Subject: [PATCH 5/5] remove order number next to Tax Invoice --- app/views/spree/admin/orders/invoice3.html.haml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/views/spree/admin/orders/invoice3.html.haml b/app/views/spree/admin/orders/invoice3.html.haml index a4af40bcd2..0bfee26822 100644 --- a/app/views/spree/admin/orders/invoice3.html.haml +++ b/app/views/spree/admin/orders/invoice3.html.haml @@ -20,8 +20,7 @@ %tr{ valign: "top" } %td{ :align => "left" } %h4 - = "#{t('spree.admin.orders.invoice.tax_invoice')}: " - = "#{@order.number}" + = "#{t('spree.admin.orders.invoice.tax_invoice')}" %td{width: "10%" }   %td{ :align => "right" }