caboose-cms 0.5.188 → 0.5.189

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGVkMDMxZGNmMjZjYzJhNjVjODI0ODU3OTBmOWEwNWNlNzMyOGQ0Mg==
+    NzgwNzYwNDY1NWVlMTZmNmEwNzQxMTM5NDk4NTljYzAwNTJkODcxYQ==
   data.tar.gz: !binary |-
-    NmViZjE5NzQzODgwMWQzY2Q1ZTFhYzVmNGMzZmRjMzI5OWE4Y2RjOQ==
+    NTk3ZTZhY2RhOGEzMWQ0Nzk5Y2Q2NzE0NTMwYjc2ZWJiODQ3Y2ZkMg==
 SHA512:
   metadata.gz: !binary |-
-    YmIzMmM5ZDE0ZTQ3M2E5ZmYyYTJhMTVjMTc5ZTBmZDg1NzJjYjgyYmQ1YWVm
-    ZjkzNTc0Mzg5MGYzOTRmZDJhNTU2NzExOTJhOTRhZjJkZDNhODQ3YzI4Mjhh
-    YjIzNDk4N2NjY2VhMzNmOWM3NWVkYTQ3NDU1YjYzOWUyY2U5ZjU=
+    NzdlN2JjYTZiOGQ5Yzk2MWFlYTdmYTljM2EzMTNiMWQ3NWE0NjVmNmNmMzFm
+    YmNjZTM4ZmY2NDdhNzRiM2M2OTE5NTA2Yzk0ZTJkZGEwM2E5YTY3YjZhMzdm
+    NGM2YTQ5MmY5MDMxNzRkZjFlMzQwNTcwYzhkM2Q0ZjkyZjMzZDA=
   data.tar.gz: !binary |-
-    MDNiNzg5MjE0ZmY3NTViZmJiYWJhZmFiYjQ5NmZjZGJjNjYxZTM1NTBjZmM4
-    MWY3ODUwNDEyYTZlY2U2ZDg2ZjczZDhkMzFkMjFmMDFlMWFlNmM1NGYwZDUx
-    NDU0YTcwMTI4ODUwZTE2YzVkMTgyYTkyMDEwYmU5OTg3N2ViNGI=
+    Mzg5NGI4YzQyMGJiZmM2YTE4ZTI2YWEzNTc0YTcxMzJkNzM0ZDA4Nzc3MzE4
+    Nzk1MmQ5MDE3MDM1YWRlMDY3Y2NlZjUyZDJhZGNhZDE0OGIxN2U3ZGYzMGE4
+    NjZlYWIwOTFmMThjYzZlZDdkZmQwMjVhYjBiN2FiMDE5NmM2MDM=

data/app/controllers/caboose/categories_controller.rb

@@ -54,12 +54,30 @@ module Caboose
       render :json => resp
     end
       
-    # GET /admin/categories/:id/edit
+    # GET /admin/categories/:id
     def admin_edit
       return unless user_is_allowed('categories', 'edit')    
       @category = Category.find(params[:id])
       render :layout => 'caboose/admin'
-    end        
+    end
+    
+    # GET /admin/categories/:id/sort-children
+    def admin_sort_children
+      return unless user_is_allowed('categories', 'edit')    
+      @category = Category.find(params[:id])
+      render :layout => 'caboose/admin'
+    end
+    
+    # PUT /admin/categories/:id/children/sort-order
+    def admin_update_sort_order
+      return unless user_is_allowed('categories', 'edit')            
+      params[:category_ids].each_with_index do |cat_id, i|
+        cat = Category.find(cat_id)
+        cat.sort_order = i
+        cat.save
+      end      
+      render :json => { :success => true }
+    end
     
     # PUT /admin/categories/:id
     def admin_update

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

@@ -19,8 +19,13 @@
 <% end %>
 
 <div id="message"></div>
+<p>
 <input type="button" value="< Back" onclick="window.location='/admin/categories';" />
+<% if @category.children && @category.children.count > 0 %>
+  <input type="button" value="Sort Child Categories" onclick="window.location='/admin/categories/<%= @category.id %>/sort-children';" />
+<% end %>
 <input type="button" value="Delete Category" onclick="delete_category(<%= @category.id %>)" />
+</p>
 
 <% content_for :caboose_css do %>
   <style>

data/app/views/caboose/categories/admin_sort_children.html.erb

@@ -0,0 +1,64 @@
+<h1>Sort Children</h1>
+
+<p>Drag the categories into the order you would like them displayed.</p>
+
+<div id='categories'>
+  <ul id='category_list'>
+    <% @category.children.reorder(:sort_order).all.each do |cat| %>
+      <li id='category_<%= cat.id %>'><%= cat.name %></li>
+    <% end %>
+  </ul>
+</div>
+<div id='message'></div>
+
+<p><input type='button' value='< Back' onclick="window.location='/admin/categories/<%= @category.id %>';" /></p>
+
+<% content_for :caboose_js do %>
+<script type='text/javascript'>    
+
+$(document).ready(function() {  
+  $('#category_list').sortable({
+    stop: function(event, ui) 
+    {           
+      $.ajax({
+        url: '/admin/categories/<%= @category.id %>/children/sort-order',
+        type: 'put',            
+        data: { 
+          category_ids: $.map($('#category_list').sortable('toArray'), function(str, j) { return parseInt(str.replace('category_', '')); })
+        }          
+      });                        
+    }
+  });
+});
+
+</script>
+<% end %>
+
+<% content_for :caboose_css do %>
+<style>
+
+#category_list {      
+  list-style: none;
+  margin: 0;      
+  padding: 0;
+  width: 350px;      
+}
+#category_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%;
+}
+
+#category_list li.selected {
+  background: #3e9aff;
+  border-color: #fff;
+  color: #fff;
+}
+    
+</style>
+<% end %>

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

@@ -39,6 +39,7 @@
     <tr>
       <%= raw @pager.sortable_table_headings({
   				'id'              => 'ID',
+  				'order_number'    => 'Order Number',
   				'customer_id'     => 'Customer',
   				'date_created'    => 'Date Created',  				
   				'total'           => 'Total',
@@ -49,6 +50,7 @@
   <% @orders.each do |order| %>
     <tr onclick="window.location='/admin/orders/<%= order.id %>';">
       <td><%= raw order.id %></td>
+      <td><%= raw order.order_number %></td>
       <td>
         <% if order.customer.nil? %>
           Unknown

data/config/routes.rb

@@ -495,16 +495,20 @@ 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/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"
+  
+
+  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/sort-children"       => "categories#admin_sort_children"
+  put     "/admin/categories/:id/children/sort-order" => "categories#admin_update_sort_order"
+  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.188'
+  VERSION = '0.5.189'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.188
+  version: 0.5.189
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-30 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -729,6 +729,7 @@ files:
 - app/views/caboose/categories/admin_edit.html.erb
 - app/views/caboose/categories/admin_index.html.erb
 - app/views/caboose/categories/admin_new.html.erb
+- app/views/caboose/categories/admin_sort_children.html.erb
 - app/views/caboose/checkout/_address_form.html.erb
 - app/views/caboose/checkout/_billing_form.html.erb
 - app/views/caboose/checkout/_cart.html.erb