caboose-store 0.0.39 → 0.0.40

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2EzZjNiODZmYjdlNTdiYmVmY2RmNWI5M2I3MzZhMmMyOWQxODdmMg==
+    ZTE4MTFjMWIzNDc0ODU2NjNlMjY0MTVhYjE5ZWU3ZjllZTU0OTZjNA==
   data.tar.gz: !binary |-
-    MGY2NWM1NGI0NWFiZGMwYjM1NmM2YTVjNzI5MTU1NGJiNmVhYjhkNQ==
+    OTg0ZmNlM2ZjYmI4Mjk3YjVhZjEyNDdmYjk0MjI3MjNkNGM1MDhhOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YTczMTJlODdiZWJhNjMzNmJjNzEyMTY2Y2VkMmM3NzkyN2VhMDE3OWM0ZWJm
-    YjE0ZGMzNTM4MzlmYjFiODk1ZGM5ZDJkMDNlZjBiM2FhZTg4MDBhMTJjYTVi
-    YTI5ZmM4ZGYwYWE1ZTdlYzBjMmFmZGM0NzMyZDk0ODMxYjE4MTc=
+    MjYyZTQ3MTNiZjE5MzMzNWNlZmZjYTg4MTQ2MGY5MzlmMzZiOTdkMmY2MTFl
+    YzZjZTY0ZmZkZThmMTkzYzBkOTM4MGE1YWFmYzQxMTAwMzZjNGNmZDU4Yjgz
+    ODFlYTI3YWU4MjNkZTMxMmRlZmEyYjY3MDJlNmVmNWU1NWFiZTU=
   data.tar.gz: !binary |-
-    ZWMxMzUxYWVjOWY2MTVmNTg4MTg0MDhlY2I4MjQzMTNmYjY4MTA2MWRkZTNl
-    NzQ2MThlYmU1YjU5OThhZDhkZDI1MDNkYzJlOGRkMmRlYWEzYzY3NjdkOTQ2
-    YWM2Yjc4OTc2MDUxYzI0OGU3MmJiZDc0YjE1ZGNmYzE0MDQwMzA=
+    NWM3ZjdjYTczYThiMDIyYzgyNzJlN2VlZDUxOTIwOWQ1NWM0N2IyYWFkMjM2
+    YTVlOTk1YWU0MzcxMTdiYThhNzViNGFmMTU2OGQ1MGU2NzY2NDQxMDMwMDQx
+    ZWI5ODA4MGU4NTFiOWJiM2Q3NDA0YTY2NGIwYzc3ZGJiNTllNDc=

data/app/assets/javascripts/caboose_store/modules/cart.js

