spree_backend 2.1.12 → 2.2.0

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

@@ -17,7 +17,7 @@
       <td class='align-center'>{{quantity}}</td>
       <td class='actions'>
         <button class='icon_link icon-trash no-text transfer_remove_variant'
-                data-variant-id='{{id}}' data-action'remove'></button>
+                data-variant-id='{{id}}' data-action='remove'></button>
       </td>
       <input type='hidden' id='variant[]' name='variant[]' value='{{id}}'>
       <input type='hidden' id='quantity[]' name='quantity[]' value='{{quantity}}'>

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

@@ -10,6 +10,8 @@
   </li>
 <% end %>
 
+<%= render 'spree/admin/shared/product_sub_menu' %>
+
 <% if @taxonomies.any? %>
 <div id="list-taxonomies" data-hook>
   <%= render 'list' %>

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

@@ -0,0 +1,16 @@
+<% content_for :table_filter_title do %>
+  <%= Spree.t(:choose_a_taxon_to_sort_products_for) %>
+<% end %>
+
+<% content_for :table_filter do %>
+  <div data-hook="admin_orders_index_search" class="columns six">
+    <input type='text' id='taxon_id' />
+  </div>
+<% end %>
+
+<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
+<span id='sorting_explanation' style='display:none'>Click &amp; drag on the products to sort them.</span>
+<ul id='taxon_products'></ul>
+
+<%= render :partial => "spree/admin/products/autocomplete", :formats => :js %>
+

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

@@ -22,6 +22,11 @@
       <%= f.label :cost_price, Spree.t(:cost_price) %>
       <%= f.text_field :cost_price, :value => number_to_currency(@variant.cost_price, :unit => ''), :class => 'fullwidth' %>
     </div>
+
+    <div class="field" data-hook="tax_category">
+      <%= f.label :tax_category_id, Spree.t(:tax_category) %>
+      <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2 fullwidth' }) %>
+    </div>
   </div>
 </div>
 

data/config/routes.rb

@@ -9,7 +9,6 @@ Spree::Core::Engine.add_routes do
       resources :promotion_actions
     end
 
-    resources :adjustments
     resources :zones
 
     resources :countries do
@@ -70,24 +69,19 @@ Spree::Core::Engine.add_routes do
       end
     end
 
-    resource :image_settings
-
     resources :orders, :except => [:show] do
       member do
-        put :fire
-        get :fire
         post :resend
         get :open_adjustments
         get :close_adjustments
+        put :approve
+        put :cancel
+        put :resume
       end
 
       resource :customer, :controller => "orders/customer_details"
 
-      resources :adjustments do
-        member do
-          get :toggle_state
-        end
-      end
+      resources :adjustments
       resources :line_items
       resources :return_authorizations do
         member do
@@ -119,13 +113,13 @@ Spree::Core::Engine.add_routes do
       resources :taxons
     end
 
-    resources :taxons, :only => [] do
+    resources :taxons, :only => [:index, :show] do
       collection do
         get :search
       end
     end
 
-    resources :reports, :only => [:index] do
+    resources :reports, :only => [:index, :show] do
       collection do
         get :sales_total
         post :sales_total
@@ -142,6 +136,7 @@ Spree::Core::Engine.add_routes do
       end
     end
 
+    resources :stock_movements
     resources :stock_items, :only => [:create, :update, :destroy]
     resources :tax_rates
     resource  :tax_settings

data/lib/spree/backend/engine.rb

@@ -3,8 +3,6 @@ module Spree
     class Engine < ::Rails::Engine
       config.middleware.use "Spree::Backend::Middleware::SeoAssist"
 
