Skip to content

armgit / spree

Public Imported from GitHub
0

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.

Open source `Spree::Admin::VariantsController` (#12264)

Łukasz Adamczyk98dbf16523c7
diff --git a/admin/app/controllers/spree/admin/variants_controller.rb b/admin/app/controllers/spree/admin/variants_controller.rb
new file mode 100644
index 0000000000..3b309f524f
--- /dev/null
+++ b/admin/app/controllers/spree/admin/variants_controller.rb
@@ -0,0 +1,89 @@
+module Spree
+ module Admin
+ class VariantsController < ResourceController
+ include StockLocationsHelper
+
+ belongs_to 'spree/product', find_by: :slug
+ before_action :load_data, only: [:edit, :update]
+ before_action :strip_attributes, only: [:update]
+
+ edit_action.before :build_prices
+ edit_action.before :build_stock_items
+
+ def search
+ query = params[:q]&.strip
+
+ if query.blank? || query.length < 3
+ respond_to do |format|
+ format.turbo_stream { head :ok }
+ format.json { render json: [] }
+ end
+ else
+ access_action = request.post? ? :manage : :index
+
+ scope = current_store.variants.accessible_by(current_ability, access_action)
+ unless params[:all].to_b.present?
+ scope = if params[:currency].present?
+ scope.active(params[:currency]).merge(current_store.products.published)
+ else
+ scope.active.merge(current_store.products.published)
+ end
+ end
+ scope = scope.where.not(id: params[:omit_ids].split(',')) if params[:omit_ids].present?
+ scope = scope.where(spree_stock_items: { stock_location_id: params[:stock_location_id] }) if params[:stock_location_id].present?
+
+ @variants = scope.
+ eligible.
+ multi_search(query).
+ includes(:images, :prices, :stock_items, :stock_locations, :product, option_values: :option_type).
+ limit(params[:limit] || 20).
+ reorder('').
+ distinct(false)
+
+ respond_to do |format|
+ format.turbo_stream do
+ render turbo_stream: [
+ turbo_stream.replace(
+ "variants_search_results",
+ partial: "spree/admin/variants/search_results",
+ locals: { variants: @variants }
+ )
+ ]
+ end
+
+ format.json do
+ render json: @variants.to_tom_select_json
+ end
+ end
+ end
+ end
+
+ private
+
+ def load_data
+ @tax_categories = TaxCategory.order(:name)
+ end
+
+ def location_after_destroy
+ spree.edit_admin_product_path(@product)
+ end
+
+ def build_prices
+ current_store.supported_currencies_list.each do |currency|
+ @variant.prices.build(currency: currency) unless @variant.prices.exists?(currency: currency.iso_code)
+ end
+ end
+
+ def build_stock_items
+ available_stock_locations.each do |stock_location|
+ @variant.stock_items.build(stock_location: stock_location) unless @variant.stock_items.exists?(stock_location: stock_location)
+ end
+ end
+
+ def strip_attributes
+ params[:variant].delete(:prices_attributes) unless can?(:manage, @variant.prices.first)
+ params[:variant].delete(:stock_items_attributes) unless can?(:manage, @variant.stock_items.first)
+ end
+ end
+ end
+end
diff --git a/admin/app/helpers/spree/admin/store_helper.rb b/admin/app/helpers/spree/admin/store_helper.rb
new file mode 100644
index 0000000000..fb95fcfff0
--- /dev/null
+++ b/admin/app/helpers/spree/admin/store_helper.rb
@@ -0,0 +1,52 @@
+module Spree
+ module Admin
+ module StoreHelper
+ include LocaleHelper
+
+ def weight_units(store = nil)
+ store ||= current_store
+ if store.metric_unit_system?
+ [
+ [Spree.t('weight_units.kilogram'), 'kg'],
+ [Spree.t('weight_units.gram'), 'g']
+ ]
+ else
+ [
+ [Spree.t('weight_units.pound'), 'lb'],
+ [Spree.t('weight_units.ounce'), 'oz']
+ ]
+ end
+ end
+
+ def dimensions_units(store = nil)
+ store ||= current_store
+
+ if store.metric_unit_system?
+ [
+ [Spree.t('dimensions_units.centimeter'), 'cm'],
+ [Spree.t('dimensions_units.millimeter'), 'mm']
+ ]
+ else
+ [
+ [Spree.t('dimensions_units.inch'), 'in'],
+ [Spree.t('dimensions_units.foot'), 'ft']
+ ]
+ end
+ end
+
+ def unit_systems
+ [
+ [Spree.t('unit_systems.metric_system'), 'metric'],
+ [Spree.t('unit_systems.imperial_system'), 'imperial']
+ ]
+ end
+
+ def legal_policy(store = nil, policy: 'privacy_policy')
+ store ||= current_store if defined?(current_store)
+ return unless store
+
+ store.send("customer_#{policy}")&.body&.html_safe
+ end
+ end
+ end
+end
diff --git a/admin/app/views/spree/admin/variants/_search_result.html.erb b/admin/app/views/spree/admin/variants/_search_result.html.erb
new file mode 100644
index 0000000000..041f1d7eb2
--- /dev/null
+++ b/admin/app/views/spree/admin/variants/_search_result.html.erb
@@ -0,0 +1,35 @@
+<div class="d-flex mb-2 hover-light p-2 px-3 align-items-center search-picker__option <% if variant.purchasable? || params[:all] %>cursor-pointer<% else %>opacity-50 disabled<% end %>" data-action="click->search-picker#toggle">
+ <div class="custom-control custom-radio ml-1 mr-3">
+ <%= radio_button_tag "#{params[:param_name]}[variant_id]", variant.id, false, class: "custom-control-input", id: "ids_#{variant.id}", data: { action: 'search-picker#toggle', search_picker_target: "checkbox" }, disabled: !params[:all] && !variant.purchasable? %>
+ <label class="custom-control-label" for="ids_<%= variant.id %>"><span></span></label>
+ </div>
+ <div class="variant-image">
+ <%= render 'spree/admin/shared/product_image', object: variant %>
+ </div>
+ <div class="ml-3 d-flex gap-2 align-items-center w-100" style="pointer-events: none">
+ <div class="flex-grow-1 variant-info">
+ <span class="variant-name">
+ <%= highlight(variant.product.name, params.dig(:q)) %>
+ </span>
+ <% if variant.sku.present? %>
+ <div class="text-muted"><strong><%= Spree.t(:sku) %>: </strong><%= variant.sku %></div>
+ <% end %>
+ <% unless variant.is_master? %>
+ <div class="text-muted">(<%= variant.options_text %>)</div>
+ <% end %>
+ </div>
+ <% if params[:stock_location_id].present? %>
+ <% stock_item = variant.stock_items.find { |si| si.stock_location_id == params[:stock_location_id] } %>
+ <div class="flex-shrink-0 d-flex flex-col" style="flex-basis: 30%">
+ <span><%= stock_item&.count_on_hand || 0 %> at location</span>
+ <% if stock_item&.backorderable? %> <span class="text-muted"><%= Spree.t(:backorderable) %></span><% end %>
+ </div>
+ <% else %>
+ <div class="flex-shrink-0 d-flex flex-col" style="flex-basis: 30%">
+ <span><%= variant.total_on_hand %> in stock</span>
+ <% if variant.backorderable? %> <span class="text-muted"><%= Spree.t(:backorderable) %></span><% end %>
+ </div>
+ <% end %>
+ <span class="flex-shrink-0" style="flex-basis: 15%"><%= variant.price_in('USD')&.display_amount %></span>
+ </div>
+</div>
diff --git a/admin/app/views/spree/admin/variants/_search_results.html.erb b/admin/app/views/spree/admin/variants/_search_results.html.erb
new file mode 100644
index 0000000000..29a6a6e797
--- /dev/null
+++ b/admin/app/views/spree/admin/variants/_search_results.html.erb
@@ -0,0 +1,9 @@
+<div id="variants_search_results" class="overflow-y-auto overflow-x-hidden" data-search-picker-target="results" style="max-height: 300px">
+ <% if variants.any? %>
+ <%= render collection: variants, partial: 'spree/admin/variants/search_result', as: :variant %>
+ <% else %>
+ <p class="text-muted text-center pb-3 pt-5">
+ <%= Spree.t('admin.variants.search_results.no_variants') %>
+ </p>
+ <% end %>
+</div>
diff --git a/admin/app/views/spree/admin/variants/_variant.html.erb b/admin/app/views/spree/admin/variants/_variant.html.erb
new file mode 100644
index 0000000000..2a2a1977af
--- /dev/null
+++ b/admin/app/views/spree/admin/variants/_variant.html.erb
@@ -0,0 +1,15 @@
+<div class="d-flex align-items-center justify-content-start">
+ <%= link_to spree.edit_admin_product_path(variant.product), data: { turbo_frame: :_top } do %>
+ <%= render 'spree/admin/shared/product_image', object: variant %>
+ <% end %>
+ <div class="ml-3">
+ <%= link_to variant.product.name, spree.edit_admin_product_path(variant.product), data: { turbo_frame: :_top } , class: 'text-dark' %>
+ <br>
+ <span class="text-muted">
+ <%= "(#{variant.options_text})" if variant.options_text.present? %>
+ </span>
+ <% if variant.sku.present? %>
+ <span class="text-muted"><strong><%= Spree.t(:sku) %>:</strong> <%= variant.sku %></span>
+ <% end %>
+ </div>
+</div>
diff --git a/admin/app/views/spree/admin/variants/edit.html.erb b/admin/app/views/spree/admin/variants/edit.html.erb
new file mode 100644
index 0000000000..432701f8ca
--- /dev/null
+++ b/admin/app/views/spree/admin/variants/edit.html.erb
@@ -0,0 +1,20 @@
+<% content_for :page_title do %>
+ <%= page_header_back_button spree.edit_admin_product_path(@product) %>
+ <%= @variant.human_name %>
+<% end %>
+
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @variant } %>
+
+<%= form_for [:admin, @product, @variant] do |f| %>
+ <div class="row">
+ <div class="col-lg-6">
+ <%= render 'spree/admin/variants/form/basic', f: f %>
+ <%= render 'spree/admin/variants/form/pricing', f: f %>
+ <%= render 'spree/admin/variants/form/inventory', f: f %>
+ </div>
+ <div class="col-lg-6">
+ <%= render 'spree/admin/variants/form/media', viewable: @variant %>
+ </div>
+ </div>
+ <%= render 'spree/admin/shared/edit_resource_links', f: f %>
+<% end %>
diff --git a/admin/app/views/spree/admin/variants/form/_basic.html.erb b/admin/app/views/spree/admin/variants/form/_basic.html.erb
new file mode 100644
index 0000000000..7f92ad162e
--- /dev/null
+++ b/admin/app/views/spree/admin/variants/form/_basic.html.erb
@@ -0,0 +1,31 @@
+<div class="card mb-4">
+ <div class="card-header">
+ <h5 class="mb-0">
+ <%= Spree.t(:settings) %>
+ </h5>
+ </div>
+ <div class="card-body">
+ <div class="form-group" data-hook="sku">
+ <%= f.label :sku, Spree.t(:sku) %>
+ <%= f.text_field :sku, class: 'form-control' %>
+ </div>
+
+ <div class="form-group" data-hook="sku">
+ <%= f.label :barcode, Spree.t(:barcode) %>
+ <%= f.text_field :barcode, class: 'form-control' %>
+ </div>
+
+ <div class="form-group" data-hook="tax_category">
+ <%= f.label :tax_category_id, Spree.t(:tax_category) %>
+ <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { data: { controller: 'autocomplete-select' } }) %>
+ </div>
+
+ <div class="form-group" data-hook="discontinue_on">
+ <%= f.label :discontinue_on, Spree.t(:discontinue_on) %>
+ <%= f.error_message_on :discontinue_on %>
+ <%= f.date_field :discontinue_on, class: 'form-control' %>
+ </div>
+
+ <%= render 'spree/admin/variants/form/dimensions', f: f %>
+ </div>
+</div>
diff --git a/admin/app/views/spree/admin/variants/form/_dimensions.html.erb b/admin/app/views/spree/admin/variants/form/_dimensions.html.erb
new file mode 100644
index 0000000000..af823d8571
--- /dev/null
+++ b/admin/app/views/spree/admin/variants/form/_dimensions.html.erb
@@ -0,0 +1,34 @@
+<div class="row">
+ <div class="col-lg-6">
+ <div class="form-group">
+ <%= f.label :width %>
+ <div class="form-control d-flex align-items-center py-0 shadow-xs focus-shadow-blue focus-border-blue mb-3">
+ <%= f.text_field :width, value: number_with_precision(f.object.width, precision: 2), class: 'form-control-plaintext pl-0' %>
+ <%= f.select :dimensions_unit, options_for_select(dimensions_units(current_store), f.object.dimensions_unit), { include_blank: false }, { class: 'form-control-plaintext w-auto border-left' } %>
+ </div>
+ </div>
+ <div class="form-group">
+ <%= f.label :height %>
+ <div class="form-control d-flex align-items-center py-0 shadow-xs focus-shadow-blue focus-border-blue mb-3">
+ <%= f.text_field :height, value: number_with_precision(f.object.height, precision: 2), class: 'form-control-plaintext pl-0' %>
+ <%= f.select :dimensions_unit, options_for_select(dimensions_units(current_store), f.object.dimensions_unit), { include_blank: false }, { class: 'form-control-plaintext w-auto border-left' } %>
+ </div>
+ </div>
+ </div>
+ <div class="col-lg-6">
+ <div class="form-group">
+ <%= f.label :depth %>
+ <div class="form-control d-flex align-items-center py-0 shadow-xs focus-shadow-blue focus-border-blue mb-3">
+ <%= f.text_field :depth, value: number_with_precision(f.object.depth, precision: 2), class: 'form-control-plaintext pl-0' %>
+ <%= f.select :dimensions_unit, options_for_select(dimensions_units(current_store), f.object.dimensions_unit), { include_blank: false }, { class: 'form-control-plaintext w-auto border-left' } %>
+ </div>
+ </div>
+ <div class="form-group">
+ <%= f.label :weight %>
+ <div class="form-control d-flex align-items-center py-0 shadow-xs focus-shadow-blue focus-border-blue mb-3">
+ <%= f.text_field :weight, value: number_with_precision(f.object.weight, precision: 2), class: 'form-control-plaintext pl-0' %>
+ <%= f.select :weight_unit, options_for_select(weight_units(current_store), f.object.weight_unit), { include_blank: false }, { class: 'form-control-plaintext w-auto border-left' } %>
+ </div>
+ </div>
+ </div>
+</div>
\ No newline at end of file
diff --git a/admin/app/views/spree/admin/variants/form/_inventory.html.erb b/admin/app/views/spree/admin/variants/form/_inventory.html.erb
new file mode 100644
index 0000000000..aec8fb77b3
--- /dev/null
+++ b/admin/app/views/spree/admin/variants/form/_inventory.html.erb
@@ -0,0 +1,45 @@
+<div class="card mb-4">
+ <div class="card-header">
+ <h5 class="mb-0">
+ <%= Spree.t(:inventory) %>
+ </h5>
+ </div>
+ <div class="card-body p-0">
+ <table class="table">
+ <thead>
+ <tr>
+ <th><%= Spree.t(:stock_location) %></th>
+ <th>
+ <%= Spree.t(:count_on_hand) %>
+ </th>
+ <th>
+ <%= Spree.t(:backorderable) %>
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <%= f.fields_for :stock_items do |stock_item_form| %>
+ <%= stock_item_form.hidden_field :id if stock_item_form.object.persisted? %>
+ <%= stock_item_form.hidden_field :stock_location_id, value: stock_item_form.object.stock_location.id %>
+ <tr>
+ <td class="w-40">
+ <%= link_to stock_item_form.object.stock_location.name, spree.edit_admin_stock_location_path(stock_item_form.object.stock_location) %>
+ </td>
+ <td class="w-20">
+ <%= stock_item_form.number_field :count_on_hand, min: 0, class: 'form-control', disabled: !can?(:manage, stock_item_form.object) %>
+ </td>
+ <td class="w-40">
+ <div class="custom-control custom-checkbox">
+ <%= stock_item_form.check_box :backorderable, class: 'custom-control-input', disabled: !can?(:manage, stock_item_form.object) %>
+ <%= stock_item_form.label :backorderable, Spree.t(:continue_selling_when_out_of_stock),class: 'custom-control-label' %>
+ </div>
+ </td>
+ </tr>
+ <% end %>
+ </tbody>
+ </table>
+ <div class="card-footer text-center bg-gray-25 text-muted">
+ <%= Spree.t('admin.variants.stock_locations_link', link: spree.admin_stock_locations_path).html_safe %>
+ </div>
+ </div>
+</div>
\ No newline at end of file
diff --git a/admin/app/views/spree/admin/variants/form/_media_asset.html.erb b/admin/app/views/spree/admin/variants/form/_media_asset.html.erb
new file mode 100644
index 0000000000..16896b0912
--- /dev/null
+++ b/admin/app/views/spree/admin/variants/form/_media_asset.html.erb
@@ -0,0 +1,21 @@
+<div id="<%= spree_dom_id(asset) %>" class="media-form__image border border-gray-200" data-sortable-update-url="<%= spree.admin_asset_path(asset) %>">
+ <div class="custom-control custom-checkbox d-none">
+ <%= check_box_tag "ids[]", asset.id, false, class: "custom-control-input", id: "#{asset.id}-checkbox", data: { media_form_target: "checkbox", action: 'media-form#showDeleteButton' } %>
+ <label class="custom-control-label" for="<%= asset.id %>-checkbox"><span></span></label>
+ </div>
+ <div class="move-handle text-center d-none ml-auto">
+ <button class="btn btn-light btn-sm px-1"><%= icon('grip-vertical', class: 'mr-0') %></button>
+ </div>
+
+ <div data-toggle="modal" data-target="#modal-lg">
+ <%= link_to spree.edit_admin_asset_path(asset), data: { turbo_frame: 'dialog_modal_lg' } do %>
+ <%= image_tag(
+ main_app.cdn_image_url(
+ asset.attachment.variant(spree_image_variant_options(resize_to_fill: [400, 400]))
+ ),
+ alt: asset.alt,
+ class: 'w-100 d-block h-100 position-absolute'
+ ) %>
+ <% end %>
+ </div>
+</div>
diff --git a/admin/config/locales/en.yml b/admin/config/locales/en.yml
index be147a6533..234e21d3dc 100644
--- a/admin/config/locales/en.yml
+++ b/admin/config/locales/en.yml
@@ -356,4 +356,7 @@ en:
variants:
option_types_link: To add more option types please go to <a href="%{link}">Option Types</a>
variants:
- currencies_link: To add more currencies, go to <a href="%{link}">Store Settings</a>
\ No newline at end of file
+ currencies_link: To add more currencies, go to <a href="%{link}">Store Settings</a>
+ stock_locations_link: To add more stock locations please go to <a href="%{link}">Stock Locations</a>
+ search_results:
+ no_variants: We couldn't find any variants matching your search :(
\ No newline at end of file
diff --git a/admin/config/routes.rb b/admin/config/routes.rb
index 19bd450559..486f0df8f0 100644
--- a/admin/config/routes.rb
+++ b/admin/config/routes.rb
@@ -20,6 +20,12 @@ Spree::Core::Engine.add_routes do
resource :profile, controller: 'profile', only: %i[edit update]
# store settings
+ resource :store, only: [:edit, :update], controller: 'stores' do
+ member do
+ get :edit_emails
+ end
+ end
+
resources :payment_methods, except: :show
resources :shipping_methods, except: :show
resources :shipping_categories, except: :show
@@ -83,6 +89,10 @@ Spree::Core::Engine.add_routes do
get '/taxons/select_options' => 'taxons#select_options', as: :taxons_select_options, defaults: { format: :json }
+ # variants
+ post 'variants/search'
+ get 'variants/search', defaults: { format: :json }
+
# errors
get '/forbidden', to: 'errors#forbidden', as: :forbidden
end
diff --git a/admin/spec/controllers/spree/admin/variants_controller_spec.rb b/admin/spec/controllers/spree/admin/variants_controller_spec.rb
new file mode 100644
index 0000000000..de094d7525
--- /dev/null
+++ b/admin/spec/controllers/spree/admin/variants_controller_spec.rb
@@ -0,0 +1,202 @@
+require 'spec_helper'
+
+RSpec.describe Spree::Admin::VariantsController, type: :controller do
+ stub_authorization!
+ render_views
+
+ let(:store) { Spree::Store.default }
+ let(:product) { create(:product, name: 'Shoes', stores: [store]) }
+ let!(:variant) { create(:variant, product: product) }
+ let(:tax_category) { create(:tax_category) }
+
+ describe 'POST #search' do
+ subject(:search) { get :search, params: params, format: :turbo_stream }
+
+ let(:params) { { q: q } }
+
+ context 'when query is blank' do
+ let(:q) { '' }
+
+ it 'returns an empty response' do
+ search
+
+ expect(response).to have_http_status(:ok)
+ expect(response.body).to be_blank
+ end
+ end
+
+ context 'when query is less than 3 characters' do
+ let(:q) { 'sh' }
+
+ it 'returns an empty response' do
+ search
+
+ expect(response).to have_http_status(:ok)
+ expect(response.body).to be_blank
+ end
+ end
+
+ context 'when query is valid' do
+ let(:q) { 'shoe' }
+
+ let!(:variant_2) { create(:variant, product: product) }
+ let!(:variant_3) { create(:variant, product: product) }
+
+ let!(:product_2) { create(:product, name: 'Shirt', stores: [store]) }
+ let!(:variant_4) { create(:variant, product: product_2) }
+
+ it 'responds with searched variants' do
+ search
+
+ expect(response).to have_http_status(:ok)
+ expect(response).to render_template(partial: 'spree/admin/variants/_search_results')
+ expect(assigns(:variants)).to match_array([variant, variant_2, variant_3])
+ end
+
+ context 'when omit_ids parameter is present' do
+ let(:params) { { q: q, omit_ids: "#{variant.id},#{variant_2.id}" } }
+
+ it 'excludes the variants with the given ids' do
+ search
+
+ expect(response).to have_http_status(:ok)
+ expect(response).to render_template(partial: 'spree/admin/variants/_search_results')
+ expect(assigns(:variants)).to match_array([variant_3])
+ end
+ end
+
+ context 'when limit parameter is present' do
+ let(:params) { { q: q, limit: 2 } }
+
+ it 'limits the number of variants returned' do
+ search
+
+ expect(response).to have_http_status(:ok)
+ expect(response).to render_template(partial: 'spree/admin/variants/_search_results')
+
+ expect(assigns(:variants).size).to eq(2)
+ expect(assigns(:variants)).to eq([variant, variant_2])
+ end
+ end
+ end
+ end
+
+ describe 'GET #edit' do
+ subject(:edit) { get :edit, params: { id: variant.id, product_id: product.slug } }
+
+ it 'renders the variant edit page' do
+ edit
+ expect(response).to render_template(:edit)
+ end
+ end
+
+ describe 'PUT #update' do
+ let(:variant_params) do
+ {
+ id: variant.id,
+ product_id: product.slug,
+ variant: {
+ sku: 'SKU123456',
+ barcode: '1234567890',
+ width: 10,
+ height: 10,
+ depth: 10,
+ weight: 10,
+ dimensions_unit: 'cm',
+ weight_unit: 'kg',
+ tax_category_id: tax_category.id
+ }
+ }
+ end
+
+ it 'should update the variant' do
+ put :update, params: variant_params
+ expect(response).to redirect_to(spree.edit_admin_product_variant_path(product, variant))
+
+ variant.reload
+
+ expect(variant.sku).to eq('SKU123456')
+ expect(variant.barcode).to eq('1234567890')
+ expect(variant.width).to eq(10)
+ expect(variant.height).to eq(10)
+ expect(variant.depth).to eq(10)
+ expect(variant.weight).to eq(10)
+ expect(variant.dimensions_unit).to eq('cm')
+ expect(variant.weight_unit).to eq('kg')
+ expect(variant.tax_category).to eq(tax_category)
+ end
+
+ context 'with multiple currencies' do
+ let(:variant_params) do
+ {
+ id: variant.id,
+ product_id: product.slug,
+ variant: {
+ prices_attributes: {
+ '0': {
+ id: variant.prices.first.id,
+ amount: 10,
+ currency: 'USD'
+ },
+ '1': {
+ amount: 20,
+ currency: 'EUR'
+ },
+ '2': {
+ amount: '',
+ currency: 'GBP'
+ }
+ }
+ }
+ }
+ end
+
+ it 'should create 1 price, and update 1 price' do
+ expect { put :update, params: variant_params }.to change(Spree::Price, :count).by(1)
+
+ variant.reload
+ expect(variant.prices.count).to eq(2)
+ expect(variant.price_in('USD').amount).to eq(10)
+ expect(variant.price_in('EUR').amount).to eq(20)
+ expect(variant.price_in('GBP').amount).to be_nil
+ end
+ end
+
+ context 'with multiple stock locations' do
+ let!(:stock_location) { Spree::StockLocation.first || create(:stock_location) }
+ let!(:stock_location2) { create(:stock_location) }
+ let!(:stock_item) { create(:stock_item, stock_location: stock_location, variant: variant, count_on_hand: 10) }
+
+ let(:variant_params) do
+ {
+ id: variant.id,
+ product_id: product.slug,
+ variant: {
+ stock_items_attributes: {
+ '0': { id: stock_item.id, count_on_hand: 20, backorderable: false, stock_location_id: stock_location.id },
+ '1': { count_on_hand: 30, backorderable: true, stock_location_id: stock_location2.id }
+ }
+ }
+ }
+ end
+
+ it 'should create 1 stock item, and update 1 stock item' do
+ expect { put :update, params: variant_params }.to change(Spree::StockItem, :count).by(1)
+
+ variant.reload
+ expect(variant.stock_items.count).to eq(2)
+ expect(variant.stock_items.first.count_on_hand).to eq(20)
+ expect(variant.stock_items.first.backorderable).to eq(false)
+ expect(variant.stock_items.last.count_on_hand).to eq(30)
+ expect(variant.stock_items.last.backorderable).to eq(true)
+ end
+ end
+ end
+
+ describe 'DELETE #destroy' do
+ it 'should destroy the variant' do
+ delete :destroy, params: { product_id: product.slug, id: variant.id }
+ expect(response).to redirect_to(spree.edit_admin_product_path(product))
+ end
+ end
+end
diff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rb
index dfb413c2e0..1a42ae8963 100644
--- a/core/app/models/spree/store.rb
+++ b/core/app/models/spree/store.rb
@@ -240,6 +240,10 @@ module Spree
self.class.where.not(id: id).any?
end
+ def metric_unit_system?
+ unit_system == 'metric'
+ end
+
private
def countries_available_for_checkout_cache_key