solidus_backend 2.1.1 → 2.2.0.beta1

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

@@ -5,7 +5,7 @@
 
 <fieldset class="no-border-bottom no-border-top">
   <div class="row">
-    <div data-hook="bill_address_wrapper" class="col-xs-6">
+    <div data-hook="bill_address_wrapper" class="col-6">
       <fieldset class="no-border-bottom">
         <legend align="center"><%= Spree.t(:billing_address) %></legend>
         <% if order.bill_address %>
@@ -14,7 +14,7 @@
       </fieldset>
     </div>
 
-    <div class="col-xs-6" data-hook="ship_address_wrapper">
+    <div class="col-6" data-hook="ship_address_wrapper">
       <fieldset class="no-border-bottom">
         <legend align="center"><%= Spree.t(:shipping_address) %></legend>
         <% if order.ship_address %>

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

@@ -31,7 +31,7 @@
           </td>
           <td class="align-center">
             <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>
           </td>
         </tr>

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

@@ -1,7 +1,7 @@
 <% shipment.manifest.each do |item| %>
   <tr class="stock-item" data-item-quantity="<%= item.quantity %>">
     <td class="item-image">
-      <%= image_tag item.variant.display_image.attachment(:mini) %>
+      <%= render 'spree/admin/shared/image', image: item.variant.display_image, size: :mini %>
     </td>
     <td class="item-name">
       <%= item.variant.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>

data/app/views/spree/admin/orders/customer_details/_form.html.erb

@@ -4,13 +4,13 @@
     <legend align="center"><%= Spree.t(:account) %></legend>
 
     <div data-hook="customer_fields" class="row">
-      <div class="col-xs-9">
+      <div class="col-9">
         <div class="field">
           <%= f.label :email %>
-          <%= f.email_field :email, :class => 'fullwidth' %>
+          <%= f.email_field :email, class: 'fullwidth' %>
         </div>
       </div>
-      <div class="col-xs-3">
+      <div class="col-3">
         <div class="field">
           <%= label_tag nil, Spree.t(:guest_checkout) %>
           <ul>
@@ -25,7 +25,7 @@
                 <%= label_tag :guest_checkout_true, Spree.t(:say_yes) %>
               </li>
               <li>
-                <%= radio_button_tag :guest_checkout, false, !guest, :disabled => @order.cart? %>
+                <%= radio_button_tag :guest_checkout, false, !guest, disabled: @order.cart? %>
                 <%= label_tag :guest_checkout_false, Spree.t(:say_no) %>
               </li>
               <%= hidden_field_tag :user_id, @order.user_id %>
@@ -37,31 +37,35 @@
   </fieldset>
 
   <div class="row">
-    <div class="col-xs-6" data-hook="ship_address_wrapper">
+    <div class="col-6" data-hook="ship_address_wrapper">
       <fieldset class="no-border-bottom">
         <legend align="center"><%= Spree.t(:shipping_address) %></legend>
-        <%= f.fields_for :ship_address do |sa_form| %>
-          <% if Spree::Config[:order_bill_address_used] %>
-            <div class="field" style="position: absolute;margin-top: -15px;left: 0;">
-              <span data-hook="use_billing">
-                <%= check_box_tag 'order[use_billing]', '1', ((@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address == @order.ship_address) %>
-                <%= label_tag 'order[use_billing]', Spree.t(:use_billing_address) %>
-              </span>
-            </div>
-          <% end %>
-
-          <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => sa_form, :type => 'shipping' } %>
+        <% if Spree::Config[:order_bill_address_used] %>
+          <div class="field" style="position: absolute;margin-top: -15px;left: 0;">
+            <span data-hook="use_billing">
+              <%= check_box_tag 'order[use_billing]', '1', (@order.ship_address.new_record? && @order.bill_address == @order.ship_address) %>
+              <%= label_tag 'order[use_billing]', Spree.t(:use_billing_address) %>
+            </span>
+          </div>
         <% end %>
+
+        <div class="js-shipping-address">
+          <%= f.fields_for :ship_address do |ba_form| %>
+            <%= render partial: 'spree/admin/shared/address_form', locals: { f: ba_form, type: "shipping" } %>
+          <% end %>
+        </div>
       </fieldset>
     </div>
 
     <% if Spree::Config[:order_bill_address_used] %>
-      <div class="col-xs-6" data-hook="bill_address_wrapper">
+      <div class="col-6" data-hook="bill_address_wrapper">
         <fieldset class="no-border-bottom">
           <legend align="center"><%= Spree.t(:billing_address) %></legend>
