kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-16 17:57:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'release/3.4.0.5'

Browse Source
This commit is contained in:
James Cole
2015-05-10 19:18:57 +02:00
parent cf00922ad2 274dba7408
commit 7b4bc23815
96 changed files with 1334 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.env.example
View File

@@ -15,4 +15,5 @@ EMAIL_SMTP=
EMAIL_DRIVER=smtp
EMAIL_USERNAME=
EMAIL_PASSWORD=
ANALYTICS_ID=
ANALYTICS_ID=
EMAIL_PRETEND=false

3
.env.testing
View File

@@ -14,4 +14,5 @@ SESSION_DRIVER=array
EMAIL_SMTP=
EMAIL_USERNAME=
EMAIL_PASSWORD=
ANALYTICS_ID=ABC
ANALYTICS_ID=ABC
EMAIL_PRETEND=true

2
README.md
View File

@@ -1,5 +1,5 @@
# Firefly III
#### v3.4.0.4
#### v3.4.0.5
[![Build Status](https://travis-ci.org/JC5/firefly-iii.svg?branch=develop)](https://travis-ci.org/JC5/firefly-iii)
[![Project Status](http://stillmaintained.com/JC5/firefly-iii.png?a=b)](http://stillmaintained.com/JC5/firefly-iii)

1
app/Commands/Command.php
View File

@@ -2,6 +2,7 @@
/**
* Class Command
*
* @codeCoverageIgnore
* @package FireflyIII\Commands
*/
abstract class Command

1
app/Console/Kernel.php
View File

@@ -6,6 +6,7 @@ use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
/**
* Class Kernel
*
* @codeCoverageIgnore
* @package FireflyIII\Console
*/
class Kernel extends ConsoleKernel

1
app/Events/Event.php
View File

@@ -3,6 +3,7 @@
/**
* Class Event
*
* @codeCoverageIgnore
* @package FireflyIII\Events
*/
abstract class Event

1
app/Events/JournalCreated.php
View File

@@ -6,6 +6,7 @@ use Illuminate\Queue\SerializesModels;
/**
* Class JournalCreated
*
* @codeCoverageIgnore
* @package FireflyIII\Events
*/
class JournalCreated extends Event

1
app/Events/JournalDeleted.php
View File

@@ -5,6 +5,7 @@ use Illuminate\Queue\SerializesModels;
/**
* Class JournalDeleted
*
* @codeCoverageIgnore
* @package FireflyIII\Events
*/
class JournalDeleted extends Event

1
app/Events/JournalSaved.php
View File

@@ -6,6 +6,7 @@ use Illuminate\Queue\SerializesModels;
/**
* Class JournalSaved
*
* @codeCoverageIgnore
* @package FireflyIII\Events
*/
class JournalSaved extends Event

1
app/Exceptions/FireflyException.php
View File

@@ -6,6 +6,7 @@ namespace FireflyIII\Exceptions;
/**
* Class FireflyException
*
* @codeCoverageIgnore
* @package FireflyIII\Exceptions
*/
class FireflyException extends \Exception

1
app/Exceptions/Handler.php
View File

@@ -6,6 +6,7 @@ use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
/**
* Class Handler
*
* @codeCoverageIgnore
* @package FireflyIII\Exceptions
*/
class Handler extends ExceptionHandler

1
app/Exceptions/NotImplementedException.php
View File

@@ -5,6 +5,7 @@ namespace FireflyIII\Exceptions;
/**
* Class NotImplementedException
*
* @codeCoverageIgnore
* @package FireflyIII\Exceptions
*/
class NotImplementedException extends \Exception

1
app/Exceptions/ValidationException.php
View File

@@ -4,6 +4,7 @@ namespace FireflyIII\Exceptions;
/**
* Class ValidationExceptions
*
* @codeCoverageIgnore
* @package FireflyIII\Exception
*/
class ValidationException extends \Exception

1
app/Handlers/Events/JournalDeletedHandler.php
View File

@@ -5,6 +5,7 @@ use FireflyIII\Events\JournalDeleted;
/**
* Class JournalDeletedHandler
*
* @codeCoverageIgnore
* @package FireflyIII\Handlers\Events
*/
class JournalDeletedHandler

5
app/Http/Controllers/Auth/AuthController.php
View File

@@ -38,6 +38,7 @@ class AuthController extends Controller
*
* @param \Illuminate\Contracts\Auth\Guard $auth
* @param \Illuminate\Contracts\Auth\Registrar $registrar
* @codeCoverageIgnore
*
*/
public function __construct(Guard $auth, Registrar $registrar)
@@ -51,7 +52,9 @@ class AuthController extends Controller
/**
* Show the application login form.
*
* @codeCoverageIgnore
* @return \Illuminate\Http\Response
*
*/
public function getLogin()
{
@@ -73,7 +76,9 @@ class AuthController extends Controller
$this->throwValidationException(
$request, $validator
);
// @codeCoverageIgnoreStart
}
// @codeCoverageIgnoreEnd
$data = $request->all();
$data['password'] = bcrypt($data['password']);

2
app/Http/Controllers/Auth/PasswordController.php
View File

@@ -7,7 +7,7 @@ use Illuminate\Foundation\Auth\ResetsPasswords;
/**
* Class PasswordController
*
* @codeCoverageIgnore
* @package FireflyIII\Http\Controllers\Auth
*/
class PasswordController extends Controller

11
app/Http/Controllers/GoogleChartController.php
View File

@@ -187,17 +187,6 @@ class GoogleChartController extends Controller
if ($entry[1] != 0 || $entry[2] != 0 || $entry[3] != 0) {
$chart->addRow($entry[0], $entry[1], $entry[2], $entry[3]);
}
// if ($entry[2] > 0) {
// $left = $entry[1] - $entry[2];
// if ($left > 0) {
// $chart->addRow($entry[0], $left, null);
// } else {
// if ($left < 0) {
// $chart->addRow($entry[0], null, $left);
// }
// }
//
// }
}
$chart->generate();

1
app/Http/Middleware/Authenticate.php
View File

@@ -7,6 +7,7 @@ use Illuminate\Http\Request;
/**
* Class Authenticate
*
* @codeCoverageIgnore
* @package FireflyIII\Http\Middleware
*/
class Authenticate

1
app/Http/Middleware/RedirectIfAuthenticated.php
View File

@@ -8,6 +8,7 @@ use Illuminate\Http\Request;
/**
* Class RedirectIfAuthenticated
*
* @codeCoverageIgnore
* @package FireflyIII\Http\Middleware
*/
class RedirectIfAuthenticated

1
app/Http/Middleware/ReplaceTestVars.php
View File

@@ -10,6 +10,7 @@ use Log;
/**
* Class ReplaceTestVars
*
* @codeCoverageIgnore
* @package FireflyIII\Http\Middleware
*/
class ReplaceTestVars

1
app/Http/Middleware/VerifyCsrfToken.php
View File

@@ -6,6 +6,7 @@ use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier;
/**
* Class VerifyCsrfToken
*
* @codeCoverageIgnore
* @package FireflyIII\Http\Middleware
*/
class VerifyCsrfToken extends BaseVerifier

1
app/Http/Requests/AccountFormRequest.php
View File

@@ -10,6 +10,7 @@ use Input;
/**
* Class AccountFormRequest
*
* @codeCoverageIgnore
* @package FireflyIII\Http\Requests
*/
class AccountFormRequest extends Request

1
app/Http/Requests/BillFormRequest.php
View File

@@ -9,6 +9,7 @@ use Input;
/**
* Class BillFormRequest
*
* @codeCoverageIgnore
* @package FireflyIII\Http\Requests
*/
class BillFormRequest extends Request

1
app/Http/Requests/BudgetFormRequest.php
View File

@@ -9,6 +9,7 @@ use Input;
/**
* Class BudgetFormRequest
*
* @codeCoverageIgnore
* @package FireflyIII\Http\Requests
*/
class BudgetFormRequest extends Request

1
app/Http/Requests/CategoryFormRequest.php
View File

@@ -9,6 +9,7 @@ use Input;
/**
* Class CategoryFormRequest
*
* @codeCoverageIgnore
* @package FireflyIII\Http\Requests
*/
class CategoryFormRequest extends Request

1
app/Http/Requests/CurrencyFormRequest.php
View File

@@ -8,6 +8,7 @@ use Input;
/**
* Class BillFormRequest
*
* @codeCoverageIgnore
* @package FireflyIII\Http\Requests
*/
class CurrencyFormRequest extends Request

1
app/Http/Requests/DeleteAccountFormRequest.php
View File

@@ -7,6 +7,7 @@ use Auth;
/**
* Class DeleteAccountFormRequest
*
* @codeCoverageIgnore
* @package FireflyIII\Http\Requests
*/
class DeleteAccountFormRequest extends Request

1
app/Http/Requests/JournalFormRequest.php
View File

@@ -10,6 +10,7 @@ use Input;
/**
* Class JournalFormRequest
*
* @codeCoverageIgnore
* @package FireflyIII\Http\Requests
*/
class JournalFormRequest extends Request

1
app/Http/Requests/PiggyBankFormRequest.php
View File

@@ -8,6 +8,7 @@ use Input;
/**
* Class PiggyBankFormRequest
*
* @codeCoverageIgnore
* @package FireflyIII\Http\Requests
*/
class PiggyBankFormRequest extends Request

1
app/Http/Requests/ProfileFormRequest.php
View File

@@ -7,6 +7,7 @@ use Auth;
/**
* Class ProfileFormRequest
*
* @codeCoverageIgnore
* @package FireflyIII\Http\Requests
*/
class ProfileFormRequest extends Request

1
app/Http/Requests/Request.php
View File

@@ -5,6 +5,7 @@ use Illuminate\Foundation\Http\FormRequest;
/**
* Class Request
*
* @codeCoverageIgnore
* @package FireflyIII\Http\Requests
*/
abstract class Request extends FormRequest

1
app/Http/Requests/TagFormRequest.php
View File

@@ -15,6 +15,7 @@ use Input;
/**
* Class TagFormRequest
*
* @codeCoverageIgnore
* @package FireflyIII\Http\Requests
*/
class TagFormRequest extends Request

2
app/Http/breadcrumbs.php
View File

@@ -319,7 +319,7 @@ Breadcrumbs::register(
Breadcrumbs::register(
'reports.month', function (Generator $breadcrumbs, Carbon $date) {
$breadcrumbs->parent('reports.index');
$breadcrumbs->parent('reports.year', $date);
$breadcrumbs->push('Monthly report for ' . $date->format('F Y'), route('reports.month', [$date->year, $date->month]));
}
);

12
app/Models/Account.php
View File

@@ -29,6 +29,7 @@ class Account extends Model
/**
* @param array $fields
*
*
* @return Account|null
*/
public static function firstOrCreateEncrypted(array $fields)
@@ -86,6 +87,7 @@ class Account extends Model
}
/**
* @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function accountMeta()
@@ -94,6 +96,7 @@ class Account extends Model
}
/**
* @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function accountType()
@@ -102,6 +105,7 @@ class Account extends Model
}
/**
* @codeCoverageIgnore
* @return array
*/
public function getDates()
@@ -110,6 +114,7 @@ class Account extends Model
}
/**
*
* @param $fieldName
*
* @return string|null
@@ -127,6 +132,7 @@ class Account extends Model
}
/**
* @codeCoverageIgnore
* @param $value
*
* @return string
@@ -144,6 +150,7 @@ class Account extends Model
}
/**
* @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function piggyBanks()
@@ -152,6 +159,7 @@ class Account extends Model
}
/**
* @codeCoverageIgnore
* @param EloquentBuilder $query
* @param array $types
*/
@@ -165,6 +173,7 @@ class Account extends Model
}
/**
* @codeCoverageIgnore
* @param EloquentBuilder $query
* @param string $name
* @param string $value
@@ -181,6 +190,7 @@ class Account extends Model
}
/**
* @codeCoverageIgnore
* @param $value
*/
public function setNameAttribute($value)
@@ -190,6 +200,7 @@ class Account extends Model
}
/**
* @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function transactions()
@@ -198,6 +209,7 @@ class Account extends Model
}
/**
* @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function user()

2
app/Models/AccountMeta.php
View File

@@ -6,6 +6,7 @@ use Watson\Validating\ValidatingTrait;
/**
* Class AccountMeta
*
* @codeCoverageIgnore
* @package FireflyIII\Models
*/
class AccountMeta extends Model
@@ -22,6 +23,7 @@ class AccountMeta extends Model
protected $table = 'account_meta';
/**
*
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function account()

1
app/Models/AccountType.php
View File

@@ -5,6 +5,7 @@ use Illuminate\Database\Eloquent\Model;
/**
* Class AccountType
*
* @codeCoverageIgnore
* @package FireflyIII\Models
*/
class AccountType extends Model

