spree_backend 2.3.13 → 2.4.0.rc1

data/app/assets/stylesheets/spree/backend/components/_navigation.scss

@@ -84,11 +84,6 @@ nav.menu {
       position: relative;
       text-align: center;
 
-      @media(max-width: 1009px) {
-        top: -3px;
-        margin-bottom: -5px;
-      }
-
       i {
         display: inline;
       }

data/app/assets/stylesheets/spree/backend/plugins/_select2.scss

@@ -21,8 +21,11 @@
     }
 
     .select2-search-choice-close {
-      background-image: none !important;
+      @extend .fa;
+      @extend .fa-times;
+      margin-top: 2px;
       font-size: 100% !important;
+      background-image: none !important;
     }
   }
 
@@ -173,7 +176,7 @@
         background-image: none !important;
         font-size: 85% !important;
         @extend .fa;
-        @extend .fa-void;
+        @extend .fa-times;
         margin-left: 2px;
         color: $color-1;
         &:before {

data/app/assets/stylesheets/spree/backend/sections/_adjustments_table.scss

@@ -0,0 +1,8 @@
+[data-hook="adjustment_buttons"] {
+  tr {
+    div {
+      width: 50%;
+      float: left;
+    }
+  }
+}

data/app/assets/stylesheets/spree/backend/sections/_products.scss

@@ -14,6 +14,10 @@
   input, select, textarea, .select2-container {
     width: 100%;
   }
+  input[type="checkbox"] {
+    width: auto;
+    vertical-align: bottom;
+  }
 }
 
 [data-hook="admin_product_form_multiple_variants"] {

data/app/assets/stylesheets/spree/backend/sections/_return_authorizations.scss

@@ -0,0 +1,24 @@
+@import "spree/backend/globals/variables";
+
+.return-items-table {
+  .refund-amount-input {
+    width: 80px;
+  }
+  .fa-thumbs-up {
+    margin-bottom: 10px;
+  }
+  .select2-container {
+    text-align: left;
+    max-width: 150px;
+  }
+}
+.expedited-exchanges-warning {
+  display: none;
+  color: black;
+  padding: 15px;
+  margin: 10px 0;
+  font-weight: bold;
+  background-color: $color-6;
+  border-radius: 4px;
+  opacity: 0.6;
+}

data/app/assets/stylesheets/spree/backend/sections/_taxons.scss

@@ -12,10 +12,4 @@
   }
   
   margin: 10px;
-}
-
-#taxon_products {
-  > li {
-    height: 170px;
-  }
-}
+}

data/app/assets/stylesheets/spree/backend/shared/_tables.scss

@@ -92,6 +92,14 @@ table {
         background-color: $color-notice;
         color: $color-1;
       }
+      .fa-thumbs-up:hover {
+        background-color: $color-success;
+        color: $color-1;
+      }
+      .fa-thumbs-down:hover {
+        background-color: $color-error;
+        color: $color-1;
+      }
     }
 
     input[type="number"],

data/app/assets/stylesheets/spree/backend/spree_admin.scss

@@ -26,6 +26,7 @@
 @import 'spree/backend/plugins/token-input';
 @import 'spree/backend/plugins/jstree';
 
+@import 'spree/backend/sections/adjustments_table';
 @import 'spree/backend/sections/alerts';
 @import 'spree/backend/sections/orders';
 @import 'spree/backend/sections/overview';
@@ -33,6 +34,7 @@
 @import 'spree/backend/sections/promotions';
 @import 'spree/backend/sections/edit_checkouts';
 @import 'spree/backend/sections/bulk_transfer';
+@import 'spree/backend/sections/return_authorizations';
 @import 'spree/backend/sections/tax_zones';
 @import 'spree/backend/sections/log_entries';
 @import 'spree/backend/sections/taxons';

data/app/assets/stylesheets/spree/backend.css

@@ -2,7 +2,7 @@
  * This is a manifest file that'll automatically include all the stylesheets available in this directory
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
- 
+
  *= require jquery.alerts/jquery.alerts
  *= require jquery.alerts/jquery.alerts.spree
  *= require responsive-tables

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

@@ -8,7 +8,7 @@ module Spree
       destroy.after :update_totals
       update.after :update_totals
 
-      skip_before_filter :load_resource, only: [:toggle_state, :edit, :update, :destroy]
+      skip_before_action :load_resource, only: [:toggle_state, :edit, :update, :destroy]
 
       before_action :find_adjustment, only: [:destroy, :edit, :update]
 
@@ -27,12 +27,6 @@ module Spree
         @order.reload.update!
       end
 
-      # Override method used to create a new instance to correctly
-      # associate adjustment with order
-      def build_resource
-        parent.adjustments.build(order: parent)
-      end
-
     end
   end
 end

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

