solidus_backend 1.3.2 → 1.4.0.beta1

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

@@ -1,3 +1,6 @@
+<% admin_breadcrumb(plural_resource_name(Spree::Shipment)) %>
+
+
 <% manifest_items = Spree::ShippingManifest.new(inventory_units: shipment.inventory_units.where(carton_id: nil)).items %>
 
 <div id="<%= "shipment_#{shipment.id}" %>" class="js-shipment-edit" data-hook="admin_shipment_form">
@@ -85,7 +88,7 @@
       <tr class="edit-tracking hidden total">
         <td colspan="5">
           <label><%= Spree::Shipment.human_attribute_name(:tracking) %>:</label>
-          <%= text_field_tag :tracking, shipment.tracking %>
+          <%= text_field_tag :tracking, shipment.tracking, id: nil %>
         </td>
         <td class="actions">
           <% if can? :update, shipment %>

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

@@ -1,5 +1,8 @@
 <% shipment_manifest.each do |item| %>
-  <tr class="stock-item" data-item-quantity="<%= item.quantity %>">
+  <tr class="stock-item"
+      data-item-quantity="<%= item.quantity %>"
+      data-variant-id="<%= item.variant.id %>"
+      >
     <td class="item-image">
       <%= image_tag item.variant.display_image.attachment(:mini) %>
     </td>

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

@@ -3,15 +3,15 @@
         <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, :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>
+        <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' } %>
 
+<% admin_breadcrumb(Spree.t(:cart)) %>
+
+
 <div data-hook="admin_order_edit_header">
   <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
 </div>
@@ -35,7 +35,3 @@
     <%= render :partial => 'line_items_edit_form', :locals => { :order => @order } %>
   </div>
 </div>
-
-<% content_for :head do %>
-  <%= javascript_tag 'var expand_variants = true;' %>
-<% end %>

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

@@ -1,8 +1,7 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: {current: 'Confirm'} %>
 
-<% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= Spree.t(:confirm_order) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:confirm_order)) %>
+
 
 <%= render partial: 'spree/admin/orders/confirm/customer_details', locals: {order: @order} %>
 
@@ -55,7 +54,7 @@
 <%= render partial: 'spree/admin/orders/confirm/payments', locals: {payments: @order.payments} %>
 
 <div class="form-buttons filter-actions actions" data-hook="complete-order-button">
-  <%= button_to [:complete, :admin, @order], {class: 'button fa fa-rocket', method: 'put'} do %>
+  <%= button_to [:complete, :admin, @order], { class: 'button', method: 'put' } do %>
     <%= Spree.t(:complete_order) %>
   <% end %>
 </div>

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

@@ -1,5 +1,5 @@
 <fieldset class="no-border-bottom">
-  <legend><%= Spree::Payment.model_name.human(count: :other) %></legend>
+  <legend><%= plural_resource_name(Spree::Payment) %></legend>
   <table class="index">
     <thead>
       <tr data-hook="payments_header">

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

@@ -1,12 +1,11 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: {current: 'Confirm'} %>
 
-<% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= Spree.t(:confirm_order) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:confirm_order)) %>
+
 
 <div class="form-buttons filter-actions actions" data-hook="complete-order-button">
   <div><%= Spree.t(:order_please_refresh) %></div><br/>
-  <%= button_to [:advance, :admin, @order], {class: 'button fa fa-refresh', method: 'put'} do %>
+  <%= button_to [:advance, :admin, @order], { class: 'button', method: 'put' } do %>
     <%= Spree.t(:order_refresh_totals) %>
   <% end %>
 </div>

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

@@ -68,6 +68,6 @@
   <div class="clear"></div>
 
   <div class="form-buttons filter-actions actions" data-hook="buttons">
-    <%= button Spree.t('actions.update'), 'refresh' %>
+    <%= button Spree.t('actions.update') %>
   </div>
 </fieldset>

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

@@ -1,11 +1,9 @@
 <%= 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) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:customer_details)) %>
+
 
 <% 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>

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

@@ -1,11 +1,10 @@
 <%= 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) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:customer_details)) %>
+
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => 'arrow-left' %></li>
+  <li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path %></li>
 <% end %>
 
 
@@ -26,4 +25,3 @@
     <%= render "spree/admin/shared/address", address: @order.ship_address %>
   </section>
 </main>
-

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

@@ -3,10 +3,7 @@
     <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, 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>
+    <li><%= button_link_to Spree.t(:resend), resend_admin_order_url(@order), method: :post %></li>
   <% end %>
 <% end %>
 
@@ -35,7 +32,3 @@
     <%= render partial: 'form', locals: { order: @order } %>
   </div>
 </div>
-
-<% content_for :head do %>
-  <%= javascript_tag 'var expand_variants = true;' %>
-<% end %>

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

@@ -1,10 +1,9 @@
-<% content_for :page_title do %>
-  <%= Spree.t(:listing_orders) %>
-<% end %>
+<% admin_breadcrumb(plural_resource_name(Spree::Order)) %>
+
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:new_order), new_admin_order_url, :icon => 'plus', :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 %>
 
@@ -70,6 +69,13 @@
       </div>
 
       <div class="omega four columns">
+        <% if Spree::Store.count > 1 %>
+          <div class="field">
+            <%= label_tag nil, Spree.t(:store) %>
+            <%= f.select :store_id_eq, Spree::Store.all.map { |s| [s.name, s.id] }, { include_blank: true }, { class: "select2" } %>
+          </div>
+        <% end %>
+
         <div class="field checkbox">
           <label>
             <%= f.check_box :completed_at_not_null, {:checked => @show_only_completed}, '1', '0' %>
@@ -89,7 +95,7 @@
 
       <div class="actions filter-actions">
         <div data-hook="admin_orders_index_search_buttons">
-          <%= button Spree.t(:filter_results), 'search' %>
+          <%= button Spree.t(:filter_results) %>
         </div>
       </div>
     <% end %>

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

@@ -1,13 +1,11 @@
 <%= render 'spree/admin/shared/payments_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree.t(:editing_payment_method) %> <i class="fa fa-arrow-right"></i> <%= @payment_method.name %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(plural_resource_name(Spree::Payment)) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::PaymentMethod), spree.admin_payment_methods_path) %>
+<% admin_breadcrumb(@payment_method.name) %>
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_payment_methods_list), spree.admin_payment_methods_path, :icon => 'arrow-left' %>
-  </li>  
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @payment_method } %>
@@ -16,7 +14,7 @@
   <fieldset class="no-border-top">
     <%= render :partial => 'form', :locals => { :f => f } %>
     <div data-hook="buttons" class="filter-actions actions">
-      <%= button Spree.t('actions.update'), 'refresh' %>
+      <%= button Spree.t('actions.update') %>
     </div>
   </fieldset>
 

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

@@ -1,13 +1,14 @@
 <%= render 'spree/admin/shared/payments_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree::PaymentMethod.model_name.human(count: :other) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(plural_resource_name(Spree::Payment)) %>
+<% admin_breadcrumb(plural_resource_name(Spree::PaymentMethod)) %>
+
 
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::PaymentMethod) %>
     <li>
-      <%= button_link_to Spree.t(:new_payment_method), new_object_url, :icon => 'plus', :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 %>
@@ -25,7 +26,7 @@
     </colgroup>
     <thead>
       <tr data-hook="admin_payment_methods_index_headers">
-        <th></th>
+        <th class="no-border"></th>
         <th><%= Spree::PaymentMethod.human_attribute_name(:name) %></th>
         <th><%= Spree::PaymentMethod.human_attribute_name(:type) %></th>
         <th><%= Spree::PaymentMethod.human_attribute_name(:display_on) %></th>

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

@@ -1,13 +1,12 @@
 <%= render 'spree/admin/shared/payments_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree.t(:new_payment_method) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(plural_resource_name(Spree::Payment)) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::PaymentMethod), spree.admin_payment_methods_path) %>
+<% admin_breadcrumb(Spree.t(:new_payment_method)) %>
+
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_payment_methods_list), admin_payment_methods_path, :icon => 'arrow-left' %>
-  </li>  
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @payment_method } %>
@@ -16,7 +15,7 @@
   <fieldset class="no-border-top">
     <%= render :partial => 'form', :locals => { :f => f } %>
     <div data-hook="buttons" class="filter-actions actions">
-      <%= button Spree.t('actions.create'), 'ok' %>
+      <%= button Spree.t('actions.create') %>
     </div>
   </fieldset>
 <% end %>

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

@@ -1,5 +1,5 @@
 <% if @payment.capture_events.exists? %>
-  <h3><%= Spree::PaymentCaptureEvent.model_name.human(count: :other) %></h3>
+  <h3><%= plural_resource_name(Spree::PaymentCaptureEvent) %></h3>
   <table class="index" id="capture_events">
     <thead>
       <tr data-hook="payments_header">

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

@@ -1,8 +1,8 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Creditcards' } %>
 
-<% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= Spree::Refund.model_name.human %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Payment), spree.admin_order_payments_path(@order)) %>
+<% admin_breadcrumb(Spree::Refund.model_name.human) %>
+
 
 <%= form_tag do %>
   <h3><%= Spree::Refund.model_name.human %></h3>

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

@@ -3,15 +3,12 @@
 <% content_for :page_actions do %>
   <% if @order.outstanding_balance? %>
     <li id="new_payment_section">
-      <%= button_link_to Spree.t(:new_payment), new_admin_order_payment_url(@order), :icon => 'plus' %>
+      <%= button_link_to Spree.t(:new_payment), new_admin_order_payment_url(@order) %>
     </li>
   <% end %>
-  <li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => 'arrow-left' %></li>
 <% end %>
 
-<% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= Spree::Payment.model_name.human(count: :other) %>
-<% end %>
+<% admin_breadcrumb(plural_resource_name(Spree::Payment)) %>
 
 <% if @order.outstanding_balance? %>
   <h5 class="outstanding-balance"><%= @order.outstanding_balance < 0 ? Spree.t(:credit_owed) : Spree.t(:balance_due) %>: <strong><%= @order.display_outstanding_balance %></strong></h5>
@@ -20,13 +17,13 @@
 <% if @payments.any? %>
 
   <fieldset data-hook="payment_list" class="no-border-bottom">
-    <legend align="center"><%= Spree::Payment.model_name.human(count: :other) %></legend>
+    <legend align="center"><%= plural_resource_name(Spree::Payment) %></legend>
     <%= render :partial => 'list', :locals => { :payments => @payments } %>
   </fieldset>
 
   <% if @refunds.any? %>
     <fieldset data-hook="payment_list" class="no-border-bottom">
-      <legend align="center"><%= Spree::Refund.model_name.human(count: :other) %></legend>
+      <legend align="center"><%= plural_resource_name(Spree::Refund) %></legend>
       <%= render :partial => 'spree/admin/shared/refunds', :locals => { :refunds => @refunds, show_actions: true } %>
     </fieldset>
   <% end %>

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

@@ -1,11 +1,10 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Payments' } %>
 
-<% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= Spree.t(:new_payment) %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Payment), spree.admin_order_payments_path(@order)) %>
+<% admin_breadcrumb(Spree.t(:new_payment)) %>
+
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_payments_list), spree.admin_order_payments_url(@order), :icon => 'arrow-left' %></li>
 <% end %>
 
 <% if @payment_methods.any? %>
@@ -16,7 +15,7 @@
       <%= 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'), @order.cart? ? 'arrow-right' : 'refresh' %>
+        <%= button @order.cart? ? Spree.t('actions.continue') : Spree.t('actions.update') %>
       </div>
     </fieldset>
   <% end %>

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

@@ -1,19 +1,16 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Payments' } %>
 
-<% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i>
-  <%= Spree::Payment.model_name.human %>
-  <i class="fa fa-arrow-right"></i>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Payment), spree.admin_order_payments_path(@order)) %>
+<% admin_breadcrumb do %>
   <%= payment_method_name(@payment) %>
-  &nbsp;
   <span class="state <%= @payment.state %>">
     <%= Spree.t(@payment.state, :scope => :payment_states, :default => @payment.state.capitalize) %>
   </span>
 <% end %>
 
+
 <% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:logs), spree.admin_order_payment_log_entries_url(@order, @payment), :icon => 'archive' %></li>
-  <li><%= button_link_to Spree.t(:back_to_payments_list), spree.admin_order_payments_url(@order), :icon => 'arrow-left' %></li>
+  <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 } %>

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

@@ -24,6 +24,7 @@
     <div class="three columns" data-hook="admin_product_price_form_country">
       <%= f.field_container :country do %>
         <%= f.label :country %>
+        <%= f.field_hint :country %>
         <%= f.collection_select :country_iso, available_countries, :iso, :name,
                                 {
                                   include_blank: t(:any_country, scope: [:spree, :admin, :prices]),

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, :icon => 'plus', :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) %>
 
@@ -62,7 +62,7 @@
 
   <div class="actions filter-actions">
     <div data-hook="admin_orders_index_search_buttons">
-      <%= button Spree.t(:filter_results), 'search' %>
+      <%= button Spree.t(:filter_results) %>
     </div>
   </div>
 

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

@@ -1,6 +1,8 @@
 <%= render 'spree/admin/shared/product_tabs', :current => 'Product Properties' %>
 <%= render 'spree/shared/error_messages', :target => @product %>
 
+<% admin_breadcrumb(plural_resource_name(Spree::ProductProperty)) %>
+
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::ProductProperty) %>
     <ul class="tollbar inline-menu">
@@ -18,7 +20,7 @@
 
 <%= form_for @product, :url => admin_product_url(@product), :method => :put do |f| %>
   <fieldset>
-    <legend align="center"><%= Spree::ProductProperty.model_name.human(count: :other) %></legend>
+    <legend align="center"><%= plural_resource_name(Spree::ProductProperty) %></legend>
     <div class="add_product_properties" data-hook="add_product_properties"></div>
 
     <div id="prototypes" data-hook></div>

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

@@ -71,6 +71,7 @@
         <%= f.label :promotionable do %>
           <%= f.check_box :promotionable %> <%= Spree::Product.human_attribute_name(:promotionable) %>
         <% end %>
+        <%= f.field_hint :promotionable %>
       <% end %>
     </div>
 
@@ -103,28 +104,19 @@
       </div>
 
       <div id="shipping_specs">
-        <div id="shipping_specs_height_field" data-hook="admin_product_form_height" class="field alpha two columns">
-          <%= f.label :height %>
-          <%= f.text_field :height, :size => 4 %>
-        </div>
-        <div id="shipping_specs_width_field" data-hook="admin_product_form_width" class="field omega two columns">
-          <%= f.label :width %>
-          <%= f.text_field :width, :size => 4 %>
-        </div>
-        <div id="shipping_specs_depth_field" data-hook="admin_product_form_depth" class="field alpha two columns">
-          <%= f.label :depth %>
-          <%= f.text_field :depth, :size => 4 %>
-        </div>
-        <div id="shipping_specs_weight_field" data-hook="admin_product_form_weight" class="field omega two columns">
-          <%= f.label :weight %>
-          <%= f.text_field :weight, :size => 4 %>
-        </div>
+        <% [:height, :width, :depth, :weight].each_with_index do |field, index| %>
+          <div id="shipping_specs_<%= field %>_field" class="field two columns <%= index.even? ? 'alpha' : 'omega' %>">
+            <%= f.label field %>
+            <%= f.text_field field, value: number_with_precision(@product.send(field), precision: 2) %>
+          </div>
+        <% end %>
       </div>
     <% end %>
 
     <div data-hook="admin_product_form_shipping_categories">
       <%= 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.error_message_on :shipping_category %>
       <% end %>
@@ -133,6 +125,7 @@
     <div data-hook="admin_product_form_tax_category">
       <%= 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.error_message_on :tax_category %>
       <% end %>
@@ -142,14 +135,14 @@
   <div class="twelve columns alpha omega">
     <div data-hook="admin_product_form_taxons">
       <%= f.field_container :taxons do %>
-        <%= f.label :taxon_ids, Spree::Taxon.model_name.human(count: :other) %><br />
+        <%= f.label :taxon_ids, plural_resource_name(Spree::Taxon) %><br />
         <%= 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, Spree::OptionType.model_name.human(count: :other) %>
+        <%= f.label :option_type_ids, plural_resource_name(Spree::OptionType) %>
         <%= f.hidden_field :option_type_ids, :value => @product.option_type_ids.join(',') %>
       <% end %>
     </div>