solidus_backend 2.4.2 → 2.5.0.beta1

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

@@ -5,6 +5,10 @@ module Spree
 
       helper 'spree/promotion_rules'
 
+      def show
+        redirect_to action: :edit
+      end
+
       def create
         @promotion = Spree::Promotion.new(permitted_resource_params)
         @promotion.codes.new(value: params[:single_code]) if params[:single_code].present?
@@ -15,7 +19,7 @@ module Spree
 
         if @promotion.save
           @promotion_code_batch.process if @promotion_code_batch
-          flash[:success] = Spree.t(:promotion_successfully_created)
+          flash[:success] = t('spree.promotion_successfully_created')
           redirect_to location_after_save
         else
           flash[:error] = @promotion.errors.full_messages.join(", ")

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

@@ -12,7 +12,7 @@ module Spree
           if report_description_key.nil?
             report_description_key = "#{report_key}_description"
           end
-          @@available_reports[report_key] = { name: Spree.t(report_key), description: Spree.t(report_description_key) }
+          @@available_reports[report_key] = { name: I18n.t(report_key, scope: 'spree'), description: I18n.t(report_description_key, scope: 'spree') }
         end
       end
 
@@ -28,7 +28,7 @@ module Spree
       def sales_total
         params[:q] = search_params
 
-        @search = Order.complete.ransack(params[:q])
+        @search = Order.complete.not_canceled.ransack(params[:q])
         @orders = @search.result
 
         @totals = {}

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

@@ -79,13 +79,23 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
     end
 
     respond_to do |format|
-      format.js { render plain: 'Ok' }
+      format.js { head :no_content }
     end
   end
 
   def destroy
     invoke_callbacks(:destroy, :before)
-    if @object.destroy
+
+    destroy_result =
+      if @object.respond_to?(:discard)
+        @object.discard
+      elsif @object.respond_to?(:paranoia_destroy)
+        @object.paranoia_destroy
+      else
+        @object.destroy
+      end
+
+    if destroy_result
       invoke_callbacks(:destroy, :after)
       flash[:success] = flash_message_for(@object, :successfully_removed)
       respond_with(@object) do |format|
@@ -126,8 +136,10 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
     self.class.parent_data[:model_name].gsub('spree/', '')
   end
 
-  alias_method :model_name, :parent_model_name
-  deprecate model_name: :parent_model_name, deprecator: Spree::Deprecation
+  def model_name
+    Spree::Deprecation.warn('model_name is deprecated. Please use parent_model_name instead.', caller)
+    parent_model_name
+  end
 
   def object_name
     controller_name.singularize
@@ -162,9 +174,9 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
   end
 
   def parent_data
+    Spree::Deprecation.warn('parent_data is deprecated without replacement.', caller)
     self.class.parent_data
   end
-  deprecate :parent_data, deprecator: Spree::Deprecation
 
   def parent
     if parent?

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

@@ -9,8 +9,8 @@ module Spree
 
       def fire
         @return_authorization.send("#{params[:e]}!")
-        flash[:success] = Spree.t(:return_authorization_updated)
-        redirect_back(fallback_location: admin_order_return_authorization(@order))
+        redirect_back(fallback_location: admin_order_return_authorizations_path(@order),
+                    flash: { success: t('spree.return_authorization_updated') })
       end
 
       private

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

@@ -6,7 +6,7 @@ module Spree
       before_action :set_zones, only: [:create, :update]
 
       def destroy
-        @object.destroy
+        @object.discard
 
         flash[:success] = flash_message_for(@object, :successfully_removed)
 

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

@@ -9,7 +9,7 @@ module Spree
         @stock_location.country = Spree::Country.default
 
       rescue ActiveRecord::RecordNotFound
-        flash[:error] = Spree.t(:stock_locations_need_a_default_country)
+        flash[:error] = t('spree.stock_locations_need_a_default_country')
         redirect_to(admin_stock_locations_path) && return
       end
     end

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

@@ -25,7 +25,7 @@ module Spree
           redirect_to admin_user_store_credits_path(@user)
         else
           load_categories
-          flash[:error] = "#{Spree.t('admin.store_credits.unable_to_create')} #{@store_credit.errors.full_messages}"
+          flash[:error] = "#{t('spree.admin.store_credits.unable_to_create')} #{@store_credit.errors.full_messages}"
           render :new
         end
       end
