caboose-cms 0.5.64 → 0.5.66

data/app/models/caboose/shipping_calculator.rb

@@ -11,48 +11,44 @@ module Caboose
     def self.rates(order)
       return [] if Caboose::store_shipping.nil?
             
-      store_config = order.site.store_config
-      if store_config        
-        rates = self.custom_rates(store_config, order)
+      sc = order.site.store_config
+      if sc.shipping_rates_function        
+        rates = self.custom_rates(sc, order)
         return rates        
       end
-            
-      ss = Caboose::store_shipping
+
       origin = Location.new(
-        :country => ss[:origin][:country],
-        :state   => ss[:origin][:state],
-        :city    => ss[:origin][:city],
-        :zip     => ss[:origin][:zip]
+        :country => sc.origin_country,
+        :state   => sc.origin_state,
+        :city    => sc.origin_city,
+        :zip     => sc.origin_zip
       )      
       destination = Location.new(
-        :country     => ss[:origin][:country],
+        :country     => sc.origin_country,
         :state       => order.shipping_address.state,
         :city        => order.shipping_address.city,
         :postal_code => order.shipping_address.zip
-      )      
-      ups = ss[:ups] ? UPS.new(:key => ss[:ups][:key], :login => ss[:ups][:username], :password => ss[:ups][:password], :origin_account => ss[:ups][:origin_account]) : nil        
-      usps = ss[:usps] ? USPS.new(:login => ss[:usps][:username]) : nil                        
-                  
+      )
+      carriers = {}      
+      carriers['UPS']   = UPS.new(  :login => sc.ups_username, :password => sc.ups_password, :key => sc.ups_key, :origin_account => sc.ups_origin_account)  if sc.ups_username.strip.length   > 0 
+      carriers['USPS']  = USPS.new( :login => sc.usps_username)                                                                                             if sc.usps_username.strip.length  > 0
+      carriers['FedEx'] = FedEx.new(:login => sc.fedex_username, :password => sc.fedex_password, :key => sc.fedex_key, :account => sc.fedex_account)        if sc.fedex_username.strip.length > 0
+
       all_rates = []
-      order.packages.each do |op|              
-        sp = op.shipping_package
+      order.packages.each do |op|
+        sp = op.shipping_package                            
         package = op.activemerchant_package
         rates = []
-        if ups                  
-          resp = ups.find_rates(origin, destination, package)      
-          resp.rates.sort_by(&:price).each do |rate|
-            next if rate.service_code != sp.service_code            
-            rates << { :carrier => 'UPS', :service_code => rate.service_code, :service_name => rate.service_name, :price => rate.total_price.to_d / 100 }
-          end
-        end
-        if usps
-          resp = usps.find_rates(origin, destination, package)
-          resp.rates.sort_by(&:price).each do |rate|
-            next if rate.service_code != sp.service_code            
-            rates << { :carrier => 'USPS', :service_code => rate.service_code, :service_name => rate.service_name, :total_price  => rate.total_price.to_d / 100 }
+        carriers.each do |name, carrier|          
+          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 }
+            end
           end
-        end
-        all_rates << { :order_package => op, :rates => rates }
+        end        
+        all_rates << { :order_package => op, :rates => rates }        
       end            
       return all_rates
     end

data/app/models/caboose/shipping_package.rb

@@ -9,12 +9,17 @@ module Caboose
     attr_accessible :id,
       :site_id,
       :name,
-      :length, 
-      :width, 
-      :height, 
+      :inside_length, 
+      :inside_width, 
+      :inside_height,
+      :outside_length, 
+      :outside_width, 
+      :outside_height,
       :volume,
+      :empty_weight,
+      :cylinder,
       :priority,
-      :flat_rate_price
+      :flat_rate_price            
           
     def fits(variants)  
       
@@ -36,7 +41,7 @@ module Caboose
       rigid_boxes = self.boxes(rigid)
       
       it_fits = false       
-      BoxPacker.container [self.length, self.width, self.height] do        
+      BoxPacker.container [self.inside_length, self.inside_width, self.inside_height] do        
         rigid_boxes.each{ |arr| add_item arr }    
         count = pack!
         it_fits = true if count == rigid_boxes.count                                      
@@ -86,6 +91,41 @@ module Caboose
       
       return nonstackable
     end
