spree_core 1.0.0.rc2 → 1.0.0.rc3

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

@@ -1,5 +1,6 @@
 /*
- * This is a manifest file that includes stylesheets for spree_core
- *= require store/reset
+* This is a manifest file that includes stylesheets for spree_core 
+ *= require store/base
+ *= require jquery.formalize.css
  *= require store/screen 
 */

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

@@ -9,7 +9,8 @@ module Spree
       def edit
         @preferences = [:site_name, :default_seo_title, :default_meta_keywords,
                         :default_meta_description, :site_url, :allow_ssl_in_production,
-                        :allow_ssl_in_development_and_test, :check_for_spree_alerts]
+                        :allow_ssl_in_staging, :allow_ssl_in_development_and_test,
+                        :check_for_spree_alerts]
       end
 
       def update

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

@@ -1,6 +1,6 @@
 module Spree
   module Admin
-    class OrdersController < BaseController
+    class OrdersController < Spree::Admin::BaseController
       require 'spree/core/gateway_error'
       before_filter :initialize_txn_partials
       before_filter :initialize_order_events

data/app/helpers/spree/base_helper.rb

@@ -10,7 +10,7 @@ module Spree
         text = "#{text}: (#{t('empty')})"
         css_class = 'empty'
       else
-        text = "#{text}: (#{current_order.item_count}) #{order_subtotal(current_order)}".html_safe
+        text = "#{text}: (#{current_order.item_count})  <span class='amount'>#{order_subtotal(current_order)}</span>".html_safe
         css_class = 'full'
       end
 
@@ -105,12 +105,12 @@ module Spree
       if taxon
         crumbs << content_tag(:li, link_to(t(:products) , products_path) + separator)
         crumbs << taxon.ancestors.collect { |ancestor| content_tag(:li, link_to(ancestor.name , seo_url(ancestor)) + separator) } unless taxon.ancestors.empty?
-        crumbs << content_tag(:li, content_tag(:span, taxon.name))
+        crumbs << content_tag(:li, content_tag(:span, link_to(taxon.name , seo_url(taxon))))
       else
         crumbs << content_tag(:li, content_tag(:span, t(:products)))
       end
-      crumb_list = content_tag(:ul, raw(crumbs.flatten.map{|li| li.mb_chars}.join))
-      content_tag(:div, crumb_list + tag(:br, {:class => 'clear'}, false, true), :id => 'breadcrumbs')
+      crumb_list = content_tag(:ul, raw(crumbs.flatten.map{|li| li.mb_chars}.join), :class => 'inline')
+      content_tag(:div, crumb_list, :id => 'breadcrumbs')
     end
 
     def taxons_tree(root_taxon, current_taxon, max_level = 1)
@@ -127,8 +127,11 @@ module Spree
     end
 
     def available_countries
-      return Country.all unless zone = Zone.find_by_name(Spree::Config[:checkout_zone])
-      zone.country_list
+      countries = Zone.find_by_name(Spree::Config[:checkout_zone]).try(:country_list) || Country.all
+      countries.collect do |c| 
+        c.name = I18n.t(c.name, :scope => 'countries', :default => c.name)
+        c 
+      end.sort{ |a,b| a.name <=> b.name }
     end
 
     def format_price(price, options={})

data/app/models/spree/activator.rb

@@ -4,7 +4,6 @@ module Spree
 
     self.event_names = [
       'spree.cart.add',
-      'spree.checkout.coupon_code_added',
       'spree.order.contents_changed',
       'spree.user.signup'
     ]

data/app/models/spree/adjustment.rb

@@ -59,12 +59,16 @@ module Spree
     # when present, but only if +locked+ is false.  Adjustments that are +locked+ will never change their amount.
     # The new adjustment amount will be set by by the +originator+ and is not automatically saved.  This makes it save
     # to use this method in an after_save hook for other models without causing an infinite recursion problem.
-    def update!
+    #
+    # order#update_adjustments passes self as the src, this is so calculations can be performed on the
+    # current values. If we used source it would load the old record from db for the association
+    def update!(src = nil)
+      src ||= source
       return if locked?
-      set_eligibility
       if originator.present?