@@ -40,7 +40,7 @@ module Spree
           end
         else
           respond_to do |format|
-            format.json { render json: { message: "#{Spree.t('admin.store_credits.unable_to_update')} #{@store_credit.errors.full_messages}" }, status: :bad_request }
+            format.json { render json: { message: "#{t('spree.admin.store_credits.unable_to_update')} #{@store_credit.errors.full_messages}" }, status: :bad_request }
           end
         end
       end
@@ -87,7 +87,7 @@ module Spree
       def ensure_update_reason
         @update_reason = Spree::StoreCreditUpdateReason.find_by(id: params[:update_reason_id])
         unless @update_reason
-          @store_credit.errors.add(:base, Spree.t("admin.store_credits.errors.update_reason_required"))
+          @store_credit.errors.add(:base, t('spree.admin.store_credits.errors.update_reason_required'))
           render_edit_page
         end
       end
@@ -102,7 +102,7 @@ module Spree
         end
 
         load_update_reasons
-        flash[:error] = "#{Spree.t("admin.store_credits.unable_to_#{translation_key}")}: #{@store_credit.errors.full_messages.join(', ')}"
+        flash[:error] = "#{t("spree.admin.store_credits.unable_to_#{translation_key}")}: #{@store_credit.errors.full_messages.join(', ')}"
         render(template) && return
       end
 

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

@@ -22,7 +22,7 @@ module Spree
             format.json { render json: @taxon.to_json }
           end
         else
-          flash[:error] = Spree.t('errors.messages.could_not_create_taxon')
+          flash[:error] = t('spree.errors.messages.could_not_create_taxon')
           respond_with(@taxon) do |format|
             format.html { redirect_to @taxonomy ? edit_admin_taxonomy_url(@taxonomy) : admin_taxonomies_url }
           end

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

@@ -24,7 +24,7 @@ module Spree
           set_roles
           set_stock_locations
 
-          flash[:success] = Spree.t(:created_successfully)
+          flash[:success] = t('spree.created_successfully')
           redirect_to edit_admin_user_url(@user)
         else
           load_roles
@@ -40,7 +40,7 @@ module Spree
           set_roles
           set_stock_locations
 
-          flash[:success] = Spree.t(:account_updated)
+          flash[:success] = t('spree.account_updated')
           redirect_to edit_admin_user_url(@user)
         else
           load_roles
@@ -54,7 +54,7 @@ module Spree
       def addresses
         if request.put?
           if @user.update_attributes(user_params)
-            flash.now[:success] = Spree.t(:account_updated)
+            flash.now[:success] = t('spree.account_updated')
           end
 
           render :addresses
@@ -78,14 +78,14 @@ module Spree
 
       def generate_api_key
         if @user.generate_spree_api_key!
-          flash[:success] = Spree.t('api.key_generated')
+          flash[:success] = t('spree.api.key_generated')
         end
         redirect_to edit_admin_user_path(@user)
       end
 
       def clear_api_key
         if @user.clear_spree_api_key!
-          flash[:success] = Spree.t('api.key_cleared')
+          flash[:success] = t('spree.api.key_cleared')
         end
         redirect_to edit_admin_user_path(@user)
       end
@@ -132,7 +132,7 @@ module Spree
       # handling raise from Spree::Admin::ResourceController#destroy
       def user_destroy_with_orders_error
         invoke_callbacks(:destroy, :fails)
-        render status: :forbidden, text: Spree.t(:error_user_destroy_with_orders)
+        render status: :forbidden, text: t('spree.error_user_destroy_with_orders')
       end
 
       def sign_in_if_change_own_password

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

@@ -8,22 +8,6 @@ module Spree
       before_action :redirect_on_empty_option_values, only: [:new]
       before_action :load_data, only: [:new, :create, :edit, :update]
 
-      # override the destroy method to set deleted_at value
-      # instead of actually deleting the product.
-      def destroy
-        @variant = Spree::Variant.find(params[:id])
-        if @variant.destroy
-          flash[:success] = Spree.t('notice_messages.variant_deleted')
-        else
-          flash[:success] = Spree.t('notice_messages.variant_not_deleted')
-        end
-
-        respond_with(@variant) do |format|
-          format.html { redirect_to admin_product_variants_url(params[:product_id]) }
-          format.js { render_js_for_destroy }
-        end
-      end
-
       private
 
       def new_before

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