2
app/Models/Budget.php
View File

@@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
/**
* Class Budget
*
* @codeCoverageIgnore
* @package FireflyIII\Models
*/
class Budget extends Model
@@ -17,6 +18,7 @@ class Budget extends Model
protected $fillable = ['user_id', 'name'];
/**
*
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function budgetlimits()

1
app/Models/BudgetLimit.php
View File

@@ -5,6 +5,7 @@ use Illuminate\Database\Eloquent\Model;
/**
* Class BudgetLimit
*
* @codeCoverageIgnore
* @package FireflyIII\Models
*/
class BudgetLimit extends Model

8
app/Models/Category.php
View File

@@ -8,6 +8,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
/**
* Class Category
*
*
* @package FireflyIII\Models
*/
class Category extends Model
@@ -17,6 +18,7 @@ class Category extends Model
protected $fillable = ['user_id', 'name'];
/**
* @codeCoverageIgnore
* @return array
*/
public function getDates()
@@ -25,6 +27,7 @@ class Category extends Model
}
/**
* @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
*/
public function transactionjournals()
@@ -66,6 +69,7 @@ class Category extends Model
}
/**
* @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function user()
@@ -74,6 +78,7 @@ class Category extends Model
}
/**
* @codeCoverageIgnore
* @param $value
*/
public function setNameAttribute($value)
@@ -83,6 +88,7 @@ class Category extends Model
}
/**
* @codeCoverageIgnore
* @param $value
*
* @return string
@@ -94,9 +100,7 @@ class Category extends Model
return Crypt::decrypt($value);
}
// @codeCoverageIgnoreStart
return $value;
// @codeCoverageIgnoreEnd
}
}

1
app/Models/Component.php
View File

@@ -6,6 +6,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
/**
* Class Component
*
* @codeCoverageIgnore
* @package FireflyIII\Models
*/
class Component extends Model

2
app/Models/LimitRepetition.php
View File

@@ -13,6 +13,7 @@ class LimitRepetition extends Model
{
/**
* @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function budgetLimit()
@@ -21,6 +22,7 @@ class LimitRepetition extends Model
}
/**
* @codeCoverageIgnore
* @return array
*/
public function getDates()

8
app/Models/PiggyBank.php
View File

@@ -17,6 +17,7 @@ class PiggyBank extends Model
= ['name', 'account_id', 'order', 'reminder_skip', 'targetamount', 'startdate', 'targetdate', 'reminder', 'remind_me'];
/**
* @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function account()
@@ -44,6 +45,7 @@ class PiggyBank extends Model
}
/**
* @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function piggyBankRepetitions()
@@ -52,6 +54,7 @@ class PiggyBank extends Model
}
/**
* @codeCoverageIgnore
* @return array
*/
public function getDates()
@@ -60,6 +63,7 @@ class PiggyBank extends Model
}
/**
* @codeCoverageIgnore
* @param $value
*
* @return int
@@ -70,6 +74,7 @@ class PiggyBank extends Model
}
/**
* @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function piggyBankEvents()
@@ -78,6 +83,7 @@ class PiggyBank extends Model
}
/**
* @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\MorphMany
*/
public function reminders()
@@ -86,6 +92,7 @@ class PiggyBank extends Model
}
/**
* @codeCoverageIgnore
* @param $value
*/
public function setNameAttribute($value)
@@ -95,6 +102,7 @@ class PiggyBank extends Model
}
/**
* @codeCoverageIgnore
* @param $value
*
* @return string

1
app/Models/PiggyBankEvent.php
View File

@@ -5,6 +5,7 @@ use Illuminate\Database\Eloquent\Model;
/**
* Class PiggyBankEvent
*
* @codeCoverageIgnore
* @package FireflyIII\Models
*/
class PiggyBankEvent extends Model

1
app/Models/PiggyBankRepetition.php
View File

@@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Model;
/**
* Class PiggyBankRepetition
*
* @codeCoverageIgnore
* @package FireflyIII\Models
*/
class PiggyBankRepetition extends Model

1
app/Models/Preference.php
View File

@@ -5,6 +5,7 @@ use Illuminate\Database\Eloquent\Model;
/**
* Class Preference
*
* @codeCoverageIgnore
* @package FireflyIII\Models
*/
class Preference extends Model

9
app/Models/Reminder.php
View File

@@ -17,6 +17,7 @@ class Reminder extends Model
protected $fillable = ['user_id', 'startdate', 'metadata', 'enddate', 'active', 'notnow', 'remindersable_id', 'remindersable_type',];
/**
* @codeCoverageIgnore
* @param $value
*
* @return int
@@ -27,6 +28,7 @@ class Reminder extends Model
}
/**
* @codeCoverageIgnore
* @return array
*/
public function getDates()
@@ -35,6 +37,7 @@ class Reminder extends Model
}
/**
* @codeCoverageIgnore
* @param $value
*
* @return mixed
@@ -49,6 +52,7 @@ class Reminder extends Model
}
/**
* @codeCoverageIgnore
* @param $value
*
* @return bool
@@ -59,6 +63,7 @@ class Reminder extends Model
}
/**
* @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\MorphTo
*/
public function remindersable()
@@ -67,6 +72,7 @@ class Reminder extends Model
}
/**
* @codeCoverageIgnore
* @param EloquentBuilder $query
* @param Carbon $start
* @param Carbon $end
@@ -79,6 +85,7 @@ class Reminder extends Model
}
/**
* @codeCoverageIgnore
* @param EloquentBuilder $query
*
* @return $this
@@ -92,6 +99,7 @@ class Reminder extends Model
}
/**
* @codeCoverageIgnore
* @param $value
*/
public function setMetadataAttribute($value)
@@ -101,6 +109,7 @@ class Reminder extends Model
}
/**
* @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function user()

7
app/Models/Tag.php
View File

@@ -67,6 +67,7 @@ class Tag extends Model
}
/**
* @codeCoverageIgnore
* @return array
*/
public function getDates()
@@ -75,6 +76,7 @@ class Tag extends Model
}
/**
* @codeCoverageIgnore
* @param $value
*
* @return string
@@ -85,6 +87,7 @@ class Tag extends Model
}
/**
* @codeCoverageIgnore
* @param $value
*
* @return string
@@ -95,6 +98,7 @@ class Tag extends Model
}
/**
* @codeCoverageIgnore
* @param $value
*/
public function setDescriptionAttribute($value)
@@ -103,6 +107,7 @@ class Tag extends Model
}
/**
* @codeCoverageIgnore
* @param $value
*/
public function setTagAttribute($value)
@@ -111,6 +116,7 @@ class Tag extends Model
}
/**
* @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
*/
public function transactionjournals()
@@ -119,6 +125,7 @@ class Tag extends Model
}
/**
* @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function user()

1
app/Models/Transaction.php
View File

@@ -9,6 +9,7 @@ use Watson\Validating\ValidatingTrait;
/**
* Class Transaction
*
* @codeCoverageIgnore
* @package FireflyIII\Models
*/
class Transaction extends Model

2
app/Models/TransactionCurrency.php
View File

@@ -4,8 +4,10 @@ use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
/**
*
* Class TransactionCurrency
*
* @codeCoverageIgnore
* @package FireflyIII\Models
*/
class TransactionCurrency extends Model

1
app/Models/TransactionGroup.php
View File

@@ -6,6 +6,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
/**
* Class TransactionGroup
*
* @codeCoverageIgnore
* @package FireflyIII\Models
*/
class TransactionGroup extends Model

22
app/Models/TransactionJournal.php
View File

