4 1 stable

.gitignore

@@ -46,4 +46,7 @@ bower.json
 
 # Ignore node_modules
 node_modules/
+spec/dummy
+Gemfile.lock
+gemfiles/*.gemfile.lock
 

Appraisals

@@ -28,6 +28,12 @@ appraise 'spree-3-5' do
   gem 'rails-controller-testing'
 end
 
+appraise 'spree-4-1' do
+  gem 'spree', '~> 4.1'
+  gem 'spree_auth_devise', '~> 4.1'
+  gem 'rails-controller-testing', '~> 1.0.2'
+end
+
 appraise 'spree-master' do
   gem 'spree', github: 'spree/spree', branch: 'master'
   gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: 'master'

Gemfile

@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'spree', github: 'spree/spree', branch: 'master'
+gem 'spree', '~> 4.1'
 # Provides basic authentication functionality for testing parts of your engine
-gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: 'master'
+gem 'spree_auth_devise', '~> 4.1'
 gem 'rails-controller-testing'
 
 gemspec

README.md

@@ -23,6 +23,12 @@ Introduction goes here.
 4. Restart your server
 
   If your server was running, restart it so that it can find the assets properly.
+
+Demo
+----
+Try Spree One Page Stock Management for Spree 4.1 with direct deployment on Heroku:
+
+[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/vinsol-spree-contrib/spree-demo-heroku/tree/spree-one-page-stock-management-4-1)
 
 ## Testing
 

app/assets/javascripts/spree/backend/spree_one_page_stock_management.js

@@ -1,3 +1,8 @@
 // Placeholder manifest file.
 // the installer will append this file to the app vendored assets here: vendor/assets/javascripts/spree/backend/all.js'
 //= require spree/backend/per_page_selector
+//= require jquery3
+
+//= require popper
+
+//= require bootstrap-sprockets

app/assets/javascripts/spree/backend/stock_management.js

@@ -0,0 +1,16 @@
+(function() {
+  jQuery(function() {
+    $('[data-hook="admin_stock_inventory_management"]').on('click', '.stock_item_backorderable', function() {
+      return $(this).parent('form').submit();
+    });
+    return $('[data-hook="admin_stock_inventory_management"]').on('submit', '.toggle_stock_item_backorderable', function() {
+      $.ajax({
+        type: this.method,
+        url: this.action,
+        data: $(this).serialize()
+      });
+      return false;
+    });
+  });
+
+}).call(this);

app/assets/stylesheets/spree/backend/spree_one_page_stock_management.css.scss

@@ -4,6 +4,3 @@ the installer will append this file to the app vendored assets here: 'vendor/ass
 */
 
 @import 'global/variables';
-@import 'bootstrap-sprockets';
-@import 'bootstrap';
-@import 'shared/base';

app/controllers/spree/admin/stock_items_controller.rb

@@ -86,7 +86,7 @@ def collection
           @search = @collection.ransack(params[:q])
           @collection = @search.result.
             page(params[:page]).
-            per(params[:per_page] || Spree::Config[:stock_items_per_page])
+            per(params[:per_page] || SpreeOnePageStockManagement::Config[:stock_items_per_page])
         end
 
         def stock_item_params

app/models/spree/spree_one_page_stock_management_setting.rb

@@ -0,0 +1,5 @@
+module Spree
+  class SpreeOnePageStockManagementSetting < Preferences::Configuration
+    preference :stock_items_per_page, :integer, default: 15
+  end
+end

app/models/spree_one_page_stock_management/backend_configuration_decorator.rb

@@ -0,0 +1,4 @@
+module SpreeOnePageStockManagement::BackendConfigurationDecorator
+end
+
+Spree::BackendConfiguration::STOCKS_TABS ||= [:stock_items]

app/models/spree_one_page_stock_management/stock_item_decorator.rb

@@ -0,0 +1,9 @@
+module SpreeOnePageStockManagement::StockItemDecorator
+
+  def self.prepended(base)
+    base.whitelisted_ransackable_associations = ['variant']
+  end
+
+end
+
+Spree::StockItem.prepend SpreeOnePageStockManagement::StockItemDecorator

app/overrides/spree/admin/add_stock_item_tab.rb

