caboose-cms 0.5.151 → 0.5.152

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDg5YjIzMDA3ZDMwMjhhMTQxMDRmYTMwNDkwNjIxNTQzYzljMzk3ZA==
+    NTZhNjlmYTMzZjhhNmZmM2RiMzM1YzI4Mzg5NGU5OTkxZWYxZDkwZg==
   data.tar.gz: !binary |-
-    ZDVmY2Q0OTE3OTI0ODJiYzI3ZGJkNTAyMWRlODhkMzZkOGQwNjhmMA==
+    NzBhZTUzN2Y5NTMzNTVjYzY0MDdkNThlOGU5NzIyNGE3MmUzNTJhNQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDA4ZGE4Y2VkZGY5NjE5OGYyMTk1YWFhN2E4OGFhYjhlYzE3MzZlMzMxYzEy
-    MzFlNjg2OTczODViYzRjMGEzMjVlYTgxNzU0YmVmYWY3MmUxZjY4ZmFhOTI3
-    NDYzMDAwZGYyOWNlN2E1MDY2Y2YzNmEwNmU4NmM1ZjAzODg4YjQ=
+    ZGNhMmJlZjIzNmJjOTI4OTQ4MTU3MDdiZjNlMWEzNTFkZjU4NGUyMmM2MWU1
+    Njc0NmI1NWMxNmE5MmMzNjhkMTQyZjY1MmZlZjQwZTJlYjc4NjU0OTI2ODIy
+    MDI4YzVjMGM5NWQ2MTkwZjExZDdkNDZiNTk5YTJlYjA3Yjk4YTY=
   data.tar.gz: !binary |-
-    NjY4M2E4NzgxY2UzYmQ4YmIzY2JkNmU1NGQ0MGY2NDNkYzYxMjZlMWQxYWM2
-    NGY2ZjliY2E0YWFmMGMwN2Y5NzkyNGI3ZjQ3YWEyN2YyZjNhZjhhYjM5NGE0
-    ZGVmNWUzZDg5MTc0MzI3OTliY2IxZWM1YWQ4Yjg1ZWU2ZGEwZTc=
+    OWUyM2EyNWU1ZDc3Njg4YWM3ZmMxMTMzOTE3ZWI1YzIwYmUxNDhhOWQ3ZDg4
+    ZTVhNTQ3NjQwZDM5YTZhNzM1MGVlNjYxNTFiMDEyZDA1NzY5MWJkMTA0ZTE3
+    MDNlZTNkYjE5ODNhNTViNTEwNjgzYmRhNDBlYzBiN2U3Y2I0NzE=

data/app/controllers/caboose/categories_controller.rb

@@ -134,6 +134,18 @@ module Caboose
         admin_options_helper(c, "#{prefix} - ")
       end      
     end
