Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 21:14:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for PreviewController (#3460)

Browse Source 
* Fixes for previewcontroller

* Fixes for previewcontroller

* Logging for invoices
This commit is contained in:
David Bomba 2020-03-09 21:47:17 +11:00 committed by GitHub
parent 2501aa3478
commit 9d3c6cb0ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/PreviewController.php
View File

@ -94,7 +94,7 @@ class PreviewController extends BaseController
request()->has('body')) request()->has('body'))
{ {
$invoice_design = new Custom(json_decode(request()->input('body'))); $invoice_design = new Custom(json_encode(request()->input('body')));
$entity = ucfirst(request()->input('entity')); $entity = ucfirst(request()->input('entity'));
@ -148,12 +148,13 @@ class PreviewController extends BaseController
$invoice->setRelation('company', auth()->user()->company()); $invoice->setRelation('company', auth()->user()->company());
$invoice->load('client'); $invoice->load('client');
// $design_object = json_decode(request()->input('body'));
$design_object = json_encode(request()->all());
if(!is_object($design_object)) if(!is_object($design_object))
return response()->json(['message' => 'Invalid custom design object'], 400); return response()->json(['message' => 'Invalid custom design object'], 400);
$invoice_design = new Custom(json_decode(request()->input('body'))); $invoice_design = new Custom($design_object);
$designer = new Designer($invoice, $invoice_design, $invoice->client->getSetting('pdf_variables'), lcfirst(request()->has('entity'))); $designer = new Designer($invoice, $invoice_design, $invoice->client->getSetting('pdf_variables'), lcfirst(request()->has('entity')));

3
app/Http/Requests/Invoice/StoreInvoiceRequest.php
View File

@ -45,11 +45,12 @@ class StoreInvoiceRequest extends Request
protected function prepareForValidation() protected function prepareForValidation()
{ {
$input = $this->all(); $input = $this->all();
\Log::error(print_r($input,));
if(array_key_exists('design_id', $input) && is_string($input['design_id'])) if(array_key_exists('design_id', $input) && is_string($input['design_id']))
$input['design_id'] = $this->decodePrimaryKey($input['design_id']); $input['design_id'] = $this->decodePrimaryKey($input['design_id']);
if($input['client_id']) if(array_key_exists('client_id', $input) && is_string($input['client_id']))
$input['client_id'] = $this->decodePrimaryKey($input['client_id']); $input['client_id'] = $this->decodePrimaryKey($input['client_id']);
if(isset($input['client_contacts'])) if(isset($input['client_contacts']))

5
tests/Feature/UserTest.php
View File

@ -191,13 +191,10 @@ class UserTest extends TestCase
$arr = $response->json(); $arr = $response->json();
\Log::error($arr);
\Log::error(print_r($arr['data']['company_user'],1));
$this->assertNotNull($arr['data']['company_user']); $this->assertNotNull($arr['data']['company_user']);
$this->assertFalse($arr['data']['company_user']['is_admin']); $this->assertFalse($arr['data']['company_user']['is_admin']);
$this->assertFalse($arr['data']['company_user']['is_owner']); $this->assertFalse($arr['data']['company_user']['is_owner']);
$this->assertEquals($arr['data']['company_user']['permissions'], ['create_client,create_invoice']); $this->assertEquals($arr['data']['company_user']['permissions'], 'create_client,create_invoice');
$user = User::whereEmail('bob@good.ole.boys.co2.com')->first(); $user = User::whereEmail('bob@good.ole.boys.co2.com')->first();