caboose-cms 0.5.162 → 0.5.163

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzQ0ZGYxZDUzOWE3ODliMGRmYWM4ZGMwN2E1ZjY2ZjlhMDI5MDMzMg==
+    MzljZTYxYTU2ZTZmY2QwMzMwNjE0YTY0NzQzNzc5N2FjNmJlZjE3Yw==
   data.tar.gz: !binary |-
-    MDhlNmIwZWE3Njc4NDk1MDgwYjlkNjhlZTU5YzJjN2EwYWUxZDA4Ng==
+    ZWUzZDNkNWQ4MGZhNzk3NTMzYjgzZDNiZmJjMzk0ZmNjNDkzMTRjYQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDMyY2RjNWNjOWQ4MTFhYzc2YzFhM2EyMjEwZjhhOTFhZjI3YTAwOGQzYzFm
-    M2E1OWY2NzQzZTIxN2U4YjAzNmFlYTY1ODViYTA5ZGU2ZTQ1MWQ1ODgxMmYz
-    Zjg0ODhlZGY5ZWY2YzNmOGU4ZmNjMDU3YzRiNjBhNGM5YjRhMzI=
+    YzhiN2FjNjEwZDExNmE5YTczMjQ2OTRhMGVjNWQwNDEyMjIwNWRiOWYwMDk1
+    ZDI0Yzg1MzUyZGYxZTYyMDAyYTdlMDg3MWE5NGYxYTNjM2Y2MTQ4YzEyNTll
+    NTVkYWEzODNkMzU4YzQ4YjVjYjM1ZTc1MjQyYzRjMjc4MDE3MDY=
   data.tar.gz: !binary |-
-    NzhlYjYxYjQ5NjRkYWVkODJmYzljMWMyMGZkOWExNmQ4NmQ0ZGVmNWJmZGI2
-    ODczYTNjNjliZjM4OWFiYTQ4YmQ5MjRhMTg5ZWU4MDA2MDQxMjU0Y2NhMThl
-    N2IzNjVmM2FhOTU4ODdiODcxNzUyNzY3YjM5YWQ5MmZhMjdiMTc=
+    ZjE1OWU3Nzg2ZDQ3ZWJkMjU4MmVjZjQ1MGEyZTQ0MWYyMTJhNzc1Y2Y4ODU2
+    YTgxMGU0NzhhNzRhMmY3MWFlODYwNjk4NGExODYwMmNjMDFiOTFiMGZkY2Q1
+    ZDQwNTU1NTU3MDZhN2FiNzNmYTViODFlY2E0MTNjZTFiZDU1NTc=

data/app/assets/javascripts/caboose/admin_edit_order.js

@@ -217,8 +217,10 @@ OrderController.prototype = {
     table = $('<table/>').addClass('data').css('width', '100%');    
     that.order_packages_table(table);
     that.unassigned_line_items_table(table);
-    that.summary_table(table);
+    that.summary_table(table);    
     $('#order_table').empty().append(table);
+    
+    that.button_controls();
   },
   
   overview_table: function()
@@ -245,8 +247,8 @@ OrderController.prototype = {
         );                    
       });
       fstatus.append(transactions_table);
-    }
-    
+    }            
+
     var table = $('<table/>').addClass('data');
     table.append($('<tr/>')  
       .append($('<th/>').html('Customer'))
@@ -265,27 +267,9 @@ OrderController.prototype = {
             else                    { that.noneditable_customer(); a.html('Edit');     }
           });
         }))
-      )
-      .append($('<td/>').attr('valign', 'top')
-        .append($('<div/>').attr('id', 'shipping_address').append(that.noneditable_shipping_address(true)))
-        .append($('<a/>').attr('href', '#').html('Edit').click(function(e) {
-          var a = $(this);
-          that.refresh_order(function() {
-            if (a.html() == 'Edit') { that.edit_shipping_address();        a.html('Finished'); }
-            else                    { that.noneditable_shipping_address(); a.html('Edit');     }
-          });
-        }))
-      )
-      .append($('<td/>').attr('valign', 'top')
-        .append($('<div/>').attr('id', 'billing_address').append(that.noneditable_billing_address(true)))
-        .append($('<a/>').attr('href', '#').html('Edit').click(function(e) {
-          var a = $(this);
-          that.refresh_order(function() {
-            if (a.html() == 'Edit') { that.edit_billing_address();        a.html('Finished'); }
-            else                    { that.noneditable_billing_address(); a.html('Edit');     }
-          });
-        }))
-      )
+      )      
+      .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))      
     );
