spree_backend 4.1.1 → 4.5.0

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

@@ -1,14 +1,19 @@
 module Spree
   module Admin
     class OrdersController < Spree::Admin::BaseController
+      include Spree::Admin::OrderConcern
+
       before_action :initialize_order_events
-      before_action :load_order, only: [:edit, :update, :cancel, :resume, :approve, :resend, :open_adjustments, :close_adjustments, :cart, :store, :set_store]
+      before_action :load_order, only: %i[
+        edit update cancel resume approve resend open_adjustments
+        close_adjustments cart channel set_channel
+      ]
 
       respond_to :html
 
       def index
         params[:q] ||= {}
-        params[:q][:completed_at_not_null] ||= '1' if Spree::Config[:show_only_complete_orders_by_default]
+        params[:q][:completed_at_not_null] ||= '1' if Spree::Backend::Config[:show_only_complete_orders_by_default]
         @show_only_completed = params[:q][:completed_at_not_null] == '1'
         params[:q][:s] ||= @show_only_completed ? 'completed_at desc' : 'created_at desc'
         params[:q][:completed_at_not_null] = '' unless @show_only_completed
@@ -23,18 +28,18 @@ module Spree
 
         if params[:q][:created_at_gt].present?
           params[:q][:created_at_gt] = begin
-                                         Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day
-                                       rescue StandardError
-                                         ''
-                                       end
+            Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day
+          rescue StandardError
+            ''
+          end
         end
 
         if params[:q][:created_at_lt].present?
           params[:q][:created_at_lt] = begin
-                                         Time.zone.parse(params[:q][:created_at_lt]).end_of_day
-                                       rescue StandardError
-                                         ''
-                                       end
+            Time.zone.parse(params[:q][:created_at_lt]).end_of_day
+          rescue StandardError
+            ''
+          end
         end
 
         if @show_only_completed
@@ -42,14 +47,14 @@ module Spree
           params[:q][:completed_at_lt] = params[:q].delete(:created_at_lt)
         end
 
-        @search = Spree::Order.preload(:user).accessible_by(current_ability, :index).ransack(params[:q])
+        @search = scope.preload(:user).accessible_by(current_ability, :index).ransack(params[:q])
 
         # lazy loading other models here (via includes) may result in an invalid query
         # e.g. SELECT  DISTINCT DISTINCT "spree_orders".id, "spree_orders"."created_at" AS alias_0 FROM "spree_orders"
         # see https://github.com/spree/spree/pull/3919
         @orders = @search.result(distinct: true).
                   page(params[:page]).
-                  per(params[:per_page] || Spree::Config[:admin_orders_per_page])
+                  per(params[:per_page] || Spree::Backend::Config[:admin_orders_per_page])
 
         # Restore dates
         params[:q][:created_at_gt] = created_at_gt
@@ -57,7 +62,7 @@ module Spree
       end
 
       def new
-        @order = Spree::Order.create(order_params)
+        @order = scope.create(order_params)
         redirect_to cart_admin_order_url(@order)
       end
 
@@ -71,23 +76,19 @@ module Spree
         @order.refresh_shipment_rates(ShippingMethod::DISPLAY_ON_BACK_END) unless @order.completed?
 
         if @order.shipments.shipped.exists?
-          redirect_to edit_admin_order_url(@order)
+          redirect_to spree.edit_admin_order_url(@order)
         end
       end
 
-      def store
-        @stores = Spree::Store.all
-      end
-
       def update
         if @order.update(params[:order]) && @order.line_items.present?
           @order.update_with_updater!
           unless @order.completed?
             # Jump to next step if order is not completed.
-            redirect_to admin_order_customer_path(@order) and return
+            redirect_to spree.admin_order_customer_path(@order) and return
           end
-        else
-          @order.errors.add(:line_items, Spree.t('errors.messages.blank')) if @order.line_items.empty?
+        elsif @order.line_items.empty?
+          @order.errors.add(:line_items, Spree.t('errors.messages.blank'))
         end
 
         render action: :edit
@@ -112,18 +113,26 @@ module Spree
       end
 
       def resend
