caboose-cms 0.9.23 → 0.9.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59f9739998eaf8c55b5dc7dadf1415f48b204749
-  data.tar.gz: 32ed06ef7e5f79a0011a3783bd8be9759fc6f79f
+  metadata.gz: 239f83b3bb1cc285a84046bf35ceb6bc8fefc781
+  data.tar.gz: f298f72d54aff977624e70e0bd86831732ca3877
 SHA512:
-  metadata.gz: 39e4656764424870785429abe0c26cf7fce8c8d38d4992e0a0785d77bd8cbf013e15c7dc4df36b29af5a2678037a98a80191eef6622004ae4e3894b17fb114c7
-  data.tar.gz: 82cce5d558e8894faa429a9a0104b8d2f04000c090545d78c4455770eac656885ac4f3e3dfd9b73e20310977ae24c7614a9f85b2d8c195b18d4fd9f2546e7e62
+  metadata.gz: dd27c86158c9aa067c4d7633740f91f71a8c782c1cc83ddf02dc271b01f207860a67185e0f548deb8d9b7de835b6721eb92e0cf99cbb4d10a965723957a2a9db
+  data.tar.gz: 95dc6d8d51f02e062c6b9f487f110057d7ef71bcfaa7c5f6ed6f3864687a5de9f429f3e092b33026519d9f0158ad372542cd74bd9339f0a75858d74801046f0e

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

@@ -104,10 +104,10 @@ Caboose.Store.Modules.Cart = (function() {
             self.render_item_count(response.item_count);
             if (self.$add_to_cart.length) self.$add_to_cart.trigger('added');
             
-            if (!self.$add_to_cart.find('.message').length) {
+            if (!self.$add_to_cart.find('.message').length) {                            
               self.$add_to_cart
                 .append($('<div/>').hide().addClass('message')
-                  .append($('<p/>').text('Successfully added to cart'))
+                  .append($('<p/>').text(response.quantity_message ? response.quantity_message : 'Successfully added to cart'))
                   .append($('<p/>')
                     .append($('<a/>').attr('href', '/cart').html('View cart')).append(' | ')
                     .append($('<a/>').attr('href', '/checkout').html('Continue to checkout'))
@@ -120,8 +120,16 @@ Caboose.Store.Modules.Cart = (function() {
               //  self.$add_to_cart.find('.message').fadeOut(function() { $(this).remove() });
               //}, 5000);
             }
-          } else {
-            alert(response.errors[0]);
+          } else {                        
+            if (!self.$add_to_cart.find('.message').length) {                            
+              self.$add_to_cart
+                .append($('<div/>').hide().addClass('note error')
+                  .append($('<p/>').text(resp.error ? resp.error : (resp.errors ? resp.errors[0] : "Error adding to cart")))
+                  .append($('<p/>').append($('<a/>').attr('href', '/cart').html('View cart')))                                      
+                );                
+              self.$add_to_cart.find('.message').fadeIn();              
+            }            
+            //alert(response.errors[0]);
           }
         }
       });

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

@@ -927,7 +927,29 @@ IndexTable.prototype = {
           async: false          
         });
       }
-    });        
+    });
+      
+    //var arr = [];
+    //$.each(this.new_model_fields, function(i, f) {
+    //  if (f.options_url && !f.options)
+    //  {
+    //    console.log("Testing1");
+    //    arr.push($.ajax({
+    //      url: f.options_url,
+    //      type: 'get'                              
+    //    }));
+    //  }
+    //});
+    //if (arr.length > 0)
+    //{
+    //  console.log("Testing");
+    //  that.show_message($('<p/>').addClass('loading').html("Getting options..."));
+    //  $.when.apply(null, arr).done(function(resp) {
+    //    console.log(resp);                                      
+    //    //that.new_form();          
+    //  });
+    //  return;
+    //}
     
     var form = $('<form/>').attr('id', 'new_form')
       .append($('<input/>').attr('type', 'hidden').attr('name', 'authenticity_token').val(that.form_authenticity_token));

