solidus_backend 2.9.6 → 2.10.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f0c706dab405664795c44607df0bd5c1c34c672d5b127334dc26f96a3c6d512
-  data.tar.gz: a967573f7531766f5463d62bf6003c199cbe3edc818045dda6c1253e65ea95ff
+  metadata.gz: 6900a204c004e5fe7d29af73908bdc9ccc97edd722a4000946a6c15baca90ed6
+  data.tar.gz: b52e623d7cf35f72ac8fe09661da2c4e69f7f727636393429f2e638919bc6dcc
 SHA512:
-  metadata.gz: 4d1dbb894a0fa1d9680ccb0209e18674f646fb8fdc3a839d5dfbba35c21eb7deb03c9872ee08eb39cc850fd828ce03782038cf5e939b481826c9d1b70c08557e
-  data.tar.gz: dfc913572b3815ba7558833d08360d06b607d0ce2c6361682c765972528ceeeff3cbcadb6eeae2d3dd6bf84ef9edc363a3a0101f38b3d957f9f6d913dc788a2a
+  metadata.gz: 502d7cb40991948f4cd60ee9d602cf94121109fd933c5f7b97aab79f0ae05c92b29b88efb71a803e2f53479a1d0d1b287be8b5fa10184956f977f697134dd93e
+  data.tar.gz: 649b8e1085cd38b2ae6ea77065a5eff52efe187facef00c924e1d18ddcee06286cbcb09c716f8fbe1c748625d87271b7f6f5cd8505f1261ebb74f2661f0ab375

data/app/assets/javascripts/spree/backend/models/order.js

@@ -21,6 +21,15 @@ Spree.Models.Order = Backbone.Model.extend({
     };
     _.extend(options, opts);
     return this.fetch(options)
+  },
+
+  empty: function (opts) {
+    var options = {
+      url: Spree.routes.orders_api + "/" + this.id + "/empty",
+      type: 'PUT',
+    };
+    _.extend(options, opts);
+    return this.fetch(options)
   }
 });
 

data/app/assets/javascripts/spree/backend/orders/cart.js

@@ -19,6 +19,12 @@ Spree.Order.initCartPage = function(order_number) {
     collection: collection
   });
 
