solidus_backend 1.2.3 → 1.3.0.beta1

data/app/helpers/spree/admin/orders_helper.rb

@@ -5,12 +5,11 @@ module Spree
       def event_links
         links = []
         @order_events.sort.each do |event|
-          if @order.send("can_#{event}?")
-            links << button_link_to(Spree.t(event), [event, :admin, @order],
-                                    :method => :put,
-                                    :icon => "#{event}",
-                                    :data => { :confirm => Spree.t(:order_sure_want_to, :event => Spree.t(event)) })
-          end
+          next unless @order.send("can_#{event}?")
+          links << button_link_to(Spree.t(event), [event, :admin, @order],
+                                  method: :put,
+                                  icon: event.to_s,
+                                  data: { confirm: Spree.t(:order_sure_want_to, event: Spree.t(event)) })
         end
         safe_join(links, '&nbsp;'.html_safe)
       end

data/app/helpers/spree/admin/payments_helper.rb

@@ -2,7 +2,7 @@ module Spree
   module Admin
     module PaymentsHelper
       def payment_method_name(payment)
-        # hack to allow us to retrieve the name of a "deleted" payment method
+        # HACK: to allow us to retrieve the name of a "deleted" payment method
         id = payment.payment_method_id
         Spree::PaymentMethod.find_with_destroyed(id).name
       end

data/app/helpers/spree/admin/products_helper.rb

@@ -5,20 +5,20 @@ module Spree
         options = @taxons.map do |taxon|
           selected = product.taxons.include?(taxon)
           content_tag(:option,
-                      :value    => taxon.id,
-                      :selected => ('selected' if selected)) do
-            (taxon.ancestors.pluck(:name) + [taxon.name]).join(" -> ")
-          end
+                      value: taxon.id,
+                      selected: ('selected' if selected)) do
+                        (taxon.ancestors.pluck(:name) + [taxon.name]).join(" -> ")
+                      end
         end
         safe_join(options)
       end
 
       def option_types_options_for(product)
-        options = @option_types.map do |option_type|
+        @option_types.map do |option_type|
           selected = product.option_types.include?(option_type)
           content_tag(:option,
-                      :value    => option_type.id,
-                      :selected => ('selected' if selected)) do
+                      value: option_type.id,
+                      selected: ('selected' if selected)) do
             option_type.name
           end
         end

data/app/helpers/spree/admin/stock_locations_helper.rb

@@ -12,4 +12,4 @@ module Spree
       end
     end
   end
-end
+end

data/app/helpers/spree/admin/store_credit_events_helper.rb

@@ -10,12 +10,12 @@ module Spree::Admin::StoreCreditEventsHelper
       new_tab: true,
       href_type: :payments,
       translation_key: 'admin.store_credits.refund_originator'
-    },
+    }
   }
 
   def store_credit_event_admin_action_name(store_credit_event)
     if Spree::StoreCreditEvent::NON_EXPOSED_ACTIONS.include?(store_credit_event.action) ||
-      store_credit_event.action == Spree::StoreCredit::VOID_ACTION
+       store_credit_event.action == Spree::StoreCredit::VOID_ACTION
       Spree.t("store_credit.display_action.admin.#{store_credit_event.action}")
     else
       store_credit_event.display_action
@@ -27,12 +27,12 @@ module Spree::Admin::StoreCreditEventsHelper
     return unless originator
 
     add_user_originator_link
-    unless self.originator_links.key?(store_credit_event.originator.class.to_s)
-      raise "Unexpected originator type #{originator.class.to_s}"
+    unless originator_links.key?(store_credit_event.originator.class.to_s)
+      raise "Unexpected originator type #{originator.class}"
     end
 
     options = {}
-    link_options = self.originator_links[store_credit_event.originator.class.to_s]
+    link_options = originator_links[store_credit_event.originator.class.to_s]
     options[:target] = '_blank' if link_options[:new_tab]
 
     # Although not all href_types are used in originator_links
@@ -75,7 +75,7 @@ module Spree::Admin::StoreCreditEventsHelper
   # Spree::UserClassHandle does not work here either as
   # the assignment is evaluated before user_class is set
   def add_user_originator_link
