caboose-cms 0.9.54 → 0.9.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acb66ef2677682c17b78ad9f2d7e3cdfe6257bb5
-  data.tar.gz: 3483b053afd8087fdcd13f51b3b2fee3fff02fd1
+  metadata.gz: 9dc18c2e49fc407aa002965dc15a63e6b7864c11
+  data.tar.gz: eef019aa5e4bd43cd13796d400db2d61cc3a8859
 SHA512:
-  metadata.gz: 4fa9d77f7095f4fe05b67401991ef29ce3f690a1e7514b763dda6e1afd75ea38d40d29affee605bc6f3dc19b2cb945b597fb12cf5ebf604bb9cbd375698824d1
-  data.tar.gz: 46cdef18a1b45e330bbbe1ce91ab46b74fbfa1012f4b552a0c52b282127ed07c59448974721f94c7d7254e25ceb7c63eff63a53f6bdab055a4e2e23d39fd289a
+  metadata.gz: 7d97e70be118cf75c6c4c4fa2dea38f36f3f90e2742fba4e65eb74f43dc8b12bf8ca1f23fb4a6dff08eac0d1581f5165fd236f23833d4ff5ff0d247593f218af
+  data.tar.gz: 91c99bba2178d298a31c68317793b794cd1ddcbda9420c919eaff1bd81c8550db4ae0db95c12fcf9c31587c94e5dd3f18c7f13e7b7341bf878a56924da45484f

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

@@ -119,7 +119,7 @@ InvoiceController.prototype = {
         { name: 'tax'              , nice_name: 'Tax'                , type: 'text'     , value: curr(that.invoice.tax)             , width: 100, fixed_placeholder: false, align: 'right' , after_update: function() { that.refresh_invoice(); }},
         { name: 'handling'         , nice_name: 'Handling'           , type: 'text'     , value: curr(that.invoice.handling)        , width: 100, fixed_placeholder: false, align: 'right' , after_update: function() { that.refresh_invoice(); }},
         { name: 'custom_discount'  , nice_name: 'Discount'           , type: 'text'     , value: curr(that.invoice.custom_discount) , width: 100, fixed_placeholder: false, align: 'right' , after_update: function() { that.refresh_invoice(); }},
-        { name: 'notes'            , nice_name: 'Notes (not public)' , type: 'textarea' , value: that.invoice.notes                 , width: 100, fixed_placeholder: false, align: 'left'  , after_update: function() { that.refresh_invoice(); }, height: 50 },
+        { name: 'notes'            , nice_name: 'Notes (not public)' , type: 'textarea' , value: that.invoice.notes                 , width: 500, fixed_placeholder: false, align: 'left'  , after_update: function() { that.refresh_invoice(); }, height: 100 },
         { name: 'customer_notes'   , nice_name: 'Customer Notes'     , type: 'textarea' , value: that.invoice.notes                 , width: 100, fixed_placeholder: false, align: 'left'  , after_update: function() { that.refresh_invoice(); }, height: 50 }
       ]
     });        
@@ -316,7 +316,8 @@ InvoiceController.prototype = {
         .append($('<div/>').attr('id', 'invoice_' + that.invoice.id + '_financial_status'))
         .append($('<div/>').attr('id', 'transactions').attr('align', 'center').append(transactions))
       );
-    table.append(tr);    
+    table.append(tr); 
+    table.append($('<tr/>').append($('<td/>').attr('align', 'left').html('Internal Notes')).append($('<td/>').attr('align','right').attr('colspan', '2').append($('<div/>').attr('id', 'invoice_' + that.invoice.id + '_notes'))));  
     return table;  
   },
   

data/app/controllers/caboose/categories_controller.rb

@@ -166,6 +166,20 @@ module Caboose
       end      
     end
 
+    # @route PUT /admin/categories/:category_id/products/:product_id/add
+    def admin_add_product
+      resp = Caboose::StdClass.new
+      resp.success = false
+      cat = Category.find(params[:category_id])
+      prod = Product.find(params[:product_id])
+      if cat && prod && cat.site_id == prod.site_id
+        cm = CategoryMembership.where(:product_id => prod.id, :category_id => cat.id).first
+        cm = CategoryMembership.create(:product_id => prod.id, :category_id => cat.id) if cm.nil?
+        resp.success = true
+      end
+      render :json => resp
+    end
+
   end
 end
 

