solidus_backend 2.2.2 → 2.3.0.beta1

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

@@ -32,26 +32,22 @@
     <% end %>
   </div>
 
-
-  <p id="filereader">File API &amp; FileReader API not supported</p>
-  <p id="formdata">XHR2's FormData is not supported</p>
-  <p id="progress">XHR2's upload progress isn't supported</p>
-
   <div id="progress-zone" class="row"></div>
 </fieldset>
 
 <% no_images = @product.images.empty? && @product.variant_images.empty? %>
 
-<table class="index sortable <%= 'hidden' if no_images %>" id="images-table" data-hook="images_table" data-sortable-link="<%= update_positions_admin_product_images_url(@product) %>">
+<table class="index sortable inline-editable-table <%= 'hidden' if no_images %>" id="images-table" data-hook="images_table" data-sortable-link="<%= update_positions_admin_product_images_url(@product) %>">
   <colgroup>
     <col style="width: 5%">
     <col style="width: 10%">
     <% if @product.has_variants? %>
-      <col style="width: 25%">
+      <col style="width: 40%">
     <% end %>
-    <col style="width: 45%">
+    <col style="width: 30%">
     <col style="width: 15%">
   </colgroup>
+
   <thead>
     <tr data-hook="images_header">
       <th colspan="2"><%= Spree.t(:thumbnail) %></th>

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

@@ -22,13 +22,12 @@
       <tr>
         <td><strong><%= Spree.t(:avs_response) %>:</strong></td>
         <td class="align-center">
-          <span class="<%= latest_payment.is_avs_risky? ? 'state void' : 'state complete' %>">
-            <% if latest_payment.is_avs_risky? %>
-              <%= "#{Spree.t(:error)}: #{avs_response_code[latest_payment.avs_response]}" %>
-            <% else %>
-              <%= Spree.t(:success) %>
-            <% end %>
-          </span>
+          <% if latest_payment.is_avs_risky? %>
+            <span class="state void"><%= Spree.t(:error) %>:</span>
+            <%= avs_response_code[latest_payment.avs_response] %>
+          <% else %>
+            <span class="state complete"><%= Spree.t(:success) %></span>
+          <% end %>
         </td>
       </tr>
 

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

@@ -55,7 +55,7 @@
                   <%= label_tag 'selected_shipping_rate_id', Spree::ShippingMethod.model_name.human %>
                   <%= select_tag :selected_shipping_rate_id,
                         options_for_select(shipment.shipping_rates.map {|sr| ["#{sr.name} #{sr.display_price}", sr.id] }, shipment.selected_shipping_rate_id),
-                        {class: 'select2 fullwidth', data: {'shipment-number' => shipment.number } } %>
+                        {class: 'custom-select fullwidth', data: {'shipment-number' => shipment.number } } %>
                 </div>
               </div>
             </div>

data/app/views/spree/admin/orders/confirm/_customer_details.html.erb

@@ -1,7 +1,7 @@
 <fieldset class="no-border-bottom" data-hook="customer_details_total">
   <legend><%= Spree.t(:customer) %></legend>
   <div class="customer"><%= order.user.try(:email) %></div><br/>
-</fieldsset>
+</fieldset>
 
 <fieldset class="no-border-bottom no-border-top">
   <div class="row">

data/app/views/spree/admin/orders/confirm/_payments.html.erb

@@ -38,4 +38,4 @@
       <% end %>
     </tbody>
   </table>
-</fieldsset>
+</fieldset>

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

@@ -33,7 +33,7 @@
 
           <div class="field">
             <%= label_tag :q_state_eq, Spree.t(:status) %>
-            <%= f.select :state_eq, Spree::Order.state_machines[:state].states.collect {|s| [Spree.t("order_state.#{s.name}"), s.value]}, {include_blank: true}, class: 'select2' %>
+            <%= f.select :state_eq, Spree::Order.state_machines[:state].states.collect {|s| [Spree.t("order_state.#{s.name}"), s.value]}, {include_blank: true}, class: 'custom-select fullwidth' %>
           </div>
 
           <div class="field">