+    
+    def toggle_shipping_method(shipping_method_id, value)      
+      if value.to_i > 0 # Add        
+        if shipping_method_id == 'all'
+          ShippingPackageMethod.where(:shipping_package_id => self.id).destroy_all      
+          ShippingMethod.reorder(:service_name).all.each do |sm|
+            ShippingPackageMethod.create(:shipping_package_id => self.id, :shipping_method_id => sm.id)
+          end                          
+        else
+          if !ShippingPackageMethod.where(:shipping_package_id => self.id, :shipping_method_id => shipping_method_id.to_i).exists?
+            ShippingPackageMethod.create(:shipping_package_id => self.id, :shipping_method_id => shipping_method_id.to_i)
+          end      
+        end              
+      else # Remove
+        if shipping_method_id == 'all'
+          ShippingPackageMethod.where(:shipping_package_id => self.id).destroy_all                          
+        else
+          ShippingPackageMethod.where(:shipping_package_id => self.id, :shipping_method_id => shipping_method_id.to_i).destroy_all      
+        end
+      end
+    end
+    
+    def uses_carrier(carrier)
+      self.shipping_methods.each do |sm|
+        return true if sm.carrier == carrier
+      end
+      return false
+    end
+    
+    def uses_service_code(carrier, service_code)
+      self.shipping_methods.each do |sm|
+        return true if sm.carrier == carrier && sm.service_code == service_code
+      end
+      return false
+    end
         
   end
 end

data/app/models/caboose/store_config.rb

@@ -1,23 +1,35 @@
 module Caboose
   class StoreConfig < ActiveRecord::Base
-    self.table_name = 'store_configs'
+    self.table_name = 'store_configs'    
+    
     belongs_to :site    
     attr_accessible :id,
       :site_id,            
       :pp_name,     
       :pp_username,
-      :pp_password,
-      :use_usps,
+      :pp_password,      
+      :ups_username,
+      :ups_password,
+      :ups_key,
+      :ups_origin_account,
+      :usps_username,
       :usps_secret_key,
       :usps_publishable_key,
-      :allowed_shipping_codes, # ['0','7','6','1','2','3'],
-      :default_shipping_code,      
+      :fedex_username,
+      :fedex_password,
+      :fedex_key,
+      :fedex_account,
       :origin_country, 
       :origin_state, 
       :origin_city, 
       :origin_zip,           
       :fulfillment_email,
       :shipping_email,
-      :handling_percentage      
+      :handling_percentage,
+      :calculate_packages,
+      :shipping_rates_function,
+      :length_unit,
+      :weight_unit
+        
   end
 end

data/app/models/caboose/tax_calculator.rb

@@ -1,9 +1,10 @@
 module Caboose
   class TaxCalculator
     def self.tax_rate(address)      
-      return 0 if address.state.downcase != 'al'
-      city = address.city.downcase
-      rate = 0.00
+      return 0.00 if address.nil? || address.city.nil? || address.state.nil?       
+      return 0 if address.state.downcase != 'al'      
+      rate = 0.00      
+      city = address.city.downcase            
       rate = rate + 0.05 if city == 'brookwood'  
       rate = rate + 0.05 if city == 'coaling'    
       rate = rate + 0.05 if city == 'coker'      
@@ -14,8 +15,8 @@ module Caboose
       rate = rate + 0.05 if city == 'northport'  
       rate = rate + 0.05 if city == 'tuscaloosa' 
       rate = rate + 0.05 if city == 'vance'      
-      rate = rate + 0.05 if city == 'woodstock'  
-      rate = rate + 0.04 if address.state.downcase == 'al' || address.state.downcase == 'alabama'        
+      rate = rate + 0.05 if city == 'woodstock'      
+      rate = rate + 0.04 if address.state.downcase == 'al' || address.state.downcase == 'alabama'              
       return rate.round(2)
     end
   end

data/app/views/caboose/blocks/admin_edit.html.erb

@@ -44,7 +44,7 @@ end
   <p><div id='block_<%= @block.id %>_value'></div></p>
 <% else %>  
   <% if @block.children.count > 0 %>  
-    <% @block.children.each do |b| %>
+    <% @block.children.order(:id).each do |b| %>
       <% if b.block_type.field_type != 'block' && b.block_type.field_type != 'richtext' %>
         <div style='margin-bottom: 10px;'><div id='block_<%= b.id %>_value'></div></div>
       <% else %>

data/app/views/caboose/line_items/admin_new.html.erb

