mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Add newlines [skip ci]
This commit is contained in:
parent
dd508dbc49
commit
71a41bc00d
@ -16,9 +16,7 @@ namespace FireflyIII\Console\Commands;
|
|||||||
use FireflyIII\Import\Logging\CommandHandler;
|
use FireflyIII\Import\Logging\CommandHandler;
|
||||||
use FireflyIII\Import\Routine\ImportRoutine;
|
use FireflyIII\Import\Routine\ImportRoutine;
|
||||||
use FireflyIII\Models\ImportJob;
|
use FireflyIII\Models\ImportJob;
|
||||||
use FireflyIII\Models\TransactionJournal;
|
|
||||||
use Illuminate\Console\Command;
|
use Illuminate\Console\Command;
|
||||||
use Illuminate\Support\Collection;
|
|
||||||
use Illuminate\Support\MessageBag;
|
use Illuminate\Support\MessageBag;
|
||||||
use Log;
|
use Log;
|
||||||
|
|
||||||
|
@ -105,7 +105,6 @@ class AttachmentController extends Controller
|
|||||||
$quoted = sprintf('"%s"', addcslashes(basename($attachment->filename), '"\\'));
|
$quoted = sprintf('"%s"', addcslashes(basename($attachment->filename), '"\\'));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/** @var LaravelResponse $response */
|
/** @var LaravelResponse $response */
|
||||||
$response = response($content, 200);
|
$response = response($content, 200);
|
||||||
$response
|
$response
|
||||||
|
@ -246,7 +246,7 @@ class ImportController extends Controller
|
|||||||
/** @var ImportRoutine $routine */
|
/** @var ImportRoutine $routine */
|
||||||
$routine = app(ImportRoutine::class);
|
$routine = app(ImportRoutine::class);
|
||||||
$routine->setJob($job);
|
$routine->setJob($job);
|
||||||
$result = $routine->run();
|
$result = $routine->run();
|
||||||
if ($result) {
|
if ($result) {
|
||||||
return Response::json(['run' => 'ok']);
|
return Response::json(['run' => 'ok']);
|
||||||
}
|
}
|
||||||
|
@ -329,8 +329,8 @@ class PiggyBankController extends Controller
|
|||||||
|
|
||||||
Session::flash(
|
Session::flash(
|
||||||
'error', strval(
|
'error', strval(
|
||||||
trans('firefly.cannot_remove_from_piggy', ['amount' => Amount::formatAnything($currency, $amount, false), 'name' => e($piggyBank->name)])
|
trans('firefly.cannot_remove_from_piggy', ['amount' => Amount::formatAnything($currency, $amount, false), 'name' => e($piggyBank->name)])
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
return redirect(route('piggy-banks.index'));
|
return redirect(route('piggy-banks.index'));
|
||||||
|
@ -86,7 +86,7 @@ class TransactionController extends Controller
|
|||||||
$first = $repository->first();
|
$first = $repository->first();
|
||||||
$start = $first->date ?? new Carbon;
|
$start = $first->date ?? new Carbon;
|
||||||
$end = new Carbon;
|
$end = new Carbon;
|
||||||
$path = '/transactions/'.$what.'/all/';
|
$path = '/transactions/' . $what . '/all/';
|
||||||
}
|
}
|
||||||
|
|
||||||
// prep for "specific date" view.
|
// prep for "specific date" view.
|
||||||
|
@ -34,13 +34,6 @@ interface ConfiguratorInterface
|
|||||||
*/
|
*/
|
||||||
public function configureJob(array $data): bool;
|
public function configureJob(array $data): bool;
|
||||||
|
|
||||||
/**
|
|
||||||
* @param ImportJob $job
|
|
||||||
*
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
public function setJob(ImportJob $job);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the data required for the next step in the job configuration.
|
* Return the data required for the next step in the job configuration.
|
||||||
*
|
*
|
||||||
@ -62,4 +55,11 @@ interface ConfiguratorInterface
|
|||||||
*/
|
*/
|
||||||
public function isJobConfigured(): bool;
|
public function isJobConfigured(): bool;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param ImportJob $job
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function setJob(ImportJob $job);
|
||||||
|
|
||||||
}
|
}
|
@ -30,33 +30,17 @@ class ImportCategory
|
|||||||
private $repository;
|
private $repository;
|
||||||
/** @var User */
|
/** @var User */
|
||||||
private $user;
|
private $user;
|
||||||
/**
|
|
||||||
* @param array $id
|
|
||||||
*/
|
|
||||||
public function setId(array $id)
|
|
||||||
{
|
|
||||||
$this->id = $id;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ImportCategory constructor.
|
* ImportCategory constructor.
|
||||||
*/
|
*/
|
||||||
public function __construct()
|
public function __construct()
|
||||||
{
|
{
|
||||||
$this->category = new Category();
|
$this->category = new Category();
|
||||||
$this->repository = app(CategoryRepositoryInterface::class);
|
$this->repository = app(CategoryRepositoryInterface::class);
|
||||||
Log::debug('Created ImportCategory.');
|
Log::debug('Created ImportCategory.');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @param array $name
|
|
||||||
*/
|
|
||||||
public function setName(array $name)
|
|
||||||
{
|
|
||||||
$this->name = $name;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Category
|
* @return Category
|
||||||
*/
|
*/
|
||||||
@ -68,6 +52,23 @@ class ImportCategory
|
|||||||
|
|
||||||
return $this->category;
|
return $this->category;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array $id
|
||||||
|
*/
|
||||||
|
public function setId(array $id)
|
||||||
|
{
|
||||||
|
$this->id = $id;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array $name
|
||||||
|
*/
|
||||||
|
public function setName(array $name)
|
||||||
|
{
|
||||||
|
$this->name = $name;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param User $user
|
* @param User $user
|
||||||
*/
|
*/
|
||||||
@ -100,7 +101,7 @@ class ImportCategory
|
|||||||
if (count($this->name) === 3) {
|
if (count($this->name) === 3) {
|
||||||
/** @var Collection $categories */
|
/** @var Collection $categories */
|
||||||
$categories = $this->repository->getCategories();
|
$categories = $this->repository->getCategories();
|
||||||
$name = $this->name['value'];
|
$name = $this->name['value'];
|
||||||
Log::debug(sprintf('Finding category with name %s', $name));
|
Log::debug(sprintf('Finding category with name %s', $name));
|
||||||
$filtered = $categories->filter(
|
$filtered = $categories->filter(
|
||||||
function (Category $category) use ($name) {
|
function (Category $category) use ($name) {
|
||||||
|
@ -53,7 +53,7 @@ class ImportCurrency
|
|||||||
}
|
}
|
||||||
Log::debug('In createCurrency()');
|
Log::debug('In createCurrency()');
|
||||||
// check if any of them is mapped:
|
// check if any of them is mapped:
|
||||||
$mapped = $this->findMappedObject();
|
$mapped = $this->findMappedObject();
|
||||||
|
|
||||||
if (!is_null($mapped->id)) {
|
if (!is_null($mapped->id)) {
|
||||||
|
|
||||||
|
@ -44,15 +44,6 @@ class ImportRoutine
|
|||||||
$this->errors = new Collection;
|
$this->errors = new Collection;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @param ImportJob $job
|
|
||||||
*/
|
|
||||||
public function setJob(ImportJob $job)
|
|
||||||
{
|
|
||||||
$this->job = $job;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@ -90,6 +81,14 @@ class ImportRoutine
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param ImportJob $job
|
||||||
|
*/
|
||||||
|
public function setJob(ImportJob $job)
|
||||||
|
{
|
||||||
|
$this->job = $job;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Collection
|
* @return Collection
|
||||||
*/
|
*/
|
||||||
|
@ -22,8 +22,8 @@ class RegisteredUser extends Mailable
|
|||||||
*/
|
*/
|
||||||
public function __construct(string $address, string $ipAddress)
|
public function __construct(string $address, string $ipAddress)
|
||||||
{
|
{
|
||||||
$this->address = $address;
|
$this->address = $address;
|
||||||
$this->ipAddress = $ipAddress;
|
$this->ipAddress = $ipAddress;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -86,7 +86,7 @@ class ImportJob extends Model
|
|||||||
*/
|
*/
|
||||||
public function addStepsDone(int $count)
|
public function addStepsDone(int $count)
|
||||||
{
|
{
|
||||||
$status = $this->extended_status;
|
$status = $this->extended_status;
|
||||||
$status['done'] += $count;
|
$status['done'] += $count;
|
||||||
$this->extended_status = $status;
|
$this->extended_status = $status;
|
||||||
$this->save();
|
$this->save();
|
||||||
|
@ -133,9 +133,10 @@ class Tag extends Model
|
|||||||
*/
|
*/
|
||||||
public function getTagAttribute($value)
|
public function getTagAttribute($value)
|
||||||
{
|
{
|
||||||
if(is_null($value)) {
|
if (is_null($value)) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return Crypt::decrypt($value);
|
return Crypt::decrypt($value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -53,7 +53,7 @@ class Search implements SearchInterface
|
|||||||
public function __construct()
|
public function __construct()
|
||||||
{
|
{
|
||||||
$this->modifiers = new Collection;
|
$this->modifiers = new Collection;
|
||||||
$this->validModifiers = (array) config('firefly.search_modifiers');
|
$this->validModifiers = (array)config('firefly.search_modifiers');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -13,7 +13,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace FireflyIII\Support;
|
namespace FireflyIII\Support;
|
||||||
|
|
||||||
use \Amount as GlobalAmount;
|
use Amount as GlobalAmount;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use Crypt;
|
use Crypt;
|
||||||
use DB;
|
use DB;
|
||||||
|
Loading…
Reference in New Issue
Block a user