From 991b19b2a2d79d5172e2ec7fef108f3c6b63e65e Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 24 Dec 2015 13:17:11 +0200 Subject: [PATCH] Bug fixes --- app/Models/Invoice.php | 2 +- app/Services/ImportService.php | 2 +- .../views/accounts/account_gateway.blade.php | 4 ++++ vendor.zip | Bin 22517514 -> 0 bytes 4 files changed, 6 insertions(+), 2 deletions(-) delete mode 100644 vendor.zip diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php index 9e10021ab874..3c95bcbddba0 100644 --- a/app/Models/Invoice.php +++ b/app/Models/Invoice.php @@ -526,7 +526,7 @@ class Invoice extends EntityModel implements BalanceAffecting } if ($this->end_date) { - $rule .= 'UNTIL=' . $this->end_date; + $rule .= 'UNTIL=' . $this->getOriginal('end_date'); } return $rule; diff --git a/app/Services/ImportService.php b/app/Services/ImportService.php index ef01758e17d3..c5efffb3ff35 100644 --- a/app/Services/ImportService.php +++ b/app/Services/ImportService.php @@ -353,7 +353,7 @@ class ImportService $results = []; foreach ($maps as $entityType => $map) { - $result[$entityType] = $this->executeCSV($entityType, $map, $headers[$entityType]); + $results[$entityType] = $this->executeCSV($entityType, $map, $headers[$entityType]); } return $results; diff --git a/resources/views/accounts/account_gateway.blade.php b/resources/views/accounts/account_gateway.blade.php index 9c1f09cec351..411658e76f64 100644 --- a/resources/views/accounts/account_gateway.blade.php +++ b/resources/views/accounts/account_gateway.blade.php @@ -54,6 +54,10 @@