caboose-cms 0.9.225 → 0.9.226

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a23fa53ff0699b384c57dcdc80f0f736a9f6694ff45f7873a204561d7428a8bb
-  data.tar.gz: 27fd72088dc361b586a85288bed0c171db33654948c08519351665c4abec44fc
+  metadata.gz: 4efa305692693dd028aae1734236af46f9340796403c20eaf095b1a166b6ecfd
+  data.tar.gz: e44d38f3c7d80ed523444cde712d130c182765e0ccce2d46dbab62ec4b8f0280
 SHA512:
-  metadata.gz: c5dfdffa53ac05471ed38c4033b7addc140efda5ef614c1153deafa64847d75e89363e64aa02302f768496de44d0a87b0818637e269381d78066ca8ff8ef2163
-  data.tar.gz: 9937276c47dd84e93e70f99c04d383c4c639f5bf84e646e91acf2f4139b8a8d73b702b541821f37c2f4629cba29fa9d4b07a2ed719120fbb3f079cdc2022087b
+  metadata.gz: bf561cbe8f47feb28180f3558aba7f440cf15fc85348c2ff995c2a7ddfb248bd861982b0cb3b368e26e051f7efd0fcff077536aca30b35a09628a4713153baa3
+  data.tar.gz: 584539e6da70d5e0d9496810fb65f710f0a4449211a1afd38e6644cc132d13fc0a9b6ca54c9746d8c70ae86d9a94720eb2742430fdb6538db50c06d2a12b34c8

data/app/controllers/caboose/invoices_controller.rb

@@ -31,12 +31,12 @@ module Caboose
         'base_url'       => params[:user_id] ? "/admin/users/#{params[:user_id]}/invoices" : "/admin/invoices",
         'additional_where' => [ params[:game_id].blank? ? 'id is not null' : ( invoice_ids.blank? ? "id is null" : "id in (#{invoice_ids})" ) ],
         'use_url_params' => false,
-        'items_per_page' => 100
+        'items_per_page' => 25
       })
       
       @edituser = params[:user_id] ? User.find(params[:user_id]) : nil
       @invoices  = @pager.items
-      @customers = Caboose::User.where(:site_id => @site.id).reorder('last_name, first_name').all
+      @customers = Caboose::User.where(:site_id => @site.id).order('last_name, first_name').all
       
       render :layout => 'caboose/admin'
     end

data/app/controllers/caboose/variants_controller.rb

@@ -184,18 +184,7 @@ module Caboose
       img.save
       render :json => true
     end
-  
-    # @route DELETE /admin/products/:product_id/variants/:id
-    def admin_delete
-      return if !user_is_allowed('variants', 'delete')
-      v = Variant.find(params[:id])
-      v.status = 'Deleted'
-      v.save
-      render :json => Caboose::StdClass.new({
-        :redirect => "/admin/products/#{v.product_id}/variants"
-      })
-    end
-    
+
     # @route DELETE /admin/products/:product_id/variants/bulk
     def admin_bulk_delete
       return if !user_is_allowed('variants', 'delete')
@@ -208,7 +197,18 @@ module Caboose
       end
       resp.success = true
       render :json => resp
-    end    
+    end
+  
+    # @route DELETE /admin/products/:product_id/variants/:id
+    def admin_delete
+      return if !user_is_allowed('variants', 'delete')
+      v = Variant.find(params[:id])
+      v.status = 'Deleted'
+      v.save
+      render :json => Caboose::StdClass.new({
+        :redirect => "/admin/products/#{v.product_id}/variants"
+      })
+    end
     
     # @route PUT /admin/products/:product_id/variants/option1-sort-order
     def admin_update_option1_sort_order

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

@@ -18,7 +18,7 @@
   <a class="caboose-btn" href='/admin/invoices/new'>New Manual Invoice</a>
   <a class="caboose-btn" href='/admin/invoices/print-pending' target='_blank'>Print Pending Invoices</a>
   <a class="caboose-btn" href='/admin/invoices/summary-report' target='_blank'>Summary Report</a>
-  <a class="caboose-btn" href='/admin/invoices/city-report' target='_blank'>City Report</a>
+<!--   <a class="caboose-btn" href='/admin/invoices/city-report' target='_blank'>City Report</a> -->
 </p>
 <form action='/admin/invoices' method='get' id='search_form' style='display: none;'>
   <p><input type='text' name='id'           placeholder='Invoice ID'     value="<%= @pager.params['id']           %>" style='width: 100px;' /></p>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.225'
+  VERSION = '0.9.226'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.225
+  version: 0.9.226
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-25 00:00:00.000000000 Z
+date: 2019-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg