From f85b4a88931b21aae084abff2e13bf42e71c975a Mon Sep 17 00:00:00 2001
From: yashodha <yashodha@cividesk.com>
Date: Thu, 9 Apr 2020 17:34:39 +0530
Subject: [PATCH] add filter and sorting for receipt date in contribution
 reports

---
 CRM/Report/Form/Contribute/Bookkeeping.php         | 1 +
 CRM/Report/Form/Contribute/DeferredRevenue.php     | 1 +
 CRM/Report/Form/Contribute/History.php             | 1 +
 CRM/Report/Form/Contribute/HouseholdSummary.php    | 1 +
 CRM/Report/Form/Contribute/OrganizationSummary.php | 1 +
 CRM/Report/Form/Contribute/SoftCredit.php          | 1 +
 CRM/Report/Form/Contribute/Summary.php             | 1 +
 CRM/Report/Form/Contribute/TopDonor.php            | 1 +
 8 files changed, 8 insertions(+)

diff --git a/CRM/Report/Form/Contribute/Bookkeeping.php b/CRM/Report/Form/Contribute/Bookkeeping.php
index 1da37dac5680..12deba433c32 100644
--- a/CRM/Report/Form/Contribute/Bookkeeping.php
+++ b/CRM/Report/Form/Contribute/Bookkeeping.php
@@ -302,6 +302,7 @@ public function __construct() {
             'type' => CRM_Utils_Type::T_INT,
           ],
           'receive_date' => ['operatorType' => CRM_Report_Form::OP_DATE],
+          'receipt_date' => ['operatorType' => CRM_Report_Form::OP_DATE],
           'contribution_source' => [
             'title' => ts('Source'),
             'name' => 'source',
diff --git a/CRM/Report/Form/Contribute/DeferredRevenue.php b/CRM/Report/Form/Contribute/DeferredRevenue.php
index 58dc07edd8e1..edfb9144ab5a 100644
--- a/CRM/Report/Form/Contribute/DeferredRevenue.php
+++ b/CRM/Report/Form/Contribute/DeferredRevenue.php
@@ -94,6 +94,7 @@ public function __construct() {
             'operatorType' => CRM_Report_Form::OP_DATE,
             'type' => CRM_Utils_Type::T_DATE,
           ],
+          'receipt_date' => ['operatorType' => CRM_Report_Form::OP_DATE],
           'cancel_date' => [
             'title' => ts('Cancel Date'),
             'operatorType' => CRM_Report_Form::OP_DATE,
diff --git a/CRM/Report/Form/Contribute/History.php b/CRM/Report/Form/Contribute/History.php
index ecb52f68ece8..c7526b39188f 100644
--- a/CRM/Report/Form/Contribute/History.php
+++ b/CRM/Report/Form/Contribute/History.php
@@ -232,6 +232,7 @@ public function __construct() {
             'default' => '',
           ],
           'receive_date' => ['operatorType' => CRM_Report_Form::OP_DATE],
+          'receipt_date' => ['operatorType' => CRM_Report_Form::OP_DATE],
           'contribution_status_id' => [
             'title' => ts('Contribution Status'),
             'operatorType' => CRM_Report_Form::OP_MULTISELECT,
diff --git a/CRM/Report/Form/Contribute/HouseholdSummary.php b/CRM/Report/Form/Contribute/HouseholdSummary.php
index 8e0c9a242206..4ed79397d516 100644
--- a/CRM/Report/Form/Contribute/HouseholdSummary.php
+++ b/CRM/Report/Form/Contribute/HouseholdSummary.php
@@ -122,6 +122,7 @@ public function __construct() {
         ],
         'filters' => [
           'receive_date' => ['operatorType' => CRM_Report_Form::OP_DATE],
+          'receipt_date' => ['operatorType' => CRM_Report_Form::OP_DATE],
           'total_amount' => ['title' => ts('Amount Between')],
           'currency' => [
             'title' => ts('Currency'),
diff --git a/CRM/Report/Form/Contribute/OrganizationSummary.php b/CRM/Report/Form/Contribute/OrganizationSummary.php
index 78d7d6282327..f195cea04467 100644
--- a/CRM/Report/Form/Contribute/OrganizationSummary.php
+++ b/CRM/Report/Form/Contribute/OrganizationSummary.php
@@ -132,6 +132,7 @@ public function __construct() {
         ],
         'filters' => [
           'receive_date' => ['operatorType' => CRM_Report_Form::OP_DATE],
+          'receipt_date' => ['operatorType' => CRM_Report_Form::OP_DATE],
           'total_amount' => ['title' => ts('Amount Between')],
           'currency' => [
             'title' => ts('Currency'),
diff --git a/CRM/Report/Form/Contribute/SoftCredit.php b/CRM/Report/Form/Contribute/SoftCredit.php
index c4c2d371486d..4394c70b2c0b 100644
--- a/CRM/Report/Form/Contribute/SoftCredit.php
+++ b/CRM/Report/Form/Contribute/SoftCredit.php
@@ -226,6 +226,7 @@ public function __construct() {
         'grouping' => 'softcredit-fields',
         'filters' => [
           'receive_date' => ['operatorType' => CRM_Report_Form::OP_DATE],
+          'receipt_date' => ['operatorType' => CRM_Report_Form::OP_DATE],
           'currency' => [
             'title' => ts('Currency'),
             'operatorType' => CRM_Report_Form::OP_MULTISELECT,
diff --git a/CRM/Report/Form/Contribute/Summary.php b/CRM/Report/Form/Contribute/Summary.php
index 091b4d5a9140..ea28427be49a 100644
--- a/CRM/Report/Form/Contribute/Summary.php
+++ b/CRM/Report/Form/Contribute/Summary.php
@@ -147,6 +147,7 @@ public function __construct() {
         'grouping' => 'contri-fields',
         'filters' => [
           'receive_date' => ['operatorType' => CRM_Report_Form::OP_DATE],
+          'receipt_date' => ['operatorType' => CRM_Report_Form::OP_DATE],
           'thankyou_date' => ['operatorType' => CRM_Report_Form::OP_DATE],
           'contribution_status_id' => [
             'title' => ts('Contribution Status'),
diff --git a/CRM/Report/Form/Contribute/TopDonor.php b/CRM/Report/Form/Contribute/TopDonor.php
index a3329a928f00..72a7243df460 100644
--- a/CRM/Report/Form/Contribute/TopDonor.php
+++ b/CRM/Report/Form/Contribute/TopDonor.php
@@ -118,6 +118,7 @@ public function __construct() {
             'default' => 'this.year',
             'operatorType' => CRM_Report_Form::OP_DATE,
           ],
+          'receipt_date' => ['operatorType' => CRM_Report_Form::OP_DATE],
           'currency' => [
             'title' => ts('Currency'),
             'operatorType' => CRM_Report_Form::OP_MULTISELECT,