caboose-cms 0.5.69 → 0.5.70

data/app/models/caboose/shipping_calculator.rb

@@ -43,8 +43,10 @@ module Caboose
           if sp.uses_carrier(name)
             resp = carrier.find_rates(origin, destination, package)      
             resp.rates.sort_by(&:price).each do |rate|
-              next if !sp.uses_service_code(name, rate.service_code)            
-              rates << { :carrier => name, :service_code => rate.service_code, :service_name => rate.service_name, :price => rate.total_price.to_d / 100 }
+              sm = ShippingMethod.where(:carrier => name, :service_code => rate.service_code).first
+              sm = ShippingMethod.create(:carrier => name, :service_code => rate.service_code, :service_name => rate.service_name) if sm.nil?
+              next if !sp.uses_shipping_method(sm)
+              rates << { :shipping_method => sm, :price => rate.total_price.to_d / 100 }
             end
           end
         end        

data/app/models/caboose/shipping_package.rb

@@ -126,6 +126,13 @@ module Caboose
       end
       return false
     end
+    
+    def uses_shipping_method(sm)
+      self.shipping_methods.each do |sm2|
+        return true if sm.id == sm2.id
+      end
+      return false
+    end
         
   end
 end

data/app/views/caboose/cart/index.html.erb

@@ -1,5 +1,9 @@
 <div class="constrain">
   <div id='cart'></div>
+  <p class='controls'>
+    <input type='button' value='Continue Shopping' onclick="window.location='/products';" />
+    <input type='button' value='Checkout' onclick="window.location='/checkout';" />
+  </p>
 </div> 
 
 <% content_for :caboose_css do %>
@@ -10,11 +14,17 @@
 
 <% content_for :caboose_js do %>
 <%= javascript_include_tag 'caboose/model/all' %>
-<%= javascript_include_tag 'caboose/cart2' %>
+<%= javascript_include_tag 'caboose/cart' %>
 <script type='text/javascript'>
 
 $(document).ready(function() {
-  var controller = new Cart();  
+  var controller = new Cart({
+    allow_edit: true,
+    show_shipping: false,
+    show_tax: false,
+    show_discounts: false,
+    show_total: false    
+  });  
 });
 
 </script>

data/app/views/caboose/checkout/#Untitled-1#

@@ -0,0 +1,2 @@
+
+

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

@@ -1,49 +1,46 @@
 
