spree_backend 3.1.14 → 3.2.0.rc1

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

@@ -69,14 +69,6 @@
         <% end %>
       </div>
 
-      <div data-hook="admin_product_form_promotionable">
-        <%= f.field_container :promotionable, class: ['form-group'] do %>
-          <%= f.label :promotionable, Spree.t(:promotionable) %>
-          <%= f.error_message_on :promotionable %>
-          <%= f.check_box :promotionable, class: 'form-control' %>
-        <% end %>
-      </div>
-
       <% if @product.has_variants? %>
         <div data-hook="admin_product_form_multiple_variants" class="well">
           <%= f.label :skus, Spree.t(:sku).pluralize %>
@@ -107,6 +99,14 @@
           <% end %>
         </div>
 
+        <div data-hook="admin_product_form_promotionable">
+          <%= f.field_container :promotionable, class: ['form-group'] do %>
+              <%= f.label :promotionable, Spree.t(:promotionable) %>
+              <%= f.error_message_on :promotionable %>
+              <%= f.check_box :promotionable, class: 'form-control' %>
+          <% end %>
+        </div>
+
         <div id="shipping_specs" class="row">
           <div class="col-md-6">
             <div id="shipping_specs_weight_field" data-hook="admin_product_form_weight" class="form-group">
@@ -195,6 +195,12 @@
     <% end %>
   </div>
 
+  <div data-hook="admin_product_form_tag_list">
+    <%= f.field_container :tag_list, class: ['form-group'] do %>
+      <%= f.label :tag_list, Spree.t(:tags) %>
+      <%= f.hidden_field :tag_list, value: @product.tag_list.join(','), class: 'tag_picker' %>
+    <% end %>
+  </div>
 
   <div data-hook="admin_product_form_meta">
     <div data-hook="admin_product_form_meta_title">

data/app/views/spree/admin/products/_properties_form.erb

@@ -5,6 +5,6 @@
 <% f.fields_for :product_properties do |properties_form| %>
     <div data-hook="value">
       <%= properties_form.label :value, properties_form.object.property.presentation %>
-      <%= properties_form.text_field :value, :class => "form-control" %>
+      <%= properties_form.text_field :value, class: "form-control" %>
     </div>
 <% end %>

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

@@ -3,38 +3,38 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_product), new_object_url, { :class => "btn-success", :icon => 'add', :id => 'admin_new_product' } %>
+  <%= button_link_to Spree.t(:new_product), new_object_url, { class: "btn-success", icon: 'add', id: 'admin_new_product' } %>
 <% end if can?(:create, Spree::Product) %>
 
 <% content_for :table_filter do %>
   <div data-hook="admin_products_sidebar">
 
     <%= search_form_for [:admin, @search] do |f| %>
-      <%- locals = {:f => f} %>
+      <%- locals = {f: f} %>
       <div data-hook="admin_products_index_search" class="row">
         <div class="col-md-6">
           <div class="form-group">
             <%= f.label :name_cont, Spree.t(:name) %>
-            <%= f.text_field :name_cont, :size => 15, class: "form-control js-quick-search-target" %>
+            <%= f.text_field :name_cont, size: 15, class: "form-control js-quick-search-target" %>
           </div>
         </div>
         <div class="col-md-6">
           <div class="form-group">
             <%= f.label :variants_including_master_sku_cont, Spree.t(:sku) %>
-            <%= f.text_field :variants_including_master_sku_cont, :size => 15, class: "form-control" %>
+            <%= f.text_field :variants_including_master_sku_cont, size: 15, class: "form-control" %>
           </div>
         </div>
         <div class="col-md-12">
           <div class="field checkbox">
             <label>
-              <%= f.check_box :deleted_at_null, {:checked => params[:q][:deleted_at_null] == '0'}, '0', '1' %>
+              <%= f.check_box :deleted_at_null, {checked: params[:q][:deleted_at_null] == '0'}, '0', '1' %>
               <%= Spree.t(:show_deleted) %>
             </label>
           </div>
 
           <div class="field checkbox">
             <label>
-              <%= f.check_box :not_discontinued, {checked: params[:q][:not_discontinued] == '0'}, '0', '1' %>
+              <%= f.check_box :discontinue_on_null, {checked: params[:q][:discontinue_on_null] == '0'}, '0', '1' %>
               <%= Spree.t(:show_discontinued ) %>
             </label>
           </div>

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

