spree_backend 4.1.1 → 4.5.0

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

@@ -0,0 +1,135 @@
+<% content_for :table_filter do %>
+  <div data-hook="admin_orders_index_search">
+
+    <%= search_form_for [:admin, @search] do |f| %>
+    <div class="row">
+
+      <div class="date-range-filter col-12 col-lg-8">
+        <div class="form-group">
+          <%= label_tag :q_created_at_gt, Spree.t(:date_range) %>
+          <div class="row pb-0">
+            <div class="col-12 col-md-6 mb-3 mb-md-0">
+              <div class="input-group datePickerFrom"
+                   data-wrap="true"
+                   data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
+                   data-max-date="<%= params[:q][:created_at_lt] %>">
+                <%= f.text_field :created_at_gt,
+                  class: 'form-control js-filterable',
+                    value: params[:q][:created_at_gt],
+                    placeholder: Spree.t(:starting_from),
+                    'data-input':'' %>
+                <%= render partial: 'spree/admin/shared/cal_close' %>
+              </div>
+            </div>
+            <div class="col-12 col-md-6 mt-3 mt-md-0">
+              <div class="input-group datePickerTo"
+                   data-wrap="true"
+                   data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
+                   data-min-date="<%= params[:q][:created_at_gt] %>">
+
+                <%= f.text_field :created_at_lt,
+                  class: 'form-control js-filterable',
+                    value: params[:q][:created_at_lt],
+                    placeholder: Spree.t(:ending_at),
+                    'data-input':'' %>
+                <%= render partial: 'spree/admin/shared/cal_close' %>
+                </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="col-12 col-lg-4">
+        <div class="form-group">
+          <%= label_tag :q_number_cont, Spree.t(:search_order_number) %>
+          <%= f.text_field :number_cont, class: 'form-control js-quick-search-target js-filterable' %>
+        </div>
+      </div>
+
+    </div>
+
+    <div class="row">
+
+      <div class="col-12 col-lg-4">
+        <div class="form-group">
+          <%= label_tag :q_state_eq, Spree.t(:status) %>
+          <%= f.select :state_eq,
+            Spree::Order.state_machines[:state].states.map {|s| [Spree.t("order_state.#{s.name}"), s.value]},
+            { include_blank: true },
+            class: 'select2-clear js-filterable' %>
+        </div>
+      </div>
+
+      <div class="col-12 col-lg-4">
+        <div class="form-group">
+          <%= label_tag :q_payment_state_eq, Spree.t(:payment_state) %>
+          <%= f.select :payment_state_eq, Spree::Order::PAYMENT_STATES.map {|s| [Spree.t("payment_states.#{s}"), s]}, { include_blank: true }, class: 'select2-clear js-filterable' %>
+        </div>
+      </div>
+
+      <div class="col-12 col-lg-4">
+        <div class="form-group">
+          <%= label_tag :q_shipment_state_eq, Spree.t(:shipment_state) %>
+          <%= f.select :shipment_state_eq, Spree::Order::SHIPMENT_STATES.map {|s| [Spree.t("shipment_states.#{s}"), s]}, { include_blank: true }, class: 'select2-clear js-filterable' %>
+        </div>
+      </div>
+
+    </div>
+
+    <div class="row">
+
+      <div class="col-12 col-lg-4">
+        <div class="form-group">
+          <%= label_tag :q_bill_address_firstname_start, Spree.t(:first_name_begins_with) %>
+          <%= f.text_field :bill_address_firstname_start, class: 'form-control js-filterable' %>
+        </div>
+      </div>
+
+      <div class="col-12 col-lg-4">
+        <div class="form-group">
+          <%= label_tag :q_bill_address_lastname_start, Spree.t(:last_name_begins_with) %>
+          <%= f.text_field :bill_address_lastname_start, class: 'form-control js-filterable' %>
+        </div>
+      </div>
+
+      <div class="col-12 col-lg-4">
+        <div class="form-group">
+          <%= label_tag :q_email_cont, Spree.t(:email) %>
+          <%= f.email_field :email_cont, class: 'form-control js-filterable' %>
+        </div>
+      </div>
+
+    </div>
+
+    <div class="row">
+
+      <div class="col-12 col-lg-4">
+        <div class="form-group">
+          <%= label_tag :q_line_items_variant_sku_eq, Spree.t(:sku) %>
+          <%= f.text_field :line_items_variant_sku_eq, class: 'form-control js-filterable' %>
+        </div>
+      </div>
+
+      <div class="col-12 col-lg-4">
+        <div class="form-group">
+          <%= label_tag :q_promotions_id_in, Spree.t(:promotion) %>
+          <%= f.select :promotions_id_in, Spree::Promotion.applied.pluck(:name, :id), { include_blank: true }, class: 'select2-clear js-filterable' %>
+        </div>
+      </div>
+
+      <div class="col-12 col-lg-4">
+        <div class="form-group">
+          <%= label_tag :q_channel_eq, Spree.t(:channel) %>
+          <%= f.select :channel_eq, Spree::Order.distinct.pluck(:channel), { include_blank: true }, class: 'select2-clear js-filterable' %>
+        </div>
+      </div>
+    </div>
+
+    <div data-hook="admin_orders_index_search_buttons" class="form-actions">
+      <%= button Spree.t(:filter_results), 'search.svg' %>
+    </div>
+
+    <% end %>
+
+  </div>
+
+<% end %>

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