-          <%= f.fields_for :bill_address do |ba_form| %>
-            <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => ba_form, :type => "billing" } %>
-          <% end %>
+          <div class="js-billing-address">
+            <%= f.fields_for :bill_address do |ba_form| %>
+              <%= render partial: 'spree/admin/shared/address_form', locals: { f: ba_form, type: "billing" } %>
+            <% end %>
+          </div>
         </fieldset>
       </div>
     <% end %>

data/app/views/spree/admin/orders/customer_details/edit.html.erb

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Customer Details' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Customer Details' } %>
 
 <% admin_breadcrumb(Spree.t(:customer_details)) %>
 
@@ -6,15 +6,17 @@
 <% content_for :page_actions do %>
 <% end %>
 
-<div id="select-customer" data-hook>
-  <fieldset class="no-border-bottom">
-    <legend align="center"><%= Spree.t(:customer_search) %></legend>
-    <%= hidden_field_tag :customer_search,  nil, :class => 'fullwidth title' %>
-  </fieldset>
-</div>
+<div class="js-customer-details" data-order-number="<%= @order.number %>">
+  <div id="select-customer" data-hook>
+    <fieldset class="no-border-bottom">
+      <legend align="center"><%= Spree.t(:customer_search) %></legend>
+      <%= hidden_field_tag :customer_search,  nil, class: 'fullwidth title' %>
+    </fieldset>
+  </div>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
+  <%= render partial: 'spree/shared/error_messages', locals: { target: @order } %>
 
-<%= form_for @order, :url => admin_order_customer_url(@order) do |f| %>
-  <%= render 'form', :f => f %>
-<% end %>
+  <%= form_for @order, url: admin_order_customer_url(@order) do |f| %>
+    <%= render 'form', f: f %>
+  <% end %>
+</div>

data/app/views/spree/admin/orders/customer_details/show.html.erb

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Customer Details' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Customer Details' } %>
 
 <% admin_breadcrumb(Spree.t(:customer_details)) %>
 
@@ -8,7 +8,7 @@
 <% end %>
 
 
-<main class="col-xs-5">
+<main class="col-5">
   <section>
     <%= content_tag :h4, Spree.t(:account) %>
     <%= Spree.t(:email) %>: <%= @order.email %><br>

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

@@ -7,7 +7,8 @@
   <% end %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Shipments' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Shipments' } %>
+<% admin_breadcrumb(plural_resource_name(Spree::Shipment)) %>
 
 <div data-hook="admin_order_edit_header">
   <%= render partial: 'spree/shared/error_messages', locals: { target: @order } %>

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

@@ -1,11 +1,13 @@
+<% admin_layout "full-width" %>
+
 <% admin_breadcrumb(plural_resource_name(Spree::Order)) %>
 
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:new_order), new_admin_order_url, :id => 'admin_new_order' %>
+    <%= button_link_to Spree.t(:new_order), new_admin_order_url, id: 'admin_new_order' %>
   </li>
-<% end if can? :edit, Spree::Order.new %>
+<% end if can? :create, Spree::Order %>
 
 <% content_for :table_filter_title do %>
   <%= Spree.t(:search) %>
@@ -15,28 +17,28 @@
   <div data-hook="admin_orders_index_search">
     <%= search_form_for [:admin, @search] do |f| %>
       <div class="row">
-        <div class="field-block col-xs-3">
+        <div class="field-block col-12 col-md-6 col-lg-4 col-xl-3">
           <div class="date-range-filter field">
             <%= label_tag :q_created_at_gt, Spree.t(:date_range) %>
-            <div class="date-range-fields">
-              <%= f.text_field :created_at_gt, :class => 'datepicker datepicker-from', :value => params[:q][:created_at_gt], :placeholder => Spree.t(:start) %>
+            <div class="date-range-fields input-group">
+              <%= f.text_field :created_at_gt, class: 'datepicker form-control datepicker-from', value: params[:q][:created_at_gt], placeholder: Spree.t(:start) %>
 
-              <span class="range-divider">
+              <span class="range-divider input-group-addon">
                 <i class="fa fa-arrow-right"></i>
               </span>
 
-              <%= f.text_field :created_at_lt, :class => 'datepicker datepicker-to', :value => params[:q][:created_at_lt], :placeholder => Spree.t(:stop) %>
+              <%= f.text_field :created_at_lt, class: 'datepicker form-control datepicker-to', value: params[:q][:created_at_lt], placeholder: Spree.t(:stop) %>
             </div>
           </div>
 
           <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: 'select2' %>
           </div>
 
           <div class="field">
             <%= label_tag nil, Spree.t(:promotion) %>
