caboose-cms 0.7.85 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57eb564ffe6b9233bff21c05f4a3ecc7504ed5d8
-  data.tar.gz: e2daf88c5fc7fdcceb6e0d4f15d638bce08daabc
+  metadata.gz: f13467e0292ffa5dc2b33fb4146f332c90d5d2d7
+  data.tar.gz: df91b598feb3cbc02ef15b850d34341d6f916f88
 SHA512:
-  metadata.gz: 2650d6671de009284f1ac5d1f74cf4bfec436720a64fd3c42efed9afd5c4cf56f34c209e93f5601bd67399d9f9631c15883b9824823ee7c0ea974bfd4414a9a2
-  data.tar.gz: 7655923adc93b7affcc26ac8cfa09854710f9eed8e494b50a8dc43ba6311e0013a7aff2f4f048f11b48003d3085c6d1bb04b6191f32309fdcf4748986b7e45d3
+  metadata.gz: a36c2cbb7516bfb4a3a691a798f98628bbb66462eae11872433dd19238608e8766fff6112875f9508bedeabf319b45b28da76c7c5e028562f4432658bc4557e0
+  data.tar.gz: 3e90010701da42e89a7952b54e42cbe9b44a5bf5356d049cfeedee9c117c18fec989391362906871e9ff18999033207c2f13d400fb5eace2859cca108cbe5165

data/app/assets/javascripts/caboose/{admin_edit_order.js → admin_edit_invoice.js}

@@ -1,10 +1,10 @@
 
-var OrderController = function(params) { this.init(params); }
+var InvoiceController = function(params) { this.init(params); }
 