data/app/controllers/caboose/cart_controller.rb

@@ -38,16 +38,46 @@ module Caboose
     end
     
     # @route POST /cart
-    def add      
+    def add
+      resp = StdClass.new
+      
       v = Variant.find(params[:variant_id])
       qty = params[:quantity] ? params[:quantity].to_i : 1
+      if @invoice.line_items.exists?(:variant_id => v.id)
+        li = @invoice.line_items.find_by_variant_id(v.id)        
+        qty = li.quantity + qty
+      end
+
+      # Check the variant limits
+      vl = VariantLimit.where(:variant_id => v.id, :user_id => @logged_in_user.id).first
+      vl = VariantLimit.where(:variant_id => v.id, :user_id => User.logged_out_user_id(@site.id)).first if vl.nil?      
+      if vl && vl.no_purchases_allowed
+        resp.error = "You don't have permission to purchase this item."
+        resp.error << "You may have different purchase permissions if you <a href='/login'>login</a>." if !logged_in?        
+        render :json => resp
+        return
+      end
+      qty2 = logged_in? && vl && vl.current_value ? qty + vl.current_value : qty 
+      if vl && !vl.qty_within_range(qty2)
+        resp.quantity_message = vl.quantity_message
+        if !logged_in?                  
+          resp.quantity_message << "You may have different purchase permissions if you <a href='/login'>login</a>." if !logged_in?                
+          if vl.qty_too_low(qty)        then qty = vl.min_quantity
+          elsif vl.qty_too_high(qty)    then qty = vl.max_quantity
+          end
+        else
+          if vl.qty_too_low(qty)
+            qty = vl.min_quantity
+            resp.quantity_message = "You must purchase at least #{vl.min_quantity} of this item, your cart has been updated."
+          elsif vl.qty_too_high(qty2)
+            qty = vl.max_quantity - vl.current_value
+            resp.quantity_message = "You can only purchase #{vl.max_quantity} of this item, your cart has been updated."
+          end
+        end
+      end
       
-      resp = StdClass.new
-            
       if @invoice.line_items.exists?(:variant_id => v.id)
         li = @invoice.line_items.find_by_variant_id(v.id)
-        li.quantity += qty
-        li.subtotal = li.unit_price * li.quantity
         InvoiceLog.create(
           :invoice_id     => @invoice.id,
           :line_item_id   => li.id,
@@ -55,11 +85,14 @@ module Caboose
           :date_logged    => DateTime.now.utc,
           :invoice_action => InvoiceLog::ACTION_LINE_ITEM_UPDATED,
           :field          => 'quantity',
-          :old_value      => li.quantity - qty,
-          :new_value      => li.quantity
+          :old_value      => li.quantity,
+          :new_value      => qty
         )
+        li.quantity = qty
+        li.subtotal = li.unit_price * qty
+        li.save
       else