-<div class='constrain'>
-  <table id="cart">
-  	<tr>
-  		<th>Item</th>
-  		<th>Quantity</th>
-  		<th>Subtotal</th>
-  	</tr>	
-  	<% @order.line_items.each do |line_item| %>
-  		<tr>
-  			<td>
-  				<%= line_item.variant.product.title %> - <%= line_item.variant.title %>
-  				
-  				<% line_item.customizations.each do |customization| %>
-  					<p><%= "- #{customization.variant.product.custom_input}: #{customization.custom_input}"%></p>
-  				<% end %>
-  			</td>
-  			<td align="right"><%= line_item.quantity %></td>
-  			<td align="right"><%= number_to_currency(line_item.subtotal) %></td>
-  		</tr>
-  	<% end %>	
-  	<tr>
-  		<td colspan="2" align="right">Subtotal</td>
-  		<td align="right"><%= number_to_currency(@order.subtotal) %></td>
-  	</tr>
-  	<% if @order.tax and @order.tax > 0 %>
-  		<tr>
-  			<td colspan="2" align="right">Tax <span class="float: right">+</span></td>
-  			<td align="right"><%= number_to_currency(@order.tax) %></td>
-  		</tr>
-  	<% end %>	
-  	<% if @order.shipping and @order.handling %>
-  		<tr>
-  		  <td colspan="2" align="right">Shipping &amp; Handling <span class="float: right">+</span></td>
-  		  <td align="right"><%= number_to_currency(@order.shipping + @order.handling) %></td>
-  		</tr>
-  	<% end %>	
-  	<% if @order.discounts.any? %>
-  		<tr>
-  		  <td colspan="2" align="right">Gift Card <span class="float: right">-</span></td>
-  		  <td align="right"><%= number_to_currency(@order.discounts.first.amount_current) %></td>
-  		</tr>
-  	<% end %>	
-  	<tr>
-  	  <td colspan="2" align="right">Total <span class="float: right">=</span></td>
-  	  <td align="right"><%= number_to_currency(@order.total) %></td>
-  	</tr>
-  </table>
-</div>
+<table class='cart'>
+  <tr>   
+    <th colspan='2'>Product</th>
+    <th>Quantity</th>
+    <th>Unit Price</th>
+    <th>Subtotal</th>
+  </tr>
+  <% @order.line_items.each do |li| %>
+    <tr data-id="<%= li.id %>">
+      <td valign='top'>
+        <% if li.variant.product_images.count > 0 %>              
+          <img src="<%= li.variant.product_images[0].image.url(:thumb) %>" width="150" />        
+        <% elsif li.variant.product.product_images.count > 0 %>              
+          <img src="<%= li.variant.product.product_images[0].image.url(:thumb) %>" width="150" />
+        <% end %>
+      </td>
+      <td valign='top'><%= li.title %></td>
+      <td valign='top' align='right' class='qty'      style='text-align: right;'><%= li.quantity %></td>
+      <td valign='top' align='right' class='price'    style='text-align: right;'><%= number_to_currency(li.price, :precision => 2) %></td>
+      <td valign='top' align='right' class='subtotal' style='text-align: right;'><%= number_to_currency(li.price, :precision => 2) %></td>
+    </tr>        
+  <% end %>                  
+  <tr><td colspan='4' align='right' style='text-align: right;'>Subtotal:            </td><td align='right' style='text-align: right;'><%= number_to_currency(@order.subtotal                   , :precision => 2) %></td></tr>            
+  <tr><td colspan='4' align='right' style='text-align: right;'>Shipping & Handling: </td><td align='right' style='text-align: right;'><%= number_to_currency(@order.shipping + @order.handling , :precision => 2) %></td></tr>  
+  <tr><td colspan='4' align='right' style='text-align: right;'>Tax:                 </td><td align='right' style='text-align: right;'><%= number_to_currency(@order.tax                        , :precision => 2) %></td></tr>
+  <% if @order.discounts && @order.discounts.count > 0 %>
+    <% @order.discounts.each do |d| %>
+      <tr>
+        <td colspan='4' align='right' style='text-align: right;'>Gift card (<%= d.gift_card.code %>):</td>
+        <td align='right' style='text-align: right;'><%= number_to_currency(d.amount, :precision => 2) %></td>
+      </tr>    
+    <% end %>
+  <% end %>
+  <tr><td colspan='4' align='right' style='text-align: right;'>Total:               </td><td align='right' style='text-align: right;'><%= number_to_currency(@order.total                      , :precision => 2) %></td></tr>
+</table>
+
+<% content_for :caboose_css do %>
+<style type='text/css'>
+
+table.cart { border-collapse: collapse; width: 100%; margin-bottom: 10px; }
+table.cart th { border: #ccc 1px solid; margin: 0; padding: 10px; text-align: center; font-weight: bold; color: #fff; background-image: url("//d9hjv462jiw15.cloudfront.net/assets/lockerroom/images/body_bg.jpg"); }
+table.cart td { border: #ccc 1px solid; margin: 0; padding: 10px; }
+
+</style>
+<% end %>

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

@@ -0,0 +1,49 @@
+
+<div class='constrain'>
+  <table id="cart">
+  	<tr>
+  		<th>Item</th>
+  		<th>Quantity</th>
+  		<th>Subtotal</th>
+  	</tr>	
+  	<% @order.line_items.each do |line_item| %>
+  		<tr>
+  			<td>
+  				<%= line_item.variant.product.title %> - <%= line_item.variant.title %>
+  				
+  				<% line_item.customizations.each do |customization| %>
+  					<p><%= "- #{customization.variant.product.custom_input}: #{customization.custom_input}"%></p>
+  				<% end %>
+  			</td>
+  			<td align="right"><%= line_item.quantity %></td>
+  			<td align="right"><%= number_to_currency(line_item.subtotal) %></td>
+  		</tr>
+  	<% end %>	
+  	<tr>
+  		<td colspan="2" align="right">Subtotal</td>
+  		<td align="right"><%= number_to_currency(@order.subtotal) %></td>
+  	</tr>
+  	<% if @order.tax and @order.tax > 0 %>
+  		<tr>
+  			<td colspan="2" align="right">Tax <span class="float: right">+</span></td>
+  			<td align="right"><%= number_to_currency(@order.tax) %></td>
+  		</tr>
+  	<% end %>	
+  	<% if @order.shipping and @order.handling %>
+  		<tr>
+  		  <td colspan="2" align="right">Shipping &amp; Handling <span class="float: right">+</span></td>
+  		  <td align="right"><%= number_to_currency(@order.shipping + @order.handling) %></td>
+  		</tr>
+  	<% end %>	
+  	<% if @order.discounts.any? %>
+  		<tr>
+  		  <td colspan="2" align="right">Gift Card <span class="float: right">-</span></td>
+  		  <td align="right"><%= number_to_currency(@order.discounts.first.amount_current) %></td>
+  		</tr>
+  	<% end %>	
+  	<tr>
+  	  <td colspan="2" align="right">Total <span class="float: right">=</span></td>
+  	  <td align="right"><%= number_to_currency(@order.total) %></td>
+  	</tr>
+  </table>
+</div>

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

@@ -1,6 +1,6 @@
   <section id='checkout-confirm'>
     <div class='wrapper'>  
-      <section id="line-items">          
+      <section id="line-items">         
         <table>
           <tr>
             <th>Product</th>
@@ -28,6 +28,8 @@
           <% end %>      
           <tr><td colspan='3' align='right' style='text-align: right;'>Total:               </td><td align='right' style='text-align: right;'><%= number_to_currency(@order.total, :precision => 2) %></td></tr>
         </table>
+        <p><a href='#' id='redeem_gift_card'>Redeem gift card</a></p>
+        <div id='gift_card_redemption_form'></div>
       </section><br />
       <section id='shipping_address'>
         <% sa = @order.shipping_address %>        
@@ -37,7 +39,7 @@
           <%= "#{sa.address2}<br />" if sa.address2 and not sa.address2.empty? %>
           <%= "#{sa.city}, #{sa.state} #{sa.zip}" %>
         </address>        
-        <p><a href="/checkout/step-two">Edit shipping address</a></p>
+        <p><a href="/checkout/addresses">Edit shipping address</a></p>
       </section>
       <section id='billing_address'>        
         <% ba = @order.billing_address %>        
@@ -47,11 +49,11 @@
           <%= "#{ba.address2}<br />" if ba.address2 and not ba.address2.empty? %>
           <%= "#{ba.city}, #{ba.state} #{ba.zip}" %>
         </address>
-        <p><a href="/checkout/step-two">Edit billing address</a></p>
+        <p><a href="/checkout/addresses">Edit billing address</a></p>
       </section>
       <section id='shipping_method'>
         <p><%= @order.shipping_carrier %> <%= @order.shipping_service_name %> - <%= number_to_currency(@order.shipping) %></p>
-        <p><a href="/checkout/step-three">Edit shipping method</a></p>
+        <p><a href="/checkout/shipping">Edit shipping method</a></p>
       </section>
       <section id='payment_method'>
         <p id='confirm_card_number'></p>

data/app/views/caboose/checkout/{step_two.html.erb → addresses.html.erb}

@@ -15,7 +15,7 @@ end
   <% 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 %>
-    <form  action="/checkout/address" method="put" id='address_form'>
+    <form action="/checkout/addresses" method="put" id='address_form'>
       <section id="checkout-address">  
         <div class="wrapper">      
           <section>
@@ -58,7 +58,7 @@ end
 </div>
 
 <%= content_for :caboose_js do %>
-<%= javascript_include_tag 'caboose/checkout_step2' %>
+<%= javascript_include_tag 'caboose/checkout_addresses' %>
 <% end %>
 <%= content_for :caboose_css do %>
 <%= stylesheet_link_tag 'caboose/message_boxes' %>

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

@@ -0,0 +1,35 @@
+
+<div id="checkout">
+  <h2>Gift Cards</h2>    
+  
+  <p align='center'>
+    <input type='text' name='code' id='code' placeholder='Gift card code' style='width: 300px;' />
+    <button class="blue" id='redeem_code_btn'>Redeem Code</button>
+    <div id='message'></div>
+  </p>
+  <div id='cart'></div>
+      
+  <section id="checkout-continue">    
+    <button class="blue">Continue to Payment</button>
+    <em>or</em>
+    <a href="/">return to the store</a>
+  </section>  
+</div>
+
+<%= content_for :caboose_js do %>
+<%= javascript_include_tag 'caboose/model/all' %>
+<%= javascript_include_tag 'caboose/cart' %>
+<%= javascript_include_tag 'caboose/checkout_gift_cards' %>
+<script type='text/javascript'>
+
+var cart = false;
+$(document).ready(function() {
+  cart = new Cart({ allow_edit_line_items: false });
+});
+
+</script>
+<% end %>
+<%= content_for :caboose_css do %>
+<%= stylesheet_link_tag 'caboose/cart' %>
+<%= stylesheet_link_tag 'caboose/checkout' %>
+<% end %>

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

@@ -1,43 +1,54 @@
-<h3>Checkout2</h3>
-<%= render :partial => '/caboose/checkout/cart' %>
-<%= render :partial => '/caboose/checkout/address_form' %>
-
-<% content_for :caboose_css do %>
-<style>
-
-/* Table */
-
-table#cart { border-collapse: collapse; }
-table#cart td { border: #666 1px dotted; padding: 4px 8px; }
-table#cart th { font-weight: bold; text-align: center; }
-
-/* Form */
-
-form#address {
-  overflow: hidden;
-  width: 100%;
-}
-
-form#address label {
-  display: inline-block;
-  margin-right: 12px;
-  min-width: 100px;
-  text-align: right;
-}
-form#address input { width: 200px; }
-
-form#address fieldset {
-  width: 100%;
-  min-width: 320px;
-}
-form#address fieldset#billing { display: none; }
-
-@media all and (min-width: 768px) {
-  form#address fieldset {
-    float: left;
-    width: 50%;
-  }
-}
-
-</style>
+<h1>Checkout</h1>
+
+<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 %>
+    <section id="checkout-login">
+      <div class="wrapper" class='login-choices'>
+        <ul>
+          <li><p>Already a member?          </p><button data-login-action="signin"   id='signin_button'   >Sign in</button></li>    
+          <li><p>Continue as a new customer </p><button data-login-action="register" id='register_button' >New Customer</button></li>        
+        </ul>
+      </div>
+      
+      <section id='checkout-login-form'>    
+        <div class="constrain" id='signin_form_container'>  
+          <form action="/login" method="post" id='signin_form'>
+            <p><input name="username" type="text"     placeholder="Email"    /></p>
+            <p><input name="password" type="password" placeholder="Password" /></p>
+            <p><input type="submit" value="Continue" /></p>
+          </form>
+        </div>      
+        <div class="constrain" id='register_form_container'>  
+          <form action="/register" method="post" id='register_form'></p>
+            <p><input name="first_name" type="text"     placeholder="First Name" /></p>
+            <p><input name="last_name"  type="text"     placeholder="Last Name"  /></p>
+            <p><input name="email"      type="text"     placeholder="Email"      /></p>
+            <p><input name="phone"      type="text"     placeholder="Phone"      /></p>
+            <p><input name="pass1"      type="password" placeholder="Password"   /></p>
+            <p><input name="pass2"      type="password" placeholder="Confirm Password" /></p>
+            <p><input name='newsletter' id='newsletter' type='checkbox' value='1' /> <label for='newsletter'>Send me updates on new products and special deals</label></p> 
+            <p><input type="submit" value="Continue" /></p>
+          </form>
+        </div>      
+        <div class="wrapper">
+          <div id='message'></div>
+        </div>
+      </section>
+    </section>
+  <% end %>
+  
+  <section id="checkout-continue">        
+    <a href="/">return to the store</a>
+  </section>
+</div>
+                                    
+<%= content_for :caboose_js do %>
+<%= javascript_include_tag 'caboose/checkout_login_register' %>
 <% end %>
