spree_backend 3.0.10 → 3.1.0.rc1

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

@@ -11,7 +11,7 @@ module Spree
       respond_to :html
 
       def index
-        @payments = @order.payments.includes(:refunds => :reason)
+        @payments = @order.payments.includes(refunds: :reason)
         @refunds = @payments.flat_map(&:refunds)
         redirect_to new_admin_order_payment_url(@order) if @payments.empty?
       end
@@ -77,7 +77,7 @@ module Spree
 
       def load_data
         @amount = params[:amount] || load_order.total
-        @payment_methods = PaymentMethod.available(:back_end)
+        @payment_methods = PaymentMethod.available_on_back_end
         if @payment and @payment.payment_method
           @payment_method = @payment.payment_method
         else

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

@@ -44,9 +44,18 @@ module Spree
 
       def destroy
         @product = Product.friendly.find(params[:id])
-        @product.destroy
 
-        flash[:success] = Spree.t('notice_messages.product_deleted')
+        begin
+          # TODO: why is @product.destroy raising ActiveRecord::RecordNotDestroyed instead of failing with false result
+          # Issue found for above comment: https://github.com/rails/rails/issues/19761
+          if @product.destroy
+            flash[:success] = Spree.t('notice_messages.product_deleted')
+          else
+            flash[:error] = @object.errors.full_messages.join(', ')
+          end
+        rescue ActiveRecord::RecordNotDestroyed => e
+          flash[:error] = Spree.t('notice_messages.product_not_deleted')
+        end
 
         respond_with(@product) do |format|
           format.html { redirect_to collection_url }

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

@@ -26,8 +26,6 @@ module Spree
             includes(promotion_includes).
             page(params[:page]).
             per(params[:per_page] || Spree::Config[:promotions_per_page])
-
-          @collection
         end
 
         def promotion_includes

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

@@ -17,8 +17,6 @@ module Spree
         @collection = @search.result.
               page(params[:page]).
               per(Spree::Config[:properties_per_page])
-
-        @collection
       end
     end
   end

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

@@ -88,15 +88,14 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
     if @object.destroy
       invoke_callbacks(:destroy, :after)
       flash[:success] = flash_message_for(@object, :successfully_removed)
-      respond_with(@object) do |format|
-        format.html { redirect_to location_after_destroy }
-        format.js   { render :partial => "spree/admin/shared/destroy" }
-      end
     else
       invoke_callbacks(:destroy, :fails)
-      respond_with(@object) do |format|
-        format.html { redirect_to location_after_destroy }
-      end
+      flash[:error] = @object.errors.full_messages.join(', ')
+    end
+
+    respond_with(@object) do |format|
+      format.html { redirect_to location_after_destroy }
+      format.js   { render_js_for_destroy }
     end
   end
 

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

@@ -0,0 +1,28 @@
+module Spree
+  module Admin
+    class ReturnIndexController < BaseController
+      def return_authorizations
+        collection(Spree::ReturnAuthorization)
+        respond_with(@collection)
+      end
+
+      def customer_returns
+        collection(Spree::CustomerReturn)
+        respond_with(@collection)
+      end
+
+      private
+
+      def collection(resource)
+        return @collection if @collection.present?
+        params[:q] ||= {}
+
+        @collection = resource.all
+        # @search needs to be defined as this is passed to search_form_for
+        @search = @collection.ransack(params[:q])
+        per_page = params[:per_page] || Spree::Config[:admin_products_per_page]
+        @collection = @search.result.order(created_at: :desc).page(params[:page]).per(per_page)
+      end
+    end
+  end
+end

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

@@ -8,7 +8,7 @@ module Spree
 
         @stock_transfers = @q.result.
                              includes(stock_movements: { stock_item: :stock_location }).
-                             order('created_at DESC').
+                             order(created_at: :desc).
                              page(params[:page])
       end
 
@@ -16,9 +16,7 @@ module Spree
         @stock_transfer = StockTransfer.friendly.find(params[:id])
       end
 
-      def new
-
-      end
+      def new; end
 
       def create
         variants = Hash.new(0)

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

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

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

@@ -0,0 +1,94 @@
+module Spree
+  module Admin
+    class StoreCreditError < StandardError; end
+
+    class StoreCreditsController < Spree::Admin::BaseController
+      before_action :load_user
+      before_action :load_categories, only: [:new, :edit]
+      before_action :load_store_credit, only: [:new, :edit, :update]
+      before_action :ensure_unused_store_credit, only: [:update]
+
+      def index
+        @store_credits = @user.store_credits.includes(:credit_type, :category).reverse_order
+      end
+
+      def create
+        @store_credit = @user.store_credits.build(
+          permitted_store_credit_params.merge(
+            created_by: try_spree_current_user,
+            action_originator: try_spree_current_user
+          )
+        )
+
+        if @store_credit.save
+          flash[:success] = flash_message_for(@store_credit, :successfully_created)
+          redirect_to admin_user_store_credits_path(@user)
+        else
+          load_categories
+          flash[:error] = Spree.t('store_credit.errors.unable_to_create')
+          render :new
+        end
+      end
+
+      def update
+        @store_credit.assign_attributes(permitted_store_credit_params)
+        @store_credit.created_by = try_spree_current_user
+
+        if @store_credit.save
+          flash[:success] = flash_message_for(@store_credit, :successfully_updated)
+          redirect_to admin_user_store_credits_path(@user)
+        else
+          load_categories
+          flash[:error] = Spree.t('store_credit.errors.unable_to_update')
+          render :edit
+        end
+      end
+
+      def destroy
+        @store_credit = @user.store_credits.find(params[:id])
+        ensure_unused_store_credit
+
+        if @store_credit.destroy
+          respond_with(@store_credit) do |format|
+            format.html { redirect_to admin_user_store_credits_path(@user) }
+            format.js { render_js_for_destroy }
+          end
+        else
+          render text: Spree.t('store_credit.errors.unable_to_delete'), status: :unprocessable_entity
+        end
+      end
+
+      protected
+
+      def permitted_store_credit_params
+        params.require(:store_credit).permit(permitted_store_credit_attributes).
+          merge(currency: Spree::Config[:currency])
+      end
+
+      private
+
+      def load_user
+        @user = Spree.user_class.find_by(id: params[:user_id])
+
+        unless @user
+          flash[:error] = Spree.t(:user_not_found)
+          redirect_to admin_path
+        end
+      end
+
+      def load_categories
+        @credit_categories = Spree::StoreCreditCategory.order(:name)
+      end
+
+      def load_store_credit
+        @store_credit = Spree::StoreCredit.find_by_id(params[:id]) || Spree::StoreCredit.new
+      end
+
+      def ensure_unused_store_credit
+        unless @store_credit.amount_used.zero?
+          raise StoreCreditError.new(Spree.t('store_credit.errors.cannot_change_used_store_credit'))
+        end
+      end
+    end
+  end
+end

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

@@ -12,9 +12,9 @@ module Spree
 
       def search
         if params[:ids]
-          @taxons = Spree::Taxon.where(:id => params[:ids].split(','))
+          @taxons = Spree::Taxon.where(id: params[:ids].split(','))
         else
-          @taxons = Spree::Taxon.limit(20).ransack(:name_cont => params[:q]).result
+          @taxons = Spree::Taxon.limit(20).ransack(name_cont: params[:q]).result
         end
       end
 
@@ -22,7 +22,7 @@ module Spree
         @taxon = @taxonomy.taxons.build(params[:taxon])
         if @taxon.save
           respond_with(@taxon) do |format|
-            format.json {render :json => @taxon.to_json }
+            format.json { render json: @taxon.to_json }
           end
         else
           flash[:error] = Spree.t('errors.messages.could_not_create_taxon')
@@ -59,15 +59,15 @@ module Spree
         rename_child_taxons if @update_children
 
         respond_with(@taxon) do |format|