@@ -0,0 +1,100 @@
+
+<h1>Add Item</h1>
+         
+<p><input type='text' name='product_title' id='product_title' value='' style='width: 400px;' /></p>
+<div id='products'></div>
+<div id='variants'></div>
+<div id='message'></div>
+
+<p><input type='button' value='Cancel' onclick="modal.close();" /></p>
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag 'caboose/model/all' %>
+<script type='text/javascript'>
+
+var modal = false;
+$(window).load(function() {
+  modal = new CabooseModal(600);
+});
+
+$(document).ready(function() {
+  $('#product_title').on('keyup', function() { show_products(); });
+});
+
+function show_products()
+{
+  var title = $('#product_title').val();
+  $.ajax({
+    url: '/admin/orders/line-items/product-stubs',
+    type: 'get',
+    data: { title: title },
+    success: function(products) {
+      if (products && products.length > 0)
+      {
+        var ul = $('<ul/>');
+        $.each(products, function(i, p) {
+          ul.append($('<li/>')
+            .attr('id', 'product_id_' + p.id)
+            .data('product_id', p.id)            
+            .append($('<a/>').html(p.title).click(function(e) {
+              e.preventDefault();
+              show_variants($(e.target).parent(), $(e.target).parent().data('product_id'));        
+            }))
+          );
+        });
+        $('#products').empty().append(ul);
+      }
+      else
+      {
+        $('#products').empty().append($('<p/>').html('No products met your search.'));
+      }
+      modal.autosize();
+    } 
+  });
+}
+
+var open_product_id = false;
+
+function show_variants(li, product_id)
+{
+  if (open_product_id && open_product_id == product_id)
+  {
+    $('#product_id_' + open_product_id).find('ul').remove();
+    open_product_id = false;
+    return;
+  }
+  if (open_product_id)  
+  {
+    $('#product_id_' + open_product_id).find('ul').remove();
+    open_product_id = false;
+  }  
+  open_product_id = product_id;
+  $.ajax({
+    url: '/admin/products/' + product_id + '/variants/json',
+    type: 'get',        
+    success: function(resp) {
+      var ul = $('<ul/>');
+      $.each(resp.models, function(i, v) {
+        var name = [];
+        if (v.option1) name.push(v.option1);
+        if (v.option2) name.push(v.option2);
+        if (v.option3) name.push(v.option3);
+        name = name.join(' / ');
+        ul.append($('<li/>')
+          .data('variant_id', v.id)          
+          .append($('<a/>').html(name).click(function(e) {
+            e.preventDefault();
+            variant_id = $(e.target).parent().data('variant_id');
+            parent.controller.add_variant(variant_id);
+            modal.close();
+          }))
+        );
+      });
+      li.append(ul);
+      modal.autosize();
+    }
+  });  
+}
+
+</script>
+<% end %>

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

@@ -1,106 +1,10 @@
-<%
-sa = @order.shipping_address
-shipping_address = sa.address1
-shipping_address << "<br />#{sa.address2}" if sa.address2 && sa.address2.length > 0
-shipping_address << "<br />#{sa.city}, #{sa.state} #{sa.zip}"
-captured = @order.financial_status == 'captured'
-%>
+
 <input type='hidden' name='order_id'    id='order_id'     value='<%= @order.id %>' />
 
 <h1>Edit Order #<%= @order.id %></h1>
