[freeside-commits] freeside/httemplate/search cust_bill_event.cgi, 1.18, 1.18.4.1 cust_bill.html, 1.37, 1.37.2.1 cust_bill_pay.html, 1.2, 1.2.4.1 cust_bill_pkg.cgi, 1.37, 1.37.2.1 cust_bill_pkg_discount.html, 1.2, 1.2.2.1 cust_credit_bill.html, 1.1, 1.1.10.1 cust_credit.html, 1.16, 1.16.2.1 cust_credit_refund.html, 1.1, 1.1.10.1 cust_event.html, 1.8, 1.8.4.1 cust_pkg_svc.html, 1.1, 1.1.2.1 cust_svc.html, 1.9, 1.9.2.1 pay_batch.cgi, 1.5, 1.5.4.1 queue.html, 1.7, 1.7.4.1 svc_domain.cgi, 1.24, 1.24.8.1 svc_external.cgi, 1.7, 1.7.6.1 svc_forward.cgi, 1.13, 1.13.8.1 svc_phone.cgi, 1.9, 1.9.4.1 svc_www.cgi, 1.11, 1.11.8.1
Ivan,,,
ivan at wavetail.420.am
Wed Nov 10 17:44:54 PST 2010
- Previous message: [freeside-commits] freeside/httemplate/browse access_group.html, 1.9, 1.9.8.1 access_user.html, 1.11, 1.11.4.1 agent_type.cgi, 1.20, 1.20.6.1 cust_attachment.html, 1.3, 1.3.4.1 cust_category.html, 1.1, 1.1.4.1 cust_class.html, 1.1, 1.1.4.1 discount.html, 1.1, 1.1.4.1 part_pkg_report_option.html, 1.2, 1.2.4.1 pkg_category.html, 1.5, 1.5.4.1 pkg_class.html, 1.7, 1.7.4.1 rate.cgi, 1.9, 1.9.4.1 svc_acct_pop.cgi, 1.23, 1.23.6.1 usage_class.html, 1.2, 1.2.4.1
- Next message: [freeside-commits] freeside/FS/FS Schema.pm, 1.242, 1.243 Conf.pm, 1.397, 1.398
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail.420.am:/tmp/cvs-serv22888/httemplate/search
Modified Files:
Tag: FREESIDE_2_1_BRANCH
cust_bill_event.cgi cust_bill.html cust_bill_pay.html
cust_bill_pkg.cgi cust_bill_pkg_discount.html
cust_credit_bill.html cust_credit.html cust_credit_refund.html
cust_event.html cust_pkg_svc.html cust_svc.html pay_batch.cgi
queue.html svc_domain.cgi svc_external.cgi svc_forward.cgi
svc_phone.cgi svc_www.cgi
Log Message:
sort by clicking on headers, RT#6465
Index: queue.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/queue.html,v
retrieving revision 1.7
retrieving revision 1.7.4.1
diff -u -w -d -r1.7 -r1.7.4.1
--- queue.html 13 May 2010 05:43:22 -0000 1.7
+++ queue.html 11 Nov 2010 01:44:50 -0000 1.7.4.1
@@ -4,7 +4,7 @@
'html_form' => qq!<FORM NAME="jobForm" ACTION="$p/misc/queue.cgi" METHOD="POST">!,
'query' => { 'table' => 'queue',
'hashref' => $hashref,
- 'extra_sql' => 'ORDER BY jobnum',
+ 'order_by' => 'ORDER BY jobnum',
},
'count_query' => $count_query,
'header' => [ '#',
Index: cust_bill_pay.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_bill_pay.html,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -w -d -r1.2 -r1.2.4.1
--- cust_bill_pay.html 24 Jan 2010 19:52:14 -0000 1.2
+++ cust_bill_pay.html 11 Nov 2010 01:44:50 -0000 1.2.4.1
@@ -25,6 +25,16 @@
sub { shift->cust_pay_otaker },
\&FS::UI::Web::cust_fields,
],
+ 'sort_fields' => [
+ 'amount',
+ 'invnum',
+ 'cust_bill_charged',
+ 'cust_bill_date',
+ '',
+ 'cust_pay_paid',
+ 'cust_pay_date',
+ '',
+ ],
'align' => 'rrrrlrrl'.FS::UI::Web::cust_aligns(),
'links' => [
'',
Index: cust_bill_pkg.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_bill_pkg.cgi,v
retrieving revision 1.37
retrieving revision 1.37.2.1
diff -u -w -d -r1.37 -r1.37.2.1
--- cust_bill_pkg.cgi 5 Nov 2010 18:16:22 -0000 1.37
+++ cust_bill_pkg.cgi 11 Nov 2010 01:44:50 -0000 1.37.2.1
@@ -74,6 +74,17 @@
sub { time2str('%b %d %Y', shift->_date ) },
\&FS::UI::Web::cust_fields,
],
+ 'sort_fields' => [
+ 'setup', #broken in $unearned case i guess
+ ( $unearned ? ('', '') : () ),
+ ( $use_usage eq 'recurring' ? 'recur - usage' :
+ $use_usage eq 'usage' ? 'usage'
+ : 'recur'
+ ),
+ ( $undearned ? ('sdate', 'edate') : () ),
+ 'invnum',
+ '_date',
+ ],
'links' => [
#'',
'',
Index: cust_event.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_event.html,v
retrieving revision 1.8
retrieving revision 1.8.4.1
diff -u -w -d -r1.8 -r1.8.4.1
--- cust_event.html 4 Dec 2009 04:40:27 -0000 1.8
+++ cust_event.html 11 Nov 2010 01:44:50 -0000 1.8.4.1
@@ -188,7 +188,8 @@
FS::UI::Web::cust_sql_fields(),
),
'hashref' => {},
- 'extra_sql' => "$where ORDER BY _date ASC",
+ 'extra_sql' => $where,
+ 'order_by' => 'ORDER BY _date ASC',
'addl_from' => $join,
};
Index: svc_domain.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/svc_domain.cgi,v
retrieving revision 1.24
retrieving revision 1.24.8.1
diff -u -w -d -r1.24 -r1.24.8.1
--- svc_domain.cgi 1 Aug 2007 22:26:46 -0000 1.24
+++ svc_domain.cgi 11 Nov 2010 01:44:50 -0000 1.24.8.1
@@ -97,7 +97,8 @@
'cust_main.custnum',
FS::UI::Web::cust_sql_fields(),
),
- 'extra_sql' => "$extra_sql $orderby",
+ 'extra_sql' => $extra_sql,
+ 'order_by' => $orderby,
'addl_from' => $addl_from,
};
Index: pay_batch.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/pay_batch.cgi,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -u -w -d -r1.5 -r1.5.4.1
--- pay_batch.cgi 9 Apr 2010 08:18:24 -0000 1.5
+++ pay_batch.cgi 11 Nov 2010 01:44:50 -0000 1.5.4.1
@@ -3,7 +3,8 @@
'name_singular' => 'batch',
'query' => { 'table' => 'pay_batch',
'hashref' => $hashref,
- 'extra_sql' => "$extra_sql ORDER BY batchnum DESC",
+ 'extra_sql' => $extra_sql,
+ 'order_by' => 'ORDER BY batchnum DESC',
},
'count_query' => "$count_query $extra_sql",
'header' => [ 'Batch',
Index: svc_www.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/svc_www.cgi,v
retrieving revision 1.11
retrieving revision 1.11.8.1
diff -u -w -d -r1.11 -r1.11.8.1
--- svc_www.cgi 1 Aug 2007 22:26:46 -0000 1.11
+++ svc_www.cgi 11 Nov 2010 01:44:50 -0000 1.11.8.1
@@ -96,7 +96,8 @@
'cust_main.custnum',
FS::UI::Web::cust_sql_fields(),
),
- 'extra_sql' => "$extra_sql $orderby",
+ 'extra_sql' => $extra_sql,
+ 'order_by' => $orderby,
'addl_from' => $addl_from,
};
Index: cust_svc.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_svc.html,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -w -d -r1.9 -r1.9.2.1
--- cust_svc.html 25 Oct 2010 22:29:36 -0000 1.9
+++ cust_svc.html 11 Nov 2010 01:44:50 -0000 1.9.2.1
@@ -110,7 +110,8 @@
'table' => 'cust_svc',
'addl_from' => $addl_from,
'hashref' => {},
- 'extra_sql' => "$extra_sql $orderby",
+ 'extra_sql' => $extra_sql,
+ 'order_by' => $orderby,
};
my $count_query = "SELECT COUNT(*) FROM cust_svc $addl_from $extra_sql";
Index: cust_pkg_svc.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_pkg_svc.html,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -w -d -r1.1 -r1.1.2.1
--- cust_pkg_svc.html 25 Oct 2010 22:22:42 -0000 1.1
+++ cust_pkg_svc.html 11 Nov 2010 01:44:50 -0000 1.1.2.1
@@ -78,7 +78,8 @@
'table' => 'cust_svc',
'addl_from' => $addl_from,
'hashref' => {},
- 'extra_sql' => "$extra_sql $orderby",
+ 'extra_sql' => $extra_sql,
+ 'order_by' => $orderby,
};
#warn Dumper($sql_query)."\n";
Index: cust_bill_pkg_discount.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_bill_pkg_discount.html,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -w -d -r1.2 -r1.2.2.1
--- cust_bill_pkg_discount.html 15 Aug 2010 07:00:21 -0000 1.2
+++ cust_bill_pkg_discount.html 11 Nov 2010 01:44:50 -0000 1.2.2.1
@@ -26,6 +26,14 @@
sub { time2str('%b %d %Y', shift->_date ) },
\&FS::UI::Web::cust_fields,
],
+ 'sort_fields' => [
+ '',
+ 'amount',
+ 'months',
+ 'pkg',
+ 'invnum',
+ '_date',
+ ],
'links' => [
#'',
'', #link to customer discount???
Index: svc_phone.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/svc_phone.cgi,v
retrieving revision 1.9
retrieving revision 1.9.4.1
diff -u -w -d -r1.9 -r1.9.4.1
--- svc_phone.cgi 22 Oct 2009 08:08:59 -0000 1.9
+++ svc_phone.cgi 11 Nov 2010 01:44:50 -0000 1.9.4.1
@@ -161,7 +161,8 @@
'cust_main.custnum',
FS::UI::Web::cust_sql_fields(),
),
- 'extra_sql' => "$extra_sql $orderby",
+ 'extra_sql' => $extra_sql,
+ 'order_by' => $orderby,
'addl_from' => $addl_from,
};
Index: cust_bill_event.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_bill_event.cgi,v
retrieving revision 1.18
retrieving revision 1.18.4.1
diff -u -w -d -r1.18 -r1.18.4.1
--- cust_bill_event.cgi 4 Dec 2009 04:40:27 -0000 1.18
+++ cust_bill_event.cgi 11 Nov 2010 01:44:49 -0000 1.18.4.1
@@ -113,7 +113,8 @@
FS::UI::Web::cust_sql_fields(),
),
'hashref' => {},
- 'extra_sql' => "$where ORDER BY _date ASC",
+ 'extra_sql' => $where,
+ 'order_by' => 'ORDER BY _date ASC',
'addl_from' => $join,
};
Index: cust_bill.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_bill.html,v
retrieving revision 1.37
retrieving revision 1.37.2.1
diff -u -w -d -r1.37 -r1.37.2.1
--- cust_bill.html 28 Aug 2010 00:18:28 -0000 1.37
+++ cust_bill.html 11 Nov 2010 01:44:50 -0000 1.37.2.1
@@ -22,6 +22,13 @@
sub { time2str('%b %d %Y', shift->_date ) },
\&FS::UI::Web::cust_fields,
],
+ 'sort_fields' => [
+ 'COALESCE( agent_invid, invnum )',
+ FS::cust_bill->owed_sql,
+ FS::cust_bill->net_sql,
+ 'charged',
+ '_date',
+ ],
'align' => 'rrrrl'.FS::UI::Web::cust_aligns(),
'links' => [
$link,
Index: cust_credit.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_credit.html,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -w -d -r1.16 -r1.16.2.1
--- cust_credit.html 22 Sep 2010 00:08:29 -0000 1.16
+++ cust_credit.html 11 Nov 2010 01:44:50 -0000 1.16.2.1
@@ -7,6 +7,7 @@
#'redirect' => $link,
'header' => \@header,
'fields' => \@fields,
+ 'sort_fields' => \@sort_fields,
'align' => $align,
'links' => \@links,
'color' => \@color,
@@ -32,12 +33,13 @@
: '';
};
-my (@header, @fields, $align, @links, @color, @style);
+my (@header, @fields, @sort_fields, $align, @links, @color, @style);
$align = '';
#amount
push @header, 'Amount';
push @fields, sub { $money_char .sprintf('%.2f', shift->amount) };
+push @sort_fields, 'amount';
$align .= 'r';
push @links, '';
push @color, '';
@@ -47,6 +49,7 @@
if ($unapplied) {
push @header, 'Unapplied';
push @fields, sub { $money_char .sprintf('%.2f', shift->unapplied_amount) };
+ push @sort_fields, '';
$align .= 'r';
push @links, '';
push @color, '';
@@ -63,6 +66,7 @@
'reason',
\&FS::UI::Web::cust_fields,
;
+push @sort_fields, '_date', 'otaker', 'reason';
$align .= 'rll'.FS::UI::Web::cust_aligns(),
push @links, '',
'',
Index: svc_external.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/svc_external.cgi,v
retrieving revision 1.7
retrieving revision 1.7.6.1
diff -u -w -d -r1.7 -r1.7.6.1
--- svc_external.cgi 15 Sep 2009 20:44:29 -0000 1.7
+++ svc_external.cgi 11 Nov 2010 01:44:50 -0000 1.7.6.1
@@ -121,7 +121,8 @@
'cust_main.custnum',
FS::UI::Web::cust_sql_fields(),
),
- 'extra_sql' => "$extra_sql $orderby",
+ 'extra_sql' => $extra_sql,
+ 'order_by' => $orderby,
'addl_from' => $addl_from,
};
Index: cust_credit_bill.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_credit_bill.html,v
retrieving revision 1.1
retrieving revision 1.1.10.1
diff -u -w -d -r1.1 -r1.1.10.1
--- cust_credit_bill.html 14 Mar 2008 07:48:44 -0000 1.1
+++ cust_credit_bill.html 11 Nov 2010 01:44:50 -0000 1.1.10.1
@@ -30,6 +30,13 @@
sub { shift->cust_credit->reason },
\&FS::UI::Web::cust_fields,
],
+ 'sort_fields' => [
+ 'amount',
+ 'invnum',
+ 'cust_credit_amount', #?
+ '', #'otaker' #this is usernum now
+ '',
+ ],
'align' => 'rrrll'.FS::UI::Web::cust_aligns(),
'links' => [
'',
Index: cust_credit_refund.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_credit_refund.html,v
retrieving revision 1.1
retrieving revision 1.1.10.1
diff -u -w -d -r1.1 -r1.1.10.1
--- cust_credit_refund.html 19 May 2008 04:07:02 -0000 1.1
+++ cust_credit_refund.html 11 Nov 2010 01:44:50 -0000 1.1.10.1
@@ -28,6 +28,11 @@
sub { shift->cust_refund->otaker },
\&FS::UI::Web::cust_fields,
],
+ 'sort_fields' => [
+ 'amount',
+ '', #cust_credit_amount? cust_credit_date? prolly split field
+ '', #_date? cust_refund_refund? also split
+ ],
'align' => 'rrrl'.FS::UI::Web::cust_aligns(),
'links' => [
'',
Index: svc_forward.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/svc_forward.cgi,v
retrieving revision 1.13
retrieving revision 1.13.8.1
diff -u -w -d -r1.13 -r1.13.8.1
--- svc_forward.cgi 1 Aug 2007 22:26:46 -0000 1.13
+++ svc_forward.cgi 11 Nov 2010 01:44:50 -0000 1.13.8.1
@@ -89,7 +89,8 @@
'cust_main.custnum',
FS::UI::Web::cust_sql_fields(),
),
- 'extra_sql' => "$extra_sql $orderby",
+ 'extra_sql' => $extra_sql,
+ 'order_by' => $orderby,
'addl_from' => $addl_from,
};
- Previous message: [freeside-commits] freeside/httemplate/browse access_group.html, 1.9, 1.9.8.1 access_user.html, 1.11, 1.11.4.1 agent_type.cgi, 1.20, 1.20.6.1 cust_attachment.html, 1.3, 1.3.4.1 cust_category.html, 1.1, 1.1.4.1 cust_class.html, 1.1, 1.1.4.1 discount.html, 1.1, 1.1.4.1 part_pkg_report_option.html, 1.2, 1.2.4.1 pkg_category.html, 1.5, 1.5.4.1 pkg_class.html, 1.7, 1.7.4.1 rate.cgi, 1.9, 1.9.4.1 svc_acct_pop.cgi, 1.23, 1.23.6.1 usage_class.html, 1.2, 1.2.4.1
- Next message: [freeside-commits] freeside/FS/FS Schema.pm, 1.242, 1.243 Conf.pm, 1.397, 1.398
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the freeside-commits
mailing list