spree 0.8.5 → 0.9.0

data/lib/tasks/database.rake

@@ -30,13 +30,7 @@ namespace :db do
   end
   
   desc 'Create the database, load the schema, and initialize with the seed data'  
-  task :setup => [ 'db:create', 'db:schema:load', 'db:seed' ]  
-       
-  desc 'Load the seed data from db/seeds.rb'  
-  task :seed => :environment do  
-    seed_file = File.join(SPREE_ROOT, 'db', 'seeds.rb')  
-    load(seed_file) if File.exist?(seed_file)  
-  end
+  task :setup => [ 'db:create', 'db:schema:load', 'db:seed' ]         
 
   desc 'Load the sample fixture data from db/sample'  
   task :sample => :environment do  

data/lib/tasks/extensions.rake

@@ -9,6 +9,13 @@ namespace :db do
     # spree 
     ActiveRecord::Migrator.migrate("#{SPREE_ROOT}/db/migrate/", version)
     # extensions
+    Spree::Extension.descendants.select{|ext| ext.root.starts_with?(SPREE_ROOT)}.each do |extension|
+      ActiveRecord::Migrator.migrate("#{extension.root}/db/migrate/", version)
+    end    
+    Spree::Extension.descendants.select{|ext| !ext.root.starts_with?(SPREE_ROOT)}.each do |extension|
+      ActiveRecord::Migrator.migrate("#{extension.root}/db/migrate/", version)
+    end    
+    
     Spree::Extension.descendants.each do |extension|
       ActiveRecord::Migrator.migrate("#{extension.root}/db/migrate/", version)
     end    
@@ -29,9 +36,12 @@ namespace :db do
       # spree 
       ActiveRecord::Migrator.run(:up, "#{SPREE_ROOT}/db/migrate/", version)
       # extensions
-      Spree::Extension.descendants.each do |extension|
-        ActiveRecord::Migrator.run(:up, "#{extension.root}/db/migrate/", version)
-      end        
+      Spree::Extension.descendants.select{|ext| ext.root.starts_with?(SPREE_ROOT)}.each do |extension|
+        ActiveRecord::Migrator.migrate("#{extension.root}/db/migrate/", version)
+      end    
+      Spree::Extension.descendants.select{|ext| !ext.root.starts_with?(SPREE_ROOT)}.each do |extension|
+        ActiveRecord::Migrator.migrate("#{extension.root}/db/migrate/", version)
+      end    
       Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
     end
 
@@ -42,9 +52,12 @@ namespace :db do
       # spree
       ActiveRecord::Migrator.run(:down, "#{SPREE_ROOT}/db/migrate/", version)
       # extensions
-      Spree::Extension.descendants.each do |extension|
-        ActiveRecord::Migrator.run(:down, "#{extension.root}/db/migrate/", version)
-      end        
+      Spree::Extension.descendants.select{|ext| ext.root.starts_with?(SPREE_ROOT)}.each do |extension|
+        ActiveRecord::Migrator.migrate("#{extension.root}/db/migrate/", version)
+      end    
+      Spree::Extension.descendants.select{|ext| !ext.root.starts_with?(SPREE_ROOT)}.each do |extension|
+        ActiveRecord::Migrator.migrate("#{extension.root}/db/migrate/", version)
+      end    
       Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
     end
   end
@@ -64,9 +77,12 @@ namespace :db do
       # spree
       pending_migrations += ActiveRecord::Migrator.new(:up, "#{SPREE_ROOT}/db/migrate/").pending_migrations
       # extensions
-      Spree::Extension.descendants.each do |extension|
+      Spree::Extension.descendants.select{|ext| ext.root.starts_with?(SPREE_ROOT)}.each do |extension|
+        pending_migrations += ActiveRecord::Migrator.new(:up, "#{extension.root}/db/migrate/").pending_migrations
+      end
+      Spree::Extension.descendants.select{|ext| !ext.root.starts_with?(SPREE_ROOT)}.each do |extension|
         pending_migrations += ActiveRecord::Migrator.new(:up, "#{extension.root}/db/migrate/").pending_migrations
-      end        
+      end
 
       if pending_migrations.any?
         puts "You have #{pending_migrations.size} pending migrations:"

data/lib/tasks/framework.rake

@@ -10,7 +10,6 @@ namespace :spree do
       end
       require 'rubygems'
       require 'rubygems/gem_runner'
-      Gem.manage_gems
 
       spree = (version = ENV['VERSION']) ?
         Gem.cache.search('spreee', "= #{version}").first :

data/lib/tasks/release.rake

@@ -14,17 +14,17 @@ RELEASE_NAME  = PKG_VERSION
 RUBY_FORGE_GROUPID = '5614'
 RUBY_FORGE_PACKAGEID = '7123'
 
-RDOC_TITLE = "Spree -- Complete Commerce Solution for Ruby on Rails"
+RDOC_TITLE = "Spree: Complete E-Commerce Solution for Ruby on Rails"
 RDOC_EXTRAS = ["README.markdown", "CONTRIBUTORS", "CHANGELOG", "INSTALL", "LICENSE"]
 
 namespace 'spree' do
   spec = Gem::Specification.new do |s|
     s.name = PKG_NAME
     s.version = PKG_VERSION
-    s.summary = 'A complete commerce solution for Ruby on Rails.'
-    s.description = "Spree is a complete commerce solution designed for use by experienced Rails developers. No solution can possibly solve everyone’s needs perfectly. There are simply too many ways that people do business for us to model them all specifically. Rather then come up short (like so many projects before it), Spree’s approach is to simply accept this and not even try. Instead Spree tries to focus on solving the 90% of the problem that most commerce projects face and anticipate that the other 10% will need to be addressed by the end developer familiar with the client’s exact business requirements."
+    s.summary = 'A complete e-commerce solution for Ruby on Rails.'
+    s.description = "Spree is a complete e-commerce solution designed for use by experienced Rails developers. No solution can possibly solve everyone’s needs perfectly. There are simply too many ways that people do business for us to model them all specifically. Rather then come up short (like so many projects before it), Spree’s approach is to simply accept this and not even try. Instead Spree tries to focus on solving the 90% of the problem that most commerce projects face and anticipate that the other 10% will need to be addressed by the end developer familiar with the client’s exact business requirements."
     s.author = "Sean Schofield"
-    s.email = "sean.schofield@gmail.com"
+    s.email = "sean@railsdog.com"
     s.homepage = 'http://spreecommerce.com/'
     s.rubyforge_project = RUBY_FORGE_PROJECT
     s.platform = Gem::Platform::RUBY
@@ -32,15 +32,18 @@ namespace 'spree' do
     s.executables = ['spree']
     s.add_dependency 'rake', '>= 0.7.1'
     s.add_dependency 'highline', '>= 1.4.0'
-    s.add_dependency 'rails', '= 2.3.2'
-    s.add_dependency 'activemerchant', '>= 1.4.1'
-    s.add_dependency 'activerecord-tableless', '>= 0.1.0' 
+    s.add_dependency 'rails', '= 2.3.4'
+    s.add_dependency 'activemerchant', '= 1.4.1'
+    s.add_dependency 'activerecord-tableless', '>= 0.1.0'
+    #s.add_dependency 'authlogic', '>=2.0.11'  (For some reason including authlogic causes bug - see #433)
     s.add_dependency 'calendar_date_select', '= 1.15' 
+    s.add_dependency 'haml-edge', '>=2.1.37'
+    s.add_dependency 'chronic', '>=0.2.3'
     s.add_dependency 'tlsmail', '= 0.0.1' 
     s.add_dependency 'rspec', '>= 1.2.0'