-        OrderMailer.confirm_email(@order.id, true).deliver_later
+        @order.deliver_order_confirmation_email
         flash[:success] = Spree.t(:order_email_resent)
 
         redirect_back fallback_location: spree.edit_admin_order_url(@order)
       end
 
+      def reset_digitals
+        load_order
+        @order.digital_links.each(&:reset!)
+        flash[:notice] = Spree.t('admin.digitals.downloads_reset')
+
+        redirect_back fallback_location: spree.edit_admin_order_url(@order)
+      end
+
       def open_adjustments
         adjustments = @order.all_adjustments.finalized
         adjustments.update_all(state: 'open')
         flash[:success] = Spree.t(:all_adjustments_opened)
 
-        respond_with(@order) { |format| format.html { redirect_back fallback_location: spree.admin_order_adjustments_url(@order) } }
+        redirect_back fallback_location: spree.admin_order_adjustments_url(@order)
       end
 
       def close_adjustments
@@ -131,28 +140,32 @@ module Spree
         adjustments.update_all(state: 'closed')
         flash[:success] = Spree.t(:all_adjustments_closed)
 
-        respond_with(@order) { |format| format.html { redirect_back fallback_location: spree.admin_order_adjustments_url(@order) } }
+        redirect_back fallback_location: spree.admin_order_adjustments_url(@order)
       end
 
-      def set_store
-        if @order.update(store_id: params[:order][:store_id])
+      def set_channel
+        if @order.update(order_params)
           flash[:success] = flash_message_for(@order, :successfully_updated)
         else
           flash[:error] = @order.errors.full_messages.join(', ')
         end
 
-        redirect_to store_admin_order_url(@order)
+        redirect_to channel_admin_order_url(@order)
       end
 
       private
 
+      def scope
+        current_store.orders.accessible_by(current_ability, :index)
+      end
+
       def order_params
         params[:created_by_id] = try_spree_current_user.try(:id)
-        params.permit(:created_by_id, :user_id, :store_id)
+        params.permit(:created_by_id, :user_id, :store_id, :channel)
       end
 
       def load_order
-        @order = Spree::Order.includes(:adjustments).find_by!(number: params[:id])
+        @order = scope.includes(:adjustments).find_by!(number: params[:id])
         authorize! action, @order
       end
 

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

@@ -10,14 +10,15 @@ module Spree
       def create
         @payment_method = params[:payment_method].delete(:type).constantize.new(payment_method_params)
         @object = @payment_method
+        set_current_store
         invoke_callbacks(:create, :before)
         if @payment_method.save
           invoke_callbacks(:create, :after)
           flash[:success] = Spree.t(:successfully_created, resource: Spree.t(:payment_method))
-          redirect_to edit_admin_payment_method_path(@payment_method)
+          redirect_to location_after_create
         else
           invoke_callbacks(:create, :fails)
-          respond_with(@payment_method)
+          respond_with(@payment_method, status: :unprocessable_entity)
         end
       end
 
@@ -29,7 +30,7 @@ module Spree
             type: payment_method_type,
             updated_at: Time.current
           )
-          @payment_method = PaymentMethod.find(params[:id])
+          @payment_method = scope.find(params[:id])
         end
 
         attributes = payment_method_params.merge(preferences_params)
@@ -38,23 +39,35 @@ module Spree
         end
 
         if @payment_method.update(attributes)
+          set_current_store
           invoke_callbacks(:update, :after)
           flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:payment_method))
-          redirect_to edit_admin_payment_method_path(@payment_method)
+          redirect_to spree.edit_admin_payment_method_path(@payment_method)
         else
           invoke_callbacks(:update, :fails)
-          respond_with(@payment_method)
+          respond_with(@payment_method, status: :unprocessable_entity)
         end
       end
 
       private
 
+      def scope
+        current_store.payment_methods.accessible_by(current_ability, :index)
+      end
+
       def collection
+        return @collection if @collection.present?
+
+        params[:q] ||= {}
         @collection = super.order(position: :asc)
+
+        @collection = scope.order(position: :asc)
+
+        @search = @collection.ransack(params[:q])
+        @collection = @search.result.page(params[:page]).per(params[:per_page])
       end
 
       def load_data
-        @stores = Spree::Store.all
         @providers = Gateway.providers.sort_by(&:name)
       end
 
