diff --git a/app/Http/Controllers/CustomersController.php b/app/Http/Controllers/CustomersController.php
index 56cd6c2..e3a14a5 100644
--- a/app/Http/Controllers/CustomersController.php
+++ b/app/Http/Controllers/CustomersController.php
@@ -162,7 +162,10 @@ class CustomersController extends Controller
'noakaun' => $request->no_akaun,
'teller' => $auth_user['name'],
'telefon2' => $request->alternate_phone,
- 'nosiri' => $nosiri_latest
+ 'nosiri' => $nosiri_latest,
+ 'nota'=>$request->nota,
+ 'kodkerja'=>$request->pekerjaan,
+ 'tujuangadai'=>$request->tujuan_gadai,
]);
Session::put('customer_info',$customer_info);
diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php
index f33508a..4a33a80 100644
--- a/app/Http/Controllers/GadaianController.php
+++ b/app/Http/Controllers/GadaianController.php
@@ -25,14 +25,10 @@ class GadaianController extends Controller
$curent_year = substr($current->year,2,2);
$curent_month = sprintf("%02d", $current->month);
$current_day = sprintf("%02d", $current->day);
- // dd($current_day);
$noic = $request->noic;
$customers_info = Http::get(config('api.url') . '/api/customers/'. $noic)->json();
$customer_info = $customers_info[0];
- // $limit_pinjaman_semasa = $customer_info['limit_pinjaman'] - $customer_info['pinjaman_semasa'];
$limit_pinjaman_semasa = 0;
- $auth_user = Auth::user();
- // dd($request->session()->get('page_reload'));
if($request->session()->get('page_reload') == null){
$gadai_transaction = Http::get(config('api.url') . '/api/gadai/'. $auth_user['cawangan'] . '/' . $current->toDateString())->json();
if($gadai_transaction){
@@ -89,12 +85,10 @@ class GadaianController extends Controller
public function store(Request $request){
$auth_user = Auth::user();
- // dd($request);
$total_nilai_marhun = $request->total_nilai_marhun;
$total_nilai_marhun = str_replace(',','',$total_nilai_marhun);
$margin_pinjaman = $request->pinjaman / $total_nilai_marhun;
- // dd($margin_pinjaman);
$kadarupah = $request->kadarkeuntungan * 100;
$keuntungan6bulan = $request->keuntungan_6bln;
$keuntungan12bulan = $request->keuntungan_sebulan*12;
@@ -161,7 +155,6 @@ class GadaianController extends Controller
public function cetakSAG(Request $request){
$auth_user = Auth::user();
- // dd($request);
$gadai = Http::put(config('api.url').'/api/gadai/norujukan/cetak/'.$auth_user['cawangan'].'/'.$request->norujukan_modal);
@@ -169,7 +162,6 @@ class GadaianController extends Controller
}
public function serahMarhun(Request $request){
- // dd($request);
$auth_user = Auth::user();
$norujukan_serah = $request->norujukanpilih;
@@ -180,8 +172,6 @@ class GadaianController extends Controller
unset($arraynorujukan[$results]);
}
- // dd($arraynorujukan);
-
foreach($arraynorujukan as $index=>$norujukan){
$gadai = Http::put(config('api.url'). '/api/gadai/norujukan/serah/'. $auth_user['cawangan'] .'/'. $norujukan);
diff --git a/app/Http/Controllers/KakitanganController.php b/app/Http/Controllers/KakitanganController.php
new file mode 100644
index 0000000..563dbd5
--- /dev/null
+++ b/app/Http/Controllers/KakitanganController.php
@@ -0,0 +1,50 @@
+middleware('auth');
+ }
+
+ public function daftarKakitangan(){
+ $api_url = config('api.url');
+ $auth_user = Auth::user();
+ $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+ $role = Role::get();
+ return view('operasi.daftar_kakitangan',compact('cawangan_info','api_url','role'));
+ }
+
+ public function registerStaff(Request $request){
+
+ $validated = $request->validate([
+ 'nama' => 'required',
+ 'email' => 'required|email',
+ 'nokp' => 'required',
+ 'telefon' => 'required',
+ 'cawangan' => 'required',
+ 'role' => 'required'
+ ]);
+
+ $new_staff = User::create([
+ 'name' => $request->nama,
+ 'email' => $request->email,
+ 'password' => Hash::make($request->nokp),
+ 'no_kp' => $request->nokp,
+ 'no_telefon' => $request->telefon,
+ 'roles' => $request->role,
+ 'cawangan' => $request->cawangan
+ ]);
+
+ return redirect()->route('daftar.kakitangan');
+ }
+}
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index cce41e9..639d36a 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -3,6 +3,9 @@
namespace App\Http\Controllers;
use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Auth;
+use App\User;
class UserController extends Controller
{
@@ -12,6 +15,9 @@ class UserController extends Controller
}
public function index(){
- return view('user.index');
+ $api_url = config('api.url');
+ $auth_user = Auth::user();
+ $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+ return view('user.index',compact('cawangan_info','api_url'));
}
}
diff --git a/app/Role.php b/app/Role.php
new file mode 100644
index 0000000..2fa8957
--- /dev/null
+++ b/app/Role.php
@@ -0,0 +1,14 @@
+
+
+
+
+
@@ -190,7 +225,7 @@
@php
$outstanding_semasa = Http::get($api_url . '/api/gadai/customers/'. $customer_info['kpbaru'] .'/outstandingsemasa')->json();
@endphp
-
+
@@ -200,7 +235,7 @@
Nota
-
+
@@ -398,6 +433,7 @@
$('#myTable').parents('div.dataTables_wrapper').first().hide();
$('#dahtebusTable').parents('div.dataTables_wrapper').first().hide();
$('#lelongTable').parents('div.dataTables_wrapper').first().hide();
+ $('#btnsave').css('display','none');
var noic = $("#noic").val();
$.ajax({
@@ -703,12 +739,14 @@
$('#btnkemaskini').removeClass('btn-primary');
$('#btnkemaskini').text('Cancel');
$('#btnkemaskini').attr('onclick','cancelbutton()');
- $('#btnotp').text('Save');
- $('#btnotp').attr('onclick','kemaskinipelanggan()');
-
+ $('#btnsave').show();
+ $('#btnotp').css('display','none');
//attribute nak readonly false
$('#telefon').attr('readonly', false);
$('#telefon2').attr('readonly', false);
+ $('#kodbank').attr('disabled', false);
+ $('#noakaun').attr('readonly', false);
+ $('#nota').attr('readonly', false);
}
@@ -718,36 +756,42 @@
$('#btnkemaskini').addClass('btn-primary');
$('#btnkemaskini').text('Kemaskini');
$('#btnkemaskini').attr('onclick','kemaskinifunc()');
- $('#btnotp').text('Daftar Akuan Online');
- $('#btnotp').attr('onclick','#');
+ $('#btnsave').css('display','none');
+ $('#btnotp').show();
document.getElementById("kemaskiniform").reset();
//attribute nak readonly false
$('#telefon').attr('readonly', true);
$('#telefon2').attr('readonly', true);
-
+ $('#kodbank').attr('disabled', true);
+ $('#noakaun').attr('readonly', true);
+ $('#nota').attr('readonly', true);
}
$("#kemaskiniform").submit(function(event) {
event.preventDefault();
- var alamat = $('#alamat').val();
var nokp = $('#icno').val();
- var poskod = $('#poskod').val();
var telefon1 = $('#telefon').val();
var telefon2 = $('#telefon2').val();
+ var kodbank = $('#kodbank').val();
+ var noakaun = $('#noakaun').val();
+ var nota = $('#nota').val();
$.ajax({
method:"put",
- url: api_url + "/api/customersonline/" + nokp,
+ url: api_url + "/api/customers/update/kaunter/" + nokp,
data:{
- "alamat": alamat,
- "poskod": poskod,
"telefon1": telefon1,
- "telefon2": telefon2
+ "telefon2": telefon2,
+ "kodbank":kodbank,
+ "noakaun":noakaun,
+ 'nota':nota
},
success: function(success){
+ $('#btnsave').css('display','none');
+ $('#btnotp').show();
Swal.fire({
icon: 'success',
title: 'Berjaya',
@@ -771,7 +815,7 @@
var errortelefon1 = 0;
var errortelefon2 = 0;
- if(!($('#telefon').val().length > 10 && $('#telefon').val().length < 12))
+ if(!($('#telefon').val().length >= 9 && $('#telefon').val().length < 12))
{
$('#errortelefon').show();
$('#errortelefon').text("*lebih kecil dari 10 dan lebih besar dari 12");
@@ -787,7 +831,7 @@
if($('#telefon2').val() != '')
{
- if(!($('#telefon2').val().length > 10 && $('#telefon2').val().length < 12))
+ if(!($('#telefon2').val().length >= 9 && $('#telefon2').val().length < 12))
{
$('#errortelefon2').show();
$('#errortelefon2').text("*lebih kecil dari 10 dan lebih besar dari 12");
diff --git a/resources/views/homepage/operasi/home.blade.php b/resources/views/homepage/operasi/home.blade.php
index c5c1eb8..2f52d03 100644
--- a/resources/views/homepage/operasi/home.blade.php
+++ b/resources/views/homepage/operasi/home.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.app')
+@extends('layouts.app_operasi')
@section('content')
-@endsection
+@endsection
\ No newline at end of file
diff --git a/resources/views/layouts/app_operasi.blade.php b/resources/views/layouts/app_operasi.blade.php
new file mode 100644
index 0000000..d7dd71d
--- /dev/null
+++ b/resources/views/layouts/app_operasi.blade.php
@@ -0,0 +1,251 @@
+
+
+
+
+
+
+
+
+
+ SISTEM AR-RAHN
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{-- jquery validation --}}
+
+
+
+ {{-- Pusher --}}
+
+
+
+
+
+
+
+
+
+
+
+
+ @yield('content')
+
+
+ @yield('footer')
+
+
diff --git a/resources/views/operasi/daftar_kakitangan.blade.php b/resources/views/operasi/daftar_kakitangan.blade.php
new file mode 100644
index 0000000..46a809e
--- /dev/null
+++ b/resources/views/operasi/daftar_kakitangan.blade.php
@@ -0,0 +1,95 @@
+@extends('layouts.app_operasi')
+
+@section('content')
+
+
+@endsection
diff --git a/resources/views/operasi/kelulusan.blade.php b/resources/views/operasi/kelulusan.blade.php
index 9b83df5..7a5ec9e 100644
--- a/resources/views/operasi/kelulusan.blade.php
+++ b/resources/views/operasi/kelulusan.blade.php
@@ -1,11 +1,11 @@
-@extends('layouts.app')
+@extends('layouts.app_operasi')
@section('content')
-
+
diff --git a/routes/web.php b/routes/web.php
index de32889..6d85c6f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -62,7 +62,7 @@ Route::get('/daftar_marhun',['as'=>'daftar_marhun','uses'=>'MarhunController@ind
Route::get('/penebusan/{norujukan}',['as'=>'penebusan','uses' => 'PenebusanController@index'])->middleware('auth','teller');
Route::get('/aliran_tunai','AliranTunaiController@index')->middleware('auth','teller');
Route::get('/harga_emas','HargaEmasController@index')->middleware('auth','teller');
-Route::get('/profile',['as'=>'profile','uses'=>'UserController@index'])->middleware('auth','teller');
+Route::get('/profile',['as'=>'profile','uses'=>'UserController@index'])->middleware('auth');
Route::get('/customer/search',['as'=>'customer.search','uses'=>'CustomersController@search'])->middleware('auth','teller');
Route::post('/customer/store',['as'=>'customer.store','uses'=>'CustomersController@store'])->middleware('auth','teller');
Route::post('/gadai/store',['as'=>'gadai.store','uses'=>'GadaianController@store'])->middleware('auth','teller');
@@ -156,3 +156,5 @@ Route::get('/operasi/kelulusan','OperasiController@kelulusan')->name('operasi.ke
Route::post('/operasi/createkelulusan',['as'=>'operasi.createkelulusan','uses'=>'OperasiController@createkelulusan'])->middleware('auth','teller');
Route::get('/operasi/getkelulusan',['as'=>'operasi.getkelulusan','uses'=>'OperasiController@getkelulusan'])->middleware('auth','teller');
Route::put('/operasi/updatekelulusan',['as'=>'operasi.updatekelulusan','uses'=>'OperasiController@updatekelulusan'])->middleware('auth','operasi');
+Route::get('/daftar/kakitangan',['as'=>'daftar.kakitangan','uses'=>'KakitanganController@daftarKakitangan'])->middleware('auth','operasi');
+Route::post('/daftar/kakitangan/baru',['as'=>'kakitangan.baru','uses'=>'KakitanganController@registerStaff']);