solidus_backend 2.1.1 → 2.2.0.beta1

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

@@ -1,9 +1,9 @@
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @option_type } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @option_type } %>
 
 <%= form_for [:admin, @option_type] do |f| %>
   <fieldset>
     <legend align="center"><%= Spree.t(:new_option_type) %></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/option_types/new.js.erb

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

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

@@ -2,10 +2,10 @@
   <fieldset class="no-border-bottom">
     <legend align="center"><%= Spree.t(:add_product) %></legend>
 
-    <div class="col-xs-9">
+    <div class="col-9">
       <div data-hook="add_product_name" class="field">
         <%= label_tag :add_line_item_variant_id, Spree.t(:name_or_sku) %>
-        <%= text_field_tag :add_line_item_variant_id, "", :class => "variant_autocomplete fullwidth" %>
+        <%= text_field_tag :add_line_item_variant_id, "", class: "variant_autocomplete fullwidth" %>
       </div>
     </div>
 

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

@@ -2,13 +2,10 @@
   <fieldset class="no-border-bottom">
     <legend align="center"><%= Spree.t(:add_product) %></legend>
 
-    <div class="col-xs-9">
-      <div data-hook="add_product_name" class="field">
-        <%= label_tag :add_variant_id, Spree.t(:name_or_sku) %>
-        <%= text_field_tag :add_variant_id, "", :class => "variant_autocomplete fullwidth" %>
-      </div>
+    <div data-hook="add_product_name" class="field">
+      <%= label_tag :add_variant_id, Spree.t(:name_or_sku) %>
+      <%= text_field_tag :add_variant_id, "", class: "variant_autocomplete fullwidth" %>
     </div>
-
   </fieldset>
 
   <div id="stock_details"></div>

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

@@ -1,21 +1,19 @@
-<% if adjustments.eligible.exists? %>
-  <fieldset class="no-border-bottom">
-    <legend><%= title %></legend>
-    <table>
-      <thead>
-        <tr>
-          <th><%= Spree::Adjustment.human_attribute_name(:name)%></th>
-          <th><%= Spree::Adjustment.human_attribute_name(:amount)%></th>
+<fieldset class="no-border-bottom">
+  <legend><%= title %></legend>
+  <table>
+    <thead>
+      <tr>
+        <th><%= Spree::Adjustment.human_attribute_name(:name)%></th>
+        <th><%= Spree::Adjustment.human_attribute_name(:amount)%></th>
+      </tr>
+    </thead>
+    <tbody data-hook="order_details_adjustments"  class="with-border">
+      <% adjustments.eligible.group_by(&:label).each do |label, adjustments| %>
+        <tr class="total">
+          <td><strong><%= label %>:</strong></td>
+          <td class="total align-center"><span><%= Spree::Money.new(adjustments.sum(&:amount), currency: adjustments.first.order.try(:currency)) %></span></td>
         </tr>
-      </thead>
-      <tbody id="order-charges" data-hook="order_details_adjustments"  class="with-border">
-        <% adjustments.eligible.group_by(&:label).each do |label, adjustments| %>
-          <tr class="total">
-            <td><strong><%= label %>:</strong></td>
-            <td class="total align-center"><span><%= Spree::Money.new(adjustments.sum(&:amount), currency: adjustments.first.order.try(:currency)) %></span></td>
-          </tr>
-        <% end %>
-      </tbody>
-    </table>
-  </fieldset>
-<% end %>
+      <% end %>
+    </tbody>
+  </table>
+</fieldset>

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

@@ -1,7 +1,7 @@
 <% carton.manifest_for_order(order).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/_form.html.erb

@@ -1,43 +1,19 @@
  <div data-hook="admin_order_form_fields">
   <% if @line_item.try(:errors).present? %>
-    <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @line_item } %>
+    <%= render partial: 'spree/shared/error_messages', locals: { target: @line_item } %>
   <% end %>
 
