gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-10 12:24:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Basic storage routine works, basic file handling.

Browse Source
This commit is contained in:
James Cole
2018-05-10 09:10:16 +02:00
parent 116f7ed613
commit cabcb9c6d0
16 changed files with 278 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Import/Converter/RabobankDebitCredit.php
View File

@@ -43,6 +43,12 @@ class RabobankDebitCredit implements ConverterInterface
return -1;
}
// old format:
if('A' === $value) {
Log::debug('Return -1');
return -1;
}
Log::debug('Return 1');

81
app/Import/Prerequisites/FilePrerequisites.php
View File

@@ -22,95 +22,16 @@ declare(strict_types=1);
namespace FireflyIII\Import\Prerequisites;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\User;
use Illuminate\Http\Request;
use Illuminate\Support\MessageBag;
/**
* @deprecated
* @codeCoverageIgnore
*
* This class contains all the routines necessary to import from a file. Hint: there are none.
*/
class FilePrerequisites implements PrerequisitesInterface
{
// /** @var User */
// private $user;
//
// /**
// * Returns view name that allows user to fill in prerequisites. Currently asks for the API key.
// *
// * @return string
// */
// public function getView(): string
// {
// return '';
// }
//
// /**
// * Returns any values required for the prerequisites-view.
// *
// * @return array
// */
// public function getViewParameters(): array
// {
// return [];
// }
//
// /**
// * Returns if this import method has any special prerequisites such as config
// * variables or other things. The only thing we verify is the presence of the API key. Everything else
// * tumbles into place: no installation token? Will be requested. No device server? Will be created. Etc.
// *
// * True if prerequisites. False if not.
// *
// * @return bool
// *
// * @throws FireflyException
// */
// public function hasPrerequisites(): bool
// {
// if ($this->user->hasRole('demo')) {
// throw new FireflyException('Apologies, the demo user cannot import files.');
// }
//
// return false;
// }
//
// /**
// * Indicate if all prerequisites have been met.
// *
// * @return bool
// */
// public function isComplete(): bool
// {
// // has no prerequisites, so always return true.
// return true;
// }
//
// /**
// * Set the user for this Prerequisites-routine. Class is expected to implement and save this.
// *
// * @param User $user
// */
// public function setUser(User $user): void
// {
// $this->user = $user;
//
// }
//
// /**
// * This method responds to the user's submission of an API key. It tries to register this instance as a new Firefly III device.
// * If this fails, the error is returned in a message bag and the user is notified (this is fairly friendly).
// *
// * @param Request $request
// *
// * @return MessageBag
// */
// public function storePrerequisites(Request $request): MessageBag
// {
// return new MessageBag;
// }
/**
* Returns view name that allows user to fill in prerequisites.
*

7
app/Import/Storage/ImportArrayStorage.php
View File

@@ -333,8 +333,8 @@ class ImportArrayStorage
}
$toStore[] = $transaction;
}
if (\count($toStore) === 0) {
$count = \count($toStore);
if ($count === 0) {
Log::info('No transactions to store left!');
return new Collection;
@@ -343,7 +343,8 @@ class ImportArrayStorage
Log::debug('Going to store...');
// now actually store them:
$collection = new Collection;
foreach ($toStore as $store) {
foreach ($toStore as $index => $store) {
Log::debug(sprintf('Going to store entry %d of %d', $index + 1, $count));
// convert the date to an object:
$store['date'] = Carbon::createFromFormat('Y-m-d', $store['date']);