From 826664f6ee3dedda5ad8ba2180dc959fde894a48 Mon Sep 17 00:00:00 2001 From: Dario Rekowski on RockPI Date: Wed, 25 Mar 2020 13:46:08 +0000 Subject: [PATCH] change creation validation to 3.000 per 3 month --- src/Controller/TransactionCreationsController.php | 4 ++-- src/Model/Transactions/TransactionCreation.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Controller/TransactionCreationsController.php b/src/Controller/TransactionCreationsController.php index 924e1c3fd..cbdb6ab47 100644 --- a/src/Controller/TransactionCreationsController.php +++ b/src/Controller/TransactionCreationsController.php @@ -197,9 +197,9 @@ class TransactionCreationsController extends AppController $connection = ConnectionManager::get('default'); $transactionActiveMonth = $connection->execute( 'SELECT id, received FROM transactions ' - . 'where received >= date_sub(date_add(curdate(), interval 1 - day(curdate()) day), interval 1 month) ' + . 'where received >= date_sub(date_add(curdate(), interval 1 - day(curdate()) day), interval 2 month) ' . 'AND ' - . 'received < date_add(date_add(curdate(), interval 1 - day(curdate()) day), interval 1 month) ' + . 'received < date_add(date_add(curdate(), interval 1 - day(curdate()) day), interval 2 month) ' . 'AND ' . 'transaction_type_id = 1' )->fetchAll('assoc'); diff --git a/src/Model/Transactions/TransactionCreation.php b/src/Model/Transactions/TransactionCreation.php index e430a8039..6f1445741 100644 --- a/src/Model/Transactions/TransactionCreation.php +++ b/src/Model/Transactions/TransactionCreation.php @@ -113,7 +113,7 @@ class TransactionCreation extends TransactionBase { return $q->where( ['OR' => ['EXTRACT(YEAR_MONTH FROM Transactions.received) LIKE EXTRACT(YEAR_MONTH FROM NOW())', - 'EXTRACT(YEAR_MONTH FROM DATE_ADD(Transactions.received, INTERVAL 1 MONTH)) LIKE EXTRACT(YEAR_MONTH FROM NOW())'] + 'EXTRACT(YEAR_MONTH FROM DATE_ADD(Transactions.received, INTERVAL 2 MONTH)) LIKE EXTRACT(YEAR_MONTH FROM NOW())'] ])->select('received'); }); //debug($existingCreations); @@ -126,8 +126,8 @@ class TransactionCreation extends TransactionBase { $newSum += $creation->amount; } } - if($newSum > 20000000) { - $this->addError('TransactionCreation::validate', 'Creation more than 1.000 GDD per Month (2 Month) not allowed'); + if($newSum > 30000000) { + $this->addError('TransactionCreation::validate', 'Creation more than 1.000 GDD per Month (3 Month) not allowed'); return false; } //die("\n");