spree_core 1.3.0 → 1.3.1

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

@@ -488,6 +488,10 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
           border-color: $link_text_color;
         }
 
+        img {
+          max-width: 100%; /* Fluid images for product */
+        }
+
       }
 
       .price {
@@ -542,6 +546,7 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
 
       img {
         min-height: 240px;
+        max-width: 100%; /* Fluid images for product */
       }
     }
     #product-thumbnails {

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

@@ -7,7 +7,7 @@ module Spree
 
         respond_to do |format|
           format.html {
-            redirect_to admin_tax_settings_path
+            redirect_to edit_admin_tax_settings_path
           }
         end
       end

data/app/controllers/spree/orders_controller.rb

@@ -39,32 +39,18 @@ module Spree
     end
 
     # Adds a new item to the order (creating a new order if none already exists)
-    #
-    # Parameters can be passed using the following possible parameter configurations:
-    #
-    # * Single variant/quantity pairing
-    # +:variants => { variant_id => quantity }+
-    #
-    # * Multiple products at once
-    # +:products => { product_id => variant_id, product_id => variant_id }, :quantity => quantity+
-    # +:products => { product_id => variant_id, product_id => variant_id }, :quantity => { variant_id => quantity, variant_id => quantity }+
     def populate
-      @order = current_order(true)
-
-      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 if params[:quantity].is_a?(Hash)
-        @order.add_variant(Variant.find(variant_id), quantity, current_currency) if quantity > 0
-      end if params[:products]
-
-      params[:variants].each do |variant_id, quantity|
-        quantity = quantity.to_i
-        @order.add_variant(Variant.find(variant_id), quantity, current_currency) if quantity > 0
-      end if params[:variants]
-
-      fire_event('spree.cart.add')
-      fire_event('spree.order.contents_changed')
-      respond_with(@order) { |format| format.html { redirect_to cart_path } }
+      populator = OrderPopulator.new(current_order(true), current_currency)
+      if populator.populate(params.slice(:products, :variants, :quantity))
+        fire_event('spree.cart.add')
+        fire_event('spree.order.contents_changed')
+        respond_with(@order) do |format|
+          format.html { redirect_to cart_path }
+        end
+      else
+        flash[:error] = populator.errors.full_messages.join(" ")
+        redirect_to :back
+      end
     end
 
     def empty

data/app/models/spree/image.rb

@@ -10,7 +10,7 @@ module Spree
                       :default_style => :product,
                       :url => '/spree/products/:id/:style/:basename.:extension',
                       :path => ':rails_root/public/spree/products/:id/:style/:basename.:extension',
-                      :convert_options => { :all => '-strip' }
+                      :convert_options => { :all => '-strip -auto-orient' }
     # 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

data/app/models/spree/line_item.rb

@@ -2,7 +2,7 @@ module Spree
   class LineItem < ActiveRecord::Base
     before_validation :adjust_quantity
     belongs_to :order
-    belongs_to :variant
+    belongs_to :variant, :class_name => "Spree::Variant"
 
     has_one :product, :through => :variant
     has_many :adjustments, :as => :adjustable, :dependent => :destroy

data/app/models/spree/order_populator.rb