@@ -30,14 +30,14 @@ module Spree
 
       def display_shipment(shipment)
         parts = [
-          "#{Spree.t(:shipment)} ##{shipment.number}",
+          "#{t('spree.shipment')} ##{shipment.number}",
           shipment.display_cost
         ]
         safe_join(parts, "<br />".html_safe)
       end
 
       def display_order(_order)
-        Spree.t(:order)
+        t('spree.order')
       end
     end
   end

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

@@ -30,7 +30,7 @@ module Spree
 
       def datepicker_field_value(date)
         unless date.blank?
-          l(date, format: Spree.t('date_picker.format', default: '%Y/%m/%d'))
+          l(date, format: t('spree.date_picker.format', default: '%Y/%m/%d'))
         end
       end
 
@@ -90,21 +90,21 @@ module Spree
       # @deprecated Please render each preference keys partial instead. Example:
       # <% @object.preferences.keys.each do |key| %>
       #   <%= render "spree/admin/shared/preference_fields/#{@object.preference_type(key)}",
-      #     form: f, attribute: "preferred_#{key}", label: Spree.t(key) %>
+      #     form: f, attribute: "preferred_#{key}", label: t(key, scope: 'spree') %>
       # <% end %>
       def preference_fields(object, form)
         return unless object.respond_to?(:preferences)
         capture do
           object.preferences.keys.each do |key|
             concat render("spree/admin/shared/preference_fields/#{object.preference_type(key)}",
-              form: form, attribute: "preferred_#{key}", label: Spree.t(key))
+              form: form, attribute: "preferred_#{key}", label: t(key, scope: 'spree'))
           end
         end
       end
       deprecate preference_fields: "Please render each preference key's partial instead. Example: \n" \
         "<% @object.preferences.keys.each do |key| %>\n" \
           "<%= render \"spree/admin/shared/preference_fields/\#{@object.preference_type(key)}\", \n" \
-             "form: f, attribute: \"preferred_\#{key}\", label: Spree.t(key) %>\n" \
+             "form: f, attribute: \"preferred_\#{key}\", label: t(key, scope: 'spree') %>\n" \
         "<% end %>", deprecator: Spree::Deprecation
 
       def link_to_add_fields(name, target, options = {})
@@ -119,7 +119,7 @@ module Spree
         options[:class] = '' unless options[:class]
         options[:class] += 'no-text with-tip' if options[:no_text]
         url = f.object.persisted? ? [:admin, f.object] : '#'
-        link_to_with_icon('trash', name, url, class: "spree_remove_fields #{options[:class]}", data: { action: 'remove' }, title: Spree.t('actions.remove')) + f.hidden_field(:_destroy)
+        link_to_with_icon('trash', name, url, class: "spree_remove_fields #{options[:class]}", data: { action: 'remove' }, title: t('spree.actions.remove')) + f.hidden_field(:_destroy)
       end
 
       def spree_dom_id(record)
@@ -130,12 +130,6 @@ module Spree
         @admin_layout = layout if layout
         @admin_layout
       end
-
-      private
-
-      def attribute_name_for(field_name)
-        field_name.tr(' ', '_').downcase
-      end
     end
   end
 end

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

@@ -32,7 +32,7 @@ module Spree
         elsif admin_breadcrumbs.any?
           admin_breadcrumbs.map{ |x| strip_tags(x) }.reverse.join(' - ')
         else
-          Spree.t(controller.controller_name, default: controller.controller_name.titleize)
+          t(controller.controller_name, default: controller.controller_name.titleize, scope: 'spree')
         end
       end
 
@@ -50,7 +50,7 @@ module Spree
         options[:route] ||= "admin_#{args.first}"
 
         destination_url = options[:url] || spree.send("#{options[:route]}_path")
-        label = Spree.t(options[:label], scope: [:admin, :tab])
+        label = t(options[:label], scope: [:spree, :admin, :tab])
 
         css_classes = []
 
@@ -80,29 +80,29 @@ module Spree
       def link_to_clone(resource, options = {})
         options[:data] = { action: 'clone' }
         options[:method] = :post
-        link_to_with_icon('copy', Spree.t(:clone), clone_object_url(resource), options)
+        link_to_with_icon('copy', t('spree.clone'), clone_object_url(resource), options)
       end
 
       def link_to_new(resource)
         options[:data] = { action: 'new' }
