solidus_backend 1.1.4 → 1.2.0.beta1

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

@@ -2,7 +2,7 @@ module Spree
   module Admin
     class OrdersController < Spree::Admin::BaseController
       before_action :initialize_order_events
-      before_action :load_order, only: [:edit, :update, :complete, :advance, :cancel, :resume, :approve, :resend, :open_adjustments, :close_adjustments, :cart, :confirm]
+      before_action :load_order, only: [:edit, :update, :complete, :advance, :cancel, :resume, :approve, :resend, :unfinalize_adjustments, :finalize_adjustments, :cart, :confirm]
       around_filter :lock_order, :only => [:update, :advance, :complete, :confirm, :cancel, :resume, :approve, :resend]
 
       rescue_from Spree::Order::InsufficientStock, with: :insufficient_stock_error
@@ -39,7 +39,7 @@ module Spree
 
         @search = Order.accessible_by(current_ability, :index).ransack(params[:q])
 
-        # lazyoading other models here (via includes) may result in an invalid query
+        # 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 = if query_present
@@ -151,18 +151,18 @@ module Spree
         redirect_to :back
       end
 
-      def open_adjustments
+      def unfinalize_adjustments
         adjustments = @order.all_adjustments.finalized
         adjustments.each(&:unfinalize!)
-        flash[:success] = Spree.t(:all_adjustments_opened)
+        flash[:success] = Spree.t(:all_adjustments_unfinalized)
 
         respond_with(@order) { |format| format.html { redirect_to :back } }
       end
 
-      def close_adjustments
+      def finalize_adjustments
         adjustments = @order.all_adjustments.not_finalized
         adjustments.each(&:finalize!)
-        flash[:success] = Spree.t(:all_adjustments_closed)
+        flash[:success] = Spree.t(:all_adjustments_finalized)
 
         respond_with(@order) { |format| format.html { redirect_to :back } }
       end

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

@@ -27,7 +27,7 @@ module Spree
         if @payment_method['type'].to_s != payment_method_type
           @payment_method.update_columns(
             type: payment_method_type,
-            updated_at: Time.now,
+            updated_at: Time.current,
           )
           @payment_method = PaymentMethod.find(params[:id])
         end

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

@@ -20,7 +20,7 @@ module Spree
       end
 
       def create
-        @payment ||= @order.payments.build(object_params)
+        @payment = PaymentCreate.new(@order, object_params).build
         if @payment.payment_method.source_required? && params[:card].present? and params[:card] != 'new'
           @payment.source = @payment.payment_method.payment_source_class.find_by_id(params[:card])
         end

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

@@ -9,7 +9,6 @@ module Spree
       helper_method :clone_object_url
 
       def show
-        session[:return_to] ||= request.referer
         redirect_to action: :edit
       end
 

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

@@ -29,9 +29,9 @@ module Spree
         params[:q] = {} unless params[:q]
 
         if params[:q][:completed_at_gt].blank?
-          params[:q][:completed_at_gt] = Time.zone.now.beginning_of_month
+          params[:q][:completed_at_gt] = Time.current.beginning_of_month
         else
-          params[:q][:completed_at_gt] = Time.zone.parse(params[:q][:completed_at_gt]).beginning_of_day rescue Time.zone.now.beginning_of_month
+          params[:q][:completed_at_gt] = Time.zone.parse(params[:q][:completed_at_gt]).beginning_of_day rescue Time.current.beginning_of_month
         end
 
         if params[:q] && !params[:q][:completed_at_lt].blank?

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

@@ -9,26 +9,28 @@ module Spree
       # And then JSON building with something like Active Model Serializers
       def users
         if params[:ids]
-          @users = Spree.user_class.where(:id => params[:ids].split(','))
+          # split here may be String#split or Array#split, so we must flatten the results
+          @users = Spree.user_class.where(id: params[:ids].split(',').flatten)
         else
           @users = Spree.user_class.ransack({
-            :m => 'or',
-            :email_start => params[:q],
-            :addresses_firstname_start => params[:q],
-            :addresses_lastname_start => params[:q]
+            m: 'or',
+            email_start: params[:q],
+            addresses_firstname_start: params[:q],
+            addresses_lastname_start: params[:q]
           }).result.limit(10)
         end
       end
 
       def products
         if params[:ids]