@@ -7,8 +7,8 @@ module Spree
       helper 'spree/admin/tables'
       layout '/spree/layouts/admin'
 
-      before_filter :check_alerts
-      before_filter :authorize_admin
+      before_action :check_alerts
+      before_action :authorize_admin
 
       protected
 
@@ -87,6 +87,12 @@ module Spree
           Spree::Backend::Config[:locale]
         end
 
+        def can_not_transition_without_customer_info
+          unless @order.billing_address.present?
+            flash[:notice] = Spree.t(:fill_in_customer_info)
+            redirect_to edit_admin_order_customer_url(@order)
+          end
+        end
     end
   end
 end

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

@@ -0,0 +1,67 @@
+module Spree
+  module Admin
+    class CustomerReturnsController < ResourceController
+      belongs_to 'spree/order', find_by: :number
+
+      before_action :parent # ensure order gets loaded to support our pseudo parent-child relationship
+      before_action :load_form_data, only: [:new, :edit]
+
+      create.before :build_return_items_from_params
+      create.fails  :load_form_data
+
+      def edit
+        @pending_return_items = @customer_return.return_items.select(&:pending?)
+        @accepted_return_items = @customer_return.return_items.select(&:accepted?)
+        @rejected_return_items = @customer_return.return_items.select(&:rejected?)
+        @manual_intervention_return_items = @customer_return.return_items.select(&:manual_intervention_required?)
+        @pending_reimbursements = @customer_return.reimbursements.select(&:pending?)
+
+        super
+      end
+
+      private
+
+      def location_after_save
+        url_for([:edit, :admin, @order, @customer_return])
+      end
+
+      def build_resource
+        Spree::CustomerReturn.new
+      end
+
+      def find_resource
+        Spree::CustomerReturn.accessible_by(current_ability, :read).find(params[:id])
+      end
+
+      def collection
+        parent # trigger loading the order
+        @collection ||= Spree::ReturnItem
+          .accessible_by(current_ability, :read)
+          .where(inventory_unit_id: @order.inventory_units.pluck(:id))
+          .map(&:customer_return).uniq.compact
+        @customer_returns = @collection
+      end
+
+      def load_form_data
+        return_items = @order.inventory_units.map(&:current_or_new_return_item).reject(&:customer_return_id)
+        @rma_return_items, @new_return_items = return_items.partition(&:return_authorization_id)
+      end
+
+      def permitted_resource_params
+        @permitted_resource_params ||= params.require('customer_return').permit(permitted_customer_return_attributes)
+      end
+
+      def build_return_items_from_params
+        return_items_params = permitted_resource_params.delete(:return_items_attributes).values
+
+        @customer_return.return_items = return_items_params.map do |item_params|
+          next unless item_params.delete('returned') == '1'
+          return_item = item_params[:id] ? Spree::ReturnItem.find(item_params[:id]) : Spree::ReturnItem.new
+          return_item.attributes = item_params
+          return_item
+        end.compact
+      end
+
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 module Spree
   module Admin
     class GeneralSettingsController < Spree::Admin::BaseController