@@ -32,6 +32,7 @@ class TransactionJournal extends Model
];
/**
* @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function bill()
@@ -40,6 +41,7 @@ class TransactionJournal extends Model
}
/**
* @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
*/
public function budgets()
@@ -48,6 +50,7 @@ class TransactionJournal extends Model
}
/**
* @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
*/
public function categories()
@@ -94,6 +97,7 @@ class TransactionJournal extends Model
}
/**
* @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function transactions()
@@ -102,6 +106,7 @@ class TransactionJournal extends Model
}
/**
* @codeCoverageIgnore
* @return array
*/
public function getDates()
@@ -110,6 +115,7 @@ class TransactionJournal extends Model
}
/**
* @codeCoverageIgnore
* @param $value
*
* @return string
@@ -120,12 +126,11 @@ class TransactionJournal extends Model
return Crypt::decrypt($value);
}
// @codeCoverageIgnoreStart
return $value;
// @codeCoverageIgnoreEnd
}
/**
* @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function piggyBankEvents()
@@ -134,6 +139,7 @@ class TransactionJournal extends Model
}
/**
* @codeCoverageIgnore
* @param EloquentBuilder $query
* @param Account $account
*/
@@ -147,6 +153,7 @@ class TransactionJournal extends Model
}
/**
* @codeCoverageIgnore
* @param EloquentBuilder $query
* @param Carbon $date
*
@@ -158,6 +165,7 @@ class TransactionJournal extends Model
}
/**
* @codeCoverageIgnore
* @param EloquentBuilder $query
* @param Carbon $date
*
@@ -169,6 +177,7 @@ class TransactionJournal extends Model
}
/**
* @codeCoverageIgnore
* @param EloquentBuilder $query
* @param $amount
*/
@@ -185,6 +194,7 @@ class TransactionJournal extends Model
}
/**
* @codeCoverageIgnore
* @param EloquentBuilder $query
* @param Carbon $date
*
@@ -196,6 +206,7 @@ class TransactionJournal extends Model
}
/**
* @codeCoverageIgnore
* @param EloquentBuilder $query
* @param array $types
*/
@@ -211,6 +222,7 @@ class TransactionJournal extends Model
}
/**
* @codeCoverageIgnore
* Automatically includes the 'with' parameters to get relevant related
* objects.
*
@@ -226,6 +238,7 @@ class TransactionJournal extends Model
}
/**
* @codeCoverageIgnore
* @param $value
*/
public function setDescriptionAttribute($value)
@@ -235,6 +248,7 @@ class TransactionJournal extends Model
}
/**
* @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
*/
public function tags()
@@ -243,6 +257,7 @@ class TransactionJournal extends Model
}
/**
* @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function transactionCurrency()
@@ -251,6 +266,7 @@ class TransactionJournal extends Model
}
/**
* @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function transactionType()
@@ -259,6 +275,7 @@ class TransactionJournal extends Model
}
/**
* @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
*/
public function transactiongroups()
@@ -267,6 +284,7 @@ class TransactionJournal extends Model
}
/**
* @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function user()

1
app/Models/TransactionRelation.php
View File

@@ -5,6 +5,7 @@ use Illuminate\Database\Eloquent\Model;
/**
* Class TransactionRelation
*
* @codeCoverageIgnore
* @package FireflyIII\Models
*/
class TransactionRelation extends Model

1
app/Models/TransactionType.php
View File

@@ -6,6 +6,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
/**
* Class TransactionType
*
* @codeCoverageIgnore
* @package FireflyIII\Models
*/
class TransactionType extends Model

2
app/Providers/FireflyServiceProvider.php
View File

@@ -10,6 +10,7 @@ use FireflyIII\Support\Preferences;
use FireflyIII\Support\Steam;
use FireflyIII\Support\Twig\Budget;
use FireflyIII\Support\Twig\General;
use FireflyIII\Support\Twig\Translation;
use FireflyIII\Support\Twig\Journal;
use FireflyIII\Support\Twig\PiggyBank;
use FireflyIII\Validation\FireflyValidator;
@@ -42,6 +43,7 @@ class FireflyServiceProvider extends ServiceProvider
Twig::addExtension(new General);
Twig::addExtension(new Journal);
Twig::addExtension(new Budget);
Twig::addExtension(new Translation);
}
public function register()

11
app/Repositories/Journal/JournalRepository.php
View File

@@ -137,7 +137,7 @@ class JournalRepository implements JournalRepositoryInterface
*/
public function getWithDate($id, Carbon $date)
{
return Auth::user()->transactionjournals()->where('id', $id)->where('date', $date->format('Y-m-d'))->first();
return Auth::user()->transactionjournals()->where('id', $id)->where('date', $date->format('Y-m-d 00:00:00'))->first();
}
/**
@@ -379,14 +379,19 @@ class JournalRepository implements JournalRepositoryInterface
$to = Account::find($data['account_to_id']);
break;
}
if (is_null($to->id)) {
if (is_null($to) || (!is_null($to) && is_null($to->id))) {
Log::error('"to"-account is null, so we cannot continue!');
App::abort(500, '"to"-account is null, so we cannot continue!');
// @codeCoverageIgnoreStart
}
if (is_null($from->id)) {
// @codeCoverageIgnoreEnd
if (is_null($from) || (!is_null($from) && is_null($from->id))) {
Log::error('"from"-account is null, so we cannot continue!');
App::abort(500, '"from"-account is null, so we cannot continue!');
// @codeCoverageIgnoreStart
}
// @codeCoverageIgnoreEnd
return [$from, $to];
}

16
app/Repositories/PiggyBank/PiggyBankRepository.php
View File

@@ -145,14 +145,20 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
/**
* Set all piggy banks to order 0.
*
* @return void
* @return boolean
*/
public function reset()
{
DB::table('piggy_banks')
->leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.id')
->where('accounts.user_id', Auth::user()->id)
->update(['order' => 0, 'piggy_banks.updated_at' => DB::Raw('NOW()')]);
// split query to make it work in sqlite:
$set = PiggyBank::
leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.id')
->where('accounts.user_id', Auth::user()->id)->get(['piggy_banks.*']);
foreach ($set as $e) {
$e->order = 0;
$e->save();
}
return true;
}
/**

1
app/Repositories/PiggyBank/PiggybankPart.php
View File

@@ -9,6 +9,7 @@ use FireflyIII\Models\Reminder;
/**
* Class PiggyBankPart
*
* @codeCoverageIgnore
* @package FireflyIII\Collection
*/
class PiggyBankPart

2
app/Repositories/Reminder/ReminderRepository.php
View File

@@ -20,7 +20,7 @@ class ReminderRepository implements ReminderRepositoryInterface
protected $helper;
/**
*
* @codeCoverageIgnore
*/
public function __construct()
{

41
app/Repositories/Tag/TagRepository.php
View File

@@ -52,6 +52,7 @@ class TagRepository implements TagRepositoryInterface
$withdrawals = $tag->transactionjournals()->where('transaction_type_id', $withdrawal->id)->count();
$transfers = $tag->transactionjournals()->where('transaction_type_id', $transfer->id)->count();
$deposits = $tag->transactionjournals()->where('transaction_type_id', $deposit->id)->count();
if ($tag->tagMode == 'balancingAct') {
@@ -73,39 +74,47 @@ class TagRepository implements TagRepositoryInterface
}
if ($tag->tagMode == 'advancePayment') {
// advance payments cannot accept transfers:
if ($journal->transaction_type_id == $transfer->id) {
return false;
}
// only if this is the only withdrawal
if ($journal->transaction_type_id == $withdrawal->id && $withdrawals < 1) {
// the first transaction to be attached to this
// tag is attached just like that:
if ($withdrawals < 1 && $deposits < 1) {
$journal->tags()->save($tag);
return true;
}
// only if this is a deposit.
if ($journal->transaction_type_id == $deposit->id) {
// if withdrawal and already has a withdrawal, return false:
if ($journal->transaction_type_id == $withdrawal->id && $withdrawals == 1) {
return false;
}
// if this is a deposit, account must match the current only journal
// (if already present):
$currentWithdrawal = $tag->transactionjournals()->where('transaction_type_id', $withdrawal->id)->first();
if ($currentWithdrawal && $currentWithdrawal->assetAccount->id == $journal->assetAccount->id) {
// if already has transaction journals, must match ALL asset account id's:
if ($deposits > 0 || $withdrawals == 1) {
$match = true;
/** @var TransactionJournal $check */
foreach ($tag->transactionjournals as $check) {
if ($check->assetAccount->id != $journal->assetAccount->id) {
$match = false;
}
}
if ($match) {
$journal->tags()->save($tag);
return true;
} else {
if (is_null($currentWithdrawal)) {
$journal->tags()->save($tag);
return true;
}
}
}
return false;
}
// @codeCoverageIgnoreStart
return false;
}
// @codeCoverageIgnoreEnd
/**
* @param Tag $tag

1
app/Services/Registrar.php
View File

@@ -7,6 +7,7 @@ use Validator;
/**
* Class Registrar
*
* @codeCoverageIgnore
* @package FireflyIII\Services
*/
class Registrar implements RegistrarContract

1
app/Support/Amount.php
View File

@@ -2,7 +2,6 @@
namespace FireflyIII\Support;
use Cache;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Models\TransactionJournal;

1
app/Support/Facades/Amount.php
View File

@@ -7,6 +7,7 @@ use Illuminate\Support\Facades\Facade;
/**
* Class Amount
*
* @codeCoverageIgnore
* @package FireflyIII\Support\Facades
*/
class Amount extends Facade

1
app/Support/Facades/ExpandedForm.php
View File

@@ -7,6 +7,7 @@ use Illuminate\Support\Facades\Facade;
/**
* Class Amount
*
* @codeCoverageIgnore
* @package FireflyIII\Support\Facades
*/
class ExpandedForm extends Facade

1
app/Support/Facades/Navigation.php
View File

@@ -7,6 +7,7 @@ use Illuminate\Support\Facades\Facade;
/**
* Class Navigation
*
* @codeCoverageIgnore
* @package FireflyIII\Support\Facades
*/
class Navigation extends Facade

1
app/Support/Facades/Preferences.php
View File

@@ -7,6 +7,7 @@ use Illuminate\Support\Facades\Facade;
/**
* Class Preferences
*
* @codeCoverageIgnore
* @package FireflyIII\Support\Facades
*/
class Preferences extends Facade

1
app/Support/Facades/Steam.php
View File

@@ -7,6 +7,7 @@ use Illuminate\Support\Facades\Facade;
/**
* Class Steam
*
* @codeCoverageIgnore
* @package FireflyIII\Support\Facades
*/
class Steam extends Facade

42
app/Support/Twig/Translation.php Normal file
View File

@@ -0,0 +1,42 @@
<?php
namespace FireflyIII\Support\Twig;
use FireflyIII\Models\LimitRepetition;
use Twig_Extension;
use Twig_SimpleFilter;
/**
* Class Budget
*
* @package FireflyIII\Support\Twig
*/
class Translation extends Twig_Extension
{
/**
* @return array
*/
public function getFilters()
{
$filters = [];
$filters[] = new Twig_SimpleFilter(
'_', function ($name) {
return trans('firefly.'.$name);
}, ['is_safe' => ['html']]
);
return $filters;
}
/**
* {@inheritDoc}
*/
public function getName()
{
return 'FireflyIII\Support\Twig\Translation';
}
}

2
config/mail.php
View File

@@ -119,6 +119,6 @@ return [
|
*/
'pretend' => false,
'pretend' => env('EMAIL_PRETEND', false),
];

6
resources/lang/en/firefly.php
View File

@@ -6,5 +6,7 @@ return [
'pleaseHold' => 'Please hold...',
'mandatoryFields' => 'Mandatory fields',
'optionalFields' => 'Optional fields',
'options' => 'Options'
];
'options' => 'Options',
'something' => 'Something!'
];

6
resources/twig/accounts/create.twig
View File

@@ -9,7 +9,7 @@
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa {{ subTitleIcon }}"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa {{ subTitleIcon }}"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.text('name') }}
@@ -22,7 +22,7 @@
{% if what == 'asset' %}
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-smile-o"></i> {{ trans('firefly.optionalFields') }}
<i class="fa fa-smile-o"></i> {{ 'optionalFields'|_ }}
</div>
<div class="panel-body">
@@ -37,7 +37,7 @@
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('create','account') }}

6
resources/twig/accounts/edit.twig
View File

@@ -9,7 +9,7 @@
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa {{ subTitleIcon }}"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa {{ subTitleIcon }}"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.text('name') }}
@@ -20,7 +20,7 @@
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-smile-o"></i> {{ trans('firefly.optionalFields') }}
<i class="fa fa-smile-o"></i> {{ 'optionalFields'|_ }}
</div>
<div class="panel-body">
{% if account.accounttype.type == 'Default account' or account.accounttype.type == 'Asset account' %}
@@ -50,7 +50,7 @@
<!-- panel for options -->
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('update','account') }}

6
resources/twig/bills/create.twig
View File

@@ -7,7 +7,7 @@
<div class="col-lg-6 col-md-12 col-sm-6">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa fa-exclamation-circle"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa fa-exclamation-circle"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.text('name') }}
@@ -23,7 +23,7 @@
<div class="col-lg-6 col-md-12 col-sm-6">
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-smile-o"></i> {{ trans('firefly.optionalFields') }}
<i class="fa fa-smile-o"></i> {{ 'optionalFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.integer('skip',0) }}
@@ -35,7 +35,7 @@
<!-- panel for options -->
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('create','bill') }}

6
resources/twig/bills/edit.twig
View File

@@ -9,7 +9,7 @@
<div class="col-lg-6 col-md-12 col-sm-6">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa fa-exclamation-circle"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa fa-exclamation-circle"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.text('name') }}
@@ -26,7 +26,7 @@
<div class="col-lg-6 col-md-12 col-sm-6">
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-smile-o"></i> {{ trans('firefly.optionalFields') }}
<i class="fa fa-smile-o"></i> {{ 'optionalFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.integer('skip') }}
@@ -37,7 +37,7 @@
</div>
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('update','bill') }}

4
resources/twig/budgets/create.twig
View File

@@ -6,7 +6,7 @@
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa fa-exclamation"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa fa-exclamation"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.text('name') }}
@@ -17,7 +17,7 @@
<!-- panel for options -->
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('create','budget') }}

4
resources/twig/budgets/edit.twig
View File

@@ -13,7 +13,7 @@
<div class="col-lg-6 col-md-12 col-sm-6">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa fa-fw fa-exclamation"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa fa-fw fa-exclamation"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.checkbox('active') }}
@@ -26,7 +26,7 @@
<!-- panel for options -->
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('update','budget') }}

4
resources/twig/categories/create.twig
View File

@@ -7,7 +7,7 @@
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa fa-exclamation"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa fa-exclamation"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.text('name') }}
@@ -20,7 +20,7 @@
<!-- panel for options -->
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('create','category') }}

4
resources/twig/categories/edit.twig
View File

@@ -7,7 +7,7 @@
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa fa-exclamation"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa fa-exclamation"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.text('name') }}
@@ -21,7 +21,7 @@
<!-- panel for options -->
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('update','category') }}

4
resources/twig/currency/create.twig
View File

@@ -6,7 +6,7 @@
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa {{ subTitleIcon }}"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa {{ subTitleIcon }}"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.text('name',null,{'maxlength' : 48}) }}
@@ -22,7 +22,7 @@
<!-- panel for options -->
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('create','currency') }}

4
resources/twig/currency/edit.twig
View File

@@ -8,7 +8,7 @@
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa {{ subTitleIcon }}"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa {{ subTitleIcon }}"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.text('name',null,{'maxlength' : 48}) }}
@@ -23,7 +23,7 @@
<!-- panel for options -->
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('update','currency') }}

2
resources/twig/index.twig
View File

@@ -5,7 +5,7 @@
{% if count == 0 %}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<p class="lead">{{ trans('firefly.welcome') }}</p>
<p class="lead">{{ 'welcome'|_ }}</p>
<p>
Create a new asset account to get started.

6
resources/twig/layout/default.twig
View File

@@ -89,15 +89,15 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">{{ trans('firefly.close') }}</span>
<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="helpTitle">{{ trans('firefly.pleaseHold') }}</h4>
<h4 class="modal-title" id="helpTitle">{{ 'pleaseHold'|_ }}</h4>
</div>
<div class="modal-body" id="helpBody">
<i class="fa fa-refresh fa-spin"></i>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('firefly.close') }}</button>
<button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>
</div>
</div>
</div>

6
resources/twig/piggy-banks/create.twig
View File

@@ -8,7 +8,7 @@
<div class="col-lg-6 col-md-12 col-sm-6">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa fa-fw fa-exclamation"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa fa-fw fa-exclamation"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
@@ -22,7 +22,7 @@
<div class="col-lg-6 col-md-12 col-sm-12">
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-smile-o"></i> {{ trans('firefly.optionalFields') }}
<i class="fa fa-smile-o"></i> {{ 'optionalFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.date('targetdate') }}
@@ -34,7 +34,7 @@
<!-- panel for options -->
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('create','piggy bank') }}

6
resources/twig/piggy-banks/edit.twig
View File

@@ -10,7 +10,7 @@
<div class="col-lg-6 col-md-12 col-sm-6">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa fa-fw fa-exclamation"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa fa-fw fa-exclamation"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
@@ -25,7 +25,7 @@
<div class="col-lg-6 col-md-12 col-sm-12">
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-smile-o"></i> {{ trans('firefly.optionalFields') }}
<i class="fa fa-smile-o"></i> {{ 'optionalFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.date('targetdate') }}
@@ -37,7 +37,7 @@
<!-- panel for options -->
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('update','piggy bank') }}

6
resources/twig/tags/create.twig
View File

@@ -7,7 +7,7 @@
<div class="col-lg-5 col-md-5 col-sm-12">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa fa-tag"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa fa-tag"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.text('tag') }}
@@ -20,7 +20,7 @@
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-smile-o"></i> {{ trans('firefly.optionalFields') }}
<i class="fa fa-smile-o"></i> {{ 'optionalFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.date('date') }}
@@ -32,7 +32,7 @@
<!-- panel for options -->
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('create','tag') }}

6
resources/twig/tags/edit.twig
View File

@@ -9,7 +9,7 @@
<div class="col-lg-5 col-md-5 col-sm-12">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa fa-tag"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa fa-tag"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.text('tag') }}
@@ -22,7 +22,7 @@
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-smile-o"></i> {{ trans('firefly.optionalFields') }}
<i class="fa fa-smile-o"></i> {{ 'optionalFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.date('date') }}
@@ -34,7 +34,7 @@
<!-- panel for options -->
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('update','tag') }}

6
resources/twig/transactions/create.twig
View File

@@ -8,7 +8,7 @@
<div class="col-lg-6 col-md-12 col-sm-12">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa fa-exclamation-circle"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa fa-exclamation-circle"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
<!-- DESCRIPTION ALWAYS AVAILABLE -->
@@ -47,7 +47,7 @@
<div class="col-lg-6 col-md-12 col-sm-12">
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-smile-o"></i> {{ trans('firefly.optionalFields') }}
<i class="fa fa-smile-o"></i> {{ 'optionalFields'|_ }}
</div>
<div class="panel-body">
<!-- BUDGET ONLY WHEN CREATING A WITHDRAWAL -->
@@ -71,7 +71,7 @@
<!-- panel for options -->
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('create','transaction') }}

6
resources/twig/transactions/edit.twig
View File

@@ -10,7 +10,7 @@
<div class="col-lg-6 col-md-12 col-sm-12">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa fa-exclamation-circle"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa fa-exclamation-circle"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
<!-- ALWAYS AVAILABLE -->
@@ -49,7 +49,7 @@
<div class="col-lg-6 col-md-12 col-sm-12">
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-smile-o"></i> {{ trans('firefly.optionalFields') }}
<i class="fa fa-smile-o"></i> {{ 'optionalFields'|_ }}
</div>
<div class="panel-body">
<!-- BUDGET ONLY WHEN CREATING A WITHDRAWAL -->
@@ -74,7 +74,7 @@
<!-- panel for options -->
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('update','transaction') }}

5
tests/TestCase.php
View File

@@ -42,7 +42,7 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase
Log::debug('Created new database.');
touch($original);
Artisan::call('migrate');
copy($original, $copy);
// create EUR currency
/** @var TransactionCurrency $currency */
@@ -50,8 +50,11 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase
$currency->code = 'EUR';
$currency->save();
Log::debug('Created new EUR currency.');
copy($original, $copy);
} else {
if (file_exists($copy)) {
Log::debug('Copied copy back over original.');
copy($copy, $original);
}
}

