spree 4.1

Gemfile

@@ -4,6 +4,10 @@ gem 'spree', github: 'spree/spree', branch: 'master'
 # Provides basic authentication functionality for testing parts of your engine
 gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: 'master'
 
-gem 'byebug', '~> 9.0.6'
+gem 'byebug', '>= 9.0.6'
+
+group :test do
+  gem 'rails-controller-testing', '~> 1.0.4'
+end
 
 gemspec

README.md

@@ -12,6 +12,10 @@ Try Spree Item Returns for Spree 3-4 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-item-returns-3-4)
 
+Try Spree Item Returns 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-item-returns-4-1)
+
 
 ## FEATURES
 

app/assets/javascripts/spree/return_authorization.js

@@ -1,2 +1,3 @@
 //= require 'spree/backend/returns/return_item_selection'
 //= require 'spree/frontend/return_item_options_selection'
+//= require jquery

app/helpers/spree/frontend_helper_decorator.rb → app/helpers/spree/return_authorizations_helper.rb

@@ -1,4 +1,4 @@
-Spree::FrontendHelper.class_eval do
+module Spree::ReturnAuthorizationsHelper
 
   def exchange_for_item_return?(return_item)
     return_item.persisted? && return_item.exchange_variant_id?

app/models/spree_item_returns/app_configuration_decorator.rb

@@ -0,0 +1,8 @@
+module SpreeItemReturns::AppConfigurationDecorator
+
+  def self.prepended(base)
+    base.preference :return_initiation_admin_mail_address, :string, default: '[email protected]'
+  end
+end
+
+Spree::AppConfiguration.prepend SpreeItemReturns::AppConfigurationDecorator

app/models/spree/line_item_decorator.rb → app/models/spree_item_returns/line_item_decorator.rb

@@ -1,4 +1,4 @@
-Spree::LineItem.class_eval do
+module SpreeItemReturns::LineItemDecorator
 
   def is_returnable?
     return false unless product.returnable?
@@ -7,3 +7,5 @@ def is_returnable?
   end
 
 end
+
+Spree::LineItem.prepend SpreeItemReturns::LineItemDecorator

app/models/spree_item_returns/order_decorator.rb

@@ -0,0 +1,19 @@
+module SpreeItemReturns::OrderDecorator
+
+  SHIPPED_STATES = ['shipped', 'partial']
+
+  def self.prepended(base)
+    base.scope :returned, -> { where(shipment_state: SHIPPED_STATES) }
+  end
+
+  def has_returnable_products?
+    products.returnable.exists?
+  end
+
+  def has_returnable_line_items?
+    line_items.any?(&:is_returnable?)
+  end
+
+end
+
+Spree::Order.prepend SpreeItemReturns::OrderDecorator

app/models/spree_item_returns/product_decorator.rb

@@ -0,0 +1,9 @@
+module SpreeItemReturns::ProductDecorator
+
+  def self.prepended(base)
+    base.validates :return_time, numericality: { greater_than_or_equal_to: 0 }
+    base.scope :returnable, -> { where(returnable: true) }
+  end
+end
+
+Spree::Product.prepend SpreeItemReturns::ProductDecorator

app/models/spree_item_returns/return_authorization_decorator.rb

@@ -0,0 +1,34 @@
+module SpreeItemReturns::ReturnAuthorizationDecorator
+
+  def self.prepended(base)
+    stock_location_validations = base._validators[:stock_location]
+    if stock_location_validations.present?
+      stock_location_validations.reject! { |validation| validation.is_a? ActiveRecord::Validations::PresenceValidator }
+    end
+
+    base._validate_callbacks.each do |callback|
+      callback.raw_filter.attributes.delete :stock_location if callback.raw_filter.is_a?(ActiveModel::Validations::PresenceValidator)
+    end
+
+    base.validates :stock_location, presence: true, unless: :user_initiated?
+    base.validates :return_items, presence: true, if: :user_initiated?
+
+    base.after_commit :notify_admin, :notify_user, on: :create, if: :user_initiated?
+  end
+
+  def allow_return_item_changes?
+    !customer_returned_items?
+  end
+
+  private
+    def notify_admin
+      Spree::ReturnAuthorizationMailer.notify_return_initialization_to_admin(number).deliver_later
+    end
+
+    def notify_user
+      Spree::ReturnAuthorizationMailer.notify_return_initialization_to_user(number).deliver_later
+    end
+
+end
+
+Spree::ReturnAuthorization.prepend SpreeItemReturns::ReturnAuthorizationDecorator

app/models/spree/return_item_decorator.rb → app/models/spree_item_returns/return_item_decorator.rb

@@ -1,4 +1,4 @@
-Spree::ReturnItem.class_eval do
+module SpreeItemReturns::ReturnItemDecorator
 
   def returnable?
     inventory_unit.variant.product.returnable?
@@ -7,4 +7,6 @@ def returnable?
   def returned?
     inventory_unit.shipped? && return_authorization.allow_return_item_changes? && !reimbursement
   end
-end
+end
+
+Spree::ReturnItem.prepend SpreeItemReturns::ReturnItemDecorator

app/models/spree_item_returns/user_decorator.rb

@@ -0,0 +1,8 @@
+module SpreeItemReturns::UserDecorator
+
+  def self.prepended(base)
+    base.has_many :return_authorizations, through: :orders
+  end
+end
+
+Spree::User.prepend SpreeItemReturns::UserDecorator

app/overrides/spree/return_authorization/user_return_authorization_history_button.rb

@@ -2,8 +2,8 @@
   virtual_path: 'spree/users/show',
   name: 'user_return_authorization_history_button',
   insert_bottom: "[data-hook='account_my_orders'] h3",
-  text: "<%= link_to(spree.return_authorizations_path, class: 'btn btn-primary pull-right') do %>
-          <span class='glyphicon glyphicon-list-alt'></span>
+  text: "<%= link_to(spree.return_authorizations_path, class: 'btn btn-primary float-right') do %>
+          <span class='glyphicon glyphicon-list-alt'><%= icon(name: 'burger', classes: 'd-none d-xl-inline-block', width: 20, height: 20)  %></span>
           <%= Spree.t(:returns_history) %>
         <% end %>"
 )

app/overrides/spree/return_authorization/user_return_authorization_initailization_button.rb

