Merge branch 'v5-fix-customField-issue' into 'master'

fix expense custom field issue

See merge request mohit.panjvani/crater-web!1328
This commit is contained in:
Mohit Panjwani
2021-12-08 12:34:01 +00:00

View File

@ -246,8 +246,8 @@ class Expense extends Model implements HasMedia
$expense->addMediaFromRequest('attachment_receipt')->toMediaCollection('receipts');
}
if ($request->customFields && empty($request->customFields)) {
$expense->addCustomFields($request->customFields);
if ($request->customFields) {
$expense->addCustomFields(json_decode($request->customFields));
}
return $expense;
@ -270,8 +270,8 @@ class Expense extends Model implements HasMedia
$this->addMediaFromRequest('attachment_receipt')->toMediaCollection('receipts');
}
if ($request->customFields && empty($request->customFields)) {
$this->updateCustomFields($request->customFields);
if ($request->customFields) {
$this->updateCustomFields(json_decode($request->customFields));
}
return true;