Merge branch 'main' into amirah
This commit is contained in:
Amirah22
@@ -663,21 +663,33 @@ class MarhunController extends Controller
|
||||
{
|
||||
$tangguhlelong = TangguhLelong::join('lelongbid', 'tangguhlelong.lelongbid_id', '=', 'lelongbid.id')
|
||||
->where('tangguhlelong.lelong_id', $id)
|
||||
->select('tangguhlelong.id as tangguhlelong_id',
|
||||
'tangguhlelong.lelongbid_id',
|
||||
'tangguhlelong.norujukan',
|
||||
'tangguhlelong.tarikhtangguh',
|
||||
'tangguhlelong.ditangguh_pada',
|
||||
'tangguhlelong.ditangguh_oleh',
|
||||
'tangguhlelong.nota',
|
||||
'lelong.id as lelong_id',
|
||||
'lelong.tarikh_lelong',
|
||||
'lelong.harga_emas_asas',
|
||||
'lelong.jbg',
|
||||
'lelong.cajlelong',
|
||||
'lelong.sts_lelong'
|
||||
)
|
||||
->get();
|
||||
|
||||
return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id'));
|
||||
}
|
||||
|
||||
public function lelbidmarhun($id, $norujukan)
|
||||
public function lelbidmarhun($id, $norujukan, $tangguhlelong_id)
|
||||
{
|
||||
$marhuns = LelongBidMarhun::join('tangguhlelong', 'lelongbidmarhun.lelongbid_id', '=', 'tangguhlelong.lelongbid_id')
|
||||
->where('tangguhlelong.lelong_id', $id)
|
||||
->where('tangguhlelong.norujukan', $norujukan)
|
||||
->get();
|
||||
|
||||
$status = Pengesahan::where('lelong_id', $id)->where('norujukan', $norujukan)->first();
|
||||
|
||||
return view('pengesahan.lelbidmarhun',compact('marhuns', 'id', 'norujukan', 'status'));
|
||||
|
||||
return view('pengesahan.lelbidmarhun',compact('tangguhlelong', 'id', 'norujukan'));
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -5,11 +5,14 @@ namespace App\Http\Controllers;
|
||||
use Illuminate\Http\Request;
|
||||
use Spatie\Permission\Models\Role;
|
||||
use Spatie\Permission\Models\Permission;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use App\Models\User;
|
||||
use Carbon\Carbon;
|
||||
use PDF;
|
||||
|
||||
use App\Models\Cawangan;
|
||||
|
||||
class PenggunaController extends Controller
|
||||
{
|
||||
/**
|
||||
@@ -32,11 +35,15 @@ class PenggunaController extends Controller
|
||||
// $alluser = User::all();
|
||||
$alluser = User::with('roles')->get();
|
||||
$allroles = Role::all()->pluck('name');
|
||||
$caw = Cawangan::all();
|
||||
$user = User::with('roles')->first();
|
||||
$userroles = $user->getRoleNames()->toArray();
|
||||
// $user = Auth::user();
|
||||
// $user->assignRole('admin');
|
||||
return view('pengurusanpengguna.index',compact('alluser','allroles'));
|
||||
return view('pengurusanpengguna.index',compact('alluser','allroles','caw','user','userroles'));
|
||||
}
|
||||
|
||||
|
||||
public function show(Request $request, $userid)
|
||||
{
|
||||
// dd($userid);
|
||||
@@ -44,12 +51,51 @@ class PenggunaController extends Controller
|
||||
$userroles = $user->getRoleNames()->toArray();
|
||||
|
||||
$allroles = Role::all()->pluck('name');
|
||||
|
||||
// $active = User::where('id','=',$userid)->update('status', 1);
|
||||
|
||||
return view('pengurusanpengguna.show',compact('user','allroles','userroles'));
|
||||
}
|
||||
|
||||
public function storepengguna(Request $request)
|
||||
{
|
||||
$currentdate = Carbon::now();
|
||||
$currentdate = $currentdate->toDateTimeString();
|
||||
//dd($request->all());
|
||||
$validator = Validator::make($request->all(), [
|
||||
'email' => 'required|string|unique:users|email'
|
||||
]);
|
||||
|
||||
if ($validator->fails()) {
|
||||
$errors = [
|
||||
'success' => "error",
|
||||
//'message' => $validator->errors()
|
||||
|
||||
];
|
||||
|
||||
return redirect()->route('pengguna.index')
|
||||
->with('success', 'Sila Masukkan Email Yang Sah'); }
|
||||
|
||||
$user = new User;
|
||||
$user->name = $request->name;
|
||||
$user->username = $request->username;
|
||||
$user->kodcaw = $request->caw;
|
||||
$user->status = 'active';
|
||||
$user->t_daftar = $currentdate;
|
||||
$user->email = $request->email;
|
||||
$user->email_verified_at = $currentdate;
|
||||
$user->password = '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi'; //password
|
||||
$user->user_type = 1;
|
||||
// $user->user_type = 1;
|
||||
$user->save();
|
||||
|
||||
return redirect()->route('pengguna.index')
|
||||
->with('success', 'Pengguna Berjaya Disimpan');
|
||||
}
|
||||
|
||||
public function store(Request $request)
|
||||
{
|
||||
// dd($request->all());
|
||||
$currentdate = Carbon::now();
|
||||
$currentdate = $currentdate->toDateTimeString();
|
||||
|
||||
@@ -76,6 +122,9 @@ class PenggunaController extends Controller
|
||||
{
|
||||
$status = 'banned';
|
||||
}
|
||||
// else if(!($request->has('status'))){
|
||||
// $status = 'active';
|
||||
// }
|
||||
else
|
||||
{
|
||||
$status = 'inactive';
|
||||
@@ -83,7 +132,7 @@ class PenggunaController extends Controller
|
||||
|
||||
$user = User::where('id','=',$request->userid)->first();
|
||||
// dd($user);
|
||||
$user->email = $request->email;
|
||||
$user->email = $request->emel;
|
||||
$user->notelbimbit = $request->notelbimbit;
|
||||
$user->nokp = $request->nokp;
|
||||
$user->updated_at = $currentdate;
|
||||
|
||||
@@ -12,6 +12,8 @@ use App\Models\GadaiMarhun;
|
||||
use App\Models\Cawangan;
|
||||
use App\Models\TransaksiKeuntungan;
|
||||
|
||||
use DateTime;
|
||||
|
||||
class TamatKontController extends Controller
|
||||
{
|
||||
//PC
|
||||
@@ -62,7 +64,9 @@ class TamatKontController extends Controller
|
||||
|
||||
|
||||
$tarikh_lelong = Carbon::parse($t_lelong);
|
||||
$t_anggaran = ($tarikh_lelong->subMonths(1))->toDateString();
|
||||
$t_anggaran = ($tarikh_lelong->subMonths(1))->format('d/m/Y');
|
||||
|
||||
// $t_anggaran = date('d-m-Y', strtotime('-1 months', strtotime($tarikh_lelong)));
|
||||
|
||||
foreach($getsurat as $index1=>$surats)
|
||||
{
|
||||
@@ -80,6 +84,7 @@ class TamatKontController extends Controller
|
||||
't_lelong',
|
||||
'user',
|
||||
't_gadais',
|
||||
't_gadaisehingga',
|
||||
't_anggaran',
|
||||
'bil_lelongcaw'
|
||||
));
|
||||
@@ -106,6 +111,12 @@ class TamatKontController extends Controller
|
||||
public function senaraitemp(Request $request)
|
||||
{
|
||||
$t_lelong = $request->tarikh_lelong;
|
||||
$tarikh_lelong = Carbon::parse($t_lelong);
|
||||
$t_lelongdisplay = $tarikh_lelong->format('d-m-Y');
|
||||
$t_anggaran = ($tarikh_lelong->subDays(20))->format('d/m/Y');
|
||||
$t_daftarlelong = ($tarikh_lelong->subMonths(1))->format('d/m/Y');
|
||||
|
||||
|
||||
|
||||
if($t_lelong != null)
|
||||
{
|
||||
@@ -131,8 +142,12 @@ class TamatKontController extends Controller
|
||||
->whereNotNull('upah12')
|
||||
->orderBy('t_gadai')
|
||||
->select('t_gadai')
|
||||
->first();
|
||||
|
||||
->first();
|
||||
// $t_gadais = $request->t_gadai;
|
||||
// $t_gadaisehingga = Carbon::parse($t_gadais);
|
||||
// $t_gadaisdisplay = $t_gadaisehingga->format('d/m/Y');
|
||||
|
||||
//
|
||||
$senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
|
||||
->where('gadai.t_matang1', '<', $t_lelong)
|
||||
->where('gadai.sttebus', '=', '')
|
||||
@@ -147,8 +162,7 @@ class TamatKontController extends Controller
|
||||
sum(pinjaman) as total_pembiayaan,
|
||||
sum(bakipjm) as total_bakipjm,
|
||||
gadai.kodcaw,
|
||||
cawangan.caw_name as caw_name'
|
||||
)
|
||||
cawangan.caw_name as caw_name')
|
||||
->get();
|
||||
|
||||
$bil_lelong = sizeof($getsurat);
|
||||
@@ -156,7 +170,10 @@ class TamatKontController extends Controller
|
||||
return view('jananotis.senaraitemp', compact( 't_lelong',
|
||||
'getsurat',
|
||||
'senarai',
|
||||
't_gadais'
|
||||
't_gadais',
|
||||
't_anggaran',
|
||||
't_daftarlelong',
|
||||
't_lelongdisplay'
|
||||
));
|
||||
}
|
||||
else
|
||||
|
||||
@@ -14,9 +14,23 @@
|
||||
<div class="container">
|
||||
<div class="row mb-2">
|
||||
<div class="col-md-11 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
|
||||
<p> <b>Tarikh Lelong : </b> {{ $t_lelong }}</p>
|
||||
<p> <b>Tarikh Gadai Sehingga : </b>{{ $t_gadais->t_gadai }}</p>
|
||||
<p> <b>Anggaran Tarikh Daftar Lelong : </b>{{ $t_anggaran }}</p>
|
||||
|
||||
<p> <b>Tarikh Lelong : </b> {{ $t_lelongdisplay }}</p>
|
||||
<p> <b>Tarikh Gadai Sehingga : </b> @php
|
||||
$myDateTime = DateTime::createFromFormat('Y-m-d', $t_gadais->t_gadai );
|
||||
$datez = $myDateTime->format('d-m-Y');
|
||||
echo($datez);
|
||||
@endphp</p>
|
||||
<p> <b>Tarikh Perlu Blast Notis SMS(30 Hari) : </b> @php
|
||||
$myDateTime = DateTime::createFromFormat('Y-m-d', $t_lelong );
|
||||
$datez1 = $myDateTime->modify('-1 month')->format('d-m-Y');
|
||||
echo($datez1);
|
||||
@endphp</p>
|
||||
<p> <b>Tarikh Perlu Daftar Batch Lelong(20 Hari) : </b>@php
|
||||
$myDateTime = DateTime::createFromFormat('Y-m-d', $t_lelong );
|
||||
$datez1 = $myDateTime->modify('-20 days')->format('d-m-Y');
|
||||
echo($datez1);
|
||||
@endphp</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -10,42 +10,40 @@
|
||||
<p>{{ $message }}</p>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="container">
|
||||
<div class="row mb-2">
|
||||
<div class="col-md-12 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
|
||||
<p> <b>Norujukan : </b> {{ $tangguhlelong[0]['norujukan'] }}</p>
|
||||
<p> <b>Pembiayaan : </b> {{ $tangguhlelong[0]['pinjaman'] }}</p>
|
||||
<p> <b>Remark : </b> {{ $tangguhlelong[0]['tangguh_nota'] }}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<form id="exportform" action="" method="POST">
|
||||
<input type="hidden" name="type" value="User">
|
||||
<table class="table table-striped table-xl text-center" id="tablelelong" style="width:100%">
|
||||
<thead class="bg-primary text-white">
|
||||
<tr>
|
||||
<th>Bil</th>
|
||||
<th>No Rujukan</th>
|
||||
<th>Marhun</th>
|
||||
<th>Karat</th>
|
||||
<th>Berat</th>
|
||||
<th>Harga (RM)</th>
|
||||
<th>Nilai Marhun</th>
|
||||
<th>Nota</th>
|
||||
<th>Status</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach ($marhuns as $marhun)
|
||||
@foreach ($tangguhlelong as $index1=>$tangguhlel)
|
||||
<tr>
|
||||
<td>{{ $loop->iteration }}</td>
|
||||
<td>{{ $marhun->norujukan }}</td>
|
||||
<td>{{ $marhun->marhun }}</td>
|
||||
<td>{{ $marhun->karat }}</td>
|
||||
<td>{{ $marhun->berat }}</td>
|
||||
<td>{{ $marhun->harga }}</td>
|
||||
<td>{{ $marhun->n_marhun }}</td>
|
||||
<td>{{ $marhun->nota }}</td>
|
||||
<td>
|
||||
@if($status->status_ubah == 1)
|
||||
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN MUTU</button>
|
||||
@elseif($status->status_ubah == 2)
|
||||
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PENAMBAHAN MARHUN</button>
|
||||
@elseif($status->status_ubah == 3)
|
||||
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PENGHAPUSAN MARHUN</button>
|
||||
@endif
|
||||
</td>
|
||||
<td>{{ $tangguhlel->marhun }}</td>
|
||||
<td>{{ $tangguhlel->karat }}</td>
|
||||
<td>{{ $tangguhlel->berat }}</td>
|
||||
<td>{{ $tangguhlel->harga }}</td>
|
||||
<td>{{ $tangguhlel->n_marhun }}</td>
|
||||
<td>{{ $tangguhlel->gadai_nota }}</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
|
||||
@@ -17,23 +17,22 @@
|
||||
<tr>
|
||||
<th>Bil</th>
|
||||
<th>Nama Cawangan</th>
|
||||
<th>Tarikh Lelong Asal</th>
|
||||
<th>Tarikh Lelong</th>
|
||||
<th>Tarikh Tangguh</th>
|
||||
<th>No Rujukan</th>
|
||||
<th class="text-center">Action</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
@foreach ($tangguhlelong as $tangguhlel)
|
||||
<tr>
|
||||
<td>{{ $loop->iteration }}</td>
|
||||
<td>{{ $tangguhlel['nama_caw'] }}</td>
|
||||
<td>{{ $tangguhlel['nama_caw']['caw_name'] }}</td>
|
||||
<td>{{ $tangguhlel->tarikh_lelong }}</td>
|
||||
<td>{{ $tangguhlel->tarikhtangguh }}</td>
|
||||
<td>{{ $tangguhlel->norujukan }}</td>
|
||||
<td>
|
||||
<a href="{{ route('pengesahan.lelbidmarhun', [ $id, $tangguhlel->norujukan ]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
|
||||
<a href="{{ route('pengesahan.lelbidmarhun', [ $id, $tangguhlel->norujukan, 'tangguhlelong_id'=>$tangguhlel['details']['tangguhlelong_id'] ]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
@extends('layouts.app')
|
||||
|
||||
@section('content')
|
||||
|
||||
|
||||
|
||||
<div class="container-fluid">
|
||||
<div class="row ">
|
||||
<div class="col-md-11 mx-auto card p-4">
|
||||
@@ -34,6 +37,7 @@
|
||||
<td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $user->id }}"></td>
|
||||
<td>{{ $user->name }}</td>
|
||||
<td>{{ $user->email }}</td>
|
||||
|
||||
<td>
|
||||
@foreach ($user->roles as $taraf)
|
||||
<button class="btn btn-primary btn-sm hovernone" disabled>{{$taraf->name}}</button>
|
||||
@@ -42,6 +46,8 @@
|
||||
<td>
|
||||
@if ($user->status =='active')
|
||||
<button class="btn btn-success btn-sm hovernone-success" disabled>{{$user->status}}</button>
|
||||
@elseif ($user->status == 'inactive')
|
||||
<button class="btn btn-warning btn-sm hovernone-warning" disabled>{{$user->status}}</button>
|
||||
@elseif ($user->status =='banned')
|
||||
<button class="btn btn-danger btn-sm hovernone-danger" disabled>{{$user->status}}</button>
|
||||
@endif
|
||||
@@ -61,6 +67,65 @@
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="modal fade" tabindex="-1" id="myModal">
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title">New Pengguna</h5>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<form action="{{ route('pengguna.storepengguna') }}" method="POST" id="formpengguna">
|
||||
@csrf
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-6">
|
||||
<label for="name">Nama</label>
|
||||
<input type="text" class="form-control" name="name" id="name" required>
|
||||
</div>
|
||||
<div class="form-group col-md-6">
|
||||
<label for="username">Username</label>
|
||||
<input type="text" class="form-control" name="username" id="username" required>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-6">
|
||||
<label for="name">Cawangan</label>
|
||||
<select class="custom-select" name="caw" id="caw">
|
||||
<option value="">Pilih Cawangan</option>
|
||||
@foreach ($caw as $item)
|
||||
<option value="{{$item->caw_code}}">{{$item->caw_name}}</option>
|
||||
@endforeach
|
||||
|
||||
<!-- <option value="all">Select All</option> -->
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group col-md-6">
|
||||
<label for="email">Email</label>
|
||||
<input type="email" class="form-control" name="email" id="email" >
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-9">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary" data-dismiss="modal">Tutup</button>
|
||||
<button type="button" class="btn btn-primary" onclick="storepengguna()">Simpan</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
//Enable tooltips everywhere
|
||||
$(function () {
|
||||
@@ -115,9 +180,16 @@
|
||||
text: '<i class="fas fa-plus" id="test"></i>',
|
||||
titleAttr: 'Tambah Pengguna',
|
||||
action: function ( e, dt, node, config ) {
|
||||
alert( 'Button activated' );
|
||||
//alert( 'Button activated' );
|
||||
// console.log('hye');
|
||||
|
||||
$('#myModal').modal("show");
|
||||
$('#myModal').on('shown.bs.modal', function () {
|
||||
$('#rolename').trigger('focus')
|
||||
})
|
||||
}
|
||||
},
|
||||
|
||||
{
|
||||
className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export',
|
||||
titleAttr: 'Export to CSV',
|
||||
@@ -141,6 +213,9 @@
|
||||
$(this).prop('checked', cb.checked);
|
||||
})
|
||||
}
|
||||
function storepengguna() {
|
||||
$("#formpengguna").submit();
|
||||
}
|
||||
</script>
|
||||
|
||||
@endsection
|
||||
@endsection
|
||||
@@ -33,7 +33,7 @@
|
||||
@endforeach
|
||||
</div>
|
||||
</div>
|
||||
@if($user->user_type == 2)
|
||||
@if($user->user_type == 1)
|
||||
<div class="d-flex form-group">
|
||||
<div class="d-flex col-md-6">
|
||||
<div style="margin-right:2%;">
|
||||
@@ -44,15 +44,6 @@
|
||||
<label class="custom-control-label" for="customSwitch1" data-status="{{ $user->status }}" id="txtstatus"></lable>
|
||||
</div>
|
||||
</div>
|
||||
<div class="d-flex col-md-6">
|
||||
<div style="margin-right:2%;">
|
||||
<label for="status1">Ban</label>
|
||||
</div>
|
||||
<div class="custom-control custom-switch" >
|
||||
<input type="checkbox" class="custom-control-input" style="background-color:red !important" name="statusban" id="customSwitch2" onchange="showban(this)">
|
||||
<label class="custom-control-label" for="customSwitch2" id="txtstatusban"></lable>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
<div class="text-right pt-4">
|
||||
|
||||
+2
-1
@@ -41,6 +41,7 @@ Route::get('/pembayaran/bidbackend', 'ApiController@bidbackend')->name('pay.bidc
|
||||
Route::group(['middleware' => ['permission:pengguna'],'prefix'=>'pengguna'], function () {
|
||||
Route::get('/listpengguna',['as'=>'pengguna.index','uses'=>'PenggunaController@index']);
|
||||
Route::get('/listpengguna/{userid}',['as'=>'pengguna.show','uses'=>'PenggunaController@show']);
|
||||
Route::post('/storepengguna',['as'=>'pengguna.storepengguna','uses'=>'PenggunaController@storepengguna']);
|
||||
Route::post('/store',['as'=>'pengguna.store','uses'=>'PenggunaController@store']);
|
||||
Route::get('/delete/{userid}',['as'=>'pengguna.delete','uses'=>'PenggunaController@delete']);
|
||||
|
||||
@@ -193,7 +194,7 @@ Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'],
|
||||
Route::post('/pcdelete',['as'=>'pengesahan.pcdelete','uses'=>'MarhunController@pcdelete']);
|
||||
Route::get('/senarailelong',['as'=>'pengesahan.senarailelong','uses'=>'MarhunController@senarailelong']);
|
||||
Route::get('/senaraitangguhlelong/{id}',['as'=>'pengesahan.senaraitangguhlelong','uses'=>'MarhunController@senaraitangguhlelong']);
|
||||
Route::get('/lelbidmarhun/{id}/{norujukan}',['as'=>'pengesahan.lelbidmarhun','uses'=>'MarhunController@lelbidmarhun']);
|
||||
Route::get('/lelbidmarhun/{id}/{norujukan}/{tangguhlelong_id}',['as'=>'pengesahan.lelbidmarhun','uses'=>'MarhunController@lelbidmarhun']);
|
||||
});
|
||||
|
||||
Route::group(['middleware' => ['permission:notistamatkontrak'],'prefix'=>'notistamatkontrak'], function () {
|
||||
|
||||
Reference in New Issue
Block a user