spree_core 1.0.0.rc1 → 1.0.0.rc2

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007-2011, Spree Commerce, Inc. and other contributors
+Copyright (c) 2007-2012, Spree Commerce, Inc. and other contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

data/app/assets/javascripts/admin/shipping_methods.js

@@ -0,0 +1,14 @@
+$(document).ready(function() {
+  if ($(".categories input:checked").length > 0) {
+    $('input[type=checkbox]:not(:checked)').attr('disabled', true);
+  }
+
+  $('.categories input[type=checkbox]').change(function(){
+    if($(this).is(':checked')) {
+      $('input[type=checkbox]').attr('disabled', true);
+      $(this).removeAttr('disabled');
+    } else {
+      $('input[type=checkbox]').removeAttr('disabled');
+    }
+  });
+});

data/app/assets/stylesheets/store/reset.css

@@ -172,4 +172,4 @@ th, td, caption { padding: 4px 10px 4px 5px; }
 tr.even td { background: #e5ecf9; }
 tfoot { font-style: italic; }
 caption { background: #eeeeee; }
-
+input[type="number"] { width: 42px; }

data/app/controllers/spree/admin/orders/customer_details_controller.rb

@@ -30,7 +30,7 @@ module Spree
               redirect_to edit_admin_order_shipment_path(@order, @order.shipment)
             else
               flash[:error] = t('errors.messages.no_shipping_methods_available')
-              redirect_to user_admin_order_path(@order)
+              redirect_to admin_order_customer_path(@order)
             end
           else
             render :action => :edit

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

@@ -34,7 +34,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
       end
     else
       invoke_callbacks(:update, :fails)
-      respond_with(@object)
+      respond_with(@object, :location => [:admin, @object])
     end
   end
 

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

@@ -2,8 +2,17 @@ module Spree
   module Admin
     class ShippingMethodsController < ResourceController
       before_filter :load_data, :except => [:index]
+      before_filter :set_shipping_category, :only => [:create, :update]
 
       private
+
+      def set_shipping_category
+        return true if params[:shipping_method][:shipping_category_id] == ""
+        @shipping_method.shipping_category = Spree::ShippingCategory.find(params[:shipping_method][:shipping_category_id])
+        @shipping_method.save
+        params[:shipping_method].delete(:shipping_category_id)
+      end
+
       def location_after_save
         edit_admin_shipping_method_path(@shipping_method)
       end

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

@@ -7,6 +7,7 @@ module Spree
 
       create.after :save_user_roles
       update.before :save_user_roles
+      update.after :sign_in_if_change_own_password
 
       def index
         respond_with(@collection) do |format|
@@ -65,6 +66,12 @@ module Spree
         def load_roles
           @roles = Role.all
         end
+
+        def sign_in_if_change_own_password
+          if current_user == @user && @user.password.present?
+            sign_in(@user, :event => :authentication, :bypass => true)
+          end
+        end
     end
   end
 end

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

@@ -178,9 +178,10 @@ module Spree
        end
 
       def product_picker_field(name, value)
-        products = Product.with_ids(value)
-        product_names_hash = products.inject({}){|memo,item| memo[item.id] = item.name; memo}
-        %(<input type="text" name="#{name}" value="#{value}" class="tokeninput products" data-names='#{product_names_hash.to_json}' />).html_safe
+        products = Product.with_ids(value.split(','))
+        product_names = products.inject({}){|memo,item| memo[item.id] = item.name; memo}
+        product_rules = products.collect{ |p| { :id => p.id, :name => p.name } }
+        %(<input type="text" name="#{name}" value="#{value}" class="tokeninput products" data-names='#{product_names.to_json}' data-pre='#{product_rules.to_json}'/>).html_safe
       end
 
       # renders set of hidden fields and button to add new record using nested_attributes

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

@@ -22,7 +22,9 @@ module Spree
         css_classes = []
 
         selected = if options[:match_path]
-          request.fullpath.starts_with?("/admin#{options[:match_path]}")
+          # TODO: `request.fullpath` for engines mounted at '/' returns '//'
+          # which seems an issue with Rails routing.- revisit issue #910
+          request.fullpath.gsub('//', '/').starts_with?("#{root_path}admin#{options[:match_path]}")
         else
           args.include?(controller.controller_name.to_sym)
         end

data/app/models/spree/order.rb

@@ -87,7 +87,7 @@ module Spree
     end
 
     # order state machine (see http://github.com/pluginaweek/state_machine/tree/master for details)
-    state_machine :initial => :cart, :use_transactions => false do
+    state_machine :initial => 'cart', :use_transactions => false do
 
       event :next do
         transition :from => 'cart',     :to => 'address'
@@ -547,7 +547,7 @@ module Spree
         shipments.each do |shipment|
           shipment.inventory_units.each do |inventory_unit|
             line_item = line_items.find_by_variant_id(inventory_unit.variant_id)
-            Spree::InventoryUnit.decrease(self, inventory_unit.variant, line_item.quantity)
+            InventoryUnit.decrease(self, inventory_unit.variant, line_item.quantity)
           end
         end
       end
@@ -560,7 +560,7 @@ module Spree
         shipments.each do |shipment|
           shipment.inventory_units.each do |inventory_unit|
             line_item = line_items.find_by_variant_id(inventory_unit.variant_id)
-            Spree::InventoryUnit.increase(self, inventory_unit.variant, line_item.quantity)
+            InventoryUnit.increase(self, inventory_unit.variant, line_item.quantity)
           end
         end
       end

data/app/models/spree/preferences/preferable.rb

@@ -8,6 +8,11 @@ module Spree::Preferences::Preferable
   def self.included(base)
     base.class_eval do
       extend Spree::Preferences::PreferableClassMethods
+      if respond_to?(:after_destroy)
+        after_destroy do |obj|
+          obj.clear_preferences
+        end
+      end
     end
   end
 
@@ -62,6 +67,10 @@ module Spree::Preferences::Preferable
     [self.class.name, name, (try(:id) || :new)].join('::').underscore
   end
 
+  def clear_preferences
+    preferences.keys.each {|pref| preference_store.delete preference_cache_key(pref)}
+  end
+
   private
 
   def preference_store

data/app/models/spree/product.rb

@@ -40,9 +40,9 @@ module Spree
     after_create :add_properties_and_option_types_from_prototype
     before_save :recalculate_count_on_hand
     after_save :update_memberships if ProductGroup.table_exists?
-    after_save :set_master_on_hand_to_zero_when_product_has_variants
     after_save :save_master
-
+    after_save :set_master_on_hand_to_zero_when_product_has_variants
+    
     has_many :variants,
       :class_name => 'Spree::Variant',
       :conditions => ["#{::Spree::Variant.quoted_table_name}.is_master = ? AND #{::Spree::Variant.quoted_table_name}.deleted_at IS NULL", false],

data/app/models/spree/shipment.rb

@@ -7,7 +7,7 @@ module Spree
     belongs_to :address
     has_many :state_events, :as => :stateful
     has_many :inventory_units, :dependent => :nullify
-    has_one :adjustment, :as => :source
+    has_one :adjustment, :as => :source, :dependent => :destroy
 
     before_create :generate_shipment_number
     after_save :ensure_correct_adjustment, :update_order

data/app/models/spree/shipping_category.rb

@@ -1,5 +1,7 @@
 module Spree
   class ShippingCategory < ActiveRecord::Base
     validates :name, :presence => true
+    has_many :products
+    has_many :shipping_methods
   end
 end

data/app/models/spree/shipping_method.rb

@@ -4,6 +4,7 @@ module Spree
     belongs_to :zone
     has_many :shipments
     validates :name, :calculator, :zone, :presence => true
+    belongs_to :shipping_category
 
     calculated_adjustments
 
@@ -16,7 +17,22 @@ module Spree
     def available_to_order?(order, display_on=nil)
       availability_check = available?(order,display_on)
       zone_check = zone && zone.include?(order.ship_address)
-      availability_check && zone_check
+      category_check = category_match?(order)
+      availability_check && zone_check && category_check
+    end
+
+    # Indicates whether or not the category rules for this shipping method
+    # are satisfied (if applicable)
+    def category_match?(order)
+      return true if shipping_category.nil?
+
+      if match_all
+        order.products.all? { |p| p.shipping_category == shipping_category }
+      elsif match_one
+        order.products.any? { |p| p.shipping_category == shipping_category }
+      elsif match_none
+        order.products.all? { |p| p.shipping_category != shipping_category }
+      end
     end
 
     def self.all_available(order, display_on=nil)

data/app/models/spree/tax_rate.rb

@@ -23,7 +23,9 @@ module Spree
     # Gets the array of TaxRates appropriate for the specified order
     def self.match(order)
       return [] unless order.tax_zone
-      all.select { |rate| rate.zone == order.tax_zone || rate.zone.contains?(order.tax_zone) }
+      all.select do |rate|
+        rate.zone == order.tax_zone || rate.zone.contains?(order.tax_zone) || rate.zone.default_tax
+      end
     end
 
     # For Vat the default rate is the rate that is configured for the default category

data/app/models/spree/variant.rb

@@ -27,7 +27,7 @@ module Spree
 
     # Returns number of inventory units for this variant (new records haven't been saved to database, yet)
     def on_hand
-      Spree::Config[:track_inventory_levels] ? self.count_on_hand : nil
+      Spree::Config[:track_inventory_levels] ? self.count_on_hand : (1.0/0) # Infinity
     end
 
     # Adjusts the inventory units to match the given new level.

data/app/models/spree/zone.rb

@@ -111,18 +111,18 @@ module Spree
     end
 
     private
-    def remove_defunct_members
-      zone_members.each do |zone_member|
-        zone_member.destroy if zone_member.zoneable_id.nil?
+      def remove_defunct_members
+        zone_members.each do |zone_member|
+          zone_member.destroy if zone_member.zoneable_id.nil? || zone_member.zoneable_type != "Spree::#{self.kind.capitalize}"
+        end
       end
-    end
 
-    def remove_previous_default
-      return unless self.default_tax
+      def remove_previous_default
+        return unless self.default_tax
 
-      Zone.all.each do |zone|
-        zone.update_attribute "default_tax", false unless zone == self
+        Zone.all.each do |zone|
+          zone.update_attribute "default_tax", false unless zone == self
+        end
       end
-    end
   end
 end

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

@@ -3,7 +3,7 @@
 <h2><%= t(:adjustment) %></h2>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @adjustment } %>
-<%= form_for @adjustment, :url => admin_order_adjustment_path(@order, @adjustment), :html => { :method => :put} do |f| %>
+<%= form_for @adjustment, :url => admin_order_adjustment_path(@order, @adjustment), :method => :put do |f| %>
   <%= render :partial => 'form', :locals => { :f => f } %>
 
   <p class="form-buttons" data-hook="buttons">

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

@@ -2,7 +2,7 @@
   <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @line_item } %>
 <% end %>
 
