solidus_backend 2.1.1 → 2.2.0.beta1

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

@@ -16,31 +16,31 @@
   <div data-hook="admin_promotions_index_search">
     <%= search_form_for [:admin, @search] do |f| %>
       <div class="row">
-        <div class="col-xs-3">
+        <div class="col-3">
           <div class="field">
             <%= label_tag :q_name_cont, Spree::Promotion.human_attribute_name(:name) %>
             <%= f.text_field :name_cont, tabindex: 1 %>
           </div>
         </div>
 
-        <div class="col-xs-3">
+        <div class="col-3">
           <div class="field">
             <%= label_tag :q_codes_value_cont, Spree::Promotion.human_attribute_name(:code) %>
             <%= f.text_field :codes_value_cont, tabindex: 1 %>
           </div>
         </div>
 
-        <div class="col-xs-3">
+        <div class="col-3">
           <div class="field">
             <%= label_tag :q_path_cont, Spree::Promotion.human_attribute_name(:path) %>
             <%= f.text_field :path_cont, tabindex: 1 %>
           </div>
         </div>
 
-        <div class="col-xs-3">
+        <div class="col-3">
           <div class="field">
             <%= label_tag :q_promotion_category_id_eq, Spree::PromotionCategory.model_name.human %><br>
-            <%= f.collection_select(:promotion_category_id_eq, @promotion_categories, :id, :name, { :include_blank => Spree.t('match_choices.all') }, { :class => 'select2 fullwidth' }) %>
+            <%= f.collection_select(:promotion_category_id_eq, @promotion_categories, :id, :name, { include_blank: Spree.t('match_choices.all') }, { class: 'select2 fullwidth' }) %>
           </div>
         </div>
       </div>
@@ -88,14 +88,14 @@
           <td class="align-center"><%= (promotion.codes.size == 1) ? promotion.codes.first.try!(:value) : Spree.t(:number_of_codes, count: promotion.codes.size) %></td>
           <td><%= promotion.description %></td>
           <td class="align-center"><%= promotion.usage_limit.nil? ? "∞" : promotion.usage_limit  %></td>
-          <td class="align-center"><%= Spree.t(:current_promotion_usage, :count => promotion.usage_count) %></td>
+          <td class="align-center"><%= Spree.t(:current_promotion_usage, count: promotion.usage_count) %></td>
           <td class="align-center"><%= promotion.expires_at.to_date.to_s(:short_date) if promotion.expires_at %></td>
           <td class="actions">
             <% if can?(:edit, promotion) %>
-              <%= link_to_edit promotion, :no_text => true %>
+              <%= link_to_edit promotion, no_text: true %>
             <% end %>
             <% if can?(:destroy, promotion) %>
-              <%= link_to_delete promotion, :no_text => true %>
+              <%= link_to_delete promotion, no_text: true %>
             <% end %>
           </td>
         </tr>
@@ -103,7 +103,7 @@
     </tbody>
   </table>
 <% else %>
-  <div class="col-xs-9 no-objects-found">
+  <div class="col-9 no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::Promotion,
                  new_resource_url: new_object_url %>

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

@@ -1,10 +1,9 @@
+<% admin_layout "full-width" %>
+
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Promotion), spree.admin_promotions_path) %>
 <% admin_breadcrumb(Spree.t(:new_promotion)) %>
 
-
-<%= form_for @promotion, :url => collection_url do |f| %>
-  <fieldset class="no-border-top">
-    <%= render :partial => 'form', :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
-  </fieldset>
+<%= form_for @promotion, url: collection_url do |f| %>
+  <%= render partial: 'form', locals: { f: f } %>
+  <%= render partial: 'spree/admin/shared/new_resource_links' %>
 <% end %>

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

@@ -1,13 +1,13 @@
 <div class="row">
-  <div class="col-xs-6">
+  <div class="col-6">
     <div class="field">
       <%= Spree.t(:form_text, scope: "promotion_rule_types.first_repeat_purchase_since")  %>
     </div>
   </div>
 
-  <div class="col-xs-6">
+  <div class="col-6">
     <div class="field">
-      <%= number_field_tag "#{param_prefix}[preferred_days_ago]", promotion_rule.preferred_days_ago, :class => 'fullwidth' %>
+      <%= number_field_tag "#{param_prefix}[preferred_days_ago]", promotion_rule.preferred_days_ago, class: 'fullwidth' %>
     </div>
   </div>
 </div>

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

@@ -1,18 +1,15 @@
-<div class="col-xs-12">
+<div class="col-12">
   <div class="row">
