solidus_backend 1.2.3 → 1.3.0.beta1

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

@@ -2,7 +2,7 @@
 
 <%= form_for [:admin, @product, @variant] do |f| %>
   <fieldset data-hook="admin_variant_new_form">
-    <legend align="center"><%= Spree.t(:new_variant) %></legend>
+    <legend><%= t('.new_variant') %></legend>
     <%= render :partial => 'form', :locals => { :f => f } %>
     <%= render :partial => 'spree/admin/shared/new_resource_links' %>
   </fieldset>

data/app/views/spree/admin/variants/new.js.erb

@@ -1,3 +1,2 @@
-$("#new_variant").html('<%= escape_javascript(render :template => 'spree/admin/variants/new', :formats => [:html], :handlers => [:erb]) %>');
-$("#new_variant .select2").select2();
-$("#new_var_link").hide();
+$(".js-content-below-tabs").html('<%= escape_javascript(render :template => 'spree/admin/variants/new', :formats => [:html], :handlers => [:erb]) %>');
+$(".js-content-below-tabs .select2").select2();

data/app/views/spree/admin/zones/_country_members.html.erb

@@ -1,9 +1,9 @@
 <div id="country_members" data-hook="member" class="omega six columns">
   <fieldset class="no-border-bottom">
-    <legend align="center"><%= Spree.t(:countries) %></legend>
+    <legend align="center"><%= Spree::Country.model_name.human(count: :other) %></legend>
 
     <%= zone_form.field_container :country_ids do %>
-      <%= zone_form.label :country_ids, Spree.t(:countries) %><br>
+      <%= zone_form.label :country_ids, Spree::Country.model_name.human(count: :other) %><br>
       <%= zone_form.collection_select :country_ids, @countries, :id, :name, {}, { :multiple => true, :class => "select2 fullwidth" } %>
     <% end %>
   </fieldset>

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

@@ -3,18 +3,18 @@
     <legend align="center"><%= Spree.t(:general_settings)%></legend>
 
     <%= zone_form.field_container :name do %>
-      <%= zone_form.label :name, Spree.t(:name) %><br />
+      <%= zone_form.label :name %><br />
       <%= zone_form.text_field :name, :class => 'fullwidth' %>
     <% end %>
 
     <%= zone_form.field_container :description do %>
-      <%= zone_form.label :description, Spree.t(:description) %><br />
+      <%= zone_form.label :description %><br />
       <%= zone_form.text_field :description, :class => 'fullwidth' %>
     <% end %>
 
     <div data-hook="default" class="field">
       <%= zone_form.check_box :default_tax %>
-      <%= label_tag :zone_default_tax, Spree.t(:default_tax_zone) %>
+      <%= zone_form.label :default_tax %>
     </div>
 
     <div data-hook="type" class="field">

data/app/views/spree/admin/zones/_state_members.html.erb

@@ -1,9 +1,9 @@
 <div id="state_members" data-hook="member" class="omega six columns">
   <fieldset class="no-border-bottom">
-    <legend align="center"><%= Spree.t(:states) %></legend>
+    <legend align="center"><%= Spree::State.model_name.human(count: :other) %></legend>
 
     <%= zone_form.field_container :state_ids do %>
-      <%= zone_form.label :state_ids, Spree.t(:states) %><br>
+      <%= zone_form.label :state_ids, Spree::State.model_name.human(count: :other) %><br>
       <%= zone_form.collection_select :state_ids, @states, :id, :name, {}, { :multiple => true, :class => "select2 fullwidth" } %>
     <% end %>
   </fieldset>

data/app/views/spree/admin/zones/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_zone) %>

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

@@ -1,7 +1,7 @@
-<%= render 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/areas_tabs' %>
 
 <% content_for :page_title do %>
-  <%= Spree.t(:zones) %>
+  <%= Spree::Zone.model_name.human(count: :other) %>
 <% end %>
 
 <% content_for :page_actions do %>
@@ -12,7 +12,7 @@
   <% end %>
 <% end %>
 
-<%= paginate @zones %>
+<%= paginate @zones, theme: "solidus_admin" %>
 
 <% if @zones.any? %>
   <table class="index" id='listing_zones' data-hook>
@@ -24,9 +24,9 @@
     </colgroup>
     <thead>
       <tr data-hook="zones_header">
-        <th><%= sort_link @search,:name, Spree.t(:name), :title => 'zones_order_by_name_title' %></th>
+        <th><%= sort_link @search,:name, Spree::Zone.human_attribute_name(:name), :title => 'zones_order_by_name_title' %></th>
         <th>
-          <%= sort_link @search,:description, Spree.t(:description), {}, {:title => 'zones_order_by_description_title'} %>
+          <%= sort_link @search,:description, Spree::Zone.human_attribute_name(:description), {}, {:title => 'zones_order_by_description_title'} %>
         </th>
         <th><%= Spree.t(:default_tax) %></th>
         <th class="actions"></th>
