spree_backend 2.4.10 → 3.0.0.rc1

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

@@ -1,34 +1,40 @@
 <% shipment.manifest.each do |item| %>
   <tr class="stock-item" data-item-quantity="<%= item.quantity %>">
-    <td class="item-image">
+    <td class="item-image image text-center">
       <%= mini_image(item.variant) %>
     </td>
+
     <td class="item-name">
       <%= item.variant.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
       <% if item.variant.sku.present? %>
         <strong><%= Spree.t(:sku) %>:</strong> <%= item.variant.sku %>
       <% end %>
     </td>
-    <td class="item-price align-center"><%= item.line_item.single_money.to_html %></td>
-    <td class="item-qty-show align-center">
-        <% item.states.each do |state,count| %>
-          <%= count %> x <%= Spree.t(state).downcase %>
-        <% end %>
+
+    <td class="item-price text-center"><%= item.line_item.single_money.to_html %></td>
+
+    <td class="item-qty-show text-center">
+      <% item.states.each do |state,count| %>
+        <%= count %> x <%= Spree.t(state).downcase %>
+      <% end %>
     </td>
+
     <% unless shipment.shipped? %>
-      <td class="item-qty-edit hidden">
-        <%= number_field_tag :quantity, item.quantity, :min => 0, :class => "line_item_quantity", :size => 5 %>
+      <td class="item-qty-edit is-hidden">
+        <%= number_field_tag :quantity, item.quantity, min: 0, class: "line_item_quantity form-control", size: 5 %>
       </td>
     <% end %>
-    <td class="item-total align-center"><%= line_item_shipment_price(item.line_item, item.quantity) %></td>
-    <td class="cart-item-delete actions" data-hook="cart_item_delete">
-      <% if !shipment.shipped? && can?(:update, item.line_item) %>
-        <%= link_to '', '#', :class => 'save-item fa fa-ok no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'save'}, :title => Spree.t('actions.save'), :style => 'display: none' %>
-        <%= link_to '', '#', :class => 'cancel-item fa fa-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel'), :style => 'display: none' %>
-        <% if shipment.order.shipped_shipments.count == 0 %>
-          <%= 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('split') %>
-          <%= link_to '', '#', :class => 'delete-item fa fa-trash no-text with-tip', :data => { 'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'remove'}, :title => Spree.t('delete') %>
-        <% end %>
+
+    <td class="item-total text-center">
+      <%= line_item_shipment_price(item.line_item, item.quantity) %>
+    </td>
+
+    <td class="cart-item-delete actions actions-3 text-center" data-hook="cart_item_delete">
+      <% if((!shipment.shipped?) && can?(:update, item.line_item)) %>
+        <%= link_to_with_icon 'cancel', Spree.t('actions.cancel'), "#", class: 'cancel-item  btn btn-primary btn-sm', data: { action: 'cancel' }, title: Spree.t('actions.cancel'), style: 'display: none', no_text: true %>
+        <%= link_to_with_icon 'ok', Spree.t('actions.save'), "#", class: 'save-item btn btn-success btn-sm', data: {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, action: 'save'}, title: Spree.t('actions.save'), style: 'display: none', no_text: true %>
+        <%= link_to_with_icon 'split', Spree.t('split'), "#", class: 'split-item btn btn-primary btn-sm', data: {action: 'split', 'variant-id' => item.variant.id}, title: Spree.t('split'), no_text: true %>
+        <%= link_to_with_icon 'delete', Spree.t('delete'), "#", class: 'delete-item btn btn-danger btn-sm', data: { 'shipment-number' => shipment.number, 'variant-id' => item.variant.id, action: 'remove'}, title: Spree.t('delete'), no_text: true %>
       <% end %>
     </td>
   </tr>

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

@@ -1,31 +1,28 @@
 <% content_for :page_actions do %>
-    <% if can?(:fire, @order) %>
-        <li><%= event_links %></li>
-    <% end %>
-    <% if can?(:resend, @order) %>
-        <li><%= button_link_to Spree.t(:resend), resend_admin_order_url(@order), :method => :post, :icon => 'email' %></li>
-    <% end %>
-    <% if can?(:admin, Spree::Order) %>
-        <li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => 'arrow-left' %></li>
-    <% end %>
+  <% if can?(:fire, @order) %>
+    <%= event_links %>
+  <% end %>
+  <% if can?(:resend, @order) %>
+    <%= button_link_to Spree.t(:resend), resend_admin_order_url(@order), :method => :post, :icon => 'envelope' %>
+  <% end %>
 <% end %>
 
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Cart' } %>
 
 <div data-hook="admin_order_edit_header">
-  <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
+  <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @order } %>
 </div>
 
 <% if @order.payments.exists? && @order.considered_risky? %>
-    <%= render 'spree/admin/orders/risk_analysis', latest_payment: @order.payments.order("created_at DESC").first %>
+  <%= render 'spree/admin/orders/risk_analysis', latest_payment: @order.payments.order("created_at DESC").first %>
 <% end %>
 
 <%= render :partial => 'add_line_item' if can?(:update, @order) %>
 
 <% if @order.line_items.empty? %>
-    <div class="no-objects-found">
-      <%= Spree.t(:your_order_is_empty_add_product)%>
-    </div>
+  <div class="alert alert-warning">
+    <%= Spree.t(:your_order_is_empty_add_product)%>
+  </div>
 <% end %>
 
 <div data-hook="admin_order_edit_form">
@@ -35,5 +32,7 @@
 </div>
 
 <% content_for :head do %>
-    <%= javascript_tag 'var expand_variants = true;' %>
+  <%= javascript_tag 'var expand_variants = true;' %>
 <% end %>
+
+<%= render partial: 'spree/admin/shared/order_summary' %>

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

@@ -1,73 +1,94 @@
-<fieldset data-hook="admin_customer_detail_form_fields" class="no-border-top">
+<div data-hook="admin_customer_detail_form_fields">
 
-  <fieldset class="index no-border-bottom" data-hook="customer_guest">
-    <legend align="center"><%= Spree.t(:account) %></legend>
+  <div class="panel panel-default" data-hook="customer_guest">
 
-    <div data-hook="customer_fields" class="row">
-      <div class="alpha eight columns">
-        <div class="field">
-          <%= f.label :email, Spree.t(:email) %>
-          <%= f.email_field :email, :class => 'fullwidth' %>
+    <div class="panel-heading">
+      <h1 class="panel-title">
+        <%= Spree.t(:account) %>
+      </h1>
+    </div>
+
+    <div class="panel-body">
+      <div data-hook="customer_fields" class="row">
+        <div class="col-md-8">
+          <div class="form-group">
+            <%= f.label :email, Spree.t(:email) %>
+            <%= f.email_field :email, class: 'form-control' %>
+          </div>  
         </div>
-      </div>
-      <div class="omega four columns">
-        <div class="field">
-          <%= label_tag nil, Spree.t(:guest_checkout) %>
-          <ul>
+        <div class="col-md-4">
+          <div class="form-group">
+            <strong><%= label_tag nil, Spree.t(:guest_checkout) %></strong>
             <% if @order.completed? %>
-              <li>
-                <%= @order.user.nil? ? Spree.t(:say_yes) : Spree.t(:say_no) %>
-              </li>
+              <div>
+                <span class="badge">
+                  <%= @order.user.nil? ? Spree.t(:say_yes) : Spree.t(:say_no) %>
+                </span>
+              </div>
             <% else %>
               <% guest = @order.user.nil? %>
-              <li>
-                <%= radio_button_tag :guest_checkout, true, guest %>
-                <%= label_tag :guest_checkout_true, Spree.t(:say_yes) %>
-              </li>
-              <li>
-                <%= radio_button_tag :guest_checkout, false, !guest, :disabled => @order.cart? %>
-                <%= label_tag :guest_checkout_false, Spree.t(:say_no) %>
-              </li>
+              <div class="radio no-margint">
+                <%= label_tag :guest_checkout_true do %>
+                  <%= radio_button_tag :guest_checkout, true, guest %>
+                  <%= Spree.t(:say_yes) %>
+                <% end %>
+              </div>
+              <div class="radio">
+                <%= label_tag :guest_checkout_false do %>
+                  <%= radio_button_tag :guest_checkout, false, !guest, disabled: @order.cart? %>
+                  <%= Spree.t(:say_no) %>
+                <% end %>
+              </div>
               <%= hidden_field_tag :user_id, @order.user_id %>
             <% end %>
-          </ul>
+          </div>
         </div>
-      </div>
+      </div>  
     </div>
-  </fieldset>
-
-  <div data-hook="bill_address_wrapper" class="alpha six columns">
-    <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 %>
-    </fieldset>
+    
   </div>
 
