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

Merge branch 'main' into amirah

Browse Source
This commit is contained in:
Amirah22
2022-04-27 09:14:56 +08:00
parent fdc7e59084 ef91c9de5c
commit 03d396d8d4
9 changed files with 208 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/MarhunController.php
+17 -5
View File
@@ -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'));
}
app/Http/Controllers/PenggunaController.php
+51 -2
View File
@@ -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;
app/Http/Controllers/TamatKontController.php
+23 -6
View File
@@ -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