-        originator.update_adjustment(self, source)
+        originator.update_adjustment(self, src)
       end
+      set_eligibility
     end
 
     private

data/app/models/spree/app_configuration.rb

@@ -18,50 +18,51 @@
 module Spree
   class AppConfiguration < Preferences::Configuration
 
-    preference :site_name, :string, :default => 'Spree Demo Site'
-    preference :default_seo_title, :string, :default => ''
-    preference :default_meta_description, :string, :default => 'Spree demo site'
-    preference :default_meta_keywords, :string, :default => 'spree, demo'
-    preference :site_url, :string, :default => 'demo.spreecommerce.com'
-    preference :default_locale, :string, :default => 'en'
-    preference :allow_locale_switching, :boolean, :default => true
-    preference :default_country_id, :integer, :default => 214
-    preference :allow_backorders, :boolean, :default => true
-    preference :allow_backorder_shipping, :boolean, :default => false # should only be true if you don't need to track inventory
-    preference :track_inventory_levels, :boolean, :default => true # will not track on_hand values for variants /products
-    preference :create_inventory_units, :boolean, :default => true # should only be false when track_inventory_levels is false, also disables RMA's
-    preference :show_descendents, :boolean, :default => true
-    preference :show_zero_stock_products, :boolean, :default => true
-    preference :orders_per_page, :integer, :default => 15
-    preference :show_only_complete_orders_by_default, :boolean, :default => true
-    preference :admin_products_per_page, :integer, :default => 10
-    preference :admin_pgroup_preview_size, :integer, :default => 10
-    preference :admin_pgroup_per_page, :integer, :default => 10
-    preference :products_per_page, :integer, :default => 12
-    preference :logo, :string, :default => 'admin/bg/spree_50.png'
+    # Alphabetized to more easily lookup particular preferences
+    preference :address_requires_state, :boolean, :default => true # should state/state_name be required
     preference :admin_interface_logo, :string, :default => 'admin/bg/spree_50.png'
+    preference :admin_pgroup_per_page, :integer, :default => 10
+    preference :admin_pgroup_preview_size, :integer, :default => 10
+    preference :admin_products_per_page, :integer, :default => 10
+    preference :allow_backorder_shipping, :boolean, :default => false # should only be true if you don't need to track inventory
+    preference :allow_backorders, :boolean, :default => true
+    preference :allow_checkout_on_gateway_error, :boolean, :default => false
+    preference :allow_guest_checkout, :boolean, :default => true
+    preference :allow_locale_switching, :boolean, :default => true
+    preference :allow_ssl_in_development_and_test, :boolean, :default => false
     preference :allow_ssl_in_production, :boolean, :default => true
     preference :allow_ssl_in_staging, :boolean, :default => true
-    preference :allow_ssl_in_development_and_test, :boolean, :default => false
-    preference :allow_guest_checkout, :boolean, :default => true
     preference :alternative_billing_phone, :boolean, :default => false # Request extra phone for bill addr
     preference :alternative_shipping_phone, :boolean, :default => false # Request extra phone for ship addr
-    preference :company, :boolean, :default => false # Request company field for billing and shipping addr
-    preference :shipping_instructions, :boolean, :default => false # Request instructions/info for shipping
-    preference :shipment_inc_vat, :boolean, :default => false
-    preference :auto_capture, :boolean, :default => false # automatically capture the creditcard (as opposed to just authorize and capture later)
-    preference :address_requires_state, :boolean, :default => true # should state/state_name be required
-    preference :checkout_zone, :string, :default => nil # replace with the name of a zone if you would like to limit the countries
     preference :always_put_site_name_in_title, :boolean, :default => true
+    preference :auto_capture, :boolean, :default => false # automatically capture the creditcard (as opposed to just authorize and capture later)
     preference :cache_static_content, :boolean, :default => true
-    preference :allow_checkout_on_gateway_error, :boolean, :default => false
-    preference :select_taxons_from_tree, :boolean, :default => false # provide opportunity to select taxons from tree instead of search with autocomplete
-    preference :max_level_in_taxons_menu, :integer, :default => 1 # maximum nesting level in taxons menu
     preference :check_for_spree_alerts, :boolean, :default => true
