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

fix skit2

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-05-20 16:54:16 +08:00
parent 3adc94849b
commit dd0ca831da
19 changed files with 1340 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AliranTunaiController.php
+3 -3
View File
@@ -108,7 +108,7 @@ class AliranTunaiController extends Controller
$tuntutbaki = Http::get(config('api.url').'/api/TuntutBaki/'.$auth_user['cawangan'])->json();
$requestkodlaluan = Http::get(config('api.url').'/api/get/pengguna/'.$auth_user['cawangan'],["namateller" => Auth::user()->name ])->json();
$advansur = Http::get(config('api.url').'/api/AnsuranByTarikh/'.$auth_user['cawangan'],['kodlaluan' => $requestkodlaluan[0]['kodlaluan']])->json();
$advansur = Http::get(config('api.url').'/api/AnsuranByTarikh/'.$auth_user['cawangan'],['kodlaluan' => Auth::user()->name ])->json();
// dd($advansur);
//******************* INITIALIZE LEJER AM START HERE****************************//
@@ -1517,8 +1517,8 @@ class AliranTunaiController extends Controller
}
$penebusan = floatval($totaltebus) + floatval($totalansuran) + floatval($totalupahlama);
$penebusanbarcodescanned = floatval($totaltebusbarcodescanned) + floatval($totalansuran) + floatval($totalupahlama) + $rugilelong;
$gadaian = floatval($totalgadai) + $bakilelong;
$penebusanbarcodescanned = floatval($totaltebusbarcodescanned) + floatval($totalansuran) + floatval($totalupahlama);
$gadaian = floatval($totalgadai);
$bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)) - floatval($totaltuntutbaki);
app/Http/Controllers/KhazanahController.php
+87 -3
View File
@@ -84,10 +84,12 @@ class KhazanahController extends Controller
$bakilelong = Http::get(config('api.url') . '/api/bakilelong/cawangan/' . $auth_user['cawangan'] . '/' . Session::get('noic') . '/baki')->json();
$rugilelong = Http::get(config('api.url') . '/api/bakilelong/cawangan/' . $auth_user['cawangan'] . '/' . Session::get('noic') . '/rugi')->json();
$negeri = Http::get(config('api.url') . '/api/negeri/')->json();
$request->session()->forget('page_reload');
$request->session()->forget('norujukan');
return view('khazanah.info',compact('cawangan_info','api_url','customer_info','bakilelong','rugilelong'));
return view('khazanah.info',compact('cawangan_info','api_url','customer_info','bakilelong','rugilelong','negeri'));
}
public function menu()
@@ -2942,7 +2944,7 @@ class KhazanahController extends Controller
$totalpinjhapuskirasehari = $kawalanstok[3]['hapuskiraini1'][0]['pinj'] + $kawalanstok[3]['hapuskiraini2'][0]['pinj'] + $kawalanstok[3]['hapuskiraini3'][0]['pinj'];
$totalpinjhapuskira = $totalpinjhapuskirakeseluruhan + $totalpinjhapuskirasehari;
$totalbilkawalanstok = $totalbilgadai-$totalbiltebus-$totalbilans-$totalbillelong-$totalbilhapuskira;
$totalbilkawalanstok = $totalbilgadai-$totalbiltebus/*-$totalbilans*/-$totalbillelong-$totalbilhapuskira;
$totalpinjkawalanstok = $totalpinjgadai-$totalpinjtebus-$totalpinjans-$totalpinjlelong-$totalpinjhapuskira;
return view('print.laporan_ringkasanharian', compact('cawangan_detail','tarikh_cetak','ringkasan_date','api_url','laporan','totalbilkawalanstok','totalpinjkawalanstok'));
@@ -3393,6 +3395,7 @@ class KhazanahController extends Controller
$cajlelong = Http::get(config('api.url').'/api/cajlelong/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
$keuntungansebenar = Http::get(config('api.url').'/api/KeuntunganSebenar/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
$cajperkhidmatan = Http::get(config('api.url').'/api/cajperkhidmatanterkumpul/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
$hapuskira = Http::get(config('api.url').'/api/CalculationHapusKira/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
//TunaiDitangan Sementara Upah
if($tarikh_imbangan2 > '2021-04-22' && $tarikh_imbangan2 < '2021-05-05' && $cawangan_detail['kodcaw'] == 'KB2')
@@ -3466,6 +3469,7 @@ class KhazanahController extends Controller
if($rugilelongxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/191','descpt' => 'Rugi Lelong Xtra','amaun' => -$rugilelongxtra]);
if($utgterkumpulxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/201','descpt' => 'Untung/Rugi Terkumpul Xtra','amaun' => $utgterkumpulxtra]);
if($jualan1stop > 0) array_push($tanggungansemasa,['glcode' => '9000/501','descpt' => 'Jualan 1 Stop','amaun' => $jualan1stop]);
if($hapuskira > 0) array_push($tanggungansemasa,['glcode' => '3000/011','descpt' => 'Hapus Kira','amaun' => -$hapuskira]);
$totaltanggungansemasa = 0;
@@ -3682,6 +3686,40 @@ class KhazanahController extends Controller
}
public function laporan_tuntutbaki(Request $request)
{
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('khazanah.laporan.tuntutbaki', compact('cawangan_info','api_url'));
}
public function cetaklaporan_tuntutbaki(Request $request){
$api_url = config('api.url');
$auth_user = Auth::user();
$current = Carbon::now();
$current = new Carbon();
$tarikh_cetak = $current->toDateString();
if($request->datetimepicker1 == null){
$gadai_date = $current->toDateString();
}else{
$split_date = explode('-',$request->datetimepicker1);
$gadai_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
}
$tuntutbaki = Http::get(config('api.url'). '/api/TuntutBaki/'. $auth_user['cawangan'] ,['tarikh' => $gadai_date])->json();
$cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
return view('print.laporan_tuntutbaki', compact('tuntutbaki','cawangan_detail','tarikh_cetak','gadai_date','api_url'));
}
public function laporan_Perbelanjaan(Request $request)
{
@@ -3739,6 +3777,8 @@ class KhazanahController extends Controller
return view('print.laporan_perbelanjaan_baucer', compact('perbelanjaan','cawangan_detail','tarikh_cetak','api_url'));
}
public function RequestPembatalan(Request $request)
{
@@ -3746,7 +3786,7 @@ class KhazanahController extends Controller
$nombor = $request->no;
$kodlaluan = $request->kodlaluan;
$updatebatal=Http::put(config('api.url').'/api/requestTeller/batal/'.$kodcaw,[
$updatebatal = Http::put(config('api.url').'/api/requestTeller/batal/'.$kodcaw,[
'no'=>$nombor,
'kodlaluan'=>$kodlaluan
]);
@@ -3756,4 +3796,48 @@ class KhazanahController extends Controller
return response('Berjaya');
}
public function SuratAkuanGadaian(Request $request)
{
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan = Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
$gadai = Http::get(config('api.url').'/api/gadai/norujukan/'.$request->norujukanhidden)->json();
foreach($gadai as $index1=>$gad)
$customers = Http::get(config('api.url').'/api/customers/'.$gad[0]['nokp'])->json();
$kodnegeridandaerah = $request->negeriagh .'|' . $request->daerahagh;
$daftarpolis = Http::post(config('api.url').'/api/polis/create/',[
'kodcaw' =>$auth_user['cawangan'],
'norujukan' => $request->norujukanhidden,
'komen1' => $request->alasan,
'komen2' => $kodnegeridandaerah,
'tebus' => 0,
'teller' => $auth_user['name'],
'caj' => 0.00
]);
$daftar = $daftarpolis->getStatusCode();
if($daftar == 200)
{
$polis = Http::get(config('api.url').'/api/polis/get/',['norujukan' => $request->norujukanhidden,'kodcaw' => $auth_user['cawangan']])->json();
// return redirect()->route('khazanah.customer_info')->with('aghinformation','Surat Akuan Gadaian Hilang berjaya dijana.|success');
return view('print.suratgadaianhilang', compact('polis','gadai','customers','cawangan_detail','api_url'));
}else{
return redirect()->route('khazanah.customer_info')->with('aghinformation','Mengalami Masalah dalam menjana.|error');
}
return response($daftarpolis);
}
}
app/Http/Controllers/LelongController.php
-2
View File
@@ -93,12 +93,10 @@ class LelongController extends Controller
if($request->jenis == 'T'){
$bakiakhir -= $request->jumlah;
$keluar += $request->jumlah;
}
else
{
$bakiakhir += -($request->jumlah);
$masuk += -($request->jumlah);
}
//masuk dalam tunai aliran