@@ -1,11 +1,11 @@
 Deface::Override.new(
   virtual_path: 'spree/orders/show',
   name: 'user_return_authorization_initailization_button',
-  insert_bottom: "#order_summary h1",
+  insert_bottom: ".order-show-number",
   text: "
         <% if spree_current_user.present? && @order.shipped? && @order.has_returnable_products? && @order.has_returnable_line_items? %>
-          <%= link_to(spree.new_order_return_authorization_path(@order), class: 'btn btn-primary pull-right') do %>
-            <span class='glyphicon glyphicon-send'></span>
+          <%= link_to(spree.new_order_return_authorization_path(@order), class: 'btn btn-primary float-right') do %>
+            <span class='glyphicon glyphicon-send'><%= icon(name: 'send', classes: 'd-none d-xl-inline-block', width: 25, height: 25)  %></span>
             <%= Spree.t(:return_products) %>
           <% end %>
         <% end %>

app/views/spree/return_authorizations/index.html.erb

@@ -1,8 +1,8 @@
 <div data-hook="admin_return_authorization_form_fields">
   <h3>
     <%= Spree.t(:my_returns_history, scope: :return_authorization_view)%>
-    <%= link_to(account_path, class: 'btn btn-primary pull-right') do %>
-      <span class='glyphicon glyphicon-list-alt'></span>
+    <%= link_to(account_path, style:'float: right', class: 'btn btn-primary') do %>
+      <span class='glyphicon glyphicon-list-alt'><%= icon(name: 'person', classes: 'd-none d-xl-inline-block', width: 30, height: 30)  %></span>
       <%= Spree.t(:back_to_account) %>
     <% end %>
   </h3>
@@ -29,7 +29,7 @@
             <td><%= (return_authorization.created_at).strftime('%v') %></td>
             <td>
               <%= link_to(order_return_authorization_path(order,id: return_authorization.number), class: 'btn btn-xs btn-primary') do %>
-                <span class='glyphicon glyphicon-plus'></span>
+                <span class='glyphicon glyphicon-plus'><%= icon(name: 'plus', classes: 'd-none d-xl-inline-block', width: 20, height: 20) %></span>
                 <%= Spree.t(:view_details) %>
               <% end %>
             </td>

app/views/spree/return_authorizations/show.html.erb

@@ -1,14 +1,15 @@
 <% content_for :head do %>
   <%= javascript_include_tag 'spree/return_authorization' %>
 <% end %>
+<div class="row">
+  <fieldset class="col-6"><h3><%= Spree.t(:return_request, scope: :return_authorizations_view) %></h3></fieldset>
+  <fieldset class="col-6" style="text-align: right;">
+    <%= link_to Spree.t(:back_to_order, scope: :return_authorizations_view), spree.order_url(@order), class: "btn btn-primary"  %> |
+    <%= link_to Spree.t(:back_to_return_history, scope: :return_authorizations_view), spree.return_authorizations_path, class: "btn btn-primary" %>
+  </fieldset>  
+</div>
 
-<fieldset><h3><%= Spree.t(:return_request, scope: :return_authorizations_view) %></h3></fieldset>
-<fieldset>
-  <%= link_to Spree.t(:back_to_order, scope: :return_authorizations_view), spree.order_url(@order)  %> |
-  <%= link_to Spree.t(:back_to_return_history, scope: :return_authorizations_view), spree.return_authorizations_path %>
-</fieldset>
-
-<%= form_for [:admin, @order, @return_authorization] do |f| %>
+<%= form_for [@order, @return_authorization] do |f| %>
   <fieldset>
     <%= f.field_container :amount, class: ['alert alert-info'] do %>
       <%= Spree.t(:return_request_status)%>  : <b><%= @return_authorization.state %></b>

spec/models/spree/order_spec.rb

@@ -5,7 +5,7 @@
 
   describe 'Constants' do
     it 'is expected to initialize SHIPPED_STATES' do
-      expect(SHIPPED_STATES).to eq(['shipped', 'partial'])
+      expect(Spree::Order::SHIPPED_STATES).to eq(['shipped', 'partial'])
     end
   end
 

spec/spec_helper.rb

@@ -3,7 +3,7 @@
 SimpleCov.start 'rails'
 
 # Configure Rails Environment
-ENV['RAILS_ENV'] = 'test'
+ENV['RAILS_ENV'] ||= 'test'
 
 require File.expand_path('../dummy/config/environment.rb',  __FILE__)
 

spree_item_returns.gemspec

@@ -2,14 +2,14 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_item_returns'
-  s.version     = '3.3.0'
+  s.version     = '3.4.0'
   s.summary     = 'Spree Item Returns'
   s.description = '
                     At User-End
                     - User can Initate items-return process
                     - Can check return history
                   '
-  s.required_ruby_version = '>= 2.2.7'
+  s.required_ruby_version = '>= 2.5.0'
 
   s.author    = 'Anurag Bhardwaj'
   s.email     = '[email protected]'
@@ -21,23 +21,23 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'spree_core', '>= 3.2.0', '< 4.0'
-  s.add_dependency 'spree_extension', '~> 0.0.5'
+  s.add_dependency 'spree_core', '>= 4.0.0'
+  s.add_dependency 'spree_extension', '~> 0.0.9'
 
   s.add_development_dependency 'appraisal'
-  s.add_development_dependency 'capybara', '~> 2.6'
-  s.add_development_dependency 'coffee-rails', '~> 4.2.1'
+  s.add_development_dependency 'capybara', '>= 3.30.0'
+  s.add_development_dependency 'coffee-rails', '~> 5.0.0'
   s.add_development_dependency 'database_cleaner'
   s.add_development_dependency 'factory_bot'
   s.add_development_dependency 'ffaker'
-  s.add_development_dependency 'rails-controller-testing', '~> 1.0.1'
-  s.add_development_dependency 'rspec-activemodel-mocks', '~> 1.0.3'
-  s.add_development_dependency 'rspec-rails', '~> 3.4'
-  s.add_development_dependency 'sass-rails', '~> 5.0.0'
+  s.add_development_dependency 'rails-controller-testing', '~> 1.0.4'
+  s.add_development_dependency 'rspec-activemodel-mocks', '~> 1.1.0'
+  s.add_development_dependency 'rspec-rails', '~> 4.0.0'
+  s.add_development_dependency 'sass-rails', '>= 5.0.0'
   s.add_development_dependency 'selenium-webdriver', '~> 3.0.8'
-  s.add_development_dependency 'shoulda-matchers', '~> 3.1.1'
+  s.add_development_dependency 'shoulda-matchers', '~> 4.3'
   s.add_development_dependency 'shoulda-callback-matchers', '~> 1.1.1'
-  s.add_development_dependency 'simplecov', '~> 0.13.0'
-  s.add_development_dependency 'sqlite3', '~> 1.3.13'
+  s.add_development_dependency 'simplecov', '~> 0.18.0'
+  s.add_development_dependency 'sqlite3', '~> 1.4'
 
 end