piggybak 0.6.34 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94b5a0a0fd89dc240c03223177459facec423547
-  data.tar.gz: 753d6351fa7aaf93d47ab9c5fa400349c1e39439
+  metadata.gz: 9cdf2d5cc0e37659ae8f4feced76d5962cc06951
+  data.tar.gz: 4588a015c22ef9592f318cfe73eed056e408661f
 SHA512:
-  metadata.gz: fdf32c2d395715e618a7a33454aa1c5b8f1c1585c24b4d18b90903404c8e885a71e83bee78f38c20bb688a2e9b91e6501c1f2914918a3c18640ceabb0902f8aa
-  data.tar.gz: be61bb408522ff2db2c09f30d320cb1416db0f313393b17322413aca61cf3f6e5abdff905ad44ec9b7b4d31db08ae5322e1c67a66baa38a329705e0b7a903c58
+  metadata.gz: 0922ce19a2e5ee163b94d88b832b8cc859a28d1dbb1fade281a2884ef05a447a786d0878c1e7b974a7b8c41b448ea367f6db4ce324f0c2070e9bd91b876f76ab
+  data.tar.gz: 12962e94a387f5153892f27a3ab72acbde68ad548ae4c4d90750557345b6e5ad4baeba6030295db95a7f549e2d2a50c1541f3672a109a4415d4bf6016598a2c8

data/Gemfile

@@ -4,17 +4,3 @@ source "http://rubygems.org"
 # Bundler will treat runtime dependencies like base dependencies, and
 # development dependencies will be added by default to the :development group.
 gemspec
-
-# jquery-rails is used by the dummy application
-gem "jquery-rails"
-
-# Declare any dependencies that are still in development here instead of in
-# your gemspec. These might include edge Rails or gems from your path or
-# Git. Remember to move these dependencies to your gemspec before releasing
-# your gem to rubygems.org.
-
-# To use debugger
-# gem 'debugger'
-
-gem "countries"
-gem "rack-ssl-enforcer"

data/Gemfile.lock

@@ -1,34 +1,18 @@
 PATH
   remote: .
   specs:
-    piggybak (0.6.34)
+    piggybak (0.7.0)
       activemerchant
       countries
-      devise
       rack-ssl-enforcer
-      rails (~> 3.2.8)
-      rails_admin (~> 0.4.5)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.16)
-      actionpack (= 3.2.16)
-      mail (~> 2.5.4)
-    actionpack (3.2.16)
-      activemodel (= 3.2.16)
-      activesupport (= 3.2.16)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    active_utils (2.0.1)
+    active_utils (2.0.2)
       activesupport (>= 2.3.11)
       i18n
-    activemerchant (1.42.4)
+    activemerchant (1.42.7)
       active_utils (~> 2.0, >= 2.0.1)
       activesupport (>= 2.3.14, < 5.0.0)
       builder (>= 2.1.2, < 4.0.0)
@@ -36,148 +20,33 @@ GEM
       json (~> 1.7)
       money (< 7.0.0)
       nokogiri (~> 1.4)
-    activemodel (3.2.16)
-      activesupport (= 3.2.16)
-      builder (~> 3.0.0)
-    activerecord (3.2.16)
-      activemodel (= 3.2.16)
-      activesupport (= 3.2.16)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.16)
-      activemodel (= 3.2.16)
-      activesupport (= 3.2.16)
-    activesupport (3.2.16)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    arel (3.0.3)
-    atomic (1.1.14)
-    bcrypt-ruby (3.1.2)
-    bootstrap-sass (2.3.2.2)
-      sass (~> 3.2)
-    builder (3.0.4)
-    coffee-rails (3.2.2)
-      coffee-script (>= 2.2.0)
-      railties (~> 3.2.0)
-    coffee-script (2.2.0)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.6.3)
+    activesupport (4.0.4)
+      i18n (~> 0.6, >= 0.6.9)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    atomic (1.1.16)
+    builder (3.2.2)
     countries (0.9.3)
       currencies (~> 0.4.2)
     currencies (0.4.2)
-    devise (3.2.2)
-      bcrypt-ruby (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
-      thread_safe (~> 0.1)
-      warden (~> 1.2.3)
-    erubis (2.7.0)
-    execjs (2.0.2)
-    font-awesome-rails (3.2.1.3)
-      railties (>= 3.2, < 5.0)
-    haml (4.0.5)
-      tilt
-    hike (1.2.3)
     i18n (0.6.9)
-    journey (1.0.4)
-    jquery-rails (3.0.4)
-      railties (>= 3.0, < 5.0)
-      thor (>= 0.14, < 2.0)
-    jquery-ui-rails (3.0.1)
-      jquery-rails
-      railties (>= 3.1.0)
     json (1.8.1)
-    kaminari (0.15.1)
-      actionpack (>= 3.0.0)
-      activesupport (>= 3.0.0)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.25.1)
-    mini_portile (0.5.2)
-    monetize (0.1.3)
-    money (6.0.1)
+    mini_portile (0.5.3)
+    minitest (4.7.5)
+    money (6.1.1)
       i18n (~> 0.6.4)
-      monetize (~> 0.1.3)
-    multi_json (1.8.4)
-    nested_form (0.3.2)
+    multi_json (1.9.2)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
-    orm_adapter (0.5.0)
-    polyglot (0.3.3)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-pjax (0.7.0)
-      nokogiri (~> 1.5)
-      rack (~> 1.3)
-    rack-ssl (1.3.3)
-      rack
     rack-ssl-enforcer (0.2.6)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.2.16)
-      actionmailer (= 3.2.16)
-      actionpack (= 3.2.16)
-      activerecord (= 3.2.16)
-      activeresource (= 3.2.16)
-      activesupport (= 3.2.16)
-      bundler (~> 1.0)
-      railties (= 3.2.16)
-    rails_admin (0.4.9)
-      bootstrap-sass (~> 2.2)
-      builder (~> 3.0)
-      coffee-rails (>= 3.1, < 5)
-      font-awesome-rails (~> 3.0)
-      haml (~> 4.0)
-      jquery-rails (>= 2.1, < 4)
-      jquery-ui-rails (~> 3.0)
-      kaminari (~> 0.14)
-      nested_form (~> 0.3)
-      rack-pjax (~> 0.6)
-      rails (~> 3.1)
-      remotipart (~> 1.0)
-      safe_yaml (~> 0.6)
-      sass-rails (~> 3.1)
-    railties (3.2.16)
-      actionpack (= 3.2.16)
-      activesupport (= 3.2.16)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.1.1)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    remotipart (1.2.1)
-    safe_yaml (0.9.7)
-    sass (3.2.13)
-    sass-rails (3.2.6)
-      railties (~> 3.2.0)
-      sass (>= 3.1.10)
-      tilt (~> 1.3)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.38)
-    warden (1.2.3)
-      rack (>= 1.0)
+    thread_safe (0.3.1)
+      atomic (>= 1.1.7, < 2)
+    tzinfo (0.3.39)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  countries
-  jquery-rails
   piggybak!
-  rack-ssl-enforcer

data/README.md

@@ -11,6 +11,8 @@ Modular / mountable ecommerce gem. Features:
 
 * Fully defined backend RailsAdmin interface for adding orders on the backend
 
+* Piggybak 0.7.0 is compatible with Rails 4, and earlier versions compatible with Rails 3.
+
 
 Announcements
 ========
@@ -42,6 +44,10 @@ Installation
 
         piggybak install
 
+* Add piggybak/piggybak-application to your main application.js:
+
+       //= require piggybak/piggybak-application
+
 (NOTE: If you run into an error saying that piggybak gem is missing, use bundle exec piggybak install)
 
 * Follow the instructions [here][documentation] to read more about the integration points and product configuration in Piggybak.

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