68
tests/controllers/AuthControllerTest.php Normal file
View File

@@ -0,0 +1,68 @@
<?php
use League\FactoryMuffin\Facade as FactoryMuffin;
/**
* Class AuthControllerTest
*/
class AuthControllerTest extends TestCase
{
/**
* Sets up the fixture, for example, opens a network connection.
* This method is called before a test is executed.
*/
public function setUp()
{
parent::setUp();
FactoryMuffin::create('FireflyIII\User');
}
/**
* This method is called before the first test of this test class is run.
*
* @since Method available since Release 3.4.0
*/
public static function setUpBeforeClass()
{
parent::setUpBeforeClass();
}
/**
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
public function tearDown()
{
parent::tearDown();
}
public function testPostRegister()
{
$data = [
'email' => 'test@example.com',
'password' => 'onetwothree',
'password_confirmation' => 'onetwothree',
'_token' => 'replaceMe'
];
$this->call('POST', '/auth/register', $data);
$this->assertResponseStatus(302);
$this->assertSessionHas('success');
}
public function testPostRegisterFails()
{
$data = [
'email' => 'test@example.com',
'password' => 'onetwothree',
'password_confirmation' => 'onetwofour',
'_token' => 'replaceMe'
];
$this->call('POST', '/auth/register', $data);
$this->assertResponseStatus(302);
}
}

22
tests/controllers/TagControllerTest.php
View File

@@ -115,6 +115,28 @@ class TagControllerTest extends TestCase
$this->assertResponseOk();
}
public function testMultipleDeposits()
{
$tag = FactoryMuffin::create('FireflyIII\Models\Tag');
FactoryMuffin::create('FireflyIII\Models\TransactionType');
$type = FactoryMuffin::create('FireflyIII\Models\TransactionType');
for ($i = 0; $i < 3; $i++) {
$journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
$journal->transaction_type_id = $type->id;
$journal->save();
$tag->transactionJournals()->save($journal);
}
$tag->tagMode = 'nothing';
$tag->save();
$this->be($tag->user);
$this->call('GET', '/tags/edit/' . $tag->id);
$this->assertResponseOk();
}
public function testHideTagHelp()
{

4
tests/factories/all.php
View File

@@ -173,9 +173,9 @@ FactoryMuffin::define(
'FireflyIII\Models\AccountType',
[
'type' => function () {
$types = ['Expense account', 'Revenue account', 'Asset account'];
$types = ['Expense account', 'Revenue account', 'Asset account','Cash account'];
$count = DB::table('account_types')->count();
if ($count < 3) {
if ($count < 4) {
return $types[$count];
} else {
return RandomString::generateRandomString(10);

4
tests/repositories/CurrencyRepositoryTest.php
View File

@@ -50,7 +50,7 @@ class CurrencyRepositoryTest extends TestCase
FactoryMuffin::create('FireflyIII\Models\TransactionCurrency');
$set = $this->object->get();
$this->assertCount(2, $set);
$this->assertCount(3, $set); // EUR is already present.
}
/**
@@ -76,7 +76,7 @@ class CurrencyRepositoryTest extends TestCase
$preference->data = 'ABC';
$preference->save();
$found = $this->object->getCurrencyByPreference($preference);
$this->assertEquals($first->id, $found->id);
$this->assertEquals(1, $found->id); // EUR is first and will be set.
}
/**

490
tests/repositories/JournalRepositoryTest.php
View File

@@ -1,5 +1,10 @@
<?php
use FireflyIII\Models\Reminder;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Journal\JournalRepository;
use Illuminate\Pagination\LengthAwarePaginator;
use League\FactoryMuffin\Facade as FactoryMuffin;
/**
* Generated by PHPUnit_SkeletonGenerator on 2015-05-05 at 19:19:32.
@@ -32,145 +37,502 @@ class JournalRepositoryTest extends TestCase
/**
* @covers FireflyIII\Repositories\Journal\JournalRepository::deactivateReminder
* @todo Implement testDeactivateReminder().
*/
public function testDeactivateReminder()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
$reminder = FactoryMuffin::create('FireflyIII\Models\Reminder');
$reminder->active = 1;
$reminder->save();
$this->be($reminder->user);
$this->object->deactivateReminder($reminder->id);
$this->assertEquals(1, Reminder::where('id', $reminder->id)->where('active', 0)->count());
}
/**
* @covers FireflyIII\Repositories\Journal\JournalRepository::delete
* @todo Implement testDelete().
*/
public function testDelete()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
$journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
$account = FactoryMuffin::create('FireflyIII\Models\Account');
$transaction = Transaction::create(
[
'account_id' => $account->id,
'transaction_journal_id' => $journal->id,
'amount' => 100,
]
);
$this->object->delete($journal);
$this->assertEquals(0, TransactionJournal::where('id', $journal->id)->whereNull('deleted_at')->count());
$this->assertEquals(0, Transaction::where('id', $transaction->id)->whereNull('deleted_at')->count());
}
/**
* @covers FireflyIII\Repositories\Journal\JournalRepository::first
* @todo Implement testFirst().
*/
public function testFirst()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
$journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
$this->be($journal->user);
$first = $this->object->first();
$this->assertEquals($journal->id, $first->id);
}
/**
* @covers FireflyIII\Repositories\Journal\JournalRepository::getAmountBefore
* @todo Implement testGetAmountBefore().
*/
public function testGetAmountBefore()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
$transaction = FactoryMuffin::create('FireflyIII\Models\Transaction');
$before = $this->object->getAmountBefore($transaction->transactionjournal, $transaction);
$this->assertEquals(0, $before);
}
/**
* @covers FireflyIII\Repositories\Journal\JournalRepository::getJournalsOfType
* @todo Implement testGetJournalsOfType().
*/
public function testGetJournalsOfType()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
$user = FactoryMuffin::create('FireflyIII\User');
$type = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$this->be($user);
$result = $this->object->getJournalsOfType($type);
$this->assertCount(0, $result);
}
/**
* @covers FireflyIII\Repositories\Journal\JournalRepository::getJournalsOfTypes
* @todo Implement testGetJournalsOfTypes().
*/
public function testGetJournalsOfTypes()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
FactoryMuffin::create('FireflyIII\Models\TransactionType');
FactoryMuffin::create('FireflyIII\Models\TransactionType');
FactoryMuffin::create('FireflyIII\Models\TransactionType');
$user = FactoryMuffin::create('FireflyIII\User');
$this->be($user);
$types = ['Withdrawal', 'Expense'];
$set = $this->object->getJournalsOfTypes($types, 0, 1);
$this->assertTrue($set instanceof LengthAwarePaginator);
$this->assertEquals(1, $set->currentPage());
}
/**
* @covers FireflyIII\Repositories\Journal\JournalRepository::getTransactionType
* @todo Implement testGetTransactionType().
*/
public function testGetTransactionType()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
$type = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$otherType = $this->object->getTransactionType($type->type);
$this->assertEquals($type->id, $otherType->id);
}
/**
* @covers FireflyIII\Repositories\Journal\JournalRepository::getWithDate
* @todo Implement testGetWithDate().
*/
public function testGetWithDate()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
$journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
$this->be($journal->user);
$found = $this->object->getWithDate($journal->id, $journal->date);
$this->assertEquals($journal->id, $found->id);
}
/**
* @covers FireflyIII\Repositories\Journal\JournalRepository::saveTags
* @todo Implement testSaveTags().
*/
public function testSaveTags()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
$journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
$tags = ['one', 'two', 'three'];
$this->be($journal->user);
$this->object->saveTags($journal, $tags);
$this->assertCount(3, $journal->tags()->get());
}
/**
* @covers FireflyIII\Repositories\Journal\JournalRepository::store
* @todo Implement testStore().
* @covers FireflyIII\Repositories\Journal\JournalRepository::storeAccounts
*/
public function testStore()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
FactoryMuffin::create('FireflyIII\Models\TransactionType');
$currency = FactoryMuffin::create('FireflyIII\Models\TransactionCurrency');
$budget = FactoryMuffin::create('FireflyIII\Models\Budget');
$account1 = FactoryMuffin::create('FireflyIII\Models\Account');
$user = FactoryMuffin::create('FireflyIII\User');
$data = [
'description' => 'Some journal ' . rand(1, 100),
'user' => $user->id,
'what' => 'withdrawal',
'amount_currency_id' => $currency->id,
'account_id' => $account1->id,
'expense_account' => 'Some expense account',
'date' => '2014-01-01',
'category' => 'Some category',
'budget_id' => $budget->id,
'amount' => 100,
'tags' => ['one', 'two', 'three']
];
$journal = $this->object->store($data);
$this->assertEquals($data['description'], $journal->description);
}
/**
* @covers FireflyIII\Repositories\Journal\JournalRepository::store
* @covers FireflyIII\Repositories\Journal\JournalRepository::storeAccounts
*/
public function testStoreDeposit()
{
for ($i = 0; $i < 4; $i++) {
FactoryMuffin::create('FireflyIII\Models\AccountType');
}
FactoryMuffin::create('FireflyIII\Models\TransactionType');
FactoryMuffin::create('FireflyIII\Models\TransactionType');
$currency = FactoryMuffin::create('FireflyIII\Models\TransactionCurrency');
$budget = FactoryMuffin::create('FireflyIII\Models\Budget');
$account1 = FactoryMuffin::create('FireflyIII\Models\Account');
$user = FactoryMuffin::create('FireflyIII\User');
$data = [
'description' => 'Some journal ' . rand(1, 100),
'user' => $user->id,
'what' => 'deposit',
'amount_currency_id' => $currency->id,
'account_id' => $account1->id,
'revenue_account' => 'Some revenue account',
'date' => '2014-01-01',
'category' => 'Some category',
'budget_id' => $budget->id,
'amount' => 100,
'tags' => ['one', 'two', 'three']
];
$journal = $this->object->store($data);
$this->assertEquals($data['description'], $journal->description);
}
/**
* @covers FireflyIII\Repositories\Journal\JournalRepository::store
* @covers FireflyIII\Repositories\Journal\JournalRepository::storeAccounts
*/
public function testStoreExpenseWithCash()
{
for ($i = 0; $i < 4; $i++) {
FactoryMuffin::create('FireflyIII\Models\AccountType');
}
FactoryMuffin::create('FireflyIII\Models\TransactionType');
$currency = FactoryMuffin::create('FireflyIII\Models\TransactionCurrency');
$budget = FactoryMuffin::create('FireflyIII\Models\Budget');
$account1 = FactoryMuffin::create('FireflyIII\Models\Account');
$user = FactoryMuffin::create('FireflyIII\User');
$data = [
'description' => 'Some journal ' . rand(1, 100),
'user' => $user->id,
'what' => 'withdrawal',
'amount_currency_id' => $currency->id,
'account_id' => $account1->id,
'expense_account' => '',
'date' => '2014-01-01',
'category' => 'Some other category',
'budget_id' => $budget->id,
'amount' => 100,
'tags' => ['one', 'two', 'three']
];
$journal = $this->object->store($data);
$this->assertEquals($data['description'], $journal->description);
}
/**
* @covers FireflyIII\Repositories\Journal\JournalRepository::store
* @covers FireflyIII\Repositories\Journal\JournalRepository::storeAccounts
* @expectedException Symfony\Component\HttpKernel\Exception\HttpException
*/
public function testStoreInvalidFromAccount()
{
for ($i = 0; $i < 4; $i++) {
FactoryMuffin::create('FireflyIII\Models\AccountType');
}
FactoryMuffin::create('FireflyIII\Models\TransactionType');
FactoryMuffin::create('FireflyIII\Models\TransactionType');
FactoryMuffin::create('FireflyIII\Models\TransactionType');
$currency = FactoryMuffin::create('FireflyIII\Models\TransactionCurrency');
$budget = FactoryMuffin::create('FireflyIII\Models\Budget');
$account1 = FactoryMuffin::create('FireflyIII\Models\Account');
$user = FactoryMuffin::create('FireflyIII\User');
$data = [
'description' => 'Some journal ' . rand(1, 100),
'user' => $user->id,
'what' => 'transfer',
'amount_currency_id' => $currency->id,
'account_from_id' => $account1->id,
'account_to_id' => 17,
'date' => '2014-01-01',
'category' => 'Some other category',
'budget_id' => $budget->id,
'amount' => 100,
'tags' => ['one', 'two', 'three']
];
$journal = $this->object->store($data);
$this->assertEquals($data['description'], $journal->description);
}
/**
* @covers FireflyIII\Repositories\Journal\JournalRepository::store
* @covers FireflyIII\Repositories\Journal\JournalRepository::storeAccounts
* @expectedException Symfony\Component\HttpKernel\Exception\HttpException
*/
public function testStoreInvalidToAccount()
{
for ($i = 0; $i < 4; $i++) {
FactoryMuffin::create('FireflyIII\Models\AccountType');
}
FactoryMuffin::create('FireflyIII\Models\TransactionType');
FactoryMuffin::create('FireflyIII\Models\TransactionType');
FactoryMuffin::create('FireflyIII\Models\TransactionType');
$currency = FactoryMuffin::create('FireflyIII\Models\TransactionCurrency');
$budget = FactoryMuffin::create('FireflyIII\Models\Budget');
$account1 = FactoryMuffin::create('FireflyIII\Models\Account');
$user = FactoryMuffin::create('FireflyIII\User');
$data = [
'description' => 'Some journal ' . rand(1, 100),
'user' => $user->id,
'what' => 'transfer',
'amount_currency_id' => $currency->id,
'account_from_id' => 17,
'account_to_id' => $account1->id,
'date' => '2014-01-01',
'category' => 'Some other category',
'budget_id' => $budget->id,
'amount' => 100,
'tags' => ['one', 'two', 'three']
];
$journal = $this->object->store($data);
$this->assertEquals($data['description'], $journal->description);
}
/**
* @covers FireflyIII\Repositories\Journal\JournalRepository::store
* @covers FireflyIII\Repositories\Journal\JournalRepository::storeAccounts
*/
public function testStoreRevenueWithCash()
{
for ($i = 0; $i < 4; $i++) {
FactoryMuffin::create('FireflyIII\Models\AccountType');
}
FactoryMuffin::create('FireflyIII\Models\TransactionType');
FactoryMuffin::create('FireflyIII\Models\TransactionType');
$currency = FactoryMuffin::create('FireflyIII\Models\TransactionCurrency');
$budget = FactoryMuffin::create('FireflyIII\Models\Budget');
$account1 = FactoryMuffin::create('FireflyIII\Models\Account');
$user = FactoryMuffin::create('FireflyIII\User');
$data = [
'description' => 'Some journal ' . rand(1, 100),
'user' => $user->id,
'what' => 'deposit',
'amount_currency_id' => $currency->id,
'account_id' => $account1->id,
'revenue_account' => '',
'date' => '2014-01-01',
'category' => 'Some other category',
'budget_id' => $budget->id,
'amount' => 100,
'tags' => ['one', 'two', 'three']
];
$journal = $this->object->store($data);
$this->assertEquals($data['description'], $journal->description);
}
/**
* @covers FireflyIII\Repositories\Journal\JournalRepository::store
* @covers FireflyIII\Repositories\Journal\JournalRepository::storeAccounts
*/
public function testStoreTransfer()
{
for ($i = 0; $i < 4; $i++) {
FactoryMuffin::create('FireflyIII\Models\AccountType');
}
FactoryMuffin::create('FireflyIII\Models\TransactionType');
FactoryMuffin::create('FireflyIII\Models\TransactionType');
FactoryMuffin::create('FireflyIII\Models\TransactionType');
$currency = FactoryMuffin::create('FireflyIII\Models\TransactionCurrency');
$budget = FactoryMuffin::create('FireflyIII\Models\Budget');
$account1 = FactoryMuffin::create('FireflyIII\Models\Account');
$account2 = FactoryMuffin::create('FireflyIII\Models\Account');
$user = FactoryMuffin::create('FireflyIII\User');
$data = [
'description' => 'Some journal ' . rand(1, 100),
'user' => $user->id,
'what' => 'transfer',
'amount_currency_id' => $currency->id,
'account_from_id' => $account1->id,
'account_to_id' => $account2->id,
'date' => '2014-01-01',
'category' => 'Some other category',
'budget_id' => $budget->id,
'amount' => 100,
'tags' => ['one', 'two', 'three']
];
$journal = $this->object->store($data);
$this->assertEquals($data['description'], $journal->description);
}
/**
* @covers FireflyIII\Repositories\Journal\JournalRepository::update
* @todo Implement testUpdate().
* @covers FireflyIII\Repositories\Journal\JournalRepository::updateTags
*/
public function testUpdate()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
for ($i = 0; $i < 4; $i++) {
FactoryMuffin::create('FireflyIII\Models\AccountType');
}
FactoryMuffin::create('FireflyIII\Models\TransactionType');
FactoryMuffin::create('FireflyIII\Models\TransactionType');
$journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
$currency = FactoryMuffin::create('FireflyIII\Models\TransactionCurrency');
$budget = FactoryMuffin::create('FireflyIII\Models\Budget');
$account1 = FactoryMuffin::create('FireflyIII\Models\Account');
$account2 = FactoryMuffin::create('FireflyIII\Models\Account');
// two transactions
Transaction::create(
[
'account_id' => $account1->id,
'transaction_journal_id' => $journal->id,
'amount' => 100,
]
);
Transaction::create(
[
'account_id' => $account1->id,
'transaction_journal_id' => $journal->id,
'amount' => -100,
]
);
$data = [
'amount_currency_id' => $currency->id,
'description' => 'New description ' . rand(1, 100),
'date' => '2015-01-01',
'category' => 'SomenewCat',
'amount' => 50,
'user' => $journal->user_id,
'budget_id' => $budget->id,
'account_from_id' => $account1->id,
'account_to_id' => $account2->id,
'revenue_account' => 'Some revenue account',
'expense_account' => 'Some expense account',
'tags' => ['a', 'b', 'c']
];
$result = $this->object->update($journal, $data);
$this->assertEquals($result->description, $data['description']);
$this->assertEquals($result->amount, 50);
}
/**
* @covers FireflyIII\Repositories\Journal\JournalRepository::update
* @covers FireflyIII\Repositories\Journal\JournalRepository::updateTags
*/
public function testUpdateNoTags()
{
for ($i = 0; $i < 4; $i++) {
FactoryMuffin::create('FireflyIII\Models\AccountType');
}
FactoryMuffin::create('FireflyIII\Models\TransactionType');
FactoryMuffin::create('FireflyIII\Models\TransactionType');
$journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
$currency = FactoryMuffin::create('FireflyIII\Models\TransactionCurrency');
$budget = FactoryMuffin::create('FireflyIII\Models\Budget');
$account1 = FactoryMuffin::create('FireflyIII\Models\Account');
$account2 = FactoryMuffin::create('FireflyIII\Models\Account');
// two transactions
Transaction::create(
[
'account_id' => $account1->id,
'transaction_journal_id' => $journal->id,
'amount' => 100,
]
);
Transaction::create(
[
'account_id' => $account1->id,
'transaction_journal_id' => $journal->id,
'amount' => -100,
]
);
$data = [
'amount_currency_id' => $currency->id,
'description' => 'New description ' . rand(1, 100),
'date' => '2015-01-01',
'category' => 'SomenewCat',
'amount' => 50,
'user' => $journal->user_id,
'budget_id' => $budget->id,
'account_from_id' => $account1->id,
'account_to_id' => $account2->id,
'revenue_account' => 'Some revenue account',
'expense_account' => 'Some expense account',
'tags' => []
];
$result = $this->object->update($journal, $data);
$this->assertEquals($result->description, $data['description']);
$this->assertEquals($result->amount, 50);
}
/**
* @covers FireflyIII\Repositories\Journal\JournalRepository::updateTags
* @todo Implement testUpdateTags().
*/
public function testUpdateTags()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
}
}

