spree_core 1.3.0.rc2 → 1.3.0

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

@@ -22,6 +22,7 @@ $(document).ready(function() {
           return { results: data }
         }
       },
+      dropdownCssClass: 'customer_search',
       formatResult: formatCustomerResult,
       formatSelection: function (customer) {
         _.each(['bill_address', 'ship_address'], function(address) {

data/app/models/spree/order.rb

@@ -201,15 +201,10 @@ module Spree
     # Array of totals grouped by Adjustment#label.  Useful for displaying price adjustments on an
     # invoice.  For example, you can display tax breakout for cases where tax is included in price.
     def price_adjustment_totals
-      totals = {}
-
-      price_adjustments.each do |adjustment|
-        label = adjustment.label
-        totals[label] ||= 0
-        totals[label] = totals[label] + adjustment.amount
-      end
-
-      totals
+      Hash[price_adjustments.group_by(&:label).map do |label, adjustments|
+        total = adjustments.sum(&:amount)
+        [label, Spree::Money.new(total, { :currency => currency })]
+      end]
     end
 
     def updater

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

@@ -40,10 +40,10 @@
   </tbody>
   <% if order.price_adjustment_totals.present? %>
     <tbody id="price-adjustments" data-hook="order_details_price_adjustments">
-      <% @order.price_adjustment_totals.keys.each do |key| %>
+      <% @order.price_adjustment_totals.each do |label, total| %>
         <tr>
-          <td colspan="3"><strong><%= key %></strong></td>
-          <td class="total"><span><%= @order.price_adjustment_totals[key].display_amount %></span></td>
+          <td colspan="3"><strong><%= label %></strong></td>
+          <td class="total"><span><%= total %></span></td>
         </tr>
       <% end %>
     </tbody>

data/app/views/spree/checkout/_summary.html.erb

@@ -21,10 +21,10 @@
     </tr>
     <% if order.price_adjustment_totals.present? %>
       <tbody id="price-adjustments" data-hook="order_details_price_adjustments">
-        <% @order.price_adjustment_totals.keys.each do |key| %>
+        <% @order.price_adjustment_totals.each do |label, total| %>
           <tr class="total">
-            <td><strong><%= key %></strong></td>
-            <td><strong><span><%= @order.price_adjustment_totals[key].display_total %></span></strong></td>
+            <td><strong><%= label %></strong></td>
+            <td><strong><span><%= total %></span></strong></td>
           </tr>
         <% end %>
       </tbody>

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

@@ -95,10 +95,10 @@
   </tfoot>
   <% if order.price_adjustment_totals.present? %>
     <tfoot id="price-adjustments" data-hook="order_details_price_adjustments">
-      <% @order.price_adjustment_totals.keys.each do |key| %>
+      <% @order.price_adjustment_totals.each do |key, total| %>
         <tr class="total">
           <td colspan="4"><strong><%= key %></strong></td>
-          <td class="total"><span><%= @order.price_adjustment_totals[key].display_amount %></span></td>
+          <td class="total"><span><%= total %></span></td>
         </tr>
       <% end %>
     </tfoot>

data/lib/spree/core/calculated_adjustments.rb

@@ -33,8 +33,7 @@ module Spree
                                     :source => calculable,
                                     :originator => self,
                                     :label => label,
-                                    :mandatory => mandatory,
-                                    :locked => true }, :without_protection => true)
+                                    :mandatory => mandatory}, :without_protection => true)
       end
 
       # Updates the amount of the adjustment using our Calculator and calling the +compute+ method with the +calculable+

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

@@ -24,7 +24,6 @@ module Spree
           return @current_order if @current_order
           if session[:order_id]
             current_order = Spree::Order.find_by_id_and_currency(session[:order_id], current_currency, :include => :adjustments)
-            current_order.last_ip_address = ip_address
             @current_order = current_order unless current_order.try(:completed?)
           end
           if create_order_if_necessary and (@current_order.nil? or @current_order.completed?)
@@ -33,8 +32,11 @@ module Spree
             @current_order.save!
             after_save_new_order
           end
-          session[:order_id] = @current_order ? @current_order.id : nil
-          @current_order
+          if @current_order
+            @current_order.last_ip_address = ip_address
+            session[:order_id] = @current_order.id
+            return @current_order
+          end
         end
 
         def associate_user
@@ -61,7 +63,7 @@ module Spree
             last_incomplete_order = user.last_incomplete_spree_order
             if session[:order_id].nil? && last_incomplete_order
               session[:order_id] = last_incomplete_order.id