+  new Spree.Views.Cart.EmptyCartButton({
+    el: $('.js-empty-cart'),
+    collection: collection,
+    model: order
+  });
+
   new Spree.Views.Order.DetailsTotal({
     el: $('#order-total'),
     model: order

data/app/assets/javascripts/spree/backend/shipments.js

@@ -1,42 +1,6 @@
 // Shipments AJAX API
 /* eslint no-extra-semi: "off", no-unused-vars: "off" */
 
-var ShipmentAddVariantView = Backbone.View.extend({
-  events: {
-    "change #add_variant_id": "onSelect",
-    "click .add_variant": "onAdd",
-    "submit form": "onAdd"
-  },
-  onSelect: function(e) {
-    var variant_id = this.$("#add_variant_id").val();
-    var template = HandlebarsTemplates["variants/autocomplete_stock"];
-    var $stock_details = this.$('#stock_details');
-    Spree.ajax({
-      url: Spree.routes.variants_api + "/" + variant_id,
-      success: function(variant){
-        $stock_details.html(template({variant: variant})).show()
-      }
-    });
-  },
-  onAdd: function(e){
-    e.preventDefault();
-
-    this.$('#stock_details').hide();
-
-    var variant_id = this.$('input.variant_autocomplete').val();
-    var stock_location_id = $(e.target).data('stock-location-id');
-    var quantity = this.$("input.quantity[data-stock-location-id='" + stock_location_id + "']").val();
-
-    addVariantFromStockLocation(stock_location_id, variant_id, quantity)
-  }
-});
-
-Spree.ready(function(){
-  $(".js-shipment-add-variant").each(function(){
-    new ShipmentAddVariantView({el: this});
-  });
-});
-
 var ShipShipmentView = Backbone.View.extend({
   initialize: function(options){
     this.shipment_number = options.shipment_number;
@@ -97,32 +61,6 @@ adjustShipmentItems = function(shipment_number, variant_id, quantity){
   }
 };
 
-addVariantFromStockLocation = function(stock_location_id, variant_id, quantity) {
-  var shipment = _.find(shipments, function(shipment){
-    return shipment.stock_location_id == stock_location_id && (shipment.state == 'ready' || shipment.state == 'pending');
-  });
-
-  if(shipment==undefined){
-    Spree.ajax({
-      type: "POST",
-      url: Spree.routes.shipments_api,
-      data: {
-        shipment: {
-          order_id: window.order_number
-        },
-        variant_id: variant_id,
-        quantity: quantity,
-        stock_location_id: stock_location_id,
-      }
-    }).done(function(){
-      window.location.reload();
-    });
-  }else{
-    //add to existing shipment
-    adjustShipmentItems(shipment.number, variant_id, quantity);
-  }
-};
-
 var ShipmentSplitItemView = Backbone.View.extend({
   tagName: 'tr',
   className: 'stock-item-split',

data/app/assets/javascripts/spree/backend/templates/index.js

@@ -13,6 +13,5 @@
 //= require spree/backend/templates/taxons/_tree
 //= require spree/backend/templates/taxons/tree
 //= require spree/backend/templates/variants/autocomplete
-//= require spree/backend/templates/variants/autocomplete_stock
 //= require spree/backend/templates/variants/line_items_autocomplete_stock
 //= require spree/backend/templates/variants/split

data/app/assets/javascripts/spree/backend/views/cart/empty_cart_button.js

@@ -0,0 +1,29 @@
+Spree.Views.Cart.EmptyCartButton = Backbone.View.extend({
+  initialize: function() {
+    this.listenTo(this.collection, 'update', this.render);
+    this.render();
+  },
+
+  events: {
+    "click": "onClick"
+  },
+
+  onClick: function(e) {
+    e.preventDefault()
+    if (!confirm(Spree.translations.are_you_sure_delete)) {
+      return;
+    }
+
+    this.model.empty({
+      success: () => {
+        this.collection.reset()
+        this.collection.push({})
+      }
+    })
+  },
+
+  render: function() {
+    var isNew = function (item) { return item.isNew() };
+    this.$el.prop("disabled", !this.collection.length || this.collection.some(isNew));
+  }
+});

data/app/assets/javascripts/spree/backend/views/cart/line_item_table.js

@@ -1,11 +1,16 @@
 Spree.Views.Cart.LineItemTable = Backbone.View.extend({
   initialize: function() {
     this.listenTo(this.collection, 'add', this.add);
+    this.listenTo(this.collection, 'reset', this.reset);
   },
 
   add: function(line_item) {
     var view = new Spree.Views.Cart.LineItemRow({model: line_item});
     view.render();
     this.$el.append(view.el);
+  },
+
+  reset: function() {
+    this.$el.empty();
   }
 });

data/app/assets/javascripts/spree/backend/views/index.js

@@ -1,5 +1,6 @@
 //= require 'spree/backend/views/calculators/tiered'
 //= require 'spree/backend/views/cart/add_line_item_button'
+//= require 'spree/backend/views/cart/empty_cart_button'
 //= require 'spree/backend/views/cart/line_item_row'
 //= require 'spree/backend/views/cart/line_item_table'
 //= require 'spree/backend/views/images/upload_zone'

data/app/controllers/spree/admin/adjustments_controller.rb

@@ -40,7 +40,7 @@ module Spree
         [
           Spree::AdjustmentReason.active.to_a,
           @adjustment.adjustment_reason
-        ].flatten.compact.uniq.sort_by { |r| r.name.downcase }
+        ].flatten.compact.uniq.sort_by { |reason| reason.name.downcase }
       end
     end
   end

data/app/controllers/spree/admin/base_controller.rb

@@ -4,7 +4,7 @@ module Spree
   module Admin
     class BaseController < Spree::BaseController
       helper 'spree/admin/navigation'
-      layout '/spree/layouts/admin'
+      layout 'spree/layouts/admin'
 
       before_action :authorize_admin
 

data/app/controllers/spree/admin/payment_methods_controller.rb

@@ -34,7 +34,7 @@ module Spree
           end
         end
 
-        if @payment_method.update_attributes(attributes)
+        if @payment_method.update(attributes)
           invoke_callbacks(:update, :after)
           flash[:success] = t('spree.successfully_updated', resource: t('spree.payment_method'))
           redirect_to edit_admin_payment_method_path(@payment_method)

data/app/controllers/spree/admin/products_controller.rb

@@ -26,7 +26,7 @@ module Spree
           end
         end
         invoke_callbacks(:update, :before)
-        if @object.update_attributes(permitted_resource_params)
+        if @object.update(permitted_resource_params)
           invoke_callbacks(:update, :after)
           flash[:success] = flash_message_for(@object, :successfully_updated)
           respond_with(@object) do |format|

data/app/controllers/spree/admin/resource_controller.rb

@@ -30,7 +30,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
 
   def update
     invoke_callbacks(:update, :before)
-    if @object.update_attributes(permitted_resource_params)
+    if @object.update(permitted_resource_params)
       invoke_callbacks(:update, :after)
       respond_with(@object) do |format|
         format.html do

data/app/controllers/spree/admin/style_guide_controller.rb

@@ -4,7 +4,7 @@ module Spree
   module Admin
     class StyleGuideController < Spree::Admin::BaseController
       respond_to :html
-      layout '/spree/layouts/admin_style_guide'
+      layout 'spree/layouts/admin_style_guide'
 
       def index
         @topics = {

data/app/controllers/spree/admin/users_controller.rb

@@ -38,7 +38,7 @@ module Spree
       end
 
       def update
-        if @user.update_attributes(user_params)
+        if @user.update(user_params)
           set_roles
           set_stock_locations
 
@@ -55,7 +55,7 @@ module Spree
 
       def addresses
         if request.put?
-          if @user.update_attributes(user_params)
+          if @user.update(user_params)
             flash.now[:success] = t('spree.account_updated')
           end
 

data/app/helpers/spree/admin/navigation_helper.rb

@@ -33,7 +33,7 @@ module Spree
         elsif content_for?(:page_title)
           content_for(:page_title)
         elsif admin_breadcrumbs.any?
-          admin_breadcrumbs.map{ |x| strip_tags(x) }.reverse.join(' - ')
+          admin_breadcrumbs.map { |breadcrumb| strip_tags(breadcrumb) }.reverse.join(' - ')
         else
           t(controller.controller_name, default: controller.controller_name.titleize, scope: 'spree')
         end
@@ -181,7 +181,8 @@ module Spree
                     url.ends_with?("#{controller.controller_name.singularize}/edit")
         options[:class] = 'fa'
         options[:class] += ' active' if is_active
-        options[:datahook] = "admin_settings_#{link_text.downcase.tr(' ', '_')}"
+        options[:data] ||= {}
+        options[:data][:hook] = "admin_settings_#{link_text.downcase.tr(' ', '_')}"
         content_tag(:li, options) do
           link_to(link_text, url)
         end

data/app/helpers/spree/promotion_rules_helper.rb

@@ -4,7 +4,7 @@ module Spree
   module PromotionRulesHelper
     def options_for_promotion_rule_types(promotion)
       existing = promotion.rules.map { |rule| rule.class.name }
-      rules = Rails.application.config.spree.promotions.rules.reject { |r| existing.include? r.name }
+      rules = Rails.application.config.spree.promotions.rules.reject { |rule| existing.include? rule.name }
       options = rules.map { |rule| [rule.model_name.human, rule.name] }
       options_for_select(options)
     end

data/app/views/spree/admin/orders/_line_items_edit_form.html.erb

@@ -7,6 +7,7 @@
 
   <% if can?(:update, @order) && can?(:create, Spree::LineItem) %>
     <button class="js-add-line-item btn btn-primary" disabled><%= t('spree.add_line_item') %></button>
+    <button class="js-empty-cart btn btn-primary" disabled><%= t('spree.empty_cart') %></button>
   <% end %>
 
   <%= render "spree/admin/orders/order_details", { order: order } %>

data/app/views/spree/admin/orders/edit.html.erb

@@ -18,13 +18,12 @@
   <%= render 'spree/admin/orders/risk_analysis', latest_payment: @order.payments.reorder("created_at DESC").first %>
 <% end %>
 
-<% if can?(:update, Spree::Shipment) && can?(:update, @order) && @order.shipment_state != "shipped" %>
-  <%= render partial: 'add_product' %>
-<% end %>
+<div data-hook="admin_order_edit_sub_header" />
 
 <% if @order.line_items.empty? %>
   <div class="no-objects-found">
-    <%= t('spree.your_order_is_empty_add_product')%>
+    <p><%= t('spree.your_order_is_empty_add_product') %></p>
+    <%= link_to t('spree.cart'), spree.cart_admin_order_url(@order), class: 'btn btn-primary' %>
   </div>
 <% end %>
 

data/app/views/spree/admin/promotions/index.html.erb

@@ -78,7 +78,7 @@
         <tr id="<%= spree_dom_id promotion %>">
           <td><%= promotion.name %></td>
           <td>
-            <%= (promotion.codes.size == 1) ? promotion.codes.take.try!(:value) : t('spree.number_of_codes', count: promotion.codes.size) %>
+            <%= (promotion.codes.size == 1) ? promotion.codes.pluck(:value).first : t('spree.number_of_codes', count: promotion.codes.size) %>
           </td>
           <td>
             <span class="pill pill-<%= promotion.active? ? 'active' : 'inactive' %>">

data/app/views/spree/admin/shared/_order_submenu.html.erb

@@ -55,9 +55,9 @@
     <% end %>
 
     <% if can?(:manage, Spree::OrderCancellations) && @order.inventory_units.cancelable.present? %>
-      <%= content_tag('li', class: "#{'active' if current == 'Cancel Inventory'}", data: {hook: 'admin_order_tabs_cancel_inventory'}) do %>
+      <li class="<%= "active" if current == "Cancel Inventory" %>" data-hook='admin_order_tabs_cancel_inventory'>
         <%= link_to t('spree.cancel_inventory'), spree.admin_order_cancellations_path(@order) %>
-      <% end %>
+      </li>
     <% end %>
   </ul>
 </nav>

data/app/views/spree/admin/stock_locations/index.html.erb

@@ -28,7 +28,7 @@
       <tr data-hook="stock_locations_header">
         <th></th>
         <th><%= Spree::StockLocation.human_attribute_name(:name) %></th>
-        <th><%= Spree::StockLocation.human_attribute_name(:state_id) %></th>
+        <th><%= Spree::StockLocation.human_attribute_name(:state) %></th>
         <th><%= plural_resource_name(Spree::StockMovement) %></th>
         <th class="actions"></th>
       </tr>

data/app/views/spree/admin/store_credit_reasons/index.html.erb

@@ -7,7 +7,7 @@
 <% content_for :page_actions do %>
   <ul class='actions inline-menu'>
     <li>
-      <%= link_to t('spree.new_adjustment_reason'), new_object_url, id: 'admin_new_named_type', class: 'btn btn-primary' %>
+      <%= link_to t('spree.new_store_credit_reason'), new_object_url, id: 'admin_new_named_type', class: 'btn btn-primary' %>
     </li>
   </ul>
 <% end %>

data/app/views/spree/admin/store_credits/index.html.erb

@@ -6,7 +6,7 @@
 <%= render 'spree/admin/users/sidebar' %>
 <%= render 'spree/admin/users/tabs', current: :store_credits %>
 <% content_for :page_actions do %>
-  <% if can?(:create, Spree::StoreCredit) %>
+  <% if can?(:create, @user.store_credits.new) %>
     <li><%= link_to t('spree.admin.store_credits.add'), new_admin_user_store_credit_path(@user), class: 'button btn btn-primary' %></li>
   <% end %>
 <% end %>

data/app/views/spree/admin/users/_tabs.html.erb

@@ -19,7 +19,7 @@
           <%= link_to t("spree.admin.user.items"), spree.items_admin_user_path(@user) %>
         </li>
       <% end %>
-      <% if can?(:display, Spree::StoreCredit) %>
+      <% if can?(:display, @user.store_credits.new) %>
         <li<%== ' class="active"' if current == :store_credits %>>
           <%= link_to t("spree.admin.user.store_credit"), spree.admin_user_store_credits_path(@user) %>
         </li>

data/lib/spree/backend.rb

@@ -9,6 +9,7 @@ require 'font-awesome-rails'
 require 'autoprefixer-rails'
 require 'jbuilder'
 require 'kaminari'
+require 'responders'
 
 require 'spree_core'
 require 'spree_api'

data/lib/spree/backend/config.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'spree/backend_configuration'
+
+module Spree
+  module Backend
+    Config = Spree::BackendConfiguration.new
+  end
+end

data/lib/spree/backend/engine.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
+require 'spree/backend/config'
+
 module Spree
   module Backend
     class Engine < ::Rails::Engine
       config.middleware.use "Spree::Backend::Middleware::SeoAssist"
 
-      initializer "spree.backend.environment", before: :load_config_initializers do |_app|
-        Spree::Backend::Config = Spree::BackendConfiguration.new
-      end
+      # Leave initializer empty for backwards-compatability. Other apps
+      # might still rely on this event.
+      initializer "spree.backend.environment", before: :load_config_initializers do; end
     end
   end
 end

data/{app/models → lib}/spree/backend_configuration.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
+require 'spree/preferences/configuration'
+
 module Spree
   class BackendConfiguration < Preferences::Configuration
-    preference :locale, :string, default: Rails.application.config.i18n.default_locale
+    preference :locale, :string, default: I18n.default_locale
 
     ORDER_TABS         ||= [:orders, :payments, :creditcard_payments,
                             :shipments, :credit_cards, :return_authorizations,

data/solidus_backend.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'jbuilder', '~> 2.8'
   s.add_dependency 'jquery-rails'
   s.add_dependency 'kaminari', '~> 1.1'
+  s.add_dependency 'responders'
   s.add_dependency 'sassc-rails'
 
   s.add_dependency 'autoprefixer-rails'

data/spec/controllers/spree/admin/customer_returns_controller_spec.rb

@@ -173,7 +173,7 @@ module Spree
 
         context "a return item has an inactive return authorization reason" do
           before(:each) do
-            accepted_return_item.update_attributes(return_reason_id: inactive_rma_reason.id)
+            accepted_return_item.update(return_reason_id: inactive_rma_reason.id)
           end
 
           it "includes the inactive return authorization reason" do

data/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb

@@ -61,7 +61,7 @@ describe Spree::Admin::Orders::CustomerDetailsController, type: :controller do
       before { allow(Spree::Order).to receive_message_chain(:includes, :find_by!) { order } }
 
       it "updates + progresses the order" do
-        expect(order).to receive(:update_attributes) { true }
+        expect(order).to receive(:update) { true }
         expect(order).to receive(:next) { false }
         attributes = { order_id: order.number, order: { email: "" } }
         put :update, params: attributes
@@ -109,7 +109,7 @@ describe Spree::Admin::Orders::CustomerDetailsController, type: :controller do
 
       context "not false guest checkout param" do
         it "does not attempt to associate the user" do
-          allow(order).to receive_messages(update_attributes: true,
+          allow(order).to receive_messages(update: true,
                                            next: false,
                                            refresh_shipment_rates: true)
 

data/spec/controllers/spree/admin/store_credits_controller_spec.rb

@@ -193,7 +193,7 @@ describe Spree::Admin::StoreCreditsController do
       let(:updated_amount) { 300.0 }
 
       context "the store credit has been partially used" do
-        before { store_credit.update_attributes(amount_used: 10.0) }
+        before { store_credit.update(amount_used: 10.0) }
 
         context "the new amount is greater than the used amount" do
           let(:updated_amount) { 11.0 }

data/spec/features/admin/orders/customer_details_spec.rb

@@ -117,7 +117,7 @@ describe "Customer Details", type: :feature, js: true do
     end
 
     it "should show validation errors" do
-      order.update_attributes!(ship_address_id: nil)
+      order.update!(ship_address_id: nil)
       click_link "Customer"
       click_button "Update"
       expect(page).to have_content("Shipping address first name can't be blank")
@@ -157,7 +157,6 @@ describe "Customer Details", type: :feature, js: true do
       end
 
       it "sets default country when displaying form" do
-        click_link "Cart"
         click_link "Customer"
         expect(page).to have_field("order_bill_address_attributes_country_id", with: brazil.id, visible: false)
       end

data/spec/features/admin/orders/new_order_spec.rb

@@ -154,14 +154,14 @@ describe "New Order", type: :feature do
       click_on "Update"
 
       # Automatically redirected to Shipments page
-      select2_search product.name, from: I18n.t('spree.name_or_sku')
-
-      click_icon :plus
+      within '.no-objects-found' do
+        click_on "Cart"
+      end
 
-      expect(page).to have_css('.stock-item')
+      add_line_item product.name
 
       click_on "Payments"
-      click_on "Continue"
+      click_on "Update"
 
       within(".additional-info") do
         expect(page).to have_content("Confirm")

data/spec/features/admin/orders/new_refund_spec.rb

@@ -29,7 +29,7 @@ RSpec.describe 'New Refund creation', :js do
       fill_in 'refund_amount', with: amount
       select reason.name, from: 'Reason'
       click_button 'Refund'
-      expect(find('input[type="submit"]')).to be_disabled
+      expect(page).to have_button('Refund', disabled: true)
     end
   end
 end

data/spec/features/admin/orders/order_details_spec.rb

@@ -76,6 +76,19 @@ describe "Order Details", type: :feature, js: true do
         expect(page).to have_field('quantity')
       end
 
+      it "can remove all items with empty cart" do
+        expect(page).to have_content("spree t-shirt")
+
+        accept_confirm "Are you sure you want to delete this record?" do
+          click_on 'Empty Cart'
+        end
+
+        expect(page).not_to have_content("spree t-shirt")
+
+        # Should have a new item row
+        expect(page).to have_field('quantity')
+      end
+
       # Regression test for https://github.com/spree/spree/issues/3862
       it "can cancel removing an item from a shipment" do
         expect(page).to have_content("spree t-shirt")
@@ -278,8 +291,7 @@ describe "Order Details", type: :feature, js: true do
 
           context 'A shipment has shipped' do
             it 'should not show or let me back to the cart page, nor show the shipment edit buttons' do
-              order = create(:order, state: 'payment')
-              order.shipments.create!(stock_location_id: stock_location.id, state: 'shipped')
+              order = create(:shipped_order, state: 'payment', stock_location: stock_location)
 
               visit spree.cart_admin_order_path(order)
 
@@ -525,8 +537,6 @@ describe "Order Details", type: :feature, js: true do
       expect(page).not_to have_css('.delete-item')
       expect(page).not_to have_css('.split-item')
       expect(page).not_to have_css('.edit-tracking')
-
-      expect(page).not_to have_css('#add-line-item')
     end
   end
 

data/spec/features/admin/products/edit/taxons_spec.rb

@@ -26,13 +26,19 @@ describe "Product Display Order", type: :feature do
       visit spree.edit_admin_product_path(product)
 
       assert_selected_taxons([taxon_1])
-
       select2_search "Clothing", from: "Taxon"
       assert_selected_taxons([taxon_1, taxon_2])
 
+      # Without this line we have a flaky spec probably due to select2 not
+      # closing its fixed overlay correctly. Clicking anywhere in the page
+      # before submit apparently solves the issue.
+      find('.edit_product', visible: true, obscured: false).click
+
       click_button "Update"
 
-      expect(find(".flash")).to have_text "Product \"#{product.name}\" has been successfully updated!"
+      within('.flash') do
+        expect(page).to have_content(%(Product "#{product.name}" has been successfully updated!))
+      end
       assert_selected_taxons([taxon_1, taxon_2])
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 2.9.6
+  version: 2.10.0.beta1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2019-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.9.6
+        version: 2.10.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.9.6
+        version: 2.10.0.beta1
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.9.6
+        version: 2.10.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.9.6
+        version: 2.10.0.beta1
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: responders
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
@@ -234,7 +248,6 @@ files:
 - app/assets/javascripts/spree/backend/templates/taxons/_tree.hbs
 - app/assets/javascripts/spree/backend/templates/taxons/tree.hbs
 - app/assets/javascripts/spree/backend/templates/variants/autocomplete.hbs
-- app/assets/javascripts/spree/backend/templates/variants/autocomplete_stock.hbs
 - app/assets/javascripts/spree/backend/templates/variants/line_items_autocomplete_stock.hbs
 - app/assets/javascripts/spree/backend/templates/variants/split.hbs
 - app/assets/javascripts/spree/backend/translation.js
@@ -243,6 +256,7 @@ files:
 - app/assets/javascripts/spree/backend/variant_autocomplete.js
 - app/assets/javascripts/spree/backend/views/calculators/tiered.js
 - app/assets/javascripts/spree/backend/views/cart/add_line_item_button.js
+- app/assets/javascripts/spree/backend/views/cart/empty_cart_button.js
 - app/assets/javascripts/spree/backend/views/cart/line_item_row.js
 - app/assets/javascripts/spree/backend/views/cart/line_item_table.js
 - app/assets/javascripts/spree/backend/views/images/upload_progress.js
@@ -290,7 +304,7 @@ files:
 - app/assets/stylesheets/spree/backend/globals/_deprecated_variables.scss
 - app/assets/stylesheets/spree/backend/globals/_deprecation.scss
 - app/assets/stylesheets/spree/backend/globals/_functions.scss
-- app/assets/stylesheets/spree/backend/globals/_mixins.css
+- app/assets/stylesheets/spree/backend/globals/_mixins.scss
 - app/assets/stylesheets/spree/backend/globals/_variables.scss
 - app/assets/stylesheets/spree/backend/globals/_variables_override.scss
 - app/assets/stylesheets/spree/backend/globals/mixins/_caret.scss
@@ -391,7 +405,6 @@ files:
 - app/helpers/spree/admin/stock_movements_helper.rb
 - app/helpers/spree/admin/store_credit_events_helper.rb
 - app/helpers/spree/promotion_rules_helper.rb
-- app/models/spree/backend_configuration.rb
 - app/views/kaminari/solidus_admin/_first_page.html.erb
 - app/views/kaminari/solidus_admin/_gap.html.erb
 - app/views/kaminari/solidus_admin/_last_page.html.erb
@@ -431,7 +444,6 @@ files:
 - app/views/spree/admin/option_types/index.html.erb
 - app/views/spree/admin/option_types/new.html.erb
 - app/views/spree/admin/option_types/new.js.erb
-- app/views/spree/admin/orders/_add_product.html.erb
 - app/views/spree/admin/orders/_adjustments.html.erb
 - app/views/spree/admin/orders/_carton.html.erb
 - app/views/spree/admin/orders/_carton_manifest.html.erb
@@ -712,7 +724,9 @@ files:
 - lib/spree/backend.rb
 - lib/spree/backend/action_callbacks.rb
 - lib/spree/backend/callbacks.rb
+- lib/spree/backend/config.rb
 - lib/spree/backend/engine.rb
+- lib/spree/backend_configuration.rb
 - lib/spree_backend.rb
 - script/rails
 - solidus_backend.gemspec
@@ -811,8 +825,8 @@ files:
 - spec/javascripts/support/with_translations.js
 - spec/javascripts/translation_spec.js
 - spec/javascripts/views/number_with_currency_spec.js
-- spec/models/spree/backend_configuration/menu_item_spec.rb
-- spec/models/spree/backend_configuration_spec.rb
+- spec/lib/spree/backend_configuration/menu_item_spec.rb
+- spec/lib/spree/backend_configuration_spec.rb
 - spec/spec_helper.rb
 - spec/support/appear_before_matcher.rb
 - spec/support/feature/base_feature_helper.rb
@@ -995,7 +1009,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements:
 - none
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Admin interface for the Solidus e-commerce framework.

data/app/assets/javascripts/spree/backend/templates/variants/autocomplete_stock.hbs

@@ -1,56 +0,0 @@
-<fieldset class="no-border-bottom">
-  <legend align="center">{{ t "select_stock" }}</legend>
-    <table class="stock-levels" data-hook="stock-levels">
-      <colgroup>
-        <col style="width: 30%;" />
-        <col style="width: 40%;" />
-        <col style="width: 20%;" />
-        <col style="width: 10%;" />
-      </colgroup>
-      <thead>
-        <th>{{ t "location" }}</th>
-        <th>{{ t "count_on_hand" }}</th>
-        <th>{{ t "quantity" }}</th>
-        <th class="actions"></th>
-      </thead>
-      <tbody>
-        {{#each variant.stock_items}}
-          <tr class="vertical-middle">
-            <td>{{this.stock_location_name}}</td>
-            {{#unless ../variant.track_inventory}}
-              <td>
-                It doesn't track inventory
-              </td>
-              <td>
-                <form>
-                  <input class="quantity" id="stock_item_quantity" data-stock-location-id="{{this.stock_location_id}}" type="number" min="1" value="1">
-                </form>
-              </td>
-              <td class="actions">
-                <button class="add_variant no-text fa fa-plus icon_link with-tip" data-stock-location-id="{{this.stock_location_id}}" title="{{ t "add" }}" data-action="add"></button>
-              </td>
-            {{else}}
-              {{#if this.available}}
-                <td>
-                  {{this.count_on_hand}}
-                  {{#if this.backorderable}} ({{ t "backorders_allowed" }}) {{/if}}
-                </td>
-                <td>
-                  <form>
-                    <input class="quantity" id="stock_item_quantity" data-stock-location-id="{{this.stock_location_id}}" type="number" min="1" value="1">
-                  </form>
-                </td>
-                <td class="actions">
-                  <button class="add_variant no-text fa fa-plus icon_link with-tip" data-stock-location-id="{{this.stock_location_id}}" title="{{ t "add" }}" data-action="add"></button>
-                </td>
-              {{else}}
-                <td>{{ t "out_of_stock" }}</td>
-                <td>0</td>
-                <td></td>
-              {{/if}}
-            {{/unless}}
-          </tr>
-        {{/each}}
-      </tbody>
-    </table>
-</fieldset>

data/app/views/spree/admin/orders/_add_product.html.erb

@@ -1,12 +0,0 @@
-<div id="add-line-item" class="js-shipment-add-variant" data-hook>
-  <fieldset class="no-border-bottom">
-    <legend align="center"><%= t('spree.add_product') %></legend>
-
-    <div data-hook="add_product_name" class="field">
-      <%= label_tag :add_variant_id, t('spree.name_or_sku') %>
-      <%= text_field_tag :add_variant_id, "", class: "variant_autocomplete fullwidth" %>
-    </div>
-  </fieldset>
-
-  <div id="stock_details"></div>
-</div>