+    preference :checkout_zone, :string, :default => nil # replace with the name of a zone if you would like to limit the countries
+    preference :company, :boolean, :default => false # Request company field for billing and shipping addr
+    preference :create_inventory_units, :boolean, :default => true # should only be false when track_inventory_levels is false, also disables RMA's
+    preference :default_country_id, :integer, :default => 214
+    preference :default_locale, :string, :default => 'en'
+    preference :default_meta_description, :string, :default => 'Spree demo site'
+    preference :default_meta_keywords, :string, :default => 'spree, demo'
+    preference :default_seo_title, :string, :default => ''
     preference :dismissed_spree_alerts, :string, :default => ''
     preference :last_check_for_spree_alerts, :string, :default => nil
-    preference :tax_using_ship_address, :boolean, :default => true
+    preference :logo, :string, :default => 'admin/bg/spree_50.png'
+    preference :max_level_in_taxons_menu, :integer, :default => 1 # maximum nesting level in taxons menu
+    preference :orders_per_page, :integer, :default => 15
     preference :prices_inc_tax, :boolean, :default => false
+    preference :products_per_page, :integer, :default => 12
+    preference :select_taxons_from_tree, :boolean, :default => false # provide opportunity to select taxons from tree instead of search with autocomplete
+    preference :shipment_inc_vat, :boolean, :default => false
+    preference :shipping_instructions, :boolean, :default => false # Request instructions/info for shipping
+    preference :show_descendents, :boolean, :default => true
+    preference :show_only_complete_orders_by_default, :boolean, :default => true
+    preference :show_zero_stock_products, :boolean, :default => true
+    preference :site_name, :string, :default => 'Spree Demo Site'
+    preference :site_url, :string, :default => 'demo.spreecommerce.com'
+    preference :tax_using_ship_address, :boolean, :default => true
+    preference :track_inventory_levels, :boolean, :default => true # will not track on_hand values for variants /products
 
     # searcher_class allows spree extension writers to provide their own Search class
     def searcher_class

data/app/models/spree/calculator/flexi_rate.rb

@@ -2,7 +2,7 @@ module Spree
   class Calculator::FlexiRate < Calculator
     preference :first_item,      :decimal, :default => 0.0
     preference :additional_item, :decimal, :default => 0.0
-    preference :max_items,       :decimal, :default => 0.0
+    preference :max_items,       :integer, :default => 0
 
     def self.description
       I18n.t(:flexible_rate)
@@ -14,14 +14,14 @@ module Spree
 
     def compute(object)
       sum = 0
-      max = self.preferred_max_items
+      max = self.preferred_max_items.to_i
       items_count = object.line_items.map(&:quantity).sum
       items_count.times do |i|
         # check max value to avoid divide by 0 errors
         if (max == 0 && i == 0) || (max > 0) && (i % max == 0)
-          sum += self.preferred_first_item
+          sum += self.preferred_first_item.to_f
         else
-          sum += self.preferred_additional_item
+          sum += self.preferred_additional_item.to_f
         end
       end
 

data/app/models/spree/order.rb

@@ -298,6 +298,11 @@ module Spree
       line_items.detect { |line_item| line_item.variant_id == variant.id }
     end
 
+    def quantity_of(variant)
+      line_item = line_items.find { |line_item| line_item.variant_id == variant.id }
+      line_item ? line_item.quantity : 0
+    end
+
     def ship_total
       adjustments.shipping.map(&:amount).sum
     end
@@ -517,7 +522,7 @@ module Spree
       # Adjustments will check if they are still eligible. Ineligible adjustments are preserved but not counted
       # towards adjustment_total.
       def update_adjustments
-        self.adjustments.reload.each(&:update!)
+        self.adjustments.reload.each { |adjustment| adjustment.update!(self) }
       end
 
       # Determine if email is required (we don't want validation errors before we hit the checkout)

data/app/models/spree/payment.rb

@@ -12,7 +12,8 @@ module Spree
     # update the order totals, etc.
     after_save :update_order
 
-    accepts_nested_attributes_for :source
+    attr_accessor :source_attributes
+    after_initialize :build_source
 
     scope :from_creditcard, where(:source_type => 'Spree::Creditcard')
     scope :with_state, lambda { |s| where(:state => s) }
