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

Corrected invoice items spacing on second page of PDF

Browse Source
This commit is contained in:
Hillel Coren 2015-03-03 14:59:52 +02:00
parent 6e03bc7510
commit 29833e6d83
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/ClientApiController.php
View File

@ -40,6 +40,8 @@ class ClientApiController extends Controller
return Response::make($error, 500, $headers); return Response::make($error, 500, $headers);
} else { } else {
$client = $this->clientRepo->save(false, $data, false); $client = $this->clientRepo->save(false, $data, false);
$client->load('contacts');
$client = Utils::remapPublicIds($client->toArray());
$response = json_encode($client, JSON_PRETTY_PRINT); $response = json_encode($client, JSON_PRETTY_PRINT);
$headers = Utils::getApiHeaders(); $headers = Utils::getApiHeaders();

5
public/built.js
View File

@ -32578,11 +32578,13 @@ function displayInvoiceItems(doc, invoice, layout) {
if (newTop > 770) { if (newTop > 770) {
line = 0; line = 0;
tableTop = layout.accountTop + layout.tablePadding; tableTop = layout.accountTop + layout.tablePadding;
y = tableTop; y = tableTop + (2 * layout.tablePadding);
top = y - layout.tablePadding; top = y - layout.tablePadding;
newTop = top + (numLines * layout.tableRowHeight); newTop = top + (numLines * layout.tableRowHeight);
doc.addPage(); doc.addPage();
console.log('== ADD PAGE ==');
} }
console.log('Y: %s', y);
var left = layout.marginLeft - layout.tablePadding; var left = layout.marginLeft - layout.tablePadding;
var width = layout.marginRight + layout.tablePadding; var width = layout.marginRight + layout.tablePadding;
@ -32748,6 +32750,7 @@ function displayInvoiceItems(doc, invoice, layout) {
} }
*/ */
SetPdfColor('Black', doc); SetPdfColor('Black', doc);
doc.setFontType('normal'); doc.setFontType('normal');

3
public/js/script.js
View File

@ -1055,7 +1055,7 @@ function displayInvoiceItems(doc, invoice, layout) {
if (newTop > 770) { if (newTop > 770) {
line = 0; line = 0;
tableTop = layout.accountTop + layout.tablePadding; tableTop = layout.accountTop + layout.tablePadding;
y = tableTop; y = tableTop + (2 * layout.tablePadding);
top = y - layout.tablePadding; top = y - layout.tablePadding;
newTop = top + (numLines * layout.tableRowHeight); newTop = top + (numLines * layout.tableRowHeight);
doc.addPage(); doc.addPage();
@ -1225,6 +1225,7 @@ function displayInvoiceItems(doc, invoice, layout) {
} }
*/ */
SetPdfColor('Black', doc); SetPdfColor('Black', doc);
doc.setFontType('normal'); doc.setFontType('normal');