-OrderController.prototype = {
+InvoiceController.prototype = {
   
-  order_id: false,
-  order: false,
+  invoice_id: false,
+  invoice: false,
   authenticity_token: false,
   store_config: false,
   
@@ -33,21 +33,25 @@ OrderController.prototype = {
   refresh: function(after)
   {
     var that = this;
-    that.refresh_order(function() {
-      $('#order_table').html("<p class='loading'>Getting order...</p>");
+    that.refresh_invoice(function() {
+      $('#invoice_table').html("<p class='loading'>Getting invoice...</p>");
       that.print();
       that.make_editable();
       if (after) after();
     });    
   },
   
-  refresh_order: function(after)
+  refresh_invoice: function(after)
   {
     var that = this;
     $.ajax({
-      url: '/admin/orders/' + that.order_id + '/json',
-      success: function(order) {                 
-        that.order = order;
+      url: '/admin/invoices/' + that.invoice_id + '/json',
+      success: function(invoice) {                 
+        that.invoice = invoice;
+        $.each(that.invoice.invoice_transactions, function(i, t) {          
+          t.amount          = parseFloat(t.amount);          
+          t.amount_refunded = t.amount_refunded == null || isNaN(t.amount_refunded) ? 0.00 : parseFloat(t.amount_refunded);                    
+        });
         that.refresh_numbers();
         if (after) after();                      
       }
@@ -57,10 +61,10 @@ OrderController.prototype = {
   refresh_numbers: function()
   {    
     var that = this;        
-    $('#subtotal').html(curr(that.order.subtotal));        
-    $('#shipping').html(curr(that.order.shipping));                    
-    $('#total'   ).html(curr(that.order.total   ));        
-    $.each(that.order.line_items, function(i, li) {
+    $('#subtotal').html(curr(that.invoice.subtotal));        
+    $('#shipping').html(curr(that.invoice.shipping));                    
+    $('#total'   ).html(curr(that.invoice.total   ));        
+    $.each(that.invoice.line_items, function(i, li) {
       $('#li_' + li.id + '_subtotal').html(curr(li.subtotal));
     }); 
   },  
@@ -68,43 +72,44 @@ OrderController.prototype = {
   make_editable: function()
   {    
     var that = this;
-    $.each(that.order.order_packages, function(i, op) {
+    $.each(that.invoice.invoice_packages, function(i, op) {
       new ModelBinder({
-        name: 'OrderPackage',
+        name: 'InvoicePackage',
         id: op.id,
-        update_url: '/admin/orders/' + op.order_id + '/packages/' + op.id,
+        update_url: '/admin/invoices/' + op.invoice_id + '/packages/' + op.id,
         authenticity_token: that.authenticity_token,
         attributes: [                      
-          { name: 'status'          , nice_name: 'Status'          , type: 'select' , value: op.status                                            , width: 300, fixed_placeholder: true , options_url: '/admin/orders/line-items/status-options' },
+          { name: 'status'          , nice_name: 'Status'          , type: 'select' , value: op.status                                            , width: 300, fixed_placeholder: true , options_url: '/admin/invoices/line-items/status-options' },
           { name: 'package_method'  , nice_name: 'Package/Method'  , type: 'select' , value: op.shipping_package_id + '_' + op.shipping_method_id , width: 300, fixed_placeholder: false, options_url: '/admin/shipping-packages/package-method-options' },
           { name: 'tracking_number' , nice_name: 'Tracking Number' , type: 'text'   , value: op.tracking_number                                   , width: 300, fixed_placeholder: true, align: 'right' },
-          { name: 'total'           , nice_name: 'Shipping Total'  , type: 'text'   , value: curr(op.total)                                       , width: 300, fixed_placeholder: true, align: 'right' , after_update: function() { that.refresh_order(); }}
+          { name: 'total'           , nice_name: 'Shipping Total'  , type: 'text'   , value: curr(op.total)                                       , width: 300, fixed_placeholder: true, align: 'right' , after_update: function() { that.refresh_invoice(); }}
         ]
       });              
     });    
-    $.each(that.order.line_items, function(i, li) {        
+    $.each(that.invoice.line_items, function(i, li) {        
       new ModelBinder({
         name: 'Lineitem',
         id: li.id,
-        update_url: '/admin/orders/' + li.order_id + '/line-items/' + li.id,
+        update_url: '/admin/invoices/' + li.invoice_id + '/line-items/' + li.id,
         authenticity_token: that.authenticity_token,
         attributes: [
-          { name: 'status'          , nice_name: 'Status'           , type: 'select'  , align: 'left' , value: li.status          , text: li.status, width: 150, fixed_placeholder: false, options_url: '/admin/orders/line-items/status-options' },
+          { name: 'status'          , nice_name: 'Status'           , type: 'select'  , align: 'left' , value: li.status          , text: li.status, width: 150, fixed_placeholder: false, options_url: '/admin/invoices/line-items/status-options' },
           { name: 'tracking_number' , nice_name: 'Tracking Number'  , type: 'text'    , align: 'left' , value: li.tracking_number , width: 200, fixed_placeholder: false },
-          { name: 'quantity'        , nice_name: 'Quantity'         , type: 'text'    , align: 'right', value: li.quantity        , width:  75, fixed_placeholder: false, after_update: function() { that.refresh_order(); } }
+          { name: 'quantity'        , nice_name: 'Quantity'         , type: 'text'    , align: 'right', value: li.quantity        , width:  75, fixed_placeholder: false, after_update: function() { that.refresh_invoice(); } }
         ]
       });
     });    
     new ModelBinder({
-      name: 'Order',
-      id: that.order.id,
-      update_url: '/admin/orders/' + that.order.id,
+      name: 'Invoice',
+      id: that.invoice.id,
+      update_url: '/admin/invoices/' + that.invoice.id,
       authenticity_token: that.authenticity_token,
       attributes: [
-        { name: 'status'         , nice_name: 'Status'   , type: 'select', value: that.order.status                , width: 100, fixed_placeholder: false, options_url: '/admin/orders/status-options' },
-        { name: 'tax'            , nice_name: 'Tax'      , type: 'text'  , value: curr(that.order.tax)             , width: 100, fixed_placeholder: false, align: 'right' , after_update: function() { that.refresh_order(); }},
-        { name: 'handling'       , nice_name: 'Handling' , type: 'text'  , value: curr(that.order.handling)        , width: 100, fixed_placeholder: false, align: 'right' , after_update: function() { that.refresh_order(); }},
-        { name: 'custom_discount', nice_name: 'Discount' , type: 'text'  , value: curr(that.order.custom_discount) , width: 100, fixed_placeholder: false, align: 'right' , after_update: function() { that.refresh_order(); }}
+        { name: 'status'         , nice_name: 'Status'        , type: 'select', value: that.invoice.status                , width: 100, fixed_placeholder: false, options_url: '/admin/invoices/status-options' },
+        { name: 'payment_terms'  , nice_name: 'Terms'         , type: 'select', value: that.invoice.payment_terms         , width: 200, fixed_placeholder: true , options_url: '/admin/invoices/payment-terms-options' },
+        { name: 'tax'            , nice_name: 'Tax'           , type: 'text'  , value: curr(that.invoice.tax)             , width: 100, fixed_placeholder: false, align: 'right' , after_update: function() { that.refresh_invoice(); }},
+        { name: 'handling'       , nice_name: 'Handling'      , type: 'text'  , value: curr(that.invoice.handling)        , width: 100, fixed_placeholder: false, align: 'right' , after_update: function() { that.refresh_invoice(); }},
+        { name: 'custom_discount', nice_name: 'Discount'      , type: 'text'  , value: curr(that.invoice.custom_discount) , width: 100, fixed_placeholder: false, align: 'right' , after_update: function() { that.refresh_invoice(); }}
       ]
     });        
   },
@@ -112,23 +117,23 @@ OrderController.prototype = {
   assign_to_package_form: function(li_id)
   {
     var that = this;
-    if (!that.order.order_packages)
-      that.order.order_packages = [];
-    if (that.order.order_packages.length == 0)
+    if (!that.invoice.invoice_packages)
+      that.invoice.invoice_packages = [];
+    if (that.invoice.invoice_packages.length == 0)
     {
       that.assign_to_new_package_form(li_id);
       return;
     }
     
-    var select = $('<select/>').attr('id', 'order_package_id').css('width', '300px').change(function(e) {
-      var order_package_id = $(this).val();
-      if (order_package_id == -1)
+    var select = $('<select/>').attr('id', 'invoice_package_id').css('width', '300px').change(function(e) {
+      var invoice_package_id = $(this).val();
+      if (invoice_package_id == -1)
         that.assign_to_new_package_form(li_id);
       else
-        that.assign_to_package(li_id, order_package_id);
+        that.assign_to_package(li_id, invoice_package_id);
     });
     select.append($('<option/>').val(-1).html('-- Select a package --'));
-    $.each(that.order.order_packages, function(i, op) {        
+    $.each(that.invoice.invoice_packages, function(i, op) {        
       var sp = op.shipping_package;      
       var sm = op.shipping_method;
       var name = []; 
@@ -155,10 +160,10 @@ OrderController.prototype = {
         var select = $('<select/>')
           .attr('id', 'package_id')
           .css('width', '400px')
-          .change(function(e) { // Create the new order package
+          .change(function(e) { // Create the new invoice package
             var arr = $(this).val().split('_');            
             $.ajax({
-              url: '/admin/orders/' + that.order.id + '/packages',
+              url: '/admin/invoices/' + that.invoice.id + '/packages',
               type: 'post',
               data: { shipping_package_id: arr[0], shipping_method_id: arr[1] },
               success: function(resp) {
@@ -188,13 +193,13 @@ OrderController.prototype = {
     });
   },
 
-  assign_to_package: function(li_id, order_package_id)
+  assign_to_package: function(li_id, invoice_package_id)
   {
     var that = this;    
     $.ajax({
-      url: '/admin/orders/' + that.order.id + '/line-items/' + li_id,
+      url: '/admin/invoices/' + that.invoice.id + '/line-items/' + li_id,
       type: 'put',
-      data: { order_package_id: order_package_id },
+      data: { invoice_package_id: invoice_package_id },
       success: function(resp) {
         if (resp.error) $('#assign_to_package_' + li_id).html("<p class='note error'>" + resp.error + "</p>");
         else that.refresh();
@@ -206,9 +211,9 @@ OrderController.prototype = {
   {
     var that = this;    
     $.ajax({
-      url: '/admin/orders/' + that.order.id + '/line-items/' + li_id,
+      url: '/admin/invoices/' + that.invoice.id + '/line-items/' + li_id,
       type: 'put',
-      data: { order_package_id: -1 },
+      data: { invoice_package_id: -1 },
       success: function(resp) {
         if (resp.error) $('#message').html("<p class='note error'>" + resp.error + "</p>");
         else that.refresh();
@@ -218,18 +223,18 @@ OrderController.prototype = {
 
 /******************************************************************************/
 
-  print_order: function()
+  print_invoice: function()
   {
     var that = this;
-    window.open('/admin/orders/' + that.order.id + '/print');
+    window.open('/admin/invoices/' + that.invoice.id + '/print');
   },  
     
-  line_items_for_order_package: function(order_package_id)
+  line_items_for_invoice_package: function(invoice_package_id)
   {
     var that = this;
     var line_items = [];
-    $.each(that.order.line_items, function(i, li) {
-      if (li.order_package_id == order_package_id)
+    $.each(that.invoice.line_items, function(i, li) {
+      if (li.invoice_package_id == invoice_package_id)
         line_items.push(li);
     });
     return line_items;
@@ -243,10 +248,10 @@ OrderController.prototype = {
     $('#overview_table').empty().append(table).append($('<br />'));
     
     table = $('<table/>').addClass('data').css('width', '100%');    
-    that.order_packages_table(table);
+    that.invoice_packages_table(table);
     that.unassigned_line_items_table(table);
     that.summary_table(table);    
-    $('#order_table').empty().append(table);
+    $('#invoice_table').empty().append(table);
     
     that.button_controls();
   },
@@ -255,34 +260,13 @@ OrderController.prototype = {
   {
     var that = this;        
     
-    var fstatus = $('<div/>').append(that.order.financial_status);
-    if (that.order.order_transactions.length > 0)        
-    {
-      var transactions_table = $('<table/>').addClass('data');
-      $.each(that.order.order_transactions, function(i, ot) {
-        var d = new Date(ot.date_processed);
-        var h = d.getHours();
-        var ampm = 'am';
-        if (h >= 12) ampm = 'pm';
-        if (h > 12) h = h - 12;                  
-        d = '' + (d.getMonth()+1) + '/' + d.getDate() + '/' + d.getYear() + '<br/>' + h + ':' + d.getMinutes() + ' ' + ampm;
-        transactions_table.append($('<tr/>')
-          .append($('<td/>').html(d   ))        
-          .append($('<td/>').html(ot.transaction_type ))
-          .append($('<td/>').html(curr(ot.amount)     ))
-          .append($('<td/>').html(ot.transaction_id   ))                
-          .append($('<td/>').html(ot.success ? 'Success' : 'Fail'))
-        );                    
-      });
-      fstatus.append(transactions_table);
-    }            
-
+    var transactions = that.transactions_table();                
     var table = $('<table/>').addClass('data');
     table.append($('<tr/>')  
       .append($('<th/>').html('Customer'))
       .append($('<th/>').html('Shipping Address'))
       .append($('<th/>').html('Billing Address'))
-      .append($('<th/>').html('Order Status'))
+      .append($('<th/>').html('Invoice Status'))
       .append($('<th/>').html('Payment Status'))      
     );    
     table.append($('<tr/>')      
@@ -290,7 +274,7 @@ OrderController.prototype = {
         .append($('<div/>').attr('id', 'customer').append(that.noneditable_customer(true)))
         .append($('<a/>').attr('href', '#').html('Edit').click(function(e) {
           var a = $(this);
-          that.refresh_order(function() {
+          that.refresh_invoice(function() {
             if (a.html() == 'Edit') { that.edit_customer();        a.html('Finished'); }
             else                    { that.noneditable_customer(); a.html('Edit');     }
           });
@@ -298,8 +282,11 @@ OrderController.prototype = {
       )      
       .append($('<td/>').attr('valign', 'top').attr('id', 'shipping_address' ).append(that.noneditable_shipping_address()))      
       .append($('<td/>').attr('valign', 'top').attr('id', 'billing_address'  ).append(that.noneditable_billing_address()))        
-      .append($('<td/>').attr('valign', 'top').append($('<div/>').attr('id', 'order_' + that.order.id + '_status')))
-      .append($('<td/>').attr('valign', 'top').attr('align', 'center').append(fstatus))      
+      .append($('<td/>').attr('valign', 'top').append($('<div/>').attr('id', 'invoice_' + that.invoice.id + '_status')))
+      .append($('<td/>').attr('valign', 'top')
+        .append($('<div/>').attr('id', 'invoice_' + that.invoice.id + '_payment_terms'))
+        .append($('<div/>').attr('id', 'transactions').attr('align', 'center').append(transactions))
+      )      
     );
     return table;  
   },
@@ -307,7 +294,7 @@ OrderController.prototype = {
   noneditable_customer: function(return_element)
   {
     var that = this;
-    c = that.order.customer;    
+    c = that.invoice.customer;    
     str = '';
     if (c)
     {
@@ -325,16 +312,16 @@ OrderController.prototype = {
   edit_customer: function()
   {
     var that = this;    
-    var div = $('<div/>').attr('id', 'order_' + that.order.id + '_customer_id');        
+    var div = $('<div/>').attr('id', 'invoice_' + that.invoice.id + '_customer_id');        
     $('#customer').empty().append(div);
             
     new ModelBinder({
-      name: 'Order',
-      id: that.order.id,
-      update_url: '/admin/orders/' + that.order.id,
+      name: 'Invoice',
+      id: that.invoice.id,
+      update_url: '/admin/invoices/' + that.invoice.id,
       authenticity_token: that.authenticity_token,
       attributes: [        
-        { name: 'customer_id', nice_name: 'Customer', type: 'select', value: that.order.customer_id, width: 150, fixed_placeholder: false, options_url: '/admin/users/options' }        
+        { name: 'customer_id', nice_name: 'Customer', type: 'select', value: that.invoice.customer_id, width: 150, fixed_placeholder: false, options_url: '/admin/users/options' }        
       ]
     });
   },
@@ -345,7 +332,7 @@ OrderController.prototype = {
     var div = $('<div/>');
     if (that.has_shippable_items())
     {
-      var sa = that.order.shipping_address;
+      var sa = that.invoice.shipping_address;
       str = '';                  
       str += (sa.first_name ? sa.first_name : '[Empty first name]') + ' ';
       str += (sa.last_name  ? sa.last_name  : '[Empty last name]');
@@ -356,12 +343,12 @@ OrderController.prototype = {
       div.append($('<div/>').attr('id', 'shipping_address').append(str));
       div.append($('<a/>').attr('href', '#').html('Edit').click(function(e) {
         var a = $(this);
-        that.refresh_order(function() { that.edit_shipping_address(); });
+        that.refresh_invoice(function() { that.edit_shipping_address(); });
       }));      
     }
     else
     {
-      div.append("This order does not require shipping.");
+      div.append("This invoice does not require shipping.");
     }    
     return div;    
   },
@@ -369,7 +356,7 @@ OrderController.prototype = {
   edit_shipping_address: function()
   {
     var that = this;
-    var sa = that.order.shipping_address;
+    var sa = that.invoice.shipping_address;
     var table = $('<table/>').addClass('shipping_address')
       .append($('<tr/>').append($('<td/>').append($('<table/>').append($('<tr/>')
         .append($('<td/>').append($('<div/>').attr('id', 'shippingaddress_' + sa.id + '_first_name')))
@@ -390,13 +377,13 @@ OrderController.prototype = {
       .append(table)
       .append($('<a/>').attr('href', '#').html('Finished').click(function(e) {
         var a = $(this);
-        that.refresh_order(function() { $('#shipping_address').empty().append(that.noneditable_shipping_address()); });
+        that.refresh_invoice(function() { $('#shipping_address').empty().append(that.noneditable_shipping_address()); });
       }));
             
     new ModelBinder({
       name: 'ShippingAddress',
       id: sa.id,
-      update_url: '/admin/orders/' + that.order.id + '/shipping-address',
+      update_url: '/admin/invoices/' + that.invoice.id + '/shipping-address',
       authenticity_token: that.authenticity_token,
       attributes: [        
         { name: 'first_name'  , nice_name: 'First Name' , type: 'text'  , value: sa.first_name , width: 150, fixed_placeholder: false },
@@ -414,7 +401,7 @@ OrderController.prototype = {
   {
     var that = this;
     
-    var sa = that.order.billing_address;
+    var sa = that.invoice.billing_address;
     if (!sa) sa = {};
     var str = '';
     str += (sa.first_name ? sa.first_name : '[Empty first name]') + ' ';
@@ -428,7 +415,7 @@ OrderController.prototype = {
       .append("<br />")
       .append($('<a/>').attr('href', '#').html('Edit').click(function(e) {
         var a = $(this);
-        that.refresh_order(function() { that.edit_billing_address(); });
+        that.refresh_invoice(function() { that.edit_billing_address(); });
       }));
     return div;    
   },
@@ -436,7 +423,7 @@ OrderController.prototype = {
   edit_billing_address: function()
   {
     var that = this;
-    var sa = that.order.billing_address;
+    var sa = that.invoice.billing_address;
     if (!sa) sa = { id: 1 };
     var table = $('<table/>').addClass('billing_address')
       .append($('<tr/>').append($('<td/>').append($('<table/>').append($('<tr/>')
@@ -458,13 +445,13 @@ OrderController.prototype = {
       .append(table)
       .append($('<a/>').attr('href', '#').html('Finished').click(function(e) {
         var a = $(this);
-        that.refresh_order(function() { $('#billing_address').empty().append(that.noneditable_billing_address()); });
+        that.refresh_invoice(function() { $('#billing_address').empty().append(that.noneditable_billing_address()); });
       }));      
             
     new ModelBinder({
       name: 'BillingAddress',
       id: sa.id,
-      update_url: '/admin/orders/' + that.order.id + '/billing-address',
+      update_url: '/admin/invoices/' + that.invoice.id + '/billing-address',
       authenticity_token: that.authenticity_token,
       attributes: [        
         { name: 'first_name'  , nice_name: 'First Name' , type: 'text'  , value: sa.first_name , width: 150, fixed_placeholder: false },
@@ -479,11 +466,11 @@ OrderController.prototype = {
   },
   
   // Show all the packages and the line items in each package
-  order_packages_table: function(table)
+  invoice_packages_table: function(table)
   {
     var that = this;    
-    $.each(that.order.order_packages, function(i, op) {
-      var line_items = that.line_items_for_order_package(op.id);      
+    $.each(that.invoice.invoice_packages, function(i, op) {
+      var line_items = that.line_items_for_invoice_package(op.id);      
       if (line_items && line_items.length > 0)
       {
         table.append($('<tr/>')      
@@ -522,15 +509,15 @@ OrderController.prototype = {
           )
           .append($('<tr/>')
             .append($('<td/>')
-              .append($('<div/>').attr('id', 'orderpackage_' + op.id + '_package_method'))
-              .append($('<div/>').attr('id', 'orderpackage_' + op.id + '_status'))
-              .append($('<div/>').attr('id', 'orderpackage_' + op.id + '_tracking_number'))
-              .append($('<div/>').attr('id', 'orderpackage_' + op.id + '_total'))
+              .append($('<div/>').attr('id', 'invoicepackage_' + op.id + '_package_method'))
+              .append($('<div/>').attr('id', 'invoicepackage_' + op.id + '_status'))
+              .append($('<div/>').attr('id', 'invoicepackage_' + op.id + '_tracking_number'))
+              .append($('<div/>').attr('id', 'invoicepackage_' + op.id + '_total'))
             )
             .append($('<td/>').attr('colspan', '5')
               .append($('<p>')
                 .append("This package is empty. ")
-                .append($('<a/>').attr('href', '#').html('Delete Package').data('op_id', op.id).click(function(e) { e.preventDefault(); that.delete_order_package($(this).data('op_id')); }))
+                .append($('<a/>').attr('href', '#').html('Delete Package').data('op_id', op.id).click(function(e) { e.preventDefault(); that.delete_invoice_package($(this).data('op_id')); }))
               )
             )
           );
@@ -548,13 +535,13 @@ OrderController.prototype = {
     });
     
     var div = $('<div/>');                
-    div.append($('<div/>').attr('id', 'orderpackage_' + op.id + '_package_method'));
-    div.append($('<div/>').attr('id', 'orderpackage_' + op.id + '_status'));
-    div.append($('<div/>').attr('id', 'orderpackage_' + op.id + '_tracking_number'));
-    div.append($('<div/>').attr('id', 'orderpackage_' + op.id + '_total'));    
-    div.append($('<div/>').attr('id', 'orderpackage_' + op.id + '_total_weight').html("Total weight: " + total_weight + " " + that.store_config.weight_unit));
-    div.append($('<a/>').attr('href','#').data('order_package_id', op.id).html('Recalculate').click(function(e) { e.preventDefault(); that.calculate_shipping($(this).data('order_package_id')); }));            
-    div.append($('<div/>').attr('id', 'order_package_' + op.id + '_message'));            
+    div.append($('<div/>').attr('id', 'invoicepackage_' + op.id + '_package_method'));
+    div.append($('<div/>').attr('id', 'invoicepackage_' + op.id + '_status'));
+    div.append($('<div/>').attr('id', 'invoicepackage_' + op.id + '_tracking_number'));
+    div.append($('<div/>').attr('id', 'invoicepackage_' + op.id + '_total'));    
+    div.append($('<div/>').attr('id', 'invoicepackage_' + op.id + '_total_weight').html("Total weight: " + total_weight + " " + that.store_config.weight_unit));
+    div.append($('<a/>').attr('href','#').data('invoice_package_id', op.id).html('Recalculate').click(function(e) { e.preventDefault(); that.calculate_shipping($(this).data('invoice_package_id')); }));            
+    div.append($('<div/>').attr('id', 'invoice_package_' + op.id + '_message'));            
     return div;
   },
   
@@ -592,10 +579,10 @@ OrderController.prototype = {
     }       
     var link = $('<a/>').attr('href', '#').html(name)
       .data('li_id', li.id)
-      .data('order_package_id', li.order_package_id)
+      .data('invoice_package_id', li.invoice_package_id)
       .click(function(e) {
         e.preventDefault();
-        that.line_item_options($(this).data('li_id'), $(this).data('order_package_id'));
+        that.line_item_options($(this).data('li_id'), $(this).data('invoice_package_id'));
       });
     return link;    
   },
@@ -610,15 +597,15 @@ OrderController.prototype = {
     return div;        
   },
   
-  line_item_options: function(li_id, order_package_id)
+  line_item_options: function(li_id, invoice_package_id)
   {
     var that = this;
     var ul = $('<ul/>').addClass('line_item_controls');
     ul.append($('<li/>').append($('<a/>')
       .html('View Product')
-      .attr('href', '/admin/orders/' + that.order.id + '/line-items/' + li_id + '/highlight')
+      .attr('href', '/admin/invoices/' + that.invoice.id + '/line-items/' + li_id + '/highlight')
     ))
-    if (order_package_id && order_package_id != -1)
+    if (invoice_package_id && invoice_package_id != -1)
     {
       ul.append($('<li/>').append($('<a/>')
         .html('Remove from Package')
@@ -628,7 +615,7 @@ OrderController.prototype = {
       ));
     }    
     ul.append($('<li/>').append($('<a/>')
-      .html('Remove from Order')
+      .html('Remove from Invoice')
       .attr('href', '#')
       .data('li_id', li_id)        
       .click(function(e) { e.preventDefault(); that.delete_line_item($(this).data('li_id')); })
@@ -646,8 +633,8 @@ OrderController.prototype = {
     var that = this;
     
     var has_unassigned_line_items = false
-    $.each(that.order.line_items, function(i, li) {
-      if (!li.order_package_id || li.order_package_id == -1)
+    $.each(that.invoice.line_items, function(i, li) {
+      if (!li.invoice_package_id || li.invoice_package_id == -1)
       {
         has_unassigned_line_items = true;
         return false;
@@ -665,8 +652,8 @@ OrderController.prototype = {
       .append($('<th/>').html('Subtotal'   ))
     );
     
-    $.each(that.order.line_items, function(i, li) {
-      if (li.order_package_id && li.order_package_id != -1) return true;
+    $.each(that.invoice.line_items, function(i, li) {
+      if (li.invoice_package_id && li.invoice_package_id != -1) return true;
             
       var div = false;
       
@@ -700,24 +687,24 @@ OrderController.prototype = {
     });
   },
   
-  // Show the order summary
+  // Show the invoice summary
   summary_table: function(table)
   {    
     var that = this;
-    if (that.order.line_items.length > 0 || that.order.order_packages.length > 0)
+    if (that.invoice.line_items.length > 0 || that.invoice.invoice_packages.length > 0)
     {
       table.append($('<tr/>').append($('<th/>').attr('colspan', '6').html('&nbsp;')));
     }
     
-    if (that.order.line_items.length > 0)
+    if (that.invoice.line_items.length > 0)
     {
-      table.append($('<tr/>').append($('<td/>').attr('colspan', '5').attr('align', 'right').html('Subtotal'    )).append($('<td/>').attr('align', 'right').attr('id', 'subtotal').html(curr(that.order.subtotal))));
-      table.append($('<tr/>').append($('<td/>').attr('colspan', '5').attr('align', 'right').append('Tax '      ).append($('<a/>').attr('href', '#').html('(calculate)').click(function(e) { e.preventDefault(); that.calculate_tax();      }))).append($('<td/>').attr('align', 'right').append($('<div/>').attr('id', 'order_' + that.order.id + '_tax'))));                
-      table.append($('<tr/>').append($('<td/>').attr('colspan', '5').attr('align', 'right').html('Shipping'    )).append($('<td/>').attr('align', 'right').attr('id', 'shipping').html(curr(that.order.shipping))));
-      table.append($('<tr/>').append($('<td/>').attr('colspan', '5').attr('align', 'right').append('Handling ' ).append($('<a/>').attr('href', '#').html('(calculate)').click(function(e) { e.preventDefault(); that.calculate_handling(); }))).append($('<td/>').attr('align', 'right').append($('<div/>').attr('id', 'order_' + that.order.id + '_handling'))));
-      if (that.order.discounts)
+      table.append($('<tr/>').append($('<td/>').attr('colspan', '5').attr('align', 'right').html('Subtotal'    )).append($('<td/>').attr('align', 'right').attr('id', 'subtotal').html(curr(that.invoice.subtotal))));
+      table.append($('<tr/>').append($('<td/>').attr('colspan', '5').attr('align', 'right').append('Tax '      ).append($('<a/>').attr('href', '#').html('(calculate)').click(function(e) { e.preventDefault(); that.calculate_tax();      }))).append($('<td/>').attr('align', 'right').append($('<div/>').attr('id', 'invoice_' + that.invoice.id + '_tax'))));                
+      table.append($('<tr/>').append($('<td/>').attr('colspan', '5').attr('align', 'right').html('Shipping'    )).append($('<td/>').attr('align', 'right').attr('id', 'shipping').html(curr(that.invoice.shipping))));
+      table.append($('<tr/>').append($('<td/>').attr('colspan', '5').attr('align', 'right').append('Handling ' ).append($('<a/>').attr('href', '#').html('(calculate)').click(function(e) { e.preventDefault(); that.calculate_handling(); }))).append($('<td/>').attr('align', 'right').append($('<div/>').attr('id', 'invoice_' + that.invoice.id + '_handling'))));
+      if (that.invoice.discounts)
       {
-        $.each(that.order.discounts, function(i, d) {
+        $.each(that.invoice.discounts, function(i, d) {
           table.append($('<tr/>')
             .append($('<td/>').attr('colspan', '5').attr('align', 'right')
               .append($('<a/>').attr('href', '#').html('Remove').click(function(e) { that.remove_discount(d.id); }))
@@ -727,14 +714,14 @@ OrderController.prototype = {
           );
         });
       }    
-      table.append($('<tr/>').append($('<td/>').attr('colspan', '5').attr('align', 'right').html('Discount')).append($('<td/>').attr('align', 'right').append($('<div/>').attr('id', 'order_' + that.order.id + '_custom_discount'))));
-      table.append($('<tr/>').append($('<td/>').attr('colspan', '5').attr('align', 'right').html('Total' )).append($('<td/>').attr('align', 'right').attr('id', 'total').html(curr(that.order.total))));
+      table.append($('<tr/>').append($('<td/>').attr('colspan', '5').attr('align', 'right').html('Discount')).append($('<td/>').attr('align', 'right').append($('<div/>').attr('id', 'invoice_' + that.invoice.id + '_custom_discount'))));
+      table.append($('<tr/>').append($('<td/>').attr('colspan', '5').attr('align', 'right').html('Total' )).append($('<td/>').attr('align', 'right').attr('id', 'total').html(curr(that.invoice.total))));
     }    
     else
     {
       table.append($('<tr/>').append($('<td/>').attr('colspan', '6')
         .append($('<p/>')
-          .append('There are no items in this order. ')
+          .append('There are no items in this invoice. ')
           .append($('<a/>').attr('href','#').html('Add one!').click(function(e) {
             e.preventDefault();
             that.add_variant();              
@@ -748,26 +735,12 @@ OrderController.prototype = {
   {
     var that = this;
     var p = $('<p/>');
-    p.append($('<input/>').attr('type', 'button').val('< Back').click(function() { window.location = '/admin/orders'; })).append(' ');
-    if (that.order.total > 0)
-    {
-      switch (that.order.financial_status)
-      {
-        case 'pending':
-          p.append($('<input/>').attr('type', 'button').val('Send for Authorization').click(function() { that.send_for_authorization(); })).append(' ');
-          break;
-        case 'authorized':    
-          p.append($('<input/>').attr('type', 'button').val('Capture Funds').click(function() { that.capture_funds(); })).append(' ');
-          p.append($('<input/>').attr('type', 'button').val('Void'         ).click(function() { that.void_order();    })).append(' ');
-          break;
-        case 'captured':           
-          p.append($('<input/>').attr('type', 'button').val('Refund'       ).click(function() { that.refund(); })).append(' ');
-          break;
-      }
-    }
+    p.append($('<input/>').attr('type', 'button').val('< Back').click(function() { window.location = '/admin/invoices'; })).append(' ');
+    if (that.invoice.total > 0 && that.invoice.financial_status == 'pending')    
+      p.append($('<input/>').attr('type', 'button').val('Send for Authorization').click(function() { that.send_for_authorization(); })).append(' ');        
     //p.append($('<input/>').attr('type', 'button').val('Resend Confirmation' ).click(function() { that.resend_confirmation(); })).append(' ');
     p.append($('<input/>').attr('type', 'button').val('Add Item'            ).click(function() { that.add_variant();         })).append(' ');
-    p.append($('<input/>').attr('type', 'button').val('Print Order'         ).click(function() { that.print_order();         })).append(' ');
+    p.append($('<input/>').attr('type', 'button').val('Print Invoice'         ).click(function() { that.print_invoice();         })).append(' ');
     $('#controls').empty().append(p);
   },
 
@@ -778,11 +751,11 @@ OrderController.prototype = {
     var that = this;
     if (!variant_id)
     {
-      caboose_modal_url('/admin/orders/' + this.order.id + '/line-items/new');
+      caboose_modal_url('/admin/invoices/' + this.invoice.id + '/line-items/new');
       return;
     }
     $.ajax({
-      url: '/admin/orders/' + that.order.id + '/line-items',
+      url: '/admin/invoices/' + that.invoice.id + '/line-items',
       type: 'post',
       data: { variant_id: variant_id },
       success: function(resp) {
@@ -792,11 +765,11 @@ OrderController.prototype = {
     });
   },
   
-  delete_order_package: function(order_package_id)
+  delete_invoice_package: function(invoice_package_id)
   {
     var that = this;
     $.ajax({
-      url: '/admin/orders/' + that.order.id + '/packages/' + order_package_id,
+      url: '/admin/invoices/' + that.invoice.id + '/packages/' + invoice_package_id,
       type: 'delete',      
       success: function(resp) {
         if (resp.error) $('#message').html("<p class='note error'>" + resp.error + "</p>");
@@ -809,7 +782,7 @@ OrderController.prototype = {
   {
     var that = this;
     $.ajax({
-      url: '/admin/orders/' + that.order.id + '/line-items/' + li_id,
+      url: '/admin/invoices/' + that.invoice.id + '/line-items/' + li_id,
       type: 'delete',      
       success: function(resp) {
         if (resp.error) $('#message').html("<p class='note error'>" + resp.error + "</p>");
@@ -818,14 +791,14 @@ OrderController.prototype = {
     });    
   },
   
-  void_order: function(confirm)
+  void_invoice: function(confirm)
   {
     var that = this;
     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() { that.void_order(true); }))
+        .append("Are you sure you want to void this invoice? ")
+        .append($('<input/>').attr('type','button').val('Yes').click(function() { that.void_invoice(true); }))
         .append(' ')
         .append($('<input/>').attr('type','button').val('No').click(function() { $('#message').empty(); }));
       $('#message').empty().append(p);
@@ -833,7 +806,7 @@ OrderController.prototype = {
     }
     $('#message').html("<p class='loading'>Voiding...</p>");
     $.ajax({
-      url: '/admin/orders/' + that.order.id + '/void',
+      url: '/admin/invoices/' + that.invoice.id + '/void',
       success: function(resp) {
         if (resp.error)   $('#message').html("<p class='note error'>" + resp.error + "</p>");
         if (resp.success) { $('#message').empty(); that.refresh(); }
@@ -842,26 +815,165 @@ OrderController.prototype = {
     });
   },
   
-  capture_funds: function(confirm)
+  /*****************************************************************************
+  /* Transactions
+  *****************************************************************************/
+  
+  refresh_transactions: function()
+  {
+    var that = this;
+    $('#transactions_message').html("<p class='loading'>Refreshing transactions...</p>");
+    $.ajax({
+      url: '/admin/invoices/' + that.invoice.id + '/refresh-transactions',
+      type: 'get',
+      success: function(resp) {
+        if (resp.error) $('#financial_status').html("Error: " + resp.error);
+        else
+        {
+          that.invoice.financial_status = resp.financial_status;
+          that.invoice.invoice_transactions = resp.invoice_transactions;
+          $('#transactions').empty().append(that.transactions_table());          
+        }
+      }
+    });          
+  },
+
+  transactions_table: function()
+  {    
+    var that = this;
+    var div = $('<div/>')
+      .append($('<span/>').attr('id', 'financial_status').append(that.invoice.financial_status)).append(' ')
+      .append($('<a/>').attr('href', '#').html('refresh').click(function(e) { e.preventDefault(); that.refresh_transactions(); }))
+      .append($('<div/>').attr('id', 'transactions_message'));
+    if (that.invoice.invoice_transactions.length > 0)        
+    {
+      var transactions_table = $('<table/>').addClass('data');
+      $.each(that.invoice.invoice_transactions, function(i, t) {
+        if (t.parent_id == null)
+        {                               
+          var link = $('<div/>').append($('<div/>').append(t.transaction_type));          
+          if (!t.captured) link.append($('<a/>').attr('href', '#').html('Capture' ).data('transaction_id', t.id).click(function(e) { e.preventDefault(); that.capture_transaction($(this).data('transaction_id')); })).append(' ');
+          if (!t.refunded) link.append($('<a/>').attr('href', '#').html('Refund'  ).data('transaction_id', t.id).click(function(e) { e.preventDefault(); that.refund_transaction($(this).data('transaction_id'));  }));
+                        
+          transactions_table.append($('<tr/>')
+            .append($('<td/>').append($('<a/>').attr('href', '#').data('transaction_id', t.id).html(formatted_date(t.date_processed)).click(function(e) { e.preventDefault(); $('#trans_row_' + $(this).data('transaction_id')).slideToggle(); })))
+            .append($('<td/>').append(link))
+            .append($('<td/>').html(curr(t.amount)     ))
+            //.append($('<td/>').html(t.transaction_id   ))                
+            .append($('<td/>').html(t.success ? 'Success' : 'Fail'))            
+          );
+          transactions_table.append($('<tr/>').append($('<td/>').attr('colspan', '4').css('padding', '0').append($('<div/>').attr('id', 'trans_row_' + t.id).css('display', 'none').css('padding', '4px 8px').html(t.transaction_id))))
+          $.each(that.invoice.invoice_transactions, function(j, t2) {
+            if (t2.parent_id == t.id)
+            {            
+              transactions_table.append($('<tr/>')                
+                .append($('<td/>').append($('<a/>').attr('href', '#').data('transaction_id', t2.id).html(formatted_date(t2.date_processed)).click(function(e) { e.preventDefault(); $('#trans_row_' + $(this).data('transaction_id')).slideToggle(); })))
+                .append($('<td/>').html(t2.transaction_type ))
+                .append($('<td/>').html(curr(t2.amount)     ))
+                //.append($('<td/>').html(t2.transaction_id   ))                
+                .append($('<td/>').html(t2.success ? 'Success' : 'Fail'))              
+              );              
+              transactions_table.append($('<tr/>').append($('<td/>').attr('colspan', '4').css('padding', '0').append($('<div/>').attr('id', 'trans_row_' + t2.id).css('display', 'none').css('padding', '4px 8px').html(t2.transaction_id))))
+            }
+          });
+        }
+      });
+      div.append(transactions_table);
+    }
+    return div;    
+  },
+  
+  //capture_funds: function(confirm)
+  //{
+  //  var that = this;    
+  //  if (!confirm)
+  //  {    
+  //    var p = $('<p/>').addClass('note confirm')
+  //      .append("Are you sure you want to charge $" + parseFloat(that.invoice.total).toFixed(2) + " to the customer? ")
+  //      .append($('<input/>').attr('type','button').val('Yes').click(function() { that.capture_funds(true); }))
+  //      .append(' ')
+  //      .append($('<input/>').attr('type','button').val('No').click(function() { $('#message').empty(); }));
+  //    $('#message').empty().append(p);
+  //    return;
+  //  }
+  //  $('#message').html("<p class='loading'>Capturing funds...</p>");
+  //  $.ajax({
+  //    url: '/admin/invoices/' + that.invoice.id + '/capture',
+  //    success: function(resp) {
+  //      if (resp.error)   $('#message').html("<p class='note error'>" + resp.error + "</p>");
+  //      if (resp.success) { $('#message').empty(); that.refresh(); }
+  //      if (resp.refresh) { $('#message').empty(); that.refresh(); }
+  //    }
+  //  });
+  //},
+  
+  capture_transaction: function(transaction_id, confirm)
   {
     var that = this;    
+    var t = that.transaction_with_id(transaction_id);          
     if (!confirm)
     {    
       var p = $('<p/>').addClass('note confirm')
-        .append("Are you sure you want to charge $" + parseFloat(that.order.total).toFixed(2) + " to the customer? ")
-        .append($('<input/>').attr('type','button').val('Yes').click(function() { that.capture_funds(true); }))
+        .append("Are you sure you want to charge $" + parseFloat(t.amount).toFixed(2) + " to the customer?<br />")
+        .append($('<input/>').attr('type','button').val('Yes').click(function() { that.capture_transaction(transaction_id, true); }))
         .append(' ')
-        .append($('<input/>').attr('type','button').val('No').click(function() { $('#message').empty(); }));
-      $('#message').empty().append(p);
+        .append($('<input/>').attr('type','button').val('No').click(function() { $('#transactions_message').empty(); }));
+      $('#transactions_message').empty().append(p);
       return;
     }
-    $('#message').html("<p class='loading'>Capturing funds...</p>");
+    $('#transactions_message').html("<p class='loading'>Capturing funds...</p>");
     $.ajax({
-      url: '/admin/orders/' + that.order.id + '/capture',
+      url: '/admin/invoices/' + that.invoice.id + '/transactions/' + transaction_id + '/capture',
       success: function(resp) {
         if (resp.error)   $('#message').html("<p class='note error'>" + resp.error + "</p>");
-        if (resp.success) { $('#message').empty(); that.refresh(); }
-        if (resp.refresh) { $('#message').empty(); that.refresh(); }
+        if (resp.success) { $('#message').empty(); that.refresh_transactions(); }
+        if (resp.refresh) { $('#message').empty(); that.refresh_transactions(); }
+      }
+    });
+  },
+  
+  refund_transaction: function(transaction_id, amount, confirm)
+  {
+    var that = this;    
+    var t = that.transaction_with_id(transaction_id);
+    var amount_available_to_refund = parseFloat(t.amount) - parseFloat(t.amount_refunded);
+    
+    if (!amount)
+    {
+      var p = $('<p/>').addClass('note confirm')
+        .append("Refund amount: $")
+        .append($('<input/>').attr('type','text').attr('id', 'refund_amount').val(amount_available_to_refund.toFixed(2)).css('width', '60px').css('text-align', 'right')).append($('<br/>'))
+        .append($('<input/>').attr('type','button').val('Continue').click(function() { that.refund_transaction(transaction_id, parseFloat($('#refund_amount').val())); })).append(' ')
+        .append($('<input/>').attr('type','button').val('Cancel').click(function() { $('#transactions_message').empty(); }));
+      $('#transactions_message').empty().append(p);
+      return;
+    }
+    if (amount > amount_available_to_refund)
+    {
+      var p = $('<p/>').addClass('note error')
+        .append("You can only refund a maximum of $" + amount_available_to_refund.toFixed(2) + ". ").append($('<br/>'))        
+        .append($('<input/>').attr('type','button').val('Back'   ).click(function() { that.refund_transaction(transaction_id); })).append(' ')
+        .append($('<input/>').attr('type','button').val('Cancel' ).click(function() { $('#transactions_message').empty(); }));
+      $('#transactions_message').empty().append(p);
+      return;
+    }
+    if (!confirm)
+    {    
+      var x = parseFloat(t.amount) - parseFloat(t.amount_refunded);
+      var p = $('<p/>').addClass('note confirm')
+        .append("Are you sure you want to refund $" + amount.toFixed(2) + " to the customer? ").append($('<br/>'))
+        .append($('<input/>').attr('type','button').val('Yes').click(function() { that.refund_transaction(transaction_id, amount, true); })).append(' ')
+        .append($('<input/>').attr('type','button').val('No' ).click(function() { $('#transactions_message').empty(); }));
+      $('#transactions_message').empty().append(p);
+      return;
+    }
+    $('#transactions_message').html("<p class='loading'>Refunding...</p>");
+    $.ajax({
+      url: '/admin/invoices/' + that.invoice.id + '/transactions/' + transaction_id + '/refund',
+      data: { amount: amount },
+      success: function(resp) {
+        if (resp.error)   $('#transactions_message').html("<p class='note error'>" + resp.error + "</p>");
+        if (resp.success) { $('#transactions_message').empty(); that.refresh_transactions(); }        
       }
     });
   },
@@ -872,7 +984,7 @@ OrderController.prototype = {
     if (!confirm)
     {    
       var p = $('<p/>').addClass('note confirm')
-        .append("Are you sure you want to send this order to the customer for authorization? ")
+        .append("Are you sure you want to send this invoice to the customer for authorization? ")
         .append($('<input/>').attr('type','button').val('Yes').click(function() { that.send_for_authorization(true); }))
         .append(' ')                
         .append($('<input/>').attr('type','button').val('No').click(function() { $('#message').empty(); }));
@@ -881,7 +993,7 @@ OrderController.prototype = {
     }
     $('#message').html("<p class='loading'>Sending for authorization...</p>");
     $.ajax({
-      url: '/admin/orders/' + that.order.id + '/send-for-authorization',
+      url: '/admin/invoices/' + that.invoice.id + '/send-for-authorization',
       success: function(resp) {
         if (resp.error)   { that.flash_error(resp.error); }
         if (resp.success) { that.refresh(function() { that.flash_success("An email has been sent successfully to the customer."); }); }        
@@ -893,8 +1005,8 @@ OrderController.prototype = {
   {
     var that = this;
     $.ajax({
-      url: '/admin/orders/' + that.order_id + '/calculate-tax',
-      success: function(resp) { that.refresh_order(function() { $('#order_' + that.order.id + '_tax').val(that.order.tax); }); }
+      url: '/admin/invoices/' + that.invoice_id + '/calculate-tax',
+      success: function(resp) { that.refresh_invoice(function() { $('#invoice_' + that.invoice.id + '_tax').val(that.invoice.tax); }); }
     });
   },
   
@@ -902,27 +1014,27 @@ OrderController.prototype = {
   {
     var that = this;
     $.ajax({
-      url: '/admin/orders/' + that.order_id + '/calculate-handling',
-      success: function(resp) { that.refresh_order(function() { $('#order_' + that.order.id + '_handling').val(that.order.handling); }); }
+      url: '/admin/invoices/' + that.invoice_id + '/calculate-handling',
+      success: function(resp) { that.refresh_invoice(function() { $('#invoice_' + that.invoice.id + '_handling').val(that.invoice.handling); }); }
     });
   },
   
-  calculate_shipping: function(order_package_id)
+  calculate_shipping: function(invoice_package_id)
   {
     var that = this;
-    $('#order_package_' + order_package_id + '_message').html("<p class='loading'>Calculating...</p>");
+    $('#invoice_package_' + invoice_package_id + '_message').html("<p class='loading'>Calculating...</p>");
     var shipping_method_id = $('');
     $.ajax({
-      url: '/admin/orders/' + that.order_id + '/packages/' + order_package_id + '/calculate-shipping',
+      url: '/admin/invoices/' + that.invoice_id + '/packages/' + invoice_package_id + '/calculate-shipping',
       success: function(resp) {
         if (resp.error)
-          $('#order_package_' + order_package_id + '_message').html("<p class='note error'>" + resp.error + "</p>");
+          $('#invoice_package_' + invoice_package_id + '_message').html("<p class='note error'>" + resp.error + "</p>");
         else
         {
-          that.refresh_order(function() { 
-            $('#orderpackage_' + order_package_id + '_total').val(resp.rate); 
+          that.refresh_invoice(function() { 
+            $('#invoicepackage_' + invoice_package_id + '_total').val(resp.rate); 
           });
-          $('#order_package_' + order_package_id + '_message').empty();
+          $('#invoice_package_' + invoice_package_id + '_message').empty();
         }
       }
     });    
@@ -932,7 +1044,7 @@ OrderController.prototype = {
   {
     var that = this;
     var needs_shipping = false;
-    $.each(that.order.line_items, function(i, li) {      
+    $.each(that.invoice.line_items, function(i, li) {      
       if (li.variant.downloadable == false)
         needs_shipping = true;
     });
@@ -946,14 +1058,14 @@ OrderController.prototype = {
     if (!length) length = 5000;
     $('#message').empty().append(str);
     setTimeout(function() { $('#message').slideUp(function() { $('#message').empty().show(); }); }, length);
-  }
+  },
   
-  //resend_confirmation: function(order_id)
+  //resend_confirmation: function(invoice_id)
   //{
   //  modal.autosize("<p class='loading'>Resending confirmation..</p>");
   //  $.ajax({
   //    type: 'post',
-  //    url: '/admin/orders/' + order_id + '/resend-confirmation',
+  //    url: '/admin/invoices/' + invoice_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>");
@@ -962,13 +1074,13 @@ OrderController.prototype = {
   //},
   //      
   //
-  //refund_order: function(order_id, confirm)
+  //refund_invoice: function(invoice_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("Are you sure you want to refund this invoice? ")
+  //      .append($('<input/>').attr('type','button').val('Yes').click(function() { refund_invoice(invoice_id, true); }))
   //      .append(' ')
   //      .append($('<input/>').attr('type','button').val('No').click(function() { $('#message').empty(); modal.autosize(); }));
   //    modal.autosize(p);
@@ -976,7 +1088,7 @@ OrderController.prototype = {
   //  }
   //  modal.autosize("<p class='loading'>Refunding...</p>");
   //  $.ajax({
-  //    url: '/admin/orders/' + order_id + '/refund',
+  //    url: '/admin/invoices/' + invoice_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>");
@@ -985,4 +1097,35 @@ OrderController.prototype = {
   //  });
   //},
   
+  transaction_with_id: function(transaction_id)
+  {
+    var that = this;    
+    var t = false;    
+    $.each(that.invoice.invoice_transactions, function(i, t2) {      
+      if (t2.id == transaction_id)
+      {
+        t = t2;
+        return false;
+      }
+    });
+    return t;
+  }      
 };
+
+function formatted_date(str)
+{
+  the_date = new Date(str);
+  var h = the_date.getHours();    
+  var i = the_date.getMinutes();  if (i < 10) i = '0' + i;
+  
+  var ampm = 'am';
+  if (h >= 12) ampm = 'pm';
+  if (h > 12) h = h - 12;
+  if (h < 10) h = '0' + h;
+  
+  var m = the_date.getMonth()+1; if (m < 10) m = '0' + m;
+  var d = the_date.getDate();    if (d < 10) d = '0' + d;
+  var y = the_date.getFullYear();
+    
+  return '' + m + '/' + d + '/' + y + '<br/>' + h + ':' + i + ' ' + ampm;
+}