@@ -60,11 +61,13 @@ module Spree
       started_processing!
       source.credit(self, amount)
     end
+    
+    # see https://github.com/spree/spree/issues/981
+    def build_source
+      return if source_attributes.nil?
 
-    # With nested attributes, Rails calls build_[association_name] for the nested model which won't work for a polymorphic association
-    def build_source(params, opts)
       if payment_method and payment_method.payment_source_class
-        self.source = payment_method.payment_source_class.new(params)
+        self.source = payment_method.payment_source_class.new(source_attributes)
       end
     end
 

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

@@ -3,6 +3,9 @@
 # StoreInstance has a persistence flag that is on by default,
 # but we disable database persistence in testing to speed up tests
 #
+
+require 'singleton'
+
 module Spree::Preferences
 
   class StoreInstance

data/app/models/spree/product.rb

@@ -70,6 +70,13 @@ module Spree
 
     alias :options :product_option_types
 
+    after_initialize :ensure_master
+
+    def ensure_master
+      return unless self.new_record?
+      self.master ||= Variant.new
+    end
+
     def to_param
       return permalink if permalink.present?
       name.to_url
@@ -180,8 +187,7 @@ module Spree
     private
       def recalculate_count_on_hand
         product_count_on_hand = has_variants? ?
-          variants.inject(0) { |acc, v| acc + v.count_on_hand } :
-          (master ? master.count_on_hand : 0)
+          variants.sum(:count_on_hand) : (master ? master.count_on_hand : 0)
         self.count_on_hand = product_count_on_hand
       end
 

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

@@ -2,7 +2,7 @@
 
 <h1><%= t(:edit_general_settings) %></h1>
 
-<%= form_tag admin_general_settings_path, :method => :put  do |form| %>
+<%= form_tag admin_general_settings_path, :method => :put do %>
   <fieldset id="preferences" data-hook>
   <% @preferences.each do |key| 
       type = Spree::Config.preference_type(key) %>

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

@@ -20,7 +20,7 @@
     <th></th>
   </tr>
   <% @option_types.each do |option_type| %>
-    <tr id="<%= dom_id option_type %>" data-hook="option_row">
+    <tr class="spree_option_type" id="<%= dom_id option_type %>" data-hook="option_row">
       <td><span class="handle"></span> <%= option_type.name %></td>
       <td class="presentation"><%= option_type.presentation %></td>
       <td class="actions">

data/app/views/spree/admin/shared/_order_details.html.erb

