caboose-cms 0.7.85 → 0.8.1

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

@@ -6,11 +6,11 @@
   <% elsif @rates.count == 1 %>
     <p>Please select which shipping method you'd like to use.</p>
     <p>
-    <% op = @rates[0][:order_package] %>
+    <% op = @rates[0][:invoice_package] %>
     <% @rates[0][:rates].each do |rate| %>
       <% sm = rate[:shipping_method] %>
       <a href='#' class='shipping_rate btn'
-        data-order_package_id="<%= op.id %>"
+        data-invoice_package_id="<%= op.id %>"
         data-shipping_method_id="<%= sm.id %>"
         data-total="<%= rate[:total_price] %>"
         ><%= number_to_currency(rate[:total_price], :precision => 2) %><br /><%= sm.service_name %>
@@ -25,7 +25,7 @@
         <th>Shipping Options</th>
       </tr>
       <% @rates.each_with_index do |package_rates, i| %>
-        <% op = package_rates[:order_package] %>
+        <% op = package_rates[:invoice_package] %>
         <% sp = op.shipping_package %>          
         <tr>                    
           <td valign='top'>
@@ -35,7 +35,7 @@
             <% package_rates[:rates].each do |rate| %>
               <% sm = rate[:shipping_method] %>
               <a href='#' class='shipping_rate btn'
-                data-order_package_id="<%= op.id %>"
+                data-invoice_package_id="<%= op.id %>"
                 data-shipping_method_id="<%= sm.id %>"
                 data-total="<%= rate[:total_price] %>"
                 ><%= number_to_currency(rate[:total_price], :precision => 2) %><br /><%= sm.service_name %>

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

@@ -2,14 +2,14 @@
 <p>Thank you for your order! Your order has been submitted.</p>
 <p>Please allow up to 48 hours for your order to be processed.  Orders are processed during normal business hours Monday through Friday.</p>
 
-<% if @last_order.has_downloadable_items? %>
+<% if @last_invoice.has_downloadable_items? %>
 	<% sc = Caboose::StoreConfig.where(:site_id => @site.id).last %>
 	<% instr = (sc && !sc.download_instructions.blank?) ? sc.download_instructions : "Your order contained downloadable items. Download your items with the links below:" %>
   <div><%== instr %></div>
   <ul id='downloads'>
-    <% @last_order.line_items.each do |li| %>
+    <% @last_invoice.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>
+        <li><a href='/my-account/invoices/<%= @last_invoice.id %>/line-items/<%= li.id %>/download' target="_blank"><%= li.variant.product.title %></a></li>
       <% end %>
     <% end %>
   </ul>   

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

@@ -4,15 +4,15 @@ gc = @gift_card
 
 <h1>Edit Gift Card</h1>
 
-<p><div id='giftcard_<%= gc.id %>_name'             ></div></p>
-<p><div id='giftcard_<%= gc.id %>_code'             ></div></p>
-<p><div id='giftcard_<%= gc.id %>_card_type'        ></div></p>
-<p><div id='giftcard_<%= gc.id %>_total'            ></div></p>
-<p><div id='giftcard_<%= gc.id %>_balance'          ></div></p>
-<p><div id='giftcard_<%= gc.id %>_min_order_total'  ></div></p>
-<p><div id='giftcard_<%= gc.id %>_date_available'   ></div></p>
-<p><div id='giftcard_<%= gc.id %>_date_expires'     ></div></p>
-<p><div id='giftcard_<%= gc.id %>_status'           ></div></p>     
+<p><div id='giftcard_<%= gc.id %>_name'               ></div></p>
+<p><div id='giftcard_<%= gc.id %>_code'               ></div></p>
+<p><div id='giftcard_<%= gc.id %>_card_type'          ></div></p>
+<p><div id='giftcard_<%= gc.id %>_total'              ></div></p>
+<p><div id='giftcard_<%= gc.id %>_balance'            ></div></p>
+<p><div id='giftcard_<%= gc.id %>_min_invoice_total'  ></div></p>
+<p><div id='giftcard_<%= gc.id %>_date_available'     ></div></p>
+<p><div id='giftcard_<%= gc.id %>_date_expires'       ></div></p>
+<p><div id='giftcard_<%= gc.id %>_status'             ></div></p>     
 <div id='message'></div>
 
 <h2>Usage</h2>
