From 9467a8c83fa17adb5f799b223c0fde4987003baf Mon Sep 17 00:00:00 2001
From: Zelda Ababil <zeldaababil01@gmail.com>
Date: Sat, 20 Jan 2024 01:54:51 +0700
Subject: [PATCH] merging

---
 resources/views/components/navbar.blade.php     |  7 ++++---
 resources/views/pages/Kasir/transaksi.blade.php | 12 +++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php
index a421981..f6902d1 100644
--- a/resources/views/components/navbar.blade.php
+++ b/resources/views/components/navbar.blade.php
@@ -2,7 +2,8 @@
 <nav class="main-header navbar navbar-expand-lg navbar-light navbar-warning">
     <div class="container" style="display: contents">
         <a href="/" class="navbar-brand">
-            <span class="brand-text font-weight-bold ml-2" style="color: rgba(62, 62, 62, 0.526)">Sepiring Telur Keriting</span>
+            <span class="brand-text font-weight-bold ml-2" style="color: rgba(62, 62, 62, 0.526)">Sepiring Telur
+                Keriting</span>
         </a>
 
         {{-- <div class="collapse navbar-collapse order-3" id="navbarCollapse">
@@ -72,8 +73,8 @@
         <ul class="order-1 order-md-3 navbar-nav navbar-no-expand ml-auto">
             <!-- Messages Dropdown Menu -->
             <li class="nav-item">
-                <a class="nav-link" id="full-screen" data-widget="control-sidebar" data-slide="true" href="javascript:void(0)"
-                    role="button">
+                <a class="nav-link" id="full-screen" data-widget="control-sidebar" data-slide="true"
+                    href="javascript:void(0)" role="button">
                     <i class="fas fa-th-large"></i>
                     Fullscreen
                 </a>
diff --git a/resources/views/pages/Kasir/transaksi.blade.php b/resources/views/pages/Kasir/transaksi.blade.php
index 16e991b..2b2f186 100644
--- a/resources/views/pages/Kasir/transaksi.blade.php
+++ b/resources/views/pages/Kasir/transaksi.blade.php
@@ -294,7 +294,7 @@
                                                                         </h5>
                                                                     </div>
                                                                     <div class="col-md-12">
-                                                                        <a class="col-6 btn btn-warning"
+                                                                        <a class="col-6 col-md-12 col-lg-6 btn btn-warning"
                                                                             id="ordered-menus">Pesan</a>
                                                                     </div>
                                                                 </div>
@@ -332,7 +332,7 @@
                                                                         </h5>
                                                                     </div>
                                                                     <div class="col-md-12">
-                                                                        <a class="col-6 btn btn-warning"
+                                                                        <a class="col-6 col-md-12 col-lg-6 btn btn-warning"
                                                                             id="ordered-menus">Pesan</a>
                                                                     </div>
                                                                 </div>
@@ -367,7 +367,9 @@
                                 <tr>
                                     <th width="60%" class="text-center">Menu</th>
                                     <th>Qty</th>
-                                    <th width="10%">⚙️</th>
+                                    <th width="10%" style="text-align: center">
+                                        <i class="fas fa-cog"></i>
+                                    </th>
                                 </tr>
                             </thead>
                             <tbody id="tbody-order-menus">
@@ -423,11 +425,11 @@
                                 <tr>
                                     <th colspan="3">
                                         <span class="row">
+                                            <input type="text" name="nama-pemesan" class="form-control rounded-0"
+                                                placeholder="Nama Pemesan" id="nama-pemesan" required>
                                             <input type="number" min="1" name="nomor-meja"
                                                 class="form-control rounded-0" placeholder="Nomor Meja" id="nomor-meja"
                                                 required>
-                                            <input type="text" name="nama-pemesan" class="form-control rounded-0"
-                                                placeholder="Nama Pemesan" id="nama-pemesan" required>
                                             <input type="text" name="keterangan-pesanan"
                                                 placeholder="Keterangan Pesanan" class="form-control rounded-0"
                                                 id="keterangan-pesanan">