solidus_backend 2.2.2 → 2.3.0.beta1

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

@@ -24,7 +24,7 @@ module Spree
       def create
         @payment = PaymentCreate.new(@order, object_params).build
         if @payment.payment_method.source_required? && params[:card].present? && params[:card] != 'new'
-          @payment.source = @payment.payment_method.payment_source_class.find_by_id(params[:card])
+          @payment.source = @payment.payment_method.payment_source_class.find_by(id: params[:card])
         end
 
         begin
@@ -87,7 +87,7 @@ module Spree
       end
 
       def load_order
-        @order = Spree::Order.find_by_number!(params[:order_id])
+        @order = Spree::Order.find_by!(number: params[:order_id])
         authorize! action, @order
         @order
       end

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

@@ -96,22 +96,16 @@ module Spree
       end
 
       def collection
-        return @collection if @collection.present?
+        return @collection if @collection
         params[:q] ||= {}
-        params[:q][:deleted_at_null] ||= "1"
-
         params[:q][:s] ||= "name asc"
-        @collection = super
-        @collection = @collection.with_deleted if params[:q].delete(:deleted_at_null) == '0'
         # @search needs to be defined as this is passed to search_form_for
-        @search = @collection.ransack(params[:q])
+        @search = super.ransack(params[:q])
         @collection = @search.result.
-              distinct_by_product_ids(params[:q][:s]).
+              order(id: :asc).
               includes(product_includes).
               page(params[:page]).
               per(Spree::Config[:admin_products_per_page])
-
-        @collection
       end
 
       def update_before

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

@@ -5,7 +5,7 @@ class Spree::Admin::PromotionRulesController < Spree::Admin::BaseController
   before_action :validate_promotion_rule_type, only: :create
 
   def create
-    @promotion_rule = @promotion_rule_type.new(params[:promotion_rule])
+    @promotion_rule = @promotion_rule_type.new(promotion_rule_params)
     @promotion_rule.promotion = @promotion
     if @promotion_rule.save
       flash[:success] = Spree.t(:successfully_created, resource: Spree.t(:promotion_rule))
@@ -47,4 +47,8 @@ class Spree::Admin::PromotionRulesController < Spree::Admin::BaseController
       end
     end
   end
+
+  def promotion_rule_params
+    params[:promotion_rule].permit!
+  end
 end

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

@@ -35,7 +35,7 @@ module Spree
       end
 
       def collection
-        return @collection if defined?(@collection)
+        return @collection if @collection
         params[:q] ||= HashWithIndifferentAccess.new
         params[:q][:s] ||= 'id desc'
 

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

@@ -8,7 +8,7 @@ module Spree
       private
 
       def collection
-        return @collection if @collection.present?
+        return @collection if @collection
         # params[:q] can be blank upon pagination
         params[:q] = {} if params[:q].blank?
 

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

@@ -26,27 +26,7 @@ module Spree
       end
 
       def sales_total
-        params[:q] = {} unless params[:q]
-
-        if params[:q][:completed_at_gt].blank?
-          params[:q][:completed_at_gt] = Time.current.beginning_of_month
-        else
-          params[:q][:completed_at_gt] = begin
-                                           Time.zone.parse(params[:q][:completed_at_gt]).beginning_of_day
-                                         rescue
-                                           Time.current.beginning_of_month
-                                         end
-        end
-
-        if params[:q] && !params[:q][:completed_at_lt].blank?
-          params[:q][:completed_at_lt] = begin
-                                           Time.zone.parse(params[:q][:completed_at_lt]).end_of_day
-                                         rescue
-                                           ""
-                                         end
-        end
-
-        params[:q][:s] ||= "completed_at desc"
+        params[:q] = search_params
 
         @search = Order.complete.ransack(params[:q])
         @orders = @search.result
@@ -68,6 +48,29 @@ module Spree
       end
 
       @@available_reports = {}
