summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2014-01-24 18:34:38 -0800
committerIvan Kohler <ivan@freeside.biz>2014-01-24 18:34:38 -0800
commit761449917d3d1d7b3a2206785e702246b8b5625e (patch)
treeafcabd6655009cb8a039557d8386cc9786ea7581
parenta794f08248abbb8d2f0efb617d3e83babdfe0e09 (diff)
select a date when importing credits, RT#27087
-rw-r--r--FS/FS/cust_credit.pm2
-rw-r--r--httemplate/misc/cust_credit-import.html9
-rw-r--r--httemplate/misc/process/cust_credit-import.cgi5
3 files changed, 14 insertions, 2 deletions
diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm
index 3f8d57c3c..7ae6c97a5 100644
--- a/FS/FS/cust_credit.pm
+++ b/FS/FS/cust_credit.pm
@@ -1118,7 +1118,7 @@ sub process_batch_import {
my $job = shift;
my $opt = { 'table' => 'cust_credit',
- 'params' => [ 'credbatch' ],
+ 'params' => [ '_date', 'credbatch' ],
'formats' => { 'simple' =>
[ 'custnum', 'amount', 'reasonnum', 'invnum' ],
},
diff --git a/httemplate/misc/cust_credit-import.html b/httemplate/misc/cust_credit-import.html
index 6de34e378..9a63a04c5 100644
--- a/httemplate/misc/cust_credit-import.html
+++ b/httemplate/misc/cust_credit-import.html
@@ -7,7 +7,7 @@ Import a file containing credits.
'name' => 'CreditImportForm',
'action' => 'process/cust_credit-import.cgi',
'num_files' => 1,
- 'fields' => [ 'format', 'credbatch' ],
+ 'fields' => [ 'format', '_date', 'credbatch' ],
'message' => 'Credit import successful',
'url' => $p."search/cust_credit.html?credbatch=$credbatch",
'onsubmit' => "document.CreditImportForm.submitButton.disabled=true;",
@@ -18,6 +18,13 @@ Import a file containing credits.
<INPUT TYPE="hidden" NAME="credbatch" VALUE="<% $credbatch %>"%>
+ <& /elements/tr-input-date-field.html, {
+ 'name' => '_date',
+ #'value' => '',
+ 'label' => 'Date',
+ }
+ &>
+
<!--
<TR>
<TH ALIGN="right">Format</TH>
diff --git a/httemplate/misc/process/cust_credit-import.cgi b/httemplate/misc/process/cust_credit-import.cgi
index 5a5cfe212..4c4d42df2 100644
--- a/httemplate/misc/process/cust_credit-import.cgi
+++ b/httemplate/misc/process/cust_credit-import.cgi
@@ -4,6 +4,11 @@
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('Import');
+my %arg = $cgi->param('arg');
+$arg{_date} = parse_datetime( $arg{_date} )
+ if $arg{_date} && $arg{_date} =~ /\D/;
+$cgi->param('arg', %arg );
+
my $server =
new FS::UI::Web::JSRPC 'FS::cust_credit::process_batch_import', $cgi;