@@ -85,8 +85,8 @@
         <div class="col-12 col-md-6 col-lg-4 col-xl-3">
           <% if Spree::Store.count > 1 %>
             <div class="field">
-              <%= label_tag nil, Spree.t(:store) %>
-              <%= f.select :store_id_eq, Spree::Store.all.map { |s| [s.name, s.id] }, { include_blank: true }, { class: "select2" } %>
+              <%= label_tag :q_store_id_eq, Spree.t(:store) %>
+              <%= f.select :store_id_eq, Spree::Store.all.map { |s| [s.name, s.id] }, { include_blank: true }, { class: "custom-select fullwidth" } %>
             </div>
           <% end %>
 

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

@@ -6,13 +6,13 @@
       <div class="col-3">
         <div id="preference-settings">
           <div class="field">
-            <%= f.label :type %>
-            <%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {id: 'gtwy-type', class: 'select2 fullwidth js-gateway-type'}) %>
+            <%= label :payment_method, :type %>
+            <%= collection_select(:payment_method, :type, @payment_method_types, :to_s, :name, {}, {class: 'custom-select fullwidth js-gateway-type'}) %>
           </div>
 
           <div class="field js-preference-source-wrapper">
             <%= f.label :preference_source %>
-            <%= f.select(:preference_source, [[Spree.t(:preference_source_none), nil]] + @object.class.available_preference_sources, {}, class: 'select2 fullwidth js-preference-source') %>
+            <%= f.select(:preference_source, [[Spree.t(:preference_source_none), nil]] + @object.class.available_preference_sources, {}, class: 'custom-select fullwidth js-preference-source') %>
           </div>
 
           <div class="gateway-settings js-gateway-settings">
@@ -23,7 +23,7 @@
             <% end %>
           </div>
 
-          <div class="info warning js-gateway-settings-warning"><%= Spree.t(:provider_settings_warning) %></div>
+          <div class="info warning js-gateway-settings-warning"><%= Spree.t(:payment_method_settings_warning) %></div>
         </div>
         <div data-hook="available_to_user" class="field">
           <%= label_tag nil, Spree::PaymentMethod.human_attribute_name(:available_to_users) %>
@@ -35,7 +35,7 @@
         </div>
         <div data-hook="auto_capture" class="field">
           <%= f.label :auto_capture %>
-          <%= select(:payment_method, :auto_capture, [["#{Spree.t(:use_app_default)} (#{Spree::Config[:auto_capture]})", ''], [Spree.t(:say_yes), true], [Spree.t(:say_no), false]], {}, {class: 'select2 fullwidth'}) %>
+          <%= select(:payment_method, :auto_capture, [["#{Spree.t(:use_app_default)} (#{Spree::Config[:auto_capture]})", ''], [Spree.t(:say_yes), true], [Spree.t(:say_no), false]], {}, {class: 'custom-select fullwidth'}) %>
         </div>
         <div data-hook="active" class="field">
           <%= label_tag nil, Spree::PaymentMethod.human_attribute_name(:active) %>

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

@@ -24,10 +24,10 @@
       <div class="payment-method-settings">
         <% @payment_methods.each do |method| %>
 
-          <div class="payment-methods" id="payment_method_<%= method.id %>">
+          <div class="payment-methods" id="payment_method_<%= method.id %>" data-payment-method-id="<%= method.id %>">
             <% if method.source_required? %>
               <br />
-              <%= render partial: "spree/admin/payments/source_forms/#{method.method_type}",
+              <%= render partial: "spree/admin/payments/source_forms/#{method.partial_name}",
                          locals: { payment_method: method, previous_cards: method.reusable_sources(@order) } %>
             <% end %>
           </div>

data/app/views/spree/admin/payments/_list.html.erb

@@ -16,7 +16,7 @@
         <td><%= link_to payment.number, spree.admin_order_payment_path(@order, payment) %></td>
         <td><%= pretty_time(payment.created_at) %></td>
         <td class="align-center amount">
-          <%= text_field_tag :amount, payment.amount, class: 'js-edit-amount edit-payment-amount editing-show' %>
+          <%= text_field_tag :amount, payment.amount, class: 'js-edit-amount align-right editing-show' %>
           <span class="js-display-amount editing-hide"><%= payment.display_amount.to_html %></span>
         </td>
         <td class="align-center"><%= payment_method_name(payment) %></td>

data/app/views/spree/admin/payments/show.html.erb

@@ -13,7 +13,7 @@
   <li><%= button_link_to Spree.t(:logs), spree.admin_order_payment_log_entries_url(@order, @payment) %></li>
 <% end %>
 
-<%= render partial: "spree/admin/payments/source_views/#{@payment.payment_method.method_type}", locals: { payment: @payment.source.is_a?(Spree::Payment) ? @payment.source : @payment } %>
+<%= render partial: "spree/admin/payments/source_views/#{@payment.payment_method.partial_name}", locals: { payment: @payment.source.is_a?(Spree::Payment) ? @payment.source : @payment } %>
 
 <div data-hook="amount" class="align-center">
   <h5><%= label_tag nil, Spree::Payment.human_attribute_name(:amount) %>: <span class="green"><%= @payment.display_amount.to_html %></span> </h5>

data/app/views/spree/admin/payments/source_forms/_gateway.html.erb

@@ -1,4 +1,4 @@
-<fieldset class="no-border-bottom">
+<fieldset class="no-border-bottom js-edit-credit-card">
   <div class="field" data-hook="previous_cards">
     <% if previous_cards.any? %>
       <% previous_cards.each do |card| %>
@@ -8,7 +8,7 @@
     <% end %>
   </div>
 
-  <div id="card_form<%= payment_method.id %>" data-hook>
+  <div id="card_form<%= payment_method.id %>" data-hook class="js-new-credit-card-form">
     <% param_prefix = "payment_source[#{payment_method.id}]" %>
 
     <div class="clear"></div>
@@ -20,11 +20,6 @@
             <%= hidden_field_tag "#{param_prefix}[cc_type]", '', {class: 'ccType'} %>
             <%= label_tag "card_number#{payment_method.id}", Spree::CreditCard.human_attribute_name(:number), class: 'required' %>
             <%= text_field_tag "#{param_prefix}[number]", '', class: 'required fullwidth cardNumber', id: "card_number#{payment_method.id}", maxlength: 19 %>
-            <span id="card_type" style="display:none;">
-              ( <span id="looks_like" ><%= Spree.t(:card_type_is) %> <span id="type"></span></span>
-                <span id="unrecognized"><%= Spree.t(:unrecognized_card_type) %></span>
-              )
-            </span>
           </div>
         </div>
       </div>

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

@@ -7,7 +7,7 @@
           <%= f.select :variant_id,
                       @product.variants_including_master.map { |v| [v.descriptive_name, v.id] },
                       {},
-                      class: "select2 fullwidth", disabled: !f.object.new_record? %>
+                      class: "custom-select fullwidth", disabled: !f.object.new_record? %>
         <% end %>
       </div>
 
@@ -20,7 +20,7 @@
                                     include_blank: t(:any_country, scope: [:spree, :admin, :prices]),
                                     selected: Spree::Config.admin_vat_country_iso
                                   },
-                                  { class: 'select2 fullwidth', disabled: !f.object.new_record? } %>
+                                  { class: 'custom-select fullwidth', disabled: !f.object.new_record? } %>
         <% end %>
       </div>
 

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

@@ -1,4 +1,6 @@
 <%= render 'spree/admin/shared/product_tabs', current: 'Prices' %>
+<% admin_breadcrumb(link_to(plural_resource_name(Spree::Price), spree.admin_product_prices_url(@product))) %>
+<% admin_breadcrumb(Spree.t('actions.edit')) %>
 
 <%= form_for @price, url: spree.admin_product_price_path(@product, @price) do |f| %>
   <fieldset>

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