-            <%= f.text_field :promotions_codes_value_cont, :size => 25 %>
+            <%= f.text_field :order_promotions_promotion_code_value_cont, size: 25 %>
           </div>
 
           <div class="field">
@@ -46,11 +48,11 @@
 
         </div>
 
-        <div class="col-xs-6">
+        <div class="col-12 col-md-6 col-lg-4 col-xl-6">
           <div class="row">
-            <div class="col-xs-6">
+            <div class="col-12 col-xl-6">
               <div class="field">
-                <%= label_tag :q_number_cont, Spree.t(:order_number, :number => '') %>
+                <%= label_tag :q_number_cont, Spree.t(:order_number, number: '') %>
                 <%= f.text_field :number_cont %>
               </div>
 
@@ -60,18 +62,18 @@
               </div>
             </div>
 
-            <div class="col-xs-6">
+            <div class="col-12 col-xl-6">
               <div class="field">
                 <%= label_tag :q_bill_address_firstname_start, Spree.t(:first_name_begins_with) %>
-                <%= f.text_field :bill_address_firstname_start, :size => 25 %>
+                <%= f.text_field :bill_address_firstname_start, size: 25 %>
               </div>
               <div class="field">
                 <%= label_tag :q_bill_address_lastname_start, Spree.t(:last_name_begins_with) %>
-                <%= f.text_field :bill_address_lastname_start, :size => 25%>
+                <%= f.text_field :bill_address_lastname_start, size: 25%>
               </div>
             </div>
 
-            <div class="col-xs-12">
+            <div class="col-12 col-xl-6">
               <div class="field" data-hook="sku-select">
                 <%= label_tag :q_line_items_variant_id_in, Spree.t(:variant) %>
                 <%= f.text_field :line_items_variant_id_in, class: "variant_autocomplete fullwidth" %>
@@ -80,7 +82,7 @@
           </div>
         </div>
 
-        <div class="col-xs-3">
+        <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) %>
@@ -90,7 +92,7 @@
 
           <div class="field checkbox">
             <label>
-              <%= f.check_box :completed_at_not_null, {:checked => @show_only_completed}, '1', '0' %>
+              <%= f.check_box :completed_at_not_null, {checked: @show_only_completed}, '1', '0' %>
               <%= Spree.t(:show_only_complete_orders) %>
             </label>
           </div>
@@ -162,14 +164,14 @@
         </td>
         <td class="align-center"><%= order.display_total.to_html %></td>
         <td class='actions align-center' data-hook="admin_orders_index_row_actions">
-          <%= link_to_edit_url edit_admin_order_path(order), :title => "admin_edit_#{dom_id(order)}", :no_text => true %>
+          <%= link_to_edit_url edit_admin_order_path(order), title: "admin_edit_#{dom_id(order)}", no_text: true %>
         </td>
       </tr>
     <% end %>
     </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::Order,
                  new_resource_url: spree.new_admin_order_path %>

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

@@ -3,11 +3,11 @@
   <div data-hook="payment_method">
 
     <div class="row">
-      <div class="col-xs-3">
+      <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'}) %>
+            <%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {id: 'gtwy-type', class: 'select2 fullwidth js-gateway-type'}) %>
           </div>
 
           <div class="field js-preference-source-wrapper">
@@ -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: 'select2 fullwidth'}) %>
         </div>
         <div data-hook="active" class="field">
           <%= label_tag nil, Spree::PaymentMethod.human_attribute_name(:active) %>
@@ -52,14 +52,14 @@
         </div>
       </div>
 
-      <div class="col-xs-6">
+      <div class="col-6">
         <div data-hook="name" class="field">
           <%= f.label :name %>
-          <%= f.text_field :name, :class => 'fullwidth' %>
+          <%= f.text_field :name, class: 'fullwidth' %>
         </div>
         <div data-hook="description" class="field">
           <%= f.label :description %>
-          <%= f.text_area :description, {:cols => 60, :rows => 6, :class => 'fullwidth'} %>
+          <%= f.text_area :description, {cols: 60, rows: 6, class: 'fullwidth'} %>
         </div>
       </div>
     </div>

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

@@ -8,11 +8,11 @@
 <% content_for :page_actions do %>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @payment_method } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @payment_method } %>
 
-<%= form_for @payment_method, :url => admin_payment_method_path(@payment_method) do |f| %>
+<%= form_for @payment_method, url: admin_payment_method_path(@payment_method) do |f| %>
   <fieldset class="no-border-top">