@@ -76,6 +89,10 @@ module Spree
 
         params.require(key).permit!
       end
+
+      def location_after_create
+        spree.edit_admin_payment_method_path(@payment_method)
+      end
     end
   end
 end

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

@@ -2,8 +2,9 @@ module Spree
   module Admin
     class PaymentsController < Spree::Admin::BaseController
       include Spree::Backend::Callbacks
+      include Spree::Admin::OrderConcern
 
-      before_action :load_order, only: [:create, :new, :index, :fire]
+      before_action :load_order
       before_action :load_payment, except: [:create, :new, :index]
       before_action :load_data
       before_action :can_not_transition_without_customer_info
@@ -48,12 +49,12 @@ module Spree
 
             saved_payments.each { |payment| payment.process! if payment.reload.checkout? && @order.complete? }
             flash[:success] = flash_message_for(saved_payments.first, :successfully_created)
-            redirect_to admin_order_payments_path(@order)
+            redirect_to spree.admin_order_payments_path(@order)
           else
             @payment ||= @order.payments.build(object_params)
             invoke_callbacks(:create, :fails)
             flash[:error] = Spree.t(:payment_could_not_be_created)
-            render :new
+            render :new, status: :unprocessable_entity
           end
         rescue Spree::Core::GatewayError => e
           invoke_callbacks(:create, :fails)
@@ -75,7 +76,7 @@ module Spree
       rescue Spree::Core::GatewayError => ge
         flash[:error] = ge.message.to_s
       ensure
-        redirect_to admin_order_payments_path(@order)
+        redirect_to spree.admin_order_payments_path(@order)
       end
 
       private
@@ -99,14 +100,8 @@ module Spree
         end
       end
 
-      def load_order
-        @order = Order.find_by!(number: params[:order_id])
-        authorize! action, @order
-        @order
-      end
-
       def load_payment
-        @payment = Payment.find_by!(number: params[:id])
+        @payment = @order.payments.find_by!(number: params[:id])
       end
 
       def model_class

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

@@ -0,0 +1,26 @@
+module Spree
+  module Admin
+    class PricesController < ResourceController
+      belongs_to 'spree/product', find_by: :slug
+
+      def create
+        params.require(:vp).permit!
+        params[:vp].each do |variant_id, prices|
+          next unless variant_id
+
+          variant = parent.variants_including_master.find(variant_id)
+          next unless variant
+
+          supported_currencies_for_all_stores.each do |currency|
+            price = variant.price_in(currency.iso_code)
+            price.price = (prices[currency.iso_code]['price'].blank? ? nil : prices[currency.iso_code]['price'])
+            price.compare_at_price = (prices[currency.iso_code]['compare_at_price'].blank? ? nil : prices[currency.iso_code]['compare_at_price'])
+            price.save! if price.new_record? && price.price || !price.new_record? && price.changed?
+          end
+        end
+        flash[:success] = Spree.t('notice_messages.prices_saved')
+        redirect_to spree.admin_product_path(parent)
+      end
+    end
+  end
+end

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

@@ -1,11 +1,17 @@
 module Spree
   module Admin
     class ProductsController < ResourceController
-      helper 'spree/products'
+      include Spree::Admin::ProductConcern
+
+      helper 'spree/admin/products'
 
       before_action :load_data, except: :index
+      before_action :set_product_defaults, only: :new
+
       create.before :create_before
       update.before :update_before
+      update.before :skip_updating_status
+      update.after :update_status
       helper_method :clone_object_url
 
       def show
@@ -20,30 +26,33 @@ module Spree
 
       def update
         if params[:product][:taxon_ids].present?
-          params[:product][:taxon_ids] = params[:product][:taxon_ids].split(',')
+          params[:product][:taxon_ids] = params[:product][:taxon_ids].reject(&:empty?)
         end
         if params[:product][:option_type_ids].present?
-          params[:product][:option_type_ids] = params[:product][:option_type_ids].split(',')
+          params[:product][:option_type_ids] = params[:product][:option_type_ids].reject(&:empty?)
         end
         invoke_callbacks(:update, :before)
         if @object.update(permitted_resource_params)
