piggybak_coupons 0.0.7 → 0.0.8

data/README.md

@@ -11,9 +11,7 @@ TODO
 
 * Document installation notes
 
-* Modify JS so that coupon doesn't trigger AJAX if recently looked up
-
-* Add coupon success message
+* Modify JS to not require addition of "inputs", complete via backend filter instead.
 
 
 Copyright

data/app/assets/javascripts/piggybak_coupons/piggybak_coupons.js

@@ -1,46 +1,29 @@
 $(function() {
 	$('#coupon_code').change(function() {
-		$(this).data('changed', true);
+		piggybak_coupons.apply_coupon();
 	});
 	piggybak.shipping_els.live('change', function() {
 		if($('#coupon_code').val() != '') {
 			setTimeout(function() {
-				$('#coupon_code').data('changed', true);
-				piggybak_coupons.apply_coupon(false);
+				piggybak_coupons.apply_coupon();
 			}, 500);
 		}
 	});
 	$('#shipping select').live('change', function() {
-		$('#coupon_code').data('changed', true);
-		piggybak_coupons.apply_coupon(false);
-	});
-	$('#apply_coupon').click(function() {
-		piggybak_coupons.apply_coupon(false);
-		return false;		
-	});
-	$('#submit input').unbind('click').click(function() {
-		piggybak_coupons.apply_coupon(true);
-		return false;
+		piggybak_coupons.apply_coupon();
 	});
 	setTimeout(function() {
 		if($('#coupon_code').val() != '') {
-			$('#coupon_code').data('changed', true);
-			piggybak_coupons.apply_coupon(false);
+			piggybak_coupons.apply_coupon();
 		}
 	}, 500);
 });
 
 var piggybak_coupons = {
-	apply_coupon: function(on_submit) {
-		if(!$('#coupon_code').data('changed')) {
-			if(on_submit) {
-				$('#new_piggybak_order').submit();
-			}
-			return;
-		}
-		$('#coupon_code').data('changed', false);
+	apply_coupon: function() {
 		$('#coupon input[type=hidden]').remove();
 		$('#coupon_response').hide();
+		$('#coupon_ajax').show();
 		$.ajax({
 			url: coupon_lookup,
 			cached: false,
@@ -55,7 +38,7 @@ var piggybak_coupons = {
 					var el2 = $('<input>').attr('type', 'hidden').attr('name', 'piggybak_order[line_items_attributes][2][coupon_application_attributes][code]').val($('#coupon_code').val());
 					$('#coupon').append(el1);
 					$('#coupon').append(el2);
-					$('#coupon_response').html('Coupon successfully applied to order.');
+					$('#coupon_response').html('Coupon successfully applied to order.').show();
 					$('#coupon_application_total').html('-$' + (-1*parseFloat(data.amount)).toFixed(2));
 					$('#coupon_application_row').show();
 					piggybak.update_totals();
@@ -67,12 +50,10 @@ var piggybak_coupons = {
 					$('#coupon_application_row').hide();
 					piggybak.update_totals();
 				}
-				if(on_submit) {
-					$('#new_piggybak_order').submit();
-				}
+				$('#coupon_ajax').hide();
 			},
 			error: function() {
-				//do nothing right now
+				$('#coupon_ajax').hide();
 			}
 		});
 	}	

data/app/views/piggybak_coupons/_apply_coupon.html.erb

@@ -3,7 +3,9 @@
 <div id="piggybak_coupon_apply_box">
 <div id="coupon_response" style="display:none;"></div>
 <input type="text" name="piggybak_coupon_code" id="coupon_code" value="<%= params.has_key?(:piggybak_coupon_code) ? params[:piggybak_coupon_code] : '' %>" />
-<input type="submit" value="Apply Coupon" id="apply_coupon" />
+<%= image_tag "ajax-loader.gif", :style => "display:none;" %>
+<br />
+<small>This will be applied automatically when modified.</small>
 </div>
 
 <script type="text/javascript">

data/lib/piggybak_coupons/version.rb

@@ -1,3 +1,3 @@
 module PiggybakCoupons
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piggybak_coupons
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,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
@@ -95,7 +95,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1746874936992918947
+      hash: 221606661625238227
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1746874936992918947
+      hash: 221606661625238227
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23