diff --git a/app/Ninja/Repositories/CreditRepository.php b/app/Ninja/Repositories/CreditRepository.php index 045e556f659c..adf89a709a38 100644 --- a/app/Ninja/Repositories/CreditRepository.php +++ b/app/Ninja/Repositories/CreditRepository.php @@ -96,18 +96,19 @@ class CreditRepository extends BaseRepository $publicId = isset($data['public_id']) ? $data['public_id'] : false; if ($credit) { - // do nothing + $credit->balance = Utils::parseFloat($input['balance']); } elseif ($publicId) { $credit = Credit::scope($publicId)->firstOrFail(); + $credit->balance = Utils::parseFloat($input['balance']); \Log::warning('Entity not set in credit repo save'); } else { $credit = Credit::createNew(); + $credit->balance = Utils::parseFloat($input['amount']); $credit->client_id = Client::getPrivateId($input['client']); } $credit->credit_date = Utils::toSqlDate($input['credit_date']); $credit->amount = Utils::parseFloat($input['amount']); - $credit->balance = Utils::parseFloat($input['amount']); $credit->private_notes = trim($input['private_notes']); $credit->save(); diff --git a/resources/views/credits/edit.blade.php b/resources/views/credits/edit.blade.php index 6cf2facc130f..a66998f30566 100644 --- a/resources/views/credits/edit.blade.php +++ b/resources/views/credits/edit.blade.php @@ -28,6 +28,11 @@ @endif {!! Former::text('amount') !!} + + @if ($credit) + {!! Former::text('balance') !!} + @endif + {!! Former::text('credit_date') ->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT, DEFAULT_DATE_PICKER_FORMAT)) ->addGroupClass('credit_date')