-    <div class="col-xs-4">
+    <div class="col-6">
       <div class="field">
-        <%= select_tag "#{param_prefix}[preferred_operator]", options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS.map{|o| [Spree.t("item_total_rule.operators.#{o}"),o]}, promotion_rule.preferred_operator), {:class => 'select2 select_item_total fullwidth'} %>
+        <%= select_tag "#{param_prefix}[preferred_operator]", options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS.map{|o| [Spree.t("item_total_rule.operators.#{o}"),o]}, promotion_rule.preferred_operator), {class: 'select2 select_item_total fullwidth'} %>
       </div>
     </div>
-    <div class="col-xs-4">
+    <div class="col-6">
       <div class="field">
-        <%= text_field_tag "#{param_prefix}[preferred_amount]", promotion_rule.preferred_amount, :class => 'fullwidth' %>
-      </div>
-    </div>
-    <div class="col-xs-4">
-      <div class="field">
-        <%= text_field_tag "#{param_prefix}[preferred_currency]", promotion_rule.preferred_currency, :class => 'fullwidth' %>
+        <%= fields_for param_prefix, promotion_rule do |f| %>
+          <%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :preferred_amount, currency_attr: :preferred_currency %>
+        <% end %>
       </div>
     </div>
   </div>

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

@@ -1,7 +1,7 @@
-<div class="col-xs-12">
+<div class="col-12">
   <div class="field">
     <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 => 'fullwidth' %>  
+    <%= text_field_tag "#{param_prefix}[preferred_path]", promotion_rule.preferred_path, class: 'fullwidth' %>  
     <span class="info"><%= Spree.t('landing_page_rule.must_have_visited_path') %></span>
   </div>
 </div>

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

@@ -1,13 +1,13 @@
-<div class="col-xs-12">
+<div class="col-12">
   <div class="row">
-    <div class="col-xs-6">
+    <div class="col-6">
       <div class="field">
         <%= Spree.t(:form_text, scope: "promotion_rule_types.nth_order")  %>
       </div>
     </div>
-    <div class="col-xs-6">
+    <div class="col-6">
       <div class="field">
-        <%= number_field_tag "#{param_prefix}[preferred_nth_order]", promotion_rule.preferred_nth_order, :class => 'fullwidth' %>
+        <%= number_field_tag "#{param_prefix}[preferred_nth_order]", promotion_rule.preferred_nth_order, class: 'fullwidth' %>
       </div>
     </div>
   </div>

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

@@ -1,9 +1,9 @@
-<div class="col-xs-12">
+<div class="col-12">
   <div class="field promo-rule-option-values">
     <div class="param-prefix hidden" data-param-prefix="<%= param_prefix %>"></div>
     <div class="row">
-      <div class="col-xs-6"><%= label_tag nil, Spree::Product.model_name.human %></div>
-      <div class="col-xs-6"><%= label_tag nil, plural_resource_name(Spree::OptionValue) %></div>
+      <div class="col-6"><%= label_tag nil, Spree::Product.model_name.human %></div>
+      <div class="col-6"><%= label_tag nil, plural_resource_name(Spree::OptionValue) %></div>
     </div>
     <div class="clear"></div>
 

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

@@ -1,13 +1,13 @@
-<div class="col-xs-12">
+<div class="col-12">
   <div class="field 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 fullwidth" %>
+    <%= hidden_field_tag "#{param_prefix}[product_ids_string]", promotion_rule.product_ids.join(","), class: "product_picker fullwidth" %>
   </div>
 </div>
-<div class="col-xs-12">
+<div class="col-12">
   <div class="field">
     <label>
