caboose-cms 0.8.24 → 0.8.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4d98086ca3a0c8138bbc8e6d05e741c5e583eee
-  data.tar.gz: 94ea06669bf9ffa4ddb80718858a9f96bdd91965
+  metadata.gz: 1f96a208dfdb1074c18a5b5f0c845276dd631798
+  data.tar.gz: 60d73ecbb0e26bc549c8131c1cde2a01334dba57
 SHA512:
-  metadata.gz: 172ae4c4a6e18388c7469e3a78f805aa7bdcb58ffac2b58c0f18c2d999474d2f15693df5f9d20d77ef3251eae864f19d5d9a47f1f1129516b81638993e6eb3af
-  data.tar.gz: 038676696d6bd3dbfa7de7de2e516979a24fb74059d20c40a5540fa91e2f7a1bfcfe035abe284f5b4fdeffcc061d54158d730b15a871b317543d07625a901e81
+  metadata.gz: bf1a6499f62a952971b09ebd6fe6c4eb64c29b165885bed861abb516e78af0a1dc56e5bbdd3d0a3fc7fe9305dd0b756e5eb9965f7c4e00deffc1920bd78e8272
+  data.tar.gz: 949c6f709388a4190ce2583c0ef432e63f40f0621aa7e4acaef9a800c08a7417184b6aab86e696336b9679cfe01a44644de5bc9534bedcee09b960bf2b88def8

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

