kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Refactor and rename test code.

Browse Source
This commit is contained in:
James Cole
2018-05-21 07:22:38 +02:00
parent 620c5f515e
commit 714b54ed06
37 changed files with 363 additions and 939 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Support/Import/Information/GetSpectreCustomerTrait.php
View File

@@ -33,7 +33,6 @@ use Log;
/**
* Trait GetSpectreCustomerTrait
*
* @package FireflyIII\Support\Import\Information
*/
trait GetSpectreCustomerTrait
{
@@ -52,9 +51,11 @@ trait GetSpectreCustomerTrait
/** @var NewCustomerRequest $request */
$request = app(NewCustomerRequest::class);
$request->setUser($importJob->user);
// todo what if customer is still null?
$customer = $request->getCustomer();
}
Log::debug('The customer is not null.');
return $customer;
@@ -72,7 +73,7 @@ trait GetSpectreCustomerTrait
$customer = null;
// check users preferences.
$preference = app('preferences')->getForUser($importJob->user, 'spectre_customer');
$preference = app('preferences')->getForUser($importJob->user, 'spectre_customer', null);
if (null !== $preference) {
Log::debug('Customer is in user configuration');
$customer = new Customer($preference->data);
@@ -96,9 +97,10 @@ trait GetSpectreCustomerTrait
}
Log::debug(sprintf('Skip customer with name "%s"', $current->getIdentifier()));
}
// store in preferences.
app('preferences')->setForUser($importJob->user, 'spectre_customer', $customer->toArray());
if (null !== $customer) {
// store in preferences.
app('preferences')->setForUser($importJob->user, 'spectre_customer', $customer->toArray());
}
return $customer;
}