Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 08:24:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2015-12-24 13:17:11 +02:00
parent c0409b86fd
commit 991b19b2a2
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/Invoice.php
View File

@ -526,7 +526,7 @@ class Invoice extends EntityModel implements BalanceAffecting
} }
if ($this->end_date) { if ($this->end_date) {
$rule .= 'UNTIL=' . $this->end_date; $rule .= 'UNTIL=' . $this->getOriginal('end_date');
} }
return $rule; return $rule;

2
app/Services/ImportService.php
View File

@ -353,7 +353,7 @@ class ImportService
$results = []; $results = [];
foreach ($maps as $entityType => $map) { foreach ($maps as $entityType => $map) {
$result[$entityType] = $this->executeCSV($entityType, $map, $headers[$entityType]); $results[$entityType] = $this->executeCSV($entityType, $map, $headers[$entityType]);
} }
return $results; return $results;

4
resources/views/accounts/account_gateway.blade.php
View File

@ -54,6 +54,10 @@
<div id="gateway_{{ $gateway->id }}_div" class='gateway-fields' style="display: none"> <div id="gateway_{{ $gateway->id }}_div" class='gateway-fields' style="display: none">
@foreach ($gateway->fields as $field => $details) @foreach ($gateway->fields as $field => $details)
@if ($details && !$accountGateway)
{!! Former::populateField($gateway->id.'_'.$field, $details) !!}
@endif
@if (in_array($field, $hiddenFields)) @if (in_array($field, $hiddenFields))
{{-- do nothing --}} {{-- do nothing --}}
@elseif ($gateway->id == GATEWAY_DWOLLA && ($field == 'key' || $field == 'secret') @elseif ($gateway->id == GATEWAY_DWOLLA && ($field == 'key' || $field == 'secret')

BIN
vendor.zip
View File

Binary file not shown.