@@ -3,22 +3,24 @@
   <%= render partial: "spree/admin/variants/split", formats: :js %>
 
   <div class="card-header stock-location no-borderb" data-hook="stock-location">
-    <h1 class="d-flex flex-wrap align-items-center card-title mb-0 h5">
+    <h5 class="flex-wrap align-items-center card-title mb-0 h6">
       <span class="shipment-number"><%= shipment.number %></span>
       -
       <span class="shipment-state"><%= Spree.t("shipment_states.#{shipment.state}") %></span>
       <%= Spree.t(:package_from) %>
-      <strong class="stock-location-name" data-hook="stock-location-name">'<%= shipment.stock_location.name %>'</strong>
+      <strong class="stock-location-name" data-hook="stock-location-name">
+        <%= link_to shipment.stock_location.name, spree.edit_admin_stock_location_url(shipment.stock_location) %>
+      </strong>
       <% if shipment.ready? and can? :update, shipment %>
         <%= link_to Spree.t(:ship), 'javascript:;', class: 'ship ml-auto btn btn-success', data: { 'shipment-number' => shipment.number } %>
         <div class='clearfix'></div>
       <% end %>
-    </h1>
+    </h5>
   </div>
 
-  <div class="table-responsive">
-    <table class="table table-bordered stock-contents" data-hook="stock-contents">
-      <thead>
+  <div class="table-responsive bg-white">
+    <table class="table stock-contents" data-hook="stock-contents">
+      <thead class="text-muted">
         <tr>
           <th colspan="2"><%= Spree.t(:item_description) %></th>
           <th width="15%" class="text-center"><%= Spree.t(:price) %></th>
@@ -41,11 +43,13 @@
                       { class: 'select2', data: {'shipment-number' => shipment.number } } %>
               </div>
             </td>
-            <td class="actions text-center">
-              <% if can? :update, shipment %>
-                <%= link_to_with_icon 'cancel', Spree.t('actions.cancel'), "#", class: 'cancel-method btn btn-primary btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), no_text: true %>
-                <%= link_to_with_icon 'save', Spree.t('actions.save'), "#", class: 'save-method btn btn-success btn-sm', data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save'), no_text: true %>
-              <% end %>
+            <td class="actions">
+              <span class="d-flex justify-content-center">
+                <% if can? :update, shipment %>
+                  <%= link_to_with_icon 'cancel.svg', Spree.t('actions.cancel'), "#", class: 'cancel-method btn btn-light btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), no_text: true %>
+                  <%= link_to_with_icon 'save.svg', Spree.t('actions.save'), "#", class: 'save-method btn btn-success btn-sm', data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save'), no_text: true %>
+                <% end %>
+              </span>
             </td>
           </tr>
           <% end %>
