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

Merge branch 'fixkaunter' into 'new-super'

Browse Source 
fix excel lelongan

See merge request online-sistem1/kaunter!199
This commit is contained in:
Afiq Zakwan Hamdan
2022-04-12 04:48:55 +00:00
parent 47fc9ffac2 074b54e826
commit ea5cdedddf
23 changed files with 981 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/CawanganAR.php
+18
View File
@@ -0,0 +1,18 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class CawanganAR extends Model
{
protected $table = 'cawangan';
protected $fillable = [
'details_caw',
'kodcaw',
'syarikat',
'min',
'max'
];
}
app/Events/NotifikasiPetiBesi.php
+32
View File
@@ -0,0 +1,32 @@
<?php
namespace App\Events;
use Illuminate\Queue\SerializesModels;
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Broadcasting\InteractsWithSockets;
use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
class NotifikasiPetiBesi implements ShouldBroadcast
{
use Dispatchable, InteractsWithSockets, SerializesModels;
public $cawangan,$status,$bakipetibesi;
public function __construct($cawangan,$status,$bakipetibesi)
{
$this->cawangan = $cawangan;
$this->status = $status;
$this->bakipetibesi = $bakipetibesi;
}
public function broadcastOn()
{
return ['notice-notify'];
}
public function broadcastAs()
{
return 'trigger-notify';
}
}
app/Http/Controllers/KhazanahController.php
+103 -6
View File
@@ -10,9 +10,11 @@ use App\Events\PendahuluanSerahan;
use App\Events\NotifikasiKelulusan;
use App\Events\NotifikasiUbahHapus;
use App\Events\NotifikasiAGH;
use App\Events\NotifikasiPetiBesi;
use App\User;
use App\Cawangan;
use App\CawanganAR;
use App\Lejeram;
use Illuminate\Http\Request;
@@ -1585,7 +1587,7 @@ class KhazanahController extends Controller
}
public function cetaklaporanLelongan(Request $request){
// dd($request);
// dd($request->all());
$api_url = config('api.url');
$auth_user = Auth::user();
$current = Carbon::now();
@@ -1594,7 +1596,15 @@ class KhazanahController extends Controller
if($request->jeniscetakan === 'cetak')
{
$lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/senaraibatch/laporan/'. $auth_user['cawangan'],['batchno' => $request->batchno])->json();
if($request->fasa == 1)
{
$lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/senaraibatch/laporan/'. $auth_user['cawangan'] . '/' . 'fasa1',['batchno' => $request->batchno])->json();
}else{
$lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/senaraibatch/laporan/'. $auth_user['cawangan'] . '/' . 'fasa2',['batchno' => $request->batchno])->json();
}
// $lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/senaraibatch/laporan/'. $auth_user['cawangan'],['batchno' => $request->batchno])->json();
$cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
@@ -1603,7 +1613,12 @@ class KhazanahController extends Controller
}else if($request->jeniscetakan === 'excel')
{
$lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/senaraibatch/laporan/'. $auth_user['cawangan'],['batchno' => $request->batchno])->json();
if($request->fasa == 1)
{
$lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/senaraibatch/laporan/'. $auth_user['cawangan'] . '/' . 'fasa1',['batchno' => $request->batchno])->json();
}else{
$lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/senaraibatch/laporan/'. $auth_user['cawangan'] . '/' . 'fasa2',['batchno' => $request->batchno])->json();
}
$cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
@@ -1611,7 +1626,14 @@ class KhazanahController extends Controller
}else if($request->jeniscetakan === 'pdf'){
$lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/senaraibatch/laporan/'. $auth_user['cawangan'],['batchno' => $request->batchno])->json();
if($request->fasa == 1)
{
$lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/senaraibatch/laporan/'. $auth_user['cawangan'] . '/' . 'fasa1',['batchno' => $request->batchno])->json();
$fasa = 'fasa1';
}else{
$lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/senaraibatch/laporan/'. $auth_user['cawangan'] . '/' . 'fasa2',['batchno' => $request->batchno])->json();
$fasa = 'fasa2';
}
$notislelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/details/notislelong/'. $auth_user['cawangan'])->json();
$cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$cawangan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
@@ -1619,8 +1641,8 @@ class KhazanahController extends Controller
// return view('print.notislelong', compact('cawangan_info','notislelong','api_url','cawangan_detail','lelong','tarikh_cetak'));
$pdf=PDF::loadView('print.notislelong', compact('cawangan_info','notislelong','api_url','cawangan_detail','lelong','tarikh_cetak'))->setPaper('A4','potrait');
return $pdf->download('notislelong_'.$tarikh_cetak.'.pdf');
$pdf=PDF::loadView('print.notislelong', compact('cawangan_info','notislelong','api_url','cawangan_detail','lelong','fasa','tarikh_cetak'))->setPaper('A4','potrait');
return $pdf->download('notislelong_'.$tarikh_cetak.'_'.$fasa.'.pdf');
// return $pdf->stream('notislelong_'.$tarikh_cetak.'.pdf');
// return view('print.notislelong', compact('cawangan_info','api_url','cawangan_detail','lelong','tarikh_cetak'));
@@ -3481,5 +3503,80 @@ class KhazanahController extends Controller
return view('print.notislelong', compact('cawangan_info','api_url','cawangan_detail'));
}
public function PaparanPermohonan()
{
$auth_user = Auth::user();
$api_url = config('api.url');
$current = Carbon::now();
$tarikhsemasa = $current->toDateString();
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$getVault = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/TunaiDiTangan/' . $auth_user['cawangan'],['tarikh' => $tarikhsemasa])->json();
//Dashboardall
$dashboard=Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url').'/api/Dashboard_all/'.$auth_user['cawangan'])->json();
$permohonan = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url').'/admin/permohonan/get/'.$auth_user['cawangan'])->json();
$bank = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url').'/api/bank')->json();
return view('khazanah.permohonanwang', compact('bank','cawangan_info','api_url','getVault','tarikhsemasa','dashboard','permohonan'));
}
public function RekodPermohonan()
{
$auth_user = Auth::user();
$api_url = config('api.url');
$current = Carbon::now();
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$permohonan = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url').'/admin/permohonan/rekod/'.$auth_user['cawangan'])->json();
return view('khazanah.rekodpermohonan', compact('cawangan_info','api_url','permohonan'));
}
public function SimpanPermohonan(Request $request){
// dd($request->all());
$auth_user = Auth::user();
$api_url = config('api.url');
$permohonan = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url') . '/admin/permohonan/add/'. $auth_user['cawangan'],[
'jenismohon' => $request->radwang,
'jumlahmohon' => $request->jumlahmohon,
'tarikhmohon' => $request->tarikhmohon,
'bakipetibesi' => $request->bakipetibesi,
'outstanding' => $request->outstanding,
'namapemohon' => $auth_user['name']
])->json();
if($permohonan == true)
{
return redirect()->back()->with('message', 'Permohonan Berjaya Disimpan!');
}else{
return redirect()->back()->with('error', 'Permohonan Tidak Berjaya!');
}
}
public function StatusPermohonan($mohonid){
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$permohonan = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url').'/admin/permohonan/get/'.$auth_user['cawangan'] .'/' . $mohonid)->json();
$getdescription = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url').'/admin/permohonan/description/' . $mohonid)->json();
return view('khazanah.status', compact('cawangan_info','api_url','permohonan','getdescription'));
}
}
app/Http/Controllers/LelongController.php
+3 -2
View File
@@ -41,9 +41,10 @@ class LelongController extends Controller
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$senaraibatch = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/senaraibatch/aktif/'. $auth_user['cawangan'])->json();
$senaraibatchfasa1 = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/senaraibatch/aktif/'. $auth_user['cawangan'] . '/' . 'fasa1')->json();
$senaraibatchfasa2 = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/senaraibatch/aktif/'. $auth_user['cawangan'] . '/' . 'fasa2')->json();
return view('khazanah.lelong',compact('cawangan_info','api_url','senaraibatch'));
return view('khazanah.lelong',compact('cawangan_info','api_url','senaraibatchfasa1','senaraibatchfasa2'));
}
public function resittuntutbaki($norujukan){