diff options
| author | Mark Wells <mark@freeside.biz> | 2015-04-26 23:58:08 -0700 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2015-04-26 23:58:08 -0700 |
| commit | 67c00bb4c9309c1ae314aa5b8657273f24539270 (patch) | |
| tree | c73d7ee2914169d87d06ef20939d28a89e038827 /FS | |
| parent | 89776e0f215a6ccc42f49a3323bce87b26b5b221 (diff) | |
adjustments for 3.x, #33852
Diffstat (limited to 'FS')
| -rw-r--r-- | FS/FS/ClientAPI/MyAccount/quotation.pm | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/FS/FS/ClientAPI/MyAccount/quotation.pm b/FS/FS/ClientAPI/MyAccount/quotation.pm index 90c2acebb..f3067f14e 100644 --- a/FS/FS/ClientAPI/MyAccount/quotation.pm +++ b/FS/FS/ClientAPI/MyAccount/quotation.pm @@ -5,7 +5,7 @@ use FS::Record qw(qsearch qsearchs); use FS::quotation; use FS::quotation_pkg; -our $DEBUG = 1; +our $DEBUG = 0; sub _custoragent_session_custnum { FS::ClientAPI::MyAccount::_custoragent_session_custnum(@_); @@ -58,6 +58,7 @@ Returns a hashref describing the current quotation, containing: =cut +use Data::Dumper; sub quotation_info { my $p = shift; @@ -69,13 +70,22 @@ sub quotation_info { warn "quotation_info #".$quotation->quotationnum if $DEBUG; - # code reuse ftw my $null_escape = sub { @_ }; - my ($sections) = $quotation->_items_sections(escape => $null_escape); - foreach my $section (@$sections) { - $section->{'detail_items'} = - [ $quotation->_items_pkg('section' => $section, escape_function => $null_escape) ]; - } + # 3.x only; 4.x quotation redesign uses actual sections for this + # and isn't a weird hack + my @items = + map { $_->{'pkgnum'} = $_->{'preref_html'}; $_ } + $quotation->_items_pkg(escape_function => $null_escape, + preref_callback => sub { shift->quotationpkgnum }); + push @items, $quotation->_items_total(); + + my $sections = [ + { 'description' => 'Estimated Charges', + 'detail_items' => \@items + } + ]; + warn Dumper $sections; + return { 'error' => '', 'sections' => $sections } } |