From 22fa2227c5383da08c8d65871685841fd64eab54 Mon Sep 17 00:00:00 2001
From: zeldaababil19 <zeldaababil01@gmail.com>
Date: Thu, 28 Mar 2024 19:05:16 +0700
Subject: [PATCH] asdas

---
 .../views/pages/Kasir/modal_extra.blade.php   | 28 +++---
 resources/views/pages/Kasir/print.blade.php   | 92 +++++++++++++------
 .../views/pages/Kasir/print_dapur.blade.php   | 41 ++++++---
 3 files changed, 105 insertions(+), 56 deletions(-)

diff --git a/resources/views/pages/Kasir/modal_extra.blade.php b/resources/views/pages/Kasir/modal_extra.blade.php
index 72735b2..768c5aa 100644
--- a/resources/views/pages/Kasir/modal_extra.blade.php
+++ b/resources/views/pages/Kasir/modal_extra.blade.php
@@ -8,21 +8,8 @@
                 </button>
             </div>
             <div class="modal-body" id="show-modal-paket">
-                <div class="col-md-6 col-sm-6" id="ordered-extra-menus">
-                    <ul>
-                        <li>
-                            <div class="row" style="justify-content: space-between;">
-                                <input type="hidden" id="id-table-row-extra">
-                                <h5 id="menu-utama-yang-terpilih"></h5>
-                                <h6 id="harga-menu-utama-yang-terpilih"></h6>
-                            </div>
-                            <ul id="extra-menu-choised">
-                            </ul>
-                        </li>
-                    </ul>
-                </div>
                 <div class="row">
-                    <div class="col-12 col-sm-12">
+                    <div class="col-8 col-sm-8">
                         <div class="card card-primary card-tabs">
                             <div class="card-header p-0 pt-1">
                                 <ul class="nav nav-tabs" id="custom-tabs-one-tab-martabak" role="tablist">
@@ -120,6 +107,19 @@
                             <!-- /.card -->
                         </div>
                     </div>
+                    <div class="col-md-4 col-sm-4" id="ordered-extra-menus">
+                        <ul style="margin-right:10px">
+                            <li>
+                                <div class="row" style="justify-content: space-between;">
+                                    <input type="hidden" id="id-table-row-extra">
+                                    <h5 id="menu-utama-yang-terpilih"></h5>
+                                    <h6 id="harga-menu-utama-yang-terpilih"></h6>
+                                </div>
+                                <ul id="extra-menu-choised">
+                                </ul>
+                            </li>
+                        </ul>
+                    </div>
                 </div>
 
                 <!-- /.button -->
diff --git a/resources/views/pages/Kasir/print.blade.php b/resources/views/pages/Kasir/print.blade.php
index 7f08e0d..3b3d6c4 100644
--- a/resources/views/pages/Kasir/print.blade.php
+++ b/resources/views/pages/Kasir/print.blade.php
@@ -123,20 +123,40 @@
     <table class="literely-table" style="width: 100%;">
         <tbody>
             @foreach ($pesanan->detailPesanan as $item)
-                <tr>
-                    <td style="width: 100px;" colspan="5">{{ $item->nama_produk }}
-                        {{ $item->status_pesanan == 0 ? '(TAKEAWAY)' : ($item->status_pesanan == 3 ? '(CANCEL)' : '') }}
-                    </td>
-                </tr>
-                <tr>
-                    <td></td>
-                    <td style="text-align: right">{{ $item->jumlah_produk }}</td>
-                    <td style="text-align: right">{{ convert_to_rupiah($item->harga_produk) }}</td>
-                    <td style="text-align: right;width: 30px">
-                        {{ $item->diskon_persen != '' || $item->diskon_persen != 0 || $item->diskon_persen != null ? $item->diskon_persen . '%' : '' }}
-                    </td>
-                    <td style="text-align: right;width: 70px">{{ convert_to_rupiah($item->total_harga_produk) }}</td>
-                </tr>
+                @if ($item->id_parent == null)
+                    <tr>
+                        <td style="width: 100px;" colspan="5">
+                            {{ $item->nama_produk }}{{ $item->status_pesanan == 0 ? '(TAKEAWAY)' : ($item->status_pesanan == 3 ? '(CANCEL)' : '') }}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="text-align: left">{{ $item->jumlah_produk }}</td>
+                        <td style="text-align: left">
+                            &nbsp;&nbsp;&nbsp;&nbsp;{{ convert_to_rupiah($item->harga_produk) }}</td>
+                        <td style="text-align: right;width: 30px">
+                            {{ $item->diskon_persen != '' || $item->diskon_persen != 0 || $item->diskon_persen != null ? $item->diskon_persen . '%' : '' }}
+                        </td>
+                        <td style="text-align: right;width: 70px">{{ convert_to_rupiah($item->harga_produk) }}
+                        </td>
+                    </tr>
+                    @php
+                        $tampungid = 0;
+                        $historyController = new App\Http\Controllers\Kasir\History();
+                        $result = $historyController->additionalProduct($item->id);
+                    @endphp
+                    @foreach ($result as $item2)
+                        @if ($item2->id_parent !== null && $item2->id_parent == $item->id)
+                            <tr>
+                                <td></td>
+                                <td style="text-align: left" colspan="2">
+                                    + &nbsp;&nbsp;{{ $item2->jumlah }}x&nbsp;&nbsp;{{ $item2->nama_produk }}</td>
+                                <td style="text-align: right;width: 70px" colspan="2">
+                                    {{ convert_to_rupiah($item2->total) }}
+                                </td>
+                            </tr>
+                        @endif
+                    @endforeach
+                @endif
             @endforeach
         </tbody>
     </table>
