caboose-cms 0.5.47 → 0.5.48

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzBjMTkxZTAwZThkY2FjNDA1YTcxZWFjOWIyYWE1MWUzZTM0YjdiMg==
+    YjAzMmQ2OTFiMjYzYWQ1ODU2OWI5NDFiNDZjMDY3MmI3NjM0NzQyZQ==
   data.tar.gz: !binary |-
-    NGNiMzEwYWJhZWZjZWVkNjg2MTY3YWFmNTg4ZTA0OWY0ZWZhZGEwZQ==
+    MDViNjhlM2EwNGI1MGU4MGYzYjAzZDEyYjlhY2VlODYxMTVlZjRiZA==
 SHA512:
   metadata.gz: !binary |-
-    OGRiZTFkYjgwZjRkYTI1YzRlNDE1MzAwOTA5MzM1YTIwN2VmZDFhMzQxYzI1
-    YWM3YjU3ZWNiNjNkYTBmZjNlNjRiODc0NjcwMGM4MmVhMTU4YWY5ZDkxMWZm
-    YjE4MTdhYzViZTY3OWU4OTQ3MWRiOTM0N2E4M2JkMWYzM2ExNWQ=
+    Njg4MzA5Yjc5MWQ2OWI5OTE3MGVkNTFhOGRkOWMxZDYwYzY0ZjhlY2M1Y2Yy
+    OGNlM2M3MjQ2YmRlMGI2NWYxOWUyZTM5ZjdhNmMwYTE0OGYyN2ZiY2ZmYjk3
+    ODEzNmMzM2Q4OTU1YzE4ZTk0ZmJmYTdkNjFkZmNlYWUxNDlhMDg=
   data.tar.gz: !binary |-
-    YjUzZjU4ZDgzMGI5NzEzYTJjYTk0ODE0YmY0ODYxYTJlYWJiNzc4ZTljMWEx
-    N2Q3MmM2MTlhNjMzNGViM2VkOGNmNmFjMmMwYzAzYzU0MzcwYTg0ZTNlYjVl
-    MWQ0MmZjMmE2NzFmOGY5ZjAyMDU5M2JiOGFhODU3NjNjNjc5ODk=
+    NGE1YmQ1Y2IzNjVkNzBkMjlkZTA4OGZmMjZjOTMxMTA2N2Y4ZGNiNDE2Yzdl
+    ODIxOGIwY2M3MWI1YmM3MWU5OGY3M2NjMTAyOWJlYjc4NTIwMDEyYTQwMTI4
+    OTk1ZjE5Y2U4NDYxYWJjY2MxYTFjODdhODFiMTk5ZDBkM2IzZTY=

data/app/controllers/caboose/categories_controller.rb

@@ -34,7 +34,7 @@ module Caboose
           :site_id   => @site.id,
           :parent_id => p.id,
           :name      => params[:name],
-          :status    => 'Inactive'
+          :status    => 'Active'
         )
         cat.slug = cat.generate_slug
         cat.url  = "#{p.url}/#{cat.slug}"

data/app/controllers/caboose/vendors_controller.rb

@@ -53,11 +53,23 @@ module Caboose
       vendor = Vendor.new(
         :site_id => @site.id,
         :name    => params[:name],
-        :status  => 'Inactive'
+        :status  => 'Active'
       )      
       render :json => { :success => vendor.save, :redirect => "/admin/vendors/#{vendor.id}" }
     end
     
+    # DELETE /admin/vendors/:id
+    def admin_delete
+      return if !user_is_allowed('vendors', 'delete')
+      v = Vendor.find(params[:id])
+      v.destroy
+      
+      resp = StdClass.new({
+        'redirect' => '/admin/vendors'
+      })
+      render :json => resp
+    end
+    
     # GET /admin/vendors/status-options
     def status_options      
       render :json => [

data/app/helpers/caboose/categories_helper.rb

@@ -15,7 +15,7 @@ module Caboose
     def category_list_items(category)
       
       # Link to category
-      link = link_to(category.name, "/admin/categories/#{category.id}/edit")
+      link = link_to(category.name, "/admin/categories/#{category.id}")
       
       # Recursively find category children
       children = content_tag :ul, category.children.collect { |child| category_list_items(child) }.join.to_s.html_safe if category.children.any?

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

@@ -18,7 +18,7 @@
 <% end %>
 
 <div id="message"></div>
-<input type="button" value="< Back" onclick="window.location='/admin/categories'" />
+<input type="button" value="< Back" onclick="window.location='/admin/categories';" />
 <input type="button" value="Delete Category" onclick="delete_category(<%= @category.id %>)" />
 
 <% content_for :caboose_css do %>

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

@@ -1,24 +1,47 @@
 <h1>Edit Vendor</h1>
 <p><div id="vendor_<%= @vendor.id %>_name"></div></p>
 <p><div id="vendor_<%= @vendor.id %>_status"></div></p>
-<input type="button" value="< Back" onclick="window.location=/admin/vendors" />
-<input type="button" value="Delete" onclick="window.location=/admin/vendors/<%= @vendor.id %>/delete" />
+<div id='message'></div>
+<input type="button" value="< Back" onclick="window.location='/admin/vendors';" />
+<input type="button" value="Delete" onclick="delete_vendor(<%= @vendor.id %>);" />
 
 <% content_for :caboose_js do %>
-  <%= javascript_include_tag "caboose/model/all" %>
-  
-  <script>
-    $(document).ready(function() {
-      m = new ModelBinder({
-        id: <%= @vendor.id %>,
-        name: 'Vendor',
-        update_url: '/admin/vendors/<%= @vendor.id %>/update',
-        authenticity_token: '<%= form_authenticity_token %>',
-        attributes: [
-          { name: 'name'   , nice_name: 'Name'   , type: 'text'   , value: <%= Caboose.json(@vendor.name).html_safe %>, width: 500 },
-          { name: 'status' , nice_name: 'Status' , type: 'select' , text: <%= raw Caboose.json(@vendor.status).html_safe %>, value: <%= Caboose.json(@vendor.status).html_safe %>, width: 500, options_url: '/admin/vendors/status-options' }
-        ]
-      })
-    });
-  </script>
+<%= javascript_include_tag "caboose/model/all" %>
+<script>
+$(document).ready(function() {
+  m = new ModelBinder({
+    id: <%= @vendor.id %>,
+    name: 'Vendor',
+    update_url: '/admin/vendors/<%= @vendor.id %>/update',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [
+      { name: 'name'   , nice_name: 'Name'   , type: 'text'   , value: <%= Caboose.json(@vendor.name).html_safe %>, width: 500 },
+      { name: 'status' , nice_name: 'Status' , type: 'select' , text: <%= raw Caboose.json(@vendor.status).html_safe %>, value: <%= Caboose.json(@vendor.status).html_safe %>, width: 500, options_url: '/admin/vendors/status-options' }
+    ]
+  })
+});
+
+function delete_vendor(vendor_id, confirm)
+{
+  if (!confirm)
+  {
+    var p = $('<p/>').addClass('note confirm')
+      .append('Are you sure you want to delete the vendor? ')
+      .append($('<input/>').attr('type','button').val('Yes').click(function() { delete_vendor(vendor_id, true); })).append(' ')
+      .append($('<input/>').attr('type','button').val('No').click(function() { $('#message').empty(); }));
+    $('#message').empty().append(p);
+    return;
+  }
+  $('#message').html("<p class='loading'>Deleting vendor...</p>");
+  $.ajax({
+    url: '/admin/vendors/' + vendor_id,
+    type: 'delete',
+    success: function(resp) {
+      if (resp.error) $('#message').html("<p class='note error'>" + resp.error + "</p>");
+      if (resp.redirect) window.location = resp.redirect;
+    }
+  });
+}
+
+</script>
 <% end %>

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

@@ -12,14 +12,16 @@
     <tr>
       <%= raw @pager.sortable_table_headings({
         'id'     => 'ID',
-        'name'  => 'Name'
+        'name'   => 'Name',
+        'status' => 'Status'
       }) %>
     </tr>
     
     <% @vendors.each do |vendor| %>
-      <tr onclick="window.location='/admin/vendors/<%= vendor.id %>/edit';">
+      <tr onclick="window.location='/admin/vendors/<%= vendor.id %>';">
         <td style="text-align: center"><%= raw vendor.id %></td>
         <td><%= raw vendor.name %></td>
+        <td><%= raw vendor.status %></td>
       </tr>
     <% end %>
   </table>

data/app/views/caboose/vendors/admin_new.html.erb

@@ -2,11 +2,12 @@
 
 <form id="new-vendor" action="/admin/vendors" method="post">
   <input type="hidden" name="authenticity_token" value="<%= form_authenticity_token %>" />
-  <input id="name" name="name" type="text" placeholder="Vendor Name" style="width: 400px" />
-  <div id='message'></div>  
+  <p><input id="name" name="name" id='name' type="text" placeholder="Vendor Name" style="width: 400px" /></p>
+  <p><input type='checkbox' name='stay' id='stay' value='1' /> Stay here so I can add another vendor</p>
+  <div id='message'></div>
   <p>
-    <input type="button" value="< Back" onclick="window.location='/admin/products'" />
-    <input type="submit" value="Add Vendor" />
+    <input type="button" value="< Back" onclick="window.location='/admin/vendors';" />
+    <input type="submit" value="Add Vendor" />    
   </p>
 </form>
 
@@ -14,9 +15,10 @@
 <script>
 $(document).ready(function() {
   $('#new-vendor').on('submit', function(event) {
-    $('#message').html("<p class='loading'>Adding vendor...</p>");
     event.preventDefault();
+    var stay = $('#stay').prop('checked');
     
+    $('#message').html("<p class='loading'>Adding vendor...</p>");        
     $.ajax({
       url: '/admin/vendors',
       type: 'post',
@@ -24,8 +26,17 @@ $(document).ready(function() {
       success: function(resp) {
         if (resp.error)
           $('#message').html("<p class='note error'>" + resp.error + "</p>");
-        else if (resp.redirect)
-          window.location = resp.redirect;
+        else
+        {
+          if (stay)
+          {
+            $('#name').val('');
+            $('#message').html("<p class='note succes'>The vendor has been added successfully.</p>");
+            setTimeout(function() { $('#message').empty(); }, 2000);
+          }
+          else if (resp.redirect)
+            window.location = resp.redirect;
+        }
       }
     });
   });

data/config/routes.rb

@@ -289,13 +289,14 @@ Caboose::Engine.routes.draw do
   
   get  '/admin/products/add-upcs' => 'products#admin_add_upcs'
   
-  get  '/admin/vendors/status-options' => 'vendors#status_options'    
-  get  '/admin/vendors/new'            => 'vendors#admin_new'
-  get  '/admin/vendors/:id'            => 'vendors#admin_edit'
-  put  '/admin/vendors/:id'            => 'vendors#admin_update'
-  post '/admin/vendors'                => 'vendors#admin_add'  
-  get  '/admin/vendors'                => 'vendors#admin_index'
-  
+  get    '/admin/vendors/status-options' => 'vendors#status_options'    
+  get    '/admin/vendors/new'            => 'vendors#admin_new'
+  get    '/admin/vendors/:id'            => 'vendors#admin_edit'
+  get    '/admin/vendors'                => 'vendors#admin_index'
+  put    '/admin/vendors/:id'            => 'vendors#admin_update'
+  post   '/admin/vendors'                => 'vendors#admin_add'
+  delete '/admin/vendors/:id'            => 'vendors#admin_delete'  
+    
   # Orders
   
   get  '/admin/orders/:id/void'                => 'orders#admin_void'

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.47'
+  VERSION = '0.5.48'
 end

metadata

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