piggybak 0.6.12 → 0.6.13

data/app/assets/javascripts/piggybak/piggybak-application.js

@@ -6,4 +6,5 @@
 //
 //= require piggybak/piggybak
 //= require piggybak/jquery.ajaxq
+//= require piggybak/jquery.validate
 //= require piggybak/piggybak.states

data/app/assets/javascripts/piggybak/piggybak.js

@@ -4,23 +4,21 @@ var page_load = 1;
 var shipping_field;
 
 $(function() {
-	piggybak.prevent_double_click();
 	shipping_field = $('#piggybak_order_line_items_attributes_0_shipment_attributes_shipping_method_id');
 	piggybak.initialize_listeners();
 	piggybak.update_shipping_options($('#piggybak_order_shipping_address_attributes_state_id'), function() {
 		$('#piggybak_order_shipments_attributes_0_shipping_method_id').val(previous_shipping);
 	});
 	piggybak.update_tax();
+	$('#new_piggybak_order').validate({
+		submitHandler: function(form) {
+			form.submit()
+		}
+	});
 });
 
 var piggybak = {
 	shipping_els: $('#piggybak_order_shipping_address_attributes_state_id,#piggybak_order_shipping_address_attributes_country_id,#piggybak_order_shipping_address_attributes_zip'),
-	prevent_double_click: function() {
-		$('#new_piggybak_order').find('input:submit').removeAttr('disabled');
-		$('#new_piggybak_order').submit(function() {
-			$(this).find('input:submit').attr('disabled', 'disabled');
-		});
-	},
 	initialize_listeners: function() {
 		piggybak.shipping_els.live('change', function() {
 			piggybak.update_shipping_options($(this));
@@ -49,6 +47,7 @@ var piggybak = {
 			var state = $('#piggybak_order_billing_address_attributes_state_id').val();
 			$('#piggybak_order_shipping_address_attributes_state_id').val(state);
 		});
+		$('#shipping_address input').valid();
 	},
 	valid_shipping_address: function() {
 		var empty = 0;
@@ -116,7 +115,7 @@ var piggybak = {
 		});
 	},
 	update_totals: function() {
-		var subtotal = $('#subtotal_total').data('total');
+		var subtotal = parseFloat($('#subtotal_total').data('total'));
 		$('#tax_total').html('$' + tax_total.toFixed(2));
 		var shipping_total = 0;
 		if($('#shipping select option:selected').length) {

data/app/views/piggybak/orders/submit.html.erb

@@ -16,17 +16,17 @@
 	<div class="item">
 		<% if current_user -%>
 		<%= f.label :email %>
-		<%= f.text_field :email, { :readonly => true, :class => "readonly" } %><br />
+		<%= f.text_field :email, { :readonly => true, :class => "readonly required" } %>
 		<span>or <%= link_to 'LOGOUT', destroy_user_session_path, :method => :delete, :class => "last" %></span>
 		<% else -%>
 		<%= f.label :email %>
-		<%= f.text_field :email %><br />
+		<%= f.text_field :email, :class =-> "required" %><br />
 		<span>or <%= link_to 'LOG IN', new_user_session_path %></span>
 		<% end -%>
 	</div>
 	<div class="item">
 		<%= f.label :phone %>
-		<%= f.text_field :phone %>
+		<%= f.text_field :phone, :class => "required" %>
 	</div>
 </div>
 
@@ -78,10 +78,10 @@
 			<%= payment.label :number %>
 			<% if @order.errors.keys.include?("payments.number".to_sym) %>
 			<span class="field_with_errors">
-			<%= payment.text_field :number %>
+			<%= payment.text_field :number, :class => "required" %>
 			</span>
 			<% else -%>
-			<%= payment.text_field :number %>
+			<%= payment.text_field :number, :class => "required" %>
 			<% end -%>
 			</div>
 	
@@ -89,10 +89,10 @@
 			<%= payment.label :verification_value %>
 			<% if @order.errors.keys.include?("payments.verification_value".to_sym) %>
 			<span class="field_with_errors">
-			<%= payment.text_field :verification_value %>
+			<%= payment.text_field :verification_value, :class => "required" %>
 			</span>
 			<% else -%>
-			<%= payment.text_field :verification_value %>
+			<%= payment.text_field :verification_value, :class => "required" %>
 			<% end -%>
 			</div>
 	

data/lib/piggybak/version.rb

@@ -1,3 +1,3 @@
 module Piggybak
-  VERSION = "0.6.12"
+  VERSION = "0.6.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piggybak
 version: !ruby/object:Gem::Version
-  version: 0.6.12
+  version: 0.6.13
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2012-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -106,6 +106,7 @@ files:
 - app/assets/javascripts/piggybak/piggybak.js
 - app/assets/javascripts/piggybak/piggybak.states.js
 - app/assets/javascripts/piggybak/piggybak-application.js
+- app/assets/javascripts/piggybak/jquery.validate.js
 - app/assets/javascripts/piggybak/jquery.ajaxq.js
 - app/assets/images/ajax-loader.gif
 - app/models/piggybak/payment_calculator/fake.rb
@@ -212,7 +213,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1733522364764140920
+      hash: 1341771261448397345
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -221,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1733522364764140920
+      hash: 1341771261448397345
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23