From d17420aa6024c993fb785c455669518ef8befd32 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Sat, 15 Feb 2014 14:42:35 -0800 Subject: [PATCH] add "Edit package definition costs" ACL, RT#27140 --- FS/FS/AccessRight.pm | 3 ++- httemplate/edit/part_pkg.cgi | 11 +++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm index 0d8795bb8..b60db2202 100644 --- a/FS/FS/AccessRight.pm +++ b/FS/FS/AccessRight.pm @@ -351,7 +351,8 @@ tie my %rights, 'Tie::IxHash', 'Edit package definitions', { rightname=>'Edit global package definitions', global=>1 }, - + 'Edit package definition costs', + 'Bulk edit package definitions', 'Edit billing events', diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi index 0e1e993df..17c45b8a0 100755 --- a/httemplate/edit/part_pkg.cgi +++ b/httemplate/edit/part_pkg.cgi @@ -176,8 +176,15 @@ { type => 'tablebreak-tr-title', value => 'Cost tracking', #better name? }, - { field=>'setup_cost', type=>'money', }, - { field=>'recur_cost', type=>'money', }, + + ( $curuser->access_right('Edit package definition costs') + ? ( { field=>'setup_cost', type=>'money', }, + { field=>'recur_cost', type=>'money', }, + ) + : ( { field=>'setup_cost', type=>'fixed', }, + { field=>'recur_cost', type=>'fixed', }, + ) + ), ( $conf->exists('part_pkg-delay_start') ? ( { type => 'tablebreak-tr-title', -- 2.11.0