@@ -327,19 +311,31 @@ OrderController.prototype = {
     });
   },
   
-  noneditable_shipping_address: function(return_element)
+  noneditable_shipping_address: function()
   {
     var that = this;
-    var sa = that.order.shipping_address;
-    var str = '';
-    str += (sa.first_name ? sa.first_name : '[Empty first name]') + ' ';
-    str += (sa.last_name  ? sa.last_name  : '[Empty last name]');        
-    str += '<br />' + (sa.address1 ? sa.address1 : '[Empty address]');
-    if (sa.address2) str += "<br />" + sa.address2;             
-    str += '<br/>' + (sa.city ? sa.city : '[Empty city]') + ", " + (sa.state ? sa.state : '[Empty state]') + " " + (sa.zip ? sa.zip : '[Empty zip]');
-    if (return_element)
-      return str;
-    $('#shipping_address').empty().append(str);
+    var div = $('<div/>');
+    if (that.has_shippable_items())
+    {
+      var sa = that.order.shipping_address;
+      str = '';                  
+      str += (sa.first_name ? sa.first_name : '[Empty first name]') + ' ';
+      str += (sa.last_name  ? sa.last_name  : '[Empty last name]');
+      str += '<br />' + (sa.address1 ? sa.address1 : '[Empty address]');
+      if (sa.address2) str += "<br />" + sa.address2;
+      str += '<br/>' + (sa.city ? sa.city : '[Empty city]') + ", " + (sa.state ? sa.state : '[Empty state]') + " " + (sa.zip ? sa.zip : '[Empty zip]');
+      
+      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(); });
+      }));      
+    }
+    else
+    {
+      div.append("This order does not require shipping.");
+    }    
+    return div;    
   },
   
   edit_shipping_address: function()
@@ -362,7 +358,12 @@ OrderController.prototype = {
         .append($('<td/>').append($('<div/>').attr('id', 'shippingaddress_' + sa.id + '_state')))        
         .append($('<td/>').append($('<div/>').attr('id', 'shippingaddress_' + sa.id + '_zip')))        
       ))));
-    $('#shipping_address').empty().append(table);
+    $('#shipping_address').empty()          
+      .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()); });
+      }));
             
     new ModelBinder({
       name: 'ShippingAddress',
@@ -381,9 +382,10 @@ OrderController.prototype = {
     });
   },
   
-  noneditable_billing_address: function(return_element)
+  noneditable_billing_address: function()
   {
     var that = this;
+    
     var sa = that.order.billing_address;
     if (!sa) sa = {};
     var str = '';
@@ -392,9 +394,15 @@ OrderController.prototype = {
     str += '<br />' + (sa.address1 ? sa.address1 : '[Empty address]');
     if (sa.address2) str += "<br />" + sa.address2;             
     str += '<br/>' + (sa.city ? sa.city : '[Empty city]') + ", " + (sa.state ? sa.state : '[Empty state]') + " " + (sa.zip ? sa.zip : '[Empty zip]');
-    if (return_element)
-      return str;
-    $('#billing_address').empty().append(str);
+    
+    var div = $('<div/>')
+      .append(str)      
+      .append("<br />")
+      .append($('<a/>').attr('href', '#').html('Edit').click(function(e) {
+        var a = $(this);
+        that.refresh_order(function() { that.edit_billing_address(); });
+      }));
+    return div;    
   },
   
   edit_billing_address: function()
@@ -418,7 +426,12 @@ OrderController.prototype = {
         .append($('<td/>').append($('<div/>').attr('id', 'billingaddress_' + sa.id + '_state')))        
         .append($('<td/>').append($('<div/>').attr('id', 'billingaddress_' + sa.id + '_zip')))        
       ))));
