spree_core 1.1.0.rc2 → 1.1.0

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

@@ -1,3 +1,4 @@
+<%# encoding: utf-8 %>
 //= require_self
 
 /**
@@ -206,7 +207,12 @@ $(".observe_field").live('change', function() {
 
 handle_date_picker_fields = function(){
   $('.datepicker').datepicker({
-    dateFormat: 'yy/mm/dd',
+    dateFormat: "<%= ::I18n.t(:format, :scope => 'spree.date_picker', :default => 'yy/mm/dd') %>",
+    dayNames: ["<%= ::I18n.t(:day_names, :scope => :date).join('","') %>"],
+    dayNamesMin: ["<%= ::I18n.t(:abbr_day_names, :scope => :date).join('","') %>"],
+    monthNames: ["<%= ::I18n.t(:month_names, :scope => :date).join('","') %>"],
+    prevText: '<%= ::I18n.t(:previous) %>',
+    nextText: '<%= ::I18n.t(:next) %>',
     showOn: "button",
     buttonImage: "<%= asset_path 'datepicker/cal.gif' %>",
     buttonImageOnly: true

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

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

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

@@ -52,6 +52,9 @@ module Spree
 
       def fire
         return unless event = params[:e] and @payment.payment_source
+
+        # Because we have a transition method also called void, we do this to avoid conflicts.
+        event = "void_transaction" if event == "void"
         if @payment.send("#{event}!")
           flash.notice = t(:payment_updated)
         else

data/app/controllers/spree/orders_controller.rb

@@ -41,7 +41,7 @@ module Spree
 
       params[:products].each do |product_id,variant_id|
         quantity = params[:quantity].to_i if !params[:quantity].is_a?(Hash)
-        quantity = params[:quantity][variant_id.to_i].to_i if params[:quantity].is_a?(Hash)
+        quantity = params[:quantity][variant_id].to_i if params[:quantity].is_a?(Hash)
         @order.add_variant(Variant.find(variant_id), quantity) if quantity > 0
       end if params[:products]
 

data/app/helpers/spree/base_helper.rb

@@ -106,7 +106,7 @@ module Spree
 
     def flash_messages
       flash.each do |msg_type, text|
-        concat(content_tag :div, text, :class => "flash #{msg_type}")
+        concat(content_tag :div, text, :class => "flash #{msg_type}") unless msg_type == :commerce_tracking
       end
       nil
     end
@@ -142,7 +142,7 @@ module Spree
     def available_countries
       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.name = I18n.t(c.iso, :scope => 'countries', :default => c.name)
         c 
       end.sort{ |a,b| a.name <=> b.name }
     end

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

@@ -4,7 +4,7 @@ module Spree
     preference :additional_item, :decimal, :default => 0.0
     preference :max_items,       :integer, :default => 0
 
-    attr_accessible :preferred_first_item, :preferred_additional_tiem, :preferred_max_items
+    attr_accessible :preferred_first_item, :preferred_additional_item, :preferred_max_items
 
     def self.description
       I18n.t(:flexible_rate)

data/app/models/spree/creditcard.rb

@@ -71,7 +71,7 @@ module Spree
 
     # Indicates whether its possible to capture the payment
     def can_capture?(payment)
-      payment.state == 'pending'
+      payment.state == 'pending' || payment.state == 'checkout'
     end
 
     # Indicates whether its possible to void the payment.

data/app/models/spree/gateway.rb

@@ -9,6 +9,8 @@ module Spree
     
     attr_accessible :preferred_server, :preferred_test_mode
 
+    attr_accessible :preferred_server, :preferred_test_mode
+
     def payment_source_class
       Creditcard
     end

data/app/models/spree/gateway/bogus.rb

@@ -67,6 +67,10 @@ module Spree
       true
     end
 
+    def actions
+      %w(capture void credit)
+    end
+
     private
       def generate_profile_id(success)
         record = true

data/app/models/spree/image.rb

@@ -3,7 +3,7 @@ module Spree
     validates_attachment_presence :attachment
     validate :no_attachment_errors
 
-    attr_accessible :attachment, :alt, :viewable_id
+    attr_accessible :alt, :attachment, :position, :viewable_id
 
     has_attached_file :attachment,
                       :styles => { :mini => '48x48>', :small => '100x100>', :product => '240x240>', :large => '600x600>' },
@@ -14,8 +14,6 @@ module Spree
     # we need to look at the write-queue for images which have not been saved yet
     after_post_process :find_dimensions
 
-    attr_accessible :attachment, :position
-
     # Load user defined paperclip settings
     if Spree::Config[:use_s3]
       s3_creds = { :access_key_id => Spree::Config[:s3_access_key], :secret_access_key => Spree::Config[:s3_secret], :bucket => Spree::Config[:s3_bucket] }

data/app/models/spree/payment.rb

@@ -36,14 +36,14 @@ module Spree
       end
       # With card payments this represents authorizing the payment
       event :pend do
-        transition :from => 'processing', :to => 'pending'
+        transition :from => ['checkout', 'processing'], :to => 'pending'
       end
       # With card payments this represents completing a purchase or capture transaction
       event :complete do
-        transition :from => ['processing', 'pending'], :to => 'completed'
+        transition :from => ['processing', 'pending', 'checkout'], :to => 'completed'
       end
       event :void do
-        transition :from => ['pending', 'completed'], :to => 'void'
+        transition :from => ['pending', 'completed', 'checkout'], :to => 'void'
       end
     end
 

data/app/models/spree/payment/processing.rb

@@ -28,7 +28,6 @@ module Spree
       end
 
       def capture!
-        return unless pending?
         protect_from_connection_error do
           check_environment
 
@@ -117,7 +116,7 @@ module Spree
       if response.success?
         self.response_code = response.authorization
         self.avs_response = response.avs_result['code']
-        self.send(success_state)
+        self.send("#{success_state}!")
       else
         self.send("#{failure_state}!")
         gateway_error(response)

data/app/models/spree/product.rb

@@ -59,7 +59,7 @@ module Spree
     accepts_nested_attributes_for :variants, :allow_destroy => true
 
     def variant_images
-      Image.find_by_sql("SELECT #{Asset.quoted_table_name}.* FROM #{Asset.quoted_table_name} LEFT JOIN #{Variant.quoted_table_name} ON (#{Variant.quoted_table_name}.id = #{Asset.quoted_table_name}.viewable_id) WHERE (#{Variant.quoted_table_name}.product_id = #{self.id})")
+      Image.find_by_sql("SELECT #{Asset.quoted_table_name}.* FROM #{Asset.quoted_table_name} LEFT JOIN #{Variant.quoted_table_name} ON (#{Variant.quoted_table_name}.id = #{Asset.quoted_table_name}.viewable_id) WHERE (#{Variant.quoted_table_name}.product_id = #{self.id}) ORDER BY #{Asset.quoted_table_name}.position")
     end
 
     alias_method :images, :variant_images
@@ -159,7 +159,7 @@ module Spree
 
       # don't dup the actual variants, just the characterising types
       p.option_types = option_types if has_variants?
-        
+
       # allow site to do some customization
       p.send(:duplicate_extra, self) if p.respond_to?(:duplicate_extra)
       p.save!
@@ -199,6 +199,22 @@ module Spree
       end
     end
 
+    def property(property_name)
+      return nil unless prop = properties.find_by_name(property_name)
+      product_properties.find_by_property_id(prop.id).try(:value)
+    end
+
+    def set_property(property_name, property_value)
+      prop = Spree::Property.find_or_initialize_by_name(property_name) do |p|
+        p.presentation = property_name
+        p.save!
+      end
+
+      prod_prop = Spree::ProductProperty.find_or_initialize_by_product_id_and_property_id(self.id, prop.id)
+      prod_prop.value = property_value
+      prod_prop.save!
+    end
+
     private
 
       # Builds variants from a hash of option types & values

data/app/models/spree/shipping_category.rb

@@ -3,5 +3,7 @@ module Spree
     validates :name, :presence => true
     has_many :products
     has_many :shipping_methods
+
+    attr_accessible :name
   end
 end

data/app/models/spree/state.rb

@@ -7,6 +7,8 @@ module Spree
 
     validates :country, :name, :presence => true
 
+    attr_accessible :name, :abbr
+
     def self.find_all_by_name_or_abbr(name_or_abbr)
       where('name = ? OR abbr = ?', name_or_abbr, name_or_abbr)
     end

data/app/models/spree/taxon.rb

@@ -6,7 +6,7 @@ module Spree
     has_and_belongs_to_many :products, :join_table => 'spree_products_taxons'
     before_create :set_permalink
 
-    attr_accessible :name, :parent_id, :position, :description, :permalink
+    attr_accessible :name, :parent_id, :position, :icon, :description, :permalink
 
     validates :name, :presence => true
     has_attached_file :icon,

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

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

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

@@ -1,3 +1,5 @@
+<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+
 <div class="toolbar" data-hook="toolbar">
   <ul class="actions">
     <li>

data/app/views/spree/admin/states/_state_list.html.erb

@@ -1,3 +1,13 @@
+<div id="new_state" data-hook></div>
+<div class="toolbar" data-hook="toolbar">
+  <ul class="actions">
+    <li id="new_state_link">
+      <%= button_link_to t(:new_state), new_admin_country_state_url(@country), {:remote => true, :icon => 'add', :id => 'new_state_link'} %>
+    </li>
+  </ul>
+  <br class="clear" />
+</div>
+
 <table class="index" id='listing_states' data-hook>
   <thead>
     <tr data-hook="states_header">
@@ -7,10 +17,7 @@
     </tr>
   </thead>
   <tbody>
-    <% @states.each do |state|
-         @edit_url = admin_country_state_path(@country, state)
-         @delete_url = admin_country_state_path(@country, state)
-    %>
+    <% @states.each do |state| %>
       <tr id="<%= spree_dom_id state %>" data-hook="states_row">
         <td><%= state.name %></td>
         <td><%= state.abbr %></td>
@@ -26,7 +33,3 @@
     <% end %>
   </tbody>
 </table>
-<div id="new_state" data-hook></div>
-<p data-hook="buttons">
-  <%= button_link_to t(:new_state), new_admin_country_state_url(@country), {:remote => true, :icon => 'add', :id => 'new_state_link'} %>
-</p>

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

@@ -2,6 +2,7 @@
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @state } %>
 
+<h3><%= t(:new_state) %></h3>
 <%= form_for [:admin, @country, @state] do |f| %>
   <%= render :partial => 'form', :locals => { :f => f } %>
   <%= render :partial => 'spree/admin/shared/new_resource_links' %>

data/app/views/spree/shared/_products.html.erb

@@ -10,6 +10,7 @@
 
 <% if products.any? %>
 <ul id="products" class="inline product-listing" data-hook>
+  <% reset_cycle('default') %>
   <% products.each do |product| %>
     <% if Spree::Config[:show_zero_stock_products] || product.has_stock? %>
       <li id="product_<%= product.id %>" class="columns three <%= cycle("alpha", "secondary", "", "omega secondary") %>" data-hook="products_list_item" itemscope itemtype="http://schema.org/Product">

data/config/locales/en.yml

@@ -16,6 +16,7 @@ en:
     new: New
     update: Update
   active: "Active"
+  activate: "Activate"
   activerecord:
     attributes:
       spree/address:
@@ -942,6 +943,8 @@ en:
   special_instructions: "Special Instructions"
   spree:
     date: Date
+    date_picker:
+      format: 'yy/mm/dd'
     time: Time
   spree_gateway_error_flash_for_checkout: "There was a problem with your payment information. Please check your information and try again."
   spree_inventory_error_flash_for_insufficient_quantity: "An item in your cart has become unavailable."

data/lib/generators/spree/install/templates/app/assets/javascripts/admin/all.js

@@ -4,8 +4,6 @@
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 // the compiled file.
 //
-//= require jquery
-//= require jquery_ujs
 <% if options[:lib_name] == 'spree' %>
 //= require admin/spree_core
 //= require admin/spree_auth

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "1.1.0.rc2"
+    "1.1.0"
   end
 end

data/lib/spree/product_filters.rb

@@ -129,21 +129,19 @@ module Spree
     #   The brand-finding code can be simplified if a few more named scopes were added to
     #   the product properties model.
     if Spree::Property.table_exists? && @@brand_property
-      Spree::Product.scope :selective_brand_any, lambda {|opts| Spree::Product.brand_any(opts) }
+      Spree::Product.scope :selective_brand_any, lambda {|*opts| Spree::Product.brand_any(*opts) }
 
       def ProductFilters.selective_brand_filter(taxon = nil)
         if taxon.nil?
           taxon = Spree::Taxonomy.first.root
         end
-        all_brands = Spree::ProductProperty.where(:property_id => @@brand_property).map(&:value).uniq
         scope = Spree::ProductProperty.scoped(:conditions => ["property_id = ?", @@brand_property]).
                                        scoped(:joins      => {:product => :taxons},
                                               :conditions => ["#{Spree::Taxon.table_name}.id in (?)", [taxon] + taxon.descendants])
-        brands = scope.map {|p| p.value}
+        brands = scope.map {|p| p.value}.uniq
 
         { :name   => "Applicable Brands",
           :scope  => :selective_brand_any,
-          :conds  => Hash[*all_brands.map {|m| [m, "p_colour.value like '%#{m}%'"]}.flatten],
           :labels => brands.sort.map {|k| [k,k]}
         }
       end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 1.1.0.rc2
-  prerelease: 6
+  version: 1.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000 Z
+date: 2012-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70210733556780 !ruby/object:Gem::Requirement
+  requirement: &70132425348640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70210733556780
+  version_requirements: *70132425348640
 - !ruby/object:Gem::Dependency
   name: nested_set
-  requirement: &70210733555720 !ruby/object:Gem::Requirement
+  requirement: &70132425347980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70210733555720
+  version_requirements: *70132425347980
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70210733554680 !ruby/object:Gem::Requirement
+  requirement: &70132425347340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70210733554680
+  version_requirements: *70132425347340
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70210733553740 !ruby/object:Gem::Requirement
+  requirement: &70132425346420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.11
   type: :runtime
   prerelease: false
-  version_requirements: *70210733553740
+  version_requirements: *70132425346420
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70210733569000 !ruby/object:Gem::Requirement
+  requirement: &70132425345560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70210733569000
+  version_requirements: *70132425345560
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70210733568120 !ruby/object:Gem::Requirement
+  requirement: &70132425360140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70210733568120
+  version_requirements: *70132425360140
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70210733567180 !ruby/object:Gem::Requirement
+  requirement: &70132425357460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70210733567180
+  version_requirements: *70132425357460
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70210733565980 !ruby/object:Gem::Requirement
+  requirement: &70132425354260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70210733565980
+  version_requirements: *70132425354260
 - !ruby/object:Gem::Dependency
   name: ransack
-  requirement: &70210733564060 !ruby/object:Gem::Requirement
+  requirement: &70132425384220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70210733564060
+  version_requirements: *70132425384220
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &70210733562620 !ruby/object:Gem::Requirement
+  requirement: &70132425382540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -120,10 +120,10 @@ dependencies:
         version: 1.20.4
   type: :runtime
   prerelease: false
-  version_requirements: *70210733562620
+  version_requirements: *70132425382540
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70210733576920 !ruby/object:Gem::Requirement
+  requirement: &70132425381100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -134,10 +134,10 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70210733576920
+  version_requirements: *70132425381100
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70210733575300 !ruby/object:Gem::Requirement
+  requirement: &70132425392620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -145,10 +145,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70210733575300
+  version_requirements: *70132425392620
 - !ruby/object:Gem::Dependency
   name: deface
-  requirement: &70210733573900 !ruby/object:Gem::Requirement
+  requirement: &70132425387500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -156,10 +156,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70210733573900
+  version_requirements: *70132425387500
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &70210733572420 !ruby/object:Gem::Requirement
+  requirement: &70132425385100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -167,7 +167,7 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70210733572420
+  version_requirements: *70132425385100
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []
@@ -963,9 +963,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -2250496839152331982
 requirements:
 - none
 rubyforge_project: spree_core