spree_core 1.2.0 → 1.2.2

data/app/models/spree/payment_method.rb

@@ -3,7 +3,7 @@ module Spree
     DISPLAY = [:both, :front_end, :back_end]
     default_scope where(:deleted_at => nil)
 
-    scope :production, where(:environment => 'production')
+    scope :production, lambda { where(:environment => 'production') }
 
     attr_accessible :name, :description, :environment, :display_on, :active
 

data/app/models/spree/preference.rb

@@ -4,7 +4,7 @@ class Spree::Preference < ActiveRecord::Base
   validates :key, :presence => true
   validates :value_type, :presence => true
 
-  scope :valid, where(Spree::Preference.arel_table[:key].not_eq(nil)).where(Spree::Preference.arel_table[:value_type].not_eq(nil))
+  scope :valid, lambda { where(Spree::Preference.arel_table[:key].not_eq(nil)).where(Spree::Preference.arel_table[:value_type].not_eq(nil)) }
 
   # The type conversions here should match
   # the ones in spree::preferences::preferrable#convert_preference_value

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

@@ -15,6 +15,8 @@ module Spree::Preferences
         else
           if get_pending_preference(name)
             get_pending_preference(name)
+          elsif Spree::Preference.table_exists? && preference = Spree::Preference.find_by_name(name)
+            preference.value
           else
             send self.class.preference_default_getter_method(name)
           end

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

@@ -23,11 +23,29 @@ module Spree::Preferences
     end
 
     def exist?(key)
-      @cache.exist? key
+      @cache.exist?(key) ||
+      should_persist? && Spree::Preference.where(:key => key).exists?
     end
 
     def get(key)
-      @cache.read(key)
+      # return the retrieved value, if it's in the cache
+      if (val = @cache.read(key)).present?
+        return val
+      end
+
+      return nil unless should_persist?
+
+      # If it's not in the cache, maybe it's in the database, but
+      # has been cleared from the cache
+
+      # does it exist in the database?
+      if preference = Spree::Preference.find_by_key(key)
+        # it does exist, so let's put it back into the cache
+        @cache.write(preference.key, preference.value)
+
+        # and return the value
+        preference.value
+      end
     end
 
     def delete(key)

data/app/models/spree/product.rb

@@ -44,6 +44,8 @@ module Spree
       :conditions => { :deleted_at => nil },
       :dependent => :destroy
 
+    has_many :variants_including_master_and_deleted, :class_name => 'Spree::Variant'
+
     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')
 
@@ -97,6 +99,16 @@ module Spree
       variants.any?
     end
 
+    # should product be displayed on products pages and search
+    def on_display?
+      has_stock? || Spree::Config[:show_zero_stock_products]
+    end
+
+    # is this product actually available for purchase
+    def on_sale?
+      has_stock? || Spree::Config[:allow_backorders]
+    end
+
     # returns the number of inventory units "on_hand" for this product
     def on_hand
       has_variants? ? variants.sum(&:on_hand) : master.on_hand
@@ -179,6 +191,10 @@ module Spree
       !!deleted_at
     end
 
+    def available?
+      !(available_on.nil? || available_on.future?)
+    end
+
     # split variants list into hash which shows mapping of opt value onto matching variants
     # eg categorise_variants_from_option(color) => {"red" -> [...], "blue" -> [...]}
     def categorise_variants_from_option(opt_type)

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

@@ -50,8 +50,23 @@ module Spree
     # If you need products only within one taxon use
     #
     #   Spree::Product.taxons_id_eq(x)
+    # 
+    # If you're using count on the result of this scope, you must use the
+    # `:distinct` option as well:
+    #
+    #   Spree::Product.in_taxon(taxon).count(:distinct => true)
+    #
+    # This is so that the count query is distinct'd:
+    #
+    #   SELECT COUNT(DISTINCT "spree_products"."id") ...
+    #
+    #   vs.
+    #
+    #   SELECT COUNT(*) ...
     add_search_scope :in_taxon do |taxon|
-      joins(:taxons).where(Taxon.table_name => { :id => taxon.self_and_descendants.map(&:id) })
+      select("DISTINCT(spree_products.id), spree_products.*").
+      joins(:taxons).
+      where(Taxon.table_name => { :id => taxon.self_and_descendants.map(&:id) })
     end
 
     # This scope selects products in all taxons AND all its descendants
@@ -63,10 +78,6 @@ module Spree
       taxons.first ? prepare_taxon_conditions(taxons) : scoped
     end
 
-    # def self.in_cached_group(product_group)
-    #   joins(:product_groups).where('spree_product_groups_products.product_group_id' => product_group)
-    # end
-
     # a scope that finds all products having property specified by name, object or id
     add_search_scope :with_property do |property|
       properties = Property.table_name