@@ -1,56 +1,56 @@
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @product } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @product } %>
 
 <% content_for :page_title do %>
   <%= link_to Spree.t(:products), spree.admin_products_url %> /
   <%= Spree.t(:new_product) %>
 <% end %>
 
-<%= form_for [:admin, @product], :html => { :multipart => true } do |f| %>
+<%= form_for [:admin, @product], html: { multipart: true } do |f| %>
   <fieldset data-hook="new_product">
-    <%= f.field_container :name, :class => ['form-group'] do %>
+    <%= f.field_container :name, class: ['form-group'] do %>
       <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
-      <%= f.text_field :name, :class => 'form-control title' %>
+      <%= f.text_field :name, class: 'form-control title' %>
       <%= f.error_message_on :name %>
     <% end %>
 
     <div data-hook="new_product_attrs" class="row">
       <% unless @product.has_variants? %>
         <div data-hook="new_product_sku" class="col-md-4">
-          <%= f.field_container :sku, :class => ['form-group'] do %>
+          <%= f.field_container :sku, class: ['form-group'] do %>
             <%= f.label :sku, Spree.t(:sku) %>
-            <%= f.text_field :sku, :size => 16, :class => 'form-control' %>
+            <%= f.text_field :sku, size: 16, class: 'form-control' %>
             <%= f.error_message_on :sku %>
           <% end %>
         </div>
       <% end %>
 
       <div data-hook="new_product_prototype" class="col-md-4">
-        <%= f.field_container :prototype, :class => ['form-group'] do %>
+        <%= f.field_container :prototype, class: ['form-group'] do %>
           <%= f.label :prototype_id, Spree.t(:prototype) %>
-          <%= f.collection_select :prototype_id, Spree::Prototype.all, :id, :name, {:include_blank => true}, {:class => 'select2'} %>
+          <%= f.collection_select :prototype_id, Spree::Prototype.all, :id, :name, {include_blank: true}, {class: 'select2'} %>
         <% end %>
       </div>
 
       <div data-hook="new_product_price" class="col-md-4">
-        <%= f.field_container :price, :class => ['form-group'] do %>
+        <%= f.field_container :price, class: ['form-group'] do %>
           <%= f.label :price, Spree.t(:master_price) %> <span class="required">*</span>
-          <%= f.text_field :price, :value => number_to_currency(@product.price, :unit => ''), :class => 'form-control' %>
+          <%= f.text_field :price, value: number_to_currency(@product.price, unit: ''), class: 'form-control' %>
           <%= f.error_message_on :price %>
         <% end %>
       </div>
 
       <div data-hook="new_product_available_on" class="col-md-4">
-        <%= f.field_container :available_on, :class => ['form-group'] do %>
+        <%= f.field_container :available_on, class: ['form-group'] do %>
           <%= f.label :available_on, Spree.t(:available_on) %>
           <%= f.error_message_on :available_on %>
-          <%= f.text_field :available_on, :class => 'datepicker form-control' %>
+          <%= f.text_field :available_on, class: 'datepicker form-control' %>
         <% end %>
       </div>
 
       <div data-hook="new_product_shipping_category" class="col-md-4">
-        <%= f.field_container :shipping_category, :class => ['form-group'] do %>
+        <%= f.field_container :shipping_category, class: ['form-group'] do %>
           <%= f.label :shipping_category_id, Spree.t(:shipping_categories) %><span class="required">*</span>
-          <%= 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: 'select2' }) %>
           <%= f.error_message_on :shipping_category_id %>
         <% end %>
       </div>
@@ -58,10 +58,10 @@
     </div>
 
     <div data-hook="product-from-prototype" id="product-from-prototype">
-      <%= render :file => 'spree/admin/prototypes/show' if @prototype %>
+      <%= render file: 'spree/admin/prototypes/show' if @prototype %>
     </div>
 
-    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+    <%= render partial: 'spree/admin/shared/new_resource_links' %>
 
   </fieldset>
 <% end %>

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

@@ -1,11 +1,11 @@
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @promotion_category } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @promotion_category } %>
 
 <%= f.field_container :name, class: ['form-group'] do %>
   <%= f.label :name %>