@@ -62,24 +66,27 @@
               <td colspan='5'><%= Spree.t(:no_shipping_method_selected) %></td>
             <% end %>
 
-            <td class="actions text-center">
-              <% if( (can? :update, shipment) and !shipment.shipped?) %>
-                <%= link_to_with_icon 'edit', Spree.t('edit'), "javascript:;", class: 'edit-method with-tip btn btn-sm btn-primary', data: {action: 'edit'}, no_text: true %>
-              <% end %>
+            <td class="actions">
+              <span class="d-flex justify-content-center">
+                <% if( (can? :update, shipment) and !shipment.shipped?) %>
+                  <%= link_to_with_icon 'edit.svg', Spree.t('edit'), "javascript:;", class: 'edit-method with-tip btn btn-sm btn-light', data: {action: 'edit'}, no_text: true %>
+                <% end %>
+              </span>
             </td>
           </tr>
 
-
         <tr class="edit-tracking is-hidden total">
           <td colspan="5">
             <label><%= Spree.t(:tracking_number) %>:</label>
             <%= text_field_tag :tracking, shipment.tracking, class: "form-control" %>
           </td>
-          <td class="actions text-center">
-            <% if can? :update, shipment %>
-              <%= link_to_with_icon 'cancel', Spree.t('actions.cancel'), "#", class: 'cancel-tracking btn btn-primary btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), no_text: true %>
-              <%= link_to_with_icon 'save', Spree.t('actions.save'), "#", class: 'save-tracking btn btn-success btn-sm', data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save'), no_text: true %>
-            <% end %>
+          <td class="actions">
+            <span class="d-flex justify-content-center">
+              <% if can? :update, shipment %>
+                <%= link_to_with_icon 'cancel.svg', Spree.t('actions.cancel'), "#", class: 'cancel-tracking btn btn-light btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), no_text: true %>
+                <%= link_to_with_icon 'save.svg', Spree.t('actions.save'), "#", class: 'save-tracking btn btn-success btn-sm', data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save'), no_text: true %>
+              <% end %>
+            </span>
           </td>
         </tr>
 
@@ -99,10 +106,12 @@
               <%= Spree.t(:no_tracking_present) %>
             <% end %>
           </td>
-          <td class="actions text-center">
-            <% if can? :update, shipment %>
-              <%= link_to_with_icon 'edit', Spree.t('edit'), "#", class: 'edit-tracking btn btn-primary btn-sm', data: {action: 'edit'}, title: Spree.t('edit'), no_text: true %>
-            <% end %>
+          <td class="actions">
+            <span class="d-flex justify-content-center">
+              <% if can? :update, shipment %>
+                <%= link_to_with_icon 'edit.svg', Spree.t('edit'), "#", class: 'edit-tracking btn btn-light btn-sm', data: {action: 'edit'}, title: Spree.t('edit'), no_text: true %>
+              <% end %>
+            </span>
           </td>
         </tr>
       </tbody>

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

@@ -1,12 +1,12 @@
 <% shipment.manifest.each do |item| %>
   <tr class="stock-item" data-item-quantity="<%= item.quantity %>">
     <td class="item-image image text-center">
-      <%= link_to mini_image(item.variant), edit_admin_product_path(item.variant.product) %>
+      <%= link_to small_image(item.variant), edit_admin_product_path(item.variant.product) %>
     </td>
 
     <td class="item-name">
       <%= link_to item.variant.product.name, edit_admin_product_path(item.variant.product) %>
-      <br />
+      <br>
       <%= "(#{item.variant.options_text})" if item.variant.options_text.present? %>
       <% if item.variant.sku.present? %>
         <strong><%= Spree.t(:sku) %>:</strong> <%= item.variant.sku %>
@@ -31,14 +31,16 @@
       <%= 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 'pencil', Spree.t('actions.edit'), "#", class: 'edit-item btn btn-outline-secondary btn-sm', title: Spree.t('actions.edit'), no_text: true %>