-         
-<table class='data'>
-<tr>
-  <th><%= if @order.customer.nil? then 'Guest' else 'Customer' end %></th>
-  <th>Shipping Address</th>
-  <th>Shipping Method</th>
-  <th>Order Status</th>
-  <th>Payment Status</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 />
-    <% elsif @order.email %>
-      <a href="mailto:<%= @order.email %>"><%= @order.email %></a>
-    <% end %>
-    <%= @order.customer ? @order.customer.phone : @order.shipping_address.phone %>    
-  </td>
-  <td valign='top'>
-    <%= "#{@order.shipping_address.first_name} #{@order.shipping_address.last_name}" %><br />
-    <%= raw shipping_address %>
-  </td>
-  <td valign='top' align='center'>
-    <% if @order.shipping_service_code %>
-      <%= @order.shipping_carrier %> <%= @order.shipping_service_name %>
-    <% else %>
-      Multiple packages
-    <% end %>
-  </td>
-  <td valign='top'>
-    <div id='order_<%= @order.id %>_status'></div>
-  </td>
-  <td valign='top' align='center'>
-    <%= @order.financial_status %>
-    <% if @order.financial_status == 'authorized' %>
-    for<br /><%= number_to_currency(@order.auth_amount) %>
-    <% end %>
-  </td>
-  <td valign="top" align='center'><%= @order.transaction_id %></td>
-</tr>
-</table><br />
-
-<table class='data' width='100%'>
-<tr>
-  <th>Item</th>
-  <th>Status</th>
-  <th>Tracking Number</th>  
-  <th>Unit Price</th>
-  <th>Quantity</th>
-  <th>Subtotal</th>
-</tr>
-<% @order.line_items.each do |li| %>
-  <tr>
-    <td>
-      <% if li.variant.nil? || li.variant.product.nil? %>
-        <% if li.variant.nil? %>
-          Unknown variant
-        <% else %>
-          <%= li.variant.sku %>
-        <% end %>
-      <% else %>
-        <a href='/admin/products/<%= li.variant.product.id %>/variants?highlight=<%= li.variant.id %>'><%= li.variant.product.title  %></a><br />
-        <%= li.variant.sku            %><br />
-        <%= li.variant.title          %>
-      <% end %>
-    </td>
-    <td              ><div id='lineitem_<%= li.id %>_status'          ></div></td>
-    <td              ><div id='lineitem_<%= li.id %>_tracking_number' ></div></td>
-    <td align='right'><%= number_to_currency(li.variant.price) %></td>    
-    <td align='right'><% if captured %><%= li.quantity %><% else %><div id='lineitem_<%= li.id %>_quantity'></div><% end %></td>
-    <td align='right' id='li_<%= li.id %>_subtotal'><%= number_to_currency(li.price) %></td>
-  </tr>
-<% end %>
-<tr><td colspan='5' align='right'>Subtotal                </td><td align='right' id='subtotal'   ><%= number_to_currency(@order.subtotal ) %></td></tr>
-<tr><td colspan='5' align='right'>Tax                     </td><td align='right' id='tax'        ><%= number_to_currency(@order.tax      ) %></td></tr>
-<tr><td colspan='5' align='right'><%= @order.shipping_service_code ? @order.shipping_service_code : '' %> Shipping &amp; Handling </td><td align='right' id='shipping'><%= number_to_currency(@order.shipping + @order.handling) %></td></tr>
-<tr>
-  <td colspan='5' align='right'>Discount</td>
-  <td align='right'>
-    <% if captured && @order.discounts.any? %>
-      <%= number_to_currency(@order.amount_discounted || 0) %>
-    <% elsif @order.discounts.any? %>
-      <%= number_to_currency(@order.discounts.first.amount_current) %>
-    <% else %>
-      $0.00
-    <% end %>
-  </td>
-</tr>
 
-<tr><td colspan='5' align='right'>Total                   </td><td align='right' id='total'      ><%= number_to_currency(@order.total    ) %></td></tr>
-</table>
+<div id='overview_table'></div>
+<div id='order_table'></div>
 <div id='message'></div>
 
 <p>
@@ -113,6 +17,7 @@ captured = @order.financial_status == 'captured'
   <input type='button' value='Refund' onclick="refund_order(<%= @order.id %>);" />
 <% end %>
 <input type='button' value='Resend Confirmation' onclick="resend_confirmation(<%= @order.id %>)" />
+<input type='button' value='Add Item' onclick="controller.add_variant();" />
 <input type='button' value='Print Order' onclick="print_order(<%= @order.id %>);" />
 
 <% str = Caboose.plugin_hook('admin_edit_order_buttons', "", @order) %>
@@ -121,159 +26,28 @@ captured = @order.financial_status == 'captured'
 
 <% content_for :caboose_js do %>
 <%= javascript_include_tag 'caboose/model/all' %>
+<%= javascript_include_tag 'caboose/admin_edit_order' %>
 <script type='text/javascript'>
 
