From 49bd0d138bca4586045ebee16c2a05c2fdd4ff36 Mon Sep 17 00:00:00 2001 From: wadedvsa <155439365+wadedvsa@users.noreply.github.com> Date: Wed, 24 Apr 2024 14:52:05 +0100 Subject: [PATCH] # This is a combination of 3 commits. # This is the 1st commit message: fix: Only show valid fees for licences # This is the commit message #2: chore: olcs-transfer bump # This is the commit message #3: fix: bump transfer dependency to minium version reqd for this bugfix --- composer.json | 2 +- module/Olcs/src/Controller/FeesController.php | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 1ba45e3a4..87930d1a3 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ "olcs/olcs-auth": "^8.0", "olcs/olcs-common": "^7.2.0", "olcs/olcs-logging": "^7.2", - "olcs/olcs-transfer": "^7.0", + "olcs/olcs-transfer": "^7.1.1", "olcs/olcs-utils": "^6.0.0", "psr/container": "^1.1|^2", "aws/aws-sdk-php": "^3.300" diff --git a/module/Olcs/src/Controller/FeesController.php b/module/Olcs/src/Controller/FeesController.php index 2756fc973..1883ca65e 100644 --- a/module/Olcs/src/Controller/FeesController.php +++ b/module/Olcs/src/Controller/FeesController.php @@ -216,7 +216,13 @@ public function receiptAction(): ViewModel protected function getOutstandingFeeDataForOrganisation(?int $organisationId) { - $query = OutstandingFees::create(['id' => $organisationId, 'hideExpired' => true]); + $query = OutstandingFees::create( + [ + 'id' => $organisationId, + 'hideExpired' => true, + 'onlySubmitted' => true, + ], + ); $response = $this->handleQuery($query); $this->disableCardPayments = $response->getResult()['disableCardPayments'];