spree_core 1.1.3 → 1.1.4

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

@@ -1,4 +1,4 @@
-<%# encoding: utf-8 %>
+//<%#encoding: UTF-8%>
 //= require_self
 
 /**
@@ -61,9 +61,9 @@ format_product_autocomplete = function(item){
 
     html += "<div><h4>" + product['name'] + "</h4>";
     if (product['master']) {
-      html += "<span><strong><%= ::I18n.t(:sku) %>: </strong>" + product['master']['sku'] + "</span>";
+      html += "<span><strong>" + Spree.translations.sku + ":</strong>" + product['master']['sku'] + "</span>";
     }
-    html += "<span><strong><%= ::I18n.t(:on_hand) %>: </strong>" + product['count_on_hand'] + "</span></div>";
+    html += "<span><strong>" + Spree.translations.on_hand + ":</strong>" + product['count_on_hand'] + "</span></div>";
   }else{
     // variant
     var variant = item.data['variant'];
@@ -82,8 +82,8 @@ format_product_autocomplete = function(item){
     }).join(", ")
 
     html += "<div><h4>" + name + "</h4>";
-    html += "<span><strong><%= ::I18n.t(:sku) %>: </strong>" + variant['sku'] + "</span>";
-    html += "<span><strong><%= ::I18n.t(:on_hand) %>: </strong>" + variant['count_on_hand'] + "</span></div>";
+    html += "<span><strong>" + Spree.translations.sku + ":</strong>" + variant['sku'] + "</span>";
+    html += "<span><strong>" + Spree.translations.on_hand + ":</strong>" + variant['count_on_hand'] + "</span></div>";
   }
 
   return html
@@ -164,9 +164,9 @@ $.fn.product_autocomplete = function(){
 $.fn.objectPicker = function(url){
   $(this).tokenInput(url + "&authenticity_token=" + escape(AUTH_TOKEN), {
     searchDelay          : 600,
-    hintText             : Spree.strings.type_to_search,
-    noResultsText        : Spree.strings.no_results,
-    searchingText        : Spree.strings.searching,
+    hintText             : Spree.translations.type_to_search,
+    noResultsText        : Spree.translations.no_results,
+    searchingText        : Spree.translations.searching,
     prePopulateFromInput : true
   });
 };
@@ -181,12 +181,12 @@ $.fn.userPicker = function(){
 
 handle_date_picker_fields = function(){
   $('.datepicker').datepicker({
-    dateFormat: "<%= ::I18n.t(:format, :scope => 'spree.date_picker', :default => 'yy/mm/dd') %>",
-    dayNames: <%= ::I18n.t(:day_names, :scope => :date).to_json %>,
-    dayNamesMin: <%= ::I18n.t(:abbr_day_names, :scope => :date).to_json %>,
-    monthNames: <%= (::I18n.t(:month_names, :scope => :date).delete_if(&:blank?)).to_json %>,
-    prevText: '<%= ::I18n.t(:previous) %>',
-    nextText: '<%= ::I18n.t(:next) %>',
+    dateFormat: Spree.translations.date_picker,
+    dayNames: Spree.translations.abbr_day_names,
+    dayNamesMin: Spree.translations.abbr_day_names,
+    monthNames: Spree.translations.month_names, 
+    prevText: Spree.translations.previous,
+    nextText: Spree.translations.next,
     showOn: "button",
     buttonImage: "<%= asset_path 'datepicker/cal.gif' %>",
     buttonImageOnly: true

data/app/assets/javascripts/admin/checkouts/edit.js

@@ -80,7 +80,7 @@ $(document).ready(function(){
         $('#user_id').val(ui.item.data['id']);
         $('#guest_checkout_true').prop("checked", false);
         $('#guest_checkout_false').prop("checked", true);
-        $('#guest_checkout_false').prob("disabled", false);
+        $('#guest_checkout_false').prop("disabled", false);
         return true;
       }
     }).data("autocomplete")._renderItem = function(ul, item) {

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

@@ -1,5 +1,3 @@
-//= require jquery
-//= require jquery_ujs
 //= require jquery-ui
 //= require jquery.cookie
 //= require jquery.tokeninput

data/app/assets/javascripts/store/checkout.js

@@ -16,7 +16,7 @@
         state_input = $('p#' + region + 'state input');
 
         if(states) {
-          selected = state_select.val();
+          selected = parseInt(state_select.val());
           state_select.html('');
           states_with_blank = [["",""]].concat(states);
           $.each(states_with_blank, function(pos,id_nm) {
@@ -72,7 +72,7 @@
 })(jQuery);
 
 function disableSaveOnClick() {
-  $('form.edit_spree_order').submit(function() {
+  $('form.edit_order').submit(function() {
     $(this).find(':submit, :image').attr('disabled', true).removeClass('primary').addClass('disabled');
   });
 }

data/app/assets/stylesheets/store/screen.css.scss

@@ -1,4 +1,4 @@
-@import "store/variables";
+@import "./variables.css.scss";
 
 /*--------------------------------------*/
 /* Basic styles 

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

@@ -19,30 +19,22 @@ module Spree
 
 
       private
-  
+
         def location_after_save
           admin_product_images_url(@product)
         end
 
         def load_data
-          @product = Product.find_by_permalink(params[:product_id])
+          @product = Product.where(:permalink => params[:product_id]).first
           @variants = @product.variants.collect do |variant|
             [variant.options_text, variant.id]
           end
-          @variants.insert(0, [I18n.t(:all), 'All'])
+          @variants.insert(0, [I18n.t(:all), @product.master.id])
         end
 
         def set_viewable
-          if params[:image].has_key? :viewable_id
-            if params[:image][:viewable_id] == 'All'
-              @image.viewable = @product.master
-            else
-              @image.viewable_type = 'Spree::Variant'
-              @image.viewable_id = params[:image][:viewable_id]
-            end
-          else
-            @image.viewable = @product.master
-          end
+          @image.viewable_type = 'Spree::Variant'
+          @image.viewable_id = params[:image][:viewable_id]
         end
 
         def destroy_before

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

@@ -3,6 +3,13 @@ module Spree
     class MailMethodsController < ResourceController
       after_filter :initialize_mail_settings
 
+      def update
+        if params[:mail_method][:preferred_smtp_password].blank?
+          params[:mail_method].delete(:preferred_smtp_password)
+        end
+        super
+      end
+
       def testmail
         @mail_method = Spree::MailMethod.find(params[:id])
         if TestMailer.test_email(@mail_method, respond_to?(:current_user) ? current_user : nil).deliver

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

@@ -10,7 +10,7 @@ module Spree
         end
 
         def edit
-          country_id = Address.default.country
+          country_id = Address.default.country.id
           @order.build_bill_address(:country_id => country_id) if @order.bill_address.nil?
           @order.build_ship_address(:country_id => country_id) if @order.ship_address.nil?
         end

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

@@ -27,7 +27,13 @@ module Spree
         end
 
         payment_method_params = params[ActiveModel::Naming.param_key(@payment_method)] || {}
-        if @payment_method.update_attributes(params[:payment_method].merge(payment_method_params))
+        attributes = params[:payment_method].merge(payment_method_params)
+        attributes.each do |k,v|
+          if k.include?("password") && attributes[k].blank?
+            attributes.delete(k)
+          end
+        end
+        if @payment_method.update_attributes(attributes)
           invoke_callbacks(:update, :after)
           flash.notice = I18n.t(:successfully_updated, :resource => I18n.t(:payment_method))
           respond_with(@payment_method, :location => edit_admin_payment_method_path(@payment_method))

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

@@ -19,13 +19,9 @@ module Spree
         end
       end
 
-      # override the destory method to set deleted_at value
-      # instead of actually deleting the product.
       def destroy
-        @product = Product.find_by_permalink!(params[:id])
-        @product.update_column(:deleted_at, Time.now)
-
-        @product.variants_including_master.update_all(:deleted_at => Time.now)
+        @product = Product.where(:permalink => params[:id]).first!
+        @product.delete
 
         flash.notice = I18n.t('notice_messages.product_deleted')
 
@@ -90,13 +86,9 @@ module Spree
               includes([:master, {:variants => [:images, :option_values]}]).
               page(params[:page]).
               per(Spree::Config[:admin_products_per_page])
-
-            if params[:q][:s].include?("master_price")
-              # By applying the group in the main query we get an undefined method gsub for Arel::Nodes::Descending
-              # It seems to only work when the price is actually being sorted in the query
-              # To be investigated later.
-              @collection = @collection.group("spree_variants.price")
-            end
+              if params[:q][:s].include?("master_price")
+                @collection = @collection.group("spree_variants.price")
+              end
           else
             includes = [{:variants => [:images,  {:option_values => :option_type}]}, {:master => :images}]
 

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

@@ -29,8 +29,8 @@ module Spree
       private
 
         def set_habtm_associations
-          @prototype.property_ids = params[:property][:id] if params[:property]
-          @prototype.option_type_ids = params[:option_type][:id] if params[:option_type]
+          @prototype.property_ids = params[:option_type].blank? ? [] : params[:property][:id]
+          @prototype.option_type_ids = params[:option_type].blank? ? [] : params[:option_type][:id]
         end
     end
   end

data/app/controllers/spree/checkout_controller.rb

@@ -6,6 +6,8 @@ module Spree
     ssl_required
 
     before_filter :load_order
+    before_filter :ensure_valid_state
+
     rescue_from Spree::Core::GatewayError, :with => :rescue_from_spree_gateway_error
 
     respond_to :html
@@ -36,6 +38,14 @@ module Spree
     end
 
     private
+      def ensure_valid_state
+        if params[:state] && params[:state] != 'cart' &&
+           !@order.checkout_steps.include?(params[:state])
+          @order.state = 'cart'
+          redirect_to checkout_path
+        end
+      end
+
       # Provides a route to redirect after order completion
       def completion_route
         order_path(@order)

data/app/controllers/spree/orders_controller.rb

@@ -1,5 +1,7 @@
 module Spree
   class OrdersController < BaseController
+    ssl_required :show
+
     rescue_from ActiveRecord::RecordNotFound, :with => :render_404
     helper 'spree/products'
 
@@ -13,7 +15,7 @@ module Spree
     def update
       @order = current_order
       if @order.update_attributes(params[:order])
-        @order.line_items = @order.line_items.select {|li| li.quantity > 0 }
+        @order.line_items = @order.line_items.select { |li| li.quantity > 0 }
         fire_event('spree.order.contents_changed')
         respond_with(@order) { |format| format.html { redirect_to cart_path } }
       else
@@ -57,14 +59,16 @@ module Spree
 
     def empty
       if @order = current_order
-        @order.line_items.destroy_all
+        @order.empty!
       end
 
       redirect_to spree.cart_path
     end
 
-    def accurate_titles
-      @order && @order.completed? ? "#{Order.model_name.human} #{@order.number}" : t(:shopping_cart)
-    end
+    private
+
+      def accurate_title
+        @order && @order.completed? ? "#{Order.model_name.human} #{@order.number}" : t(:shopping_cart)
+      end
   end
 end

data/app/helpers/spree/base_helper.rb

@@ -65,13 +65,22 @@ module Spree
 
     def meta_data_tags
       object = instance_variable_get('@'+controller_name.singularize)
-      meta = { :keywords => Spree::Config[:default_meta_keywords], :description => Spree::Config[:default_meta_description] }
+      meta = {}
 
-      if object.kind_of?(ActiveRecord::Base)
+      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
 
+      if meta[:description].blank? && object.kind_of?(Spree::Product)
+        meta[:description] = strip_tags(object.description)
+      end
+
+      meta.reverse_merge!({
+        :keywords => Spree::Config[:default_meta_keywords],
+        :description => Spree::Config[:default_meta_description]
+      })
+
       meta.map do |name, content|
         tag('meta', :name => name, :content => content)
       end.join("\n")
@@ -86,9 +95,13 @@ module Spree
       link_to image_tag(image_path), root_path
     end
 
-    def flash_messages
+    def flash_messages(opts = {})
+      opts[:ignore_types] = [:commerce_tracking].concat(opts[:ignore_types] || [])
+
       flash.each do |msg_type, text|
-        concat(content_tag :div, text, :class => "flash #{msg_type}") unless msg_type == :commerce_tracking
+        unless opts[:ignore_types].include?(msg_type)
+          concat(content_tag :div, text, :class => "flash #{msg_type}")
+        end
       end
       nil
     end

data/app/helpers/spree/checkout_helper.rb

@@ -1,15 +1,7 @@
 module Spree
   module CheckoutHelper
-    def checkout_states
-      if @order.payment and @order.payment.payment_method.payment_profiles_supported?
-        %w(address delivery payment confirm complete)
-      else
-        %w(address delivery payment complete)
-      end
-    end
-
     def checkout_progress
-      states = checkout_states
+      states = @order.checkout_steps
       items = states.map do |state|
         text = t("order_state.#{state}").titleize
 

data/app/helpers/spree/products_helper.rb

@@ -17,10 +17,6 @@ module Spree
       raw(product.description.gsub(/(.*?)\r?\n\r?\n/m, '<p>\1</p>'))
     end
 
-    def variant_images_hash(product)
-      product.variant_images.inject({}) { |h, img| (h[img.viewable_id] ||= []) << img; h }
-    end
-
     def line_item_description(variant)
       description = variant.product.description
       if description.present?

data/app/models/spree/address.rb

@@ -36,7 +36,7 @@ module Spree
     end
 
     def state_text
-      state.nil? ? state_name : (state.abbr.blank? ? state.name : state.abbr)
+      state.try(:abbr) || state.try(:name) || state_name 
     end
 
     def zone

data/app/models/spree/app_configuration.rb

@@ -77,6 +77,7 @@ module Spree
     preference :s3_headers, :string, :default => "{\"Cache-Control\":\"max-age=31557600\"}"
     preference :use_s3, :boolean, :default => false # Use S3 for images rather than the file system
     preference :s3_protocol, :string
+    preference :s3_host_alias, :string
 
     # searcher_class allows spree extension writers to provide their own Search class
     def searcher_class

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

@@ -1,4 +1,6 @@
 require_dependency 'spree/calculator'
+# For #to_d method on Ruby 1.8
+require 'bigdecimal/util'
 
 module Spree
   class Calculator::PriceSack < Calculator
@@ -17,12 +19,12 @@ module Spree
     # as object we always get line items, as calculable we have Coupon, ShippingMethod
     def compute(object)
       if object.is_a?(Array)
-        base = object.map { |o| o.respond_to?(:amount) ? o.amount : o.to_d }.sum
+        base = object.map { |o| o.respond_to?(:amount) ? o.amount : BigDecimal(o.to_s) }.sum
       else
-        base = object.respond_to?(:amount) ? object.amount : object.to_d
+        base = object.respond_to?(:amount) ? object.amount : BigDecimal(object.to_s)
       end
 
-      if base >= self.preferred_minimal_amount
+      if base < self.preferred_minimal_amount
         self.preferred_normal_amount
       else
         self.preferred_discount_amount

data/app/models/spree/image.rb

@@ -9,7 +9,8 @@ module Spree
                       :styles => { :mini => '48x48>', :small => '100x100>', :product => '240x240>', :large => '600x600>' },
                       :default_style => :product,
                       :url => '/spree/products/:id/:style/:basename.:extension',
-                      :path => ':rails_root/public/spree/products/:id/:style/:basename.:extension'
+                      :path => ':rails_root/public/spree/products/:id/:style/:basename.:extension',
+                      :convert_options => { :all => '-strip' }
     # save the w,h of the original image (from which others can be calculated)
     # we need to look at the write-queue for images which have not been saved yet
     after_post_process :find_dimensions
@@ -22,6 +23,7 @@ module Spree
       Spree::Image.attachment_definitions[:attachment][:s3_headers] = ActiveSupport::JSON.decode(Spree::Config[:s3_headers])
       Spree::Image.attachment_definitions[:attachment][:bucket] = Spree::Config[:s3_bucket]
       Spree::Image.attachment_definitions[:attachment][:s3_protocol] = Spree::Config[:s3_protocol] unless Spree::Config[:s3_protocol].blank?
+      Spree::Image.attachment_definitions[:attachment][:s3_host_alias] = Spree::Config[:s3_host_alias] unless Spree::Config[:s3_host_alias].blank?
     end
 
     Spree::Image.attachment_definitions[:attachment][:styles] = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles])

data/app/models/spree/inventory_unit.rb

@@ -1,9 +1,9 @@
 module Spree
   class InventoryUnit < ActiveRecord::Base
-    belongs_to :variant, :class_name => "Spree::Variant"
-    belongs_to :order, :class_name => "Spree::Order"
-    belongs_to :shipment, :class_name => "Spree::Shipment"
-    belongs_to :return_authorization, :class_name => "Spree::ReturnAuthorization"
+    belongs_to :variant
+    belongs_to :order
+    belongs_to :shipment
+    belongs_to :return_authorization
 
     scope :backorder, where(:state => 'backordered')
 
@@ -107,8 +107,10 @@ module Spree
       end
 
       def restock_variant
-        variant.on_hand = (variant.on_hand + 1)
-        variant.save
+        if Spree::Config[:track_inventory_levels]
+          variant.on_hand += 1
+          variant.save
+        end
       end
   end
 end