spree_core 1.2.0.rc2 → 1.2.0

data/app/models/spree/line_item.rb

@@ -97,7 +97,7 @@ module Spree
       end
 
       def quantity_no_less_than_shipped
-        already_shipped = order.shipments.reduce(0) { |acc,s| acc + s.inventory_units.count { |i| i.variant == variant } }
+        already_shipped = order.shipments.reduce(0) { |acc,s| acc + s.inventory_units.select { |i| i.variant == variant }.count }
         unless quantity >= already_shipped
           errors.add(:quantity, I18n.t('validation.cannot_be_less_than_shipped_units'))
         end

data/app/models/spree/order.rb

@@ -1,8 +1,17 @@
 require 'spree/core/validators/email'
+require 'spree/order/checkout'
 
 module Spree
   class Order < ActiveRecord::Base
-    include Checkout
+    # TODO:
+    # Need to use fully qualified name here because during sandbox migration
+    # there is a class called Checkout which conflicts if you use this:
+    #
+    #   include Checkout
+    #
+    # rather than the qualified name. This will most likely be fixed with the
+    # 1.3 release.
+    include Spree::Order::Checkout
     checkout_flow do
       go_to_state :address
       go_to_state :delivery
@@ -98,6 +107,10 @@ module Spree
       line_items.sum(&:amount)
     end
 
+    def display_total
+      Spree::Money.new(total)
+    end
+
     def to_param
       number.to_s.to_url.upcase
     end

data/app/models/spree/order/checkout.rb

@@ -3,26 +3,40 @@ module Spree
     module Checkout
       def self.included(klass)
         klass.class_eval do
-          cattr_accessor :next_event_transitions
-          cattr_accessor :previous_states
-          cattr_accessor :checkout_flow
-          cattr_accessor :checkout_steps
+          class_attribute :next_event_transitions
+          class_attribute :previous_states
+          class_attribute :checkout_flow
+          class_attribute :checkout_steps
 
           def self.checkout_flow(&block)
             if block_given?
               @checkout_flow = block
+              define_state_machine!
             else
               @checkout_flow
             end
           end
 
           def self.define_state_machine!
-            self.checkout_steps = []
+            # Needs to be an ordered hash to preserve flow order
+            self.checkout_steps = ActiveSupport::OrderedHash.new
             self.next_event_transitions = []
             self.previous_states = [:cart]
+
+            # Build the checkout flow using the checkout_flow defined either
+            # within the Order class, or a decorator for that class.
+            #
+            # This method may be called multiple times depending on if the
+            # checkout_flow is re-defined in a decorator or not.
             instance_eval(&checkout_flow)
+
             klass = self
 
+            # To avoid a ton of warnings when the state machine is re-defined
+            StateMachine::Machine.ignore_method_conflicts = true
+            # To avoid multiple occurrences of the same transition being defined
+            # On first definition, state_machines will not be defined
+            state_machines.clear if respond_to?(:state_machines)
             state_machine :state, :initial => :cart do
               klass.next_event_transitions.each { |t| transition(t.merge(:on => :next)) }
 

data/app/models/spree/product.rb

@@ -30,8 +30,19 @@ module Spree
     belongs_to :shipping_category
 
     has_one :master,
-      :class_name => "Spree::Variant",
-      :conditions => { :is_master => true }
+      :class_name => 'Spree::Variant',
+      :conditions => { :is_master => true },
+      :dependent => :destroy
+
+    has_many :variants,
+      :class_name => 'Spree::Variant',
+      :conditions => { :is_master => false, :deleted_at => nil },
+      :order => :position
+
+    has_many :variants_including_master,
+      :class_name => 'Spree::Variant',
+      :conditions => { :deleted_at => nil },
+      :dependent => :destroy
 
     delegate_belongs_to :master, :sku, :price, :weight, :height, :width, :depth, :is_master
     delegate_belongs_to :master, :cost_price if Variant.table_exists? && Variant.column_names.include?('cost_price')
@@ -43,33 +54,13 @@ module Spree
     after_save :save_master
     after_save :set_master_on_hand_to_zero_when_product_has_variants
 
-    has_many :variants,
-      :class_name => "Spree::Variant",
-      :conditions => { :is_master => false, :deleted_at => nil },
-      :order => 'position ASC'
+    delegate :images, :to => :master, :prefix => true
+    alias_method :images, :master_images
 
-    has_many :variants_including_master,
-      :class_name => "Spree::Variant",
-      :conditions => { :deleted_at => nil },
-      :dependent => :destroy
-
-    has_many :variants_with_only_master,
-      :class_name => "Spree::Variant",
-      :conditions => { :is_master => true, :deleted_at => nil },
-      :dependent => :destroy
+    has_many :variant_images, :source => :images, :through => :variants_including_master, :order => :position
 
     accepts_nested_attributes_for :variants, :allow_destroy => true
 
