spree_backend 2.3.13 → 2.4.0.rc1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 2.3.13
+  version: 2.4.0.rc1
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2014-10-09 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.3.13
+        version: 2.4.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.13
+        version: 2.4.0.rc1
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.13
+        version: 2.4.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.13
+        version: 2.4.0.rc1
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -68,32 +68,18 @@ dependencies:
         version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: select2-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.5.9.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.5.9.1
-- !ruby/object:Gem::Dependency
-  name: email_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
-  type: :development
+        version: 3.5.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 3.5.0
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []
@@ -115,6 +101,7 @@ files:
 - 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/line_items_on_order_edit.js.erb
 - 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
@@ -124,6 +111,8 @@ files:
 - 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/returns/expedited_exchanges_warning.coffee
+- app/assets/javascripts/spree/backend/returns/return_item_selection.js
 - app/assets/javascripts/spree/backend/select_payments.js.coffee
 - app/assets/javascripts/spree/backend/shipments.js.erb
 - app/assets/javascripts/spree/backend/spree-select2.js.erb
@@ -163,6 +152,7 @@ files:
 - 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/_adjustments_table.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
@@ -172,6 +162,7 @@ files:
 - 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/_return_authorizations.scss
 - app/assets/stylesheets/spree/backend/sections/_tax_zones.scss
 - app/assets/stylesheets/spree/backend/sections/_taxons.scss
 - app/assets/stylesheets/spree/backend/sections/_users.scss
@@ -185,28 +176,33 @@ files:
 - 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/customer_returns_controller.rb
 - app/controllers/spree/admin/general_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
 - app/controllers/spree/admin/log_entries_controller.rb
 - app/controllers/spree/admin/option_types_controller.rb
 - app/controllers/spree/admin/option_values_controller.rb
 - app/controllers/spree/admin/orders/customer_details_controller.rb
 - app/controllers/spree/admin/orders_controller.rb
-- app/controllers/spree/admin/overview_controller.rb
 - app/controllers/spree/admin/payment_methods_controller.rb
 - app/controllers/spree/admin/payments_controller.rb
 - app/controllers/spree/admin/product_properties_controller.rb
 - app/controllers/spree/admin/products_controller.rb
 - app/controllers/spree/admin/promotion_actions_controller.rb
+- app/controllers/spree/admin/promotion_categories_controller.rb
 - app/controllers/spree/admin/promotion_rules_controller.rb
 - app/controllers/spree/admin/promotions_controller.rb
 - app/controllers/spree/admin/properties_controller.rb
 - app/controllers/spree/admin/prototypes_controller.rb
+- app/controllers/spree/admin/refund_reasons_controller.rb
+- app/controllers/spree/admin/refunds_controller.rb
+- app/controllers/spree/admin/reimbursement_types_controller.rb
+- app/controllers/spree/admin/reimbursements_controller.rb
 - app/controllers/spree/admin/reports_controller.rb
 - app/controllers/spree/admin/resource_controller.rb
+- app/controllers/spree/admin/return_authorization_reasons_controller.rb
 - app/controllers/spree/admin/return_authorizations_controller.rb
+- app/controllers/spree/admin/return_items_controller.rb
 - app/controllers/spree/admin/search_controller.rb
 - app/controllers/spree/admin/shipping_categories_controller.rb
 - app/controllers/spree/admin/shipping_methods_controller.rb
@@ -226,6 +222,7 @@ files:
 - 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/customer_returns_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
@@ -233,6 +230,8 @@ files:
 - app/helpers/spree/admin/orders_helper.rb
 - app/helpers/spree/admin/payments_helper.rb
 - app/helpers/spree/admin/products_helper.rb
+- app/helpers/spree/admin/reimbursement_type_helper.rb
+- app/helpers/spree/admin/reimbursements_helper.rb
 - app/helpers/spree/admin/stock_locations_helper.rb
 - app/helpers/spree/admin/stock_movements_helper.rb
 - app/helpers/spree/admin/tables_helper.rb
@@ -249,14 +248,20 @@ files:
 - app/views/spree/admin/countries/edit.html.erb
 - app/views/spree/admin/countries/index.html.erb
 - app/views/spree/admin/countries/new.html.erb
+- app/views/spree/admin/customer_returns/_reimbursements_table.html.erb
+- app/views/spree/admin/customer_returns/_return_item_decision.html.erb
+- app/views/spree/admin/customer_returns/_return_item_selection.html.erb
+- app/views/spree/admin/customer_returns/edit.html.erb
+- app/views/spree/admin/customer_returns/index.html.erb
+- app/views/spree/admin/customer_returns/new.html.erb
 - app/views/spree/admin/general_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
 - app/views/spree/admin/images/new.html.erb