@@ -0,0 +1,68 @@
+module Spree
+  class OrderPopulator
+    attr_accessor :order, :currency
+    attr_reader :errors
+
+    def initialize(order, currency)
+      @order = order
+      @currency = currency
+      @errors = ActiveModel::Errors.new(self)
+    end
+
+    #
+    # Parameters can be passed using the following possible parameter configurations:
+    #
+    # * Single variant/quantity pairing
+    # +:variants => { variant_id => quantity }+
+    #
+    # * Multiple products at once
+    # +:products => { product_id => variant_id, product_id => variant_id }, :quantity => quantity+
+    # +:products => { product_id => variant_id, product_id => variant_id }, :quantity => { variant_id => quantity, variant_id => quantity }+
+    def populate(from_hash)
+      from_hash[:products].each do |product_id,variant_id|
+        attempt_cart_add(variant_id, from_hash[:quantity])
+      end if from_hash[:products]
+
+      from_hash[:variants].each do |variant_id, quantity|
+        attempt_cart_add(variant_id, quantity)
+      end if from_hash[:variants]
+
+      valid?
+    end
+
+    def valid?
+      errors.empty?
+    end
+
+    private
+
+    def attempt_cart_add(variant_id, quantity)
+      quantity = quantity.to_i
+      variant = Spree::Variant.find(variant_id)
+      if quantity > 0
+        if check_stock_levels(variant, quantity)
+          @order.add_variant(variant, quantity, currency)
+        end
+      end
+    end
+
+    def check_stock_levels(variant, quantity)
+      display_name = %Q{#{variant.name}}
+      display_name += %Q{ (#{variant.options_text})} unless variant.options_text.blank?
+
+      if variant.in_stock?
+        on_hand = variant.on_hand
+        if on_hand >= quantity
+          return true
+        else
+          errors.add(:base, %Q{There are only #{on_hand} of #{display_name.inspect} remaining.} + 
+                            %Q{ Please select a quantity less than or equal to this value.})
+          return false
+        end
+      else
+        errors.add(:base, %Q{#{display_name.inspect} is out of stock.})
+        return false
+      end
+    end
+  end
+end

data/app/views/spree/address/_form.html.erb

@@ -50,7 +50,7 @@
          ].join.gsub('"', "'").gsub("\n", "")
       %>
       <%= javascript_tag do -%>
-        document.write("<%== state_elements %>");
+        $('#<%="#{address_id}state" %>').append("<%== state_elements %>");
       <% end %>
     </p>
       <noscript>

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

@@ -19,13 +19,20 @@
         <%= preference_field_tag 'preferences[attachment_path]', Spree::Config[:attachment_path], :type => :string %>
       </div>
 
-      
       <div class="alpha eight columns">
         <div data-hook="attachment_default_url" class="field">
           <%= label_tag 'preferences[attachment_default_url]', t(:attachment_default_url) %>
           <%= preference_field_tag 'preferences[attachment_default_url]', Spree::Config[:attachment_default_url], :type => :string %>
         </div>
       </div>
+
+      <div class="alpha eight columns">
+        <div data-hook="attachment_url" class="field">
+          <%= label_tag 'preferences[attachment_url]', t(:attachment_url) %>
+          <%= preference_field_tag 'preferences[attachment_url]', Spree::Config[:attachment_url], :type => :string %>
+        </div>
+      </div>
+
       <div class="omega four columns">
         <div data-hook="attachment_default_style" class="field">
           <%= label_tag 'preferences[attachment_default_style]', t(:attachment_default_style) %>

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

@@ -50,9 +50,9 @@
 </div>
 
 <script>
-  var variant_prices = {};
-  <% @return_authorization.order.inventory_units.group_by(&:variant).each do | variant, units| %>
-    variant_prices[<%= variant.id.to_s %>] = <%= variant.price %>;
+  var line_item_prices = {};
+  <% @return_authorization.order.line_items.group_by(&:variant).each do | variant, items| %>
+    line_item_prices[<%= variant.id.to_s %>] = <%= items.first.price %>;
   <% end %>
 
   $(document).ready(function(){
@@ -61,7 +61,7 @@
       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()
+         rma_amount += line_item_prices[variant_id] * $(input).val()
       });
 
       if(!isNaN(rma_amount)){

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

@@ -20,7 +20,7 @@
   <tbody id="subtotal" data-hook="order_details_subtotal"  class="with-border">
     <tr class="total" id="subtotal-row">
       <td colspan="3"><b><%= t(:subtotal) %>:</b></td>
-      <td class="total"><span><%= @order.display_total %></span></td>
+      <td class="total"><span><%= @order.display_item_total %></span></td>
     </tr>
   </tbody>
   <tbody id="order-charges" data-hook="order_details_adjustments"  class="with-border">

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

@@ -6,9 +6,10 @@
 
 <%= form_tag admin_tax_settings_path, :method => :put do %>
   <div data-hook="shipment_vat" class="field align-center">
+    <%= hidden_field_tag 'preferences[shipment_inc_vat]', '0' %>
     <%= check_box_tag 'preferences[shipment_inc_vat]', '1',  Spree::Config[:shipment_inc_vat] %>
     <%= label_tag nil, t(:shipment_inc_vat) %>    
-    <%= hidden_field_tag 'preferences[shipment_inc_vat]', '0' %>    
+
   </div>
 
   <div class="form-buttons" data-hook="buttons">

data/app/views/spree/checkout/payment/_gateway.html.erb

@@ -2,10 +2,9 @@
 <% param_prefix = "payment_source[#{payment_method.id}]" %>
 
 <p class="field" data-hook="card_number">
-  <%= label_tag nil, t(:card_number) %><br />
+  <%= label_tag nil, t(:card_number) %><span class="required">*</span><br />
   <% options_hash = Rails.env.production? ? {:autocomplete => 'off'} : {} %>
   <%= text_field_tag "#{param_prefix}[number]", '', options_hash.merge(:id => 'card_number', :class => 'required', :size => 19, :maxlength => 19, :autocomplete => "off") %>
-  <span class="required">*</span>
   &nbsp;
   <span id="card_type" style="display:none;">
     ( <span id="looks_like" ><%= t(:card_type_is) %> <span id="type"></span></span>
@@ -14,15 +13,13 @@
   </span>
 </p>
 <p class="field" data-hook="card_expiration">
-  <%= label_tag nil, t(:expiration) %><br />
+  <%= label_tag nil, t(:expiration) %><span class="required">*</span><br />
   <%= select_month(Date.today, { :prefix => param_prefix, :field_name => 'month', :use_month_numbers => true }, :class => 'required') %>
   <%= select_year(Date.today, { :prefix => param_prefix, :field_name => 'year', :start_year => Date.today.year, :end_year => Date.today.year + 15 }, :class => 'required') %>
-  <span class="required">*</span>
 </p>
 <p class="field" data-hook="card_code">
-  <%= label_tag nil, t(:card_code) %><br />
+  <%= label_tag nil, t(:card_code) %><span class="required">*</span><br />
   <%= text_field_tag "#{param_prefix}[verification_value]", '', options_hash.merge(:id => 'card_code', :class => 'required', :size => 5) %>
-  <span class="required">*</span>
   <%= link_to "(#{t(:whats_this)})", spree.content_path('cvv'), :target => '_blank', :onclick => "window.open(this.href,'cvv_info','left=20,top=20,width=500,height=500,toolbar=0,resizable=0,scrollbars=1');return false", "data-hook" => "cvv_link" %>
 </p>
 <%= hidden_field param_prefix, 'first_name', :value => @order.billing_firstname %>

data/app/views/spree/products/_thumbnails.html.erb

@@ -1,19 +1,21 @@
-<!-- no need for thumnails unless there is more then one image -->
-<% if product.images.size > 1 || product.variant_images.size > 0 %>
+<%# no need for thumbnails unless there is more than one image %>
+<% if (@product.images + @product.variant_images).uniq.size > 1 %>
   <ul id="product-thumbnails" class="thumbnails inline" data-hook>
-    <% product.images.each do |i| %>
-      <li class="tmb-all" id="tmb-<%= i.id.to_s %>"><%= link_to image_tag(i.attachment.url(:mini)), i.attachment.url(:product) %></li>
+    <% @product.images.each do |i| %>
+      <li class='tmb-all' id='tmb-<%= i.id %>'>
+        <%= link_to(image_tag(i.attachment.url(:mini)), i.attachment.url(:product), :class => 'tmb-all', :id => "tmb-#{i.id}") %>
+      </li>
+    <% end %>
+
+    <% if @product.has_variants? %>
+      <% @variants.select(&:available?).each do |v| %>
+        <% v.images.each do |i| %>
+          <% next if @product.images.include?(i) %>
+          <li class='vtmb-<%= v.id %> vtmb' id='tmb-<%= i.id %>'>
+            <%= link_to(image_tag(i.attachment.url(:mini)), i.attachment.url(:product)) %>
+          </li>
+        <% end %>
+      <% end %>
     <% end %>
-    <% if @product.has_variants?
-      @variants.each do |v|
-        if v.available?
-          v.images.each do |i| %>
-            <li class="vtmb-<%= v.id.to_s %> vtmb" id="tmb-<%= i.id.to_s %>"><%= link_to image_tag(i.attachment.url(:mini)), i.attachment.url(:product) %></li>
-          <%
-          end
-        end
-      end
-    end
-    %>
   </ul>
 <% end %>

data/app/views/spree/products/show.html.erb

@@ -9,7 +9,7 @@
           <%= render :partial => 'image' %>
         </div>
         <div id="thumbnails" data-hook>
-          <%= render :partial => 'thumbnails', :locals => { :product => @product } %>
+          <%= render :partial => 'thumbnails' %>
         </div>
       </div>
 

data/config/locales/en.yml

@@ -260,9 +260,10 @@ en:
   assign_taxon: "Assign Taxon"
   assign_taxons: "Assign Taxons"
   attachment_default_style: "Attachments Style"
-  attachment_default_url: "Attachments URL"
+  attachment_default_url: "Attachments Default URL"
   attachment_path: "Attachments Path"
   attachment_styles: "Paperclip Styles"
+  attachment_url: "Attachments URL"
   authorization_failure: "Authorization Failure"
   authorized: Authorized
   availability: "Availability"
@@ -413,8 +414,6 @@ en:
   email_server_settings_description: "Set email server settings."
   empty: "Empty"
   empty_cart: "Empty Cart"
-  enable_login_via_login_password: "Use standard email/password"
-  enable_login_via_openid: "Use OpenID instead"
   enable_mail_delivery: Enable Mail Delivery
   ending_in: "Ending in"
   enter_exactly_as_shown_on_card: Please enter exactly as shown on the card
@@ -496,7 +495,7 @@ en:
   image_settings: "Image Settings"
   image_settings_description: "Image Settings Description"
   image_settings_updated: "Image Settings successfully updated."
-  image_settings_warning: "You will need to regenerate thumbnails if you update the paperclip styles. Use rake paperclip:refresh:thumbnails to do this."
+  image_settings_warning: "You will need to regenerate thumbnails if you update the paperclip styles. Use rake paperclip:refresh:thumbnails CLASS=Spree::Image to do this."
   in_progress: "In Progress"
   include_in_shipment: Include in Shipment
   included_in_other_shipment: Included in another Shipment
@@ -534,14 +533,6 @@ en:
   live: "Live"
   loading: Loading
   locale_changed: "Locale Changed"
-  logged_in_as: "Logged in as"
-  logged_in_succesfully: "Logged in successfully"
-  logged_out: "You have been logged out."
-  login: Login
-  login_as_existing: "Login as Existing Customer"
-  login_failed: "Login authentication failed."
-  login_name: Login
-  logout: Logout
   look_for_similar_items: Look for similar items
   maestro_or_solo_cards: Maestro/Solo cards
   mail_delivery_enabled: "Mail delivery is enabled"

data/config/routes.rb

@@ -6,8 +6,6 @@ Spree::Core::Engine.routes.draw do
 
   match '/locale/set', :to => 'locale#set'
 
-  resources :tax_categories
-
   resources :states, :only => :index
   resources :countries, :only => :index
 
@@ -25,27 +23,12 @@ Spree::Core::Engine.routes.draw do
 
   resources :orders do
     post :populate, :on => :collection
-
-    resources :line_items
-
-    resources :shipments do
-      member do
-        get :shipping_method
-      end
-    end
-
   end
+
   get '/cart', :to => 'orders#edit', :as => :cart
   put '/cart', :to => 'orders#update', :as => :update_cart
   put '/cart/empty', :to => 'orders#empty', :as => :empty_cart
 
-  resources :shipments do
-    member do
-      get :shipping_method
-      put :shipping_method
-    end
-  end
-
   # route globbing for pretty nested taxon and product paths
   match '/t/*id', :to => 'taxons#show', :as => :nested_taxons
 

data/db/migrate/20121031162139_split_prices_from_variants.rb

@@ -18,13 +18,14 @@ class SplitPricesFromVariants < ActiveRecord::Migration
   end
 
   def down
-    add_column :spree_variants, :price, :decimal, :after => :sku, :scale => 8, :precision => 2
+    prices = ActiveRecord::Base.connection.execute("select variant_id, amount from spree_prices")
+    add_column :spree_variants, :price, :decimal, :after => :sku, :scale => 2, :precision => 8
 
-    Spree::Variant.all.each do |variant|
-      variant.price = variant.default_price.amount
-      variant.save!
+    prices.each do |price|
+      ActiveRecord::Base.connection.execute("update spree_variants set price = #{price['amount']} where id = #{price['variant_id']}")
     end
-
+    
+    change_column :spree_variants, :price, :decimal, :after => :sku, :scale => 2, :precision => 8, :null => false
     drop_table :spree_prices
   end
 end

data/lib/spree/core/controller_helpers/order.rb

@@ -27,7 +27,7 @@ module Spree
             @current_order = current_order unless current_order.try(:completed?)
           end
           if create_order_if_necessary and (@current_order.nil? or @current_order.completed?)
-            @current_order = Spree::Order.new(currency: current_currency)
+            @current_order = Spree::Order.new(:currency => current_currency)
             before_save_new_order
             @current_order.save!
             after_save_new_order

data/lib/spree/core/testing_support/factories/payment_factory.rb

@@ -7,25 +7,8 @@ FactoryGirl.define do
     state 'pending'
     response_code '12345'
 
-    # limit the payment amount to order's remaining balance, to avoid over-pay exceptions
-    after_create do |pmt|
-        #pmt.update_attribute(:amount, [pmt.amount, pmt.order.outstanding_balance].min)
-    end
   end
 
-  # factory :creditcard_txn do
-  #   payment
-  #   amount 45.75
-  #   response_code 12345
-  #   txn_type CreditcardTxn::TxnType::AUTHORIZE
-  #
-  #   # match the payment amount to the payment's value
-  #   after_create do |txn|
-  #     # txn.update_attribute(:amount, [txn.amount, txn.payment.payment].min)
-  #     txn.update_attribute(:amount, txn.payment.amount)
-  #   end
-  # end
-
   factory :check_payment, :class => Spree::Payment do
     amount 45.75
     payment_method { FactoryGirl.create(:payment_method) }

data/lib/spree/core/testing_support/factories/product_factory.rb

@@ -7,11 +7,13 @@ FactoryGirl.define do
     sku 'ABC'
     available_on 1.year.ago
     deleted_at nil
+    on_hand 5
   end
 
   factory :product, :parent => :simple_product do
     tax_category { |r| Spree::TaxCategory.first || r.association(:tax_category) }
     shipping_category { |r| Spree::ShippingCategory.first || r.association(:shipping_category) }
+    on_hand 5
   end
 
   factory :product_with_option_types, :parent => :product do
@@ -22,6 +24,7 @@ FactoryGirl.define do
     name "Custom Product"
     price "17.99"
     description { Faker::Lorem.paragraphs(1 + Kernel.rand(5)).join("\n") }
+    on_hand 5
 
     # associations:
     tax_category { |r| Spree::TaxCategory.first || r.association(:tax_category) }

data/lib/spree/core/validators/email.rb

@@ -18,6 +18,6 @@ class EmailValidator < ActiveModel::EachValidator
     rescue Exception => e
       r = false
     end
-    record.errors[attribute] << (options[:message] || "is invalid") unless r
+    record.errors[attribute] << (options[:message] || I18n.t("errors.messages.invalid")) unless r
   end
 end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "1.3.0"
+    "1.3.1"
   end
 end

data/lib/tasks/taxon.rake

@@ -1,7 +1,7 @@
 namespace :spree do
   desc "Resets all taxon permalinks"
   task :reset_taxon_permalinks => :environment do
-    Taxon.where(:parent_id => nil).each {|taxon| redo_permalinks(taxon) }
+    Spree::Taxon.where(:parent_id => nil).each {|taxon| redo_permalinks(taxon) }
   end
 
   def redo_permalinks(taxon)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,43 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000 Z
+date: 2013-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70209186380480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70209186380480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
-  requirement: &70209186378780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70209186378780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.5
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70209186388720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70209186388720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: select2-rails
-  requirement: &70209186399300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,32 +69,47 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70209186399300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70209186396280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.6.11
   type: :runtime
   prerelease: false
-  version_requirements: *70209186396280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.11
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70209186410800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70209186410800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70209186407680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +117,15 @@ dependencies:
         version: 1.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70209186407680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70209186405000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +133,15 @@ dependencies:
         version: '2.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70209186405000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70209186403600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +149,15 @@ dependencies:
         version: 1.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70209186403600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.4
 - !ruby/object:Gem::Dependency
   name: ransack
-  requirement: &70209186418360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,43 +165,63 @@ dependencies:
         version: 0.7.2
   type: :runtime
   prerelease: false
-  version_requirements: *70209186418360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &70209186416340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.28.0
+        version: 1.29.3
   type: :runtime
   prerelease: false
-  version_requirements: *70209186416340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.29.3
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70209186413900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 3.2.10
   type: :runtime
   prerelease: false
-  version_requirements: *70209186413900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.10
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70209186425820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70209186425820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: deface
-  requirement: &70209186421040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +229,15 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70209186421040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &70209186433540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,40 +245,60 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70209186433540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70209186431100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *70209186431100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.8
 - !ruby/object:Gem::Dependency
   name: money
-  requirement: &70209186514640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70209186514640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: rabl
-  requirement: &70209186511340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.7.2
   type: :runtime
   prerelease: false
-  version_requirements: *70209186511340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.2
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []
@@ -415,6 +505,7 @@ files:
 - app/models/spree/option_value.rb
 - app/models/spree/order/checkout.rb
 - app/models/spree/order.rb
+- app/models/spree/order_populator.rb
 - app/models/spree/order_updater.rb
 - app/models/spree/payment/processing.rb
 - app/models/spree/payment.rb
@@ -1155,11 +1246,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1528119227121806143
+      hash: -4519868674944601549
 requirements:
 - none
 rubyforge_project: spree_core
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Core e-commerce functionality for the Spree project.