-      before_filter :set_store
+      before_action :set_store
 
       def edit
         @preferences_security = [:allow_ssl_in_production,

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

@@ -1,7 +1,7 @@
 module Spree
   module Admin
     class ImagesController < ResourceController
-      before_filter :load_data
+      before_action :load_data
 
       create.before :set_viewable
       update.before :set_viewable

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

@@ -1,7 +1,7 @@
 module Spree
   module Admin
     class LogEntriesController < Spree::Admin::BaseController
-      before_filter :find_order_and_payment
+      before_action :find_order_and_payment
 
       def index
         @log_entries = @payment.log_entries
@@ -16,4 +16,4 @@ module Spree
       end
     end
   end
-end
+end

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

@@ -1,7 +1,7 @@
 module Spree
   module Admin
     class OptionTypesController < ResourceController
-      before_filter :setup_new_option_value, :only => [:edit]
+      before_action :setup_new_option_value, only: :edit
 
       def update_values_positions
         params[:positions].each do |id, index|

data/app/controllers/spree/admin/orders/customer_details_controller.rb

@@ -2,7 +2,7 @@ module Spree
   module Admin
     module Orders
       class CustomerDetailsController < Spree::Admin::BaseController
-        before_filter :load_order
+        before_action :load_order
 
         def show
           edit
@@ -27,7 +27,7 @@ module Spree
 
             @order.refresh_shipment_rates
             flash[:success] = Spree.t('customer_details_updated')
-            redirect_to admin_order_customer_path(@order)
+            redirect_to edit_admin_order_url(@order)
           else
             render :action => :edit
           end

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

@@ -1,8 +1,8 @@
 module Spree
   module Admin
     class OrdersController < Spree::Admin::BaseController
-      before_filter :initialize_order_events
-      before_filter :load_order, :only => [:edit, :update, :cancel, :resume, :approve, :resend, :open_adjustments, :close_adjustments]
+      before_action :initialize_order_events
+      before_action :load_order, only: [:edit, :update, :cancel, :resume, :approve, :resend, :open_adjustments, :close_adjustments, :cart]
 
       respond_to :html
 
@@ -20,11 +20,11 @@ module Spree
 
         params[:q].delete(:inventory_units_shipment_id_null) if params[:q][:inventory_units_shipment_id_null] == "0"
 
-        if params[:q][:created_at_gt].present?
+        if !params[:q][:created_at_gt].blank?
           params[:q][:created_at_gt] = Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day rescue ""
         end
 
-        if params[:q][:created_at_lt].present?
+        if !params[:q][:created_at_lt].blank?
           params[:q][:created_at_lt] = Time.zone.parse(params[:q][:created_at_lt]).end_of_day rescue ""
         end
 
@@ -49,15 +49,26 @@ module Spree
 
       def new
         @order = Order.create(order_params)
-        redirect_to edit_admin_order_url(@order)
+        redirect_to cart_admin_order_url(@order)
       end
 
       def edit
+        can_not_transition_without_customer_info
+
         unless @order.completed?
           @order.refresh_shipment_rates
         end
       end
 
+      def cart
+        unless @order.completed?
+          @order.refresh_shipment_rates
+        end
+        if @order.shipped_shipments.count > 0
+          redirect_to edit_admin_order_url(@order)
+        end
+      end
+
       def update
         if @order.update_attributes(params[:order]) && @order.line_items.present?
           @order.update!
@@ -73,7 +84,7 @@ module Spree
       end
 
       def cancel
-        @order.cancel!
+        @order.canceled_by(try_spree_current_user)
         flash[:success] = Spree.t(:order_canceled)
         redirect_to :back
       end
@@ -98,16 +109,16 @@ module Spree
       end
 
       def open_adjustments
-        adjustments = @order.all_adjustments.where(state: 'closed')
-        adjustments.update_all(state: 'open')
+        adjustments = @order.adjustments.where(:state => 'closed')
+        adjustments.update_all(:state => 'open')
         flash[:success] = Spree.t(:all_adjustments_opened)
 
         respond_with(@order) { |format| format.html { redirect_to :back } }
       end
 
       def close_adjustments
-        adjustments = @order.all_adjustments.where(state: 'open')
-        adjustments.update_all(state: 'closed')
+        adjustments = @order.adjustments.where(:state => 'open')
+        adjustments.update_all(:state => 'closed')
         flash[:success] = Spree.t(:all_adjustments_closed)
 
         respond_with(@order) { |format| format.html { redirect_to :back } }

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

@@ -1,9 +1,9 @@
 module Spree
   module Admin
     class PaymentMethodsController < ResourceController
-      skip_before_filter :load_resource, :only => [:create]
-      before_filter :load_data
-      before_filter :validate_payment_method_provider, :only => :create
+      skip_before_action :load_resource, only: :create
+      before_action :load_data
+      before_action :validate_payment_method_provider, only: :create
 
       respond_to :html
 

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

@@ -3,15 +3,16 @@ module Spree
     class PaymentsController < Spree::Admin::BaseController
       include Spree::Backend::Callbacks
 
-      before_filter :load_order, :only => [:create, :new, :index, :fire]
-      before_filter :load_payment, :except => [:create, :new, :index]
-      before_filter :load_data
-      before_filter :can_transition_to_payment
+      before_action :load_order, only: [:create, :new, :index, :fire]
+      before_action :load_payment, except: [:create, :new, :index]
+      before_action :load_data
+      before_action :can_not_transition_without_customer_info
 
       respond_to :html
 
       def index
-        @payments = @order.payments
+        @payments = @order.payments.includes(:refunds => :reason)
+        @refunds = @payments.flat_map(&:refunds)
         redirect_to new_admin_order_payment_url(@order) if @payments.empty?
       end
 
@@ -84,13 +85,6 @@ module Spree
         end
       end
 
-      def can_transition_to_payment
-        unless @order.billing_address.present?
-          flash[:notice] = Spree.t(:fill_in_customer_info)
-          redirect_to edit_admin_order_customer_url(@order)
-        end
-      end
-
       def load_order
         @order = Order.find_by_number!(params[:order_id])
         authorize! action, @order

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

@@ -2,8 +2,8 @@ module Spree
   module Admin
     class ProductPropertiesController < ResourceController
       belongs_to 'spree/product', :find_by => :slug
-      before_filter :find_properties
-      before_filter :setup_property, :only => [:index]
+      before_action :find_properties
+      before_action :setup_property, only: :index
 
       private
         def find_properties

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

@@ -3,7 +3,7 @@ module Spree
     class ProductsController < ResourceController
       helper 'spree/products'
 
-      before_filter :load_data, :except => :index
+      before_action :load_data, except: :index
       create.before :create_before
       update.before :update_before
       helper_method :clone_object_url

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

@@ -1,6 +1,6 @@
 class Spree::Admin::PromotionActionsController < Spree::Admin::BaseController
-  before_filter :load_promotion, :only => [:create, :destroy]
-  before_filter :validate_promotion_action_type, :only => :create
+  before_action :load_promotion, only: [:create, :destroy]
+  before_action :validate_promotion_action_type, only: :create
 
   def create
     @calculators = Spree::Promotion::Actions::CreateAdjustment.calculators

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

@@ -0,0 +1,6 @@
+module Spree
+  module Admin
+    class PromotionCategoriesController < ResourceController
+    end
+  end
+end

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

@@ -1,8 +1,8 @@
 class Spree::Admin::PromotionRulesController < Spree::Admin::BaseController
   helper 'spree/promotion_rules'
 
-  before_filter :load_promotion, :only => [:create, :destroy]
-  before_filter :validate_promotion_rule_type, :only => :create
+  before_action :load_promotion, only: [:create, :destroy]
+  before_action :validate_promotion_rule_type, only: :create
 
   def create
     # Remove type key from this hash so that we don't attempt

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

@@ -1,7 +1,7 @@
 module Spree
   module Admin
     class PromotionsController < ResourceController
-      before_filter :load_data
+      before_action :load_data
 
       helper 'spree/promotion_rules'
 
@@ -12,6 +12,7 @@ module Spree
 
         def load_data
           @calculators = Rails.application.config.spree.calculators.promotion_actions_create_adjustments
+          @promotion_categories = Spree::PromotionCategory.order(:name)
         end
 
         def collection

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

@@ -0,0 +1,6 @@
+module Spree
+  module Admin
+    class RefundReasonsController < ResourceController
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+module Spree
+  module Admin
+    class RefundsController < ResourceController
+      belongs_to 'spree/payment'
+      before_action :load_order
+
+      helper_method :refund_reasons
+
+      private
+
+      def location_after_save
+        admin_order_payments_path(@payment.order)
+      end
+
+      def load_order
+        # the spree/admin/shared/order_tabs partial expects the @order instance variable to be set
+        @order = @payment.order if @payment
+      end
+
+      def refund_reasons
+        @refund_reasons ||= RefundReason.active.all
+      end
+
+      def build_resource
+        super.tap do |refund|
+          refund.amount = refund.payment.credit_allowed
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,6 @@
+module Spree
+  module Admin
+    class ReimbursementTypesController < ResourceController
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+module Spree
+  module Admin
+    class ReimbursementsController < ResourceController
+      belongs_to 'spree/order', find_by: :number
+
+      before_action :load_simulated_refunds, only: :edit
+
+      def perform
+        @reimbursement.perform!
+        redirect_to location_after_save
+      end
+
+      private
+
+      def build_resource
+        if params[:build_from_customer_return_id].present?
+          customer_return = CustomerReturn.find(params[:build_from_customer_return_id])
+
+          Reimbursement.build_from_customer_return(customer_return)
+        else
+          super
+        end
+      end
+
+      def location_after_save
+        if @reimbursement.reimbursed?
+          admin_order_reimbursement_path(parent, @reimbursement)
+        else
+          edit_admin_order_reimbursement_path(parent, @reimbursement)
+        end
+      end
+
+      def load_simulated_refunds
+        @reimbursement_objects = @reimbursement.simulate
+      end
+
+      # TODO: Remove this when https://github.com/spree/spree/pull/5158 gets merged in
+      def permitted_resource_params
+        params[object_name].present? ? super : ActionController::Parameters.new
+      end
+
+    end
+  end
+end

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

@@ -2,7 +2,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
   include Spree::Backend::Callbacks
 
   helper_method :new_object_url, :edit_object_url, :object_url, :collection_url
-  before_filter :load_resource, :except => [:update_positions]
+  before_action :load_resource, except: :update_positions
   rescue_from ActiveRecord::RecordNotFound, :with => :resource_not_found
 
   respond_to :html
@@ -239,7 +239,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
     #
     # Other controllers can, should, override it to set custom logic
     def permitted_resource_params
-      params.require(object_name).permit!
+      params[object_name].present? ? params.require(object_name).permit! : ActionController::Parameters.new
     end
 
     def collection_actions

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

@@ -0,0 +1,6 @@
+module Spree
+  module Admin
+    class ReturnAuthorizationReasonsController < ResourceController
+    end
+  end
+end