Merge pull request #94 from ggoffy/master

bugs in filter by status
XoopsModules25x · Feb 19, 2023 · 58b19ce · 58b19ce
2 parents 6cfda0a + 9195902
commit 58b19ce
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 18 deletions.
diff --git a/outputs.php b/outputs.php
@@ -166,15 +166,9 @@
             case 'csv':
             case 'xlsx':
                 //$creator = ('' != $GLOBALS['xoopsUser']->getVar('name')) ? $GLOBALS['xoopsUser']->getVar('name') : $GLOBALS['xoopsUser']->getVar('uname');
-                $filename = date('Ymd_H_i_s_', \time()) . \_MA_WGSIMPLEACC_TRANSACTIONS . '.' . $outType;
-
-                $filterYear      = Request::getInt('filterYear');
-                $filterMonthFrom = Request::getInt('filterMonthFrom');
-                $filterYearFrom  = Request::getInt('filterYearFrom');
-                $filterMonthTo   = Request::getInt('filterMonthTo');
-                $filterYearTo    = Request::getInt('filterYearTo', date('Y'));
-                $traStatus       = Request::getArray('tra_status');
-                $traDesc         = Request::getString('tra_desc');
+                $filename  = date('Ymd_H_i_s_', \time()) . \_MA_WGSIMPLEACC_TRANSACTIONS . '.' . $outType;
+                $traStatus = Request::getArray('tra_status');
+                $traDesc   = Request::getString('tra_desc');
 
                 // Add data
                 $crTransactions = new \CriteriaCompo();
@@ -201,7 +195,7 @@
                 if ($accId > 0) {
                     $crTransactions->add(new \Criteria('tra_accid', $accId));
                 }
-                if (\count($traStatus) > 0) {
+                if (\count($traStatus) > 0 && '' !== (string)$traStatus[0]) {
                     $critStatus = '(' . \implode(',', $traStatus) . ')';
                     $crTransactions->add(new \Criteria('tra_status', $critStatus, 'IN'));
                 } else {

diff --git a/transactions.php b/transactions.php
@@ -56,12 +56,11 @@
     $dateTo = \DateTime::createFromFormat(\_SHORTDATESTRING, Request::getString('filterTo'))->getTimestamp();
 }
 $filterInvalid = Request::getInt('filterInvalid');
-$traStatus = '';
-$status        = Request::getString('tra_status'); // status from pagination
-if ('' === $status) {
-    $traStatus  = Request::getArray('filterStatus'); // status from form filter
-} elseif ($traId > 0) {
-    $traStatus = \explode('_', $status);
+$traStatus = [];
+if (Request::hasVar('filterStatus')) {
+    $traStatus  = Request::getArray('filterStatus');
+} else {
+    $traStatus = \explode('_', Request::getString('tra_status'));
 }
 $traDesc = Request::getString('tra_desc');
 $sortBy  = Request::getString('sortby', 'tra_id');
@@ -139,7 +138,7 @@
         if ($cliId > 0) {
             $crTransactions->add(new \Criteria('tra_cliid', $cliId));
         }
-        if (\count($traStatus) > 0) {
+        if (\count($traStatus) > 0 && '' !== (string)$traStatus[0]) {
             $critStatus = '(' . \implode(',', $traStatus) . ')';
             $crTransactions->add(new \Criteria('tra_status', $critStatus, 'IN'));
         } else {
@@ -583,7 +582,7 @@
         if ($accId > 0) {
             $crTransactions->add(new \Criteria('tra_accid', $accId));
         }
-        if (\count($traStatus) > 0) {
+        if (\count($traStatus) > 0 && '' !== (string)$traStatus[0]) {
             $critStatus = '(' . \implode(',', $traStatus) . ')';
             $crTransactions->add(new \Criteria('tra_status', $critStatus, 'IN'));
         }