Merge branch 'main' into issue-170-phpstan

anstiftung · Jan 15, 2025 · f1006f4 · f1006f4
2 parents b07a8a4 + 3db6516
commit f1006f4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/plugins/Admin/src/Controller/FundingsController.php b/plugins/Admin/src/Controller/FundingsController.php
@@ -55,6 +55,7 @@ public function bankExport() {
         $fundings = $fundingsTable->find('all',
             conditions: [
                 $fundingsTable->aliasField('submit_date IS NOT NULL'),
+                $fundingsTable->aliasField('money_transfer_date IS NULL'),
             ],
             contain: [
                 'OwnerUsers',

diff --git a/src/Model/Entity/Funding.php b/src/Model/Entity/Funding.php
@@ -14,15 +14,17 @@ class Funding extends Entity
         'rejected-by-admins' => 'Uploads: ' . self::STATUS_MAPPING_UPLOADS[self::STATUS_REJECTED_BY_ADMIN],
         'no-data-verified' => 'Noch keine Felder bestätigt',
         'not-submitted' => 'Förderantrag nicht eingereicht',
-        'submitted' => 'Förderantrag eingereicht',
+        'submitted' => 'Förderantrag eingereicht (und noch nicht überwiesen)',
+        'submitted-and-money-transferred' => 'Förderantrag überwiesen',
     ];
 
     const ADMIN_FILTER_CONDITIONS = [
         'to-be-verified-by-admins' => 'Fundings.activity_proof_status = ' . self::STATUS_PENDING . ' OR Fundings.freistellungsbescheid_status = ' . self::STATUS_PENDING . ' OR (Fundings.submit_date IS NOT NULL AND Fundings.zuwendungsbestaetigung_status = ' . self::STATUS_PENDING . ')',  
         'rejected-by-admins' => 'Fundings.activity_proof_status = ' . self::STATUS_REJECTED_BY_ADMIN . ' OR Fundings.freistellungsbescheid_status = ' . self::STATUS_REJECTED_BY_ADMIN . ' OR (Fundings.submit_date IS NOT NULL AND Fundings.zuwendungsbestaetigung_status = ' . self::STATUS_REJECTED_BY_ADMIN . ')',
         'no-data-verified' => 'Fundings.verified_fields IS NULL',
         'not-submitted' => 'Fundings.submit_date IS NULL',
-        'submitted' => 'Fundings.submit_date IS NOT NULL',
+        'submitted' => 'Fundings.submit_date IS NOT NULL AND Fundings.money_transfer_date IS NULL',
+        'submitted-and-money-transferred' => 'Fundings.submit_date IS NOT NULL AND Fundings.money_transfer_date IS NOT NULL',
     ];
 
     const STATUS_PENDING = 10;