-        <%= 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 class="cart-item-delete actions" data-hook="cart_item_delete">
+      <span class="d-flex justify-content-center">
+        <% if((!shipment.shipped?) && can?(:update, item.line_item)) %>
+          <%= link_to_with_icon 'edit.svg', Spree.t('actions.edit'), "#", class: 'edit-item btn btn-light btn-sm', title: Spree.t('actions.edit'), no_text: true %>
+          <%= link_to_with_icon 'cancel.svg', Spree.t('actions.cancel'), "#", class: 'cancel-item  btn btn-light btn-sm', data: { action: 'cancel' }, title: Spree.t('actions.cancel'), style: 'display: none', no_text: true %>
+          <%= link_to_with_icon 'save.svg', 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.svg', Spree.t('split'), "#", class: 'split-item btn btn-light btn-sm', data: {action: 'split', 'variant-id' => item.variant.id}, title: Spree.t('split'), no_text: true %>
+          <%= link_to_with_icon 'delete.svg', 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 %>
+      </span>
     </td>
   </tr>
 <% end %>

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

@@ -14,7 +14,7 @@
 
 <% if @order.line_items.empty? %>
   <div class="alert alert-warning">
-    <%= Spree.t(:your_order_is_empty_add_product)%>
+    <%= Spree.t(:your_order_is_empty_add_product) %>
   </div>
 <% end %>
 

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

@@ -0,0 +1,7 @@
+<%= render 'spree/admin/shared/order_tabs', current: :channel %>
+
+<div data-hook="admin_order_edit_header">
+  <%= render 'spree/admin/shared/error_messages', target: @order %>
+</div>
+
+<%= render 'channel_form', order: @order if can?(:update, @order) %>

data/app/views/spree/admin/orders/customer_details/_autocomplete.js.erb

@@ -1,19 +1,42 @@
 <script type='text/template' id='customer_autocomplete_template'>