-    $('#billing_address').empty().append(table);
+    $('#billing_address').empty()
+      .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()); });
+      }));      
             
     new ModelBinder({
       name: 'BillingAddress',
@@ -593,7 +606,7 @@ OrderController.prototype = {
       .append($('<th/>').html('Package'    ))
       .append($('<th/>').html('Item'       ))
       .append($('<th/>').html('Status'     ))    
-      .append($('<th/>').html('Unit Price1' ))
+      .append($('<th/>').html('Unit Price' ))
       .append($('<th/>').html('Quantity'   ))
       .append($('<th/>').html('Subtotal'   ))
     );
@@ -601,13 +614,22 @@ OrderController.prototype = {
     $.each(that.order.line_items, function(i, li) {
       if (li.order_package_id && li.order_package_id != -1) return true;
             
-      var div = $('<div/>').attr('id', 'assign_to_package_' + li.id)
-        .append('Unpackaged! ')
-        .append($('<a/>').data('line_item_id', li.id).attr('href', '#').html('Assign to package').click(function(e) {
-          e.preventDefault();
-          e.stopPropagation();
-          that.assign_to_package_form($(this).data('line_item_id'));
-        }));
+      var div = false;
+      
+      if (li.variant.downloadable)
+      {
+        div = $('<div/>').append('This item is downloadable.');
+      }
+      else
+      {        
+        div = $('<div/>').attr('id', 'assign_to_package_' + li.id)
+          .append('Unpackaged! ')
+          .append($('<a/>').data('line_item_id', li.id).attr('href', '#').html('Assign to package').click(function(e) {
+            e.preventDefault();
+            e.stopPropagation();
+            that.assign_to_package_form($(this).data('line_item_id'));
+          }));
+      }
                                      
       var tr = $('<tr/>');
       tr.append($('<td/>').append(div));
@@ -645,7 +667,7 @@ OrderController.prototype = {
           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); }))
-              .append(' ' + d.name + ' Discount')
+              .append(' "' + d.gift_card.code + '" Discount')
             )
             .append($('<td/>').attr('align', 'right').html(curr(d.amount)))
           );
@@ -668,6 +690,35 @@ OrderController.prototype = {
     }
   },
   
+  button_controls: function()
+  {
+    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('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(' ');
+    $('#controls').empty().append(p);
+  },
+
+  /****************************************************************************/
+  
   add_variant: function(variant_id)
   {
     var that = this;
@@ -759,8 +810,43 @@ OrderController.prototype = {
         if (resp.refresh) { $('#message').empty(); that.refresh(); }
       }
     });
-  }
-                              
+  },
+  
+  send_for_authorization: function(confirm)
+  {
+    var that = this;    
+    if (!confirm)
+    {    
+      var p = $('<p/>').addClass('note confirm')
+        .append("Are you sure you want to send this order 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(); }));
+      $('#message').empty().append(p);
+      return;
+    }
+    $('#message').html("<p class='loading'>Sending for authorization...</p>");
+    $.ajax({
+      url: '/admin/orders/' + that.order.id + '/send-for-authorization',
+      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(); }
+      }
+    });
+  },
+
+  has_shippable_items: function()
+  {
+    var that = this;
+    var needs_shipping = false;
+    $.each(that.order.line_items, function(i, li) {      
+      if (li.variant.downloadable == false)
+        needs_shipping = true;
+    });
+    return needs_shipping;    
+  },
+  
   //resend_confirmation: function(order_id)
   //{
   //  modal.autosize("<p class='loading'>Resending confirmation..</p>");

data/app/assets/javascripts/caboose/checkout_login_register.js