-    <%= render :partial => 'form', :locals => { :f => f } %>
+    <%= render partial: 'form', locals: { f: f } %>
     <div data-hook="buttons" class="filter-actions actions">
       <%= button Spree.t('actions.update') %>
     </div>

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

@@ -8,7 +8,7 @@
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::PaymentMethod) %>
     <li>
-      <%= button_link_to Spree.t(:new_payment_method), new_object_url, :id => 'admin_new_payment_methods_link' %>
+      <%= button_link_to Spree.t(:new_payment_method), new_object_url, id: 'admin_new_payment_methods_link' %>
     </li>
   <% end %>
 <% end %>
@@ -46,10 +46,10 @@
           <td class="align-center"><%= method.active ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
           <td data-hook="admin_payment_methods_index_row_actions" class="actions">
             <% if can?(:update, method.becomes(Spree::PaymentMethod)) %>
-              <%= link_to_edit method.becomes(Spree::PaymentMethod), :no_text => true %>
+              <%= link_to_edit method.becomes(Spree::PaymentMethod), no_text: true %>
             <% end %>
             <% if can?(:destroy, method.becomes(Spree::PaymentMethod)) %>
-              <%= link_to_delete method.becomes(Spree::PaymentMethod), :no_text => true  %>
+              <%= link_to_delete method.becomes(Spree::PaymentMethod), no_text: true  %>
             <% end %>
           </td>
         </tr>
@@ -57,7 +57,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::PaymentMethod,
                  new_resource_url: new_object_url %>

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

@@ -9,11 +9,11 @@
 <% content_for :page_actions do %>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @payment_method } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @payment_method } %>
 
-<%= form_for @payment_method, :url => collection_url do |f| %>
+<%= form_for @payment_method, url: collection_url do |f| %>
   <fieldset class="no-border-top">
-    <%= render :partial => 'form', :locals => { :f => f } %>
+    <%= render partial: 'form', locals: { f: f } %>
     <div data-hook="buttons" class="filter-actions actions">
       <%= button Spree.t('actions.create') %>
     </div>

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

@@ -1,11 +1,13 @@
-<div data-hook="admin_payment_form_fields" class="row">
-  <div class="col-xs-3">
-    <div class="field">
-      <%= f.label :amount %>
-      <%= f.text_field :amount, :value => @order.display_outstanding_balance.money, :class => 'fullwidth' %>
+<div data-hook="admin_payment_form_fields">
+  <div class="row">
+    <div class="col-4">
+      <div class="field">
+        <%= f.label :amount %>
+        <%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :amount, currency: @order.currency %>
+      </div>
     </div>
   </div>
-  <div class="col-xs-9">
+  <div>
     <div class="field">
       <label><%= Spree::PaymentMethod.model_name.human %></label>
       <ul>
@@ -25,8 +27,8 @@
           <div class="payment-methods" id="payment_method_<%= method.id %>">
             <% if method.source_required? %>
               <br />
-              <%= render :partial => "spree/admin/payments/source_forms/#{method.method_type}",
-                         :locals => { :payment_method => method, previous_cards: method.reusable_sources(@order) } %>
+              <%= render partial: "spree/admin/payments/source_forms/#{method.method_type}",
+                         locals: { payment_method: method, previous_cards: method.reusable_sources(@order) } %>
             <% end %>
           </div>
         <% end %>

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

@@ -21,7 +21,7 @@
         </td>
         <td class="align-center"><%= payment_method_name(payment) %></td>
         <td class="align-center"><%= payment.transaction_id %></td>
-        <td class="align-center"> <span class="state <%= payment.state %>"><%= Spree.t(payment.state, :scope => :payment_states, :default => payment.state.capitalize) %></span></td>
+        <td class="align-center"> <span class="state <%= payment.state %>"><%= Spree.t(payment.state, scope: :payment_states, default: payment.state.capitalize) %></span></td>
         <td class="actions">
           <div class="editing-show">
             <%= link_to_with_icon 'save', Spree.t('actions.save'), nil, no_text: true, class: "js-save", data: {action: 'save'} %>
@@ -38,7 +38,7 @@
               <% elsif action == 'capture' && !@order.completed? %>
                 <%# no capture prior to completion. payments get captured when the order completes. %>
               <% else %>
-                <%= link_to_with_icon action, Spree.t(action), fire_admin_order_payment_path(@order, payment, :e => action), :method => :put, :no_text => true, :data => {:action => action} %>
+                <%= link_to_with_icon action, Spree.t(action), fire_admin_order_payment_path(@order, payment, e: action), method: :put, no_text: true, data: {action: action} %>
               <% end %>
             <% end %>
           </div>