-        unit_price = v.clearance && v.clearance_price ? v.clearance_price : (v.on_sale? ? v.sale_price : v.price)
+        unit_price = v.clearance && v.clearance_price ? v.clearance_price : (v.on_sale? ? v.sale_price : v.price)        
         li = LineItem.create(
           :invoice_id   => @invoice.id,
           :variant_id => v.id,
@@ -105,7 +138,35 @@ module Caboose
         end
         case name
           when 'quantity'    then
-            if value.to_i != li.quantity
+
+            value = value.to_i
+            qty = value
+
+            # Check the variant limits
+            vl = VariantLimit.where(:variant_id => li.variant_id, :user_id => @logged_in_user.id).first
+            vl = VariantLimit.where(:variant_id => li.variant_id, :user_id => User.logged_out_user_id(@site.id)).first if vl.nil?      
+            if vl && vl.no_purchases_allowed
+              resp.error = "You don't have permission to purchase this item."
+              resp.error << "You may have different purchase permissions if you <a href='/login'>login</a>." if !logged_in?        
+              render :json => resp
+              return
+            end
+            qty2 = logged_in? && vl && vl.current_value ? qty + vl.current_value : qty 
+            if vl && !vl.qty_within_range(qty2)
+              resp.quantity_message = vl.quantity_message
+              if !logged_in?                  
+                resp.quantity_message << "You may have different purchase permissions if you <a href='/login'>login</a>." if !logged_in?                
+                if vl.qty_too_low(qty)        then qty = vl.min_quantity
+                elsif vl.qty_too_high(qty)    then qty = vl.max_quantity
+                end
+              else
+                if vl.qty_too_low(qty)        then qty = (qty == 0 ? 0 : vl.min_quantity)
+                elsif vl.qty_too_high(qty2)   then qty = vl.max_quantity - vl.current_value
+                end
+              end
+            end
+
+            if qty != li.quantity
               op = li.invoice_package
               if op
                 op.shipping_method_id = nil
@@ -118,7 +179,7 @@ module Caboose
                 li.invoice.calculate        
               end
             end
-            li.quantity = value.to_i
+            li.quantity = qty
             if li.quantity == 0
               li.destroy
               InvoiceLog.create(

data/app/controllers/caboose/checkout_controller.rb

@@ -211,9 +211,13 @@ module Caboose
       # Make sure all the variants still exist      
       @invoice.line_items.each do |li|
         v = Variant.where(:id => li.variant_id).first
+        vl = VariantLimit.where(:variant_id => v.id, :user_id => @invoice.customer_id).first
         if v.nil? || v.status == 'Deleted'
           render :json => { :error => 'One or more of the products you are purchasing are no longer available.' }
           return
+        elsif !vl.qty_within_range( vl.current_value + li.quantity )
+          render :json => { :error => 'You have exceeded the limit you are allowed to purchase.' }
+          return
         end
       end
 
@@ -262,6 +266,15 @@ module Caboose
       
       @invoice.status = Invoice::STATUS_PENDING
       @invoice.invoice_number = @site.store_config.next_invoice_number
+
+      # Update variant limits to reflect this purchase
+      @invoice.line_items.each do |li|
+        vl = VariantLimit.where(:user_id => @invoice.customer_id, :variant_id => li.variant_id).first
+        if vl
+          vl.current_value += li.quantity
+          vl.save
+        end
+      end
       
       # Send out emails
       begin

data/app/controllers/caboose/products_controller.rb

@@ -71,7 +71,7 @@ module Caboose
           
         elsif params[:id].to_i > 0 && Product.exists?(params[:id])
           @product = Product.find(params[:id])
-          render 'product/not_available' and return if @product.status == 'Inactive'
+          render 'product/not_available' and return if @product.status == 'Inactive' || @product.site_id != @site.id
           
           @category       = @product.categories.first
           @review         = Review.new

data/app/controllers/caboose/variant_limits_controller.rb

@@ -0,0 +1,95 @@
+module Caboose
+  class VariantLimitsController < ApplicationController
+    layout 'caboose/admin'
+
+    # @route GET /admin/variant-limits/json
+    def admin_json 
+      render :json => false and return if !user_is_allowed_to 'view', 'variantlimits'
+      pager = Caboose::Pager.new(params, {
+        'variant_id' => '',
+        'user_id' => params[:user_id]
+      },
+      {
+        'model' => 'Caboose::VariantLimit',
+        'sort'  => 'variant_id',
+        'desc'  => 'false',
+        'base_url' => '/admin/variant-limits',
+        'items_per_page' => 100
+      })
+      render :json => {
+        :pager => pager,
+        :models => pager.items.as_json(:include => [:variant])
+      } 
+    end
+
+    # @route GET /admin/variant-limits/:id/json
+    def admin_json_single
+      render :json => false and return if !user_is_allowed_to 'edit', 'variantlimits'
+      variantlimit = VariantLimit.find(params[:id])
+      render :json => variantlimit.as_json(:include => [:variant])
+    end
+
+    # @route POST /admin/variant-limits
+    def admin_add
+      return unless (user_is_allowed_to 'edit', 'variantlimits')
+      resp = Caboose::StdClass.new
+      if VariantLimit.where(:user_id => params[:user_id], :variant_id => params[:variant_id]).exists?
+        resp.error = 'That variant is already added to this user.'
+      else
+        c = VariantLimit.new
+        c.user_id = params[:user_id]
+        c.variant_id = params[:variant_id]
+        c.min_quantity = 0
+        c.max_quantity = 0
+        c.current_value = 0
+        c.save
+        resp.success = true
+      end
+      render :json => resp
+    end
+      
+    # @route PUT /admin/variant-limits/:id
+    def admin_update
+      return unless (user_is_allowed_to 'edit', 'variantlimits')
+      resp = Caboose::StdClass.new
+      variantlimit = VariantLimit.find(params[:id])
+      user = logged_in_user
+      if user
+
+        params.each do |k,v|
+          case k
+            when "user_id" then variantlimit.user_id = v
+            when "variant_id" then variantlimit.variant_id = v
+            when "min_quantity" then variantlimit.min_quantity = v
+            when "max_quantity" then variantlimit.max_quantity = v
+            when "current_value" then variantlimit.current_value = v
+          end
+        end
+
+        resp.success = variantlimit.save
+      end
+      render :json => resp
+    end
+
+    # @route GET /admin/users/:user_id/variant-limits
+    def admin_edit
+      return unless (user_is_allowed_to 'edit', 'users')
+      @edituser = Caboose::User.find(params[:user_id])
+    end
+
+    # @route_priority 1
+    # @route GET /admin/variant-limits/variant-options
+    def admin_variant_options
+      return unless user_is_allowed('edit', 'users')
+      options = [{ 'value' => nil, 'text' => 'Select a Variant' }]
+      products = Caboose::Product.where(:site_id => @site.id).all
+      products.each do |p|
+        p.variants.each do |v|
+          options << { 'value' => v.id, 'text' => v.full_title }
+        end
+      end
+      render :json => options
+    end
+
+  end
+end

data/app/controllers/caboose/vendors_controller.rb

@@ -95,6 +95,7 @@ module Caboose
     
     # @route_priority 1
     # @route GET /admin/store/vendors/options
+    # @route GET /admin/vendors/options
     def options      
       render :json => Vendor.where(:site_id => @site.id).reorder(:name).all.collect{ |v| { :value => v.id, :text => v.name }}      
     end

data/app/models/caboose/schema.rb

@@ -971,6 +971,13 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :downloadable                  , :boolean   , { :default => false }],        
         [ :is_bundle                     , :boolean   , { :default => false }]
       ],
