[freeside-commits] branch FREESIDE_3_BRANCH updated. 64cb9f480fae2da57bcf760f74212d1f270c9290

[Ivan Kohler]

The branch, FREESIDE_3_BRANCH has been updated
       via  64cb9f480fae2da57bcf760f74212d1f270c9290 (commit)
      from  9d55843fddd22f64ad0f6b890181c6918aebbf6d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 64cb9f480fae2da57bcf760f74212d1f270c9290
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Sep 13 15:48:56 2018 -0700

    optimize declined payment event condition, RT#81305

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index d313db321..447a6bcad 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -1913,7 +1913,7 @@ sub tables_hashref {
       ],
       'primary_key' => 'paybatchnum',
       'unique' => [],
-      'index' => [ ['batchnum'], ['invnum'], ['custnum'] ],
+      'index' => [ ['batchnum'], ['invnum'], ['custnum'], ['status'] ],
     },
 
     'fcc477map' => {
diff --git a/FS/FS/part_event/Condition/cust_pay_batch_declined.pm b/FS/FS/part_event/Condition/cust_pay_batch_declined.pm
index b3a8d705f..8efb27854 100644
--- a/FS/FS/part_event/Condition/cust_pay_batch_declined.pm
+++ b/FS/FS/part_event/Condition/cust_pay_batch_declined.pm
@@ -16,36 +16,16 @@ sub eventtable_hashref {
     };
 }
 
-#sub option_fields {
-#  (
-#    'field'         => 'description',
-#
-#    'another_field' => { 'label'=>'Amount', 'type'=>'money', },
-#
-#    'third_field'   => { 'label'         => 'Types',
-#                         'type'          => 'checkbox-multiple',
-#                         'options'       => [ 'h', 's' ],
-#                         'option_labels' => { 'h' => 'Happy',
-#                                              's' => 'Sad',
-#                                            },
-#  );
-#}
-
 sub condition {
   my($self, $cust_pay_batch, %opt) = @_;
 
-  #my $cust_main = $self->cust_main($object);
-  #my $value_of_field = $self->option('field');
-  #my $time = $opt{'time'}; #use this instead of time or $^T
-
   $cust_pay_batch->status =~ /Declined/i;
-
 }
 
-#sub condition_sql {
-#  my( $class, $table ) = @_;
-#  #...
-#  'true';
-#}
+sub condition_sql {
+  my( $class, $table ) = @_;
+
+  "(cust_pay_batch.status IS NOT NULL AND cust_pay_batch.status = 'Declined')";
+}
 
 1;

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Schema.pm                                    |  2 +-
 .../Condition/cust_pay_batch_declined.pm           | 30 ++++------------------
 2 files changed, 6 insertions(+), 26 deletions(-)