-  <% if Spree::Order.checkout_step_names.include?(:delivery) %>
-    <%= render :partial => "spree/admin/orders/carton", :collection => @order.cartons.order(:shipped_at), :locals => { :order => order } %>
-    <%= render :partial => "spree/admin/orders/shipment", :collection => @order.shipments.order(:created_at), :locals => { :order => order } %>
-  <% else %>
-    <%= render :partial => "spree/admin/orders/line_items", :locals => { :order => order } %>
-  <% end %>
-  <%= render :partial => "spree/admin/orders/adjustments", :locals => {
-        :adjustments => @order.line_item_adjustments, 
-        :order => order,
-        :title => Spree.t(:line_item_adjustments)
-   } %>
-  <%= render :partial => "spree/admin/orders/adjustments", :locals => {
-        :adjustments => @order.shipment_adjustments, 
-        :order => order,
-        :title => Spree.t(:shipment_adjustments)
-   } %>
-  <%= render :partial => "spree/admin/orders/adjustments", :locals => {
-        :adjustments => @order.adjustments, 
-        :order => order,
-        :title => Spree.t(:order_adjustments)
-   } %>
+  <%= render :partial => "spree/admin/orders/carton", collection: @order.cartons.order(:shipped_at), locals: { order: order } %>
+  <%= render :partial => "spree/admin/orders/shipment", collection: @order.shipments.order(:created_at), locals: { order: order } %>
 
-  <% if order.line_items.exists? %>
-    <fieldset class="no-border-bottom" id="order-total" data-hook="order_details_total">
-      <legend><%= Spree.t(:order_total) %></legend>
-      <span class="order-total"><%= order.display_total %></span>
-    </fieldset>
-  <% end %>
+  <%= render "spree/admin/orders/order_details", { order: order } %>
 
   <%= javascript_tag do -%>
     var order_number = '<%= @order.number %>';
     var shipments = [];
 
     <% @order.shipments.each do |shipment| %>
-            shipments.push(<%== shipment.as_json(:root => false, :only => [:id, :tracking, :number, :state, :stock_location_id], :include => [:inventory_units, :stock_location]).to_json %>);
+            shipments.push(<%== shipment.as_json(root: false, only: [:id, :tracking, :number, :state, :stock_location_id], include: [:inventory_units, :stock_location]).to_json %>);
     <% end %>
   <% end -%>
 </div>

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

@@ -1,50 +1,24 @@
-<% if order.line_items.exists? %>
-  <table class="line-items index" data-hook="line-items">
-    <colgroup>
-      <col style="width: 10%;" />
-      <col style="width: 20%;" />
-      <col style="width: 20%;" />
-      <col style="width: 15%;" />
-    </colgroup>
+<table class="line-items index" data-hook="line-items">
+  <colgroup>
+    <col style="width: 10%;" />
+    <col style="width: 45%;" />
+    <col style="width: 10%;" />
+    <col style="width: 10%;" />
+    <col style="width: 10%;" />
+    <col style="width: 15%;" />
+  </colgroup>
 
-    <thead>
-      <tr>
-        <th colspan="2"><%= Spree::Product.human_attribute_name(:name) %></th>
-        <th><%= Spree::LineItem.human_attribute_name(:price) %></th>
-        <th><%= Spree::LineItem.human_attribute_name(:quantity) %></th>
-        <th><%= Spree::LineItem.human_attribute_name(:total) %></th>
-        <th class="orders-actions actions" data-hook="admin_order_form_line_items_header_actions">&nbsp;</th>
-      </tr>
-    </thead>
+  <thead>
+    <tr>
+      <th colspan="2"><%= Spree::Product.human_attribute_name(:name) %></th>
+      <th><%= Spree::LineItem.human_attribute_name(:price) %></th>
+      <th><%= Spree::LineItem.human_attribute_name(:quantity) %></th>
+      <th><%= Spree::LineItem.human_attribute_name(:total) %></th>
+      <th class="orders-actions actions" data-hook="admin_order_form_line_items_header_actions">&nbsp;</th>
+    </tr>
+  </thead>
 