@@ -4,15 +4,18 @@ var page_load = 1;
 var shipping_field;
 
 $(function() {
-	shipping_field = $('#piggybak_order_line_items_attributes_0_shipment_attributes_shipping_method_id');
+	if($('form#new_order').size() == 0) {
+		return;
+	}
+	shipping_field = $('#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_shipping_options($('#order_shipping_address_attributes_state_id'), function() {
+		$('#order_shipments_attributes_0_shipping_method_id').val(previous_shipping);
 	});
 	piggybak.update_tax();
-	$('#new_piggybak_order').validate({
+	$('#new_order').validate({
 		submitHandler: function(form) {
-      var submit = $($('#new_piggybak_order input[type=submit]'));
+      var submit = $($('#new_order input[type=submit]'));
       submit.prop('disabled',true);
       submit.attr('value','Processing...');
 			form.submit()
@@ -21,20 +24,20 @@ $(function() {
 });
 
 var piggybak = {
-	shipping_els: '#piggybak_order_shipping_address_attributes_state_id,#piggybak_order_shipping_address_attributes_country_id,#piggybak_order_shipping_address_attributes_zip',
+	shipping_els: '#order_shipping_address_attributes_state_id,#order_shipping_address_attributes_country_id,#order_shipping_address_attributes_zip',
 	initialize_listeners: function() {
 		$(document).on('change', piggybak.shipping_els, function() {
 			piggybak.update_shipping_options($(this));
 		});
-		$(document).on('change', '#piggybak_order_billing_address_attributes_state_id', function() {
+		$(document).on('change', '#order_billing_address_attributes_state_id', function() {
 			piggybak.update_tax();
 		});
 		$('#shipping select').change(function() {
 			piggybak.update_totals();
 		});
-		$('#shipping_address #copy').click(function() {
+		$('#shipping_address #copy').on('click', function() {
 			piggybak.copy_from_billing();
-			piggybak.update_shipping_options($('#piggybak_order_shipping_address_attributes_state_id'));
+			piggybak.update_shipping_options($('#order_shipping_address_attributes_state_id'));
 			return false;
 		});
 		return;
@@ -44,11 +47,11 @@ var piggybak = {
 			var id = $(j).attr('id').replace(/billing_address/, 'shipping_address');
 			$('#' + id).val($(j).val());	
 		});
-		var country = $('#piggybak_order_billing_address_attributes_country_id').val();
-		$('#piggybak_order_shipping_address_attributes_country_id').val(country);
+		var country = $('#order_billing_address_attributes_country_id').val();
+		$('#order_shipping_address_attributes_country_id').val(country);
 		piggybak_states.update_state_option('shipping', function() {
-			var state = $('#piggybak_order_billing_address_attributes_state_id').val();
-			$('#piggybak_order_shipping_address_attributes_state_id').val(state);
+			var state = $('#order_billing_address_attributes_state_id').val();
+			$('#order_shipping_address_attributes_state_id').val(state);
 		});
 		$('#shipping_address input').valid();
 	},
@@ -107,7 +110,7 @@ var piggybak = {
 		});
 		$('#billing_address input, #billing_address select').each(function(i, j) {
 			var id = $(j).attr('id');
-			id = id.replace("piggybak_order_billing_address_attributes_", '');
+			id = id.replace("order_billing_address_attributes_", '');
 			billing_data[id] = $(j).val();	
 		});
 		$.ajax({
@@ -141,7 +144,7 @@ var piggybak = {
 		$('#shipping_address input, #shipping_address select').each(function(i, j) {
 			var id = $(j).attr('id');
 			if(typeof(id) !== 'undefined') {
-				id = id.replace("piggybak_order_shipping_address_attributes_", '');
+				id = id.replace("order_shipping_address_attributes_", '');
 				if($(j).is(':checkbox')) {
 					shipping_data[id] = $(j).is(':checked');
 				} else {

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

@@ -2,10 +2,10 @@ var geodata;
 
 var piggybak_states = {
 	initialize_listeners: function() {
-		$('#piggybak_order_shipping_address_attributes_country_id').change(function() {
+		$('#order_shipping_address_attributes_country_id').change(function() {
 			piggybak_states.update_state_option('shipping');
 		});
-		$('#piggybak_order_billing_address_attributes_country_id').change(function() {
+		$('#order_billing_address_attributes_country_id').change(function() {
 			piggybak_states.update_state_option('billing');
 		});
 		return;
@@ -23,7 +23,7 @@ var piggybak_states = {
 		});
 	},
 	update_state_option: function(type, block) {
-		var country_field = $('#piggybak_order_' + type + '_address_attributes_country_id');
+		var country_field = $('#order_' + type + '_address_attributes_country_id');
 		var country_id = country_field.val();
 		var new_field;
 
@@ -35,7 +35,7 @@ var piggybak_states = {
 		} else {
 			new_field = $('<input>');
 		}
-		var old_field = $('#piggybak_order_' + type + '_address_attributes_state_id');
+		var old_field = $('#order_' + type + '_address_attributes_state_id');
 		new_field.attr('name', old_field.attr('name')).attr('id', old_field.attr('id'));
 		if(old_field.prop('tagName') == new_field.prop('tagName')) {
 			new_field.val(old_field.val());
@@ -50,6 +50,9 @@ var piggybak_states = {
 };
 
 $(function() {
+	if($('form#new_order').size() == 0) {
+		return;
+	}
 	piggybak_states.populate_geodata();
 	piggybak_states.initialize_listeners();
 });

data/app/assets/javascripts/rails_admin/custom/ui.js.erb

@@ -38,17 +38,17 @@ var piggybak_rails_admin = {
 
 		if(country_id == '') {
 			country_id = "<%= ::Piggybak::Country.where(abbr: Piggybak.config.default_country).first.id %>";
-		}
+		} 
 		if(geodata.countries["country_" + country_id].length > 0) {
 			new_field = $('<select>');
 			$.each(geodata.countries["country_" + country_id], function(i, j) {
 				new_field.append($('<option>').val(j.id).html(j.name));
-			});
+			});	
 		} else {
 			new_field = $('<input>');
 		}
 
-		var old_field = $('#piggybak_order_' + type + '_address_attributes_state_id');
+		var old_field = $('#' + type + '_state_id');
 		new_field.attr('name', old_field.attr('name')).attr('id', old_field.attr('id'));
 		if(old_field.prop('tagName') == new_field.prop('tagName')) {
 			new_field.val(old_field.val());
@@ -64,12 +64,12 @@ var piggybak_rails_admin = {
 	toggle_line_item: function(el) {
 		var line_item = el.parent().parent().parent();
 		line_item.find('> div.control-group').not('.line_item_type_field').hide();
-		if(piggybak_rails_admin.line_item_types[el.val()].fields !== undefined) {
-			$.each(piggybak_rails_admin.line_item_types[el.val()].fields, function(a, b) {
-				line_item.find('> div.' + b + '_field').show();
-			});
+  		if(piggybak_rails_admin.line_item_types[el.val()].fields !== undefined) {
+  			$.each(piggybak_rails_admin.line_item_types[el.val()].fields, function(a, b) {
+  				line_item.find('> div.' + b + '_field').show();
+  			});
 		}
-	}
+  	}
 };
 
 $(function() {
@@ -80,30 +80,35 @@ $(function() {
 	piggybak_rails_admin.populate_geodata();
 	piggybak_rails_admin.initialize_listeners();
 
-	$('#copy_from_billing').click(function(e) {
+  	$('#copy_from_billing').click(function(e) {
 		e.preventDefault();
 
-		$.each($('#piggybak_order_billing_address_attributes_field input'), function(i, el) {
-			if($(el).attr('id') !== undefined) {
-				var shipping_id = $(el).attr('id').replace('billing', 'shipping');
-				$('#' + shipping_id).val($(el).val());
-			}
-		});
-		$('#piggybak_order_shipping_address_attributes_country_id').val($('#piggybak_order_billing_address_attributes_country_id').val());
-		piggybak_rails_admin.update_state_option('shipping', function() {
-			$('#piggybak_order_shipping_address_attributes_state_id').val($('#piggybak_order_billing_address_attributes_state_id').val());
+  		$.each($('#piggybak_order_billing_address_attributes_field input'), function(i, el) {
+  			if($(el).attr('id') !== undefined) {
+  				var shipping_id = $(el).attr('id').replace('billing', 'shipping');
+  				$('#' + shipping_id).val($(el).val());
+  			}
+  		});
+		$('#piggybak_order_shipping_address_attributes_country_id option:last').remove();
+		$('<option>').val($('#piggybak_order_billing_address_attributes_country_id').val()).html($('#piggybak_order_billing_address_attributes_country_id_field input').val()).appendTo($('#piggybak_order_shipping_address_attributes_country_id'));
+  		$('#piggybak_order_shipping_address_attributes_country_id').val($('#piggybak_order_billing_address_attributes_country_id').val());
+  		$('#piggybak_order_shipping_address_attributes_country_id_field input').val($('#piggybak_order_billing_address_attributes_country_id_field input').val());
+  		piggybak_rails_admin.update_state_option('shipping', function() {
+			$('#shipping_state_id').val($('#billing_state_id').val());
+			$('#piggybak_order_shipping_address_attributes_state_id').val($('#shipping_state_id').val());
 		});
-	});
+  		return false;
+  	});
 
 	//From polymorphic
-	$.each($('.line_item_type_field select,.line_item_type_field input'), function(i, el) {
-		piggybak_rails_admin.toggle_line_item($(el));
-	});
-	//Removing delete-ability of line_item_types that can't be destroyed
-	$.each($('.line_item_type_field input'), function(i, el) {
-		if(!piggybak_rails_admin.line_item_types[$(el).val()].allow_destroy) {
-			$(el).parentsUntil('fieldset').parent().parent().find('.remove_nested_fields').remove();
-		}
-	});
+  	$.each($('.line_item_type_field select,.line_item_type_field input'), function(i, el) {
+  		piggybak_rails_admin.toggle_line_item($(el));
+  	});
+  	//Removing delete-ability of line_item_types that can't be destroyed
+  	$.each($('.line_item_type_field input'), function(i, el) {
+  		if(!piggybak_rails_admin.line_item_types[$(el).val()].allow_destroy) {
+  			$(el).parentsUntil('fieldset').parent().parent().find('.remove_nested_fields').remove();
+  		}
+  	});
 });