solidus_backend 1.2.3 → 1.3.0.beta1

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

@@ -6,18 +6,16 @@
     <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 %>
+        <strong><%= Spree::Variant.human_attribute_name(: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 %>
+          <%= count %> x <%= Spree.t(state, scope: 'inventory_states') %>
         <% end %>
     </td>
-    <td class="item-qty-edit hidden">
-      <%= number_field_tag :quantity, item.quantity, :min => 0, :class => "line_item_quantity", :size => 5 %>
-    </td>
     <td class="item-total align-center"><%= line_item_shipment_price(item.line_item, item.quantity) %></td>
   </tr>
 <% end %>

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

@@ -39,6 +39,5 @@
     <% @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 %>
-    <%= render :partial => 'spree/admin/shared/update_order_state', :handlers => [:js] %>
   <% end -%>
 </div>

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

@@ -8,11 +8,13 @@
     </colgroup>
 
     <thead>
-      <th colspan="2"><%= Spree.t(:name) %></th>
-      <th><%= Spree.t(:price) %></th>
-      <th><%= Spree.t(:quantity) %></th>
-      <th><%= Spree.t(:total_price) %></th>
-      <th class="orders-actions actions" data-hook="admin_order_form_line_items_header_actions">&nbsp;</th>
+      <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>
@@ -22,7 +24,7 @@
           <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.t(:sku) %>:</strong> <%= item.variant.sku %>
+              <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>
@@ -37,8 +39,8 @@
             <% 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('edit') %>
-              <%= link_to '', '#', :class => 'delete-line-item fa fa-trash no-text with-tip',  :title => Spree.t('delete') %>
+              <%= 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 %>

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

@@ -34,7 +34,5 @@
       <% @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 %>
-
-      <%= render :partial => 'spree/admin/shared/update_order_state', :handlers => [:js] %>
   <% end -%>
 </div>

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

@@ -12,7 +12,9 @@
         </strong></td>
           <td class="align-center">
             <span class="<%= @order.payments.failed.count > 0 ? 'state void' : 'state complete' %>">
-              <%= link_to "#{Spree.t 'payments_count', count: @order.payments.failed.count, default: pluralize(@order.payments.failed.count, Spree.t(:payment))}", spree.admin_order_payments_path(@order) %>
+              <%= link_to Spree.t(:payments_failed_count,
+                                  count: @order.payments.failed.count),
+                          spree.admin_order_payments_path(@order) %>
             </span>
         </td>
       </tr>

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

@@ -1,123 +1,122 @@
 <% manifest_items = Spree::ShippingManifest.new(inventory_units: shipment.inventory_units.where(carton_id: nil)).items %>
 
-<% unless manifest_items.empty? %>
-  <div id="<%= "shipment_#{shipment.id}" %>" data-hook="admin_shipment_form">
-    <fieldset class="no-border-bottom">
-      <legend align="center" class="stock-location" data-hook="stock-location">
-        <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>
-      </legend>
+<div id="<%= "shipment_#{shipment.id}" %>" class="js-shipment-edit" data-hook="admin_shipment_form">
+  <fieldset class="no-border-bottom">
+    <legend align="center" class="stock-location" data-hook="stock-location">
+      <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>
+    </legend>
 
-      <% if shipment.ready? && can?(:ship, shipment) %>
-        <%= form_tag(spree.ship_api_shipment_path(shipment), { method: "PUT", remote: true, id: "admin-ship-shipment" }) do %>
-          <%= hidden_field_tag :send_mailer, false %>
-          <%= check_box_tag :send_mailer, true, true %>
-          <%= label_tag :send_mailer, Spree.t(:send_mailer) %>
-          <%= submit_tag Spree.t(:ship), class: "ship-shipment-button" %>
-        <% end %>
+    <% if shipment.ready? && can?(:ship, shipment) %>
+      <%= form_tag("#", class: "admin-ship-shipment") do %>
+        <%= check_box_tag :send_mailer, true, true %>
+        <%= label_tag :send_mailer, Spree.t(:send_mailer) %>
+        <%= submit_tag Spree.t('actions.ship'), class: "ship-shipment-button" %>
       <% end %>
-    </fieldset>
+    <% end %>
+  </fieldset>
 
-    <table class="stock-contents shipment index" data-hook="stock-contents">
-      <colgroup>
-        <col style="width: 10%;" />
-        <col style="width: 30%;" />
-        <col style="width: 15%;" />
-        <col style="width: 15%;" />
-        <col style="width: 15%;" />
-        <col style="width: 15%;" />
-      </colgroup>
+  <table class="stock-contents shipment index" data-hook="stock-contents">
+    <colgroup>
+      <col style="width: 10%;" />
+      <col style="width: 30%;" />
+      <col style="width: 15%;" />
+      <col style="width: 15%;" />
+      <col style="width: 15%;" />
+      <col style="width: 15%;" />
+    </colgroup>
 
-      <thead>
-        <th colspan="2"><%= Spree.t(:item_description) %></th>
-        <th><%= Spree.t(:price) %></th>
-        <th><%= Spree.t(:quantity) %></th>
-        <th><%= Spree.t(:total) %></th>
+    <thead>
+      <tr>
+        <th colspan="2"><%= Spree::LineItem.human_attribute_name(:description) %></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"></th>
-      </thead>
-
-      <tbody data-shipment-number="<%= shipment.number %>" data-order-number="<%= order.number %>">
-        <%= render 'spree/admin/orders/shipment_manifest', { shipment_number: shipment.number, shipment_manifest: manifest_items } %>
+      </tr>
+    </thead>
 
-        <% unless shipment.shipped? %>
-          <tr class="edit-method hidden total">
-            <td colspan="5">
-              <div class="field alpha five columns">
-                <%= label_tag 'selected_shipping_rate_id', Spree.t(:shipping_method) %>
-                <%= 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 } } %>
-              </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') %>
-              <% end %>
-            </td>
-          </tr>
-          <% end %>
-
-          <tr class="show-method total">
-            <% if rate = shipment.selected_shipping_rate %>
-              <td colspan="4">
-                <strong><%= rate.name %></strong>
-              </td>
-              <td class="total" align="center">
-                <span><%= shipment.display_cost %></span>
-              </td>
-            <% else %>
-              <td colspan='5'><%= Spree.t(:no_shipping_method_selected) %></td>
-            <% end %>
+    <tbody data-shipment-number="<%= shipment.number %>" data-order-number="<%= order.number %>">
+      <%= render 'spree/admin/orders/shipment_manifest', { shipment_number: shipment.number, shipment_manifest: manifest_items } %>
 