-    <tbody>
-      <% order.line_items.each do |item| %>
-        <%= content_tag :tr, class: 'line-item', id: "line-item-#{item.id}", data: { line_item_id: item.id } do %>
-          <td class="line-item-image"><%= image_tag item.variant.display_image.attachment(:mini) %></td>
-          <td class="line-item-name">
-            <%= item.variant.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
-            <% if item.variant.sku.present? %>
-              <strong><%= Spree::Variant.human_attribute_name(:sku) %>:</strong> <%= item.variant.sku %>
-            <% end %>
-          </td>
-          <td class="line-item-price align-center"><%= item.single_money.to_html %></td>
-          <td class="line-item-qty-show align-center">
-            <%= item.quantity %>
-          </td>
-          <td class="line-item-qty-edit">
-            <%= number_field_tag :quantity, item.quantity, :min => 0, :class => "line_item_quantity", :size => 5 %>
-          </td>
-          <td class="line-item-total align-center"><%= line_item_shipment_price(item, item.quantity) %></td>
-          <td class="cart-line-item-delete actions" data-hook="cart_line_item_delete">
-            <% if can? :update, item %>
-              <%= link_to '', '#', :class => 'save-line-item fa fa-ok no-text with-tip',       :title => Spree.t('actions.save') %>
-              <%= link_to '', '#', :class => 'cancel-line-item fa fa-cancel no-text with-tip', :title => Spree.t('actions.cancel') %>
-              <%= link_to '', '#', :class => 'edit-line-item fa fa-edit no-text with-tip',     :title => Spree.t('actions.edit') %>
-              <%= link_to '', '#', :class => 'delete-line-item fa fa-trash no-text with-tip',  :title => Spree.t('actions.delete') %>
-            <% end %>
-          </td>
-        <% end %>
-      <% end %>
-    </tbody>
-  </table>
-<% end %>
+  <tbody>
+    <%# Rendered by JS %>
+  </tbody>
+</table>

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

@@ -1,38 +1,13 @@
-<div data-hook="admin_order_form_fields">
+<div data-hook="admin_order_form_fields" class="js-order-cart-page" data-order-number="<%= @order.number %>">
   <% if @line_item.try(:errors).present? %>
-      <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @line_item } %>
+      <%= render partial: 'spree/shared/error_messages', locals: { target: @line_item } %>
   <% end %>
 
-  <%= render :partial => "spree/admin/orders/line_items", :locals => { :order => order } %>
-  <%= render :partial => "spree/admin/orders/adjustments", :locals => {
-          :adjustments => @order.line_item_adjustments,
-          :order => order,
-          :title => Spree.t(:line_item_adjustments)
-  } %>
-  <%= render :partial => "spree/admin/orders/adjustments", :locals => {
-          :adjustments => @order.shipment_adjustments,
-          :order => order,
-          :title => Spree.t(:shipment_adjustments)
-  } %>
-  <%= render :partial => "spree/admin/orders/adjustments", :locals => {
-          :adjustments => @order.adjustments,
-          :order => order,
-          :title => Spree.t(:order_adjustments)
-  } %>
+  <%= render partial: "spree/admin/orders/line_items", locals: { order: order } %>
 
-  <% if order.line_items.exists? %>
-      <fieldset class="no-border-bottom" id="order-total" data-hook="order_details_total">
-        <legend><%= Spree.t(:order_total) %></legend>
-        <span class="order-total"><%= order.display_total %></span>
-      </fieldset>
+  <% if can?(:update, @order) && can?(:create, Spree::LineItem) %>
+    <button class="js-add-line-item" disabled><%= t('spree.add_line_item') %></button>
   <% end %>
 
-  <%= javascript_tag do -%>
-      var order_number = '<%= @order.number %>';
-      var shipments = [];
-
-      <% @order.shipments.each do |shipment| %>
-            shipments.push(<%== shipment.as_json(:root => false, :only => [:id, :tracking, :number, :state, :stock_location_id], :include => [:inventory_units, :stock_location]).to_json %>);
-      <% end %>
-  <% end -%>
+  <%= render "spree/admin/orders/order_details", { order: order } %>
 </div>

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