-    s.add_dependency 'rspec-rails', '>= 1.2.0' 
-    # For some reason the authlogic dependency really screws things up (See Issue #433)
-    #s.add_dependency 'authlogic', '>= 2.0.11'
+    s.add_dependency 'rspec-rails', '>= 1.2.0'
+    s.add_dependency 'searchlogic', ">=2.3.5" 
+
     s.has_rdoc = true
     #s.rdoc_options << '--title' << RDOC_TITLE << '--line-numbers' << '--main' << 'README'
     rdoc_excludes = Dir["**"].reject { |f| !File.directory? f }
@@ -66,7 +69,10 @@ namespace 'spree' do
     files.exclude /^pkg/
     files.include 'public/.htaccess.example'
     files.exclude 'public/images/products'
+    files.exclude 'public/assets/products'
     files.exclude 'tmp/'
+    files.exclude 'vendor/plugins/delegate_belongs_to/spec/app_root/log/*.log'
+    files.exclude 'vendor/plugins/resource_controller/test/*'
     s.files = files.to_a
   end
 
@@ -81,8 +87,13 @@ namespace 'spree' do
       sh "gem uninstall #{PKG_NAME}" rescue nil
     end
 
+    desc "Install the gems needed for testing"
+    task :test_gems do
+      system "rake gems:install RAILS_ENV=test"
+    end
+
     desc "Build and install Gem from source"
-    task :install => [:package, :uninstall] do
+    task :install => [:test_gems, :package, :uninstall] do
       chdir("#{SPREE_ROOT}/pkg") do
         latest = Dir["#{PKG_NAME}-*.gem"].last
         sh "gem install #{latest}"

data/lib/tasks/translation.rake

@@ -46,7 +46,7 @@ def create_hash(data, basename)
   previous_key = 'base'
   data.split("\n").each do |w|
     next if w.strip.blank?
-    (key, value) = w.split(':')
+    (key, value) = w.split(':', 2)
     value ||= ''
     shift = (key =~ /\w/)/2 - parent.size                             #Determine level of current key in comparison to parent array
     key = key.sub(/^\s+/,'')

data/lib/tasks/upgrade.rake

@@ -1,14 +1,7 @@
 namespace :spree do
-  desc "Assistance for upgrading an existing Spree deployment.  WARNING: Will replace certain javascript and stylesheet assets."
+  desc "Assistance for upgrading an existing Spree deployment. (Deprecated)"
   task :upgrade => :environment do
-                                   
-    Spree::FileUtilz.mirror_files "#{SPREE_ROOT}/public/javascripts", "#{RAILS_ROOT}/public/javascripts"
-    Spree::FileUtilz.mirror_files "#{SPREE_ROOT}/public/stylesheets", "#{RAILS_ROOT}/public/stylesheets"
-    Spree::FileUtilz.mirror_files "#{SPREE_ROOT}/public/images", "#{RAILS_ROOT}/public/images"
-    Spree::FileUtilz.mirror_files "#{SPREE_ROOT}/config/initializers", "#{RAILS_ROOT}/config/initializers"
-    FileUtils.cp("#{SPREE_ROOT}/config/spree_permissions.yml", "#{RAILS_ROOT}/config")
-    FileUtils.cp("#{SPREE_ROOT}/config/routes.rb", "#{RAILS_ROOT}/config")
-    FileUtils.cp("#{SPREE_ROOT}/config/boot.rb", "#{RAILS_ROOT}/config")    
+    puts "This task has been deprecated.  Run 'spree --upgrade' command using the newest gem instead."
   end
 end  
 

data/public/javascripts/calculator.js

@@ -0,0 +1,13 @@
+$j(function() {                                                                    
+  var original_calc_type = $j('#calc-type').attr('value');
+  $j('div#calculator-settings-warning').hide();
+  $j('#calc-type').change(function() { 
+    if ($j('#calc-type').attr('value') == original_calc_type) {
+      $j('div.calculator-settings').show();
+      $j('div#calculator-settings-warning').hide();
+    } else {
+      $j('div.calculator-settings').hide();
+      $j('div#calculator-settings-warning').show();
+    }
+  });
+})