-    def variant_images
-      Image.joins("LEFT JOIN #{Variant.quoted_table_name} ON #{Variant.quoted_table_name}.id = #{Spree::Asset.quoted_table_name}.viewable_id").
-      where("(#{Spree::Asset.quoted_table_name}.viewable_type = ? AND #{Spree::Asset.quoted_table_name}.viewable_id = ?) OR
-             (#{Spree::Asset.quoted_table_name}.viewable_type = ? AND #{Spree::Asset.quoted_table_name}.viewable_id = ?)", Variant.name, self.master.id, Product.name, self.id).
-      order("#{Spree::Asset.quoted_table_name}.position").
-      extend(Spree::Core::RelationSerialization)
-    end
-
-    alias_method :images, :variant_images
-
     validates :name, :price, :permalink, :presence => true
 
     attr_accessor :option_values_hash
@@ -91,18 +82,19 @@ module Spree
 
     after_initialize :ensure_master
 
-    def ensure_master
-      return unless new_record?
-      self.master ||= Variant.new
+    def variants_with_only_master
+      ActiveSupport::Deprecation.warn("[SPREE] Spree::Product#variants_with_only_master will be deprecated in Spree 1.3. Please use Spree::Product#master instead.")
+      master
     end
 
+
     def to_param
       permalink.present? ? permalink : (permalink_was || name.to_s.to_url)
     end
 
     # returns true if the product has any variants (the master variant is not a member of the variants array)
     def has_variants?
-      variants.exists?
+      variants.any?
     end
 
     # returns the number of inventory units "on_hand" for this product
@@ -130,6 +122,13 @@ module Spree
       end
     end
 
+    # override the delete method to set deleted_at value
+    # instead of actually deleting the product.
+    def delete
+      self.update_column(:deleted_at, Time.now)
+      variants_including_master.update_all(:deleted_at => Time.now)
+    end
+
     # Adding properties and option types on creation based on a chosen prototype
     attr_reader :prototype_id
     def prototype_id=(value)
@@ -215,6 +214,10 @@ module Spree
       end
     end
 
+    def display_price
+      Spree::Money.new(price).to_s
+    end
+
     private
 
       # Builds variants from a hash of option types & values
@@ -260,6 +263,11 @@ module Spree
       def save_master
         master.save if master && (master.changed? || master.new_record?)
       end
+
+      def ensure_master
+        return unless new_record?
+        self.master ||= Variant.new
+      end
   end
 end
 

data/app/models/spree/product/scopes.rb

@@ -27,11 +27,11 @@ module Spree
     end
 
     add_search_scope :ascend_by_master_price do
-      joins(:variants_with_only_master).order("#{variant_table_name}.price ASC")
+      joins(:master).order("#{variant_table_name}.price ASC")
     end
 
     add_search_scope :descend_by_master_price do
-      joins(:variants_with_only_master).order("#{variant_table_name}.price DESC")
+      joins(:master).order("#{variant_table_name}.price DESC")
     end
 
     add_search_scope :price_between do |low, high|

data/app/models/spree/shipping_rate.rb

@@ -5,5 +5,15 @@ module Spree
         self.send("#{k}=", v)
       end
     end
+
+    def display_price
+      if Spree::Config[:shipment_inc_vat]
+        price = (1 + Spree::TaxRate.default) * cost
+      else
+        price = cost
+      end
+
+      Spree::Money.new(price)
+    end
   end
 end

data/app/models/spree/variant.rb

@@ -51,18 +51,12 @@ module Spree
       end
     end
 
-    # strips all non-price-like characters from the price.
     def price=(price)
-      if price.present?
-        self[:price] = price.to_s.gsub(/[^0-9\.-]/, '').to_f
-      end
+      self[:price] = parse_price(price) if price.present?
     end
 
-    # and cost_price
     def cost_price=(price)
-      if price.present?
-        self[:cost_price] = price.to_s.gsub(/[^0-9\.-]/, '').to_f
-      end
+      self[:cost_price] = parse_price(price) if price.present?
     end
 
     # returns number of units currently on backorder for this variant.
@@ -140,6 +134,18 @@ module Spree
 
     private
 
+      # strips all non-price-like characters from the price, taking into account locale settings
+      def parse_price(price)
+        price = price.to_s
+
+        separator, delimiter = I18n.t([:'number.currency.format.separator', :'number.currency.format.delimiter'])
+        non_price_characters = /[^0-9\-#{separator}]/
+        price.gsub!(non_price_characters, '') # strip everything else first
+        price.gsub!(separator, '.') unless separator == '.' # then replace the locale-specific decimal separator with the standard separator if necessary
+
+        price.to_d
+      end
+
       # Ensures a new variant takes the product master price when price is not supplied
       def check_price
         if price.nil?

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

@@ -12,7 +12,7 @@
     <tr id="<%= spree_dom_id(adjustment) %>" data-hook="adjustment_row">
       <td><%= adjustment.created_at.to_s(:date_time24) %></td>
       <td><%= adjustment.label %></td>
-      <td><%= number_to_currency adjustment.amount %></td>
+      <td><%= adjustment.display_amount %></td>
       <td class='actions'>
         <%= link_to_edit adjustment, :class => 'edit' %>
         &nbsp;

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

@@ -4,15 +4,24 @@
 
 <%= form_tag admin_general_settings_path, :method => :put do %>
   <fieldset id="preferences" data-hook>
-  <% @preferences.each do |key| 
-      type = Spree::Config.preference_type(key) %>
-      <%= label_tag(key, t(key) + ': ') + tag(:br) if type != :boolean %>
-      <%= preference_field_tag(key, Spree::Config[key], :type => type) %>
-      <%= label_tag(key, t(key)) + tag(:br) if type == :boolean %>
-  <% end %>
+    <% @preferences.each do |key|
+        type = Spree::Config.preference_type(key) %>
+        <%= label_tag(key, t(key) + ': ') + tag(:br) if type != :boolean %>
+        <%= preference_field_tag(key, Spree::Config[key], :type => type) %>
+        <%= label_tag(key, t(key)) + tag(:br) if type == :boolean %>
+    <% end %>
+      <p>
+        <%= label_tag :currency, t(:currency) %>
+        <%= select_tag :currency, currency_options %>
+      </p>
   </fieldset>
+
   <p class="form-buttons" data-hook="buttons">
     <%= button t(:update) %>
     <%= t(:or) %> <%= link_to t(:cancel), admin_general_settings_url %>
   </p>
 <% end %>
+
+<script>
+  $('#currency').select2();
+</script>

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

@@ -9,6 +9,12 @@
     <td><%= Spree::Config[key] %></td>
   </tr>
   <% end %>
+  <tr>
+    <td colspan="2">
+      <%= t(:dollar_amounts_displayed_as, :example => Spree::Money.new(20.99)) %>
+    </td>
+  </tr>
+
   <tr>
     <td colspan="2">
       <%= Spree::Config[:allow_ssl_in_production] ? t(:ssl_will_be_used_in_production_mode) : t(:ssl_will_not_be_used_in_production_mode) %>

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

@@ -3,14 +3,10 @@
     <td><%= t(:filename) %>:</td>
     <td><%= f.file_field :attachment %></td>
   </tr>
-  <% if @product.has_variants? %>
-    <tr data-hook="variant">
-      <td><%= Spree::Variant.model_name.human %>:</td>
-      <td><%= f.select :viewable_id, @variants %></td>
-    </tr>
-  <% else %>
-    <%= hidden_field_tag :product_id, @product.id %>
-  <% end %>
+  <tr data-hook="variant">
+    <td><%= Spree::Variant.model_name.human %>:</td>
+    <td><%= f.select :viewable_id, @variants %></td>
+  </tr>
   <tr data-hook="alt_text">
     <td><%= t(:alt_text) %>:</td>
     <td><%= f.text_area :alt %></td>

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

@@ -21,7 +21,7 @@
       <tbody id="subtotal" data-hook="admin_order_form_subtotal">
         <tr id="subtotal-row">
           <td colspan="3"><b><%= t(:subtotal) %>:</b></td>
-          <td class="total"><span><%= number_to_currency @order.item_total %></span></td>
+          <td class="total"><span><%= money(@order.item_total) %></span></td>
           <td></td>
         </tr>
       </tbody>
@@ -29,7 +29,7 @@
         <% @order.adjustments.each do |adjustment| %>
           <tr>
             <td colspan="3"><strong><%= adjustment.label %></strong></td>
-            <td class="total"><span><%= number_to_currency adjustment.amount %></span></td>
+            <td class="total"><span><%= adjustment.display_amount %></span></td>
             <td></td>
           </tr>
         <% end %>
@@ -37,7 +37,7 @@
       <tbody id="order-total" data-hook="admin_order_form_total">
         <tr>
           <td colspan="3"><b><%= t(:order_total) %>:</b></td>
-          <td class="total"><span id="order_total"><%= number_to_currency @order.total %></span></td>
+          <td class="total"><span id="order_total"><%= @order.display_total %></span></td>
           <td></td>
         </tr>
       </tbody>

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

@@ -2,9 +2,9 @@
   <td width="300">
     <%=f.object.variant.product.name%> <%= "(#{f.object.variant.options_text}))" unless f.object.variant.option_values.empty? %>
   </td>
-  <td valign="top" class="price"><%= number_to_currency f.object.price %></td>
+  <td valign="top" class="price"><%= money(f.object.price) %></td>
   <td valign="top" class="qty"><%= f.number_field :quantity, :min => 0, :style => "width:30px;", :class => "qty" %></td>
-  <td valign="top" class="total"><%= number_to_currency (f.object.price * f.object.quantity) %></td>
+  <td valign="top" class="total"><%= money(f.object.price * f.object.quantity) %></td>
   <td data-hook="admin_order_form_line_item_actions">
     <%= link_to_delete f.object, {:url => admin_order_line_item_url(@order.number, f.object) } %>
   </td>

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

@@ -32,7 +32,7 @@
       <td><%= link_to t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) if order.payment_state %></td>
       <td><%= link_to t("shipment_states.#{order.shipment_state}"), admin_order_shipments_path(order) if order.shipment_state %></td>
       <td><%= order.email %></td>
-      <td><%= number_to_currency order.total %></td>
+      <td><%= order.display_total %></td>
       <td class='actions' data-hook="admin_orders_index_row_actions">
         <%= link_to_edit_url edit_admin_order_path(order), :title => "admin_edit_#{dom_id(order)}" %>
       </td>
@@ -82,6 +82,10 @@
         <%= f.check_box :completed_at_not_null, {:checked => @show_only_completed}, '1', '' %>
         <%= label_tag nil, t(:show_only_complete_orders) %>
       </p>
+      <p>
+        <%= f.check_box :inventory_units_shipment_id_null, { }, '1', '0' %>
+        <%= label_tag nil, t(:show_only_unfulfilled_orders) %>
+      </p>
       <div data-hook="admin_orders_index_search_buttons">
         <p><%= button t(:search) %></p>
       </div>

data/app/views/spree/admin/payments/_list.html.erb

@@ -9,7 +9,7 @@
   <% payments.each do |payment| %>
     <tr data-hook="payments_row">
       <td><%= payment.created_at.to_s(:date_time24) %></td>
-      <td><%= number_to_currency payment.amount %></td>
+      <td><%= money(payment.amount) %></td>
       <td><%= link_to payment_method_name(payment), admin_order_payment_path(@order, payment) %></td>
       <td><%= t(payment.state, :scope => :payment_states, :default => payment.state.capitalize) %></td>
       <td>

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

@@ -12,7 +12,7 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Payments' } %>
 
 <% if @order.outstanding_balance? %>
-  <p><%= @order.outstanding_balance < 0 ? t(:credit_owed) : t(:balance_due) %> <strong><%= number_to_currency @order.outstanding_balance %></strong></p>
+  <p><%= @order.outstanding_balance < 0 ? t(:credit_owed) : t(:balance_due) %> <strong><%= money(@order.outstanding_balance) %></strong></p>
 <% end %>
 
 <h2><%= t(:payments) %></h2>

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

@@ -24,7 +24,7 @@
   <tr <%= "style='color: red;'" if product.deleted? %> id="<%= spree_dom_id product %>" data-hook="admin_products_index_rows">
     <td><%= product.sku rescue '' %></td>
     <td><%= link_to product.try(:name), edit_admin_product_path(product) %></td>
-    <td><%= number_to_currency product.price rescue '' %></td>
+    <td><%= money(product.price) rescue '' %></td>
     <td class="actions" data-hook="admin_products_index_row_actions">
       <%= link_to_edit product, :class => 'edit' unless product.deleted? %>
       &nbsp;

data/app/views/spree/admin/reports/sales_total.html.erb

@@ -4,15 +4,15 @@
   <tbody>
     <tr>
       <th scope="row"><%= t(:item_total) %>:</th>
-      <td align="right"><%= number_to_currency @item_total %></td>
+      <td align="right"><%= money @item_total %></td>
     </tr>
     <tr>
       <th scope="row"><%= t(:adjustment_total) %>:</th>
-      <td align="right"><%= number_to_currency @adjustment_total %></td>
+      <td align="right"><%= money @adjustment_total %></td>
     </tr>
     <tr>
       <th scope="row"><%= t(:sales_total) %>:</th>
-      <td align="right"><%= number_to_currency @sales_total %></td>
+      <td align="right"><%= money @sales_total %></td>
     </tr>
   </tbody>
 </table>