kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-14 16:13:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop

Browse Source 
* 'develop' of https://github.com/firefly-iii/firefly-iii:
  New translation strings.
  Update JournalRepository.php
  Update Amount.php
  Update ImportStorage.php
  Fix #854
  Enable mod_ssl by default
This commit is contained in:
James Cole
2017-09-24 21:18:57 +02:00
parent 260ef1a07e 9f1ea0807b
commit ac0e2c9885
7 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@@ -28,6 +28,9 @@ COPY ./docker/apache2.conf /etc/apache2/apache2.conf
# Enable apache mod rewrite.. # Enable apache mod rewrite..
RUN a2enmod rewrite RUN a2enmod rewrite
# Enable apache mod ssl..
RUN a2enmod ssl
# Setup the Composer installer # Setup the Composer installer
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer

4
app/Import/Converter/Amount.php
View File

@@ -36,6 +36,10 @@ class Amount implements ConverterInterface
*/ */
public function convert($value): string public function convert($value): string
{ {
if(is_null($value)) {
return '0';
}
$value = strval($value);
Log::debug(sprintf('Start with amount "%s"', $value)); Log::debug(sprintf('Start with amount "%s"', $value));
$len = strlen($value); $len = strlen($value);
$decimalPosition = $len - 3; $decimalPosition = $len - 3;

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

@@ -39,11 +39,11 @@ class ImportStorage
/** @var string */ /** @var string */
private $dateFormat = 'Ymd'; // yes, hard coded private $dateFormat = 'Ymd'; // yes, hard coded
/** @var ImportJob */ /** @var ImportJob */
private $job; protected $job;
/** @var Collection */ /** @var Collection */
private $objects; private $objects;
/** @var Collection */ /** @var Collection */
private $rules; protected $rules;
/** @var array */ /** @var array */
private $transfers = []; private $transfers = [];

5
app/Import/Storage/ImportSupport.php
View File

@@ -35,6 +35,11 @@ use Illuminate\Database\Query\JoinClause;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log; use Log;
/**
* Trait ImportSupport
*
* @package FireflyIII\Import\Storage
*/
trait ImportSupport trait ImportSupport
{ {
/** @var int */ /** @var int */

4
app/Repositories/Journal/JournalRepository.php
View File

@@ -196,7 +196,7 @@ class JournalRepository implements JournalRepositoryInterface
$journal->save(); $journal->save();
// store stuff: // store stuff:
$this->storeCategoryWithJournal($journal, $data['category']); $this->storeCategoryWithJournal($journal, strval($data['category']));
$this->storeBudgetWithJournal($journal, $data['budget_id']); $this->storeBudgetWithJournal($journal, $data['budget_id']);
// store two transactions: // store two transactions:
@@ -271,7 +271,7 @@ class JournalRepository implements JournalRepositoryInterface
$journal->categories()->detach(); $journal->categories()->detach();
$journal->budgets()->detach(); $journal->budgets()->detach();
$this->storeCategoryWithJournal($journal, $data['category']); $this->storeCategoryWithJournal($journal, strval($data['category']));
$this->storeBudgetWithJournal($journal, $data['budget_id']); $this->storeBudgetWithJournal($journal, $data['budget_id']);
// negative because source loses money. // negative because source loses money.

2
resources/lang/en_US/firefly.php
View File

@@ -474,7 +474,7 @@ return [
'converted_to_Withdrawal' => 'The transaction has been converted to a withdrawal', 'converted_to_Withdrawal' => 'The transaction has been converted to a withdrawal',
'converted_to_Deposit' => 'The transaction has been converted to a deposit', 'converted_to_Deposit' => 'The transaction has been converted to a deposit',
'converted_to_Transfer' => 'The transaction has been converted to a transfer', 'converted_to_Transfer' => 'The transaction has been converted to a transfer',
'invalid_convert_selection' => 'The account you have selected is already used in this transaction or does not exist.',
// create new stuff: // create new stuff:
'create_new_withdrawal' => 'Create new withdrawal', 'create_new_withdrawal' => 'Create new withdrawal',

2
resources/lang/en_US/form.php
View File

@@ -186,7 +186,7 @@ return [
'payment_date' => 'Payment date', 'payment_date' => 'Payment date',
'invoice_date' => 'Invoice date', 'invoice_date' => 'Invoice date',
'internal_reference' => 'Internal reference', 'internal_reference' => 'Internal reference',
'inward' => 'Inward description', 'inward' => 'Inward description',
'outward' => 'Outward description', 'outward' => 'Outward description',
'rule_group_id' => 'Rule group',
]; ];