caboose-cms 0.5.89 → 0.5.90

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDk1M2U0YmY4NzM1YzZhN2E3Yjk4MDczYWYyZjE3OTQ2OGM5ZTU3Nw==
+    YTZmMjA4ZGY0YTdlYTg1N2I3ZGE1ZTk2MWFhNTg1NTMxYTE0Y2QzMg==
   data.tar.gz: !binary |-
-    NTFjYmMwN2Y4MGM1Y2U5NzAwMTdhMmNhMjk2MzllOWU5MGFiYmJjMA==
+    YjE4M2E4ZWRjYWEwZjQyMGQzOGRkNDc3OTEwNTQ5MzgyOTdmNWQzZQ==
 SHA512:
   metadata.gz: !binary |-
-    NjZiYzUwYzFiMmNkZWMzNjkwZTZlZTAzZTY2NWZjMjQzYjc3YmRmNWU5YzZj
-    MjQzNTBmMGIxMzg4ZTBjODY3MTY5YzdjNjk2YjUzZDI1NzYzNDgxMWFkMjJm
-    N2NkZTAxNWZjZTlhM2M5N2YyZWRmNDYxYmU5ZTYyYTBmYjQzYWQ=
+    YzZlMzcxYzZkNzI3YzAxZGM4MWMzODk3ODNmMzU5NDNjOGY2M2YzZWM4ODdm
+    ZWFhMWI4YTgzY2Q0ODZjYjBkOTEyMDY2YzkwODJlNTcyNmYyYmQ3MzBlOTdm
+    NDEzYTcyNjk2NWVhYmEwMTcyOTM2ZWZlNGQ2NWQwY2IwMGExYTU=
   data.tar.gz: !binary |-
-    MDExYjAzMjE4ZjdiMTEzNTQ3Zjk0ODZmY2VlMWZjYTYxNDNkNjk1MzlmYTYy
-    NjFjOWY2ZWI5OTBmNDViNTcyNTExZTNiODhjYjA2YzU5MzdkNjZhODZkMmJj
-    MzIwNzRlMzZlMWFjNjdhNTZiMmU3ZmNkYzQ0ZDQ3ZDM4ZmIwOTc=
+    ZTZlMmIwYWM4OWFlZTAxNjlhOTA5YWU1ODczYTY5MTI0OTE1NzRiY2MxYzVk
+    NWE2OGY0M2E2Yjk3MjVkMWVlYmZiZGRlNzdiZDk0MWUwZDdkODBmOGY0MmM3
+    MjJiM2ZjNTBlNzA3NjBlZWEyZGJiZmQ3MTE2YmVkNmYzYzlhYjI=

data/app/assets/javascripts/caboose/checkout_login_register.js