@@ -1,2 +1,50 @@
-<%# This redirection is present ONLY to simplify overloading of the admin order summary format %>
-<%= render :partial => 'spree/shared/order_details', :locals => { :order => order } %>
+<table class="index" data-hook="order_details">
+  <tbody id="line-items" data-hook>
+    <tr data-hook="order_details_line_items_headers">
+      <th><%= t(:item_description) %></th>
+      <th class="price"><%= t(:price) %></th>
+      <th class="qty"><%= t(:qty) %></th>
+      <th class="total"><span><%= t(:total) %></span></th>
+    </tr>
+
+    <% @order.line_items.each do |item| %>
+      <tr data-hook="order_details_line_item_row">
+        <td width="300"><%= item.variant.product.name %> <%= "(" + variant_options(item.variant) + ")" unless item.variant .option_values.empty? %></td>
+        <td class="price"><%= number_to_currency item.price %></td>
+        <td class="qty"><%= item.quantity %></td>
+        <td class="total"><span><%= number_to_currency (item.price * item.quantity) %></span></td>
+      </tr>
+    <% end %>
+  </tbody>
+  <tbody id="subtotal" data-hook="order_details_subtotal">
+    <tr class="total" id="subtotal-row">
+      <td colspan="3"><b><%= t(:subtotal) %>:</b></td>
+      <td class="total"><span><%= number_to_currency @order.item_total %></span></td>
+    </tr>
+  </tbody>
+  <tbody id="order-charges" data-hook="order_details_adjustments">
+    <% @order.adjustments.eligible.each do |adjustment| %>
+    <% next if (adjustment.originator_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
+      <tr class="total">
+        <td colspan="3"><strong><%= adjustment.label %></strong></td>
+        <td class="total"><span><%= number_to_currency adjustment.amount %></span></td>
+      </tr>
+    <% end %>
+  </tbody>
+  <tbody id="order-total" data-hook="order_details_total">
+    <tr class="total">
+      <td colspan="3"><b><%= t(:order_total) %>:</b></td>
+      <td class="total"><span id="order_total"><%= number_to_currency @order.total %></span></td>
+    </tr>
+  </tbody>
+  <% if order.price_adjustment_totals.present? %>
+    <tbody id="price-adjustments" data-hook="order_details_price_adjustments">
+      <% @order.price_adjustment_totals.keys.each do |key| %>
+        <tr class="total">
+          <td colspan="3"><strong><%= key %></strong></td>
+          <td class="total"><span><%= number_to_currency @order.price_adjustment_totals[key] %></span></td>
+        </tr>
+      <% end %>
+    </tbody>
+  <% end %>
+</table>

data/app/views/spree/admin/shared/_product_tabs.html.erb

@@ -1,4 +1,4 @@
-<h1><%== t(:editing_product) + " &ldquo;#{@product.name}&rdquo;" %></h1>
+<h1><%= t(:editing_product) %> &ldquo;<%= @product.name %>&rdquo;</h1>
 
 <% content_for :sidebar do %>
 

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

@@ -1,3 +1,4 @@
+<div class="columns alpha six">
 <fieldset id="billing" data-hook>
   <%= form.fields_for :bill_address do |bill_form| %>
     <legend><%= t(:billing_address) %></legend>
@@ -25,6 +26,11 @@
         <%= bill_form.text_field :address2 %>
       </p>
 
+      <p class="field" id="bcity">
+        <%= bill_form.label :city, t(:city) %><span class="req">*</span><br />
+        <%= bill_form.text_field :city, :class => 'required' %>
+      </p>
+
       <p class="field" id="bcountry">
         <%= bill_form.label :country_id, t(:country) %><span class="req">*</span><br />
         <span id="bcountry">
@@ -56,11 +62,6 @@
         </p>
       <% end %>
 
-      <p class="field" id="bcity">
-        <%= bill_form.label :city, t(:city) %><span class="req">*</span><br />
-        <%= bill_form.text_field :city, :class => 'required' %>
-      </p>
-
       <p class="field" id="bzipcode">
         <%= bill_form.label :zipcode, t(:zip) %><span class="req">*</span><br />
         <%= bill_form.text_field :zipcode, :class => 'required' %>
@@ -78,7 +79,9 @@
     </div>
   <% end %>
 </fieldset>
+</div>
 
+<div class="columns omega six">
 <fieldset id="shipping" data-hook>
   <%= form.fields_for :ship_address do |ship_form| %>
     <legend><%= t(:shipping_address) %></legend>
@@ -110,6 +113,11 @@
         <%= ship_form.text_field :address2 %>
       </p>
 
+      <p class="field" id="scity">
+        <%= ship_form.label :city, t(:city) %><span class="req">*</span><br />
+        <%= ship_form.text_field :city, :class => 'required' %>
+      </p>
+
       <p class="field" id="scountry">
         <%= ship_form.label :country_id, t(:country) %><span class="req">*</span><br />
         <span id="scountry">
@@ -141,12 +149,6 @@
         </p>
       <% end %>
 
-      <p class="field" id="scity">
-        <%= ship_form.label :city, t(:city) %><span class="req">*</span><br />
-        <%= ship_form.text_field :city, :class => 'required' %>
-      </p>
-
-
       <p class="field" id="szipcode">
         <%= ship_form.label :zipcode, t(:zip) %><span class="req">*</span><br />
         <%= ship_form.text_field :zipcode, :class => 'required' %>
@@ -164,8 +166,8 @@
     </div>
   <% end %>
 </fieldset>
-
-<hr class="space" />
+</div>
+<hr class="clear" />
 <div class="form-buttons" data-hook="buttons">
   <%= submit_tag t(:save_and_continue), :class => 'continue button primary' %>
 </div>