IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Renamed lots of "piggybank" to "piggyBank".

Browse Source
This commit is contained in:
James Cole 2014-12-24 19:13:15 +01:00
parent 0332104738
commit 335279e728
12 changed files with 152 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
app/breadcrumbs.php
View File

@ -134,35 +134,35 @@ Breadcrumbs::register(
// piggy banks // piggy banks
Breadcrumbs::register( Breadcrumbs::register(
'piggybanks.index', function (Generator $breadcrumbs) { 'piggyBanks.index', function (Generator $breadcrumbs) {
$breadcrumbs->parent('home'); $breadcrumbs->parent('home');
$breadcrumbs->push('Piggy banks', route('piggybanks.index')); $breadcrumbs->push('Piggy banks', route('piggyBanks.index'));
} }
); );
Breadcrumbs::register( Breadcrumbs::register(
'piggybanks.create', function (Generator $breadcrumbs) { 'piggyBanks.create', function (Generator $breadcrumbs) {
$breadcrumbs->parent('piggybanks.index'); $breadcrumbs->parent('piggyBanks.index');
$breadcrumbs->push('Create new piggy bank', route('piggybanks.create')); $breadcrumbs->push('Create new piggy bank', route('piggyBanks.create'));
} }
); );
Breadcrumbs::register( Breadcrumbs::register(
'piggybanks.edit', function (Generator $breadcrumbs, Piggybank $piggybank) { 'piggyBanks.edit', function (Generator $breadcrumbs, Piggybank $piggyBank) {
$breadcrumbs->parent('piggybanks.show', $piggybank); $breadcrumbs->parent('piggyBanks.show', $piggyBank);
$breadcrumbs->push('Edit ' . $piggybank->name, route('piggybanks.edit', $piggybank->id)); $breadcrumbs->push('Edit ' . $piggyBank->name, route('piggyBanks.edit', $piggyBank->id));
} }
); );
Breadcrumbs::register( Breadcrumbs::register(
'piggybanks.delete', function (Generator $breadcrumbs, Piggybank $piggybank) { 'piggyBanks.delete', function (Generator $breadcrumbs, Piggybank $piggyBank) {
$breadcrumbs->parent('piggybanks.show', $piggybank); $breadcrumbs->parent('piggyBanks.show', $piggyBank);
$breadcrumbs->push('Delete ' . $piggybank->name, route('piggybanks.delete', $piggybank->id)); $breadcrumbs->push('Delete ' . $piggyBank->name, route('piggyBanks.delete', $piggyBank->id));
} }
); );
Breadcrumbs::register( Breadcrumbs::register(
'piggybanks.show', function (Generator $breadcrumbs, Piggybank $piggybank) { 'piggyBanks.show', function (Generator $breadcrumbs, Piggybank $piggyBank) {
$breadcrumbs->parent('piggybanks.index'); $breadcrumbs->parent('piggyBanks.index');
$breadcrumbs->push($piggybank->name, route('piggybanks.show', $piggybank->id)); $breadcrumbs->push($piggyBank->name, route('piggyBanks.show', $piggyBank->id));
} }
); );
@ -251,22 +251,22 @@ Breadcrumbs::register(
); );
Breadcrumbs::register( Breadcrumbs::register(
'repeated.edit', function (Generator $breadcrumbs, Piggybank $piggybank) { 'repeated.edit', function (Generator $breadcrumbs, Piggybank $piggyBank) {
$breadcrumbs->parent('repeated.show', $piggybank); $breadcrumbs->parent('repeated.show', $piggyBank);
$breadcrumbs->push('Edit ' . $piggybank->name, route('repeated.edit', $piggybank->id)); $breadcrumbs->push('Edit ' . $piggyBank->name, route('repeated.edit', $piggyBank->id));
} }
); );
Breadcrumbs::register( Breadcrumbs::register(
'repeated.delete', function (Generator $breadcrumbs, Piggybank $piggybank) { 'repeated.delete', function (Generator $breadcrumbs, Piggybank $piggyBank) {
$breadcrumbs->parent('repeated.show', $piggybank); $breadcrumbs->parent('repeated.show', $piggyBank);
$breadcrumbs->push('Delete ' . $piggybank->name, route('repeated.delete', $piggybank->id)); $breadcrumbs->push('Delete ' . $piggyBank->name, route('repeated.delete', $piggyBank->id));
} }
); );
Breadcrumbs::register( Breadcrumbs::register(
'repeated.show', function (Generator $breadcrumbs, Piggybank $piggybank) { 'repeated.show', function (Generator $breadcrumbs, Piggybank $piggyBank) {
$breadcrumbs->parent('repeated.index'); $breadcrumbs->parent('repeated.index');
$breadcrumbs->push($piggybank->name, route('repeated.show', $piggybank->id)); $breadcrumbs->push($piggyBank->name, route('repeated.show', $piggyBank->id));
} }
); );