-            <td class="actions">
-              <% if( (can? :update, shipment) and !shipment.shipped?) %>
-                <%= link_to '', '#', :class => 'edit-method fa fa-edit no-text with-tip', :data => {:action => 'edit'}, :title => Spree.t('edit') %>
-              <% end %>
-            </td>
-          </tr>
-
-        <tr class="edit-tracking hidden total">
+      <% unless shipment.shipped? %>
+        <tr class="edit-method hidden total">
           <td colspan="5">
-            <label><%= Spree.t(:tracking_number) %>:</label>
-            <%= text_field_tag :tracking, shipment.tracking %>
+            <div class="field alpha five columns">
+              <%= 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 } } %>
+            </div>
           </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-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>
+        <% end %>
 
-        <% if order.special_instructions.present? %>
-          <tr class='special_instructions'>
-            <td colspan="5">
-              <strong><%= Spree.t(:special_instructions) %>:&nbsp;</strong><%= order.special_instructions %>
+        <tr class="show-method total">
+          <% if rate = shipment.selected_shipping_rate %>
+            <td colspan="4">
+              <strong><%= rate.name %></strong>
             </td>
-          </tr>
-        <% end %>
+            <td class="total" align="center">
+              <span><%= shipment.display_cost %></span>
+            </td>
+          <% else %>
+            <td colspan='5'><%= Spree.t(:no_shipping_method_selected) %></td>
+          <% end %>
 
-        <tr class="show-tracking total">
-          <td colspan="5" class="tracking-value">
-            <% if shipment.tracking.present? %>
-              <strong><%= Spree.t(:tracking) %>:</strong> <%= shipment.tracking %>
-            <% else %>
-              <%= Spree.t(:no_tracking_present) %>
-            <% end %>
-          </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('edit') %>
+            <% 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') %>
             <% end %>
           </td>
         </tr>
-      </tbody>
-    </table>
-  </div>
-<% end %>
+
+      <tr class="edit-tracking hidden total">
+        <td colspan="5">
+          <label><%= Spree::Shipment.human_attribute_name(:tracking) %>:</label>
+          <%= text_field_tag :tracking, shipment.tracking %>
+        </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') %>
+          <% end %>
+        </td>
+      </tr>
+
+      <% if order.special_instructions.present? %>
+        <tr class='special_instructions'>
+          <td colspan="5">
+            <strong><%= Spree.t(:special_instructions) %>:&nbsp;</strong><%= order.special_instructions %>
+          </td>
+        </tr>
+      <% end %>
+
+      <tr class="show-tracking total">
+        <td colspan="5" class="tracking-value">
+          <% if shipment.tracking.present? %>
+            <strong><%= Spree::Shipment.human_attribute_name(:tracking) %>:</strong> <%= shipment.tracking %>
+          <% else %>
+            <%= Spree.t(:no_tracking_present) %>
+          <% end %>
+        </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') %>
+          <% end %>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</div>

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

@@ -6,26 +6,21 @@
     <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 %>
