resolved conflicts

This commit is contained in:
2025-03-31 03:46:05 +03:00
6454 changed files with 1520539 additions and 9 deletions
@@ -0,0 +1,45 @@
@extends('layouts.main')
@section('content')
<div class="row bg-title">
<div class="col-lg-3 col-md-4 col-sm-4 col-xs-12">
<h4 class="page-title">{{ __('payroll_salary_scale.add_category') }}</h4>
</div>
<div class="col-lg-9 col-sm-8 col-md-8 col-xs-12">
<ol class="breadcrumb">
<li><a href="{{ route('home') }}">{{ __('payroll_salary_scale.dashboard') }}</a></li>
<li><a href="/salary_scales/index">{{ __('payroll_salary_scale.salary_scale') }}</a></li>
<li class="active">{{ __('payroll_salary_scale.create') }}</li>
</ol>
</div>
</div>
<div class="row">
<div class="col-sm-12">
@include('payroll::payroll_salary_scales.menu')
</div>
</div>
<div class="row">
<div class="col-sm-12">
<!--Flash messages at the top -->
@include('flash::message')
<div class="white-box">
{{ Form::open(['route' => 'payroll_salary_scales.store', 'data-toggle' => 'validator']) }}
<div class="form-group" id="optionsList">
{{ Form::label('name', __('payroll_salary_scale.salary_scale_name')) }}
{{ Form::text('name', '', ['class' => 'form-control compulsory', 'required']) }}
<div class="help-block with-errors"></div>
</div>
{{ Form::button(__('payroll_salary_scale.submit'),['type'=>'submit','class'=>'btn btn-success waves-effect waves-light m-r-10 submit-btn']) }}
{{ Form::button(__('payroll_salary_scale.cancel'),['type'=>'reset','class'=>'btn btn-default waves-effect waves-light']) }}
{{ Form::close() }}
</div>
</div>
</div>
@endsection
@push('scripts')
<script src="{{ asset('elite/js/validator.js') }}"></script>
<script type="text/javascript"></script>
@endpush
@@ -0,0 +1,47 @@
@extends('layouts.main')
@section('content')
<div class="row bg-title">
<div class="col-lg-3 col-md-4 col-sm-4 col-xs-12">
<h4 class="page-title">{{ __('payroll_salary_scale.edit') }}</h4>
</div>
<div class="col-lg-9 col-sm-8 col-md-8 col-xs-12">
<ol class="breadcrumb">
<li><a href="{{ route('home') }}">{{ __('payroll_salary_scale.dashboard') }}</a></li>
<li><a href="/salary_scales/index">{{ __('payroll_salary_scale.salary_scale') }}</a></li>
<li class="active">{{ __('payroll_salary_scale.edit') }}</li>
</ol>
</div>
</div>
<div class="row">
<div class="col-sm-12">
@include('payroll::payroll_salary_scales.menu')
</div>
</div>
<div class="row">
<div class="col-sm-12">
<!--Flash messages at the top -->
@include('flash::message')
<div class="white-box">
{{ Form::model($scale, ['method' => 'PUT', 'route' => ['payroll_salary_scales.update',$scale], 'data-toggle' => 'validator']) }}
<div class="form-group">
{{ Form::label('name', __('payroll_salary_scale.salary_scale_name')) }}
{{ Form::text('name', $scale->name, ['class' => 'form-control compulsory', 'required']) }}
<div class="help-block with-errors"></div>
</div>
{{ Form::button(__('payroll_salary_scale.submit'),['type'=>'submit','class'=>'btn btn-success waves-effect waves-light m-r-10']) }}
{{ Form::button(__('payroll_salary_scale.cancel'),['type'=>'reset','class'=>'btn btn-default waves-effect waves-light']) }}
{{ Form::close() }}
</div>
</div>
</div>
@endsection
@push('scripts')
<script src="{{ asset('elite/js/validator.js') }}"></script>
@endpush
@@ -0,0 +1,77 @@
@extends('layouts.main')
@push('styles')
<link href="{{ asset('/elite/bower_components/datatables/jquery.dataTables.min.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('elite/tables/css/buttons.dataTables.min.css') }}" rel="stylesheet" type="text/css" />
@endpush
@section('content')
<div class="row bg-title">
<div class="col-lg-3 col-md-4 col-sm-4 col-xs-12">
<h4 class="page-title">{{ __('payroll_salary_scale.activate_category') }}</h4>
</div>
<div class="col-lg-9 col-sm-8 col-md-8 col-xs-12">
<ol class="breadcrumb">
<li><a href="{{ route('home') }}">{{ __('payroll_salary_scale.dashboard') }}</a></li>
<li><a href="/salary_scales/index">{{ __('payroll_salary_scale.salary_scale') }}</a></li>
<li class="active">{{ __('payroll_salary_scale.activate') }}</li>
</ol>
</div>
</div>
<div class="row">
<div class="col-sm-12">
@include('payroll::payroll_salary_scales.menu')
</div>
</div>
<div class="row">
<div class="col-sm-12">
<div class="white-box">
<div class="table-responsive">
<table class="table table-striped">
<thead>
<tr>
<th>{{ __('payroll_salary_scale.salary_scale_name') }}</th>
<th></th>
</tr>
</thead>
<tbody>
@foreach($scales as $scale)
<tr>
<td>{{ $scale->name }}</td>
<td>
{{ Form::model($scale->id ,['method' => 'POST', 'route' => ['payroll_salary_scales.activate', $scale->id]]) }}
<button type="submit" class="btn btn-warning" onclick="return confirm('<?php echo __('payroll_salary_scale.are_you_sure');?>')"><i class="fa fa-check"></i> {{ __('payroll_salary_scale.activate') }}</button>
{{ Form::close() }}
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
</div>
</div>
@endsection
@push('scripts')
<script src="{{ asset('elite/bower_components/datatables/jquery.dataTables.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/dataTables.buttons.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/buttons.flash.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/jszip.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/pdfmake.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/vfs_fonts.js') }}"></script>
<script src="{{ asset('elite/tables/js/buttons.html5.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/buttons.print.min.js') }}"></script>
<script>
$('.table').DataTable({
dom: 'Bfrtip',
buttons: [
'copy', 'csv', 'excel', 'pdf', 'print'
]
});
</script>
@endpush
@@ -0,0 +1,106 @@
@extends('layouts.main')
@push('styles')
<link href="{{ asset('/elite/bower_components/datatables/jquery.dataTables.min.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('elite/tables/css/buttons.dataTables.min.css') }}" rel="stylesheet" type="text/css" />
@endpush
@section('content')
<div class="row bg-title">
<div class="col-lg-3 col-md-4 col-sm-4 col-xs-12">
<h4 class="page-title">{{ __('payroll_salary_scale.salary_scale') }}</h4>
</div>
<div class="col-lg-9 col-sm-8 col-md-8 col-xs-12">
<ol class="breadcrumb">
<li><a href="{{ route('home') }}">{{ __('payroll_salary_scale.dashboard') }}</a></li>
<li><a href="/salary_scales/index">{{ __('payroll_salary_scale.salary_scale') }}</a></li>
<li class="active">{{ __('payroll_salary_scale.view') }}</li>
</ol>
</div>
</div>
<div class="row">
<div class="col-sm-12">
@include('payroll::payroll_salary_scales.menu')
</div>
</div>
<div class="row">
<div class="col-sm-12">
<div class="white-box">
@include('flash::message')
<div class="table-responsive">
<table class="table color-bordered-table success-bordered-table table-striped">
<thead>
<tr>
<th>{{ __('payroll_salary_scale.salary_scale_name') }}</th>
<th></th>
<th></th>
</tr>
</thead>
<tbody>
@foreach($scales as $scale)
<tr>
<td>{{ $scale->name }}</td>
<td>
<a href="/payroll_salary_scales/{{ $scale->id }}/edit/" class="btn btn-info"><i class="fa fa-pencil"></i> {{ __('payroll_salary_scale.edit') }}</a>
</td>
<td>
{{ Form::model($scale->id ,['method' => 'DELETE', 'route' => ['payroll_salary_scales.destroy', $scale->id]]) }}
<button type="submit" class="btn btn-danger" onclick="return confirm('<?php echo __('payroll_salary_scale.are_you_sure');?>')"><i class="fa fa-trash"></i> {{ __('payroll_salary_scale.delete') }}</button>
{{ Form::close() }}
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
</div>
</div>
@endsection
@push('scripts')
<script src="{{ asset('elite/bower_components/datatables/jquery.dataTables.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/dataTables.buttons.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/buttons.flash.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/jszip.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/pdfmake.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/vfs_fonts.js') }}"></script>
<script src="{{ asset('elite/tables/js/buttons.html5.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/buttons.print.min.js') }}"></script>
<script>
$('.table').DataTable({
dom: 'Bfrtip',
buttons: [
'copy', 'csv', {
extend: 'pdf',
exportOptions: {
columns: [0]
},
title: 'Payroll Categories'
},
{
extend: 'print',
exportOptions: {
columns: [0]
},
title: 'Payroll Categories'
},
{
extend: 'excel',
exportOptions: {
columns: [0]
},
title: 'Payroll Categories'
}
]
});
</script>
@endpush
@@ -0,0 +1,7 @@
<div class="panel panel-default">
<div class="panel-body">
<a href="{{ route('payroll_salary_scales.create') }}" class="nav-item btn btn-success ti-plus"> {{ __('payroll_salary_scale.add_scale') }}</a>
<a href="{{ route('payroll_salary_scales.index') }}" class="nav-item btn btn-primary ti-pencil"> {{ __('payroll_salary_scale.view_category') }}</a>
<a href="{{ route('payroll_salary_scales.inactive') }}" class="nav-item btn btn-warning ti-pencil"> {{ __('payroll_salary_scale.inactive_category') }}</a>
</div>
</div>