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

Merge branch 'main' into afiqhamzah-feat-add-capture-marhun-picture

Browse Source
This commit is contained in:
afiq.hamzah
2022-11-27 15:36:18 +08:00
parent 11236d4208 325bba16ae
commit 7f8f852b9d
82 changed files with 5081 additions and 1291 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Auth/LoginController.php
+5
View File
@@ -42,4 +42,9 @@ class LoginController extends Controller
{
return 'username';
}
public function redirectLogin()
{
return redirect()->route('login');
}
}
app/Http/Controllers/AuthMobile/AuthController.php
+1 -1
View File
@@ -133,7 +133,7 @@ class AuthController extends Controller
}
public function logoutUser(Request $request){
auth()->user()->tokens()->delete();
auth()->user()->currentAccessToken()->delete();
return [
'message' => 'Logged Out'
app/Http/Controllers/DatabaseController.php
+20 -2
View File
@@ -7,7 +7,9 @@ use Spatie\Permission\Models\Role;
use Spatie\Permission\Models\Permission;
use Illuminate\Support\Facades\Auth;
use App\Models\Cawangan;
use App\Models\Gadai;
use App\Models\TransaksiKeuntungan;
use Illuminate\Support\Facades\Http;
class DatabaseController extends Controller
{
@@ -31,7 +33,23 @@ class DatabaseController extends Controller
$caw = Cawangan::all();
// $user = Auth::user();
// $user->assignRole('admin');
return view('pengurusandatabase.senaraidb',compact('caw'));
//db cawangan - success
//db online_arrahn - success
//api_kaunter - success
//api_arrahn
$gadai = Gadai::on('KB2')->orderBy('t_gadai', 'DESC')->first();
$transaksi_keuntungan = TransaksiKeuntungan::on('main')->orderBy('id', 'DESC')->first();
$roles_harian_penilai = Http::get(config('app.api_url_kaunter') . 'api/roles_harian/KB2', [
'role_harian' => 'penilai',
])->json();
// $customer_details = Http::withOptions(['verify' => config('app.api_verify')])
// ->get('https://api.arrahn.com.my/api/customers/960403065465')->json();
// dd($gadai, $transaksi_keuntungan, $roles_harian_penilai, $customer_details);
return view('pengurusandatabase.senaraidb',compact('caw', 'gadai', 'transaksi_keuntungan', 'roles_harian_penilai'));
}
public function showConn($id)
app/Http/Controllers/HomeController.php
+2 -1
View File
@@ -76,8 +76,9 @@ class HomeController extends Controller
'lelong.cajlelong',
'lelong.sts_lelong'
)
->groupBy('cawangan_lelong.lelong_id')
->get()->toArray();
// dd($lelong, $lelong2);
//dd($lelong);
foreach($lelong as $info)
{
app/Http/Controllers/LelongController.php
+812 -31
View File
File diff suppressed because it is too large Load Diff
app/Http/Controllers/MarhunController.php
+128 -21
View File
@@ -22,6 +22,7 @@ use App\Models\LelKarat;
use App\Models\LelKarat_temp;
use App\Models\Pengesahan;
use App\Models\GadaiMarhun;
use App\Models\LelongBidder;
use App\Models\ScanSemak;
use App\Models\TangguhLelong;
use Carbon\Carbon;
@@ -59,10 +60,9 @@ class MarhunController extends Controller
$caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first();
$lelongbid = LelongBid::where('lelong_id', '=', $lelong_id) //keseluruhan
->where('caw_id', '=', $caw->id)
->get();
// dd($lelongbid->toArray());
// dd($lelongbid);
$sag = LelongBid::where('lelong_id', $lelong_id) //belum disemak
->where('caw_id', $caw->id)
@@ -127,15 +127,20 @@ class MarhunController extends Controller
->distinct()
->get();
$lelongbid = LelongBid::where('lelong_id', '=', $lelong_id) //keseluruhan
->where('caw_id', '=', $caw->id)
->get();
foreach ($lelongbid as $index1 => $bid) {
$sudahdisahkan = Pengesahan::where('lelongbid_id', $bid['id'])
->where('lelong_id', $lelong_id)
->get();
$statusdrpdpc = Pengesahan::where('lelongbid_id', $bid['id'])
->where('lelong_id', $lelong_id)
->where('status_ubah', 6)
->first();
// $status = Pengesahan::where('lelongbid_id', $bid['id'])
// ->where('lelong_id', $lelong_id)
// ->first();
$statusSemakMarhun = ScanSemak::where('lelongbid_id', $bid['id'])
->whereNotNull('scan_keluar')
@@ -147,32 +152,47 @@ class MarhunController extends Controller
}
$lelongbid[$index1]['statustangguhlel'] = $statusdrpdpc;
// $lelongbid[$index1]['status'] = $status;
if ($sudahdisahkan) {
$sudahdisahkan = Pengesahan::where('lelongbid_id', $bid['id'])
->where('lelong_id', $lelong_id)
->get();
// dump($sudahdisahkan);
// if ($sudahdisahkan) {
foreach ($sudahdisahkan as $sahkan) {
// dd($sahkan);
$lelongbidmarhun = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.id', '=', 'pengesahan.lelongbidmarhun_id')
$status = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.id', '=', 'pengesahan.lelongbidmarhun_id')
->where('lelongbidmarhun.id', $sahkan['lelongbidmarhun_id'])
->where('pengesahan.status', '0')
->select('pengesahan.disahkan_oleh',
'pengesahan.disahkan_pada'
'pengesahan.disahkan_pada',
'pengesahan.status'
)
->first();
$lelongbid[$index1]['pengesahan'] = $lelongbidmarhun;
$lelongbid[$index1]['status'] = $status;
// $lelongbid[$index1]['pengesahanbysag'] = $sudahdisahkan;
// dd($lelongbid[$index1]['pengesahan']);
}
} else {
//
}
// } else {
// }
$marhun = LelongBidMarhun::where('lelongbid_id', '=', $bid['id'])
->get()
->toArray();
$lelongbid[$index1]['marhun'] = $marhun;
}
return view('marhun.senaraimarhun', compact('lelongbid', 'lelong_id', 'caw', 'sag', 'dalamproses', 'sdhdisemak', 'sdhdisahkan', 'sdhdisemaktangguhlel', 'dalamprosestangguhlel', 'sdhdisahkantangguhlel'));
// dd($status);
// $index->status = $status;
}
// dd($sudahdisahkan);
return view('marhun.senaraimarhun', compact('sudahdisahkan','lelongbid', 'lelong_id', 'caw', 'sag', 'dalamproses', 'sdhdisemak', 'sdhdisahkan', 'sdhdisemaktangguhlel', 'dalamprosestangguhlel', 'sdhdisahkantangguhlel'));
}
public function kemaskini(Request $request)
@@ -711,7 +731,7 @@ class MarhunController extends Controller
->where('kodcaw', '=', $user['kodcaw'])
->get()
->toArray();
//dd($lelongs);
dd($lelongs);
$arraycaw = [];
@@ -2040,6 +2060,22 @@ class MarhunController extends Controller
public function listScanBarcodejual($lelong_id)
{
// $user = Auth::user();
// $caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first();
// $lelongDetail = Lelong::where('id', '=', $lelong_id)->first();
// $lelongbid = LelongBid::where('lelong_id', '=', $lelong_id)
// ->where('status_payment', '=', '1')
// ->where('caw_id', '=', $caw->id)
// ->get();
// $senaraiScanKeluar = ScanSemak::where('lelong_id', '=', $lelong_id)
// ->where('kodcaw', '=', $caw->caw_code)
// ->where('serahkpdpembida', '=', '1')
// ->orderBy('id', 'desc')
// ->get();
// dd($senaraiScanKeluar);
$user = Auth::user();
$caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first();
@@ -2047,16 +2083,36 @@ class MarhunController extends Controller
$lelongbid = LelongBid::where('lelong_id', '=', $lelong_id)
->where('status_payment', '=', '1')
->where('caw_id', '=', $caw->id)
->select('id')
->get()
->keyBy('id');
foreach ($lelongbid as $index => $value) {
$namabidder = LelongBidder::
where('lelongbid_id', '=', $value['id'])
// ->where('lelongbid.kodcaw', '=', $user->kodcaw)
->where('lelongbidder.status_bidder','=','1')
->select('lelongbidder.lelongbid_id','lelongbidder.nama_bidder')
->get();
// dump($namabidder);
$lelongbid[$index]['nama_bidder'] = $namabidder;
}
// dd($namabidder);
$senaraiScanKeluar = ScanSemak::where('lelong_id', '=', $lelong_id)
->where('kodcaw', '=', $caw->caw_code)
->where('serahkpdpembida', '=', '1')
->orderBy('id', 'desc')
// ->whereNull('scan_masuk')
->get();
// dd($senaraiScanKeluar);
return view('marhun.scanbarcodejual', compact('lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar'));
$pluckLelongBid = $lelongbid->pluck('id')->toArray();
$pluckScanKeluar = $senaraiScanKeluar->pluck('lelongbid_id')->toArray();
$diff_lelong_bid = array_diff($pluckLelongBid, $pluckScanKeluar);
$new_lelong_bid = LelongBid::with('scanSemakSelesaiJual')
->whereIn('id', $diff_lelong_bid)
->get();
// dd($new_lelong_bid);
return view('marhun.scanbarcodejual', compact('namabidder','new_lelong_bid','lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar'));
}
public function scanKeluarMarhunjual(Request $request)
{
@@ -2262,6 +2318,57 @@ class MarhunController extends Controller
return $this->marhunPhotoService->show($request->norujukan_sag, $marhun);
}
public function exportmarhundetailspembida($lelong_id)
{
$user = Auth::user();
//dd($user);
$lelongs = LelongBid::join('lelongbidder', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbid.lelong_id', '=', $lelong_id)
->where('lelongbid.kodcaw', '=', $user->kodcaw)
->where('lelongbidder.status_bidder','=','1')
->where('lelongbid.status_jual', '=', 1)
->where('lelongbid.status_payment', '=', 1)
->select('lelongbid.id','lelongbid.norujukan','lelongbidder.nama_bidder')
->orderBy('lelongbid.norujukan')
->get();
// ->toArray();
// dd($lelongs);
$arraycaw = [];
$total_berat = 0;
$berat = 0;
$total_harga = 0;
$harga = 0;
$total_nmarhun = 0;
$nilai_marhun = 0;
$total_hargaasas = 0;
$hargaasas = 0;
foreach ($lelongs as $index1 => $lelong) {
$marhun = LelongBidMarhun::where('lelongbid_id', '=', $lelong['id'])->get();
$total_berat = $total_berat + $marhun->sum('berat');
$lelongs[$index1]['detailmarhun'] = $marhun;
}
// dd( $total_berat );
array_push($arraycaw, [
'berat' => $berat,
'harga' => $harga,
'n_marhun' => $nilai_marhun,
'hargaasas' => $hargaasas,
]);
$pdf = PDF::loadView('pdf.marhundetailspembida', compact('lelongs', 'arraycaw', 'total_nmarhun', 'total_berat', 'total_harga', 'total_hargaasas'))->setPaper('a4', 'potrait');
return $pdf->download('Senarai Marhun Pembida.pdf');
}
}
app/Http/Controllers/NotisController.php
+4 -1
View File
@@ -162,7 +162,10 @@ class NotisController extends Controller
->where('nokp','=',$cal['nokp'])
->get();
// dd($listsag);
foreach($listsag as $index=>$listing){
foreach($listsag as $index=>$listing)
{
$bayaran = $listing['hargajualan'] - $listing['bakihargajualan'];
app/Http/Controllers/PaymentController.php
+9 -2
View File
@@ -301,7 +301,8 @@ class PaymentController extends Controller
$sagmenang = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->join('users', 'lelongbidder.user_id', '=', 'users.id')
->where('lelongbid.status_jual', 1)
->where('users.id', $request->user_id)
->where('lelongbidder.status_bidder', 1)
->where('lelongbidder.user_id', $request->user_id)
->where('lelongbid.lelong_id', $request->lelong_id)
->where('lelongbid.kodcaw', $user->kodcaw)
->select('lelongbidder.hargabida',
@@ -312,6 +313,9 @@ class PaymentController extends Controller
'lelongbidder.status_payment'
)
->get();
// dd($sagmenang);
foreach($sagmenang as $index1=>$bid)
{
@@ -319,6 +323,8 @@ class PaymentController extends Controller
$eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->join('users', 'lelongbidder.user_id', '=', 'users.id')
->where('lelongbidder.lelongbid_id', $bid->lelongbid_id)
->where('lelongbid.status_jual', 1)
->where('lelongbidder.status_bidder', 1)
->where('lelongbidder.user_id', $request->user_id)
->where('lelongbid.kodcaw', $user->kodcaw)
->select('lelongbidder.hargabida',
@@ -338,6 +344,7 @@ class PaymentController extends Controller
'user_id' => $request->user_id,
'lelong_id' => $request->lelong_id,
'kodcaw' => $user->kodcaw,
'lelongbid_id' => $bid->lelongbid_id,
// 'norujukan' => $norujukan_id[$index1],
'norujukan' => $bid->norujukan,
'status_payment_opt' => 1,
@@ -362,7 +369,7 @@ class PaymentController extends Controller
$eachbidupdate = LelongBid::where('id',$bid->lelongbid_id)->first();
$eachbidupdate->status_jual = 1;
$eachbidupdate->status_payment = '1';
$eachbidupdate->t_jual = $currentdate;
// $eachbidupdate->t_jual = $currentdate;
$eachbidupdate->hargajual = $eachbid->hargabida;
$eachbidupdate->save();
app/Http/Controllers/PenggunaController.php
+21 -11
View File
@@ -91,6 +91,22 @@ class PenggunaController extends Controller
{
return redirect()->route('pengguna.index')->with('failed','Maaf, Nama Pengguna / Emel Berikut Telah Wujud !');
} else {
$allroles = Role::all()->pluck('name');
$arraytaraf = [];
$counttaraf = 0;
foreach($allroles as $index=>$taraf) {
$req = 'taraf'.$taraf;
if($request->$req)
{
$counttaraf++;
array_push($arraytaraf,$taraf);
}
}
if($counttaraf < 1){
return redirect()->route('pengguna.index')->with('failed','Maaf, Taraf Tidak Dipilih');
}
$user = new User;
$user->name = $request->name;
$user->username = $request->username;
@@ -103,18 +119,12 @@ class PenggunaController extends Controller
$user->user_type = 1;
$user->save();
$allroles = Role::all()->pluck('name');
$arraytaraf = [];
foreach($allroles as $index=>$taraf) {
$req = 'taraf'.$taraf;
if($request->$req)
{
array_push($arraytaraf,$taraf);
}
}
$user->syncRoles($arraytaraf);
return redirect()->route('pengguna.index')
->with('success', 'Pengguna Berjaya Disimpan');
return redirect()->route('pengguna.index')
->with('success', 'Pengguna Berjaya Disimpan');
}
}
app/Http/Controllers/ReportController.php
+69 -16
View File
@@ -89,12 +89,15 @@ class ReportController extends Controller
$arraydetails = [];
$arrayinfo = [];
$test = Lelong::with(['cawangan','lelongBid'])
->find($lelong_id);
$cawangan = $test->cawangan;
$lelong_bid = $test->lelongBid;
$cawangan = $test->cawangan
->where('caw_code','=',$kodcaw);
// dd($cawangan[0]['caw_name']);
$lelong_bid = $test->lelongBid
->where('kodcaw','=',$kodcaw);
@@ -110,7 +113,7 @@ class ReportController extends Controller
$pdf = PDF::loadView('pdf.listlelong',compact('cawangan','lelong_bid','total_hargaasas','total_berat'))
$pdf = PDF::loadView('pdf.listlelong',compact('test','cawangan','lelong_bid','total_hargaasas','total_berat'))
->setPaper('a4', 'potrait');
return $pdf->download('Senarai Barang Lelong.pdf');
@@ -127,7 +130,6 @@ class ReportController extends Controller
->get()
->toArray();
foreach($brgdetails as $brg)
{
$details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
@@ -207,7 +209,7 @@ class ReportController extends Controller
$pdf = PDF::loadView('pdf.listlelongdetails',compact('lelongs','arraycaw','total_nmarhun','total_berat','total_harga','total_hargaasas','arrayinfo'
$pdf = PDF::loadView('pdf.listlelongdetails',compact('lelongs','arraycaw','total_nmarhun','total_berat','total_harga','total_hargaasas','arrayinfo','nilai_marhun'
))->setPaper('a4', 'potrait');
return $pdf->download('Senarai Lelong Details.pdf');
@@ -347,7 +349,14 @@ class ReportController extends Controller
$total_hargalelong = 0;
$total_bakirugi = 0;
$total_hargaasas = 0;
$jumlahmargin = 0;
$arrayinfocaw = [];
$arraydetails = [];
$rugilelong = 0;
$bakilelong = 0;
$total_rugilelong = 0;
$total_bakilelong = 0;
$info = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
@@ -372,12 +381,35 @@ class ReportController extends Controller
->where('lelongbidder.status_bidder','=','1')
->where('lelongbid.kodcaw',$kodcaw)
->select('lelongbid.norujukan','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.upahsimpan',
'lelongbid.cajlelong','lelongbidder.hargabida','lelongbid.baki','lelongbid.hargaasas','lelongbidder.nama_bidder')
'lelongbid.cajlelong','lelongbidder.hargabida','lelongbid.baki','lelongbid.hargaasas','lelongbidder.nama_bidder','bakiupah')
->get()->toArray();
foreach($laporanlelong as $index1=>$laplelong)
{
$margin = ($laplelong['pinjaman']/ $laplelong['nilaimarhun'])*100;
$lelong = Lelong::where('id',$lelong_id)->get();
$sumcajlelong = $laplelong['hargaasas'] * ($lelong[0]['cajlelong']/100);
$totalbaki = $laplelong['hargaasas'] - $laplelong['pinjaman'] - $laplelong['bakiupah'] - bcdiv($sumcajlelong,1,1);
if($laplelong['baki'] > 0)
{
$bakilelong = $bakilelong + $laplelong['baki'];
}
else
{
$rugilelong = $rugilelong + $laplelong['baki'];
}
// if($laplelong['baki'] < 0)
// {
// $rugilelong = $rugilelong + $laplelong['baki'];
// }
$total_nmarhun = $total_nmarhun + $laplelong['nilaimarhun'];
$total_pembiayaan = $total_pembiayaan + $laplelong['pinjaman'];
$total_upahsimpan = $total_upahsimpan + $laplelong['upahsimpan'];
@@ -385,14 +417,29 @@ class ReportController extends Controller
$total_hargalelong = $total_hargalelong + $laplelong['hargabida'];
$total_bakirugi = $total_bakirugi + $laplelong['baki'];
$total_hargaasas = $total_hargaasas + $laplelong['hargaasas'];
array_push($arraydetails,['laplelong' => $laplelong,
'margin' => $margin,
'rugilelong'=>$rugilelong,
'bakilelong'=>$bakilelong,
]);
$total_rugilelong = $total_rugilelong + $rugilelong;
$total_bakilelong = $total_bakilelong + $bakilelong;
}
$pdf = PDF::loadView('pdf.pdflaplelong',compact('info','lelong_id','laporanlelong','lelong_id','total_nmarhun','total_pembiayaan',
'total_upahsimpan','total_cajlelong','total_hargalelong','total_bakirugi','total_hargaasas','arrayinfocaw'))
->setPaper('a4', 'potrait');
$pdf = PDF::loadView('pdf.pdflaplelong',compact('info','lelong_id','laporanlelong','lelong_id','total_nmarhun','total_pembiayaan',
'total_upahsimpan','total_cajlelong','total_hargalelong','total_bakirugi','total_hargaasas','arrayinfocaw','margin','arraydetails',
'total_rugilelong','total_bakilelong','bakilelong','rugilelong'))
->setPaper('a4', 'landscape');
return $pdf->download('Laporan Lelong Keseluruhan.pdf');
@@ -564,6 +611,7 @@ class ReportController extends Controller
$total_cajlelong = 0;
$total_bakilelong = 0;
$total_rugilelong = 0;
$total_baki = 0;
$marhuns = SimulasiBid::join('cawangan', 'simulasibid.caw_id', '=', 'cawangan.id')
// ->join('gadai','simulasibid.norujukan','=','gadai.norujukan')
@@ -640,13 +688,14 @@ class ReportController extends Controller
$total_hargaasas = $total_hargaasas + $cal['hargaasas'];
$total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun'];
$total_bakiupah = $total_bakiupah + $cal['bakiupah'];
$total_cajlelong = $total_cajlelong + $cal['cajlelong'];
$total_cajlelong = $total_cajlelong + $cal['cajlelong'];
$total_baki = $total_baki + $cal['baki'];
$datacaw = Cawangan::where('id','=',$cawid)
->get();
}
$pdf = PDF::loadView('pdf.pdfsimulasireport',compact('arraymarhun','marhuns','simulasi_id','cawid','keuntungan','datacaw','total_berat','total_pinjaman','total_hargaasas','total_nilaimarhun','total_bakiupah','total_cajlelong','total_bakilelong','total_rugilelong'))
$pdf = PDF::loadView('pdf.pdfsimulasireport',compact('arraymarhun','marhuns','simulasi_id','cawid','keuntungan','datacaw','total_berat','total_pinjaman','total_hargaasas','total_nilaimarhun','total_bakiupah','total_cajlelong','total_bakilelong','total_rugilelong','total_baki'))
->setPaper('a4','potrait');
return $pdf->download('Laporan Simulasi Cawangan.pdf');
@@ -754,8 +803,9 @@ class ReportController extends Controller
// dd($customer);
$simulasilel = Lelong::where('id',$lelongid)->get();
$sumcajlelong = $cal['hargaasas'] * ($simulasilel[0]['cajlelong']/100);
$totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - bcdiv($sumcajlelong,1,1);
$marhuns[$index1]['cajlelong'] = bcdiv($sumcajlelong,1,1);
$cajlelongnew = round($sumcajlelong,1,1);
$totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - $cajlelongnew;
$marhuns[$index1]['cajlelong'] = $cajlelongnew;
$marhuns[$index1]['baki'] = $totalbaki;
@@ -785,7 +835,7 @@ class ReportController extends Controller
$total_hargaasas = $total_hargaasas + $cal['hargaasas'];
$total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun'];
$total_bakiupah = $total_bakiupah + $cal['bakiupah'];
$total_cazlelong = $total_cazlelong + bcdiv($sumcajlelong,1,1);
$total_cazlelong = $total_cazlelong + $cajlelongnew;
}
@@ -888,6 +938,9 @@ class ReportController extends Controller
$cawangan[$index1]['detail']=$marhuns;
}
$getpengesahan = Cawangan::where('caw_code', $kodcaw)->first();
return view('marhun.ubahmarhun', compact('cawangan','lelong_id','getpengesahan'));
}
app/Http/Controllers/SimulasiController.php
+179 -16
View File
@@ -402,7 +402,7 @@ class SimulasiController extends Controller
foreach($simulasi_bid_arr as $index) {
$updategadai = Http::withOptions(['verify' => config('app.api_verify')])
->post(config('app.api_url').'taglel/update',[
'kodcaw'=>$index['caw_id'],
'kodcaw'=>$index['kodcaw'],
'norujukan'=>$index['norujukan']
])
->json();
@@ -977,11 +977,12 @@ class SimulasiController extends Controller
$bakiupah += $sim_bid->bakiupah;
$berat += $sim_bid->berat;
$hargaasas += $sim_bid->hargaasas;
$cajlelong += $sim_bid->cajlelong;
$sumcajlelong = $sim_bid['hargaasas'] * ($simulasi['cajlelong']/100);
$cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
$totalbaki = $sim_bid['hargaasas'] - $sim_bid['pinjaman'] - $sim_bid['bakiupah'] - bcdiv($sumcajlelong,1,1);
$sumcajlelong = $sim_bid['hargaasas'] * ($simulasi['cajlelong']/100);
// $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
$cajlelong = $cajlelong + $sim_bid['cajlelong'];
$totalbaki = $sim_bid['hargaasas'] - $sim_bid['pinjaman'] - $sim_bid['bakiupah'] - $sim_bid['cajlelong'];
if(strpos($totalbaki, '-') !== false)
{
$rugi = -$totalbaki;
@@ -1132,7 +1133,12 @@ class SimulasiController extends Controller
$total_untung_asal = TransaksiKeuntungan::where('norujukan','=',$bid['norujukan'])->sum('bayaran_keuntungan');
$beza_keuntungan = $total_untung_asal - $total_untung_rebet;
$detail_sag = Gadai::on($bid->kodcaw)->where('norujukan',$bid->norujukan)->first();
$keuntungan = bcdiv(($detail_sag['tempoh']-$detail_sag['tempohbayar'])*$detail_sag['kadarupah']/100*$detail_sag['bakipjm'],1,1)-$beza_keuntungan;
// $keuntungan = bcdiv(($detail_sag['tempoh']-$detail_sag['tempohbayar'])*$detail_sag['kadarupah']/100*$detail_sag['bakipjm'],1,1)-$beza_keuntungan;
if($detail_sag['tempohbayar'] == $detail_sag['tempoh'] ){
$keuntungan = 0.00;
}else{
$keuntungan = bcdiv(($detail_sag['tempoh']-$detail_sag['tempohbayar'])*$detail_sag['kadarupah']/100*$detail_sag['bakipjm'],1,1)-$beza_keuntungan;
}
$sumhargaasas = 0;
$simulasibidmarhun = SimulasiBidMarhun::where('simulasibid_id','=',$bid['id'])->get();
@@ -1165,13 +1171,16 @@ class SimulasiController extends Controller
}
$simulasi = Simulasi::where('id',$request->idsimulasi)->get();
$sumcajlelong = $sumhargaasas * ($simulasi[0]['cajlelong']/100);
$sumcajlel = round($sumcajlelong,1,1);
// $keuntungannew = bcdiv($keuntungan,1,1);
$totalbaki = $sumhargaasas - $detail_sag->bakipjm - bcdiv($keuntungan,1,1) - bcdiv($sumcajlelong,1,1);
$totalbaki = $sumhargaasas - $detail_sag->bakipjm - $keuntungan - $sumcajlel;
// dump($sumhargaasas);
$kirakeuntungan = SimulasiBid::where('norujukan',$bid['norujukan'])
->update([
'bakiupah'=> bcdiv($keuntungan,1,1),
'bakiupah'=> $keuntungan,
'hargaasas'=> $sumhargaasas,
'cajlelong'=> bcdiv($sumcajlelong,1,1),
'cajlelong'=> $sumcajlel,
'baki'=> $totalbaki,
]);
@@ -1182,10 +1191,11 @@ class SimulasiController extends Controller
$loguser->username = $user->username;
$loguser->nama_user = $user->name;
$loguser->norujukan = $bid['norujukan'];
$loguser->nota = ' Kemaskini Harga Asas/Keuntungan '.bcdiv($keuntungan,1,1);
$loguser->nota = ' Kemaskini Harga Asas/Keuntungan '.$keuntungan;
$loguser->save();
}
// dd($sumhargaasas);
return redirect()->route('analisa.show',$request->idsimulasi)
->with('success','Kemaskini Harga Emas Berjaya');
@@ -1417,6 +1427,7 @@ class SimulasiController extends Controller
$rugilelong = 0;
$bakilelong = 0;
$keuntungan = 0;
$total_baki = 0;
$simulasilel = Simulasi::with('cawangan')->find($simulasi_id);
@@ -1444,16 +1455,17 @@ class SimulasiController extends Controller
// $simulasilel = Simulasi::where('id',$simulasi_id)->get();
$sumcajlelong = $cal['hargaasas'] * ($simulasilel->cajlelong/100);
$totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - bcdiv($sumcajlelong,1,1);
$marhuns[$index1]['cajlelong'] = bcdiv($sumcajlelong,1,1);
$marhuns[$index1]['baki'] = $totalbaki;
$baki = $cal['baki'];
$marhuns[$index1]['cajlelong'] = $cal['cajlelong'];
$marhuns[$index1]['baki'] = $baki;
$total_berat = $total_berat + $cal['berat'];
$total_pinjaman = $total_pinjaman + $cal['pinjaman'];
$total_hargaasas = $total_hargaasas + $cal['hargaasas'];
$total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun'];
$total_bakiupah = $total_bakiupah + $cal['bakiupah'];
$total_cazlelong = $total_cazlelong + bcdiv($sumcajlelong,1,1);
$total_baki = $total_baki + $cal['baki'];
$total_cazlelong = $total_cazlelong + $cal['cajlelong'];
array_push($arraymarhun,[
@@ -1478,7 +1490,8 @@ class SimulasiController extends Controller
'total_hargaasas',
'simulasilel',
'cawanganDetail',
'total_cazlelong'));
'total_cazlelong',
'total_baki'));
}
public function deletemarhunlel(Request $request){
@@ -2156,7 +2169,8 @@ class SimulasiController extends Controller
'total_bakilelong',
'data',
'total_bakiupah',
'total_nilaimarhun'
'total_nilaimarhun',
'kali'
));
}
@@ -2483,6 +2497,155 @@ class SimulasiController extends Controller
}
public function exportkali(Request $request)
{
$kali = $request->kali;
// dd($lelong_id);
$simulasi = Simulasi::where('kali','=',$kali)->first();
$simulasilel = CawanganSimulasi::where('kali','=',$kali)->get();
// dd($simulasilel);
// $lelkarat = LelKarat::where('lelong_id','=',$lelong_id)->get();
// $jeniskarat = JenisKarat::all();
$arraydata = [];
$arraycaw = [];
$data = [];
$total_marhun = 0;
$total_berat = 0;
$total_nmarhun = 0;
$total_pinjaman = 0;
$total_upah = 0;
$total_hargaasas = 0;
$total_cazlelong = 0;
$total_rugilelong = 0;
$total_bakilelong = 0;
$total24Kgb = 0;
$total24K = 0;
$total23k = 0;
$total22K = 0;
$total21K = 0;
$total20K = 0;
$total18Kp = 0;
$total18K = 0;
$total14Kp = 0;
$total14K = 0;
$total9K = 0;
$total_nilaimarhun = 0;
$nilai_marhun = 0;
$total_bakiupah = 0;
foreach($simulasilel as $simlel)
{
$cawangan = Cawangan::where('id','=',$simlel->caw_id)->first();
$databid = SimulasiBid::join('cawangan_simulasi','cawangan_simulasi.caw_id','=','simulasibid.caw_id')
->select('simulasibid.id','simulasibid.berat','simulasibid.marhun','simulasibid.cajlelong','simulasibid.baki','simulasibid.nilaimarhun',
'simulasibid.pinjaman','simulasibid.hargaasas','simulasibid.cajlelong','simulasibid.bakiupah')
->where('cawangan_simulasi.caw_id','=', $simlel->caw_id)
->where('cawangan_simulasi.simulasi_id','=', $simlel->simulasi_id)
->get();
// dd($databid);
$t_simulasi = Simulasi::join('cawangan_simulasi','cawangan_simulasi.simulasi_id','=','simulasi.id')
->where('cawangan_simulasi.simulasi_id','=', $simlel->simulasi_id)
->where('cawangan_simulasi.kali','=',$kali)->first();
// dd($t_simulasi);
// dd($databid->toArray());
$packet = 0;
$berat = 0;
$pinjaman =0;
$nilai_marhun = 0;
$bakiupah = 0;
$hargaasas = 0;
$cajlelong = 0;
$rugilelong = 0;
$bakilelong = 0;
$id = $simlel->simulasi_id;
foreach($databid as $index1=>$bid)
{
$marhun = SimulasiBidMarhun::where('simulasibid_id','=',$bid['id'])->get();
$berat = $berat + $bid['berat'];
$nilai_marhun = $nilai_marhun + $bid['nilaimarhun'];
$pinjaman =$pinjaman + $bid['pinjaman'];
$bakiupah = $bakiupah + $bid['bakiupah'];
$hargaasas = $hargaasas + $bid['hargaasas'];
// $cajlelong = $cajlelong + $bid['cajlelong'];
$lelongsim = Simulasi::where('id',$id)->get();
$sumcajlelong = $bid['hargaasas'] * ($lelongsim[0]['cajlelong']/100);
$cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
$totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - bcdiv($sumcajlelong,1,1);
if($totalbaki > 0)
{
$bakilelong = $bakilelong + $totalbaki;
}
else
{
$rugilelong = $rugilelong - $totalbaki;
}
}
array_push($arraycaw,[
'id_cawangan'=> $cawangan['id'],
'cawangan'=>$cawangan['caw_name'],
't_simulasi'=>$simulasi['tarikh_lelong'],
'bil_marhun'=>sizeof($databid),
// 'jbg'=>$bid['jbg'],
'berat'=>$berat,
'n_marhun'=>$nilai_marhun,
'pinjaman'=>$pinjaman,
'upahsimpan'=>$bakiupah,
'bakiupah'=>$bakiupah,
'hargaasas'=>$hargaasas,
'cajlelong'=>$cajlelong,
'rugilelong'=>$rugilelong,
'bakilelong'=>$bakilelong,
]);
$total_marhun = $total_marhun + sizeof($databid);
$total_berat = $total_berat + $berat;
$total_pinjaman = $total_pinjaman + $pinjaman;
$total_hargaasas = $total_hargaasas + $hargaasas;
$total_cazlelong = $total_cazlelong + $cajlelong;
$total_rugilelong = $total_rugilelong + $rugilelong;
$total_bakilelong = $total_bakilelong + $bakilelong;
$total_nilaimarhun = $total_nilaimarhun + $nilai_marhun;
$total_bakiupah = $total_bakiupah + $bakiupah;
$data = Simulasi::where('kali','=',$kali)
->first();
}
$pdf = PDF::loadView('pdf.simreportkali',compact('arraycaw',
'total_marhun',
'total_berat',
'total_nmarhun',
'total_pinjaman',
'total_upah',
'total_hargaasas',
'total_cazlelong',
'total_rugilelong',
'total_bakilelong',
'kali',
'data',
'total_bakiupah',
'total_nilaimarhun'
))->setPaper('a4', 'landscape');
return $pdf->download('Lelongan Simulasi Keseluruhan Mengikut Kali.pdf');
}
app/Http/Controllers/TangguhLelongController.php
+12 -5
View File
@@ -43,10 +43,6 @@ class TangguhLelongController extends Controller
foreach($lelong as $info)
{
// $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
// ->where('lelong_id',$info['lelong_id'])
$detailsinfo = CawanganLelong::select('cawangan_lelong.caw_id','caw_name','lelongbid.status_jual','caw_code')
->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->join('lelongbid','lelongbid.kodcaw','=','cawangan.caw_code')
@@ -921,9 +917,19 @@ class TangguhLelongController extends Controller
->where('lelong.sts_lelong',0)
->select('cawangan_lelong.lelong_id', 'cawangan_lelong.caw_id','lelong.sts_lelong','cawangan.caw_name','lelong.tarikh_lelong','cawangan.caw_code','lelong.jbg')
->distinct()
->orderBy('cawangan_lelong.lelong_id')
->get()
->toArray();
$lelong= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
->where('lelong.sts_lelong',0)
->select('lelong_id','tarikh_lelong','lelong.fasa','jbg','sts_lelong')
->distinct()
->orderBy('lelong_id')
->get()
->toArray();
// dd($lelong);
foreach($lelong as $info)
{
@@ -933,7 +939,7 @@ class TangguhLelongController extends Controller
->toArray();
$sag = TangguhLelong::where('lelong_id', $info['lelong_id'])
->where('kodcaw', $info['caw_code'])
// ->where('kodcaw', $info['caw_code'])
->where('status',4)
->select('norujukan')
->get()
@@ -954,6 +960,7 @@ class TangguhLelongController extends Controller
$currentdate = $currentdate->toDateTimeString();
$tangguh = TangguhLelong::where('status',4)
->where('kodcaw','=',$caw_code)
->get();
// dd($pengesahan);