+<%= content_for :caboose_css do %>
+<%= stylesheet_link_tag 'caboose/message_boxes' %>
+<%= stylesheet_link_tag 'caboose/checkout' %>
+<% end %>

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

@@ -1,79 +1,112 @@
-<% if Caboose::payment_processor == 'authorize.net' %>
-  <form id="payment" target="relay" action="<%= Caboose::PaymentProcessor.form_url(@order) %>" method="post">
-    <%= sim_fields(@sim_transaction) %>
-    <label>Card Number</label>
-    <input name="x_card_num" type="text" />
-    <label>Expiration</label>
-    <input id="expiration" name="x_exp_date" type="hidden" />
-    
-    <br />
-    
-    <select id="month" name="month">
-      <option value="01">01 - Jan</option>
-      <option value="02">02 - Feb</option>
-      <option value="03">03 - Mar</option>
-      <option value="04">04 - Apr</option>
-      <option value="05">05 - May</option>
-      <option value="06">06 - Jun</option>
-      <option value="07">07 - Jul</option>
-      <option value="08">08 - Aug</option>
-      <option value="09">09 - Sep</option>
-      <option value="10">10 - Oct</option>
-      <option value="11">11 - Nov</option>
-      <option value="12">12 - Dec</option>
-    </select>
-    /
-    <select id="year" name="year">
-      <% (DateTime.now.year...DateTime.now.year + 20).each do |i| %>
-        <option value="<%= i-2000 %>"><%= i %></option>
-      <% end %>
-    </select>
-    
-    <br />
-    
-    <label>Security Code</label>
-    <input id="x_card_code" name="x_card_code" type="text" />
-    <input type="submit" value="Submit" />
-  </form>
-<% end %>
+<%
+store_config = @site.store_config
+%>
+<div id="checkout">
+  <h2>Payment</h2>
+  <section id='checkout-payment'>
+    <% if store_config.pp_name == 'authorize.net' %>        
+      <form id="payment" target="relay" action="https://secure.authorize.net/gateway/transact.dll" method="post">
+        <%= sim_fields(@sim_transaction) %>
+        <input id="x_invoice_num" name="x_invoice_num" type="hidden" value="<%= @order.id %>" />
+        <input id="x_description" name="x_after_relay" type="hidden" value="<%= raw "#{@request.protocol}#{@request.host_with_port}/checkout/authnet-response/#{@order.id}" %>" />
+        <p><input name="x_card_num" id='billing-cc-number' type="text" maxlength="16" placeholder="Card Number" /></p>                    
+        <p>            
+          <input id="expiration" name="x_exp_date" type="hidden" />
+          <select id="month" name="month">                                      
+            <option value="01">01 - Jan</option>
+            <option value="02">02 - Feb</option>
+            <option value="03">03 - Mar</option>
+            <option value="04">04 - Apr</option>
+            <option value="05">05 - May</option>
+            <option value="06">06 - Jun</option>
+            <option value="07">07 - Jul</option>
+            <option value="08">08 - Aug</option>
+            <option value="09">09 - Sep</option>
+            <option value="10">10 - Oct</option>
+            <option value="11">11 - Nov</option>
+            <option value="12">12 - Dec</option>
+          </select>
+          /
+          <select id="year" name="year">
+            <% (DateTime.now.year...DateTime.now.year + 20).each do |i| %>
+              <option value="<%= i-2000 %>"><%= i %></option>
+            <% end %>
+          </select>
+        </p>                                                                  
+      </form>        
+    <% end %>
+  </section>
+  <section id='checkout-confirm'>
+    <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>
+    <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>
+    <section id='shipping_method'>
+      <h3>Shipping</h3>
+      <p><%= @order.shipping_carrier %> <%= @order.shipping_service_name %> - <%= number_to_currency(@order.shipping) %></p>
+      <p><a href="/checkout/shipping">Edit</a></p>
+    </section>
+    <section id='payment_method'>
+      <h3>Payment</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'><p align='center'>Your credit card will not be charged until you confirm your order.</p></div>    
+    <button class="blue">Continue to Order Confirmation</button>
+    <em>or</em>
+    <a href="/">return to the store</a>
+  </section>
+  <iframe id="relay" name="relay" style='display: block; width: 800px; height: 400px; border: #000 1px solid;'></iframe>
+</div>
+
+<%= content_for :caboose_js do %>
+<%= javascript_include_tag 'caboose/cart' %>
+<%= javascript_include_tag 'caboose/checkout_payment' %>
+<script type='text/javascript'>
+var SHOW_RELAY = <%= @show_relay ? 'true' : 'false' %>;
 