+    
+    # GET /admin/categories/:category_id/products/json
+    def admin_category_products                  
+      query = ["select P.id, P.title from store_category_memberships CM
+        left join store_products P on P.id = CM.product_id
+        where CM.category_id = ?
+        order by CM.sort_order, P.title", params[:id]]             
+      rows = ActiveRecord::Base.connection.select_rows(ActiveRecord::Base.send(:sanitize_sql_array, query))
+      arr = rows.collect{ |row| { :id => row[0], :title => row[1] }}
+      render :json => arr
+    end
+    
   end
 end
 

data/app/controllers/caboose/products_controller.rb

@@ -74,12 +74,13 @@ module Caboose
         'price_gte'       => '',
         'price_lte'       => '',
         'alternate_id'    => '',
-        'search_like'     => ''
-        #'pcs_category_id' => cat.id
+        'search_like'     => '',
+        'cm_category_id'  => cat.id # This filters the CategoryMembership object that we'll be sorting on
       }, {
         'model'           => 'Caboose::Product',
-        'sort'            => if params[:sort] then params[:sort] else 'store_products.sort_order' end,
-        #'sort'            => if params[:sort] then params[:sort] else 'store_product_category_sorts.sort_order' end,
+        #'sort'            => if params[:sort] then params[:sort] else 'store_products.sort_order' end,
+        #'sort'            => if params[:sort] then params[:sort] else 'store_category_memberships.sort_order' end,
+        'sort'            => 'store_category_memberships.sort_order',
         'base_url'        => url_without_params,
         'items_per_page'  => 15,
         'use_url_params'  => false,
@@ -89,15 +90,15 @@ module Caboose
         },
         
         'includes' => {
-          #'pcs_category_id' => [ 'product_category_sorts', 'category_id' ],          
-          'category_id'     => [ 'categories' , 'id'     ],
-          'category_name'   => [ 'categories' , 'name'   ],
-          'vendor_id'       => [ 'vendor'     , 'id'     ],
-          'vendor_name'     => [ 'vendor'     , 'name'   ],
-          'vendor_status'   => [ 'vendor'     , 'status' ],
-          'price_gte'       => [ 'variants'   , 'price'  ],
-          'price_lte'       => [ 'variants'   , 'price'  ],
-          'variant_status'  => [ 'variants'   , 'status' ]
+          'cm_category_id'  => [ 'category_memberships' , 'category_id' ],          
+          'category_id'     => [ 'categories'           , 'id'          ],
+          'category_name'   => [ 'categories'           , 'name'        ],
+          'vendor_id'       => [ 'vendor'               , 'id'          ],
+          'vendor_name'     => [ 'vendor'               , 'name'        ],
+          'vendor_status'   => [ 'vendor'               , 'status'      ],
+          'price_gte'       => [ 'variants'             , 'price'       ],
+          'price_lte'       => [ 'variants'             , 'price'       ],
+          'variant_status'  => [ 'variants'             , 'status'      ]
         }
       })
       
@@ -467,17 +468,19 @@ module Caboose
     
     # GET /admin/products/sort
     def admin_sort
-      @products   = Product.active
-      @vendors    = Vendor.active
-      @categories = Category.all
-      
+      #@products   = Product.active
+      #@vendors    = Vendor.active
+      #@categories = Category.all      
       render :layout => 'caboose/admin'
     end
     
-    # PUT /admin/products/update-sort-order
+    # PUT /admin/categories/:category_id/products/sort-order
     def admin_update_sort_order
-      params[:product_ids].each_with_index do |product_id, index|
-        Product.find(product_id.to_i).update_attribute(:sort_order, index)
+      cat_id = params[:category_id]      
+      params[:product_ids].each_with_index do |product_id, i|
+        cm = CategoryMembership.where(:category_id => cat_id, :product_id => product_id).first
+        cm.sort_order = i
+        cm.save
       end      
       render :json => { :success => true }
     end

data/app/models/caboose/schema.rb

@@ -69,8 +69,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         :shipping_carrier      ,
         :shipping_service_code ,
         :shipping_service_name ,        
-        :transaction_id        ,
-        :transaction_id        ,
+        :transaction_id        ,        
         :transaction_service   ,
         :amount_discounted     ,
         :auth_code             ,                
@@ -248,7 +247,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
       ],
       Caboose::CategoryMembership => [        
         [ :category_id           , :integer ],
-        [ :product_id            , :integer ]      
+        [ :product_id            , :integer ],
+        [ :sort_order            , :integer  , { :default => 0 }]
       ],
       Caboose::CustomizationMembership => [
         [ :product_id       , :integer ],
@@ -483,12 +483,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :on_sale               , :boolean   , { :default => false }],
         [ :allow_gift_wrap       , :boolean   , { :default => false }],
         [ :gift_wrap_price       , :decimal   , { :precision => 8, :scale => 2 }]