@@ -211,21 +231,37 @@
     <table class="table" style="width: 100%;">
         <tbody>
             @foreach ($pesanan->detailPesanan as $item)
-                <tr>
-                    <td style="width: 80px;" colspan="3">
-                        <h4>
-                            ({{ $item->jumlah_produk }} X)
-                            {{ $item->nama_produk }}
-                            {{ $item->status_pesanan == 0 ? '(TAKEAWAY)' : ($item->status_pesanan == 3 ? '(CANCEL)' : '') }}
-                        </h4>
-                        @if ($item->keterangan_produk != '')
-                            <p>
-                                &nbsp;&nbsp;&nbsp;&nbsp; ket: {{ $item->keterangan_produk }}
-                            </p>
-                            <br>
+                @if ($item->id_parent == null)
+                    <tr>
+                        <td style="width: 80px;" colspan="3">
+                            <h4>
+                                ({{ $item->jumlah_produk }} X)
+                                {{ $item->nama_produk }}
+                                {{ $item->status_pesanan == 0 ? '(TAKEAWAY)' : ($item->status_pesanan == 3 ? '(CANCEL)' : '') }}
+                            </h4>
+                            @if ($item->keterangan_produk != '')
+                                <p>
+                                    &nbsp;&nbsp;&nbsp;&nbsp; ket: {{ $item->keterangan_produk }}
+                                </p>
+                                <br>
+                            @endif
+                        </td>
+                    </tr>
+                    @php
+                        $tampungid = 0;
+                        $historyController = new App\Http\Controllers\Kasir\History();
+                        $result = $historyController->additionalProduct($item->id);
+                    @endphp
+                    @foreach ($result as $item2)
+                        @if ($item2->id_parent !== null && $item2->id_parent == $item->id)
+                            <tr>
+                                <td></td>
+                                <td style="text-align: left" colspan="2">
+                                    + &nbsp;&nbsp;{{ $item2->jumlah }}x&nbsp;&nbsp;{{ $item2->nama_produk }}</td>
+                            </tr>
                         @endif
-                    </td>
-                </tr>
+                    @endforeach
+                @endif
             @endforeach
         </tbody>
     </table>
diff --git a/resources/views/pages/Kasir/print_dapur.blade.php b/resources/views/pages/Kasir/print_dapur.blade.php
index 103139b..4e7862c 100644
--- a/resources/views/pages/Kasir/print_dapur.blade.php
+++ b/resources/views/pages/Kasir/print_dapur.blade.php
@@ -239,20 +239,33 @@
         <table class="table" style="width: 100%;">
             <tbody>
                 @foreach ($pesanan->detailPesanan as $item)
-                    <tr>
-                        <td style="width: 80px;" colspan="3">
-                            <h4>
-                                ({{ $item->jumlah_produk }} X)
-                                {{ $item->nama_produk }}{{ $item->status_pesanan == 0 ? '(TAKEAWAY)' : ($item->status_pesanan == 3 ? '(CANCEL)' : '') }}
-                            </h4>
-                            @if ($item->keterangan_produk != '')
-                                <p>
-                                    &nbsp;&nbsp;&nbsp;&nbsp; ket: {{ $item->keterangan_produk }}
-                                </p>
-                                <br>
-                            @endif
-                        </td>
-                    </tr>
+                    @if ($item->id_parent == null)
+                        <tr>
+                            <td style="width: 80px;" colspan="3">
+                                <h4>
+                                    ({{ $item->jumlah_produk }} X)
+                                    {{ $item->nama_produk }}
+                                    {{ $item->status_pesanan == 0 ? '(TAKEAWAY)' : ($item->status_pesanan == 3 ? '(CANCEL)' : '') }}
+                                </h4>
+                                @php
+                                    $tampungid = 0;
+                                    $historyController = new App\Http\Controllers\Kasir\History();
+                                    $result = $historyController->additionalProduct($item->id);
+                                @endphp
+                                @foreach ($result as $item2)
+                                    @if ($item2->id_parent !== null && $item2->id_parent == $item->id)
+                                        &nbsp;+&nbsp;{{ $item2->jumlah }}x&nbsp;&nbsp;{{ $item2->nama_produk }}
+                                    @endif
+                                @endforeach
+                                @if ($item->keterangan_produk != '')
+                                    <p>
+                                        &nbsp;&nbsp;&nbsp;&nbsp; ket: {{ $item->keterangan_produk }}
+                                    </p>
+                                    <br>
+                                @endif
+                            </td>
+                        </tr>
+                    @endif
                 @endforeach
             </tbody>
         </table>