+          set_current_store
           invoke_callbacks(:update, :after)
           flash[:success] = flash_message_for(@object, :successfully_updated)
           respond_with(@object) do |format|
             format.html { redirect_to location_after_save }
-            format.js   { render layout: false }
+            format.js { render layout: false }
           end
         else
           # Stops people submitting blank slugs, causing errors when they try to
           # update the product again
           @product.slug = @product.slug_was if @product.slug.blank?
           invoke_callbacks(:update, :fails)
-          respond_with(@object)
+          respond_with(@object) do |format|
+            format.html { render :edit, status: :unprocessable_entity }
+          end
         end
       end
 
       def destroy
-        @product = Product.friendly.find(params[:id])
+        @product = product_scope.friendly.find(params[:id])
 
         begin
           # TODO: why is @product.destroy raising ActiveRecord::RecordNotDestroyed instead of failing with false result
@@ -67,15 +76,15 @@ module Spree
 
         if @new.persisted?
           flash[:success] = Spree.t('notice_messages.product_cloned')
-          redirect_to edit_admin_product_url(@new)
+          redirect_to spree.edit_admin_product_url(@new)
         else
           flash[:error] = Spree.t('notice_messages.product_not_cloned', error: @new.errors.full_messages.to_sentence)
-          redirect_to admin_products_url
+          redirect_to spree.admin_products_url
         end
       rescue ActiveRecord::RecordInvalid => e
         # Handle error on uniqueness validation on product fields
         flash[:error] = Spree.t('notice_messages.product_not_cloned', error: e.message)
-        redirect_to admin_products_url
+        redirect_to spree.admin_products_url
       end
 
       def stock
@@ -84,18 +93,22 @@ module Spree
         @stock_locations = StockLocation.accessible_by(current_ability)
         if @stock_locations.empty?
           flash[:error] = Spree.t(:stock_management_requires_a_stock_location)
-          redirect_to admin_stock_locations_path
+          redirect_to spree.admin_stock_locations_path
         end
       end
 
       protected
 
       def find_resource
-        Product.with_deleted.friendly.find(params[:id])
+        product_scope.with_deleted.friendly.find(params[:id])
       end
 
       def location_after_save
-        spree.edit_admin_product_url(@product)
+        if params[:product][:product_properties_attributes].present?
+          spree.admin_product_product_properties_path(@product)
+        else
+          spree.edit_admin_product_url(@product)
+        end
       end
 
       def load_data
@@ -105,15 +118,32 @@ module Spree
         @shipping_categories = ShippingCategory.order(:name)
       end
 
+      def set_product_defaults
+        @product.shipping_category ||= @shipping_categories&.first
+      end
+
+      def skip_updating_status
+        @new_status = params[:product].delete(:status)
+      end
+
+      def update_status
+        return if @new_status == @product.status
+        return if cannot?(:activate, Spree::Product) && @new_status&.to_sym == :active
+
+        event_to_fire = @product.status_transitions.find { |transition| transition.from == @product.status && transition.to == @new_status }&.event
+        @product.send(event_to_fire) if event_to_fire
+      end
+
       def collection
         return @collection if @collection.present?
 
         params[:q] ||= {}
         params[:q][:deleted_at_null] ||= '1'
-        params[:q][:not_discontinued] ||= '1'
 
         params[:q][:s] ||= 'name asc'
-        @collection = super
+
+        @collection = product_scope
+
         # Don't delete params[:q][:deleted_at_null] here because it is used in view to check the
         # checkbox for 'q[deleted_at_null]'. This also messed with pagination when deleted_at_null is checked.
         if params[:q][:deleted_at_null] == '0'
@@ -126,7 +156,8 @@ module Spree
         @collection = @search.result.
                       includes(product_includes).
                       page(params[:page]).
-                      per(params[:per_page] || Spree::Config[:admin_products_per_page])
+                      per(params[:per_page] || Spree::Backend::Config[:admin_products_per_page])
+
         @collection
       end
 
@@ -137,7 +168,7 @@ module Spree
       end
 
       def update_before
-        # note: we only reset the product properties if we're receiving a post
+        # NOTE: we only reset the product properties if we're receiving a post
         #       from the form on that tab
         return unless params[:clear_product_properties]
 