-        link_to_with_icon('plus', Spree.t(:new), edit_object_url(resource))
+        link_to_with_icon('plus', t('spree.new'), edit_object_url(resource))
       end
 
       def link_to_edit(resource, options = {})
         url = options[:url] || edit_object_url(resource)
         options[:data] = { action: 'edit' }
-        link_to_with_icon('edit', Spree.t('actions.edit'), url, options)
+        link_to_with_icon('edit', t('spree.actions.edit'), url, options)
       end
 
       def link_to_edit_url(url, options = {})
         options[:data] = { action: 'edit' }
-        link_to_with_icon('edit', Spree.t('actions.edit'), url, options)
+        link_to_with_icon('edit', t('spree.actions.edit'), url, options)
       end
 
       def link_to_delete(resource, options = {})
         url = options[:url] || object_url(resource)
-        name = options[:name] || Spree.t('actions.delete')
-        confirm = options[:confirm] || Spree.t(:are_you_sure)
+        name = options[:name] || t('spree.actions.delete')
+        confirm = options[:confirm] || t('spree.are_you_sure')
         options[:class] = "#{options[:class]} delete-resource".strip
         options[:data] = { confirm: confirm, action: 'remove' }
         link_to_with_icon 'trash', name, url, options

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

@@ -6,9 +6,9 @@ module Spree
         links = []
         @order_events.sort.each do |event|
           next unless @order.send("can_#{event}?")
-          links << button_link_to(Spree.t(event), [event, :admin, @order],
+          links << button_link_to(t(event, scope: 'spree'), [event, :admin, @order],
                                   method: :put,
-                                  data: { confirm: Spree.t(:order_sure_want_to, event: Spree.t(event)) })
+                                  data: { confirm: t('spree.order_sure_want_to', event: t(event, scope: 'spree')) })
         end
         safe_join(links, '&nbsp;'.html_safe)
       end

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

@@ -1,30 +1,6 @@
 module Spree
   module Admin
     module ProductsHelper
-      def taxon_options_for(product)
-        options = @taxons.map do |taxon|
-          selected = product.taxons.include?(taxon)
-          content_tag(:option,
-                      value: taxon.id,
-                      selected: ('selected' if selected)) do
-                        (taxon.ancestors.pluck(:name) + [taxon.name]).join(" -> ")
-                      end
-        end
-        safe_join(options)
-      end
-
-      def option_types_options_for(product)
-        @option_types.map do |option_type|
-          selected = product.option_types.include?(option_type)
-          content_tag(:option,
-                      value: option_type.id,
-                      selected: ('selected' if selected)) do
-            option_type.name
-          end
-        end
-        safe_join(options)
-      end
-
       def show_rebuild_vat_checkbox?
         Spree::TaxRate.included_in_price.exists?
       end

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

@@ -16,7 +16,7 @@ module Spree::Admin::StoreCreditEventsHelper
   def store_credit_event_admin_action_name(store_credit_event)
     if Spree::StoreCreditEvent::NON_EXPOSED_ACTIONS.include?(store_credit_event.action) ||
        store_credit_event.action == Spree::StoreCredit::VOID_ACTION
-      Spree.t("store_credit.display_action.admin.#{store_credit_event.action}")
+      t("spree.store_credit.display_action.admin.#{store_credit_event.action}")
     else
       store_credit_event.display_action
     end
@@ -40,28 +40,28 @@ module Spree::Admin::StoreCreditEventsHelper
     case link_options[:href_type]
     when :user
       link_to(
-        Spree.t(link_options[:translation_key], { email: originator.email }),
+        t(link_options[:translation_key], email: originator.email, scope: 'spree'),
         spree.edit_admin_user_path(originator),
         options
       )
     when :line_item
       order = originator.line_item.order
       link_to(
-        Spree.t(link_options[:translation_key], { order_number: order.number }),
+        t(link_options[:translation_key], order_number: order.number, scope: 'spree'),
         spree.edit_admin_order_path(order),
         options
       )
     when :payment
       order = originator.order
       link_to(
-        Spree.t(link_options[:translation_key], { order_number: order.number }),
+        t(link_options[:translation_key], order_number: order.number, scope: 'spree'),
         spree.admin_order_payment_path(order, originator),
         options
       )
     when :payments
       order = originator.payment.order
       link_to(
-        Spree.t(link_options[:translation_key], { order_number: order.number }),
+        t(link_options[:translation_key], order_number: order.number, scope: 'spree'),
         spree.admin_order_payments_path(order),
         options
       )