@@ -23,8 +23,7 @@ Caboose.Store.Modules.CheckoutLoginRegister = (function() {
     }
     
     $('#signin_form_container'   ).slideUp();
-    $('#register_form_container' ).slideUp();
-    $('#guest_form_container'    ).slideUp();
+    $('#register_form_container' ).slideUp();    
     
     self.$checkout = $('#checkout')        
     self.bindEventHandlers();
@@ -35,12 +34,9 @@ Caboose.Store.Modules.CheckoutLoginRegister = (function() {
   //
   
   self.bindEventHandlers = function() {
-    self.$checkout.on('click' , '[data-login-action]', self.login_click_handler);
-    //self.$checkout.on('submit', '#checkout-login form', self.login_submit_handler);    
-    //self.$checkout.on('click' , '#checkout-continue button', self.continue_handler);
+    self.$checkout.on('click' , '[data-login-action]', self.login_click_handler);    
     $('#signin_form'  ).submit(self.login_form_submit_handler);
-    $('#register_form').submit(self.register_form_submit_handler);
-    $('#guest_form'   ).submit(self.guest_form_submit_handler);    
+    $('#register_form').submit(self.register_form_submit_handler);        
   };
   
   self.login_click_handler = function(event) {    
@@ -112,20 +108,6 @@ Caboose.Store.Modules.CheckoutLoginRegister = (function() {
     });
     return false;
   };
-  
-  self.guest_form_submit_handler = function(event) {    
-    $('#message').html("<p class='loading'>Submitting...</p>");
-    $.ajax({
-      url: '/checkout/attach-guest',
-      type: 'post',
-      data: $('#guest_form').serialize(),
-      success: function(resp) {
-        if (resp.error) $('#message').html("<p class='note error'>" + resp.error + "</p>");
-        else window.location = '/checkout/addresses';
-      }
-    });
-    return false;
-  };
       
   return self
 }).call(Caboose.Store);

data/app/controllers/caboose/checkout_controller.rb

@@ -27,6 +27,7 @@ module Caboose
     # GET /checkout/addresses
     def addresses      
       redirect_to '/checkout' if !logged_in?      
+      @logged_in_user = logged_in_user      
     end
     
     # Step 3 - Shipping method
@@ -44,7 +45,8 @@ module Caboose
       
       # Now get the rates for those packages            
       @rates = ShippingCalculator.rates(@order)      
-      Caboose.log(@rates.inspect)      
+      #Caboose.log(@rates.inspect)
+      @logged_in_user = logged_in_user      
     end
     
     # Step 4 - Gift cards
@@ -53,6 +55,7 @@ module Caboose
       redirect_to '/checkout'           and return if !logged_in?
       redirect_to '/checkout/addresses' and return if @order.shipping_address.nil? || @order.billing_address.nil?
       redirect_to '/checkout/shipping'  and return if @order.has_empty_shipping_methods?
+      @logged_in_user = logged_in_user
     end
     
     # Step 5 - Payment
@@ -93,10 +96,12 @@ module Caboose
         when 'payscape'
           @form_url = Caboose::PaymentProcessor.form_url(@order)
       end
+      @logged_in_user = logged_in_user
     end
     
     # GET /checkout/thanks
     def thanks
+      @logged_in_user = logged_in_user
     end
     
     #===========================================================================
@@ -153,9 +158,10 @@ module Caboose
     end
     
     # POST /checkout/attach-user
-    def attach_user            
+    def attach_user              
       render :json => { :success => false, :errors => ['User is not logged in'] } and return if !logged_in?
       @order.customer_id = logged_in_user.id
+      #Caboose.log("Attaching user to order: customer_id = #{@order.customer_id}")
       render :json => { :success => @order.save, :errors => @order.errors.full_messages, :logged_in => logged_in? }
     end
     

data/app/controllers/caboose/register_controller.rb

@@ -27,20 +27,13 @@ module Caboose
         pass1       = params[:pass1]
         pass2       = params[:pass2]
                           
-        if first_name.nil? || first_name.strip.length == 0
-          resp.error = "Your first name is required."
-        elsif last_name.nil? || last_name.strip.length == 0
-          resp.error = "Your last name is required."
-        elsif email.nil? || email.strip.length == 0
-          resp.error = "Your email address is required."
-        elsif User.where(:email => email.strip.downcase).exists?
-          resp.error = "A user with that email address already exists."
-        elsif phone.nil? || phone.strip.length < 10
-          resp.error = "Your phone number is required. Please include your area code."
-        elsif pass1.nil? || pass1.strip.length < 8
-          resp.error = "Your password must be at least 8 characters."
-        elsif pass2.nil? || pass1 != pass2
-          resp.error = "Your passwords don't match."
+        if first_name.nil? || first_name.strip.length == 0       then resp.error = "Your first name is required."
+        elsif last_name.nil? || last_name.strip.length == 0      then resp.error = "Your last name is required."
+        elsif email.nil? || email.strip.length == 0              then resp.error = "Your email address is required."
+        elsif User.where(:email => email.strip.downcase).exists? then resp.error = "A user with that email address already exists."
+        elsif phone.nil? || phone.strip.length < 10              then resp.error = "Your phone number is required. Please include your area code."
+        elsif pass1.nil? || pass1.strip.length < 8               then resp.error = "Your password must be at least 8 characters."
+        elsif pass2.nil? || pass1 != pass2                       then resp.error = "Your passwords don't match."
         else
           
           u = Caboose::User.new
@@ -54,7 +47,7 @@ module Caboose
           
           # Go ahead and log the user in
           u = Caboose::User.find(u.id)
-          login_user(u)
+          login_user(u, true)          
           
           resp.redirect = "/login?return_url=#{return_url}"
 

data/app/views/caboose/checkout/addresses.html.erb

@@ -2,11 +2,11 @@
 sa = @order.shipping_address
 ba = @order.billing_address
 if sa.nil?
-  q = ["status <> ? and id < ?", 'cart', @order.id]
+  q = ["status <> ? and id < ? and customer_id = ?", 'cart', @order.id, @order.customer_id]
   if Caboose::Order.where(q).exists?    
     last_order = Caboose::Order.where(q).first
     sa = last_order.shipping_address
-    ba = last_order.billing_address
+    ba = last_order.billing_address      
   end
 end
 %>
@@ -14,10 +14,10 @@ end
 <div id="checkout">  
   <% if @logged_in_user.id == 1 %>    
     <p class='note error'>You are logged in as the admin user. Please <a href='/logout'>logout</a> and complete your order as a different user.</p>
-  <% else %>
+  <% else %>    
     <form action="/checkout/addresses" method="put" id='address_form'>
       <section id="checkout-address">  
-        <div class="wrapper">      
+        <div class="wrapper">          
           <section>
             <fieldset id="shipping">
               <h3>Shipping Address</h3>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.89'
+  VERSION = '0.5.90'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.89
+  version: 0.5.90
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg