KoPKB/kaunter
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

fix skit

Browse Source
This commit is contained in:
hafifierahman
2022-04-03 09:57:15 +08:00
parent 1b5aeeaf11
commit 6ccfa59d8d
7 changed files with 208 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/CawanganAR.php
+18
View File
@@ -0,0 +1,18 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class CawanganAR extends Model
{
protected $table = 'cawangan';
protected $fillable = [
'details_caw',
'kodcaw',
'syarikat',
'min',
'max'
];
}
app/Events/NotifikasiPetiBesi.php
+32
View File
@@ -0,0 +1,32 @@
<?php
namespace App\Events;
use Illuminate\Queue\SerializesModels;
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Broadcasting\InteractsWithSockets;
use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
class NotifikasiPetiBesi implements ShouldBroadcast
{
use Dispatchable, InteractsWithSockets, SerializesModels;
public $cawangan,$status,$bakipetibesi;
public function __construct($cawangan,$status,$bakipetibesi)
{
$this->cawangan = $cawangan;
$this->status = $status;
$this->bakipetibesi = $bakipetibesi;
}
public function broadcastOn()
{
return ['notice-notify'];
}
public function broadcastAs()
{
return 'trigger-notify';
}
}
app/Http/Controllers/KhazanahController.php
+17 -20
View File
@@ -10,9 +10,11 @@ use App\Events\PendahuluanSerahan;
use App\Events\NotifikasiKelulusan;
use App\Events\NotifikasiUbahHapus;
use App\Events\NotifikasiAGH;
use App\Events\NotifikasiPetiBesi;
use App\User;
use App\Cawangan;
use App\CawanganAR;
use App\Lejeram;
use Illuminate\Http\Request;
@@ -3492,29 +3494,17 @@ class KhazanahController extends Controller
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
//Peti Besi Cawangan
// $getVault=Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url').'/api/TunaiDiTangan/'.$auth_user['cawangan'])->json();
$getVault = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/TunaiDiTangan/' . $auth_user['cawangan'],['tarikh' => $tarikhsemasa])->json();
// if(sizeof($getVault) == 0)
// {
// $peti_besi_terkini=Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/daftarVault/'.$auth_user['cawangan'])->json();
// $getVault = $peti_besi_terkini['bakiakhir'];
// }else{
// $getVault = $getVault[0]['bakiakhir'];
// }
//Dashboardall
$dashboard=Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url').'/api/Dashboard_all/'.$auth_user['cawangan'])->json();
$permohonan = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url').'/admin/permohonan/get/'.$auth_user['cawangan'])->json();
$bank = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url').'/api/bank')->json();
return view('khazanah.permohonanwang', compact('cawangan_info','api_url','getVault','tarikhsemasa','dashboard','permohonan'));
return view('khazanah.permohonanwang', compact('bank','cawangan_info','api_url','getVault','tarikhsemasa','dashboard','permohonan'));
}
public function RekodPermohonan()
@@ -3574,16 +3564,23 @@ class KhazanahController extends Controller
$auth_user = Auth::user();
$api_url = config('api.url');
//Peti Besi Cawangan
$getVault=Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json();
$current = Carbon::now();
$tarikhsemasa = $current->toDateString();
$cawangan = CawanganAR::where('kodcaw','KB2')->get()->toArray();
$getVault = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/TunaiDiTangan/' . 'KB2',['tarikh' => $tarikhsemasa])->json();
if(sizeof($getVault) == 0)
if(floatval($getVault) > $cawangan[0]['max'])
{
$peti_besi_terkini=Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/daftarVault/'.$auth_user['cawangan'])->json();
$getVault = $peti_besi_terkini['bakiakhir'];
session(['status' => 'max']);
event(new NotifikasiPetiBesi('KB2','max',$getVault));
}else if(floatval($getVault) < $cawangan[0]['min'])
{
session(['status' => 'min']);
event(new NotifikasiPetiBesi('KB2','min',$getVault));
}else{
$getVault = $getVault[0]['bakiakhir'];
echo 'tiada';
}
}
resources/views/homepage/khazanah/home.blade.php
-42
View File
@@ -153,35 +153,8 @@
</div>
</div>
<div class="notify-petibesi max">
<div class="toast-content max">
<i class="fas fa-exclamation check"></i>
<div class="message">
<span class="text text-1">Baki Maksimum</span>
<span class="text text-2">Baki peti besi melebihi RM 150,000.00</span>
</div>
<i class="fas fa-times close"></i>
<div class="progress"></div>
</div>
</div>
{{-- <div class="notify-petibesi min">
<div class="toast-content min">
<i class="fas fa-exclamation check"></i>
<div class="message">
<span class="text text-1">Baki Minimum</span>
<span class="text text-2">Baki peti besi melebihi RM 150,000.00</span>
</div>
<i class="fas fa-times close"></i>
<div class="progress"></div>
</div>
</div> --}}
<div class="container">
<button id="showbutton">Click</button>
<div class="row justify-content-center" style="margin-top:60px;">
<div class="col-md-12">
@@ -780,20 +753,5 @@
}
// function clickedbutton(){
// const button = $('#show').val();
// }
$("#showbutton").click(function(){
// alert("The paragraph was clicked.");
$(".notify-petibesi").addClass("active");
});
$(".close").click(function(){
// alert("The paragraph was clicked.");
$(".notify-petibesi").removeClass("active");
});
</script>
@endsection
resources/views/khazanah/permohonanwang.blade.php
+51 -1
View File
@@ -71,7 +71,11 @@
if($mohon['tagdeposit'] === 1)
{
echo '<button data-mohonid="' . $mohon["mohonid"] . '" id="btnterima" class="btn btn-success"><i class="fas fa-check"></i></button>';
}else{
}else if(($mohon['tagcit'] === 0 && $mohon['jenismohon'] === 'bayaranbalik'))
{
echo '<button data-mohonid="' . $mohon["mohonid"] . '" id="btncit" class="btn btn-secondary">CIT</button>';
}
else{
echo '<span class="p-2 badge badge-info">DALAM PROSES</span>';
}
@endphp
@@ -184,5 +188,51 @@
});
});
$(document).on('click', '#btncit', function(e) {
let mid = $(this).data("mohonid");
var bank = @php echo json_encode($bank) @endphp;
var options = {};
$.map(bank,
function(o) {
options[o.abbreviation] = o.name;
});
Swal.fire({
title: 'BANK CIT',
text: 'Sila Pilih Bank',
input: 'select',
inputOptions: options,
showCancelButton: true,
animation: 'slide-from-top',
inputPlaceholder: 'Sila Pilih Bank',
allowOutsideClick: false
}).then(function (result) {
if (result) {
if (result.isConfirmed) {
$.ajax({
method:"put",
url: api_url + '/admin/permohonan/tagcit',
data: {
"mohonid" : mid,
"bank" : result.value
},
success:function(data)
{
if(data === 1)
Swal.fire('Diterima!', '', 'success')
}
});
}else{
}
}
});
});
</script>
@endsection
resources/views/khazanah/status.blade.php
+62 -56
View File
@@ -166,102 +166,106 @@
<!-- Add class 'active' to progress -->
<div class="row d-flex justify-center">
<div class="col-12">
<ul id="progressbar" class="text-center flex">
<li class="{{ ($permohonan['tarikh_permohonan'] !== null) ? 'active' : '' }} step0 col-2"></li>
<li class="{{ ($permohonan['tagoperasi'] === 1) ? 'active' : '' }} step0 col-2"></li>
<li class="{{ ($permohonan['tagakaun'] === 1) ? 'active' : '' }} step0 col-2"></li>
<li class="{{ ($permohonan['tagpb'] === 1) ? 'active' : '' }} step0 col-2"></li>
<li class="{{ ($permohonan['tagdeposit'] === 1) ? 'active' : '' }} step0 col-2"></li>
<li class="{{ ($permohonan['tagterima'] === 1) ? 'active' : '' }} step0 col-2"></li>
</ul>
</div>
</div>
<div class="d-flex col-12">
<div class="text-center icon-content col-2"> <img class="icon mx-auto" src="{{ asset('img/proposal.png') }}">
<div class="flex flex-column">
<p class="font-weight-bold text-center">Permohonan <br>Cawangan</p>
@if($permohonan['jenismohon'] == 'permohonanwang')
<div class="row d-flex justify-center">
<div class="col-12">
<ul id="progressbar" class="text-center flex">
<li class="{{ ($permohonan['tarikh_permohonan'] !== null) ? 'active' : '' }} step0 col-2"></li>
<li class="{{ ($permohonan['tagoperasi'] === 1) ? 'active' : '' }} step0 col-2"></li>
<li class="{{ ($permohonan['tagakaun'] === 1) ? 'active' : '' }} step0 col-2"></li>
<li class="{{ ($permohonan['tagpb'] === 1) ? 'active' : '' }} step0 col-2"></li>
<li class="{{ ($permohonan['tagdeposit'] === 1) ? 'active' : '' }} step0 col-2"></li>
<li class="{{ ($permohonan['tagterima'] === 1) ? 'active' : '' }} step0 col-2"></li>
</ul>
</div>
</div>
@else
<div class="row d-flex justify-content-center">
<div class="col-12">
<ul id="progressbar" class="text-center flex">
<li class="{{ ($permohonan['tarikh_permohonan'] !== null) ? 'active' : '' }} step0 col-4"></li>
<li class="{{ ($permohonan['tagcit'] === 1) ? 'active' : '' }} step0 col-4"></li>
<li class="{{ ($permohonan['tagoperasi'] === 1) ? 'active' : '' }} step0 col-4"></li>
<li class="{{ ($permohonan['tagakaun'] === 1) ? 'active' : '' }} step0 col-4"></li>
</ul>
</div>
</div>
@endif
@if($permohonan['jenismohon'] == 'permohonanwang')
<div class="d-flex col-12">
<div class="text-center icon-content col-2"> <img class="icon mx-auto" src="{{ asset('img/proposal.png') }}">
<div class="flex flex-column">
<p class="font-weight-bold text-center">Permohonan <br>Cawangan</p>
</div>
</div>
<div class="justify-center text-center icon-content col-2"> <img class="icon mx-auto" src="{{ asset('img/operasicek.png') }}">
<div class="flex flex-column">
<p class="font-weight-bold text-center">Pengesahan<br>Operasi</p>
{!! ($permohonan['tagoperasi'] === 2) ? '<img class="icon position-absolute" style="top:0;left:20;" src=' . asset('img/batal.png') .'>' : '' !!}
</div>
</div>
<div class="flex flex-col text-center icon-content col-2"> <img class="icon mx-auto" src="{{ asset('img/operasicek.png') }}">
<div class="d-flex flex-column">
<p class="font-weight-bold text-center">Akaun</p>
{!! ($permohonan['tagakaun'] === 2) ? '<img class="icon position-absolute" style="top:0;left:20;" src=' . asset('img/batal.png') .'>' : '' !!}
</div>
</div>
<div class="flex flex-col text-center icon-content col-2"> <img class="icon mx-auto" src="{{ asset('img/leaderapproval.png') }}">
<div class="d-flex flex-column">
<p class="font-weight-bold text-center">Kelulusan <br>Pengurus Besar</p>
{!! ($permohonan['tagpb'] === 2) ? '<img class="icon position-absolute" style="top:0;left:20;" src=' . asset('img/batal.png') .'>' : '' !!}
</div>
</div>
<div class="flex flex-col text-center icon-content col-2"> <img class="icon mx-auto" src="{{ asset('img/chequetick.png') }}">
<div class="d-flex flex-column">
<p class="font-weight-bold text-center">Akaun <br> Deposit Ke Bank <br>Selesai</p>
{!! ($permohonan['tagdeposit'] === 2) ? '<img class="icon position-absolute" style="top:0;left:20;" src=' . asset('img/batal.png') .'>' : '' !!}
</div>
</div>
<div class="flex flex-col text-center icon-content col-2"> <img class="icon mx-auto" src="{{ asset('img/money.png') }}">
<div class="d-flex flex-column">
<p class="font-weight-bold text-center">Cawangan<br> Terima Wang</p>
</div>
</div>
</div>
@else
<div class="d-flex col-12 mx-auto justify-content-center">
<div class="text-center icon-content col-2"> <img class="icon mx-auto" src="{{ asset('img/proposal.png') }}">
<div class="flex flex-column">
<p class="font-weight-bold text-center">Permohonan <br>Cawangan</p>
</div>
</div>
<div class="justify-center text-center icon-content col-2"> <img class="icon mx-auto" src="{{ asset('img/operasicek.png') }}">
<div class="flex flex-column">
<p class="font-weight-bold text-center">CIT Selesai Deposit ke Bank</p>
</div>
</div>
<div class="justify-center text-center icon-content col-2"> <img class="icon mx-auto" src="{{ asset('img/operasicek.png') }}">
<div class="flex flex-column">
<p class="font-weight-bold text-center">Pengesahan<br>Operasi</p>
</div>
</div>
<div class="flex flex-col text-center icon-content col-2"> <img class="icon mx-auto" src="{{ asset('img/operasicek.png') }}">
<div class="d-flex flex-column">
<p class="font-weight-bold text-center">Akaun</p>
</div>
</div>
</div>
@endif
<table class="table table-striped">
<thead class="thead-dark">
<tr>
@@ -294,6 +298,8 @@
break;
case 7: echo $desc['description'];
break;
case 8: echo $desc['description'] . '<br>' . 'JENIS BANK :' . $desc[0]['jenisbank'];
break;
}
resources/views/layouts/app.blade.php
+28 -96
View File
@@ -74,101 +74,6 @@
flex-direction: column;
align-items: flex-start !important;
}
.notify-petibesi.max{
position: absolute;
bottom:50px;
right: 30px;
border-radius:12px;
background: #fff;
padding: 20px 35px 20px 25px;
box-shadow:0 5px 10px rgba(0,0,0,0.1);
border-left: 6px solid #e67e22;
z-index:1;
display:none;
-webkit-transition: opacity 600ms, visibility 600ms;
transition: opacity 600ms, visibility 600ms;
}
.notify-petibesi.min{
position: absolute;
bottom:50px;
right: 30px;
border-radius:12px;
background: #fff;
padding: 20px 35px 20px 25px;
box-shadow:0 5px 10px rgba(0,0,0,0.1);
border-left: 6px solid #e74c3c;
z-index:1;
display:none;
-webkit-transition: opacity 600ms, visibility 600ms;
transition: opacity 600ms, visibility 600ms;
}
.notify-petibesi.active{
display:block;
}
.notify-petibesi .toast-content{
display:flex;
align-items:center;
}
.toast-content .message{
display:flex;
flex-direction: column;
margin: 0 20px;
}
.toast-content.max .check{
display:flex;
align-items:center;
justify-content:center;
height:35px;
width:35px;
background-color:#e67e22;
color:#fff;
font-size:20px;
border-radius:50%;
}
.toast-content.min .check{
display:flex;
align-items:center;
justify-content:center;
height:35px;
width:35px;
background-color:#e74c3c;
color:#fff;
font-size:20px;
border-radius:50%;
}
.message .text{
font-size:20px;
font-weight:400;
color:#666666;
}
.message .text.text-1{
font-weight:600;
color:#333;
}
.notify-petibesi .close{
position:absolute;
top:10px;
right:15px;
padding:5px;
cursor:pointer;
opacity:0.7;
}
.notify-petibesi .close:hover{
opacity:1;
}
</style>
</head>
@@ -282,6 +187,26 @@
});
var channel2 = pusher.subscribe('notice-notify');
channel2.bind('trigger-notify', function(data) {
if(cawangankhazanah == data.cawangan)
{
if(data.status == 'max')
{
$("#notify-maksimum").removeClass("d-none");
$("#notify-maksimum").addClass("d-block");
$("#value-maksimum").text('RM ' + data.bakipetibesi);
}
if(data.status == 'min')
{
$("#notify-minimum").removeClass("d-none");
$("#notify-minimum").addClass("d-block");
$("#value-minimum").text('RM ' + data.bakipetibesi);
}
}
});
$("#navbarDropdown").click(function(){
$('#bell').css("color", "grey");
@@ -407,12 +332,19 @@
</nav>
{{-- {{ dd(session()->has('status')) }} --}}
<div id="notify-maksimum" style="z-index: 1" class="alert {!! (session()->has('status')) ? (session()->get('status') == 'max') ? 'd-block' : 'd-none' : 'd-none' !!} alert-warning sticky-top text-center" role="alert">
Baki peti besi anda sekarang adalah <b id="value-maksimum"></b> dan melebihi had maksimum peti besi. Sila buat permohonan bayaran balik segera!
</div>
<div id="notify-minimum" style="z-index: 1" class="alert {!! (session()->has('status')) ? (session()->get('status') == 'min') ? 'd-block' : 'd-none' : 'd-none' !!} alert-danger sticky-top text-center" role="alert">
Baki peti besi anda sekarang adalah <b id="value-minimum"></b> dan melebihi had minimum peti besi. Sila buat permohonan wang segera!
</div>
<main class="py-4">
@yield('content')
</main>
</div>
@yield('footer')
</body>
</html>