TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-28 04:01:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent 68db11becf 79208fe596
commit 67d4f5101d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Models/Expense.php
View File

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