@@ -0,0 +1,236 @@
+ 
+var VariantChildrenController = function(params) { this.init(params); };
+
+VariantChildrenController.prototype = {
+
+  container: 'variant_children',
+  product_id: false,
+  variant_id: false,
+  variant_children: false,
+  authenticity_token: false,
+  hide_on_init: false,
+          
+  init: function(params)
+  {
+    var that = this;
+    for (var i in params)
+      that[i] = params[i]; 
+    if (that.hide_on_init)
+      that.refresh_and_hide();
+    else
+      that.refresh_and_print();
+  },
+  
+  hide: function()
+  {
+    var that = this;
+    $('#'+that.container).hide();    
+  },
+  
+  refresh_and_print: function()
+  {
+    var that = this;
+    that.refresh(function() { that.print(); });
+  },
+  
+  refresh_and_hide: function()
+  {
+    var that = this;
+    that.refresh(function() {
+      that.print();
+      $('#'+that.container).hide();
+    });
+  },
+  
+  refresh: function(after)
+  {
+    var that = this;
+    $.ajax({
+      url: '/admin/products/' + that.product_id + '/variants/' + that.variant_id + '/children/json',
+      type: 'get',
+      success: function(resp) {
+        that.variant_children = resp.models;
+        if (after) after();        
+      }       
+    });    
+  },
+  
+  print: function()
+  {
+    var that = this;
+    $('#'+that.container).show();
+    
+    $('#'+that.container).empty()
+      .append($('<div/>').attr('id', 'new_vc_container')
+        .append($('<p/>')
+          .append($('<a/>').attr('href', '#').append('Add Variant to Bundle').click(function(e) { e.preventDefault(); that.add_variant_child(); }))
+        )
+      );
+        
+    if (!that.variant_children || that.variant_children.length == 0)
+    {
+      $('#'+that.container)
+        .append($('<div/>').attr('id', 'vc_message'))
+        .append($('<p/>')
+          .append("This variant doesn't have any child variants.")          
+        );
+    }
+    else
+    {    
+      var div = $('<div/>');
+      var tbody = $('<tbody/>')
+        .append($('<tr/>')
+          .append($('<th/>').append('Item'))        
+          .append($('<th/>').append('Qty'))
+          .append($('<th/>').append('&nbsp;'))
+        );
+      $.each(that.variant_children, function(i, vc) {
+        if (vc.variant)
+        {
+          tbody.append($('<tr/>')
+            .append($('<td/>').append(vc.variant.full_title))        
+            .append($('<td/>').append($('<div/>').attr('id', 'variantchild_' + vc.id + '_quantity')))
+            .append($('<td/>').attr('id', 'vc_' + vc.id + '_message').append($('<a/>').attr('href', '#').append('Remove').data('vc_id', vc.id).click(function(e) { e.preventDefault(); that.delete_variant_child($(this).data('vc_id')); })))
+          );
+        }
+      }); 
+      div.append($('<table/>').addClass('data').append(tbody)).append($('<br/>'));
+      $('#'+that.container).append(div);        
+    }        
+    $('#'+that.container).show();
+    
+    $.each(that.variant_children, function(i, vc) {
+      new ModelBinder({
+        name: 'VariantChild',
+        id: vc.id,
+        update_url: '/admin/products/' + that.product_id + '/variants/' + that.variant_id + '/children/' + vc.id,
+        authenticity_token: '<%= form_authenticity_token %>',
+        attributes: [          
+          { name: 'quantity', nice_name: 'Qty', type: 'text', align: 'right', width: 60, value: vc.quantity, fixed_placeholder: false }                
+        ]
+      });
+    });    
+  },
+  
+  add_variant_child: function(variant_id)
+  {
+    var that = this;
+    if (!variant_id)
+    {      
+      $('#new_vc_container').empty()
+        .append($('<div/>').addClass('note warning')          
+          .append($('<p/>').append($('<input/>').attr('type', 'text').attr('placeholder', 'Product Name').keyup(function() { that.show_products($(this).val()); })))
+          .append($('<div/>').attr('id', 'products'))
+          .append($('<div/>').attr('id', 'new_vc_message'))
+          .append($('<p/>').append($('<input/>').attr('type', 'button').val('Cancel').click(function(e) { that.print(); })))
+        );        
+      return;
+    }
+    $('#new_vc_message').html("<p class='loading'>Adding variant...</p>");
+    $.ajax({
+      url: '/admin/products/' + that.product_id + '/variants/' + that.variant_id + '/children',
+      type: 'post',
+      data: { variant_id: variant_id },
+      success: function(resp) {
+        if (resp.error) $('#new_vc_message').html("<p class='note error'>" + resp.error + "</p>");
+        if (resp.success) that.refresh_and_print();        
+      }
+    });    
+  },
+  
+  delete_variant_child: function(vc_id)
+  {
+    var that = this;    
+    $('#vc_' + vc_id + '_message').html("<p class='loading_small'>...</p>");
+    $.ajax({
+      url: '/admin/products/' + that.product_id + '/variants/' + that.variant_id + '/children/' + vc_id,
+      type: 'delete',      
+      success: function(resp) {
+        if (resp.error) $('#vc_' + vc_id + '_message').html("<p class='note error'>" + resp.error + "</p>");
+        if (resp.success) that.refresh_and_print();        
+      }
+    });    
+  },
+  
+  show_products: function(title)
+  {
+    var that = this;
+    $.ajax({
+      url: '/admin/products/stubs',
+      type: 'get',
+      data: { title: title },
+      success: function(products) {
+        if (products && products.length > 0)
+        {
+          var ul = $('<ul/>');
+          $.each(products, function(i, p) {
+            ul.append($('<li/>')
+              .attr('id', 'product_id_' + p.id)
+              .data('product_id', p.id)
+              .data('variant_id', p.variant_id)            
+              .append($('<a/>').attr('href', '#').html(p.title).click(function(e) {
+                e.preventDefault();
+                
+                var li = $(e.target).parent();
+                var product_id = li.data('product_id');
+                var variant_id = li.data('variant_id');              
+                
+                if (variant_id && variant_id != null)
+                  that.add_variant_child(variant_id);
+                else              
+                  that.show_variants(li, product_id);                                        
+              }))
+            );
+          });
+          $('#products').empty().append(ul);
+        }
+        else
+        {
+          $('#products').empty().append($('<p/>').html('No products met your search.'));
+        }        
+      } 
+    });
+  },
+
+  show_variants: function(li, product_id)
+  {
+    var that = this;
+    if (that.open_product_id && that.open_product_id == product_id)
+    {
+      $('#product_id_' + that.open_product_id).find('ul').remove();
+      that.open_product_id = false;
+      return;
+    }
+    if (that.open_product_id)  
+    {
+      $('#product_id_' + that.open_product_id).find('ul').remove();
+      that.open_product_id = false;
+    }  
+    that.open_product_id = product_id;
+    $.ajax({
+      url: '/admin/products/' + product_id + '/variants/json',
+      type: 'get',        
+      success: function(resp) {
+        var ul = $('<ul/>');
+        $.each(resp.models, function(i, v) {
+          var name = [];
+          if (v.option1) name.push(v.option1);
+          if (v.option2) name.push(v.option2);
+          if (v.option3) name.push(v.option3);
+          name = name.join(' / ');
+          if (!name || name.length == 0) name = 'Default';
+          ul.append($('<li/>')
+            .data('variant_id', v.id)          
+            .append($('<a/>').attr('href', '#').html(name).click(function(e) {
+              e.preventDefault();
+              variant_id = $(e.target).parent().data('variant_id');
+              that.add_variant_child(variant_id);              
+            }))
+          );
+        });
+        li.append(ul);        
+      }
+    });  
+  }
+  
+};

data/app/controllers/caboose/line_items_controller.rb

