Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Fix various issues with return authorization form (#12838)
Damian Kaczmarczykf8b382de64f6
diff --git a/admin/app/javascript/spree/admin/controllers/return_items_controller.js b/admin/app/javascript/spree/admin/controllers/return_items_controller.jsindex 1433999786..93922c1fe2 100644--- a/admin/app/javascript/spree/admin/controllers/return_items_controller.js+++ b/admin/app/javascript/spree/admin/controllers/return_items_controller.js@@ -21,7 +21,12 @@ export default class extends CheckboxSelectAll {var totalPretaxRefund = 0this.checked.forEach((checkbox) => {const returnItemRow = checkbox.closest('tr')- const amount = parseFloat(returnItemRow.querySelector('.refund-amount-input').value)+ const refundAmountInput = returnItemRow.querySelector('.refund-amount-input')+ let amount = parseFloat(refundAmountInput.value)+ if (!Number.isFinite(amount)) {+ amount = 0+ refundAmountInput.value = 0+ }totalPretaxRefund += amount})diff --git a/admin/app/views/spree/admin/orders/return_authorizations/_form.html.erb b/admin/app/views/spree/admin/orders/return_authorizations/_form.html.erbindex 966ba81039..c88e256cd2 100644--- a/admin/app/views/spree/admin/orders/return_authorizations/_form.html.erb+++ b/admin/app/views/spree/admin/orders/return_authorizations/_form.html.erb@@ -68,9 +68,9 @@<td><%= inventory_unit.state.humanize %></td><tdclass="charged-amount"- data-charged-amount="<%= return_item.pre_tax_amount %>"+ data-charged-amount="<%= inventory_unit.charged_amount %>">- <%= return_item.display_pre_tax_amount %>+ <%= inventory_unit.display_charged_amount %></td><td class="purchased-quantity"><%= inventory_unit.quantity %>@@ -81,6 +81,7 @@{class: "refund-quantity-input form-control",min: 0,+ required: true,data: {action: "return-items#updateSuggestedAmount",},@@ -93,12 +94,13 @@<td><% if editable %><%= item_fields.text_field :pre_tax_amount,- {- class: "refund-amount-input form-control",- data: {- action: "return-items#updateTotalRefundAmount",- },- } %>+ {+ class: "refund-amount-input form-control",+ required: true,+ data: {+ action: "return-items#updateTotalRefundAmount",+ },+ } %><% else %><%= return_item.display_pre_tax_amount %><% end %>@@ -153,9 +155,9 @@<div class="form-group"><%= f.label :reason, raw(Spree.t(:reason) + required_span_tag) %><%= f.select :return_authorization_reason_id,- @reasons.collect { |r| [r.name, r.id] },- { include_blank: Spree.t(:select_a_return_authorization_reason) },- { class: "custom-select" } %>+ @reasons.collect { |r| [r.name, r.id] },+ { include_blank: Spree.t(:select_a_return_authorization_reason) },+ { class: "custom-select" } %><%= f.error_message_on :reason %></div>diff --git a/admin/spec/controllers/spree/admin/orders/return_authorizations_controller_spec.rb b/admin/spec/controllers/spree/admin/orders/return_authorizations_controller_spec.rbindex 0db3d2dccb..c5b796d064 100644--- a/admin/spec/controllers/spree/admin/orders/return_authorizations_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/orders/return_authorizations_controller_spec.rb@@ -82,7 +82,11 @@ RSpec.describe Spree::Admin::Orders::ReturnAuthorizationsController dodescribe '#update' dosubject do- put :update, params: {+ put :update, params: params+ end++ let(:params) do+ {order_id: order.number,id: return_authorization.id,return_authorization: {@@ -109,6 +113,22 @@ RSpec.describe Spree::Admin::Orders::ReturnAuthorizationsController dosubjectexpect(response).to redirect_to(spree.edit_admin_order_path(order))end++ context 'when _destroy is set to true' do+ let(:params) do+ {+ order_id: order.number,+ id: return_authorization.id,+ return_authorization: { return_items_attributes: { '0' => { id: return_item.id, _destroy: true } } }+ }+ end++ it 'can destroy return items' do+ subject+ expect(return_authorization.return_items.count).to eq 0+ expect(Spree::ReturnItem.find_by(id: return_item.id)).to be_nil+ end+ endenddescribe '#show' dodiff --git a/core/app/models/spree/inventory_unit.rb b/core/app/models/spree/inventory_unit.rbindex 1a85b227c1..1c8811aa31 100644--- a/core/app/models/spree/inventory_unit.rb+++ b/core/app/models/spree/inventory_unit.rb@@ -1,5 +1,6 @@module Spreeclass InventoryUnit < Spree.base_class+ extend Spree::DisplayMoneyif defined?(Spree::Webhooks::HasWebhooks)include Spree::Webhooks::HasWebhooksend@@ -30,6 +31,8 @@ module Spreevalidates :quantity, numericality: { greater_than: 0 }+ money_methods :charged_amount+# state machine (see http://github.com/pluginaweek/state_machine/tree/master for details)state_machine initial: :on_hand doevent :fill_backorder do@@ -113,6 +116,14 @@ module Spreeoriginal_return_item_id?end+ def charged_amount+ percentage_of_line_item * line_item.pre_tax_amount+ end++ def percentage_of_line_item+ quantity / BigDecimal(line_item.quantity)+ end+privatedef allow_ship?@@ -124,10 +135,6 @@ module Spreeorder.fulfill!end- def percentage_of_line_item- quantity / BigDecimal(line_item.quantity)- end-def current_return_itemreturn_items.not_cancelled.firstenddiff --git a/core/app/models/spree/return_item.rb b/core/app/models/spree/return_item.rbindex 11212cc064..6133c07318 100644--- a/core/app/models/spree/return_item.rb+++ b/core/app/models/spree/return_item.rb@@ -13,6 +13,10 @@ module Spree@_return_quantity = value.to_iend+ def pre_tax_amount=(amount)+ self[:pre_tax_amount] = Spree::LocalizedNumber.parse(amount)+ end+def return_quantity@_return_quantity.nil? ? inventory_unit.quantity : @_return_quantityenddiff --git a/core/lib/spree/permitted_attributes.rb b/core/lib/spree/permitted_attributes.rbindex 20b1005d08..84caf84f2b 100644--- a/core/lib/spree/permitted_attributes.rb+++ b/core/lib/spree/permitted_attributes.rb@@ -184,6 +184,7 @@ module Spree:amount, :memo, :stock_location_id, :inventory_units_attributes,:return_authorization_reason_id, {return_items_attributes: [+ :_destroy,:id, :inventory_unit_id,:preferred_reimbursement_type_id,:return_authorization_id, :returned, :pre_tax_amount,diff --git a/core/spec/models/spree/inventory_unit_spec.rb b/core/spec/models/spree/inventory_unit_spec.rbindex ca12e28449..1cce4f1146 100644--- a/core/spec/models/spree/inventory_unit_spec.rb+++ b/core/spec/models/spree/inventory_unit_spec.rb@@ -31,7 +31,7 @@ describe Spree::InventoryUnit, type: :model doendend- context '#backordered_for_stock_item' do+ describe '#backordered_for_stock_item' dolet(:order) doorder = create(:order, state: 'complete', ship_address: create(:ship_address))order.completed_at = Time.current@@ -127,7 +127,7 @@ describe Spree::InventoryUnit, type: :model doendend- context '#finalize_units!' do+ describe '#finalize_units!' dolet!(:stock_location) { create(:stock_location) }let(:variant) { create(:variant) }let (:shipment) { create(:shipment) }@@ -167,7 +167,7 @@ describe Spree::InventoryUnit, type: :model doit 'connects return_authorizations' doexpect(inventory_unit.return_authorizations).to eq [return_item.return_authorization]- end+ endendcontext 'no associated return item' do@@ -250,4 +250,16 @@ describe Spree::InventoryUnit, type: :model doexpect(subject.included_tax_total).to eq line_item_included_tax_total / quantityendend++ describe '#charged_amount' do+ subject { build(:inventory_unit, line_item: line_item, quantity: 1) }++ let(:quantity) { 2 }+ let(:line_item_pre_tax_amount) { 10.00 }+ let(:line_item) { build(:line_item, quantity: quantity, pre_tax_amount: line_item_pre_tax_amount) }++ it 'is the correct amount' do+ expect(subject.charged_amount).to eq line_item_pre_tax_amount / quantity+ end+ endenddiff --git a/core/spec/models/spree/return_item_spec.rb b/core/spec/models/spree/return_item_spec.rbindex e59c321b47..deefd3818a 100644--- a/core/spec/models/spree/return_item_spec.rb+++ b/core/spec/models/spree/return_item_spec.rb@@ -91,6 +91,19 @@ describe Spree::ReturnItem, type: :model doendend+ describe '#pre_tax_amount=' do+ let(:return_item) { build :return_item }+ let(:amount) { '3,0A0' }++ before do+ return_item.pre_tax_amount = amount+ end++ it 'is expected to equal to localized number' do+ expect(return_item.pre_tax_amount).to eq(Spree::LocalizedNumber.parse(amount))+ end+ end+describe '.default_refund_amount_calculator' doit 'defaults to the default refund amount calculator' doexpect(Spree::ReturnItem.refund_amount_calculator).to eq Spree::Calculator::Returns::DefaultRefundAmount