@@ -145,13 +176,26 @@ module Spree
       end
 
       def product_includes
-        [{ variants: [:images], master: [:images, :default_price] }]
+        {
+          variant_images: [],
+          tax_category: [],
+          master: [],
+          variants: [:prices]
+        }
       end
 
       def clone_object_url(resource)
         clone_admin_product_url resource
       end
 
+      def permitted_resource_params
+        if cannot?(:activate, @product) && @new_status&.to_sym == :active
+          super.except(:status, :make_active_at).permit!
+        else
+          super
+        end
+      end
+
       private
 
       def variant_stock_includes

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

@@ -29,7 +29,7 @@ class Spree::Admin::PromotionActionsController < Spree::Admin::BaseController
   private
 
   def load_promotion
-    @promotion = Spree::Promotion.find(params[:promotion_id])
+    @promotion = current_store.promotions.find(params[:promotion_id])
   end
 
   def validate_promotion_action_type

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

@@ -30,7 +30,7 @@ class Spree::Admin::PromotionRulesController < Spree::Admin::BaseController
   private
 
   def load_promotion
-    @promotion = Spree::Promotion.find(params[:promotion_id])
+    @promotion = current_store.promotions.find(params[:promotion_id])
   end
 
   def validate_promotion_rule_type

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

@@ -6,17 +6,17 @@ module Spree
       helper 'spree/admin/promotion_rules'
 
       def clone
-        promotion = Spree::Promotion.find(params[:id])
+        promotion = current_store.promotions.find(params[:id])
         duplicator = Spree::PromotionHandler::PromotionDuplicator.new(promotion)
 
         @new_promo = duplicator.duplicate
 
         if @new_promo.errors.empty?
           flash[:success] = Spree.t('promotion_cloned')
-          redirect_to edit_admin_promotion_url(@new_promo)
+          redirect_to spree.edit_admin_promotion_url(@new_promo)
         else
           flash[:error] = Spree.t('promotion_not_cloned', error: @new_promo.errors.full_messages.to_sentence)
-          redirect_to admin_promotions_url(@new_promo)
+          redirect_to spree.admin_promotions_url(@new_promo)
         end
       end
 
@@ -27,6 +27,8 @@ module Spree
       end
 
       def load_data
+        @actions = Rails.application.config.spree.promotions.actions
+
         @calculators = Rails.application.config.spree.calculators.promotion_actions_create_adjustments
         @promotion_categories = Spree::PromotionCategory.order(:name)
       end
@@ -42,7 +44,7 @@ module Spree
         @collection = @search.result(distinct: true).
                       includes(promotion_includes).
                       page(params[:page]).
-                      per(params[:per_page] || Spree::Config[:admin_promotions_per_page])
+                      per(params[:per_page] || Spree::Backend::Config[:admin_promotions_per_page])
       end
 
       def promotion_includes

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

@@ -17,7 +17,7 @@ module Spree
         @search = @collection.ransack(params[:q])
         @collection = @search.result.
                       page(params[:page]).
-                      per(Spree::Config[:admin_properties_per_page])
+                      per(Spree::Backend::Config[:admin_properties_per_page])
       end
     end
   end

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

@@ -5,7 +5,7 @@ module Spree
         if request.xhr?
           render layout: false
         else
-          redirect_to admin_prototypes_path
+          redirect_to spree.admin_prototypes_path
         end
       end
 

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

@@ -38,7 +38,7 @@ module Spree
 
       def spree_core_gateway_error(error)
         flash[:error] = error.message
-        redirect_to edit_admin_order_reimbursement_path(parent, @reimbursement)
+        redirect_to spree.edit_admin_order_reimbursement_path(parent, @reimbursement)
       end
     end
   end

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

@@ -48,7 +48,7 @@ module Spree
 
         params[:q][:s] ||= 'completed_at desc'
 
-        @search = Order.complete.ransack(params[:q])
+        @search = scope.complete.ransack(params[:q])
         @orders = @search.result
 
         @totals = {}
@@ -62,6 +62,10 @@ module Spree
 
       private
 
+      def scope
+        current_store.orders.accessible_by(current_ability, :index)
+      end
+
       def model_class
         Spree::Admin::ReportsController
       end