-  <div class="omega six columns" 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| %>
-        <div class="field" style="position: absolute;margin-top: -15px;right: 0;">
-          <span data-hook="use_billing">
-            <%= check_box_tag 'order[use_billing]', '1', ((@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.same_as?(@order.ship_address)) %>
-            <%= label_tag 'order[use_billing]', Spree.t(:use_billing_address) %>
-          </span>
+  <div class="row">
+    <div data-hook="bill_address_wrapper" class="col-md-6">
+      <div class="panel panel-default">
+        <div class="panel-heading">
+          <h1 class="panel-title"><%= Spree.t(:billing_address) %></h1>
         </div>
 
-        <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => sa_form, :type => 'shipping' } %>
-      <% end %>
-    </fieldset>
-  </div>
+        <div class="panel-body">
+          <%= f.fields_for :bill_address do |ba_form| %>
+            <%= render partial: 'spree/admin/shared/address_form', locals: { f: ba_form, type: "billing" } %>
+          <% end %>  
+        </div>
+      </div>
+    </div>
+
+    <div class="col-md-6" data-hook="ship_address_wrapper">
+      <div class="panel panel-default">
+        <div class="panel-heading">
+          <h1 class="panel-title"><%= Spree.t(:shipping_address) %></h1>
+        </div>
+        <div class="panel-body">
+          <%= f.fields_for :ship_address do |sa_form| %>
+            <div class="form-group">
+              <span data-hook="use_billing">
+                <%= check_box_tag 'order[use_billing]', '1', ((@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.same_as?(@order.ship_address)) %>
+                <%= label_tag 'order[use_billing]', Spree.t(:use_billing_address) %>
+              </span>
+            </div>
 
-  <div class="clear"></div>
+            <%= render partial: 'spree/admin/shared/address_form', locals: { f: sa_form, type: 'shipping' } %>
+          <% end %>
+        </div>
+      </div>
+    </div>
+  </div>
 
-  <div class="form-buttons filter-actions actions" data-hook="buttons">
-    <%= button Spree.t('actions.update'), 'refresh' %>
+  <div class="form-actions" data-hook="buttons">
+    <%= button Spree.t('actions.update'), 'save' %>
   </div>
 
   <% content_for :head do %>
     <%= javascript_include_tag 'spree/backend/address_states.js' %>
   <% end %>
-</fieldset>
+</div>

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

@@ -1,23 +1,27 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Customer Details' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Customer Details' } %>
 
 <% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= Spree.t(:customer_details) %>
+  / <%= Spree.t(:customer_details) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => 'arrow-left' %></li>
-<% 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' %>
-    <%= render :partial => "spree/admin/orders/customer_details/autocomplete", :formats => :js %>
-  </fieldset>
+<div id="select-customer" class="panel panel-default" data-hook>
+  <div class="panel-heading">
+    <h1 class="panel-title">
+      <%= Spree.t(:customer_search) %>  
+    </h1>
+  </div>
+  <div class="panel-body">
+    <%= hidden_field_tag :customer_search,  nil, class: 'error-message' %>
+    <%= render partial: "spree/admin/orders/customer_details/autocomplete", formats: :js %>
+  </div>
 </div>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @order } %>
 
-<%= form_for @order, :url => admin_order_customer_url(@order) do |f| %>
-  <%= render 'form', :f => f %>
+<%= form_for @order, url: admin_order_customer_url(@order) do |f| %>
+  <%= render 'form', f: f %>
 <% end %>
+
+<br>
+
+<%= render partial: 'spree/admin/shared/order_summary' %>

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

@@ -1,29 +1,30 @@
 <% content_for :page_actions do %>
   <% if can?(:fire, @order) %>
-    <li><%= event_links %></li>
+    <%= event_links %>
   <% end %>
   <% if can?(:resend, @order) %>
-    <li><%= button_link_to Spree.t(:resend), resend_admin_order_url(@order), method: :post, icon: 'email' %></li>
-  <% end %>
-  <% if can?(:admin, Spree::Order) %>
-    <li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, icon: 'arrow-left' %></li>
+    <%= button_link_to Spree.t(:resend), resend_admin_order_url(@order), method: :post, icon: 'envelope' %>
   <% end %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Shipments' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Shipments' } %>
+
+<% content_for :page_title do %>
+  / <%= Spree::Shipment.model_name.human(count: :many) %>
+<% end %>
 
 <div data-hook="admin_order_edit_header">
-  <%= render partial: 'spree/shared/error_messages', locals: { target: @order } %>
+  <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @order } %>
 </div>
 
-<% if @order.payments.valid.any? && @order.considered_risky? %>
+<% if @order.payments.exists? && @order.considered_risky? %>
   <%= render 'spree/admin/orders/risk_analysis', latest_payment: @order.payments.valid.last %>
 <% end %>
 
 <%= render partial: 'add_product' if @order.shipment_state != 'shipped' && can?(:update, @order) %>
 
 <% if @order.line_items.empty? %>
-  <div class="no-objects-found">
+  <div class="alert alert-warning">
     <%= Spree.t(:your_order_is_empty_add_product)%>
   </div>
 <% end %>
@@ -37,3 +38,5 @@
 <% content_for :head do %>
   <%= javascript_tag 'var expand_variants = true;' %>
 <% end %>
+
+<%= render partial: 'spree/admin/shared/order_summary' %>