@@ -64,7 +64,8 @@ Caboose.Store.Modules.CheckoutLoginRegister = (function() {
     self.current_form = form;         
   };
   
-  self.login_form_submit_handler = function(event) {    
+  self.login_form_submit_handler = function(event) {
+    event.preventDefault();    
     $('#message').html("<p class='loading'>Logging in...</p>");
     $.ajax({
       url: '/login',
@@ -88,22 +89,29 @@ Caboose.Store.Modules.CheckoutLoginRegister = (function() {
     return false;
   };
   
-  self.register_form_submit_handler = function(event) {    
+  self.register_form_submit_handler = function(event) {
+    event.preventDefault();
     $('#message').html("<p class='loading'>Registering...</p>");
     $.ajax({
       url: '/register',
       type: 'post',
       data: $('#register_form').serialize(),
       success: function(resp) {
-        if (resp.error) $('#message').html("<p class='note error'>" + resp.error + "</p>");
-        $.ajax({
-          url: '/checkout/attach-user',
-          type: 'post',            
-          success: function(resp2) {
-            if (resp2.error) $('#message').html("<p class='note error'>" + resp2.error + "</p>");
-            else window.location = '/checkout/addresses';
-          }
-        });        
+        if (resp.error)
+          $('#message').html("<p class='note error'>" + resp.error + "</p>");
+        else
+        {
+          $.ajax({
+            url: '/checkout/attach-user',
+            type: 'post',            
+            success: function(resp2) {
+              if (resp2.error)
+                $('#message').html("<p class='note error'>" + resp2.error + "</p>");
+              else
+                window.location = '/checkout/addresses';
+            }
+          });
+        }
       }
     });
     return false;

data/app/assets/javascripts/caboose/main.js

@@ -215,3 +215,20 @@ window.States = {
   "WI": "Wisconsin",
   "WY": "Wyoming"
 };
+
+function curr(x)
+{
+  if (!x) return '0.00'
+  var t = typeof x;
+  if (t == 'boolean') return '0.00';
+  if (t == 'number')  return x.toFixed(2);
+  if (t == 'string')  return parseFloat(x).toFixed(2);
+  console.log("curr doesn't know what this is:");
+  console.log(x);
+  console.log(t);
+  return 'STAHP'
+}
+
+function capitalize_first_letter(string) {
+  return string.charAt(0).toUpperCase() + string.slice(1);
+}

data/app/assets/javascripts/caboose/my_account_edit_order.js

@@ -0,0 +1,490 @@
+
+var MyAccountOrderController = function(params) { this.init(params); }
+
+MyAccountOrderController.prototype = {
+  
+  order_id: false,
+  order: false,
+  authenticity_token: false,
+  
+  init: function(params)
+  {
+    for (var i in params)
+      this[i] = params[i];
+    
+    var that = this;
+    $('#payment_form').hide();
+    $(document).ready(function() { that.refresh(); });
+  },
+  
+  refresh: function()
+  {
+    var that = this;
+    that.refresh_order(function() {
+      $('#order_table').html("<p class='loading'>Getting order...</p>");
+      that.print();       
+    });    
+  },
+  
+  refresh_order: function(after)
+  {
+    var that = this;
+    $.ajax({
+      url: '/my-account/orders/' + that.order_id + '/json',
+      success: function(order) {                 
+        that.order = order;
+        if (after) after(); 
+      }
+    });
+  },
+
+/******************************************************************************/
+      
+  line_items_for_order_package: function(order_package_id)
+  {
+    var that = this;
+    var line_items = [];
+    $.each(that.order.line_items, function(i, li) {
+      if (li.order_package_id == order_package_id)
+        line_items.push(li);
+    });
+    return line_items;
+  },
+  
+  print: function()
+  {    
+    var that = this;
+
+    if (that.order.line_items && that.order.line_items.length > 0)
+    {      
+      var count_packaged     = 0;
+      var count_unpackaged   = 0;
+      var count_downloadable = 0;
+      $.each(that.order.line_items, function(i, li) {  
+        if (li.order_package_id)
+          count_packaged++;
+        else if (li.variant.downloadable == true)
+          count_downloadable++;
+        else
+          count_unpackaged++;
+      });
+      
+      var table = that.overview_table();
+      $('#overview_table').empty().append(table).append($('<br />'));
+      
+      table = $('<table/>').addClass('order').css('width', '100%');
+      if (count_packaged     > 0) that.packaged_line_items_table(table);
+      if (count_unpackaged   > 0) that.unpackaged_line_items_table(table);
+      if (count_downloadable > 0) that.downloadable_line_items_table(table);    
+      that.summary_table(table);
+      $('#order_table').empty().append(table);
+    }
+    else
+    {
+      $('#overview_table').empty();
+      $('#order_table').empty();
+      $('#message').empty().html("This order is empty.");
+    }                  
+  },
+  
+  overview_table: function()
+  {
+    var that = this;        
+    
+    var fstatus = $('<div/>').append($('<p/>').html(capitalize_first_letter(that.order.financial_status)));    
+    if (that.order.financial_status == 'pending')        
+    {      
+      fstatus.append($('<p/>').append($('<input/>').attr('type', 'button').addClass('btn').val('Pay now').click(function(e) { e.preventDefault(); that.payment_form(); })));            
+    }            
+
+    var table = $('<table/>').addClass('order');
+    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('Payment Status'))      
+    );    
+    table.append($('<tr/>')      
+      .append($('<td/>').attr('valign', 'top').attr('id', 'customer'         ).append(that.noneditable_customer()))
+      .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').attr('align', 'center').append($('<p/>').html(capitalize_first_letter(that.order.status))))
+      .append($('<td/>').attr('valign', 'top').attr('align', 'center').append(fstatus))      
+    );
+    return table;  
+  },
+  
+  noneditable_customer: function()
+  {
+    var that = this;
+    c = that.order.customer;    
+    str = '';
+    if (c)                                                                  
+    {
+      str = c.first_name + ' ' + c.last_name;
+      if (c.email) str += '<br /><a href="mailto:' + c.email + '">' + c.email + '</a>';
+      if (c.phone) str += '<br />' + c.phone;
+    }
+    else
+      str = '[Empty]';    
+    return str;    
+  },
+  
+  noneditable_shipping_address: function()
+  {
+    var that = this;
+    var div = $('<div/>');
+    if (that.has_shippable_items())
+    {
+      var sa = that.order.shipping_address;
+      str = '';                  
+      str += (sa.first_name ? sa.first_name : '[Empty first name]') + ' ';
+      str += (sa.last_name  ? sa.last_name  : '[Empty last name]');
+      str += '<br />' + (sa.address1 ? sa.address1 : '[Empty address]');
+      if (sa.address2) str += "<br />" + sa.address2;
+      str += '<br/>' + (sa.city ? sa.city : '[Empty city]') + ", " + (sa.state ? sa.state : '[Empty state]') + " " + (sa.zip ? sa.zip : '[Empty zip]');
+      
+      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(); });
+      }));      
+    }
+    else
+    {
+      div.append("This order does not require shipping.");
+    }    
+    return div;    
+  },
+  
+  edit_shipping_address: function()
+  {
+    var that = this;
+    var sa = that.order.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')))
+        .append($('<td/>').append($('<div/>').attr('id', 'shippingaddress_' + sa.id + '_last_name')))
+      ))))
+      .append($('<tr/>').append($('<td/>').append($('<table/>').append($('<tr/>')
+        .append($('<td/>').append($('<div/>').attr('id', 'shippingaddress_' + sa.id + '_address1')))                                
+      ))))
+      .append($('<tr/>').append($('<td/>').append($('<table/>').append($('<tr/>')        
+        .append($('<td/>').append($('<div/>').attr('id', 'shippingaddress_' + sa.id + '_address2')))                        
+      ))))
+      .append($('<tr/>').append($('<td/>').append($('<table/>').append($('<tr/>')
+        .append($('<td/>').append($('<div/>').attr('id', 'shippingaddress_' + sa.id + '_city')))
+        .append($('<td/>').append($('<div/>').attr('id', 'shippingaddress_' + sa.id + '_state')))        
+        .append($('<td/>').append($('<div/>').attr('id', 'shippingaddress_' + sa.id + '_zip')))        
+      ))));
+    $('#shipping_address').empty()          
+      .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()); });
+      }));
+            
+    new ModelBinder({
+      name: 'ShippingAddress',
+      id: sa.id,
+      update_url: '/my-account/orders/' + that.order.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 },
+        { name: 'last_name'   , nice_name: 'Last Name'  , type: 'text'  , value: sa.last_name  , width: 150, fixed_placeholder: false },
+        { name: 'address1'    , nice_name: 'Address 1'  , type: 'text'  , value: sa.address1   , width: 320, fixed_placeholder: false },
+        { name: 'address2'    , nice_name: 'Address 2'  , type: 'text'  , value: sa.address2   , width: 320, fixed_placeholder: false },
+        { name: 'city'        , nice_name: 'City'       , type: 'text'  , value: sa.city       , width: 180, fixed_placeholder: false },
+        { name: 'state'       , nice_name: 'State'      , type: 'text'  , value: sa.state      , width: 40, fixed_placeholder: false },
+        { name: 'zip'         , nice_name: 'Zip'        , type: 'text'  , value: sa.zip        , width: 60, fixed_placeholder: false }
+      ]
+    });
+  },
+  
+  noneditable_billing_address: function()
+  {
+    var that = this;
+    
+    var sa = that.order.billing_address;
+    if (!sa) sa = {};
+    var str = '';
+    str += (sa.first_name ? sa.first_name : '[Empty first name]') + ' ';
+    str += (sa.last_name  ? sa.last_name  : '[Empty last name]');        
+    str += '<br />' + (sa.address1 ? sa.address1 : '[Empty address]');
+    if (sa.address2) str += "<br />" + sa.address2;             
+    str += '<br/>' + (sa.city ? sa.city : '[Empty city]') + ", " + (sa.state ? sa.state : '[Empty state]') + " " + (sa.zip ? sa.zip : '[Empty zip]');
+    
+    var div = $('<div/>')
+      .append(str)      
+      .append("<br />")
+      .append($('<a/>').attr('href', '#').html('Edit').click(function(e) {
+        var a = $(this);
+        that.refresh_order(function() { that.edit_billing_address(); });
+      }));
+    return div;    
+  },
+  
+  edit_billing_address: function()
+  {
+    var that = this;
+    var sa = that.order.billing_address;
+    if (!sa) sa = { id: 1 };
+    var table = $('<table/>').addClass('billing_address')
+      .append($('<tr/>').append($('<td/>').append($('<table/>').append($('<tr/>')
+        .append($('<td/>').append($('<div/>').attr('id', 'billingaddress_' + sa.id + '_first_name')))
+        .append($('<td/>').append($('<div/>').attr('id', 'billingaddress_' + sa.id + '_last_name')))
+      ))))
+      .append($('<tr/>').append($('<td/>').append($('<table/>').append($('<tr/>')
+        .append($('<td/>').append($('<div/>').attr('id', 'billingaddress_' + sa.id + '_address1')))                                
+      ))))
+      .append($('<tr/>').append($('<td/>').append($('<table/>').append($('<tr/>')        
+        .append($('<td/>').append($('<div/>').attr('id', 'billingaddress_' + sa.id + '_address2')))                        
+      ))))
+      .append($('<tr/>').append($('<td/>').append($('<table/>').append($('<tr/>')
+        .append($('<td/>').append($('<div/>').attr('id', 'billingaddress_' + sa.id + '_city')))
+        .append($('<td/>').append($('<div/>').attr('id', 'billingaddress_' + sa.id + '_state')))        
+        .append($('<td/>').append($('<div/>').attr('id', 'billingaddress_' + sa.id + '_zip')))        
+      ))));
+    $('#billing_address').empty()
+      .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()); });
+      }));      
+            
+    new ModelBinder({
+      name: 'BillingAddress',
+      id: sa.id,
+      update_url: '/my-account/orders/' + that.order.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 },
+        { name: 'last_name'   , nice_name: 'Last Name'  , type: 'text'  , value: sa.last_name  , width: 150, fixed_placeholder: false },
+        { name: 'address1'    , nice_name: 'Address 1'  , type: 'text'  , value: sa.address1   , width: 320, fixed_placeholder: false },
+        { name: 'address2'    , nice_name: 'Address 2'  , type: 'text'  , value: sa.address2   , width: 320, fixed_placeholder: false },
+        { name: 'city'        , nice_name: 'City'       , type: 'text'  , value: sa.city       , width: 180, fixed_placeholder: false },
+        { name: 'state'       , nice_name: 'State'      , type: 'text'  , value: sa.state      , width: 40, fixed_placeholder: false },
+        { name: 'zip'         , nice_name: 'Zip'        , type: 'text'  , value: sa.zip        , width: 60, fixed_placeholder: false }
+      ]
+    });
+  },
+  
+  // Show all the packages and the line items in each package
+  packaged_line_items_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);      
+      if (line_items && line_items.length > 0)
+      {        
+        table.append($('<tr/>').append($('<th/>').attr('colspan', '5').addClass('package_header').html("Package " + (i+1) + ": " + op.shipping_method.service_name + "<br />" + op.status)));
+        table.append($('<tr/>')                
+          .append($('<th/>').html('Item'))
+          .append($('<th/>').html('Status'))    
+          .append($('<th/>').html('Unit Price'))
+          .append($('<th/>').html('Quantity'))
+          .append($('<th/>').html('Subtotal'))
+        );                          
+        $.each(line_items, function(j, li) {          
+          var tr = $('<tr/>');                                 
+          tr.append($('<td/>').addClass('line_item_details'   ).append(that.line_item_details(li)));
+          tr.append($('<td/>').addClass('line_item_status'    ).attr('align', 'center').html(li.status));      
+          tr.append($('<td/>').addClass('line_item_unit_price').attr('align', 'right' ).html(curr(li.unit_price)));    
+          tr.append($('<td/>').addClass('line_item_quantity'  ).attr('align', 'right' ).html(li.quantity));
+          tr.append($('<td/>').addClass('line_item_subtotal'  ).attr('align', 'right' ).html(curr(li.subtotal)));        
+          table.append(tr);
+        });      
+      }
+    });
+  },
+  
+  // Show all the packages and the line items in each package
+  unpackaged_line_items_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);      
+      if (line_items && line_items.length > 0)
+      {        
+        table.append($('<tr/>').append($('<th/>').attr('colspan', '5').addClass('package_header').html("Unpackaged Items")));
+        table.append($('<tr/>')                
+          .append($('<th/>').html('Item'))
+          .append($('<th/>').html('Status'))    
+          .append($('<th/>').html('Unit Price'))
+          .append($('<th/>').html('Quantity'))
+          .append($('<th/>').html('Subtotal'))
+        );                          
+        $.each(line_items, function(j, li) {          
+          var tr = $('<tr/>');                                 
+          tr.append($('<td/>').addClass('line_item_details'   ).append(that.line_item_details(li)));
+          tr.append($('<td/>').addClass('line_item_status'    ).attr('align', 'center').html(li.status));      
+          tr.append($('<td/>').addClass('line_item_unit_price').attr('align', 'right' ).html(curr(li.unit_price)));    
+          tr.append($('<td/>').addClass('line_item_quantity'  ).attr('align', 'right' ).html(li.quantity));
+          tr.append($('<td/>').addClass('line_item_subtotal'  ).attr('align', 'right' ).html(curr(li.subtotal)));        
+          table.append(tr);
+        });      
+      }
+    });
+  },
+   
+  downloadable_line_items_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);      
+      if (line_items && line_items.length > 0)
+      {        
+        table.append($('<tr/>').append($('<th/>').attr('colspan', '5').addClass('package_header').html("Downloadable Items")));
+        table.append($('<tr/>')                
+          .append($('<th/>').html('Item'))
+          .append($('<th/>').html('Status'))    
+          .append($('<th/>').html('Unit Price'))
+          .append($('<th/>').html('Quantity'))
+          .append($('<th/>').html('Subtotal'))
+        );                          
+        $.each(line_items, function(j, li) {          
+          var tr = $('<tr/>');                                 
+          tr.append($('<td/>').addClass('line_item_details'   ).append(that.line_item_details(li)));
+          tr.append($('<td/>').addClass('line_item_status'    ).attr('align', 'center').html(li.status));      
+          tr.append($('<td/>').addClass('line_item_unit_price').attr('align', 'right' ).html(curr(li.unit_price)));    
+          tr.append($('<td/>').addClass('line_item_quantity'  ).attr('align', 'right' ).html(li.quantity));
+          tr.append($('<td/>').addClass('line_item_subtotal'  ).attr('align', 'right' ).html(curr(li.subtotal)));        
+          table.append(tr);
+        });      
+      }
+    });
+  },
+  
+  line_item_details: function(li)
+  {
+    var that = this;    
+    var v = li.variant;
+    var name = ''
+    if (!v || !v.product)
+      name = v ? v.sku : 'Unknown variant';                      
+    else
+    {
+      name = v.product.title;
+      if (v.sku   && v.sku.length   > 0) name += '<br />' + v.sku;
+      if (v.title && v.title.length > 0) name += '<br />' + v.title;
+    }       
+    
+    var div = $('<div/>').append($('<p/>').append($('<a/>').attr('href', '/products/' + li.variant.product_id).html(name)));
+    if (li.is_gift)
+    {      
+      div.append($('<ul/>').addClass('gift_options')
+        .append($('<li/>').html("This item is a gift."))
+        .append($('<li/>').html("Gift wrap? " + (li.gift_wrap ? 'Yes' : 'No')))
+        .append($('<li/>').html("Hide prices? " + (li.hide_prices ? 'Yes' : 'No')))
+        .append($('<li/>').html("Gift message: " + (li.gift_message && li.gift_message.length > 0 ? li.gift_message : '[Empty]')))
+      );            
+    }
+    else
+    {
+      div.append($('<p/>').html("This item is not a gift."));
+    } 
+    if (li.variant.downloadable)
+    {
+      div.append($('<p/>').append($('<a/>').attr('href', '/my-account/orders/' + that.order.id + '/line-items/' + li.id + '/download').html('Download')));
+    }
+    
+    return div;    
+  },
+      
+  // Show the order summary
+  summary_table: function(table)
+  {    
+    var that = this;
+    table.append($('<tr/>').append($('<th/>').attr('colspan', '5').addClass('totals_header').html('Totals')));        
+    table.append($('<tr/>').addClass('totals_row').append($('<td/>').attr('colspan', '4').attr('align', 'right').html('Subtotal' )).append($('<td/>').attr('align', 'right').attr('id', 'subtotal').html(curr(that.order.subtotal ))));
+    table.append($('<tr/>').addClass('totals_row').append($('<td/>').attr('colspan', '4').attr('align', 'right').html('Tax'      )).append($('<td/>').attr('align', 'right').attr('id', 'tax'     ).html(curr(that.order.tax      ))));
+    table.append($('<tr/>').addClass('totals_row').append($('<td/>').attr('colspan', '4').attr('align', 'right').html('Shipping' )).append($('<td/>').attr('align', 'right').attr('id', 'shipping').html(curr(that.order.shipping ))));
+    table.append($('<tr/>').addClass('totals_row').append($('<td/>').attr('colspan', '4').attr('align', 'right').html('Handling' )).append($('<td/>').attr('align', 'right').attr('id', 'handling').html(curr(that.order.handling ))));
+    if (that.order.discounts)
+    {
+      $.each(that.order.discounts, function(i, d) {
+        table.append($('<tr/>').addClass('totals_row')
+          .append($('<td/>').attr('colspan', '4').attr('align', 'right').append(' "' + d.gift_card.code + '" Discount'))
+          .append($('<td/>').attr('align', 'right').html(curr(d.amount)))
+        );
+      });
+    }    
+    table.append($('<tr/>').addClass('totals_row').append($('<td/>').attr('colspan', '4').attr('align', 'right').html('Discount')).append($('<td/>').attr('align', 'right').attr('id', 'custom_discount').html(curr(that.order.custom_discount))));
+    table.append($('<tr/>').addClass('totals_row').append($('<td/>').attr('colspan', '4').attr('align', 'right').html('Total'   )).append($('<td/>').attr('align', 'right').attr('id', 'total'          ).html(curr(that.order.total))));            
+  },
+
+  /****************************************************************************/
+  
+  payment_form: function()
+  {
+    var that = this;
+    var ba = that.order.billing_address;
+    if (ba == null || ba == false || 
+      ba.first_name.length == 0 || 
+      ba.last_name.length == 0 ||
+      ba.address1.length == 0 || 
+      ba.city.length == 0 || 
+      ba.state.length == 0 || 
+      ba.zip.length == 0
+    ) {                                                           
+      $('#payment_message').empty().html("<p class='note error'>Your billing address must be valid before making payment. Please review and try again.</p>");
+      return;    
+    }
+    var form = $('#payment_form');
+    if (!form.is(':visible'))
+    {
+      $('#payment_message').empty();
+      form.slideDown();
+    }
+    else
+      form.slideUp();          
+  },
+  
+  submit_payment: function() 
+  {
+    $('#payment_message').empty().html("<p class='loading'>Processing payment...</p>");
+    $('#payment_form').slideUp();
+  },
+    
+  send_for_authorization: function(confirm)
+  {
+    var that = this;    
+    if (!confirm)
+    {    
+      var p = $('<p/>').addClass('note confirm')
+        .append("Are you sure you want to send this order 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(); }));
+      $('#message').empty().append(p);
+      return;
+    }
+    $('#message').html("<p class='loading'>Sending for authorization...</p>");
+    $.ajax({
+      url: '/my-account/orders/' + that.order.id + '/send-for-authorization',
+      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(); }
+      }
+    });
+  },
+
+  has_shippable_items: function()
+  {
+    var that = this;
+    var needs_shipping = false;
+    $.each(that.order.line_items, function(i, li) {      
+      if (li.variant.downloadable == false)
+        needs_shipping = true;
+    });
+    return needs_shipping;    
+  },
+  
+};
+  
+function relay_handler(resp)
+{
+  
+}