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 @@
Waiting Approval';
+ } else if ($status == 1) {
+ return 'Approved';
+ } else if ($status == 3) {
+ return 'Rejected';
+ }
+ }
+ }
+
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 @@
-
-
-
-
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 @@
-
- @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']))
@endif
- @elseif($route[0]!=='settings')
+ @elseif($route[0]!=='settings' && $route[0]!=='approval')