putrakuningan/clara
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Metronic Version to 8.2.1 #1

Merged
putrakuningan merged 77 commits from dev into master 2024-05-04 09:46:45 +00:00
Conversation 0 Commits 77 Files Changed 2274 +41 -29
5 changed files with 41 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7e2c42a463 - Show all commits

36
app/Helpers/Helpers.php
View File

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

7
modules_statuses.json
View File

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

14
resources/views/layout/_auth.blade.php
View File

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

5
resources/views/layout/_default.blade.php
View File

@ -35,11 +35,6 @@
<!--end::Page-->
</div>
<!--end::App-->
@include('partials/_drawers')
@include('partials/_modals')
@include('partials/_scrolltop')
@endsection

8
resources/views/layout/partials/sidebar-layout/_toolbar.blade.php
View File

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