spree_backend 4.2.4 → 4.3.0.rc3

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

@@ -6,10 +6,10 @@ module Spree
       private
 
       def set_country
-        @stock_location.country = Spree::Country.default
+        @stock_location.country = current_store.default_country
         unless @stock_location.country
           flash[:error] = Spree.t(:stock_locations_need_a_default_country)
-          redirect_to admin_stock_locations_path
+          redirect_to spree.admin_stock_locations_path
         end
       end
     end

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

@@ -18,7 +18,7 @@ module Spree
         @stock_movement = stock_location.stock_movements.build(stock_movement_params)
         if @stock_movement.save
           flash[:success] = flash_message_for(@stock_movement, :successfully_created)
-          redirect_to admin_stock_location_stock_movements_path(stock_location)
+          redirect_to spree.admin_stock_location_stock_movements_path(stock_location)
         else
           render :new
         end

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

@@ -36,7 +36,7 @@ module Spree
                                   variants)
 
           flash[:success] = Spree.t(:stock_successfully_transferred)
-          redirect_to admin_stock_transfer_path(stock_transfer)
+          redirect_to spree.admin_stock_transfer_path(stock_transfer)
         end
       end
 

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

@@ -9,20 +9,21 @@ module Spree
       before_action :ensure_unused_store_credit, only: [:update]
 
       def index
-        @store_credits = @user.store_credits.includes(:credit_type, :category).reverse_order
+        @store_credits = @user.store_credits.for_store(current_store).includes(: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
+            action_originator: try_spree_current_user,
+            store: current_store
           )
         )
 
         if @store_credit.save
           flash[:success] = flash_message_for(@store_credit, :successfully_created)
-          redirect_to admin_user_store_credits_path(@user)
+          redirect_to spree.admin_user_store_credits_path(@user)
         else
           load_categories
           flash[:error] = Spree.t('store_credit.errors.unable_to_create')
@@ -36,7 +37,7 @@ module Spree
 
         if @store_credit.save
           flash[:success] = flash_message_for(@store_credit, :successfully_updated)
-          redirect_to admin_user_store_credits_path(@user)
+          redirect_to spree.admin_user_store_credits_path(@user)
         else
           load_categories
           flash[:error] = Spree.t('store_credit.errors.unable_to_update')
@@ -45,13 +46,13 @@ module Spree
       end
 
       def destroy
-        @store_credit = @user.store_credits.find(params[:id])
+        @store_credit = @user.store_credits.for_store(current_store).find(params[:id])
         ensure_unused_store_credit
 
         if @store_credit.destroy
           flash[:success] = flash_message_for(@store_credit, :successfully_removed)
           respond_with(@store_credit) do |format|
-            format.html { redirect_to admin_user_store_credits_path(@user) }
+            format.html { redirect_to spree.admin_user_store_credits_path(@user) }
             format.js { render_js_for_destroy }
           end
         else
@@ -72,7 +73,7 @@ module Spree
 
         unless @user
           flash[:error] = Spree.t(:user_not_found)
-          redirect_to admin_path
+          redirect_to spree.admin_path
         end
       end
 
@@ -81,7 +82,11 @@ module Spree
       end
 
       def load_store_credit
-        @store_credit = Spree::StoreCredit.find_by(id: params[:id]) || Spree::StoreCredit.new
+        @store_credit = scope.find_by(id: params[:id]) || scope.new
+      end
+
+      def scope
+        current_store.store_credits
       end
 
       def ensure_unused_store_credit

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

@@ -8,15 +8,13 @@ module Spree
       before_action :normalize_supported_locales, only: [:create, :update]
       before_action :set_default_country_id, only: :new
       before_action :load_all_countries, only: [:new, :edit, :update, :create]
-      before_action :load_all_zones, only: %i[new edit]
+      before_action :load_all_zones, only: [:new, :edit, :update, :create]
 
       def index
         if params[:ids]
           load_stores_by_ids
         elsif params[:q]
           load_stores_by_query
-        else
-          @stores = Spree::Store.all
         end
 
         respond_with(@stores) do |format|
@@ -25,25 +23,24 @@ module Spree
       end
 
       def load_stores_by_ids
-        ids = params[:ids].split(',')
-        @stores = Spree::Store.where(id: ids)
+        @stores = stores_scope.where(id: params[:ids].split(','))
       end
 
       def load_stores_by_query
         @stores = if defined?(SpreeGlobalize)