@@ -1,8 +1,9 @@
 <%= render 'spree/admin/shared/product_tabs', current: 'Prices' %>
+<% admin_breadcrumb(plural_resource_name(Spree::Price)) %>
 
 <% content_for :page_actions do %>
   <li id="new_price_link">
-    <%= button_link_to t(".new_price"), new_object_url, { remote: true, id: 'admin_new_product' } %>
+    <%= button_link_to t(".new_price"), new_object_url %>
   </li>
 <% end if can?(:create, Spree::Product) %>
 
@@ -21,7 +22,7 @@
         <%= f.select :variant_id_eq,
                     @product.variants_including_master.map { |v| [v.descriptive_name, v.id] },
                     {include_blank: true},
-                    class: "select2 fullwidth" %>
+                    class: "custom-select fullwidth" %>
       </div>
     </div>
 
@@ -31,7 +32,7 @@
         <%= f.select :currency_eq,
                     @prices.map(&:currency).uniq,
                     {include_blank: true},
-                    class: "select2 fullwidth" %>
+                    class: "custom-select fullwidth" %>
       </div>
     </div>
 
@@ -41,7 +42,7 @@
         <%= f.select :country_iso_eq,
                     @prices.map(&:country).compact.uniq.map { |c| [c.name, c.iso]},
                     {include_blank: true},
-                    class: "select2 fullwidth" %>
+                    class: "custom-select fullwidth" %>
       </div>
     </div>
 

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

@@ -1,3 +1,7 @@
+<%= render 'spree/admin/shared/product_tabs', current: 'Prices' %>
+<% admin_breadcrumb(link_to(plural_resource_name(Spree::Price), spree.admin_product_prices_url(@product))) %>
+<% admin_breadcrumb(Spree.t('actions.new')) %>
+
 <%= form_for [:admin, @product, @product.prices.build] do |f| %>
   <fieldset data-hook="admin_product_price_new_form">
     <legend><%= t('.new_price') %></legend>

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

@@ -48,7 +48,7 @@
       <% @option_types.each do |option_type, option_values| %>
         <div class="field">
           <%= label :option_type_presentation, option_type.presentation %>
-          <%= select_tag "ovi[]", options_from_collection_for_select(option_values, :id, :presentation, params[:ovi]), class: 'select2 fullwidth', include_blank: true, id: "#{option_type.name}_option_type_select" %>
+          <%= select_tag "ovi[]", options_from_collection_for_select(option_values, :id, :presentation, params[:ovi]), class: 'custom-select fullwidth', include_blank: true, id: "#{option_type.name}_option_type_select" %>
         </div>
       <% end %>
       <div class="form-buttons filter-actions actions">

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

@@ -32,7 +32,8 @@
       <div data-hook="admin_product_form_price">
         <%= f.field_container :price do %>
           <%= f.label :price, class: 'required' %>
-          <%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :price, currency: @product.find_or_build_master.default_price.currency %>
+          <%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :price,
+                     currency: Spree::Config.default_pricing_options.currency %>
           <%= f.error_message_on :price %>
         <% end %>
       </div>
@@ -120,7 +121,7 @@
         <%= f.field_container :shipping_categories do %>
           <%= f.label :shipping_category_id, Spree::ShippingCategory.model_name.human %>
           <%= f.field_hint :shipping_category %>
-          <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2' }) %>
+          <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'custom-select' }) %>
           <%= f.error_message_on :shipping_category %>
         <% end %>
       </div>
@@ -129,7 +130,7 @@
         <%= f.field_container :tax_category do %>
           <%= f.label :tax_category_id, Spree::TaxCategory.model_name.human %>
           <%= f.field_hint :tax_category %>
-          <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2' }) %>
+          <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'custom-select' }) %>
           <%= f.error_message_on :tax_category %>
         <% end %>
       </div>

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