@@ -24,7 +24,7 @@ gc = @gift_card
     </tr>
     <% gc.discounts.each do |d| %>
       <tr>
-        <td><a href='/admin/orders/<%= d.order_id %>'><%= d.order_id %></a></td>
+        <td><a href='/admin/invoices/<%= d.invoice_id %>'><%= d.invoice_id %></a></td>
         <td><%= number_to_currency(d.amount) %></td>
       </tr>
     <% end %>
@@ -49,15 +49,15 @@ $(document).ready(function() {
     update_url: '/admin/gift-cards/<%= gc.id %>',
     authenticity_token: '<%= form_authenticity_token %>',
     attributes: [      
-      { name: 'name'               , nice_name: 'Name'                , type: 'text'   , value: <%= raw Caboose.json(gc.name                             ) %>, width: 400, align: 'left'  },
-      { name: 'code'               , nice_name: 'Code'                , type: 'text'   , value: <%= raw Caboose.json(gc.code                             ) %>, width: 400, align: 'left'  },
-      { name: 'card_type'          , nice_name: 'Type'                , type: 'select' , value: <%= raw Caboose.json(gc.card_type                        ) %>, width: 400, align: 'left'  , options_url: '/admin/gift-cards/card-type-options' },
-      { name: 'total'              , nice_name: 'Total'               , type: 'text'   , value: <%= raw Caboose.json(sprintf('%.2f', gc.total           )) %>, width: 400, align: 'right' },
-      { name: 'balance'            , nice_name: 'Balance'             , type: 'text'   , value: <%= raw Caboose.json(sprintf('%.2f', gc.balance         )) %>, width: 400, align: 'right' },
-      { name: 'min_order_total'    , nice_name: 'Minimum Order Total' , type: 'text'   , value: <%= raw Caboose.json(sprintf('%.2f', gc.min_order_total )) %>, width: 400, align: 'right' },
-      { name: 'date_available'     , nice_name: 'Date Available'      , type: 'date'   , value: <%= raw Caboose.json(gc.date_available ? gc.date_available.strftime('%m/%d/%Y') : '') %>, width: 400, align: 'left'  },
-      { name: 'date_expires'       , nice_name: 'Date Expires'        , type: 'date'   , value: <%= raw Caboose.json(gc.date_expires   ? gc.date_expires.strftime('%m/%d/%Y')   : '') %>, width: 400, align: 'left'  },
-      { name: 'status'             , nice_name: 'Status'              , type: 'select' , value: <%= raw Caboose.json(gc.status                           ) %>, width: 400, align: 'left'  , options_url: '/admin/gift-cards/status-options' }      
+      { name: 'name'               , nice_name: 'Name'                  , type: 'text'   , value: <%= raw Caboose.json(gc.name                               ) %>, width: 400, align: 'left'  },
+      { name: 'code'               , nice_name: 'Code'                  , type: 'text'   , value: <%= raw Caboose.json(gc.code                               ) %>, width: 400, align: 'left'  },
+      { name: 'card_type'          , nice_name: 'Type'                  , type: 'select' , value: <%= raw Caboose.json(gc.card_type                          ) %>, width: 400, align: 'left'  , options_url: '/admin/gift-cards/card-type-options' },
+      { name: 'total'              , nice_name: 'Total'                 , type: 'text'   , value: <%= raw Caboose.json(sprintf('%.2f', gc.total             )) %>, width: 400, align: 'right' },
+      { name: 'balance'            , nice_name: 'Balance'               , type: 'text'   , value: <%= raw Caboose.json(sprintf('%.2f', gc.balance           )) %>, width: 400, align: 'right' },
+      { name: 'min_invoice_total'  , nice_name: 'Minimum Invoice Total' , type: 'text'   , value: <%= raw Caboose.json(sprintf('%.2f', gc.min_invoice_total )) %>, width: 400, align: 'right' },
+      { name: 'date_available'     , nice_name: 'Date Available'        , type: 'date'   , value: <%= raw Caboose.json(gc.date_available ? gc.date_available.strftime('%m/%d/%Y') : '') %>, width: 400, align: 'left'  },
+      { name: 'date_expires'       , nice_name: 'Date Expires'          , type: 'date'   , value: <%= raw Caboose.json(gc.date_expires   ? gc.date_expires.strftime('%m/%d/%Y')   : '') %>, width: 400, align: 'left'  },
+      { name: 'status'             , nice_name: 'Status'                , type: 'select' , value: <%= raw Caboose.json(gc.status                             ) %>, width: 400, align: 'left'  , options_url: '/admin/gift-cards/status-options' }      
     ]    
   });       
 });

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