@@ -134,7 +134,7 @@ module Caboose
         vars << "%#{str}%"
       end      
       where = where.join(' and ')
-      query = ["select id, title, option1, option2, option3 from store_products where #{where} invoice by title limit 20"]
+      query = ["select id, title, option1, option2, option3 from store_products where #{where} order by title limit 20"]
       vars.each{ |v| query << v }
       
       rows = ActiveRecord::Base.connection.select_rows(ActiveRecord::Base.send(:sanitize_sql_array, query))

data/app/controllers/caboose/products_controller.rb

@@ -7,7 +7,35 @@ module Caboose
   end
   
   class ProductsController < Caboose::ApplicationController
-       
+           
+    # @route GET /admin/products/stubs
+    def admin_stubs      
+      title = params[:title].strip.downcase.split(' ')
+      render :json => [] and return if title.length == 0
+      
+      where = ["site_id = ?"]      
+      vars = [@site.id]
+      title.each do |str|
+        where << 'lower(title) like ?'
+        vars << "%#{str}%"
+      end      
+      where = where.join(' and ')
+      query = ["select id, title, option1, option2, option3 from store_products where #{where} order by title limit 20"]
+      vars.each{ |v| query << v }
+      
+      rows = ActiveRecord::Base.connection.select_rows(ActiveRecord::Base.send(:sanitize_sql_array, query))
+      arr = rows.collect do |row|
+        has_options = row[2] || row[3] || row[4] ? true : false
+        variant_id = nil
+        if !has_options
+          v = Variant.where(:product_id => row[0].to_i, :status => 'Active').first
+          variant_id = v.id if v
+        end          
+        { :id => row[0], :title => row[1], :variant_id => variant_id }
+      end        
+      render :json => arr
+    end
+    
     # @route GET /products/:id/info
     def info
       p = Product.find(params[:id])
@@ -433,15 +461,26 @@ module Caboose
       
       resp = Caboose::StdClass.new
       name = params[:name]
+      pd = @site.product_default
       
       if name.length == 0
         resp.error = "The title cannot be empty."
-      else
+      else                
         p = Product.new(:site_id => @site.id, :title => name)
         mc = MediaCategory.where(:site_id => @site.id).where("parent_id IS NULL").exists? ? MediaCategory.where(:site_id => @site.id).where("parent_id IS NULL").last : MediaCategory.create(:name => "Media", :site_id => @site.id)
         pc = MediaCategory.where(:name => "Products", :site_id => @site.id).exists? ? MediaCategory.where(:name => "Products", :site_id => @site.id).last : MediaCategory.create(:name => "Products", :site_id => @site.id, :parent_id => mc.id)
         c = MediaCategory.create(:site_id => @site.id, :name => name, :parent_id => pc.id)
         p.media_category_id = c.id
+                        
+        p.vendor_id       = pd.vendor_id      
+        p.option1         = pd.option1        
+        p.option2         = pd.option2        
+        p.option3         = pd.option3
+        p.status          = pd.status
+        p.on_sale         = pd.on_sale
+        p.allow_gift_wrap = pd.allow_gift_wrap
+        p.gift_wrap_price = pd.gift_wrap_price
+        
         p.save
         resp.redirect = "/admin/products/#{p.id}/general"
       end

data/app/controllers/caboose/store_controller.rb

@@ -3,47 +3,66 @@ require 'csv'
 module Caboose
   class StoreController < ApplicationController
     layout 'caboose/admin'
-    
+                  
     # @route GET /admin/store/json
     def admin_json_single
       return if !user_is_allowed('invoices', 'view')
       sc = @site.store_config
-      render :json => sc      
+      render :json => sc
     end
     
     # @route GET /admin/store
     def admin_edit_general
       return if !user_is_allowed('sites', 'edit')
       @store_config = @site.store_config
-      @store_config = StoreConfig.create(:site_id => @site.id) if @store_config.nil?      
+      @store_config = StoreConfig.create(:site_id => @site.id) if @store_config.nil?
+      @product_default = @site.product_default
+      @variant_default = @site.variant_default            
+    end
+    
+    # @route GET /admin/store/defaults
+    def admin_edit_defaults
+      return if !user_is_allowed('sites', 'edit')
+      @store_config = @site.store_config
+      @store_config = StoreConfig.create(:site_id => @site.id) if @store_config.nil?
+      @product_default = @site.product_default
+      @variant_default = @site.variant_default            
     end
     
     # @route GET /admin/store/payment
     def admin_edit_payment
       return if !user_is_allowed('sites', 'edit')
       @store_config = @site.store_config