6
app/controllers/GoogleChartController.php
View File

@ -312,16 +312,16 @@ class GoogleChartController extends BaseController
} }
/** /**
* @param Piggybank $piggybank * @param Piggybank $piggyBank
* *
* @return \Illuminate\Http\JsonResponse * @return \Illuminate\Http\JsonResponse
*/ */
public function piggyBankHistory(\Piggybank $piggybank) public function piggyBankHistory(\Piggybank $piggyBank)
{ {
$this->_chart->addColumn('Date', 'date'); $this->_chart->addColumn('Date', 'date');
$this->_chart->addColumn('Balance', 'number'); $this->_chart->addColumn('Balance', 'number');
$set = \DB::table('piggy_bank_events')->where('piggybank_id', $piggybank->id)->groupBy('date')->get(['date', DB::Raw('SUM(`amount`) AS `sum`')]); $set = \DB::table('piggy_bank_events')->where('piggybank_id', $piggyBank->id)->groupBy('date')->get(['date', DB::Raw('SUM(`amount`) AS `sum`')]);
foreach ($set as $entry) { foreach ($set as $entry) {
$this->_chart->addRow(new Carbon($entry->date), floatval($entry->sum)); $this->_chart->addRow(new Carbon($entry->date), floatval($entry->sum));

134
app/controllers/PiggybankController.php
View File

@ -35,29 +35,21 @@ class PiggybankController extends BaseController
/** /**
* Add money to piggy bank * Add money to piggy bank
* *
* @param Piggybank $piggybank * @param Piggybank $piggyBank
* *
* @return $this * @return $this
*/ */
public function add(Piggybank $piggybank) public function add(Piggybank $piggyBank)
{ {
\Log::debug('Now in add() for piggy bank #' . $piggybank->id . ' (' . $piggybank->name . ')'); $leftOnAccount = $this->_repository->leftOnAccount($piggyBank->account);
\Log::debug('Z'); $savedSoFar = $piggyBank->currentRelevantRep()->currentamount;
\Log::debug('currentRelevantRep is null: ' . boolstr($piggybank->currentRelevantRep())); $leftToSave = $piggyBank->targetamount - $savedSoFar;
$leftOnAccount = $this->_repository->leftOnAccount($piggybank->account);
\Log::debug('A');
$savedSoFar = $piggybank->currentRelevantRep()->currentamount;
\Log::debug('B');
$leftToSave = $piggybank->targetamount - $savedSoFar;
\Log::debug('C');
$maxAmount = min($leftOnAccount, $leftToSave); $maxAmount = min($leftOnAccount, $leftToSave);
\Log::debug('D');
\Log::debug('Now going to view for piggy bank #' . $piggybank->id . ' (' . $piggybank->name . ')'); \Log::debug('Now going to view for piggy bank #' . $piggyBank->id . ' (' . $piggyBank->name . ')');
return View::make('piggybanks.add', compact('piggybank', 'maxAmount')); return View::make('piggybanks.add', compact('piggyBank', 'maxAmount'));
} }
/** /**
@ -78,15 +70,15 @@ class PiggybankController extends BaseController
} }
/** /**
* @param Piggybank $piggybank * @param Piggybank $piggyBank
* *
* @return $this * @return $this
*/ */
public function delete(Piggybank $piggybank) public function delete(Piggybank $piggyBank)
{ {
$subTitle = 'Delete "' . e($piggybank->name) . '"'; $subTitle = 'Delete "' . e($piggyBank->name) . '"';
return View::make('piggybanks.delete', compact('piggybank', 'subTitle')); return View::make('piggybanks.delete', compact('piggyBank', 'subTitle'));
} }
/** /**
@ -104,11 +96,11 @@ class PiggybankController extends BaseController
} }
/** /**
* @param Piggybank $piggybank * @param Piggybank $piggyBank
* *
* @return $this * @return $this
*/ */
public function edit(Piggybank $piggybank) public function edit(Piggybank $piggyBank)
{ {
/** @var \FireflyIII\Database\Account\Account $acct */ /** @var \FireflyIII\Database\Account\Account $acct */
@ -116,28 +108,28 @@ class PiggybankController extends BaseController
$periods = Config::get('firefly.piggybank_periods'); $periods = Config::get('firefly.piggybank_periods');
$accounts = FFForm::makeSelectList($acct->getAssetAccounts()); $accounts = FFForm::makeSelectList($acct->getAssetAccounts());
$subTitle = 'Edit piggy bank "' . e($piggybank->name) . '"'; $subTitle = 'Edit piggy bank "' . e($piggyBank->name) . '"';
$subTitleIcon = 'fa-pencil'; $subTitleIcon = 'fa-pencil';
/* /*
* Flash some data to fill the form. * Flash some data to fill the form.
*/ */
if (is_null($piggybank->targetdate) || $piggybank->targetdate == '') { if (is_null($piggyBank->targetdate) || $piggyBank->targetdate == '') {
$targetDate = null; $targetDate = null;
} else { } else {
$targetDate = new Carbon($piggybank->targetdate); $targetDate = new Carbon($piggyBank->targetdate);
$targetDate = $targetDate->format('Y-m-d'); $targetDate = $targetDate->format('Y-m-d');
} }
$preFilled = ['name' => $piggybank->name, $preFilled = ['name' => $piggyBank->name,
'account_id' => $piggybank->account_id, 'account_id' => $piggyBank->account_id,
'targetamount' => $piggybank->targetamount, 'targetamount' => $piggyBank->targetamount,
'targetdate' => $targetDate, 'targetdate' => $targetDate,
'reminder' => $piggybank->reminder, 'reminder' => $piggyBank->reminder,
'remind_me' => intval($piggybank->remind_me) == 1 || !is_null($piggybank->reminder) ? true : false 'remind_me' => intval($piggyBank->remind_me) == 1 || !is_null($piggyBank->reminder) ? true : false
]; ];
Session::flash('preFilled', $preFilled); Session::flash('preFilled', $preFilled);
return View::make('piggybanks.edit', compact('subTitle', 'subTitleIcon', 'piggybank', 'accounts', 'periods', 'preFilled')); return View::make('piggybanks.edit', compact('subTitle', 'subTitleIcon', 'piggyBank', 'accounts', 'periods', 'preFilled'));
} }
/** /**
@ -145,134 +137,134 @@ class PiggybankController extends BaseController
*/ */
public function index() public function index()
{ {
/** @var Collection $piggybanks */ /** @var Collection $piggyBanks */
$piggybanks = $this->_repository->get(); $piggyBanks = $this->_repository->get();
$accounts = []; $accounts = [];
/** @var Piggybank $piggybank */ /** @var Piggybank $piggyBank */
foreach ($piggybanks as $piggybank) { foreach ($piggyBanks as $piggyBank) {
$piggybank->savedSoFar = floatval($piggybank->currentRelevantRep()->currentamount); $piggyBank->savedSoFar = floatval($piggyBank->currentRelevantRep()->currentamount);
$piggybank->percentage = intval($piggybank->savedSoFar / $piggybank->targetamount * 100); $piggyBank->percentage = intval($piggyBank->savedSoFar / $piggyBank->targetamount * 100);
$piggybank->leftToSave = $piggybank->targetamount - $piggybank->savedSoFar; $piggyBank->leftToSave = $piggyBank->targetamount - $piggyBank->savedSoFar;
/* /*
* Fill account information: * Fill account information:
*/ */
$account = $piggybank->account; $account = $piggyBank->account;
if (!isset($accounts[$account->id])) { if (!isset($accounts[$account->id])) {
$accounts[$account->id] = [ $accounts[$account->id] = [
'name' => $account->name, 'name' => $account->name,
'balance' => Steam::balance($account), 'balance' => Steam::balance($account),
'leftForPiggybanks' => $this->_repository->leftOnAccount($account), 'leftForPiggybanks' => $this->_repository->leftOnAccount($account),
'sumOfSaved' => $piggybank->savedSoFar, 'sumOfSaved' => $piggyBank->savedSoFar,
'sumOfTargets' => floatval($piggybank->targetamount), 'sumOfTargets' => floatval($piggyBank->targetamount),
'leftToSave' => $piggybank->leftToSave 'leftToSave' => $piggyBank->leftToSave
]; ];
} else { } else {
$accounts[$account->id]['sumOfSaved'] += $piggybank->savedSoFar; $accounts[$account->id]['sumOfSaved'] += $piggyBank->savedSoFar;
$accounts[$account->id]['sumOfTargets'] += floatval($piggybank->targetamount); $accounts[$account->id]['sumOfTargets'] += floatval($piggyBank->targetamount);
$accounts[$account->id]['leftToSave'] += $piggybank->leftToSave; $accounts[$account->id]['leftToSave'] += $piggyBank->leftToSave;
} }
} }
return View::make('piggybanks.index', compact('piggybanks', 'accounts')); return View::make('piggybanks.index', compact('piggyBanks', 'accounts'));
} }
/** /**
* POST add money to piggy bank * POST add money to piggy bank
* *
* @param Piggybank $piggybank * @param Piggybank $piggyBank
* *
* @return \Illuminate\Http\RedirectResponse * @return \Illuminate\Http\RedirectResponse
*/ */
public function postAdd(Piggybank $piggybank) public function postAdd(Piggybank $piggyBank)
{ {
$amount = round(floatval(Input::get('amount')), 2); $amount = round(floatval(Input::get('amount')), 2);
/** @var \FireflyIII\Database\PiggyBank\PiggyBank $acct */ /** @var \FireflyIII\Database\PiggyBank\PiggyBank $acct */
$repos = App::make('FireflyIII\Database\PiggyBank\PiggyBank'); $repos = App::make('FireflyIII\Database\PiggyBank\PiggyBank');
$leftOnAccount = $repos->leftOnAccount($piggybank->account); $leftOnAccount = $repos->leftOnAccount($piggyBank->account);
$savedSoFar = $piggybank->currentRelevantRep()->currentamount; $savedSoFar = $piggyBank->currentRelevantRep()->currentamount;
$leftToSave = $piggybank->targetamount - $savedSoFar; $leftToSave = $piggyBank->targetamount - $savedSoFar;
$maxAmount = round(min($leftOnAccount, $leftToSave), 2); $maxAmount = round(min($leftOnAccount, $leftToSave), 2);
if ($amount <= $maxAmount) { if ($amount <= $maxAmount) {
$repetition = $piggybank->currentRelevantRep(); $repetition = $piggyBank->currentRelevantRep();
$repetition->currentamount += $amount; $repetition->currentamount += $amount;
$repetition->save(); $repetition->save();
/* /*
* Create event! * Create event!
*/ */
Event::fire('piggybank.addMoney', [$piggybank, $amount]); // new and used. Event::fire('piggybank.addMoney', [$piggyBank, $amount]); // new and used.
Session::flash('success', 'Added ' . mf($amount, false) . ' to "' . e($piggybank->name) . '".'); Session::flash('success', 'Added ' . mf($amount, false) . ' to "' . e($piggyBank->name) . '".');
} else { } else {
Session::flash('error', 'Could not add ' . mf($amount, false) . ' to "' . e($piggybank->name) . '".'); Session::flash('error', 'Could not add ' . mf($amount, false) . ' to "' . e($piggyBank->name) . '".');
} }
return Redirect::route('piggybanks.index'); return Redirect::route('piggybanks.index');
} }
/** /**
* @param Piggybank $piggybank * @param Piggybank $piggyBank
* *
* @return \Illuminate\Http\RedirectResponse * @return \Illuminate\Http\RedirectResponse
*/ */
public function postRemove(Piggybank $piggybank) public function postRemove(Piggybank $piggyBank)
{ {
$amount = floatval(Input::get('amount')); $amount = floatval(Input::get('amount'));
$savedSoFar = $piggybank->currentRelevantRep()->currentamount; $savedSoFar = $piggyBank->currentRelevantRep()->currentamount;
if ($amount <= $savedSoFar) { if ($amount <= $savedSoFar) {
$repetition = $piggybank->currentRelevantRep(); $repetition = $piggyBank->currentRelevantRep();
$repetition->currentamount -= $amount; $repetition->currentamount -= $amount;
$repetition->save(); $repetition->save();
/* /*
* Create event! * Create event!
*/ */
Event::fire('piggybank.removeMoney', [$piggybank, $amount]); // new and used. Event::fire('piggybank.removeMoney', [$piggyBank, $amount]); // new and used.
Session::flash('success', 'Removed ' . mf($amount, false) . ' from "' . e($piggybank->name) . '".'); Session::flash('success', 'Removed ' . mf($amount, false) . ' from "' . e($piggyBank->name) . '".');
} else { } else {
Session::flash('error', 'Could not remove ' . mf($amount, false) . ' from "' . e($piggybank->name) . '".'); Session::flash('error', 'Could not remove ' . mf($amount, false) . ' from "' . e($piggyBank->name) . '".');
} }
return Redirect::route('piggybanks.index'); return Redirect::route('piggybanks.index');
} }
/** /**
* @param Piggybank $piggybank * @param Piggybank $piggyBank
* *
* @return \Illuminate\View\View * @return \Illuminate\View\View
*/ */
public function remove(Piggybank $piggybank) public function remove(Piggybank $piggyBank)
{ {
return View::make('piggybanks.remove')->with('piggybank', $piggybank); return View::make('piggybanks.remove',compact('piggyBank'));
} }
/** /**
* @param Piggybank $piggybank * @param Piggybank $piggyBank
* *
* @return $this * @return $this
*/ */
public function show(Piggybank $piggybank) public function show(Piggybank $piggyBank)
{ {
$events = $piggybank->piggybankevents()->orderBy('date', 'DESC')->orderBy('id', 'DESC')->get(); $events = $piggyBank->piggybankevents()->orderBy('date', 'DESC')->orderBy('id', 'DESC')->get();
/* /*
* Number of reminders: * Number of reminders:
*/ */
$amountPerReminder = $piggybank->amountPerReminder(); $amountPerReminder = $piggyBank->amountPerReminder();
$remindersCount = $piggybank->countFutureReminders(); $remindersCount = $piggyBank->countFutureReminders();
$subTitle = e($piggybank->name); $subTitle = e($piggyBank->name);
return View::make('piggybanks.show', compact('amountPerReminder', 'remindersCount', 'piggybank', 'events', 'subTitle')); return View::make('piggybanks.show', compact('amountPerReminder', 'remindersCount', 'piggyBank', 'events', 'subTitle'));
} }

6
app/lib/FireflyIII/Database/PiggyBank/PiggyBank.php
View File

@ -221,17 +221,17 @@ class PiggyBank implements CUD, CommonDatabaseCalls, PiggyBankInterface
} }
/** /**
* @param \Piggybank $piggybank * @param \Piggybank $piggyBank
* @param Carbon $date * @param Carbon $date
* *
* @return mixed * @return mixed
* @throws FireflyException * @throws FireflyException
* @throws NotImplementedException * @throws NotImplementedException
*/ */
public function findRepetitionByDate(\Piggybank $piggybank, Carbon $date) public function findRepetitionByDate(\Piggybank $piggyBank, Carbon $date)
{ {
/** @var Collection $reps */ /** @var Collection $reps */
$reps = $piggybank->piggybankrepetitions()->get(); $reps = $piggyBank->piggybankrepetitions()->get();
if ($reps->count() == 1) { if ($reps->count() == 1) {
return $reps->first(); return $reps->first();
} }

32
app/lib/FireflyIII/Event/Piggybank.php
View File

@ -15,14 +15,14 @@ class Piggybank
{ {
/** /**
* @param \Piggybank $piggybank * @param \Piggybank $piggyBank
* @param float $amount * @param float $amount
*/ */
public function addMoney(\Piggybank $piggybank, $amount = 0.0) public function addMoney(\Piggybank $piggyBank, $amount = 0.0)
{ {
if ($amount > 0) { if ($amount > 0) {
$event = new \PiggyBankEvent; $event = new \PiggyBankEvent;
$event->piggybank()->associate($piggybank); $event->piggybank()->associate($piggyBank);
$event->amount = floatval($amount); $event->amount = floatval($amount);
$event->date = new Carbon; $event->date = new Carbon;
if (!$event->isValid()) { if (!$event->isValid()) {
@ -76,15 +76,15 @@ class Piggybank
} }
/** /**
* @param \Piggybank $piggybank * @param \Piggybank $piggyBank
* @param float $amount * @param float $amount
*/ */
public function removeMoney(\Piggybank $piggybank, $amount = 0.0) public function removeMoney(\Piggybank $piggyBank, $amount = 0.0)
{ {
$amount = $amount * -1; $amount = $amount * -1;
if ($amount < 0) { if ($amount < 0) {
$event = new \PiggyBankEvent; $event = new \PiggyBankEvent;
$event->piggybank()->associate($piggybank); $event->piggybank()->associate($piggyBank);
$event->amount = floatval($amount); $event->amount = floatval($amount);
$event->date = new Carbon; $event->date = new Carbon;
$event->save(); $event->save();
@ -92,15 +92,15 @@ class Piggybank
} }
/** /**
* @param \Piggybank $piggybank * @param \Piggybank $piggyBank
*/ */
public function storePiggybank(\Piggybank $piggybank) public function storePiggybank(\Piggybank $piggyBank)
{ {
if (intval($piggybank->repeats) == 0) { if (intval($piggyBank->repeats) == 0) {
$repetition = new \PiggybankRepetition; $repetition = new \PiggybankRepetition;
$repetition->piggybank()->associate($piggybank); $repetition->piggybank()->associate($piggyBank);
$repetition->startdate = $piggybank->startdate; $repetition->startdate = $piggyBank->startdate;
$repetition->targetdate = $piggybank->targetdate; $repetition->targetdate = $piggyBank->targetdate;
$repetition->currentamount = 0; $repetition->currentamount = 0;
$repetition->save(); $repetition->save();
} }
@ -112,18 +112,18 @@ class Piggybank
/** /**
* @param \TransactionJournal $journal * @param \TransactionJournal $journal
* @param int $piggybankId * @param int $piggyBankId
*/ */
public function storeTransfer(\TransactionJournal $journal, $piggybankId = 0) public function storeTransfer(\TransactionJournal $journal, $piggyBankId = 0)
{ {
if (intval($piggybankId) == 0) { if (intval($piggyBankId) == 0) {
return; return;
} }
/** @var \FireflyIII\Database\PiggyBank\PiggyBank $repository */ /** @var \FireflyIII\Database\PiggyBank\PiggyBank $repository */
$repository = \App::make('FireflyIII\Database\PiggyBank\PiggyBank'); $repository = \App::make('FireflyIII\Database\PiggyBank\PiggyBank');
/** @var \Piggybank $piggyBank */ /** @var \Piggybank $piggyBank */
$piggyBank = $repository->find($piggybankId); $piggyBank = $repository->find($piggyBankId);
if ($journal->transactions()->where('account_id', $piggyBank->account_id)->count() == 0) { if ($journal->transactions()->where('account_id', $piggyBank->account_id)->count() == 0) {
return; return;

2
app/lib/FireflyIII/Shared/Toolkit/Reminders.php
View File

@ -72,7 +72,7 @@ class Reminders
$today = Carbon::now(); $today = Carbon::now();
/** @var \Piggybank $piggybank */ /** @var \Piggybank $piggyBank */
foreach ($set as $piggyBank) { foreach ($set as $piggyBank) {
/** @var \PiggybankRepetition $repetition */ /** @var \PiggybankRepetition $repetition */
$repetition = $piggyBank->currentRelevantRep(); $repetition = $piggyBank->currentRelevantRep();

4
app/views/piggybanks/add.blade.php
View File

@ -1,10 +1,10 @@
<form style="display: inline;" id="add" action="{{route('piggybanks.add',$piggybank->id)}}" method="POST"> <form style="display: inline;" id="add" action="{{route('piggybanks.add',$piggyBank->id)}}" method="POST">
{{Form::token()}} {{Form::token()}}
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button> <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
<h4 class="modal-title" id="myModalLabel">Add money to {{{$piggybank->name}}}</h4> <h4 class="modal-title" id="myModalLabel">Add money to {{{$piggyBank->name}}}</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p> <p>

6
app/views/piggybanks/delete.blade.php
View File

@ -1,12 +1,12 @@
@extends('layouts.default') @extends('layouts.default')
@section('content') @section('content')
{{ Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName(), $piggybank) }} {{ Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName(), $piggyBank) }}
{{Form::open(['class' => 'form-horizontal','id' => 'destroy','url' => route('piggybanks.destroy',$piggybank->id)])}} {{Form::open(['class' => 'form-horizontal','id' => 'destroy','url' => route('piggybanks.destroy',$piggyBank->id)])}}
<div class="row"> <div class="row">
<div class="col-lg-6 col-md-12 col-sm-12"> <div class="col-lg-6 col-md-12 col-sm-12">
<div class="panel panel-red"> <div class="panel panel-red">
<div class="panel-heading"> <div class="panel-heading">
Delete piggy bank "{{{$piggybank->name}}}" Delete piggy bank "{{{$piggyBank->name}}}"
</div> </div>
<div class="panel-body"> <div class="panel-body">
<p> <p>

4
app/views/piggybanks/edit.blade.php
View File

@ -1,7 +1,7 @@
@extends('layouts.default') @extends('layouts.default')
@section('content') @section('content')
{{ Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName(), $piggybank) }} {{ Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName(), $piggyBank) }}
{{Form::model($piggybank, ['class' => 'form-horizontal','id' => 'update','url' => route('piggybanks.update',$piggybank->id)])}} {{Form::model($piggyBank, ['class' => 'form-horizontal','id' => 'update','url' => route('piggybanks.update',$piggyBank->id)])}}
<div class="row"> <div class="row">
<div class="col-lg-6 col-md-12 col-sm-6"> <div class="col-lg-6 col-md-12 col-sm-6">

28
app/views/piggybanks/index.blade.php
View File

@ -2,52 +2,52 @@
@section('content') @section('content')
{{ Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName()) }} {{ Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName()) }}
<div class="row"> <div class="row">
@foreach($piggybanks as $piggybank) @foreach($piggyBanks as $piggyBank)
<div class="col-lg-6 col-md-6 col-sm-12"> <div class="col-lg-6 col-md-6 col-sm-12">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<i class="fa fa-fw fa-rocket"></i> <a href="{{route('piggybanks.show',$piggybank->id)}}" title="{{{$piggybank->name}}}">{{{$piggybank->name}}}</a> <i class="fa fa-fw fa-rocket"></i> <a href="{{route('piggybanks.show',$piggyBank->id)}}" title="{{{$piggyBank->name}}}">{{{$piggyBank->name}}}</a>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div class="row"> <div class="row">
<div class="col-lg-2 col-md-3 col-sm-4"> <div class="col-lg-2 col-md-3 col-sm-4">
{{mf($piggybank->savedSoFar,true)}} {{mf($piggyBank->savedSoFar,true)}}
</div> </div>
<div class="col-lg-8 col-md-6 col-sm-4"> <div class="col-lg-8 col-md-6 col-sm-4">
<div class="progress progress-striped"> <div class="progress progress-striped">
<div <div
@if($piggybank->percentage == 100) @if($piggyBank->percentage == 100)
class="progress-bar progress-bar-success" class="progress-bar progress-bar-success"
@else @else
class="progress-bar progress-bar-info" class="progress-bar progress-bar-info"
@endif @endif
role="progressbar" aria-valuenow="{{$piggybank->percentage}}" aria-valuemin="0" aria-valuemax="100" style="min-width: 40px;width: {{$piggybank->percentage}}%;"> role="progressbar" aria-valuenow="{{$piggyBank->percentage}}" aria-valuemin="0" aria-valuemax="100" style="min-width: 40px;width: {{$piggyBank->percentage}}%;">
{{$piggybank->percentage}}% {{$piggyBank->percentage}}%
</div> </div>
</div> </div>
</div> </div>
<div class="col-lg-2 col-md-3 col-sm-4"> <div class="col-lg-2 col-md-3 col-sm-4">
{{mf($piggybank->targetamount,true)}} {{mf($piggyBank->targetamount,true)}}
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-2 col-md-3 col-sm-4"> <div class="col-lg-2 col-md-3 col-sm-4">
<div class="btn-group btn-group-xs"> <div class="btn-group btn-group-xs">
@if($piggybank->leftToSave > 0) @if($piggyBank->leftToSave > 0)
<a href="#" class="btn btn-default addMoney" data-id="{{{$piggybank->id}}}"><span data-id="{{{$piggybank->id}}}" class="glyphicon glyphicon-plus"></span></a> <a href="#" class="btn btn-default addMoney" data-id="{{{$piggyBank->id}}}"><span data-id="{{{$piggyBank->id}}}" class="glyphicon glyphicon-plus"></span></a>
@endif @endif
<a href="#" class="btn btn-default removeMoney" data-id="{{{$piggybank->id}}}"><span data-id="{{{$piggybank->id}}}" class="glyphicon glyphicon-minus"></span></a> <a href="#" class="btn btn-default removeMoney" data-id="{{{$piggyBank->id}}}"><span data-id="{{{$piggyBank->id}}}" class="glyphicon glyphicon-minus"></span></a>
</div> </div>
</div> </div>
<div class="col-lg-8 col-md-6 col-sm-4"> <div class="col-lg-8 col-md-6 col-sm-4">
<div class="btn-group btn-group-xs"> <div class="btn-group btn-group-xs">
<a href="{{route('piggybanks.edit',$piggybank->id)}}" class="btn btn-default"><span class="glyphicon glyphicon-pencil"></span></a> <a href="{{route('piggybanks.edit',$piggyBank->id)}}" class="btn btn-default"><span class="glyphicon glyphicon-pencil"></span></a>
<a href="{{route('piggybanks.delete',$piggybank->id)}}" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span></a> <a href="{{route('piggybanks.delete',$piggyBank->id)}}" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span></a>
</div> </div>
</div> </div>
<div class="col-lg-2 col-md-3 col-sm-4"> <div class="col-lg-2 col-md-3 col-sm-4">
@if($piggybank->leftToSave > 0) @if($piggyBank->leftToSave > 0)
{{mf($piggybank->leftToSave)}} {{mf($piggyBank->leftToSave)}}
@endif @endif
</div> </div>
</div> </div>

8
app/views/piggybanks/remove.blade.php
View File

@ -1,18 +1,18 @@
<form style="display: inline;" id="remove" action="{{route('piggybanks.remove',$piggybank->id)}}" method="POST"> <form style="display: inline;" id="remove" action="{{route('piggybanks.remove',$piggyBank->id)}}" method="POST">
{{Form::token()}} {{Form::token()}}
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button> <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
<h4 class="modal-title" id="myModalLabel">Remove money from {{{$piggybank->name}}}</h4> <h4 class="modal-title" id="myModalLabel">Remove money from {{{$piggyBank->name}}}</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p> <p>
The maximum amount you can remove is {{mf($piggybank->currentRelevantRep()->currentamount)}} The maximum amount you can remove is {{mf($piggyBank->currentRelevantRep()->currentamount)}}
</p> </p>
<div class="input-group"> <div class="input-group">
<div class="input-group-addon">€</div> <div class="input-group-addon">€</div>
<input step="any" class="form-control" id="amount" autocomplete="off" name="amount" max="{{round($piggybank->currentRelevantRep()->currentamount,2)}}" type="number"> <input step="any" class="form-control" id="amount" autocomplete="off" name="amount" max="{{round($piggyBank->currentRelevantRep()->currentamount,2)}}" type="number">
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">

38
app/views/piggybanks/show.blade.php
View File

@ -1,6 +1,6 @@
@extends('layouts.default') @extends('layouts.default')
@section('content') @section('content')
{{ Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName(), $piggybank) }} {{ Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName(), $piggyBank) }}
<div class="row"> <div class="row">
<div class="col-lg-8 col-md-8 col-sm-6"> <div class="col-lg-8 col-md-8 col-sm-6">
<div class="panel panel-default"> <div class="panel panel-default">
@ -25,8 +25,8 @@
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu pull-right" role="menu"> <ul class="dropdown-menu pull-right" role="menu">
<li><a href="{{route('piggybanks.edit',$piggybank->id)}}"><i class="fa fa-pencil fa-fw"></i> Edit</a></li> <li><a href="{{route('piggybanks.edit',$piggyBank->id)}}"><i class="fa fa-pencil fa-fw"></i> Edit</a></li>
<li><a href="{{route('piggybanks.delete',$piggybank->id)}}"><i class="fa fa-trash fa-fw"></i> Delete</a></li> <li><a href="{{route('piggybanks.delete',$piggyBank->id)}}"><i class="fa fa-trash fa-fw"></i> Delete</a></li>
</ul> </ul>
</div> </div>
</div> </div>
@ -36,54 +36,54 @@
<table class="table table-bordered table-striped"> <table class="table table-bordered table-striped">
<tr> <tr>
<td>Account</td> <td>Account</td>
<td><a href="{{route('accounts.show',$piggybank->account_id)}}">{{{$piggybank->account->name}}}</a></td> <td><a href="{{route('accounts.show',$piggyBank->account_id)}}">{{{$piggyBank->account->name}}}</a></td>
</tr> </tr>
<tr> <tr>
<td>Target amount</td> <td>Target amount</td>
<td>{{mf($piggybank->targetamount)}}</td> <td>{{mf($piggyBank->targetamount)}}</td>
</tr> </tr>
<tr> <tr>
<td>Saved so far</td> <td>Saved so far</td>
<td>{{mf($piggybank->currentRelevantRep()->currentamount)}}</td> <td>{{mf($piggyBank->currentRelevantRep()->currentamount)}}</td>
</tr> </tr>
<tr> <tr>
<td>Left to save</td> <td>Left to save</td>
<td>{{mf($piggybank->targetamount-$piggybank->currentRelevantRep()->currentamount)}}</td> <td>{{mf($piggyBank->targetamount-$piggyBank->currentRelevantRep()->currentamount)}}</td>
</tr> </tr>
<tr> <tr>
<td>Start date</td> <td>Start date</td>
<td> <td>
@if(is_null($piggybank->startdate)) @if(is_null($piggyBank->startdate))
<em>No start date</em> <em>No start date</em>
@endif @endif
@if(is_object($piggybank->startdate)) @if(is_object($piggyBank->startdate))
{{$piggybank->startdate->format('jS F Y')}} {{$piggyBank->startdate->format('jS F Y')}}
@endif @endif
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Target date</td> <td>Target date</td>
<td> <td>
@if(is_null($piggybank->targetdate)) @if(is_null($piggyBank->targetdate))
<em>No target date</em> <em>No target date</em>
@endif @endif
@if(is_object($piggybank->targetdate)) @if(is_object($piggyBank->targetdate))
{{$piggybank->targetdate->format('jS F Y')}} {{$piggyBank->targetdate->format('jS F Y')}}
@endif @endif
</td> </td>
</tr> </tr>
@if(!is_null($piggybank->reminder)) @if(!is_null($piggyBank->reminder))
<tr> <tr>
<td>Reminder</td> <td>Reminder</td>
<td> <td>
@if(intval($piggybank->remind_me) == 0) @if(intval($piggyBank->remind_me) == 0)
<em>(no reminder)</em> <em>(no reminder)</em>
@else @else
Every Every
@if($piggybank->reminder_skip != 0) @if($piggyBank->reminder_skip != 0)
{{$piggybank->reminder_skip}} {{$piggyBank->reminder_skip}}
@endif @endif
{{$piggybank->reminder}}(s) {{$piggyBank->reminder}}(s)
@endif @endif
</td> </td>
</tr> </tr>
@ -116,7 +116,7 @@
@section('scripts') @section('scripts')
<script type="text/javascript"> <script type="text/javascript">
var piggyBankID = {{{$piggybank->id}}}; var piggyBankID = {{{$piggyBank->id}}};
</script> </script>
<!-- load the libraries and scripts necessary for Google Charts: --> <!-- load the libraries and scripts necessary for Google Charts: -->