diff options
Diffstat (limited to 'httemplate')
-rw-r--r-- | httemplate/docs/credits.html | 8 | ||||
-rw-r--r-- | httemplate/docs/license.html | 10 | ||||
-rw-r--r-- | httemplate/search/elements/grouped-search.html | 2 | ||||
-rw-r--r-- | httemplate/search/elements/grouped-search/deposit_slip | 8 | ||||
-rw-r--r-- | httemplate/search/elements/grouped-search/html | 6 | ||||
-rw-r--r-- | httemplate/search/elements/search-deposit_slip.html | 17 | ||||
-rw-r--r-- | httemplate/search/elements/search.html | 9 |
7 files changed, 51 insertions, 9 deletions
diff --git a/httemplate/docs/credits.html b/httemplate/docs/credits.html index 4bcb266..d71d563 100644 --- a/httemplate/docs/credits.html +++ b/httemplate/docs/credits.html @@ -29,9 +29,6 @@ <BR> <H3>Core Team</H3> -Christopher Burger<BR> -Mitch Jackson<BR> -Jim Lucas<BR> Ivan Kohler<BR> <BR> @@ -64,6 +61,7 @@ Stephen Bechard<BR> Eric Bosrup<BR> Dickie Bradford<BR> Alex Brelsfoard<BR> +Christopher Burger<BR> Dave Burgess<BR> Joe Camadine<BR> Chris Cappuccio<BR> @@ -76,6 +74,7 @@ Dave Denney<BR> Serge Dolgov<BR> Scott Edwards<BR> Kenny Elliott<BR> +Velimir Gayevskiy<BR> Joshua Goodman<BR> Donald Greer<BR> Joel Griffiths<BR> @@ -85,12 +84,14 @@ Troy Hammonds<BR> Sean Hanson<BR> Dale Hege<BR> Kelly Hickel<BR> +Mitch Jackson<BR> Mark James<BR> Gary Jones<BR> Fernando M. Kiernan<BR> Frederico Caldeira Knabben<BR> Greg Kuhnert<BR> Steven Levithan<BR> +Jim Lucas<BR> Randall Lucas<BR> Foteos Macrides<BR> Roger Mangraviti<BR> @@ -100,6 +101,7 @@ David Peters<BR> Matt Peterson<BR> Luke Pfeifer<BR> Alan Phipps<BR> +Eric Sandeen<BR> Ricardo Signes<BR> Steve Simitzis<BR> Stanislav Sinyagin<BR> diff --git a/httemplate/docs/license.html b/httemplate/docs/license.html index 1b9d10a..2676920 100644 --- a/httemplate/docs/license.html +++ b/httemplate/docs/license.html @@ -6,7 +6,7 @@ <P> -Copyright © 2005-2017 Freeside Internet Services, Inc.<BR> +Copyright © 2005-2020 Freeside Internet Services, Inc.<BR> Copyright © 2000-2005 Ivan Kohler<BR> Copyright © 1999 Silicon Interactive Software Design<BR> All rights reserved<BR> @@ -152,6 +152,9 @@ licensed under the terms of MIT License. Contains the leaflet JavaScript library <a href="http://leafletjs.com/">Leaflet JS</a> by Vladimir Agafonkin, licensed under the terms of MIT License. +<P> +Contains a deposit slip template by Vel from <a href="http://latextypesetting.com">LaTeX Typesetting</a>. + <!-- artwork --> <P> @@ -170,7 +173,6 @@ http://www.iconarchive.com/show/oxygen-icons-by-oxygen-icons.org/Actions-documen licensed under GNU Lesser General Public License </P> - <P> Contains icons from <A HREF="https://www.iconfinder.com/colebemis" TARGET="_blank">iconfinder.com</A> @@ -178,5 +180,9 @@ by Cole Bemis, licensed under the terms of the Creative Commons Attribution 3.0 License. </p> +<P> +Contains the <a href="http://sandeen.net/GnuMICR/">GnuMICR font</a> +by Eric Sandeen, licensed under the terms of the GNU GPL. + </BODY> </HTML> diff --git a/httemplate/search/elements/grouped-search.html b/httemplate/search/elements/grouped-search.html index 56fc88d..80a9319 100644 --- a/httemplate/search/elements/grouped-search.html +++ b/httemplate/search/elements/grouped-search.html @@ -42,7 +42,7 @@ </%doc> <%init> my $type = 'html'; -if ($cgi->param('type') =~ /^(html|html-print|xls)$/) { +if ($cgi->param('type') =~ /^(html|html-print|xls|deposit_slip)$/) { $type = $1; } </%init> diff --git a/httemplate/search/elements/grouped-search/deposit_slip b/httemplate/search/elements/grouped-search/deposit_slip new file mode 100644 index 0000000..6e69662 --- /dev/null +++ b/httemplate/search/elements/grouped-search/deposit_slip @@ -0,0 +1,8 @@ +<& /search/elements/search-deposit_slip.html, rows=>\@rows, &>\ +<%init> +my %opt = @_; +my $group_info = $m->comp('core', %opt); +#just the first group +my $query = $group_info->{queries}[0]; +my @rows = $query->qsearch; +</%init> diff --git a/httemplate/search/elements/grouped-search/html b/httemplate/search/elements/grouped-search/html index ae80865..24cf50e 100644 --- a/httemplate/search/elements/grouped-search/html +++ b/httemplate/search/elements/grouped-search/html @@ -114,9 +114,13 @@ my $money = $conf->config('money_char') || '$'; %# download links <P><% emt('Download results:') %> % $cgi->param('type', 'xls'); -<A HREF="<% $cgi->self_url %>"><% emt('Spreadsheet') %></A> | +<A HREF="<% $cgi->self_url %>"><% emt('Spreadsheet') %></A> | % $cgi->param('type', 'html-print'); <A HREF="<% $cgi->self_url %>"><% emt('webpage') %></A> +% if ( ref($query) && $query->{table} eq 'cust_pay' ) { +% $cgi->param('type', 'deposit_slip'); + | <A HREF="<% $cgi->self_url %>"><% emt('deposit slip') %></A> +% } % $cgi->delete('type'); </P> % } diff --git a/httemplate/search/elements/search-deposit_slip.html b/httemplate/search/elements/search-deposit_slip.html new file mode 100644 index 0000000..c7a6cbb --- /dev/null +++ b/httemplate/search/elements/search-deposit_slip.html @@ -0,0 +1,17 @@ +<% $deposit_pdf %>\ +<%init> + +my %args = @_; +my $rows = $args{'rows'}; + +my $deposit_pdf = deposit_slip_pdf( + conf => FS::Conf->new, + cust_pay => $rows, +); + +http_header('Content-Type' => 'application/pdf'); +http_header('Content-Disposition' => "filename=deposit.pdf" ); +http_header('Content-Length' => length($deposit_pdf) ); +http_header('Cache-control' => 'max-age=60' ); + +</%init> diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html index 730a51a..60548e2 100644 --- a/httemplate/search/elements/search.html +++ b/httemplate/search/elements/search.html @@ -198,6 +198,10 @@ Example: % <% include('search-xml.html', rows=>$rows, opt=>\%opt ) %> % +% } elsif ( $type eq 'deposit_slip' ) { +% +<% include('search-deposit_slip.html', rows=>$rows, opt=>\%opt ) %> +% % } else { % <% include('search-html.html', @@ -224,8 +228,9 @@ my $curuser = $FS::CurrentUser::CurrentUser; $m->comp('/elements/handle_uri_query'); -my $type = $cgi->param('_type') =~ /^(csv|\w*\.xls|xml|select|html(-print)?)$/ - ? $1 : 'html' ; +my $type = $cgi->param('_type') + =~ /^(csv|\w*\.xls|xml|select|html(-print)?|deposit_slip)$/ + ? $1 : 'html' ; if ( !$curuser->access_right('Download report data') ) { $opt{'disable_download'} = 1; |