caboose-cms 0.9.28 → 0.9.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e874f1cc3a49bfb9ca519da804aaef5c4da22b2
-  data.tar.gz: dfd0a6d5d8579bf3e507b6c695b87c971f819946
+  metadata.gz: 283e17b034bdd0cb3bc0a343d592141a4febd4aa
+  data.tar.gz: bfb91798884a5bfbab943eca89738fb9083979b3
 SHA512:
-  metadata.gz: 7d53a02acd2f30c9e96127f450dd23904c6dae8b15ae8dc3567e3fd0e403d832c6f1f674416319325e2dea4546487965962ad0f6994853cd1f04f2951e0d024a
-  data.tar.gz: 0e24809540ebf8edafed45437328a6403dc156dea7a8ef0a6bcae3fc46cb27ec4d1dbb67d9de3141f8733b90fc6ea86315e004d0f1c3d0bf76a6a324b2686a82
+  metadata.gz: 1f2a734ff80bbab2afc20c1c6982ccfc66b42491cab113ecbf1f211f951e802dc575bec807fce8c45ec8b9d544947ef60b12aa4d7e478b71bc47e660ca7f1a41
+  data.tar.gz: 4516a5ecdefbf9567ee9d3f1ac5f278d8e10f3fb4170e4586514d63abe3236f1911c64991b41ea7a231cf07b716dac003df151cf16cac4e8f37fce933e6827e1

data/app/controllers/caboose/variant_limits_controller.rb

@@ -3,6 +3,7 @@ module Caboose
     layout 'caboose/admin'
 
     # @route GET /admin/variant-limits/json
+    # @route GET /admin/users/:user_id/variant-limits/json
     def admin_json 
       render :json => false and return if !user_is_allowed_to 'view', 'variantlimits'
       pager = Caboose::Pager.new(params, {
@@ -23,6 +24,7 @@ module Caboose
     end
 
     # @route GET /admin/variant-limits/:id/json
+    # @route GET /admin/users/:user_id/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])
@@ -49,6 +51,7 @@ module Caboose
     end
       
     # @route PUT /admin/variant-limits/:id
+    # @route PUT /admin/users/:user_id/variant-limits/:id
     def admin_update
       return unless (user_is_allowed_to 'edit', 'variantlimits')
       resp = Caboose::StdClass.new
@@ -74,9 +77,16 @@ module Caboose
     end
 
     # @route GET /admin/users/:user_id/variant-limits
+    def admin_user_index
+      return unless (user_is_allowed_to 'edit', 'users')
+      @edituser = Caboose::User.find(params[:user_id])
+    end
+    
+    # @route GET /admin/users/:user_id/variant-limits/:id
     def admin_edit
       return unless (user_is_allowed_to 'edit', 'users')
       @edituser = Caboose::User.find(params[:user_id])
+      @variant_limit = Caboose::VariantLimit.find(params[:id])
     end
 
     # @route_priority 1

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

@@ -18,7 +18,7 @@ tabs = {
 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}"])
+	arr = tabs.to_a.insert(5, ['Variant Limits', "/admin/users/#{@edituser.id}/variant-limits"])
   tabs = Hash[arr]
 end
 if Caboose::Subscription.where(:site_id => @site.id).exists?

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

@@ -1,6 +1,12 @@
 <%= render :partial => 'caboose/users/admin_header' %> 
 
-<div id='variant-limits'></div>
+<h2>Edit Variant Limit</h2>
+<p><div id='variantlimit_<%= @variant_limit.id %>_variant_id'         ></div></p>
+<p><div id='variantlimit_<%= @variant_limit.id %>_min_quantity_value' ></div></p>
+<p><div id='variantlimit_<%= @variant_limit.id %>_min_quantity_func'  ></div></p>
+<p><div id='variantlimit_<%= @variant_limit.id %>_max_quantity_value' ></div></p>
+<p><div id='variantlimit_<%= @variant_limit.id %>_max_quantity_func'  ></div></p>
+<p><div id='variantlimit_<%= @variant_limit.id %>_current_value'      ></div></p>
 
 <%= render :partial => 'caboose/users/admin_footer' %> 
 
@@ -9,28 +15,20 @@
 <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 %> }
+  new ModelBinder({
+    name: 'VariantLimit',
+    id: <%= @variant_limit.id %>,
+    update_url: '/admin/variant-limits/<%= @variant_limit.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [
+      { name: 'variant_id'         , nice_name: 'Product Variant'  , type: 'select'   , value: <%= raw Caboose.json(@variant_limit.variant_id         ) %>, width: 600  , options_url: '/admin/variant-limits/variant-options' },
+      { name: 'min_quantity_value' , nice_name: 'Min Qty Value'    , type: 'text'     , value: <%= raw Caboose.json(@variant_limit.min_quantity_value ) %>, width: 600 },
+      { name: 'min_quantity_func'  , nice_name: 'Min Qty Function' , type: 'textarea' , value: <%= raw Caboose.json(@variant_limit.min_quantity_func  ) %>, width: 600 , height: 100 },
+      { name: 'max_quantity_value' , nice_name: 'Max Qty Value'    , type: 'text'     , value: <%= raw Caboose.json(@variant_limit.max_quantity_value ) %>, width: 600 },
+      { name: 'max_quantity_func'  , nice_name: 'Max Qty Function' , type: 'textarea' , value: <%= raw Caboose.json(@variant_limit.max_quantity_func  ) %>, width: 600 , height: 100 },
+      { name: 'current_value'      , nice_name: 'Purchased'        , type: 'text'     , value: <%= raw Caboose.json(@variant_limit.current_value      ) %>, width: 600 }
     ]    
-  });
+  });      
 });
 </script>
 <% end %>

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

@@ -0,0 +1,38 @@
+<%= 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/users/<%= @edituser.id %>/variant-limits',
+    allow_bulk_edit: false,
+    allow_bulk_delete: false,
+    allow_duplicate: false,
+    allow_advanced_edit: true,
+    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          }, width: 150  , text: function(r) { return (r.variant ? (r.variant.alternate_id ? r.variant.alternate_id : r.variant.id) : '') }, options_url: '/admin/variant-limits/variant-options' },
+      { show: true, editable: true , bulk_edit: false, name: 'min_quantity_value' , nice_name: 'Min Qty Value'    , sort: 'min_quantity_value' , type: 'text'     , value: function(r) { return r.min_quantity_value  }, width: 150 },
+      { show: true, editable: true , bulk_edit: false, name: 'min_quantity_func'  , nice_name: 'Min Qty Function' , sort: 'min_quantity_func'  , type: 'textarea' , value: function(r) { return r.min_quantity_func   }, width: 150 },
+      { show: true, editable: true , bulk_edit: false, name: 'max_quantity_value' , nice_name: 'Max Qty Value'    , sort: 'max_quantity_value' , type: 'text'     , value: function(r) { return r.max_quantity_value  }, width: 150 },
+      { show: true, editable: true , bulk_edit: false, name: 'max_quantity_func'  , nice_name: 'Max Qty Function' , sort: 'max_quantity_func'  , type: 'textarea' , value: function(r) { return r.max_quantity_func   }, 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.28'
+  VERSION = '0.9.29'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.28
+  version: 0.9.29
 platform: ruby
 authors:
 - William Barry
@@ -1240,6 +1240,7 @@ files:
 - 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/variant_limits/admin_user_index.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