-          @products = Product.where(:id => params[:ids].split(","))
+          # split here may be String#split or Array#split, so we must flatten the results
+          @products = Product.where(id: params[:ids].split(",").flatten)
         else
           @products = Product.ransack(params[:q]).result
         end
 
         @products = @products.distinct.page(params[:page]).per(params[:per_page])
-        expires_in 15.minutes, :public => true
+        expires_in 15.minutes, public: true
         headers['Surrogate-Control'] = "max-age=#{15.minutes}"
       end
     end

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

@@ -7,7 +7,7 @@ module Spree
         { translation_key: :name, attr_name: :name }
       ]
 
-      before_filter :load_transferable_stock_locations, only: :index
+      before_filter :load_viewable_stock_locations, only: :index
       before_filter :load_variant_display_attributes, only: [:receive, :edit, :show, :tracking_info]
       before_filter :load_source_stock_locations, only: :new
       before_filter :load_destination_stock_locations, only: :edit
@@ -43,7 +43,7 @@ module Spree
 
       def ship
         if @stock_transfer.transfer
-          @stock_transfer.ship(shipped_at: DateTime.now)
+          @stock_transfer.ship(shipped_at: DateTime.current)
           flash[:success] = Spree.t(:stock_transfer_complete)
           redirect_to admin_stock_transfers_path
         else
@@ -100,16 +100,16 @@ module Spree
         authorize! :create, duplicate
       end
 
-      def load_transferable_stock_locations
-        @stock_locations = accessible_source_stock_locations | accessible_destination_stock_locations
+      def load_viewable_stock_locations
+        @stock_locations = Spree::StockLocation.accessible_by(current_ability, :read)
       end
 
       def load_source_stock_locations
-        @source_stock_locations = accessible_source_stock_locations
+        @source_stock_locations ||= Spree::StockLocation.accessible_by(current_ability, :transfer_from)
       end
 
       def load_destination_stock_locations
-        @destination_stock_locations = accessible_destination_stock_locations.where.not(id: @stock_transfer.source_location_id)
+        @destination_stock_locations ||= Spree::StockLocation.accessible_by(current_ability, :transfer_to).where.not(id: @stock_transfer.source_location_id)
       end
 
       def load_variant_display_attributes
@@ -142,14 +142,6 @@ module Spree
           @stock_transfer.destination_location.move(transfer_item.variant, transfer_item.received_quantity, @stock_transfer)
         end
       end
-
-      def accessible_source_stock_locations
-        @source_locations ||= Spree::StockLocation.accessible_by(current_ability, :transfer_from)
-      end
-
-      def accessible_destination_stock_locations
-        @destination_locations ||= Spree::StockLocation.accessible_by(current_ability, :transfer_to)
-      end
     end
   end
 end

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

@@ -0,0 +1,33 @@
+module Spree
+  module Admin
+    class StyleGuideController < Spree::Admin::BaseController
+      respond_to :html
+      layout '/spree/layouts/admin_style_guide'
+
+      def index
+        @topics = {
+          typography: [
+            'fonts',
+            'colors',
+            'lists',
+            'icons',
+            'tags'
+          ],
+          forms: [
+            'building_forms',
+            'validation'
+          ],
+          messaging: [
+            'loading',
+            'flashes',
+            'tooltips'
+          ],
+          tables: [
+            'building_tables',
+            'pagination'
+          ]
+        }
+      end
+    end
+  end
+end

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

@@ -26,15 +26,11 @@ module Spree
         parts << variant.product.name
         parts << "(#{variant.options_text})" if variant.options_text.present?
         parts << line_item.display_total
-        safe_join(parts, "<br />".html_safe)
+        parts.join("<br>").html_safe
       end
 
       def display_shipment(shipment)
-        parts = [
-          "#{Spree.t(:shipment)} ##{shipment.number}",
-          shipment.display_cost
-        ]
-        safe_join(parts, "<br />".html_safe)
+        "#{Spree.t(:shipment)} ##{shipment.number}<br>#{shipment.display_cost}".html_safe
       end
 
       def display_order(order)

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

