From 80b548ef7cad9b01584f8ab2018e186a03148210 Mon Sep 17 00:00:00 2001 From: Jonathan Prykop Date: Wed, 27 Jul 2016 14:01:44 -0500 Subject: RT#71009: (v4+) OFM - Separate permissions for edit dates and contract dates [renamed start date files for generic use, original commit RT#38883] --- httemplate/misc/process/change_pkg_date.html | 53 ++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100755 httemplate/misc/process/change_pkg_date.html (limited to 'httemplate/misc/process/change_pkg_date.html') diff --git a/httemplate/misc/process/change_pkg_date.html b/httemplate/misc/process/change_pkg_date.html new file mode 100755 index 000000000..17a8518f9 --- /dev/null +++ b/httemplate/misc/process/change_pkg_date.html @@ -0,0 +1,53 @@ +<& /elements/header-popup.html &> + + + +<%init> + +my $curuser = $FS::CurrentUser::CurrentUser; +die "access denied" + unless $curuser->access_right('Change package start date'); + +$cgi->param('pkgnum') =~ /^(\d+)$/ + or die "illegal pkgnum"; +my $pkgnum = $1; + +my $cust_pkg = qsearchs({ + table => 'cust_pkg', + addl_from => ' JOIN cust_main USING (custnum) ', + hashref => { 'pkgnum' => $pkgnum }, + extra_sql => ' AND '. $curuser->agentnums_sql, +}) or die "Unknown pkgnum: $pkgnum"; + +my $cust_main = $cust_pkg->cust_main; + +my $error; +my $start_date; +if ( $cgi->param('when') eq 'now' ) { + # start it the next time billing runs + $start_date = ''; +} elsif ( $cgi->param('when') eq 'next_bill_date' ) { + $start_date = $cust_main->next_bill_date; +} elsif ( $cgi->param('when') eq 'date' ) { + $start_date = parse_datetime($cgi->param('start_date')); +} + +if ( $cust_pkg->setup ) { + # shouldn't happen + $error = 'This package has already started billing.'; +} else { + local $FS::UID::AutoCommit = 0; + foreach my $pkg ($cust_pkg, $cust_pkg->supplemental_pkgs) { + $pkg->set('start_date', $start_date); + $error ||= $pkg->replace; + } + $error ? dbh->rollback : dbh->commit; +} + +if ( $error ) { + $cgi->param('error', $error); + print $cgi->redirect($fsurl.'misc/change_pkg_start.html?', $cgi->query_string); +} + -- cgit v1.2.1 From 990d718978480aa02b0031a2ec6753e64975fd34 Mon Sep 17 00:00:00 2001 From: Jonathan Prykop Date: Wed, 27 Jul 2016 17:23:14 -0500 Subject: RT#71009: (v4+) OFM - Separate permissions for edit dates and contract dates --- httemplate/misc/process/change_pkg_date.html | 31 ++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 9 deletions(-) (limited to 'httemplate/misc/process/change_pkg_date.html') diff --git a/httemplate/misc/process/change_pkg_date.html b/httemplate/misc/process/change_pkg_date.html index 17a8518f9..5b1eedfad 100755 --- a/httemplate/misc/process/change_pkg_date.html +++ b/httemplate/misc/process/change_pkg_date.html @@ -6,9 +6,21 @@ <%init> +my $field = $cgi->param('field'); + +my ($acl, $isstart); +if ($field eq 'start_date') { + $acl = 'Change package start date'; + $isstart = 1; +} elsif ($field eq 'contract_end') { + $acl = 'Change package contract end date'; +} else { + die "Unknown date field"; +} + my $curuser = $FS::CurrentUser::CurrentUser; die "access denied" - unless $curuser->access_right('Change package start date'); + unless $curuser->access_right($acl); $cgi->param('pkgnum') =~ /^(\d+)$/ or die "illegal pkgnum"; @@ -24,23 +36,24 @@ my $cust_pkg = qsearchs({ my $cust_main = $cust_pkg->cust_main; my $error; -my $start_date; +my $date_value; if ( $cgi->param('when') eq 'now' ) { - # start it the next time billing runs - $start_date = ''; + # blank start means start it the next time billing runs + $date_value = $isstart ? '' : time; } elsif ( $cgi->param('when') eq 'next_bill_date' ) { - $start_date = $cust_main->next_bill_date; + $date_value = $cust_main->next_bill_date; } elsif ( $cgi->param('when') eq 'date' ) { - $start_date = parse_datetime($cgi->param('start_date')); + $date_value = parse_datetime($cgi->param('date_value')); } -if ( $cust_pkg->setup ) { +if ( $isstart && $cust_pkg->setup ) { # shouldn't happen $error = 'This package has already started billing.'; } else { local $FS::UID::AutoCommit = 0; foreach my $pkg ($cust_pkg, $cust_pkg->supplemental_pkgs) { - $pkg->set('start_date', $start_date); + last if $error; + $pkg->set($field, $date_value); $error ||= $pkg->replace; } $error ? dbh->rollback : dbh->commit; @@ -48,6 +61,6 @@ if ( $cust_pkg->setup ) { if ( $error ) { $cgi->param('error', $error); - print $cgi->redirect($fsurl.'misc/change_pkg_start.html?', $cgi->query_string); + print $cgi->redirect($fsurl.'misc/change_pkg_date.html?', $cgi->query_string); } -- cgit v1.2.1 From 3e5bee7db5e58a9938edc3926d55d7e71688ddb2 Mon Sep 17 00:00:00 2001 From: Jonathan Prykop Date: Fri, 29 Jul 2016 18:57:14 -0500 Subject: RT#71009: (v4+) OFM - Separate permissions for edit dates and contract dates [tweaked now handling] --- httemplate/misc/process/change_pkg_date.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'httemplate/misc/process/change_pkg_date.html') diff --git a/httemplate/misc/process/change_pkg_date.html b/httemplate/misc/process/change_pkg_date.html index 5b1eedfad..3084ec538 100755 --- a/httemplate/misc/process/change_pkg_date.html +++ b/httemplate/misc/process/change_pkg_date.html @@ -38,8 +38,9 @@ my $cust_main = $cust_pkg->cust_main; my $error; my $date_value; if ( $cgi->param('when') eq 'now' ) { - # blank start means start it the next time billing runs - $date_value = $isstart ? '' : time; + # blank start means start it the next time billing runs ("Now") + # blank contract end means it never ends ("Never") + $date_value = ''; } elsif ( $cgi->param('when') eq 'next_bill_date' ) { $date_value = $cust_main->next_bill_date; } elsif ( $cgi->param('when') eq 'date' ) { -- cgit v1.2.1