-      <%= Spree.t('product_rule.label', :select => 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 select2'})).html_safe %>
+      <%= Spree.t('product_rule.label', select: 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 select2'})).html_safe %>
     </label>
   </div>
 </div>

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

@@ -1,14 +1,14 @@
   <div class="row">
-    <div class="col-xs-11">
+    <div class="col-11">
       <div class="field 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 fullwidth", id: 'product_taxon_ids' %>
+        <%= hidden_field_tag "#{param_prefix}[taxon_ids_string]", promotion_rule.taxon_ids.join(","), class: "taxon_picker fullwidth", id: 'product_taxon_ids' %>
       </div>
     </div>
-    <div class="col-xs-12">
+    <div class="col-12">
       <div class="field">
         <label>
-          <%= Spree.t('taxon_rule.label', :select => 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 select2'})).html_safe %>
+          <%= Spree.t('taxon_rule.label', select: 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 select2'})).html_safe %>
         </label>
       </div>
     </div>

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

@@ -1,4 +1,4 @@
-<div class="col-xs-12">
+<div class="col-12">
   <div class="field">
     <label><%= Spree.t('user_rule.choose_users') %></label><br>
     <input type='hidden' name='<%= param_prefix %>[user_ids_string]' class='user_picker fullwidth' value='<%= promotion_rule.user_ids.join(",") %>'>

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

@@ -1,15 +1,15 @@
 <div data-hook="admin_property_form" class="align-center row">
-  <div class="col-xs-6">
+  <div class="col-6">
     <%= f.field_container :name do %>
       <%= f.label :name, class: 'required' %><br />
-      <%= f.text_field :name, :class => 'fullwidth' %>
+      <%= f.text_field :name, class: 'fullwidth' %>
       <%= f.error_message_on :name %>
     <% end %>
   </div>
-  <div class="col-xs-6">
+  <div class="col-6">
     <%= f.field_container :presentation do %>
       <%= f.label :presentation, class: 'required' %><br />
-      <%= f.text_field :presentation, :class => 'fullwidth' %>
+      <%= f.text_field :presentation, class: 'fullwidth' %>
       <%= f.error_message_on :presentation %>
     <% end %>
   </div>

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

@@ -3,11 +3,11 @@
 <% admin_breadcrumb(@property.name) %>
 
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @property } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @property } %>
 
 <%= form_for [:admin, @property] do |f| %>
   <fieldset class="no-border-top">
-    <%= 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/properties/index.html.erb

@@ -5,7 +5,7 @@
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Property) %>
     <li id="new_property_link">
-      <%= button_link_to Spree.t(:new_property), new_admin_property_url, { :remote => true, :id => 'new_property_link' } %>
+      <%= button_link_to Spree.t(:new_property), new_admin_property_url, { remote: true, id: 'new_property_link' } %>
     </li>
   <% end %>
 <% end %>
@@ -19,14 +19,14 @@
 
     <%= search_form_for [:admin, @search] do |f| %>
 
-        <%- locals = {:f => f} %>
+        <%- locals = {f: f} %>
 
         <div data-hook="admin_property_index_search">
           <div class="row">
-            <div class="col-xs-6">
+            <div class="col-6">
               <div class="field">
                 <%= f.label :name_cont, Spree.t(:name) %>
-                <%= f.text_field :name_cont, :size => 15 %>
+                <%= f.text_field :name_cont, size: 15 %>
               </div>
             </div>
           </div>
@@ -64,10 +64,10 @@
         <td style="padding-left:1em"><%= property.presentation %></td>
         <td class="actions">
           <% if can?(:update, property) %>
-            <%= link_to_edit(property, :no_text => true) %>
+            <%= link_to_edit(property, no_text: true) %>
           <% end %>
           <% if can?(:destroy, property) %>
-            <%= link_to_delete(property, :no_text => true) %>
+            <%= link_to_delete(property, no_text: true) %>
           <% end %>
         </td>
       </tr>
@@ -75,7 +75,7 @@
   </tbody>
 </table>
 <% else %>
-  <div class="col-xs-9 no-objects-found">
+  <div class="col-9 no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::Property,
                  new_resource_url: new_object_url %>

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

@@ -1,11 +1,11 @@
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @property } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @property } %>
 
 <%= form_for [:admin, @property] do |f| %>
 <fieldset data-hook="new_property">
   <legend align="center"><%= Spree.t(:new_property) %></legend>
-  <%= render :partial => 'form', :locals => { :f => f } %>
+  <%= render partial: 'form', locals: { f: f } %>
   <div class="filter-actions">
-    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+    <%= render partial: 'spree/admin/shared/new_resource_links' %>
   </div>
 </fieldset>
 <% end %>

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

@@ -1,2 +1,2 @@
-$("#new_property_container").html('<%= escape_javascript(render :template => "spree/admin/properties/new", :formats => [:html], :handlers => [:erb]) %>');
+$("#new_property_container").html('<%= escape_javascript(render template: "spree/admin/properties/new", formats: [:html], handlers: [:erb]) %>');
 $("#new_property_link").parent().hide();

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

@@ -8,11 +8,11 @@
 <% content_for :page_actions do %>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @object } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @object } %>
 
 <%= form_for [:admin, @refund_reason] do |f| %>
   <fieldset class="no-border-top">
-    <%= render :partial => 'spree/admin/refund_reasons/shared/form', :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+    <%= render partial: 'spree/admin/refund_reasons/shared/form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/edit_resource_links' %>
   </fieldset>
 <% end %>

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

