From ad3def69e345a14ba17f9a0a91c7d8821b53da21 Mon Sep 17 00:00:00 2001 From: JoshuaLicense Date: Fri, 10 May 2024 14:47:59 +0100 Subject: [PATCH] chore: revert "fix: Only show valid fees for licences (dvsa/olcs-internal#155)" (dvsa/olcs-internal#162) This reverts commit 1309aba64d79eed89535539c017d186713e9551c. --- app/internal/composer.json | 2 +- app/internal/composer.lock | 16 ++++++++-------- .../src/Controller/Traits/FeesActionTrait.php | 2 -- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/app/internal/composer.json b/app/internal/composer.json index eab3c66a1d..3d7764995a 100644 --- a/app/internal/composer.json +++ b/app/internal/composer.json @@ -36,7 +36,7 @@ "olcs/olcs-auth": "^8.0", "olcs/olcs-common": "^7.0.0", "olcs/olcs-logging": "^7.2", - "olcs/olcs-transfer": "^7.1.1", + "olcs/olcs-transfer": "^7.0.0", "olcs/olcs-utils": "^6.0.0", "saeven/zf3-purifier": "^1.1", "doctrine/doctrine-module": "^5", diff --git a/app/internal/composer.lock b/app/internal/composer.lock index 252ec11e2a..ab14aea574 100644 --- a/app/internal/composer.lock +++ b/app/internal/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "aa853db416c64a9bcc06b041b81aba07", + "content-hash": "259dae4e13ea8bb216a0d0cb4ee43573", "packages": [ { "name": "aws/aws-crt-php", @@ -4632,16 +4632,16 @@ }, { "name": "olcs/olcs-transfer", - "version": "v7.1.1", + "version": "v7.0.1", "source": { "type": "git", "url": "https://github.com/dvsa/olcs-transfer.git", - "reference": "144bbdbdf426174e4db22d188fe8c519af6e5b23" + "reference": "fa56bc7dd9ee127fe593c13239fbc3887fd45c6b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dvsa/olcs-transfer/zipball/144bbdbdf426174e4db22d188fe8c519af6e5b23", - "reference": "144bbdbdf426174e4db22d188fe8c519af6e5b23", + "url": "https://api.github.com/repos/dvsa/olcs-transfer/zipball/fa56bc7dd9ee127fe593c13239fbc3887fd45c6b", + "reference": "fa56bc7dd9ee127fe593c13239fbc3887fd45c6b", "shasum": "" }, "require": { @@ -4657,7 +4657,7 @@ "laminas/laminas-stdlib": "^3.0", "laminas/laminas-validator": "^2.11.1", "laminas/laminas-xml": "^1.4.0", - "php": "^8.0", + "php": "~8.0.0", "psr/container": "^1.1|^2" }, "require-dev": { @@ -4683,9 +4683,9 @@ "notification-url": "https://packagist.org/downloads/", "description": "OLCS Transfer", "support": { - "source": "https://github.com/dvsa/olcs-transfer/tree/v7.1.1" + "source": "https://github.com/dvsa/olcs-transfer/tree/v7.0.1" }, - "time": "2024-04-29T11:14:43+00:00" + "time": "2024-04-17T10:45:52+00:00" }, { "name": "olcs/olcs-utils", diff --git a/app/internal/module/Olcs/src/Controller/Traits/FeesActionTrait.php b/app/internal/module/Olcs/src/Controller/Traits/FeesActionTrait.php index c009132435..6522209c49 100644 --- a/app/internal/module/Olcs/src/Controller/Traits/FeesActionTrait.php +++ b/app/internal/module/Olcs/src/Controller/Traits/FeesActionTrait.php @@ -210,8 +210,6 @@ protected function getFeesTable($status) $params['status'] = $status; } - $params['onlySubmitted'] = true; - $results = $this->getFees($params); $tableParams = array_merge($params, ['query' => $this->getRequest()->getQuery()]);