Bug fixes
This commit is contained in:
parent
c0409b86fd
commit
991b19b2a2
4 changed files with 6 additions and 2 deletions
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -54,6 +54,10 @@
|
|||
<div id="gateway_{{ $gateway->id }}_div" class='gateway-fields' style="display: none">
|
||||
@foreach ($gateway->fields as $field => $details)
|
||||
|
||||
@if ($details && !$accountGateway)
|
||||
{!! Former::populateField($gateway->id.'_'.$field, $details) !!}
|
||||
@endif
|
||||
|
||||
@if (in_array($field, $hiddenFields))
|
||||
{{-- do nothing --}}
|
||||
@elseif ($gateway->id == GATEWAY_DWOLLA && ($field == 'key' || $field == 'secret')
|
||||
|
|
|
|||
BIN
vendor.zip
BIN
vendor.zip
Binary file not shown.
Loading…
Add table
Reference in a new issue