172
tests/repositories/PiggyBankRepositoryTest.php
View File

@@ -1,5 +1,9 @@
<?php
use Carbon\Carbon;
use FireflyIII\Models\PiggyBank;
use FireflyIII\Models\PiggyBankRepetition;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepository;
use League\FactoryMuffin\Facade as FactoryMuffin;
/**
* Generated by PHPUnit_SkeletonGenerator on 2015-05-05 at 19:19:32.
@@ -32,62 +36,98 @@ class PiggyBankRepositoryTest extends TestCase
/**
* @covers FireflyIII\Repositories\PiggyBank\PiggyBankRepository::calculateParts
* @todo Implement testCalculateParts().
*/
public function testCalculateParts()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
/** @var PiggyBankRepetition $repetition */
$repetition = FactoryMuffin::create('FireflyIII\Models\PiggyBankRepetition');
$repetition->startdate = new Carbon('2014-01-01');
$repetition->targetdate = new Carbon('2014-12-31');
$repetition->save();
$parts = $this->object->calculateParts($repetition);
$this->assertCount(1, $parts);
}
/**
* @covers FireflyIII\Repositories\PiggyBank\PiggyBankRepository::calculateParts
*/
public function testCalculatePartsWithReminder()
{
/** @var PiggyBankRepetition $repetition */
$repetition = FactoryMuffin::create('FireflyIII\Models\PiggyBankRepetition');
/** @var PiggyBank $piggyBank */
$piggyBank = FactoryMuffin::create('FireflyIII\Models\PiggyBank');
$piggyBank->startdate = new Carbon('2014-01-01');
$piggyBank->targetdate = new Carbon('2014-12-31');
$piggyBank->remind_me = 1;
$piggyBank->reminder = 'monthly';
$repetition->startdate = new Carbon('2014-01-01');
$repetition->targetdate = new Carbon('2014-12-31');
$repetition->piggy_bank_id = $piggyBank->id;
$repetition->save();
$piggyBank->save();
$parts = $this->object->calculateParts($repetition);
$this->assertCount(12, $parts);
}
/**
* @covers FireflyIII\Repositories\PiggyBank\PiggyBankRepository::createEvent
* @todo Implement testCreateEvent().
*/
public function testCreateEvent()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
$piggyBank = FactoryMuffin::create('FireflyIII\Models\PiggyBank');
$this->object->createEvent($piggyBank, 100);
$this->assertCount(1, $piggyBank->piggybankevents()->get());
}
/**
* @covers FireflyIII\Repositories\PiggyBank\PiggyBankRepository::createPiggyBankPart
* @todo Implement testCreatePiggyBankPart().
*/
public function testCreatePiggyBankPart()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
$repetition = FactoryMuffin::create('FireflyIII\Models\PiggyBankRepetition');
$data = [
'repetition' => $repetition,
'amountPerBar' => 100,
'currentAmount' => 100,
'cumulativeAmount' => 100,
'startDate' => new Carbon,
'targetDate' => new Carbon,
];
$part = $this->object->createPiggyBankPart($data);
$this->assertEquals($data['amountPerBar'], $part->getAmountPerBar());
}
/**
* @covers FireflyIII\Repositories\PiggyBank\PiggyBankRepository::destroy
* @todo Implement testDestroy().
*/
public function testDestroy()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
$piggyBank = FactoryMuffin::create('FireflyIII\Models\PiggyBank');
$this->object->destroy($piggyBank);
$this->assertCount(0, PiggyBank::where('id', $piggyBank->id)->whereNull('deleted_at')->get());
}
/**
* @covers FireflyIII\Repositories\PiggyBank\PiggyBankRepository::getEventSummarySet
* @todo Implement testGetEventSummarySet().
*/
public function testGetEventSummarySet()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
$piggyBank = FactoryMuffin::create('FireflyIII\Models\PiggyBank');
$set = $this->object->getEventSummarySet($piggyBank);
$this->assertCount(0, $set);
}
/**
@@ -96,46 +136,51 @@ class PiggyBankRepositoryTest extends TestCase
*/
public function testGetEvents()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
$piggyBank = FactoryMuffin::create('FireflyIII\Models\PiggyBank');
$set = $this->object->getEvents($piggyBank);
$this->assertCount(0, $set);
}
/**
* @covers FireflyIII\Repositories\PiggyBank\PiggyBankRepository::getPiggyBanks
* @todo Implement testGetPiggyBanks().
*/
public function testGetPiggyBanks()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
$piggyBank = FactoryMuffin::create('FireflyIII\Models\PiggyBank');
$this->be($piggyBank->account->user);
$set = $this->object->getPiggyBanks();
$this->assertCount(1, $set);
}
/**
* @covers FireflyIII\Repositories\PiggyBank\PiggyBankRepository::reset
* @todo Implement testReset().
*/
public function testReset()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
$piggyBank = FactoryMuffin::create('FireflyIII\Models\PiggyBank');
$piggyBank->order = 4;
$piggyBank->save();
$this->be($piggyBank->account->user);
$this->object->reset();
$this->assertCount(1, PiggyBank::where('order', 0)->get());
}
/**
* @covers FireflyIII\Repositories\PiggyBank\PiggyBankRepository::setOrder
* @todo Implement testSetOrder().
*/
public function testSetOrder()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
$piggyBank = FactoryMuffin::create('FireflyIII\Models\PiggyBank');
$piggyBank->order = 4;
$this->be($piggyBank->account->user);
$piggyBank->save();
$this->object->setOrder($piggyBank->id, 3);
$newPiggy = PiggyBank::find($piggyBank->id);
$this->assertEquals(3, $newPiggy->order);
}
/**
@@ -144,10 +189,21 @@ class PiggyBankRepositoryTest extends TestCase
*/
public function testStore()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
$account = FactoryMuffin::create('FireflyIII\Models\Account');
$data = [
'remind_me' => 1,
'account_id' => $account->id,
'name' => 'Some piggy',
'targetamount' => 100,
'reminder_skip' => 0,
'order' => 1,
];
$piggyBank = $this->object->store($data);
$this->assertEquals(1, $piggyBank->id);
}
/**
@@ -156,9 +212,21 @@ class PiggyBankRepositoryTest extends TestCase
*/
public function testUpdate()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
$piggyBank = FactoryMuffin::create('FireflyIII\Models\PiggyBank');
$data = [
'name' => 'Update piggy ' . rand(1, 100),
'account_id' => $piggyBank->account_id,
'targetamount' => 101,
'targetdate' => new Carbon,
'reminder' => null,
'startdate' => new Carbon,
'remind_me' => '1'
];
$new = $this->object->update($piggyBank, $data);
$this->assertEquals($data['name'], $new->name);
$this->assertEquals($piggyBank->id, $new->id);
}
}

111
tests/repositories/ReminderRepositoryTest.php
View File

@@ -1,5 +1,7 @@
<?php
use Carbon\Carbon;
use FireflyIII\Repositories\Reminder\ReminderRepository;
use League\FactoryMuffin\Facade as FactoryMuffin;
/**
* Generated by PHPUnit_SkeletonGenerator on 2015-05-05 at 19:19:32.
@@ -18,6 +20,8 @@ class ReminderRepositoryTest extends TestCase
public function setUp()
{
parent::setUp();
$helper = $this->mock('FireflyIII\Helpers\Reminders\ReminderHelperInterface');
$helper->shouldReceive('getReminderText')->andReturn('Hello!');
$this->object = new ReminderRepository;
}
@@ -33,49 +37,116 @@ class ReminderRepositoryTest extends TestCase
/**
* @covers FireflyIII\Repositories\Reminder\ReminderRepository::getActiveReminders
* @todo Implement testGetActiveReminders().
*/
public function testGetActiveReminders()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
$yesterday = Carbon::now()->subDay();
$tomorrow = Carbon::now()->addDay();
$user = FactoryMuffin::create('FireflyIII\User');
for ($i = 0; $i < 3; $i++) {
$reminder = FactoryMuffin::create('FireflyIII\Models\Reminder');
$reminder->active = 1;
$reminder->notnow = 0;
$reminder->startdate = $yesterday;
$reminder->enddate = $tomorrow;
$reminder->user_id = $user->id;
$reminder->save();
}
$reminder = FactoryMuffin::create('FireflyIII\Models\Reminder');
$reminder->active = 0;
$reminder->notnow = 0;
$reminder->startdate = $yesterday;
$reminder->enddate = $tomorrow;
$reminder->user_id = $user->id;
$reminder->save();
$this->be($user);
$set = $this->object->getActiveReminders();
$this->assertCount(3, $set);
}
/**
* @covers FireflyIII\Repositories\Reminder\ReminderRepository::getDismissedReminders
* @todo Implement testGetDismissedReminders().
*/
public function testGetDismissedReminders()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
$user = FactoryMuffin::create('FireflyIII\User');
for ($i = 0; $i < 3; $i++) {
$reminder = FactoryMuffin::create('FireflyIII\Models\Reminder');
$reminder->notnow = 1;
$reminder->user_id = $user->id;
$reminder->save();
}
$reminder = FactoryMuffin::create('FireflyIII\Models\Reminder');
$reminder->notnow = 0;
$reminder->user_id = $user->id;
$reminder->save();
$this->be($user);
$set = $this->object->getDismissedReminders();
$this->assertCount(3, $set);
}
/**
* @covers FireflyIII\Repositories\Reminder\ReminderRepository::getExpiredReminders
* @todo Implement testGetExpiredReminders().
*/
public function testGetExpiredReminders()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
$yesterday = Carbon::now()->subDay();
$tomorrow = Carbon::now()->addDay();
$user = FactoryMuffin::create('FireflyIII\User');
for ($i = 0; $i < 3; $i++) {
$reminder = FactoryMuffin::create('FireflyIII\Models\Reminder');
$reminder->active = 1;
$reminder->notnow = 0;
$reminder->startdate = $tomorrow;
$reminder->enddate = $yesterday;
$reminder->user_id = $user->id;
$reminder->save();
}
$reminder = FactoryMuffin::create('FireflyIII\Models\Reminder');
$reminder->active = 0;
$reminder->notnow = 0;
$reminder->startdate = $tomorrow;
$reminder->enddate = $yesterday;
$reminder->user_id = $user->id;
$reminder->save();
$this->be($user);
$set = $this->object->getExpiredReminders();
$this->assertCount(3, $set);
}
/**
* @covers FireflyIII\Repositories\Reminder\ReminderRepository::getInactiveReminders
* @todo Implement testGetInactiveReminders().
*/
public function testGetInactiveReminders()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
$user = FactoryMuffin::create('FireflyIII\User');
for ($i = 0; $i < 3; $i++) {
$reminder = FactoryMuffin::create('FireflyIII\Models\Reminder');
$reminder->active = 0;
$reminder->user_id = $user->id;
$reminder->save();
}
$reminder = FactoryMuffin::create('FireflyIII\Models\Reminder');
$reminder->active = 1;
$reminder->user_id = $user->id;
$reminder->save();
$this->be($user);
$set = $this->object->getInactiveReminders();
$this->assertCount(3, $set);
}
}

