spree_core 0.70.3 → 0.70.4

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

@@ -40,7 +40,7 @@ $(document).ready(function(){
     });
   }
 
-  $("#customer_search").autocomplete("/admin/users.json?authenticity_token=" + $('meta[name=csrf-token]').attr("content"), {
+  $("#customer_search").autocomplete("/admin/users.json?authenticity_token=" + encodeURIComponent($('meta[name=csrf-token]').attr("content")), {
     minChars: 5,
     delay: 1500,
     parse: prep_user_autocomplete_data,

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

@@ -60,10 +60,6 @@
         }
       }).triggerHandler('click');
 
-      $('form.edit_order').submit(function() {
-        $(this).find(':submit, :image').attr('disabled', true).removeClass('primary').addClass('disabled');
-      });
-
     }
 
     if($('#checkout_form_payment').is('*')){
@@ -75,3 +71,9 @@
     }
   });
 })(jQuery);
+
+function disableSaveOnClick() {
+  $('form.edit_spree_order').submit(function() {
+    $(this).find(':submit, :image').attr('disabled', true).removeClass('primary').addClass('disabled');
+  });
+}

data/app/models/calculator/{price_bucket.rb → price_sack.rb}

@@ -1,10 +1,10 @@
-class Calculator::PriceBucket < Calculator
+class Calculator::PriceSack < Calculator
   preference :minimal_amount, :decimal, :default => 0
   preference :normal_amount, :decimal, :default => 0
   preference :discount_amount, :decimal, :default => 0
 
   def self.description
-    I18n.t("price_bucket")
+    I18n.t("price_sack")
   end
 
   # as object we always get line items, as calculable we have Coupon, ShippingMethod

data/app/models/payment.rb

@@ -69,9 +69,15 @@ class Payment < ActiveRecord::Base
   end
 
   def process!
-    if !processing? and source and source.respond_to?(:process!)
-      started_processing!
-      source.process!(self) # source is responsible for updating the payment state when it's done processing
+    if payment_method && payment_method.source_required?
+      if source
+        if !processing? && source.respond_to?(:process!)
+          started_processing!
+          source.process!(self) # source is responsible for updating the payment state when it's done processing
+        end
+      else
+        raise Spree::GatewayError.new(I18n.t(:payment_processing_failed))
+      end
     end
   end
 

data/app/models/payment_method.rb

@@ -45,4 +45,8 @@ class PaymentMethod < ActiveRecord::Base
     false
   end
 
+  def source_required?
+    true
+  end
+
 end

data/app/models/payment_method/check.rb

@@ -24,4 +24,8 @@ class PaymentMethod::Check < PaymentMethod
     payment.void
     true
   end
+  
+  def source_required?
+    false
+  end
 end

data/app/views/checkout/_payment.html.erb

@@ -27,4 +27,5 @@
 <hr class="space" />
 <div class="form-buttons" data-hook="buttons">
   <%= submit_tag t(:save_and_continue), :class => 'continue button primary' %>
+  <script>disableSaveOnClick();</script>
 </div>

data/config/locales/en.yml

@@ -672,7 +672,7 @@ en:
   preview: Preview
   previous: Previous
   price: Price
-  price_bucket: Price Bucket
+  price_sack: Price Sack
   price_with_vat_included: "%{price} (inc. VAT)"
   problem_authorizing_card: "Problem authorizing credit card"
   problem_capturing_card: "Problem capturing credit card"

data/lib/spree_core/railtie.rb

@@ -28,9 +28,9 @@ module SpreeCore
           Calculator::FlatRate,
           Calculator::FlexiRate,
           Calculator::PerItem,
-          Calculator::PriceBucket]
+          Calculator::PriceSack]
 
-       app.config.spree.calculators.tax_rates = [
+      app.config.spree.calculators.tax_rates = [
           Calculator::SalesTax,
           Calculator::Vat]
     end
@@ -56,7 +56,7 @@ module SpreeCore
 
     # sets the manifests / assets to be precompiled
     initializer "spree.assets.precompile" do |app|
-      app.config.assets.precompile += ['store/all.*', 'admin/all.*', 'admin/spree_dash.*', 'admin/orders/edit_form.js', 'jqPlot/excanvas.min.js', 'admin/images/new.js', 'jquery.jstree/themes/apple/*']
+      app.config.assets.precompile += ['store/all.*', 'admin/all.*', 'admin/spree_dash.*', 'admin/orders/edit_form.js', 'admin/address_states.js', 'jqPlot/excanvas.min.js', 'admin/images/new.js', 'jquery.jstree/themes/apple/*']
     end
 
     # turn off asset debugging since that kills performance in development mode

data/lib/spree_core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "0.70.3"
+    "0.70.4"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_core
 version: !ruby/object:Gem::Version 
-  hash: 257
+  hash: 271
   prerelease: 
   segments: 
   - 0
   - 70
-  - 3
-  version: 0.70.3
+  - 4
+  version: 0.70.4
 platform: ruby
 authors: 
 - Sean Schofield
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-22 00:00:00 Z
+date: 2012-03-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -103,12 +103,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 27
         segments: 
         - 1
-        - 0
         - 3
-        version: 1.0.3
+        - 0
+        version: 1.3.0
   requirement: *id006
   type: :runtime
   prerelease: false
@@ -151,12 +151,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 27
         segments: 
         - 2
-        - 4
-        - 1
-        version: 2.4.1
+        - 5
+        - 0
+        version: 2.5.0
   requirement: *id009
   type: :runtime
   prerelease: false
@@ -221,12 +221,12 @@ dependencies:
         version: 3.1.1
     - - <=
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 11
         segments: 
         - 3
         - 1
-        - 3
-        version: 3.1.3
+        - 4
+        version: 3.1.4
   requirement: *id013
   type: :runtime
   prerelease: false
@@ -477,7 +477,7 @@ files:
 - app/models/calculator/flat_rate.rb
 - app/models/calculator/flexi_rate.rb
 - app/models/calculator/per_item.rb
-- app/models/calculator/price_bucket.rb
+- app/models/calculator/price_sack.rb
 - app/models/calculator/sales_tax.rb
 - app/models/calculator/vat.rb
 - app/models/calculator.rb