@@ -105,6 +105,7 @@ Caboose.Store.Modules.Cart = (function() {
             if (!self.$addToCart.find('.message').length) {
               self.$addToCart.append($('<p/>').hide().addClass('message').text('Successfully added to cart'));
               self.$addToCart.find('.message').fadeIn();
+              Caboose.Store.Modules.Product.$product.trigger('added-to-cart');
               
               setTimeout(function() {
                 self.$addToCart.find('.message').fadeOut(function() { $(this).remove() });

data/app/assets/javascripts/caboose_store/modules/checkout_step1.js

@@ -61,6 +61,11 @@ Caboose.Store.Modules.CheckoutStep1 = (function() {
     }
     $('#' + form + '_button').addClass('selected');
     $('#message').empty();
+    
+    $('html, body').animate({
+      scrollTop: $('#checkout-login').offset().top
+    }, 600);
+    
     self.current_form = form;         
   };
   

data/app/assets/javascripts/caboose_store/modules/checkout_step2.js

@@ -29,7 +29,7 @@ Caboose.Store.Modules.CheckoutStep2 = (function() {
         if (resp.errors && resp.errors.length > 0)
           $('#message').html("<p class='note error'>" + resp.errors[0] + "</p>");
         else if (resp.success)
-          window.location = '/checkout/step-three';        
+          window.location = '/checkout/step-three';
       }
     });
     return false;

data/app/assets/javascripts/caboose_store/modules/checkout_step4.js

@@ -9,13 +9,17 @@ Caboose.Store.Modules.CheckoutStep4 = (function() {
     $('#checkout-confirm').hide();
     $('#relay').hide();
     self.bind_event_handlers();    
+    self.expiration_change_handler();
   };
     
   self.bind_event_handlers = function() {
     $('#checkout-payment form#payment select').change(self.expiration_change_handler);
     $('#checkout-continue button').click(self.continue_handler);
     $('#checkout-confirm #edit_payment').click(self.edit_payment_handler);                
-    //$('#relay').on('load', self.relay_handler);
+    
+    $(window).on('message', function(event) {
+      relay_handler(event.originalEvent.data);
+    });
   };
     
   self.expiration_change_handler = function(event) {
@@ -83,6 +87,7 @@ Caboose.Store.Modules.CheckoutStep4 = (function() {
 
 function relay_handler(resp)
 {
+  console.log('RELAY');
   if (resp.success == true)
     window.location = '/checkout/thanks';
   else if (resp.message)  

data/app/assets/javascripts/caboose_store/modules/product.js

@@ -176,15 +176,6 @@ Caboose.Store.Modules.Product = (function() {
   };
   
   self.getOptionsWithAllValues = function() {
-    //return _.map(self.getOptionsFromProduct(), function(optionName) {
-    //  return {
-    //    name: optionName,
-    //    values: _.uniq(_.map(self.product.variants, function(variant) {
-    //      return variant[self.getOptionAttribute(optionName)];
-    //    }))
-    //  };
-    //});
-    
     var options = [];
     if (self.product.option1) options.push({ name: self.product.option1, values: self.option1_values });
     if (self.product.option2) options.push({ name: self.product.option2, values: self.option2_values });
@@ -277,8 +268,8 @@ Caboose.Store.Modules.Product = (function() {
   //
   
   self.setImageFromVariant = function(variant) {    
-    if (!variant || !variant.images || variant.images.length == 0 || !variant.images[0])
-      return;
+    if (!variant || !variant.images || variant.images.length == 0 || !variant.images[0]) return;
+    self.$product.trigger('variant:updated');
     
     var $figure = self.$images.children('figure');   
     if (variant.images && variant.images.length > 0 && variant.images[0]) {

data/app/assets/templates/caboose_store/cart/line_items.jst.ejs

@@ -26,14 +26,14 @@
         </section>
         
         <section>
-          <p class="price">$<%= lineItem.price %></p>
+          <p class="price">$<%= parseFloat(Math.round(lineItem.price * 100) / 100).toFixed(2)  %></p>
         </section>
       </li>
     <% }); %>
     
     <li>
       <footer>
-        <a href="/checkout" class="btn blue">Proceed to Checkout</a>
+        <a href="/checkout" class="btn blue">Checkout</a>
         <h4>Subtotal: <span class="subtotal">$<%= parseFloat(Math.round(order.subtotal * 100) / 100).toFixed(2) %></span></h4>
       </footer>
     </li>

data/app/assets/templates/caboose_store/product/options.jst.ejs

@@ -11,7 +11,7 @@
 <% _.each(options, function(option, index) { %>
   <h3><%= option.name %></h3>
   <ul id="<%= 'option' + (index + 1) %>" data-name="<%= option.name %>">
-    <% _.each(option.values, function(value) { %>
+    <% _.each(_.sortBy(option.values, function(option) { return parseFloat(option) }), function(value) { %>
       <li data-value="<%= value %>"><%= value %></li>
     <% }); %>
   </ul>

data/app/controllers/caboose_store/cart_controller.rb

@@ -8,6 +8,7 @@ module CabooseStore
     
     # GET /cart
     def index
+      
     end
     
     # GET /cart/items

data/app/controllers/caboose_store/checkout_controller.rb

@@ -2,6 +2,7 @@ module CabooseStore
   class CheckoutController < CabooseStore::ApplicationController
     helper :authorize_net
     before_filter :ensure_line_items, :only => [:step_one, :step_two]
+    protect_from_forgery :except => :relay
     
     def ensure_line_items
       redirect_to '/checkout/empty' if @order.line_items.empty?
@@ -31,15 +32,15 @@ module CabooseStore
     end
     
     # GET /checkout/step-three
-    def step_three      
+    def step_three
       redirect_to '/checkout/step-one' and return if !logged_in?
       redirect_to '/checkout/step-two' and return if @order.shipping_address.nil? || @order.billing_address.nil?
-      @rates = ShippingCalculator.rates(@order)      
+      @rates = ShippingCalculator.rates(@order)
       @selected_rate = ShippingCalculator.rate(@order)
     end
     
     # GET /checkout/step-four
-    def step_four            
+    def step_four
       redirect_to '/checkout/step-one'   and return if !logged_in?
       redirect_to '/checkout/step-two'   and return if @order.shipping_address.nil? || @order.billing_address.nil?
       redirect_to '/checkout/step-three' and return if @order.shipping_method_code.nil?
@@ -199,20 +200,22 @@ module CabooseStore
     
     # POST /checkout/relay/:order_id
     def relay
+      ap '--HOOK RELAY'
       @order = CabooseStore::Order.find(params[:order_id])
+      @success = CabooseStore::PaymentProcessor.authorize(@order, params)
+      @message = @success ? 'Payment processed successfully' : 'There was a problem processing your payment'
+      
+      #case CabooseStore::payment_processor
+      #  when 'authorize.net'
+      #    @success = params[:x_response_code] == '1'
+      #    @message = jarams[:x_response_reason_text]
+      #    @order.transaction_id = params[:x_trans_id] if params[:x_trans_id]
+      #  when 'payscape'
+      #    @success = CabooseStore::PaymentProcessor.authorize(@order, params)
+      #    @message = @success ? 'Payment processed successfully' : 'There was a problem processing your payment'
+      #    @order.transaction_id = params['transaction-id'] if params['transaction-id']
+      #end
       
-      case CabooseStore::payment_processor
-        when 'authorize.net'
-          @success = params[:x_response_code] == '1'
-          @message = params[:x_response_reason_text]
-          @order.transaction_id = params[:x_trans_id] if params[:x_trans_id]
-        when 'payscape'
-          @success = CabooseStore::PaymentProcessor.authorize(@order, params)
-          @message = @success ? 'Payment processed successfully' : 'There was a problem processing your payment'
-          @order.transaction_id = params['transaction-id'] if params['transaction-id']
-      end
-      ap @success
-      ap '---------'
       if @success
         @order.financial_status = 'authorized'
         @order.status = 'pending'

data/app/controllers/caboose_store/products_controller.rb

@@ -185,6 +185,51 @@ module CabooseStore
       redirect_to "/admin/products/#{params[:id]}/variants"
     end
     
+    # POST /admin/products/:id/varaints/add-multiple
+    def admin_add_multiple_variants
+      product = Product.find(params[:id])
+      
+      params[:variants_csv].split("\r\n").each do |variant|
+        row = variant.split(',')
+        
+        render :json => { :success => false, :error => "Quantity is not defined for variant: #{row[0].strip}" } and return if row[1].nil?
+        render :json => { :success => false, :error => "Price is not defined for variant: #{row[0].strip}" } and return if row[2].nil?
+        
+        attributes = {
+          :alternate_id => row[0].strip,
+          :quantity_in_stock => row[1].strip.to_i,
+          :price => '%.2f' % row[2].strip.to_f,
+          :status => 'Active'
+        }
+        
+        if product.option1 && row[3].nil?
+          render :json => { :success => false, :error => "#{product.option1} not defined for variant: #{attributes[:alternate_id]}" } and return
+        elsif product.option1
+          attributes[:option1] = row[3].strip
+        end
+        
+        if product.option2 && row[4].nil?
+          render :json => { :success => false, :error => "#{product.option2} not defined for variant: #{attributes[:alternate_id]}" } and return
+        elsif product.option2
+          attributes[:option2] = row[4].strip
+        end
+        
+        if product.option3 && row[5].nil?
+          render :json => { :success => false, :error => "#{product.option3} not defined for variant: #{attributes[:alternate_id]}" } and return
+        elsif product.option3
+          attributes[:option3] = row[5].strip
+        end
+        
+        if product.variants.find_by_alternate_id(attributes[:alternate_id])
+          product.variants.find_by_alternate_id(attributes[:alternate_id]).update_attributes(attributes)
+        else
+          Variant.create(attributes.merge(:product_id => product.id))
+        end
+      end
+      
+      render :json => { :success => true }
+    end
+    
     # POST /admin//products/:id/variants/remove
     def admin_remove_variants
       params[:variant_ids].each do |variant_id|

data/app/helpers/caboose_store/checkout_helper.rb

@@ -30,7 +30,7 @@ module CabooseStore
     
     def checkout_nav(i)
       str = ""
-      str << "<div id='nav'>"
+      str << "<div id='checkout-nav'>"
       str << "  <ul>"
       str << "    <li class='odd'  id='checkout_nav1'><a href='#{i <= 1 ? '#' : '/checkout/step-one'   }' class='#{i == 1 ? 'current' : (i < 1 ? 'not_done' : 'done')}'><span>User Account </span></a></li>"
       str << "    <li class='even' id='checkout_nav2'><a href='#{i <= 2 ? '#' : '/checkout/step-two'   }' class='#{i == 2 ? 'current' : (i < 2 ? 'not_done' : 'done')}'><span>Addresses    </span></a></li>"
@@ -41,6 +41,6 @@ module CabooseStore
       str << "</div>"
       return str
     end
-    
   end
 end
+

data/app/mailers/caboose_store/orders_mailer.rb

@@ -1,11 +1,11 @@
 module CabooseStore
   class OrdersMailer < ActionMailer::Base
-    default :from => 'woodsnwater.actionmailer@gmail.com'
+    default :from => CabooseStore::from_address.nil? ? 'caboose-store.actionmailer@gmail.com' : CabooseStore::from_address
     
     # Sends a confirmation email to the customer about a new order 
     def customer_new_order(order)
       @order = order
-      mail(:to => order.customer ? order.customer.email : order.email, :subject => 'Thank you for your order!')
+      mail(:to => order.customer.email, :subject => 'Thank you for your order!')
     end
     
     # Sends a notification email to the fulfillment dept about a new order 
@@ -23,7 +23,8 @@ module CabooseStore
     # Sends a notification email to the customer that the status of the order has been changed
     def customer_status_updated(order)
       @order = order
-      mail(:to => order.customer ? order.customer.email : order.email, :subject => 'Order status update')
+      mail(:to => order.customer.email, :subject => 'Order status update')
     end
   end
 end
+

data/app/models/caboose_store/payment_processors/authorizenet.rb

@@ -2,20 +2,52 @@ class CabooseStore::PaymentProcessors::Authorizenet < CabooseStore::PaymentProce
   def self.api(root, body, test=false)
   end
   
-  def self.form_url(order)
-    #'https://secure.authorize.net/gateway/transact.dll'
+  def self.form_url(order=nil)
+    #if Rails.env == 'development'
     'https://test.authorize.net/gateway/transact.dll'
+    #else
+    #  'https://secure.authorize.net/gateway/transact.dll'
+    #end
   end
   
   def self.authorize(order, params)
+    order.update_attribute(:transaction_id, params[:x_trans_id]) if params[:x_trans_id]
+    return params[:x_response_code] == '1'
   end
   
   def self.void(order)
+    response = AuthorizeNet::SIM::Transaction.new(
+      CabooseStore::authorize_net_login_id,
+      CabooseStore::authorize_net_transaction_key,
+      order.total,
+      :transaction_type => 'VOID',
+      :transaction_id => order.transaction_id
+    )
+    
+    ap response
   end
   
   def self.capture(order)
+    response = AuthorizeNet::SIM::Transaction.new(
+      CabooseStore::authorize_net_login_id,
+      CabooseStore::authorize_net_transaction_key,
+      order.total,
+      :transaction_type => 'CAPTURE_ONLY',
+      :transaction_id => order.transaction_id
+    )
+    
+    ap response
   end
   
   def self.refund(order)
+    response = AuthorizeNet::SIM::Transaction.new(
+      CabooseStore::authorize_net_login_id,
+      CabooseStore::authorize_net_transaction_key,
+      order.total,
+      :transaction_type => 'CREDIT',
+      :transaction_id => order.transaction_id
+    )
+    
+    ap response
   end
 end

data/app/models/caboose_store/payment_processors/payscape.rb

@@ -69,6 +69,7 @@ class CabooseStore::PaymentProcessors::Payscape < CabooseStore::PaymentProcessor
   
   def self.authorize(order, params)
     response = self.api 'complete-action', { 'token-id' => params['token-id'] }, order.test?
+    order.update_attribute(:transaction_id, params['transaction-id']) if params['transaction-id']
     return response['result-code'].to_i == 100
   end
   

data/app/models/caboose_store/states.rb

@@ -1,6 +1,6 @@
-class States
+class CabooseStore::States
   def self.all
-    {    
+    {
       "AL" => "Alabama",
       "AK" => "Alaska",
       "AS" => "American Samoa",

data/app/models/caboose_store/variant.rb

@@ -19,6 +19,7 @@ module CabooseStore
       :price,              # Variant’s price.
       :ignore_quantity,
       :quantity,
+      :quantity_in_stock,
       :allow_backorder,    # Whether to allow items with no inventory to be added to the cart    
       :status,             # Current status: active, inactive, deleted
       :weight,             # The weight of the variant. This will always be in metric grams.

data/app/views/caboose_store/checkout/relay.html.erb

@@ -1,12 +1,23 @@
 <!DOCTYPE>
 <html>
   <body>
-    <script type="text/javascript">
-      parent.relay_handler({
-        "success": <%= @success %>,
-        "message": "<%= @message %>"
-      });
-    </script>
+    <% if CabooseStore::payment_processor == 'payscape' %>
+      <script type="text/javascript">
+        parent.relay_handler({
+          "success": <%= @success %>,
+          "message": "<%= @message %>"
+        });
+      </script>
+    <% end %>
+    
+    <% if CabooseStore::payment_processor == 'authorize.net' %>
+      <script>
+        parent.postMessage({
+          "success": <%= @success %>,
+          "message": "<%= @message %>"
+        }, "<%= CabooseStore::root_url %>");
+      </script>
+    <% end %>
   </body>
 </html>
 

data/app/views/caboose_store/checkout/step_four.html.erb

@@ -1,4 +1,3 @@
-
 <div id="checkout">
   <h2>Checkout</h2>
   <%= raw checkout_nav(4) %>
@@ -8,11 +7,16 @@
       <% if CabooseStore::payment_processor == 'authorize.net' %>
         <form id="payment" target="relay" action="<%= CabooseStore::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" />          
+          <input name="x_card_num" type="text" maxlength="16" />
+          <!--<br />
+          <label>Security Code</label><br />
+          <input id="x_card_code" name="x_card_code" type="text" />-->
           <br />          
+          
+          <label>Expiration</label>
+          <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>
@@ -32,10 +36,8 @@
             <% (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" />
+          </select><br />
+          <br />
           <input type="submit" value="Submit" />
         </form>
       <% end %>
@@ -88,4 +90,4 @@
 
 <%= content_for :caboose_js do %>
 <%= javascript_include_tag 'caboose_store/modules/checkout_step4' %>
-<% end %>
+<% end %>

data/app/views/caboose_store/checkout/step_one.html.erb

@@ -10,6 +10,7 @@
         <li><p>No thanks                              </p><button data-login-action="guest"    id='guest_button'    >Continue As Guest</button></li>
       </ul>
     </div>
+    
     <section id='checkout-login-form'>    
       <div class="wrapper" id='signin_form_container'>  
         <form action="/login" method="post" id='signin_form'>
@@ -18,6 +19,7 @@
           <input type="submit" value="Submit" />
         </form>
       </div>
+      
       <div class="wrapper" id='register_form_container'>  
         <form action="/register" method="post" id='register_form'>
           <input name="first_name" type="text" placeholder="First Name" />
@@ -29,6 +31,7 @@
           <input type="submit" value="Submit" />
         </form>
       </div>
+      
       <div class="wrapper" id='guest_form_container'>  
         <form action="/checkout/attach-guest" method="post" id='guest_form'>
           <input name="email" type="text" placeholder="Email" />
@@ -36,7 +39,10 @@
           <input type="submit" value="Submit" />
         </form>
       </div>
-      <div id='message'></div>
+      
+      <div class="wrapper">
+        <div id='message'></div>
+      </div>
     </section>
   </section>
   
@@ -47,4 +53,4 @@
                                     
 <%= content_for :caboose_js do %>
 <%= javascript_include_tag 'caboose_store/modules/checkout_step1' %>
-<% end %>
+<% end %>

data/app/views/caboose_store/checkout/step_two.html.erb

@@ -17,7 +17,7 @@ ba = @order.billing_address
             <label><span>Address 1  </span> <input name="shipping[address1]"   type="text" value="<%= sa ? sa.address1   : "" %>" /></label>
             <label><span>Address 2  </span> <input name="shipping[address2]"   type="text" value="<%= sa ? sa.address2   : "" %>" /></label>
             <label><span>City       </span> <input name="shipping[city]"       type="text" value="<%= sa ? sa.city       : "" %>" /></label>        
-            <label><span>State      </span> <select name="shipping[state]"><% States.all.each do |abbr, state| %><option value="<%= abbr %>" <%= sa && sa.state == abbr ? 'selected' : "" %>><%= state %></option><% end %></select></label>        
+            <label><span>State      </span> <select name="shipping[state]"><% CabooseStore::States.all.each do |abbr, state| %><option value="<%= abbr %>" <%= sa && sa.state == abbr ? 'selected' : "" %>><%= state %></option><% end %></select></label>        
             <label><span>Zip        </span> <input name="shipping[zip]"       type="text"  value="<%= sa ? sa.zip        : "" %>" /></label>
             <label><input name="use_as_billing" type="checkbox" value="false" /> Use as billing address</label>
           </fieldset>
@@ -31,7 +31,7 @@ ba = @order.billing_address
             <label><span>Address 1  </span> <input name="billing[address1]"   type="text" value="<%= ba ? ba.address1   : "" %>" /></label>
             <label><span>Address 2  </span> <input name="billing[address2]"   type="text" value="<%= ba ? ba.address2   : "" %>" /></label>
             <label><span>City       </span> <input name="billing[city]"       type="text" value="<%= ba ? ba.city       : "" %>" /></label>
-            <label><span>State      </span> <select name="billing[state]"><% States.all.each do |abbr, state| %><option value="<%= abbr %>" <%= ba && ba.state == abbr ? 'selected' : "" %>><%= state %></option><% end %></select></label>                
+            <label><span>State      </span> <select name="billing[state]"><% CabooseStore::States.all.each do |abbr, state| %><option value="<%= abbr %>" <%= ba && ba.state == abbr ? 'selected' : "" %>><%= state %></option><% end %></select></label>                
             <label><span>Zip        </span> <input name="billing[zip]"        type="text" value="<%= ba ? ba.zip        : "" %>" /></label>
           </fieldset>
         </section>        
@@ -48,4 +48,5 @@ ba = @order.billing_address
 
 <%= content_for :caboose_js do %>
 <%= javascript_include_tag 'caboose_store/modules/checkout_step2' %>
-<% end %>
+<% end %>
+

data/app/views/caboose_store/orders/admin_edit.html.erb

@@ -11,17 +11,19 @@ captured = @order.financial_status == 'captured'
          
 <table class='data'>
 <tr>
-  <th>Customer</th>
+  <th><%= if @order.customer.nil? then 'Guest' else 'Customer' end %></th>
   <th>Shipping Address</th>
   <th>Order Status</th>
   <th>Payment Status</th>
-	<th>Transaction ID</th>
+  <th>Transaction ID</th>
 </tr>
 <tr>
   <td valign='top'>
     <%= "#{@order.shipping_address.first_name} #{@order.shipping_address.last_name}" %><br />
     <% if @order.customer %>
-      <a href='mailto:<%= "#{@order.customer.email}" %>'><%= "#{@order.customer.email}" %></a><br />
+      <a href="mailto:<%= "#{@order.customer.email}" %>"><%= "#{@order.customer.email}" %></a><br />
+    <% elsif @order.email %>
+      <a href="mailto:<%= @order.email %>"><%= @order.email %></a>
     <% end %>
     <%= @order.customer ? @order.customer.phone : @order.shipping_address.phone %>
   </td>
@@ -38,7 +40,7 @@ captured = @order.financial_status == 'captured'
     for <%= number_to_currency(@order.auth_amount) %>
     <% end %>
   </td>
-	<td valign="top"><%= @order.transaction_id %></td>
+  <td valign="top"><%= @order.transaction_id %></td>
 </tr>
 </table><br />
 
@@ -93,11 +95,11 @@ captured = @order.financial_status == 'captured'
 
 <% if @order.financial_status == 'authorized' %>
   <input type='button' value='Capture Funds' onclick="capture_funds(<%= @order.id %>);" />
-	<input type='button' value='Void' onclick="void_order(<%= @order.id %>);" />
+  <input type='button' value='Void' onclick="void_order(<%= @order.id %>);" />
 <% end %>
 
 <% if @order.financial_status == 'captured' %>
-	<input type='button' value='Refund' onclick="refund_order(<%= @order.id %>);" />
+  <input type='button' value='Refund' onclick="refund_order(<%= @order.id %>);" />
 <% end %>
 
 <input type='button' value='Resend Confirmation' onclick="resend_confirmation(<%= @order.id %>)" />
@@ -110,15 +112,15 @@ captured = @order.financial_status == 'captured'
 
 function resend_confirmation(order_id)
 {
-	modal.autosize("<p class='loading'>Resending confirmation..</p>");
-	$.ajax({
-		type: 'post',
-		url: '/admin/orders/' + order_id + '/resend-confirmation',
-		success: function(resp) {
-			if (resp.error) modal.autosize("<p class='note error'>" + resp.error + "</p>");
-			if (resp.success) modal.autosize("<p class='note success'>" + resp.success + "</p>");
-		}
-	});
+  modal.autosize("<p class='loading'>Resending confirmation..</p>");
+  $.ajax({
+    type: 'post',
+    url: '/admin/orders/' + order_id + '/resend-confirmation',
+    success: function(resp) {
+      if (resp.error) modal.autosize("<p class='note error'>" + resp.error + "</p>");
+      if (resp.success) modal.autosize("<p class='note success'>" + resp.success + "</p>");
+    }
+  });
 }
 
 function capture_funds(order_id, confirm)

data/app/views/caboose_store/products/admin_edit_variants.html.erb

@@ -1,11 +1,11 @@
 <% content_for :caboose_css do %>
-	<style>
-		ul {
-			list-style-type: square;
-			padding: 0 0 0 24px;
-			margin: 12px 0 24px;
-		}
-	</style>
+  <style>
+    ul {
+      list-style-type: square;
+      padding: 0 0 0 24px;
+      margin: 12px 0 24px;
+    }
+  </style>
 <% end %>
 
 <%
@@ -82,6 +82,13 @@ end
 
 <p><input type='button' value='New Variant' onclick="add_variant(<%= p.id %>);" /></p>
 
+<form id="add-multiple" action="/admin/products/<%= @product.id %>/variants/add-multiple" method="post">
+  <p style="margin: 0 0 12px"><small>CSV format: Alternate ID, Quantity, Price<%= ', ' if @product.option1 || @product.option2 || @product.option3 %><%= [@product.option1, @product.option2, @product.option3].compact.join(', ') %></small></p>
+  <textarea id="variants_csv" name="variants_csv" rows="8" cols="12" style="min-width: 500px; min-height: 250px; margin: 0 0 16px; padding: 12px"></textarea><br />
+  <input type="submit" value="Submit" />
+  <p class="message" style="margin: 12px 0 0; color: red"></p>
+</form>
+
 <%= render :partial => 'caboose_store/products/admin_footer' %>
 
 <% content_for :caboose_css do %>
@@ -95,6 +102,25 @@ td.sort_handle { background: #ccc; width: 20px; }
 <script type='text/javascript'>
 
 $(document).ready(function() {
+  $('form#add-multiple').on('submit', function(event) {
+    event.preventDefault();
+    var $form = $(event.target);
+    
+    $.ajax({
+      type: $form.attr('method'),
+      url: $form.attr('action'),
+      data: $form.serialize(),
+      success: function(response) {
+        console.log(response);
+        if (response.success) {
+          location.reload();
+        } else {
+          $form.find('.message').empty().text(response.error);
+        }
+      }
+    });
+  });
+  
   <% p.variants.each do |v| %>
   new ModelBinder({
     name: 'Variant',

data/config/routes.rb

@@ -27,7 +27,7 @@ CabooseStore::Engine.routes.draw do
   #get  '/checkout/payment'         => 'checkout#payment'
   get  '/checkout/relay/:order_id' => 'checkout#relay'
   post '/checkout/relay/:order_id' => 'checkout#relay'  
-  #get  '/checkout/empty'           => 'checkout#empty'
+  get  '/checkout/empty'           => 'checkout#empty'
   
   # Products
   
@@ -44,6 +44,7 @@ CabooseStore::Engine.routes.draw do
   get  '/admin/products/:id/variants/group'  => 'products#admin_group_variants'
   post '/admin/products/:id/variants/add'    => 'products#admin_add_variants'
   post '/admin/products/:id/variants/remove' => 'products#admin_remove_variants'
+  post '/admin/products/:id/variants/add-multiple' => 'products#admin_add_multiple_variants'
   
   get '/admin/products/add-upcs' => 'products#admin_add_upcs'
   

data/lib/caboose-store.rb

@@ -15,6 +15,7 @@ module CabooseStore
     :authorize_net_transaction_key,
     :handling_percentage,
     :allowed_shipping_method_codes,
-    :default_shipping_method_code
+    :default_shipping_method_code,
+    :from_address
 end
 

data/lib/caboose-store/engine.rb

@@ -87,7 +87,8 @@ module CabooseStore::BootStrapper
     end
     
     # Log the order and set an instance variable up
-    ap @order = CabooseStore::Order.find(session[:cart_id])
+    @order = CabooseStore::Order.find(session[:cart_id])
     session[:new_cart_items] ||= Array.new
   end
 end
+

data/lib/caboose-store/version.rb

@@ -1,3 +1,3 @@
 module CabooseStore
-  VERSION = '0.0.39'
+  VERSION = '0.0.40'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-store
 version: !ruby/object:Gem::Version
-  version: 0.0.39
+  version: 0.0.40
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caboose-cms