359
tests/repositories/TagRepositoryTest.php
View File

@@ -1,5 +1,8 @@
<?php
use FireflyIII\Models\Tag;
use FireflyIII\Models\Transaction;
use FireflyIII\Repositories\Tag\TagRepository;
use League\FactoryMuffin\Facade as FactoryMuffin;
/**
* Generated by PHPUnit_SkeletonGenerator on 2015-05-05 at 19:19:32.
@@ -31,27 +34,298 @@ class TagRepositoryTest extends TestCase
}
/**
* Already connected tag and transaction journal returns FALSE.
*
* @covers FireflyIII\Repositories\Tag\TagRepository::connect
* @todo Implement testConnect().
*/
public function testConnect()
public function testConnectAlreadyConnected()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
$journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
$tag = FactoryMuffin::create('FireflyIII\Models\Tag');
$journal->tags()->save($tag);
$result = $this->object->connect($journal, $tag);
$this->assertFalse($result);
}
/**
* A deposit cannot be connected to a balancing act.
*
* @covers FireflyIII\Repositories\Tag\TagRepository::connect
*/
public function testConnectBalancingOneDeposit()
{
$withdrawal = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$deposit = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$transfer = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
$tag = FactoryMuffin::create('FireflyIII\Models\Tag');
$journal->transaction_type_id = $deposit->id;
$tag->tagMode = 'balancingAct';
$tag->save();
$journal->save();
$result = $this->object->connect($journal, $tag);
$this->assertFalse($result);
}
/**
* Connecting a single transfer to a balancing act is possible if there are no
* other transfers already connected.
*
* @covers FireflyIII\Repositories\Tag\TagRepository::connect
*/
public function testConnectBalancingOneTransfer()
{
$withdrawal = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$deposit = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$transfer = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
$tag = FactoryMuffin::create('FireflyIII\Models\Tag');
$journal->transaction_type_id = $transfer->id;
$tag->tagMode = 'balancingAct';
$tag->save();
$journal->save();
$result = $this->object->connect($journal, $tag);
$this->assertTrue($result);
}
/**
* Connecting a single withdrawal to a balancing act is possible if there are
* not other withdrawals already connected.
*
* @covers FireflyIII\Repositories\Tag\TagRepository::connect
*/
public function testConnectBalancingOneWithdrawal()
{
$withdrawal = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$deposit = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$transfer = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
$tag = FactoryMuffin::create('FireflyIII\Models\Tag');
$journal->transaction_type_id = $withdrawal->id;
$tag->tagMode = 'balancingAct';
$tag->save();
$journal->save();
$result = $this->object->connect($journal, $tag);
$this->assertTrue($result);
}
/**
* @covers FireflyIII\Repositories\Tag\TagRepository::connect
*/
public function testConnectDefault()
{
$journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
$tag = FactoryMuffin::create('FireflyIII\Models\Tag');
$tag->tagMode = 'nothing';
$tag->save();
$result = $this->object->connect($journal, $tag);
$this->assertTrue($result);
}
/**
* Once one or more journals have been accepted by the tag, others must match the asset account
* id. For this to work, we must also create an asset account, and a transaction.
*
* @covers FireflyIII\Repositories\Tag\TagRepository::connect
*/
public function testConnectPaymentMultipleMatch()
{
$withdrawal = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$deposit = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$transfer = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$expense = FactoryMuffin::create('FireflyIII\Models\AccountType');
$revenue = FactoryMuffin::create('FireflyIII\Models\AccountType');
$asset = FactoryMuffin::create('FireflyIII\Models\AccountType');
$account = FactoryMuffin::create('FireflyIII\Models\Account');
$journal1 = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
$journal2 = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
// transactions for both:
Transaction::create(['account_id' => $account->id, 'transaction_journal_id' => $journal1->id, 'amount' => 100]);
Transaction::create(['account_id' => $account->id, 'transaction_journal_id' => $journal2->id, 'amount' => 100]);
$tag = FactoryMuffin::create('FireflyIII\Models\Tag');
$journal1->transaction_type_id = $withdrawal->id;
$journal2->transaction_type_id = $deposit->id;
$tag->tagMode = 'advancePayment';
$account->account_type_id = $asset->id;
$tag->save();
$journal1->save();
$journal2->save();
$account->save();
// connect journal1:
$journal1->tags()->save($tag);
$result = $this->object->connect($journal2, $tag);
$this->assertTrue($result);
}
/**
* Once one or more journals have been accepted by the tag, others must match the asset account
* id. For this to work, we must also create an asset account, and a transaction.
*
* @covers FireflyIII\Repositories\Tag\TagRepository::connect
*/
public function testConnectPaymentNoMatch()
{
$withdrawal = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$deposit = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$transfer = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$expense = FactoryMuffin::create('FireflyIII\Models\AccountType');
$revenue = FactoryMuffin::create('FireflyIII\Models\AccountType');
$asset = FactoryMuffin::create('FireflyIII\Models\AccountType');
$account1 = FactoryMuffin::create('FireflyIII\Models\Account');
$account2 = FactoryMuffin::create('FireflyIII\Models\Account');
$journal1 = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
$journal2 = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
// transactions for both:
Transaction::create(['account_id' => $account1->id, 'transaction_journal_id' => $journal1->id, 'amount' => 100]);
Transaction::create(['account_id' => $account2->id, 'transaction_journal_id' => $journal2->id, 'amount' => 100]);
$tag = FactoryMuffin::create('FireflyIII\Models\Tag');
$journal1->transaction_type_id = $withdrawal->id;
$journal2->transaction_type_id = $deposit->id;
$tag->tagMode = 'advancePayment';
$account1->account_type_id = $asset->id;
$account2->account_type_id = $asset->id;
$tag->save();
$journal1->save();
$journal2->save();
$account1->save();
$account2->save();
// connect journal1:
$journal1->tags()->save($tag);
$result = $this->object->connect($journal2, $tag);
// account1 and account2 are different, so false:
$this->assertFalse($result);
}
/**
* An advance payment accepts no transfers
*
* @covers FireflyIII\Repositories\Tag\TagRepository::connect
*/
public function testConnectPaymentOneTransfer()
{
$withdrawal = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$deposit = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$transfer = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
$tag = FactoryMuffin::create('FireflyIII\Models\Tag');
$journal->transaction_type_id = $transfer->id;
$tag->tagMode = 'advancePayment';
$tag->save();
$journal->save();
$result = $this->object->connect($journal, $tag);
$this->assertFalse($result);
}
/**
* An advance payment accepts only one withdrawal, not two.
*
* @covers FireflyIII\Repositories\Tag\TagRepository::connect
*/
public function testConnectPaymentOneWithdrawal()
{
$withdrawal = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$deposit = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$transfer = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
$tag = FactoryMuffin::create('FireflyIII\Models\Tag');
$journal->transaction_type_id = $withdrawal->id;
$tag->tagMode = 'advancePayment';
$tag->save();
$journal->save();
$result = $this->object->connect($journal, $tag);
$this->assertTrue($result);
}
/**
* An advance payment accepts only one withdrawal, not two.
*
* @covers FireflyIII\Repositories\Tag\TagRepository::connect
*/
public function testConnectPaymentTwoWithdrawals()
{
$withdrawal = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$deposit = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$transfer = FactoryMuffin::create('FireflyIII\Models\TransactionType');
$journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
$otherJournal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
$tag = FactoryMuffin::create('FireflyIII\Models\Tag');
$journal->transaction_type_id = $withdrawal->id;
$otherJournal->transaction_type_id = $withdrawal->id;
$tag->tagMode = 'advancePayment';
$tag->save();
$journal->save();
$otherJournal->save();
$otherJournal->tags()->save($tag);
$result = $this->object->connect($journal, $tag);
$this->assertFalse($result);
}
/**
* @covers FireflyIII\Repositories\Tag\TagRepository::destroy
* @todo Implement testDestroy().
*/
public function testDestroy()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
$tag = FactoryMuffin::create('FireflyIII\Models\Tag');
$this->object->destroy($tag);
$this->assertCount(0, Tag::where('id', $tag->id)->whereNull('deleted_at')->get());
}
/**
@@ -60,33 +334,68 @@ class TagRepositoryTest extends TestCase
*/
public function testGet()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
$user = FactoryMuffin::create('FireflyIII\User');
$tag1 = FactoryMuffin::create('FireflyIII\Models\Tag');
$tag2 = FactoryMuffin::create('FireflyIII\Models\Tag');
$tag1->tag = 'BBB';
$tag2->tag = 'AAA';
$tag1->user_id = $user->id;
$tag2->user_id = $user->id;
$tag1->save();
$tag2->save();
$this->be($user);
$set = $this->object->get();
$this->assertCount(2, $set);
$this->assertEquals('AAA', $set->first()->tag);
}
/**
* @covers FireflyIII\Repositories\Tag\TagRepository::store
* @todo Implement testStore().
*/
public function testStore()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
$user = FactoryMuffin::create('FireflyIII\User');
$data = [
'tag' => 'Hello' . rand(1, 100),
'date' => '2012-01-01',
'description' => 'Some',
'latitude' => 12,
'longitude' => 13,
'zoomLevel' => 4,
'tagMode' => 'nothing'
];
$this->be($user);
$tag = $this->object->store($data);
$this->assertEquals($data['tag'], $tag->tag);
}
/**
* @covers FireflyIII\Repositories\Tag\TagRepository::update
* @todo Implement testUpdate().
*/
public function testUpdate()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
$tag = FactoryMuffin::create('FireflyIII\Models\Tag');
$data = [
'tag' => 'Hello' . rand(1, 100),
'date' => '2012-01-01',
'description' => 'Some',
'latitude' => 12,
'longitude' => 13,
'zoomLevel' => 4,
'tagMode' => 'nothing'
];
$this->be($tag->user);
$newTag = $this->object->update($tag, $data);
$this->assertEquals($data['tag'], $newTag->tag);
$this->assertEquals($tag->id, $newTag->id);
}
}