@@ -15,8 +15,8 @@ module Spree
         obj = object.respond_to?(:errors) ? object : instance_variable_get("@#{object}")
 
         if obj && obj.errors[method].present?
-          errors = safe_join(obj.errors[method], "<br />".html_safe)
-          content_tag(:span, errors, class: 'formError')
+          errors = obj.errors[method].map { |err| h(err) }.join('<br />').html_safe
+          content_tag(:span, errors, :class => 'formError')
         else
           ''
         end
@@ -132,11 +132,12 @@ module Spree
 
       def preference_fields(object, form)
         return unless object.respond_to?(:preferences)
-        fields = object.preferences.keys.map { |key|
+        object.preferences.keys.map{ |key|
+
           form.label("preferred_#{key}", Spree.t(key) + ": ") +
-            preference_field_for(form, "preferred_#{key}", type: object.preference_type(key))
-        }
-        safe_join(fields, "<br />".html_safe)
+            preference_field_for(form, "preferred_#{key}", :type => object.preference_type(key))
+
+        }.join("<br />").html_safe
       end
 
       def link_to_add_fields(name, target, options = {})

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

@@ -6,7 +6,7 @@ module Spree
       #   * :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.
-      def tab(*args)
+      def tab(*args, &block)
         options = {:label => args.first.to_s}
 
         if args.last.is_a?(Hash)
@@ -38,7 +38,7 @@ module Spree
         if options[:css_class]
           css_classes << options[:css_class]
         end
-        content_tag('li', link, :class => css_classes.join(' '))
+        content_tag('li', link + (yield if block_given?), class: css_classes.join(' ') )
       end
 
       def link_to_clone(resource, options={})
@@ -74,7 +74,7 @@ module Spree
         options[:class] = (options[:class].to_s + " fa fa-#{icon_name} icon_link with-tip").strip
         options[:class] += ' no-text' if options[:no_text]
         options[:title] = text if options[:no_text]
-        text = options[:no_text] ? '' : content_tag(:span, text, class: 'text')
+        text = options[:no_text] ? '' : raw("<span class='text'>#{text}</span>")
         options.delete(:no_text)
         link_to(text, url, options)
       end
@@ -88,6 +88,7 @@ module Spree
       end
 
       def button_link_to(text, url, html_options = {})
+        html_options = {class: ''}.merge(html_options)
         if (html_options[:method] &&
             html_options[:method].to_s.downcase != 'get' &&
             !html_options[:remote])
@@ -102,15 +103,21 @@ module Spree
 
           html_options.delete('data-update') unless html_options['data-update']
 
-          html_options[:class] = 'button'
+          html_options[:class] += ' button'
 
           if html_options[:icon]
             html_options[:class] += " fa fa-#{html_options[:icon]}"
           end
-          link_to(text, url, html_options)
+          link_to(text_for_button_link(text, html_options), url, html_options)
         end
       end
 
+      def text_for_button_link(text, html_options)
+        s = ''
+        s << text
+        raw(s)
+      end
+
       def configurations_menu_item(link_text, url, description = '')
         %(<tr>
           <td>#{link_to(link_text, url)}</td>

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

@@ -12,7 +12,7 @@ module Spree
                                     :data => { :confirm => Spree.t(:order_sure_want_to, :event => Spree.t(event)) })
           end
         end
-        safe_join(links, ' '.html_safe)
+        links.join(' ').html_safe
       end
 
       def line_item_shipment_price(line_item, quantity)

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

@@ -9,8 +9,7 @@ module Spree
                       :selected => ('selected' if selected)) do
             (taxon.ancestors.pluck(:name) + [taxon.name]).join(" -> ")
           end
-        end
-        safe_join(options)
+        end.join("").html_safe
       end
 
       def option_types_options_for(product)
@@ -21,8 +20,7 @@ module Spree
                       :selected => ('selected' if selected)) do
             option_type.name
           end
-        end
-        safe_join(options)
+        end.join("").html_safe
       end
     end
   end

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

