caboose-cms 0.7.85 → 0.8.1

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

@@ -18,7 +18,7 @@ Caboose.Store.Modules.CheckoutShipping = (function() {
       url: '/checkout/shipping',
       type: 'put',      
       data: { 
-        order_package_id:   $(event.target).data('order_package_id'),
+        invoice_package_id: $(event.target).data('invoice_package_id'),
         shipping_method_id: $(event.target).data('shipping_method_id'),
         total:              $(event.target).data('total')
       },

data/app/assets/javascripts/caboose/jquery.payment.js

@@ -0,0 +1 @@
+(function(){var t,e,n,r,a,o,i,l,u,s,c,h,p,g,v,f,d,m,y,C,T,w,$,D,S=[].slice,k=[].indexOf||function(t){for(var e=0,n=this.length;n>e;e++)if(e in this&&this[e]===t)return e;return-1};t=window.jQuery||window.Zepto||window.$,t.payment={},t.payment.fn={},t.fn.payment=function(){var e,n;return n=arguments[0],e=2<=arguments.length?S.call(arguments,1):[],t.payment.fn[n].apply(this,e)},a=/(\d{1,4})/g,t.payment.cards=r=[{type:"visaelectron",patterns:[4026,417500,4405,4508,4844,4913,4917],format:a,length:[16],cvcLength:[3],luhn:!0},{type:"maestro",patterns:[5018,502,503,56,58,639,6220,67],format:a,length:[12,13,14,15,16,17,18,19],cvcLength:[3],luhn:!0},{type:"forbrugsforeningen",patterns:[600],format:a,length:[16],cvcLength:[3],luhn:!0},{type:"dankort",patterns:[5019],format:a,length:[16],cvcLength:[3],luhn:!0},{type:"visa",patterns:[4],format:a,length:[13,16],cvcLength:[3],luhn:!0},{type:"mastercard",patterns:[51,52,53,54,55,22,23,24,25,26,27],format:a,length:[16],cvcLength:[3],luhn:!0},{type:"amex",patterns:[34,37],format:/(\d{1,4})(\d{1,6})?(\d{1,5})?/,length:[15],cvcLength:[3,4],luhn:!0},{type:"dinersclub",patterns:[30,36,38,39],format:/(\d{1,4})(\d{1,6})?(\d{1,4})?/,length:[14],cvcLength:[3],luhn:!0},{type:"discover",patterns:[60,64,65,622],format:a,length:[16],cvcLength:[3],luhn:!0},{type:"unionpay",patterns:[62,88],format:a,length:[16,17,18,19],cvcLength:[3],luhn:!1},{type:"jcb",patterns:[35],format:a,length:[16],cvcLength:[3],luhn:!0}],e=function(t){var e,n,a,o,i,l,u,s;for(t=(t+"").replace(/\D/g,""),o=0,l=r.length;l>o;o++)for(e=r[o],s=e.patterns,i=0,u=s.length;u>i;i++)if(a=s[i],n=a+"",t.substr(0,n.length)===n)return e},n=function(t){var e,n,a;for(n=0,a=r.length;a>n;n++)if(e=r[n],e.type===t)return e},p=function(t){var e,n,r,a,o,i;for(r=!0,a=0,n=(t+"").split("").reverse(),o=0,i=n.length;i>o;o++)e=n[o],e=parseInt(e,10),(r=!r)&&(e*=2),e>9&&(e-=9),a+=e;return a%10===0},h=function(t){var e;return null!=t.prop("selectionStart")&&t.prop("selectionStart")!==t.prop("selectionEnd")?!0:null!=("undefined"!=typeof document&&null!==document&&null!=(e=document.selection)?e.createRange:void 0)&&document.selection.createRange().text?!0:!1},$=function(t,e){var n,r,a;try{n=e.prop("selectionStart")}catch(o){r=o,n=null}return a=e.val(),e.val(t),null!==n&&e.is(":focus")?(n===a.length&&(n=t.length),e.prop("selectionStart",n),e.prop("selectionEnd",n)):void 0},m=function(t){var e,n,r,a,o,i,l,u;for(null==t&&(t=""),r="０１２３４５６７８９",a="0123456789",i="",e=t.split(""),l=0,u=e.length;u>l;l++)n=e[l],o=r.indexOf(n),o>-1&&(n=a[o]),i+=n;return i},d=function(e){var n;return n=t(e.currentTarget),setTimeout(function(){var t;return t=n.val(),t=m(t),t=t.replace(/\D/g,""),$(t,n)})},v=function(e){var n;return n=t(e.currentTarget),setTimeout(function(){var e;return e=n.val(),e=m(e),e=t.payment.formatCardNumber(e),$(e,n)})},l=function(n){var r,a,o,i,l,u,s;return o=String.fromCharCode(n.which),!/^\d+$/.test(o)||(r=t(n.currentTarget),s=r.val(),a=e(s+o),i=(s.replace(/\D/g,"")+o).length,u=16,a&&(u=a.length[a.length.length-1]),i>=u||null!=r.prop("selectionStart")&&r.prop("selectionStart")!==s.length)?void 0:(l=a&&"amex"===a.type?/^(\d{4}|\d{4}\s\d{6})$/:/(?:^|\s)(\d{4})$/,l.test(s)?(n.preventDefault(),setTimeout(function(){return r.val(s+" "+o)})):l.test(s+o)?(n.preventDefault(),setTimeout(function(){return r.val(s+o+" ")})):void 0)},o=function(e){var n,r;return n=t(e.currentTarget),r=n.val(),8!==e.which||null!=n.prop("selectionStart")&&n.prop("selectionStart")!==r.length?void 0:/\d\s$/.test(r)?(e.preventDefault(),setTimeout(function(){return n.val(r.replace(/\d\s$/,""))})):/\s\d?$/.test(r)?(e.preventDefault(),setTimeout(function(){return n.val(r.replace(/\d$/,""))})):void 0},f=function(e){var n;return n=t(e.currentTarget),setTimeout(function(){var e;return e=n.val(),e=m(e),e=t.payment.formatExpiry(e),$(e,n)})},u=function(e){var n,r,a;return r=String.fromCharCode(e.which),/^\d+$/.test(r)?(n=t(e.currentTarget),a=n.val()+r,/^\d$/.test(a)&&"0"!==a&&"1"!==a?(e.preventDefault(),setTimeout(function(){return n.val("0"+a+" / ")})):/^\d\d$/.test(a)?(e.preventDefault(),setTimeout(function(){var t,e;return t=parseInt(a[0],10),e=parseInt(a[1],10),e>2&&0!==t?n.val("0"+t+" / "+e):n.val(""+a+" / ")})):void 0):void 0},s=function(e){var n,r,a;return r=String.fromCharCode(e.which),/^\d+$/.test(r)?(n=t(e.currentTarget),a=n.val(),/^\d\d$/.test(a)?n.val(""+a+" / "):void 0):void 0},c=function(e){var n,r,a;return a=String.fromCharCode(e.which),"/"===a||" "===a?(n=t(e.currentTarget),r=n.val(),/^\d$/.test(r)&&"0"!==r?n.val("0"+r+" / "):void 0):void 0},i=function(e){var n,r;return n=t(e.currentTarget),r=n.val(),8!==e.which||null!=n.prop("selectionStart")&&n.prop("selectionStart")!==r.length?void 0:/\d\s\/\s$/.test(r)?(e.preventDefault(),setTimeout(function(){return n.val(r.replace(/\d\s\/\s$/,""))})):void 0},g=function(e){var n;return n=t(e.currentTarget),setTimeout(function(){var t;return t=n.val(),t=m(t),t=t.replace(/\D/g,"").slice(0,4),$(t,n)})},w=function(t){var e;return t.metaKey||t.ctrlKey?!0:32===t.which?!1:0===t.which?!0:t.which<33?!0:(e=String.fromCharCode(t.which),!!/[\d\s]/.test(e))},C=function(n){var r,a,o,i;return r=t(n.currentTarget),o=String.fromCharCode(n.which),/^\d+$/.test(o)&&!h(r)?(i=(r.val()+o).replace(/\D/g,""),a=e(i),a?i.length<=a.length[a.length.length-1]:i.length<=16):void 0},T=function(e){var n,r,a;return n=t(e.currentTarget),r=String.fromCharCode(e.which),/^\d+$/.test(r)&&!h(n)?(a=n.val()+r,a=a.replace(/\D/g,""),a.length>6?!1:void 0):void 0},y=function(e){var n,r,a;return n=t(e.currentTarget),r=String.fromCharCode(e.which),/^\d+$/.test(r)&&!h(n)?(a=n.val()+r,a.length<=4):void 0},D=function(e){var n,a,o,i,l;return n=t(e.currentTarget),l=n.val(),i=t.payment.cardType(l)||"unknown",n.hasClass(i)?void 0:(a=function(){var t,e,n;for(n=[],t=0,e=r.length;e>t;t++)o=r[t],n.push(o.type);return n}(),n.removeClass("unknown"),n.removeClass(a.join(" ")),n.addClass(i),n.toggleClass("identified","unknown"!==i),n.trigger("payment.cardType",i))},t.payment.fn.formatCardCVC=function(){return this.on("keypress",w),this.on("keypress",y),this.on("paste",g),this.on("change",g),this.on("input",g),this},t.payment.fn.formatCardExpiry=function(){return this.on("keypress",w),this.on("keypress",T),this.on("keypress",u),this.on("keypress",c),this.on("keypress",s),this.on("keydown",i),this.on("change",f),this.on("input",f),this},t.payment.fn.formatCardNumber=function(){return this.on("keypress",w),this.on("keypress",C),this.on("keypress",l),this.on("keydown",o),this.on("keyup",D),this.on("paste",v),this.on("change",v),this.on("input",v),this.on("input",D),this},t.payment.fn.restrictNumeric=function(){return this.on("keypress",w),this.on("paste",d),this.on("change",d),this.on("input",d),this},t.payment.fn.cardExpiryVal=function(){return t.payment.cardExpiryVal(t(this).val())},t.payment.cardExpiryVal=function(t){var e,n,r,a;return a=t.split(/[\s\/]+/,2),e=a[0],r=a[1],2===(null!=r?r.length:void 0)&&/^\d+$/.test(r)&&(n=(new Date).getFullYear(),n=n.toString().slice(0,2),r=n+r),e=parseInt(e,10),r=parseInt(r,10),{month:e,year:r}},t.payment.validateCardNumber=function(t){var n,r;return t=(t+"").replace(/\s+|-/g,""),/^\d+$/.test(t)?(n=e(t),n?(r=t.length,k.call(n.length,r)>=0&&(n.luhn===!1||p(t))):!1):!1},t.payment.validateCardExpiry=function(e,n){var r,a,o;return"object"==typeof e&&"month"in e&&(o=e,e=o.month,n=o.year),e&&n?(e=t.trim(e),n=t.trim(n),/^\d+$/.test(e)&&/^\d+$/.test(n)&&e>=1&&12>=e?(2===n.length&&(n=70>n?"20"+n:"19"+n),4!==n.length?!1:(a=new Date(n,e),r=new Date,a.setMonth(a.getMonth()-1),a.setMonth(a.getMonth()+1,1),a>r)):!1):!1},t.payment.validateCardCVC=function(e,r){var a,o;return e=t.trim(e),/^\d+$/.test(e)?(a=n(r),null!=a?(o=e.length,k.call(a.cvcLength,o)>=0):e.length>=3&&e.length<=4):!1},t.payment.cardType=function(t){var n;return t?(null!=(n=e(t))?n.type:void 0)||null:null},t.payment.formatCardNumber=function(n){var r,a,o,i;return n=n.replace(/\D/g,""),(r=e(n))?(o=r.length[r.length.length-1],n=n.slice(0,o),r.format.global?null!=(i=n.match(r.format))?i.join(" "):void 0:(a=r.format.exec(n),null!=a?(a.shift(),a=t.grep(a,function(t){return t}),a.join(" ")):void 0)):n},t.payment.formatExpiry=function(t){var e,n,r,a;return(n=t.match(/^\D*(\d{1,2})(\D+)?(\d{1,4})?/))?(e=n[1]||"",r=n[2]||"",a=n[3]||"",a.length>0?r=" / ":" /"===r?(e=e.substring(0,1),r=""):2===e.length||r.length>0?r=" / ":1===e.length&&"0"!==e&&"1"!==e&&(e="0"+e,r=" / "),e+r+a):""}}).call(this);

data/app/assets/javascripts/caboose/model/attribute.js

@@ -29,6 +29,7 @@ Attribute.prototype = {
   hour_increment: 1,
   show_check_all: true,
   show_empty_option: false,
+  empty_option_text: false,
   quick_add_url: false,
   quick_add_text: 'Add New',  
   
@@ -37,9 +38,9 @@ Attribute.prototype = {
   options: false,
   s3: false,
   
-  save: function(after) {          
-    //if (this.before_update) this.before_update();    
+  save: function(after) {                  
     var this2 = this;
+    //if (this.before_update) this.before_update(this2);
     $.ajax({
       url: this.update_url,
       type: 'put',

data/app/assets/javascripts/caboose/model/bound_control.js

@@ -13,9 +13,40 @@ BoundControl = Class.extend({
   cancel: function() {},      // Cancels the edit
   error:  function(str) {},     // Shows an error
 
+  //show_loader: function() {
+  //  var w = $('#'+this.el).outerWidth();
+  //  var h = 40; //$('#'+this.el).outerHeight();
+  //  var this2 = this;
+  //  
+  //  if (!$('#'+this.el+'_check').length)
+  //  {      
+  //    $('#'+this.el+'_container').prepend($('<div/>')
+  //      .attr('id', this.el + '_check')
+  //      .addClass('mb_bound_input_check')
+  //      .css('position', 'absolute')
+  //      .css('top', 0)
+  //      .css('right', w-h-1)
+  //      .css('width', h+2)
+  //      .css('overflow', 'hidden')
+  //      .append($('<a/>')
+  //        .addClass('loading')
+  //        .html('&#10003;')
+  //        .css('width', h)
+  //        .css('margin-left', h)
+  //        .attr('href', '#')
+  //        .click(function(event) { event.preventDefault(); })
+  //      )
+  //    );
+  //  }    
+  //  $('#'+this.el+'_check a')
+  //    .addClass('mb_loading')
+  //    .css('margin-left', h);
+  //  $('#'+this.el+'_check a').animate({ 'margin-left': 0 }, 300); 
+  //},
+  
   show_loader: function() {
     var w = $('#'+this.el).outerWidth();
-    var h = 40; //$('#'+this.el).outerHeight();
+    var h = $('#'+this.el).outerHeight();    
     var this2 = this;
     
     if (!$('#'+this.el+'_check').length)
@@ -25,30 +56,31 @@ BoundControl = Class.extend({
         .addClass('mb_bound_input_check')
         .css('position', 'absolute')
         .css('top', 0)
-        .css('left', w-h-1)
-        .css('width', h+2)
+        .css('right', 0-h)
+        .css('width', h)
         .css('overflow', 'hidden')
+        .css('border', '0')
         .append($('<a/>')
           .addClass('loading')
           .html('&#10003;')
           .css('width', h)
-          .css('margin-left', h)
+          .css('height', h)
+          .css('text-decoration', 'none')
+          .css('border', '0')
           .attr('href', '#')
           .click(function(event) { event.preventDefault(); })
         )
       );
     }    
-    $('#'+this.el+'_check a')
-      .addClass('mb_loading')
-      .css('margin-left', h);
-    $('#'+this.el+'_check a').animate({ 'margin-left': 0 }, 300); 
+    $('#'+this.el+'_check a').addClass('loading');
+    $('#'+this.el+'_check').animate({ 'right': -1 }, 300); 
   },
   
   hide_loader: function() {
     this.hide_check();
   },
   
-  show_check: function(duration) {
+  show_check: function(duration) {        
     $('#'+this.el+'_check a').removeClass('loading');
     if (duration)
     {
@@ -57,12 +89,22 @@ BoundControl = Class.extend({
     }
   },
   
+  //hide_check: function() {
+  //  var w = $('#'+this.el).outerWidth();
+  //  var h = 40;
+  //  
+  //  var this2 = this;
+  //  $('#'+this.el+'_check a').animate({ 'margin-left': h }, 300, function() { 
+  //    $('#'+this2.check).remove(); 
+  //  });
+  //},
+  
   hide_check: function() {
-    var h = $('#'+this.el).outerHeight();
-    var this2 = this;
-    $('#'+this.el+'_check a').animate({ 'margin-left': h }, 300, function() { 
-      $('#'+this2.check).remove(); 
+    var that = this;    
+    var h = $('#'+this.el).outerHeight();        
+    $('#'+that.el+'_check').animate({ 'right': 0-h }, 300, function() { 
+      $('#'+that.el+'_check').remove(); 
     });
-  }
+  },
   
 });

data/app/assets/javascripts/caboose/model/bound_select.js

@@ -18,12 +18,11 @@ BoundSelect = BoundControl.extend({
     this.el = this.el ? this.el : this.model.name.toLowerCase() + '_' + this.model.id + '_' + this.attribute.name;
     this.message = this.el + '_message';
     this.placeholder = this.el + '_placeholder';
-         
-    $('#'+this.el).wrap($('<div/>')
-      .attr('id', this.el + '_container')
-      .addClass('mb_container')
-      .css('position', 'relative')
-    );
+    
+    var wrapper = $('<div/>').attr('id', this.el + '_container').addClass('mb_container').css('position', 'relative');
+    if (this.attribute.wrapper_class)
+      wrapper.addClass(this.attribute.wrapper_class);        
+    $('#'+this.el).wrap(wrapper);                
     $('#'+this.el+'_container').empty();
     if (this.attribute.fixed_placeholder == true)
     {
@@ -74,8 +73,8 @@ BoundSelect = BoundControl.extend({
             caboose_modal_close_handler = function(new_id) {              
               this2.attribute.populate_options(function() {
                 var select2 = $('#' + this2.el + '_select');
-                select2.empty();
-                if (this2.attribute.show_empty_option)  select.append($('<option/>').val('').html('-- Empty --'));
+                select2.empty();                
+                if (this2.attribute.show_empty_option)  select.append($('<option/>').val('').html(this2.attribute.empty_text ? this2.attribute.empty_text : '-- Empty --'));
                 if (this2.attribute.quick_add_url)      select.append($('<option/>').val('quickadd').html('-- ' + this2.attribute.quick_add_text + ' --'));
                 $.each(this2.attribute.options, function(i, option) {
                   var opt = $('<option/>').val(option.value).html(option.text);
@@ -117,9 +116,8 @@ BoundSelect = BoundControl.extend({
           value: this2.attribute.value,
           text: this2.attribute.text
         });
-      }      
-      if (this2.attribute.show_empty_option)      
-        select.append($('<option/>').val('').html('-- Empty --'));
+      }
+      if (this2.attribute.show_empty_option)  select.append($('<option/>').val('').html(this2.attribute.empty_text ? this2.attribute.empty_text : '-- Empty --'));
       if (this2.attribute.quick_add_url)      
         select.append($('<option/>').val('quickadd').html('-- ' + this2.attribute.quick_add_text + ' --'));
       $.each(this2.attribute.options, function(i, option) {

data/app/assets/javascripts/caboose/model/bound_select_simple.js

@@ -0,0 +1,215 @@
+
+BoundSelectSimple = BoundControl.extend({
+
+  //el: false,
+  //model: false,
+  //attribute: false,
+  //binder: false,
+  
+  message: false,
+  placeholder: false,
+ 
+  init: function(params) {
+    //console.log('control.model.id = ' + this.model.id);
+    for (var thing in params)
+      this[thing] = params[thing];
+    //console.log('control.model.id = ' + this.model.id);
+    
+    this.el = this.el ? this.el : this.model.name.toLowerCase() + '_' + this.model.id + '_' + this.attribute.name;
+    this.message = this.el + '_message';
+    this.placeholder = this.el + '_placeholder';
+    
+    var wrapper = $('<div/>').attr('id', this.el + '_container').addClass('mb_container').css('position', 'relative');
+    if (this.attribute.wrapper_class)
+      wrapper.addClass(this.attribute.wrapper_class);        
+    $('#'+this.el).wrap(wrapper);                
+    $('#'+this.el+'_container').empty();
+    if (this.attribute.fixed_placeholder == true)
+    {
+      $('#'+this.el+'_container').append($('<div/>')
+        .attr('id', this.placeholder)
+        .addClass('mb_placeholder')
+        .append($('<span/>')
+          .html(this.attribute.nice_name + ': ')
+        )
+      );
+    }
+    var this2 = this;
+    $('#'+this.el+'_container').append($('<input/>')
+      .attr('type', 'text')
+      .attr('id', this.el)
+      .addClass('mb_fake_option')
+      .attr('placeholder', this.attribute.empty_text)
+      .click(function() { this2.edit(); })
+      .val(this.attribute.text && this.attribute.text.length > 0 ? this.attribute.text : this.attribute.empty_text)
+    );
+    if (this.attribute.width)
+      $('#'+this.el).css('width', this.attribute.width);
+    
+    if (this.attribute.fixed_placeholder)
+    {
+      var w = $('#'+this.placeholder).outerWidth();
+      $('#'+this.el)
+        .css('padding-left', '+=' + w)
+        .css('width', '-=' + w);
+    }
+    
+    //this.update_options();
+      
+    //var this2 = this;
+    //this.attribute.populate_options(function() {
+    //  this2.print_options(this2);
+    //});    
+        
+    this.attribute.populate_options(function() {
+      var select = $('<select/>')
+        .attr('id', this2.el + '_select')
+        .addClass('mb_fake')
+        .css('width', $('#'+this2.el).outerWidth())        
+        .on('change', function() {                
+          var v = $('#'+this2.el+'_select').val();
+          if (this2.attribute.quick_add_url && v == 'quickadd')
+          {                        
+            caboose_modal_close_handler = function(new_id) {              
+              this2.attribute.populate_options(function() {
+                var select2 = $('#' + this2.el + '_select');
+                select2.empty();
+                if (this2.attribute.show_empty_option)  select.append($('<option/>').val('').html('-- Empty --'));
+                if (this2.attribute.quick_add_url)      select.append($('<option/>').val('quickadd').html('-- ' + this2.attribute.quick_add_text + ' --'));
+                $.each(this2.attribute.options, function(i, option) {
+                  var opt = $('<option/>').val(option.value).html(option.text);
+                  if (option.value == new_id)
+                  {
+                    this2.attribute.text = option.text;
+                    $('#'+this2.el).val(this2.attribute.text);
+                    opt.attr('selected', 'true');
+                  }
+                  select.append(opt);
+                });
+                $('#'+this2.el).val(new_id);
+                this2.save();
+              }, true);
+            }
+            if (typeof this2.attribute.quick_add_url == 'string')
+              caboose_modal_url(this2.attribute.quick_add_url);
+            else
+              caboose_modal_url(this2.attribute.quick_add_url(this2.model()));
+          }
+          else
+          {
+            $('#'+this2.el).val(v);                    
+            this2.save();
+          }
+        });        
+      // Make sure the existing value is in the list of options
+      var exists = false;
+      $.each(this2.attribute.options, function(i, option) {
+        if (option.value == this2.attribute.value)
+        {
+          exists = true;
+          return false;
+        }
+      });
+      if (!exists && !(this2.attribute.show_empty_option && (this2.attribute.value == '' || this2.attribute.value == null)))
+      {
+        this2.attribute.options.unshift({ 
+          value: this2.attribute.value,
+          text: this2.attribute.text
+        });
+      }      
+      if (this2.attribute.show_empty_option)      
+        select.append($('<option/>').val('').html('-- Empty --'));
+      if (this2.attribute.quick_add_url)      
+        select.append($('<option/>').val('quickadd').html('-- ' + this2.attribute.quick_add_text + ' --'));
+      $.each(this2.attribute.options, function(i, option) {
+        var opt = $('<option/>')
+          .val(option.value)
+          .html(option.text);
+        if (option.value == this2.attribute.value)
+        {
+          this2.attribute.text = option.text;
+          $('#'+this2.el).val(this2.attribute.text);
+          opt.attr('selected', 'true');
+        }
+        select.append(opt);
+      });      
+      $('#'+this2.el+'_container').append(select);
+      $('#'+this2.el+'_select').css('width', $('#'+this2.el).outerWidth());            
+    });
+  },
+             
+  //update_options: function() {    
+  //  var that = this;
+  //  this.attribute.populate_options(function() {          
+  //    var select = $('<select/>')
+  //      .attr('id', that.el + '_select')
+  //      .addClass('fake')
+  //      .css('width', $('#'+that.el).outerWidth())
+  //      .on('change', function() {
+  //        $('#'+that.el).val($('#'+that.el+'_select').val());
+  //        that.save();                     
+  //      });
+  //          
+  //    $.each(that.attribute.options, function(i, option) {      
+  //      var opt = $('<option/>')
+  //        .val(option.value)
+  //        .html(option.text);
+  //      if (option.value == that.attribute.value)
+  //        opt.attr('selected', 'true');
+  //      select.append(opt);
+  //    });
+  //    
+  //    if ($('#' + that.el + '_select').length) 
+  //      $('#' + that.el + '_select').remove();
+  //    
+  //    $('#'+that.el+'_container').append(select);    
+  //    $('#'+that.el+'_select').css('width', $('#'+that.el).outerWidth());
+  //  });
+  //},
+  
+  view: function() {
+    
+  },
+    
+  edit: function() {        
+  },
+  
+  save: function() {
+    this.attribute.value = $('#'+this.el).val();
+    var i = $('#' + this.el + "_container option[value='" + this.attribute.value + "']").index();
+    this.attribute.text = $('#' + this.el + " option").eq(i).text();
+    if (this.attribute.text == '' && this.attribute.show_empty_option)
+      this.attribute.text = '-- Empty --';
+        
+    var this2 = this;    
+    this.binder.save(this.attribute, function(resp) {      
+      $(this2.attribute.options).each(function(i,opt) {
+        if (opt.value == this2.attribute.value)
+          this2.attribute.text = opt.text;        
+      });      
+      if (this2.attribute.text)
+        $('#'+this2.el).val(this2.attribute.text);
+      $('#'+this2.el+'_check a').removeClass('loading');
+      if (resp.error) this2.error(resp.error);
+      else
+      {
+        if (this2.binder.success)
+          this2.binder.success(this2);
+        this2.view();
+      }
+    });
+  },
+  
+  cancel: function() {
+    this.attribute.value = this.attribute.value_clean;
+    $('#'+this.el).val(this.attribute.value);
+    this.view();
+  },
+
+  error: function(str) {
+    if (!$('#'+this.message).length)
+      $('#'+this.el+'_container').prepend($('<div/>').attr('id', this.message));
+    $('#'+this.message).html("<p class='note error'>" + str + "</p>");
+  }
+
+});

data/app/assets/javascripts/caboose/model/bound_text.js

@@ -13,13 +13,12 @@ BoundText = BoundControl.extend({
     for (var thing in params)
       this[thing] = params[thing];
     
-    this.el = this.el ? this.el : this.model.name.toLowerCase() + '_' + this.model.id + '_' + this.attribute.name;    
-    $('#'+this.el).wrap($('<div/>')
-      .attr('id', this.el + '_container')
-      .addClass('mb_container')
-      .css('position', 'relative')
-    );
-    $('#'+this.el+'_container').empty();
+    this.el = this.el ? this.el : this.model.name.toLowerCase() + '_' + this.model.id + '_' + this.attribute.name;
+    var wrapper = $('<div/>').attr('id', this.el + '_container').addClass('mb_container').css('position', 'relative');
+    if (this.attribute.wrapper_class)
+      wrapper.addClass(this.attribute.wrapper_class);        
+    $('#'+this.el).wrap(wrapper);      
+    $('#'+this.el+'_container').empty();    
     $('#'+this.el+'_container').append($('<input/>')
       .attr('id', this.el)
       .attr('type', 'text')
@@ -76,7 +75,7 @@ BoundText = BoundControl.extend({
       }
       else
       {
-        this2.show_check(500);
+        this2.show_check(500);        
         $('#'+this2.el).val(this2.attribute.value);
         $('#'+this2.el).removeClass('mb_dirty');
 

data/app/assets/javascripts/caboose/{my_account_edit_order.js → my_account_edit_invoice.js}

@@ -1,10 +1,10 @@
 
-var MyAccountOrderController = function(params) { this.init(params); }
+var MyAccountInvoiceController = function(params) { this.init(params); }
 
-MyAccountOrderController.prototype = {
+MyAccountInvoiceController.prototype = {
   
-  order_id: false,
-  order: false,
+  invoice_id: false,
+  invoice: false,
   authenticity_token: false,
   
   init: function(params)
@@ -20,20 +20,20 @@ MyAccountOrderController.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();
       if (after) after();
     });    
   },
   
-  refresh_order: function(after)
+  refresh_invoice: function(after)
   {
     var that = this;
     $.ajax({
-      url: '/my-account/orders/' + that.order_id + '/json',
-      success: function(order) {                 
-        that.order = order;
+      url: '/my-account/invoices/' + that.invoice_id + '/json',
+      success: function(invoice) {                 
+        that.invoice = invoice;
         if (after) after(); 
       }
     });
@@ -41,12 +41,12 @@ MyAccountOrderController.prototype = {
 
 /******************************************************************************/
       
-  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;
@@ -56,13 +56,13 @@ MyAccountOrderController.prototype = {
   {    
     var that = this;
 
-    if (that.order.line_items && that.order.line_items.length > 0)
+    if (that.invoice.line_items && that.invoice.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)
+      $.each(that.invoice.line_items, function(i, li) {  
+        if (li.invoice_package_id)
           count_packaged++;
         else if (li.variant.downloadable == true)
           count_downloadable++;
@@ -73,18 +73,18 @@ MyAccountOrderController.prototype = {
       var table = that.overview_table();
       $('#overview_table').empty().append(table).append($('<br />'));
       
-      table = $('<table/>').addClass('order').css('width', '100%');
+      table = $('<table/>').addClass('invoice').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);
+      $('#invoice_table').empty().append(table);
     }
     else
     {
       $('#overview_table').empty();
-      $('#order_table').empty();
-      $('#message').empty().html("This order is empty.");
+      $('#invoice_table').empty();
+      $('#message').empty().html("This invoice is empty.");
     }                  
   },
   
@@ -92,25 +92,25 @@ MyAccountOrderController.prototype = {
   {
     var that = this;        
     
-    var fstatus = $('<div/>').append($('<p/>').html(capitalize_first_letter(that.order.financial_status)));    
-    if (that.order.financial_status == 'pending')        
+    var fstatus = $('<div/>').append($('<p/>').html(capitalize_first_letter(that.invoice.financial_status)));    
+    if (that.invoice.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');
+    var table = $('<table/>').addClass('invoice');
     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('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($('<p/>').html(capitalize_first_letter(that.invoice.status))))
       .append($('<td/>').attr('valign', 'top').attr('id', 'financial_status' ).attr('align', 'center').append(fstatus))      
     );
     return table;  
@@ -119,7 +119,7 @@ MyAccountOrderController.prototype = {
   noneditable_customer: function()
   {
     var that = this;
-    c = that.order.customer;    
+    c = that.invoice.customer;    
     str = '';
     if (c)                                                                  
     {
@@ -138,7 +138,7 @@ MyAccountOrderController.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]');
@@ -149,12 +149,12 @@ MyAccountOrderController.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;    
   },
@@ -162,7 +162,7 @@ MyAccountOrderController.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')))
@@ -183,13 +183,13 @@ MyAccountOrderController.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: '/my-account/orders/' + that.order.id + '/shipping-address',
+      update_url: '/my-account/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 },
@@ -207,7 +207,7 @@ MyAccountOrderController.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]') + ' ';
@@ -221,7 +221,7 @@ MyAccountOrderController.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;    
   },
@@ -229,7 +229,7 @@ MyAccountOrderController.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/>')
@@ -251,13 +251,13 @@ MyAccountOrderController.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: '/my-account/orders/' + that.order.id + '/billing-address',
+      update_url: '/my-account/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 },
@@ -275,8 +275,8 @@ MyAccountOrderController.prototype = {
   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);      
+    $.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/>').append($('<th/>').attr('colspan', '5').addClass('package_header').html("Package " + (i+1) + ": " + op.shipping_method.service_name + "<br />" + op.status)));
@@ -304,8 +304,8 @@ MyAccountOrderController.prototype = {
   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);      
+    $.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/>').append($('<th/>').attr('colspan', '5').addClass('package_header').html("Unpackaged Items")));
@@ -332,8 +332,8 @@ MyAccountOrderController.prototype = {
   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);      
+    $.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/>').append($('<th/>').attr('colspan', '5').addClass('package_header').html("Downloadable Items")));
@@ -387,32 +387,32 @@ MyAccountOrderController.prototype = {
     } 
     if (li.variant.downloadable)
     {
-      div.append($('<p/>').append($('<a/>').attr('href', '/my-account/orders/' + that.order.id + '/line-items/' + li.id + '/download').html('Download')));
+      div.append($('<p/>').append($('<a/>').attr('href', '/my-account/invoices/' + that.invoice.id + '/line-items/' + li.id + '/download').html('Download')));
     }
     
     return div;    
   },
       
-  // Show the order summary
+  // Show the invoice 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)
+    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.invoice.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.invoice.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.invoice.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.invoice.handling ))));
+    if (that.invoice.discounts)
     {
-      $.each(that.order.discounts, function(i, d) {
+      $.each(that.invoice.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))));            
+    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.invoice.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.invoice.total))));            
   },
 
   /****************************************************************************/
@@ -430,7 +430,7 @@ MyAccountOrderController.prototype = {
     
     $('#payment_message').empty().html("<p class='loading'>Getting payment form...</p>");
     $.ajax({
-      url: '/my-account/orders/' + that.order.id + '/payment-form',
+      url: '/my-account/invoices/' + that.invoice.id + '/payment-form',
       type: 'get',
       success: function(html) {        
         form.empty().append(html);
@@ -468,7 +468,7 @@ MyAccountOrderController.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;
     });