caboose-cms 0.8.64 → 0.8.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d35930182bb20d54aa4c0b5b5e8904f3ef90681
-  data.tar.gz: ec38ef84ece6b6ea25ffc3aff9efda36f0d738df
+  metadata.gz: e6a4ba5943295734cab32b17d7fdbfa8dd72711d
+  data.tar.gz: 88ff9aec8169a808c90b0b9ed97e63816638be5e
 SHA512:
-  metadata.gz: b8525496f4bdcebb66cb5da6402250ea8750c94afebbec73bd9f85d75a2980c3a4511f308931b83cce7cde4c840596764c80fe847a681459bae16c90629bd172
-  data.tar.gz: 5de7d8361b02fd800da40c2e24eb193cf4ba02a82d166394a6fe3c696f3faa0687783237d1b6c2886a11b91003e0b41328058858eec6946c564cfb985f74401a
+  metadata.gz: ec41548d7130692a7754d55d62703cf5d17266222a4b2215da0c4bdc5179f8f5722868ad7878d7340a3248de76cfb1c2839e9eed03e21fd12927fc85695d56d8
+  data.tar.gz: b50b104307b57b2839efbfc1460be7922d6967150c91e00daf2d455f4d1b27b0afcbf435ed17746094ec3362166f623931c915ed3ced32c5b38303dff4f64b57

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

@@ -14,6 +14,7 @@ MyAccountInvoiceController.prototype = {
     
     var that = this;
     $('#payment_form').hide();
+    
     $(document).ready(function() { that.refresh(); });
   },
   
