KoPKB/erahn-click
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'first' of https://gitlab.com/online-sistem1/arrahn-portal into first

Browse Source
This commit is contained in:
hafifierahman
2021-10-31 10:04:41 +08:00
parent d2ca73df65 d724a323eb
commit 7cd9fc6572
9 changed files with 373 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/SemakController.php
+25 -4
View File
@@ -41,11 +41,11 @@ class SemakController extends Controller
return view('semak.senaraisag', compact('belum_tebus','sudah_tebus'));
}
public function PenyataSummary($norujukan)
public function PenyataSummary($kodcaw,$norujukan)
{
$api_url = config('api.url');
$cawangan=Http::get(config('api.url').'/api/cawangan/detail/'. 'KB2')->json();
$cawangan=Http::get(config('api.url').'/api/cawangan/detail/'. $kodcaw)->json();
$cawangan_detail=$cawangan[0];
$auth_user = Auth::user();
@@ -64,11 +64,32 @@ class SemakController extends Controller
return view('penyata.summary',compact('cawangan_detail','transaction','customer','gadai','api_url'));
}
public function Penyata($norujukan)
public function PenyataSummaryUpah($kodcaw,$norujukan)
{
$api_url = config('api.url');
$cawangan=Http::get(config('api.url').'/api/cawangan/detail/'. 'KB2')->json();
$cawangan=Http::get(config('api.url').'/api/cawangan/detail/'. $kodcaw)->json();
$cawangan_detail=$cawangan[0];
$auth_user = Auth::user();
$customer = Http::get(config('api.url'). '/api/customers/'.$auth_user['icno'])->json();
$gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $norujukan)->json();
if(sizeof($gadai) != 0)
$gadai = $gadai[0];
$upah = Http::get(config('api.url').'/portal/transaksipelanggan/upah',['norujukan' => $norujukan,'kodcaw' => $kodcaw])->json();
return view('penyata.summaryupah',compact('cawangan_detail','upah','customer','gadai','api_url'));
}
public function Penyata($kodcaw,$norujukan)
{
$api_url = config('api.url');
$cawangan=Http::get(config('api.url').'/api/cawangan/detail/'. $kodcaw)->json();
$cawangan_detail=$cawangan[0];
$auth_user = Auth::user();
public/argon/login/logo_arrahn_baru.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 MiB

After

Width:  |  Height:  |  Size: 891 KiB

resources/views/layouts/app.blade.php
+33 -2
View File
@@ -53,8 +53,8 @@
.login-logo{
margin-top:50px;
width:200px;
height:200px;
width:50%;
height:50%;
}
@media (max-width: 1023px) {
@@ -69,6 +69,37 @@
}
}
.form-styling {
width: 100%;
height: 50px;
padding-left: 15px;
border: grey solid 2px;
border-radius: 35px;
margin-bottom: 20px;
background: rgba(255,255,255,.2);
}
.labelcool {
font-weight: 600;
text-transform: uppercase;
font-size: 13px;
padding-left: 10px;
/* padding-bottom: 10px; */
/* color: rgba(255,255,255,.7); */
text-align: left;
color:black;
display: block;
}
.buttonberjaya {
border-radius: 20px;
height: 50px;
background-color:#009432;
color:white;
font-weight: bold;
border-color: #357ebd !important;
}
/* .btn-primary {
color: #fff !important;
background-color: #282460 !important;
resources/views/pembayaran/checkout.blade.php
+24 -2
View File
@@ -330,7 +330,7 @@
let bayar = Number(this.value);
let errorlebih = nm - (nm * 0.01);
let errorlebih = nm - (nm * 0.1);
if(bayar > parseFloat(errorlebih)){
$("#bayarsbmt").prop('disabled', false);
@@ -345,6 +345,17 @@
return false;
}
if(bayar <= 0){
$("#bayarsbmt").prop('disabled', true);
Swal.fire(
'Amaran!',
'Bayaran tidak boleh ditinggalkan kosong!',
'error'
)
}else{
$("#bayarsbmt").prop('disabled', false);
}
$(this).closest('tr').find('.bayaran').val(this.value);
calculateall(jenis);
});
@@ -358,7 +369,7 @@
let bayar = Number(this.value);
let errorlebih = (bakipinjam - (nm * 0.01));
let errorlebih = (bakipinjam - (nm * 0.1));
if(bayar > parseFloat(errorlebih)){
$("#bayarsbmt").prop('disabled', false);
@@ -373,6 +384,17 @@
return false;
}
if(bayar <= 0){
$("#bayarsbmt").prop('disabled', true);
Swal.fire(
'Amaran!',
'Bayaran tidak boleh ditinggalkan kosong!',
'error'
)
}else{
$("#bayarsbmt").prop('disabled', false);
}
$(this).closest('tr').find('.bayaran').val(this.value);
calculateall(jenis);
});
resources/views/pembayaran/senaraibayaran.blade.php
+7 -5
View File
@@ -92,8 +92,9 @@
@if($bt['hargajualan'] == '')
@php
$koskeuntungan = Http::get(config('api.url') . '/api/upahbukantawarruq/' . $bt['kodcaw'] . '/' . $bt['norujukan'])->json();
$searchonline = Http::get(config('api.url') . '/portal/searchsagonline/',['norujukan' => $bt['norujukan']])->json();
@endphp
<tr>
<tr {{ ($searchonline) ? 'style=background-color:#81ecec;' : '' }}>
<td scope="row">
<div class="media align-items-center">
<div class="media-body">
@@ -117,7 +118,7 @@
{{ number_format($koskeuntungan,2) }}
</td>
<td>
<input type="checkbox" name="chkboxsag[]" value="{{ $bt['norujukan'] }}" id="sag-{{ $loop->iteration }}" data-norujukan="{{ $bt['norujukan'] }}"/>
<input type="checkbox" name="chkboxsag[]" value="{{ $bt['norujukan'] }}" id="sag-{{ $loop->iteration }}" data-norujukan="{{ $bt['norujukan'] }}" {{ ($searchonline || $koskeuntungan <= 0) ? 'disabled' : '' }}/>
</td>
</tr>
@endif
@@ -144,14 +145,15 @@
<tbody class="list">
@foreach($belum_tebus as $index=>$bt)
@if($bt['hargajualan'] != '')
@php
@php
$searchonline = Http::get(config('api.url') . '/portal/searchsagonline/',['norujukan' => $bt['norujukan']])->json();
$koskeuntungan = Http::get(config('api.url') . '/api/upahtawarruq/' . $bt['kodcaw'] . '/' . $bt['norujukan'])->json();
$keuntungan_1bln = $bt['pinjaman'] * ($bt['kadarupah'] / 100);
$ten_percent = floatval($bt['nilaimarhun']) * 0.1;
$baki_pinjaman = floatval($bt['bakipjm']);
$max_bayaran = $baki_pinjaman - $ten_percent;
@endphp
<tr>
<tr {{ ($searchonline) ? 'style=background-color:#81ecec;' : '' }}>
<th scope="row">
<div class="media align-items-center">
<div class="media-body">
@@ -175,7 +177,7 @@
{{ number_format($koskeuntungan,2) }}
</td>
<td>
<input type="checkbox" name="chkboxsag[]" value="{{ $bt['norujukan'] }}" id="sag-{{ $loop->iteration }}" data-norujukan="{{ $bt['norujukan'] }}"/>
<input type="checkbox" name="chkboxsag[]" value="{{ $bt['norujukan'] }}" id="sag-{{ $loop->iteration }}" data-norujukan="{{ $bt['norujukan'] }}" {{ ($searchonline || $koskeuntungan <= 0) ? 'disabled' : '' }}/>
</td>
</tr>
@endif
resources/views/penyata/summary.blade.php
-41
View File
@@ -275,47 +275,6 @@
</div>
<br>
<hr>
<div>
<form>
<table class="tablebayaran">
<tr>
<th>Norujukan</th>
<th>Pembiayaan</th>
<th>Keuntungan</th>
<th>Bayaran</th>
</tr>
<tr>
<td><input type="checkbox" name="chkboxnorujukan" value="{{ $gad['norujukan'] }}" onclick="funccheck(this)" id="chkboxnr"/>{{ $gad['norujukan'] }}</td>
<td><span>{{ number_format($gad['bakihargajualan'],2) }}</span></td>
<td><span>{{ number_format($gad['bakiupah'],2) }}</span></td>
<td><input type="text" name="txtbayar" readonly/></td>
<td><button type="submit" class="btn-sub" disabled>Bayar</button></td>
</tr>
</table>
</form>
</div>
<script>
function funccheck(e)
{
var check = document.getElementById("chkboxnr").checked;
if(check === true)
{
}else{
console.log('false');
}
}
</script>
</page>
</body>
</html>
resources/views/penyata/summaryupah.blade.php
+266
View File
@@ -0,0 +1,266 @@
<html>
<head>
<style>
.header{
font-size:12px;
font-weight: bold;
margin-left:40px;
}
body {
background: white;
}
page {
background: white;
display: block;
margin: 0 auto;
margin-bottom: 0.5cm;
/* box-shadow: 0 0 0.5cm rgba(0,0,0,0.5); */
}
page[size="A4"] {
width: 21cm;
/* height: 29.7cm; */
}
page[size="A4"][layout="landscape"] {
width: 29.7cm;
height: 21cm;
}
@media print {
body, page {
margin: 0;
box-shadow: 0;
}
}
.middleheader{
text-align: center;
}
.container{
font-family: Arial, Helvetica, sans-serif;
width: 90%;
/* border: 2px solid gray;
border-radius: 15px; */
box-shadow: 0 0 15px rgba(0,0,0,0.5);
/* padding: 50px; */
/* margin: 20px; */
padding-top:10px;
padding: 10px 10px 10px 30px;
margin: 0 auto;
}
#header {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 100%;
margin-left:40px;
}
#header td, #customer th {
padding:4px;
font-size:10px;
}
#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;
}
.statements{
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 95%;
margin: 0 auto;
}
.statements th{
font-size:14px;
background-color: #f9ca24;
border:1px solid gray;
color:black;
padding:4px 10px 4px 10px;
}
.statements td{
border:1px solid gray;
padding:4px 4px 4px 4px;
}
.center{
position: fixed;
left: 0;
bottom: 0;
width: 100%;
color: white;
text-align: center;
}
.btn-sub{
border-radius: 12px;
font-size: 14px;
background-color: #008CBA;
border: none;
color: white;
padding: 10px 10px;
text-align: center;
text-decoration: none;
display: inline-block;
}
.btn-sub:hover{
background-color: #4CAF50; /* Green */
color: white;
cursor: pointer;
}
.btn-sub:disabled{
background-color: #8AA1B1; /* Green */
color: white;
cursor: pointer;
}
.tablebayaran{
margin-left:auto;
margin-right:auto;
border-spacing:10px;
text-align: center;
}
input[type=text] {
width: 70%;
padding: 7px 10px;
margin: 8px 0;
box-sizing: border-box;
}
</style>
</head>
<body>
@php
$mytime = Carbon\Carbon::now()->format('d-m-Y');
@endphp
<page size="A4">
<h6 class="header">SULIT DAN PERSENDIRIAN</h6>
<table id="header">
<tr>
<th rowspan="4" style="width:50px"><br><img src="{{ asset('assets/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>
<div class="container">
<table style="font-size:12px;">
<tr>
<td style="text-align: right;">Nombor KP:</td>
<td>{{ $customer['kpbaru'] }}</td>
</tr>
<tr>
<td style="text-align: right;">Nama :</td>
<td>{{ $customer['nama'] }}</td>
</tr>
<tr>
@php
$poskod = Http::get($api_url . '/api/poskod/' . $customer['poskod'])->json();
$negeri = Http::get($api_url . '/api/negeri/' . $poskod['kodnegeri'])->json();
$daerah = Http::get($api_url . '/api/daerah/' . $poskod['koddaerah'])->json();
@endphp
<td style="text-align: right;vertical-align: top;">Alamat:</td>
<td>{!! strtoupper($customer['alamat1']) . ',<br>' . $customer['poskod'] . ', ' . strtoupper($daerah['namadaerah']) . ', ' . strtoupper($negeri['negeri']) !!}</td>
</tr>
<tr>
<td style="padding-top:30px;">Tarikh Cetak:</td>
<td style="padding-top:30px;">{{ $mytime }}</td>
</tr>
</table>
</div>
<h6 class="middleheader">PENYATA KIRA-KIRA PEMBIAYAAN SURAT AKUAN GADAI</h6>
<div class="container" style="margin-top:15px;">
<table style="font-size:14px;border-spacing: 30px 5px;margin-left:auto;margin-right:auto;">
<tr>
<th colspan="3" style="text-align: left;">TRANSAKSI PELANGGAN</th>
<th style="text-align:right;">UPAH (RM)</th>
<th style="text-align:right;">JUMLAH (RM)</th>
</tr>
@foreach($gadai as $index1=>$gad)
<tr>
<td colspan="2">PERMULAAN PEMBIAYAAN PADA @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $gad['t_gadai']);
$formattedweddingdate = $myDateTime->format('d/m/Y');
echo($formattedweddingdate)
@endphp </td>
<td style="text-align:center;">:</td>
<td style="text-align:right;">-</td>
<td style="text-align:right;">{{ number_format($gad['pinjaman'],2) }}</td>
</tr>
@endforeach
@foreach($upah as $index=>$upahan)
<tr>
<td colspan="2">
@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $upahan['tarikh']);
$formattedweddingdate = $myDateTime->format('d/m/Y');
echo 'PEMBAYARAN UPAH PADA ' . $formattedweddingdate;
@endphp</td>
<td style="text-align:center;">:</td>
<td style="text-align:right;">{{ $upahan['upahDibayar'] }}</td>
<td style="text-align:right;">{{ number_format($gad['pinjaman'],2) }}</td>
</tr>
@endforeach
<tr style="text-align: left;border-top:1px solid black;border-bottom:1px solid black;">
<th colspan="2" style="text-align: left;border-top:1px solid black;border-bottom:1px solid black;">PEMBIAYAAN KESELURUHAN</th>
<td>:</td>
<th colspan="2" style="font-weight:bold;text-align:right;border-top:1px solid black;border-bottom:1px solid black;">{{ number_format($gad['pinjaman'],2) }}</th>
</tr>
</table>
</div>
<br>
</page>
</body>
</html>
resources/views/semak/senaraisag.blade.php
+14 -30
View File
@@ -47,7 +47,6 @@
<th scope="col" class="sort" data-sort="status">Upah</th>
<th scope="col" class="sort" data-sort="status">Nilai Marhun</th>
<th scope="col" class="sort" data-sort="status">Berat</th>
<th scope="col" class="sort" data-sort="status">Marhun</th>
<th scope="col" class="sort" data-sort="status">JBG</th>
<th scope="col" class="sort" data-sort="status">Kadar Upah</th>
</tr>
@@ -59,7 +58,7 @@
<th scope="row">
<div class="media align-items-center">
<div class="media-body">
<a href="{{ route('penyata.show',$bt['norujukan']) }}" target="_blank"><span class="name mb-0 text-sm">{{ $bt['norujukan'] }}</span></a>
<a href="{{ route('penyata.summaryupah',['kodcaw' => $bt['kodcaw'], 'norujukan' => $bt['norujukan']]) }}" target="_blank"><span class="name mb-0 text-sm">{{ $bt['norujukan'] }}</span></a>
</div>
</div>
</th>
@@ -67,22 +66,19 @@
{{ number_format($bt['pinjaman'],2) }}
</td>
<td>
{{ number_format($bt['pinjaman'],2) }}
{{ number_format($bt['bakiupah'],2) }}
</td>
<td>
{{ number_format($bt['pinjaman'],2) }}
{{ number_format($bt['nilaimarhun'],2) }}
</td>
<td>
{{ number_format($bt['pinjaman'],2) }}
{{ number_format($bt['berat'],2) }}
</td>
<td>
{{ number_format($bt['pinjaman'],2) }}
{{ number_format($bt['tempoh'],2) }}
</td>
<td>
{{ number_format($bt['pinjaman'],2) }}
</td>
<td>
{{ number_format($bt['pinjaman'],2) }}
{{ number_format($bt['kadarupah'],2) }}
</td>
</tr>
@endif
@@ -110,7 +106,6 @@
<th scope="col" class="sort" data-sort="budget">N. Marhun</th>
<th scope="col" class="sort" data-sort="budget">Berat(gm)</th>
<th scope="col" class="sort" data-sort="budget">Kos Keuntungan (12bulan)</th>
<th scope="col" class="sort" data-sort="budget">Marhun</th>
<th scope="col" class="sort" data-sort="budget">JBG</th>
</tr>
</thead>
@@ -121,7 +116,7 @@
<th scope="row">
<div class="media align-items-center">
<div class="media-body">
<a href="{{ route('penyata.summary',$bt['norujukan']) }}" target="_blank"><span class="name mb-0 text-sm">{{ $bt['norujukan'] }}</span></a>
<a href="{{ route('penyata.summary',['kodcaw' => $bt['kodcaw'], 'norujukan' => $bt['norujukan']]) }}" target="_blank"><span class="name mb-0 text-sm">{{ $bt['norujukan'] }}</span></a>
</div>
</div>
</th>
@@ -132,7 +127,7 @@
{{ number_format($bt['bakipjm'],2) }}
</td>
<td>
{{ number_format($bt['bakipjm'],2) }}
{{ number_format($bt['bakiupah'],2) }}
</td>
<td>
{{ number_format($bt['nilaimarhun'],2) }}
@@ -144,10 +139,7 @@
{{ number_format($bt['upah12'],2) }}
</td>
<td>
{{ number_format($bt['upah12'],2) }}
</td>
<td>
{{ number_format($bt['jbg'],2) }}
{{ number_format($bt['tempoh'],2) }}
</td>
</tr>
@endif
@@ -171,9 +163,7 @@
<th scope="col" class="sort" data-sort="budget">Pinjaman</th>
<th scope="col" class="sort" data-sort="budget">N. Marhun</th>
<th scope="col" class="sort" data-sort="budget">Berat(gm)</th>
<th scope="col" class="sort" data-sort="budget">Marhun</th>
<th scope="col" class="sort" data-sort="budget">JBG</th>
<th scope="col" class="sort" data-sort="budget">K.Upah</th>
<th scope="col" class="sort" data-sort="budget">Upah</th>
<th scope="col" class="sort" data-sort="budget">J.Tebus</th>
<th scope="col" class="sort" data-sort="budget">T.Tebus</th>
@@ -185,19 +175,13 @@
<th scope="row">
<div class="media align-items-center">
<div class="media-body">
<a href="{{ route('penyata.show',$st['norujukan']) }}" target="_blank"><span class="name mb-0 text-sm">{{ $st['norujukan'] }}</span></a>
<a href="{{ route('penyata.show',['kodcaw' => $st['kodcaw'], 'norujukan' => $st['norujukan']]) }}" target="_blank"><span class="name mb-0 text-sm">{{ $st['norujukan'] }}</span></a>
</div>
</div>
</th>
<td>
{{ number_format($st['pinjaman'],2) }}
</td>
<td>
{{ number_format($st['bakipjm'],2) }}
</td>
<td>
{{ number_format($st['bakipjm'],2) }}
</td>
<td>
{{ number_format($st['nilaimarhun'],2) }}
</td>
@@ -205,16 +189,16 @@
{{ number_format($st['berat'],2) }}
</td>
<td>
{{ number_format($st['upah12'],2) }}
{{ number_format($st['tempoh'],2) }}
</td>
<td>
{{ number_format($st['upah12'],2) }}
{{ number_format($st['bakiupah'],2) }}
</td>
<td>
{{ number_format($st['jbg'],2) }}
{{ $st['sttebus'] }}
</td>
<td>
{{ number_format($st['jbg'],2) }}
{{ $st['t_update'] }}
</td>
</tr>
@endforeach
routes/web.php
+4 -2
View File
@@ -53,8 +53,10 @@ Route::group(['middleware' => 'auth','verified'], function () {
Route::post('/senaraisag', 'App\Http\Controllers\SemakController@SenaraiSAG')->name('senaraisag');
Route::get('/semakbayaran', 'App\Http\Controllers\BayaranController@SenaraiPembayaran')->name('pembayaransag');
Route::get('/analisa', 'App\Http\Controllers\AnalisaController@index')->name('analisa.index');
Route::get('/penyata/{norujukan}', 'App\Http\Controllers\SemakController@Penyata')->name('penyata.show');
Route::get('/penyata/summary/{norujukan}', 'App\Http\Controllers\SemakController@PenyataSummary')->name('penyata.summary');
Route::get('/penyata/{kodcaw}/{norujukan}', 'App\Http\Controllers\SemakController@Penyata')->name('penyata.show');
Route::get('/penyata/summary/{kodcaw}/{norujukan}', 'App\Http\Controllers\SemakController@PenyataSummary')->name('penyata.summary');
Route::get('/penyata/summaryarrahn/{kodcaw}/{norujukan}', 'App\Http\Controllers\SemakController@PenyataSummaryUpah')->name('penyata.summaryupah');
Route::post('/paymentaction', 'App\Http\Controllers\BayaranController@PembayaranAction')->name('payment.action');
//Pembayaran Engine