From 95f871fc98eff48bb4af211d705f788a06d3bf4c Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Sun, 17 May 2015 17:38:29 -0700 Subject: payment application detail report, RT#34871 --- httemplate/elements/menu.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'httemplate/elements') diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html index 1bab4ef46..34bba7e8c 100644 --- a/httemplate/elements/menu.html +++ b/httemplate/elements/menu.html @@ -328,13 +328,14 @@ tie my %report_bill_event, 'Tie::IxHash', ; tie my %report_payments, 'Tie::IxHash', - 'Payments' => [ $fsurl.'search/report_cust_pay.html', 'Payment report (by type and/or date range)' ], + 'Payments' => [ $fsurl.'search/report_cust_pay.html', 'Payment report (by type and/or date range)' ], + 'Payment application detail' => [ $fsurl.'search/report_cust_bill_pay_pkg.html', 'Line item application detail' ], ; $report_payments{'Pending Payments'} = [ $fsurl.'search/cust_pay_pending.html?magic=_date;statusNOT=done', 'Pending real-time payments' ] if $curuser->access_right('View customer pending payments'); +$report_payments{'Unapplied Payments'} = [ $fsurl.'search/report_cust_pay.html?unapplied=1', 'Unapplied payment report (by type and/or date range)' ]; $report_payments{'Voided Payments'} = [ $fsurl.'search/report_cust_pay.html?void=1', 'Voided payment report (by type and/or date range)' ] if $curuser->access_right('View customer pending payments'); -$report_payments{'Unapplied Payments'} = [ $fsurl.'search/report_cust_pay.html?unapplied=1', 'Unapplied payment report (by type and/or date range)' ]; $report_payments{'Payment Batches'} = [ $fsurl.'search/pay_batch.html', 'Payment batches (by status and/or date range)' ] if $conf->exists('batch-enable') || $conf->config('batch-enable_payby'); $report_payments{'Unapplied Payment Aging'} = [ $fsurl.'search/report_unapplied_cust_pay.html', 'Unapplied payment aging report' ]; -- cgit v1.2.1 From fb7f3203c7d839ae3964d5e2cac71892422a10d1 Mon Sep 17 00:00:00 2001 From: Jonathan Prykop Date: Tue, 5 May 2015 15:49:51 -0500 Subject: RT#34289: Flag service fields as mandatory --- httemplate/elements/tr-input-date-field.html | 9 ++++++--- httemplate/elements/tr-select-hardware_type.html | 5 +++-- httemplate/elements/tr-select-router_block_ip.html | 6 +++--- 3 files changed, 12 insertions(+), 8 deletions(-) (limited to 'httemplate/elements') diff --git a/httemplate/elements/tr-input-date-field.html b/httemplate/elements/tr-input-date-field.html index ff9855184..f2a570b99 100644 --- a/httemplate/elements/tr-input-date-field.html +++ b/httemplate/elements/tr-input-date-field.html @@ -13,6 +13,7 @@ Example: 'usedatetime' => 1, #use DateTime->strftime to format the date # instead of Date::Format->time2str 'noinit' => 1, #first one on the page is enough + 'required' => 1, }, &> @@ -24,8 +25,9 @@ Example: % } - - <% $label %> +<% include('/elements/tr-td-label.html', + 'label' => $label, + 'required' => $required ) %> > @@ -48,7 +50,7 @@ Example: <%init> -my($name, $value, $label, $format, $usedatetime, $noinit, $colspan); +my($name, $value, $label, $format, $usedatetime, $noinit, $colspan, $required); if ( ref($_[0]) ) { my $opt = shift; $name = $opt->{'name'}; @@ -58,6 +60,7 @@ if ( ref($_[0]) ) { $usedatetime = $opt->{'usedatetime'}; $noinit = $opt->{'noinit'}; $colspan = $opt->{'colspan'} || 1; + $required = $opt->{'required'}; } else { ($name, $value, $label, $format, $usedatetime) = @_; $colspan = 1; diff --git a/httemplate/elements/tr-select-hardware_type.html b/httemplate/elements/tr-select-hardware_type.html index c3066417b..b51afc0a5 100644 --- a/httemplate/elements/tr-select-hardware_type.html +++ b/httemplate/elements/tr-select-hardware_type.html @@ -1,5 +1,6 @@ - - <% $opt{'label'} || 'Device type: ' %> +<% include('/elements/tr-td-label.html', + 'label' => $opt{'label'} || 'Device type: ', + 'required' => $opt{'required'} ) %> <% include('select-hardware_type.html', %opt) %> diff --git a/httemplate/elements/tr-select-router_block_ip.html b/httemplate/elements/tr-select-router_block_ip.html index 11f7c4831..ee135686c 100644 --- a/httemplate/elements/tr-select-router_block_ip.html +++ b/httemplate/elements/tr-select-router_block_ip.html @@ -30,7 +30,7 @@ function clearhint_ip_addr (what) { what.value = ''; } -<& /elements/tr-td-label.html, label => ($opt{'label'} || 'Router') &> +<& /elements/tr-td-label.html, label => ($opt{'label'} || 'Router'), required => $opt{'required'} &> <& /elements/select-tiered.html, prefix => 'router_', tiers => [ { @@ -56,9 +56,9 @@ function clearhint_ip_addr (what) { ] &> -<& /elements/tr-td-label.html, label => 'IP address' &> +<& /elements/tr-td-label.html, label => 'IP address', required => $opt{'ip_addr_required'} &> -% warn Dumper \%fixed; +% #warn Dumper \%fixed; % if ( exists $fixed{$ip_field} ) { <% $opt{'ip_addr'} || '' %> -- cgit v1.2.1 From cca0cc20700b15a95b2c61e527b3a128c6efb32e Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Wed, 3 Jun 2015 22:16:26 -0700 Subject: set appointment length, RT#33556 --- httemplate/elements/make_appointment.html | 34 ++++++++++++++++++++++ .../elements/popup_link-make_appointment.html | 31 ++++++++++++++++++++ httemplate/elements/schedule-appointment.html | 21 +++++++++++++ 3 files changed, 86 insertions(+) create mode 100644 httemplate/elements/make_appointment.html create mode 100644 httemplate/elements/popup_link-make_appointment.html create mode 100644 httemplate/elements/schedule-appointment.html (limited to 'httemplate/elements') diff --git a/httemplate/elements/make_appointment.html b/httemplate/elements/make_appointment.html new file mode 100644 index 000000000..f9e80045c --- /dev/null +++ b/httemplate/elements/make_appointment.html @@ -0,0 +1,34 @@ +<& /elements/header-popup.html &> + +% #XXX actually, the action needs to repace the top-level window with this +% #$params->{'action'} = $p. 'rt/Search/Schedule.html?'. $query; +
+ + + +% my @sched_item = qsearch('sched_item', { 'disabled' => '', }); +% my @username = map $_->access_user->username, @sched_item; +% foreach my $username (@username) { + +% } + +Length: + +
+
+ + + +
+ +<& /elements/footer-popup.html &> +<%init> + +#XXX '&pkgnum=$pkgnum";need to be for specific package/location, not just for a customer... default to active(/ordered) package in a pkg_class w/ticketing_queueid, otherwise, a popup? (well, we're already a popup now) we're getting complicated like form-creat_ticket.html + + + diff --git a/httemplate/elements/popup_link-make_appointment.html b/httemplate/elements/popup_link-make_appointment.html new file mode 100644 index 000000000..60a337c04 --- /dev/null +++ b/httemplate/elements/popup_link-make_appointment.html @@ -0,0 +1,31 @@ +<%doc> + +Example: + + include('/elements/init_overlib.html') + + include( '/elements/popup_link-make-appointment.html', { #hashref or a list, either way + 'custnum' => 54, + }) + + +<& /elements/popup_link.html, $params &>\ +<%init> + +my $params = { 'closetext' => 'Close' }; + +if (ref($_[0]) eq 'HASH') { + $params = { %$params, %{ $_[0] } }; +} else { + $params = { %$params, @_ }; +} + +#$params->{'label'} ||= 'schedule new appointment'; +$params->{'label'} ||= 'Schedule new appointment'; +$params->{'actionlabel'} ||= 'Schedule appointment'; +#$params->{'width'} ||= 350; +#$params->{'height'} ||= 220; + +$params->{'action'} = $p. '/elements/make_appointment.html?custnum='. $params->{'custnum'}; + + diff --git a/httemplate/elements/schedule-appointment.html b/httemplate/elements/schedule-appointment.html new file mode 100644 index 000000000..a469c8405 --- /dev/null +++ b/httemplate/elements/schedule-appointment.html @@ -0,0 +1,21 @@ + + + + + +<%init> + +my @username = map encode_entities($_), $cgi->param('username'); +my $LengthMin = encode_entities( $cgi->param('LengthMin') ); +my $custnum = encode_entities( $cgi->param('custnum') ); + +my $query = join('&', map "username=$_", @username). + "&LengthMin=$LengthMin". + "&custnum=$custnum"; + #XXX '&pkgnum=$pkgnum";need to be for specific package/location, not just for a customer... default to active(/ordered) package in a pkg_class w/ticketing_queueid, otherwise, a popup? we're getting complicated like form-creat_ticket.html + +my $url = $p. 'rt/Search/Schedule.html?'. $query; + + -- cgit v1.2.1 From be50cb8c900bfc20c873996a9ab6c48009de0204 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Wed, 3 Jun 2015 22:32:55 -0700 Subject: default appointment length, RT#33556 --- httemplate/elements/make_appointment.html | 7 ++++++- httemplate/elements/schedule-appointment.html | 7 +++---- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'httemplate/elements') diff --git a/httemplate/elements/make_appointment.html b/httemplate/elements/make_appointment.html index f9e80045c..ddf377f54 100644 --- a/httemplate/elements/make_appointment.html +++ b/httemplate/elements/make_appointment.html @@ -15,7 +15,10 @@ Length:
@@ -28,6 +31,8 @@ Length: <& /elements/footer-popup.html &> <%init> +my $default_length = FS::Conf->new->config('default_appointment_length') || 180; + #XXX '&pkgnum=$pkgnum";need to be for specific package/location, not just for a customer... default to active(/ordered) package in a pkg_class w/ticketing_queueid, otherwise, a popup? (well, we're already a popup now) we're getting complicated like form-creat_ticket.html diff --git a/httemplate/elements/schedule-appointment.html b/httemplate/elements/schedule-appointment.html index a469c8405..45a8a5bab 100644 --- a/httemplate/elements/schedule-appointment.html +++ b/httemplate/elements/schedule-appointment.html @@ -1,10 +1,9 @@ - - +<& /elements/header-popup.html &> +

Scheduling appointment...

- - +<& /elements/footer-popup.html &> <%init> my @username = map encode_entities($_), $cgi->param('username'); -- cgit v1.2.1