+
+      private
+
+      def search_params
+        params.fetch(:q, {}).tap do |q|
+          q[:completed_at_gt] = adjust_start_date q[:completed_at_gt]
+          q[:completed_at_lt] = adjust_end_date(q[:completed_at_lt]) if q[:completed_at_lt].present?
+          q[:s] ||= 'completed_at desc'
+        end
+      end
+
+      def adjust_start_date(string_date = nil)
+        return Time.current.beginning_of_month if string_date.blank?
+        Time.zone.parse(string_date).beginning_of_day
+      rescue ArgumentError
+        Time.current.beginning_of_month
+      end
+
+      def adjust_end_date(string_date)
+        Time.zone.parse(string_date).end_of_day
+      rescue ArgumentError
+        ""
+      end
     end
   end
 end

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

@@ -122,10 +122,13 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
     "Spree::#{controller_name.classify}".constantize
   end
 
-  def model_name
-    parent_data[:model_name].gsub('spree/', '')
+  def parent_model_name
+    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 object_name
     controller_name.singularize
   end
@@ -161,16 +164,24 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
   def parent_data
     self.class.parent_data
   end
+  deprecate :parent_data, deprecator: Spree::Deprecation
 
   def parent
-    if parent_data.present?
-      @parent ||= parent_data[:model_class].send("find_by_#{parent_data[:find_by]}", params["#{model_name}_id"])
-      instance_variable_set("@#{model_name}", @parent)
+    if parent?
+      @parent ||= self.class.parent_data[:model_class].find_by(self.class.parent_data[:find_by] => params["#{parent_model_name}_id"])
+      instance_variable_set("@#{parent_model_name}", @parent)
+    else
+      Spree::Deprecation.warn "Calling #parent is deprecated on a ResourceController which has not defined a belongs_to"
+      nil
     end
   end
 
+  def parent?
+    self.class.parent_data.present?
+  end
+
   def find_resource
-    if parent_data.present?
+    if parent?
       parent.send(controller_name).find(params[:id])
     else
       model_class.find(params[:id])
@@ -178,7 +189,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
   end
 
   def build_resource
-    if parent_data.present?
+    if parent?
       parent.send(controller_name).build
     else
       model_class.new
@@ -186,11 +197,11 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
   end
 
   def collection
-    return parent.send(controller_name) if parent_data.present?
+    return parent.send(controller_name) if parent?
     if model_class.respond_to?(:accessible_by) && !current_ability.has_block?(params[:action], model_class)
       model_class.accessible_by(current_ability, action)
     else
-      model_class.where(nil)
+      model_class.all
     end
   end
 
@@ -205,7 +216,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
   # URL helpers
 
   def new_object_url(options = {})
-    if parent_data.present?
+    if parent?
       spree.new_polymorphic_url([:admin, parent, model_class], options)
     else
       spree.new_polymorphic_url([:admin, model_class], options)
@@ -213,7 +224,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
   end
 
   def edit_object_url(object, options = {})
-    if parent_data.present?
+    if parent?
       spree.polymorphic_url([:edit, :admin, parent, object], options)
     else
       spree.polymorphic_url([:edit, :admin, object], options)
@@ -223,7 +234,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
   def object_url(object = nil, options = {})
     target = object ? object : @object
 
-    if parent_data.present?
+    if parent?
       spree.polymorphic_url([:admin, parent, target], options)
     else
       spree.polymorphic_url([:admin, target], options)
@@ -231,7 +242,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
   end
 
   def collection_url(options = {})
-    if parent_data.present?
+    if parent?
       spree.polymorphic_url([:admin, parent, model_class], options)
     else
       spree.polymorphic_url([:admin, model_class], options)
@@ -242,7 +253,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
   #
   # Other controllers can, should, override it to set custom logic
   def permitted_resource_params
-    params[object_name].present? ? params.require(object_name).permit! : ActionController::Parameters.new
+    params[object_name].present? ? params.require(object_name).permit! : ActionController::Parameters.new.permit!
   end
 
   def collection_actions

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

