From 73b5e8cbbe655b2da75cabefb2fde68c3e2e8310 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Tue, 7 Jan 2025 16:44:34 +0100
Subject: [PATCH] Bug 38718: Main container - POS

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 .../prog/en/includes/main-container.inc         |  1 +
 .../intranet-tmpl/prog/en/modules/pos/pay.tt    | 15 ++-------------
 .../prog/en/modules/pos/register.tt             | 15 +++------------
 .../prog/en/modules/pos/registers.tt            | 17 ++---------------
 4 files changed, 8 insertions(+), 40 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc
index 17b9d744f9..5160a6b119 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc
@@ -23,6 +23,7 @@
                         [% CASE 'circ-nav' %][% INCLUDE 'circ-nav.inc' %]
                         [% CASE 'facets' %][% INCLUDE 'facets.inc' %]
                         [% CASE 'vendor-menu' %][% INCLUDE 'vendor-menu.inc' %]
+                        [% CASE 'pos-menu' %][% INCLUDE 'pos-menu.inc' %]
                         [% CASE 'subscriptions-search' %][% INCLUDE 'subscriptions-search.inc' %]
                         [% CASE 'tools-menu' %][% INCLUDE 'tools-menu.inc' %]
                         [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
index f3693b24e7..8271031bb8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
@@ -30,10 +30,7 @@
     [% END #/ WRAPPER breadcrumbs %]
 [% END #/ WRAPPER sub-header.inc %]
 
-<div class="main container-fluid">
-    <div class="row">
-        <div class="col-md-10 order-sm-1 order-md-2">
-            [% INCLUDE 'messages.inc' %]
+[% WRAPPER 'main-container.inc' %]
 
             <h1>Point of sale</h1>
 
@@ -175,15 +172,7 @@
             </div>
         [%- END -%]
 
-    </div>
-
-    <div class="col-md-2 order-sm-2 order-md-1">
-        <aside>
-            [% INCLUDE 'pos-menu.inc' %]
-        </aside>
-    </div>
-</div> <!-- /.row -->
-</div> <!-- /.main.container-fluid -->
+[% END %]
 
 <!-- Email receipt modal -->
 <div class="modal" id="emailReceiptModal" tabindex="-1" role="dialog" aria-labelledby="emailReceiptLabel">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
index 3121464440..15878a0352 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
@@ -28,10 +28,8 @@
     [% END #/ WRAPPER breadcrumbs %]
 [% END #/ WRAPPER sub-header.inc %]
 
-<div class="main container-fluid">
-    <div class="row">
-        <div class="col-md-10 order-md-2 order-sm-1">
-            [% INCLUDE 'messages.inc' %]
+
+[% WRAPPER 'main-container.inc' aside='pos-menu' %]
 
             [% IF ( error_registers ) %]
                 <div id="error_message" class="alert alert-info">
@@ -277,15 +275,8 @@
                 </table>
             </div>
             [% END %]
-        </div>
 
-        <div class="col-md-2 order-sm-2 order-md-1">
-            <aside>
-                [% INCLUDE 'pos-menu.inc' %]
-            </aside>
-        </div>
-    </div><!-- /.row -->
-</div> <!-- /.main.container-fluid -->
+[% END %]
 
     <!-- Confirm cashup modal -->
     <div class="modal" id="confirmCashupModal" tabindex="-1" role="dialog" aria-labelledby="confirmCashupLabel">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt
index 4e9b8f7891..9cac64cd6b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt
@@ -26,11 +26,7 @@
         [% END #/ WRAPPER breadcrumbs %]
     [% END #/ WRAPPER sub-header.inc %]
 
-    <div class="main container-fluid">
-        <div class="row">
-            <div class="col-md-10 order-md-2 order-sm-1">
-                <main>
-                    [% INCLUDE 'messages.inc' %]
+    [% WRAPPER 'main-container.inc' aside='pos-menu' %]
                     [% IF ( error_registers ) %]
                         <div id="error_message" class="alert alert-info">
                             <p>
@@ -139,17 +135,8 @@
                         </table>
                     </div> <!-- /.page-section -->
                     [% END %]
-                </main>
-            </div>
 
-            <div class="col-md-2 order-sm-2 order-md-1">
-                <aside>
-                    [% INCLUDE 'pos-menu.inc' %]
-                </aside>
-            </div>
-
-        </div> <!-- /.row -->
-    </div> <!-- /.main.container-fluid -->
+        [% END %]
 
         <!-- Confirm cashup modal -->
         <div class="modal" id="confirmCashupModal" tabindex="-1" role="dialog" aria-labelledby="confirmCashupLabel">