-- 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/option_types/_form.html.erb
 - app/views/spree/admin/option_types/_option_value_fields.html.erb
@@ -264,14 +269,17 @@ files:
 - app/views/spree/admin/option_types/index.html.erb
 - app/views/spree/admin/option_types/new.html.erb
 - app/views/spree/admin/option_types/new.js.erb
+- app/views/spree/admin/orders/_add_line_item.html.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
+- app/views/spree/admin/orders/_line_items_edit_form.html.erb
 - app/views/spree/admin/orders/_risk_analysis.html.erb
 - app/views/spree/admin/orders/_shipment.html.erb
 - app/views/spree/admin/orders/_shipment_manifest.html.erb
+- app/views/spree/admin/orders/cart.html.erb
 - app/views/spree/admin/orders/customer_details/_form.html.erb
 - app/views/spree/admin/orders/customer_details/edit.html.erb
 - app/views/spree/admin/orders/edit.html.erb
@@ -305,6 +313,10 @@ files:
 - app/views/spree/admin/products/stock.html.erb
 - app/views/spree/admin/promotion_actions/create.js.erb
 - app/views/spree/admin/promotion_actions/destroy.js.erb
+- app/views/spree/admin/promotion_categories/_form.html.erb
+- app/views/spree/admin/promotion_categories/edit.html.erb
+- app/views/spree/admin/promotion_categories/index.html.erb
+- app/views/spree/admin/promotion_categories/new.html.erb
 - app/views/spree/admin/promotion_rules/create.js.erb
 - app/views/spree/admin/promotion_rules/destroy.js.erb
 - app/views/spree/admin/promotions/_actions.html.erb
@@ -326,7 +338,9 @@ files:
 - app/views/spree/admin/promotions/rules/_first_order.html.erb
 - app/views/spree/admin/promotions/rules/_item_total.html.erb
 - app/views/spree/admin/promotions/rules/_landing_page.html.erb
+- app/views/spree/admin/promotions/rules/_one_use_per_user.html.erb
 - app/views/spree/admin/promotions/rules/_product.html.erb
+- app/views/spree/admin/promotions/rules/_taxon.html.erb
 - app/views/spree/admin/promotions/rules/_user.html.erb
 - app/views/spree/admin/promotions/rules/_user_logged_in.html.erb
 - app/views/spree/admin/properties/_form.html.erb
@@ -344,8 +358,20 @@ files:
 - app/views/spree/admin/prototypes/new.js.erb
 - app/views/spree/admin/prototypes/select.js.erb
 - app/views/spree/admin/prototypes/show.html.erb
+- app/views/spree/admin/refund_reasons/edit.html.erb
+- app/views/spree/admin/refund_reasons/index.html.erb
+- app/views/spree/admin/refund_reasons/new.html.erb
+- app/views/spree/admin/refunds/edit.html.erb
+- app/views/spree/admin/refunds/new.html.erb
+- app/views/spree/admin/reimbursement_types/index.html.erb
+- app/views/spree/admin/reimbursements/edit.html.erb
+- app/views/spree/admin/reimbursements/index.html.erb
+- app/views/spree/admin/reimbursements/show.html.erb
 - app/views/spree/admin/reports/index.html.erb
 - app/views/spree/admin/reports/sales_total.html.erb
+- app/views/spree/admin/return_authorization_reasons/edit.html.erb
+- app/views/spree/admin/return_authorization_reasons/index.html.erb
+- app/views/spree/admin/return_authorization_reasons/new.html.erb
 - app/views/spree/admin/return_authorizations/_form.html.erb
 - app/views/spree/admin/return_authorizations/edit.html.erb
 - app/views/spree/admin/return_authorizations/index.html.erb
@@ -368,6 +394,7 @@ files:
 - 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
+- app/views/spree/admin/shared/_refunds.html.erb
 - app/views/spree/admin/shared/_report_criteria.html.erb
 - app/views/spree/admin/shared/_report_order_criteria.html.erb
 - app/views/spree/admin/shared/_show_resource_links.html.erb
@@ -377,6 +404,10 @@ files:
 - app/views/spree/admin/shared/_tabs.html.erb
 - app/views/spree/admin/shared/_translations.html.erb
 - app/views/spree/admin/shared/_update_order_state.js
+- app/views/spree/admin/shared/named_types/_edit.html.erb
+- app/views/spree/admin/shared/named_types/_form.html.erb
+- app/views/spree/admin/shared/named_types/_index.html.erb
+- app/views/spree/admin/shared/named_types/_new.html.erb
 - app/views/spree/admin/shipping_categories/_form.html.erb
 - app/views/spree/admin/shipping_categories/edit.html.erb
 - app/views/spree/admin/shipping_categories/index.html.erb
