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
Pre-select currency and store when creating Products in Admin UI
Damian Legawieca28cb45effa2
diff --git a/backend/app/controllers/spree/admin/resource_controller.rb b/backend/app/controllers/spree/admin/resource_controller.rbindex a1528c3c05..8b0de21739 100644--- a/backend/app/controllers/spree/admin/resource_controller.rb+++ b/backend/app/controllers/spree/admin/resource_controller.rb@@ -3,6 +3,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseControllerhelper_method :new_object_url, :edit_object_url, :object_url, :collection_urlbefore_action :load_resource, except: :update_positions+ before_action :set_currency, :set_store, only: [:new, :create]rescue_from ActiveRecord::RecordNotFound, with: :resource_not_foundrespond_to :html@@ -194,6 +195,19 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseControllercollection_urlend+ def set_currency+ @object.currency = current_currency if model_class.method_defined?(:currency)+ @object.cost_currency = current_currency if model_class.method_defined?(:cost_currency)+ end++ def set_store+ if @object.has_attribute?(:store_id)+ @object.store = current_store+ elsif model_class.method_defined?(:stores)+ @object.stores << current_store+ end+ end+# URL helpersdef new_object_url(options = {})diff --git a/backend/spec/features/admin/orders/new_order_spec.rb b/backend/spec/features/admin/orders/new_order_spec.rbindex bfb6cdd148..ae2c847fe6 100644--- a/backend/spec/features/admin/orders/new_order_spec.rb+++ b/backend/spec/features/admin/orders/new_order_spec.rb@@ -4,6 +4,8 @@ describe 'New Order', type: :feature dolet!(:product) { create(:product_in_stock) }let!(:state) { create(:state) }let!(:user) { create(:user, ship_address: create(:address), bill_address: create(:address)) }+ let(:order) { Spree::Order.last }+ let(:store) { Spree::Store.default }stub_authorization!@@ -12,14 +14,18 @@ describe 'New Order', type: :feature docreate(:shipping_method)# create default storeallow(Spree.user_class).to receive(:find_by).and_return(user)- create(:store)visit spree.new_admin_order_pathendit 'does check if you have a billing address before letting you add shipments' doclick_on 'Shipments'expect(page).to have_content 'Please fill in customer info'- expect(page).to have_current_path(spree.edit_admin_order_customer_path(Spree::Order.last))+ expect(page).to have_current_path(spree.edit_admin_order_customer_path(order))+ end++ it 'sets proper currency and store' do+ expect(order.store).to eq(store)+ expect(order.currency).to eq(store.default_currency)endit 'completes new order successfully without using the cart', js: true do@@ -38,7 +44,7 @@ describe 'New Order', type: :feature doclick_on 'Payments'click_on 'Update'- expect(page).to have_current_path(spree.admin_order_payments_path(Spree::Order.last))+ expect(page).to have_current_path(spree.admin_order_payments_path(order))click_icon 'capture'click_on 'Shipments'@@ -58,6 +64,7 @@ describe 'New Order', type: :feature dowithin('.line-items') doexpect(page).to have_content(product.name)+ expect(page).to have_content(product.price_in(store.default_currency).display_price.to_s)endclick_on 'Customer'@@ -172,7 +179,7 @@ describe 'New Order', type: :feature doselect_customerwait_for { !page.has_button?('Update') }click_button 'Update'- expect(Spree::Order.last.state).to eq 'delivery'+ expect(order.state).to eq 'delivery'endenddiff --git a/backend/spec/features/admin/products/products_spec.rb b/backend/spec/features/admin/products/products_spec.rbindex 7a0053659f..245d611874 100644--- a/backend/spec/features/admin/products/products_spec.rb+++ b/backend/spec/features/admin/products/products_spec.rb@@ -2,6 +2,8 @@require 'spec_helper'describe 'Products', type: :feature do+ let(:store) { Spree::Store.default }+context 'as admin user' dostub_authorization!@@ -209,6 +211,7 @@ describe 'Products', type: :feature docontext 'creating a new product' dobefore do+ store.update!(default_currency: 'EUR')@shipping_category = create(:shipping_category)visit spree.admin_products_pathwithin find('#contentHeader') do@@ -228,6 +231,10 @@ describe 'Products', type: :feature doselect @shipping_category.name, from: 'product_shipping_category_id'click_button 'Create'expect(page).to have_content('successfully created!')+ expect(page).to have_field('product_price', with: '100.00')+ expect(page).to have_select('product_store_ids', selected: store.name)+ expect(page).to have_select('product_cost_currency', selected: 'Euro (EUR)')+ expect(Spree::Product.last.master.prices.last.currency).to eq('EUR')click_button 'Update'expect(page).to have_content('successfully updated!')end