From 811c9a03818c0192bebe9aab341d2712d0bf8f9c Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Thu, 25 Apr 2024 14:29:09 +0000 Subject: [PATCH] test fixes --- Controller/ApiBillController.php | 6 +++--- Models/SalesBillMapper.php | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Controller/ApiBillController.php b/Controller/ApiBillController.php index b4c7f70..75fc0c4 100755 --- a/Controller/ApiBillController.php +++ b/Controller/ApiBillController.php @@ -926,7 +926,7 @@ final class ApiBillController extends Controller * * @since 1.0.0 */ - public function apiBillElementCreate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void + public function apiBillElementCreate(HttpRequest $request, ResponseAbstract $response, array $data = []) : void { if (!empty($val = $this->validateBillElementCreate($request))) { $response->header->status = RequestStatusCode::R_400; @@ -959,7 +959,7 @@ final class ApiBillController extends Controller /** * Method to create a bill element from request. * - * @param RequestAbstract $request Request + * @param HttpRequest $request Request * @param ResponseAbstract $response Response * @param Bill $bill Bill to create element for * @param array $data Generic data @@ -968,7 +968,7 @@ final class ApiBillController extends Controller * * @since 1.0.0 */ - private function createBillElementFromRequest(RequestAbstract $request, ResponseAbstract $response, Bill $bill, $data = null) : BillElement + private function createBillElementFromRequest(HttpRequest $request, ResponseAbstract $response, Bill $bill, $data = null) : BillElement { // @todo handle text element diff --git a/Models/SalesBillMapper.php b/Models/SalesBillMapper.php index 01aa7f3..bed50c6 100755 --- a/Models/SalesBillMapper.php +++ b/Models/SalesBillMapper.php @@ -385,7 +385,7 @@ final class SalesBillMapper extends BillMapper $hasData = false; foreach ($results as $result) { - if ($result !== '0' || ((int) $result) > 0) { + if (!empty($result)) { $hasData = true; break; } @@ -434,9 +434,7 @@ final class SalesBillMapper extends BillMapper $hasData = false; foreach ($results as $result) { - if ($result['net_sales'] !== '0' || ((int) $result['net_sales']) > 0 - || $result['net_costs'] !== '0' || ((int) $result['net_costs']) > 0 - ) { + if (!empty($result['net_sales']) || !empty($result['net_costs'])) { $hasData = true; break; }