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

Merge branch 'release/3.8.4'

Browse Source 
# Conflicts:
#	app/Helpers/Csv/PostProcessing/Bill.php
This commit is contained in:
James Cole
2016-04-24 18:48:16 +02:00
parent d02df46517 93421b50f9
commit 3f6c19dec4
88 changed files with 3664 additions and 730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Helpers/Csv/Converter/AssetAccountIban.php
View File

@@ -26,7 +26,7 @@ class AssetAccountIban extends BasicConverter implements ConverterInterface
// is mapped? Then it's easy!
if (isset($this->mapped[$this->index][$this->value])) {
$account = $repository->find($this->mapped[$this->index][$this->value]);
$account = $repository->find(intval($this->mapped[$this->index][$this->value]));
Log::debug('Found mapped account for value "' . $this->value . '". It is account #' . $account->id);
return $account;

2
app/Helpers/Csv/Converter/AssetAccountName.php
View File

@@ -25,7 +25,7 @@ class AssetAccountName extends BasicConverter implements ConverterInterface
// is mapped? Then it's easy!
if (isset($this->mapped[$this->index][$this->value])) {
$account = $repository->find($this->mapped[$this->index][$this->value]);
$account = $repository->find(intval($this->mapped[$this->index][$this->value]));
return $account;
}

2
app/Helpers/Csv/Converter/AssetAccountNumber.php
View File

@@ -34,7 +34,7 @@ class AssetAccountNumber extends BasicConverter implements ConverterInterface
// is mapped? Then it's easy!
if (isset($this->mapped[$this->index][$this->value])) {
$account = $repository->find($this->mapped[$this->index][$this->value]);
$account = $repository->find(intval($this->mapped[$this->index][$this->value]));
return $account;
}

2
app/Helpers/Csv/Converter/CategoryId.php
View File

@@ -16,7 +16,7 @@ class CategoryId extends BasicConverter implements ConverterInterface
/**
* @return Category
*/
public function convert(): Budget
public function convert(): Category
{
/** @var SingleCategoryRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Category\SingleCategoryRepositoryInterface');

2
app/Helpers/Csv/Converter/CategoryName.php
View File

@@ -17,7 +17,7 @@ class CategoryName extends BasicConverter implements ConverterInterface
/**
* @return Category
*/
public function convert(): Budget
public function convert(): Category
{
/** @var SingleCategoryRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Category\SingleCategoryRepositoryInterface');

2
app/Helpers/Csv/Importer.php
View File

@@ -28,7 +28,7 @@ class Importer
/** @var Data */
protected $data;
/** @var array */
protected $errors;
protected $errors = [];
/** @var array */
protected $importData;
/** @var array */

2
app/Helpers/Csv/PostProcessing/Bill.php
View File

@@ -20,7 +20,7 @@ class Bill implements PostProcessorInterface
{
// get bill id.
if (!is_null($this->data['bill']->id)) {
if (!is_null($this->data['bill']) && !is_null($this->data['bill']->id)) {
$this->data['bill-id'] = $this->data['bill']->id;
}