-<%= form_for @order, :url => admin_order_url(@order), :html => { :method => :put} do |f| %>
+<%= form_for @order, :url => admin_order_url(@order), :method => :put do |f| %>
   <%= f.hidden_field :number %>
   <table class="index">
     <tbody id="line-items">

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

@@ -43,6 +43,6 @@
 </p>
 
 <% content_for :head do %>
-  <%= javascript_include_tag '/states.js', 'admin/address_states.js' %>
+  <%= javascript_include_tag states_path, 'admin/address_states.js' %>
 <% end %>
 

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

@@ -2,7 +2,7 @@
 
 <h1><%= t(:editing_payment_method) %></h1>
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @payment_method } %>
-<%= form_for @payment_method, :url => admin_payment_method_path(@payment_method), :html => { :method => :put } do |f| %>
+<%= form_for @payment_method, :url => admin_payment_method_path(@payment_method), :method => :put do |f| %>
   <%= render :partial => 'form', :locals => { :f => f } %>
   <p data-hook="buttons">
     <%= submit_tag t(:update) %>

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

@@ -4,7 +4,7 @@
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @product } %>
 
-<%= form_for @product, :url => admin_product_url(@product), :html => { :method => :put } do |f| %>
+<%= form_for @product, :url => admin_product_url(@product), :method => :put do |f| %>
   <table class="index">
     <thead>
       <tr data-hook="product_properties_header">

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