data/public/javascripts/checkout.js

@@ -1,14 +1,16 @@
 //On page load
-$(function() {  
+$(function() {        
+  $('input#coupon-code').keydown(function(event) { if (event.keyCode == 13) { ajax_coupon(); } });
   $('#checkout_same_address').sameAddress();
   $('span#bcountry select').change(function() { update_state('b'); });
   $('span#scountry select').change(function() { update_state('s'); });
   get_states();
+  $('input#checkout_creditcard_number').blur(set_card_validation);
   
   // hook up the continue buttons for each section
   for(var i=0; i < regions.length; i++) {     
     var section = regions[i];                          
-    $('#continue_' + section).click(function() { eval( "continue_button(this);") });   
+    $('#continue_' + section).click(function() { eval( "continue_button(this);"); return false; });
     
     // enter key should be same as continue button (don't submit form though)
     $('#' + section + ' input').bind("keyup", section, function(e) {
@@ -18,7 +20,8 @@ $(function() {
     });
   }                          
   //disable submit
-  $(':submit').attr('disabled', 'disbled');
+  $('div#checkout :submit').attr('disabled', 'disabled');
+  $('div#checkout-summary :submit').attr('disabled', 'disabled');
       
   // hookup the radio buttons for registration
   $('#choose_register').click(function() { $('div#new_user').show(); $('div#guest_user, div#existing_user').hide(); }); 
@@ -42,8 +45,8 @@ jQuery.fn.sameAddress = function() {
       return;
     }
     $('input#hidden_sstate').val($('input#hidden_bstate').val());
-    $("#billing input, #billing select").each(function() {
-      $("#shipping #"+ $(this).attr('id').replace('bill', 'ship')).val($(this).val());
+    $("#billing input, #billing select").each(function() {   
+      $("#shipping #"+ $(this).attr('id').replace('bill', 'shipment_attributes')).val($(this).val());
     })
     update_state('s');
   })
@@ -52,20 +55,19 @@ jQuery.fn.sameAddress = function() {
 //Initial state mapper on page load
 var state_mapper;
 var get_states = function() {
-  $.getJSON('/states.js', function(json) {
-    state_mapper = json;
-    $('span#bcountry select').val($('input#hidden_bcountry').val());
-    update_state('b');
-    $('span#bstate :only-child').val($('input#hidden_bstate').val());
-    $('span#scountry select').val($('input#hidden_scountry').val());
-    update_state('s');
-    $('span#sstate :only-child').val($('input#hidden_sstate').val());
-  });
+  $('span#bcountry select').val($('input#hidden_bcountry').val());
+  update_state('b');
+  $('span#bstate :only-child').val($('input#hidden_bstate').val());
+  $('span#scountry select').val($('input#hidden_scountry').val());
+  update_state('s');
+  $('span#sstate :only-child').val($('input#hidden_sstate').val());
 };
 
 // replace the :only child of the parent with the given html, and transfer
 //   {name,id} attributes over, returning the new child
 var chg_state_input_element = function (parent, html) {
+  var errorlabel = parent.find('label');
+  errorlabel.remove();
   var child = parent.find(':only-child');
   var name = child.attr('name');
   var id = child.attr('id');
@@ -88,6 +90,9 @@ var chg_state_input_element = function (parent, html) {
 // TODO: better as sibling dummy state ?
 // Update the input method for address.state 
 var update_state = function(region) {
+  if ($('span#' + region + 'state').length == 0) { 
+    return;
+  } 
   var country        = $('span#' + region + 'country :only-child').val();
   var states         = state_mapper[country];
   var hidden_element = $('input#hidden_' + region + 'state');
@@ -154,7 +159,7 @@ var validate_section = function(region) {
 };
 
 var shift_to_region = function(active) {
-  if (active != regions[0]) { $('div#flash-errors').remove(); }
+  if (active != regions[0]) { $('div.flash.errors').remove(); }
   var found = 0;
   for(var i=0; i<regions.length; i++) {
     if(!found) {
@@ -176,25 +181,25 @@ var shift_to_region = function(active) {
     }
   }                                                                         
   if (active == 'confirmation') {
+    // indicates order is ready to be processed (as opposed to simply updated)
     $("input#final_answer").attr("value", "yes");    
     $('#continue_confirmation').removeAttr('disabled', 'disabled'); 
     $('#post-final').removeAttr('disabled', 'disabled'); 
   } else {
-    // indicates order is ready to be processed (as opposed to simply updated)
     $("input#final_answer").attr("value", "");
     // disable form submit
-    $(':submit').attr('disabled', 'disbled'); 
+    $('div#checkout :submit').attr('disabled', 'disabled');
   }
   return;
 };
 
 var submit_billing = function() {
-  build_address('Billing Address', 'b');
+  build_address('b');
   return true;
 };
 
-var build_address = function(title, region) {
-  var address = '<h3>' + title + '</h3>';
+var build_address = function(region) {
+  var address = "";
   address += $('p#' + region + 'fname input').val() + ' ' + $('p#' + region + 'lname input').val() + '<br />';
   address += $('p#' + region + 'address input').val() + '<br />';
   if($('p#' + region + 'address2').val() != '') {
@@ -209,7 +214,7 @@ var build_address = function(title, region) {
   address += ' ' + $('p#' + region + 'zip input').val() + '<br />';
   address += $('p#' + region + 'country :selected').html() + '<br />';
   address += $('p#' + region + 'phone input').val();
-  $('div#' + region + 'display').html(address);
+  $('div#' + region + 'display div').html(address);
   return;
 };
 
@@ -220,14 +225,15 @@ var submit_shipping = function() {
   // Save what we have so far and get the list of shipping methods via AJAX
   $.ajax({
     type: "POST",
-    url: 'checkout',                                 
+    url: '../checkout',                                 
     beforeSend : function (xhr) {
       xhr.setRequestHeader('Accept-Encoding', 'identity');
     },
     dataType: "json",
     data: $('#checkout_form').serialize(),
     success: function(json) {  
-      update_shipping_methods(json.available_methods); 
+      update_shipping_methods(json.available_methods);            
+      update_confirmation(json);      
     },
     error: function (XMLHttpRequest, textStatus, errorThrown) {
       $('div#methods :child').remove();
@@ -235,7 +241,7 @@ var submit_shipping = function() {
       return false;
     }
   });  
-  build_address('Shipping Address', 's');
+  build_address('s');
   return true;
 };
                      
@@ -251,7 +257,7 @@ var submit_shipping_method = function() {
     // Save what we have so far and get the updated order totals via AJAX
     $.ajax({
       type: "POST",
-      url: 'checkout',                                 
+      url: '../checkout',                                 
       beforeSend : function (xhr) {
         xhr.setRequestHeader('Accept-Encoding', 'identity');
       },      
@@ -283,14 +289,14 @@ var update_shipping_methods = function(methods) {
     var i = $(document.createElement('input'))
                 .attr('id', this.id)
                 .attr('type', 'radio')
-                .attr('name', 'method_id')
+                .attr('name', 'checkout[shipment_attributes][shipping_method_id]')
                 .val(this.id)
                 .click(function() { $('div#methods input').attr('checked', ''); $(this).attr('checked', 'checked'); });
     if($(methods).length == 1) {
       i.attr('checked', 'checked');
     }
     var l = $(document.createElement('label'))
-                .attr('for', s)
+                .attr('for', this.id)
                 .html(s);
     $('div#methods').append($(p).append(i).append(l));
   });
@@ -299,11 +305,28 @@ var update_shipping_methods = function(methods) {
 };                                     
 
 var update_confirmation = function(order) {
+  var textToInsert = '';
+  var summaryText = '';
+  
+  for (var key in order.charges) {
+    textToInsert  += '<tr><td colspan="3"><strong>' + key + '</strong></td><td class="total_display"><span>' + order.charges[key] + '</span></td>';
+    summaryText  += '<tr><td>' + key + '</td><td>' + order.charges[key] + '</td>';
+  }
+  $('tbody#order-charges').html(textToInsert);          
+  $('tbody#summary-order-charges').html(summaryText);  
+    
+  textToInsert = '';                               
+  summaryText = '';
+  for (var key in order.credits) {
+    textToInsert  += '<tr><td colspan="3"><strong>' + key + '</strong></td><td class="total_display"><span>' + order.credits[key] + '</span></td>';
+    summaryText  += '<tr><td>' + key + '</td><td>(' + order.credits[key] + ')</td>';
+  }
+  $('tbody#order-credits').html(textToInsert);    
+  $('tbody#summary-order-credits').html(summaryText);    
+
   $('span#order_total').html(order.order_total);
-  $('span#ship_amount').html(order.ship_amount);
-  $('span#tax_amount').html(order.tax_amount);                                  
-  $('span#ship_method').html(order.ship_method);                                    
-};      
+  $('span#summary-order-total').html(order.order_total);
+};
 
 var submit_registration = function() {
   // no need to do any ajax, user is already logged in
@@ -331,11 +354,12 @@ var ajax_login = function() {
       xhr.setRequestHeader('Accept-Encoding', 'identity');
     },      
     dataType: "json",
-    data: $('#checkout_form').serialize(),
+    data: $('#checkout_form').serialize() + "&_method=post",
     success: function(result) {  
       if (result) {
         $('div#already_logged_in').show();
         $('div#register_or_guest').hide();
+        update_addresses(result);
         update_login();
       } else {
         registration_error("Invalid username or password.");
@@ -356,7 +380,7 @@ var ajax_register = function() {
       xhr.setRequestHeader('Accept-Encoding', 'identity');
     },      
     dataType: "json",
-    data: $('#checkout_form').serialize(),
+    data: $('#checkout_form').serialize() + "&_method=post",
     success: function(result) {  
       if (result == true) {
         $('div#already_logged_in').show();
@@ -399,10 +423,115 @@ var update_login = function() {
     },      
     dataType: "html",
     success: function(result) {
-	 		$("div#login-bar").html(result);  
+      $("div#login-bar").html(result);
     },
     error: function (XMLHttpRequest, textStatus, errorThrown) {
       // TODO (maybe do nothing)
     }
   });  	
 };
+
+
+
+/* validating card details */
+
+/* this info is held in an array to get a strict order on the tests in case of overlap
+ * (original info taken from activemerchant, but a better reference seems to be 
+ *   http://en.wikipedia.org/wiki/Credit_card_number - though there's nothing definitive?)
+ * this info could be used to tell AM what the correct type is... (and remove the hook...?)
+ * switch now identified as maestro
+ * TODO: finish this list
+ * (from AM_protx, extra - ELECTRON = /^(424519|42496[23]|450875|48440[6-8]|4844[1-5][1-5]|4917[3-5][0-9]|491880)\d{10}(\d{3})?$/
+ */
+var current_card_type = null;
+
+var card_regexps 
+   = [ 
+       [ 'Visa Electron'      , /^(417500|(4917|4913|4508|4844)\d{2})\d{10}$/ ]
+     , [ 'Visa'               , /^4\d{12}(\d{3})?$/                           ]
+     , [ 'MasterCard'         , /^(5[1-5]\d{4}|677189)\d{10}$/                ]
+  // , [ 'discover'           , /^(6011|65\d{2})\d{12}$/                      ]
+     , [ 'American Express'   , /^(34|37)\d{13}$/                             ]
+     , [ 'Diners Club'        , /^3(0[0-5]|[68]\d)\d{11}$/                    ]
+     , [ 'JCB'                , /^35(2[89]|[3-8]\d)\d{12}$/                ]
+     , [ 'Solo'               , /^(6767|6334)\d{12}(\d{2,3})?$/               ]
+  // , [ 'dankort'            , /^5019\d{12}$/                                ]
+     , [ 'Maestro'            , /^((5018|5020|5038|6304|6759|6761|4903|4905|4911|4936|6333|6759)\d{2}|564182|633100)\d{10,13}$/ ]
+  // , [ 'forbrugsforeningen' , /^600722\d{10}$/                              ]
+     , [ 'Laser'              , /^(6304|6706|6771|6709)\d{12,15}$/            ]
+     ];
+
+var card_type = function(number) {
+  var name = null;
+  $.each(card_regexps, function (i,e) {
+    if (number.match(e[1])) {
+      name = e[0];
+      return false;
+    }
+  });
+  return name;
+};
+
+var set_card_validation = function () {
+  if ($("#checkout_creditcard_number").val().match(/^\s*$/)) {
+    $('#card_type').hide();
+    return;
+  }
+  current_card_type = card_type($("#checkout_creditcard_number").val());
+  $('#card_type').show();
+  $('#card_type #looks_like').hide();
+  $('#card_type #unrecognized').hide();
+  if (current_card_type == null) {
+    $('#card_type #unrecognized').show();
+    current_card_type = "unknown";   
+  } else {
+    $('#card_type #looks_like #type').html(current_card_type);
+    $('#card_type #looks_like').show();
+  }
+  if (current_card_type.match(/unknown|maestro|solo|switch/i)) {
+    $('p#maestro_extra').show('slow');
+  } else {
+    $('p#maestro_extra').hide('slow');
+    $('p#maestro_extra input, p#maestro_extra select').val("")      // clear the values
+  }
+};
+
+var ajax_coupon = function() {
+  $.ajax({
+    type: "POST",
+    url: '../checkout',                                
+    beforeSend : function (xhr) {
+      xhr.setRequestHeader('Accept-Encoding', 'identity');        
+      $('div#coupon-error').removeClass('error').html("");     
+      $('img#coupon_busy_indicator').show();
+    },      
+    dataType: "json",   
+    data: $('#checkout-summary-form').serialize(),    
+    complete: function() { $('img#coupon_busy_indicator').hide(); },
+    success: function(json) {  
+      // TODO - create new div for coupon messages and provide feedback that it was accepted       
+      update_confirmation(json);
+    },
+    error: function (XMLHttpRequest, textStatus, errorThrown) {
+      $('div#coupon-error').addClass('error').html("Server Error: Unable to Process Coupon");
+    }
+  });  	
+};
+
+var update_addresses = function(addresses) {
+  fields = new Array('lastname', 'firstname', 'city', 'address1', 'zipcode', 'phone');
+  if (addresses.bill_address) {
+    for (x in fields) {
+      $('#checkout_bill_address_attributes_'+fields[x]).val(addresses.bill_address.address[fields[x]]);
+    }
+    $('#bstate select option[value=' + addresses.bill_address.address['state_id'] + ']').attr('selected', true);
+    $('#bcountry select option[value=' + addresses.bill_address.address['country_id'] + ']').attr('selected', true);
+  }
+  if (addresses.ship_address) {
+    for (x in fields) {
+      $('#checkout_shipment_attributes_address_attributes_'+fields[x]).val(addresses.ship_address.address[fields[x]]);      
+    }
+    $('#sstate select option[value=' + addresses.ship_address.address['state_id'] + ']').attr('selected', true);
+    $('#scountry select option[value=' + addresses.ship_address.address['country_id'] + ']').attr('selected', true);
+  }  
+}