data/app/controllers/caboose/products_controller.rb

@@ -275,6 +275,7 @@ module Caboose
         'vendor_name'  => '',
         'search_like'  => '',
         'category_id'  => '',
+        'status'       => 'Active',
         'price'        => params[:filters] && params[:filters][:missing_prices] ? 0 : ''
       }, {
         'model'          => 'Caboose::Product',
@@ -637,6 +638,16 @@ module Caboose
     def api_index
       render :json => Product.where(:status => 'Active')
     end
+
+    # @route GET /api/products/keyword
+    def api_keyword
+      query = params[:query]
+      resp = Caboose::StdClass.new({'products' => {}})
+      if query && !query.blank?
+        resp.products = Product.select('title, id').where(:site_id => @site.id).where('title ILIKE (?)',"%#{query}%").order(:title).limit(30)
+      end
+      render :json => resp
+    end
     
     # @route GET /api/products/:id
     def api_details
@@ -649,6 +660,9 @@ module Caboose
       p = Product.where(:id => params[:id]).first
       render :json => p ? p.variants : { :error => 'Invalid product ID' }
     end
+
+    
+
         
   end
 end

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

@@ -9,7 +9,7 @@
 <h2>Products</h2>
 
 <% if @category.products.any? %>
-  <ul>
+  <ul id="cat-products">
     <% @category.products.each do |product| %>
       <li><a href="/admin/products/<%= product.id %>/general"><%= product.title %></a></li>
     <% end %>
@@ -18,6 +18,12 @@
   <p>This category has no associated products.</p>
 <% end %>
 
+<div class="add-form">
+  <h5>Add Product to This Category</h5>
+  <input type="text" id="product-finder" placeholder="Product name" />
+  <ul id="product-results"></ul>
+</div>
+<br /><br />
 <div id="message"></div>
 <p>
 <input type="button" value="< Back" onclick="window.location='/admin/categories';" />
@@ -30,6 +36,12 @@
 <% content_for :caboose_css do %>
   <style>
     .push-below { margin-bottom: 24px; }
+    #product-results li {
+      cursor: pointer;
+    }
+    #product-results li:hover {
+      color: blue;
+    }
   </style>
 <% end %>
 
@@ -53,6 +65,45 @@ $(document).ready(function() {
   });
 });
 
+function add_product_to_category(product_id, title) {
+  $.ajax({
+    url: '/admin/categories/<%= @category.id %>/products/' + product_id + '/add',
+    type: 'put',
+    success: function(resp) {
+      $("#product-results").html("");
+      if ( resp && resp.success ) {
+        var a = $("<a />").attr('href','/admin/products' + product_id + '/general').text(title);
+        var li = $("<li />").append(a);
+        $("#cat-products").append(li);
+        $("#message").html("<p class='note success'>Product added to category.</p>");
+      }
+    }
+  });
+}
+
+$("#product-finder").keyup(function() {
+  var q = $("#product-finder").val();
+  var ul = $("#product-results");
+  ul.html("");
+  if ( q && q != '' ) {
+    $.ajax({
+      url: '/api/products/keyword',
+      data: {
+        query: q
+      },
+      type: 'get',
+      success: function(resp) {
+        if ( resp && resp.products && resp.products.length > 0 ) {
+          $.each(resp.products, function(k,v) {
+            var li = $("<li />").attr('onclick',"add_product_to_category(" + v.id + ",'" + v.title + "');return false;").text(v.title);
+            ul.append(li);
+          });
+        }
+      }
+    });
+  }
+});
+
 function delete_category(cat_id, confirm) {
   if (!confirm) {
     var p = $('<p/>').addClass('note error').css('margin-bottom', '10px')

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

@@ -4,7 +4,8 @@
 <p style="margin: 12px 0">
   <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="/admin/products/alternate-ids">Alternate IDs</a><span style="margin: 0 3px">|</span>
+  <a href="/admin/products#status=Deleted">Deleted Products</a>
 <!--   <a href='#'>Search Form</a> -->
 </p>
 

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.54'
+  VERSION = '0.9.55'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.54
+  version: 0.9.55
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-07 00:00:00.000000000 Z
+date: 2017-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg