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

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

@ -16,7 +16,7 @@ class Payment extends TransformerAbstract
protected $defaultIncludes = ['account', 'vendor', 'category']; protected $defaultIncludes = ['account', 'vendor', 'category'];
/** /**
* @param Model $model * @param Model $model
* @return array * @return array
*/ */
public function transform(Model $model) public function transform(Model $model)
@ -41,7 +41,7 @@ class Payment extends TransformerAbstract
} }
/** /**
* @param Model $model * @param Model $model
* @return \League\Fractal\Resource\Item * @return \League\Fractal\Resource\Item
*/ */
public function includeAccount(Model $model) public function includeAccount(Model $model)
@ -50,16 +50,20 @@ 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());
} }
/** /**
* @param Model $model * @param Model $model
* @return \League\Fractal\Resource\Item * @return \League\Fractal\Resource\Item
*/ */
public function includeCategory(Model $model) public function includeCategory(Model $model)

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

@ -16,7 +16,7 @@ class Revenue extends TransformerAbstract
protected $defaultIncludes = ['account', 'customer', 'category']; protected $defaultIncludes = ['account', 'customer', 'category'];
/** /**
* @param Model $model * @param Model $model
* @return array * @return array
*/ */
public function transform(Model $model) public function transform(Model $model)
@ -41,7 +41,7 @@ class Revenue extends TransformerAbstract
} }
/** /**
* @param Model $model * @param Model $model
* @return \League\Fractal\Resource\Item * @return \League\Fractal\Resource\Item
*/ */
public function includeAccount(Model $model) public function includeAccount(Model $model)
@ -50,16 +50,20 @@ 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());
} }
/** /**
* @param Model $model * @param Model $model
* @return \League\Fractal\Resource\Item * @return \League\Fractal\Resource\Item
*/ */
public function includeCategory(Model $model) public function includeCategory(Model $model)

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

@ -15,7 +15,7 @@ class Item extends TransformerAbstract
protected $defaultIncludes = ['tax', 'category']; protected $defaultIncludes = ['tax', 'category'];
/** /**
* @param Model $model * @param Model $model
* @return array * @return array
*/ */
public function transform(Model $model) public function transform(Model $model)
@ -39,20 +39,28 @@ 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());
} }
} }