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
Fixed Admin Order sorting/filtering + added more specs (#13302)
Damian Legawiec7a5b2a9d1297
diff --git a/admin/app/helpers/spree/admin/orders_filters_helper.rb b/admin/app/helpers/spree/admin/orders_filters_helper.rbindex 1d2877b4de..7cf4c4bf11 100644--- a/admin/app/helpers/spree/admin/orders_filters_helper.rb+++ b/admin/app/helpers/spree/admin/orders_filters_helper.rb@@ -70,6 +70,7 @@ module Spree# e.g. SELECT DISTINCT DISTINCT "spree_orders".id, "spree_orders"."created_at" AS alias_0 FROM "spree_orders"# see https://github.com/spree/spree/pull/3919@orders = @search.result(distinct: true).page(params[:page]).per(params[:per_page] || Spree::Admin::RuntimeConfig.admin_orders_per_page)+ @collection = @ordersenddef load_userdiff --git a/admin/spec/controllers/spree/admin/orders_controller_spec.rb b/admin/spec/controllers/spree/admin/orders_controller_spec.rbindex e894961b10..06562e0b58 100644--- a/admin/spec/controllers/spree/admin/orders_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/orders_controller_spec.rb@@ -44,10 +44,10 @@ RSpec.describe Spree::Admin::OrdersController, type: :controller doorderend- let!(:shipped_order) { create(:shipped_order, with_payment: false, total: 100, store: store) }- let!(:order) { create(:completed_order_with_totals, line_items_count: 2, total: 100, store: store) }+ let!(:shipped_order) { create(:shipped_order, with_payment: false, total: 100, store: store, completed_at: 2.days.ago) }+ let!(:order) { create(:completed_order_with_totals, line_items_count: 2, total: 100, store: store, completed_at: 1.day.ago) }let!(:cancelled_order) do- order = create(:completed_order_with_totals, state: 'canceled', total: 100, store: store)+ order = create(:completed_order_with_totals, state: 'canceled', total: 100, store: store, completed_at: 3.days.ago)create(:payment, state: 'completed', amount: order.total, order: order)update_payment_state_after_refund(order)end@@ -69,32 +69,37 @@ RSpec.describe Spree::Admin::OrdersController, type: :controller doit 'return all completed orders' doget :index- expect(assigns(:orders).to_a).to include(order)- expect(assigns(:orders).to_a).to include(shipped_order)+ expect(assigns(:collection).to_a).to include(order)+ expect(assigns(:collection).to_a).to include(shipped_order)+ end++ it 'returns all completed orders sorted by completed_at desc' do+ get :index+ expect(assigns(:collection).ids).to eq([order.id, shipped_order.id, cancelled_order.id])endit 'returns all fulfilled orders' doget :index, params: { q: { shipment_state_eq: :shipped } }- expect(assigns(:orders).to_a).to eq([shipped_order])+ expect(assigns(:collection).to_a).to eq([shipped_order])endit 'returns all cancelled orders by shipment state' doget :index, params: { q: { state_eq: :canceled } }- expect(assigns(:orders).to_a).to eq([cancelled_order])+ expect(assigns(:collection).to_a).to eq([cancelled_order])endit 'returns all refunded orders' doget :index, params: { q: { refunded: '1' } }- expect(assigns(:orders).to_a).to eq([shipped_order])+ expect(assigns(:collection).to_a).to eq([shipped_order])endit 'returns all partially refunded orders' doget :index, params: { q: { partially_refunded: '1' } }- expect(assigns(:orders).to_a).to eq([order])+ expect(assigns(:collection).to_a).to eq([order])endcontext 'filtering by payment state' do@@ -107,37 +112,41 @@ RSpec.describe Spree::Admin::OrdersController, type: :controller doit 'returns all paid orders' doget :index, params: { q: { payment_state_eq: :paid } }- expect(assigns(:orders).to_a).to contain_exactly(paid_order)+ expect(assigns(:collection).to_a).to contain_exactly(paid_order)endit 'returns all orders with credit owed' doget :index, params: { q: { payment_state_eq: :credit_owed } }- expect(assigns(:orders).to_a).to contain_exactly(cancelled_order)+ expect(assigns(:collection).to_a).to contain_exactly(cancelled_order)endit 'returns all orders with balance due' doget :index, params: { q: { payment_state_eq: :balance_due } }- expect(assigns(:orders).to_a).to contain_exactly(balance_due_order, order, shipped_order)+ expect(assigns(:collection).to_a).to contain_exactly(balance_due_order, order, shipped_order)endit 'returns all refunded orders via payment_state filter' doget :index, params: { q: { payment_state_eq: :refunded } }- expect(assigns(:orders).to_a).to eq([shipped_order])+ expect(assigns(:collection).to_a).to eq([shipped_order])endit 'returns all partially refunded orders via payment_state filter' doget :index, params: { q: { payment_state_eq: :partially_refunded } }- expect(assigns(:orders).to_a).to eq([order])+ expect(assigns(:collection).to_a).to eq([order])endendcontext 'filtering by date' dosubject { get :index, params: { q: q } }+ before do+ Spree::Order.delete_all+ end+let(:q) do{completed_at_gt: 4.months.ago,@@ -145,30 +154,22 @@ RSpec.describe Spree::Admin::OrdersController, type: :controller do}end- let!(:order1) { create(:completed_order_with_totals, store: store) }+ let!(:order1) { create(:completed_order_with_totals, store: store, completed_at: 5.month.ago) }let!(:order2) { create(:completed_order_with_totals, store: store) }context 'for All Orders' do- before do- order1.update(completed_at: 5.month.ago)- end-it 'uses completed_at column' dosubject- expect(assigns(:orders).to_a).to include(order2)- expect(assigns(:orders).to_a).not_to include(order1)+ expect(assigns(:collection).to_a).to include(order2)+ expect(assigns(:collection).to_a).not_to include(order1)endendcontext 'filtering by "yesterday"' do+ let!(:order1) { create(:completed_order_with_totals, completed_at: Date.yesterday + 3.hours, store: store) }let!(:order2) { create(:completed_order_with_totals, completed_at: Date.today, store: store) }- before do- order1.update(completed_at: Date.yesterday + 3.hours)- order2.update(completed_at: Date.yesterday + 16.hours)- end-let(:q) do{completed_at_gt: Date.yesterday,@@ -178,7 +179,7 @@ RSpec.describe Spree::Admin::OrdersController, type: :controller doit 'filters by orders completed yesterday' dosubject- expect(assigns(:orders).to_a).to contain_exactly(order1, order2)+ expect(assigns(:collection).to_a).to contain_exactly(order1)endend@@ -195,7 +196,7 @@ RSpec.describe Spree::Admin::OrdersController, type: :controller doit 'filters by orders completed_at in the store timezone' dosubject- expect(assigns(:orders).to_a).to contain_exactly(order1, order2)+ expect(assigns(:collection).to_a).to contain_exactly(order1, order2)endendend@@ -206,7 +207,7 @@ RSpec.describe Spree::Admin::OrdersController, type: :controller dopayment_state_eq: :balance_due} }- expect(assigns(:orders).to_a).to contain_exactly(order)+ expect(assigns(:collection).to_a).to contain_exactly(order)endenddiff --git a/admin/spec/controllers/spree/admin/shipments_controller_spec.rb b/admin/spec/controllers/spree/admin/shipments_controller_spec.rbindex 0a1b435216..6af8981541 100644--- a/admin/spec/controllers/spree/admin/shipments_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/shipments_controller_spec.rb@@ -31,6 +31,11 @@ RSpec.describe Spree::Admin::ShipmentsController, type: :controller dodescribe '#ship' docontext 'when shipment can be shipped' do+ before do+ shipment.update(tracking: '1234567890')+ expect(shipment.tracking).to eq('1234567890')+ end+it 'ships the shipment' dopost :ship, params: { order_id: order.number, id: shipment.number }expect(shipment.reload.state).to eq('shipped')diff --git a/admin/spec/features/spree/admin/orders/edit_order_spec.rb b/admin/spec/features/spree/admin/orders/edit_order_spec.rbindex c1f14f23fe..44b3bb3f56 100644--- a/admin/spec/features/spree/admin/orders/edit_order_spec.rb+++ b/admin/spec/features/spree/admin/orders/edit_order_spec.rb@@ -1,6 +1,6 @@require 'spec_helper'-xdescribe 'Edit Order Spec', type: :feature do+describe 'Edit Order Spec', type: :feature dostub_authorization!let(:store) { Spree::Store.default }diff --git a/core/lib/spree/testing_support/factories/order_factory.rb b/core/lib/spree/testing_support/factories/order_factory.rbindex 7cb803d908..3ef3a0451d 100644--- a/core/lib/spree/testing_support/factories/order_factory.rb+++ b/core/lib/spree/testing_support/factories/order_factory.rb@@ -73,7 +73,7 @@ FactoryBot.define doafter(:create) do |order, evaluator|order.refresh_shipment_rates(evaluator.shipping_method_filter)- order.update_column(:completed_at, Time.current)+ order.update_column(:completed_at, order.completed_at || Time.current)endfactory :completed_order_with_pending_payment do@@ -110,13 +110,16 @@ FactoryBot.define doendfactory :shipped_order do+ shipment_state { 'shipped' }+after(:create) do |order|order.shipments.each do |shipment|shipment.inventory_units.update_all state: 'shipped'- shipment.update_column('state', 'shipped')+ shipment.update_columns(+ state: 'shipped',+ tracking: '1234567890'+ )end- order.update_column('shipment_state', 'shipped')- order.reloadendendenddiff --git a/core/spec/services/spree/credit_cards/destroy_spec.rb b/core/spec/services/spree/credit_cards/destroy_spec.rbindex 3f0c491e69..48ae7ba5df 100644--- a/core/spec/services/spree/credit_cards/destroy_spec.rb+++ b/core/spec/services/spree/credit_cards/destroy_spec.rb@@ -22,8 +22,8 @@ describe Spree::CreditCards::Destroy, type: :service dodescribe '#invalidate_payments' dolet!(:completed_order) { create(:completed_order_with_pending_payment, user_id: order.user_id) }- let!(:payment) { create(:payment, source: credit_card, order: order) }- let!(:complete_order_payment) { create(:payment, source: credit_card, order: completed_order, state: 'completed') }+ let!(:payment) { create(:payment, source: credit_card, order: order, amount: order.total) }+ let!(:complete_order_payment) { create(:payment, source: credit_card, order: completed_order, state: 'completed', amount: completed_order.total) }it 'destroy credit_card and invalidate valid checkout payments' dores = subject