@@ -15,6 +15,10 @@ module Spree
           ],
           forms: [
             'building_forms',
+            'buttons',
+            'helper_text',
+            'inputs',
+            'labels',
             'validation'
           ],
           components: [

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

@@ -96,7 +96,7 @@ module Spree
       private
 
       def collection
-        return @collection if @collection.present?
+        return @collection if @collection
         if request.xhr? && params[:q].present?
           @collection = Spree.user_class.includes(:bill_address, :ship_address)
                             .where("spree_users.email #{LIKE} :search

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

@@ -55,6 +55,11 @@ module Spree
       def redirect_on_empty_option_values
         redirect_to admin_product_variants_url(params[:product_id]) if @product.empty_option_values?
       end
+
+      def parent
+        @parent ||= Spree::Product.with_deleted.find_by(slug: params[:product_id])
+        @product = @parent
+      end
     end
   end
 end

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

@@ -79,6 +79,7 @@ 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)
       end
 
@@ -102,7 +103,7 @@ module Spree
         url = options[:url] || object_url(resource)
         name = options[:name] || Spree.t('actions.delete')
         confirm = options[:confirm] || Spree.t(:are_you_sure)
-        options[:class] = "delete-resource"
+        options[:class] = "#{options[:class]} delete-resource".strip
         options[:data] = { confirm: confirm, action: 'remove' }
         link_to_with_icon 'trash', name, url, options
       end
@@ -116,10 +117,13 @@ module Spree
         link_to(text, url, options)
       end
 
-      def icon(icon_name)
+      def solidus_icon(icon_name)
         icon_name ? content_tag(:i, '', class: icon_name) : ''
       end
 
+      alias_method :icon, :solidus_icon
+      deprecate icon: :solidus_icon, deprecator: Spree::Deprecation
+
       def button(text, icon_name = nil, button_type = 'submit', options = {})
         class_names = "button"
         if icon_name

data/app/helpers/spree/promotion_rules_helper.rb

@@ -2,8 +2,8 @@ module Spree
   module PromotionRulesHelper
     def options_for_promotion_rule_types(promotion)
       existing = promotion.rules.map { |rule| rule.class.name }
-      rule_names = Rails.application.config.spree.promotions.rules.map(&:name).reject{ |r| existing.include? r }
-      options = rule_names.map { |name| [Spree.t("promotion_rule_types.#{name.demodulize.underscore}.name"), name] }
+      rules = Rails.application.config.spree.promotions.rules.reject { |r| existing.include? r.name }
+      options = rules.map { |rule| [rule.model_name.human, rule.name] }
       options_for_select(options)
     end
   end

data/app/models/spree/backend_configuration.rb

@@ -98,6 +98,7 @@ module Spree
         MenuItem.new(
           PROMOTION_TABS,
           'bullhorn',
+          partial: 'spree/admin/shared/promotion_sub_menu',
           condition: -> { can?(:admin, Spree::Promotion) },
           url: :admin_promotions_path
         ),

data/app/views/spree/admin/adjustments/_form.html.erb

@@ -20,7 +20,7 @@
     <div class="col-3">
       <%= f.field_container :label do %>
         <%= f.label :adjustment_reason_id %><br/>
-        <%= f.collection_select(:adjustment_reason_id, reasons_for(@adjustment), :id, :name, {include_blank: true}, {"data-placeholder" => Spree.t(:select_a_reason), class: 'select2 fullwidth'}) %>
+        <%= f.collection_select(:adjustment_reason_id, reasons_for(@adjustment), :id, :name, {include_blank: true}, {"data-placeholder" => Spree.t(:select_a_reason), class: 'custom-select fullwidth'}) %>
       <% end %>
     </div>
 

data/app/views/spree/admin/customer_returns/_return_item_selection.html.erb

@@ -47,10 +47,10 @@
           <%= item_fields.check_box :resellable, { checked: return_item.resellable } %>
         </td>
         <td class="align-center">
-          <%= item_fields.select :reception_status_event, return_item.potential_reception_transitions, {include_blank: true}, {class: 'add-item select2 fullwidth'} %>
+          <%= item_fields.select :reception_status_event, return_item.potential_reception_transitions, {include_blank: true}, {class: 'add-item custom-select fullwidth'} %>
         </td>
         <td class="align-center">
-          <%= item_fields.select :return_reason_id, @reasons.collect{|r|[r.name, r.id]}, {include_blank: true}, {class: 'select2 fullwidth'} %>
+          <%= item_fields.select :return_reason_id, @reasons.collect{|r|[r.name, r.id]}, {include_blank: true}, {class: 'custom-select fullwidth'} %>
         </td>
       </tr>
     <% end %>

data/app/views/spree/admin/customer_returns/new.html.erb

@@ -33,7 +33,7 @@
 
         <%= f.field_container :stock_location do %>
           <%= f.label :stock_location_id, Spree::StockLocation.model_name.human %>
-          <%= f.select :stock_location_id, Spree::StockLocation.order_default.to_a.collect{|l|[l.name.humanize, l.id]}, {include_blank: true}, {class: 'select2 fullwidth', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
+          <%= f.select :stock_location_id, Spree::StockLocation.order_default.to_a.collect{|l|[l.name, l.id]}, {include_blank: true}, {class: 'custom-select fullwidth', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
           <%= f.error_message_on :stock_location_id %>
         <% end %>
 

data/app/views/spree/admin/images/_form.html.erb

@@ -7,7 +7,7 @@
       </div>
       <div data-hook="variant" class="field">
         <%= f.label :viewable_id, Spree::Variant.model_name.human %><br>
-        <%= f.select :viewable_id, @variants, {}, { class: 'select2 fullwidth' } %>
+        <%= f.select :viewable_id, @variants, {}, { class: 'custom-select fullwidth' } %>
       </div>
     </div>
     <div data-hook="alt_text" class="field col-4">

data/app/views/spree/admin/images/_image_row.html.erb

@@ -1,22 +1,40 @@
 <tr id="<%= spree_dom_id image %>" data-hook="images_row" class="<%= cycle('odd', 'even')%>">
+
   <td class="no-border">
     <% if can?(:update_positions, Spree::Image) %>
       <span class="handle"></span>
     <% end %>
   </td>
+
   <td>
     <%= link_to image.attachment.url(:product) do %>
       <%= render 'spree/admin/shared/image', image: image, size: :mini %>
     <% end %>
   </td>
+
   <% if @product.has_variants? %>
-    <td><%= options_text_for(image) %></td>
-  <% end %>
-  <td><%= image.alt %></td>
+    <td>
+      <%= fields_for image do |f| %>
+        <%= f.select :viewable_id, options_for_select(@variants, image.viewable_id), {}, class: 'select2 fullwidth', autocomplete: "off" %>
+      <% end %>
+    </td>
+  <% end # @product.has_variants? %>
+
+  <td>
+    <%= fields_for image do |f| %>
+      <%= f.text_field :alt %>
+    <% end %>
+  </td>
+
   <td class="actions">
     <% if can?(:update, image) %>
-      <%= link_to_with_icon 'edit', Spree.t('actions.edit'), edit_admin_product_image_url(@product, image), no_text: true, data: {action: 'edit'} %>
+      <%= link_to_with_icon 'check', Spree.t('actions.save'), api_variant_image_path(@product, image), no_text: true, data: {action: 'save'} %>
+
+      <%= link_to_with_icon 'cancel', Spree.t('actions.cancel'), nil, no_text: true, data: {action: 'cancel'} %>
+
+      <%= link_to_with_icon 'edit', Spree.t('actions.edit'), edit_admin_product_image_path(@product, image), no_text: true, data: {action: 'edit'} %>
     <% end %>
+
     <% if can?(:destroy, image) %>
       <%= link_to_delete image, { url: admin_product_image_url(@product, image), no_text: true } %>
     <% end %>

data/app/views/spree/admin/images/create.js.erb

@@ -1,9 +1,12 @@
-var uploadedRow = $('[data-upload-id="<%= params[:upload_id] %>"]');
+var $uploadEl = $('[data-upload-id="<%= params[:upload_id] %>"]');
 
 <% if @image.persisted? %>
-  uploadedRow.trigger('clear');
-  $('#images-table').removeClass('hidden').find('tbody').append('<%= j render partial: "image_row", locals: {image: @image } %>');
-  $('.no-objects-found').hide();
+
+  $uploadEl.trigger('clear');
+  Spree.Views.Tables.EditableTable.append('<%= j render "image_row", image: @image %>');
+
 <% else %>
-  uploadedRow.find('error').removeClass('hidden').html('<%= j @image.errors.full_messages.join("<br>").html_safe %>');
+
+  $uploadEl.find('error').removeClass('hidden').html('<%= j @image.errors.full_messages.join("<br>").html_safe %>');
+
 <% end %>