@@ -3,7 +3,7 @@
 <%= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => 'Product Details' } %>
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @product } %>
 
-<%= form_for [:admin, @product], :html => { :method => :put, :multipart => true } do |f| %>
+<%= form_for [:admin, @product], :method => :put, :html => { :multipart => true } do |f| %>
   <%= render :partial => 'form', :locals => { :f => f } %>
   <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
 <% end %>

data/app/views/spree/admin/shared/_destroy.js.erb

@@ -13,4 +13,4 @@ if notice %>
   } <%
 end %>
 
-<%= render :partial => '/admin/shared/update_order_state' if @order %>
+<%= render :partial => '/spree/admin/shared/update_order_state' if @order %>

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

@@ -21,7 +21,7 @@
 </div>
 
 <div data-hook="admin_shipment_edit_form">
-  <%= form_for @shipment, :url => admin_order_shipment_path(@order, @shipment), :html => { :method => :put } do |shipment_form| %>
+  <%= form_for @shipment, :url => admin_order_shipment_path(@order, @shipment), :method => :put do |shipment_form| %>
       <%= render :partial => 'form', :locals => { :shipment_form => shipment_form } %>
 
       <div data-hook="admin_shipment_edit_form_buttons">

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

@@ -18,6 +18,21 @@
   <% end %>
 </div>
 
