caboose-cms 0.9.113 → 0.9.114

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5b6301fd321b1efeab9a0cd5f7ed2e70a78fc56
-  data.tar.gz: 7219d25362856913714e7ec5946136e5590093b2
+  metadata.gz: ae72cde296525849afad58aaab5bbd68ceee848b
+  data.tar.gz: 52509f12ba044955cd0153b167b6292879133a6f
 SHA512:
-  metadata.gz: 3c7f98b0ea172cf2680ee857d5e917a6bc75e0739d54d80ea248b488c57413da9c234a6327fea742812840f02c573a625cb59fe28cede0a8734eaa280c7b1d80
-  data.tar.gz: cfecdb73e6bb98c0288afe5dcc9ef3a1f0f3ab422faa00d4c14de85dd5f80bd88454cb96ce26b88df7e59c497e7abe0a3631feeabdbf0190e7e6b2b4a3062016
+  metadata.gz: dd10147fd33167312d596827dc3ac730f308ff6e2275970553fda5962f01d3bdb72073549522f95d79a1de6f403025da6935c8578a5dd2dcb6ab5f2a96790110
+  data.tar.gz: 808eb857f1e05a649e85b9fe9565f7380677ea4f0363e93d67b2ed77fd635400e3bb6eed27fa992899120bc4f266bde5b22c0cb146f6fa82d0be07cac9a82a02

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

@@ -529,9 +529,10 @@ InvoiceController.prototype = {
           } 
           tr.append($('<td/>')
             .append(that.line_item_link(li))
+            .append(that.line_item_opts(li))
             .append(that.subscription_dates(li))                    
-            .append(that.line_item_weight(li))
-            .append(that.gift_options(li))
+     //       .append(that.line_item_weight(li))
+     //       .append(that.gift_options(li))
             .append($('<div/>').attr('id', 'line_item_' + li.id + '_message'))
           );                              
           tr.append($('<td/>').append($('<div/>').attr('id', 'lineitem_' + li.id + '_status')))      
@@ -629,6 +630,23 @@ InvoiceController.prototype = {
       });
     return link;    
   },
+
+  line_item_opts: function(li) {
+    var that = this;
+    var v = li.variant;
+    var div = $('<p />');
+    var opts = [];
+    if ( v && v.option1 )
+      opts.push(v.option1);
+    if ( v && v.option2 )
+      opts.push(v.option2);
+    if ( v && v.option3 )
+      opts.push(v.option3);
+    if ( opts.length > 0 )
+      div.text( opts.join(', '));
+    div.css('margin-bottom',0).css('margin-top','5px');
+    return div;
+  },
   
   line_item_weight: function(li)
   {
@@ -726,8 +744,9 @@ InvoiceController.prototype = {
       
       tr.append($('<td/>')
         .append(that.line_item_link(li))
+        .append(that.line_item_opts(li))
         .append(that.subscription_dates(li))                                    
-        .append(that.gift_options(li))
+   //     .append(that.gift_options(li))
         .append($('<div/>').attr('id', 'line_item_' + li.id + '_message'))
       );
             

data/app/controllers/caboose/invoices_controller.rb

@@ -5,6 +5,13 @@ module Caboose
     # @route GET /admin/users/:user_id/invoices
     def admin_index
       return if !user_is_allowed('invoices', 'view')
+
+      if !params[:game_id].blank?
+        game = Colonnade::Game.find(params[:game_id])
+        menu = Colonnade::Menu.where(:game_id => game.id).first if game
+        invoice_ids = Colonnade::SuiteMenu.where(:menu_id => menu.id).pluq(:invoice_id) if menu
+        invoice_ids = invoice_ids.to_s.gsub('[','').gsub(']','')
+      end
       
       @pager = Caboose::PageBarGenerator.new(params, {
         'site_id'              => @site.id,
@@ -20,6 +27,7 @@ module Caboose
         'sort'           => 'id',
         'desc'           => 1,
         '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
       })
@@ -214,13 +222,44 @@ module Caboose
     
     # @route GET /admin/invoices/print-pending
     def admin_print_pending
-      return if !user_is_allowed('invoices', 'edit')    
-      
-      pdf = PendingInvoicesPdf.new
+      return if !user_is_allowed('invoices', 'edit')
+
+      pdf = @site.store_config.custom_invoice_pdf
+      pdf = "PendingInvoicesPdf" if pdf.blank?                      
+      eval("pdf = #{pdf}.new")
+
+      where = []
+      terms = []
+      where << "(id = ?)" if !params[:id].blank?
+      terms << params[:id] if !params[:id].blank?
+      where << "(invoice_number = ?)" if !params[:invoice_number].blank?
+      terms << params[:invoice_number] if !params[:invoice_number].blank?
+      where << "(customer_id = ?)" if !params[:customer_id].blank?
+      terms << params[:customer_id] if !params[:customer_id].blank?
+      where << "(total_gte = ?)" if !params[:total_gte].blank?
+      terms << params[:total_gte] if !params[:total_gte].blank?
+      where << "(total_lte = ?)" if !params[:total_lte].blank?
+      terms << params[:total_lte] if !params[:total_lte].blank?
+      where << "(status = ?)"
+      terms << 'pending'
+
+
+      if !params[:game_id].blank?
+        game = Colonnade::Game.find(params[:game_id])
+        menu = Colonnade::Menu.where(:game_id => game.id).first if game
+        invoice_ids = Colonnade::SuiteMenu.where(:menu_id => menu.id).pluq(:invoice_id) if menu
+      end
+
+      where << "(id in (?))" if invoice_ids
+      terms << invoice_ids if invoice_ids
+
+
+      where2 = where.join(' AND ')
+
+      pdf.invoices = Invoice.where(where2, *terms).all  
       if params[:print_card_details]
         pdf.print_card_details = params[:print_card_details].to_i == 1
       end
-      pdf.invoices = Invoice.where(:site_id => @site.id, :status => Invoice::STATUS_PENDING).all      
       send_data pdf.to_pdf, :filename => "pending_invoices.pdf", :type => "application/pdf", :disposition => "inline"            
     end
       

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

@@ -1,3 +1,4 @@
+<div style="padding-right:20px;">
 
 <% if @edituser %>
   <%= render :partial => 'caboose/users/admin_header' %>
@@ -20,6 +21,9 @@
   <%= render :partial => 'caboose/users/admin_footer' %>
 <% end %>
 
+</div>
+
+
 <!--
 <p>
 <input type='button' value='< Back' onclick="window.location='/admin/invoices';" />

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.113'
+  VERSION = '0.9.114'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.113
+  version: 0.9.114
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-20 00:00:00.000000000 Z
+date: 2018-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg