update for sit

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)
     {

modules_statuses.json

@@ -1,10 +1,5 @@
 {
     "Usermanager": true,
-    "Company": true,
+    "Cetaklabel": true,
-    "Supplier": true,
-    "Buyer": true,
-    "Product": true,
-    "Warehouse": true,
-    "Master": true,
     "Logs": true
 }

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-->
 

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

resources/views/layout/partials/sidebar-layout/_toolbar.blade.php

@@ -12,9 +12,8 @@
             @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">
@@ -24,7 +23,7 @@
                         </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