@@ -20,15 +20,15 @@ $(document).ready(function() {
     allow_duplicate: false,
     allow_advanced_edit: true,
     fields: [
-      { show: true  , bulk_edit: true  , name: 'name'               , nice_name: 'Name'           , sort: 'name'            , type: 'text'    , value: function(gc) { return gc.name;                        }, width: 75, align: 'left'  },                                                         
-      { show: true  , bulk_edit: true  , name: 'code'               , nice_name: 'Code'           , sort: 'code'            , type: 'text'    , value: function(gc) { return gc.code;                        }, width: 75, align: 'left'  },
-      { show: true  , bulk_edit: true  , name: 'card_type'          , nice_name: 'Type'           , sort: 'card_type'       , type: 'select'  , value: function(gc) { return gc.card_type;                   }, width: 75, align: 'left'  , options_url: '/admin/gift-cards/card-type-options' },
-      { show: true  , bulk_edit: true  , name: 'total'              , nice_name: 'Total'          , sort: 'total'           , type: 'text'    , value: function(gc) { return curr(gc.total);                 }, width: 75, align: 'right' },
-      { show: true  , bulk_edit: true  , name: 'balance'            , nice_name: 'Balance'        , sort: 'balance'         , type: 'text'    , value: function(gc) { return curr(gc.balance);               }, width: 75, align: 'right' },
-      { show: true  , bulk_edit: true  , name: 'min_order_total'    , nice_name: 'Minimum Order'  , sort: 'min_order_total' , type: 'text'    , value: function(gc) { return curr(gc.min_order_total);       }, width: 75, align: 'right' },
-      { show: true  , bulk_edit: true  , name: 'date_available'     , nice_name: 'Date Available' , sort: 'date_available'  , type: 'date'    , value: function(gc) { return format_date(gc.date_available); }, width: 75, align: 'left'  },
-      { show: true  , bulk_edit: true  , name: 'date_expires'       , nice_name: 'Date Expires'   , sort: 'date_expires'    , type: 'date'    , value: function(gc) { return format_date(gc.date_expires);   }, width: 75, align: 'left'  },
-      { show: true  , bulk_edit: true  , name: 'status'             , nice_name: 'Status'         , sort: 'status'          , type: 'select'  , value: function(gc) { return gc.status;                      }, width: 75, align: 'left'  , options_url: '/admin/gift-cards/status-options' }            
+      { show: true  , bulk_edit: true  , name: 'name'               , nice_name: 'Name'            , sort: 'name'              , type: 'text'    , value: function(gc) { return gc.name;                        }, width: 75, align: 'left'  },                                                         
+      { show: true  , bulk_edit: true  , name: 'code'               , nice_name: 'Code'            , sort: 'code'              , type: 'text'    , value: function(gc) { return gc.code;                        }, width: 75, align: 'left'  },
+      { show: true  , bulk_edit: true  , name: 'card_type'          , nice_name: 'Type'            , sort: 'card_type'         , type: 'select'  , value: function(gc) { return gc.card_type;                   }, width: 75, align: 'left'  , options_url: '/admin/gift-cards/card-type-options' },
+      { show: true  , bulk_edit: true  , name: 'total'              , nice_name: 'Total'           , sort: 'total'             , type: 'text'    , value: function(gc) { return curr(gc.total);                 }, width: 75, align: 'right' },
+      { show: true  , bulk_edit: true  , name: 'balance'            , nice_name: 'Balance'         , sort: 'balance'           , type: 'text'    , value: function(gc) { return curr(gc.balance);               }, width: 75, align: 'right' },
+      { show: true  , bulk_edit: true  , name: 'min_invoice_total'  , nice_name: 'Minimum Invoice' , sort: 'min_invoice_total' , type: 'text'    , value: function(gc) { return curr(gc.min_invoice_total);     }, width: 75, align: 'right' },
+      { show: true  , bulk_edit: true  , name: 'date_available'     , nice_name: 'Date Available'  , sort: 'date_available'    , type: 'date'    , value: function(gc) { return format_date(gc.date_available); }, width: 75, align: 'left'  },
+      { show: true  , bulk_edit: true  , name: 'date_expires'       , nice_name: 'Date Expires'    , sort: 'date_expires'      , type: 'date'    , value: function(gc) { return format_date(gc.date_expires);   }, width: 75, align: 'left'  },
+      { show: true  , bulk_edit: true  , name: 'status'             , nice_name: 'Status'          , sort: 'status'            , type: 'select'  , value: function(gc) { return gc.status;                      }, width: 75, align: 'left'  , options_url: '/admin/gift-cards/status-options' }            
     ],
     new_model_text: 'New Gift Card',
     no_models_text: 'There are no gift cards right now.',

data/app/views/caboose/{orders → invoices}/admin_city_report.html.erb

@@ -1,7 +1,7 @@
 
 <h1>City Report</h1>
 
-<form action='/admin/orders/city-report' method='get' id='search_form'>
+<form action='/admin/invoices/city-report' method='get' id='search_form'>
   <p>
      <input type='text' id='d1' name='d1' value='<%= @d1.strftime('%Y-%m-%d') %>' /> -
      <input type='text' id='d2' name='d2' value='<%= @d2.strftime('%Y-%m-%d') %>' />

data/app/views/caboose/invoices/admin_delete_form.html.erb

@@ -0,0 +1,18 @@
+<%= render :partial => 'invoices/admin_header' %>
+
+<div id='message'>
+<p><input type='button' value='Delete this invoice' onclick='delete_invoice(<%= @invoice.id %>);' /></p>
+</div>
+
+<%= render :partial => 'invoices/admin_footer' %>
+
+<% content_for :caboose_js do %>
+<script type='text/javascript'>
+
+var modal = false;
+$(window).load(function() {
+  modal = new CabooseModal(800);
+});
+
+</script>
+<% end %>

data/app/views/caboose/{orders → invoices}/admin_edit.html.erb

@@ -1,41 +1,41 @@
 
-<input type='hidden' name='order_id'    id='order_id'     value='<%= @order.id %>' />
+<input type='hidden' name='invoice_id'    id='invoice_id'     value='<%= @invoice.id %>' />
 
-<h1>Edit Order #<%= @order.id %></h1>
+<h1>Edit Invoice #<%= @invoice.id %></h1>
 
 <div id='overview_table'></div>
-<div id='order_table'></div>
+<div id='invoice_table'></div>
 <div id='message'></div>
 <div id='controls'></div>
 
 <!--
 <p>
-<input type='button' value='< Back' onclick="window.location='/admin/orders';" />
-<% if @order.financial_status == Caboose::Order::FINANCIAL_STATUS_AUTHORIZED && @order.total > 0.00 %>
+<input type='button' value='< Back' onclick="window.location='/admin/invoices';" />
+<% if @invoice.financial_status == Caboose::Invoice::FINANCIAL_STATUS_AUTHORIZED && @invoice.total > 0.00 %>
   <input type='button' value='Capture Funds' onclick="controller.capture_funds();" />
-  <input type='button' value='Void'          onclick="controller.void_order();" />
+  <input type='button' value='Void'          onclick="controller.void_invoice();" />
 <% end %>
-<% if @order.financial_status == Caboose::Order::FINANCIAL_STATUS_CAPTURED && @order.total > 0.00 %>
-  <input type='button' value='Refund' onclick="refund_order(<%= @order.id %>);" />
+<% if @invoice.financial_status == Caboose::Invoice::FINANCIAL_STATUS_CAPTURED && @invoice.total > 0.00 %>
+  <input type='button' value='Refund' onclick="refund_invoice(<%= @invoice.id %>);" />
 <% end %>
-<input type='button' value='Resend Confirmation' onclick="resend_confirmation(<%= @order.id %>)" />
+<input type='button' value='Resend Confirmation' onclick="resend_confirmation(<%= @invoice.id %>)" />
 <input type='button' value='Add Item'            onclick="controller.add_variant();" />
-<input type='button' value='Print Order'         onclick="controller.print_order(<%= @order.id %>);" />
+<input type='button' value='Print Invoice'         onclick="controller.print_invoice(<%= @invoice.id %>);" />
 
-<% str = Caboose.plugin_hook('admin_edit_order_buttons', "", @order) %>
+<% str = Caboose.plugin_hook('admin_edit_invoice_buttons', "", @invoice) %>
 <% if str %><%= raw str %><% end %>
 </p>
 -->
 
 <% content_for :caboose_js do %>
 <%= javascript_include_tag 'caboose/model/all' %>
-<%= javascript_include_tag 'caboose/admin_edit_order' %>
+<%= javascript_include_tag 'caboose/admin_edit_invoice' %>
 <script type='text/javascript'>
 
 var controller = false;
 $(document).ready(function() {
-  controller = new OrderController({ 
-    order_id: <%= raw Caboose.json(@order.id) %>,
+  controller = new InvoiceController({ 
+    invoice_id: <%= raw Caboose.json(@invoice.id) %>,
     authenticity_token: <%= raw Caboose.json(form_authenticity_token) %>
   });
 });

data/app/views/caboose/{orders → invoices}/admin_index.html.erb

@@ -1,4 +1,4 @@
-<h1>Orders</h1>
+<h1>Invoices</h1>
 
 <style type='text/css'>
 #search_form_wrapper { margin-bottom: 10px; position: absolute; top:0; right: 0; }
@@ -6,14 +6,14 @@
 
 <p>
   <a class="caboose-btn" href='#' onclick="$('#search_form').toggle(400, function() { modal.autosize(); });">Show/hide search form</a>
-  <a class="caboose-btn" href='/admin/orders/new'>New Manual Order</a>
-  <a class="caboose-btn" href='/admin/orders/print-pending' target='_blank'>Print Pending Orders</a>
-  <a class="caboose-btn" href='/admin/orders/summary-report' target='_blank'>Summary Report</a>
-  <a class="caboose-btn" href='/admin/orders/city-report' target='_blank'>City Report</a>
+  <a class="caboose-btn" href='/admin/invoices/new'>New Manual Invoice</a>
+  <a class="caboose-btn" href='/admin/invoices/print-pending' target='_blank'>Print Pending Invoices</a>
+  <a class="caboose-btn" href='/admin/invoices/summary-report' target='_blank'>Summary Report</a>
+  <a class="caboose-btn" href='/admin/invoices/city-report' target='_blank'>City Report</a>
 </p>
-<form action='/admin/orders' method='get' id='search_form' style='display: none;'>
-  <p><input type='text' name='id'           placeholder='Order ID'     value="<%= @pager.params['id']           %>" style='width: 100px;' /></p>
-  <p><input type='text' name='order_number' placeholder='Order Number' value="<%= @pager.params['order_number'] %>" style='width: 100px;' /></p>
+<form action='/admin/invoices' method='get' id='search_form' style='display: none;'>
+  <p><input type='text' name='id'           placeholder='Invoice ID'     value="<%= @pager.params['id']           %>" style='width: 100px;' /></p>
+  <p><input type='text' name='invoice_number' placeholder='Invoice Number' value="<%= @pager.params['invoice_number'] %>" style='width: 100px;' /></p>
   <p><select name='customer_id'>
       <optgroup label='Status' style='width: 100px'>
         <option value=''>-- All customers --</option>        
@@ -35,16 +35,16 @@
     </select></p>  
   <p>
     <input type='submit' value='Search' />
-    <input type='button' value='Clear' onclick="window.location='/admin/orders';" />
+    <input type='button' value='Clear' onclick="window.location='/admin/invoices';" />
   </p>
 </form>
 
-<% if @orders.count > 0 %>
-  <table class='data' id='orders_table'>
+<% if @invoices.count > 0 %>
+  <table class='data' id='invoices_table'>
     <tr>
       <%= raw @pager.sortable_table_headings({
   				'id'              => 'ID',
-  				'order_number'    => 'Order Number',
+  				'invoice_number'    => 'Invoice Number',
   				'customer_id'     => 'Customer',
   				'date_created'    => 'Date Created',  				
   				'total'           => 'Total',
@@ -52,30 +52,30 @@
   			})
   		%>
     </tr>
-  <% @orders.each do |order| %>
-    <tr onclick="window.location='/admin/orders/<%= order.id %>';">
-      <td><%= raw order.id %></td>
-      <td><%= raw order.order_number %></td>
+  <% @invoices.each do |invoice| %>
+    <tr onclick="window.location='/admin/invoices/<%= invoice.id %>';">
+      <td><%= raw invoice.id %></td>
+      <td><%= raw invoice.invoice_number %></td>
       <td>
-        <% if order.customer.nil? %>
+        <% if invoice.customer.nil? %>
           Unknown
         <% else %>
-          <% if order.customer.first_name && order.customer.first_name.strip.length > 0 %>
-            <%= order.customer.first_name %> <%= order.customer.last_name %>
+          <% if invoice.customer.first_name && invoice.customer.first_name.strip.length > 0 %>
+            <%= invoice.customer.first_name %> <%= invoice.customer.last_name %>
           <% else %>
-            <%= order.customer.email %>            
+            <%= invoice.customer.email %>            
           <% end %>
         <% end %>
       </td>
-      <td><%= raw order.date_created %></td>
-      <td align='right'><%= number_to_currency(order.total) %></td>
-      <td><%= raw order.status %></td>      
+      <td><%= raw invoice.date_created %></td>
+      <td align='right'><%= number_to_currency(invoice.total) %></td>
+      <td><%= raw invoice.status %></td>      
     </tr>
   <% end %>
   </table>
   <p><%= raw @pager.generate %></p>
 <% else %>
-  <p>There are no orders right now.</p>
+  <p>There are no invoices right now.</p>
 <% end %>
 
 <% content_for :caboose_js do %>

data/app/views/caboose/{orders → invoices}/admin_invalid_order.html.erb

@@ -1,3 +1,3 @@
 
-<h1>Invalid Order Number</h1>
-<p><input type='button' value='< Back' onclick="window.location='/admin/orders';" /></p>
+<h1>Invalid Invoice Number</h1>
+<p><input type='button' value='< Back' onclick="window.location='/admin/invoices';" /></p>

data/app/views/caboose/{orders → invoices}/admin_new.html.erb

@@ -1,20 +1,20 @@
-<h1>New Manual Order</h1>
+<h1>New Manual Invoice</h1>
 
-<p>This will create a new order that you can populate and then send to the customer for payment.</p>
+<p>This will create a new invoice that you can populate and then send to the customer for payment.</p>
 
 <p>
-<input type='button' value='< Back' onclick="window.location='/admin/orders';" />
-<input type='button' value='Create Order' onclick='create_order();' />
+<input type='button' value='< Back' onclick="window.location='/admin/invoices';" />
+<input type='button' value='Create Order' onclick='create_invoice();' />
 </p>
 
 <% content_for :caboose_js do %>
 <script type='text/javascript'>
 
-function create_order()
+function create_invoice()
 {
-  $('#message').empty().append("<p class='loading'>Creating order...</p>");  
+  $('#message').empty().append("<p class='loading'>Creating invoice...</p>");  
   $.ajax({
-    url: '/admin/orders',
+    url: '/admin/invoices',
     type: 'post',    
     success: function(resp) {
       if (resp.error) $('#message').html("<p class='note error'>" + resp.error + "</p>");

data/app/views/caboose/{orders → invoices}/admin_print.html.erb

@@ -1,13 +1,13 @@
 <%
-sa = @order.shipping_address
+sa = @invoice.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}"
 %>
 <p align='center'><img src='https://dmwwflw4i3miv.cloudfront.net/logo.png' /></p>
 
-<h1>Order #<%= @order.order_number %></h1>
-<p>Order ID: <%= @order.id %></p>
+<h1>Invoice #<%= @invoice.invoice_number %></h1>
+<p>Invoice ID: <%= @invoice.id %></p>
 
 <table class='data'>
 <tr>
@@ -17,16 +17,16 @@ shipping_address << "<br />#{sa.city}, #{sa.state} #{sa.zip}"
 </tr>
 <tr>
   <td valign='top'>
-    <%= "#{@order.customer.first_name} #{@order.customer.last_name}" %><br />
-    <a href='mailto:<%= "#{@order.customer.email}" %>'><%= "#{@order.customer.email}" %></a><br />
-    <%= @order.customer.phone %>
+    <%= "#{@invoice.customer.first_name} #{@invoice.customer.last_name}" %><br />
+    <a href='mailto:<%= "#{@invoice.customer.email}" %>'><%= "#{@invoice.customer.email}" %></a><br />
+    <%= @invoice.customer.phone %>
   </td>
   <td valign='top'>
-    <%= "#{@order.shipping_address.name}" %><br />
+    <%= "#{@invoice.shipping_address.name}" %><br />
     <%= raw shipping_address %>
   </td>
   <td valign='top'>
-    <%= @order.financial_status %>    
+    <%= @invoice.financial_status %>    
   </td>
 </tr>
 </table><br />
@@ -39,7 +39,7 @@ shipping_address << "<br />#{sa.city}, #{sa.state} #{sa.zip}"
   <th>Quantity</th>
   <th>Subtotal</th>
 </tr>
-<% @order.line_items.each do |li| %>
+<% @invoice.line_items.each do |li| %>
   <tr>
     <td>
       <%= li.variant.product.title %><br />
@@ -52,12 +52,12 @@ shipping_address << "<br />#{sa.city}, #{sa.state} #{sa.zip}"
     <td align='right'><%= number_to_currency(li.subtotal) %></td>
   </tr>
 <% end %>
-<tr><td colspan='4' align='right'>Subtotal  </td><td align='right'><%= number_to_currency(@order.subtotal ) %></td></tr>
-<tr><td colspan='4' align='right'>Tax       </td><td align='right'><%= number_to_currency(@order.tax      ) %></td></tr>
-<tr><td colspan='4' align='right'><%= @order.shipping_method %> Shipping  </td><td align='right'><%= number_to_currency(@order.shipping ) %></td></tr>
-<tr><td colspan='4' align='right'>Handling  </td><td align='right'><%= number_to_currency(@order.handling ) %></td></tr>
-<tr><td colspan='4' align='right'>Discount  </td><td align='right'><%= number_to_currency(@order.discount ) %></td></tr>
-<tr><td colspan='4' align='right'>Total     </td><td align='right'><%= number_to_currency(@order.total    ) %></td></tr>
+<tr><td colspan='4' align='right'>Subtotal  </td><td align='right'><%= number_to_currency(@invoice.subtotal ) %></td></tr>
+<tr><td colspan='4' align='right'>Tax       </td><td align='right'><%= number_to_currency(@invoice.tax      ) %></td></tr>
+<tr><td colspan='4' align='right'><%= @invoice.shipping_method %> Shipping  </td><td align='right'><%= number_to_currency(@invoice.shipping ) %></td></tr>
+<tr><td colspan='4' align='right'>Handling  </td><td align='right'><%= number_to_currency(@invoice.handling ) %></td></tr>
+<tr><td colspan='4' align='right'>Discount  </td><td align='right'><%= number_to_currency(@invoice.discount ) %></td></tr>
+<tr><td colspan='4' align='right'>Total     </td><td align='right'><%= number_to_currency(@invoice.total    ) %></td></tr>
 </table>
 
 <% content_for :caboose_js do %>

data/app/views/caboose/{orders → invoices}/admin_summary_report.html.erb

@@ -22,9 +22,9 @@ end
 day_count = @rows.count
 %>
 
-<h1>Order Summary Report</h1>
+<h1>Invoice Summary Report</h1>
 
-<form action='/admin/orders/summary-report' method='get' id='search_form'>
+<form action='/admin/invoices/summary-report' method='get' id='search_form'>
   <p>
      <input type='text' id='d1' name='d1' value='<%= @d1.strftime('%Y-%m-%d') %>' /> -
      <input type='text' id='d2' name='d2' value='<%= @d2.strftime('%Y-%m-%d') %>' />
@@ -68,7 +68,7 @@ function drawChart()
     
   var counts_chart = new google.visualization.ColumnChart(document.getElementById('counts_chart'));
   counts_chart.draw(counts, {        
-    title: 'Daily Order Counts',
+    title: 'Daily Invoice Counts',
     width:  1200,
     height: 800,
     hAxis: { label: 'Date' },
@@ -85,7 +85,7 @@ function drawChart()
     
   var totals_chart = new google.visualization.ColumnChart(document.getElementById('totals_chart'));
   totals_chart.draw(totals, {        
-    title: 'Daily Order Totals',
+    title: 'Daily Invoice Totals',
     width:  1200,
     height: 800,
     hAxis: { label: 'Date' },