From cf95af9a9b41480cf18bc09b9de60abf98db1ed5 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 11 Aug 2022 14:57:25 +0200
Subject: [PATCH] navigating to Order after saving journal

---
 Layout/default/Order/Index.php                      |  7 +++++++
 application/OrderJournal/OrderJournalController.php | 10 ++++++++++
 2 files changed, 17 insertions(+)

diff --git a/Layout/default/Order/Index.php b/Layout/default/Order/Index.php
index a0c3bcf36..50fe54238 100644
--- a/Layout/default/Order/Index.php
+++ b/Layout/default/Order/Index.php
@@ -323,6 +323,13 @@
                                       <form method="post" action="<?=self::getUrl("OrderJournal", "save")?>">
                                         <input type="hidden" name="order_id" value="<?=$order->id?>" />
                                         <input type="hidden" name="s" value="<?=$pagination['start']?>" />
+                                        <?php if($showSpecial): ?>
+                                          <input type="hidden" name="specialProductsOnly" value="1" />
+                                        <?php elseif($showVoice): ?>
+                                          <input type="hidden" name="voiceProductsOnly" value="1" />
+                                        <?php elseif($showLonelies): ?>
+                                          <input type="hidden" name="noTermProducts" value="1" />
+                                        <?php endif; ?>
                                         <?php if(is_array($filter) && count($filter)) foreach($filter as $n => $v): ?>
                                           <input type="hidden" name="filter[<?=$n?>]" value="<?=$v?>" />
                                         <?php endforeach; ?>
diff --git a/application/OrderJournal/OrderJournalController.php b/application/OrderJournal/OrderJournalController.php
index 9985d84e6..b65a29d88 100644
--- a/application/OrderJournal/OrderJournalController.php
+++ b/application/OrderJournal/OrderJournalController.php
@@ -49,6 +49,16 @@ class OrderJournalController extends mfBaseController {
     if (is_array($this->request->filter)) {
       $query["filter"] = $this->request->filter;
     }
+    if($this->request->voiceProductsOnly) {
+      $query['voiceProductsOnly'] = 1;
+    }
+    if($this->request->specialProductsOnly) {
+      $query['specialProductsOnly'] = 1;
+    }
+    if($this->request->noTermProducts) {
+      $query['noTermProducts'] = 1;
+    }
+    
     $qs = http_build_query($query);