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

Merge branch 'master' of https://gitlab.com/online-sistem1/kaunter into pipi

Browse Source
This commit is contained in:
hafifierahman
2020-12-06 13:09:09 +08:00
parent cdd75979a3 bfbd863afc
commit 0117ebd686
6 changed files with 175 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/CustomersController.php
-6
View File
@@ -148,12 +148,6 @@ class CustomersController extends Controller
//
}
public function test(){
$response = Http::get('http://localhost:8000/api/customers');
dd($response->json());
}
public function getOTP()
{
$auth_user = Auth::user();
app/Http/Controllers/KhazanahController.php
+15 -2
View File
@@ -13,16 +13,21 @@ class KhazanahController extends Controller
{
$auth_user = Auth::user();
$api_url = config('api.url');
$gadai = Http::get( config('api.url') .'/api/gadai/serah_marhun/khazanah/'. $auth_user['cawangan'])->json();
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('khazanah.menu',compact('cawangan_info','api_url'));
return view('khazanah.menu',compact('cawangan_info','api_url','gadai'));
}
public function gadaian()
{
$auth_user = Auth::user();
$api_url = config('api.url');
$gadai = Http::get( config('api.url') .'/api/gadai/serah_marhun/khazanah/'. $auth_user['cawangan'])->json();
$petibesi = Http::get( config('api.url') .'/api/gadai/serah_marhun/khazanah/petibesi/'. $auth_user['cawangan'])->json();
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('khazanah.gadaian',compact('cawangan_info','api_url'));
return view('khazanah.gadaian',compact('cawangan_info','api_url','gadai','petibesi'));
}
public function tebus()
@@ -59,4 +64,12 @@ class KhazanahController extends Controller
return view('khazanah.serahan',compact('cawangan_info','api_url'));
}
public function barcodescanned(Request $request){
// dd($request);
$auth_user = Auth::user();
$gadai = Http::put(config('api.url').'/api/gadai/serah_marhun/khazanah/'. $auth_user['cawangan'] .'/' . $request->norujukan_barcode)->json();
return redirect()->route('khazanah.gadaian');
}
}
resources/views/customers/index.blade.php
+17 -13
View File
@@ -15,14 +15,25 @@
<div class="text-center">
<h5 class="text-uppercase">masukkan nombor kad pengenalan</h5>
<form action="{{ route('customer.search') }}" method="GET">
<input type="text" id="noic" style="width:400px" name="noic" placeholder="No Kad Pengenalan Pelanggan" autocomplete="off" value="{{$search == false ? '' : $noic ?? ''}}"/>
<input type="submit" class="btn btn-primary" value="SAHKAN" />
<div class="row justify-content-center">
<div class="col-md-7">
<div class="input-group my-3">
<input type="text" class="form-control" name="noic" placeholder="No Kad Pengenalan Pelanggan" aria-label="No Kad Pengenalan Pelanggan" autocomplete="off" value="{{$search == false ? '' : $noic ?? ''}}" aria-describedby="button-addon2">
<div class="input-group-append">
<button class="btn btn-outline-primary" type="submit" id="button-addon2">Sahkan</button>
</div>
</div>
</div>
</div>
<!-- <input type="text" id="noic" style="width:400px" name="noic" placeholder="No Kad Pengenalan Pelanggan" autocomplete="off" value="{{$search == false ? '' : $noic ?? ''}}"/>
<input type="submit" class="btn btn-primary" value="Sahkan" /> -->
</form>
</div>
@if($search == true )
<div class="text-center mt-3">
<button type="button" style="margin:auto" class="btn btn-primary" data-toggle="modal" data-target="#daftar_pelanggan">
DAFTAR PELANGGAN
Daftar Pelanggan
</button>
</div>
@endif
@@ -63,12 +74,6 @@
<div class="col-md-8"><input class="form-control" type="text" name="main_phone" id="main_phone" autocomplete="off"></div>
<div class="col-md-4">No Telefon 2</div>
<div class="col-md-8"><input class="form-control" type="text" name="alternate_phone" id="alternate_phone" autocomplete="off"></div>
<!-- <div class="col-md-4">Alamat Surat Menyurat</div>
<div class="col-md-8"><textarea style="resize:none" name="alamat_menyurat" id="alamat_menyurat" cols="30" rows="3"></textarea></div>
<div class="col-md-4">Poskod</div>
<div class="col-md-8"><input type="text" name="poskod_menyurat" id="poskod_menyurat" autocomplete="off"></div>
<div class="col-md-4">Negeri</div>
<div class="col-md-8"><input type="text" name="negeri_menyurat" id="negeri_menyurat" autocomplete="off"></div> -->
<div class="col-md-12 ml-4">
<div class="form-group row">
<div class="form-check form-check-inline">
@@ -117,8 +122,6 @@
</div>
</div> -->
</div>
<!-- <div class="col-md-4">Daerah</div>
<div class="col-md-8"><input type="text" name="daerah_menyurat" id="daerah_menyurat"></div> -->
<div class="col-md-4">Umur</div>
<div class="col-md-8"><input class="form-control" type="text" name="age" id="age" readonly></div>
<div class="col-md-4">Bangsa</div>
@@ -135,6 +138,7 @@
<div class="col-md-8">
<select class="form-control" name="bank_name" data-placeholder="Pilih Bank" id="bank_name">
@foreach($bank as $banks)
<option disabled selected value> -- Pilih Bank -- </option>
<option value="{{ $banks['abbreviation'] }}">{{ $banks['name'] }}</option>
@endforeach
</select>
@@ -147,8 +151,8 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger" data-dismiss="modal">BATAL</button>
<input type="submit" name="submit" class="btn btn-primary" value="TERIMA">
<button type="button" class="btn btn-danger" data-dismiss="modal">Batal</button>
<input type="submit" name="submit" class="btn btn-primary" value="Terima">
</div>
</form>
</div>
resources/views/khazanah/gadaian.blade.php
+139 -50
View File
@@ -1,5 +1,54 @@
@extends('layouts.app')
<!-- The Modal -->
<div class="modal fade" id="marhunModal">
<div class="modal-dialog modal-xl modal-dialog-centered">
<div class="modal-content">
<!-- Modal Header -->
<div class="modal-header">
<h4 class="modal-title"></h4>
<button type="button" class="close" data-dismiss="modal">&times;</button>
</div>
<!-- Modal body -->
<div class="modal-body">
<div class="row">
<div class="col-md-12">
<h4>Marhun</h4>
<table id="biasa" class="table table-striped table-bordered text-center" style="width:100%">
<thead>
<tr>
<th>Bil</th>
<th>Jenis Marhun</th>
<th>Berat</th>
<th>Karat</th>
<th>Nilai Marhun</th>
<th>Nota</th>
</tr>
</thead>
<tbody id="tablemarhun">
</tbody>
</table>
</div>
</div>
<div class="row">
<div class="col-md-4 text-right">
Jumlah Berat Marhun (gm)
</div>
<div class="col-md-4">
<input type="text" readonly id="jumlah_berat" name="jumlah_berat" class="form-control">
</div>
</div>
</div>
<!-- Modal footer -->
<div class="modal-footer">
<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
@section('content')
<div class="container">
<div class="row justify-content-center">
@@ -13,8 +62,12 @@
<a href="{{ url('menu') }}" class="ion-backspace" style="font-size:50px;color:blue;"></a>
</div>
<div class="col-8 justify-content-center">
<label>Scan Barcode Kemasukan Marhun Ke Peti Besi</label>
<input type="text" class="form-control col-4 mx-auto" />
<form action="{{ route('barcode.scanned') }}" method="post">
@csrf
<label>Scan Barcode Kemasukan Marhun Ke Peti Besi</label>
<input type="text" class="form-control col-4 mx-auto" name="norujukan_barcode" autocomplete="off" id="norujukan_barcode"/>
<input type="submit" id="submit_button" name="submit_button" hidden>
</form>
</div>
<div class="col-2">
</div>
@@ -27,12 +80,6 @@
<li class="nav-item">
<a class="nav-link" id="gadaian-belum-serah-tab" data-toggle="tab" href="#gadaian-belum-serah" role="tab" aria-controls="gadaian-belum-serah" aria-selected="false">Pengesahan Marhun</a>
</li>
{{-- <li class="nav-item">
<div class="row">
<input type="checkbox"/><span>Auto Refresh</span>
<input type="checkbox"/><span>Semak Marhun Lain</span>
</div>
</li> --}}
</ul>
<div class="tab-content" id="myTabContent">
@@ -44,7 +91,7 @@
<h4 class="mt-4 mb-4">Masuk Gadaian Untuk Kelulusan</h4>
</div>
<div class="col-2 justify-content-end">
<h5 class="mt-4 mb-4">Gadaian : <span class="badge badge-success">2</span></h5>
<h5 class="mt-4 mb-4">Gadaian : <span class="badge badge-success"></span></h5>
</div>
</div>
<table class='table mt-4' id='table-gadaian-semasa'>
@@ -52,28 +99,32 @@
<tr>
<th>Bil</th>
<th>No Rujukan</th>
<th>T/Gadai</th>
<th>Pinjaman</th>
<th>Pembiayaan</th>
<th>N. Marhun</th>
<th>Berat (gm)</th>
<th>Dari Teller</th>
<th>Marhun</th>
<th>Teller</th>
</tr>
</thead>
<tbody>
<tr>
<td>1</td>
<td>31231</td>
<td>2321</td>
<td>32</td>
<td>323</td>
<td>323</td>
<td>Mahfuz</td>
<td>JBG</td>
</tr>
@if (is_array($gadai) || is_object($gadai))
@foreach($gadai as $index=>$gadaian)
<tr>
<td>{{ $index+1 }}</td>
<td>
@php
$marhun = Http::get($api_url . '/api/marhun/' . $gadaian['norujukan'] )->json();
@endphp
<a href="#" data-toggle="modal" data-berat="{{$gadaian['berat']}}" data-marhun="{{ json_encode($marhun) }}" data-norujukan="{{$gadaian['norujukan']}}" data-hargajualan="{{$gadaian['hargajualan']}}" data-kodcaw="{{ $gadaian['kodcaw'] }}" data-target="#marhunModal"> {{$gadaian['norujukan']}}</a>
</td>
<td>{{ $gadaian['pinjaman'] }}</td>
<td>{{ $gadaian['nilaimarhun'] }}</td>
<td>{{ $gadaian['teller'] }}</td>
</tr>
@endforeach
@endif
</tbody>
</table>
</div>
<div class="tab-pane fade" id="gadaian-belum-serah" role="tabpanel" aria-labelledby="gadaian-belum-serah-tab">
<div class="row mb-4">
<div class="col-1">
@@ -82,12 +133,9 @@
<h4 class="mt-4 mb-4">Pengesahan Marhun Dari Khazanah</h4>
</div>
<div class="col-3 justify-content-end">
<h5 class="mt-4 mb-4">Semakan Marhun : <span class="badge badge-success">2</span></h5>
<h5 class="mt-4 mb-4">Semakan Marhun : <span class="badge badge-success"></span></h5>
</div>
</div>
<table class='table mt-4' id='table-gadaian-belum-serah'>
<thead>
<tr>
@@ -95,45 +143,86 @@
<th>No Rujukan</th>
<th>Masa Terima</th>
<th>N. Marhun</th>
<th>Berat (gm)</th>
<th>Marhun</th>
</tr>
</thead>
<tbody>
<tr>
<td>1</td>
<td>31231</td>
<td>2321</td>
<td>32</td>
<td>323</td>
<td>323</td>
</tr>
@if (is_array($petibesi) || is_object($petibesi))
@foreach($petibesi as $index=>$marhun)
<tr>
<td>{{ $index+1 }}</td>
<td>
@php
$marhun_detail = Http::get($api_url . '/api/marhun/' . $marhun['norujukan'] )->json();
@endphp
<a href="#" data-toggle="modal" data-berat="{{$marhun['berat']}}" data-marhun="{{ json_encode($marhun_detail) }}" data-norujukan="{{$marhun['norujukan']}}" data-hargajualan="{{$marhun['hargajualan']}}" data-kodcaw="{{ $marhun['kodcaw'] }}" data-target="#marhunModal"> {{$marhun['norujukan']}}</a>
</td>
<td>{{ $marhun['pinjaman'] }}</td>
<td>{{ $marhun['nilaimarhun'] }}</td>
<td>{{ $marhun['teller'] }}</td>
</tr>
@endforeach
@endif
</tbody>
</table>
</div>
</div>
<div class="row mt-5">
<label class="label-control col-3">Nilai Marhun Terkumpul (Telah Lulus)</label>
<input class="form-control col-3" type="text" value="2,689.39" readonly/>
<label class="label-control col-3">Berat Keseluruhan</label>
<div class="input-group col-3 mb-4">
<input type="text" class="form-control" value="0.00" readonly>
<div class="input-group-append">
<span class="input-group-text" id="basic-addon2">gm</span>
<div class="col-md-12">
<div class="row form-group">
<label class="label-control col-md-3">Nilai Marhun Terkumpul (Telah Lulus)</label>
<input class="form-control col-md-3" type="text" value="2,689.39" readonly/>
</div>
</div>
</div>
</div>
<div class="row mt-2 d-flex justify-content-center">
<a href="#" class="btn btn-info col-2">Laporan Scan Barcode Gadaian</a>
<a href="#" class="btn btn-info ml-2 col-2">Senarai Pembatalan No Rujukan</a>
<a href="#" class="btn btn-info">Laporan Scan Barcode Gadaian</a>
<a href="#" class="btn btn-info">Senarai Pembatalan No Rujukan</a>
</div>
</div>
</div>
</div>
</div>
</div>
<script>
var api_url = "<?php echo $api_url ?>";
//modal
$('#marhunModal').on('show.bs.modal', function(event) {
var button = $(event.relatedTarget); // button yg trigger
var arraymarhun = button.data('marhun');
var norujukan = button.data('norujukan');
var kodcaw = button.data('kodcaw');
var hargajualan = button.data('hargajualan');
var total_berat = button.data('berat');
$('#jumlah_berat').val(total_berat);
$('#tablemarhun').empty();
$.each(arraymarhun,function(index,marhun){
$.each(marhun, function(index,marhun_detail){
var marhun_name;
$.ajax({
method:'GET',
url: api_url + '/api/jemas/nama_marhun',
dataType: 'json',
data:{
marhun:marhun_detail['marhun']
},
success:function(marhun_ajax){
$("#tablemarhun").append("<tr><td>" + marhun_detail['bil'] + "</td><td>" + marhun_ajax['descpt'] +"</td><td>" + marhun_detail['berat'] +"</td><td>" + marhun_detail['karat'] +"</td><td>RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +"</td><td>"+ marhun_detail['nota'] +"</td></tr>");
}
});
});
});
});
$('#norujukan_barcode').keyup(function(){
if(this.value.length >= 14){
$('#submit_button').submit();
}
});
</script>
@endsection
resources/views/khazanah/menu.blade.php
+1 -1
View File
@@ -9,7 +9,7 @@
<div class="card-body text-center mx-auto">
<a href="{{ url('khazanahgadaian') }}" class="btn btn-info ml-2">Gadai <span class="badge badge-light">1</span></a>
<a href="{{ url('khazanahgadaian') }}" class="btn btn-info ml-2">Gadai <span class="badge badge-light">{{ count($gadai) }}</span></a>
<a href="{{ url('khazanahtebus') }}" class="btn btn-info ml-2">Tebus <span class="badge badge-light">2</span></a>
<a href="{{ url('pendahuluan') }}" class="btn btn-info ml-2">Pendahuluan</a>
<a href="{{ url('serahan') }}" class="btn btn-info ml-2">Serahan</a>
routes/web.php
+3 -1
View File
@@ -52,10 +52,12 @@ Route::post('/serahmarhun',['as'=>'marhun.serah','uses'=>'GadaianController@sera
//Khazanah
Route::get('/menu','KhazanahController@menu')->middleware('auth','khazanah');
Route::get('/khazanahgadaian','KhazanahController@gadaian')->middleware('auth','khazanah');
Route::get('/khazanahgadaian',['as'=>'khazanah.gadaian','uses'=>'KhazanahController@gadaian'])->middleware('auth','khazanah');
Route::get('/khazanahtebus','KhazanahController@tebus')->middleware('auth','khazanah');
Route::get('/kelulusan','KhazanahController@kelulusan')->middleware('auth','khazanah');
Route::get('/pendahuluan','KhazanahController@pendahuluan')->middleware('auth','khazanah');
Route::get('/serahan','KhazanahController@serahan')->middleware('auth','khazanah');
Route::post('/barcodescanned',['as'=>'barcode.scanned','uses'=>'KhazanahController@barcodescanned'])->middleware('auth','khazanah');