@@ -15,9 +15,9 @@ module Spree
 
       def display_variant(stock_movement)
         variant = stock_movement.stock_item.variant
-        output = [variant.name]
-        output << variant.options_text unless variant.options_text.blank?
-        safe_join(output, "<br />".html_safe)
+        output = variant.name
+        output += "<br>(#{variant.options_text})" unless variant.options_text.blank?
+        output.html_safe
       end
     end
   end

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

@@ -14,10 +14,10 @@
       <td class="align-center" colspan='4'>
         <% if can? :update, Spree::Adjustment %>
           <div>
-            <%= button_to Spree.t(:open_all_adjustments), open_adjustments_admin_order_path(@order), method: :get %>
+            <%= button_to Spree.t(:unfinalize_all_adjustments), adjustments_unfinalize_admin_order_path(@order), method: :get %>
           </div>
           <div>
-            <%= button_to Spree.t(:close_all_adjustments), close_adjustments_admin_order_path(@order), method: :get %>
+            <%= button_to Spree.t(:finalize_all_adjustments), adjustments_finalize_admin_order_path(@order), method: :get %>
           </div>
         <% end %>
       </td>

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

@@ -1,4 +1,4 @@
-<table class="index">
+<table class="index customer-return-reimbursements">
   <thead data-hook="customer_return_header">
     <tr>
       <th><%= Spree.t(:number) %></th>

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

@@ -19,7 +19,7 @@
       <% return_item = item_fields.object %>
 
       <tr>
-        <td class="align-center" class="inventory-unit-checkbox">
+        <td class="align-center inventory-unit-checkbox">
           <div style="display:none">
             <%= item_fields.hidden_field :inventory_unit_id %>
             <%= item_fields.hidden_field :return_authorization_id %>

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

@@ -16,7 +16,7 @@
 <% end %>
 
 <% if @pending_return_items.any? %>
-  <fieldset data-hook="accepted_return_items" class="no-border-bottom">
+  <fieldset data-hook="pending_return_items" class="no-border-bottom">
     <legend align="center"><%= Spree.t(:pending) %></legend>
     <%= render partial: 'return_item_decision', locals: {return_items: @pending_return_items, show_decision: true} %>
   </fieldset>

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

@@ -1,5 +1,3 @@
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
 <%= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => 'Images' } %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @image } %>
@@ -16,7 +14,7 @@
       <%= link_to image_tag(@image.attachment.url(:small)), @image.attachment.url(:product) %>
     </div>
     <div class="nine columns omega">
-      <%= render :partial => 'form', :locals => { :f => f } %>  
+      <%= render :partial => 'form', :locals => { :f => f } %>
     </div>
     <div class="clear"></div>
     <div class="form-buttons filter-actions actions" data-hook="buttons">

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

@@ -1,5 +1,3 @@
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
 <%= render :partial => 'spree/admin/shared/product_tabs', :locals => {:current => 'Images'} %>
 
 <% content_for :page_actions do %>

data/app/views/spree/admin/option_types/edit.html.erb

@@ -1,5 +1,3 @@
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
 <% content_for :page_title do %>
   <%= Spree.t(:editing_option_type) %> <span class="green">"<%= @option_type.name %>"</span>
 <% end %>
@@ -8,7 +6,7 @@
   <li>
     <span id="new_add_option_value" data-hook>
       <%= link_to_add_fields Spree.t(:add_option_value), "tbody#option_values", :class => 'button fa fa-plus' %>
-    </span>      
+    </span>
   </li>
   <li>
     <%= button_link_to Spree.t(:back_to_option_types_list), spree.admin_option_types_path, :icon => 'arrow-left' %>
@@ -20,7 +18,7 @@
 <%= form_for [:admin, @option_type] do |f| %>
   <fieldset>
     <legend align="center"><%= Spree.t(:option_values) %></legend>
-    
+
     <%= render :partial => 'form', :locals => { :f => f } %>
 
     <table class="index sortable" data-hook data-sortable-link="<%= update_values_positions_admin_option_types_url %>">

data/app/views/spree/admin/option_types/index.html.erb