-      ],
-      Caboose::ProductCategorySort => [
-        [ :product_id  , :integer ],
-        [ :category_id , :integer ],
-        [ :sort_order  , :integer ]
-      ],                              
+      ],         
       Caboose::ProductImage => [
         [ :product_id            , :integer  ],
         [ :alternate_id          , :string   ],

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

@@ -1,250 +1,88 @@
 <h1>Sort Products</h1>
 
-<section>
-  <aside>
-    <ul id="source" class="sortable">
-      <% @products.each do |product| %>
-        <li data-id="<%= product.id %>"><%= product.title %></li>
-      <% end %>
-    </ul>
-    
-    <input name="search" type="search" placeholder="Search for Products" />
-    
-    <select class="filter" name="vendor">
-      <option value="">-- Filter by Vendor --</option>      
-      <% @vendors.each do |vendor| %>
-        <option value="<%= vendor.id %>"><%= vendor.name %></option>
-      <% end %>
-    </select>
-  </aside>
-  
-  <article>
-    <ul id="target" class="sortable">
-      <% @products.each do |product| %>
-        <li data-id="<%= product.id %>"><%= product.title %></li>
-      <% end %>
-    </ul>
-    
-    <input id="submit" type="button" value="Apply" /><br />
-  </article>
-</section>
+<p><select id="category_id">
+  <option value="">-- Select a category --</option>
+  <% Caboose::Category.options(@site.id).each do |cat| %>
+    <option value='<%= cat[:value] %>'><%= cat[:text] %></option>
+  <% end %>
+</select></p>
+<div id='products'></div>
+<div id='message'></div>
 
 <% content_for :caboose_js do %>
-<%= javascript_include_tag('underscore') %>
 <script type='text/javascript'>    
-window.products = <%= @products.to_json.html_safe %>;
-window.results  = window.products; // Used to store filtered results
-    
-// Delay method
-var delay = (function(){
-  var timer = 0;
-  return function(callback, ms){
-    clearTimeout (timer);
-    timer = setTimeout(callback, ms);
-  };
-})();
-    
-// Filter
-function filter(event) {
-  var $source       = $('ul#source')
-    , $search       = $('input[name=search]')
-    , search_string = $search.val() === $search.attr('placeholder') ? undefined : $search.val().trim().toUpperCase()
-    , vendor_id     = $('select[name=vendor]').val();
-  
-  $source.empty();
-  
-  _.each(window.products, function(product) {
-    if (!search_string && !vendor_id
-    || search_string && product.title.toUpperCase().indexOf(search_string) > -1
-    || vendor_id && product.vendor_id == vendor_id) {
-      $source.append( $('<li/>').attr('data-id', product.id).text(product.title) );
-    }
+
+$(document).ready(function() {
+  $('#category_id').change(function() {
+    update_products();  
   });
-}
+  update_products();
+});
 
-function update(event) {
+function update_products()
+{
+  var cat_id = $('#category_id').val();
+  if (cat_id == '')
+  {
+    $('#message').empty().html("<p class'note error'>Please select a category.</p>");
+    return;
+  }
   
-  // Send the ordered array to the server to make it official
+  $('#message').empty().html("<p class'loading'>Getting products...</p>");
   $.ajax({
-    type: 'put',
-    url: '/admin/products/update-sort-order',
-    data: { product_ids: $('ul#target').sortable('toArray', { attribute: 'data-id' }) }
-  });
+    url: '/admin/categories/' + cat_id + '/products/json',
+    type: 'get',
+    success: function(products) {
+      var ul = $('<ul/>').attr('id', 'product_list');
+      $.each(products, function(i, p) {        
+        ul.append($('<li/>').attr('id', 'product_' + p.id).data('id', p.id).html(p.title));      
+      });
+      $('#message').empty();
+      $('#products').empty().append(ul);
+      $('#product_list').sortable({
+        stop: function(event, ui) 
+        {           
+          $.ajax({
+            url: '/admin/categories/' + $('#category_id').val() + '/products/sort-order',
+            type: 'put',            
+            data: { 
+              product_ids: $.map($('#product_list').sortable('toArray'), function(str, j) { return parseInt(str.replace('product_', '')); })
+            }          
+          });                        
+        }
+      });
+    }
+  });      
 }
 
-$(document).ready(function() {
-  var selected_class = 'selected';
-  
-  // Selection rules
-  $('ul.sortable').on('click', 'li', function(event) {
-    $element = $(this);
-    
-    if (event.shiftKey && $last_element) {
-      if ($element.index() < $last_element.index()) {
-        $element.nextUntil($last_element).addClass(selected_class);
-      } else {
-        $element.prevUntil($last_element).addClass(selected_class);
-      }
-      
-      $element.toggleClass(selected_class);
-    } else if (event.ctrlKey || event.metaKey) {
-      if ($element.hasClass(selected_class)) {
-        $element.removeClass(selected_class);
-      } else {
-        $element.addClass(selected_class);
-      }
-    } else {
-      $element.addClass(selected_class).siblings().removeClass(selected_class);
-    }
-    
-    $last_element = $element;
-  });
-  
-  // Setup sortable lists
-  $('ul#source').sortable({
-    delay: 150,
-    revert: 0,
-    connectWith: 'ul#target',
-    
-    helper: function(event, item) {
-      
-      // If the user just clicked and immediately drug an element
-      if ( !item.hasClass(selected_class) ) item.addClass(selected_class).siblings().removeClass(selected_class);
-      
-      // Grab the selected elements and create the helper
-      var elements = item.parent().children('.' + selected_class).clone()
-        , helper   = $('<li/>');
-        
-      // Add the elements to the item multidrag data attribute
-      item.data('multidrag', elements).siblings('.' + selected_class);
-      
-      // Pass back the helper
-      return helper.append(elements);
-    },
-    
-    start: function(event, ui) {
-      
-      // Make sure the item stays visible on #source
-      $(ui.item).show();
-      
-      // Clone the original item and note the previous one, to reappend after jquery ui takes it away
-      item_clone = $(ui.item).clone();
-      previous_item = $(ui.item).prev();
-      
-      // Remove selected status from ul#target
-      $('ul#target li.selected').removeClass('selected');
-    },
-    
-    beforeStop: function(event, ui) {
-      
-      if ($(ui.item).parent().attr('id') != 'source') {
-      
-        // Remove duplicate items from old positions
-        ui.item.data('multidrag').each(function(index, element) {
-          var $element = $(element);
-          $('ul#target li[data-id=' + $element.attr('data-id') + ']').not('.selected').remove()
-        });
-      }
-    },
-    
-    stop: function(event, ui) {
-      
-      if ($(ui.item).parent().attr('id') == 'source') return false;
-      
-      // Clear multidrag data
-      ui.item.after( ui.item.data('multidrag') ).remove();
-      
-      // If the previous item is defined append the clone just after, otherwise prepend to #source
-      if (previous_item.length) {
-        previous_item.after(item_clone);
-      } else {
-        $('ul#source').prepend(item_clone);
-      }
-      
-      // Update sort order
-      update(event, ui);
-    }
-  });
-  
-  // Update sort order when done sorting
-  $('ul#target').sortable({ stop: update });
-  
-  // Filter when the vendor select box change
-  $('select').on('change', filter);
-  
-  // Filter, after a delay, when there is a keyup event in the search
-  $('input[type=search]').on('keyup', function(event) {
-    delay(function() { filter(event) }, 600);
-  });
-});
 </script>
 <% end %>
 
 <% content_for :caboose_css do %>
-  <style>
-  
-    /* Layout */
-    
-    section,
-    section article { overflow: hidden; }
-    
-    section aside {
-      float: left;
-      margin-right: 12px;
-    }
-    
-    /* Filters */
-    
-    input[type=search], select {
-      box-sizing: border-box;
-      margin: 6px 0;
-      width: 350px;
-      outline: none !important;
-    }
-    input[type=search] { height: 42px; }
-    select { display: block; }
-    
-    input[type=button] {
-      background: #ccc;
-      cursor: pointer;
-      margin: 12px 0;
-      padding: 6px;
-      outline: none !important;
-    }
-    
-    /* Lists */
-    
-    ul.sortable {
-      border: 1px solid #ccc;
-      height: 250px;
-      list-style: none;
-      margin: 0;
-      overflow-x: hidden;
-      overflow-y: scroll;
-      padding: 0;
-      width: 350px;
-      -webkit-touch-callout: none;
-      -webkit-user-select: none;
-      -khtml-user-select: none;
-      -moz-user-select: none;
-      -ms-user-select: none;
-      user-select: none;
-    }
-    ul.sortable li {
-      box-sizing: border-box;
-      border-bottom: 1px solid #ccc;
-      cursor: pointer;
-      cursor: grab;
-      display: block;
-      padding: 6px;
-      width: 100%;
-    }
-    ul.sortable li.selected {
-      background: #3e9aff;
-      border-color: #fff;
-      color: #fff;
-    }
+<style>
+
+#product_list {      
+  list-style: none;
+  margin: 0;      
+  padding: 0;
+  width: 350px;      
+}
+#product_list li {
+  box-sizing: border-box;
+  border-top: 1px solid #ccc;
+  border-bottom: 1px solid #ccc;
+  cursor: pointer;
+  cursor: grab;
+  display: block;
+  padding: 6px;
+  width: 100%;
+}
+
+#product_list li.selected {
+  background: #3e9aff;
+  border-color: #fff;
+  color: #fff;
+}
     