-  <div class='customer-autocomplete-item'>
-    <div class='customer-details'>
-      <h5>{{customer.email}}</h5>
-      {{#if bill_address.firstname }}
-        <strong>{{t 'bill_address' }}</strong>
-        {{bill_address.firstname}} {{bill_address.lastname}}<br>
-        {{bill_address.address1}}, {{bill_address.address2}}<br>
-        {{bill_address.city}}<br>
-        {{#if bill_address.state_id }}
-          {{bill_address.state.name}}
+  <div class='customer-autocomplete-item container'>
+    <div class="row">
+      <div class="col">
+        <h5><strong>Email:</strong> {{customer.email}}</h5>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class='customer-details col-6'>
+        {{#if bill_address.firstname }}
+          <strong>{{t 'bill_address' }}</strong><br>
+          {{bill_address.firstname}} {{bill_address.lastname}}<br>
+          {{bill_address.address1}}, {{bill_address.address2}}<br>
+          {{bill_address.city}}<br>
+          {{#if bill_address.state }}
+            {{bill_address.state.name}}
+          {{else}}
+            {{bill_address.state_name}}
+          {{/if}}
+          {{bill_address.country.name}}
+        {{/if}}
+    </div>
+
+    <div class='customer-details col-6'>
+      {{#if ship_address.firstname }}
+        <strong>Shipping Address</strong><br>
+        {{ship_address.firstname}} {{ship_address.lastname}}<br>
+        {{ship_address.address1}}, {{ship_address.address2}}<br>
+        {{ship_address.city}}<br>
+        {{#if ship_address.state }}
+          {{ship_address.state.name}}
         {{else}}
-          {{bill_address.state_name}}
+          {{ship_address.state_name}}
         {{/if}}
-        {{bill_address.country.name}}
+        {{ship_address.country.name}}
       {{/if}}
     </div>
+
   </div>
+</div>
 </script>

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

@@ -3,9 +3,9 @@
   <div class="card mb-3" data-hook="customer_guest">
 
     <div class="card-header">
-      <h1 class="card-title mb-0 h5">
+      <h5 class="card-title mb-0 h6">
         <%= Spree.t(:account) %>
-      </h1>
+      </h5>
     </div>
 
     <div class="card-body">
@@ -27,13 +27,13 @@
 
             <% if @order.completed? %>
               <div>
-                <span class="badge badge-secondary">
+                <span class="badge badge-pill badge-secondary">
                   <%= guest ? Spree.t(:say_yes) : Spree.t(:say_no) %>
                   <%= hidden_field_tag :guest_checkout, guest %>
                 </span>
               </div>
             <% else %>
-              <div class="radio no-margint">
+              <div class="radio mt-0">
                 <%= label_tag :guest_checkout_true do %>
                   <%= radio_button_tag :guest_checkout, true, guest %>
                   <%= Spree.t(:say_yes) %>
@@ -58,7 +58,7 @@
     <div data-hook="bill_address_wrapper" class="col-12 col-lg-6">
       <div class="card mb-3">
         <div class="card-header">
-          <h1 class="card-title mb-0 h5"><%= Spree.t(:billing_address) %></h1>
+          <h5 class="card-title mb-0 h6"><%= Spree.t(:billing_address) %></h5>
         </div>
 
         <div class="card-body">
@@ -76,15 +76,15 @@
     <div class="col-12 col-lg-6" data-hook="ship_address_wrapper">
       <div class="card mb-3">
         <div class="card-header">
-          <h1 class="card-title mb-0 h5"><%= Spree.t(:shipping_address) %></h1>
+          <h5 class="card-title mb-0 h6"><%= Spree.t(:shipping_address) %></h5>
         </div>
         <div class="card-body">
           <% if can? :edit, @order.user %>
             <%= 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.shipping_eq_billing_address? %>
-                  <%= label_tag 'order[use_billing]', Spree.t(:use_billing_address) %>
+                  <%= check_box_tag 'order[use_billing]', '1', @order.shipping_eq_billing_address?, class: 'checkbox' %>
+                  <%= label_tag 'order[use_billing]', Spree.t(:use_billing_address), class: 'form-check-label' %>
                 </span>
               </div>
 
@@ -100,7 +100,7 @@
 
   <% if can? :edit, @order.user %>
     <div class="form-actions" data-hook="buttons">
-      <%= button Spree.t('actions.update'), 'save' %>
+      <%= button Spree.t('actions.update'), 'save.svg' %>
     </div>
   <% end %>
 </div>

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

@@ -1,18 +1,14 @@
 <%= render 'spree/admin/shared/order_tabs', current: :customer_details %>
 
-<% content_for :page_title do %>
-  / <%= Spree.t(:customer_details) %>
-<% end %>
-
 <% if can? :edit, @order.user %>
   <div id="select-customer" class="card mb-3" data-hook>
     <div class="card-header">
-      <h1 class="card-title mb-0 h5">
+      <h5 class="card-title mb-0 h6">
         <%= Spree.t(:customer_search) %>
-      </h1>
+      </h5>
     </div>
     <div class="card-body" id="customer-search-field">
-      <%= hidden_field_tag :customer_search,  nil, class: 'error-message' %>
+      <%= select_tag :customer_search, nil, class: 'd-block w-100' %>
       <%= render partial: "spree/admin/orders/customer_details/autocomplete", formats: :js %>
     </div>
   </div>

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

@@ -2,10 +2,6 @@
 
 <%= render 'spree/admin/shared/order_tabs', current: :shipments %>
 
-<% content_for :page_title do %>
-  / <%= plural_resource_name(Spree::Shipment) %>
-<% end %>
-
 <div data-hook="admin_order_edit_header">
   <%= render 'spree/admin/shared/error_messages', target: @order %>
 </div>
@@ -18,7 +14,7 @@
 
 <% if @order.line_items.empty? %>
   <div class="alert alert-warning">
-    <%= Spree.t(:your_order_is_empty_add_product)%>
+    <%= Spree.t(:your_order_is_empty_add_product) %>
   </div>
 <% end %>