[freeside-commits] branch FREESIDE_4_BRANCH updated. ae98c71f809d0f3a2826ba8c3030b5fcf89fcfcc
Ivan
ivan at 420.am
Tue Jan 31 11:48:18 PST 2017
The branch, FREESIDE_4_BRANCH has been updated
via ae98c71f809d0f3a2826ba8c3030b5fcf89fcfcc (commit)
via 742fd27193b9816af1717f239f0d55dd0b6291de (commit)
from e50c164d1d56ceb159969b8684ea000f3807f784 (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 ae98c71f809d0f3a2826ba8c3030b5fcf89fcfcc
Merge: 742fd27 e50c164
Author: Ivan Kohler <ivan at freeside.biz>
Date: Tue Jan 31 11:48:14 2017 -0800
Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_4_BRANCH
commit 742fd27193b9816af1717f239f0d55dd0b6291de
Author: Ivan Kohler <ivan at freeside.biz>
Date: Tue Jan 31 11:47:53 2017 -0800
Revert "add date to quick payment entry, RT#73382"
This reverts commit 2b76dd3be38311e9144a3f2017dfdaec6261fff3.
diff --git a/httemplate/elements/customer-table.html b/httemplate/elements/customer-table.html
index 25c26b5..0aa792d 100644
--- a/httemplate/elements/customer-table.html
+++ b/httemplate/elements/customer-table.html
@@ -25,7 +25,7 @@ Example:
'custnum_update_callback' => 'name_of_js_callback' #passed a rownum
#listrefs
- 'type' => ['immutable', ''], # immutable, checkbox, date or ''/text
+ 'types' => ['immutable', ''], # immutable or ''/text
'align' => [ 'c', 'l', 'r', '' ],
'size' => [], # sizes ignored for immutable
'color' => [],
@@ -66,10 +66,7 @@ This mason element is currently only used by misc/batch-cust_pay.html,
and probably should be cleaned up more before being used by anything else.
</%doc>
-<LINK REL="stylesheet" TYPE="text/css" HREF="<%$fsurl%>elements/calendar-win2k-2.css" TITLE="win2k-2">
-<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/calendar_stripped.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/calendar-en.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/calendar-setup.js"></SCRIPT>
+
<SCRIPT TYPE="text/javascript">
var num_open_invoices = new Array;
@@ -655,12 +652,6 @@ and probably should be cleaned up more before being used by anything else.
% } elsif ( $types->[$col] eq 'checkbox' ) {
my_input.setAttribute('type', 'checkbox');
my_input.checked = (values && values.<% $field %>) ? true : false;
-% } elsif ( $types->[$col] eq 'date' ) {
- my_input_button = document.createElement('IMG');
- my_input_button.setAttribute('src', '<% $fsurl %>images/calendar.png');
- my_input_button.setAttribute('title', <% mt('Select date') |js_string %>);
- my_input_button.setAttribute('name', '<% $name %>'+thisrownum+'button');
- my_input_button.setAttribute('id', '<% $name %>'+thisrownum+'button');
% }
my_input.value = (values && values.<% $field %>) || '';
% if ( $opt{onchange}->[$col] ) {
@@ -671,21 +662,9 @@ and probably should be cleaned up more before being used by anything else.
my_input.onkeyup = calc_total<%$col%>;
% }
my_cell.appendChild(my_input);
-% if ( $types->[$col] eq 'date' ) {
- my_cell.appendChild(my_input_button);
-% }
row.appendChild(my_cell);
-% if ( $types->[$col] eq 'date' ) {
- Calendar.setup({
- inputField: '<% $name %>'+thisrownum,
- ifFormat: "<% $date_format %>",
- button: '<% $name %>'+thisrownum+'button',
- align: "BR"
- });
-% }
-
% $col++;
% }
@@ -826,7 +805,6 @@ addRow();
my(%opt) = @_;
my $conf = new FS::Conf;
-my $date_format = $conf->config('date_format') || '%m/%d/%Y';
my $types = $opt{'type'} ? [ @{$opt{'type'}} ] : [];
my $sizes = $opt{'size'} ? [ @{$opt{'size'}} ] : [];
diff --git a/httemplate/misc/batch-cust_pay.html b/httemplate/misc/batch-cust_pay.html
index e20e4a4..d4d4afa 100644
--- a/httemplate/misc/batch-cust_pay.html
+++ b/httemplate/misc/batch-cust_pay.html
@@ -469,16 +469,16 @@ die "access denied"
my $conf = new FS::Conf;
my $money_char = $conf->config('money_char') || '$';
-my @header = ( 'Amount', 'Check #', 'Date override' );
-my @fields = ( 'paid', 'payinfo', '_date' );
-my @types = ( '', '', 'date', );
-my @align = ( 'r', 'r', 'r' );
-my @sizes = ( 8, 10, 8 );
-my @colors = ( '', '', '' );
+my @header = ( 'Amount', 'Check #' );
+my @fields = ( 'paid', 'payinfo' );
+my @types = ( '', '' );
+my @align = ( 'r', 'r' );
+my @sizes = ( 8, 10 );
+my @colors = ( '', '' );
my %param = ();
-my @footer = ( '_TOTAL', '', '' );
-my @footer_align = ( 'r', 'r', '' );
-my @onchange = ( '', '', '' );
+my @footer = ( '_TOTAL', '' );
+my @footer_align = ( 'r', 'r' );
+my @onchange = ( '', '' );;
my $use_discounts = '';
# Not entirely sure this works anymore...
diff --git a/httemplate/misc/process/batch-cust_pay.cgi b/httemplate/misc/process/batch-cust_pay.cgi
index b4580bb..ff78862 100644
--- a/httemplate/misc/process/batch-cust_pay.cgi
+++ b/httemplate/misc/process/batch-cust_pay.cgi
@@ -38,7 +38,6 @@ foreach my $row ( map /^custnum(\d+)$/, keys %$param ) {
'paid' => $param->{"paid$row"},
'payby' => 'BILL',
'payinfo' => $param->{"payinfo$row"},
- '_date' => $param->{"_date$row"},
'discount_term' => $param->{"discount_term$row"},
'paybatch' => $paybatch,
'no_auto_apply' => exists($param->{"no_auto_apply$row"}) ? 'Y' : '',
-----------------------------------------------------------------------
Summary of changes:
httemplate/elements/customer-table.html | 26 ++------------------------
httemplate/misc/batch-cust_pay.html | 18 +++++++++---------
httemplate/misc/process/batch-cust_pay.cgi | 1 -
3 files changed, 11 insertions(+), 34 deletions(-)
More information about the freeside-commits
mailing list