caboose-cms 0.5.156 → 0.5.158

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzdiZGFiOGM0NGU2ODVjOWI5MjI1ZjNiMGQ0OTU5MjZhOGFhNTBmMQ==
+    M2YwM2I5ZDUwYzdhZTQyZGRjZTFjMmI1MjFlNGRmYTk1ZDkxZjAwYw==
   data.tar.gz: !binary |-
-    ZDMwNGExODM4YjdhY2Q5MTJlZjk4Yjk3Y2UwYzRiNDA1MDUxNGI0ZA==
+    MDE0NWMxY2IzNjZiZTJiODliMDY5NTlhZTU1NDlkMzY3Mjk1OGMyZQ==
 SHA512:
   metadata.gz: !binary |-
-    MmM4MzVhZDZkZDM5NDQyZjY5MzU0NzliNDlmY2E1OTAzNDhjYzlmYmRhOGUy
-    OGQyZWNlZTFjOTI1ODUwOWM2MmI1NWMwZDQ2MzQyOTZiNzhmMzQ1NDM3NzRk
-    MWY3YTY5MDdhOTY1MGQ2ZGQ2ODFhYzY0YjYxMDYwMjVhMmMxODM=
+    YWU2N2NjYjE0MWVjNzY1Y2Y2YjQyNWZmMTNhZmE3Y2NmMTdmOTJkMDlkMzdj
+    MjNjY2M1M2FkNzBjMjAzMTNmZWIyYjkyOTc1MTZlZGRiNjEwNmQyMzQ3OWE1
+    YzE1ZmFjNTcyMzA4MGVmYTQ1MWY1YTM3MzA5NTRhNDhiOTRlYmE=
   data.tar.gz: !binary |-
-    YzEyNmUxZWY3ZTk3Zjg3M2NmZjJiMzQwMTAxMzZiYWI3ZTk1MDJiYjM5YTFk
-    ZTAwMDVjZTgxOTM4OTQyMjYyNTI1MWFlMTJkMDcwMDk3MTUxMTFjMzRhMmM0
-    MmQwYzdhYzU4ZWRhYTVjODg2MWQwNjk1MjU3NDQ0Mjc5MTg0ODg=
+    NGI0ODI2ZWVjYWMyNzM1MWNhNjM5YmQwMzQyNjFjOTA5ZjAzNzJjM2EwYzIx
+    YzA3YTg3YmE0MTJhYmRlYjAyZTFlMGRhMzk1NTlmMWQyMjdjM2I5MWU0NTQ3
+    MGQyYTBmOWYyOWI3YTI4Yzk0ZjE2NmZiOTdmYjY4MzM0NjcyNTM=

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

@@ -0,0 +1,36 @@
+
+Caboose.Store.Modules.CheckoutPayment = (function() {
+
+  self = {
+    is_confirm: false
+  };    
+  
+  self.initialize = function() {        
+    $('#checkout-continue button').click(self.continue_handler);
+  };
+
+  self.continue_handler = function(event) {    
+    $('#message').html("<p class='loading'>Processing...</p>");
+    $.ajax({
+      url: '/checkout/confirm',
+      type: 'post',
+      success: function(resp)
+      {
+        if (resp.success == true)
+        {
+          if (resp.redirect)
+            window.location = resp.redirect;
+          else
+            window.location = '/checkout/thanks';          
+        }
+        else if (resp.error)  
+          $('#message').html("<p class='note error'>" + resp.error + "</p>");
+        else
+          $('#message').html("<p class='note error'>There was an error processing your payment.</p>");
+      } 
+    });
+  };
+  
+  return self
+}).call(Caboose.Store);
+

data/app/controllers/caboose/checkout_controller.rb

@@ -72,7 +72,7 @@ module Caboose
       redirect_to '/checkout'           and return if !logged_in?
       redirect_to '/checkout/addresses' and return if @order.billing_address.nil? || (@order.has_shippable_items? && @order.shipping_address.nil?)
       redirect_to '/checkout/shipping'  and return if @order.has_shippable_items? && @order.has_empty_shipping_methods?
-      #redirect_to '/checkout/confirm'   and return if @order.total == 0.00      
+      redirect_to '/checkout/confirm'   and return if @order.total == 0.00      
       
       # Make sure all the variants still exist      
       @order.line_items.each do |li|
@@ -109,22 +109,57 @@ module Caboose
     end
         
     # GET /checkout/confirm