-          format.html {redirect_to edit_admin_taxonomy_url(@taxonomy) }
-          format.json {render :json => @taxon.to_json }
+          format.html { redirect_to edit_admin_taxonomy_url(@taxonomy) }
+          format.json { render json: @taxon.to_json }
         end
       end
 
       def destroy
         @taxon = Taxon.find(params[:id])
         @taxon.destroy
-        respond_with(@taxon) { |format| format.json { render :json => '' } }
+        respond_with(@taxon) { |format| format.json { render json: '' } }
       end
 
       private
@@ -107,18 +107,20 @@ module Spree
 
       def rename_child_taxons
         @taxon.descendants.each do |taxon|
-          taxon.reload
-          taxon.set_permalink
-          taxon.save!
+          reload_taxon_and_set_permalink(taxon)
         end
       end
 
       def regenerate_permalink
-        @taxon.reload
-        @taxon.set_permalink
-        @taxon.save!
+        reload_taxon_and_set_permalink(@taxon)
         @update_children = true
       end
+
+      def reload_taxon_and_set_permalink(taxon)
+        taxon.reload
+        taxon.set_permalink
+        taxon.save!
+      end
     end
   end
 end

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

@@ -7,8 +7,6 @@ module Spree
 
       # http://spreecommerce.com/blog/2010/11/02/json-hijacking-vulnerability/
       before_action :check_json_authenticity, only: :index
-      before_action :load_roles
-      before_action :extract_roles_from_params, only: [:create, :update]
 
       def index
         respond_with(@collection) do |format|
@@ -22,11 +20,8 @@ module Spree
       end
 
       def create
-
         @user = Spree.user_class.new(user_params)
         if @user.save
-          set_roles
-
           flash.now[:success] = flash_message_for(@user, :successfully_created)
           render :edit
         else
@@ -41,7 +36,6 @@ module Spree
         end
 
         if @user.update_attributes(user_params)
-          set_roles
           flash.now[:success] = Spree.t(:account_updated)
         end
 
@@ -95,8 +89,9 @@ module Spree
 
         def collection
           return @collection if @collection.present?
+          @collection = super
           if request.xhr? && params[:q].present?
