Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9 from alltheworld/report2

Browse Source 
Report2
This commit is contained in:
Hillel Coren 2014-02-21 13:57:34 +02:00
commit 295aaa60cf
3 changed files with 691 additions and 373 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/views/invoices/edit.blade.php
View File

@ -207,10 +207,10 @@
</div> </div>
<div style="display:none">
{{ Former::select('invoice_design_id')->label('Design')->style('display:inline;width:120px')->raw() {{ Former::select('invoice_design_id')->label('Design')->style('display:inline;width:120px')->raw()
->fromQuery($invoiceDesigns, 'name', 'id')->data_bind("value: invoice_design_id") }} ->fromQuery($invoiceDesigns, 'name', 'id')->data_bind("value: invoice_design_id") }}
</div>
{{ Button::normal('Download PDF', array('onclick' => 'onDownloadClick()')) }} {{ Button::normal('Download PDF', array('onclick' => 'onDownloadClick()')) }}
@ -558,6 +558,15 @@
invoice.imageWidth = {{ $account->getLogoWidth() }}; invoice.imageWidth = {{ $account->getLogoWidth() }};
invoice.imageHeight = {{ $account->getLogoHeight() }}; invoice.imageHeight = {{ $account->getLogoHeight() }};
@endif @endif
//define logo images
invoice.imageLogo1 = "{{ HTML::image_data('images/report_logo1.jpg') }}";
invoice.imageLogoWidth1 =120;
invoice.imageLogoHeight1 = 40
return invoice; return invoice;
} }

BIN
public/images/report_logo1.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

1051
public/js/script.js Executable file → Normal file
View File

File diff suppressed because it is too large Load Diff