@@ -0,0 +1,32 @@
+<div class="js-order-line-item-adjustments <%= "hidden" if order.line_item_adjustments.eligible.none? %>">
+  <%=
+    render "spree/admin/orders/adjustments", {
+      adjustments: order.line_item_adjustments,
+      order: order,
+      title: Spree.t(:line_item_adjustments)
+    }
+  %>
+</div>
+<div class="js-order-shipment-adjustments <%= "hidden" if order.shipment_adjustments.eligible.none? %>">
+  <%=
+    render "spree/admin/orders/adjustments", {
+      adjustments: order.shipment_adjustments,
+      order: order,
+      title: Spree.t(:shipment_adjustments)
+    }
+  %>
+</div>
+<div class="js-order-adjustments <%= "hidden" if order.adjustments.eligible.none? %>">
+  <%=
+    render "spree/admin/orders/adjustments", {
+      adjustments: order.adjustments,
+      order: order,
+      title: Spree.t(:order_adjustments)
+    }
+  %>
+</div>
+
+<fieldset class="no-border-bottom <%= "hidden" if order.line_items.none? %>" id="order-total" data-hook="order_details_total">
+  <legend><%= Spree.t(:order_total) %></legend>
+  <span class="order-total"><%= order.display_total %></span>
+</fieldset>

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

@@ -1,6 +1,3 @@
-<% admin_breadcrumb(plural_resource_name(Spree::Shipment)) %>
-
-
 <%
   manifest_items = Spree::ShippingManifest.new(
     inventory_units: shipment.inventory_units.where(carton_id: nil),
@@ -53,22 +50,22 @@
         <tr class="edit-method hidden total">
           <td colspan="5">
             <div class="row">
-              <div class="col-xs-4">
+              <div class="col-12">
                 <div class="field">
                   <%= label_tag 'selected_shipping_rate_id', Spree::ShippingMethod.model_name.human %>
                   <%= select_tag :selected_shipping_rate_id,
                         options_for_select(shipment.shipping_rates.map {|sr| ["#{sr.name} #{sr.display_price}", sr.id] }, shipment.selected_shipping_rate_id),
-                        {:class => 'select2 fullwidth', :data => {'shipment-number' => shipment.number } } %>
+                        {class: 'select2 fullwidth', data: {'shipment-number' => shipment.number } } %>
                 </div>
               </div>
             </div>
           </td>
           <td class="actions">
             <% if can? :update, shipment %>
-              <%= link_to '', '#', :class => 'save-method fa fa-check no-text with-tip',
-                :data => {'shipment-number' => shipment.number, :action => 'save'}, title: Spree.t('actions.save') %>
-              <%= link_to '', '#', :class => 'cancel-method fa fa-cancel no-text with-tip',
-                :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel') %>
+              <%= link_to '', '#', class: 'save-method fa fa-check no-text with-tip',
+                data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save') %>
+              <%= link_to '', '#', class: 'cancel-method fa fa-cancel no-text with-tip',
+                data: {action: 'cancel'}, title: Spree.t('actions.cancel') %>
             <% end %>
           </td>
         </tr>
@@ -88,7 +85,7 @@
 
           <td class="actions">
             <% if can?(:update, shipment) && !shipment.shipped? %>
-              <%= link_to '', '#', :class => 'edit-method fa fa-edit no-text with-tip', :data => {:action => 'edit'}, :title => Spree.t('actions.edit') %>
+              <%= link_to '', '#', class: 'edit-method fa fa-edit no-text with-tip', data: {action: 'edit'}, title: Spree.t('actions.edit') %>
             <% end %>
           </td>
         </tr>
@@ -100,8 +97,8 @@
         </td>
         <td class="actions">
           <% if can? :update, shipment %>
-            <%= link_to '', '#', :class => 'save-tracking fa fa-check no-text with-tip', :data => {'shipment-number' => shipment.number, :action => 'save'}, :title => Spree.t('actions.save') %>
-            <%= link_to '', '#', :class => 'cancel-tracking fa fa-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel') %>
+            <%= link_to '', '#', class: 'save-tracking fa fa-check no-text with-tip', data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save') %>
+            <%= link_to '', '#', class: 'cancel-tracking fa fa-cancel no-text with-tip', data: {action: 'cancel'}, title: Spree.t('actions.cancel') %>
           <% end %>
         </td>
       </tr>