-<% if Caboose::payment_processor == 'payscape' %>
-  <form id="payment" action="<%= @form_url %>" method="post" target="relay">
-    <input id="billing-amount" type="hidden" value="<%= @order.total %>" />
-    <input id="expiration" name="billing-cc-exp" type="hidden" />
-    
-    <div>
-      <label for="billing-cc-number">Card number:</label>
-      <input id="billing-cc-number" name="billing-cc-number" type="text" maxlength="16" />
-    </div>
-    
-    <div>
-      <label for="billing-expiration-month">Expiration:</label>
-      <select name="month">
-        <option value="01">01 - Jan</option>
-        <option value="02">02 - Feb</option>
-        <option value="03">03 - Mar</option>
-        <option value="04">04 - Apr</option>
-        <option value="05">05 - May</option>
-        <option value="06">06 - Jun</option>
-        <option value="07">07 - Jul</option>
-        <option value="08">08 - Aug</option>
-        <option value="09">09 - Sep</option>
-        <option value="10">10 - Oct</option>
-        <option value="11">11 - Nov</option>
-        <option value="12">12 - Dec</option>
-      </select>
-      /
-      <select name="year">
-        <% (DateTime.now.year...DateTime.now.year + 20).each do |i| %>
-          <option value="<%= i-2000 %>"><%= i %></option>
-        <% end %>
-      </select>
-    </div>
-    
-    <!--<input type="submit" value="Submit" />-->
-  </form>
+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'>
 
-<iframe id="relay" name="relay"></iframe>
+#checkout h3 { font-size: 14pt; font-weight: bold; }
 
+</style>
+<% end %>