+<div data-hook"admin_shipping_method_form_availability_fields">
+  <fieldset class="categories">
+    <legend><%= t(:availability) %></legend>
+    <%= f.field_container :shipping_category do %>
+      <%= f.label :shipping_category, t(:shipping_category_choose) %>
+      <%= select(:shipping_method, :shipping_category_id, Spree::ShippingCategory.all.collect { |s| [s.name, s.id] }, { :include_blank => true }) %>
+    <% end %>
+
+    <b><%= t(:match_rule) %></b>&nbsp;&nbsp;
+    <%= f.check_box :match_none %>&nbsp;<%= f.label :match_none, t('match_choices.none') %>
+    <%= f.check_box :match_one %>&nbsp;<%= f.label :match_one, t('match_choices.one') %>
+    <%= f.check_box :match_all %>&nbsp;<%= f.label :match_all, t('match_choices.all') %>
+  </fieldset>
+</div>
+
 <div data-hook="admin_shipping_method_form_calculator_fields">
   <%= render :partial => 'spree/admin/shared/calculator_fields', :locals => { :f => f } %>
 </div>

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

@@ -2,7 +2,7 @@
 
 <h1><%= t(:taxon_edit) %></h1>
 
-<%= form_for [:admin, @taxonomy, @taxon], :html => { :method => :put, :multipart => true} do |f| %>
+<%= form_for [:admin, @taxonomy, @taxon], :method => :put, :html => { :multipart => true } do |f| %>
   <%= render :partial => 'form', :locals => { :f => f } %>
 
   <p class="form-buttons" data-hook="buttons">

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

@@ -13,18 +13,17 @@
   <td><%= zone_form.check_box :default_tax %></td>
 </p>
 
-
 <p data-hook="type">
   <%= label_tag nil, t(:type) %><br />
   <label class="sub">
-    <%= zone_form.radio_button('kind', 'country', {:id => 'country_based'}) %>
+    <%= zone_form.radio_button('kind', 'country', { :id => 'country_based' }) %>
     <%= t(:country_based) %>
   </label> &nbsp;
   <label class="sub">
-    <%= zone_form.radio_button('kind', 'state', {:id => 'state_based'}) %>
+    <%= zone_form.radio_button('kind', 'state', { :id => 'state_based' }) %>
     <%= t(:state_based) %>
   </label> &nbsp;
 </p>
 
-<%= render :partial =>'member_type', :locals => { :type => 'country', :zone_form => zone_form }%>
-<%= render :partial =>'member_type', :locals => { :type => 'state', :zone_form => zone_form } %>
+<%= render :partial => 'member_type', :locals => { :type => 'country', :zone_form => zone_form }%>
+<%= render :partial => 'member_type', :locals => { :type => 'state', :zone_form => zone_form } %>

data/app/views/spree/checkout/edit.html.erb

@@ -1,5 +1,5 @@
 <% content_for :head do %>
-  <%= javascript_include_tag '/states' %>
+  <%= javascript_include_tag states_path %>
 <% end %>
 <div id="checkout" data-hook>
   <h1><%= t(:checkout) %></h1>

data/app/views/spree/checkout/registration.html.erb

@@ -8,7 +8,7 @@
     <div id="guest_checkout" data-hook>
       <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
       <h2><%= t(:guest_user_account) %></h2>
-      <%= form_for @order, :url => update_checkout_registration_path, :html => { :method => :put, :id => 'checkout_form_registration'} do |f| %>
+      <%= form_for @order, :url => update_checkout_registration_path, :method => :put, :html => { :id => 'checkout_form_registration' } do |f| %>
         <p>
           <%= f.label :email, t(:email) %><br />
           <%= f.email_field :email, :class => 'title' %>

data/app/views/spree/orders/new.html.erb

@@ -2,7 +2,7 @@
 
 <h1><%= t(:shopping_cart) %></h1>
 
-<%= form_for @order, :url =>'#', :html => {:method => :put} do |order_form| %>
+<%= form_for @order, :url =>'#', :method => :put do |order_form| %>
   <%= render :partial => 'form', :locals => { :order_form => order_form } %>
 <% end %>