diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2015-01-18 14:03:07 -0800 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2015-01-18 14:03:07 -0800 |
| commit | 85c78d955fbc2fd6c3991156b387d37c185b9f64 (patch) | |
| tree | 682733a1bd4cd3e33434dac083569ca86e75d347 /httemplate/search | |
| parent | 89f9957267f05520fc676c378694383d16eedeb1 (diff) | |
disable quotations, RT#20688, RT#22232
Diffstat (limited to 'httemplate/search')
| -rw-r--r-- | httemplate/search/elements/search.html | 10 | ||||
| -rwxr-xr-x | httemplate/search/quotation.html | 38 |
2 files changed, 23 insertions, 25 deletions
diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html index 3fb1e3e74..62a0e4786 100644 --- a/httemplate/search/elements/search.html +++ b/httemplate/search/elements/search.html @@ -307,9 +307,11 @@ if ( $opt{'disableable'} ) { $opt{'query'}{'hashref'}{'disabled'} = ''; $opt{'query'}{'extra_sql'} =~ s/^\s*WHERE/ AND/i; + my $table = $opt{'query'}{'table'}; + $opt{'count_query'} .= ( $opt{'count_query'} =~ /WHERE/i ? ' AND ' : ' WHERE ' ). - "( disabled = '' OR disabled IS NULL )"; + "( $table.disabled = '' OR $table.disabled IS NULL )"; } elsif ( $opt{'disabled_statuspos'} || $opt{'disabled_statuspos'} eq '0' ) { #add status column @@ -360,12 +362,6 @@ unless ( $type =~ /^(csv|xml|\w*.xls)$/) { s/^\s*SELECT\s*(.*?)\s+FROM\s/SELECT COUNT(*) FROM /i; #silly vim:/ } - if ( $opt{disableable} && ! $cgi->param('showdisabled') ) { - $opt{count_query} .= - ( ( $opt{count_query} =~ /WHERE/i ) ? ' AND ' : ' WHERE ' ). - "( disabled = '' OR disabled IS NULL )"; - } - unless ( $type eq 'html-print' ) { #setup some pagination things if we're in html mode diff --git a/httemplate/search/quotation.html b/httemplate/search/quotation.html index fbc35bea1..6badb13b7 100755 --- a/httemplate/search/quotation.html +++ b/httemplate/search/quotation.html @@ -1,20 +1,22 @@ <& elements/search.html, - 'title' => emt('Quotation Search Results'), - 'html_init' => $html_init, - 'menubar' => $menubar, - 'name' => 'quotations', - 'query' => $sql_query, - 'count_query' => $count_query, - 'count_addl' => $count_addl, - 'redirect' => $link, - 'header' => [ emt('Quotation #'), - emt('Setup'), - emt('Recurring'), - emt('Date'), - emt('Prospect'), - emt('Customer'), - ], - 'fields' => [ + 'title' => emt('Quotation Search Results'), + 'html_init' => $html_init, + 'menubar' => $menubar, + 'name' => 'quotations', + 'query' => $sql_query, + 'count_query' => $count_query, + 'count_addl' => $count_addl, + 'redirect' => $link, + 'disableable' => 1, + 'disabled_statuspos' => 1, + 'header' => [ emt('Quotation #'), + emt('Setup'), + emt('Recurring'), + emt('Date'), + emt('Prospect'), + emt('Customer'), + ], + 'fields' => [ 'quotationnum', sub { $money_char. shift->total_setup }, sub { $money_char. shift->total_recur }, @@ -27,7 +29,7 @@ }, #\&FS::UI::Web::cust_fields, ], - 'sort_fields' => [ + 'sort_fields' => [ 'quotationnum', '', #FS::quotation->total_setup_sql, '', #FS::quotation->total_recur_sql, @@ -43,7 +45,7 @@ $link, $prospect_link, $cust_link, - #( map { $_ ne 'Cust. Status' ? $clink : '' } + #( map { $_ ne 'Cust. Status' ? $cust_link : '' } # FS::UI::Web::cust_header() #), ], |