@@ -124,7 +121,7 @@
         </td>
         <td class="actions">
           <% if can? :update, shipment %>
-            <%= link_to '', '#', :class => 'edit-tracking fa fa-edit no-text with-tip', :data => {:action => 'edit'}, :title => Spree.t('actions.edit') %>
+            <%= link_to '', '#', class: 'edit-tracking fa fa-edit no-text with-tip', data: {action: 'edit'}, title: Spree.t('actions.edit') %>
           <% end %>
         </td>
       </tr>

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

@@ -4,7 +4,7 @@
       data-variant-id="<%= item.variant.id %>"
       >
     <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? %>
@@ -22,8 +22,8 @@
 
     <td class="cart-item-delete actions" data-hook="cart_item_delete">
       <% if can? :update, item %>
-        <%= link_to '', '#', :class => 'split-item icon_link fa fa-arrows-h no-text with-tip', :data => {:action => 'split', 'variant-id' => item.variant.id}, :title => Spree.t('actions.split') %>
-        <%= link_to '', '#', :class => 'delete-item fa fa-trash no-text with-tip', :data => { 'variant-id' => item.variant.id}, :title => Spree.t('actions.delete') %>
+        <%= link_to '', '#', class: 'split-item icon_link fa fa-arrows-h no-text with-tip', data: {action: 'split', 'variant-id' => item.variant.id}, title: Spree.t('actions.split') %>
+        <%= link_to '', '#', class: 'delete-item fa fa-trash no-text with-tip', data: { 'variant-id' => item.variant.id}, title: Spree.t('actions.delete') %>
       <% end %>
     </td>
   </tr>

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

@@ -3,35 +3,25 @@
         <li><%= event_links %></li>
     <% end %>
     <% if can?(:resend, @order) && @order.completed? %>
-        <li><%= button_link_to Spree.t(:resend), resend_admin_order_url(@order), :method => :post %></li>
+        <li><%= button_link_to Spree.t(:resend), resend_admin_order_url(@order), method: :post %></li>
     <% end %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Cart' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Cart' } %>
 
 <% admin_breadcrumb(Spree.t(:cart)) %>
 
 
 <div data-hook="admin_order_edit_header">
-  <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
+  <%= render partial: 'spree/shared/error_messages', locals: { target: @order } %>
 </div>
 
 <% if @order.payments.exists? && @order.is_risky? %>
     <%= render 'spree/admin/orders/risk_analysis', latest_payment: @order.payments.reorder("created_at DESC").first %>
 <% end %>
 
-<% if can?(:update, @order) && can?(:create, Spree::LineItem) %>
-  <%= render :partial => 'add_line_item' %>
-<% end %>
-
-<% if @order.line_items.empty? %>
-    <div class="no-objects-found">
-      <%= Spree.t(:your_order_is_empty_add_product)%>
-    </div>
-<% end %>
-
 <div data-hook="admin_order_edit_form">
   <div id="order-form-wrapper">
-    <%= render :partial => 'line_items_edit_form', :locals => { :order => @order } %>
+    <%= render partial: 'line_items_edit_form', locals: { order: @order } %>
   </div>
 </div>

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

@@ -19,7 +19,7 @@
       order: @order,
       title: Spree.t(:line_item_adjustments),
     }
-  )
+  ) if @order.line_item_adjustments.eligible.any?
 %>
 
 <%=
@@ -30,7 +30,7 @@
       order: @order,
       title: Spree.t(:shipment_adjustments),
     }
-  )
+  ) if @order.shipment_adjustments.eligible.any?
 %>
 
 <%=
@@ -41,7 +41,7 @@
       order: @order,
       title: Spree.t(:order_adjustments),
     }
-  )
+  ) if @order.adjustments.eligible.any?
 %>
 
 <% if @order.line_items.exists? %>