@@ -113,7 +124,7 @@ module Spree
       end
 
       conditions = "#{option_values}.name = ? AND #{option_values}.option_type_id = ?", value, option_type_id
-      select("DISTINCT spree_products.id").joins(:variants_including_master => :option_values).where(conditions)
+      group("spree_products.id").joins(:variants_including_master => :option_values).where(conditions)
     end
 
     # Finds all products which have either:
@@ -188,11 +199,11 @@ module Spree
 
     add_search_scope :on_hand do
       variants_table = Variant.table_name
-      where("#{table_name}.id in (select product_id from #{variants_table} where product_id = #{table_name}.id group by product_id having sum(count_on_hand) > 0)")
+      where("#{table_name}.id in (select product_id from #{variants_table} where product_id = #{table_name}.id and #{variants_table}.deleted_at IS NULL group by product_id having sum(count_on_hand) > 0)")
     end
 
     add_search_scope :taxons_name_eq do |name|
-      select("DISTINCT spree_products.id").joins(:taxons).where(Taxon.arel_table[:name].eq(name))
+      group("spree_products.id").joins(:taxons).where(Taxon.arel_table[:name].eq(name))
     end
 
     if (ActiveRecord::Base.connection.adapter_name == 'PostgreSQL')

data/app/models/spree/return_authorization.rb

@@ -72,6 +72,7 @@ module Spree
         credit.source = self
         credit.adjustable = order
         credit.save
+        order.return if inventory_units.all?(&:returned?)
       end
 
       def allow_receive?

data/app/models/spree/shipment.rb

@@ -26,9 +26,10 @@ module Spree
 
     make_permalink :field => :number
 
-    scope :shipped, where(:state => 'shipped')
-    scope :ready,   where(:state => 'ready')
-    scope :pending, where(:state => 'pending')
+    scope :with_state, lambda { |s| where(:state => s) }
+    scope :shipped, with_state('shipped')
+    scope :ready,   with_state('ready')
+    scope :pending, with_state('pending')
 
     def to_param
       number if number
@@ -114,10 +115,11 @@ module Spree
 
       # Determines the appropriate +state+ according to the following logic:
       #
-      # pending    unless +order.payment_state+ is +paid+
+      # pending    unless order is complete and +order.payment_state+ is +paid+
       # shipped    if already shipped (ie. does not change the state)
       # ready      all other cases
       def determine_state(order)
+        return 'pending' unless order.complete?
         return 'pending' if inventory_units.any? &:backordered?
         return 'shipped' if state == 'shipped'
         order.paid? ? 'ready' : 'pending'

data/app/models/spree/shipping_method.rb

@@ -1,6 +1,9 @@
 module Spree
   class ShippingMethod < ActiveRecord::Base
     DISPLAY = [:both, :front_end, :back_end]
+
+    default_scope where(:deleted_at => nil)
+
     has_many :shipments
     validates :name, :zone, :presence => true
 
@@ -13,17 +16,13 @@ module Spree
     calculated_adjustments
 
     def available?(order, display_on = nil)
-      displayable? && calculator.available?(order)
+      displayable?(display_on) && calculator.available?(order)
     end
 
-    def displayable?
+    def displayable?(display_on)
       (self.display_on == display_on.to_s || self.display_on.blank?)
     end
 
-    def calculator_available?(order)
-      caluclator.available?(order)
-    end
-
     def within_zone?(order)
       zone && zone.include?(order.ship_address)
     end

data/app/models/spree/tax_rate.rb

@@ -20,7 +20,7 @@ module Spree
     calculated_adjustments
     scope :by_zone, lambda { |zone| where(:zone_id => zone) }
 
-    attr_accessible :amount, :tax_category_id, :calculator, :zone_id, :included_in_price
+    attr_accessible :amount, :tax_category_id, :calculator, :zone_id, :included_in_price, :name, :show_rate_in_label
 
     # Gets the array of TaxRates appropriate for the specified order
     def self.match(order)
@@ -73,7 +73,9 @@ module Spree
     private
 
       def create_label
-        "#{tax_category.name} #{amount * 100}%"
+        label = ""
+        label << (name.present? ? name : tax_category.name) + " "
+        label << (show_rate_in_label? ? "#{amount * 100}%" : "")
       end
   end
 end

data/app/models/spree/taxon.rb

@@ -51,5 +51,12 @@ module Spree
       scope
     end
 
+    def pretty_name
+      ancestor_chain = self.ancestors.inject("") do |name, ancestor|
+        name += "#{ancestor.name} -> "
+      end
+      ancestor_chain + "#{name}"
+    end
+
   end
 end

