Merge branch 'new-super' of https://gitlab.com/online-sistem1/kaunter into new-super

This commit is contained in:
Zakwan Hamdan
2023-02-05 11:01:48 +08:00
16 changed files with 1177 additions and 27 deletions
@@ -11,7 +11,7 @@
<a class="btn btn-info btn-lg" href="#" onclick="pelangganclick()">PELANGGAN</a>
<a class="btn btn-info btn-lg" href="{{ url('/harga_emas') }}">HARGA EMAS</a>
<a class="btn btn-info btn-lg" href="{{ url('/aliran_tunai') }}">ALIRAN TUNAI</a>
<a class="btn btn-info btn-lg" href="#">TETAPAN</a>
{{-- <a class="btn btn-info btn-lg" href="#">TETAPAN</a> --}}
</div>
</div>
</div>
+11 -2
View File
@@ -155,6 +155,7 @@
<th>Margin</th>
<th>Tempoh</th>
<th>Keuntungan</th>
<th>Lelong</th>
</tr>
</thead>
</table>
@@ -170,6 +171,7 @@
<th>Pembiayaan</th>
<th>Margin</th>
<th>Tempoh</th>
<th>Lelong</th>
</tr>
</thead>
</table>
@@ -507,6 +509,11 @@
if(jenistebus == "belum_tebus"){
var urlroute = '{{ route("penebusan.khazanah", ":id") }}';
urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
if(gadai_detail['taglel'] == 1){
var taglel = 'Akan Dilelong';
}else{
var taglel = '';
}
if(gadai_detail["bakihargajualan"] == null){
xtawarruq.row.add([
'<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>',
@@ -515,7 +522,8 @@
gadai_detail['t_matang'],
'RM '+formatter.format(gadai_detail['pinjaman']),
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
gadai_detail['tempoh']
gadai_detail['tempoh'],
taglel
]).draw();
}else{
if(gadai_detail['lelong_tawarruq'] == 0){
@@ -532,7 +540,8 @@
'RM '+formatter.format(gadai_detail['bakipjm']),
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
gadai_detail['tempoh'],
'RM '+ upahsemasa
'RM '+ upahsemasa,
taglel
]).draw();
}
}else if(jenistebus == "sudah_tebus"){
@@ -0,0 +1,81 @@
@extends('layouts.app')
@section('content')
<div class="container">
<div class="row">
<div class="col-md-12">
<div class="card">
<nav aria-label="breadcrumb">
<ol class="breadcrumb pb-3">
<li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
<li class="breadcrumb-item"><a href="{{ route('laporan') }}">Laporan</a></li>
<li class="breadcrumb-item active" aria-current="page">Imbang Duga Akru</li>
</ol>
</nav>
<div class="card-body text-center">
@if(session()->has('error'))
<div class="alert alert-danger">
{{ session()->get('error') }}
</div>
@endif
<div class="row form-group">
<div class="col-md-2"></div>
<div class="col-md-15"></div>
</div>
<div class="container">
<form method="post" onsubmit="loadingmodal()">
@csrf
<div class="row">
<div class="col-sm-2">Tarikh</div>
<div class="col-sm-4"><input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker2" name="datetimepicker2" autocomplete="off" aria-describedby="basic-addon1"></div>
</div>
<br>
<div class="row">
<div class="col-sm-3"></div>
<div class="col-sm-1"> <input type="submit" class="btn btn-success ml-md-1" id="submit_button" name="submit_button" value="Cetak Laporan " formaction="{{route('imbangdugaakru.cetak')}}"></div>
</div>
</form>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<script type="text/javascript">
var api_url = "<?php echo $api_url ?>";
var kodcaw = "<?php echo $cawangan_info['kodcaw'] ?>";
$(document).ready( function () {
var dateToday = new Date();
$('#datetimepicker2').datepicker({
format: 'dd-mm-yyyy',
});
$('#datetimepicker2').datepicker('setStartDate', new Date(2022,11,19));
$('#datetimepicker2').datepicker('setEndDate', new Date());
});
function loadingmodal()
{
Swal.fire({
title: 'Memuatkan...',
allowEscapeKey : false,
allowOutsideClick: false,
didOpen: function () {
Swal.showLoading()
}
});
}
</script>
@endsection
@@ -111,6 +111,9 @@
{{-- <div class="row">
<a href="{{ route('laporan.auditcustomer') }}" class="btn btn-dark btn-lg btn-block mb-3">Audit Customer</a>
</div> --}}
<div class="row">
<a href="{{ route('laporan.imbangdugaakru') }}" class="btn btn-dark btn-lg btn-block mb-3">Imbang Duga Akru</a>
</div>
</div>
</div>
</div>
+1 -1
View File
@@ -550,7 +550,7 @@ function ubahwakil(e)
}
let batchno = $('#batch').val();let teller = "{{ Auth::user()->name }}";let bakipjm = $('#pembiayaan').val().replace(/[^0-9.-]+/g,"");let bakiupah = $('#keuntungan').val();
let batchno = $('#batch').val();let teller = "{{ Auth::user()->name }}";let bakipjm = $('#pembiayaan').val().replace(/[^0-9.-]+/g,"");let bakiupah = $('#keuntungan').val().replace(/[^0-9.-]+/g,"");
let cajlain = 0.00; let cajlelong = $('#cajlelong').val();
let jumlah = $('#jumlah').val().replace(/[^0-9.-]+/g,"");let hargajual = $('#hargajual').val().replace(/[^0-9.-]+/g,"");
@@ -128,7 +128,7 @@
@else
@php
$cawangan_staff = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $staff->cawangan)->json();
echo ucwords($cawangan_staff['details_caw']);
echo ($cawangan_staff) ? ucwords($cawangan_staff['details_caw']) : 'test';
@endphp
@endif
</td>
@@ -136,16 +136,18 @@
@if($auth_user->roles == 'operasi')
<a href="{{ route('kakitangan.tukartaraf',['id'=>$staff->id]) }}" class="btn btn-warning" title="Tukar Taraf"><i class="material-icons">edit</i></a>
<a href="{{ route('kakitangan.tukarcawangan',['id'=>$staff->id]) }}" class="btn btn-info" title="Tukar Cawangan"><i class="material-icons">work</i></a>
<a href="{{ route('operasi.kakitangan.edit',['id'=>$staff->id]) }}" class="btn btn-success" title="Edit Maklumat"><i class="material-icons">settings</i></a>
<button type="button" class="btn btn-danger btn-delete" data-roles="{{ $auth_user->roles }}" data-staff-id="{{ $staff->id }}" data-token="{{ csrf_token() }}" title="Delete Kakitangan"><i class="material-icons">delete</i></button>
@elseif($auth_user->roles == 'admin')
<form method="post" action="{{ route('admin.kakitangan.delete') }}">
{{ @csrf_field() }}
{{-- <form method="post" action="{{ route('admin.kakitangan.delete') }}">
{{ @csrf_field() }} --}}
<input type="hidden" name="staff_id" value="{{ $staff->id }}"/>
<a href="{{ route('admin.kakitangan.tukartaraf',['id'=>$staff->id]) }}" class="btn btn-warning" title="Tukar Taraf"><i class="material-icons">edit</i></a>
<a href="{{ route('admin.kakitangan.tukarcawangan',['id'=>$staff->id]) }}" class="btn btn-info" title="Tukar Cawangan"><i class="material-icons">work</i></a>
<a href="{{ route('admin.kakitangan.edit',['id'=>$staff->id]) }}" class="btn btn-success" title="Edit Maklumat"><i class="material-icons">settings</i></a>
<a href="{{ route('admin.kakitangan.resetcredentials',['id'=>$staff->id]) }}" class="btn btn-primary" title="Reset Password"><i class="material-icons">restore</i></a>
<button type="button" class="btn btn-danger btn-delete" data-staff-id="{{ $staff->id }}" data-token="{{ csrf_token() }}" title="Delete Kakitangan"><i class="material-icons">delete</i></button>
</form>
{{-- </form> --}}
@endif
</td>
</tr>
@@ -165,20 +167,57 @@
var tablerekod = $('#rekod_kakitangan').DataTable();
$('.btn-delete').on('click', function(){
var form = $(this).closest('form');
Swal.fire(
{
title: 'Are you sure?',
text: "You won't be able to revert this!",
// var form = $(this).closest('form');
var roles = $(this).data('roles');
var staff_id = $(this).data('staff-id');
var url_redirected = (roles == 'operasi') ? "{{ route('operasi.kakitangan.delete') }}" : "{{ route('admin.kakitangan.delete') }}";
Swal.fire({
title: 'Padam Kakitangan Ini?',
text: "Anda tidak boleh mengembalikan data ini balik selepas dipadamkan!",
type: 'warning',
showCancelButton: true,
confirmButtonClass: 'btn btn-danger',
cancelButtonClass: 'btn btn-warning',
confirmButtonText: 'Yes, delete it!',
confirmButtonText: 'Padam!',
cancelButtonText: 'Batal!',
buttonsStyling: false
}
).then(function() {
form.submit();
}).then(function(result) {
if (result.isConfirmed) {
$.ajax({
method:'post',
url: url_redirected,
data: {
"_token": "{{ csrf_token() }}",
"staff_id" : staff_id
},
success:function(data){
if(data == 'success')
{
if(roles == 'operasi')
window.location.href = "{{ route('daftar.kakitangan') }}";
else
window.location.href = "{{ route('admin.daftar.kakitangan') }}";
Swal.fire({
title: 'Memuatkan...',
allowEscapeKey : false,
allowOutsideClick: false,
didOpen: function () {
Swal.showLoading();
}
});
}
},
error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
}
});
}
}).catch(swal.noop)
});
@@ -9,13 +9,13 @@
<nav aria-label="breadcrumb">
<ol class="breadcrumb pb-3">
<li class="breadcrumb-item"><a href="{{ url('/') }}">Home</a></li>
<li class="breadcrumb-item" aria-current="page"><a href="{{ route('admin.daftar.kakitangan') }}">Kakitangan</a></li>
<li class="breadcrumb-item" aria-current="page"><a href="{{ (Auth::user()->roles == 'admin') ? route('admin.daftar.kakitangan') : route('daftar.kakitangan') }}">Kakitangan</a></li>
<li class="breadcrumb-item active" aria-current="page">Edit Maklumat Kakitangan</li>
</ol>
</nav>
<div class="card-body text-center">
<form action="{{ route('admin.kakitangan.edit.store') }}" method="post">
<form action="{{ (Auth::user()->roles == 'admin') ? route('admin.kakitangan.edit.store') : route('operasi.kakitangan.edit.store') }}" method="post">
@csrf
<input type="hidden" name='user_id' id='user_id' readonly value="{{ $user->id }}" class='form-control'>
<div class='row form-group'>
@@ -0,0 +1,486 @@
<html>
<head>
<script src="{{ asset('js/jquery.min.js') }}"></script>
<style>
#header {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 100%;
}
#header td, #customers th {
padding:4px;
font-size:12px;
}
#header tr:nth-child(even){background-color: #ffffff;}
#header tr:hover {background-color: #ddd;}
#header th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
#loading {
position: fixed;
display: block;
width: 100%;
height: 100%;
top: 0;
left: 0;
text-align: center;
opacity: 0.7;
background-color: #fff;
z-index: 99;
}
#loading-image {
position: absolute;
top: 100px;
left: 240px;
z-index: 100;
}
#scan {
font-family: Arial, Helvetica, sans-serif;
width: 100%;
border: 1px solid #ddd;
}
#scan td, #scan th {
padding: 8px;
font-size:20px;
}
#scan tr:nth-child(even){background-color: #ffffff;}
#scan tr:hover {background-color: #ddd;}
#scan th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
#scan {
font-family: Arial, Helvetica, sans-serif;
width: 100%;
}
#scan td, #scan th {
padding: 8px;
font-size:12px;
}
#scan tr:nth-child(even){background-color: #ffffff;}
#scan tr:hover {background-color: #ddd;}
#scan th {
border-collapse: collapse;
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
#details {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 50%;
}
#details td, #details th {
padding: 8px;
font-size:16px;
}
#details tr:nth-child(even){background-color: #ffffff;}
#details tr:hover {background-color: #ffffff;}
#details th {
padding-top: 12px;
font-style:bold;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
#sign {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 100%;
}
#sign td, #sign th {
padding: 8px;
font-size:11px;
text-align: center;
}
#sign tr:nth-child(even){background-color: #ffffff;}
#sign tr:hover {background-color: #ddd;}
#sign th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
#title {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 50%;
}
#title td, #title th {
padding:4px;
font-size:12px;
border: 0px solid #fff;
}
#title tr:nth-child(even){background-color: #ffffff;}
#title tr:hover {background-color: #ddd;}
#title th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
#details {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width:80%;
}
#details td, #details th {
padding:4px;
font-size:16px;
border: 1px solid #ddd;
}
#details tr:nth-child(even){background-color: #ffffff;}
#details tr:hover {background-color: #ddd;}
#details th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
#tarikh_cetak {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 50%;
}
#tarikh_cetak td, #tarikh_cetak th {
padding:4px;
font-size:10px;
}
#tarikh_cetak tr:nth-child(even){background-color: #ffffff;}
#tarikh_cetak tr:hover {background-color: #ddd;}
#tarikh_cetak th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
#data {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 80%;
}
#data td, #data th {
padding:4px;
font-size:16px;
}
#data tr:nth-child(even){background-color: #ffffff;}
#data tr:hover {background-color: #ddd;}
#data th {
padding-top: 11px;
padding-bottom: 11px;
text-align: left;
padding:4px;
color:black;
font-size:14px;
}
#tarikh_ib {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width:45%;
}
#tarikh_ib td, #tarikh_ib th {
padding:4px;
font-size:12px;
}
#tarikh_ib tr:nth-child(even){background-color: #ffffff;}
#tarikh_ib tr:hover {background-color: #ddd;}
#tarikh_ib th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
#GL {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width:100%;
}
#GL td, #GL th {
padding:4px;
font-size:12px;
border: 1px solid #ddd;
}
#GL tr:nth-child(even){background-color: #ffffff;}
#GL tr:hover {background-color: #ddd;}
#GL th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
#GL_dtl {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width:100%;
}
#GL_dtl td, #GL_dtl th {
padding:4px;
font-size:12px;
border: 1px solid #ddd;
}
#GL_dtl tr:nth-child(even){background-color: #ffffff;}
#GL_dtl tr:hover {background-color: #ddd;}
#GL_dtl th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
#dtl_ib {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width:100%;
}
#dtl_ib td, #dtl_ib th {
padding:4px;
font-size:12px;
border: 1px solid #ddd;
}
#dtl_ib tr:nth-child(even){background-color: #ffffff;}
#dtl_ib tr:hover {background-color: #ddd;}
#dtl_ib th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
#total_harta {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width:100%;
}
#total_harta td, #total_harta th {
padding:4px;
font-size:12px;
border: 1px solid #ddd;
}
#total_harta tr:nth-child(even){background-color: #ffffff;}
#total_harta tr:hover {background-color: #ddd;}
#total_harta th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
</style>
</head>
<body>
<table id="header">
<tr>
<th rowspan="4" style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th>
<th colspan="1">KOPERASI PERMODALAN KELANTAN BERHAD</th>
</tr>
<tr>
<td>{{ $cawangan_detail['namacaw'] }}</td>
<td></td>
</tr>
<tr>
<td>{{ $cawangan_detail['alamat1'] }}</td>
<td></td>
</tr>
<tr>
<td>{{ $cawangan_detail['alamat2'].' No Tel : '. $cawangan_detail['notel'].' No Faks : '. $cawangan_detail['nofaks'] }}</td>
<td></td>
</tr>
</table>
<br>
<table id="tarikh_ib">
<tr>
<td cospan="2" > <B><U>LAPORAN IMBANGAN DUGA CAWANGAN</U></B></td>
</tr>
</table>
<table id="tarikh_ib">
<tr><td style="width:10px" ><b>Tarikh Laporan</b></td ><td style="width:20px"> {{ ($tarikh_imbangan2) ? $tarikh_imbangan2 : ''}} </td><td style="width:18px" ><b>Tarikh Cetak</b></td><td style="width:25px" > {{$tarikh_cetak}} </td> </tr>
</table>
<br>
<table id="GL_dtl">
<tr>
<th width="20%"> Kod GL </th>
<th colspan="1" width="60%">Keterangan </th>
<th width="20%">Amaun</th>
</tr>
<tr>
<th colspan="3"><b> HARTA SEMASA</b> </th>
</tr>
@foreach($hartasemasa as $index => $assets)
@if($assets->amaun != 0)
<tr>
<td>{{ $assets->glcode }}</td>
<td>{{ $assets->descpt }}</td>
<td>{{ number_format($assets->amaun,2) }}</td>
</tr>
@endif
@endforeach
<tr>
<td><b>JUMLAH </b></td>
<td colspan="1"></td>
<td><b>{{ number_format($totalhartasemasa,2) }}</b></td>
</tr>
</table>
<br>
<table id="GL_dtl">
<tr>
<th colspan="3"><b> TANGGUNGAN SEMASA</b> </th>
</tr>
@foreach($tanggungansemasa as $index => $liabilities)
@if($liabilities->amaun != 0)
<tr>
<td width="20%">{{ $liabilities->glcode }}</td>
<td colspan="1" width="60%">{{ $liabilities->descpt }}</td>
<td width="20%">{{ number_format($liabilities->amaun,2) }}</td>
</tr>
@endif
@endforeach
<tr>
<td ><b>JUMLAH </b></td>
<td colspan="1"></td>
<td><b>{{ number_format($totaltanggungansemasa,2) }}</b></td>
</tr>
</table>
<br>
<br>
<br>
</body>
</html>