@@ -10,8 +10,6 @@
   <% end %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
 <div id="new_option_type"></div>
 
 <% if @option_types.any? %>

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

@@ -1,5 +1,3 @@
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @option_type } %>
 
 <%= form_for [:admin, @option_type] do |f| %>

data/app/views/spree/admin/orders/_shipment_manifest.html.erb

@@ -25,7 +25,7 @@
         <%= link_to '', '#', :class => 'save-item fa fa-check no-text with-tip', :data => {'shipment-number' => shipment_number, 'variant-id' => item.variant.id, :action => 'save'}, :title => Spree.t('actions.save'), :style => 'display: none' %>
         <%= link_to '', '#', :class => 'cancel-item fa fa-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel'), :style => 'display: none' %>
         <%= link_to '', '#', :class => 'split-item icon_link fa fa-arrows-h no-text with-tip', :data => {:action => 'split', 'variant-id' => item.variant.id}, :title => Spree.t('split') %>
-        <%= link_to '', '#', :class => 'delete-item fa fa-trash no-text with-tip', :data => { 'shipment-number' => shipment_number, 'variant-id' => item.variant.id, :action => 'remove'}, :title => Spree.t('delete') %>
+        <%= link_to '', '#', :class => 'delete-item fa fa-trash no-text with-tip', :data => { 'line-item-id' => item.line_item.id}, :title => Spree.t('delete') %>
       <% end %>
     </td>
   </tr>

data/app/views/spree/admin/orders/index.html.erb

@@ -99,7 +99,7 @@
 <%= paginate @orders %>
 
 <% if @orders.any? %>
-  <table class="index responsive" id="listing_orders" data-hook>
+  <table class="index" id="listing_orders" data-hook>
     <colgroup>
        <col style="width: 13%;">
        <col style="width: 10%;">

data/app/views/spree/admin/product_properties/index.html.erb

@@ -1,4 +1,3 @@
-<%= render 'spree/admin/shared/product_sub_menu' %>
 <%= render 'spree/admin/shared/product_tabs', :current => 'Product Properties' %>
 <%= render 'spree/shared/error_messages', :target => @product %>
 

data/app/views/spree/admin/products/edit.html.erb

@@ -7,8 +7,6 @@
   <% end %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
 <%= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => 'Product Details' } %>
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @product } %>
 

data/app/views/spree/admin/products/index.html.erb

@@ -8,8 +8,6 @@
   </li>
 <% end if can?(:create, Spree::Product) %>
 
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
 <% content_for :table_filter_title do %>
   <%= Spree.t(:search) %>
 <% end %>
@@ -77,10 +75,10 @@
     <tbody>
       <% @collection.each do |product| %>
           <tr <%== "style='color: red;'" if product.deleted? %> id="<%= spree_dom_id product %>" data-hook="admin_products_index_rows" class="<%= cycle('odd', 'even') %>">
-            <td class="align-center"><%= product.sku rescue '' %></td>
+            <td class="align-center"><%= product.sku %></td>
             <td class="align-center"><%= image_tag product.display_image.attachment(:mini) %></td>
             <td><%= link_to product.try(:name), edit_admin_product_path(product) %></td>
-            <td class="align-center"><%= product.display_price.to_html rescue '' %></td>
+            <td class="align-center"><%= product.display_price.to_html %></td>
             <td class="actions" data-hook="admin_products_index_row_actions">
               <%= link_to_edit product, :no_text => true, :class => 'edit' if can?(:edit, product) && !product.deleted? %>
               &nbsp;

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

@@ -1,5 +1,3 @@
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @product } %>
 
 <%= form_for [:admin, @product], method: :post, url: admin_products_path, :html => { :multipart => true } do |f| %>

data/app/views/spree/admin/promotion_categories/edit.html.erb

@@ -2,8 +2,6 @@
   <%= Spree.t(:editing_promotion_category) %>
 <% end %>
 
-<%= render 'spree/admin/shared/promotion_sub_menu' %>
-
 <%= form_for @promotion_category, :url => object_url, :method => :put do |f| %>
   <fieldset class="no-border-top">
     <%= render :partial => 'form', :locals => { :f => f } %>