data/app/models/spree/variant.rb

@@ -6,7 +6,7 @@ module Spree
                         :tax_category_id, :shipping_category_id, :meta_description,
                         :meta_keywords, :tax_category
 
-    attr_accessible :name, :presentation, :cost_price,
+    attr_accessible :name, :presentation, :cost_price, :lock_version,
                     :position, :on_hand, :option_value_ids,
                     :product_id, :option_values_attributes, :price,
                     :weight, :height, :width, :depth, :sku
@@ -21,30 +21,21 @@ module Spree
     validates :cost_price, :numericality => { :greater_than_or_equal_to => 0, :allow_nil => true } if self.table_exists? && self.column_names.include?('cost_price')
     validates :count_on_hand, :numericality => true
 
+    after_save :process_backorders
     after_save :recalculate_product_on_hand, :if => :is_master?
 
     # default variant scope only lists non-deleted variants
-    scope :active, where(:deleted_at => nil)
-    scope :deleted, where('deleted_at IS NOT NULL')
+    scope :active, lambda { where(:deleted_at => nil) }
+    scope :deleted, lambda { where('deleted_at IS NOT NULL') }
 
     # 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] ? count_on_hand : (1.0 / 0) # Infinity
     end
 
-    # Adjusts the inventory units to match the given new level.
+    # set actual attribute
     def on_hand=(new_level)
       if Spree::Config[:track_inventory_levels]
-        new_level = new_level.to_i
-
-        # increase Inventory when
-        if new_level > on_hand
-          # fill backordered orders before creating new units
-          backordered_units = inventory_units.with_state('backordered')
-          backordered_units.slice(0, new_level).each(&:fill_backorder)
-          new_level -= backordered_units.length
-        end
-
         self.count_on_hand = new_level
       else
         raise 'Cannot set on_hand value when Spree::Config[:track_inventory_levels] is false'
@@ -134,9 +125,29 @@ module Spree
 
     private
 
+      def process_backorders
+        if count_changes = changes['count_on_hand']
+          new_level = count_changes.last
+
+          if Spree::Config[:track_inventory_levels]
+            new_level = new_level.to_i
+
+            # update backorders if level is positive
+            if new_level > 0
+              # fill backordered orders before creating new units
+              backordered_units = inventory_units.with_state('backordered')
+              backordered_units.slice(0, new_level).each(&:fill_backorder)
+              new_level -= backordered_units.length
+            end
+
+            self.update_attribute_without_callbacks(:count_on_hand, new_level)
+          end
+        end
+      end
+
       # strips all non-price-like characters from the price, taking into account locale settings
       def parse_price(price)