-            @collection = Spree.user_class.includes(:bill_address, :ship_address)
+            @collection = @collection.includes(:bill_address, :ship_address)
                               .where("spree_users.email #{LIKE} :search
                                      OR (spree_addresses.firstname #{LIKE} :search AND spree_addresses.id = spree_users.bill_address_id)
                                      OR (spree_addresses.lastname  #{LIKE} :search AND spree_addresses.id = spree_users.bill_address_id)
@@ -105,28 +100,16 @@ module Spree
                                     { :search => "#{params[:q].strip}%" })
                               .limit(params[:limit] || 100)
           else
-            @search = Spree.user_class.ransack(params[:q])
+            @search = @collection.ransack(params[:q])
             @collection = @search.result.page(params[:page]).per(Spree::Config[:admin_products_per_page])
           end
         end
 
       private
 
-      def set_roles
-        if @roles_ids
-          @user.spree_roles = Spree::Role.where(id: @roles_ids)
-        end
-      end
-
-      def extract_roles_from_params
-        if params[:user]
-          @roles_ids = params[:user].delete("spree_role_ids")
-        end
-      end
-
       def user_params
         params.require(:user).permit(permitted_user_attributes |
-                                     [:spree_role_ids,
+                                     [spree_role_ids: [],
                                       ship_address_attributes: permitted_address_attributes,
                                       bill_address_attributes: permitted_address_attributes])
       end
@@ -157,10 +140,6 @@ module Spree
           sign_in(@user, event: :authentication, bypass: true)
         end
       end
-
-      def load_roles
-        @roles = Spree::Role.all
-      end
     end
   end
 end

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

@@ -23,10 +23,13 @@ module Spree
 
       protected
         def new_before
-          @object.attributes = @object.product.master.attributes.except('id', 'created_at', 'deleted_at',
+          master = @object.product.master
+          @object.attributes = master.attributes.except('id', 'created_at', 'deleted_at',
                                                                         'sku', 'is_master')
-          # Shallow Clone of the default price to populate the price field.
-          @object.default_price = @object.product.master.default_price.clone
+          if master.default_price.present?
+            # Shallow Clone of the default price to populate the price field.
+            @object.default_price = master.default_price.clone
+          end
         end
 
         def collection
@@ -35,7 +38,7 @@ module Spree
           if @deleted.blank?
             @collection ||= super.includes(:default_price, option_values: :option_type)
           else
-            @collection ||= Variant.only_deleted.where(:product_id => parent.id)
+            @collection ||= Variant.only_deleted.where(product_id: parent.id)
           end
           @collection
         end

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

@@ -144,6 +144,15 @@ module Spree
         resource_class.model_name.human(count: I18N_PLURAL_MANY_COUNT)
       end
 
+      def back_to_list_button(resource, path)
+        button_text = Spree.t(:back_to_resource_list, resource: resource)
+        link_to_with_icon 'arrow-left', button_text, path, class: 'btn btn-default'
+      end
+
+      def order_time(time)
+        [I18n.l(time.to_date), time.strftime("%l:%M %p")].join('')
+      end
+
       private
         def attribute_name_for(field_name)
           field_name.gsub(' ', '_').downcase

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

@@ -1,11 +1,20 @@
 module Spree
   module Admin
     module NavigationHelper
-      # Make an admin tab that coveres one or more resources supplied by symbols
+      # Makes an admin navigation tab (<li> tag) that links to a routing resource under /admin.
+      # The arguments should be a list of symbolized controller names that will cause this tab to
+      # be highlighted, with the first being the name of the resouce to link (uses URL helpers).
+      #
       # Option hash may follow. Valid options are
       #   * :label to override link text, otherwise based on the first resource name (translated)
       #   * :route to override automatically determining the default route
-      #   * :match_path as an alternative way to control when the tab is active, /products would match /admin/products, /admin/products/5/variants etc.
+      #   * :match_path as an alternative way to control when the tab is active, /products would
+      #     match /admin/products, /admin/products/5/variants etc.  Can be a String or a Regexp.
+      #     Controller names are ignored if :match_path is provided.
+      #
+      # Example:
+      #   # Link to /admin/orders, also highlight tab for ProductsController and ShipmentsController
+      #   tab :orders, :products, :shipments
       def tab(*args)
         options = { label: args.first.to_s }
 
@@ -92,8 +101,8 @@ module Spree
 
       # helper method to create proper url to apply per page filtering
       # fixes https://github.com/spree/spree/issues/6888
-      def per_page_dropdown_params
-        args = params.clone
+      def per_page_dropdown_params(args = nil)
+        args ||= params.clone
         args.delete(:page)
         args.delete(:per_page)
         args
@@ -116,9 +125,11 @@ module Spree
       end
 
       def link_to_clone(resource, options={})
-        options[:data] = { action: 'clone' }
-        options[:class] = "btn btn-primary btn-sm"
-        link_to_with_icon('clone', Spree.t(:clone), clone_object_url(resource), options)
+        options[:data] = { action: 'clone', :'original-title' => Spree.t(:clone) }
+        options[:class] = "btn btn-primary btn-sm with-tip"
+        options[:method] = :post
+        options[:icon] = :clone
+        button_link_to '', clone_object_url(resource), options
       end
 
       def link_to_new(resource)
@@ -177,7 +188,7 @@ module Spree
         if (html_options[:method] &&
             html_options[:method].to_s.downcase != 'get' &&
             !html_options[:remote])
-          form_tag(url, method: html_options.delete(:method)) do
+          form_tag(url, method: html_options.delete(:method), class: 'display-inline') do
             button(text, html_options.delete(:icon), nil, html_options)
           end
         else