-  <%= f.text_field :name, :class => 'form-control' %>
+  <%= f.text_field :name, class: 'form-control' %>
   <%= f.error_message_on :name %>
 <% end %>
 <%= f.field_container :code, class: ['form-group'] do %>
   <%= f.label :code %>
-  <%= f.text_field :code, :class => 'form-control' %>
+  <%= f.text_field :code, class: 'form-control' %>
 <% end %>

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

@@ -3,9 +3,9 @@
   <%= @promotion_category.name %>
 <% end %>
 
-<%= form_for @promotion_category, :url => object_url, :method => :put do |f| %>
+<%= form_for @promotion_category, url: object_url, method: :put do |f| %>
   <fieldset>
-    <%= render :partial => 'form', :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/edit_resource_links' %>
   </fieldset>
 <% end %>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_promotion_category), new_object_url, :icon => 'add', :class => 'btn-success' %>
+  <%= button_link_to Spree.t(:new_promotion_category), new_object_url, icon: 'add', class: 'btn-success' %>
 <% end %>
 
 <% if @promotion_categories.any? %>
@@ -19,8 +19,8 @@
           <td><%= promotion_category.name %></td>
           <td><%= promotion_category.code %></td>
           <td class="actions actions-2 text-right">
-            <%= link_to_edit promotion_category, :no_text => true %>
-            <%= link_to_delete promotion_category, :no_text => true %>
+            <%= link_to_edit promotion_category, no_text: true %>
+            <%= link_to_delete promotion_category, no_text: true %>
           </td>
         </tr>
       <% end %>

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

@@ -3,9 +3,9 @@
   <%= Spree.t(:new_promotion_category) %>
 <% end %>
 
-<%= form_for :promotion_category, :url => collection_url do |f| %>
+<%= form_for :promotion_category, url: collection_url do |f| %>
   <fieldset>
-    <%= render :partial => 'form', :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/new_resource_links' %>
   </fieldset>
 <% end %>

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

@@ -4,12 +4,12 @@
   </h1>
 </div>
 <div id="action_fields" class="panel-body">
-  <%= form_tag spree.admin_promotion_promotion_actions_path(@promotion), :remote => true, :id => 'new_promotion_action_form' do %>
+  <%= 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] } ) %>
 
     <div class="form-group">
       <%= label_tag :action_type, Spree.t(:add_action_of_type)%>
-      <%= select_tag 'action_type', options, :class => 'select2' %>
+      <%= select_tag 'action_type', options, class: 'select2' %>
     </div>
     <div class="form-actions">
       <%= button Spree.t(:add), 'plus', 'submit', class: "btn-success" %>
@@ -17,10 +17,10 @@
 
   <% end %>
 
-  <%= form_for @promotion, :url => spree.admin_promotion_path(@promotion), :method => :put do |f| %>
+  <%= form_for @promotion, url: spree.admin_promotion_path(@promotion), method: :put do |f| %>
     <div id="actions" class="filter_list margint">
       <% if @promotion.actions.any? %>
-        <%= render :partial => 'promotion_action',  :collection => @promotion.actions %>
+        <%= render partial: 'promotion_action',  collection: @promotion.actions %>
       <% else %>
         <div class="alert alert-warning">
           <%= Spree.t(:no_actions_added) %>

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

@@ -1,21 +1,21 @@
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @promotion } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @promotion } %>
 
 <div class="row" id="general_fields" >
   <div class="col-md-3">
     <%= f.field_container :name, class: ['form-group'] do %>
       <%= f.label :name %>
-      <%= f.text_field :name, :class => 'form-control' %>
+      <%= f.text_field :name, class: 'form-control' %>
       <%= f.error_message_on :name %>
     <% end %>
 
     <%= f.field_container :code, class: ['form-group'] do %>
       <%= f.label :code %>
-      <%= f.text_field :code, :class => 'form-control' %>
+      <%= f.text_field :code, class: 'form-control' %>
     <% end %>
 
     <%= f.field_container :path, class: ['form-group'] do %>
       <%= f.label :path %>
-      <%= f.text_field :path, :class => 'form-control' %>
+      <%= f.text_field :path, class: 'form-control' %>
     <% end %>
 
     <%= f.field_container :advertise, class: ['checkbox'] do %>
@@ -29,32 +29,32 @@
   <div class="col-md-6">
     <%= f.field_container :description, class: ['form-group'] do %>
       <%= f.label :description %>
-      <%= f.text_area :description, :rows => 7, :class => 'form-control' %>
+      <%= f.text_area :description, rows: 7, class: 'form-control' %>
     <% end %>
 
     <%= f.field_container :category, class: ['form-group'] do %>
       <%= f.label :promotion_category %>
-      <%= f.collection_select(:promotion_category_id, @promotion_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2' }) %>
+      <%= f.collection_select(:promotion_category_id, @promotion_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2' }) %>
     <% end %>
   </div>
 
   <div id="expiry_fields" class="col-md-3">
     <%= f.field_container :usage_limit do %>
       <%= f.label :usage_limit %>
-      <%= f.number_field :usage_limit, :min => 0, :class => 'form-control' %>
+      <%= f.number_field :usage_limit, min: 0, class: 'form-control' %>
       <p class="help-block">
-        <%= Spree.t(:current_promotion_usage, :count => @promotion.credits_count) %>
+        <%= Spree.t(:current_promotion_usage, count: @promotion.credits_count) %>
       </p>
     <% end %>
 
     <div id="starts_at_field" class="form-group">
       <%= f.label :starts_at %>
-      <%= f.text_field :starts_at, :value => datepicker_field_value(@promotion.starts_at), :class => 'datepicker datepicker-from form-control' %>
+      <%= f.text_field :starts_at, value: datepicker_field_value(@promotion.starts_at), class: 'datepicker datepicker-from form-control' %>
     </div>
 
     <div id="expires_at_field" class="form-group">
       <%= f.label :expires_at %>
-      <%= f.text_field :expires_at, :value => datepicker_field_value(@promotion.expires_at), :class => 'datepicker datepicker-to form-control' %>
+      <%= f.text_field :expires_at, value: datepicker_field_value(@promotion.expires_at), class: 'datepicker datepicker-to form-control' %>
     </div>
   </div>
 </div>

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

@@ -7,5 +7,5 @@
   <% param_prefix = "promotion[promotion_rules_attributes][#{promotion_rule.id}]" %>
   <%= hidden_field_tag "#{param_prefix}[id]", promotion_rule.id %>
 
-  <%= render partial: "spree/admin/promotions/rules/#{type_name}", locals: { promotion_rule: promotion_rule, param_prefix: param_prefix } rescue nil %>
+  <%= render partial: "spree/admin/promotions/rules/#{type_name}", locals: { promotion_rule: promotion_rule, param_prefix: param_prefix } %>
 </div>

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

@@ -5,11 +5,11 @@
 </div>
 <div id="rule_fields" class="panel-body">
 
-  <%= form_tag spree.admin_promotion_promotion_rules_path(@promotion), :remote => true, :id => 'new_product_rule_form' do %>
+  <%= form_tag spree.admin_promotion_promotion_rules_path(@promotion), remote: true, id: 'new_product_rule_form' do %>
     
     <div class="form-group">
       <%= label_tag :promotion_rule_type, Spree.t(:add_rule_of_type) %>
-      <%= select_tag('promotion_rule[type]', options_for_promotion_rule_types(@promotion), :class => 'select2') %>
+      <%= select_tag('promotion_rule[type]', options_for_promotion_rule_types(@promotion), class: 'select2') %>
     </div>
     <div class="form-actions">
       <%= button Spree.t(:add), 'plus', 'submit', class: "btn-success" %>
@@ -17,7 +17,7 @@
 
   <% end %>
 
-  <%= form_for @promotion, :url => object_url, :method => :put do |f| %>
+  <%= form_for @promotion, url: object_url, method: :put do |f| %>
     <div id="promotion-policy-select">
       <% Spree::Promotion::MATCH_POLICIES.each do |policy| %>
         <div class="radio">
@@ -31,7 +31,7 @@
 
     <div id="rules" class="filter_list margint">
       <% if @promotion.rules.any? %>
-        <%= render :partial => 'promotion_rule', :collection => @promotion.rules, :locals => {} %>
+        <%= render partial: 'promotion_rule', collection: @promotion.rules, locals: {} %>
       <% else %>
         <div class="alert alert-warning">
           <%= Spree.t(:no_rules_added) %>

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

@@ -5,7 +5,7 @@
       <%= 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' %>
+                     class: 'type-select select2' %>
     </div>
     <% unless promotion_action.new_record? %>
       <div class="form-group col-md-6 no-marginb settings">

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

@@ -5,7 +5,7 @@
       <%= 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' %>
+                    class: 'type-select select2' %>
     </div>
     <% unless promotion_action.new_record? %>
       <div class="form-group col-md-6 no-marginb settings">
@@ -14,7 +14,7 @@
           <%= 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)) %>
+                                   type: promotion_action.calculator.preference_type(key)) %>
         <% end %>
         <%= hidden_field_tag "#{param_prefix}[calculator_attributes][id]", promotion_action.calculator.id %>
       </div>

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

@@ -1,6 +1,6 @@
 <div class="panel-body calculator-fields">
   <% promotion_action.promotion_action_line_items.each do |item| %>
-    <strong><%= item.quantity %> x <%= item.variant.product.name %></strong>
+    <strong><%= item.quantity %> x <%= item.name %></strong>
     <%= item.variant.options_text %>
   <% end %>
 

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

@@ -3,11 +3,11 @@
   <%= @promotion.name %>
 <% end %>
 
-<%= form_for @promotion, :url => object_url, :method => :put do |f| %>
+<%= form_for @promotion, url: object_url, method: :put do |f| %>
   <div class="row">
     <div class="col-md-12">
-      <%= render :partial => 'form', :locals => { :f => f } %>
-      <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+      <%= render partial: 'form', locals: { f: f } %>
+      <%= render partial: 'spree/admin/shared/edit_resource_links' %>
     </div>
   </div>
 
@@ -16,15 +16,15 @@
 <div id="promotion-filters" class="row">
   <div id="rules_container" class="col-md-6">
     <div class="panel panel-default">
-      <%= render :partial => 'rules' %>
+      <%= render partial: 'rules' %>
     </div>
   </div>
 
   <div id="actions_container" class="col-md-6">
     <div class="panel panel-default">
-      <%= render :partial => 'actions' %>
+      <%= render partial: 'actions' %>
     </div>
   </div>
 </div>
 
-<%= render :partial => "spree/admin/variants/autocomplete", :formats => [:js] %>
+<%= render partial: "spree/admin/variants/autocomplete", formats: [:js] %>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_promotion), new_object_url, :class => "btn-success", :icon => 'add' %>
+  <%= button_link_to Spree.t(:new_promotion), new_object_url, class: "btn-success", icon: 'add' %>
 <% end %>
 
 <% content_for :table_filter do %>
@@ -30,7 +30,7 @@
 
           <div class="form-group">
             <%= label_tag :q_promotion_category_id_eq, Spree.t(:promotion_category) %>
-            <%= f.collection_select(:promotion_category_id_eq, @promotion_categories, :id, :name, { :include_blank => Spree.t('match_choices.all') }, { :class => 'select2' }) %>
+            <%= f.collection_select(:promotion_category_id_eq, @promotion_categories, :id, :name, { include_blank: Spree.t('match_choices.all') }, { class: 'select2' }) %>
           </div>
         </div>
       </div>
@@ -64,11 +64,11 @@
           <td><%= promotion.code %></td>
           <td><%= promotion.description %></td>
           <td><%= promotion.usage_limit.nil? ? "∞" : promotion.usage_limit  %></td>
-          <td><%= Spree.t(:current_promotion_usage, :count => promotion.credits_count) %></td>
+          <td><%= Spree.t(:current_promotion_usage, count: promotion.credits_count) %></td>
           <td><%= promotion.expires_at.to_date.to_s(:short_date) if promotion.expires_at %></td>
           <td class="actions actions-2">
-            <%= link_to_edit promotion, :no_text => true %>
-            <%= link_to_delete promotion, :no_text => true %>
+            <%= link_to_edit promotion, no_text: true %>
+            <%= link_to_delete promotion, no_text: true %>
           </td>
         </tr>
       <% end %>

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

@@ -3,9 +3,9 @@
   <%= Spree.t(:new_promotion) %>
 <% end %>
 
-<%= form_for :promotion, :url => collection_url do |f| %>
-  <%= render :partial => 'form', :locals => { :f => f } %>
+<%= form_for :promotion, url: collection_url do |f| %>
+  <%= render partial: 'form', locals: { f: f } %>
   <div class="text-center">
-    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+    <%= render partial: 'spree/admin/shared/new_resource_links' %>
   </div>
 <% end %>