-                    Spree::Store.joins(:translations).where("LOWER(#{Store::Translation.table_name}.name) LIKE LOWER(:query)",
+                    stores_scope.joins(:translations).where("LOWER(#{Store::Translation.table_name}.name) LIKE LOWER(:query)",
                                                             query: "%#{params[:q]}%")
                   else
-                    Spree::Store.where('LOWER(name) LIKE LOWER(:query)', query: "%#{params[:q]}%")
+                    stores_scope.where('LOWER(name) LIKE LOWER(:query)', query: "%#{params[:q]}%")
                   end
       end
 
       def create
-        @store = Spree::Store.new(permitted_store_params)
+        @store = stores_scope.new(permitted_store_params)
 
         if @store.save
           flash[:success] = flash_message_for(@store, :successfully_created)
-          redirect_to admin_stores_path
+          redirect_to @store.formatted_url + spree.admin_stores_path
         else
           flash[:error] = "#{Spree.t('store_errors.unable_to_create')}: #{@store.errors.full_messages.join(', ')}"
           render :new
@@ -55,20 +52,20 @@ module Spree
 
         if @store.save
           flash[:success] = flash_message_for(@store, :successfully_updated)
-          redirect_to admin_stores_path
+          redirect_to spree.admin_stores_path
         else
           flash[:error] = "#{Spree.t('store_errors.unable_to_update')}: #{@store.errors.full_messages.join(', ')}"
-          render :edit
+          redirect_to spree.edit_admin_store_path(@store)
         end
       end
 
       def destroy
-        @store = Spree::Store.find(params[:id])
+        @store = stores_scope.find(params[:id])
 
         if @store.destroy
           flash[:success] = flash_message_for(@store, :successfully_removed)
           respond_with(@store) do |format|
-            format.html { redirect_to admin_stores_path }
+            format.html { redirect_to spree.admin_stores_path }
             format.js { render_js_for_destroy }
           end
         else
@@ -77,8 +74,8 @@ module Spree
       end
 
       def set_default
-        store = Spree::Store.find(params[:id])
-        stores = Spree::Store.where.not(id: params[:id])
+        store = stores_scope.find(params[:id])
+        stores = stores_scope.where.not(id: params[:id])
 
         ApplicationRecord.transaction do
           store.update(default: true)
@@ -91,7 +88,7 @@ module Spree
           flash[:error] = "#{Spree.t(:store_not_set_as_default, store: store.name)} #{store.errors.full_messages.join(', ')}"
         end
 
-        redirect_to admin_stores_path
+        redirect_to spree.admin_stores_path
       end
 
       protected
@@ -103,7 +100,7 @@ module Spree
       private
 
       def load_store
-        @store = Spree::Store.find_by(id: params[:id]) || Spree::Store.new
+        @store = stores_scope.find_by(id: params[:id]) || stores_scope.new
       end
 
       def load_all_countries

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

@@ -51,7 +51,7 @@ module Spree
           rename_child_taxons if @update_children
 
           respond_with(@taxon) do |format|
-            format.html { redirect_to edit_admin_taxonomy_url(@taxonomy) }
+            format.html { redirect_to spree.edit_admin_taxonomy_url(@taxonomy) }
             format.json { render json: @taxon.to_json }
           end
         else
@@ -65,7 +65,7 @@ module Spree
       def remove_icon
         if @taxon.icon.destroy
           flash[:success] = Spree.t('notice_messages.icon_removed')
-          redirect_to edit_admin_taxonomy_taxon_url(@taxonomy.id, @taxon.id)
+          redirect_to spree.edit_admin_taxonomy_taxon_url(@taxonomy.id, @taxon.id)
         else
           flash[:error] = Spree.t('errors.messages.cannot_remove_icon')
           render :edit
@@ -90,9 +90,9 @@ module Spree
 
       def load_taxonomy
         @taxonomy = if defined?(SpreeGlobalize)
-                      Taxonomy.includes(:translations, taxons: [:translations]).find(params[:taxonomy_id])
+                      scope.includes(:translations, taxons: [:translations]).find(params[:taxonomy_id])
                     else
-                      Taxonomy.find(params[:taxonomy_id])
+                      scope.find(params[:taxonomy_id])
                     end
       end
 
@@ -102,7 +102,7 @@ module Spree
       end
 
       def set_parent(parent_id)
-        @taxon.parent = Taxon.find(parent_id.to_i) if parent_id
+        @taxon.parent = current_store.taxons.find(parent_id.to_i) if parent_id
       end
 
       def set_permalink_params
@@ -127,6 +127,10 @@ module Spree
         taxon.set_permalink
         taxon.save!
       end
+
+      def scope
+        current_store.taxonomies
+      end
     end
   end
 end

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

@@ -6,14 +6,14 @@ module Spree
       after_action :sign_in_if_change_own_password, only: :update
 
       def show
-        redirect_to edit_admin_user_path(@user)
+        redirect_to spree.edit_admin_user_path(@user)
       end
 
       def create
         @user = Spree.user_class.new(user_params)
         if @user.save
           flash[:success] = flash_message_for(@user, :successfully_created)
-          redirect_to edit_admin_user_path(@user)
+          redirect_to spree.edit_admin_user_path(@user)
         else
           render :new
         end
@@ -27,7 +27,7 @@ module Spree
 
         if @user.update(user_params)
           flash[:success] = Spree.t(:account_updated)
-          redirect_to edit_admin_user_path(@user)
+          redirect_to spree.edit_admin_user_path(@user)
         else
           render :edit
         end
@@ -35,6 +35,8 @@ module Spree
 
       def addresses
         if request.put?
+          params[:user][:bill_address_attributes][:user_id] = @user.id if params[:user][:bill_address_attributes].present?
+          params[:user][:ship_address_attributes][:user_id] = @user.id if params[:user][:ship_address_attributes].present?
           if @user.update(user_params)
             flash.now[:success] = Spree.t(:account_updated)
           end
@@ -45,13 +47,13 @@ module Spree
 
       def orders
         params[:q] ||= {}
-        @search = Spree::Order.reverse_chronological.ransack(params[:q].merge(user_id_eq: @user.id))
+        @search = current_store.orders.reverse_chronological.ransack(params[:q].merge(user_id_eq: @user.id))
         @orders = @search.result.page(params[:page])
       end
 
       def items
         params[:q] ||= {}
-        @search = Spree::Order.includes(
+        @search = current_store.orders.includes(
           line_items: {
             variant: [:product, { option_values: :option_type }]
           }
@@ -63,14 +65,14 @@ module Spree
         if @user.generate_spree_api_key!
           flash[:success] = Spree.t('api.key_generated')
         end
-        redirect_to edit_admin_user_path(@user)
+        redirect_to spree.edit_admin_user_path(@user)
       end
 
       def clear_api_key
         if @user.clear_spree_api_key!
           flash[:success] = Spree.t('api.key_cleared')
         end
-        redirect_to edit_admin_user_path(@user)
+        redirect_to spree.edit_admin_user_path(@user)
       end
 
       def model_class

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

@@ -1,6 +1,8 @@
 module Spree
   module Admin
     class VariantsController < ResourceController
+      include Spree::Admin::ProductConcern
+
       belongs_to 'spree/product', find_by: :slug
       new_action.before :new_before
       before_action :redirect_on_empty_option_values, only: [:new]
@@ -9,7 +11,7 @@ module Spree
       # override the destroy method to set deleted_at value
       # instead of actually deleting the product.
       def destroy
-        @variant = Variant.find(params[:id])
+        @variant = parent.variants.find(params[:id])
         if @variant.destroy
           flash[:success] = Spree.t('notice_messages.variant_deleted')
         else
@@ -17,7 +19,7 @@ module Spree
         end
 
         respond_with(@variant) do |format|
-          format.html { redirect_to admin_product_variants_url(params[:product_id]) }
+          format.html { redirect_to spree.admin_product_variants_url(params[:product_id]) }
           format.js { render_js_for_destroy }
         end
       end
@@ -34,20 +36,19 @@ module Spree
         @object.default_price = master.default_price.clone if master.default_price.present?
       end
 
-      def parent
-        @product = Product.with_deleted.friendly.find(params[:product_id])
-      end
-
       def collection
-        @deleted = params.key?(:deleted) && params[:deleted] == 'on' ? 'checked' : ''
+        return @collection if @collection.present?
+
+        params[:q] ||= {}
+        @deleted = params.dig(:q, :deleted_at_null) || '0'
 
-        @collection ||=
-          if @deleted.blank?
-            super.includes(:default_price, option_values: :option_type)
-          else
-            Variant.only_deleted.where(product_id: parent.id)
-          end
-        @collection
+        @collection = super
+        @collection = @collection.deleted if @deleted == '1'
+        # @search needs to be defined as this is passed to search_link
+        @search = @collection.ransack(params[:q])
+        @collection = @search.result.
+                      page(params[:page]).
+                      per(params[:per_page] || Spree::Backend::Config[:variants_per_page])
       end
 
       private
@@ -57,7 +58,7 @@ module Spree
       end
 
       def redirect_on_empty_option_values
-        redirect_to admin_product_variants_url(params[:product_id]) if @product.empty_option_values?
+        redirect_to spree.admin_product_variants_url(params[:product_id]) if @product.empty_option_values?
       end
     end
   end

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

@@ -15,13 +15,9 @@ module Spree
 
       def flash_alert(flash)
         if flash.present?
-          message = flash[:error] || flash[:notice] || flash[:success]
-          flash_class = 'danger' if flash[:error]
-          flash_class = 'info' if flash[:notice]
-          flash_class = 'success' if flash[:success]
-          flash_div = content_tag(:div, message, class: "alert alert-#{flash_class} mx-2")
-          content_tag(:div, flash_div,
-                      class: 'd-flex justify-content-center position-fixed flash-alert ')
+          type = flash.first[0]
+          message = flash.first[1]
+          content_tag(:span, message, class: 'd-none', data: { alert_type: type })
         end
       end
 
@@ -35,6 +31,46 @@ module Spree
         )
       end
 
+      # Returns Humanized Dropdown Values From a Constant In the Model
+      # Pass the model name as a string and then a hash containing the constant name
+      # and the option to paramatize the return value.
+      #
+      # Example:
+      #
+      #   spree_humanize_dropdown_values('Spree::CmsPage', { const: 'TYPES' })
+      #   spree_humanize_dropdown_values('Spree::Menu', { const: 'MENU_TYPES', paramterize_values: true })
+      #
+      def spree_humanize_dropdown_values(model_name, options = {})
+        formatted_option_values = []
+
+        const = options[:const] || nil
+        paramterize_values = options[:paramterize_values] || false
+
+        return unless const.present?
+
+        model_name.constantize.const_get(const).map do |type|
+          return_value = if paramterize_values
+                           type.parameterize(separator: '_')
+                         else
+                           type
+                         end
+
+          formatted_option_values << [spree_humanize_type(type), return_value]
+        end
+
+        formatted_option_values
+      end
+
+      def spree_humanize_type(obj)
+        last_word = obj.split('::', 10).last
+
+        if last_word.starts_with?('Cms')
+          last_word.slice(3, 100).gsub(/(?<=[a-z])(?=[A-Z])/, ' ')
+        else
+          last_word.gsub(/(?<=[a-z])(?=[A-Z])/, ' ')
+        end
+      end
+
       def error_message_on(object, method, _options = {})
         object = convert_to_model(object)
         obj = object.respond_to?(:errors) ? object : instance_variable_get("@#{object}")
@@ -63,6 +99,12 @@ module Spree
       end
 
       def preference_field_tag(name, value, options)
+        if options[:key] == :currency
+          return select_tag(name,
+                            options_from_collection_for_select(supported_currencies_for_all_stores, :iso_code, :iso_code, value),
+                            class: 'select2')
+        end
+
         case options[:type]
         when :integer
           text_field_tag(name, value, preference_field_options(options))
@@ -147,7 +189,7 @@ module Spree
                 (form.select "preferred_#{key}", currency_options(object.preferences[key]), {}, { class: 'form-control select2' }),
                           class: 'form-group', id: [object.class.to_s.parameterize, 'preference', key].join('-'))
             else
-              if object.preference_type(key) == :boolean
+              if object.preference_type(key).to_sym == :boolean
                 content_tag(:div, preference_field_for(form, "preferred_#{key}", type: object.preference_type(key)) +
                   form.label("preferred_#{key}", Spree.t(key), class: 'form-check-label'),
                             class: 'form-group form-check', id: [object.class.to_s.parameterize, 'preference', key].join('-'))
@@ -195,21 +237,17 @@ module Spree
       end
 
       def product_preview_link(product)
-        return unless frontend_available?
-
         button_link_to(
           Spree.t(:preview_product),
-          spree.product_url(product),
+          spree_storefront_resource_url(product),
           class: 'btn-outline-secondary', icon: 'view.svg', id: 'admin_preview_product', target: :blank
         )
       end
 
       def taxon_preview_link(taxon)
-        return unless frontend_available?
-
         button_link_to(
           Spree.t(:preview_taxon),
-          seo_url(taxon),
+          spree_storefront_resource_url(taxon),
           class: 'btn-outline-secondary', icon: 'view.svg', id: 'admin_preview_taxon', target: :blank
         )
       end