-        price = price.to_s
+        return price unless price.is_a?(String)
 
         separator, delimiter = I18n.t([:'number.currency.format.separator', :'number.currency.format.delimiter'])
         non_price_characters = /[^0-9\-#{separator}]/

data/app/views/spree/admin/banners/_gateway.html.erb

@@ -0,0 +1,14 @@
+<% if !spree_current_user.dismissed_banner?(:gateway) &&
+      Spree::PaymentMethod.production.where("type != 'Spree::Gateway::Bogus'").empty?  %>
+
+  <div class="banner payment_banner">
+    <p class="message">
+      <%= t(:payment_processor_choose_banner_text)%>
+      <%= link_to t(:payment_processor_choose_link), "http://spreecommerce.com/products/payment_processing", :target => '_blank' %>
+    </p>
+
+    <%= link_to t(:dismiss_banner), dismiss_admin_banner_path(:gateway),
+      :remote => true, :method => :post, :class => 'dismiss', :id => "dismiss-banner" %>
+  </div>
+
+<% end %>

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

@@ -10,10 +10,19 @@
         <%= 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>
+
+    <p>
+      <%= label_tag :currency, t(:currency) %>
+      <%= select_tag :currency, currency_options %>
+    </p>
+
+     <p>
+       <strong><%= t(:currency_symbol_position) %></strong><br>
+       <%= radio_button_tag :currency_symbol_position, "before" %>
+       <%= label_tag :currency_symbol_position_before, Spree::Money.new(10, :symbol_position => "before") %><br>
+       <%= radio_button_tag :currency_symbol_position, "after" %>
+       <%= label_tag :currency_symbol_position_after, Spree::Money.new(10, :symbol_position => "after") %>
+     </p>
   </fieldset>
 
   <p class="form-buttons" data-hook="buttons">

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

@@ -26,7 +26,7 @@
         </tr>
       </tbody>
       <tbody id="order-charges" data-hook="admin_order_form_adjustments">
-        <% @order.adjustments.each do |adjustment| %>
+        <% @order.adjustments.eligible.each do |adjustment| %>
           <tr>
             <td colspan="3"><strong><%= adjustment.label %></strong></td>
             <td class="total"><span><%= adjustment.display_amount %></span></td>

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

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

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

@@ -39,7 +39,7 @@
 <% end %>
 
 <%= javascript_tag do -%>
-  var properties = [<%= @properties.map{|id| "'#{id}'"}.join(', ') %>];
+  var properties = <%= raw(@properties.to_json) %>;
 
   $("#product_properties input.autocomplete").live("keydown", function(){
     already_auto_completed = $(this).is('ac_input');

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

@@ -88,7 +88,7 @@
 
   <%= f.field_container :taxons do %>
     <%= f.label :taxon_ids, t(:taxons) %><br />
-    <%= f.select :taxon_ids, taxon_options_for(@product), {}, :class => "select2", :multiple => true %>
+    <%= f.hidden_field :taxon_ids, :value => @product.taxon_ids.join(',') %>
   <% end %>
 
   <%= f.field_container :option_types do %>
@@ -112,11 +112,10 @@
   <div data-hook="admin_product_form_additional_fields"></div>
 </div>
 
-<script>
+<% unless Rails.env.test? %>
+  <script>
+  $("#product_option_type_ids").select2();
 
-$("#product_taxon_ids").select2({
-  formatSelection: function(item) { return item.text.split(' -> ').slice(-1)[0] },
-});
-
-$("#product_option_type_ids").select2();
-</script>
+  $('.select2-container').css({width: '20em'})
+  </script>
+<% end %>

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

@@ -59,7 +59,7 @@
 //<![CDATA[
   (function($){
     var base_url = "<%= admin_prototypes_url %>";
-    var prototype_select = $('#product_prototype_id');    
+    var prototype_select = $('#product_prototype_id');
     prototype_select.change(function() {
       var id = prototype_select.val();
       if (id.length) {

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

@@ -20,8 +20,8 @@
           <% elsif units.select(&:shipped?).empty? %>
             0
           <% else %>
-            <%= text_field_tag "return_quantity[#{variant.id}]",
-                @return_authorization.inventory_units.group_by(&:variant)[variant].try(:size) || 0, {:style => 'width:30px;'} %>
+            <%= number_field_tag "return_quantity[#{variant.id}]",
+                @return_authorization.inventory_units.group_by(&:variant)[variant].try(:size) || 0, {:style => 'width:50px;', :min => 0} %>
           <% end %>
         </td>
       </tr>
@@ -33,7 +33,7 @@
     <% if @return_authorization.received? %>
       <%= money @return_authorization.amount %>
     <% else %>
-      <%= f.text_field :amount, {:style => 'width:80px;'} %> <%= t(:rma_value) %>: <span id="rma_value"></span>
+      <%= f.text_field :amount, {:style => 'width:80px;'} %> <%= t(:rma_value) %>: <span id="rma_value">0.00</span>
       <%= f.error_message_on :amount %>
     <% end %>
   <% end %>
@@ -45,35 +45,19 @@
   <% end %>
 
 
-  <% content_for :head do %>
-    <%= javascript_tag do -%>
-      var variant_prices = new Array();
-      <% @return_authorization.order.inventory_units.group_by(&:variant).each do | variant, units| %>
-        variant_prices[<%= variant.id.to_s %>] = <%= variant.price %>;
-      <% end %>
-
-      function calculate_rma_price(object, value){
-        var rma_amount = 0;
-
-        $.each($("td.return_quantity input"), function(i, inpt){
-          var variant_id = $(inpt).attr('id').replace("return_quantity_", "");
-           rma_amount += variant_prices[variant_id] * $(inpt).val()
-        });
+<script>
+  $(document).ready(function(){
+    var rma_amount = 0;
+    $("td.return_quantity input").on('change', function() {
+      var rma_amount = 0;
+      $.each($("td.return_quantity input"), function(i, input) {
+        var variant_id = $(input).attr('id').replace("return_quantity_", "");
+         rma_amount += variant_prices[variant_id] * $(input).val()
+      });
 
-        if(!isNaN(rma_amount)){
-          $("span#rma_value").html(rma_amount.toFixed(2));
-        }
+      if(!isNaN(rma_amount)){
+        $("span#rma_value").html(rma_amount.toFixed(2));
       }
-
-      $(document).ready(function(){
-        $.each($("td.return_quantity input"), function(i, inpt){
-          $(inpt).delayedObserver(function() {
-            calculate_rma_price();
-          }, 0.5);
-        });
-
-        calculate_rma_price();
-      });
-    <% end -%>
-  <% end %>
-</div>
+    })
+  });
+</script>