Browse Source

Make the data importer ignore pending transactions. #10947

pull/980/head
James Cole 3 weeks ago
parent
commit
45c5ec2546
  1. 12
      app/Services/Nordigen/Conversion/Routine/TransactionProcessor.php
  2. 6
      resources/views/v2/import/004-configure/index.blade.php
  3. 30
      resources/views/v2/import/004-configure/partials/gocardless-options.blade.php

12
app/Services/Nordigen/Conversion/Routine/TransactionProcessor.php

@ -176,9 +176,21 @@ class TransactionProcessor
Log::info(sprintf('Will not grab transactions after "%s"', $this->notAfter->format('Y-m-d H:i:s')));
}
$return = [];
$getPending =$this->configuration->getPendingTransactions();
if($getPending) {
Log::info('Will include pending transactions.');
}
if(!$getPending) {
Log::info('Will NOT include pending transactions.');
}
foreach ($transactions as $transaction) {
$madeOn = $transaction->getDate();
if(!$getPending && $transaction->key === 'pending') {
Log::debug(sprintf('Skip pending transaction made on "%s".', $madeOn->format(self::DATE_TIME_FORMAT)));
continue;
}
if ($this->notBefore instanceof Carbon && $madeOn->lt($this->notBefore)) {
Log::debug(
sprintf(

6
resources/views/v2/import/004-configure/index.blade.php

@ -83,6 +83,12 @@
@endif
<!-- end of spectre options -->
<!-- Nordigen / GoCardless specific options -->
@if('nordigen' === $flow)
@include('import.004-configure.partials.gocardless-options')
@endif
<!-- end of Nordigen / GoCardless options -->
<!-- camt.053 options -->
@if('file' === $flow && 'camt' === $configuration->getContentType())
@include('import.004-configure.partials.camt-053-options')

30
resources/views/v2/import/004-configure/partials/gocardless-options.blade.php

@ -0,0 +1,30 @@
<div class="row mt-3">
<div class="col-lg-10 offset-lg-1">
<div class="card">
<div class="card-header">
GoCardless import options
</div>
<div class="card-body">
<!-- Pending Transactions Configuration -->
<div class="form-group row">
<div class="col-sm-3">Pending transactions</div>
<div class="col-sm-9">
<div class="form-check">
<input class="form-check-input"
@if($configuration->getPendingTransactions()) checked @endif
type="checkbox" id="pending_transactions" name="pending_transactions" value="1"
aria-describedby="pendingTransactionsHelp">
<label class="form-check-label" for="pending_transactions">
Include pending transactions
</label>
<small id="pendingTransactionsHelp" class="form-text text-muted">
<br>Select to include pending (unposted) transactions in addition to posted
transactions.
</small>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
Loading…
Cancel
Save