-    ul#source .ui-sortable-placeholder { display: none; }
-  </style>
-<% end %>
+</style>
+<% end %>

data/config/routes.rb

@@ -413,14 +413,14 @@ Caboose::Engine.routes.draw do
                                                                                
   get     "/admin/products"                                 => "products#admin_index"
   get     "/admin/products/json"                            => "products#admin_json"
-  get     '/admin/products/sort'                            => 'products#admin_sort'
-  put     '/admin/products/update-sort-order'               => 'products#admin_update_sort_order'  
+  get     '/admin/products/sort'                            => 'products#admin_sort'  
+  put     "/admin/categories/:category_id/products/sort-order" => "products#admin_update_sort_order"  
   put     "/admin/products/update-vendor-status/:id"        => "products#admin_update_vendor_status"
   get     "/admin/products/new"                             => "products#admin_new"
   get     "/admin/products/status-options"                  => "products#admin_status_options"    
   get     "/admin/products/:id/general"                     => "products#admin_edit_general"    
   get     "/admin/products/:id/description"                 => "products#admin_edit_description"
-  get     "/admin/products/:id/categories"                  => "products#admin_edit_categories"
+  get     "/admin/products/:id/categories"                  => "products#admin_edit_categories"  
   post    "/admin/products/:id/categories"                  => "products#admin_add_to_category"
   delete  "/admin/products/:id/categories/:category_id"     => "products#admin_remove_from_category"
 