-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>");
-    }
-  });
-}
-
-function capture_funds(order_id, confirm)
-{
-  total = $('#total').html();
-  if (!confirm)
-  {    
-    var p = $('<p/>').addClass('note confirm')
-      .append("Are you sure you want to charge " + total + " to the customer? ")
-      .append($('<input/>').attr('type','button').val('Yes').click(function() { capture_funds(order_id, true); }))
-      .append(' ')
-      .append($('<input/>').attr('type','button').val('No').click(function() { $('#message').empty(); modal.autosize(); }));
-    modal.autosize(p);
-    return;
-  }
-  modal.autosize("<p class='loading'>Capturing funds...</p>");
-  $.ajax({
-    url: '/admin/orders/' + order_id + '/capture',
-    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>");
-      if (resp.refresh) window.location.reload(true);
-    }
-  });
-}
-
-function void_order(order_id, confirm)
-{
-  if (!confirm)
-  {    
-    var p = $('<p/>').addClass('note confirm')
-      .append("Are you sure you want to void this order? ")
-      .append($('<input/>').attr('type','button').val('Yes').click(function() { void_order(order_id, true); }))
-      .append(' ')
-      .append($('<input/>').attr('type','button').val('No').click(function() { $('#message').empty(); modal.autosize(); }));
-    modal.autosize(p);
-    return;
-  }
-  modal.autosize("<p class='loading'>Voiding...</p>");
-  $.ajax({
-    url: '/admin/orders/' + order_id + '/void',
-    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>");
-      if (resp.refresh) window.location.reload(true);
-    }
-  });
-}
-
-function refund_order(order_id, confirm)
-{
-  if (!confirm)
-  {    
-    var p = $('<p/>').addClass('note confirm')
-      .append("Are you sure you want to refund this order? ")
-      .append($('<input/>').attr('type','button').val('Yes').click(function() { refund_order(order_id, true); }))
-      .append(' ')
-      .append($('<input/>').attr('type','button').val('No').click(function() { $('#message').empty(); modal.autosize(); }));
-    modal.autosize(p);
-    return;
-  }
-  modal.autosize("<p class='loading'>Refunding...</p>");
-  $.ajax({
-    url: '/admin/orders/' + order_id + '/refund',
-    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>");
-      if (resp.refresh) window.location.reload(true);
-    }
-  });
-}
-
-function print_order(order_id)
-{
-  window.open('/admin/orders/' + order_id + '/print');
-}
-
+var controller = false;
 $(document).ready(function() {
-  <% @order.line_items.each do |li| %>
-  new ModelBinder({
-    name: 'Lineitem',
-    id: <%= li.id %>,
-    update_url: '/admin/orders/<%= @order.id %>/line-items/<%= li.id %>',
-    authenticity_token: '<%= form_authenticity_token %>',
-    attributes: [
-      { name: 'status'          , nice_name: 'Status'           , type: 'select'  , align: 'left' , value: <%= raw Caboose.json(li.status          ) %>, text: <%= raw Caboose.json(li.status          ) %>, width: 150, fixed_placeholder: false, options_url: '/admin/orders/line-item-status-options' },
-      { name: 'tracking_number' , nice_name: 'Tracking Number'  , type: 'text'    , align: 'left' , value: <%= raw Caboose.json(li.tracking_number ) %>, width: 200, fixed_placeholder: false },
-      { name: 'quantity'        , nice_name: 'Quantity'         , type: 'text'    , align: 'right', value: <%= raw Caboose.json(li.quantity        ) %>, width:  75, fixed_placeholder: false,
-        before_update: function() {          
-          modal.autosize("<p class='loading'>Recalculating tax, shipping and handling...</p>"); 
-        },
-        after_update: function() {
-          var order_id = $('#order_id').val();
-          $.ajax({
-            url: '/admin/orders/' + order_id + '/json',
-            success: function(order) {
-              $.each(order.order_line_items, function(i, li) {
-                $('#li_' + li.id + '_subtotal').html('$' + parseFloat(li.variant.price * li.quantity).toFixed(2));
-              });
-              var sah = parseFloat(order.shipping) + parseFloat(order.handling);
-              $('#subtotal' ).html('$' + parseFloat(order.subtotal ).toFixed(2));
-              $('#subtotal' ).html('$' + parseFloat(order.subtotal ).toFixed(2));
-              $('#tax'      ).html('$' + parseFloat(order.tax      ).toFixed(2));
-              $('#shipping' ).html('$' + parseFloat(sah            ).toFixed(2));
-              $('#total'    ).html('$' + parseFloat(order.total    ).toFixed(2));
-              $('#order_total').val(parseFloat(order.total).toFixed(2));
-              $('#message').empty();
-              modal.autosize();
-            }
-          });
-        }
-      }
-    ]
-  });
-  <% end %>
-
-  new ModelBinder({
-    name: 'Order',
-    id: <%= @order.id %>,
-    update_url: '/admin/orders/<%= @order.id %>',
-    authenticity_token: '<%= form_authenticity_token %>',
-    attributes: [
-      { 
-        name: 'status',
-        nice_name: 'Status',
-        type: 'select',
-        value: <%= raw Caboose.json(@order.status) %>,
-        text: <%= raw Caboose.json(@order.status) %>,
-        width: 100,
-        options_url: '/admin/orders/status-options',
-        fixed_placeholder: false
-      }
-    ]
+  controller = new OrderController({ 
+    order_id: <%= raw Caboose.json(@order.id) %>,
+    authenticity_token: <%= raw Caboose.json(form_authenticity_token) %>
   });
 });
 
-var modal = false;
-$(window).load(function() {
-  modal = new CabooseModal('95%');
-});
-
 </script>
 <% end %>
+
+<% content_for :caboose_css do %>
+<style type='text/css'>
+
+table.shipping_address td { 
+  padding: 0 !important; 
+  margin: 0 !important; 
+  border: 0 !important; 
+}
+
+</style>
+<% end %>