-    self.originator_links[Spree.user_class.to_s] = {
+    originator_links[Spree.user_class.to_s] = {
       new_tab: true,
       href_type: :user,
       translation_key: 'admin.store_credits.user_originator'

data/app/helpers/spree/admin/tables_helper.rb

@@ -1,7 +1,6 @@
 module Spree
   module Admin
     module TablesHelper
-
       # Adds class 'active' to <th> & <td> tags
       # for better tables styling
       def sort_by_active_class(row)
@@ -9,7 +8,6 @@ module Spree
           return "sort-active"
         end
       end
-
     end
   end
 end

data/app/helpers/spree/admin/taxons_helper.rb

@@ -2,7 +2,7 @@ module Spree
   module Admin
     module TaxonsHelper
       def taxon_path(taxon)
-        taxon.ancestors.reverse.collect { |ancestor| ancestor.name }.join( " >> ")
+        taxon.ancestors.reverse.collect(&:name).join( " >> ")
       end
     end
   end

data/app/helpers/spree/promotion_rules_helper.rb

@@ -1,13 +1,10 @@
 module Spree
   module PromotionRulesHelper
-
     def options_for_promotion_rule_types(promotion)
       existing = promotion.rules.map { |rule| rule.class.name }
       rule_names = Rails.application.config.spree.promotions.rules.map(&:name).reject{ |r| existing.include? r }
-      options = rule_names.map { |name| [ Spree.t("promotion_rule_types.#{name.demodulize.underscore}.name"), name] }
+      options = rule_names.map { |name| [Spree.t("promotion_rule_types.#{name.demodulize.underscore}.name"), name] }
       options_for_select(options)
     end
- 
   end
 end
-

data/app/models/spree/backend_configuration.rb

@@ -15,6 +15,7 @@ module Spree
                             :shipping_categories, :stock_locations, :trackers,
                             :refund_reasons, :reimbursement_types, :return_authorization_reasons]
     PROMOTION_TABS     ||= [:promotions, :promotion_categories]
+    STOCK_TABS         ||= [:stock_items, :stock_transfers]
     USER_TABS          ||= [:users, :store_credits]
   end
 end

data/app/views/kaminari/solidus_admin/_first_page.html.erb

@@ -0,0 +1,3 @@
+<li class="page-item">
+  <%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, remote: remote, class: 'page-link' %>
+</li>

data/app/views/kaminari/solidus_admin/_gap.html.erb

@@ -0,0 +1,3 @@
+<li class='disabled'>
+  <%= content_tag :a, raw(t 'views.pagination.truncate') %>
+</li>

data/app/views/kaminari/solidus_admin/_last_page.html.erb

@@ -0,0 +1,3 @@
+<li class="page-item">
+  <%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, { remote: remote, class: 'page-link' } %>
+</li>

data/app/views/kaminari/solidus_admin/_next_page.html.erb

@@ -0,0 +1,3 @@
+<li class="page-item">
+  <%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, rel: 'next', remote: remote, class: 'page-link' %>
+</li>

data/app/views/kaminari/solidus_admin/_page.html.erb

@@ -0,0 +1,9 @@
+<% if page.current? %>
+  <li class="page-item active">
+    <%= content_tag :a, page, remote: remote, rel: (page.next? ? 'next' : (page.prev? ? 'prev' : nil)), class: 'page-link' %>
+  </li>
+<% else %>
+  <li class="page-item">
+    <%= link_to page, url, remote: remote, rel: (page.next? ? 'next' : (page.prev? ? 'prev' : nil)), class: 'page-link' %>
+  </li>
+<% end %>

data/app/views/kaminari/solidus_admin/_paginator.html.erb

@@ -0,0 +1,15 @@
+<%= paginator.render do %>
+  <nav class="text-xs-center">
+    <ul class="pagination">
+      <%= first_page_tag unless current_page.first? %>
+      <%= prev_page_tag unless current_page.first? %>
+      <% each_page do |page| %>
+        <% if page.left_outer? || page.right_outer? || page.inside_window? %>
+          <%= page_tag page %>
+        <% end %>
+      <% end %>
+      <%= next_page_tag unless current_page.last? %>
+      <%= last_page_tag unless current_page.last? %>
+    </ul>
+  </nav>
+<% end %>

data/app/views/kaminari/solidus_admin/_prev_page.html.erb

@@ -0,0 +1,3 @@
+<li class="page-item">
+  <%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, rel: 'prev', remote: remote, class: 'page-link' %>
+</li>

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

@@ -1,3 +1,5 @@
+<%= render 'spree/admin/shared/settings_checkout_tabs' %>
+
 <% content_for :page_title do %>
   <%= Spree.t(:editing_adjustment_reason) %>
 <% end %>

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

@@ -1,7 +1,7 @@
-<%= render partial: 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/settings_checkout_tabs' %>
 
 <% content_for :page_title do %>
-  <%= Spree.t(:adjustment_reasons) %>
+  <%= Spree::AdjustmentReason.model_name.human(count: :other) %>
 <% end %>
 
 <% content_for :page_actions do %>
@@ -21,8 +21,8 @@
     </colgroup>
     <thead>
       <tr data-hook="adjustment_reasons_header">
-        <th><%= Spree.t(:name) %></th>
-        <th><%= Spree.t(:state) %></th>
+        <th><%= Spree::AdjustmentReason.human_attribute_name(:name) %></th>
+        <th><%= Spree::AdjustmentReason.human_attribute_name(:state) %></th>
         <th class="actions"></th>
       </tr>
     </thead>
@@ -44,7 +44,8 @@
   </table>
 <% else %>
   <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/adjustment_reason')) %>,
-    <%= link_to Spree.t(:add_one), new_object_url %>!
+    <%= render 'spree/admin/shared/no_objects_found',
+                 resource: Spree::AdjustmentReason,
+                 new_resource_url: new_object_url %>
   </div>
 <% end %>

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

@@ -1,3 +1,5 @@
+<%= render 'spree/admin/shared/settings_checkout_tabs' %>
+
 <% content_for :page_title do %>
   <%= Spree.t(:new_adjustment_reason) %>
 <% end %>

data/app/views/spree/admin/adjustment_reasons/shared/_form.html.erb

@@ -2,19 +2,19 @@
   <div class="row">
     <div class="alpha four columns">
       <%= f.field_container :name do %>
-        <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
+        <%= f.label :name, class: 'required' %><br />
         <%= f.text_field :name, :class => 'fullwidth' %>
       <% end %>
 
       <%= f.field_container :code do %>
-        <%= f.label :code, Spree.t(:code) %> <span class="required">*</span><br />
+        <%= f.label :code, class: 'required' %><br />
         <%= f.text_field :code, :class => 'fullwidth' %>
       <% end %>
 
       <div class="checkbox">
         <label>
           <%= f.check_box :active %>
-          <%= Spree.t(:active) %>
+          <%= Spree::AdjustmentReason.human_attribute_name(:active) %>
         </label>
       </div>
     </div>

data/app/views/spree/admin/adjustments/_adjustments_table.html.erb

@@ -1,10 +1,10 @@
 <table class="index adjustments" data-hook="adjustments">
   <thead data-hook="adjustmment_head">
     <tr>
-      <th><%= Spree.t(:adjustable) %></th>
-      <th><%= Spree.t(:description) %></th>
-      <th><%= Spree.t(:amount) %></th>
-      <th><%= Spree.t(:state) %></th>
+      <th><%= Spree::Adjustment.human_attribute_name(:adjustable) %></th>
+      <th><%= Spree::Adjustment.human_attribute_name(:label) %></th>
+      <th><%= Spree::Adjustment.human_attribute_name(:amount) %></th>
+      <th><%= Spree::Adjustment.human_attribute_name(:state) %></th>
       <th class="actions"></th>
     </tr>
   </thead>

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

@@ -1,23 +1,23 @@
 <div data-hook="admin_adjustment_form_fields" class="row">
   <div class="alpha three columns">
     <%= f.field_container :amount do %>
-      <%= f.label :amount, raw(Spree.t(:amount) + content_tag(:span, " *", :class => "required")) %>
-      <%= text_field :adjustment, :amount, :class => 'fullwidth' %>
+      <%= f.label :amount, class: 'required' %>
+      <%= text_field :adjustment, :amount, class: 'fullwidth' %>
       <%= f.error_message_on :amount %>
     <% end %>
   </div>
 
   <div class="six columns">
     <%= f.field_container :label do %>
-      <%= f.label :label, raw(Spree.t(:description) + content_tag(:span, " *", :class => "required")) %>
-      <%= text_field :adjustment, :label, :class => 'fullwidth' %>
+      <%= f.label :label, class: 'required' %>
+      <%= text_field :adjustment, :label, class: 'fullwidth' %>
       <%= f.error_message_on :label %>
     <% end %>
   </div>
 
   <div class="omega three columns">
     <%= f.field_container :label do %>
-      <%= f.label :adjustment_reason_id, Spree.t(:reason) %><br/>
+      <%= f.label :adjustment_reason_id %><br/>
       <%= f.collection_select(:adjustment_reason_id, reasons_for(@adjustment), :id, :name, {include_blank: true}, {"data-placeholder" => Spree.t(:select_a_reason), class: 'select2 fullwidth'}) %>
     <% end %>
   </div>

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

@@ -1,7 +1,7 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Adjustments' } %>
 
 <% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= Spree.t(:edit) %> <%= Spree.t(:adjustment) %>
+  <i class="fa fa-arrow-right"></i> <%= Spree.t('actions.edit') %> <%= Spree.t(:adjustment) %>
 <% end %>
 
 <% content_for :page_actions do %>
@@ -15,7 +15,6 @@
 
     <div class="filter-actions actions" data-hook="buttons">
       <%= button Spree.t(:continue), 'arrow-right' %>
-      <span class="or"><%= Spree.t(:or) %></span>
       <%= link_to_with_icon 'remove', Spree.t('actions.cancel'), admin_order_adjustments_url(@order), :class => 'button' %>
     </div>
   </fieldset>

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

@@ -16,7 +16,6 @@
 
     <div class="filter-actions actions" data-hook="buttons">
       <%= button Spree.t(:continue), 'arrow-right' %>
-      <span class="or"><%= Spree.t(:or) %></span>
       <%= button_link_to Spree.t('actions.cancel'), admin_order_adjustments_url(@order), :icon => 'remove' %>
     </div>
   </fieldset>

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

@@ -13,11 +13,11 @@
   </colgroup>
 
   <thead>
-    <th colspan="2"><%= Spree.t(:item_description) %></th>
-    <th><%= Spree.t(:quantity) %></th>
-    <th><%= Spree.t(:state) %></th>
-    <th><%= Spree.t(:shipment) %></th>
-    <th><%= Spree.t(:cancel) %></th>
+    <th colspan="2"><%= Spree::LineItem.human_attribute_name(:description) %></th>
+    <th><%= Spree::OrderCancellations.human_attribute_name(:quantity) %></th>
+    <th><%= Spree::OrderCancellations.human_attribute_name(:state) %></th>
+    <th><%= Spree::OrderCancellations.human_attribute_name(:shipment) %></th>
+    <th><%= Spree::OrderCancellations.human_attribute_name(:cancel) %></th>
   </thead>
 
   <tbody>
@@ -30,7 +30,7 @@
           <td class="inventory-unit-name">
             <%= inventory_unit.variant.product.name %><br><%= "(" + variant_options(inventory_unit.variant) + ")" unless inventory_unit.variant.option_values.empty? %>
             <% if inventory_unit.variant.sku.present? %>
-              <strong><%= Spree.t(:sku) %>:</strong> <%= inventory_unit.variant.sku %>
+              <strong><%= Spree::Variant.human_attribute_name(:sku) %>:</strong> <%= inventory_unit.variant.sku %>
             <% end %>
           </td>
           <td class="inventory-unit-quantity align-center">1</td>

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

@@ -1,13 +1,13 @@
 <div data-hook="admin_country_form_fields" class="row">
   <div class="alpha four columns">
     <div data-hook="name" class="field">
-      <%= f.label :name, Spree.t(:name) %>
+      <%= f.label :name %>
       <%= f.text_field :name, :class => 'fullwidth' %>
     </div>
   </div>
   <div class="four columns">
     <div data-hook="iso_name" class="field">
-      <%= f.label :iso_name, Spree.t(:iso_name) %>
+      <%= f.label :iso_name %>
       <%= f.text_field :iso_name, :class => 'fullwidth' %>
     </div>
   </div>
@@ -15,7 +15,7 @@
     <div data-hook="states_required" class="field checkbox">
       <label>
         <%= f.check_box :states_required %>
-        <%= Spree.t(:states_required) %>
+        <%= Spree::Country.human_attribute_name(:states_required) %>
       </label>
     </div>
   </div>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/areas_tabs' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:editing_country) %>

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

@@ -1,4 +1,4 @@
-<%= render 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/areas_tabs' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:listing_countries) %>
@@ -23,9 +23,9 @@
   </colgroup>
   <thead>
     <tr data-hook="tax_header">
-      <th><%= Spree.t(:country_name) %></th>
-      <th><%= Spree.t(:iso_name) %></th>
-      <th><%= Spree.t(:states_required) %></th>
+      <th><%= Spree::Country.human_attribute_name(:name) %></th>
+      <th><%= Spree::Country.human_attribute_name(:iso_name) %></th>
+      <th><%= Spree::Country.human_attribute_name(:states_required) %></th>
       <th class="actions"></th>
     </tr>
   </thead>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/areas_tabs' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:new_country) %>

data/app/views/spree/admin/customer_returns/_reimbursements_table.html.erb

@@ -1,10 +1,10 @@
 <table class="index customer-return-reimbursements">
   <thead data-hook="customer_return_header">
     <tr>
-      <th><%= Spree.t(:number) %></th>
-      <th><%= Spree.t(:total) %></th>
-      <th><%= Spree.t(:status) %></th>
-      <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
+      <th><%= Spree::Reimbursement.human_attribute_name(:number) %></th>
+      <th><%= Spree::Reimbursement.human_attribute_name(:total) %></th>
+      <th><%= Spree::Reimbursement.human_attribute_name(:reimbursement_status) %></th>
+      <th><%= Spree::Reimbursement.human_attribute_name(:created_at) %></th>
       <th class="actions"></th>
     </tr>
   </thead>