fix alt-identifier search

apps/maarch_entreprise/documents_list_copies.php

@@ -154,22 +154,7 @@ if (!empty($order_field) && !empty($order)) {
             $list->setOrder();
             $list->setOrderField($arr_order[0]);
         }
-        $basket_res_order = explode(' ', $_SESSION['current_basket']['basket_res_order']);
-        if ($basket_res_order[0] == 'alt_identifier') {
-            $orderstr = 'order by order_alphanum(alt_identifier)';
-            if (empty($basket_res_order[1])) {
-                $orderstr .= 'desc';
-            } else {
-                $orderstr .= $basket_res_order[1];
-            }
-        } else {
-            $orderstr = 'order by '.$_SESSION['current_basket']['basket_res_order'].' ';
-            if (empty($basket_res_order[1])) {
-                $orderstr .= 'desc';
-            } else {
-                $orderstr .= $basket_res_order[1];
-            }
-        }
+        $orderstr = 'order by '.str_replace('alt_identifier', 'order_alphanum(alt_identifier)', $_SESSION['current_basket']['basket_res_order']);
         $_SESSION['last_order_basket'] = $orderstr;
     } else {
         $list->setOrder();

apps/maarch_entreprise/documents_list_with_attachments.php

@@ -154,22 +154,7 @@ if (!empty($order_field) && !empty($order)) {
             $list->setOrder();
             $list->setOrderField($arr_order[0]);
         }
-        $basket_res_order = explode(' ', $_SESSION['current_basket']['basket_res_order']);
-        if ($basket_res_order[0] == 'alt_identifier') {
-            $orderstr = 'order by order_alphanum(alt_identifier) ';
-            if (empty($basket_res_order[1])) {
-                $orderstr .= 'desc';
-            } else {
-                $orderstr .= $basket_res_order[1];
-            }
-        } else {
-            $orderstr = 'order by '.$_SESSION['current_basket']['basket_res_order'].' ';
-            if (empty($basket_res_order[1])) {
-                $orderstr .= 'desc';
-            } else {
-                $orderstr .= $basket_res_order[1];
-            }
-        }
+        $orderstr = 'order by '.str_replace('alt_identifier', 'order_alphanum(alt_identifier)', $_SESSION['current_basket']['basket_res_order']);
         $_SESSION['last_order_basket'] = $orderstr;
     } else {
         $list->setOrder();

modules/visa/documents_list_with_signatory.php

@@ -153,22 +153,7 @@ if (!empty($order_field) && !empty($order)) {
             $list->setOrder();
             $list->setOrderField($arr_order[0]);
         }
-        $basket_res_order = explode(' ', $_SESSION['current_basket']['basket_res_order']);
-        if ($basket_res_order[0] == 'alt_identifier') {
-            $orderstr = 'order by order_alphanum(alt_identifier) ';
-            if (empty($basket_res_order[1])) {
-                $orderstr .= 'desc';
-            } else {
-                $orderstr .= $basket_res_order[1];
-            }
-        } else {
-            $orderstr = 'order by '.$_SESSION['current_basket']['basket_res_order'].' ';
-            if (empty($basket_res_order[1])) {
-                $orderstr .= 'desc';
-            } else {
-                $orderstr .= $basket_res_order[1];
-            }
-        }
+        $orderstr = 'order by '.str_replace('alt_identifier', 'order_alphanum(alt_identifier)', $_SESSION['current_basket']['basket_res_order']);
         $_SESSION['last_order_basket'] = $orderstr;
     } else {
         $list->setOrder();