diff --git a/app/Models/Expense.php b/app/Models/Expense.php index 395a81cfae20..34c92288a83c 100644 --- a/app/Models/Expense.php +++ b/app/Models/Expense.php @@ -61,6 +61,7 @@ class Expense extends EntityModel 'vendor', 'amount', 'public_notes', + 'private_notes', 'expense_category', 'expense_date', ]; @@ -73,7 +74,8 @@ class Expense extends EntityModel 'category' => 'expense_category', 'client' => 'client', 'vendor' => 'vendor', - 'notes|details' => 'public_notes', + 'notes|details^private' => 'public_notes', + 'notes|details^public' => 'private_notes', 'date' => 'expense_date', ]; } diff --git a/app/Ninja/Import/CSV/ExpenseTransformer.php b/app/Ninja/Import/CSV/ExpenseTransformer.php index b64ade053cb2..4d1c5299f176 100644 --- a/app/Ninja/Import/CSV/ExpenseTransformer.php +++ b/app/Ninja/Import/CSV/ExpenseTransformer.php @@ -24,6 +24,7 @@ class ExpenseTransformer extends BaseTransformer 'client_id' => isset($data->client) ? $this->getClientId($data->client) : null, 'expense_date' => isset($data->expense_date) ? date('Y-m-d', strtotime($data->expense_date)) : null, 'public_notes' => $this->getString($data, 'public_notes'), + 'private_notes' => $this->getString($data, 'private_notes'), 'expense_category_id' => isset($data->expense_category) ? $this->getExpenseCategoryId($data->expense_category) : null, ]; });