-    #def confirm_without_payment
-    #  redirect_to '/checkout'           and return if !logged_in?
-    #  redirect_to '/checkout/addresses' and return if @order.billing_address.nil? || (@order.has_shippable_items? && @order.shipping_address.nil?)
-    #  redirect_to '/checkout/shipping'  and return if @order.has_shippable_items? && @order.has_empty_shipping_methods?
-    #  redirect_to '/checkout/payment'   and return if @order.total > 0.00      
-    #  
-    #  # Make sure all the variants still exist      
-    #  @order.line_items.each do |li|
-    #    v = Variant.where(:id => li.variant_id).first
-    #    if v.nil? || v.status == 'Deleted'
-    #      render :file => 'caboose/checkout/deleted_variant'
-    #      return
-    #    end
-    #  end
-    #  @logged_in_user = logged_in_user
-    #end
+    def confirm_without_payment
+      redirect_to '/checkout'           and return if !logged_in?
+      redirect_to '/checkout/addresses' and return if @order.billing_address.nil? || (@order.has_shippable_items? && @order.shipping_address.nil?)
+      redirect_to '/checkout/shipping'  and return if @order.has_shippable_items? && @order.has_empty_shipping_methods?
+      redirect_to '/checkout/payment'   and return if @order.total > 0.00      
+      
+      # Make sure all the variants still exist      
+      @order.line_items.each do |li|
+        v = Variant.where(:id => li.variant_id).first
+        if v.nil? || v.status == 'Deleted'
+          render :file => 'caboose/checkout/deleted_variant'
+          return
+        end
+      end
+      @logged_in_user = logged_in_user
+    end
+    
+    # POST /checkout/confirm
+    def confirm
+      render :json => { :error => 'Not logged in.'            } and return if !logged_in?
+      render :json => { :error => 'Invalid addresses.'        } and return if @order.billing_address.nil? || (@order.has_shippable_items? && @order.shipping_address.nil?)
+      render :json => { :error => 'Invalid shipping methods.' } and return if @order.has_shippable_items? && @order.has_empty_shipping_methods?
+      render :json => { :error => 'Order requires payment.'   } and return if @order.total > 0.00
+      
+      resp = Caboose::StdClass.new
+                  
+      @order.financial_status = Order::FINANCIAL_STATUS_AUTHORIZED
+      @order.status = Order::STATUS_PENDING
+      @order.order_number = @site.store_config.next_order_number
+         
+      # Take funds from any gift cards that were used on the order
+      @order.take_gift_card_funds
+        
+      # Send out emails        
+      OrdersMailer.configure_for_site(@site.id).customer_new_order(@order).deliver
+      OrdersMailer.configure_for_site(@site.id).fulfillment_new_order(@order).deliver        
+        
+      # Emit order event
+      Caboose.plugin_hook('order_authorized', @order)
+      
+      # Save the order
+      @order.save
+      
+      # Clear the cart and re-initialize                    
+      session[:cart_id] = nil
+      init_cart
+      
+      resp.success = true
+      resp.redirect = '/checkout/thanks'      
+      render :json => resp
+    end
     
     # GET /checkout/thanks
     def thanks

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

@@ -38,11 +38,8 @@ store_config = @site.store_config
       </section>
     <% end %>
     <section id='payment_method'>
-      <h3>Payment Method</h3>      
-      <div id='confirm_card'>
-        <p id='confirm_card_number'></p>
-        <p><a href="#" id='edit_payment'>Edit</a></p>
-      </div>
+      <h3>Payment Method</h3>
+      <p>Your order does not require payment.</p>
     </section>
     <div style='clear: left;'>&nbsp;</div>
   </section>
@@ -59,7 +56,7 @@ store_config = @site.store_config
 
 <%= content_for :caboose_js do %>
 <%= javascript_include_tag 'caboose/cart' %>
-<%= javascript_include_tag 'caboose/checkout_payment' %>
+<%= javascript_include_tag 'caboose/checkout_confirm_without_payment' %>
 <script type='text/javascript'>
 
 var cart = false;

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

@@ -4,13 +4,25 @@
 
 <% if @last_order.has_downloadable_items? %>
   <p>Your order contained downloadable items. Download your items with the links below:</p>
-  <ul>
+  <ul id='downloads'>
     <% @last_order.line_items.each do |li| %>
       <% if li.variant.downloadable %>
         <li><a href='/my-account/orders/<%= @last_order.id %>/line-items/<%= li.id %>/download' target="_blank"><%= li.variant.product.title %></a></li>
       <% end %>
     <% end %>
-  </ul>
+  </ul>   
 <% end %>
 
 <p><a href="/">Continue Shopping</a></p>
+
+
+<%= content_for :caboose_css do %>
+<style type='text/css'>
+
+p { margin-bottom: 10px; }
+
+#downloads { margin: 0 0 10px 0; padding: 0; list-style: none; }
+#downloads li { margin: 0; padding: 0; }
+
+</style>
+<% end %>

data/config/routes.rb

@@ -388,7 +388,8 @@ Caboose::Engine.routes.draw do
   put  '/checkout/shipping'        => 'checkout#update_shipping'
   get  '/checkout/gift-cards'      => 'checkout#gift_cards'  
   get  '/checkout/payment'         => 'checkout#payment'
-  get  '/checkout/confirm'         => 'checkout#confirm_without_payment'  
+  get  '/checkout/confirm'         => 'checkout#confirm_without_payment'
+  post '/checkout/confirm'         => 'checkout#confirm'  
   get  '/checkout/thanks'          => 'checkout#thanks'
   get  '/checkout/test-email'      => 'checkout#test_email'
 

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.156'
+  VERSION = '0.5.158'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.156
+  version: 0.5.158
 platform: ruby
 authors:
 - William Barry
@@ -408,6 +408,7 @@ files:
 - app/assets/javascripts/caboose/cart_old.js
 - app/assets/javascripts/caboose/checkout.js
 - app/assets/javascripts/caboose/checkout_addresses.js
+- app/assets/javascripts/caboose/checkout_confirm_without_payment.js
 - app/assets/javascripts/caboose/checkout_gift_cards.js
 - app/assets/javascripts/caboose/checkout_login_register.js
 - app/assets/javascripts/caboose/checkout_module.js