@@ -441,6 +472,7 @@ files:
 - app/views/spree/admin/users/new.html.erb
 - app/views/spree/admin/users/orders.html.erb
 - app/views/spree/admin/variants/_autocomplete.js.erb
+- app/views/spree/admin/variants/_autocomplete_line_items_stock.js.erb
 - app/views/spree/admin/variants/_autocomplete_stock.js.erb
 - app/views/spree/admin/variants/_form.html.erb
 - app/views/spree/admin/variants/_split.js.erb
@@ -456,10 +488,8 @@ files:
 - app/views/spree/admin/zones/index.html.erb
 - app/views/spree/admin/zones/new.html.erb
 - app/views/spree/layouts/admin.html.erb
-- app/views/spree/test_mailer/test_email.text.erb
 - config/initializers/assets.rb
 - config/initializers/form_builder.rb
-- config/locales/en.yml
 - config/routes.rb
 - lib/spree/backend.rb
 - lib/spree/backend/action_callbacks.rb
@@ -521,13 +551,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubyforge_project: spree_backend
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: backend e-commerce functionality for the Spree project.

data/app/controllers/spree/admin/inventory_units_controller.rb

@@ -1,6 +0,0 @@
-module Spree
-  module Admin
-    class InventoryUnitsController < Spree::Admin::BaseController
-    end
-  end
-end

data/app/controllers/spree/admin/line_items_controller.rb

@@ -1,49 +0,0 @@
-module Spree
-  module Admin
-    class LineItemsController < Spree::Admin::BaseController
-      layout nil, :only => [:create, :destroy, :update]
-
-      before_filter :load_order
-      before_filter :load_line_item, :only => [:destroy, :update]
-
-      respond_to :html, :js
-
-      def create
-        variant = Variant.find(params[:line_item][:variant_id])
-        @line_item = @order.contents.add(variant, params[:line_item][:quantity].to_i)
-
-        if @order.save
-          render_order_form
-        else
-          respond_with(@line_item) do |format|
-            format.js { render :action => 'create', :locals => { :order => @order.reload } }
-          end
-        end
-      end
-
-      def destroy
-        @line_item.destroy
-        render_order_form
-      end
-
-      def update
-        @line_item.update_attributes(params[:line_item])
-        render_order_form
-      end
-
-      private
-        def render_order_form
-          render :partial => 'spree/admin/orders/form', :locals => { :order => @order.reload }
-        end
-
-        def load_order
-          @order = Order.find_by_number!(params[:order_id])
-          authorize! action, @order
-        end
-
-        def load_line_item
-          @line_item = @order.line_items.find(params[:id])
-        end
-    end
-  end
-end

data/app/controllers/spree/admin/overview_controller.rb

@@ -1,11 +0,0 @@
-# this clas was inspired (heavily) from the mephisto admin architecture
-module Spree
-  module Admin
-    class OverviewController < Spree::Admin::BaseController
-      def index
-        @users = User.all
-      end
-
-    end
-  end
-end

data/app/views/spree/admin/inventory_units/adjust.html.erb

@@ -1,31 +0,0 @@
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @level } %>
-
-<%= form_tag do %>
-<br /><br />
-
-<h1><%= Spree.t(:inventory_adjustment) %></h1>
-
-<table class="basic-table">
-  <thead data-hook="inventory_header">
-    <tr>
-      <th><%= Spree.t(:sku) %></th>
-      <th><%= Spree.t(:product) %></th>
-      <th><%= Spree.t(:options) %></th>
-      <th><%= Spree.t(:adjustment) %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr data-hook="inventory_row">
-      <td><%= @variant.sku %></td>
-      <td><%= @variant.product.name %></td>
-      <td><%= variant_options @variant %></td>
-      <td>
-        <%= text_field :level, :adjustment, :class => 'quantity' %>
-      </td>
-    </tr>
-  </tbody>
-</table>
-<%= submit_tag Spree.t('actions.update') %>
-<%= Spree.t(:or) %>
-<%= link_to Spree.t('actions.cancel'), :controller => 'overview', :action => :index %>
-<% end %>

data/app/views/spree/test_mailer/test_email.text.erb

@@ -1,4 +0,0 @@
-<%= Spree.t('test_mailer.test_email.greeting') %>
-================
-
-<%= Spree.t('test_mailer.test_email.message') %>

data/config/locales/en.yml

@@ -1,6 +0,0 @@
-en:
-  spree:
-    info_product_has_multiple_skus: "This product has %{count} variants:"
-    info_number_of_skus_not_shown:
-      one: "and one other"
-      other: "and %{count} others"