diff --git a/app/controllers/ClientApiController.php b/app/controllers/ClientApiController.php index 1ce750931252..138a92aabcdb 100644 --- a/app/controllers/ClientApiController.php +++ b/app/controllers/ClientApiController.php @@ -40,6 +40,8 @@ class ClientApiController extends Controller return Response::make($error, 500, $headers); } else { $client = $this->clientRepo->save(false, $data, false); + $client->load('contacts'); + $client = Utils::remapPublicIds($client->toArray()); $response = json_encode($client, JSON_PRETTY_PRINT); $headers = Utils::getApiHeaders(); diff --git a/public/built.js b/public/built.js index 9fce8d058aec..f671719efb2e 100644 --- a/public/built.js +++ b/public/built.js @@ -32578,11 +32578,13 @@ function displayInvoiceItems(doc, invoice, layout) { if (newTop > 770) { line = 0; tableTop = layout.accountTop + layout.tablePadding; - y = tableTop; + y = tableTop + (2 * layout.tablePadding); top = y - layout.tablePadding; newTop = top + (numLines * layout.tableRowHeight); doc.addPage(); + console.log('== ADD PAGE =='); } + console.log('Y: %s', y); var left = layout.marginLeft - layout.tablePadding; var width = layout.marginRight + layout.tablePadding; @@ -32748,6 +32750,7 @@ function displayInvoiceItems(doc, invoice, layout) { } */ + SetPdfColor('Black', doc); doc.setFontType('normal'); diff --git a/public/js/script.js b/public/js/script.js index ad7d7bc367a7..a6d9bf6df0d4 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -1055,7 +1055,7 @@ function displayInvoiceItems(doc, invoice, layout) { if (newTop > 770) { line = 0; tableTop = layout.accountTop + layout.tablePadding; - y = tableTop; + y = tableTop + (2 * layout.tablePadding); top = y - layout.tablePadding; newTop = top + (numLines * layout.tableRowHeight); doc.addPage(); @@ -1225,6 +1225,7 @@ function displayInvoiceItems(doc, invoice, layout) { } */ + SetPdfColor('Black', doc); doc.setFontType('normal');