@@ -52,11 +52,10 @@
   </table>
 <% else %>
   <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/zone')) %>
-    <% if can?(:create, Spree::Zone) %>
-      <%= link_to Spree.t(:add_one), spree.new_admin_zone_path %>!
-    <% end %>
+    <%= render 'spree/admin/shared/no_objects_found',
+                 resource: Spree::Zone,
+                 new_resource_url: new_object_url %>
   </div>
 <% end %>
 
-<%= paginate @zones %>
+<%= paginate @zones, theme: "solidus_admin" %>

data/app/views/spree/admin/zones/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_zone) %>

data/app/views/spree/layouts/admin.html.erb

@@ -1,48 +1,30 @@
 <!doctype html>
-<!--[if lt IE 7 ]> <html class="ie ie6" lang="<%= I18n.locale %>"> <![endif]-->
-<!--[if IE 7 ]>    <html class="ie ie7" lang="<%= I18n.locale %>"> <![endif]-->
-<!--[if IE 8 ]>    <html class="ie ie8" lang="<%= I18n.locale %>"> <![endif]-->
-<!--[if IE 9 ]>    <html class="ie ie9" lang="<%= I18n.locale %>"> <![endif]-->
-<!--[if gt IE 9]><!--><html lang="<%= I18n.locale %>"><!--<![endif]-->
+<html lang="<%= I18n.locale %>">
   <head data-hook="admin_inside_head">
-    <%= render :partial => 'spree/admin/shared/head' %>
+    <%= render 'spree/admin/shared/head' %>
   </head>
 
-  <body class='admin'>
-    <%= render partial: 'spree/admin/shared/navigation' %>
-
-    <div class='main-content' id='wrapper' data-hook>
-
-      <div class="flash-wrapper js-flash-wrapper">
-        <% if flash[:error] %>
-          <div class="flash error"><%= flash[:error] %></div>
-        <% end %>
-        <% if notice %>
-          <div class="flash notice"><%= notice %></div>
-        <% end %>
-        <% if flash[:success] %>
-          <div class="flash success"><%= flash[:success] %></div>
-        <% end %>
-      </div>
-
-      <div id="progress">
-        <div class="wrapper">
-          <div id="spinner" class="spinner"></div>
-          <div class="progress-message"><%= Spree.t(:loading) %>...</div>
-        </div>
-      </div>
-
-      <%= render :partial => 'spree/admin/shared/content_header' %>
+  <body class="admin">
+    <%= render "spree/admin/shared/navigation" %>
+    <%= render "spree/admin/shared/header" %>
+    <%= render "spree/admin/shared/flash" %>
+    <%= render "spree/admin/shared/spinner" %>
 
+    <div class="main-content" id="wrapper" data-hook>
       <div class="container">
         <div class="row">
           <div class="<%= 'with-sidebar ' if content_for?(:sidebar) %>" id="content" data-hook>
-            <div class="<%= if content_for?(:sidebar) then 'twelve' else 'sixteen' end %> columns">
+            <% if content_for?(:tabs) %>
+              <div class="sixteen columns">
+                <%= yield :tabs %>
+              </div>
+            <% end %>
+            <div class="js-content-below-tabs <%= if content_for?(:sidebar) then 'twelve' else 'sixteen' end %> columns">
               <%= render :partial => 'spree/admin/shared/table_filter' %>
               <%= yield %>
             </div>
 
-            <%= render :partial => 'spree/admin/shared/sidebar' %>
+            <%= render 'spree/admin/shared/sidebar' %>
           </div>
         </div>
       </div>

data/config/initializers/assets.rb

@@ -1 +1,7 @@
-Rails.application.config.assets.precompile += %w( jquery-ui/* solidus-style-guide-logo.png )
+Rails.application.config.assets.precompile += %w[
+  spree/backend/all*
+  fontawesome-webfont*
+  select2_locale*
+  jquery-ui/*.png
+  solidus-style-guide-logo.png
+]

data/config/initializers/form_builder.rb

@@ -3,7 +3,7 @@
 #
 class ActionView::Helpers::FormBuilder
   def field_container(method, options = {}, &block)
-    @template.field_container(@object_name,method,options,&block)
+    @template.field_container(@object_name, method, options, &block)
   end
 
   def error_message_on(method, options = {})
@@ -11,5 +11,4 @@ class ActionView::Helpers::FormBuilder
   end
 end
 
-ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| "<span class=\"field_with_errors\">#{html_tag}</span>".html_safe }
-
+ActionView::Base.field_error_proc = proc{ |html_tag, _instance| "<span class=\"field_with_errors\">#{html_tag}</span>".html_safe }

data/config/routes.rb

@@ -1,7 +1,7 @@
 Spree::Core::Engine.add_routes do
   namespace :admin do
     get '/search/users', to: "search#users", as: :search_users
-    get '/search/products', :to => "search#products", :as => :search_products
+    get '/search/products', to: "search#products", as: :search_products
 
     resources :dashboards, only: [] do
       collection do
@@ -49,7 +49,7 @@ Spree::Core::Engine.add_routes do
           post :update_positions
         end
       end
-      resources :variants_including_master,   only: [:update]
+      resources :variants_including_master, only: [:update]
     end
     get '/products/:product_slug/stock', to: "stock_items#index", as: :product_stock
 
@@ -116,7 +116,7 @@ Spree::Core::Engine.add_routes do
         resources :refunds, only: [:new, :create, :edit, :update]
       end
 
-      resources :reimbursements, only: [:create, :show, :edit, :update] do
+      resources :reimbursements, only: [:index, :create, :show, :edit, :update] do
         member do
           post :perform
         end
@@ -129,7 +129,7 @@ Spree::Core::Engine.add_routes do
       end
     end
 
-    resource :general_settings do
+    resource :general_settings, only: [:edit, :update] do
       collection do
         post :clear_cache
       end
@@ -141,9 +141,6 @@ Spree::Core::Engine.add_routes do
       collection do
         post :update_positions
       end
-      member do
-        get :get_children
-      end
       resources :taxons
     end
 
@@ -168,7 +165,7 @@ Spree::Core::Engine.add_routes do
     resources :shipping_methods
     resources :shipping_categories
 
-    resources :stock_transfers, :except => [:destroy] do
+    resources :stock_transfers, except: [:destroy] do
       member do
         get :receive
         put :finalize
@@ -186,11 +183,15 @@ Spree::Core::Engine.add_routes do
       end
     end
 
-    resources :stock_items, :except => [:show, :new, :edit]
+    resources :stock_items, except: [:show, :new, :edit]
     resources :tax_rates
 
     resources :trackers
-    resources :payment_methods
+    resources :payment_methods do
+      collection do
+        post :update_positions
+      end
+    end
 
     resources :users do
       member do
@@ -209,7 +210,7 @@ Spree::Core::Engine.add_routes do
       end
     end
 
-    resources :style_guide
+    resources :style_guide, only: [:index]
   end
 
   get '/admin', to: 'admin/root#index', as: :admin

data/lib/spree/backend.rb

@@ -6,6 +6,7 @@ require 'sass-rails'
 require 'bourbon'
 require 'select2-rails'
 require 'handlebars_assets'
+require 'font-awesome-rails'
 
 require 'spree_core'
 require 'spree_api'

data/lib/spree/backend/action_callbacks.rb

@@ -21,6 +21,5 @@ module Spree
     def fails(method)
       @fails_methods << method
     end
-
   end
 end

data/lib/spree/backend/callbacks.rb

@@ -4,7 +4,6 @@ module Spree
       extend ActiveSupport::Concern
 
       module ClassMethods
-
         attr_accessor :callbacks
 
         protected
@@ -41,12 +40,11 @@ module Spree
         callbacks = self.class.callbacks || {}
         return if callbacks[action].nil?
         case callback_type.to_sym
-          when :before then callbacks[action].before_methods.each {|method| send method }
-          when :after  then callbacks[action].after_methods.each  {|method| send method }
-          when :fails  then callbacks[action].fails_methods.each  {|method| send method }
+        when :before then callbacks[action].before_methods.each { |method| send method }
+        when :after  then callbacks[action].after_methods.each  { |method| send method }
+        when :fails  then callbacks[action].fails_methods.each  { |method| send method }
         end
       end
-
     end
   end
 end

data/lib/spree/backend/engine.rb

@@ -3,7 +3,7 @@ module Spree
     class Engine < ::Rails::Engine
       config.middleware.use "Spree::Backend::Middleware::SeoAssist"
 
-      initializer "spree.backend.environment", :before => :load_config_initializers do |app|
+      initializer "spree.backend.environment", before: :load_config_initializers do |_app|
         Spree::Backend::Config = Spree::BackendConfiguration.new
       end
 
@@ -11,19 +11,6 @@ module Spree
       initializer "spree.params.filter" do |app|
         app.config.filter_parameters += [:password, :password_confirmation, :number]
       end
-
-      # sets the manifests / assets to be precompiled, even when initialize_on_precompile is false
-      initializer "spree.assets.precompile", :group => :all do |app|
-        app.config.assets.precompile += %w[
-          spree/backend/all*
-          spree/backend/orders/edit_form.js
-          spree/backend/address_states.js
-          jqPlot/excanvas.min.js
-          spree/backend/images/new.js
-          fontawesome-webfont*
-          select2_locale*
-        ]
-      end
     end
   end
 end

data/script/rails

@@ -6,4 +6,3 @@ ENGINE_PATH = File.expand_path('../../lib/spree/backend/engine', __FILE__)
 
 require 'rails/all'
 require 'rails/engine/commands'
-

data/solidus_backend.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'jquery-rails'
   s.add_dependency 'jquery-ui-rails', '~> 5.0.0'
   s.add_dependency 'select2-rails',   '3.5.9.1' # 3.5.9.2 breaks forms
+  s.add_dependency 'font-awesome-rails', '~> 4.0'
 
   s.add_dependency 'handlebars_assets', '~> 0.23'
 end

data/spec/controllers/spree/admin/base_controller_spec.rb

@@ -3,11 +3,11 @@
 # we call process directly instead of get
 require 'spec_helper'
 
-describe Spree::Admin::BaseController, :type => :controller do
+describe Spree::Admin::BaseController, type: :controller do
   controller(Spree::Admin::BaseController) do
     def index
       authorize! :update, Spree::Order
-      render :text => 'test'
+      render text: 'test'
     end
   end
 

data/spec/controllers/spree/admin/cancellations_controller_spec.rb

@@ -6,7 +6,7 @@ describe Spree::Admin::CancellationsController do
   describe "#index" do
     subject { spree_get :index, order_id: order.number }
 
-    let(:order) { create(:order_ready_to_ship, line_items_count: 1)}
+    let(:order) { create(:order_ready_to_ship, line_items_count: 1) }
 
     context "for an order with inventory" do
       render_views
@@ -20,7 +20,7 @@ describe Spree::Admin::CancellationsController do
   describe "#cancel" do
     subject { spree_post :short_ship, order_id: order.number, inventory_unit_ids: inventory_units.map(&:id) }
 
-    let(:order) { order = create(:order_ready_to_ship, :number => "R100", :state => "complete", line_items_count: 1) }
+    let(:order) { create(:order_ready_to_ship, number: "R100", state: "complete", line_items_count: 1) }
     let(:referer) { "order_admin_page" }
 
     context "no inventory unit ids are provided" do

data/spec/controllers/spree/admin/customer_returns_controller_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Spree
   module Admin
-    describe CustomerReturnsController, :type => :controller do
+    describe CustomerReturnsController, type: :controller do
       stub_authorization!
 
       describe "#index" do
@@ -50,7 +50,6 @@ module Spree
           let(:return_reason_3) { create(:return_reason) }
           let!(:inactive_rma_reason) { create(:return_reason, active: false) }
 
-
           let(:order) { create(:shipped_order, line_items_count: 4) }
           let(:rma) { create(:return_authorization, order: order, reason: return_reason_1) }
 
@@ -66,7 +65,7 @@ module Spree
               total_inventory_count = 4
               rma_return_items_count = 1
               customer_return_return_items_count = 1
-              expect(assigns(:new_return_items).length).to eq (total_inventory_count - rma_return_items_count - customer_return_return_items_count)
+              expect(assigns(:new_return_items).length).to eq(total_inventory_count - rma_return_items_count - customer_return_return_items_count)
             end
 
             it "builds new return items" do
@@ -92,7 +91,7 @@ module Spree
             it "loads the possible return items" do
               rma_return_item_count = rma.return_items.count
               total_unit_count = order.inventory_units.count
-              customer_returned_count =  previous_customer_return.return_items.count
+              customer_returned_count = previous_customer_return.return_items.count
               expected_total = total_unit_count - customer_returned_count - rma_return_item_count
               expect(assigns(:new_return_items).length).to eq expected_total
             end
@@ -102,7 +101,7 @@ module Spree
             end
 
             it "loads the persisted rma return items" do
-              expect(assigns(:rma_return_items).all? { |return_item| return_item.persisted? }).to eq true
+              expect(assigns(:rma_return_items).all?(&:persisted?)).to eq true
             end
 
             it "has one rma return item" do
@@ -123,7 +122,7 @@ module Spree
         let!(:inactive_rma_reason) { create(:return_reason, active: false) }
 
         let!(:accepted_return_item)            { customer_return.return_items.order('id').first.tap(&:accept!) }
-        let!(:rejected_return_item)            { customer_return.return_items.order('id').second.tap(&:reject!)}
+        let!(:rejected_return_item)            { customer_return.return_items.order('id').second.tap(&:reject!) }
         let!(:manual_intervention_return_item) { customer_return.return_items.order('id').third.tap(&:require_manual_intervention!) }
 
         subject do
@@ -194,7 +193,7 @@ module Spree
               return_items_attributes: {
                 "0" => {
                   returned: "1",
-                  "pre_tax_amount"=>"15.99",
+                  amount: "15.99",
                   inventory_unit_id: order.inventory_units.shipped.last.id,
                   reception_status_event: reception_status_event
                 }