-            elsif current_order && last_incomplete_order && current_order != last_incomplete_order
+            elsif current_order(true) && last_incomplete_order && current_order != last_incomplete_order
               current_order.merge!(last_incomplete_order)
             end
           end

data/lib/spree/core/testing_support/capybara_ext.rb

@@ -28,10 +28,16 @@ module CapybaraExt
 
   def select2_search(value, options)
     id = find_label_by_text(options[:from])
+    options[:from] = "#s2id_#{id}"
+    targetted_select2_search(value, options)
+  end
 
-    select2_id = "#s2id_#{id}"
-    find(select2_id).find(".select2-choices").click
-    page.execute_script "$('#{select2_id} input.select2-input').val('#{value}').trigger('keyup-change');"
+  def targetted_select2_search(value, options)
+    #p %Q{$('#{options[:from]}').select2('open')}
+    page.execute_script %Q{$('#{options[:from]}').select2('open')}
+    container = options[:dropdown_css] || ".select2-with-searchbox"
+    #p "$('#{container} input.select2-input').val('#{value}').trigger('keyup-change');"
+    page.execute_script "$('#{container} input.select2-input').val('#{value}').trigger('keyup-change');"
     select_select2_result(value)
   end
 
@@ -39,15 +45,20 @@ module CapybaraExt
     id = find_label_by_text(options[:from])
 
     # generate select2 id
-    select2_id = "#s2id_#{id}"
+    options[:from] = "#s2id_#{id}"
+    targetted_select2(value, options)
+  end
 
+  def targetted_select2(value, options)
     # find select2 element and click it
-    find("#{select2_id}").find('a').click
+    find(options[:from]).find('a').click
     select_select2_result(value)
   end
 
   def select_select2_result(value)
-    find(:xpath, %Q{//div[@class="select2-result-label" and text()="#{value}"]}).click
+    #p %Q{$("div.select2-result-label:contains('#{value}')").mouseup()}
+    sleep(1)
+    page.execute_script(%Q{$("div.select2-result-label:contains('#{value}')").mouseup()})
   end
 
   def find_label_by_text(text)

data/lib/spree/core/version.rb

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

metadata

@@ -1,51 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 1.3.0.rc2
-  prerelease: 6
+  version: 1.3.0
+  prerelease: 
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-16 00:00:00.000000000 Z
+date: 2012-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70209186380480 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.4
+  version_requirements: *70209186380480
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70209186378780 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 2.1.5
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.1.5
+  version_requirements: *70209186378780
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70209186388720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,15 +43,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
+  version_requirements: *70209186388720
 - !ruby/object:Gem::Dependency
   name: select2-rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70209186399300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,47 +54,32 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.2'
+  version_requirements: *70209186399300
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70209186396280 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.6.11
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.11
+  version_requirements: *70209186396280
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70209186410800 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.2
+  version_requirements: *70209186410800
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70209186407680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -117,15 +87,10 @@ dependencies:
         version: 1.12.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.12.0
+  version_requirements: *70209186407680
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70209186405000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,15 +98,10 @@ dependencies:
         version: '2.8'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.8'
+  version_requirements: *70209186405000
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70209186403600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -149,47 +109,32 @@ dependencies:
         version: 1.3.4
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.4
+  version_requirements: *70209186403600
 - !ruby/object:Gem::Dependency
   name: ransack
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70209186418360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.0
+  version_requirements: *70209186418360
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70209186416340 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.28.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.28.0
+  version_requirements: *70209186416340
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70209186413900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,31 +142,21 @@ dependencies:
         version: 3.2.9
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.9
+  version_requirements: *70209186413900
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70209186425820 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.13.0
+  version_requirements: *70209186425820
 - !ruby/object:Gem::Dependency
   name: deface
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70209186421040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -229,15 +164,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
+  version_requirements: *70209186421040
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70209186433540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -245,60 +175,40 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.2
+  version_requirements: *70209186433540
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70209186431100 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.7
+  version_requirements: *70209186431100
 - !ruby/object:Gem::Dependency
   name: money
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70209186514640 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 5.0.0
+  version_requirements: *70209186514640
 - !ruby/object:Gem::Dependency
   name: rabl
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70209186511340 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.7.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.7.2
+  version_requirements: *70209186511340
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []
@@ -1240,13 +1150,16 @@ 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: 1528119227121806143
 requirements:
 - none
 rubyforge_project: spree_core
-rubygems_version: 1.8.23
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Core e-commerce functionality for the Spree project.