@@ -21,9 +22,13 @@ MyAccountInvoiceController.prototype = {
   {
     var that = this;
     that.refresh_invoice(function() {
+      if (that.invoice.financial_status == 'pending')    
+        that.payment_method_controller = new MyAccountPaymentMethodController({ ic: that });
+    
       $('#invoice_table').html("<p class='loading'>Getting invoice...</p>");
       that.print();
-      if (after) after();
+            
+      if (after) after();            
     });    
   },
   
@@ -79,6 +84,9 @@ MyAccountInvoiceController.prototype = {
       if (count_downloadable > 0) that.downloadable_line_items_table(table);    
       that.summary_table(table);
       $('#invoice_table').empty().append(table);
+      
+      if (that.invoice.financial_status == 'pending')        
+        that.payment_method_controller.print();
     }
     else
     {
@@ -96,7 +104,8 @@ MyAccountInvoiceController.prototype = {
     var fstatus = $('<div/>').append($('<p/>').html(capitalize_first_letter(that.invoice.financial_status)));    
     if (that.invoice.financial_status == 'pending')        
     {      
-      fstatus.append($('<p/>').append($('<input/>').attr('type', 'button').addClass('btn').val('Pay now').click(function(e) { e.preventDefault(); that.payment_form(); })));            
+      fstatus.append($('<div/>').attr('id', 'payment_method_container'));
+      //fstatus.append($('<p/>').append($('<input/>').attr('type', 'button').addClass('btn').val('Pay now').click(function(e) { e.preventDefault(); that.payment_form(); })));            
     }            
 
     var table = $('<table/>').addClass('invoice');
@@ -424,32 +433,87 @@ MyAccountInvoiceController.prototype = {
   },
 
   /****************************************************************************/
+
+  confirm_invoice: function()
+  {
+    var that    = this;
+    var cust    = that.invoice.customer;
+    var form    = $('#payment_form');
+    var message = $('#payment_message');
+
+    if (form.is(':visible'))
+    {
+      form.slideUp(function() { form.empty(); });
+      message.empty();
+      return; 
+    }
+
+    form.append($('<h4/>').append("Confirm payment"));
+    form.append($('<p/>').html("A payment of $" + curr(that.invoice.total) + " will be charged to your " + cust.card_brand + ' ending in ' + cust.card_last4 + "."));
+
+    form.append($('<input/>').attr('type', 'button').addClass('btn').val('Pay Now').click(function(e)
+      {
+        e.preventDefault();
+        message.empty().html("<p class='loading'>Processing payment...</p>");
+        
+        $.ajax({
+          url: '/my-account/confirm',
+          type: 'post',
+          data: { id: that.invoice.id},
+          success: function(resp) {
+            if (resp.success == true)
+            {
+              form.slideUp(function() { form.empty(); });
+              message.empty().html("<p class='note success'>" + resp.message + "</p>");
+              setTimeout(function() { message.empty() }, 5000);
+              that.refresh();
+            }
+            else {
+              message.empty().html("<p class='note error'>" + resp.error + "</p>");
+            }
+          }
+        });
+      }
+    ));
+
+    form.slideDown();
+  },
   
   payment_form: function()
   {
-    var that = this;
-    var form = $('#payment_form');
+    var that    = this;
+    var form    = $('#payment_form');
+    var message = $('#payment_message')
     if (form.is(':visible'))
     {      
       form.slideUp(function() { form.empty(); });
-      $('#payment_message').empty();
+      message.empty();
       return; 
     }
     
-    $('#payment_message').empty().html("<p class='loading'>Getting payment form...</p>");
+    message.empty().html("<p class='loading'>Processing payment...</p>");
     $.ajax({
       url: '/my-account/invoices/' + that.invoice.id + '/payment-form',
       type: 'get',
-      success: function(html) {        
-        form.empty().append(html);
-        form.slideDown();
-        $('#payment_message').empty();
-        $('#payment_confirm').click(function(e) {                                                                   
-          $('#expiration').val($('#month').val() + $('#year').val());    
-          $('#payment_message').empty().html("<p class='loading'>Processing payment...</p>");
-          $('#payment_form').slideUp();
-          $('#payment').submit();            
-        });                
+      success: function(resp) {        
+        if (resp.success == true)
+        {
+          message.empty().html("<p class='note success'>" + resp.message + "</p>");
+          setTimeout(function() { message.empty() }, 5000);
+          that.refresh();
+        }
+        else {
+          message.empty().html("<p class='note error'>" + resp.error + "</p>");
+        }
+
+        // form.empty().append(html);
+        // form.slideDown();
+        // $('#payment_confirm').click(function(e) {                                                                   
+        //   $('#expiration').val($('#month').val() + $('#year').val());    
+        //   $('#payment_message').empty().html("<p class='loading'>Processing payment...</p>");
+        //   $('#payment_form').slideUp();
+        //   $('#payment').submit();            
+        // });                
       }
     });                  
   },

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

@@ -0,0 +1,175 @@
+
+var MyAccountPaymentMethodController = function(params) { this.init(params); };
+
+MyAccountPaymentMethodController.prototype = {
+
+  container: 'payment_method_container',  
+  stripe_key: false,
+  customer_id: false,
+  card_brand: false,
+  card_last4: false,
+  card_name: false,
+  card_zip: false,
+  ic: false,
+  
+  init: function(params)
+  {
+    var that = this;
+    for (var i in params)
+      that[i] = params[i];        
+  },
+  
+  refresh: function(after)
+  {
+    var that = this;
+    $.ajax({
+      url: '/checkout/stripe/json',
+      type: 'get',          
+      success: function(resp) {        
+        that.stripe_key   = resp.stripe_key;
+        that.customer_id  = resp.customer_id;
+        that.card_brand   = resp.card_brand;
+        that.card_last4   = resp.card_last4;
+        //that.cc.print_ready_message();
+        if (after) after();            
+      }
+    });    
+  },
+  
+  print: function()
+  {
+    var that = this;    
+    if (!that.stripe_key)
+    {
+      that.refresh(function() { that.print(); });
+      return;
+    }    
+    var msg = that.card_brand && that.card_last4 ? that.card_brand + ' ending in ' + that.card_last4 : 'You have no card on file.';    
+    var div = $('<div/>');
+    
+    if (that.ic.invoice.financial_status == 'pending') {
+      if (that.card_brand && that.card_last4) {
+        div.append($('<p/>').append($('<input/>').attr('type', 'button').addClass('btn').val('Confirm').click(function(e) { e.preventDefault(); that.ic.refresh_invoice( function() { that.ic.confirm_invoice(); }); })));
+      }
+    }
+            
+    if (that.ic.invoice.total > 0.00)
+    {
+      var msg = that.card_brand && that.card_last4 ? that.card_brand + ' ending in ' + that.card_last4 : 'You have no card on file.';
+      div.append($('<p/>')
+        .append(msg).append(' ')
+        .append($('<a/>').attr('href', '#').html('Edit').click(function(e) { e.preventDefault(); that.edit(); })
+      ));
+    }
+    else
+    {          
+      div.append($('<p/>')
+        .append("No payment is required at this time. ")
+        .append($('<a/>').attr('href', '#').html('Edit').click(function(e) { e.preventDefault(); that.edit(); })
+      ));      
+    }    
+    $('#'+that.container).empty().append(div);    
+  },
+
+  edit: function()
+  {
+    var that = this;
+    
+    if (that.ic.invoice.total <= 0.00)
+    {
+      that.print();
+      return;
+    }
+    
+    var form = $('<form/>')
+      .attr('action', '')
+      .attr('method', 'post')
+      .attr('id', 'stripe_form')
+      .addClass('stripe_form')
+      .submit(function(e) { e.preventDefault(); that.update(); return false; });
+                  
+    form.append($('<div/>').addClass('card_number_container')                                        
+      .append($('<input/>').attr('id', 'card_number').attr('type', 'tel').attr('autocomplete', 'off').attr('autocorrect', 'off').attr('spellcheck', 'off').attr('autocapitalize', 'off').attr('placeholder', 'Card number'))              
+      .append($('<div/>').addClass('svg icon').css('width', '30px').css('height', '30px').html('<svg version="1.1" viewBox="0 0 30 30" width="30" height="30" focusable="false"><g fill-rule="evenodd"><path d="M2.00585866,0 C0.898053512,0 0,0.900176167 0,1.99201702 L0,9.00798298 C0,10.1081436 0.897060126,11 2.00585866,11 L11.9941413,11 C13.1019465,11 14,10.0998238 14,9.00798298 L14,1.99201702 C14,0.891856397 13.1029399,0 11.9941413,0 L2.00585866,0 Z M2.00247329,1 C1.44882258,1 1,1.4463114 1,1.99754465 L1,9.00245535 C1,9.55338405 1.45576096,10 2.00247329,10 L11.9975267,10 C12.5511774,10 13,9.5536886 13,9.00245535 L13,1.99754465 C13,1.44661595 12.544239,1 11.9975267,1 L2.00247329,1 Z M1,3 L1,5 L13,5 L13,3 L1,3 Z M11,8 L11,9 L12,9 L12,8 L11,8 Z M9,8 L9,9 L10,9 L10,8 L9,8 Z M9,8" style="fill:#3b6faa" transform="translate(8,10)"></g></svg>')));
+    form.append($('<div/>').addClass('card_exp_container')      
+      .append($('<input/>').attr('id', 'card_exp').attr('type', 'tel').attr('autocomplete', 'off').attr('autocorrect', 'off').attr('spellcheck', 'off').attr('autocapitalize', 'off').attr('placeholder', 'MM / YY').attr('x-autocompletetype', 'off').attr('autocompletetype', 'off'))      
+      .append($('<div/>').addClass('svg icon').css('width', '30px').css('height', '30px').html('<svg version="1.1" viewBox="0 0 30 30" width="30" height="30" focusable="false"><g fill-rule="evenodd"><path d="M2.0085302,1 C0.899249601,1 0,1.90017617 0,2.99201702 L0,10.007983 C0,11.1081436 0.901950359,12 2.0085302,12 L9.9914698,12 C11.1007504,12 12,11.0998238 12,10.007983 L12,2.99201702 C12,1.8918564 11.0980496,1 9.9914698,1 L2.0085302,1 Z M1.99539757,4 C1.44565467,4 1,4.43788135 1,5.00292933 L1,9.99707067 C1,10.5509732 1.4556644,11 1.99539757,11 L10.0046024,11 C10.5543453,11 11,10.5621186 11,9.99707067 L11,5.00292933 C11,4.44902676 10.5443356,4 10.0046024,4 L1.99539757,4 Z M3,1 L3,2 L4,2 L4,1 L3,1 Z M8,1 L8,2 L9,2 L9,1 L8,1 Z M3,0 L3,1 L4,1 L4,0 L3,0 Z M8,0 L8,1 L9,1 L9,0 L8,0 Z M8,0" style="fill:#3b6faa" transform="translate(8,9)"></g></svg>')));
+    form.append($('<div/>').addClass('card_cvc_container')
+      .append($('<input>').attr('id', 'card_cvc').attr('type', 'tel').attr('autocomplete', 'off').attr('autocorrect', 'off').attr('spellcheck', 'off').attr('autocapitalize', 'off').attr('placeholder', 'CVC').attr('maxlength', '4'))      
+      .append($('<div>').addClass('svg icon').css('width', '30px').css('height', '30px').html('<svg version="1.1" viewBox="0 0 30 30" width="30" height="30" focusable="false"><g fill-rule="evenodd"><path d="M8.8,4 C8.8,1.79086089 7.76640339,4.18628304e-07 5.5,0 C3.23359661,-4.1480896e-07 2.2,1.79086089 2.2,4 L3.2,4 C3.2,2.34314567 3.81102123,0.999999681 5.5,1 C7.18897877,1.00000032 7.80000001,2.34314567 7.80000001,4 L8.8,4 Z M1.99201702,4 C0.891856397,4 0,4.88670635 0,5.99810135 L0,10.0018986 C0,11.1054196 0.900176167,12 1.99201702,12 L9.00798298,12 C10.1081436,12 11,11.1132936 11,10.0018986 L11,5.99810135 C11,4.89458045 10.0998238,4 9.00798298,4 L1.99201702,4 Z M1.99754465,5 C1.44661595,5 1,5.45097518 1,5.99077797 L1,10.009222 C1,10.5564136 1.4463114,11 1.99754465,11 L9.00245535,11 C9.55338405,11 10,10.5490248 10,10.009222 L10,5.99077797 C10,5.44358641 9.5536886,5 9.00245535,5 L1.99754465,5 Z M1.99754465,5" style="fill:#3b6faa" transform="translate(9,9)"></g></svg>')));
+    form.append($('<div/>').addClass('card_name_container')                                        
+      .append($('<input/>').attr('id', 'card_name').attr('type', 'text').attr('autocomplete', 'off').attr('autocorrect', 'off').attr('spellcheck', 'off').attr('autocapitalize', 'on').attr('placeholder', 'Name on card')));
+    form.append($('<div/>').addClass('card_zip_container')                                        
+      .append($('<input/>').attr('id', 'card_zip').attr('type', 'tel').attr('autocomplete', 'off').attr('autocorrect', 'off').attr('spellcheck', 'off').attr('autocapitalize', 'on').attr('placeholder', 'Zip code')));
+    form.append($('<div/>').attr('id', 'payment_message'))
+    form.append($('<p/>').addClass('payment_controls')
+      .append($('<input/>').attr('type', 'button').attr('id', 'cancel_payment_btn').val('Cancel' ).click(function(e) { that.print(); })).append(' ')
+      .append($('<input/>').attr('type', 'submit').attr('id', 'save_payment_btn').val('Save'   ))
+    );
+      
+    $('#payment_method_container').empty().append(form);
+            
+    $('#stripe_form .card_number_container input').payment('formatCardNumber');
+    $('#stripe_form .card_exp_container    input').payment('formatCardExpiry');
+    $('#stripe_form .card_cvc_container    input').payment('formatCardCVC');          
+  },
+  
+  update: function() 
+  {
+    var that = this;                
+    var info = {
+      number:      $('#card_number').val(),
+      exp:         $('#card_exp').val(),
+      cvc:         $('#card_cvc').val(),
+      name:        $('card_name').val(),
+      address_zip: $('card_zip').val()
+    };
+    var exp = info.exp.split('/');
+    var m = exp.length > 0 ? exp[0] : '';
+    var y = exp.length > 1 ? exp[1] : '';        
+    var error = false;
+    if (!$.payment.validateCardNumber(info.number)) error = "Invalid card number.";
+    if (!$.payment.validateCardExpiry(m, y))        error = "Invalid expiration date.";
+    if (!$.payment.validateCardCVC(info.cvc))       error = "Invalid CVC.";
+    if (error) { $('#payment_message').html("<p class='note error'>" + error + "</p>"); return; }
+        
+    $('#save_payment_btn').attr('disabled', 'true').val('Saving card...');    
+    Stripe.setPublishableKey(that.stripe_key);    
+    Stripe.card.createToken(info, function(status, resp) {
+      if (resp.error)
+      {
+        $('#save_payment_btn').attr('disabled', 'false').val('Save Payment Method');    
+        $('#payment_message').html("<p class='note error'>" + resp.error.message + "</p>");
+      }      
+      else
+      {
+        that.card_brand = resp.card.brand;
+        that.card_last4 = resp.card.last4;                                
+        $.ajax({
+          url: '/checkout/stripe-details',
+          type: 'put',
+          data: { token: resp.id, card: resp.card },
+          success: function(resp2) {
+            if (resp2.success)
+            {              
+              that.customer_id = resp2.customer_id;
+              that.print();              
+              //that.cc.print_ready_message();
+            }
+            if (resp2.error) $('#payment_message').html("<p class='note error'>" + resp2.error + "</p>");
+          }
+        });
+      }
+    });  
+  },
+  
+  ready: function()
+  {
+    var that = this;
+    if (that.ic.invoice.total <= 0.00) return true;
+    if (!that.customer_id ) return false;
+    if (!that.card_brand  ) return false;
+    if (!that.card_last4  ) return false;
+    return true;
+  }
+};

data/app/assets/stylesheets/caboose/my_account_edit_invoice.css.scss

@@ -29,7 +29,7 @@ p { margin-bottom: 10px; }
 
 #payment_form {
   margin: 0 0 20px 0;
-  padding: 0;
+  padding: 5px;
   background: #EFEFEF;
   -webkit-border-radius: 5px;
   -moz-border-radius: 5px;

data/app/controllers/caboose/#checkout_controller.rb#

@@ -0,0 +1,464 @@
+require 'authorize_net'
+  
+module Caboose
+  class CheckoutController < Caboose::ApplicationController
+        
+    before_filter :ensure_line_items, :only => [:step_one, :step_two]
+    protect_from_forgery
+    
+    def ensure_line_items
+      redirect_to '/checkout/empty' if @invoice.line_items.empty?
+    end
+        
+    # @route GET /checkout/json
+    def invoice_json            
+      render :json => @invoice.as_json(
+        :include => [                          
+          :customer,
+          :shipping_address,
+          :billing_address,
+          :invoice_transactions,          
+          { 
+            :line_items => { 
+              :include => { 
+                :variant => { 
+                  :include => [
+                    { :product_images => { :methods => :urls }},
+                    { :product => { :include => { :product_images => { :methods => :urls }}}}
+                  ],
+                  :methods => :title
+                }
+              }
+            }
+          },
+          { :invoice_packages => { :include => [:shipping_package, :shipping_method] }},          
+          { :discounts => { :include => :gift_card }}
+        ]        
+      )      
+    end
+    
+    # @route GET /checkout/stripe/json
+    def stripe_json
+      sc = @site.store_config
+      u = logged_in_user
+      render :json => {
+        :stripe_key     => sc.stripe_publishable_key.strip,        
+        :customer_id    => u.stripe_customer_id,                   
+        :card_last4     => u.card_last4,     
+        :card_brand     => u.card_brand,       
+        :card_exp_month => u.card_exp_month, 
+        :card_exp_year  => u.card_exp_year
+      }          
+    end
+    
+    #===========================================================================
+    
+    # Step 1 - Login or register
+    # @route GET /checkout
+    def index            
+      if logged_in?
+        if @invoice.customer_id.nil?
+          @invoice.customer_id = logged_in_user.id
+          @invoice.save
+        end                        
+        #redirect_to '/checkout/addresses'
+        #return
+        
+        @invoice.verify_invoice_packages
+        
+        # See if any there are any empty invoice packages          
+        #@invoice.invoice_packages.each do |op|
+        #  count = 0
+        #  @invoice.line_items.each do |li|
+        #    count = count + 1 if li.invoice_package_id == op.id
+        #  end
+        #  op.destroy if count == 0
+        #end
+        #
+        ## See if any line items aren't associated with an invoice package
+        #line_items_attached = true
+        #@invoice.line_items.each do |li|
+        #  line_items_attached = false if li.invoice_package_id.nil?
+        #end
+        #  
+        #ops = @invoice.invoice_packages
+        #if ops.count == 0 || !line_items_attached
+        #  @invoice.calculate
+        #  LineItem.where(:invoice_id => @invoice.id).update_all(:invoice_package_id => nil)
+        #  InvoicePackage.where(:invoice_id => @invoice.id).destroy_all          
+        #  InvoicePackage.create_for_invoice(@invoice)
+        #end
+      
+        #render :file => "caboose/checkout/checkout_#{@site.store_config.pp_name}"
+        render :file => "caboose/checkout/checkout"                                                                                                                      
+      end
+    end
+    
+    # Step 3 - Shipping method
+    # @route GET /checkout/shipping/json
+    def shipping_json
+      render :json => { :error => 'Not logged in.'          } and return if !logged_in?
+      render :json => { :error => 'No shippable items.'     } and return if !@invoice.has_shippable_items?
+      render :json => { :error => 'Empty shipping address.' } and return if @invoice.shipping_address.nil?      
+      
+      @invoice.calculate
+      
+      #ops = @invoice.invoice_packages      
+      #if params[:recalculate_invoice_packages] || ops.count == 0
+      #  # Remove any invoice packages      
+      #  LineItem.where(:invoice_id => @invoice.id).update_all(:invoice_package_id => nil)
+      #  InvoicePackage.where(:invoice_id => @invoice.id).destroy_all      
+      #    
+      #  # Calculate what shipping packages we'll need            
+      #  InvoicePackage.create_for_invoice(@invoice)
+      #end
+
+      # Now get the rates for those packages            
+      rates = ShippingCalculator.rates(@invoice)      
+      render :json => rates                  
+    end        
+        
+    # Step 5 - Update Stripe Details
+    # @route PUT /checkout/stripe-details
+    def update_stripe_details
+      render :json => false and return if !logged_in?
+      
+      sc = @site.store_config      
+      Stripe.api_key = sc.stripe_secret_key.strip
+
+      u = logged_in_user      
+      
+      c = nil
+      if u.stripe_customer_id
+        c = Stripe::Customer.retrieve(u.stripe_customer_id)
+        begin          
+          c.source = params[:token]
+          c.save
+        rescue          
+          c = nil
+        end
+      end
+      
+      if c.nil?
+        c = Stripe::Customer.create(
+          :source => params[:token],
+          :email => u.email,
+          :metadata => { :user_id => u.id }          
+        )
+      end
+      
+      u.stripe_customer_id = c.id
+      u.card_last4     = params[:card][:last4]
+      u.card_brand     = params[:card][:brand]  
+      u.card_exp_month = params[:card][:exp_month]
+      u.card_exp_year  = params[:card][:exp_year]
+      u.save
+      
+      render :json => {
+        :success => true,
+        :customer_id => u.stripe_customer_id
+      }      
+    end
+    
+    # @route POST /checkout/confirm
+    def confirm
+      render :json => { :error => 'Not logged in.'            } and return if !logged_in?
+      #render :json => { :error => 'Invalid billing address.'  } and return if @invoice.billing_address.nil?
+      render :json => { :error => 'Invalid shipping address.' } and return if @invoice.has_shippable_items? && @invoice.shipping_address.nil?      
+      render :json => { :error => 'Invalid shipping methods.' } and return if @invoice.has_shippable_items? && @invoice.has_empty_shipping_methods?      
+      
+      resp = Caboose::StdClass.new
+      sc = @site.store_config
+      
+      # Make sure all the variants still exist      
+      @invoice.line_items.each do |li|
+        v = Variant.where(:id => li.variant_id).first
+        if v.nil? || v.status == 'Deleted'
+          render :json => { :error => 'One or more of the products you are purchasing are no longer available.' }
+          return
+        end
+      end
+
+      error = false      
+      requires_payment = @invoice.line_items.count > 0 && @invoice.total > 0 && @invoice.payment_terms == Invoice::PAYMENT_TERMS_PIA       
+      if requires_payment
+      
+        ot = nil
+        case sc.pp_name
+          when StoreConfig::PAYMENT_PROCESSOR_AUTHNET
+                                    
+          when StoreConfig::PAYMENT_PROCESSOR_STRIPE
+            Stripe.api_key = sc.stripe_secret_key.strip
+            begin
+              c = Stripe::Charge.create(
+                :amount => (@invoice.total * 100).to_i,
+                :currency => 'usd',
+                :customer => logged_in_user.stripe_customer_id,
+                :capture => false,
+                :metadata => { :invoice_id => @invoice.id },
+                :statement_descriptor => "Invoice ##{@invoice.id}"
+              )
+            rescue Exception => ex
+              render :json => { :error => ex.message }
+              return
+            end
+            ot = Caboose::InvoiceTransaction.create(
+              :invoice_id        => @invoice.id,
+              :transaction_id    => c.id,
+              :transaction_type  => c.captured ? Caboose::InvoiceTransaction::TYPE_AUTHCAP : Caboose::InvoiceTransaction::TYPE_AUTHORIZE,
+              :payment_processor => sc.pp_name,
+              :amount            => c.amount/100.0,              
+              :date_processed    => DateTime.now.utc,              
+              :success           => c.status == 'succeeded'
+            )
+        end
+        
+        if !ot.success
+          render :json => { :error => error }
+          return        
+        else        
+          @invoice.financial_status = Invoice::FINANCIAL_STATUS_AUTHORIZED                                                   
+          @invoice.take_gift_card_funds
+        end
+      end
+      
+      @invoice.status = Invoice::STATUS_PENDING
+      @invoice.invoice_number = @site.store_config.next_invoice_number
+      
+      # Send out emails
+      begin
+        InvoicesMailer.configure_for_site(@site.id).customer_new_invoice(@invoice).deliver
+        InvoicesMailer.configure_for_site(@site.id).fulfillment_new_invoice(@invoice).deliver
+      rescue
+        puts "=================================================================="
+        puts "Error sending out invoice confirmation emails for invoice ID #{@invoice.id}"
+        puts "=================================================================="
+      end
+      
+      # Emit invoice event      
+      Caboose.plugin_hook('invoice_authorized', @invoice) if @invoice.total > 0 
+      
+      # Save the invoice
+      @invoice.save
+      
+      # Decrement quantities of variants
+      @invoice.decrement_quantities
+      
+      # Clear the cart and re-initialize                    
+      session[:cart_id] = nil
+      init_cart
+      
+      resp.success = true
+      resp.redirect = '/checkout/thanks'      
+      render :json => resp
+    end
+    
+    # @route GET /checkout/thanks
+    def thanks
+      @logged_in_user = logged_in_user
+      
+      # Find the last invoice for the user
+      @last_invoice = Invoice.where(:customer_id => @logged_in_user.id).reorder("id desc").limit(1).first            
+      add_ga_event('Ecommerce', 'Checkout', 'Payment', (@last_invoice.total*100).to_i)
+    end
+    
+    #===========================================================================    
+    
+    # @route GET /checkout/state-options
+    def state_options                            
+      options = Caboose::States.all.collect { |abbr, state| { 'value' => abbr, 'text' => abbr }}
+      render :json => options
+    end
+        
+    # @route GET /checkout/total
+    def verify_total
+      total = 0.00
+      if logged_in?
+        @invoice.calculate
+        total = @invoice.total
+      end
+      render :json => total.to_f      
+    end
+    
+    # @route GET /checkout/address
+    def address
+      render :json => {
+        :shipping_address => @invoice.shipping_address,
+        :billing_address => @invoice.billing_address
+      }
+    end
+            
+    # @route PUT /checkout/addresses
+    def update_addresses
+      
+      # Grab or create addresses
+      shipping_address = if @invoice.shipping_address then @invoice.shipping_address else Address.new end
+      billing_address  = if @invoice.billing_address  then @invoice.billing_address  else Address.new end
+            
+      has_shippable_items = @invoice.has_shippable_items?
+        
+      # Shipping address
+      if has_shippable_items
+        shipping_address.first_name = params[:shipping][:first_name]
+        shipping_address.last_name  = params[:shipping][:last_name]
+        shipping_address.company    = params[:shipping][:company]
+        shipping_address.address1   = params[:shipping][:address1]
+        shipping_address.address2   = params[:shipping][:address2]
+        shipping_address.city       = params[:shipping][:city]
+        shipping_address.state      = params[:shipping][:state]
+        shipping_address.zip        = params[:shipping][:zip]
+      end
+      
+      # Billing address
+      if has_shippable_items && params[:use_as_billing]
+        billing_address.update_attributes(shipping_address.attributes)
+      else
+        billing_address.first_name = params[:billing][:first_name]
+        billing_address.last_name  = params[:billing][:last_name]
+        billing_address.company    = params[:billing][:company]
+        billing_address.address1   = params[:billing][:address1]
+        billing_address.address2   = params[:billing][:address2]
+        billing_address.city       = params[:billing][:city]
+        billing_address.state      = params[:billing][:state]
+        billing_address.zip        = params[:billing][:zip]
+      end
+      
+      # Save address info; generate ids      
+      render :json => { :success => false, :errors => shipping_address.errors.full_messages, :address => 'shipping' } and return if has_shippable_items && !shipping_address.save
+      render :json => { :success => false, :errors => billing_address.errors.full_messages, :address => 'billing' } and return if !billing_address.save
+      
+      # Associate address info with invoice
+      @invoice.shipping_address_id = shipping_address.id
+      @invoice.billing_address_id  = billing_address.id
+      
+      #render :json => { :redirect => 'checkout/shipping' }
+      render :json => { :success => @invoice.save, :errors => @invoice.errors.full_messages }
+    end
+    
+    # @route PUT /checkout/shipping-address
+    def update_shipping_address      
+      resp = Caboose::StdClass.new
+            
+      # Grab or create addresses
+      sa = @invoice.shipping_address
+      if sa.nil?
+        sa = Address.create
+        @invoice.shipping_address_id = sa.id
+        @invoice.save
+      end
+            
+      save = true
+      recalc_shipping = false
+      params.each do |name, value|
+        case name                              
+          when 'address1' then recalc_shipping = true if sa.address1 != value
+          when 'address2' then recalc_shipping = true if sa.address2 != value          
+          when 'city'     then recalc_shipping = true if sa.city     != value
+          when 'state'    then recalc_shipping = true if sa.state    != value          
+          when 'zip'      then recalc_shipping = true if sa.zip      != value          
+        end        
+        case name          
+          when 'name'           then sa.name          = value          
+          when 'first_name'     then sa.first_name    = value
+          when 'last_name'      then sa.last_name     = value
+          when 'street'         then sa.street        = value
+          when 'address1'       then sa.address1      = value
+          when 'address2'       then sa.address2      = value
+          when 'company'        then sa.company       = value
+          when 'city'           then sa.city          = value
+          when 'state'          then sa.state         = value
+          when 'province'       then sa.province      = value
+          when 'province_code'  then sa.province_code = value
+          when 'zip'            then sa.zip           = value
+          when 'country'        then sa.country       = value
+          when 'country_code'   then sa.country_code  = value
+          when 'phone'          then sa.phone         = value
+        end                 
+      end      
+      if recalc_shipping
+        @invoice.invoice_packages.each do |op|          
+          op.shipping_method_id = nil                         
+          op.total = nil
+          op.save
+        end
+      end
+
+      resp.success = save && sa.save      
+      render :json => resp            
+    end
+    
+    # @route PUT /checkout/billing-address
+    def update_billing_address
+      
+      # Grab or create addresses
+      ba = @invoice.billing_address
+      if ba.nil?
+        ba = Address.create
+        @invoice.billing_address_id = ba.id
+        @invoice.save
+      end
+                                                        
+      ba.first_name = params[:first_name]
+      ba.last_name  = params[:last_name]
+      ba.company    = params[:company]
+      ba.address1   = params[:address1]
+      ba.address2   = params[:address2]
+      ba.city       = params[:city]
+      ba.state      = params[:state]
+      ba.zip        = params[:zip]
+      ba.save
+                        
+      render :json => { :success => true }
+    end
+    
+    # @route POST /checkout/attach-user
+    def attach_user              
+      render :json => { :success => false, :errors => ['User is not logged in'] } and return if !logged_in?
+      @invoice.customer_id = logged_in_user.id
+      #Caboose.log("Attaching user to invoice: customer_id = #{@invoice.customer_id}")
+      render :json => { :success => @invoice.save, :errors => @invoice.errors.full_messages, :logged_in => logged_in? }
+    end
+    
+    # @route POST /checkout/guest
+    def attach_guest
+      resp = Caboose::StdClass.new      
+      email = params[:email]      
+      
+      if email != params[:confirm_email]
+        resp.error = "Emails do not match."
+      elsif Caboose::User.where(:email => email, :is_guest => false).exists?
+        resp.error = "A user with that email address already exists."
+      else
+        user = Caboose::User.where(:email => email, :is_guest => true).first
+        if user.nil?        
+          user = Caboose::User.create(:email => email)
+          user.is_guest = true
+          user.save
+          user = Caboose::User.where(:email => email).first
+        end                   
+        @invoice.customer_id = user.id
+        login_user(user)
+        
+        if !@invoice.valid?        
+          resp.errors = @invoice.errors.full_messages
+        else
+          @invoice.save
+          resp.redirect = '/checkout/addresses'
+        end
+      end
+      render :json => resp            
+    end
+    
+    # @route PUT /checkout/shipping
+    def update_shipping
+      op = InvoicePackage.find(params[:invoice_package_id])
+      op.shipping_method_id = params[:shipping_method_id]
+      op.total = params[:total]
+      op.save
+      op.invoice.calculate
+                                   
+      render :json => { :success => true }               
+    end
+        
+  end
+end

data/app/controllers/caboose/invoices_controller.rb

@@ -279,7 +279,8 @@ module Caboose
             Invoice::STATUS_CART, 
             Invoice::STATUS_PENDING, 
             Invoice::STATUS_READY_TO_SHIP, 
-            Invoice::STATUS_SHIPPED, 
+            Invoice::STATUS_SHIPPED,
+            Invoice::STATUS_PAID, 
             Invoice::STATUS_CANCELED
           ]
           options = statuses.collect{ |s| { 'text' => s.capitalize, 'value' => s }}

data/app/controllers/caboose/my_account_invoices_controller.rb

@@ -56,10 +56,90 @@ module Caboose
           
         when 'stripe'
           # TODO: Implement manual invoice payment for stripe
-          
       end      
       render :layout => false      
     end
+
+    # @route POST /my-account/confirm
+    def confirm
+      Caboose::log(params)
+      sc = @site.store_config
+      @invoice = Invoice.find(params[:id])
+
+      # Make sure all the variants still exist      
+      @invoice.line_items.each do |li|
+        v = Variant.where(:id => li.variant_id).first
+        if v.nil? || v.status == 'Deleted'
+          render :json => { :error => 'One or more of the products you are purchasing are no longer available.' }
+          return
+        end
+      end
+
+      error = false      
+      requires_payment = @invoice.line_items.count > 0 && @invoice.total > 0
+      if requires_payment
+        ot = nil
+
+        Stripe.api_key = sc.stripe_secret_key.strip
+        begin
+          c = Stripe::Charge.create(
+            :amount => (@invoice.total * 100).to_i,
+            :currency => 'usd',
+            :customer => logged_in_user.stripe_customer_id,
+            :capture => false,
+            :metadata => { :invoice_id => @invoice.id },
+            :statement_descriptor => "Invoice ##{@invoice.id}"
+          )
+        rescue Exception => ex
+          render :json => { :error => ex.message }
+          return
+        end
+        ot = Caboose::InvoiceTransaction.create(
+          :invoice_id        => @invoice.id,
+          :transaction_id    => c.id,
+          :transaction_type  => c.captured ? Caboose::InvoiceTransaction::TYPE_AUTHCAP : Caboose::InvoiceTransaction::TYPE_AUTHORIZE,
+          :payment_processor => sc.pp_name,
+          :amount            => c.amount/100.0,
+          :date_processed    => DateTime.now.utc,
+          :success           => c.status == 'succeeded'
+        )
+
+        if !ot.success
+          render :json => { :error => error }
+          return
+        else
+          capture_resp = @invoice.capture_funds
+          if capture_resp.success == true
+            @invoice.take_gift_card_funds
+            @invoice.status = Caboose::Invoice::STATUS_PAID
+          end
+        end
+      end
+      
+      @invoice.invoice_number = @site.store_config.next_invoice_number
+      
+      # Send out emails
+      begin
+        InvoicesMailer.configure_for_site(@site.id).customer_new_invoice(@invoice).deliver
+        InvoicesMailer.configure_for_site(@site.id).fulfillment_new_invoice(@invoice).deliver
+      rescue
+        puts "=================================================================="
+        puts "Error sending out invoice confirmation emails for invoice ID #{@invoice.id}"
+        puts "=================================================================="
+      end
+
+      # Save the invoice
+      @invoice.save
+
+      # Decrement quantities of variants
+      @invoice.decrement_quantities
+
+      render :json => {
+        :success => true,
+        :message => "Thank you for your payment!"
+      }
+      return
+    end
     
     # @route GET /my-account/invoices/:id/json
     def invoice_json

data/app/mailers/caboose/invoices_mailer.rb

@@ -19,9 +19,9 @@ module Caboose
     #end        
     
     # Sends a confirmation email to the customer about a new invoice 
-    def customer_new_invoice(invoice)      
+    def customer_new_invoice(invoice)
       @invoice = invoice
-      mail(:to => invoice.customer.email, :subject => 'Thank you for your invoice!')
+      mail(:to => invoice.customer.email, :subject => 'Thank you for your order!')
     end
     
     # Sends a notification email to the fulfillment dept about a new invoice 

data/app/models/caboose/invoice.rb

@@ -55,6 +55,7 @@ module Caboose
     STATUS_CANCELED      = 'canceled'
     STATUS_READY_TO_SHIP = 'ready to ship'
     STATUS_SHIPPED       = 'shipped'    
+    STATUS_PAID          = 'paid'
     STATUS_TESTING       = 'testing'
     
     # New
@@ -89,6 +90,7 @@ module Caboose
     scope :pending    , where('status = ?', 'pending')    
     scope :canceled   , where('status = ?', 'canceled')
     scope :shipped    , where('status = ?', 'shipped')
+    scope :paid       , where('status = ?', 'paid')
     scope :test       , where('status = ?', 'testing')
     
     scope :authorized , where('financial_status = ?', 'authorized')
@@ -101,7 +103,7 @@ module Caboose
     #
     
     validates :status, :inclusion => {
-      :in      => ['cart', 'pending', 'canceled', 'ready to ship', 'shipped', 'testing'],
+      :in      => ['cart', 'pending', 'canceled', 'ready to ship', 'shipped', 'paid', 'testing'],
       :message => "%{value} is not a valid status. Must be either 'pending' or 'shipped'"
     }
     

data/app/views/caboose/my_account_invoices/edit.html.erb

@@ -15,8 +15,11 @@ store_config = @invoice.site.store_config
 <p><input type='button' value='< Back' class='btn' onclick="window.location='/my-account/invoices';" /></p>
 
 <% content_for :caboose_js do %>
+<%= javascript_include_tag 'https://js.stripe.com/v2/' %>
+<%= javascript_include_tag 'caboose/jquery.payment' %>
 <%= javascript_include_tag 'caboose/model/all' %>
 <%= javascript_include_tag 'caboose/my_account_edit_invoice' %>
+<%= javascript_include_tag 'caboose/my_account_payment_method_controller' %>
 <script type='text/javascript'>
 
 var controller = false;
@@ -32,4 +35,20 @@ $(document).ready(function() {
 
 <% content_for :caboose_css do %>
 <%= stylesheet_link_tag 'caboose/my_account_edit_invoice' %>
+<style type='text/css'>
+.stripe_form { width: 100%; }
+.stripe_form .card_number_container { position: relative; width: 100%; }                                 .stripe_form .card_number_container input { padding-left: 30px; height: 37px;            font-size: 15px; width: 100%; border-color: #b9b9b9; border-style: solid; border-width: 1px 1px 0px 1px; }
+.stripe_form .card_exp_container    { position: relative; width: 50% !important; float: left; }          .stripe_form .card_exp_container    input { padding-left: 30px; height: 37px;            font-size: 15px; width: 100%; border-color: #b9b9b9; border-style: solid; border-width: 1px 1px 0px 1px; }
+.stripe_form .card_cvc_container    { position: relative; width: 50%; float: left; }                     .stripe_form .card_cvc_container    input { padding-left: 30px; height: 37px;            font-size: 15px; width: 100%; border-color: #b9b9b9; border-style: solid; border-width: 1px 1px 0px 0px; }
+.stripe_form .card_name_container   { position: relative; width: 50%; float: left; }                     .stripe_form .card_name_container   input { padding-left: 10px; height: 37px !important; font-size: 15px; width: 100%; border-color: #b9b9b9; border-style: solid; border-width: 1px 0px 1px 1px; }
+.stripe_form .card_zip_container    { position: relative; width: 50%; float: left; margin-bottom: 4px; } .stripe_form .card_zip_container    input { padding-left: 10px; height: 37px;            font-size: 15px; width: 100%; border-color: #b9b9b9; border-style: solid; border-width: 1px 1px 1px 0px; }
+
+.stripe_form .card_number_container .icon { position: absolute; top: 3px; left: 1px; transform-origin: 50% 50% 0; pointer-events: none; }
+.stripe_form .card_exp_container    .icon { position: absolute; top: 3px; left: 1px; transform-origin: 50% 50% 0; pointer-events: none; }
+.stripe_form .card_cvc_container    .icon { position: absolute; top: 3px; left: 1px; transform-origin: 50% 50% 0; pointer-events: none; }
+
+.stripe_form .note { width: 100%; margin-bottom: 10px !important; text-align: center; }
+.stripe_form .payment_controls { clear: left; margin-top: 4px !important; }
+
+</style>
 <% end %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.64'
+  VERSION = '0.8.65'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.8.64
+  version: 0.8.65
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2016-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -600,6 +600,7 @@ files:
 - app/assets/javascripts/caboose/model/pager.js
 - app/assets/javascripts/caboose/model/s3.js
 - app/assets/javascripts/caboose/my_account_edit_invoice.js
+- app/assets/javascripts/caboose/my_account_payment_method_controller.js
 - app/assets/javascripts/caboose/product.js
 - app/assets/javascripts/caboose/product_new.js
 - app/assets/javascripts/caboose/product_old.js
@@ -743,6 +744,7 @@ files:
 - app/assets/templates/caboose/product/images.jst.ejs
 - app/assets/templates/caboose/product/images_old.jst.ejs
 - app/assets/templates/caboose/product/options.jst.ejs
+- app/controllers/caboose/#checkout_controller.rb#
 - app/controllers/caboose/ab_options_controller.rb
 - app/controllers/caboose/ab_variants_controller.rb
 - app/controllers/caboose/admin_controller.rb