+        <strong><%= Spree::Variant.human_attribute_name(: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 %>
+          <%= count %> x <%= Spree.t(state, scope: 'inventory_states') %>
         <% end %>
     </td>
-    <td class="item-qty-edit hidden">
-      <%= number_field_tag :quantity, item.quantity, :min => 0, :class => "line_item_quantity", :size => 5 %>
-    </td>
     <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 can? :update, item %>
-        <%= link_to '', '#', :class => 'save-item fa fa-check 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' %>
-        <%= 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 => { 'line-item-id' => item.line_item.id}, :title => Spree.t('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/confirm/_line_items.html.erb

@@ -1,10 +1,10 @@
 <% if order.line_items.exists? %>
   <table class="line-items index" data-hook="line-items">
     <thead>
-      <th colspan="2"><%= Spree.t(:name) %></th>
-      <th><%= Spree.t(:price) %></th>
-      <th><%= Spree.t(:quantity) %></th>
-      <th><%= Spree.t(:total_price) %></th>
+      <th colspan="2"><%= Spree::LineItem.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_price) %></th>
     </thead>
 
     <tbody>

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

@@ -1,14 +1,14 @@
 <fieldset class="no-border-bottom">
-  <legend><%= Spree.t(:payments) %></legend>
+  <legend><%= Spree::Payment.model_name.human(count: :other) %></legend>
   <table class="index">
     <thead>
       <tr data-hook="payments_header">
-        <th><%= Spree.t(:identifier) %></th>
-        <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
-        <th><%= Spree.t(:amount) %></th>
-        <th><%= Spree.t(:payment_method) %></th>
-        <th><%= Spree.t(:transaction_id) %></th>
-        <th><%= Spree.t(:payment_state) %></th>
+        <th><%= Spree::Payment.human_attribute_name(:number) %></th>
+        <th><%= Spree::Payment.human_attribute_name(:created_at) %></th>
+        <th><%= Spree::Payment.human_attribute_name(:amount) %></th>
+        <th><%= Spree::PaymentMethod.model_name.human %></th>
+        <th><%= Spree::Payment.human_attribute_name(:response_code) %></th>
+        <th><%= Spree::Payment.human_attribute_name(:state) %></th>
       </tr>
     </thead>
     <tbody>

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

@@ -1,7 +1,7 @@
 <div id="<%= "shipment_#{shipment.id}" %>" data-hook="admin_shipment_form">
   <fieldset class="no-border-bottom">
     <legend align="center" class="stock-location" data-hook="stock-location">
-      <%= Spree.t(:shipment) %>
+      <%= Spree::Shipment.model_name.human %>
       <span class="shipment-number"><%= shipment.number %></span>
       <%= Spree.t(:from) %>
       <strong class="stock-location-name" data-hook="stock-location-name">"<%= shipment.stock_location.name %>"</strong>
@@ -11,11 +11,11 @@
   <table class="stock-contents index" data-hook="stock-contents">
     <thead>
       <th colspan="2">
-        <%= Spree.t(:item_description) %>
+        <%= Spree::LineItem.human_attribute_name(:description) %>
       </th>
-      <th><%= Spree.t(:price) %></th>
-      <th><%= Spree.t(:quantity) %></th>
-      <th><%= Spree.t(:total) %></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>
     </thead>
 
     <tbody data-shipment-number="<%= shipment.number %>" data-order-number="<%= order.number %>">
@@ -36,7 +36,7 @@
 
       <tr class="edit-tracking hidden total">
         <td colspan="5">
-          <label><%= Spree.t(:tracking_number) %>:</label>
+          <label><%= Spree::Shipment.human_attribute_name(:tracking) %>:</label>
           <%= text_field_tag :tracking, shipment.tracking %>
         </td>
       </tr>
@@ -44,7 +44,10 @@
       <% if order.special_instructions.present? %>
         <tr class='special_instructions'>
           <td colspan="5">
-            <strong><%= Spree.t(:special_instructions) %>:&nbsp;</strong><%= order.special_instructions %>
+            <strong>
+              <%= Spree::Order.human_attribute_name(:special_instructions) %>:
+            </strong>
+            <%= order.special_instructions %>
           </td>
         </tr>
       <% end %>

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

@@ -6,13 +6,13 @@
     <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 %>
+        <strong><%= Spree::Variant.human_attribute_name(: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 %>
+          <%= count %> x <%= Spree.t(state, scope: 'inventory_states') %>
         <% end %>
     </td>
     <td class="item-total align-center"><%= line_item_shipment_price(item.line_item, item.quantity) %></td>

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

@@ -6,7 +6,7 @@
     <div data-hook="customer_fields" class="row">
       <div class="alpha eight columns">
         <div class="field">
-          <%= f.label :email, Spree.t(:email) %>
+          <%= f.label :email %>
           <%= f.email_field :email, :class => 'fullwidth' %>
         </div>
       </div>
@@ -70,8 +70,4 @@
   <div class="form-buttons filter-actions actions" data-hook="buttons">
     <%= button Spree.t('actions.update'), 'refresh' %>
   </div>
-
-  <% content_for :head do %>
-    <%= javascript_include_tag 'spree/backend/address_states.js' %>
-  <% end %>
 </fieldset>