X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Felements%2Fcust_pay_or_refund.html;h=b07f5e9d2167a5699fbec1c013cb24b6b33f958f;hb=497739310211650a12becc4ca7954c2b055499c8;hp=b5172fb36d297750e802207079e733906b1e614e;hpb=5f4452d8d9cfe03330e3dc1da529ff6cf0f65882;p=freeside.git

diff --git a/httemplate/search/elements/cust_pay_or_refund.html b/httemplate/search/elements/cust_pay_or_refund.html
index b5172fb36..b07f5e9d2 100755
--- a/httemplate/search/elements/cust_pay_or_refund.html
+++ b/httemplate/search/elements/cust_pay_or_refund.html
@@ -26,6 +26,7 @@ Examples:
                'html_init'      => '',
                'addl_header'    => [],
                'addl_fields'    => [],
+               'addl_sort_fields' => [],
                'redirect_empty' => $redirect_empty,
           )
 
@@ -39,7 +40,7 @@ Examples:
          )
 
 </%doc>
-<& search.html,
+<& grouped-search.html,
                 'title'          => $title, # XXX: translate
                 'name_singular'  => $name_singular,
                 'query'          => $sql_query,
@@ -54,6 +55,17 @@ Examples:
                 'link_onclicks'  => \@link_onclicks,
                 'color'          => \@color,
                 'style'          => \@style,
+
+                'group_column'   => 'payby',
+                'group_label'    => 'payby_name',
+                'subtotal'       => { $opt{amount_field} => "sum($amount_field)" },
+                'subtotal_row'   => [ 'Subtotal',
+                                      sub { sprintf($money, $_[0]->$amount_field) },
+                                    ],
+                'total_row'      => [ '<B>Total</B>',
+                                      sub { sprintf("<B>$money</B>", $_[0]->$amount_field) },
+                                    ],
+                'show_combined'  => 1,
 &>
 <%init>
 
@@ -61,11 +73,16 @@ my %opt = @_;
 
 my $curuser = $FS::CurrentUser::CurrentUser;
 
+my $conf = FS::Conf->new;
+my $money = ($conf->config('money_char') || '$') . '%.2f';
+
 die "access denied"
   unless $curuser->access_right('Financial reports');
 
 my $table = $opt{'table'} || 'cust_'.$opt{'thing'};
 
+my $has_reason = dbdef->table($table)->column('reasonnum') ? 1 : 0;
+
 my $amount_field = $opt{'amount_field'};
 my $name_singular = $opt{'name_singular'};
 
@@ -165,16 +182,26 @@ push @header, "\u$name_singular",
 $align .= 'rr';
 push @links, '', '';
 push @fields, 'payby_payinfo_pretty',
-              sub { sprintf('$%.2f', shift->$amount_field() ) },
+              sub { sprintf($money, shift->$amount_field() ) },
 ;
 push @link_onclicks, $sub_receipt, '';
-push @sort_fields, '', $amount_field;
+push @sort_fields, 'paysort', $amount_field;
+
+if ($opt{'show_card_type'}) {
+  push @header, emt('Card Type');
+  $align .= 'r';
+  push @links, '';
+  push @fields, sub { 
+    (($_[0]->payby eq 'CARD') && ($_[0]->paymask !~ /N\/A/)) ? cardtype($_[0]->paymask) : ''
+  };
+  push @sort_fields, '';
+}
 
 if ( $unapplied ) {
   push @header, emt('Unapplied');
   $align .= 'r';
   push @links, '';
-  push @fields, sub { sprintf('$%.2f', shift->unapplied_amount) };
+  push @fields, sub { sprintf($money, shift->unapplied_amount) };
   push @sort_fields, '';
 }
 
@@ -193,6 +220,7 @@ unless ( $opt{'disable_by'} ) {
                       $o = 'customer self-service' if $o eq 'fs_selfservice';
                       $o;
                     };
+  push @sort_fields, '';
 }
 
 if ( $tax_names ) {
@@ -209,6 +237,7 @@ if ( $tax_names ) {
                                    split('\|', shift->tax_names)
                            );
                     };
+  push @sort_fields, '', '';
 }
 
 push @header, FS::UI::Web::cust_header();
@@ -218,11 +247,14 @@ push @links, map { $_ ne 'Cust. Status' ? $cust_link : '' }
 my @color = ( ( map '', @fields ), FS::UI::Web::cust_colors() );
 my @style = ( ( map '', @fields ), FS::UI::Web::cust_styles() );
 push @fields, \&FS::UI::Web::cust_fields;
+push @sort_fields, FS::UI::Web::cust_sort_fields;
 
 push @header, @{ $opt{'addl_header'} }
   if $opt{'addl_header'};
 push @fields, @{ $opt{'addl_fields'} }
   if $opt{'addl_fields'};