@@ -26,15 +26,15 @@
 
           <div class="col-4">
             <div class="field">
-              <%= f.label :variants_including_master_sku_cont, Spree::Variant.human_attribute_name(:sku) %>
-              <%= f.text_field :variants_including_master_sku_cont, size: 15 %>
+              <%= f.label :with_variant_sku_cont, Spree::Variant.human_attribute_name(:sku) %>
+              <%= f.text_field :with_variant_sku_cont, size: 15 %>
             </div>
           </div>
 
           <div class="col-2">
             <div class="field checkbox">
               <label>
-                <%= f.check_box :deleted_at_null, {checked: params[:q][:deleted_at_null] == '0'}, '0', '1' %>
+                <%= f.check_box :with_deleted, { checked: params[:q][:with_deleted] == 'true' }, 'true', 'false' %>
                 <%= Spree.t(:show_deleted) %>
               </label>
             </div>

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

@@ -47,7 +47,7 @@
           <%= f.label :shipping_category_id, Spree::ShippingCategory.
                 model_name.human, class: 'required' %>
           <%= f.field_hint :shipping_category %><br />
-          <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2 fullwidth' }) %>
+          <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'custom-select fullwidth' }) %>
           <%= f.error_message_on :shipping_category_id %>
         <% end %>
       </div>
@@ -56,7 +56,7 @@
         <%= f.field_container :tax_category do %>
           <%= f.label :tax_category_id, Spree::TaxCategory.model_name.human %>
           <%= f.field_hint :tax_category %>
-          <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2 fullwidth' }) %>
+          <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'custom-select fullwidth' }) %>
           <%= f.error_message_on :tax_category %>
         <% end %>
       </div>

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

@@ -1,7 +1,4 @@
 $("#new_product_wrapper").html('<%= escape_javascript(render template: "spree/admin/products/new", formats: [:html], handlers: [:erb]) %>');
 handle_date_picker_fields();
-<% unless Rails.env.test? %>
-  $('.select2').select2();
-<% end %>
 $("#table-filter").hide();
 $("#admin_new_product").parent().hide();

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

@@ -1,14 +1,10 @@
 $('#actions').append('<%= escape_javascript( render(partial: 'spree/admin/promotions/promotion_action', object: @promotion_action) ) %>');
 $('#actions .no-objects-found').hide();
-$(document).ready(function(){
-  $(".variant_autocomplete").variantAutocomplete();
-  //enable select2 functions for recently added box
-  $('.type-select.select2').last().select2();
-});
+$(".variant_autocomplete").variantAutocomplete();
+
 initPromotionActions();
 
 
 $('#<%= dom_id @promotion_action %>').hide();
 $('#<%= dom_id @promotion_action %>').fadeIn();
 new Spree.CalculatorEditView({el: $('#<%= dom_id @promotion_action %> .js-calculator-fields')});
-

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

@@ -5,12 +5,4 @@ $('.product_picker').productAutocomplete();
 $('.user_picker').userAutocomplete();
 $('.taxon_picker').taxonAutocomplete();
 
-$('select.select2').select2({
-  allowClear: true,
-  dropdownAutoWidth: true,
-  minimumResultsForSearch: 8
-});
-
 $('#promotion_rule_type').html('<%= escape_javascript options_for_promotion_rule_types(@promotion) %>');
-$('#promotion_rule_type').select2();
-

data/app/views/spree/admin/promotions/_actions.html.erb

@@ -1,13 +1,13 @@
 <fieldset id="action_fields" class="no-border-top">
 
   <%= form_tag spree.admin_promotion_promotion_actions_path(@promotion), remote: true, id: 'new_promotion_action_form' do %>
-    <% options = options_for_select(  Rails.application.config.spree.promotions.actions.map(&:name).map {|name| [ Spree.t("promotion_action_types.#{name.demodulize.underscore}.name"), name] } ) %>
+    <% options = options_for_select(  Rails.application.config.spree.promotions.actions.map {|action| [ action.model_name.human, action.name] } ) %>
     <fieldset>
       <legend align="center"><%= plural_resource_name(Spree::PromotionAction) %></legend>
       <% if can?(:update, @promotion) %>
         <div class="field">
           <%= label_tag :action_type, Spree.t(:add_action_of_type)%>
-          <%= select_tag 'action_type', options, class: 'select2 fullwidth' %>
+          <%= select_tag 'action_type', options, class: 'custom-select fullwidth' %>
         </div>
         <div class="filter-actions actions">
           <%= button Spree.t('actions.add') %>

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

@@ -25,7 +25,7 @@
 
           <%= f.field_container :category do %>
             <%= f.label :promotion_category_id, Spree::PromotionCategory.model_name.human %><br />
-            <%= f.collection_select(:promotion_category_id, @promotion_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2 fullwidth' }) %>
+            <%= f.collection_select(:promotion_category_id, @promotion_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'custom-select fullwidth' }) %>
           <% end %>
         </div>
       </div>

data/app/views/spree/admin/promotions/_promotion_action.html.erb

@@ -1,6 +1,5 @@
-<div class="promotion_action promotion-block <%= promotion_action.type.to_s.demodulize.underscore %>" id="<%= dom_id promotion_action %>">
-  <% type_name = promotion_action.class.name.demodulize.underscore %>
-  <h6 class="promotion-title"><%= Spree.t("promotion_action_types.#{type_name}.description") %></h6>
+<div class="promotion_action promotion-block <%= promotion_action.model_name.element %>" id="<%= dom_id promotion_action %>">
+  <h6 class="promotion-title"><%= promotion_action.class.human_attribute_name(:description) %></h6>
   <% if can?(:destroy, promotion_action) %>
     <%= link_to_with_icon 'trash', '', spree.admin_promotion_promotion_action_path(@promotion, promotion_action), remote: true, method: :delete, class: 'delete' %>
   <% end %>
@@ -9,6 +8,6 @@
   <%= hidden_field_tag "#{param_prefix}[id]", promotion_action.id %>
 
   <%= render partial: "spree/shared/error_messages", locals: { target: promotion_action } %>
-  <%= render partial: "spree/admin/promotions/actions/#{type_name}",
+  <%= render partial: promotion_action.to_partial_path,
              locals: { promotion_action: promotion_action, param_prefix: param_prefix } %>
 </div>

data/app/views/spree/admin/promotions/_promotion_rule.html.erb

@@ -1,6 +1,6 @@
 <div class="promotion_rule promotion-block col-12" id="<%= dom_id promotion_rule %>">
-  <% type_name = promotion_rule.class.name.demodulize.underscore %>
-  <h6 class='promotion-title <%= 'no-text' if type_name == 'user_logged_in' || type_name == 'first_order'%>'><%= Spree.t("promotion_rule_types.#{type_name}.description") %></h6>
+  <% type_name = promotion_rule.model_name.element %>
+  <h6 class='promotion-title <%= 'no-text' if type_name == 'user_logged_in' || type_name == 'first_order'%>'><%= promotion_rule.class.human_attribute_name(:description) %></h6>
   <% if can?(:destroy, promotion_rule) %>
     <%= link_to_with_icon 'trash', '', spree.admin_promotion_promotion_rule_path(@promotion, promotion_rule), remote: true, method: :delete, class: 'delete' %>
   <% end %>
@@ -8,5 +8,5 @@
   <% param_prefix = "promotion[promotion_rules_attributes][#{promotion_rule.id}]" %>
   <%= hidden_field_tag "#{param_prefix}[id]", promotion_rule.id %>
   <%= render partial: "spree/shared/error_messages", locals: { target: promotion_rule } %>
-  <%= render partial: "spree/admin/promotions/rules/#{type_name}", locals: { promotion_rule: promotion_rule, param_prefix: param_prefix } %>
+  <%= render partial: promotion_rule.to_partial_path, locals: { promotion_rule: promotion_rule, param_prefix: param_prefix } %>
 </div>