caboose-cms 0.5.155 → 0.5.156

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODgyOGM1NGVlNDY1ZmMxOGY3OGFkYjQ1MTU3ODQ5NjdmMmMyYjQyMA==
+    NzdiZGFiOGM0NGU2ODVjOWI5MjI1ZjNiMGQ0OTU5MjZhOGFhNTBmMQ==
   data.tar.gz: !binary |-
-    NWRhNjEwNDQ3YWUzZTEzYjgyYzkyYzM5Mzk5MjE5Njk2NzQwMmFiYQ==
+    ZDMwNGExODM4YjdhY2Q5MTJlZjk4Yjk3Y2UwYzRiNDA1MDUxNGI0ZA==
 SHA512:
   metadata.gz: !binary |-
-    YzBmYTVjYjg0YzYwNjVmMjEwYWI2YmIwOTViZmI3MDU0NDZkNjQ4YjMwNzE1
-    ZWM5MDFkZmRmYjllNjAzNWY1ZDNiMTRhODcxMTE3Zjc3Yjg0ZjAwMzdlNDIw
-    ZWE1MDJmMzM5OTRjNDRiZTcwZThmMzk1ODg4ZTM2ZWY2Mzc1ODI=
+    MmM4MzVhZDZkZDM5NDQyZjY5MzU0NzliNDlmY2E1OTAzNDhjYzlmYmRhOGUy
+    OGQyZWNlZTFjOTI1ODUwOWM2MmI1NWMwZDQ2MzQyOTZiNzhmMzQ1NDM3NzRk
+    MWY3YTY5MDdhOTY1MGQ2ZGQ2ODFhYzY0YjYxMDYwMjVhMmMxODM=
   data.tar.gz: !binary |-
-    ODA3ZmQ0MzI0YTA1OWRjMjYwZWFiZDQ3NTBhYmU3MDA3NmQ3NWQ0ZjczNGNk
-    NzEzMjYxNjM3ODE4NjczNjRjMTZhNzQyYmQ2ZDkwMjAxNjVjMGQwOGZmOGZl
-    OWVkZTgzMzU0YWUyMTMxMjE4NTJkMmUzZjZmMmU4ZDE2ZjljMDg=
+    YzEyNmUxZWY3ZTk3Zjg3M2NmZjJiMzQwMTAxMzZiYWI3ZTk1MDJiYjM5YTFk
+    ZTAwMDVjZTgxOTM4OTQyMjYyNTI1MWFlMTJkMDcwMDk3MTUxMTFjMzRhMmM0
+    MmQwYzdhYzU4ZWRhYTVjODg2MWQwNjk1MjU3NDQ0Mjc5MTg0ODg=

data/app/controllers/caboose/checkout_controller.rb

@@ -71,7 +71,8 @@ module Caboose
     def 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/shipping'  and return if @order.has_shippable_items? && @order.has_empty_shipping_methods?
+      #redirect_to '/checkout/confirm'   and return if @order.total == 0.00      
       
       # Make sure all the variants still exist      
       @order.line_items.each do |li|
@@ -106,6 +107,24 @@ module Caboose
       end
       @logged_in_user = logged_in_user
     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
     
     # GET /checkout/thanks
     def thanks

data/app/models/caboose/tax_calculator.rb

@@ -23,6 +23,10 @@ module Caboose
       end
       
       sa = order.shipping_address
+      if sa.nil? || sa.address1.nil? || sa.city.nil? || sa.state.nil? || sa.zip.nil?        
+        sa = order.billing_address
+      end      
+      return 0.00 if sa.nil? || sa.address1.nil? || sa.city.nil? || sa.state.nil? || sa.zip.nil?
       
       TaxCloud.configure do |config|
         config.api_login_id  = sc.taxcloud_api_id

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

@@ -0,0 +1,83 @@
+<%
+store_config = @site.store_config
+%>
+<div id="checkout">
+  <h2>Confirm Order</h2>  
+  <section id='checkout-confirm'>
+    <% if @order.has_shippable_items? %>
+      <section id='shipping_address'>
+        <h3>Shipping Address</h3>
+        <% sa = @order.shipping_address %>        
+        <address>
+          <%= "#{sa.first_name} #{sa.last_name}" %><br />
+          <%= sa.address1 %><br />
+          <%= "#{sa.address2}<br />" if sa.address2 and not sa.address2.empty? %>
+          <%= "#{sa.city}, #{sa.state} #{sa.zip}" %>
+        </address>        
+        <p><a href="/checkout/addresses">Edit</a></p>
+      </section>
+    <% end %>
+    <section id='billing_address'>        
+      <h3>Billing Address</h3>
+      <% ba = @order.billing_address %>        
+      <address>
+        <%= "#{ba.first_name} #{ba.last_name}" %><br />
+        <%= ba.address1 %><br />
+        <%= "#{ba.address2}<br />" if ba.address2 and not ba.address2.empty? %>
+        <%= "#{ba.city}, #{ba.state} #{ba.zip}" %>
+      </address>
+      <p><a href="/checkout/addresses">Edit</a></p>
+    </section>
+    <% if @order.has_shippable_items? %>
+      <section id='shipping_method'>
+        <h3>Shipping</h3>
+        <% @order.order_packages.all.each do |op| %>        
+          <p><%= op.shipping_method.service_name %> - <%= number_to_currency(op.total) %></p>
+        <% end %>
+        <p><a href="/checkout/shipping">Edit</a></p>
+      </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>
+    </section>
+    <div style='clear: left;'>&nbsp;</div>
+  </section>
+  <section>
+  <div id='cart'></div>
+  </section>  
+  <section id="checkout-continue">
+    <div id='message'></div>    
+    <button class="blue">Confirm Order</button>
+    <em>or</em>
+    <a href="/">return to the store</a>
+  </section>  
+</div>
+
+<%= content_for :caboose_js do %>
+<%= javascript_include_tag 'caboose/cart' %>
+<%= javascript_include_tag 'caboose/checkout_payment' %>
+<script type='text/javascript'>
+
+var cart = false;
+$(document).ready(function() {
+  cart = new Cart({
+    allow_edit_line_items: false,
+    allow_edit_gift_cards: false
+  });
+});
+
+</script>
+<% end %>
+<%= content_for :caboose_css do %>
+<%= stylesheet_link_tag 'caboose/cart' %>
+<%= stylesheet_link_tag 'caboose/checkout' %>
+<style type='text/css'>
+
+#checkout h3 { font-size: 14pt; font-weight: bold; }
+
+</style>
+<% end %>

data/config/routes.rb

@@ -387,7 +387,8 @@ Caboose::Engine.routes.draw do
   get  '/checkout/shipping'        => 'checkout#shipping'
   put  '/checkout/shipping'        => 'checkout#update_shipping'
   get  '/checkout/gift-cards'      => 'checkout#gift_cards'  
-  get  '/checkout/payment'         => 'checkout#payment'  
+  get  '/checkout/payment'         => 'checkout#payment'
+  get  '/checkout/confirm'         => 'checkout#confirm_without_payment'  
   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.155'
+  VERSION = '0.5.156'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.155
+  version: 0.5.156
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -740,6 +740,7 @@ files:
 - app/views/caboose/checkout/authnet_relay.html.erb
 - app/views/caboose/checkout/authnet_response.html.erb
 - app/views/caboose/checkout/billing.html.erb
+- app/views/caboose/checkout/confirm_without_payment.html.erb
 - app/views/caboose/checkout/discount.html.erb
 - app/views/caboose/checkout/empty.html.erb
 - app/views/caboose/checkout/error.html.erb