Merge pull request #2430 from internetee/handle-monthly-invoice-status

Added monthly status to invoices

app/controllers/admin/invoices_controller.rb

@@ -81,18 +81,24 @@ module Admin
       payment_order.update(notes: 'Cancelled')
     end
 
+    # rubocop:disable Metrics/MethodLength
     def filter_by_status
       case params[:status]
       when 'Paid'
         Invoice.includes(:account_activity, :buyer).where.not(account_activity: { id: nil })
       when 'Unpaid'
-        Invoice.includes(:account_activity, :buyer).where(account_activity: { id: nil })
+        Invoice.includes(:account_activity, :buyer).where(account_activity: { id: nil },
+                                                          cancelled_at: nil,
+                                                          monthly_invoice: false)
       when 'Cancelled'
         Invoice.includes(:account_activity, :buyer).where.not(cancelled_at: nil)
+      when 'Monthly'
+        Invoice.where(monthly_invoice: true, cancelled_at: nil)
       else
         Invoice.includes(:account_activity, :buyer)
       end
     end
+    # rubocop:enable Metrics/MethodLength
 
     def filter_by_receipt_date(invoices)
       date_from_param = params[:q][:receipt_date_gteq] if params[:q][:receipt_date_gteq].present?

app/controllers/repp/v1/invoices_controller.rb

@@ -97,6 +97,7 @@ module Repp
                             account_activity_id_not_null
                             account_activity_id_null cancelled_at_null
                             cancelled_at_not_null number_gteq number_lteq
+                            monthly_invoice_true monthly_invoice_false
                             total_gteq total_lteq s] + [s: []])
       end
 

app/views/admin/invoices/_search_form.html.erb

@@ -12,7 +12,7 @@
                 <div class="col-md-3">
                     <div class="form-group">
                         <%= f.label t(:status) %>
-                        <%= select_tag :status, options_for_select(%w(Paid Unpaid Cancelled),params[:status]),
+                        <%= select_tag :status, options_for_select(%w(Paid Unpaid Cancelled Monthly),params[:status]),
                                        { multiple: false, include_blank: true, selected: params[:status], class: 'form-control selectize'} %>
                     </div>
                 </div>

app/views/admin/invoices/index.haml

@@ -31,6 +31,8 @@
                 %td= l invoice.receipt_date
               - elsif invoice.cancelled?
                 %td.text-grey= t(:cancelled)
+              - elsif invoice.monthly_invoice
+                %td= l invoice.issue_date
               - else
                 %td.text-danger= t(:unpaid)
 

app/views/registrar/invoices/partials/_details.haml

@@ -19,6 +19,8 @@
     %dd= l @invoice.receipt_date
   - elsif @invoice.cancelled?
     %dd.text-grey= t(:cancelled)
+  - elsif @invoice.monthly_invoice
+    %dd= l @invoice.issue_date
   - else
     %dd{class: 'text-danger'}= t(:unpaid)