+push @sort_fields, @{ $opt{'addl_sort_fields'} }
+  if $opt{'addl_sort_fields'};
 
 my( $count_query, $sql_query, @count_addl );
 if ( $cgi->param('magic') ) {
@@ -230,6 +262,7 @@ if ( $cgi->param('magic') ) {
   my @search = ();
   my @select = (
     "$table.*",
+    "( $table.payby || ' ' || coalesce($table.paymask, $table.payinfo) ) AS paysort",
     FS::UI::Web::cust_sql_fields(),
     'cust_main.custnum AS cust_main_custnum',
   );
@@ -252,14 +285,10 @@ if ( $cgi->param('magic') ) {
       $title = $part_referral->referral. " $title";
     }
 
-    # cust_classnum (false laziness w/ elements/cust_main_dayranges.html, prepaid_income.html, cust_bill_pay.html, cust_bill_pkg.html cust_bill_pkg_referral.html, unearned_detail.html, cust_credit.html, cust_credit_refund.html, cust_main::Search::search_sql)
-    if ( grep { $_ eq 'cust_classnum' } $cgi->param ) {
-      my @classnums = grep /^\d*$/, $cgi->param('cust_classnum');
-      push @search, 'COALESCE( cust_main.classnum, 0) IN ( '.
-                        join(',', map { $_ || '0' } @classnums ).
-                    ' )'
-        if @classnums;
-    }
+    # cust_classnum - standard matching
+    push @search, $m->comp('match-classnum',
+        param => 'cust_classnum', field => 'cust_main.classnum'
+      );
 
     if ( $cgi->param('custnum') =~ /^(\d+)$/ ) {
       push @search, "$table.custnum = $1";
@@ -271,7 +300,7 @@ if ( $cgi->param('magic') ) {
       foreach my $payby ( $cgi->param('payby') ) {
 
         $payby =~
-          /^(CARD|CHEK|BILL|CASH|PPAL|APPL|ANRD|PREP|WIRE|WEST|EDI|MCRD)(-(VisaMC|Amex|Discover|Maestro|Tokenized))?$/
+          /^(CARD|CHEK|BILL|CASH|PPAL|APPL|ANRD|PREP|WIRE|WEST|IDTP|EDI|MCRD|MCHK)(-(VisaMC|Amex|Discover|Maestro|Tokenized))?$/
             or die "illegal payby $payby";
 
         my $payby_search = "$table.payby = '$1'";
@@ -321,7 +350,6 @@ if ( $cgi->param('magic') ) {
 
           } elsif ( $cardtype eq 'Discover' ) {
 
-            my $conf = new FS::Conf;
             my $country = $conf->config('countrydefault') || 'US';
 
             $search =
@@ -402,7 +430,8 @@ if ( $cgi->param('magic') ) {
     if ( $cgi->param('payinfo') ) {
       $cgi->param('payinfo') =~ /^\s*(\d+)\s*$/
         or die "illegal payinfo ". $cgi->param('payinfo');
-      push @search, "$table.payinfo = '$1'";
+      my $regexp = regexp_sql();
+      push @search, "$table.payinfo $regexp '^0*$1\$'";
     }
 
     if ( $cgi->param('ccpay') =~ /^([\w-:]+)$/ ) {
@@ -411,6 +440,7 @@ if ( $cgi->param('magic') ) {
       push @search, "($table.auth LIKE '$1%') OR ($table.order_number LIKE '$1%')";
       push @fields, 'auth', 'order_number';
       push @header, 'Auth #', 'Transaction #';
+      push @sort_fields, '', '';
       $align .= 'rr';
 
     }
@@ -436,7 +466,7 @@ if ( $cgi->param('magic') ) {
                     "$table.void_date <= $v_ending";
     }
 
-    push @search, FS::UI::Web::parse_lt_gt($cgi, "$table.$amount_field" );
+    push @search, FS::UI::Web::parse_lt_gt($cgi, $amount_field, $table);
 
     $orderby = '_date';
 
@@ -492,6 +522,18 @@ if ( $cgi->param('magic') ) {
   my $addl_from = FS::UI::Web::join_cust_main($table);
   my $group_by = '';
 
+  # reasons, for refunds and voided payments
+  if ( $has_reason ) {
+    push @select, "reason.reason";
+    $addl_from .= " LEFT JOIN reason USING (reasonnum)\n";
+    push @fields, 'reason';
+    push @sort_fields, 'reason.reason';
+    push @header, emt('Reason');
+    if ( $cgi->param('reasonnum') =~ /^(\d+)$/ ) {
+      push @search, "COALESCE(reasonnum, 0) = $1";
+    }
+  }
+
   if ( $cgi->param('tax_names') ) {
     if ( dbh->{Driver}->{Name} =~ /^Pg/i ) {
 
@@ -538,6 +580,7 @@ if ( $cgi->param('magic') ) {
 } else {
 
   #hmm... is this still used?
+  warn "undefined search magic";
 
   $cgi->param('payinfo') =~ /^\s*(\d+)\s*$/ or die "illegal payinfo";
   my $payinfo = $1;