data/app/views/spree/admin/promotions/rules/_country.html.erb

@@ -0,0 +1,6 @@
+<div class="panel-body">
+  <div class="form-group no-marginb">
+    <%= label_tag Spree.t('country_rule.label') %>
+    <%= select_tag("#{param_prefix}[preferred_country_id]", options_for_select(Spree::Country.pluck(:name, :id), promotion_rule.preferred_country_id), { class: 'select_product form-control' }) %>
+  </div>
+</div>

data/app/views/spree/admin/promotions/rules/_landing_page.html.erb

@@ -1,7 +1,7 @@
 <div class="panel-body">
   <div class="form-group">
     <label for="<%= "#{param_prefix}_preferred_path" %>"><%= Spree.t('promotion_rule_types.landing_page.description') %>:</label>
-    <%= text_field_tag "#{param_prefix}[preferred_path]", promotion_rule.preferred_path, :class => 'form-control' %>
+    <%= text_field_tag "#{param_prefix}[preferred_path]", promotion_rule.preferred_path, class: 'form-control' %>
     <p class="help-block">
       <%= Spree.t('landing_page_rule.must_have_visited_path') %>
     </p>

data/app/views/spree/admin/promotions/rules/_product.html.erb

@@ -1,10 +1,10 @@
 <div class="panel-body">
   <div class="form-group products_rule_products">
     <%= label_tag "#{param_prefix}_product_ids_string", Spree.t('product_rule.choose_products') %>
-    <%= hidden_field_tag "#{param_prefix}[product_ids_string]", promotion_rule.product_ids.join(","), :class => "product_picker" %>
+    <%= hidden_field_tag "#{param_prefix}[product_ids_string]", promotion_rule.product_ids.join(","), class: "product_picker" %>
   </div>
   <div class="form-group no-marginb">
     <%= label_tag Spree.t('product_rule.label') %>
-    <%= select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::Product::MATCH_POLICIES.map{|s| [Spree.t("product_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy), {:class => 'select_product form-control'}) %>
+    <%= select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::Product::MATCH_POLICIES.map{|s| [Spree.t("product_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy), {class: 'select_product form-control'}) %>
   </div>
 </div>

data/app/views/spree/admin/promotions/rules/_taxon.html.erb

@@ -1,10 +1,10 @@
 <div class="panel-body">
   <div class="form-group taxons_rule_taxons">
     <%= label_tag "#{param_prefix}_taxon_ids_string", Spree.t('taxon_rule.choose_taxons') %>
-    <%= hidden_field_tag "#{param_prefix}[taxon_ids_string]", promotion_rule.taxon_ids.join(","), :class => "taxon_picker", id: 'product_taxon_ids' %>
+    <%= hidden_field_tag "#{param_prefix}[taxon_ids_string]", promotion_rule.taxon_ids.join(","), class: "taxon_picker", id: 'product_taxon_ids' %>
   </div>
   <div class="form-group no-marginb">
     <%= label_tag Spree.t('taxon_rule.label') %>
-    <%= select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::Taxon::MATCH_POLICIES.map{|s| [Spree.t("taxon_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy), {:class => 'select_taxon form-control'}) %>
+    <%= select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::Taxon::MATCH_POLICIES.map{|s| [Spree.t("taxon_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy), {class: 'select_taxon form-control'}) %>
   </div>
 </div>

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

@@ -2,14 +2,14 @@
   <div class="col-md-6">
     <%= f.field_container :name, class: ['form-group'] do %>
       <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
-      <%= f.text_field :name, :class => 'form-control' %>
+      <%= f.text_field :name, class: 'form-control' %>
       <%= f.error_message_on :name %>
     <% end %>
   </div>
   <div class="col-md-6">
     <%= f.field_container :presentation, class: ['form-group'] do %>
       <%= f.label :presentation, Spree.t(:presentation) %> <span class="required">*</span>
-      <%= f.text_field :presentation, :class => 'form-control' %>
+      <%= f.text_field :presentation, class: 'form-control' %>
       <%= f.error_message_on :presentation %>
     <% end %>
   </div>

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

@@ -3,11 +3,11 @@
   <%= @property.name %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @property } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @property } %>
 
 <%= form_for [:admin, @property] do |f| %>
   <fieldset>
-    <%= render :partial => 'form', :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/edit_resource_links' %>
   </fieldset>
 <% end %>