spree_core 0.70.RC1 → 0.70.0.rc2

data/README.md

@@ -1,15 +1,21 @@
+Core
+====
+
+Core e-commerce functionality for the Spree project
+
+
 Testing
-=======
+-------
 
 Create the test site
 
-    rake test_app
+    bundle exec rake test_app
 
 Run the tests
 
-    rake spec
+    bundle exec rake spec
 
 Run the coverage. After the rake task open coverage/index.html
 
-    rake rcov
+    bundle exec rake rcov
 

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

@@ -106,7 +106,7 @@ prep_product_autocomplete_data = function(data){
 }
 
 $.fn.product_autocomplete = function(){
-  $(this).autocomplete("/admin/products.json?authenticity_token=" + escape($('meta[name=csrf-token]').attr("content")), {
+  $(this).autocomplete("/admin/products.json?authenticity_token=" + encodeURIComponent($('meta[name=csrf-token]').attr("content")), {
       parse: prep_product_autocomplete_data,
       formatItem: function(item) {
         return format_product_autocomplete(item);

data/app/assets/javascripts/admin/orders/edit_form.js

@@ -9,7 +9,9 @@ $.each($('td.qty input'), function(i, inpt){
       type: "POST",
       url: "/admin/orders/" + $('input#order_number').val() + "/line_items/" + $(id).val(),
       data: ({_method: "put", "line_item[quantity]": $(this).val()}),
-      success: function(html){ $('#order-form-wrapper').html(html)}
+      complete: function(resp){ 
+        $('#order-form-wrapper').html(resp.responseText);
+      }
     });
 
   }, 0,5);

data/app/assets/stylesheets/admin/admin-form.css.erb

@@ -53,9 +53,7 @@ fieldset#preferences textarea { height: 100px; }
 
 
 .date-range-filter {width:220px;}
-  .date-range-filter input {width:75px;}
-  .date-range-filter .yui-u { width:50% }
-
+  .date-range-filter input {width:70px;}
 
 /* Multi-column form layout
 -------------------------------------------------------------- */

data/app/assets/stylesheets/admin/admin-tables.css.erb

@@ -24,7 +24,7 @@ table.index th {
 table.index tr.alt td {
   background-color: #efefef; }
 table.index.green th {
-  background: #cfefa7 url(<%= asset_path 'admin/grid_header_back_green.png' %>) top left repeat-x;
+  background: #cfefa7 url(<%= asset_path 'admin/bg/grid_header_back_green.png' %>) top left repeat-x;
   border-left: 1px solid #E4FDB4;
   border-top: 1px solid #E4FDB4;
   border-right: 1px solid #B7CB90;

data/app/assets/stylesheets/admin/admin.css.erb

@@ -331,7 +331,7 @@ body {
     .errorExplanation h2 {
       font-size: 1.75em;
       padding-left: 40px;
-      background: url(<%= asset_path 'admin/icons/orb/32x32/3.png' %>) center left no-repeat; }
+      background: url(<%= asset_path 'admin/icons/32x32/3.png' %>) center left no-repeat; }
   ul.checkbox-list {
     list-style: none; }
     ul.checkbox-list li {
@@ -406,7 +406,7 @@ body {
       ul.taxonomy-actions li.disabled {
         opacity: .5; }
   h3.warning {
-    background-image: url(<%= asset_path 'admin/icons/fugue/exclamation.png' %>);
+    background-image: url(<%= asset_path 'admin/icons/exclamation.png' %>);
     background-position: 10px 15px;
     background-repeat: no-repeat;
     padding-left: 35px; }

data/app/assets/stylesheets/admin/spree_core.css

@@ -10,7 +10,6 @@
  *= require admin/admin-typography.css
  *= require admin/admin
  *= require admin/edit_checkouts.css
- *= require admin/grids.css
  *= require admin/token-input.css
  *= require jquery-ui.datepicker
 */

data/app/controllers/admin/line_items_controller.rb

@@ -14,7 +14,9 @@ class Admin::LineItemsController < Admin::BaseController
         format.html { render :partial => "admin/orders/form", :locals => {:order => @order.reload}, :layout => false }
       end
     else
-      #TODO Handle failure gracefully, patches welcome.
+      respond_with(@line_item) do |format| 
+        format.js { render :action => 'create', :locals => {:order => @order.reload}, :layout => false }
+      end
     end
   end
 

data/app/controllers/checkout_controller.rb

@@ -61,11 +61,17 @@ class CheckoutController < Spree::BaseController
   def load_order
     @order = current_order
     redirect_to cart_path and return unless @order and @order.checkout_allowed?
+    raise_insufficient_quantity and return if @order.insufficient_stock_lines.present?
     redirect_to cart_path and return if @order.completed?
     @order.state = params[:state] if params[:state]
     state_callback(:before)
   end
 
+  def raise_insufficient_quantity
+    flash[:error] = t('spree_inventory_error_flash_for_insufficient_quantity')
+    redirect_to cart_path
+  end
+
   def state_callback(before_or_after = :before)
     method_name = :"#{before_or_after}_#{@order.state}"
     send(method_name) if respond_to?(method_name, true)

data/app/helpers/spree/base_helper.rb

@@ -35,8 +35,19 @@ module Spree::BaseHelper
 
   # human readable list of variant options
   def variant_options(v, allow_back_orders = Spree::Config[:allow_backorders], include_style = true)
+    ActiveSupport::Deprecation.warn("variant_options method is deprecated, and will be removed in 0.80.0", caller)
     list = v.options_text
-    list = include_style ? content_tag(:span, "(#{t(:out_of_stock)}) #{list}", :class => "out-of-stock") : "#{t(:out_of_stock)} #{list}" unless (allow_back_orders || v.in_stock?)
+
+    # We shouldn't show out of stock if the product is infact in stock
+    # or when we're not allowing backorders.
+    unless (allow_back_orders || v.in_stock?)
+      list = if include_style
+        content_tag(:span, "(#{t(:out_of_stock)}) #{list}", :class => "out-of-stock")
+      else
+        "#{t(:out_of_stock)} #{list}"
+      end
+    end
+
     list
   end
 
@@ -56,12 +67,12 @@ module Spree::BaseHelper
   def meta_data_tags
     object = instance_variable_get('@'+controller_name.singularize)
     meta = { :keywords => Spree::Config[:default_meta_keywords], :description => Spree::Config[:default_meta_description] }
-    
+
     if object.kind_of?(ActiveRecord::Base)
       meta[:keywords] = object.meta_keywords if object[:meta_keywords].present?
       meta[:description] = object.meta_description if object[:meta_description].present?
     end
-    
+
     meta.map do |name, content|
       tag('meta', :name => name, :content => content)
     end.join("\n")
@@ -88,7 +99,7 @@ module Spree::BaseHelper
   def logo(image_path=Spree::Config[:logo])
     link_to image_tag(image_path), root_path
   end
-  
+
   def flash_messages
     [:notice, :error].map do |msg_type|
       if flash[msg_type]
@@ -98,7 +109,7 @@ module Spree::BaseHelper
       end
     end.join("\n").html_safe
   end
-  
+
   def breadcrumbs(taxon, separator=" » ")
     return "" if current_page?("/") || taxon.nil?
     separator = raw(separator)
@@ -120,8 +131,8 @@ module Spree::BaseHelper
       root_taxon.children.map do |taxon|
         css_class = (current_taxon && current_taxon.self_and_ancestors.include?(taxon)) ? 'current' : nil
         content_tag :li, :class => css_class do
-         link_to(taxon.name, seo_url(taxon)) + 
-         taxons_tree(taxon, current_taxon, max_level - 1) 
+         link_to(taxon.name, seo_url(taxon)) +
+         taxons_tree(taxon, current_taxon, max_level - 1)
         end
       end.join("\n").html_safe
     end
@@ -131,7 +142,7 @@ module Spree::BaseHelper
     return Country.all unless zone = Zone.find_by_name(Spree::Config[:checkout_zone])
     zone.country_list
   end
-  
+
   def format_price(price, options={})
     options.assert_valid_keys(:show_vat_text)
     options.reverse_merge! :show_vat_text => Spree::Config[:show_price_inc_vat]
@@ -142,7 +153,7 @@ module Spree::BaseHelper
       formatted_price
     end
   end
-  
+
   # generates nested url to product based on supplied taxon
   def seo_url(taxon, product = nil)
     return '/t/' + taxon.permalink if product.nil?
@@ -150,7 +161,7 @@ module Spree::BaseHelper
       "not used anymore. Use product_url instead. (called from #{caller[0]})"
     return product_url(product)
   end
-  
+
   def current_orders_product_count
     if current_order.blank? || current_order.item_count < 1
       return 0

data/app/models/creditcard.rb

@@ -2,6 +2,7 @@ class Creditcard < ActiveRecord::Base
   has_many :payments, :as => :source
 
   before_save :set_last_digits
+  after_validation :set_card_type
 
   attr_accessor :number, :verification_value
 
@@ -23,6 +24,19 @@ class Creditcard < ActiveRecord::Base
     self.last_digits ||= number.to_s.length <= 4 ? number : number.to_s.slice(-4..-1)
   end
 
+  # cheap hack to get to the type? method from deep within ActiveMerchant without stomping on
+  # potentially existing methods in CreditCard
+  class CardDetector
+    class << self
+      include ActiveMerchant::Billing::CreditCardMethods::ClassMethods
+    end
+  end
+
+  # sets self.cc_type while we still have the card number
+  def set_card_type
+    self.cc_type ||= CardDetector.type?(self.number)
+  end
+
   def name?
     first_name? && last_name?
   end
@@ -243,7 +257,7 @@ class Creditcard < ActiveRecord::Base
 
   def spree_cc_type
     return "visa" if ENV['RAILS_ENV'] == "development"
-    self.class.type?(number)
+    self.cc_type
   end
 
   # Saftey check to make sure we're not accidentally performing operations on a live gateway.

data/app/models/inventory_unit.rb

@@ -22,12 +22,6 @@ class InventoryUnit < ActiveRecord::Base
     after_transition :to => 'returned', :do => :restock_variant
   end
 
-  # method deprecated in favour of adjust_units (which creates & destroys units as needed).
-  def self.sell_units(order)
-    warn "[DEPRECATION] `InventoryUnits#sell_units` is deprecated.  Please use `InventoryUnits#assign_opening_inventory` instead. (called from #{caller[0]})"
-    self.adjust_units(order)
-  end
-
   # Assigns inventory to a newly completed order.
   # Should only be called once during the life-cycle of an order, on transition to completed.
   #
@@ -88,7 +82,10 @@ class InventoryUnit < ActiveRecord::Base
   end
 
   def self.destroy_units(order, variant, quantity)
-    variant_units = order.inventory_units.group_by(&:variant_id)[variant.id].sort_by(&:state)
+    variant_units = order.inventory_units.group_by(&:variant_id)
+    return unless variant_units.include? variant.id
+
+    variant_units = variant_units[variant.id].sort_by(&:state)
 
     quantity.times do
       inventory_unit = variant_units.shift
@@ -97,9 +94,8 @@ class InventoryUnit < ActiveRecord::Base
   end
 
   def self.create_units(order, variant, sold, back_order)
-    if back_order > 0 && !Spree::Config[:allow_backorders]
-      raise "Cannot request back orders when backordering is disabled"
-    end
+    return if back_order > 0 && !Spree::Config[:allow_backorders]
+
 
     shipment = order.shipments.detect {|shipment| !shipment.shipped? }
 

data/app/models/line_item.rb

@@ -10,6 +10,8 @@ class LineItem < ActiveRecord::Base
   validates :variant, :presence => true
   validates :quantity, :numericality => { :only_integer => true, :message => I18n.t("validation.must_be_int") }
   validates :price, :numericality => true
+  validate :stock_availability
+  
   # validate :meta_validation_of_quantities
 
   attr_accessible :quantity
@@ -58,6 +60,14 @@ class LineItem < ActiveRecord::Base
     self.quantity = 0 if self.quantity.nil? || self.quantity < 0
   end
 
+  def sufficient_stock?
+    Spree::Config[:allow_backorders] ? true : (self.variant.on_hand >= self.quantity)
+  end
+
+  def insufficient_stock?
+    !sufficient_stock?
+  end
+
   private
     def update_inventory
       return true unless self.order.completed?
@@ -89,7 +99,12 @@ class LineItem < ActiveRecord::Base
       if order.try(:inventory_units).to_a.any?{|unit| unit.variant_id == variant_id && unit.shipped?}
         errors.add :base, I18n.t("cannot_destory_line_item_as_inventory_units_have_shipped")
         return false
-     end
-  end
+      end
+    end
+
+    def stock_availability
+      return if sufficient_stock?
+      errors.add(:quantiy, "can't be greater than avaiable stock.")
+    end
 end
 

data/app/models/order.rb

@@ -45,8 +45,6 @@ class Order < ActiveRecord::Base
 
   make_permalink :field => :number
 
-  attr_accessor :out_of_stock_items
-
   class_attribute :update_hooks
   self.update_hooks = Set.new
 
@@ -318,7 +316,7 @@ class Order < ActiveRecord::Base
   # Called after transition to complete state when payments will have been processed
   def finalize!
     update_attribute(:completed_at, Time.now)
-    self.out_of_stock_items = InventoryUnit.assign_opening_inventory(self)
+    InventoryUnit.assign_opening_inventory(self)
     # lock any optional adjustments (coupon promotions, etc.)
     adjustments.optional.each { |adjustment| adjustment.update_attribute("locked", true) }
     OrderMailer.confirm_email(self).deliver
@@ -378,6 +376,10 @@ class Order < ActiveRecord::Base
     line_items.map{|li| li.variant.product}
   end
 
+  def insufficient_stock_lines
+    line_items.select &:insufficient_stock?
+  end
+
   private
   def create_user
     self.email = user.email if self.user and not user.anonymous?

data/app/models/product.rb

@@ -44,18 +44,17 @@ class Product < ActiveRecord::Base
   after_save :save_master
 
   has_many :variants,
-    :conditions => ["variants.is_master = ? AND variants.deleted_at IS NULL", false],
-    :order => 'variants.position ASC'
-
+    :conditions => ["#{Variant.table_name}.is_master = ? AND #{Variant.table_name}.deleted_at IS NULL", false],
+    :order => "#{Variant.table_name}.position ASC"
 
   has_many :variants_including_master,
     :class_name => 'Variant',
-    :conditions => ["variants.deleted_at IS NULL"],
+    :conditions => ["#{Variant.table_name}.deleted_at IS NULL"],
     :dependent => :destroy
 
   has_many :variants_with_only_master,
     :class_name => 'Variant',
-    :conditions => ["variants.deleted_at IS NULL AND variants.is_master = ?", true],
+    :conditions => ["#{Variant.table_name}.deleted_at IS NULL AND #{Variant.table_name}.is_master = ?", true],
     :dependent => :destroy
 
 
@@ -74,30 +73,43 @@ class Product < ActiveRecord::Base
 
   include ::Scopes::Product
 
-  #RAILS3 TODO -  scopes are duplicated here and in scopres/product.rb - can we DRY it up?
+  #RAILS3 TODO -  scopes are duplicated here and in scopes/product.rb - can we DRY it up?
   # default product scope only lists available and non-deleted products
-  scope :not_deleted,     where("products.deleted_at is NULL")
+  class << self
+    def not_deleted
+      where(Product.arel_table[:deleted_at].eq(nil))
+    end
+
+    def available(available_on = nil)
+      where(Product.arel_table[:available_on].lteq(available_on || Time.zone.now ))
+    end
 
-  scope :available,       lambda { |*on| where("products.available_on <= ?", on.first || Time.zone.now ) }
+    #RAILS 3 TODO - this scope doesn't match the original 2.3.x version, needs attention (but it works)
+    def active
+      not_deleted.available
+    end
 
-  #RAILS 3 TODO - this scope doesn't match the original 2.3.x version, needs attention (but it works)
-  scope :active,          lambda{ not_deleted.available }
+    def on_hand
+      where(Product.arel_table[:count_on_hand].gteq(0))
+    end
 
-  scope :on_hand,         where("products.count_on_hand > 0")
+    def id_equals(input_id)
+      where(Product.arel_table[:id].eq(input_id))
+    end
 
+    def taxons_name_eq(name)
+      joins(:taxons).where(Taxon.arel_table[:name].eq(name))
+    end
+  end
   if (ActiveRecord::Base.connection.adapter_name == 'PostgreSQL')
-    if ActiveRecord::Base.connection.tables.include?("products")
-      scope :group_by_products_id, { :group => Product.column_names.map{|col_name| "products.#{col_name}"} }
+    if Product.table_exists?
+      scope :group_by_products_id, { :group => Product.column_names.map{|col_name| "#{Product.table_name}.#{col_name}"} }
     end
   else
-    scope :group_by_products_id, { :group => "products.id" }
+    scope :group_by_products_id, { :group => "#{Product.table_name}.id" }
   end
   search_methods :group_by_products_id
 
-  scope :id_equals, lambda { |input_id| where("products.id = ?", input_id) }
-
-  scope :taxons_name_eq, lambda { |name| joins(:taxons).where("taxons.name = ?", name) }
-
   # ----------------------------------------------------------------------------------------------------------
   #
   # The following methods are deprecated and will be removed in a future version of Spree
@@ -135,7 +147,7 @@ class Product < ActiveRecord::Base
 
   # returns true if the product has any variants (the master variant is not a member of the variants array)
   def has_variants?
-    !variants.empty?
+    variants.any?
   end
 
   # returns the number of inventory units "on_hand" for this product
@@ -151,7 +163,7 @@ class Product < ActiveRecord::Base
 
   # Returns true if there are inventory units (any variant) with "on_hand" state for this product
   def has_stock?
-    master.in_stock? || !!variants.detect{|v| v.in_stock?}
+    master.in_stock? || variants.any?(&:in_stock?)
   end
 
   def tax_category
@@ -236,7 +248,7 @@ class Product < ActiveRecord::Base
   end
 
   private
-  
+
   def sanitize_permalink
     self.permalink = self.permalink.to_url
   end