-      @store_config = StoreConfig.create(:site_id => @site.id) if @store_config.nil?      
+      @store_config = StoreConfig.create(:site_id => @site.id) if @store_config.nil?
+      @product_default = @site.product_default
+      @variant_default = @site.variant_default
     end
     
     # @route GET /admin/store/shipping
     def admin_edit_shipping
       return if !user_is_allowed('sites', 'edit')
       @store_config = @site.store_config
-      @store_config = StoreConfig.create(:site_id => @site.id) if @store_config.nil?      
+      @store_config = StoreConfig.create(:site_id => @site.id) if @store_config.nil?
+      @product_default = @site.product_default
+      @variant_default = @site.variant_default
     end
     
     # @route GET /admin/store/tax
     def admin_edit_tax
       return if !user_is_allowed('sites', 'edit')
       @store_config = @site.store_config
-      @store_config = StoreConfig.create(:site_id => @site.id) if @store_config.nil?      
+      @store_config = StoreConfig.create(:site_id => @site.id) if @store_config.nil?
+      @product_default = @site.product_default
+      @variant_default = @site.variant_default
     end
     
     # @route GET /admin/store/packages
     def admin_edit_packages
       return if !user_is_allowed('sites', 'edit')
       @store_config = @site.store_config
-      @store_config = StoreConfig.create(:site_id => @site.id) if @store_config.nil?      
+      @store_config = StoreConfig.create(:site_id => @site.id) if @store_config.nil?
+      @product_default = @site.product_default
+      @variant_default = @site.variant_default
     end
     
     # @route PUT /admin/store
@@ -53,6 +72,8 @@ module Caboose
       resp = StdClass.new     
       sc = @site.store_config
       sc = StoreConfig.create(:site_id => @site.id) if sc.nil?
+      pd = @site.product_default
+      vd = @site.variant_default
           
       save = true
       params.each do |name,value|
@@ -105,10 +126,45 @@ module Caboose
           when 'download_url_expires_in'          then sc.download_url_expires_in          = value            
           when 'starting_invoice_number'          then sc.starting_invoice_number          = value
           when 'default_payment_terms'            then sc.default_payment_terms            = value
+                                
+          when 'product_vendor_id'                      then pd.vendor_id                      = value   
+          when 'product_option1'                        then pd.option1                        = value
+          when 'product_option2'                        then pd.option2                        = value
+          when 'product_option3'                        then pd.option3                        = value
+          when 'product_status'                         then pd.status                         = value
+          when 'product_on_sale'                        then pd.on_sale                        = value
+          when 'product_allow_gift_wrap'                then pd.allow_gift_wrap                = value
+          when 'product_gift_wrap_price'                then pd.gift_wrap_price                = value
+            
+          when 'variant_site_id'                        then vd.site_id                        = value                    
+          when 'variant_cost'                           then vd.cost                           = value
+          when 'variant_price'                          then vd.price                          = value
+          when 'variant_available'                      then vd.available                      = value
+          when 'variant_quantity_in_stock'              then vd.quantity_in_stock              = value
+          when 'variant_ignore_quantity'                then vd.ignore_quantity                = value
+          when 'variant_allow_backorder'                then vd.allow_backorder                = value
+          when 'variant_weight'                         then vd.weight                         = value
+          when 'variant_length'                         then vd.length                         = value
+          when 'variant_width'                          then vd.width                          = value
+          when 'variant_height'                         then vd.height                         = value
+          when 'variant_volume'                         then vd.volume                         = value
+          when 'variant_cylinder'                       then vd.cylinder                       = value
+          when 'variant_requires_shipping'              then vd.requires_shipping              = value
+          when 'variant_taxable'                        then vd.taxable                        = value
+          when 'variant_shipping_unit_value'            then vd.shipping_unit_value            = value
+          when 'variant_flat_rate_shipping'             then vd.flat_rate_shipping             = value
+          when 'variant_flat_rate_shipping_package_id'  then vd.flat_rate_shipping_package_id  = value
+          when 'variant_flat_rate_shipping_method_id'   then vd.flat_rate_shipping_method_id   = value
+          when 'variant_flat_rate_shipping_single'      then vd.flat_rate_shipping_single      = value
+          when 'variant_flat_rate_shipping_combined'    then vd.flat_rate_shipping_combined    = value
+          when 'variant_status'                         then vd.status                         = value
+          when 'variant_downloadable'                   then vd.downloadable                   = value
+          when 'variant_is_bundle'                      then vd.is_bundle                      = value
+      
     	  end
     	end
     	
-    	resp.success = save && sc.save
+    	resp.success = save && sc.save && pd.save && vd.save
     	render :json => resp
     end