diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index b4a87804d2..bddabbd04b 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -199,7 +199,7 @@ class AccountController extends Controller 'user' => Auth::user()->id, 'accountRole' => $request->input('accountRole'), 'openingBalance' => floatval($request->input('openingBalance')), - 'openingBalanceDate' => new Carbon($request->input('openingBalanceDate')), + 'openingBalanceDate' => new Carbon((string) $request->input('openingBalanceDate')), 'openingBalanceCurrency' => intval($request->input('balance_currency_id')), ]; @@ -237,7 +237,7 @@ class AccountController extends Controller 'accountRole' => $request->input('accountRole'), 'virtualBalance' => floatval($request->input('virtualBalance')), 'openingBalance' => floatval($request->input('openingBalance')), - 'openingBalanceDate' => new Carbon($request->input('openingBalanceDate')), + 'openingBalanceDate' => new Carbon((string) $request->input('openingBalanceDate')), 'openingBalanceCurrency' => intval($request->input('balance_currency_id')), 'ccType' => $request->input('ccType'), 'ccMonthlyPaymentDate' => $request->input('ccMonthlyPaymentDate'), diff --git a/app/Models/Account.php b/app/Models/Account.php index cdc4c28088..c621afca8e 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -44,6 +44,10 @@ use Watson\Validating\ValidatingTrait; * @property mixed startBalance * @property mixed endBalance * @property mixed lastActivityDate + * @property mixed piggyBalance + * @property mixed difference + * @propery mixed percentage + * */ class Account extends Model { diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php index 3a60335bef..a08241d1a1 100644 --- a/app/Models/PiggyBank.php +++ b/app/Models/PiggyBank.php @@ -43,6 +43,7 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereRemindMe($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereOrder($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereEncrypted($value) + * @property PiggyBankRepetition currentRep */ class PiggyBank extends Model { diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index 25f45e70c9..8aedbd44d2 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -66,6 +66,7 @@ use Watson\Validating\ValidatingTrait; * @property bool joinedTransactionTypes * @property mixed account_id * @property mixed name + * @property mixed symbol */ class TransactionJournal extends Model { diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index 8cd51fd77a..e5900e802b 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -350,7 +350,7 @@ class AccountRepository implements AccountRepositoryInterface /** * @param array $data * - * @return Account; + * @return Account */ public function store(array $data) {