@@ -480,16 +480,17 @@ Caboose::Engine.routes.draw do
   #=============================================================================
   # Categories
   #=============================================================================
-  
-  get     "/admin/categories"                 => "categories#admin_index"
-  get     "/admin/categories/new"             => "categories#admin_new"
-  get     "/admin/categories/options"         => "categories#admin_options"
-  get     '/admin/categories/status-options'  => 'categories#admin_status_options'  
-  get     "/admin/categories/:id"             => "categories#admin_edit"  
-  put     "/admin/categories/:id"             => "categories#admin_update"    
-  post    "/admin/categories/:id"             => "categories#admin_update"  
-  post    "/admin/categories"                 => "categories#admin_add"
-  delete  "/admin/categories/:id"             => "categories#admin_delete"
+          
+  get     "/admin/categories"                   => "categories#admin_index"
+  get     "/admin/categories/new"               => "categories#admin_new"
+  get     "/admin/categories/options"           => "categories#admin_options"
+  get     '/admin/categories/status-options'    => 'categories#admin_status_options'
+  get     "/admin/categories/:id/products/json" => "categories#admin_category_products"  
+  get     "/admin/categories/:id"               => "categories#admin_edit"  
+  put     "/admin/categories/:id"               => "categories#admin_update"    
+  post    "/admin/categories/:id"               => "categories#admin_update"  
+  post    "/admin/categories"                   => "categories#admin_add"
+  delete  "/admin/categories/:id"               => "categories#admin_delete"
   
   #=============================================================================  
   # Orders

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.151'
+  VERSION = '0.5.152'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.151
+  version: 0.5.152
 platform: ruby
 authors:
 - William Barry