@@ -1,10 +1,10 @@
 Deface::Override.new(
-  virtual_path: 'spree/layouts/admin',
+  virtual_path: 'spree/admin/shared/_main_menu',
   name: 'add_stock_item_tab',
-  insert_bottom: "[data-hook='admin_tabs']",
+  insert_bottom: "nav",
   text: %q{
       <% if can? :admin, Spree::StockItem %>
-        <ul class="nav nav-sidebar">
+        <ul class="nav nav-sidebar border-bottom">
           <%= tab *Spree::BackendConfiguration::STOCKS_TABS, icon: 'th-list' %>
         </ul>
       <% end %>

app/views/spree/admin/stock_items/_custom_table_options.html.erb

@@ -1,10 +1,10 @@
-<div class="row index-pagination-row">
-  <div class="col-sm-6">
-    <%= paginate collection, params: { stock_location: params[:stock_location] || @stock_location.id } %>
+<div class="row index-pagination-row mt-4">
+  <div class="col-6 text-left">
+    <%= paginate collection, params: { stock_location: params[:stock_location] || @stock_location.id }, theme: 'twitter-bootstrap-4' %>
   </div>
-  <div class="col-sm-6">
+  <div class="col-6">
     <div class="pagination-wrap">
-      <%= form_tag(per_page_dropdown_params(params), { method: :get, class: 'js-per-page-form form-inline' }) do %>
+      <%= form_tag(per_page_dropdown_params(params), { method: :get, class: 'js-per-page-form form-inline justify-content-end' }) do %>
         <%= per_page_dropdown %>
       <% end %>
       <div class="clearfix"></div>

app/views/spree/admin/stock_items/index.html.erb

@@ -28,8 +28,12 @@
 
 <div id='stock-items-div' class='container-fluid' >
   <div class="row">
-    <%= label_tag Spree.t(:select_stock_location) %>
-    <%= select_tag :stock_location, options_for_select(Spree::StockLocation.all.map { |stock_location| [stock_location.name, stock_location.id, data: { url: admin_stock_items_url(q: search_params, per_page: params[:per_page], stock_location: stock_location.name) }] }, @stock_location.id), class: 'select2', id: 'stock-location-selector', data: { hook: 'stock-location-selector' } %>
+    <div class="col-1">
+      <%= label_tag Spree.t(:select_stock_location) %>
+    </div>
+    <div class="col-4">
+      <%= select_tag :stock_location, options_for_select(Spree::StockLocation.all.map { |stock_location| [stock_location.name, stock_location.id, data: { url: admin_stock_items_url(q: search_params, per_page: params[:per_page], stock_location: stock_location.name) }] }, @stock_location.id), class: 'select2', id: 'stock-location-selector', data: { hook: 'stock-location-selector' } %>
+    </div>
   </div>
 </div>
 

lib/spree_one_page_stock_management/engine.rb

@@ -15,6 +15,10 @@ def self.activate
       end
     end
 
+    initializer "spree_one_page_stock_management.preferences", before: :load_config_initializers do
+      SpreeOnePageStockManagement::Config = Spree::SpreeOnePageStockManagementSetting.new
+    end
+
     config.to_prepare &method(:activate).to_proc
   end
 end

spec/models/spree/app_configuration_spec.rb

@@ -2,6 +2,6 @@
 
 describe Spree::AppConfiguration, type: :model do
   describe 'per_page preferences' do
-    it { expect(Spree::Config.stock_items_per_page).to eq(15) }
+    it { expect(SpreeOnePageStockManagement::Config.stock_items_per_page).to eq(15) }
   end
 end

spree_one_page_stock_management.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.version     = SpreeOnePageStockManagement.version
   s.summary     = 'Add extension summary here'
   s.description = 'Add (optional) extension description here'
-  s.required_ruby_version = '>= 2.2.7'
+  s.required_ruby_version = '>= 2.5'
 
   s.author    = 'You'
   s.email     = 'you@example.com'
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'spree_core', '>= 3.1.0', '< 4.0'
+  s.add_dependency 'spree_core', '~> 4.0'
   s.add_dependency 'spree_extension'
 
   s.add_development_dependency 'capybara'
@@ -34,8 +34,12 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'sass-rails'
   s.add_development_dependency 'selenium-webdriver'
   s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'pg', '~> 0.18'
+  s.add_development_dependency 'pg', '>= 0.18'
   s.add_development_dependency 'mysql2'
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'appraisal'
+  s.add_development_dependency 'bootstrap', '~> 4.3.1'
+  s.add_development_dependency 'jquery-rails'
+  s.add_development_dependency 'kaminari', '~> 1.2.1'
+  s.add_development_dependency 'bootstrap4-kaminari-views'
 end