shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

item transformer doesn't accept null

Browse Source
This commit is contained in:
denisdulici 2017-10-09 11:59:58 +03:00
parent f8ce9ffd32
commit f1cd07dd70
3 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Transformers/Expense/Payment.php
View File

@ -51,10 +51,14 @@ class Payment extends TransformerAbstract
/** /**
* @param Model $model * @param Model $model
* @return \League\Fractal\Resource\Item * @return mixed
*/ */
public function includeVendor(Model $model) public function includeVendor(Model $model)
{ {
if (!$model->vendor) {
return $this->null();
}
return $this->item($model->vendor, new Vendor()); return $this->item($model->vendor, new Vendor());
} }

6
app/Http/Transformers/Income/Revenue.php
View File

@ -51,10 +51,14 @@ class Revenue extends TransformerAbstract
/** /**
* @param Model $model * @param Model $model
* @return \League\Fractal\Resource\Item * @return mixed
*/ */
public function includeCustomer(Model $model) public function includeCustomer(Model $model)
{ {
if (!$model->customer) {
return $this->null();
}
return $this->item($model->customer, new Customer()); return $this->item($model->customer, new Customer());
} }

12
app/Http/Transformers/Item/Item.php
View File

@ -40,19 +40,27 @@ class Item extends TransformerAbstract
/** /**
* @param Model $model * @param Model $model
* @return \League\Fractal\Resource\Item * @return mixed
*/ */
public function includeTax(Model $model) public function includeTax(Model $model)
{ {
if (!$model->tax) {
return $this->null();
}
return $this->item($model->tax, new Tax()); return $this->item($model->tax, new Tax());
} }
/** /**
* @param Model $model * @param Model $model
* @return \League\Fractal\Resource\Item * @return mixed
*/ */
public function includeCategory(Model $model) public function includeCategory(Model $model)
{ {
if (!$model->category) {
return $this->null();
}
return $this->item($model->category, new Category()); return $this->item($model->category, new Category());
} }
} }