data/app/views/spree/admin/promotion_categories/index.html.erb

@@ -10,8 +10,6 @@
   <% end %>
 <% end %>
 
-<%= render 'spree/admin/shared/promotion_sub_menu' %>
-
 <table>
   <colgroup>
     <col style="width: 40%">

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

@@ -2,8 +2,6 @@
   <%= Spree.t(:new_promotion_category) %>
 <% end %>
 
-<%= render 'spree/admin/shared/promotion_sub_menu' %>
-
 <%= form_for :promotion_category, :url => collection_url do |f| %>
   <fieldset class="no-border-top">
     <%= render :partial => 'form', :locals => { :f => f } %>

data/app/views/spree/admin/promotions/actions/_create_adjustment.html.erb

@@ -1,28 +1,2 @@
-<div class="calculator-fields row">
-
-  <div class="field alpha four columns">
-    <% field_name = "#{param_prefix}[calculator_type]" %>
-    <%= label_tag field_name, Spree.t(:calculator) %>
-    <%= select_tag field_name,
-                   options_from_collection_for_select(@calculators, :to_s, :description, promotion_action.calculator.type),
-                   :class => 'type-select select2 fullwidth' %>
-    <% if promotion_action.calculator.respond_to?(:preferences) %>
-      <span class="warning info"><%= Spree.t(:calculator_settings_warning) %></span>
-    <% end %>
-  </div>
-
-  <% unless promotion_action.new_record? %>
-    <div class="settings field omega four columns">
-      <% type_name = promotion_action.calculator.type.demodulize.underscore %>
-      <% if lookup_context.exists?("fields",
-          ["spree/admin/promotions/calculators/#{type_name}"], true) %>
-        <%= render "spree/admin/promotions/calculators/#{type_name}/fields",
-          calculator: promotion_action.calculator, prefix: param_prefix %>
-      <% else %>
-        <%= render "spree/admin/promotions/calculators/default_fields",
-          calculator: promotion_action.calculator, prefix: param_prefix %>
-      <% end %>
-      <%= hidden_field_tag "#{param_prefix}[calculator_attributes][id]", promotion_action.calculator.id %>
-    </div>
-  <% end %>
-</div>
+<%= render partial: 'spree/admin/promotions/actions/promotion_calculators_with_custom_fields',
+           locals: { calculators: @calculators, promotion_action: promotion_action, param_prefix: param_prefix } %>

data/app/views/spree/admin/promotions/actions/_create_item_adjustments.html.erb

@@ -1,26 +1,2 @@
-<div class="calculator-fields row">
-
-  <div class="field alpha four columns">
-    <% field_name = "#{param_prefix}[calculator_type]" %>
-    <%= label_tag field_name, Spree.t(:calculator) %>
-    <%= select_tag field_name,
-                   options_from_collection_for_select(Spree::Promotion::Actions::CreateItemAdjustments.calculators, :to_s, :description, promotion_action.calculator.type),
-                   :class => 'type-select select2 fullwidth' %>
-    <% if promotion_action.calculator.respond_to?(:preferences) %>
-      <span class="warning info"><%= Spree.t(:calculator_settings_warning) %></span>
-    <% end %>
-  </div>
-
-  <% unless promotion_action.new_record? %>
-    <div class="settings field omega four columns">
-      <% promotion_action.calculator.preferences.keys.map do |key| %>
-        <% field_name = "#{param_prefix}[calculator_attributes][preferred_#{key}]" %>
-        <%= label_tag field_name, Spree.t(key.to_s) %>
-        <%= preference_field_tag(field_name,
-                                 promotion_action.calculator.get_preference(key),
-                                 :type => promotion_action.calculator.preference_type(key)) %>
-      <% end %>
-      <%= hidden_field_tag "#{param_prefix}[calculator_attributes][id]", promotion_action.calculator.id %>
-    </div>
-  <% end %>
-</div>
+<%= render partial: 'spree/admin/promotions/actions/promotion_calculators_with_custom_fields',
+           locals: { calculators: Spree::Promotion::Actions::CreateItemAdjustments.calculators, promotion_action: promotion_action, param_prefix: param_prefix } %>