kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-20 03:08:11 +00:00
Code Issues Projects Releases Wiki Activity

Fix storage bug in #845

Browse Source
This commit is contained in:
James Cole
2017-09-15 06:26:09 +02:00
parent 519ca4b2af
commit 38bb074751
2 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/Import/Object/ImportBill.php
View File

@@ -17,6 +17,7 @@ use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log; use Log;
use Steam;
/** /**
* Class ImportBill * Class ImportBill
@@ -26,6 +27,8 @@ use Log;
class ImportBill class ImportBill
{ {
/** @var string */
private $amount = '1';
/** @var Bill */ /** @var Bill */
private $bill; private $bill;
/** @var array */ /** @var array */
@@ -59,6 +62,14 @@ class ImportBill
return $this->bill; return $this->bill;
} }
/**
* @param string $amount
*/
public function setAmount(string $amount)
{
$this->amount = Steam::positive($amount);
}
/** /**
* @param array $id * @param array $id
*/ */
@@ -220,12 +231,22 @@ class ImportBill
return true; return true;
} }
Log::debug('Found no bill so must create one ourselves.');
$data = [ $data = [
'name' => $name, 'name' => $name,
'match' => $name,
'amount_min' => bcmul($this->amount, '0.9'),
'amount_max' => bcmul($this->amount, '1.1'),
'user_id' => $this->user->id,
'date' => date('Y-m-d'),
'repeat_freq' => 'monthly',
'skip' => '0',
'automatch' => '0',
'active' => '1',
]; ];
Log::debug('Found no bill so must create one ourselves. Assume default values.', $data);
$this->bill = $this->repository->store($data); $this->bill = $this->repository->store($data);
Log::debug(sprintf('Successfully stored new bill #%d: %s', $this->bill->id, $this->bill->name)); Log::debug(sprintf('Successfully stored new bill #%d: %s', $this->bill->id, $this->bill->name));

4
app/Import/Storage/ImportStorage.php
View File

@@ -173,6 +173,10 @@ class ImportStorage
// store meta object things: // store meta object things:
$this->storeCategory($journal, $importJournal->category->getCategory()); $this->storeCategory($journal, $importJournal->category->getCategory());
$this->storeBudget($journal, $importJournal->budget->getBudget()); $this->storeBudget($journal, $importJournal->budget->getBudget());
// to save bill, also give it the amount:
$importJournal->bill->setAmount($amount);
$this->storeBill($journal, $importJournal->bill->getBill()); $this->storeBill($journal, $importJournal->bill->getBill());
$this->storeMeta($journal, $importJournal->metaDates); $this->storeMeta($journal, $importJournal->metaDates);
$journal->setMeta('notes', $importJournal->notes); $journal->setMeta('notes', $importJournal->notes);