X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fquotation.html;h=0e3e8b3c6cbd9022455c9cffc3233855a24a254a;hb=71039cd742898a214fe7ae6f3908beb15a0270c6;hp=bd998bb915558c997ee6d067503dbc8a35681f4e;hpb=1553b7eca477f52824b6b352a0e87df68622411b;p=freeside.git
diff --git a/httemplate/view/quotation.html b/httemplate/view/quotation.html
index bd998bb91..0e3e8b3c6 100755
--- a/httemplate/view/quotation.html
+++ b/httemplate/view/quotation.html
@@ -1,5 +1,4 @@
<& /elements/header.html, mt('Quotation View'), $menubar &>
-
<& /elements/init_overlib.html &>
+% if ( $quotation->custnum ) {
+
Quotation #<% $quotationnum %>
+% if ($quotation->quotation_description) {
+ (<% $quotation->quotation_description |h %>)
+% }
+
+% }
+
% unless ( $quotation->disabled eq 'Y' ) {
+% my $inrow = 0;
% if ( $curuser->access_right('Order customer package') ) {
<& /elements/order_pkg_link.html,
'label' => emt('Add package'),
'actionlabel' => emt('Add package'),
map { $_ => $quotation->$_ } qw( quotationnum custnum prospectnum )
&>
+% $inrow++;
% }
% if ( $curuser->access_right('One-time charge') ) {
- | <& /elements/one_time_charge_link.html,
+ <% $inrow ? ' | ' : '' %>
+ <& /elements/one_time_charge_link.html,
map { $_ => $quotation->$_ } qw( quotationnum custnum prospectnum )
&>
+% $inrow++;
% }
-
+
+% if ( $can_generate_quotation ) {
+ <% $inrow ? ' | ' : '' %>
+ Edit quotation fields
+% $inrow++;
+% }
+
+ <% $inrow ? '
' : '' %>
% if ( 1 ) { #if ( $curuser->access_right('Send quotations') )
@@ -52,7 +70,9 @@ function areyousure(href, message) {
% if ( $curuser->access_right('New customer') && $quotation->quotation_pkg ) {
+% # if we end up with more than one option, combine these links and add an interstitial screen
Place order
+ | Order on hold
% }
@@ -73,6 +93,22 @@ function areyousure(href, message) {
% }
+% my $close_date = $quotation->close_date;
+% my $confidence = $quotation->confidence;
+% if ($close_date or length($confidence)) {
+
+% if ($close_date) {
+
+ Close Date: |
+ <% time2str($conf->config('date_format') || '%m/%d/%Y',$close_date) %> |
+
+% }
+% if (length($confidence)) {
+Confidence: | <% $confidence %>% |
+% }
+
+% }
+
% if ( $conf->exists('quotation_html') ) {
<% join('', $quotation->print_html( preref_callback=>$preref_callback )) %>
% } else {
@@ -85,9 +121,11 @@ function areyousure(href, message) {
my $curuser = $FS::CurrentUser::CurrentUser;
-#die "access denied"
+#die "access denied";
# unless $curuser->access_right('View quotations');
+my $can_generate_quotation = $curuser->access_right('Generate quotation');
+
my $quotationnum;
my($query) = $cgi->keywords;
if ( $query =~ /^(\d+)$/ ) {
@@ -114,11 +152,23 @@ my $link = "quotationnum=$quotationnum";
#$link .= ';notice_name='. $notice_name if $notice_name;
my $preref_callback = sub {
- areyousure_link("${p}misc/delete-quotation_pkg.html?". shift->quotationpkgnum,
+ my $quotation_pkg = shift;
+ $can_generate_quotation ?
+ areyousure_link("${p}misc/delete-quotation_pkg.html?". $quotation_pkg->quotationpkgnum,
emt('Are you sure you want to remove this package from the quotation?'),
emt('Remove this package'), #tooltip
qq(
), #link
- );
+ ) .
+ include('/elements/popup_link.html',
+ action => "${p}edit/quotation_pkg_detail.html?pkgnum=" .
+ $quotation_pkg->quotationpkgnum,
+ html_label => qq(
),
+ title => emt('Edit quotation details'),
+ actionlabel => emt('Edit quotation details'),
+ color => '#333399',
+ width => 763,
+ )
+ : '';
};
sub areyousure_link {