-      config.autoload_paths += %W(#{config.root}/lib)
-
       initializer "spree.backend.environment", :before => :load_config_initializers do |app|
         Spree::Backend::Config = Spree::BackendConfiguration.new
       end
@@ -17,16 +15,14 @@ module Spree
       # 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[
-          admin/all.*
-          admin/orders/edit_form.js
-          admin/address_states.js
+          spree/backend/all*
+          spree/backend/orders/edit_form.js
+          spree/backend/address_states.js
           jqPlot/excanvas.min.js
-          admin/images/new.js
+          spree/backend/images/new.js
           jquery.jstree/themes/apple/*
-          fontawesome-webfont*
         ]
       end
-
     end
   end
 end

data/lib/spree/backend.rb

@@ -13,10 +13,3 @@ require 'spree/core/mail_interceptor'
 require 'spree/responder'
 
 require 'spree/backend/engine'
-
-if defined?(ActionView)
-  require 'awesome_nested_set/helper'
-  ActionView::Base.class_eval do
-    include CollectiveIdea::Acts::NestedSet::Helper
-  end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 2.1.12
+  version: 2.2.0
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.12
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.12
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.12
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.12
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -100,94 +100,92 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/assets/fonts/FontAwesome.otf
-- app/assets/fonts/fontawesome-webfont.eot
-- app/assets/fonts/fontawesome-webfont.svg
-- app/assets/fonts/fontawesome-webfont.ttf
-- app/assets/fonts/fontawesome-webfont.woff
 - app/assets/images/admin/payment_banner.png
 - app/assets/images/admin/progress.gif
 - app/assets/images/credit_cards/credit_card.gif
-- app/assets/javascripts/admin/address_states.js
-- app/assets/javascripts/admin/admin.js.erb
-- app/assets/javascripts/admin/calculator.js
-- app/assets/javascripts/admin/checkouts/edit.js
-- app/assets/javascripts/admin/gateway.js
-- app/assets/javascripts/admin/image_settings.js.erb
-- app/assets/javascripts/admin/images/index.js.coffee
-- app/assets/javascripts/admin/images/new.js.coffee
-- app/assets/javascripts/admin/line_items.js.coffee
-- app/assets/javascripts/admin/nested-attribute.js
-- app/assets/javascripts/admin/option_type_autocomplete.js.erb
-- app/assets/javascripts/admin/orders/edit.js
-- app/assets/javascripts/admin/orders/edit_form.js
-- app/assets/javascripts/admin/payments/edit.js.coffee
-- app/assets/javascripts/admin/payments/new.js
-- app/assets/javascripts/admin/product_picker.js
-- app/assets/javascripts/admin/progress.coffee
-- app/assets/javascripts/admin/promotions.js
-- app/assets/javascripts/admin/shipments.js.erb
-- app/assets/javascripts/admin/spree-select2.js.erb
-- app/assets/javascripts/admin/spree_backend.js
-- app/assets/javascripts/admin/states.js
-- app/assets/javascripts/admin/stock_management.js.coffee
-- app/assets/javascripts/admin/stock_movement.js.coffee
-- app/assets/javascripts/admin/stock_transfer.js.coffee
-- app/assets/javascripts/admin/taxon_autocomplete.js.erb
-- app/assets/javascripts/admin/taxon_tree_menu.js.coffee
-- app/assets/javascripts/admin/taxonomy.js.coffee
-- app/assets/javascripts/admin/underscore-min.js
-- app/assets/javascripts/admin/user_picker.js
-- app/assets/javascripts/admin/variant_autocomplete.js.erb
-- app/assets/javascripts/admin/variant_management.js.coffee
-- app/assets/javascripts/admin/zone.js.coffee
-- app/assets/javascripts/spree/backend/select_payments.js.coffee
-- app/assets/javascripts/store/backend.js
-- app/assets/stylesheets/admin/components/_actions.scss
-- app/assets/stylesheets/admin/components/_date-picker.scss
-- app/assets/stylesheets/admin/components/_messages.scss
-- app/assets/stylesheets/admin/components/_navigation.scss
-- app/assets/stylesheets/admin/components/_pagination.scss
-- app/assets/stylesheets/admin/components/_product_autocomplete.scss
-- app/assets/stylesheets/admin/components/_progress.scss
-- app/assets/stylesheets/admin/components/_sidebar.scss
-- app/assets/stylesheets/admin/components/_states.scss
-- app/assets/stylesheets/admin/components/_table-filter.scss
-- app/assets/stylesheets/admin/globals/_functions.scss
-- app/assets/stylesheets/admin/globals/_mixins.scss
-- app/assets/stylesheets/admin/globals/_variables.scss
-- app/assets/stylesheets/admin/globals/_variables_override.scss
-- app/assets/stylesheets/admin/hacks/_ie.scss
-- app/assets/stylesheets/admin/hacks/_mozilla.scss
-- app/assets/stylesheets/admin/hacks/_opera.scss
-- app/assets/stylesheets/admin/plugins/_font-awesome.scss
-- app/assets/stylesheets/admin/plugins/_jstree.scss
-- app/assets/stylesheets/admin/plugins/_powertip.scss
-- app/assets/stylesheets/admin/plugins/_select2.scss
-- app/assets/stylesheets/admin/plugins/_token-input.scss
-- app/assets/stylesheets/admin/sections/_alerts.scss
-- app/assets/stylesheets/admin/sections/_bulk_transfer.scss
-- app/assets/stylesheets/admin/sections/_edit_checkouts.scss
-- app/assets/stylesheets/admin/sections/_image_settings.scss
-- app/assets/stylesheets/admin/sections/_log_entries.scss
-- app/assets/stylesheets/admin/sections/_orders.scss
-- app/assets/stylesheets/admin/sections/_overview.scss
-- app/assets/stylesheets/admin/sections/_products.scss
-- app/assets/stylesheets/admin/sections/_promotions.scss
-- app/assets/stylesheets/admin/sections/_tax_zones.scss
-- app/assets/stylesheets/admin/shared/_forms.scss
-- app/assets/stylesheets/admin/shared/_icons.scss
-- app/assets/stylesheets/admin/shared/_layout.scss
-- app/assets/stylesheets/admin/shared/_tables.scss
-- app/assets/stylesheets/admin/shared/_typography.scss
-- app/assets/stylesheets/admin/spree_admin.scss
-- app/assets/stylesheets/admin/spree_backend.css
-- app/assets/stylesheets/store/backend.css
+- app/assets/javascripts/spree/backend.js
+- app/assets/javascripts/spree/backend/address_states.js
+- app/assets/javascripts/spree/backend/adjustments.js.coffee
+- app/assets/javascripts/spree/backend/admin.js.erb
+- app/assets/javascripts/spree/backend/calculator.js
+- app/assets/javascripts/spree/backend/checkouts/edit.js
+- app/assets/javascripts/spree/backend/gateway.js
+- app/assets/javascripts/spree/backend/handlebar_extensions.js
+- app/assets/javascripts/spree/backend/images/index.js.coffee
+- app/assets/javascripts/spree/backend/images/new.js.coffee
+- app/assets/javascripts/spree/backend/index.html
+- app/assets/javascripts/spree/backend/line_items.js.coffee
+- app/assets/javascripts/spree/backend/nested-attribute.js
+- app/assets/javascripts/spree/backend/option_type_autocomplete.js.erb
+- app/assets/javascripts/spree/backend/orders/edit.js
+- app/assets/javascripts/spree/backend/orders/edit_form.js
+- app/assets/javascripts/spree/backend/payments/edit.js.coffee
+- app/assets/javascripts/spree/backend/payments/new.js
+- app/assets/javascripts/spree/backend/product_picker.js
+- app/assets/javascripts/spree/backend/progress.coffee
+- app/assets/javascripts/spree/backend/promotions.js
+- app/assets/javascripts/spree/backend/shipments.js.erb
+- app/assets/javascripts/spree/backend/spree-select2.js.erb
+- app/assets/javascripts/spree/backend/spree_backend.js
+- app/assets/javascripts/spree/backend/states.js
+- app/assets/javascripts/spree/backend/stock_management.js.coffee
+- app/assets/javascripts/spree/backend/stock_movement.js.coffee
+- app/assets/javascripts/spree/backend/stock_transfer.js.coffee
+- app/assets/javascripts/spree/backend/taxon_autocomplete.js.erb
+- app/assets/javascripts/spree/backend/taxon_tree_menu.js.coffee
+- app/assets/javascripts/spree/backend/taxonomy.js.coffee
+- app/assets/javascripts/spree/backend/taxons.js.coffee
+- app/assets/javascripts/spree/backend/underscore-min.js
+- app/assets/javascripts/spree/backend/user_picker.js
+- app/assets/javascripts/spree/backend/variant_autocomplete.js.erb
+- app/assets/javascripts/spree/backend/variant_management.js.coffee
+- app/assets/javascripts/spree/backend/zone.js.coffee
+- app/assets/javascripts/spree/frontend/backend.js
+- app/assets/stylesheets/spree/backend.css
+- app/assets/stylesheets/spree/backend/components/_actions.scss
+- app/assets/stylesheets/spree/backend/components/_date-picker.scss
+- app/assets/stylesheets/spree/backend/components/_messages.scss
+- app/assets/stylesheets/spree/backend/components/_navigation.scss
+- app/assets/stylesheets/spree/backend/components/_pagination.scss
+- app/assets/stylesheets/spree/backend/components/_product_autocomplete.scss
+- app/assets/stylesheets/spree/backend/components/_progress.scss
+- app/assets/stylesheets/spree/backend/components/_sidebar.scss
+- app/assets/stylesheets/spree/backend/components/_states.scss
+- app/assets/stylesheets/spree/backend/components/_table-filter.scss
+- app/assets/stylesheets/spree/backend/globals/_functions.scss
+- app/assets/stylesheets/spree/backend/globals/_mixins.scss
+- app/assets/stylesheets/spree/backend/globals/_variables.scss
+- app/assets/stylesheets/spree/backend/globals/_variables_override.scss
+- app/assets/stylesheets/spree/backend/hacks/_ie.scss
+- app/assets/stylesheets/spree/backend/hacks/_mozilla.scss
+- app/assets/stylesheets/spree/backend/hacks/_opera.scss
+- app/assets/stylesheets/spree/backend/plugins/_jstree.scss
+- app/assets/stylesheets/spree/backend/plugins/_powertip.scss
+- app/assets/stylesheets/spree/backend/plugins/_select2.scss
+- app/assets/stylesheets/spree/backend/plugins/_token-input.scss
+- app/assets/stylesheets/spree/backend/sections/_alerts.scss
+- app/assets/stylesheets/spree/backend/sections/_bulk_transfer.scss
+- app/assets/stylesheets/spree/backend/sections/_edit_checkouts.scss
+- app/assets/stylesheets/spree/backend/sections/_image_settings.scss
+- app/assets/stylesheets/spree/backend/sections/_log_entries.scss
+- app/assets/stylesheets/spree/backend/sections/_orders.scss
+- app/assets/stylesheets/spree/backend/sections/_overview.scss
+- app/assets/stylesheets/spree/backend/sections/_products.scss
+- app/assets/stylesheets/spree/backend/sections/_promotions.scss
+- app/assets/stylesheets/spree/backend/sections/_tax_zones.scss
+- app/assets/stylesheets/spree/backend/sections/_taxons.scss
+- app/assets/stylesheets/spree/backend/shared/_forms.scss
+- app/assets/stylesheets/spree/backend/shared/_icons.scss
+- app/assets/stylesheets/spree/backend/shared/_layout.scss
+- app/assets/stylesheets/spree/backend/shared/_tables.scss
+- app/assets/stylesheets/spree/backend/shared/_typography.scss
+- app/assets/stylesheets/spree/backend/spree_admin.scss
+- app/assets/stylesheets/spree/backend/spree_backend.css
+- app/assets/stylesheets/spree/frontend/backend.css
 - app/controllers/spree/admin/adjustments_controller.rb
 - app/controllers/spree/admin/base_controller.rb
 - app/controllers/spree/admin/countries_controller.rb
 - app/controllers/spree/admin/general_settings_controller.rb
-- app/controllers/spree/admin/image_settings_controller.rb
 - app/controllers/spree/admin/images_controller.rb
 - app/controllers/spree/admin/inventory_units_controller.rb
 - app/controllers/spree/admin/line_items_controller.rb
@@ -227,8 +225,10 @@ files:
 - app/controllers/spree/admin/variants_controller.rb
 - app/controllers/spree/admin/variants_including_master_controller.rb
 - app/controllers/spree/admin/zones_controller.rb
+- app/helpers/spree/admin/adjustments_helper.rb
 - app/helpers/spree/admin/base_helper.rb
 - app/helpers/spree/admin/general_settings_helper.rb
+- app/helpers/spree/admin/images_helper.rb
 - app/helpers/spree/admin/inventory_settings_helper.rb
 - app/helpers/spree/admin/navigation_helper.rb
 - app/helpers/spree/admin/orders_helper.rb
@@ -240,6 +240,7 @@ files:
 - app/helpers/spree/admin/taxons_helper.rb
 - app/helpers/spree/promotion_rules_helper.rb
 - app/models/spree/backend_configuration.rb
+- app/views/spree/admin/adjustments/_adjustment.html.erb
 - app/views/spree/admin/adjustments/_adjustments_table.html.erb
 - app/views/spree/admin/adjustments/_form.html.erb
 - app/views/spree/admin/adjustments/edit.html.erb
@@ -250,7 +251,6 @@ files:
 - app/views/spree/admin/countries/index.html.erb
 - app/views/spree/admin/countries/new.html.erb
 - app/views/spree/admin/general_settings/edit.html.erb
-- app/views/spree/admin/image_settings/edit.html.erb
 - app/views/spree/admin/images/_form.html.erb
 - app/views/spree/admin/images/edit.html.erb
 - app/views/spree/admin/images/index.html.erb
@@ -258,6 +258,7 @@ files:
 - app/views/spree/admin/inventory_units/adjust.html.erb
 - app/views/spree/admin/line_items/create.js.erb
 - app/views/spree/admin/line_items/destroy.js.erb
+- app/views/spree/admin/log_entries/_credit_card.html.erb
 - app/views/spree/admin/log_entries/index.html.erb
 - app/views/spree/admin/mail_methods/_form.html.erb
 - app/views/spree/admin/mail_methods/edit.html.erb
@@ -268,6 +269,7 @@ files:
 - app/views/spree/admin/option_types/new.html.erb
 - app/views/spree/admin/option_types/new.js.erb
 - app/views/spree/admin/orders/_add_product.html.erb
+- app/views/spree/admin/orders/_adjustments.html.erb
 - app/views/spree/admin/orders/_form.html.erb
 - app/views/spree/admin/orders/_line_item.html.erb
 - app/views/spree/admin/orders/_line_items.html.erb
@@ -283,6 +285,7 @@ files:
 - app/views/spree/admin/payment_methods/index.html.erb
 - app/views/spree/admin/payment_methods/new.html.erb
 - app/views/spree/admin/payments/_bill_address_form.html.erb
+- app/views/spree/admin/payments/_capture_events.html.erb
 - app/views/spree/admin/payments/_form.html.erb
 - app/views/spree/admin/payments/_list.html.erb
 - app/views/spree/admin/payments/credit.html.erb
@@ -296,6 +299,7 @@ files:
 - app/views/spree/admin/product_properties/_product_property_fields.html.erb
 - app/views/spree/admin/product_properties/index.html.erb
 - app/views/spree/admin/products/_add_stock_form.html.erb
+- app/views/spree/admin/products/_autocomplete.js.erb
 - app/views/spree/admin/products/_form.html.erb
 - app/views/spree/admin/products/_properties_form.erb
 - app/views/spree/admin/products/edit.html.erb
@@ -314,7 +318,9 @@ files:
 - app/views/spree/admin/promotions/_rules.html.erb
 - app/views/spree/admin/promotions/_tab.html.erb
 - app/views/spree/admin/promotions/actions/_create_adjustment.html.erb
+- app/views/spree/admin/promotions/actions/_create_item_adjustments.html.erb
 - app/views/spree/admin/promotions/actions/_create_line_items.html.erb
+- app/views/spree/admin/promotions/actions/_free_shipping.html.erb
 - app/views/spree/admin/promotions/edit.html.erb
 - app/views/spree/admin/promotions/index.html.erb
 - app/views/spree/admin/promotions/new.html.erb
@@ -358,7 +364,8 @@ files:
 - app/views/spree/admin/shared/_header.html.erb
 - app/views/spree/admin/shared/_menu.html.erb
 - app/views/spree/admin/shared/_new_resource_links.html.erb
-- app/views/spree/admin/shared/_order_details.html.erb
+- app/views/spree/admin/shared/_order_submenu.html.erb
+- app/views/spree/admin/shared/_order_summary.html.erb
 - app/views/spree/admin/shared/_order_tabs.html.erb
 - app/views/spree/admin/shared/_product_sub_menu.html.erb
 - app/views/spree/admin/shared/_product_tabs.html.erb
@@ -420,6 +427,7 @@ files:
 - app/views/spree/admin/taxons/_form.html.erb
 - app/views/spree/admin/taxons/_taxon_table.html.erb
 - app/views/spree/admin/taxons/edit.html.erb
+- app/views/spree/admin/taxons/index.html.erb
 - app/views/spree/admin/taxons/search.rabl
 - app/views/spree/admin/trackers/_form.html.erb
 - app/views/spree/admin/trackers/edit.html.erb
@@ -509,7 +517,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: spree_backend
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: backend e-commerce functionality for the Spree project.