solidus_backend 2.1.1 → 2.2.0.beta1

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Creditcards' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Creditcards' } %>
 
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Payment), spree.admin_order_payments_path(@order)) %>
 <% admin_breadcrumb(Spree::Refund.model_name.human) %>

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

@@ -18,16 +18,16 @@
 
   <fieldset data-hook="payment_list" class="no-border-bottom">
     <legend align="center"><%= plural_resource_name(Spree::Payment) %></legend>
-    <%= render :partial => 'list', :locals => { :payments => @payments } %>
+    <%= render partial: 'list', locals: { payments: @payments } %>
   </fieldset>
 
   <% if @refunds.any? %>
     <fieldset data-hook="payment_list" class="no-border-bottom">
       <legend align="center"><%= plural_resource_name(Spree::Refund) %></legend>
-      <%= render :partial => 'spree/admin/shared/refunds', :locals => { :refunds => @refunds, show_actions: true } %>
+      <%= render partial: 'spree/admin/shared/refunds', locals: { refunds: @refunds, show_actions: true } %>
     </fieldset>
   <% end %>
 
 <% else %>
-  <div class="col-xs-9 no-objects-found"><%= Spree.t(:order_has_no_payments) %></div>
+  <div class="col-9 no-objects-found"><%= Spree.t(:order_has_no_payments) %></div>
 <% end %>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Payments' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Payments' } %>
 
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Payment), spree.admin_order_payments_path(@order)) %>
 <% admin_breadcrumb(Spree.t(:new_payment)) %>
@@ -8,11 +8,11 @@
 <% end %>
 
 <% if @payment_methods.any? %>
-  <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @payment } %>
+  <%= render partial: 'spree/shared/error_messages', locals: { target: @payment } %>
 
-  <%= form_for @payment, :url => admin_order_payments_path(@order) do |f| %>
+  <%= form_for @payment, url: admin_order_payments_path(@order) do |f| %>
     <fieldset class="no-border-top">
-      <%= render :partial => 'form', :locals => { :f => f } %>
+      <%= render partial: 'form', locals: { f: f } %>
 
       <div class="filter-actions actions" data-hook="buttons">
         <%= button @order.cart? ? Spree.t('actions.continue') : Spree.t('actions.update') %>

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

@@ -1,10 +1,10 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Payments' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Payments' } %>
 
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Payment), spree.admin_order_payments_path(@order)) %>
 <% admin_breadcrumb do %>
   <%= payment_method_name(@payment) %>
   <span class="state <%= @payment.state %>">
-    <%= Spree.t(@payment.state, :scope => :payment_states, :default => @payment.state.capitalize) %>
+    <%= Spree.t(@payment.state, scope: :payment_states, default: @payment.state.capitalize) %>
   </span>
 <% end %>
 
@@ -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.method_type}", 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

@@ -14,12 +14,12 @@
     <div class="clear"></div>
 
     <div class="row">
-      <div class="col-xs-5">
+      <div class="col-5">
         <div data-hook="card_number">
           <div class="field">
             <%= 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 %>
+            <%= 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>
@@ -28,7 +28,7 @@
           </div>
         </div>
       </div>
-      <div class="col-xs-5">
+      <div class="col-5">
         <div data-hook="card_name">
           <div class="field">
             <%= label_tag "card_name#{payment_method.id}", Spree::CreditCard.human_attribute_name(:name), class: 'required' %>
@@ -36,19 +36,16 @@
           </div>
         </div>
       </div>
-      <div class="col-xs-4">
+      <div class="col-4">
         <div data-hook="card_expiration" class="field">
           <%= label_tag "card_expiry#{payment_method.id}", Spree::CreditCard.human_attribute_name(:expiration), class: 'required' %>
           <%= text_field_tag "#{param_prefix}[expiry]", '', id: "card_expiry#{payment_method.id}", class: "required cardExpiry", placeholder: "MM / YY" %>
         </div>
       </div>
-      <div class="col-xs-3">
+      <div class="col-3">
         <div data-hook="card_code" class="field">
           <%= label_tag "card_code#{payment_method.id}", Spree::CreditCard.human_attribute_name(:card_code), class: 'required' %>
           <%= text_field_tag "#{param_prefix}[verification_value]", '', id: "card_code#{payment_method.id}", class: 'required fullwidth cardCode', size: 5 %>
-          <a href="/content/cvv" class="info cvvLink" target="_blank">
-            (<%= Spree.t(:what_is_this) %>)
-          </a>
         </div>
       </div>
     </div>
@@ -58,7 +55,7 @@
     <%= label_tag "card_address#{payment_method.id}", Spree.t(:billing_address) %>
     <% address = @order.bill_address || @order.ship_address || Spree::Address.build_default %>
     <%= fields_for "#{param_prefix}[address_attributes]", address do |f| %>
-      <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => f, :type => "billing" } %>
+      <%= render partial: 'spree/admin/shared/address_form', locals: { f: f, type: "billing" } %>
     <% end %>
 
     <div class="clear"></div>

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

@@ -2,7 +2,7 @@
   <legend align="center"><%= Spree::CreditCard.model_name.human %></legend>
 
   <div class="row">
-    <div class="col-xs-4">
+    <div class="col-4">
       <dl>
         <dt><%= Spree.t(:name_on_card) %>:</dt>
         <dd><%= payment.source.name %></dd>

data/app/views/spree/admin/payments/source_views/_storecredit.html.erb

@@ -2,7 +2,7 @@
   <legend align="center"><%= Spree::StoreCredit.model_name.human %></legend>
 
   <div class="row">
-    <div class="col-xs-4">
+    <div class="col-4">
       <dl>
         <dt><%= Spree::StoreCreditCategory.model_name.human %>:</dt>
         <dd><%= payment.source.category.name%></dd>

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

@@ -1,8 +1,7 @@
 <div data-hook="admin_product_price_fields">
 
   <div data-hook="admin_product_price_form">
-    <div class="row">
-      <div class="col-xs-3" data-hook="admin_product_price_form_variant">
+      <div data-hook="admin_product_price_form_variant" class="col-12">
         <%= f.field_container :variant do %>
           <%= f.label :variant %>
           <%= f.select :variant_id,
@@ -12,17 +11,7 @@
         <% end %>
       </div>
 
-      <div class="col-xs-2" data-hook="admin_product_price_form_currency">
-        <%= f.field_container :currency do %>
-          <%= f.label :currency %>
-          <%= f.select :currency,
-                      Money::Currency.all.map { |c| ["#{c.iso_code} (#{c.name})", c.iso_code] },
-                      {},
-                      class: "select2 fullwidth", disabled: !f.object.new_record? %>
-        <% end %>
-      </div>
-
-      <div class="col-xs-2" data-hook="admin_product_price_form_country">
+      <div data-hook="admin_product_price_form_country" class="col-12">
         <%= f.field_container :country do %>
           <%= f.label :country %>
           <%= f.field_hint :country %>
@@ -35,10 +24,10 @@
         <% end %>
       </div>
 
-      <div class="col-xs-2" data-hook="admin_product_price_form_amount">
+      <div data-hook="admin_product_price_form_amount" class="col-4">
         <%= f.field_container :price do %>
           <%= f.label :price %>
-          <%= f.text_field :price, value: f.object.money.format, class: 'fullwidth title' %>
+          <%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :price, currency_attr: :currency %>
         <% end %>
       </div>
   </div>

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

@@ -1,5 +1,5 @@
 <div class="row">
-  <div class="col-xs-12">
+  <div class="col-12">
     <fieldset class="no-border-bottom <%= "no-border-top" if !variants %>">
       <% if variants %>
         <legend align="center"><%= I18n.t(:master_variant, scope: :spree) %> <%= admin_hint I18n.t(:master_variant, scope: :spree), I18n.t(:master_variant, scope: [:spree, :hints, "spree/price"]) %></legend>
@@ -26,11 +26,11 @@
             <td class="align-right"><%= price.money.to_html %></td>
             <td class="actions">
               <% if can?(:update, price) %>
-                <%= link_to_edit(price, :no_text => true) unless price.deleted? %>
+                <%= link_to_edit(price, no_text: true) unless price.deleted? %>
               <% end %>
               <% if can?(:destroy, price) %>
                 &nbsp;
-                <%= link_to_delete(price, :no_text => true) unless price.deleted? %>
+                <%= link_to_delete(price, no_text: true) unless price.deleted? %>
               <% end %>
             </td>
           </tr>

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

@@ -21,11 +21,11 @@
           <td class="align-right"><%= price.money.to_html %></td>
           <td class="actions">
             <% if can?(:update, price) %>
-              <%= link_to_edit(price, :no_text => true) unless price.deleted? %>
+              <%= link_to_edit(price, no_text: true) unless price.deleted? %>
             <% end %>
             <% if can?(:destroy, price) %>
               &nbsp;
-              <%= link_to_delete(price, :no_text => true) unless price.deleted? %>
+              <%= link_to_delete(price, no_text: true) unless price.deleted? %>
             <% end %>
           </td>
         </tr>

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

@@ -6,7 +6,7 @@
     <%= render 'form', f: f %>
 
     <% if can?(:update, @product) %>
-      <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+      <%= render partial: 'spree/admin/shared/edit_resource_links' %>
     <% end %>
   </fieldset>
 <% end %>

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

@@ -2,7 +2,7 @@
 
 <% 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, { remote: true, id: 'admin_new_product' } %>
   </li>
 <% end if can?(:create, Spree::Product) %>
 
@@ -15,7 +15,7 @@
   <%= search_form_for [:admin, :product, @search] do |f| %>
 
   <div class="row">
-    <div class="col-xs-4">
+    <div class="col-4">
       <div class="field" data-hook="sku-select">
         <%= label_tag :q_variant_id_eq, Spree::Variant.model_name.human %>
         <%= f.select :variant_id_eq,
@@ -25,7 +25,7 @@
       </div>
     </div>
 
-    <div class="col-xs-2">
+    <div class="col-2">
       <div class="field" data-hook="currency-select">
         <%= label_tag :q_currency_eq, Spree::Price.human_attribute_name(:currency) %>
         <%= f.select :currency_eq,
@@ -35,7 +35,7 @@
       </div>
     </div>
 
-    <div class="col-xs-2">
+    <div class="col-2">
       <div class="field" data-hook="country-select">
         <%= label_tag :q_country_iso_eq, Spree::Price.human_attribute_name(:country) %>
         <%= f.select :country_iso_eq,
@@ -45,14 +45,14 @@
       </div>
     </div>
 
-    <div class="col-xs-2">
+    <div class="col-2">
       <div class="field">
         <%= label_tag :q_amount_gt, t(".amount_greater_than") %>
         <%= f.text_field :amount_gt %>
       </div>
     </div>
 
-    <div class="col-xs-2">
+    <div class="col-2">
       <div class="field">
         <%= label_tag :q_amount_lt, t(".amount_less_than") %>
         <%= f.text_field :amount_lt %>

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

@@ -1,7 +1,7 @@
 <%= form_for [:admin, @product, @product.prices.build] do |f| %>
   <fieldset data-hook="admin_product_price_new_form">
     <legend><%= t('.new_price') %></legend>
-    <%= 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/prices/new.js.erb

@@ -1,2 +1,2 @@
-$(".js-content-below-tabs").html('<%= escape_javascript(render :template => 'spree/admin/prices/new', :formats => [:html], :handlers => [:erb]) %>');
+$(".js-content-below-tabs").html('<%= escape_javascript(render template: 'spree/admin/prices/new', formats: [:html], handlers: [:erb]) %>');
 $(".js-content-below-tabs .select2").select2();

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

@@ -1,5 +1,5 @@
-<%= render 'spree/admin/shared/product_tabs', :current => 'Product Properties' %>
-<%= render 'spree/shared/error_messages', :target => @product %>
+<%= render 'spree/admin/shared/product_tabs', current: 'Product Properties' %>
+<%= render 'spree/shared/error_messages', target: @product %>
 
 <% admin_breadcrumb(plural_resource_name(Spree::ProductProperty)) %>
 
@@ -7,13 +7,13 @@
   <% if can?(:create, Spree::ProductProperty) %>
     <ul class="tollbar inline-menu">
       <li>
-        <%= link_to_add_fields Spree.t(:add_product_properties), 'tbody#product_properties', :class => 'plus button' %>
+        <%= link_to_add_fields Spree.t(:add_product_properties), 'tbody#product_properties', class: 'plus button' %>
       </li>
     </ul>
   <% end %>
 <% end %>
 
-<%= form_for @product, :url => admin_product_url(@product), :method => :put do |f| %>
+<%= form_for @product, url: admin_product_url(@product), method: :put do |f| %>
   <fieldset>
     <legend align="center"><%= plural_resource_name(Spree::ProductProperty) %></legend>
     <div class="add_product_properties" data-hook="add_product_properties"></div>
@@ -28,7 +28,7 @@
       </thead>
       <tbody id="product_properties" data-hook>
         <%= f.fields_for :product_properties do |pp_form| %>
-          <%= render 'product_property_fields', :f => pp_form %>
+          <%= render 'product_property_fields', f: pp_form %>
         <% end %>
       </tbody>
     </table>

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

@@ -2,11 +2,11 @@
 
   <div class="row">
 
-    <div class="left col-xs-9" data-hook="admin_product_form_left">
+    <div class="left col-9" data-hook="admin_product_form_left">
       <div data-hook="admin_product_form_name">
         <%= f.field_container :name do %>
           <%= f.label :name, class: 'required' %>
-          <%= f.text_field :name, :class => 'fullwidth title', :required => true %>
+          <%= f.text_field :name, class: 'fullwidth title', required: true %>
           <%= f.error_message_on :name %>
         <% end %>
       </div>
@@ -14,7 +14,7 @@
       <div data-hook="admin_product_form_slug">
         <%= f.field_container :slug do %>
           <%= f.label :slug, class: 'required' %>
-          <%= f.text_field :slug, :class => 'fullwidth title', :required => true %>
+          <%= f.text_field :slug, class: 'fullwidth title', required: true %>
           <%= f.error_message_on :slug %>
         <% end %>
       </div>
@@ -22,17 +22,17 @@
       <div data-hook="admin_product_form_description">
         <%= f.field_container :description do %>
           <%= f.label :description %>
-          <%= f.text_area :description, {:rows => "#{unless @product.has_variants? then '22' else '15' end}", :class => 'fullwidth'} %>
+          <%= f.text_area :description, {rows: "#{unless @product.has_variants? then '22' else '15' end}", class: 'fullwidth'} %>
           <%= f.error_message_on :description %>
         <% end %>
       </div>
     </div>
 
-    <div class="right col-xs-3" data-hook="admin_product_form_right">
+    <div class="right col-3" data-hook="admin_product_form_right">
       <div data-hook="admin_product_form_price">
         <%= f.field_container :price do %>
           <%= f.label :price, class: 'required' %>
-          <%= f.text_field :price, :value => number_to_currency(@product.price, :unit => ''), :required => true %>
+          <%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :price, currency: @product.find_or_build_master.default_price.currency %>
           <%= f.error_message_on :price %>
         <% end %>
       </div>
@@ -44,22 +44,16 @@
 
       <div class="row">
 
-        <div data-hook="admin_product_form_cost_price" class="col-xs-6">
+        <div data-hook="admin_product_form_cost_price" class="col-12">
           <%= f.field_container :cost_price do %>
             <%= f.label :cost_price %>
-            <%= f.text_field :cost_price, :value => number_to_currency(@product.cost_price, :unit => '') %>
-            <%= f.error_message_on :cost_price %>
-          <% end %>
-        </div>
 
-        <div data-hook="admin_product_form_cost_currency" class="col-xs-6">
-          <%= f.field_container :cost_currency do %>
-            <%= f.label :cost_currency %>
-            <%= f.text_field :cost_currency %>
+            <%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :cost_price, currency_attr: :cost_currency %>
+
+            <%= f.error_message_on :cost_price %>
             <%= f.error_message_on :cost_currency %>
           <% end %>
         </div>
-
       </div>
 
       <div class="clear"></div>
@@ -68,7 +62,7 @@
         <%= f.field_container :available_on do %>
           <%= f.label :available_on %>
           <%= f.error_message_on :available_on %>
-          <%= f.text_field :available_on, :value => datepicker_field_value(@product.available_on), :class => 'datepicker' %>
+          <%= f.text_field :available_on, value: datepicker_field_value(@product.available_on), class: 'datepicker' %>
         <% end %>
       </div>
 
@@ -105,13 +99,13 @@
         <div data-hook="admin_product_form_sku">
           <%= f.field_container :sku do %>
             <%= f.label :sku, Spree::Variant.human_attribute_name(:sku) %>
-            <%= f.text_field :sku, :size => 16 %>
+            <%= f.text_field :sku, size: 16 %>
           <% end %>
         </div>
 
         <div id="shipping_specs" class="row">
           <% [:height, :width, :depth, :weight].each_with_index do |field, index| %>
-            <div id="shipping_specs_<%= field %>_field" class="col-xs-6">
+            <div id="shipping_specs_<%= field %>_field" class="col-6">
               <div class="field">
                 <%= f.label field %>
                 <%= f.text_field field, value: number_with_precision(@product.send(field), precision: 2) %>
@@ -126,7 +120,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: 'select2' }) %>
           <%= f.error_message_on :shipping_category %>
         <% end %>
       </div>
@@ -135,7 +129,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: 'select2' }) %>
           <%= f.error_message_on :tax_category %>
         <% end %>
       </div>
@@ -145,18 +139,18 @@
 
   <div class="row">
 
-    <div class="col-xs-9">
+    <div class="col-9">
       <div data-hook="admin_product_form_taxons">
         <%= f.field_container :taxons do %>
           <%= f.label :taxon_ids, plural_resource_name(Spree::Taxon) %><br />
-          <%= f.hidden_field :taxon_ids, :value => @product.taxon_ids.join(',') %>
+          <%= f.hidden_field :taxon_ids, value: @product.taxon_ids.join(',') %>
         <% end %>
       </div>
 
       <div data-hook="admin_product_form_option_types">
         <%= f.field_container :option_types do %>
           <%= f.label :option_type_ids, plural_resource_name(Spree::OptionType) %>
-          <%= f.hidden_field :option_type_ids, :value => @product.option_type_ids.join(',') %>
+          <%= f.hidden_field :option_type_ids, value: @product.option_type_ids.join(',') %>
         <% end %>
       </div>
 
@@ -164,21 +158,21 @@
         <div data-hook="admin_product_form_meta_title">
           <%= f.field_container :meta_title do %>
             <%= f.label :meta_title %>
-            <%= f.text_field :meta_title, :class => 'fullwidth' %>
+            <%= f.text_field :meta_title, class: 'fullwidth' %>
           <% end %>
         </div>
 
         <div data-hook="admin_product_form_meta_keywords">
           <%= f.field_container :meta_keywords do %>
             <%= f.label :meta_keywords %>
-            <%= f.text_field :meta_keywords, :class => 'fullwidth' %>
+            <%= f.text_field :meta_keywords, class: 'fullwidth' %>
           <% end %>
         </div>
 
         <div data-hook="admin_product_form_meta_description">
           <%= f.field_container :meta_description do %>
             <%= f.label :meta_description %>
-            <%= f.text_field :meta_description, :class => 'fullwidth' %>
+            <%= f.text_field :meta_description, class: 'fullwidth' %>
           <% end %>
         </div>
       </div>