+      Caboose::VariantLimit => [
+        [ :variant_id       , :integer ],
+        [ :user_id          , :integer ],
+        [ :min_quantity     , :integer ],
+        [ :max_quantity     , :integer ],
+        [ :current_value    , :integer ]      
+      ],
       Caboose::Vendor => [
         [ :site_id      , :integer    ],
         [ :alternate_id , :string     ],

data/app/models/caboose/variant_limit.rb

@@ -0,0 +1,50 @@
+module Caboose
+  class VariantLimit < ActiveRecord::Base
+    self.table_name = 'store_variant_limits'
+    
+    belongs_to :variant
+    belongs_to :user    
+    attr_accessible :id ,
+      :variant_id       ,
+      :user_id          ,
+      :min_quantity     ,
+      :max_quantity     ,
+      :current_value
+      
+    def quantity_message      
+      if self.min_quantity == 0 && self.max_quantity == 0
+        return "You are not allowed to purchase this item."
+      end
+      if self.max_quantity
+        if self.min_quantity && self.min_quantity > 0
+          return "You are allowed to purchase between #{self.min_quantity} and #{self.max_quantity} of this item."
+        else
+          return "You are allowed to purchase up to #{self.max_quantity} of this item."
+        end
+      end
+      if self.min_quantity && self.min_quantity > 0
+        return "You must purchase at least #{self.min_quantity} of this item." 
+      end
+      return nil
+    end
+    
+    def no_purchases_allowed
+      return self.min_quantity == 0 && self.max_quantity == 0
+    end
+    
+    def qty_within_range(qty)
+      return false if self.min_quantity && qty < self.min_quantity
+      return false if self.max_quantity && qty > self.max_quantity
+      return true
+    end
+    
+    def qty_too_low(qty)
+      return self.min_quantity && qty < self.min_quantity
+    end
+    
+    def qty_too_high(qty)
+      return self.max_quantity && qty > self.max_quantity
+    end
+          
+  end
+end

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

@@ -85,15 +85,15 @@ tr.invoice_totals_header td { border: 0; }
 #invoice_1_instore_pickup_background { border: none; }
 #invoice_1_instore_pickup { top: 0; width: 30px; height: 30px; }
 
-.mb_container.first_name { display: block; width:  50% !important; float: left; } .mb_container.first_name input  { width: 100% !important; border-color: #b9b9b9; border-right: none; border-bottom: none; }  
-.mb_container.last_name  { display: block; width:  50% !important; }              .mb_container.last_name  input  { width: 100% !important; border-color: #b9b9b9;                     border-bottom: none; }  
-.mb_container.company    { display: block; width: 100% !important; clear:left; }  .mb_container.company    input  { width: 100% !important; border-color: #b9b9b9;                     border-bottom: none; }  
-.mb_container.address1   { display: block; width: 100% !important; }              .mb_container.address1   input  { width: 100% !important; border-color: #b9b9b9;                     border-bottom: none; }  
-.mb_container.address2   { display: block; width: 100% !important; }              .mb_container.address2   input  { width: 100% !important; border-color: #b9b9b9;                     border-bottom: none; }  
-.mb_container.city       { display: block; width:  50% !important; float: left; } .mb_container.city       input  { width: 100% !important; border-color: #b9b9b9; border-right: none; }
-.mb_container.state      { display: block; width:  25% !important; float: left; } .mb_container.state      select { width: 100% !important; border-color: #b9b9b9; border-right: none; border-left: 1px; border-bottom: 1px; border-top: 1px; height: 36px !important; font-size: 1em; }
-                                                                                  .mb_container.state      input  { width: 100% !important; border-color: #b9b9b9; border-right: none; }
-.mb_container.zip        { display: block; width:  25% !important; }              .mb_container.zip        input  { width: 100% !important; border-color: #b9b9b9; }
+.mb_container.first_name { display: block; width:  49% !important; float: left; margin-right: 2%; } .mb_container.first_name input  { width: 100% !important; border-color: #b9b9b9; margin-bottom: 10px; }  
+.mb_container.last_name  { display: block; width:  49% !important; }              .mb_container.last_name  input  { width: 100% !important; border-color: #b9b9b9;  }  
+.mb_container.company    { display: block; width: 100% !important; clear:left; margin-bottom: 10px; }  .mb_container.company    input  { width: 100% !important; border-color: #b9b9b9;   }  
+.mb_container.address1   { display: block; width: 100% !important; margin-bottom: 10px; }              .mb_container.address1   input  { width: 100% !important; border-color: #b9b9b9;             }  
+.mb_container.address2   { display: block; width: 100% !important;  margin-bottom: 10px; }              .mb_container.address2   input  { width: 100% !important; border-color: #b9b9b9;           }  
+.mb_container.city       { display: block; width:  48% !important; float: left; margin-right: 2%; margin-bottom: 10px; } .mb_container.city       input  { width: 100% !important; border-color: #b9b9b9; }
+.mb_container.state      { display: block; width:  23% !important; float: left; margin-right: 2%; margin-bottom: 10px; } .mb_container.state      select { width: 100% !important; border-color: #b9b9b9;  border-left: 1px; border-bottom: 1px; border-top: 1px; height: 36px !important; font-size: 1em; }
+.mb_container.state      input  { width: 100% !important; border-color: #b9b9b9;  }
+.mb_container.zip        { display: block; width:  25% !important; }  .mb_container.zip input  { width: 100% !important; border-color: #b9b9b9; }
 
 #gift_cards_container p { float: right; margin-bottom: 0 !important; }
 #gift_cards_container input[type="text"]   { margin-top: 0px !important; margin-right: 10px !important; display: block; float: right; }

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

@@ -1,7 +1,10 @@
+
+<div id="checkout-thanks-wrapper" style="max-width:1000px;margin:0 auto;padding:20px 2%;">
 <h3>All Finished!</h3>
 <p>Thank you for your order! Your order has been submitted.</p>
 <p>Please allow up to 48 hours for your order to be processed.  Orders are processed during normal business hours Monday through Friday.</p>
 
+
 <% if @last_invoice.has_downloadable_items? %>
 	<% sc = Caboose::StoreConfig.where(:site_id => @site.id).last %>
 	<% instr = (sc && !sc.download_instructions.blank?) ? sc.download_instructions : "Your order contained downloadable items. Download your items with the links below:" %>
@@ -15,7 +18,10 @@
   </ul>   
 <% end %>
 
-<p><a href="/">Continue Shopping</a></p>
+<br />
+<p><a href="/products" class="btn">Continue Shopping</a></p>
+
+</div>
 
 
 <%= content_for :caboose_css do %>

data/app/views/caboose/invoices_mailer/fulfillment_new_invoice.html.erb

@@ -3,7 +3,7 @@
 <!-- <h1>Thank you for your invoice!</h1> -->
 <h1>New Order Received</h1>
 
-<h4><a href="<%= @invoice.site.store_config.authnet_relay_domain %>/admin/invoices/<%= @invoice.id %>" target="_blank" title="View Order">View Order</a></h4>
+<h4><a href="http://<%= @invoice.site.primary_domain.domain %>/admin/invoices/<%= @invoice.id %>" target="_blank" title="View Order">View Order</a></h4>
 
 <h2>Order Details</h2>
 

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

@@ -2,10 +2,10 @@
 <h1>Products</h1>
 
 <p style="margin: 12px 0">
-  <a href="/admin/vendors/new">New Vendor</a><span style="margin: 0 3px">|</span>  
+  <a href="/admin/store/vendors/new">New Vendor</a><span style="margin: 0 3px">|</span>  
   <a href="/admin/products/sort">Sort Products</a><span style="margin: 0 3px">|</span>
-  <a href="/admin/products/alternate-ids">Alternate IDs</a><span style="margin: 0 3px">|</span>
-  <a href='#'>Search Form</a>
+  <a href="/admin/products/alternate-ids">Alternate IDs</a><!-- <span style="margin: 0 3px">|</span> -->
+<!--   <a href='#'>Search Form</a> -->
 </p>
 
 <form action="/admin/products" method="get" id="search_form" style="margin: 0 0 12px">

data/app/views/caboose/users/_admin_header.html.erb

@@ -13,11 +13,16 @@ tabs = {
   'Login Logs'      => "/admin/login-logs?user_id=#{@edituser.id}",
   'Password'        => "/admin/users/#{@edituser.id}/password",
   'Roles'           => "/admin/users/#{@edituser.id}/roles",
-  'Subscriptions'   => "/admin/users/#{@edituser.id}/subscriptions",
   'Delete'          => "/admin/users/#{@edituser.id}/delete"  
 }
 if @site.use_store
 	arr = tabs.to_a.insert(1, ['Payment Method', "/admin/users/#{@edituser.id}/payment-method"])
+	tabs = Hash[arr]
+	arr = tabs.to_a.insert(5, ['Variant Limits', "/admin/users/#{@edituser.id}/variant-limits#user_id=#{@edituser.id}"])
+  tabs = Hash[arr]
+end
+if Caboose::Subscription.where(:site_id => @site.id).exists?
+	arr = tabs.to_a.insert(6, ['Subscriptions', "/admin/users/#{@edituser.id}/subscriptions"])
   tabs = Hash[arr]
 end
 tabs = Caboose.plugin_hook('admin_user_tabs', tabs, @edituser, @site)

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

@@ -0,0 +1,36 @@
+<%= render :partial => 'caboose/users/admin_header' %> 
+
+<div id='variant-limits'></div>
+
+<%= render :partial => 'caboose/users/admin_footer' %> 
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag 'caboose/model/all' %>
+<script type='text/javascript'>
+
+$(document).ready(function() {
+  var that = this;
+  var table = new IndexTable({    
+    form_authenticity_token: '<%= form_authenticity_token %>',
+    container: 'variant-limits',
+    base_url: '/admin/variant-limits',
+    allow_bulk_edit: false,
+    allow_bulk_delete: false,
+    allow_duplicate: false,
+    allow_advanced_edit: false,
+    allow_import: false,
+    fields: [ 
+      { show: true  , editable: true, bulk_edit: false, name: 'variant_id'        , nice_name: 'Product Variant'        , sort: 'variant_id'        , type: 'select'   , value: function(r) { return r.variant_id }, text: function(r) { return (r.variant ? (r.variant.alternate_id ? r.variant.alternate_id : r.variant.id) : '') }, width: 150, options_url: '/admin/variant-limits/variant-options' },
+      { show: true  , editable: true, bulk_edit: false, name: 'min_quantity'        , nice_name: 'Min Qty'        , sort: 'min_quantity'        , type: 'text'   , value: function(r) { return r.min_quantity }, width: 150 },
+      { show: true  , editable: true, bulk_edit: false, name: 'max_quantity'        , nice_name: 'Max Qty'        , sort: 'max_quantity'        , type: 'text'   , value: function(r) { return (r.max_quantity == null || r.max_quantity == '' ? 0 : r.max_quantity) }, width: 150 },
+      { show: true  , editable: false, bulk_edit: false, name: 'current_value'        , nice_name: 'Purchased'        , sort: 'current_value'        , type: 'text'   , value: function(r) { return (r.current_value ) }, width: 150 }
+    ],
+    new_model_text: 'New Variant Limit',
+    new_model_fields: [
+      { name: 'variant_id', nice_name: 'Product', type: 'select', width: 400, options_url: '/admin/variant-limits/variant-options' },
+      { name: 'user_id', nice_name: 'User', type: 'hidden', width: 400, value: <%= @edituser.id %> }
+    ]    
+  });
+});
+</script>
+<% end %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.23'
+  VERSION = '0.9.24'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.23
+  version: 0.9.24
 platform: ruby
 authors:
 - William Barry
@@ -828,6 +828,7 @@ files:
 - app/controllers/caboose/subscriptions_controller.rb
 - app/controllers/caboose/users_controller.rb
 - app/controllers/caboose/variant_children_controller.rb
+- app/controllers/caboose/variant_limits_controller.rb
 - app/controllers/caboose/variants_controller.rb
 - app/controllers/caboose/vendors_controller.rb
 - app/helpers/caboose/application_helper.rb
@@ -953,6 +954,7 @@ files:
 - app/models/caboose/variant.rb
 - app/models/caboose/variant_child.rb
 - app/models/caboose/variant_default.rb
+- app/models/caboose/variant_limit.rb
 - app/models/caboose/vendor.rb
 - app/models/caboose/wish_list.rb
 - app/models/caboose/wish_list_line_item.rb
@@ -1237,6 +1239,7 @@ files:
 - app/views/caboose/users/admin_index.html.erb
 - app/views/caboose/users/admin_new.html.erb
 - app/views/caboose/users/admin_update_pic.html.erb
+- app/views/caboose/variant_limits/admin_edit.html.erb
 - app/views/caboose/variants/admin_edit.html.erb
 - app/views/caboose/variants/admin_edit_option1_media.html.erb
 - app/views/caboose/variants/admin_edit_option2_media.html.erb