@@ -48,7 +48,7 @@
     </tbody>
   </table>
 <% else %>
-  <div class="col-xs-9 no-objects-found">
+  <div class="col-9 no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::RefundReason,
                  new_resource_url: new_object_url %>

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

@@ -9,11 +9,11 @@
 <% content_for :page_actions do %>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @object } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @object } %>
 
 <%= form_for [:admin, @refund_reason] do |f| %>
   <fieldset class="no-border-top">
-    <%= render :partial => 'spree/admin/refund_reasons/shared/form', :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+    <%= render partial: 'spree/admin/refund_reasons/shared/form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/new_resource_links' %>
   </fieldset>
 <% end %>

data/app/views/spree/admin/refund_reasons/shared/_form.html.erb

@@ -1,13 +1,13 @@
 <div data-hook="admin_named_type_form_fields" class="row">
-  <div class="col-xs-3">
+  <div class="col-3">
     <%= f.field_container :name do %>
       <%= f.label :name, class: 'required' %><br />
-      <%= f.text_field :name, :class => 'fullwidth' %>
+      <%= f.text_field :name, class: 'fullwidth' %>
     <% end %>
 
     <%= f.field_container :code do %>
       <%= f.label :code, class: 'required' %><br />
-      <%= f.text_field :code, :class => 'fullwidth' %>
+      <%= f.text_field :code, class: 'fullwidth' %>
 
     <% end %>
     <div class="checkbox">

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

@@ -7,13 +7,13 @@
 <%= form_for [:admin, @refund.payment.order, @refund.payment, @refund] do |f| %>
   <fieldset class="no-border-top">
     <div data-hook="admin_refund_form_fields" class="row">
-      <div class="col-xs-3">
+      <div class="col-3">
         <div class="field">
           <%= f.label :amount %><br/>
           <%= @refund.amount %>
         </div>
       </div>
-      <div class="col-xs-3">
+      <div class="col-3">
         <div class="field">
           <%= f.label :refund_reason_id %><br/>
           <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {}, {class: 'select2 fullwidth'}) %>

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

@@ -8,25 +8,25 @@
 <%= form_for [:admin, @refund.payment.order, @refund.payment, @refund] do |f| %>
   <fieldset class="no-border-top">
     <div data-hook="admin_refund_form_fields" class="row">
-      <div class="col-xs-3">
+      <div class="col-3">
         <div class="field">
           <%= Spree.t(:payment_amount) %><br/>
           <%= @refund.payment.amount %>
         </div>
       </div>
-      <div class="col-xs-3">
+      <div class="col-3">
         <div class="field">
           <%= Spree.t(:credit_allowed) %><br/>
           <%= @refund.payment.credit_allowed %>
         </div>
       </div>
-      <div class="col-xs-3">
+      <div class="col-3">
         <div class="field">
           <%= f.label :amount %><br/>
           <%= f.text_field :amount, class: 'fullwidth' %>
         </div>
       </div>
-      <div class="col-xs-3">
+      <div class="col-3">
         <div class="field">
           <%= f.label :refund_reason_id %><br/>
           <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {include_blank: true}, {class: 'select2 fullwidth'}) %>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Customer Returns' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Customer Returns' } %>
 
 <% admin_breadcrumb("#{Spree.t(:editing_reimbursement)} #{@reimbursement.number}") %>
 
@@ -7,7 +7,7 @@
   <li><%= button_link_to Spree.t(:back_to_customer_return), url_for([:edit, :admin, @order, @reimbursement.customer_return]) %></li>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @reimbursement } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @reimbursement } %>
 
 <%= form_for [:admin, @order, @reimbursement] do |f| %>
   <fieldset class='no-border-bottom'>
@@ -16,11 +16,11 @@
       <thead>
         <tr>
           <th><%= Spree::Product.model_name.human %></th>
-          <th><%= Spree::ReturnItem.human_attribute_name(:preferred_reimbursement_type_id) %></th>
-          <th><%= Spree::ReturnItem.human_attribute_name(:override_reimbursement_type_id) %></th>
-          <th><%= Spree::ReturnItem.human_attribute_name(:amount) %></th>
+          <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:preferred_reimbursement_type_id) %></th>
+          <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:override_reimbursement_type_id) %></th>
+          <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:amount) %></th>
           <th><%= Spree::ReturnItem.human_attribute_name(:total) %></th>
-          <th><%= Spree::ReturnItem.human_attribute_name(:exchange_variant) %></th>
+          <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:exchange_variant) %></th>
         </tr>
       </thead>
       <tbody>