From 7e2c42a4638e3335468335a73736c18582b4d95b Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Thu, 10 Aug 2023 21:30:05 +0700
Subject: [PATCH] update for sit

---
 app/Helpers/Helpers.php                       | 36 +++++++++++++++++++
 modules_statuses.json                         |  7 +---
 resources/views/layout/_auth.blade.php        | 14 --------
 resources/views/layout/_default.blade.php     |  5 ---
 .../sidebar-layout/_toolbar.blade.php         |  8 ++---
 5 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/app/Helpers/Helpers.php b/app/Helpers/Helpers.php
index 962b3c5..30e2c6b 100644
--- a/app/Helpers/Helpers.php
+++ b/app/Helpers/Helpers.php
@@ -1,5 +1,7 @@
 <?php
 
+    use Modules\Usermanager\Entities\User;
+
     if (!function_exists('theme')) {
         function theme()
         {
@@ -424,6 +426,40 @@
         }
     }
 
+    if (!function_exists('get_user')) {
+        /**
+         * Get icon
+         *
+         * @param $path
+         *
+         * @return string
+         */
+        function get_user($id)
+        {
+            return User::find($id);
+        }
+    }
+
+    if (!function_exists('get_status')) {
+        /**
+         * Get icon
+         *
+         * @param $path
+         *
+         * @return string
+         */
+        function get_status($status)
+        {
+            if ($status == 0) {
+                return '<span class="badge badge-light-primary">Waiting Approval</span>';
+            } else if ($status == 1) {
+                return '<span class="badge badge-light-success">Approved</span>';
+            } else if ($status == 3) {
+                return '<span class="badge badge-light-danger">Rejected</span>';
+            }
+        }
+    }
+
 
     function verify_user($id, $passwd, $SERVER_ADDR, $IPUserManager, $portUserManager, $appId)
     {
diff --git a/modules_statuses.json b/modules_statuses.json
index 4c80db5..73e7211 100644
--- a/modules_statuses.json
+++ b/modules_statuses.json
@@ -1,10 +1,5 @@
 {
     "Usermanager": true,
-    "Company": true,
-    "Supplier": true,
-    "Buyer": true,
-    "Product": true,
-    "Warehouse": true,
-    "Master": true,
+    "Cetaklabel": true,
     "Logs": true
 }
diff --git a/resources/views/layout/_auth.blade.php b/resources/views/layout/_auth.blade.php
index 2b17b86..1d0f1d1 100644
--- a/resources/views/layout/_auth.blade.php
+++ b/resources/views/layout/_auth.blade.php
@@ -19,20 +19,6 @@
                     <!--end::Wrapper-->
                 </div>
                 <!--end::Form-->
-
-                <!--begin::Footer-->
-                <div class="d-flex flex-center flex-wrap px-5">
-                    <!--begin::Links-->
-                    <div class="d-flex fw-semibold text-primary fs-base">
-                        <a href="#" class="px-5" target="_blank">Terms</a>
-
-                        <a href="#" class="px-5" target="_blank">Plans</a>
-
-                        <a href="#" class="px-5" target="_blank">Contact Us</a>
-                    </div>
-                    <!--end::Links-->
-                </div>
-                <!--end::Footer-->
             </div>
             <!--end::Body-->
 
diff --git a/resources/views/layout/_default.blade.php b/resources/views/layout/_default.blade.php
index b7577c4..4475ee7 100644
--- a/resources/views/layout/_default.blade.php
+++ b/resources/views/layout/_default.blade.php
@@ -35,11 +35,6 @@
         <!--end::Page-->
     </div>
     <!--end::App-->
-
-    @include('partials/_drawers')
-
-    @include('partials/_modals')
-
     @include('partials/_scrolltop')
 
 @endsection
diff --git a/resources/views/layout/partials/sidebar-layout/_toolbar.blade.php b/resources/views/layout/partials/sidebar-layout/_toolbar.blade.php
index 24905ef..82d60d8 100644
--- a/resources/views/layout/partials/sidebar-layout/_toolbar.blade.php
+++ b/resources/views/layout/partials/sidebar-layout/_toolbar.blade.php
@@ -12,19 +12,18 @@
             @include(config('settings.KT_THEME_LAYOUT_DIR').'/partials/sidebar-layout/_page-title')
 
             @if(isset($route[0]) && $route[0]!=='cardboard-detail')
-
                 @if(isset($route[1]) && $route[1] == 'index')
-                    @if($route[0]=='document' || $route[0]=='cardboard')
+                    @if($route[0]=='document')
                         @if(!Auth::user()->hasRole(['ad','dd']))
                         <!--begin::Actions-->
                         <div class="d-flex align-items-center gap-2 gap-lg-3">
                             <!--begin::Primary button-->
-                            <a href="{{ route($route[0].'.create') }}" class="btn btn-sm fw-bold btn-primary text-capitalize">Add {{ str_replace('-',' ',$route[0]) }}</a>
+                            <a href="{{ route($route[0].'.create') }}" class="btn btn-sm fw-bold btn-primary text-capitalize" >Add {{ str_replace('-',' ',$route[0]) }}</a>
                             <!--end::Primary button-->
                         </div>
                         <!--end::Actions-->
                         @endif
-                    @elseif($route[0]!=='settings')
+                    @elseif($route[0]!=='settings' && $route[0]!=='approval')
                         <!--begin::Actions-->
                         <div class="d-flex align-items-center gap-2 gap-lg-3">
                             <!--begin::Primary button-->
@@ -67,6 +66,7 @@
                             <!--end::Primary button-->
                         @endif
                         <!--begin::Primary button-->
+                            <a href="{{ route($route[0].'.index') }}?id={{ $id }}" class="btn btn-sm fw-bold btn-primary text-capitalize">Add/Edit Odner</a>
                         <a href="{{ route('cardboard.index') }}" class="btn btn-sm fw-bold btn-warning text-capitalize">Back</a>
                         <!--end::Primary button-->
                     @else