X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Felements%2Freport_cust_pay_or_refund.html;h=806746a23ab26c4a4637efe74c70ee8f460014c4;hb=d406868577ff4df701bc3fe6ef9c0ab6f0e72999;hp=0e04ab0dd35dab74bf317d04eccf532743b948b4;hpb=47835e6fb2ff9da30bd95ce10f1f22a3ce1cb8b5;p=freeside.git
diff --git a/httemplate/search/elements/report_cust_pay_or_refund.html b/httemplate/search/elements/report_cust_pay_or_refund.html
index 0e04ab0dd..806746a23 100644
--- a/httemplate/search/elements/report_cust_pay_or_refund.html
+++ b/httemplate/search/elements/report_cust_pay_or_refund.html
@@ -23,92 +23,55 @@ Examples:
- <% mt('Search options') |h %>
+ <% mt('[_1] search options', ucfirst($name_singular)) |h %>
|
-
- <% ucfirst(PL($name_singular)) %> of type: |
-
-
- |
-
-
-
+ <& /elements/tr-select.html,
+ label => ucfirst(PL($name_singular)) . ' of type:',
+ field => 'payby',
+ options => [ keys(\%payby) ],
+ labels => \%payby,
+ multiple => 1,
+ size => 18,
+ &>
- <% mt('Check #:') |h %> |
+ <% mt('Check #:') |h %> |
-
+
|
-
-
- <% mt('Transaction #') |h %>
-
- |
+ <% mt('Transaction #:') |h %> |
-
+
|
- <& /elements/tr-select-agent.html,
- 'curr_value' => scalar($cgi->param('agentnum')),
- 'label' => emt('for agent: '),
- 'disable_empty' => 0,
- &>
-
<& /elements/tr-select-user.html &>
+% if ( $has_reason ) {
+% # limit to reasons that are in use for the table being reported on
+% # (maybe order by count(*) desc?)
+ <& /elements/tr-select-table.html,
+ label => emt('Reason'),
+ field => 'reasonnum',
+ id => 'reasonnum',
+ table => 'reason',
+ name_col => 'reason',
+ extra_sql => " WHERE EXISTS(SELECT 1 FROM $table WHERE $table.reasonnum = reason.reasonnum) ",
+ empty_label => emt('any'),
+ &>
+% }
+
- <% mt('Payment') |h %> |
+ <% mt(ucfirst($name_singular). ' date') |h %> |
<& /elements/tr-input-beginning_ending.html,
- layout => 'horiz',
+ layout => 'horiz',
+ input_time => $conf->exists('report-cust_pay-select_time'),
&>
|
@@ -128,21 +91,76 @@ Examples:
% }
+% if ( $table eq 'cust_pay' ) {
+
+% # payment batch
+% # <& /elements/tr-select-batchnum.html &>
+
+% #payment "entry" batch (should probably just all become the same thing)
+ <& /elements/tr-select-paybatch.html &>
+
+% }
+
<& /elements/tr-input-lessthan_greaterthan.html,
'label' => emt('Amount'),
'field' => 'paid',
&>
+
+
+
+
+
+
+
+
+
+ <% mt('Customer search options') |h %>
+ |
+
+
+ <& /elements/tr-select-agent.html,
+ 'curr_value' => scalar($cgi->param('agentnum')),
+ 'label' => emt('Agent'),
+ 'disable_empty' => 0,
+ &>
+
+ <& /elements/tr-select-cust_class.html,
+ 'label' => emt('Customer class'),
+ 'field' => 'cust_classnum',
+ 'multiple' => 1,
+ 'pre_options' => [ 0 => emt('(none)') ],
+ &>
+
+
+
% if ( $table eq 'cust_pay' ) {
+
+
+
+
+
+
+ <% mt('Display options') |h %>
+ |
+
+
<& /elements/tr-checkbox.html,
'label' => emt('Include tax names'),
'field' => 'tax_names',
'value' => 1,
&>
-% }
+
+ <& /elements/tr-checkbox.html,
+ 'label' => emt('Include order number'),
+ 'field' => 'show_order_number',
+ 'value' => 1,
+ &>
+% }
+
@@ -158,6 +176,8 @@ my $name_singular = $opt{'name_singular'};
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('Financial reports');
+my $conf = new FS::Conf;
+
my $void = $cgi->param('void') ? 1 : 0;
my $unapplied = $cgi->param('unapplied') ? 1 : 0;
@@ -166,4 +186,29 @@ my $title = $void ? "Voided $name_singular report" :
"\u$name_singular report" ;
$table .= '_void' if $void;
+my $has_reason = dbdef->table($table)->column('reasonnum');
+
+tie (my %payby, 'Tie::IxHash',
+ 'CARD-VisaMC' => 'credit card (Visa/MasterCard)',
+ 'CARD-Amex' => 'credit card (American Express)',
+ 'CARD-Discover' => 'credit card (Discover)',
+ 'CARD-Maestro' => 'credit card (Maestro/Switch/Solo)',
+ 'CARD-Tokenized' => 'credit card (Tokenized)',
+
+ 'CHEK' => 'electronic check / ACH',
+ 'BILL' => 'check',
+ 'CASH' => 'cash',
+ 'PPAL' => 'Paypal',
+ 'APPL' => 'Apple Store',
+ 'ANRD' => 'Android Market',
+
+ 'PREP' => 'prepaid card',
+ 'WIRE' => 'wire transfer',
+ 'WEST' => 'Western Union',
+ 'IDTP' => 'IDT Payment Services',
+ 'EDI' => 'Electronic Debit (EDI)',
+ 'MCRD' => 'manual credit card',
+ 'MCHK' => 'manual electronic check',
+);
+
%init>