diff --git a/app/Events/NotifikasiAGH.php b/app/Events/NotifikasiAGH.php
new file mode 100644
index 0000000..3e89d31
--- /dev/null
+++ b/app/Events/NotifikasiAGH.php
@@ -0,0 +1,33 @@
+kodcaw = $kodcaw;
+ $this->message = $message;
+ $this->typeerror = $typeerror;
+ $this->pc = $pc;
+ }
+
+ public function broadcastOn()
+ {
+ return ['notice-agh'];
+ }
+
+ public function broadcastAs()
+ {
+ return 'my-agh';
+ }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php
index a6d67b7..06fbcfe 100644
--- a/app/Http/Controllers/AliranTunaiController.php
+++ b/app/Http/Controllers/AliranTunaiController.php
@@ -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****************************//
@@ -1276,6 +1276,38 @@ class AliranTunaiController extends Controller
}
+ public function alirantunaiTebusAutoTawarruq(Request $request){
+
+ $auth_user = Auth::user();
+
+ $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' .$request->norujukan)->json();
+ $gadai_detail = $gadai[0];
+
+ $tebus = Http::get(config('api.url') . '/api/listpenebusanhistory/'. $auth_user['cawangan'],['norujukan' => $request->norujukan])->json();
+ $tebus_detail = $tebus[0];
+
+ $getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $tebus_detail['teller']])->json();
+
+ $keluar=$getTunai2['keluar'];
+ $baki=$getTunai2['baki'];
+ $masuk=$getTunai2['masuk'];
+ $bakiawal=$getTunai2['bakiawal'];
+ $pendahuluan=$getTunai2['tambah'];
+ $serahan=$getTunai2['kurang'];
+ $totalmasuk = 0;
+ $bakiakhir = $baki;
+ $totalkeluar = 0;
+
+ $bakiakhir = $bakiakhir + $request->totalbayaran;
+
+ $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
+ 'kodlaluan' => $tebus_detail['teller'],
+ 'keluar'=>$keluar,
+ 'masuk'=>$masuk,
+ 'bakiakhir'=>$bakiakhir
+ ]);
+ }
+
public function alirantunaiUpahBknTawarruq(Request $request){
$auth_user = Auth::user();
@@ -1431,7 +1463,7 @@ class AliranTunaiController extends Controller
$gadai = Http::get(config('api.url'). '/api/gadai/laporan/'. $auth_user['cawangan'] .'/'. $current->toDateString())->json();
$tebus = Http::get(config('api.url'). '/api/tebus/laporan/'. $auth_user['cawangan'] .'/'. $current->toDateString())->json();
$ansuran = Http::get(config('api.url'). '/api/ansuran/laporan/'. $auth_user['cawangan'],['tarikh' => $current->toDateString()])->json();
-
+ $tuntutbaki = Http::get(config('api.url'). '/api/TuntutBaki/'. $auth_user['cawangan'] . '/teller/',['teller' => Auth::user()->name])->json();
$advansur = Http::get(config('api.url').'/api/AnsuranByTarikh/'.$auth_user['cawangan'],['kodlaluan' => Auth::user()->name ])->json();
$totalserahan = 0;
@@ -1455,7 +1487,7 @@ class AliranTunaiController extends Controller
{
if($gad['teller'] === Auth::user()->name)
{
- if($gad['semakbarcode'] === 'LULUS')
+ if($gad['semakbarcode'] == 'Lulus')
$totalgadaibarcodescanned += $gad['pinjaman'];
$totalgadai += $gad['pinjaman'];
@@ -1501,11 +1533,26 @@ class AliranTunaiController extends Controller
$totalupahlama += $upahlama['upahDibayar'];
}
+ $totaltuntutbaki = 0;
+ $bakilelong = 0;
+ $rugilelong = 0;
+ foreach($tuntutbaki as $index1=>$tb)
+ {
+ if($tb['jenis'] == 'T')
+ {
+ $bakilelong += $tb['jumlah'];
+ }else{
+ $rugilelong += -($tb['jumlah']);
+ }
+
+ $totaltuntutbaki += $tb['jumlah'];
+ }
+
$penebusan = floatval($totaltebus) + floatval($totalansuran) + floatval($totalupahlama);
$penebusanbarcodescanned = floatval($totaltebusbarcodescanned) + floatval($totalansuran) + floatval($totalupahlama);
$gadaian = floatval($totalgadai);
- $bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan));
+ $bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)) - floatval($totaltuntutbaki);
$errorpendahuluan = false; $errorserahan = false; $errorpenebusan = false; $errorgadaian = false; $errorbaki = false;
@@ -1528,7 +1575,7 @@ class AliranTunaiController extends Controller
{
return response('sama');
}else{
- $arraykemaskini = ['pendahuluan' => round($totalpendahuluan,2),'serahan' => round($totalserahan,2), 'penebusan' => round($totaltebusbarcodescanned,2), 'gadaian' => round($totalgadaibarcodescanned,2), 'bakisemasa' => round($bakisemasa,1)];
+ $arraykemaskini = ['pendahuluan' => round($totalpendahuluan,2),'serahan' => round($totalserahan,2), 'penebusan' => round($penebusanbarcodescanned,2), 'gadaian' => round($totalgadaibarcodescanned,2), 'bakisemasa' => round($bakisemasa,1)];
return response()->json($arraykemaskini);
}
}
@@ -1549,8 +1596,8 @@ class AliranTunaiController extends Controller
$updateTunai = Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
'kodlaluan' => $auth_user['name'],
- 'keluar'=> $keluar,
- 'masuk'=> $masuk,
+ 'keluar'=> $request->gadaian,
+ 'masuk'=> $request->penebusan,
'bakiakhir'=> $request->bakiakhir
]);
diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php
index 7d9bf97..5421a59 100644
--- a/app/Http/Controllers/GadaianController.php
+++ b/app/Http/Controllers/GadaianController.php
@@ -425,11 +425,55 @@ class GadaianController extends Controller
return view('print.resittebusseparuh',compact('transaction','gadai','customers_info','penebusan','wakil','totaltransaction'));
}
+ public function resitautotawarruq($id)
+ {
+
+ $auth_user = Auth::user();
+
+ $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
+
+ $totaltransaction = 0;
+
+ $transaction = Http::get(config('api.url') . '/api/transaction/'. $id)->json();
+
+ foreach($transaction as $trans)
+ {
+ $totaltransaction += $trans['duit_masuk'];
+ }
+
+ if(sizeof($gadai) != 0)
+ $gadai = $gadai[0][0];
+
+ $customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json();
+
+ $transaction_keuntungan = Http::get(config('api.url'). '/api/transaksi_keuntungan_latest/'. $id)->json();
+ if(sizeof($customers_info) != 0)
+ $customers_info = $customers_info[0];
+
+
+ $penebusan = Http::get(config('api.url') . '/api/listpenebusanhistory/' . $auth_user['cawangan'],[ "norujukan" => $id])->json();
+
+ if(sizeof($penebusan) != 0)
+ $penebusan = $penebusan[0];
+
+ $wakil = Http::get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $penebusan['nowakil'])->json();
+
+ // dd($wakil);
+ if(sizeof($wakil) != 0)
+ $wakil = $wakil[0];
+
+ return view('print.resittebusautotawarruq',compact('transaction','gadai','customers_info','penebusan','wakil','totaltransaction','transaction_keuntungan'));
+ }
+
public function resittebus($id)
{
$auth_user = Auth::user();
+ $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+
+ dd($cawangan_info);
+
$gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
$totaltransaction = 0;
@@ -462,7 +506,7 @@ class GadaianController extends Controller
if(sizeof($wakil) != 0)
$wakil = $wakil[0];
- return view('print.resittebus',compact('transaction','gadai','customers_info','penebusan','wakil','totaltransaction'));
+ return view('print.resittebus',compact('transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction'));
}
public function resitbelumtebus($id)
diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index af9b1b6..8b5a0b9 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -9,6 +9,7 @@ use App\Events\OperasiNotice;
use App\Events\PendahuluanSerahan;
use App\Events\NotifikasiKelulusan;
use App\Events\NotifikasiUbahHapus;
+use App\Events\NotifikasiAGH;
use App\User;
use App\Cawangan;
@@ -20,6 +21,7 @@ use Illuminate\Support\Facades\Session;
use Illuminate\Support\Facades\Hash;
use Carbon\Carbon;
use PDF;
+use DateTime;
class KhazanahController extends Controller
{
@@ -36,25 +38,61 @@ class KhazanahController extends Controller
$api_url = config('api.url');
$auth_user = Auth::user();
+ $idtype = 'nokp';
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$bank = Http::get(config('api.url') . '/api/bank')->json();
- return view('khazanah.index',compact('search','cawangan_info','bank','api_url'));
+ return view('khazanah.index',compact('search','cawangan_info','bank','api_url','idtype'));
+ }
+
+ public function search(Request $request){
+ $noic = $request->noic;
+ $idtype = $request->customerIDType;
+ Session::put('noic', $noic);
+ $api_url = config('api.url');
+ $auth_user = Auth::user();
+ $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+ $bank = Http::get(config('api.url') . '/api/bank')->json();
+ $customers_info = Http::get(config('api.url') . '/api/customers/'. $noic)->json();
+
+ if($customers_info){
+ $customer_info = $customers_info[0];
+ }else{
+ $customer_info = $customers_info;
+ }
+ $request->session()->forget('page_reload');
+ $request->session()->forget('norujukan');
+
+ $search = true;
+
+ if($customer_info){
+ Session::put('customer_info_khazanah',$customer_info);
+ return redirect()->route('khazanah.customer_info')->with( ['customer_info' => $customer_info,'cawangan_info'=>$cawangan_info,'api_url'=>$api_url]);
+ }else{
+ return view('khazanah.index',compact('search','noic','cawangan_info','bank','api_url','idtype'));
+ }
}
public function info(Request $request){
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
- $customers_info = Http::get(config('api.url') . '/api/customers/'. $request->noic)->json();
+ $customers_info = Http::get(config('api.url') . '/api/customers/'. Session::get('noic'))->json();
if($customers_info){
$customer_info = $customers_info[0];
}else{
$customer_info = $customers_info;
}
+ $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'));
+ return view('khazanah.info',compact('cawangan_info','api_url','customer_info','bakilelong','rugilelong','negeri'));
}
public function menu()
@@ -791,7 +829,6 @@ class KhazanahController extends Controller
else
{
-
$hariIni_UG=$get_lejerUG[0]['hariini'];
$kelmarin_UG=$get_lejerUG[0]['kelmarin'];
$jumlah_UG=$get_lejerUG[0]['jumlah'];
@@ -824,13 +861,11 @@ class KhazanahController extends Controller
$jumlah_Pinjaman=$get_lejerPinjaman[0]['jumlah'];
$kredit_Pinjaman=$get_lejerPinjaman[0]['kredit'];
$debit_Pinjaman=$get_lejerPinjaman[0]['debit'];
- $recno_Pinjaman=$get_lejerPinjaman[0]['recno'];
-
+ $recno_Pinjaman=$get_lejerPinjaman[0]['recno'];
$kredit_Pinjaman=$kredit_Pinjaman+$pinjaman;
-
-
-
+
+
$hariIni_Pinjaman=$debit_Pinjaman-$kredit_Pinjaman;
$kelmarin_Pinjaman=$jumlah_Pinjaman-$hariIni_Pinjaman;
@@ -843,8 +878,6 @@ class KhazanahController extends Controller
]);
-
-
$get_latest_bayarUntung=Http::get(config('api.url').'/api/latest_transaksi_untung/'.$request->norujukan_barcode)->json();
$bayaran_latest_untung=$get_latest_bayarUntung[0]['bayaran_keuntungan'];
$bayaran_rebate=$get_latest_bayarUntung[0]['keuntungan_rebet'];
@@ -857,7 +890,6 @@ class KhazanahController extends Controller
$recno_untung=$get_lejer_Untung [0]['recno'];
$kredit_untung=$get_lejer_Untung [0]['kredit'];
-
$kredit_untung=$kredit_untung+$bayaran_latest_untung;
$hariini_untung=$debit_untung-$kredit_untung;
$kelmarin_untung=$jumlah_untung-$hariini_untung;
@@ -872,8 +904,6 @@ class KhazanahController extends Controller
]);
-
-
$get_latest_bayarRebate=Http::get(config('api.url').'/api/latest_transaksi_untung/data/'.$request->norujukan_barcode)->json();
$latest_rebate=$get_latest_bayarRebate[0]['keuntungan_rebet'];
@@ -905,7 +935,6 @@ class KhazanahController extends Controller
$get_latest_bayarRebate=Http::get(config('api.url').'/api/latest_transaksi_untung/data/'.$request->norujukan_barcode)->json();
$latest_rebate=$get_latest_bayarRebate[0]['keuntungan_rebet'];
-
$get_GLCode_RebateB=Http::get(config('api.url').'/api/getGlCode/'.$auth_user['cawangan'],['glcode'=>$Rebet_B])->json();
$keterangan_RebateB=$get_GLCode_Tunai[0]['descpt'];
$acctype_RebateB=$get_GLCode_Tunai[0]['acttype'];
@@ -936,9 +965,6 @@ class KhazanahController extends Controller
$totalmasuk = $tebus_detail['bakipjm'] + $masuk;
-
-
-
$get_GLCode_Tunai=Http::get(config('api.url').'/api/getGlCode/'.$auth_user['cawangan'],['glcode'=>$KOD_tunai])->json();
$keterangan_Tunai=$get_GLCode_Tunai[0]['descpt'];
$acctype_Tunai=$get_GLCode_Tunai[0]['acttype'];
@@ -957,8 +983,6 @@ class KhazanahController extends Controller
$hariIni_Tunai=$debit_Tunai-$kredit_Tunai;
$kelmarin_Tunai=$jumlah_Tunai-$hariIni_Tunai;
-
-
$updateGlejer_Tunai=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
'recno'=>$recno_Tunai,
'debit'=>$debit_Tunai,
@@ -1496,7 +1520,6 @@ class KhazanahController extends Controller
$bakiperubatan = 0;
-
switch ($request->jenismodal) {
case "selenggara":
$kategori = "Baiki dan Selenggara";
@@ -1576,6 +1599,9 @@ class KhazanahController extends Controller
'jumlahkeping' => "0"
]);
+ $myDateTime = DateTime::createFromFormat('Y-m-d', $request->tarikhbil);
+ $tarikhbil = $myDateTime->format('dmY');
+
$panjar = Http::post(config('api.url') . '/api/CreatePanjar/'. $auth_user['cawangan'],[
'deskripsi' => $request->deskripsi,
@@ -1585,7 +1611,7 @@ class KhazanahController extends Controller
'id' => $auth_user['name'],
'bakiperubatan' => $bakiperubatan,
'nobaucer' => $request->baucer,
- 'nobil' => "3213231",
+ 'nobil' => $tarikhbil,
'tuntutoleh' => $request->tuntutan
])->json();
@@ -1608,9 +1634,9 @@ class KhazanahController extends Controller
$keterangan=$get_glCode_Details[0]['descpt']; //keterangan glcode
$actype=$get_glCode_Details[0]['acttype']; //keterangan acctype
- $get_Panjar_AM=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$PANJAR_AM])->json();
- if(sizeof($get_Panjar_AM)==0)
- {
+ $get_Panjar_AM=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$PANJAR_AM])->json();
+ if(sizeof($get_Panjar_AM)==0)
+ {
$jumlah=0.0;
$getGLedjer_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$PANJAR_AM])->json();
if(sizeof($getGLedjer_Semalam)==0)
@@ -1720,28 +1746,28 @@ class KhazanahController extends Controller
'kelmarin'=>$kelmarin_panjar,
- ]);
+ ]);
- $LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json();
- $hariini_Tunai=$LejerTunaiDitangan[0]['hariini'];
- $kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin'];
- $jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah'];
- $debit_Tunai=$LejerTunaiDitangan[0]['debit'];
- $recno_Tunai=$LejerTunaiDitangan[0]['recno'];
- $kredit_Tunai=$LejerTunaiDitangan[0]['kredit'];
-
- $kredit_Tunai=$kredit_Tunai+$request->bayaran;
- $hariini_Tunai=$debit_Tunai-$kredit_Tunai;
- $kelmarin_Tunai=$jumlah_Tunai-$hariini_Tunai;
+ $LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json();
+ $hariini_Tunai=$LejerTunaiDitangan[0]['hariini'];
+ $kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin'];
+ $jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah'];
+ $debit_Tunai=$LejerTunaiDitangan[0]['debit'];
+ $recno_Tunai=$LejerTunaiDitangan[0]['recno'];
+ $kredit_Tunai=$LejerTunaiDitangan[0]['kredit'];
+
+ $kredit_Tunai=$kredit_Tunai+$request->bayaran;
+ $hariini_Tunai=$debit_Tunai-$kredit_Tunai;
+ $kelmarin_Tunai=$jumlah_Tunai-$hariini_Tunai;
- $update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
- 'recno'=>$recno_Tunai,
- 'debit'=>$debit_Tunai,
- 'kredit'=>$kredit_Tunai,
- 'hariini'=>$hariini_Tunai,
- 'kelmarin'=>$kelmarin_Tunai,
-
- ]);
+ $update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
+ 'recno'=>$recno_Tunai,
+ 'debit'=>$debit_Tunai,
+ 'kredit'=>$kredit_Tunai,
+ 'hariini'=>$hariini_Tunai,
+ 'kelmarin'=>$kelmarin_Tunai,
+
+ ]);
}
@@ -1758,62 +1784,62 @@ class KhazanahController extends Controller
$get_Panjar_AM=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$KERAIAN])->json();
if(sizeof($get_Panjar_AM)==0)
{
- $jumlah=0.0;
- $getGLedjer_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$KERAIAN])->json();
- if(sizeof($getGLedjer_Semalam)==0)
- {
- $jumlah=0.0;
- }
- else
- {
+ $jumlah=0.0;
+ $getGLedjer_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$KERAIAN])->json();
+ if(sizeof($getGLedjer_Semalam)==0)
+ {
+ $jumlah=0.0;
+ }
+ else
+ {
- $jumlah_semalam=$getGLedjer_Semalam[0]['jumlah'];
- $hariIniSemalam=$getGLedjer_Semalam[0]['hariini'];
- $jumlah=$jumlah_semalam+$hariIniSemalam;
- }
- $jumlahBulan_ini=0.0;
- $get_GlejerBulan_Tahun=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$KERAIAN])->json();
-
- if( sizeof($get_GlejerBulan_Tahun)==0)
- {
- $jumlahBulan_ini=0.0;
- }
- else
- {
- $jumlahBulan_ini=$get_GlejerBulan_Tahun[0]['jumlah'];
- $jumlahBulan_ini=$jumlah-$jumlahBulan_ini;
-
- }//end bulan tahun
- $Jumlah_TahunIni=0.0;
- $get_Glejer_Tahun=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$KERAIAN])->json();
- if(sizeof($get_Glejer_Tahun)==0)
- {
- $Jumlah_TahunIni=0.0;
- }
- else
- {
+ $jumlah_semalam=$getGLedjer_Semalam[0]['jumlah'];
+ $hariIniSemalam=$getGLedjer_Semalam[0]['hariini'];
+ $jumlah=$jumlah_semalam+$hariIniSemalam;
+ }
+ $jumlahBulan_ini=0.0;
+ $get_GlejerBulan_Tahun=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$KERAIAN])->json();
+
+ if( sizeof($get_GlejerBulan_Tahun)==0)
+ {
+ $jumlahBulan_ini=0.0;
+ }
+ else
+ {
+ $jumlahBulan_ini=$get_GlejerBulan_Tahun[0]['jumlah'];
+ $jumlahBulan_ini=$jumlah-$jumlahBulan_ini;
+
+ }//end bulan tahun
+ $Jumlah_TahunIni=0.0;
+ $get_Glejer_Tahun=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$KERAIAN])->json();
+ if(sizeof($get_Glejer_Tahun)==0)
+ {
+ $Jumlah_TahunIni=0.0;
+ }
+ else
+ {
+
+ $JumTahunIni=$get_Glejer_Tahun[0]['jumlah'];
+ $Jumlah_TahunIni=$jumlah-$JumTahunIni;
- $JumTahunIni=$get_Glejer_Tahun[0]['jumlah'];
- $Jumlah_TahunIni=$jumlah-$JumTahunIni;
-
- }
+ }
- $HariIni=0.00-$request->bayaran;
- $kelmarin=$jumlah-$HariIni;
-
- //insert glejer untuk current date /hari ini
- $daftarGlejer=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[
- 'kodcaw'=>$auth_user['cawangan'],
- 'glcode'=>$KERAIAN,
- 'descpt'=>$keterangan,
- 'debit'=>$request->bayaran,
- 'kredit'=>0.0,
- 'hariini'=>$HariIni,
- 'kelmarin'=>$kelmarin,
- 'jumlah'=>$jumlah,
- 'bulanini'=>$jumlahBulan_ini,
- 'tahunini'=>$Jumlah_TahunIni,
- 'acttype'=> $actype
+ $HariIni=0.00-$request->bayaran;
+ $kelmarin=$jumlah-$HariIni;
+
+ //insert glejer untuk current date /hari ini
+ $daftarGlejer=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[
+ 'kodcaw'=>$auth_user['cawangan'],
+ 'glcode'=>$KERAIAN,
+ 'descpt'=>$keterangan,
+ 'debit'=>$request->bayaran,
+ 'kredit'=>0.0,
+ 'hariini'=>$HariIni,
+ 'kelmarin'=>$kelmarin,
+ 'jumlah'=>$jumlah,
+ 'bulanini'=>$jumlahBulan_ini,
+ 'tahunini'=>$Jumlah_TahunIni,
+ 'acttype'=> $actype
]);
@@ -1838,54 +1864,50 @@ class KhazanahController extends Controller
]);
-
-
}
else
{
- $hariini_panjar= $get_Panjar_AM[0]['hariini'];
- $kelmarin_panjar= $get_Panjar_AM[0]['kelmarin'];
- $jumlah_panjar= $get_Panjar_AM[0]['jumlah'];
- $debit_panjar= $get_Panjar_AM[0]['debit'];
- $recno_panjar= $get_Panjar_AM[0]['recno'];
- $kredit_panjar= $get_Panjar_AM[0]['kredit'];
+ $hariini_panjar= $get_Panjar_AM[0]['hariini'];
+ $kelmarin_panjar= $get_Panjar_AM[0]['kelmarin'];
+ $jumlah_panjar= $get_Panjar_AM[0]['jumlah'];
+ $debit_panjar= $get_Panjar_AM[0]['debit'];
+ $recno_panjar= $get_Panjar_AM[0]['recno'];
+ $kredit_panjar= $get_Panjar_AM[0]['kredit'];
- $debit_panjar=$debit_panjar+$request->bayaran;
- $harini_panjar=$debit_panjar-$kredit_panjar;
- $kelmarin_panjar=$jumlah_panjar-$harini_panjar;
+ $debit_panjar=$debit_panjar+$request->bayaran;
+ $harini_panjar=$debit_panjar-$kredit_panjar;
+ $kelmarin_panjar=$jumlah_panjar-$harini_panjar;
- $update_PanjarAM=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
- 'recno'=>$recno_panjar,
- 'debit'=>$debit_panjar,
- 'kredit'=>$kredit_panjar,
- 'hariini'=>$hariini_panjar,
- 'kelmarin'=>$kelmarin_panjar,
+ $update_PanjarAM=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
+ 'recno'=>$recno_panjar,
+ 'debit'=>$debit_panjar,
+ 'kredit'=>$kredit_panjar,
+ 'hariini'=>$hariini_panjar,
+ 'kelmarin'=>$kelmarin_panjar,
+ ]);
-
- ]);
+ $LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json();
+ $hariini_Tunai=$LejerTunaiDitangan[0]['hariini'];
+ $kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin'];
+ $jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah'];
+ $debit_Tunai=$LejerTunaiDitangan[0]['debit'];
+ $recno_Tunai=$LejerTunaiDitangan[0]['recno'];
+ $kredit_Tunai=$LejerTunaiDitangan[0]['kredit'];
+
+ $kredit_Tunai=$kredit_Tunai+$request->bayaran;
+ $hariini_Tunai=$debit_Tunai-$kredit_Tunai;
+ $kelmarin_Tunai=$jumlah_Tunai-$hariini_Tunai;
- $LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json();
- $hariini_Tunai=$LejerTunaiDitangan[0]['hariini'];
- $kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin'];
- $jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah'];
- $debit_Tunai=$LejerTunaiDitangan[0]['debit'];
- $recno_Tunai=$LejerTunaiDitangan[0]['recno'];
- $kredit_Tunai=$LejerTunaiDitangan[0]['kredit'];
-
- $kredit_Tunai=$kredit_Tunai+$request->bayaran;
- $hariini_Tunai=$debit_Tunai-$kredit_Tunai;
- $kelmarin_Tunai=$jumlah_Tunai-$hariini_Tunai;
-
- $update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
- 'recno'=>$recno_Tunai,
- 'debit'=>$debit_Tunai,
- 'kredit'=>$kredit_Tunai,
- 'hariini'=>$hariini_Tunai,
- 'kelmarin'=>$kelmarin_Tunai,
-
- ]);
+ $update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
+ 'recno'=>$recno_Tunai,
+ 'debit'=>$debit_Tunai,
+ 'kredit'=>$kredit_Tunai,
+ 'hariini'=>$hariini_Tunai,
+ 'kelmarin'=>$kelmarin_Tunai,
+
+ ]);
}
@@ -1899,51 +1921,52 @@ class KhazanahController extends Controller
$keterangan=$get_glCode_Details[0]['descpt']; //keterangan glcode
$actype=$get_glCode_Details[0]['acttype']; //keterangan acctype
- $get_Panjar_AM=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$SELENGGARA])->json();
+ $get_Panjar_AM=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$SELENGGARA])->json();
+
if(sizeof($get_Panjar_AM)==0)
{
- $jumlah=0.0;
- $getGLedjer_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$SELENGGARA])->json();
- if(sizeof($getGLedjer_Semalam)==0)
- {
- $jumlah=0.0;
- }
- else
- {
+ $jumlah=0.0;
+ $getGLedjer_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$SELENGGARA])->json();
+ if(sizeof($getGLedjer_Semalam)==0)
+ {
+ $jumlah=0.0;
+ }
+ else
+ {
- $jumlah_semalam=$getGLedjer_Semalam[0]['jumlah'];
- $hariIniSemalam=$getGLedjer_Semalam[0]['hariini'];
- $jumlah=$jumlah_semalam+$hariIniSemalam;
- }
- $jumlahBulan_ini=0.0;
- $get_GlejerBulan_Tahun=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$SELENGGARA])->json();
-
- if( sizeof($get_GlejerBulan_Tahun)==0)
- {
- $jumlahBulan_ini=0.0;
- }
- else
- {
- $jumlahBulan_ini=$get_GlejerBulan_Tahun[0]['jumlah'];
- $jumlahBulan_ini=$jumlah-$jumlahBulan_ini;
-
- }//end bulan tahun
- $Jumlah_TahunIni=0.0;
- $get_Glejer_Tahun=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$SELENGGARA])->json();
- if(sizeof($get_Glejer_Tahun)==0)
- {
- $Jumlah_TahunIni=0.0;
- }
- else
- {
+ $jumlah_semalam=$getGLedjer_Semalam[0]['jumlah'];
+ $hariIniSemalam=$getGLedjer_Semalam[0]['hariini'];
+ $jumlah=$jumlah_semalam+$hariIniSemalam;
+ }
+ $jumlahBulan_ini=0.0;
+ $get_GlejerBulan_Tahun=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$SELENGGARA])->json();
+
+ if( sizeof($get_GlejerBulan_Tahun)==0)
+ {
+ $jumlahBulan_ini=0.0;
+ }
+ else
+ {
+ $jumlahBulan_ini=$get_GlejerBulan_Tahun[0]['jumlah'];
+ $jumlahBulan_ini=$jumlah-$jumlahBulan_ini;
+
+ }//end bulan tahun
+ $Jumlah_TahunIni=0.0;
+ $get_Glejer_Tahun=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$SELENGGARA])->json();
+ if(sizeof($get_Glejer_Tahun)==0)
+ {
+ $Jumlah_TahunIni=0.0;
+ }
+ else
+ {
+
+ $JumTahunIni=$get_Glejer_Tahun[0]['jumlah'];
+ $Jumlah_TahunIni=$jumlah-$JumTahunIni;
- $JumTahunIni=$get_Glejer_Tahun[0]['jumlah'];
- $Jumlah_TahunIni=$jumlah-$JumTahunIni;
-
- }
+ }
- $HariIni=0.0-$request->bayaran;
- $kelmarin=$jumlah-$HariIni;
+ $HariIni=0.0-$request->bayaran;
+ $kelmarin=$jumlah-$HariIni;
//insert glejer untuk current date /hari ini
$daftarGlejer=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[
@@ -1991,45 +2014,45 @@ class KhazanahController extends Controller
else
{
- $hariini_panjar= $get_Panjar_AM[0]['hariini'];
- $kelmarin_panjar= $get_Panjar_AM[0]['kelmarin'];
- $jumlah_panjar= $get_Panjar_AM[0]['jumlah'];
- $debit_panjar= $get_Panjar_AM[0]['debit'];
- $recno_panjar= $get_Panjar_AM[0]['recno'];
- $kredit_panjar= $get_Panjar_AM[0]['kredit'];
- $debit_panjar=$debit_panjar+$request->bayaran;
- $harini_panjar=$debit_panjar-$kredit_panjar;
- $kelmarin_panjar=$jumlah_panjar-$harini_panjar;
- $update_PanjarAM=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
- 'recno'=>$recno_panjar,
- 'debit'=>$debit_panjar,
- 'kredit'=>$kredit_panjar,
- 'hariini'=>$hariini_panjar,
- 'kelmarin'=>$kelmarin_panjar,
+ $hariini_panjar= $get_Panjar_AM[0]['hariini'];
+ $kelmarin_panjar= $get_Panjar_AM[0]['kelmarin'];
+ $jumlah_panjar= $get_Panjar_AM[0]['jumlah'];
+ $debit_panjar= $get_Panjar_AM[0]['debit'];
+ $recno_panjar= $get_Panjar_AM[0]['recno'];
+ $kredit_panjar= $get_Panjar_AM[0]['kredit'];
+ $debit_panjar=$debit_panjar+$request->bayaran;
+ $harini_panjar=$debit_panjar-$kredit_panjar;
+ $kelmarin_panjar=$jumlah_panjar-$harini_panjar;
+ $update_PanjarAM=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
+ 'recno'=>$recno_panjar,
+ 'debit'=>$debit_panjar,
+ 'kredit'=>$kredit_panjar,
+ 'hariini'=>$hariini_panjar,
+ 'kelmarin'=>$kelmarin_panjar,
-
- ]);
+
+ ]);
- $LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json();
- $hariini_Tunai=$LejerTunaiDitangan[0]['hariini'];
- $kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin'];
- $jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah'];
- $debit_Tunai=$LejerTunaiDitangan[0]['debit'];
- $recno_Tunai=$LejerTunaiDitangan[0]['recno'];
- $kredit_Tunai=$LejerTunaiDitangan[0]['kredit'];
-
- $kredit_Tunai=$kredit_Tunai+$request->bayaran;
- $hariini_Tunai=$debit_Tunai-$kredit_Tunai;
- $kelmarin_Tunai=$jumlah_Tunai-$hariini_Tunai;
+ $LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json();
+ $hariini_Tunai=$LejerTunaiDitangan[0]['hariini'];
+ $kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin'];
+ $jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah'];
+ $debit_Tunai=$LejerTunaiDitangan[0]['debit'];
+ $recno_Tunai=$LejerTunaiDitangan[0]['recno'];
+ $kredit_Tunai=$LejerTunaiDitangan[0]['kredit'];
+
+ $kredit_Tunai=$kredit_Tunai+$request->bayaran;
+ $hariini_Tunai=$debit_Tunai-$kredit_Tunai;
+ $kelmarin_Tunai=$jumlah_Tunai-$hariini_Tunai;
- $update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user->kodcaw,[
- 'recno'=>$recno_Tunai,
- 'debit'=>$debit_Tunai,
- 'kredit'=>$kredit_Tunai,
- 'hariini'=>$hariini_Tunai,
- 'kelmarin'=>$kelmarin_Tunai,
-
- ]);
+ $update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user->kodcaw,[
+ 'recno'=>$recno_Tunai,
+ 'debit'=>$debit_Tunai,
+ 'kredit'=>$kredit_Tunai,
+ 'hariini'=>$hariini_Tunai,
+ 'kelmarin'=>$kelmarin_Tunai,
+
+ ]);
}
}//end perbelanjaan Selanggara
@@ -2047,9 +2070,22 @@ class KhazanahController extends Controller
if($upVault == 200 && empty($panjar) == false && $upDeno == 200)
{
+ if($request->jenismodal === 'perubatan')
+ {
+ $listUser=User::where('name','=',$request->tuntutan)->get();
+
+ $totalsebenar = floatval($listUser[0]->perubatan) - floatval($request->bayaran);
+
+ $overrideuser = User::where('cawangan','=',$auth_user['cawangan'])
+ ->where('name','=',$request->tuntutan)
+ ->update(array(
+ 'perubatan' => $totalsebenar
+ ));
+ }
+
return redirect('/panjar')->with('messageinformation','Panjar Berjaya Disimpan.');
}else{
- return redirect('/panjar')->with('messageinformation','Panjar Mengalami Masalah UntukDisimpan.');
+ return redirect('/panjar')->with('messageinformation','Panjar Mengalami Masalah Untuk Disimpan.');
}
return response($updateVault);
@@ -3157,7 +3193,7 @@ class KhazanahController extends Controller
}
public function cetakLaporanRingkasanHarian(Request $request){
- // dd($request);
+
$api_url = config('api.url');
$auth_user = Auth::user();
$current = Carbon::now();
@@ -3223,13 +3259,13 @@ class KhazanahController extends Controller
$totalbilhapuskirakeseluruhan = $kawalanstok[3]['hapuskira1'][0]['bil'] + $kawalanstok[3]['hapuskira2'][0]['bil'] + $kawalanstok[3]['hapuskira3'][0]['bil'];
$totalbilhapuskirasehari = $kawalanstok[3]['hapuskiraini1'][0]['bil'] + $kawalanstok[3]['hapuskiraini2'][0]['bil'] + $kawalanstok[3]['hapuskiraini3'][0]['bil'];
- $totalbilhapuskira = $totalbilhapuskirakeseluruhan + $totalbilhapuskirasehari; echo number_format($totalbilhapuskira);
+ $totalbilhapuskira = $totalbilhapuskirakeseluruhan + $totalbilhapuskirasehari;
$totalpinjhapuskirakeseluruhan = $kawalanstok[3]['hapuskira1'][0]['pinj'] + $kawalanstok[3]['hapuskira2'][0]['pinj'] + $kawalanstok[3]['hapuskira3'][0]['pinj'];
$totalpinjhapuskirasehari = $kawalanstok[3]['hapuskiraini1'][0]['pinj'] + $kawalanstok[3]['hapuskiraini2'][0]['pinj'] + $kawalanstok[3]['hapuskiraini3'][0]['pinj'];
- $totalpinjhapuskira = $totalpinjhapuskirakeseluruhan + $totalpinjhapuskirasehari; echo number_format($totalpinjhapuskira,2);
+ $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'));
@@ -3248,7 +3284,7 @@ class KhazanahController extends Controller
$split_date = explode('-',$request->datetimepicker1);
$tebus_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
}
- $marhun = Http::get(config('api.url'). '/api/gadai/laporan/ringkasan/'. $auth_user['cawangan'] .'/'. $tebus_date)->json();
+ $marhun = Http::get(config('api.url'). '/api/gadai/laporan/ringkasan/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json();
$marhun = $marhun[0];
$keseluruhanupahsimpan = $marhun['lelongupahsimpan'] + $marhun['tebus'][0]['upahsimpan'] + $marhun['advansur'][0]['upahsimpan'];
@@ -4003,6 +4039,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')
@@ -4013,24 +4050,40 @@ class KhazanahController extends Controller
$totaltunaiditangan = $tunaiditangan;
}
+ $jualan1stop = 0;$belian1stop = 0;$utgterkumpulxtra = 0;$rugilelongxtra = 0;$bakilelongxtra = 0;$cajlelongxtra = 0;$upahsimpanxtra = 0;
+ //1Stop Special Case
+ if($auth_user['cawangan'] === '1STOP')
+ {
+ $jualan1stop = floatval(129857.00);
+ $belian1stop = floatval(122446.50);
+ $utgterkumpulxtra = floatval(6727.10);
+ $rugilelongxtra = floatval(10079.30);
+ $bakilelongxtra = floatval(123.20);
+ $cajlelongxtra = floatval(25.50);
+ $upahsimpanxtra = floatval(4894.40);
+
+ }
+
//Terkumpul
$untungrugiterkumpul = Http::get(config('api.url'). '/api/UntungRugiTerkumpul/'. $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
$hartasemasa = [];
// $hartasemasa = ['serahan' => $imbangduga['serahan'],'pinjamankoop' => $pinjamandiberi['pinjamankoop'],'emaspalsu' => $pinjamandiberi['emaspalsu'],'tunaiditangan' => $tunaiditangan['bakiakhir']];
- array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $totaltunaiditangan]);
- array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq]);
- array_push($hartasemasa,['glcode' => '1000/011','descpt' => 'Penghutang Kakitangan', 'amaun' => $penghutangkaki]);
- array_push($hartasemasa,['glcode' => '1000/045','descpt' => 'Serahan Bayaran Online', 'amaun' => 0.00]);
- array_push($hartasemasa,['glcode' => '1000/211','descpt' => 'Keuntungan Tertangguh', 'amaun' => $keuntungan]);
- array_push($hartasemasa,['glcode' => '5000/041','descpt' => 'Bayaran Pendahuluan','amaun' => ($bayaranpendahuluan * -1)]);
- array_push($hartasemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]);
- array_push($hartasemasa,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]);
- array_push($hartasemasa,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['pinjamankoop']]);
- array_push($hartasemasa,['glcode' => '1000/014','descpt' => 'Pinjaman Diberi - Emas Palsu / Kes', 'amaun' => $pinjamandiberi['emaspalsu']]);
- array_push($hartasemasa,['glcode' => '1000/090','descpt' => 'Pindah Ke KPKB(IP)', 'amaun' => $imbangduga['pindahkekpkb']]);
+ if($totaltunaiditangan > 0) array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $totaltunaiditangan]);
+ if($pembiayaantawarruq > 0) array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq]);
+ if($penghutangkaki > 0) array_push($hartasemasa,['glcode' => '1000/011','descpt' => 'Penghutang Kakitangan', 'amaun' => $penghutangkaki]);
+ //array_push($hartasemasa,['glcode' => '1000/045','descpt' => 'Serahan Bayaran Online', 'amaun' => 0.00]);
+ if($keuntungan > 0) array_push($hartasemasa,['glcode' => '1000/211','descpt' => 'Keuntungan Tertangguh', 'amaun' => $keuntungan]);
+ if($bayaranpendahuluan > 0) array_push($hartasemasa,['glcode' => '5000/041','descpt' => 'Bayaran Pendahuluan','amaun' => ($bayaranpendahuluan * -1)]);
+ if($rebet > 0) array_push($hartasemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]);
+ if($imbangduga['serahan'] > 0) array_push($hartasemasa,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]);
+ if($pinjamandiberi['pinjamankoop'] > 0) array_push($hartasemasa,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['pinjamankoop']]);
+ if($pinjamandiberi['emaspalsu'] > 0) array_push($hartasemasa,['glcode' => '1000/014','descpt' => 'Pinjaman Diberi - Emas Palsu / Kes', 'amaun' => $pinjamandiberi['emaspalsu']]);
+ if($imbangduga['pindahkekpkb'] > 0) array_push($hartasemasa,['glcode' => '1000/090','descpt' => 'Pindah Ke KPKB(IP)', 'amaun' => $imbangduga['pindahkekpkb']]);
+ if($belian1stop > 0) array_push($hartasemasa,['glcode' => '8000/501','descpt' => 'Belian 1 Stop', 'amaun' => $belian1stop]);
+
$totalhartasemasa = 0;
foreach($hartasemasa as $index => $hs)
{
@@ -4041,19 +4094,27 @@ class KhazanahController extends Controller
// $tanggungansemasa = ['pendahuluan' => $imbangduga['pendahuluan'],'bds' => $panjar['bds'],'perubatan' => $panjar['perubatan'],'keraian' => $panjar['keraian'],'bakilelong' => $bakilelong['bakilelong'],'rugilelong' => $bakilelong['rugilelong'],'wtd' => $wtd,'cajlelong' => $cajlelong];
- array_push($tanggungansemasa,['glcode' => '2000/007','descpt' => 'Keuntungan Tergantung', 'amaun' => $keuntungan]);
- array_push($tanggungansemasa,['glcode' => '5000/013','descpt' => 'Upah Simpan','amaun' => $keuntungansebenar]);
- array_push($tanggungansemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]);
- array_push($tanggungansemasa,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]);
- array_push($tanggungansemasa,['glcode' => '3000/017','descpt' => 'PANJAR - Baiki dan Selenggara','amaun' => -$panjar['bds']]);
- array_push($tanggungansemasa,['glcode' => '3000/018','descpt' => 'PANJAR - Belanja AM','amaun' => -$panjar['perubatan']]);
- array_push($tanggungansemasa,['glcode' => '3000/019','descpt' => 'PANJAR - Keraian Dan Promosi','amaun' => -$panjar['keraian']]);
- array_push($tanggungansemasa,['glcode' => '7000/090','descpt' => 'Baki Lelong','amaun' => $bakilelong['bakilelong']]);
- array_push($tanggungansemasa,['glcode' => '3000/020','descpt' => 'Kerugian Lelong','amaun' => $bakilelong['rugilelong']]);
- array_push($tanggungansemasa,['glcode' => '3000/021','descpt' => 'WANG TAK DITUNTUT','amaun' => $wtd]);
- array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Pendapatan Caj Lelong','amaun' => $cajlelong]);
- array_push($tanggungansemasa,['glcode' => '7000/101','descpt' => 'Untung/Rugi Terkumpul','amaun' => $untungrugiterkumpul]);
- array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Caj Perkhidmatan Terkumpul','amaun' => $cajperkhidmatan]);
+ if($keuntungan > 0) array_push($tanggungansemasa,['glcode' => '2000/007','descpt' => 'Keuntungan Tergantung', 'amaun' => $keuntungan]);
+ if($keuntungansebenar > 0) array_push($tanggungansemasa,['glcode' => '5000/013','descpt' => 'Upah Simpan','amaun' => $keuntungansebenar]);
+ if($rebet > 0) array_push($tanggungansemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]);
+ if($imbangduga['pendahuluan'] > 0) array_push($tanggungansemasa,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]);
+ if($panjar['bds'] > 0) array_push($tanggungansemasa,['glcode' => '3000/017','descpt' => 'PANJAR - Baiki dan Selenggara','amaun' => -$panjar['bds']]);
+ if($panjar['perubatan'] > 0) array_push($tanggungansemasa,['glcode' => '3000/018','descpt' => 'PANJAR - Belanja AM','amaun' => -$panjar['perubatan']]);
+ if($panjar['keraian'] > 0) array_push($tanggungansemasa,['glcode' => '3000/019','descpt' => 'PANJAR - Keraian Dan Promosi','amaun' => -$panjar['keraian']]);
+ if($bakilelong['bakilelong'] != 0) array_push($tanggungansemasa,['glcode' => '7000/090','descpt' => 'Baki Lelong','amaun' => $bakilelong['bakilelong']]);
+ if($bakilelong['rugilelong'] != 0) array_push($tanggungansemasa,['glcode' => '3000/020','descpt' => 'Kerugian Lelong','amaun' => $bakilelong['rugilelong']]);
+ if($wtd > 0) array_push($tanggungansemasa,['glcode' => '3000/021','descpt' => 'WANG TAK DITUNTUT','amaun' => $wtd]);
+ if($cajlelong > 0) array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Pendapatan Caj Lelong','amaun' => $cajlelong]);
+ if($untungrugiterkumpul > 0) array_push($tanggungansemasa,['glcode' => '7000/101','descpt' => 'Untung/Rugi Terkumpul','amaun' => $untungrugiterkumpul]);
+ if($cajperkhidmatan > 0) array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Caj Perkhidmatan Terkumpul','amaun' => $cajperkhidmatan]);
+ if($cajlelongxtra > 0) array_push($tanggungansemasa,['glcode' => '5000/313','descpt' => 'Pendapatan Caj Lelong Xtra ','amaun' => $cajlelongxtra]);
+ if($upahsimpanxtra > 0) array_push($tanggungansemasa,['glcode' => '5000/413','descpt' => 'Upah Simpan Xtra - Koperasi PKB','amaun' => $upahsimpanxtra]);
+ if($bakilelongxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/190','descpt' => 'Baki Lelong Xtra','amaun' => $bakilelongxtra]);
+ 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;
foreach($tanggungansemasa as $index => $ts)
@@ -4269,6 +4330,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)
{
@@ -4326,6 +4421,8 @@ class KhazanahController extends Controller
return view('print.laporan_perbelanjaan_baucer', compact('perbelanjaan','cawangan_detail','tarikh_cetak','api_url'));
}
+
+
public function RequestPembatalan(Request $request)
{
@@ -4333,7 +4430,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
]);
@@ -4343,4 +4440,73 @@ class KhazanahController extends Controller
return response('Berjaya');
}
-}
\ No newline at end of file
+ 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;
+
+ $polis = Http::get(config('api.url').'/api/polis/get/',['norujukan' => $request->norujukanhidden,'kodcaw' => $auth_user['cawangan']])->json();
+
+ $daftar = 0;
+ if(sizeof($polis) > 0)
+ {
+ event(new NotifikasiAGH($auth_user['cawangan'],'Tak boleh generate dah kerana sudah digenerate dah.','error',$auth_user['name']));
+ $daftar = 400;
+ }else{
+ $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();
+
+ event(new NotifikasiAGH($auth_user['cawangan'],'Surat Akuan Gadaian Hilang berjaya dijana.','success',$auth_user['name']));
+ // 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{
+
+ event(new NotifikasiAGH($auth_user['cawangan'],'Mengalami masalah dalam menjana.','error',$auth_user['name']));
+ // return redirect()->route('khazanah.customer_info')->with('aghinformation','Mengalami masalah dalam menjana.|error');
+ }
+
+ return response($daftarpolis);
+ }
+
+ public function cetakSuratAkuanGadaianHilang(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];
+
+
+
+
+ return view('print.suratgadaianhilang', compact('polis','gadai','customers','cawangan_detail','api_url'));
+ }
+
+}
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 5f07630..8ce3e9c 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -91,8 +91,13 @@ class LelongController extends Controller
$bakiakhir = $baki;
- $bakiakhir -= $request->jumlah;
-
+ if($request->jenis == 'T'){
+ $bakiakhir -= $request->jumlah;
+ }
+ else
+ {
+ $bakiakhir += -($request->jumlah);
+ }
//masuk dalam tunai aliran
$updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php
index e9539bc..ebd0b67 100644
--- a/app/Http/Controllers/PenebusanController.php
+++ b/app/Http/Controllers/PenebusanController.php
@@ -38,6 +38,36 @@ class PenebusanController extends Controller
return view('penebusan.index',compact('cawangan_info','api_url','gadai','marhun','nama','nilaihargasemasa'));
}
+ public function tebuspenuh(Request $request)
+ {
+ $api_url = config('api.url');
+
+ $updatetebus = Http::put(config('api.url').'/api/updatetebus/'. $request->kodcaw .'/' . $request->norujukan,[
+ "nopelanggan" => $request->nopelanggan,
+ "jenistebus" => $request->jenistebus,
+ "jbg" => $request->jbg,
+ "kadarupah" => $request->kadarupah,
+ "nilai_marhun" => $request->nilai_marhun,
+ "pinjaman" => $request->pinjaman,
+ "ansuran" => $request->ansuran,
+ "addpinjaman" => $request->addpinjaman,
+ "bakipinjaman" => $request->bakipinjaman,
+ "bakiupah" => $request->bakiupah,
+ "historygadaian" => $request->historygadaian,
+ "marhun" => $request->marhun,
+ "nowakil" => $request->nowakil,
+ "jenisbayarantebus" => $request->jenisbayarantebus,
+ "teller" => $request->teller
+ ])->json();
+
+ if($updatetebus)
+ {
+ return response('success');
+ }else{
+ return response('fail');
+ }
+ }
+
public function bayaransuransTawarruq(Request $request)
{
$api_url = config('api.url');
@@ -548,6 +578,145 @@ class PenebusanController extends Controller
}
+ public function tebusautotawarruq(Request $request)
+ {
+ $api_url = config('api.url');
+ $current = Carbon::now();
+ $current = new Carbon();
+ $curent_year = substr($current->year,2,2);
+ $curent_month = sprintf("%02d", $current->month);
+ $current_day = sprintf("%02d", $current->day);
+
+ $auth_user = Auth::user();
+
+ ////////////////////////
+ /// UPDATE TEBUS API////
+ ///////////////////////
+ $updatetebus = Http::put(config('api.url').'/api/updateautotawarruq/'. $auth_user['cawangan'] .'/' . $request->norujukan,[
+ 'nopelanggan' => $request->nopelanggan,
+ 'jenistebus' => $request->jenistebus,
+ 'jbg' => $request->jbg,
+ 'kadarupah' => $request->kadarupah,
+ 'nilai_marhun' => $request->nilai_marhun,
+ 'pinjaman' => $request->pinjaman_lama,
+ 'ansuran' => $request->ansuran,
+ 'addpinjaman'=> $request->addpinjaman,
+ 'bakipinjaman' => $request->bakipinjaman,
+ 'bakiupah' => $request->bakiupah,
+ 'nowakil' => $request->nowakil,
+ 'historygadaian' => $request->historygadaian,
+ 'marhun' => $request->marhun,
+ 'jenisbayarantebus' => $request->jenisbayarantebus,
+ 'teller' => $request->teller,
+
+ 'totalbayaran' => $request->totalbayaran,
+ ])->json();
+
+
+ //////////////////////
+ /// MAKING NEW SAG////
+ /////////////////////
+ $gadai_transaction = Http::get(config('api.url') . '/api/gadai/'. $auth_user['cawangan'] . '/' . $current->toDateString())->json();
+ if($gadai_transaction){
+ $new_sirig = $gadai_transaction['sirig'] + 1;
+
+ }else{
+ $new_sirig = 1;
+ }
+
+ $new_transaction = sprintf("%04d",$new_sirig);
+ $norujukanbaru = strtoupper($auth_user['cawangan']) . $curent_year . $curent_month . $current_day . '-' .$new_transaction;
+
+ $gadai = Http::post(config('api.url').'/api/gadai/'.$auth_user['cawangan'],[
+ 'norujukan' => $norujukanbaru,
+ 'nopelanggan' => $request->nopelanggan,
+ 'nokp' => $request->noic,
+ 'sirig' => $new_sirig
+ ]);
+
+
+ //////////////////////
+ ////Update SAG BARU///
+ /////////////////////
+ $keuntungan_sebln = $request->keuntungan_sebulan;
+ $keuntungan_sebln = str_replace(',','',$keuntungan_sebln);
+
+ $total_nilai_marhun = $request->total_nilai_marhun;
+ $margin_pinjaman = $request->pinjaman / $total_nilai_marhun;
+ $kadarupah = $request->kadarkeuntungan * 100;
+ $keuntungan6bulan = $keuntungan_sebln * 6;
+ $keuntungan12bulan = $keuntungan_sebln * 12;
+ $hargajualan = $request->pinjaman + $keuntungan12bulan;
+
+
+ $gadai = Http::put(config('api.url').'/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[
+ 'kodcaw' => $auth_user['cawangan'],
+ 'nilaimarhun' => round($total_nilai_marhun, 2),
+ 'berat' => round($request->total_berat, 2),
+ 'pinjaman' => round($request->pinjaman, 2),
+ 'kadarupah' => round($kadarupah, 2),
+ 'marhun' => $request->marhun_detail,
+ 'percentpinj' => $margin_pinjaman,
+ 'teller'=> $auth_user['name'],
+ 'upah6' => $keuntungan6bulan,
+ 'upah12' => $keuntungan12bulan,
+ 'hargajualan' => $hargajualan,
+ 'kuantiti_marhun' => $request->kuantiti_marhun
+ ])->json();
+
+ $komuditi = Http::put(config('api.url').'/api/komuditi/transaksi',[
+ 'unit_komuditi' => round($request->pinjaman, 2),
+ 'norujukan' => $norujukanbaru,
+ 'kodcaw' => $auth_user['cawangan'],
+ 'teller' => $auth_user['name']
+ ]);
+
+ ////////////////////////////
+ ////Update History Gadaian///
+ ////////////////////////////
+
+ $updatehistorygadaian = Http::put(config('api.url').'/api/gadai/updatehistory/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[
+ 'historygadaian' => $request->norujukan
+ ])->json();
+
+ ///////////////////////////
+ /// MARHUN UPDATE TABLE////
+ //////////////////////////
+
+
+ $arraymarhunbaru = [];
+
+ $marhunsediada = Http::get(config('api.url') . '/api/marhun/'. $request->norujukan)->json();
+
+ $marhunyangdiambil = $marhunsediada[0];
+ foreach($marhunyangdiambil as $index=>$marhunloop)
+ {
+ $karatbaru = str_replace('.','-',$marhunloop['karat']);
+ $hargabaru = Http::get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json();
+
+ $nilaimarhun = (floatval($hargabaru['harga']) * floatval($marhunloop['berat']));
+
+ array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $hargabaru['harga'], "n_marhun" => $nilaimarhun]);
+ }
+
+ foreach($arraymarhunbaru as $array1){
+ $updatemarhun = Http::post(config('api.url').'/api/marhun/'. $auth_user['cawangan'],[
+ 'norujukan' => $norujukanbaru,
+ 'marhun' => $array1['marhun'],
+ 'nota' => $array1['nota'],
+ 'karat' => $array1['karat'],
+ 'berat_emas' => $array1['berat'],
+ 'harga' => $array1['harga'],
+ 'nilai_marhun' => $array1['n_marhun']
+ ])->json();
+ }
+
+ $this->AliranTunaiController->alirantunaiTebusAutoTawarruq($request);
+
+
+ return response()->json($updatemarhun,200);
+
+ }
public function tebusseparuh(Request $request)
{
@@ -765,4 +934,24 @@ class PenebusanController extends Controller
return $totalnilaimarhun;
}
+ public function PenebusanKhazanah($norujukan){
+ $auth_user = Auth::user();
+ $api_url = config('api.url');
+ $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+
+ $gadaidetail = Http::get(config('api.url') . '/api/gadai/norujukan/'. $norujukan)->json();
+ $noic = $gadaidetail[0][0]['nokp'];
+ $customerdetail = Http::get(config('api.url') . '/api/customers/'. $noic)->json();
+ $marhundetail = Http::get(config('api.url') . '/api/marhun/'. $norujukan)->json();
+
+ $marhun = $marhundetail[0];
+ $nama = $customerdetail[0]['nama'];
+
+ $gadai = $gadaidetail[0][0];
+
+ $nilaihargasemasa = $this->tukaranhargaemas($norujukan);
+
+ return view('penebusan.index-khazanah',compact('cawangan_info','api_url','gadai','marhun','nama','nilaihargasemasa'));
+ }
+
}
diff --git a/composer.json b/composer.json
index b88c633..fbedd0b 100644
--- a/composer.json
+++ b/composer.json
@@ -20,6 +20,7 @@
"milon/barcode": "^7.0",
"predis/predis": "^1.1",
"pusher/pusher-php-server": "~4.0",
+ "rap2hpoutre/laravel-log-viewer": "^1.7",
"simplesoftwareio/simple-qrcode": "^4.1",
"spatie/laravel-medialibrary": "^7.19",
"twilio/sdk": "^6.16",
diff --git a/composer.lock b/composer.lock
index df97578..020bb29 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "79aad5a75460ed20426a86ab992dab8e",
+ "content-hash": "4f26944f77caea167bb120f5fe970820",
"packages": [
{
"name": "almasaeed2010/adminlte",
@@ -3337,6 +3337,69 @@
],
"time": "2020-08-18T17:17:46+00:00"
},
+ {
+ "name": "rap2hpoutre/laravel-log-viewer",
+ "version": "v1.7.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/rap2hpoutre/laravel-log-viewer.git",
+ "reference": "27392d29234b6ff38a456454558f4bcc40cc837a"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/rap2hpoutre/laravel-log-viewer/zipball/27392d29234b6ff38a456454558f4bcc40cc837a",
+ "reference": "27392d29234b6ff38a456454558f4bcc40cc837a",
+ "shasum": ""
+ },
+ "require": {
+ "illuminate/support": "4.2.*|5.*|^6.0|^7.0|^8.0",
+ "php": ">=5.4.0"
+ },
+ "require-dev": {
+ "orchestra/testbench": "3.7.*",
+ "phpunit/phpunit": "^7"
+ },
+ "type": "laravel-package",
+ "extra": {
+ "laravel": {
+ "providers": [
+ "Rap2hpoutre\\LaravelLogViewer\\LaravelLogViewerServiceProvider"
+ ]
+ }
+ },
+ "autoload": {
+ "classmap": [
+ "src/controllers"
+ ],
+ "psr-0": {
+ "Rap2hpoutre\\LaravelLogViewer\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "rap2hpoutre",
+ "email": "raphaelht@gmail.com"
+ }
+ ],
+ "description": "A Laravel log reader",
+ "keywords": [
+ "laravel",
+ "log",
+ "log-reader",
+ "log-viewer",
+ "logging",
+ "lumen"
+ ],
+ "support": {
+ "issues": "https://github.com/rap2hpoutre/laravel-log-viewer/issues",
+ "source": "https://github.com/rap2hpoutre/laravel-log-viewer/tree/master"
+ },
+ "time": "2020-09-08T12:21:27+00:00"
+ },
{
"name": "sabberworm/php-css-parser",
"version": "8.3.1",
diff --git a/config/app.php b/config/app.php
index 7d36cfc..1b9b59d 100644
--- a/config/app.php
+++ b/config/app.php
@@ -177,6 +177,7 @@ return [
Yajra\DataTables\DataTablesServiceProvider::class,
Barryvdh\DomPDF\ServiceProvider::class,
Milon\Barcode\BarcodeServiceProvider::class,
+ Rap2hpoutre\LaravelLogViewer\LaravelLogViewerServiceProvider::class,
],
diff --git a/config/logviewer.php b/config/logviewer.php
new file mode 100644
index 0000000..90c2a6f
--- /dev/null
+++ b/config/logviewer.php
@@ -0,0 +1,15 @@
+ 52428800, // size in Byte
+ 'pattern' => env('LOGVIEWER_PATTERN', '*.log'),
+ 'storage_path' => env('LOGVIEWER_STORAGE_PATH', storage_path('logs')),
+];
diff --git a/public/js/main.js b/public/js/main.js
index 9d027d9..d422400 100644
--- a/public/js/main.js
+++ b/public/js/main.js
@@ -135,7 +135,6 @@ function totalkeyserahan(datakeyin)
$.each(arrayambilan, function( index, arr ){
if(arr[0] == idkey)
{
-
arrayambilan[index][1] = totalamount(idkey,valkey);
}
@@ -267,6 +266,114 @@ function kiraan(datakeyin)
}
+function kiraanpanjar(datakeyin)
+{
+ var idkey = $(datakeyin).attr('id');
+ var valkey = $(datakeyin).val();
+ var amount = 0;
+ let amountkiraan = 0;
+
+ var validate = parseFloat($(datakeyin).data('amaun'));
+
+ $.each(arrayambilan, function( index, arr ){
+ if(arr[0] == idkey)
+ {
+
+ arrayambilan[index][1] = totalamount(idkey,valkey);
+ }
+
+ amount += arr[1];
+ });
+
+ if(Number(valkey) > Number(validate))
+ {
+ Swal.fire({
+ icon: 'error',
+ title: 'Amaran',
+ text: 'Jumlah denominasi melebihi kadar'
+ });
+ $(datakeyin).val('');
+ }
+ else
+ {
+
+ $('#amaunkiraan').val(amount);
+
+ }
+
+ switch(idkey) {
+ case 'bundle1':
+ amountkiraan += (valkey * 100);
+ $('#totalb1').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'bundle20':
+ amountkiraan += (valkey * 1000);
+ $('#totalb20').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'bundle5':
+ amountkiraan += (valkey * 500);
+ $('#totalb5').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'bundle50':
+ amountkiraan += (valkey * 5000);
+ $('#totalb50').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'bundle10':
+ amountkiraan += (valkey * 1000);
+ $('#totalb10').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'bundle100':
+ amountkiraan += (valkey * 5000);
+ $('#totalb100').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'sen1':
+ amountkiraan += (valkey * 0.01);
+ $('#totalsen1').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'sen5':
+ amountkiraan += (valkey * 0.05);
+ $('#totalsen5').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'sen10':
+ amountkiraan += (valkey * 0.05);
+ $('#totalsen10').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'sen20':
+ amountkiraan += (valkey * 0.20);
+ $('#totalsen20').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'sen50':
+ amountkiraan += (valkey * 0.50);
+ $('#totalsen50').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'ringgit1':
+ amountkiraan += (valkey * 1);
+ $('#totalring1').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'ringgit5':
+ amountkiraan += (valkey * 5);
+ $('#totalring5').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'ringgit10':
+ amountkiraan += (valkey * 10);
+ $('#totalring10').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'ringgit20':
+ amountkiraan += (valkey * 20);
+ $('#totalring20').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'ringgit50':
+ amountkiraan += (valkey * 50);
+ $('#totalring50').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'ringgit100':
+ amountkiraan += (valkey * 100);
+ $('#totalring100').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ }
+
+}
+
async function openuptambahdanserah(e)
{
var id = $(e).attr('id');
diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php
index e8fbca1..cfcff80 100644
--- a/resources/views/aliran_tunai/index.blade.php
+++ b/resources/views/aliran_tunai/index.blade.php
@@ -197,7 +197,7 @@
-
+
Bil
@@ -209,7 +209,9 @@
@if(is_object($tuntutbaki) || is_array($tuntutbaki))
+ @php $totaltuntutbaki = 0; $totalcajlelong = 0; @endphp
@foreach($tuntutbaki as $tb)
+ @php $totaltuntutbaki += $tb['jumlah'];$totalcajlelong += $tb['cajlelong']; @endphp
{{ $loop->iteration }}
{{ $tb['tarikh'] }}
@@ -224,6 +226,13 @@
@endforeach
@endif
+
+ JUMLAH
+ {{ number_format($totalcajlelong,2)}}
+ {{ number_format($totaltuntutbaki,2)}}
+
+
+
@@ -336,9 +345,7 @@
});
}
}
- }
});
-
}
let pusherenv = "{{ env('PUSHER_APP_KEY') }}";
diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php
index 3738a37..083e053 100644
--- a/resources/views/customers/info.blade.php
+++ b/resources/views/customers/info.blade.php
@@ -477,26 +477,192 @@
function checkserah(data){
var urlpenebusan = $(data).data("url");
var norujukan = $(data).data("norujukan");
+
$.ajax({
method:'get',
- url: api_url + '/api/check/serah/gadai',
+ url: api_url + '/api/polis/get/',
datatype:'json',
data:{
'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
'norujukan': norujukan
},
success:function(data){
- if(data == 'true'){
- window.location = urlpenebusan;
- }else if(data == 'false'){
- Swal.fire({
- icon: 'error',
- title: 'Amaran',
- text: 'Gadaian Belum Scan Barcode'
- });
+
+ var count = Object.keys(data).length;
+
+ if(count > 0)
+ {
+ if(data[0].tebus === 0)
+ {
+ const swalWithBootstrapButtons = Swal.mixin({
+ customClass: {
+ confirmButton: 'btn btn-success',
+ cancelButton: 'btn btn-danger mr-1'
+ },
+ buttonsStyling: false
+ });
+
+ swalWithBootstrapButtons.fire({
+ title: 'Dapatkan Pengesahan Khazanah',
+ text: "Surat Akuan Gadaian Hilang!",
+ icon: 'info',
+ showCancelButton: true,
+ confirmButtonText: 'Hantar',
+ cancelButtonText: 'Batal',
+ reverseButtons: true
+ }).then((result) => {
+ if (result.isConfirmed) {
+
+ let komen = "Surat Akuan Gadaian Hilang|" + '-' + "|" + '-' + "|" + '-' + "| Tambah Pinjaman";
+ let teller = "{{ Auth::user()->name }}";
+
+ Swal.fire({
+ title: 'Tunggu Pengesahan Daripada Khazanah.',
+ icon: 'info',
+ width: 600,
+ padding: '3em',
+ background: '#fffff',
+ showCancelButton: false,
+ showConfirmButton: false,
+ allowOutsideClick: false,
+ allowEscapeKey: false,
+ allowEnterKey: false
+ })
+ let siricreated = 0;
+ $.ajax({
+ method:'post',
+ url: "{{ route('khazanah.createkelulusan') }}",
+ data: {
+ "_token": "{{ csrf_token() }}",
+ "norujukan" : norujukan,
+ "komen" : komen,
+ "jumpinjam" : '0.00',
+ "teller" : teller
+ },
+ success:function(data){
+ siricreated = data;
+ },
+ error: function(xhr, status, error) {
+ var err = eval("(" + xhr.responseText + ")");
+ alert(xhr.responseText);
+ }
+ });
+
+ var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
+ cluster: 'ap1',
+ encrypted: true
+ });
+
+ var channel = pusher.subscribe('notice-kelulusan');
+ channel.bind('my-kelulusan', function(data) {
+
+
+ if(data.norujukan == norujukan && data.siri == siricreated)
+ {
+ if(data.kelulusan == 'lulus')
+ {
+ Swal.fire({
+ icon: 'success',
+ title: 'Telah Disahkan'
+ }).then(function(){
+ $.ajax({
+ method:'put',
+ url: api_url + '/api/polis/put/',
+ data: {
+ 'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
+ 'norujukan': norujukan,
+ 'tebus' : 1
+ },
+ success:function(data){
+ location.reload();
+
+ },
+ error: function(xhr, status, error) {
+ var err = eval("(" + xhr.responseText + ")");
+ alert(xhr.responseText);
+ }
+ });
+ });
+
+ }
+ else if(data.kelulusan == 'batal')
+ {
+ Swal.fire({
+ icon: 'warning',
+ title: 'Telah Dibatalkan',
+ text: `Komen : ${data.komen}`
+ }).then(function(){
+ return false;
+ });
+ }
+ }
+
+ });
+
+
+ }
+ else if (result.dismiss === Swal.DismissReason.cancel) {
+ swalWithBootstrapButtons.fire(
+ 'Gagal',
+ 'Gagal mendapatkan kelulusan khazanah',
+ 'error'
+ )
+ }
+ });
+ }
+ else
+ {
+ $.ajax({
+ method:'get',
+ url: api_url + '/api/check/serah/gadai',
+ datatype:'json',
+ data:{
+ 'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
+ 'norujukan': norujukan
+ },
+ success:function(data){
+ if(data == 'true'){
+ window.location = urlpenebusan;
+ }else if(data == 'false'){
+ Swal.fire({
+ icon: 'error',
+ title: 'Amaran',
+ text: 'Gadaian Belum Scan Barcode'
+ });
+ }
+ }
+ });
+ }
+
+
+
+ }else{
+ $.ajax({
+ method:'get',
+ url: api_url + '/api/check/serah/gadai',
+ datatype:'json',
+ data:{
+ 'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
+ 'norujukan': norujukan
+ },
+ success:function(data){
+ if(data == 'true'){
+ window.location = urlpenebusan;
+ }else if(data == 'false'){
+ Swal.fire({
+ icon: 'error',
+ title: 'Amaran',
+ text: 'Gadaian Belum Scan Barcode'
+ });
+ }
+ }
+ });
}
}
});
+
+
+
}
function gadaiTable(data,jenistebus){
@@ -522,7 +688,7 @@
gadai_detail['t_matang'],
'RM '+formatter.format(gadai_detail['pinjaman']),
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
- gadai_detail['jbg']
+ gadai_detail['tempoh']
]).draw();
}else{
tablegadai.row.add([
@@ -545,7 +711,7 @@
gadai_detail['t_update'],
'RM '+formatter.format(gadai_detail['bakipjm']),
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
- gadai_detail['jbg']
+ gadai_detail['tempoh']
]).draw();
}else if(jenistebus == "lelong"){
var urlroute = '{{ route("lelongan", ":id") }}';
diff --git a/resources/views/homepage/khazanah/home.blade.php b/resources/views/homepage/khazanah/home.blade.php
index 9769bbe..6b9214b 100644
--- a/resources/views/homepage/khazanah/home.blade.php
+++ b/resources/views/homepage/khazanah/home.blade.php
@@ -174,7 +174,7 @@
Laporan
diff --git a/resources/views/khazanah/dashboard.blade.php b/resources/views/khazanah/dashboard.blade.php
index 4d34971..46c23a3 100644
--- a/resources/views/khazanah/dashboard.blade.php
+++ b/resources/views/khazanah/dashboard.blade.php
@@ -150,11 +150,11 @@
Keuntungan :
-
RM {{ number_format($keuntungan) }}
+
RM {{ number_format($keuntungan,2) }}
Upah Simpan :
-
RM {{ number_format($upahsimpan) }}
+
RM {{ number_format($upahsimpan,2) }}
diff --git a/resources/views/khazanah/index.blade.php b/resources/views/khazanah/index.blade.php
index 78fc091..4195a35 100644
--- a/resources/views/khazanah/index.blade.php
+++ b/resources/views/khazanah/index.blade.php
@@ -10,17 +10,31 @@
+
+
+
+ Home
+ Pengenalan Diri
+
+
+
masukkan nombor kad pengenalan
-
-
+
@@ -44,13 +58,13 @@
Daftar Pelanggan
+
+
+
+
+
+
+
+
@@ -160,12 +307,62 @@
@endsection
diff --git a/resources/views/khazanah/info.blade.php b/resources/views/khazanah/info.blade.php
index dd5df0a..319c9e3 100644
--- a/resources/views/khazanah/info.blade.php
+++ b/resources/views/khazanah/info.blade.php
@@ -1,5 +1,222 @@
@extends('layouts.app')
+
+
@section('content')
+@include('modal.historytebus')
+@include('modal.wakil')
+@include('modal.agh')
+
+
+
+
+
+
+
+
+ Home
+ Pengenalan Diri
+ Pelanggan
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Bil
+ No Rujukan
+ Tarikh Gadai
+ Tarikh Matang
+ Baki Harga Jualan
+ Baki Pembiayaan
+ Margin
+ Tempoh
+ Keuntungan
+
+
+
+
+
+
+
+
+ Bil
+ No Rujukan
+ Tarikh Gadai
+ Tarikh Matang
+ Pembiayaan
+ Margin
+ Tempoh
+
+
+
+
+
+
+ {{-- Sudah Tebus --}}
+
+
+
+
+ Bil
+ No Rujukan
+ Tarikh Tebus
+ Baki Pembiayaan
+ Margin
+ Tempoh
+
+
+
+
+
+
+
+ Bil
+ No Rujukan
+ Tarikh Lelong
+ Tarikh Tuntut
+ Pembiayaan
+ Harga Jual
+ Jum Tuntut/Bayar
+ Keuntungan
+ Caj Lelong
+
+
+
+
+
+ Rekod Gadaian
+ Surat Akuan Hilang
+
+
+
+
+
+
+
+
+
@@ -80,7 +323,8 @@
@php
- $daerah = Http::get($api_url . '/api/daerah/' . $customer_info['koddaerah'])->json();
+ $poskod = Http::get($api_url . '/api/poskod/'. $customer_info['poskod'])->json();
+ $daerah = Http::get($api_url . '/api/daerah/' . $poskod['koddaerah'])->json();
@endphp
@@ -91,16 +335,25 @@
@php
- $negeri = Http::get($api_url . '/api/negeri/' . $customer_info['kodnegeri'])->json();
+ $negeri = Http::get($api_url . '/api/negeri/' . $poskod['kodnegeri'])->json();
@endphp
+
Kemaskini
+ Save
Daftar Akaun Online
@@ -151,271 +404,673 @@
-
-
-
-
-
-
-
maklumat pelanggan
-
-
-
-
-
-
-
- Bil
- No Rujukan
- Tarikh Gadai
- Pembiayaan
- Nilai Marhun
- Tempoh
- Keuntungan
- Tarikh Matang
- Margin
- Kos Keuntungan
- Hapus Gadai
-
-
-
-
-
- {{-- Sudah Tebus --}}
-
-
-
-
- Bil
- No Rujukan
- Tarikh Gadai
- Pembiayaan
- Nilai Marhun
- Tempoh
- Keuntungan
- Tarikh Matang
- Margin
- Kos Keuntungan
- Hapus Gadai
-
-
-
-
-
-
-
-
- Bil
- No Rujukan
- Tarikh Gadai
- Pembiayaan
- Nilai Marhun
- Tempoh
- Keuntungan
- Tarikh Matang
- Margin
- Kos Keuntungan
- Hapus Gadai
-
-
-
-
-
-
-
-
-
-
@endsection
diff --git a/resources/views/khazanah/laporan/index.blade.php b/resources/views/khazanah/laporan/index.blade.php
index 22d14b5..959af9b 100644
--- a/resources/views/khazanah/laporan/index.blade.php
+++ b/resources/views/khazanah/laporan/index.blade.php
@@ -63,6 +63,10 @@
+
diff --git a/resources/views/khazanah/laporan/tuntutbaki.blade.php b/resources/views/khazanah/laporan/tuntutbaki.blade.php
new file mode 100644
index 0000000..fae7641
--- /dev/null
+++ b/resources/views/khazanah/laporan/tuntutbaki.blade.php
@@ -0,0 +1,156 @@
+@extends('layouts.app')
+
+@section('content')
+
+
+
+
+
+
+ Home
+ Laporan
+ Tuntut Baki
+
+
+
+
+
+
+
+
+
+
+
+ Bil
+ Nama
+ No K/P
+ No Rujukan
+ Nama Teller
+ Caj Lelong (RM)
+ Jumlah Baki (RM)
+
+
+
+ TOTAL
+
+
+
+
+
+
+
+
+ {{--
+
+ Bilangan Surat : 3
+ Jumlah Pinjaman : RM 3,000.00
+
+
--}}
+
+
+
+
+
+
+@endsection
+
diff --git a/resources/views/khazanah/panjar.blade.php b/resources/views/khazanah/panjar.blade.php
index 2a5f9e7..79d14dc 100644
--- a/resources/views/khazanah/panjar.blade.php
+++ b/resources/views/khazanah/panjar.blade.php
@@ -59,6 +59,8 @@
Perubatan
Dapur
Pos
+
+
Baki Perubatan
@@ -113,7 +115,11 @@
var tablepanjar = $('#table-panjar').DataTable({
"scrollX": true
- });
+ });
+
+ var tablebakiperubatan = $('#table-bakiperubatan').DataTable({
+ // "scrollX": true
+ });
$(document).ready( function () {
@@ -134,7 +140,7 @@
Swal.fire({
icon: 'error',
title: 'Amaran!',
- text: 'Tambah Marhun Tidak Berjaya'
+ text: 'Panjar Tak Berjaya'
});
console.log(xhRequest);
}
@@ -196,7 +202,7 @@
Swal.fire({
icon: 'error',
title: 'Amaran!',
- text: 'Tambah Marhun Tidak Berjaya'
+ text: 'Panjar Tidak Berjaya'
});
console.log(xhRequest);
}
@@ -208,52 +214,104 @@
function checkformpanjar(formdata)
{
+
+ // let keraian = $('#KeraianForm').hasClass('in'); //-- check dapur only for tuntutan;
- // let dapur = $('#DapurModal').hasClass('in'); //-- check dapur only for tuntutan;
-
- // //Variable Initialize
- // let baucer = $(formdata).find("[name='baucer']").val();
- // let tarikh = $(formdata).find("[name='tarikh']").val();
+ let baucer = $(formdata).find("[name='baucer']").val();
+ let tarikh = $(formdata).find("[name='tarikh']").val();
// let tuntutan = $(formdata).find("[name='tuntutan']").val();
- // let tarikhbil = $(formdata).find("[name='tarikhbil']").val();
- // let deskripsi = $(formdata).find("[name='deskripsi']").val();
- // let bayaran = $(formdata).find("[name='bayaran']").val();
+ let tarikhbil = $(formdata).find("[name='tarikhbil']").val();
+ let deskripsi = $(formdata).find("[name='deskripsi']").val();
+ let bayaran = $(formdata).find("[name='bayaran']").val();
- // var validation = Array.prototype.filter.call(formdata, function(form) {
- // if (form.checkValidity() === false) {
- // event.preventDefault();
- // event.stopPropagation();
- // }
- // form.classList.add('is-invalid');
- // });
- // if(!tarikh)
- // {
- // console.log('tarikh xleh');
- // }
+ let booltarikh = true; let booltarikhbil = true; let booldeskripsi = true; let boolbayaran = true;
- // if(!tarikhbil)
- // {
- // console.log('tarikh xde');
- // }
+ if(!tarikh)
+ {
+ $(formdata).find("[name='errortarikh']").show();
+ $(formdata).find("[name='errortarikh']").text("*Isikan tarikh dalam input!");
+ $(formdata).find("[name='tarikh']").addClass('is-invalid');
+ $(formdata).find("[name='tarikh']").parent().removeClass("mb-4");
- // if(dapur === false)
- // {
- // if(!tuntutan)
- // console.log('tututan xde');
- // }
+ booltarikh = false;
+ }else{
+ $(formdata).find("[name='errortarikh']").hide();
+ $(formdata).find("[name='tarikh']").removeClass('is-invalid');
+ $(formdata).find("[name='tarikh']").parent().addClass("mb-4");
- // if(deskripsi === '' || deskripsi === null)
- // {
- // console.log('deskripsi xde');
- // }
+ booltarikh = true;
+ }
- // if(bayaran === null || bayaran === '')
- // {
- // console.log('bayaran xde');
- // }
-
- // return false;
+ if(!tarikhbil)
+ {
+ $(formdata).find("[name='errorbil']").show();
+ $(formdata).find("[name='errorbil']").text("*Isikan tarikh bil dalam input!");
+ $(formdata).find("[name='tarikhbil']").addClass('is-invalid');
+ $(formdata).find("[name='tarikhbil']").parent().removeClass("mb-4");
+
+ booltarikhbil = false;
+
+ }else{
+ $(formdata).find("[name='errorbil']").hide();
+ $(formdata).find("[name='tarikhbil']").removeClass('is-invalid');
+ $(formdata).find("[name='tarikhbil']").parent().addClass("mb-4");
+
+ booltarikhbil = true;
+ }
+
+ if(!$.trim(deskripsi))
+ {
+ $(formdata).find("[name='errordeskripsi']").show();
+ $(formdata).find("[name='errordeskripsi']").text("*Isikan tarikh deskripsi dalam input!");
+ $(formdata).find("[name='deskripsi']").addClass('is-invalid');
+ $(formdata).find("[name='deskripsi']").parent().removeClass("mb-4");
+
+ booldeskripsi = false;
+ }else{
+ $(formdata).find("[name='errordeskripsi']").hide();
+ $(formdata).find("[name='deskripsi']").removeClass('is-invalid');
+ $(formdata).find("[name='deskripsi']").parent().addClass("mb-4");
+
+ booldeskripsi = true;
+ }
+
+ if(!bayaran)
+ {
+ $(formdata).find("[name='errorbayaran']").show();
+ $(formdata).find("[name='errorbayaran']").text("*Isikan bayaran dalam input!");
+ $(formdata).find("[name='bayaran']").addClass('is-invalid');
+ $(formdata).find("[name='bayaran']").parent().removeClass("mb-4");
+
+ boolbayaran = false;
+ }else{
+ $(formdata).find("[name='errorbayaran']").hide();
+ $(formdata).find("[name='bayaran']").removeClass('is-invalid');
+ $(formdata).find("[name='bayaran']").parent().addClass("mb-4");
+
+ boolbayaran = true;
+ }
+
+ let errorbaucer = $(formdata).find("[name='errorbaucer']").text();
+ let errortarikh = $(formdata).find("[name='errortarikh']").text();
+ let errortuntutan = $(formdata).find("[name='errortuntutan']").text();
+ let errortarikhbil = $(formdata).find("[name='errorbil']").text();
+ let errordeskripsi = $(formdata).find("[name='errordeskripsi']").text();
+ let errorbayaran = $(formdata).find("[name='errorbayaran']").text();
+
+ if(booltarikh === true && booltarikhbil === true && booldeskripsi === true && boolbayaran === true)
+ {
+ return true;
+ }else{
+
+ event.preventDefault();
+ return;
+ }
+
+ event.preventDefault();
+ return;
+
+
}
function openupdeno()
@@ -314,6 +372,27 @@
.find("input[type=checkbox], input[type=radio]")
.prop("checked", "")
.end();
+
+ $(this).find("[name='errortarikh']").hide();
+ $(this).find("[name='tarikh']").removeClass('is-invalid');
+ $(this).find("[name='tarikh']").parent().addClass("mb-4");
+
+ $(this).find("[name='errortuntutan']").hide();
+ $(this).find("[name='tuntutan']").removeClass('is-invalid');
+ $(this).find("[name='tuntutan']").parent().addClass("mb-4");
+
+ $(this).find("[name='errorbil']").hide();
+ $(this).find("[name='tarikhbil']").removeClass('is-invalid');
+ $(this).find("[name='tarikhbil']").parent().addClass("mb-4");
+
+ $(this).find("[name='errordeskripsi']").hide();
+ $(this).find("[name='deskripsi']").removeClass('is-invalid');
+ $(this).find("[name='deskripsi']").parent().addClass("mb-4");
+
+ $(this).find("[name='errorbayaran']").hide();
+ $(this).find("[name='bayaran']").removeClass('is-invalid');
+ $(this).find("[name='bayaran']").parent().addClass("mb-4");
+
});
$('#SelenggaraModal').on('hidden.bs.modal', function (e) {
@@ -324,6 +403,26 @@
.find("input[type=checkbox], input[type=radio]")
.prop("checked", "")
.end();
+
+ $(this).find("[name='errortarikh']").hide();
+ $(this).find("[name='tarikh']").removeClass('is-invalid');
+ $(this).find("[name='tarikh']").parent().addClass("mb-4");
+
+ $(this).find("[name='errortuntutan']").hide();
+ $(this).find("[name='tuntutan']").removeClass('is-invalid');
+ $(this).find("[name='tuntutan']").parent().addClass("mb-4");
+
+ $(this).find("[name='errorbil']").hide();
+ $(this).find("[name='tarikhbil']").removeClass('is-invalid');
+ $(this).find("[name='tarikhbil']").parent().addClass("mb-4");
+
+ $(this).find("[name='errordeskripsi']").hide();
+ $(this).find("[name='deskripsi']").removeClass('is-invalid');
+ $(this).find("[name='deskripsi']").parent().addClass("mb-4");
+
+ $(this).find("[name='errorbayaran']").hide();
+ $(this).find("[name='bayaran']").removeClass('is-invalid');
+ $(this).find("[name='bayaran']").parent().addClass("mb-4");
});
$('#BelanjaamModal').on('hidden.bs.modal', function (e) {
@@ -334,6 +433,26 @@
.find("input[type=checkbox], input[type=radio]")
.prop("checked", "")
.end();
+
+ $(this).find("[name='errortarikh']").hide();
+ $(this).find("[name='tarikh']").removeClass('is-invalid');
+ $(this).find("[name='tarikh']").parent().addClass("mb-4");
+
+ $(this).find("[name='errortuntutan']").hide();
+ $(this).find("[name='tuntutan']").removeClass('is-invalid');
+ $(this).find("[name='tuntutan']").parent().addClass("mb-4");
+
+ $(this).find("[name='errorbil']").hide();
+ $(this).find("[name='tarikhbil']").removeClass('is-invalid');
+ $(this).find("[name='tarikhbil']").parent().addClass("mb-4");
+
+ $(this).find("[name='errordeskripsi']").hide();
+ $(this).find("[name='deskripsi']").removeClass('is-invalid');
+ $(this).find("[name='deskripsi']").parent().addClass("mb-4");
+
+ $(this).find("[name='errorbayaran']").hide();
+ $(this).find("[name='bayaran']").removeClass('is-invalid');
+ $(this).find("[name='bayaran']").parent().addClass("mb-4");
});
$('#PerubatanModal').on('hidden.bs.modal', function (e) {
@@ -344,6 +463,26 @@
.find("input[type=checkbox], input[type=radio]")
.prop("checked", "")
.end();
+
+ $(this).find("[name='errortarikh']").hide();
+ $(this).find("[name='tarikh']").removeClass('is-invalid');
+ $(this).find("[name='tarikh']").parent().addClass("mb-4");
+
+ $(this).find("[name='errortuntutan']").hide();
+ $(this).find("[name='tuntutan']").removeClass('is-invalid');
+ $(this).find("[name='tuntutan']").parent().addClass("mb-4");
+
+ $(this).find("[name='errorbil']").hide();
+ $(this).find("[name='tarikhbil']").removeClass('is-invalid');
+ $(this).find("[name='tarikhbil']").parent().addClass("mb-4");
+
+ $(this).find("[name='errordeskripsi']").hide();
+ $(this).find("[name='deskripsi']").removeClass('is-invalid');
+ $(this).find("[name='deskripsi']").parent().addClass("mb-4");
+
+ $(this).find("[name='errorbayaran']").hide();
+ $(this).find("[name='bayaran']").removeClass('is-invalid');
+ $(this).find("[name='bayaran']").parent().addClass("mb-4");
});
@@ -355,6 +494,26 @@
.find("input[type=checkbox], input[type=radio]")
.prop("checked", "")
.end();
+
+ $(this).find("[name='errortarikh']").hide();
+ $(this).find("[name='tarikh']").removeClass('is-invalid');
+ $(this).find("[name='tarikh']").parent().addClass("mb-4");
+
+ $(this).find("[name='errortuntutan']").hide();
+ $(this).find("[name='tuntutan']").removeClass('is-invalid');
+ $(this).find("[name='tuntutan']").parent().addClass("mb-4");
+
+ $(this).find("[name='errorbil']").hide();
+ $(this).find("[name='tarikhbil']").removeClass('is-invalid');
+ $(this).find("[name='tarikhbil']").parent().addClass("mb-4");
+
+ $(this).find("[name='errordeskripsi']").hide();
+ $(this).find("[name='deskripsi']").removeClass('is-invalid');
+ $(this).find("[name='deskripsi']").parent().addClass("mb-4");
+
+ $(this).find("[name='errorbayaran']").hide();
+ $(this).find("[name='bayaran']").removeClass('is-invalid');
+ $(this).find("[name='bayaran']").parent().addClass("mb-4");
});
// $('#denominasipanjar').on('hidden.bs.modal', function (e) {
diff --git a/resources/views/khazanah/pendahuluanserahanmain.blade.php b/resources/views/khazanah/pendahuluanserahanmain.blade.php
index 951cc09..4d6230a 100644
--- a/resources/views/khazanah/pendahuluanserahanmain.blade.php
+++ b/resources/views/khazanah/pendahuluanserahanmain.blade.php
@@ -150,12 +150,77 @@
let dtacct = $('#dtacct').val();
let ktacct = $('#ktacct').val();
- $('#amaundiminta').val(amaun);
+ let boolamaun = false;let boolketerangan = false;let booljenis = false;
+ if(!amaun)
+ {
+ $("[name='erroramaun']").show();
+ $("[name='erroramaun']").text("*Isikan amaun dalam input!");
+ $("[name='amaun']").addClass('is-invalid');
- $('#denominasiHQModal').modal('show');
- $('#pendahuluanserahanModal').modal('hide');
+ boolamaun = true;
+ }else{
+ $("[name='erroramaun']").hide();
+ $("[name='amaun']").removeClass('is-invalid');
+
+ boolamaun = false;
+ }
+
+ if(!keterangan)
+ {
+ $("[name='errorketerangan']").show();
+ $("[name='errorketerangan']").text("*Isikan keterangan dalam input!");
+ $("[name='keterangan']").addClass('is-invalid');
+
+ boolketerangan = true;
+ }else{
+ $("[name='errorketerangan']").hide();
+ $("[name='keterangan']").removeClass('is-invalid');
+
+ boolketerangan = false;
+ }
+
+ if(!jenis)
+ {
+ $(".invalid-feedback").show();
+
+ booljenis = true;
+ }else{
+ $(".invalid-feedback").hide();
+
+ booljenis = false;
+ }
+
+ if(boolamaun === false && boolketerangan === false && booljenis === false)
+ {
+ console.log('masuk');
+ $('#amaundiminta').val(amaun);
+ $('#denominasiHQModal').modal('show');
+ $('#pendahuluanserahanModal').modal('hide');
+ return true;
+ }else{
+ event.preventDefault();
+ return false;
+ }
+
+
}
+ $('#pendahuluanserahanModal').on('hidden.bs.modal', function (e) {
+
+ $(this).find("[name='erroramaun']").hide();
+ $(this).find("[name='amaun']").removeClass('is-invalid');
+ // $(this).find("[name='tarikh']").parent().addClass("mb-4");
+
+ $(this).find("[name='errorketerangan']").hide();
+ $(this).find("[name='keterangan']").removeClass('is-invalid');
+ // $(this).find("[name='tuntutan']").parent().addClass("mb-4");
+
+ $(this).find(".invalid-feedback").hide();
+ // $(this).find("[name='errorradio']").removeClass('is-invalid');
+ // $(this).find("[name='tarikhbil']").parent().addClass("mb-4");
+
+ });
+
function funcbatal()
{
$('#denominasiHQModal').modal('hide');
diff --git a/resources/views/khazanah/tebus.blade.php b/resources/views/khazanah/tebus.blade.php
index 16d54ad..f9fe130 100644
--- a/resources/views/khazanah/tebus.blade.php
+++ b/resources/views/khazanah/tebus.blade.php
@@ -106,9 +106,9 @@
{{$ls['norujukan']}}
-
+ {{ $ls['penilai'] }}
{{ $ls['jenistebus'] }}
- {{ $ls['nilaimarhun'] }}
+ {{ $ls['nilaimarhun'] }}
@endforeach
diff --git a/resources/views/layouts/app_operasi.blade.php b/resources/views/layouts/app_operasi.blade.php
index cf40376..ca892d2 100644
--- a/resources/views/layouts/app_operasi.blade.php
+++ b/resources/views/layouts/app_operasi.blade.php
@@ -131,9 +131,22 @@
$('#linkz').text(data.namateller + " Pohon Kelulusan");
$("#linkz").attr("href", "{{ url('kelulusan') }}");
- audio.play();
- audio.muted = false;
-
+ if(window.location.pathname === '/operasi/kelulusan')
+ {
+ location.reload();
+ }else{
+ audio.play();
+ audio.muted = false;
+ var countlagu = 1;
+ audio.onended = function() {
+ if(countlagu <= 3){
+ countlagu++;
+ console.log(countlagu);
+ this.play();
+ }
+ }
+ }
+
const Toast = Swal.mixin({
toast: true,
position: 'top-end',
diff --git a/resources/views/lelongan/index.blade.php b/resources/views/lelongan/index.blade.php
index e275dfb..bf08b1b 100644
--- a/resources/views/lelongan/index.blade.php
+++ b/resources/views/lelongan/index.blade.php
@@ -207,6 +207,8 @@
buttonsStyling: false
});
+ let jumlah = $('#jumlah').val();let hargajual = $('#hargajual').val();
+
swalWithBootstrapButtons.fire({
title: 'Dapatkan Pengesahan Khazanah',
text: "Tuntutan Baki Pelanggan!",
@@ -230,7 +232,7 @@
allowEnterKey: false
})
- let mohon = "Tuntut Baki Lelongan";
+
let norujukan = $('#norujukan').val();
@@ -241,14 +243,16 @@
if($("input[name='radlelong']:checked").val() == 'baki')
{
jenis = 'T';
+ let mohon = "Tuntut Baki Lelongan";
}else{
jenis = 'B';
+ let mohon = "Bayar Baki Lelongan";
}
- let batchno = $('#batch').val();let teller = "{{ Auth::user()->name }}";let bakipjm = $('#pembiayaan').val();let bakiupah = $('#keuntungan').val();
+ let batchno = $('#batch').val();let teller = "{{ Auth::user()->name }}";let bakipjm = $('#pembiayaan').val().replace(/[^0-9.-]+/g,"");let bakiupah = $('#keuntungan').val();
let cajlain = 0.00; let cajlelong = $('#cajlelong').val();
- let jumlah = $('#jumlah').val();let hargajual = $('#hargajual').val();
+ let jumlah = $('#jumlah').val().replace(/[^0-9.-]+/g,"");let hargajual = $('#hargajual').val().replace(/[^0-9.-]+/g,"");
$.ajax({
method:'post',
@@ -273,8 +277,6 @@
var channel = pusher.subscribe('notice-ubahhapus');
channel.bind('my-ubahhapus', function(data) {
- console.log(data);
-
if(data.norujukan == norujukan)
{
diff --git a/resources/views/modal/agh.blade.php b/resources/views/modal/agh.blade.php
new file mode 100644
index 0000000..0f2f7d3
--- /dev/null
+++ b/resources/views/modal/agh.blade.php
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
+
+
+ @csrf
+
+
+
Jenis Alasan :
+
+
+ Simpanan
+ Bencana alam
+ Kecurian
+ Di Ragut
+ Kes Polis
+ Hilang
+
+
+
+
+
+
Negeri :
+
+
+ @foreach($negeri as $neg)
+ {{ $neg['negeri'] }}
+ @endforeach
+
+
+
+
+
+
+
Daerah :
+
+
+ Sila Pilih Negeri *
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/views/modal/denominasimodalpendahuluanserahan.blade.php b/resources/views/modal/denominasimodalpendahuluanserahan.blade.php
index 2c9179d..c5f5b76 100644
--- a/resources/views/modal/denominasimodalpendahuluanserahan.blade.php
+++ b/resources/views/modal/denominasimodalpendahuluanserahan.blade.php
@@ -118,6 +118,7 @@
+
RM100
diff --git a/resources/views/modal/denopanjar.blade.php b/resources/views/modal/denopanjar.blade.php
index 8f7fc73..76119ce 100644
--- a/resources/views/modal/denopanjar.blade.php
+++ b/resources/views/modal/denopanjar.blade.php
@@ -35,51 +35,51 @@
RM0.01
-
+
RM1
-
+
RM0.05
-
+
RM5
-
+
RM0.10
-
+
RM10
-
+
RM0.20
-
+
RM20
-
+
RM0.50
-
+
RM50
-
+
@@ -89,7 +89,7 @@
RM100
-
+
diff --git a/resources/views/modal/panjar.blade.php b/resources/views/modal/panjar.blade.php
index 8621ce9..651c408 100644
--- a/resources/views/modal/panjar.blade.php
+++ b/resources/views/modal/panjar.blade.php
@@ -8,7 +8,7 @@
×
-
+
@csrf
@@ -31,60 +31,50 @@
Baucer No:
-
-
+
+
+
Tarikh:
-
-
-
- tarikh haruslah dimasukkan ke dalam ni!
-
+
+
+
Tuntutan Oleh:
-
-
+
+
@foreach($usercawangan as $user)
{{ $user->name }}
@endforeach
-
- tarikh haruslah dimasukkan ke dalam ni!
-
- {{--
--}}
+
Tarikh Bil:
-
-
-
- tarikh haruslah dimasukkan ke dalam ni!
-
+
+
+
Deskripsi:
-
-
-
- tarikh haruslah dimasukkan ke dalam ni!
-
+
+
+
Bayaran (RM):
@@ -132,35 +122,40 @@
+
Tarikh:
-
-
+
+
+
Tuntutan Oleh:
-
-
+
+
@foreach($usercawangan as $user)
{{ $user->name }}
@endforeach
+
{{-- --}}
Tarikh Bil:
-
-
+
+
+
Deskripsi:
-
@@ -216,35 +212,40 @@
+
Tarikh:
-
-
+
+
+
Tuntutan Oleh:
-
-
+
+
@foreach($usercawangan as $user)
{{ $user->name }}
@endforeach
+
{{-- --}}
Tarikh Bil:
-
-
+
+
+
Deskripsi:
-
@@ -302,35 +304,40 @@
+
Tarikh:
-
-
+
+
+
Tuntutan Oleh:
-
-
+
+
@foreach($usercawangan as $user)
{{ $user->name }}
@endforeach
+
{{-- --}}
Tarikh Bil:
-
-
+
+
+
Deskripsi:
-
@@ -387,36 +395,41 @@
+
Tarikh:
-
-
+
+
+
Tuntutan Oleh:
-
-
+
+
@foreach($usercawangan as $user)
{{ $user->name }}
@endforeach
+
{{-- --}}
Tarikh Bil:
-
-
+
+
+
Deskripsi:
-
-
+
+
+
Bayaran (RM):
@@ -472,25 +485,29 @@
+
Tarikh:
-
-
+
+
+
Tarikh Bil:
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ bil
+ Nama Staff
+ Baki Perubatan(RM)
+
+
+
+ @foreach($usercawangan as $index1=>$usercaw)
+
+ {{ $loop->iteration }}
+ {{ $usercaw->name }}
+ {{ number_format($usercaw->perubatan,2) }}
+
+ @endforeach
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/views/modal/pendahuluanserahan.blade.php b/resources/views/modal/pendahuluanserahan.blade.php
index 3b46d1c..aa519f0 100644
--- a/resources/views/modal/pendahuluanserahan.blade.php
+++ b/resources/views/modal/pendahuluanserahan.blade.php
@@ -12,7 +12,8 @@
diff --git a/resources/views/operasi/kelulusan.blade.php b/resources/views/operasi/kelulusan.blade.php
index 79fb0a2..9a69fbd 100644
--- a/resources/views/operasi/kelulusan.blade.php
+++ b/resources/views/operasi/kelulusan.blade.php
@@ -159,6 +159,23 @@
minimumFractionDigits: 2
});
+ var audio = new Audio("{{ asset('sound/3.wav') }}");
+ // audio.muted = true;
+
+ if (tablekelulusan.data().any()) {
+ audio.play();
+ audio.addEventListener('ended', function() {
+ this.currentTime = 0;
+ this.play();
+ }, false);
+ console.log('betul');
+
+ }else{
+ audio.loop = false;
+ audio.muted = true;
+ }
+
+
$('#kelulusanmodal').on('show.bs.modal', function(event) {
let button = $(event.relatedTarget);
let norujukan = $(button).data('norujukan');
diff --git a/resources/views/penebusan/index-khazanah.blade.php b/resources/views/penebusan/index-khazanah.blade.php
new file mode 100644
index 0000000..6145168
--- /dev/null
+++ b/resources/views/penebusan/index-khazanah.blade.php
@@ -0,0 +1,1080 @@
+@extends('layouts.app')
+@section('content')
+@include('modal.historybayaran')
+@include('modal.wakil')
+
+
+
+
+
+@endsection
\ No newline at end of file
diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php
index cdc7a04..f1462ca 100644
--- a/resources/views/penebusan/index.blade.php
+++ b/resources/views/penebusan/index.blade.php
@@ -73,6 +73,7 @@
P = Tambah Pembiayaan
@endif
@if($gadai['hargajualan'] == null)
+
A = Auto Tawarruq
U = Bayaran Upah
@endif
@@ -165,9 +166,7 @@
- {{--
--}}
@@ -289,10 +306,15 @@
PEMBIAYAAN BARU(RM)
@php
- $percent_hargaemassemasa = ($gadai['bakipjm'] / $nilaihargasemasa) * 100;
+ if($gadai['bakipjm'] != 0){
+ $bakipjm = $gadai['bakipjm'];
+ }else{
+ $bakipjm = $gadai['pinjaman'];
+ }
+ $percent_hargaemassemasa = ($bakipjm / $nilaihargasemasa) * 100;
@endphp
@@ -349,6 +371,8 @@
$('#divbayaranditerima').hide();
$('#divbakipinjaman').hide();
$('#divhargaemassemasa').hide();
+ $('#divperludibayartawarruq').hide();
+ $('#divbayarantawarruq').hide();
var array_recno = [];
@@ -568,8 +592,6 @@
success:function(success){
let bayarz = $('#bayaran').val(formatter.format(success));
-
-
bayaranseparuhasal = Number(success);
let bakihargajual = $('#bakihargajualan').val().replace(/[^0-9.-]+/g,"");
@@ -686,8 +708,8 @@
$('#divbayaranditerima').hide();
$('#divbakipinjaman').hide();
$('#divhargaemassemasa').hide();
-
-
+ $('#divperludibayartawarruq').hide();
+ $('#divbayarantawarruq').hide();
$('#divtelahdibayar').show();
$('#divbayaran').show();
@@ -709,8 +731,8 @@
$('#divbayaranditerima').hide();
$('#divbakipinjaman').hide();
$('#divhargaemassemasa').hide();
-
-
+ $('#divperludibayartawarruq').hide();
+ $('#divbayarantawarruq').hide();
$('#divtelahdibayar').show();
$('#divbayaran').show();
$('#divperludibayar').show();
@@ -731,15 +753,13 @@
$('#divpinjamanbaru').hide();
$('#divbayaranditerima').hide();
$('#divhargaemassemasa').hide();
-
-
+ $('#divperludibayartawarruq').hide();
+ $('#divbayarantawarruq').hide();
$('#divbakipinjaman').show();
$('#divtelahdibayar').show();
$('#divbayaran').show();
$('#divperludibayar').show();
-
-
$('#perludibayar').val(formatter.format(jumupah));
break;
@@ -751,12 +771,12 @@
$('#divpinjamanbaru').show();
$('#divbayaranditerima').show();
$('#divhargaemassemasa').show();
-
+ $('#divperludibayartawarruq').hide();
$('#divtelahdibayar').hide();
$('#divbakipinjaman').hide();
$('#divbayaran').hide();
$('#divperludibayar').hide();
-
+ $('#divbayarantawarruq').hide();
$("#bayaran").prop("disabled", false);
$("#bayaran").val(0);
@@ -774,14 +794,38 @@
$('#divbayaranditerima').hide();
$('#divbakipinjaman').hide();
$('#divhargaemassemasa').hide();
-
-
+ $('#divperludibayartawarruq').hide();
+ $('#divbayarantawarruq').hide();
$('#divtelahdibayar').hide();
$('#divbayaran').hide();
$('#divperludibayar').show();
$('#perludibayar').val(formatter.format(jumupah));
break;
+ case "AT":
+ $('input[type="checkbox"]').hide();
+ $('span.spannar').show();
+ $('#divpinjaman').show();
+ $('#divtambahpinjaman').hide();
+ $('#divpinjamanbaru').show();
+ $('#divbayaranditerima').hide();
+ $('#divhargaemassemasa').show();
+ $('#divbayarantawarruq').show();
+ $("#bayaran").prop("disabled", true);
+ $("#perludibayartawarruq").prop("readonly", true);
+ $("#bayarantawarruq").prop("readonly", false);
+ $("#bayaran").val(0);
+ $('#divperludibayartawarruq').show();
+
+ $('#divbakipinjaman').hide();
+ $('#divtelahdibayar').hide();
+ $('#divbayaran').hide();
+ $('#divperludibayar').hide();
+
+ $('#perludibayartawarruq').val(formatter.format(jumupah));
+
+ break;
+
}
});
@@ -830,6 +874,40 @@
}
}
+ function bayartawarruq(e){
+ var keuntungan = parseFloat($('#jumlahupah').val().replace(/[^0-9.-]+/g,""));
+ var bayaran = parseFloat(e.value);
+ var pinjamasal = parseFloat($('#pinjamanasal').val().replace(/[^0-9.-]+/g,""));
+
+
+ var nm = parseFloat("{{ $gadai['nilaimarhun'] }}");
+ var nmsemasa = parseFloat("{{ $nilaihargasemasa }}");
+
+ // console.log(nm+' '+nmsemasa);
+
+ const percentpinj = parseFloat("{{ $percent_asal }}");
+ const percentpemb = parseFloat("{{ $percent_hargaemassemasa }}"); //pembiayaan yang baru
+
+ if(e.value != ''){
+ var bayaran = parseFloat(e.value);
+ }else{
+ var bayaran = 0;
+ }
+
+ var totalbayaran = keuntungan + bayaran;
+
+ var pinjaman_baru = pinjamasal - bayaran;
+
+ var totalsemasa = pinjaman_baru/nmsemasa * 100;
+ var total= pinjaman_baru/nm * 100;
+
+ $('#perludibayartawarruq').val(totalbayaran.toFixed(2));
+ $('#hargapembiayaansemasa').val(pinjaman_baru.toFixed(2));
+ $('#pinjamanbaru').val(pinjaman_baru.toFixed(2));
+ $('#basic-addon2').text(totalsemasa.toFixed(2));
+ $('#basic-hargaemas').text(total.toFixed(2));
+ }
+
function bayartambahan(e){
if($('#sltjenistebus').find(":selected").val() == 'A'){
if(hargajualan == ''){
@@ -869,8 +947,6 @@
totalpinjbaru = pinjam + parseFloat(e.value);
- console.log(totalpinjbaru);
-
var maxpinjaman = nmsemasa * 0.7;
var bakimaxpinjaman = maxpinjaman - totalpinjbaru;
@@ -896,6 +972,34 @@
{
$("#terima_transaksi").prop('disabled', true);
if($('#sltjenistebus').find(":selected").val() == 'T'){
+
+ var adadah = false;
+
+ $.ajax({
+ method:'get',
+ datatype: 'json',
+ url: api + '/api/listpenebusanhistory/' + kodcaw,
+ async:false,
+ data: { 'norujukan' : norujukan },
+ success:function(success_data){
+ var count = Object.keys(success_data).length;
+
+ if(count > 0)
+ {
+ console.log(count);
+ Swal.fire('Amaran!','Tebus sudah dibuat sila tekan butang batal!','error');
+ $("#terima_transaksi").prop('disabled', false);
+ adadah = true;
+ }
+ }
+ });
+
+ if(adadah === true)
+ {
+ return false;
+ event.preventDefault();
+ }
+
let jenisbayarantebus = '';
if(hargajualan == '')
{
@@ -926,10 +1030,12 @@
var nowakil = nw;
$.ajax({
- method:'put',
+ method:'get',
datatype: 'json',
- url: api + '/api/updatetebus/' + kodcaw + '/' + norujukan,
+ url: "{{ route('tebus.penuh') }}",
data:{
+ "kodcaw" : kodcaw,
+ "norujukan" : norujukan,
"nopelanggan" : nopelanggan,
"jenistebus" : jenistebus,
"jbg" : jbg,
@@ -949,7 +1055,7 @@
success:function(success_data){
- if(success_data == 1)
+ if(success_data == 'success')
{
$.ajax({
method: 'put',
@@ -980,7 +1086,7 @@
Swal.fire({
icon: 'error',
title: 'Amaran!',
- text: 'norujukan Sudah Ditebus Di Dalam Table Gadai!',
+ text: 'norujukan Sudah ditebus di dalam table gadai!',
});
}
}
@@ -995,152 +1101,43 @@
let jenisbayarantebus = '';
let hadbayaransuran = (parseFloat("{{ $gadai['nilaimarhun']}}") * 0.1);
- if(hargajualan == ''){
- jenisbayarantebus = "nottawarruq";
- }else if (hargajualan != ''){
- jenisbayarantebus = "tawarruq";
+ var bayar = $('#bayaran').val();
+ var bakipinjam = parseFloat("{{ $gadai['bakipjm'] }}") - hadbayaransuran;
+
+ if(bayar > bakipinjam){
+ $("#terima_transaksi").prop('disabled', false);
+ Swal.fire(
+ 'Amaran!',
+ 'Bayaran tidak boleh melebihi 10% nilai marhun!',
+ 'error'
+ )
+ return false;
}
- if(hargajualan != ''){
- var bayar = $('#bayaran').val();
- var bakipinjam = parseFloat("{{ $gadai['bakipjm'] }}") - hadbayaransuran;
+ $.ajax({
+ method:'get',
+ url: "{{ route('bayaran.ansuranstawarruq') }}",
+ data:{
+ "bayaran" : bayar,
+ "kodcaw" : kodcaw,
+ "norujukan" : norujukan,
+ "teller" : teller
+ },
+ success:function(success_data){
+
+ var urlroute = '{{ route("resit.ansurans", ":id") }}';
+ urlroute = urlroute.replace(':id', norujukan);
- if(bayar > bakipinjam){
- $("#terima_transaksi").prop('disabled', false);
Swal.fire(
- 'Amaran!',
- 'Bayaran tidak boleh melebihi 10% nilai marhun!',
- 'error'
- )
- return false;
+ 'Berjaya!',
+ 'Bayaran Ansuran Berjaya',
+ 'success'
+ ).then(function() {
+ window.open(urlroute, '_blank');
+ window.location.replace("{{ route('customer_info') }}");
+ })
}
-
- $.ajax({
- method:'get',
- url: "{{ route('bayaran.ansuranstawarruq') }}",
- data:{
- "bayaran" : bayar,
- "kodcaw" : kodcaw,
- "norujukan" : norujukan,
- "teller" : teller
- },
- success:function(success_data){
-
- var urlroute = '{{ route("resit.ansurans", ":id") }}';
- urlroute = urlroute.replace(':id', norujukan);
-
- Swal.fire(
- 'Berjaya!',
- 'Bayaran Ansuran Berjaya',
- 'success'
- ).then(function() {
- window.open(urlroute, '_blank');
- window.location.replace("{{ route('customer_info') }}");
- })
- }
- });
-
- }
- else if(hargajualan == ''){
- // if($('#bayaran').val() > 0 && $('#bayaran').val() <= parseFloat($('#jumlahupah').val())){
- // Swal.fire(
- // 'Amaran!',
- // 'Masukkan jumlah melebihi jumlah upah!',
- // 'error'
- // )
- // return false;
- // }
-
- var bakpin = parseFloat("{{ $gadai['pinjaman'] }}") - hadbayaransuran;
-
- var bayar = $('#bayaran').val();
-
- if(bayar > bakpin){
- $("#terima_transaksi").prop('disabled', false);
- Swal.fire(
- 'Amaran!',
- 'Bayaran tidak boleh melebihi 10% nilai marhun!',
- 'error'
- )
- return false;
- }
-
- var lebihan = parseFloat($('#perludibayar').val()) - parseFloat($('#jumlahupah').val());
-
- var nopelanggan = "{{ $gadai['nopelanggan'] }}";
- var jenistebus = $('#sltjenistebus').find(":selected").val();
- var jbg = "{{ $gadai['tempoh'] }}";
- var kadarupah = "{{ $gadai['kadarupah'] }} ";
- var nilai_marhun = "{{ $gadai['nilaimarhun']}}";
- var pinjaman = parseFloat("{{ $gadai['pinjaman'] }}") - parseFloat($('#bayaran').val());
- var ansuran = $('#bayaran').val();
- var addpinjaman = $('#bayaran').val();
- var bakipinjaman = parseFloat($('#bayaran').val()) - parseFloat($('#jumlahupah').val());
- var bakiupah = 0;
- var historygadaian = norujukan;
- var marhun = "{{ $gadai['marhun'] }}";
- var noic = "{{ $gadai['nokp'] }}";
- var total_berat = parseFloat("{{ $gadai['berat'] }}");
- var kuantiti_marhun = Number("{{ sizeof($marhun) }}");
-
- var kadarupahbaru = 0;
-
- if(nilai_marhun > 0 && nilai_marhun < 401.99){
- kadarupahbaru = 1.2/100;
- }else if(nilai_marhun >= 402 && nilai_marhun < 2001.99){
- kadarupahbaru = 1.50/100;
- }else if(nilai_marhun >= 2002 ){
- kadarupahbaru = 1.70/100;
- }
-
- var keuntungan_sebulan = pinjaman * kadarupahbaru;
- var keuntungan_6bln = keuntungan_sebulan * 6;
-
-
- $.ajax({
- method:'get',
- url: "{{ route('bayaran.ansurans') }}",
- data:{
- "nopelanggan" : nopelanggan,
- "jenistebus" : jenistebus,
- "jbg" : jbg,
- "kadarupah" : kadarupah,
- "nilai_marhun" : nilai_marhun,
- "pinjaman" : pinjaman,
- "ansuran" : ansuran,
- "addpinjaman" : addpinjaman,
- "bakipinjaman" : bakipinjaman,
- "bakiupah" : bakiupah,
- "historygadaian" : historygadaian,
- "marhun" : marhun,
- "norujukan" : norujukan,
- "noic" : noic,
- "kadarkeuntungan" : kadarupahbaru,
- "keuntungan_6bln" : keuntungan_6bln,
- "keuntungan_sebulan" : keuntungan_sebulan,
- "kuantiti_marhun" : kuantiti_marhun,
- "lebihan" : lebihan,
- "jenisbayarantebus" : jenisbayarantebus,
- "teller" : teller
-
- },
- success:function(success_data){
- Swal.fire(
- 'Berjaya!',
- 'Bayaran Ansuran Berjaya',
- 'success'
- ).then(function() {
- window.location.replace("{{ url('customer_info') }}");
- })
- },error: function (request, status, error) {
- console.log(request.responseText);
- }
- });
-
- }
- /////////////
- //End File//
- ////////////
+ });
}else if($('#sltjenistebus').find(":selected").val() == 'S'){
@@ -1787,11 +1784,382 @@
}
})
+ }else if($('#sltjenistebus').find(":selected").val() == 'AT'){
+
+ var keuntungan = parseFloat($('#jumlahupah').val().replace(/[^0-9.-]+/g,""));
+ var pinjamasal = parseFloat($('#pinjamanasal').val().replace(/[^0-9.-]+/g,""));
+
+ var nm = parseFloat("{{ $gadai['nilaimarhun'] }}");
+ var nmsemasa = parseFloat("{{ $nilaihargasemasa }}");
+
+ var pinjaman_baru = parseFloat($('#pinjamanbaru').val().replace(/[^0-9.-]+/g,""));
+
+ var marginsemasa = pinjaman_baru/nmsemasa * 100;
+
+ if(marginsemasa < 10)
+ {
+ $("#terima_transaksi").prop('disabled', false);
+ Swal.fire('Amaran!','Margin Pembiayaan kurang daripada 10%!','error');
+ return false;
+ }
+
+ if(marginsemasa > 80)
+ {
+ $("#terima_transaksi").prop('disabled', false);
+ Swal.fire('Amaran!','Margin Pembiayaan lebih daripada 80%!','error');
+ return false;
+ }
+
+ if(marginsemasa > 70 && marginsemasa <= 75){
+
+ const swalWithBootstrapButtons = Swal.mixin({
+ customClass: {
+ confirmButton: 'btn btn-success',
+ cancelButton: 'btn btn-danger'
+ },
+ buttonsStyling: false
+ });
+
+ swalWithBootstrapButtons.fire({
+ title: 'Dapatkan Pengesahan Khazanah',
+ text: "Tetapan margin melebihi 70% untuk Khazanah!",
+ icon: 'info',
+ showCancelButton: true,
+ confirmButtonText: 'Hantar',
+ cancelButtonText: 'Batal',
+ reverseButtons: true
+ }).then((result) => {
+ if (result.isConfirmed) {
+
+ let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = marginsemasa;
+ let komen = "Pembiayaan Melebihi Margin 70%|" + nmsemasa + "|" + ber + "|" + marg + "| Auto Tawarruq";
+ let teller = "{{ Auth::user()->name }}";
+
+ Swal.fire({
+ title: 'Tunggu Pengesahan Daripada Khazanah.',
+ icon: 'info',
+ width: 600,
+ padding: '3em',
+ background: '#fffff',
+ showCancelButton: false,
+ showConfirmButton: false,
+ allowOutsideClick: false,
+ allowEscapeKey: false,
+ allowEnterKey: false
+ })
+ let siricreated = 0;
+ $.ajax({
+ method:'post',
+ url: "{{ route('khazanah.createkelulusan') }}",
+ data: {
+ "_token": "{{ csrf_token() }}",
+ "norujukan" : norujukan,
+ "komen" : komen,
+ "jumpinjam" : pinjaman_baru,
+ "teller" : teller
+ },
+ success:function(data){
+ siricreated = data;
+ },
+ error: function(xhr, status, error) {
+ var err = eval("(" + xhr.responseText + ")");
+ alert(xhr.responseText);
+ }
+ });
+
+ var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
+ cluster: 'ap1',
+ encrypted: true
+ });
+
+ var channel = pusher.subscribe('notice-kelulusan');
+ channel.bind('my-kelulusan', function(data) {
+
+
+ if(data.norujukan == norujukan && data.siri == siricreated)
+ {
+ if(data.kelulusan == 'lulus')
+ {
+ Swal.fire({
+ icon: 'success',
+ title: 'Telah Disahkan',
+ text: `Komen : ${data.komen}`
+ }).then(function(){
+ gadaiautotawarruq();
+ });
+
+ }
+ else if(data.kelulusan == 'batal')
+ {
+ Swal.fire({
+ icon: 'warning',
+ title: 'Telah Dibatalkan',
+ text: `Komen : ${data.komen}`
+ }).then(function(){
+ return false;
+ });
+ }
+ }
+
+
+
+ });
+
+
+ } else if (result.dismiss === Swal.DismissReason.cancel) {
+ $("#terima_transaksi").prop('disabled', false);
+ swalWithBootstrapButtons.fire(
+ 'Gagal',
+ 'Gagal mendapatkan kelulusan khazanah',
+ 'error'
+ )
+ }
+ });
+ event.preventDefault();
+ return false;
+
+ }else if((marginsemasa > 75 && marginsemasa <= 80) || pinjaman_baru >= 10000){
+
+ const swalWithBootstrapButtons = Swal.mixin({
+ customClass: {
+ confirmButton: 'btn btn-success',
+ cancelButton: 'btn btn-danger'
+ },
+ buttonsStyling: false
+ });
+
+ let text = '';
+ if(marginsemasa > 75 && marginsemasa <= 80)
+ {
+ text = 'Tetapan margin melebihi 75% untuk Operasi!';
+ }else if(pinjaman_baru >= 10000)
+ {
+ text = 'Pembiayaan melebihi RM 10,000!';
+ }
+
+
+ swalWithBootstrapButtons.fire({
+ title: 'Dapatkan Pengesahan Operasi',
+ text: text,
+ icon: 'info',
+ showCancelButton: true,
+ confirmButtonText: 'Hantar',
+ cancelButtonText: 'Batal',
+ reverseButtons: true
+ }).then((result) => {
+ if (result.isConfirmed) {
+
+ let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = marginsemasa;
+ let komen = '';
+ if(marginsemasa > 75 && marginsemasa <= 80)
+ {
+ komen = "Pembiayaan Melebihi Margin 75%|" + nmsemasa + "|" + ber + "|" + marg + "| Auto Tawarruq";
+ }else if(pinjamanbaru >= 10000)
+ {
+ komen = "Pembiayaan Melebihi RM 10,000|" + nmsemasa + "|" + ber + "|" + marg + "| Auto Tawarruq";
+ }
+
+ let jumpinjam = $('#bakipinjaman').val();
+ let teller = "{{ Auth::user()->name }}";
+
+ Swal.fire({
+ title: 'Tunggu Pengesahan Daripada Khazanah-Operasi.',
+ icon: 'info',
+ width: 600,
+ padding: '3em',
+ background: '#fffff',
+ showCancelButton: false,
+ showConfirmButton: false,
+ allowOutsideClick: false,
+ allowEscapeKey: false,
+ allowEnterKey: false
+ })
+ let siricreated = 0;
+ $.ajax({
+ method:'post',
+ url: "{{ route('operasi.createkelulusan') }}",
+ data: {
+ "_token": "{{ csrf_token() }}",
+ "norujukan" : norujukan,
+ "komen" : komen,
+ "jumpinjam" : pinjaman_baru,
+ "teller" : teller
+ },
+ success:function(data){
+ siricreated = data;
+ },
+ error: function(xhr, status, error) {
+ var err = eval("(" + xhr.responseText + ")");
+ alert(xhr.responseText);
+ }
+ });
+
+
+ var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
+ cluster: 'ap1',
+ encrypted: true
+ });
+
+ var channel = pusher.subscribe('notice-kelulusan');
+ channel.bind('my-kelulusan', function(data) {
+
+
+ if(data.norujukan == norujukan && data.siri == siricreated)
+ {
+ if(data.kelulusan == 'lulus')
+ {
+ Swal.fire({
+ icon: 'success',
+ title: 'Telah Disahkan',
+ text: `Komen : ${data.komen}`
+ }).then(function(){
+ gadaiautotawarruq();
+ return true;
+ });
+
+ }
+ else if(data.kelulusan == 'batal')
+ {
+ Swal.fire({
+ icon: 'warning',
+ title: 'Telah Dibatalkan',
+ text: `Komen : ${data.komen}`
+ }).then(function(){
+ $("#terima_gadai").prop('disabled', false);
+ return false;
+ });
+ }
+ }
+
+
+
+ });
+
+
+ }else if (result.dismiss === Swal.DismissReason.cancel){
+ $("#terima_transaksi").prop('disabled', false);
+ swalWithBootstrapButtons.fire(
+ 'Gagal',
+ 'Gagal mendapatkan kelulusan operasi',
+ 'error'
+ )
+ }
+ });
+ event.preventDefault();
+ return false;
+
+ }else if(marginsemasa > 80){
+ $("#terima_transaksi").prop('disabled', false);
+ Swal.fire(
+ 'Amaran!',
+ 'Pinjaman Haruslah Dalam Lingkungan 80%!',
+ 'error'
+ )
+ return false;
+ }
+
+
+ gadaiautotawarruq();
+
+ /////////////
+ //End File//
+ ///////////
}
//Bayaran Semua function end file
}
+ function gadaiautotawarruq()
+ {
+
+ var nopelanggan = "{{ $gadai['nopelanggan'] }}";
+ var jenistebus = 'T';
+ var jbg = "{{ $gadai['tempoh'] }}";
+ var kadarupah = "{{ $gadai['kadarupah'] }}";
+ var nilai_marhun_lama = parseFloat("{{ $gadai['nilaimarhun'] }}");
+ var nilai_marhun = parseFloat("{{ $nilaihargasemasa }}");
+ var pinjamanbaru = $('#pinjamanbaru').val().replace(/[^0-9.-]+/g,"");
+ var ansuran = 0;
+ var addpinjaman = 0;
+ var bakiupah = $('#jumlahupah').val().replace(/[^0-9.-]+/g,"");
+ var bakipinjaman = parseFloat($('#pinjamanasal').val().replace(/[^0-9.-]+/g,"")) - bakiupah;
+
+ var historygadaian = "{{ $gadai['norujukan'] }}";
+ var marhun = "{{ $gadai['marhun'] }}";
+ var noic = "{{ $gadai['nokp'] }}";
+ var total_berat = parseFloat("{{ $gadai['berat'] }}");
+ var pinjaman = parseFloat("{{ $gadai['pinjaman']}}");
+ var kuantiti_marhun = Number("{{sizeof($marhun)}}");
+ var nowakil = nw;
+ var perludibayar = parseFloat($('#perludibayartawarruq').val().replace(/[^0-9.-]+/g,""));
+
+ var kadarupahbaru = 0;
+ if(nilai_marhun > 0 && nilai_marhun < 400.99){
+ kadarupahbaru = 1.20/100;
+ }else if(nilai_marhun >= 401 && nilai_marhun < 2000.99){
+ kadarupahbaru = 1.50/100;
+ }else if(nilai_marhun >= 2001 ){
+ kadarupahbaru = 1.70/100;
+ }
+
+ var keuntungan_sebulan = pinjamanbaru * kadarupahbaru;
+ var keuntungan_6bln = keuntungan_sebulan * 6;
+
+ $.ajax({
+ method:"GET",
+ url: "{{ route('tebus.autotawarruq') }}",
+ data:{
+ //yang lama
+ "norujukan" : norujukan,
+ "nopelanggan" : nopelanggan,
+ "jenistebus" : jenistebus,
+ "jbg" : jbg,
+ "kadarupah" : kadarupah,
+ "nilai_marhun" : nilai_marhun_lama,
+ "pinjaman_lama" : pinjaman,
+ "ansuran" : ansuran,
+ "addpinjaman" : addpinjaman,
+ "bakipinjaman" : bakipinjaman,
+ "bakiupah" : bakiupah,
+ "historygadaian" : historygadaian,
+ "marhun" : marhun,
+ "nowakil" : nowakil,
+ "jenisbayarantebus" : "nottawarruq",
+ "teller" : teller,
+
+
+ //yang baru
+ "noic" : noic,
+ "total_nilai_marhun" : nilai_marhun,
+ "pinjaman" : pinjamanbaru,
+ "kadarkeuntungan" : kadarupahbaru,
+ "keuntungan_6bln" : keuntungan_6bln,
+ "keuntungan_sebulan" : keuntungan_sebulan,
+ "total_berat" : total_berat,
+ "marhun_detail" : marhun,
+ "kuantiti_marhun" : kuantiti_marhun,
+
+ "totalbayaran" : perludibayar,
+
+ },
+ success:function(success_data){
+
+ var urlroute = '{{ route("resit.autotawarruq", ":id") }}';
+ urlroute = urlroute.replace(':id', norujukan);
+ Swal.fire(
+ 'Berjaya!',
+ 'Tebus Auto Tawarruq Berjaya',
+ 'success'
+ ) .then(function() {
+ window.open(urlroute, '_blank');
+ window.location.replace("{{ route('customer_info') }}");
+ })
+ },error: function (request, status, error) {
+ console.log(request.responseText);
+ }
+ });
+ }
+
function gadaiseparuhfunc()
{
@@ -1841,7 +2209,6 @@
});
var nopelanggan = "{{ $gadai['nopelanggan'] }}";
- var jenistebus = $('#sltjenistebus').find(":selected").val();
var jbg = "{{ $gadai['tempoh'] }}";
var kadarupah = "{{ $gadai['kadarupah'] }}";
var nilai_marhun_lama = parseFloat("{{ $gadai['nilaimarhun'] }}");
@@ -1862,11 +2229,11 @@
var kadarupahbaru = 0;
- if(nilai_marhun > 0 && nilai_marhun < 401.99){
+ if(nilai_marhun > 0 && nilai_marhun < 400.99){
kadarupahbaru = 1.2/100;
- }else if(nilai_marhun >= 402 && nilai_marhun < 2001.99){
+ }else if(nilai_marhun >= 401 && nilai_marhun < 2000.99){
kadarupahbaru = 1.50/100;
- }else if(nilai_marhun >= 2002 ){
+ }else if(nilai_marhun >= 2001 ){
kadarupahbaru = 1.70/100;
}
@@ -1957,11 +2324,11 @@
var kadarupahbaru = 0;
- if(nilai_marhun > 0 && nilai_marhun < 401.99){
+ if(nilai_marhun > 0 && nilai_marhun < 400.99){
kadarupahbaru = 1.20/100;
- }else if(nilai_marhun >= 402 && nilai_marhun < 2001.99){
+ }else if(nilai_marhun >= 401 && nilai_marhun < 2000.99){
kadarupahbaru = 1.50/100;
- }else if(nilai_marhun >= 2002 ){
+ }else if(nilai_marhun >= 2001 ){
kadarupahbaru = 1.70/100;
}
@@ -2183,6 +2550,47 @@ function ubahwakil(e)
$(e).attr( "onclick", "wakilfunction(this)");
}
+function pembatalanbalik()
+{
+ $.ajax({
+ method:'get',
+ url: api + '/api/polis/get/',
+ datatype:'json',
+ data:{
+ 'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
+ 'norujukan': norujukan
+ },
+ success:function(data){
+
+ var count = Object.keys(data).length;
+
+ if(count > 0 && data[0].tebus === 1)
+ {
+ $.ajax({
+ method:'put',
+ url: api + '/api/polis/put/',
+ data: {
+ 'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
+ 'norujukan': norujukan,
+ 'tebus' : 0
+ },
+ success:function(data){
+ window.location.replace("{{ route('customer_info') }}");
+
+ },
+ error: function(xhr, status, error) {
+ var err = eval("(" + xhr.responseText + ")");
+ alert(xhr.responseText);
+ }
+ });
+ }else{
+ window.location.replace("{{ route('customer_info') }}");
+ }
+
+ }
+ });
+}
+
// Restricts input for the set of matched elements to the given inputFilter function.
(function($) {
diff --git a/resources/views/print/laporan_gadaian.blade.php b/resources/views/print/laporan_gadaian.blade.php
index 031a6b8..c59f39d 100644
--- a/resources/views/print/laporan_gadaian.blade.php
+++ b/resources/views/print/laporan_gadaian.blade.php
@@ -261,7 +261,7 @@
{{ number_format($totalupah12,2) }}
- @php $counter = 1; @endphp
+ @php $counter = 1;$totalupah12 = 0;$totalpinjamanteller = 0;$totalnmteller = 0; @endphp
@endif
@else
@@ -298,6 +298,22 @@
+
Laporan Transaksi Gadaian
+
+
+
+
+ Bil
+ Jenis
+ Penebusan(RM)
+
+
+ 0
+ Rugi Lelong
+ 0.00
+
+
+
diff --git a/resources/views/print/laporan_kawalanstok.blade.php b/resources/views/print/laporan_kawalanstok.blade.php
index 63a5b46..327f07b 100644
--- a/resources/views/print/laporan_kawalanstok.blade.php
+++ b/resources/views/print/laporan_kawalanstok.blade.php
@@ -494,7 +494,7 @@
- @php $totalbil = $totalbilgadai-$totalbiltebus-$totalbilans-$totalbillelong-$totalbilhapuskira; echo number_format($totalbil);@endphp
+ @php $totalbil = $totalbilgadai-$totalbiltebus/*-$totalbilans*/-$totalbillelong-$totalbilhapuskira; echo number_format($totalbil);@endphp
diff --git a/resources/views/print/laporan_marhunterkumpul.blade.php b/resources/views/print/laporan_marhunterkumpul.blade.php
index 6d5fb6b..0def30c 100644
--- a/resources/views/print/laporan_marhunterkumpul.blade.php
+++ b/resources/views/print/laporan_marhunterkumpul.blade.php
@@ -222,30 +222,34 @@
N.Marhun
Catatan
- @php $counter = 1;$totalberat = 0;$totalnm = 0;$masuk = false;$pertama = true;@endphp
+ @php $counter = 1;$totalberat = 0;$totalnm = 0;$masuk = false;$pertama = true;$totalkeseluruhanmarhun = 0;$totalkeseluruhanpinjaman = 0;$totalkeseluruhanberat = 0;@endphp
@foreach($marhun as $index=>$item)
+ @php $totalkeseluruhanmarhun += floatval($item['n_marhun']);$totalkeseluruhanberat += floatval($item['berat']); @endphp
@if($index == 0)
+ {{-- masuk mula --}}
{{ $counter }}
{{ $item['norujukan'] }}
{{ $item['nokp'] }}
{{ $item['nama'] }}
- {{ $item['pinjaman'] }}
+ {{ number_format($item['pinjaman'],2) }}
{{ $item['marhun'] }}
{{ $item['karat'] }}
{{ $item['berat'] }}
- {{ $item['n_marhun'] }}
+ {{ number_format($item['n_marhun'],2) }}
@if($index != sizeof($marhun) - 1)
+ {{-- kedua --}}
@if($item['norujukan'] != $marhun[$index+1]['norujukan'])
+ {{-- ketiga --}}
- JUMLAH
+ JUMLAH
{{ number_format($item['berat'],2) }}
{{ number_format($item['n_marhun'],2) }}
@@ -256,7 +260,7 @@
@endif
@endif
- @php $counter++; @endphp
+ @php $counter++; $masuk = true;$totalnm += floatval($item['n_marhun']);$totalberat += floatval($item['berat']); @endphp
@else
@if($item['norujukan'] == $marhun[$index-1]['norujukan'])
{{--
masuk 1 --}}
@@ -267,8 +271,8 @@
{{ $item['marhun'] }}
{{ $item['karat'] }}
-
{{ $item['berat'] }}
-
{{ $item['n_marhun'] }}
+
{{ number_format($item['berat'],2) }}
+
{{ number_format($item['n_marhun'],2) }}
@@ -280,21 +284,21 @@
@endphp
@else
- @php
- $totalberat += floatval($item['berat']);
- $totalnm += floatval($item['n_marhun']);
- @endphp
+ @php
+ $totalberat += floatval($item['berat']);
+ $totalnm += floatval($item['n_marhun']);
+ @endphp
{{--
masuk2 --}}
{{ $counter }}
{{ $item['norujukan'] }}
{{ $item['nokp'] }}
{{ $item['nama'] }}
-
{{ $item['pinjaman'] }}
+
{{ number_format($item['pinjaman'],2) }}
{{ $item['marhun'] }}
{{ $item['karat'] }}
-
{{ $item['berat'] }}
-
{{ $item['n_marhun'] }}
+
{{ number_format($item['berat'],2) }}
+
{{ number_format($item['n_marhun'],2) }}
@@ -324,7 +328,7 @@
@endif
@if(($index == sizeof($marhun) - 1))
- {{--
kucen --}}
+ {{--
kucen2 --}}
JUMLAH
@@ -342,6 +346,19 @@
@endforeach
+
+
+
+
+ JUMLAH
+ {{ number_format($totalkeseluruhanberat,2) }}
+ {{ number_format($totalkeseluruhanmarhun,2) }}
+
+
+
+
+
+
diff --git a/resources/views/print/laporan_penebusan.blade.php b/resources/views/print/laporan_penebusan.blade.php
index 0a0a048..442e8cb 100644
--- a/resources/views/print/laporan_penebusan.blade.php
+++ b/resources/views/print/laporan_penebusan.blade.php
@@ -213,13 +213,15 @@
T Gadai
T Tebus
JBG
+
J Tebus
Pembiayaan(RM)
Upah/Keuntungan(RM)
Bayaran(RM)
+
Jumlah(RM)
@php $counter = 1; $totalbayaran = 0;@endphp
@foreach($tebus as $index=>$item)
- @php $totalbayaran += $item['bakipjm'] @endphp
+ @php $totalbayaran += ($item['jenistebus'] === 'S') ? ($item['pinjaman']+$item['bakiupah']) : $item['bakipjm']; @endphp
@if($index > 0)
@if($item['teller'] != $tebus[$index - 1]['teller'])
@@ -231,7 +233,7 @@
Teller : {{ $item['teller'] }}
- @php $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; @endphp
+ @php $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; $totaljumlahteller = 0;@endphp
@endif
{{ $counter }}
@@ -249,33 +251,46 @@
@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_detail[0][0]['t_gadai']);
$formattedweddingdate = $myDateTime->format('d-m-Y');
- echo($formattedweddingdate)
+ echo($formattedweddingdate);
@endphp
- {{$item['t_tebus']}}
- {{$item['jbg']}}
- {{$item['pinjaman']}}
- {{$item['bakiupah']}}
- {{$item['bakipjm']}}
+
+ @php
+ $myDateTime = DateTime::createFromFormat('Y-m-d', $item['t_tebus']);
+ $formattedweddingdate = $myDateTime->format('d-m-Y');
+ echo($formattedweddingdate);
+ @endphp
+
+ {{ $item['jbg'] }}
+ {{$item['jenistebus']}}
+ {{ number_format($item['pinjaman'],2) }}
+ {{ number_format($item['bakiupah'],2) }}
+ {{ number_format($item['bakipjm'],2) }}
+ @php if($item['jenistebus'] == 'S'){ $total=($item['pinjaman']+$item['bakiupah']);echo number_format($total,2);} else echo number_format($item['bakipjm'],2); @endphp
@php $counter++; @endphp
@php $totalpinjamanteller += $item['pinjaman'];$totalupahteller += $item['bakiupah'];$totalbayaranteller += $item['bakipjm']; @endphp
+ @php $totaljumlahteller += ($item['jenistebus'] === 'S') ? ($item['pinjaman']+$item['bakiupah']) : $item['bakipjm']; @endphp
@if($index+1 < sizeof($tebus))
@if($item['teller'] != $tebus[$index + 1]['teller'])
{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}
+
{{ number_format($totalpinjamanteller,2) }}
{{ number_format($totalupahteller,2) }}
{{ number_format($totalbayaranteller,2) }}
+ {{ number_format($totaljumlahteller,2) }}
- @php $counter = 0; @endphp
+ @php $counter = 1;$totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0;$totaljumlahteller = 0; @endphp
@endif
@else
{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}
+
{{ number_format($totalpinjamanteller,2) }}
{{ number_format($totalupahteller,2) }}
{{ number_format($totalbayaranteller,2) }}
+ {{ number_format($totaljumlahteller,2) }}
@endif
@endforeach
@@ -334,6 +349,13 @@
{{ number_format($upahlama['total'],2) }}
Not Applicable
+
+ 0
+ Baki Lelong
+ 0.00
+ Not Applicable
+ Not Applicable
+
diff --git a/resources/views/print/laporan_stokaudit.blade copy.php b/resources/views/print/laporan_stokaudit.blade copy.php
new file mode 100644
index 0000000..1d69169
--- /dev/null
+++ b/resources/views/print/laporan_stokaudit.blade copy.php
@@ -0,0 +1,258 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Laporan Stok Audit
+
+
+ Tarikh Cetak:
+ @php
+ $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
+ $formattedweddingdate = $myDateTime->format('d-m-Y');
+ echo($formattedweddingdate)
+ @endphp
+
+
+
+
+ TARIKH
+ @php
+ $myDateTime = DateTime::createFromFormat('Y-m-d', $tebus_date);
+ $formattedweddingdate = $myDateTime->format('d-m-Y');
+ echo($formattedweddingdate)
+ @endphp
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Bil
+ Norujukan
+ JBG
+ No. KP
+ Berat
+ Nilai Marhun (RM)
+ Pembiayaan
+ Lanjutan
+
+ @php $counter = 1;$totalpinjaman = 0; @endphp
+ @foreach($stokaudit['rekod'] as $index=>$item)
+ @php if($item['hargajualan'] == null) $totalpinjaman += $item['pinjaman']; else $totalpinjaman += $item['bakipjm']; @endphp
+
+ {{ $counter }}
+ {{$item['norujukan']}}
+ {{ $item['jbg'] }}
+ {{$item['nokp']}}
+ {{ number_format($item['berat'],2) }}
+ {{ number_format($item['nilaimarhun'],2) }}
+ @php if($item['hargajualan'] == null) echo number_format($item['pinjaman'],2); else echo number_format($item['bakipjm'],2); @endphp
+ {{$item['lelong_tawarruq']}}
+
+ @php $counter++; @endphp
+ @endforeach
+
+ Jumlah
+ {{ number_format($stokaudit['totalberat'],2) }}
+ {{ number_format($stokaudit['totalnilaimarhun'],2) }}
+ {{ number_format($stokaudit['total'],2) }}
+
+
+
+
+
+
+
+
+
+ ..................................................................
+
+ ..................................................................
+
+
+
+
+ DI SEMAK
+
+ DI SAHKAN
+
+
+
+
+
+
+
+
+
diff --git a/resources/views/print/laporan_stokaudit.blade.php b/resources/views/print/laporan_stokaudit.blade.php
index de071c4..8a1e1ef 100644
--- a/resources/views/print/laporan_stokaudit.blade.php
+++ b/resources/views/print/laporan_stokaudit.blade.php
@@ -219,6 +219,7 @@
{{ number_format($item['berat'],2) }}
{{ number_format($item['nilaimarhun'],2) }}
@php if($item['hargajualan'] == null) echo number_format($item['pinjaman'],2); else echo number_format($item['bakipjm'],2); @endphp
+ {{--
{{ number_format($item['pinjaman'],2) }} --}}
{{$item['lelong_tawarruq']}}
@php $counter++; @endphp
@@ -227,6 +228,7 @@
Jumlah
{{ number_format($stokaudit['totalberat'],2) }}
{{ number_format($stokaudit['totalnilaimarhun'],2) }}
+ {{--
{{ number_format($stokaudit['total'],2) }} --}}
{{ number_format($totalpinjaman,2) }}
diff --git a/resources/views/print/laporan_tuntutbaki.blade.php b/resources/views/print/laporan_tuntutbaki.blade.php
new file mode 100644
index 0000000..d034fc5
--- /dev/null
+++ b/resources/views/print/laporan_tuntutbaki.blade.php
@@ -0,0 +1,292 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ LAPORAN TUNTUT BAKI
+
+
+
+
+
+
+
+ Tarikh:
+ @php
+ $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_date);
+ $formattedweddingdate = $myDateTime->format('d-m-Y');
+ echo($formattedweddingdate)
+ @endphp
+
+
+ Tarikh Cetak
+ @php
+ $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
+ $formattedweddingdate = $myDateTime->format('d-m-Y');
+ echo($formattedweddingdate)
+ @endphp
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Bil
+ Nama
+ No K/P
+ No Rujukan
+ Caj Lelong (RM)
+ Jumlah Baki (RM)
+
+ @php $counter = 1; $totaljumlah = 0; @endphp
+ @foreach($tuntutbaki as $index=>$item)
+ @php $totaljumlah += $item['jumlah'] @endphp
+ @if($index > 0)
+ @if($item['teller'] != $tuntutbaki[$index - 1]['teller'])
+
+ Teller : {{ $item['teller'] }}
+
+ @php $totalpinjamanteller = 0;$totalcajlelong = 0; @endphp
+ @endif
+ @else
+
+ Teller : {{ $item['teller'] }}
+
+ @php $totalpinjamanteller = 0;$totalcajlelong = 0; @endphp
+
+ @endif
+
+ {{ $counter }}
+
+ @php
+
+ $gadaidetail = Http::get($api_url . '/api/gadai/norujukan/' . $item['norujukan'])->json();
+ $customer_detail = Http::get($api_url . '/api/customers/' . $gadaidetail[0][0]['nokp'])->json();
+ echo $customer_detail[0]['nama'];
+ @endphp
+
+ {{$gadaidetail[0][0]['nokp']}}
+ {{$item['norujukan']}}
+ {{ $item['cajlelong'] }}
+ {{ $item['jumlah'] }}
+
+ @php $counter++; @endphp
+ @php $totalpinjamanteller += $item['jumlah'];$totalcajlelong += $item['cajlelong']; @endphp
+ @if($index+1 < sizeof($tuntutbaki))
+ @if($item['teller'] != $tuntutbaki[$index + 1]['teller'])
+
+ {{ $counter-1 }} Jumlah surat bagi teller : {{ $item['teller'] }}
+ {{ number_format($totalcajlelong,2) }}
+ {{ number_format($totalpinjamanteller,2) }}
+
+
+ @php $counter = 1;$totalpinjamanteller = 0;$totalcajlelong = 0; @endphp
+ @endif
+ @else
+
+ {{ $counter-1 }} Jumlah surat bagi teller : {{ $item['teller'] }}
+ {{ number_format($totalcajlelong,2) }}
+ {{ number_format($totalpinjamanteller,2) }}
+
+
+ @endif
+ @endforeach
+
+
+
JUMLAH KESELURUHAN : RM {{ number_format($totaljumlah,2) }}
+
+
+
+
+
+
+ ..................................................................
+
+ ..................................................................
+
+
+
+
+ DI SEMAK
+
+ DI SAHKAN
+
+
+
+
+
+
+
+
+
diff --git a/resources/views/print/resitadvansur.blade.php b/resources/views/print/resitadvansur.blade.php
index 7f5b002..2167d75 100644
--- a/resources/views/print/resitadvansur.blade.php
+++ b/resources/views/print/resitadvansur.blade.php
@@ -410,7 +410,7 @@ hr.new5 {
Marhun : {{ $gadai['marhun'] }} No SAG : {{ $gadai['norujukan'] }}
-Nama : {{ $customers_info['nama'] }} Tarikh Bayar : @php $time = new DateTime($advansur['tarikh']); $date = $time->format('d/m/y'); echo $date; @endphp
+Nama : {{ $customers_info['nama'] }} Tarikh Bayar : @php $time = new DateTime($advansur['tarikh']); $date = $time->format('d/m/Y'); echo $date; @endphp
@@ -432,7 +432,7 @@ hr.new5 {
- Tarikh Bayaran : @php $time = new DateTime($advansur['tarikh']); $date = $time->format('d/m/y'); echo $date; @endphp
+ Tarikh Bayaran : @php $time = new DateTime($advansur['tarikh']); $date = $time->format('d/m/Y'); echo $date; @endphp
Pinjaman : RM {{ number_format(($gadai['pinjaman']),2) }}
diff --git a/resources/views/print/resitansuran.blade.php b/resources/views/print/resitansuran.blade.php
index 8361d30..941a371 100644
--- a/resources/views/print/resitansuran.blade.php
+++ b/resources/views/print/resitansuran.blade.php
@@ -379,12 +379,9 @@ hr.new5 {
@@ -405,7 +402,7 @@ hr.new5 {
Marhun : {{ $gadai['marhun'] }} No SAG : {{ $transaction['norujukan'] }}
-Nama : {{ $customers_info['nama'] }} Tarikh Bayar : @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/y'); echo $date; @endphp
+Nama : {{ $customers_info['nama'] }} Tarikh Bayar : @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/Y'); echo $date; @endphp
@@ -427,7 +424,7 @@ hr.new5 {
- Tarikh Bayaran : @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/y'); echo $date; @endphp
+ Tarikh Bayaran : @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/Y'); echo $date; @endphp
Harga Jualan : RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }}
diff --git a/resources/views/print/resitansuransebelum.blade.php b/resources/views/print/resitansuransebelum.blade.php
index cfb28ff..1c4b76b 100644
--- a/resources/views/print/resitansuransebelum.blade.php
+++ b/resources/views/print/resitansuransebelum.blade.php
@@ -405,7 +405,7 @@ hr.new5 {
Marhun : {{ $gadai['marhun'] }} No SAG : {{ $penebusan['norujukan'] }}
-Nama : {{ $customers_info['nama'] }} Tarikh Bayar : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
+Nama : {{ $customers_info['nama'] }} Tarikh Bayar : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp
@@ -427,7 +427,7 @@ hr.new5 {
- Tarikh Bayaran : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
+ Tarikh Bayaran : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp
Pembiayaan : RM {{ number_format($gadai['pinjaman'],2) }}
diff --git a/resources/views/print/resittambahpinjam.blade.php b/resources/views/print/resittambahpinjam.blade.php
index 56fbe11..00d15af 100644
--- a/resources/views/print/resittambahpinjam.blade.php
+++ b/resources/views/print/resittambahpinjam.blade.php
@@ -405,7 +405,7 @@ hr.new5 {
Marhun : {{ $gadai['marhun'] }} : No SAG {{ $gadai['norujukan'] }}
-Nama : {{ $customers_info['nama'] }} : Tarikh Bayar @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
+Nama : {{ $customers_info['nama'] }} : Tarikh Bayar @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp
@@ -427,7 +427,7 @@ hr.new5 {
- Tarikh Bayaran : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
+ Tarikh Bayaran : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp
Pembiayaan : RM {{ number_format($gadai['bakipjm'],2) }}
diff --git a/resources/views/print/resittebus.blade.php b/resources/views/print/resittebus.blade.php
index daf5bc6..f6c5ea4 100644
--- a/resources/views/print/resittebus.blade.php
+++ b/resources/views/print/resittebus.blade.php
@@ -381,6 +381,7 @@ hr.new5 {
+
@@ -406,7 +407,7 @@ hr.new5 {
Marhun : {{ $gadai['marhun'] }} No SAG : {{ $gadai['norujukan'] }}
-Nama : {{ $customers_info['nama'] }} Tarikh Bayar : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
+Nama : {{ $customers_info['nama'] }} Tarikh Bayar : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp
@@ -428,7 +429,7 @@ hr.new5 {
- Tarikh Bayaran : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
+ Tarikh Bayaran : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp
Harga Jualan : RM {{ number_format(($gadai['hargajualan']),2) }}
diff --git a/resources/views/print/resittebusautotawarruq.blade.php b/resources/views/print/resittebusautotawarruq.blade.php
new file mode 100644
index 0000000..24930d5
--- /dev/null
+++ b/resources/views/print/resittebusautotawarruq.blade.php
@@ -0,0 +1,565 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Salinan Pelanggan
+
+
+ RESIT BAYARAN
+
+
+
+
+
+
+
+
+
+
+Marhun : {{ $gadai['marhun'] }} No SAG : {{ $gadai['norujukan'] }}
+
+
+Nama : {{ $customers_info['nama'] }} Tarikh Bayar : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp
+
+
+
+No K/P : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp Tempoh Simpan : {{ $gadai['tempoh'] }}
+
+
+
+Nama Wakil : @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp
+
+
+
+No K/P Wakil : @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp
+
+
+
+
+AT
+
+
+
+
+ Pinjaman
+
+ : RM {{ number_format($gadai['pinjaman'],2) }}
+
+
+ (-) Bayaran Pinjaman
+
+ : RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan'],2) }}
+
+
+ Bayaran Upah
+
+ : RM {{ number_format($transaction_keuntungan['bayaran_keuntungan'],2) }}
+
+
+ Pembiyaan Baru
+
+ : RM {{ number_format($gadai['pinjaman']-$transaction_keuntungan['bayaran_pembiayaan'],2) }}
+
+
+ Jumlah Bayaran
+
+ : RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan']+$transaction_keuntungan['bayaran_keuntungan'],2) }}
+
+
+
+
+
+
+
+
+
+
+
+ ....................................................
+
+ ....................................................
+
+ ....................................................
+
+ ....................................................
+
+
+
+DiSemak
+
+ Cagaran Di Keluarkan
+
+ Cagaran Diterima
+
+ Ar-Rahn {{ Auth::user()->name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Salinan Pejabat
+
+
+ RESIT BAYARAN
+
+
+
+
+
+
+
+
+
+Marhun : {{ $gadai['marhun'] }} No SAG : {{ $gadai['norujukan'] }}
+
+
+Nama : {{ $customers_info['nama'] }} Tarikh Bayar : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
+
+
+
+No K/P : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp Tempoh Simpan : {{ $gadai['tempoh'] }}
+
+
+
+
+
+Nama Wakil : @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp
+
+
+
+
+No K/P Wakil : @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp
+
+
+
+
+AT
+
+
+
+
+ Pinjaman
+
+ : RM {{ number_format($gadai['pinjaman'],2) }}
+
+
+ (-) Bayaran Pinjaman
+
+ : RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan'],2) }}
+
+
+ Bayaran Upah
+
+ : RM {{ number_format($transaction_keuntungan['bayaran_keuntungan'],2) }}
+
+
+ Pembiyaan Baru
+
+ : RM {{ number_format($gadai['pinjaman']-$transaction_keuntungan['bayaran_pembiayaan'],2) }}
+
+
+ Jumlah Bayaran
+
+ : RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan']+$transaction_keuntungan['bayaran_keuntungan'],2) }}
+
+
+
+
+
+
+
+
+
+
+
+ ....................................................
+
+ ....................................................
+
+ ....................................................
+
+ ....................................................
+
+
+
+DiSemak
+
+ Cagaran Di Keluarkan
+
+ Cagaran Diterima
+
+ Ar-Rahn {{ Auth::user()->name }}
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/views/print/resittebusseparuhbelum.blade.php b/resources/views/print/resittebusseparuhbelum.blade.php
index 99953f0..827ba3b 100644
--- a/resources/views/print/resittebusseparuhbelum.blade.php
+++ b/resources/views/print/resittebusseparuhbelum.blade.php
@@ -398,7 +398,7 @@ hr.new5 {
Marhun : {{ $gadai['marhun'] }} No SAG : {{ $gadai['norujukan'] }}
-Nama : {{ $customers_info['nama'] }} Tarikh Bayar : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
+Nama : {{ $customers_info['nama'] }} Tarikh Bayar : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp
@@ -421,7 +421,7 @@ hr.new5 {
- Tarikh Bayaran : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
+ Tarikh Bayaran : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp
Pembiayaan : RM {{ number_format(($gadai['pinjaman']),2) }}
diff --git a/resources/views/print/suratgadaianhilang.blade.php b/resources/views/print/suratgadaianhilang.blade.php
new file mode 100644
index 0000000..3bba116
--- /dev/null
+++ b/resources/views/print/suratgadaianhilang.blade.php
@@ -0,0 +1,115 @@
+
+
+ Surat Akuan Gadaian
+
+
+
+
+
+
+ AKUAN BERKANUN
+
+
+ @php
+ $poskod = Http::get($api_url . '/api/poskod/' . $customers[0]['poskod'])->json();
+ $negeri = Http::get($api_url . '/api/negeri/' . $poskod['kodnegeri'])->json();
+ $daerah = Http::get($api_url . '/api/daerah/' . $poskod['koddaerah'])->json();
+
+ @endphp
+ Saya, {{ $customers[0]['nama'] }} , No. K/P : @php $satu = substr($gadai[0][0]['nokp'],0,6); $dua = substr($gadai[0][0]['nokp'],6,2);$ketiga = substr($gadai[0][0]['nokp'],8); echo $satu . '-' . $dua . '-' . $ketiga; @endphp yang beralamat di {{ strtoupper($customers[0]['alamat1']) . ', ' . $customers[0]['poskod'] . ', ' . strtoupper($daerah['namadaerah']) . ', ' . strtoupper($negeri['negeri']) }} dengan sesungguhnya dan sebenarnya mengaku bahawa: -
+
+
+ Surat Gadaian Ar-Rahn Cawangan @php $namacawangan = substr($cawangan_detail['namacaw'],7); $rendoh = strtolower($namacawangan);echo ucwords($rendoh); @endphp kepunyaan saya telah hilang dalam simpanan @php if(strtoupper($polis[0]['komen1']) == 'SIMPANAN') { echo '.'; }else{ echo 'kerana ' . $polis[0]['komen1'] . ' .'; } @endphp Saya telah sedaya upaya berusaha mencari surat tersebut tetapi gagal menemuinya. Saya juga mengaku bahawa tidak pernah menjual atau menggadai surat tersebut kepada mana-mana institusi kewangan.
+
+
+ Butir-butir mengenai kehilangan surat gadaian tersebut adalah seperti berikut: -
+
+
+
+ No. Rujukan
+ :
+ {{ $polis[0]['norujukan'] }}
+
+
+ Berat
+ :
+ {{ $gadai[0][0]['berat'] }} gm
+
+
+ Pembiayaan
+ :
+ RM {{ $gadai[0][0]['pinjaman'] }}
+
+
+ Tarikh Gadaian
+ :
+ @php $time = new DateTime($gadai[0][0]['t_gadai']); $date = $time->format('d/m/Y'); echo $date; @endphp
+
+
+ dan saya membuat akuan ini dengan kepercayaan bahwa akuan ini adalah benar, dan menurut kuasa peruntukan Akta Akuan Berkanun 1960.
+
+
+
+ Diperbuat dan dengan sesungguhnya diakui
+ )
+
+
+
+ oleh yang tersebut namanya di atas-
+ )
+
+
+
+ {{ $customers[0]['nama'] }}
+ )
+ ........................................................
+
+ @php
+ list($negeriagh, $daerahagh) = explode('|', $polis[0]['komen2']);
+ $negeri = Http::get($api_url . '/api/negeri/' . $negeriagh)->json();
+ $daerah = Http::get($api_url . '/api/daerah/' . $daerahagh)->json();
+
+ @endphp
+
+ di {{ strtoupper($daerah['namadaerah']) }}
+ )
+
+
+
+ di dalam Negeri {{ $negeri['negeri'] }}
+ )
+
+
+
+ pada
+ )
+
+
+
+
+ Di Hadapan Saya,
+
+ ..................................................
+ ( Tandatangan Hakim
+ Mahkamah Seksyen, Majistret,
+ Pesuruhjaya Sumpah
+ atau Notari Awam )
+
+
\ No newline at end of file
diff --git a/resources/views/vendor/laravel-log-viewer/log.blade.php b/resources/views/vendor/laravel-log-viewer/log.blade.php
new file mode 100644
index 0000000..90a3650
--- /dev/null
+++ b/resources/views/vendor/laravel-log-viewer/log.blade.php
@@ -0,0 +1,336 @@
+
+
+
+
+
+
+ Laravel log viewer
+
+
+
+
+
+
+
+
+
+
+
+ @if ($logs === null)
+
+ Log file >50M, please download it.
+
+ @else
+
+
+
+ @if ($standardFormat)
+ Level
+ Context
+ Date
+ @else
+ Line number
+ @endif
+ Content
+
+
+
+
+ @foreach($logs as $key => $log)
+
+ @if ($standardFormat)
+
+ {{$log['level']}}
+
+ {{$log['context']}}
+ @endif
+ {{{$log['date']}}}
+
+ @if ($log['stack'])
+
+
+
+ @endif
+ {{{$log['text']}}}
+ @if (isset($log['in_file']))
+ {{{$log['in_file']}}}
+ @endif
+ @if ($log['stack'])
+ {{{ trim($log['stack']) }}}
+
+ @endif
+
+
+ @endforeach
+
+
+
+ @endif
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/routes/web.php b/routes/web.php
index ff90705..4e23b20 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -41,11 +41,16 @@ Route::get('test', function () {
// });
-
+Route::get('logs', '\Rap2hpoutre\LaravelLogViewer\LogViewerController@index');
Route::get('/welcome',function(){
- return view('print.resittebus');
+ $auth_user = Auth::user();
+ $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
+ $cawangan_detail=$cawangan[0];
+
+ return view('print.suratgadaihilang', compact('cawangan_detail'));
+
});
@@ -96,6 +101,8 @@ Route::get('/kemaskinialirantunai',['as'=>'kemaskini.alirantunai','uses'=>'Alira
//MAINTENANCE
+Route::get('/tebuspenuh',['as'=>'tebus.penuh','uses'=>'PenebusanController@tebuspenuh'])->middleware('auth','teller');
+Route::get('/tebusautotawarruq',['as'=>'tebus.autotawarruq','uses'=>'PenebusanController@tebusautotawarruq'])->middleware('auth','teller');
Route::get('/tebusseparuh',['as'=>'tebus.separuh','uses'=>'PenebusanController@tebusseparuh'])->middleware('auth','teller');
Route::get('/tambahpinjaman',['as'=>'tambah.pinjaman','uses'=>'PenebusanController@tambahpinjaman'])->middleware('auth','teller');
Route::get('/bayaransurans',['as'=>'bayaran.ansurans','uses'=>'PenebusanController@bayaransurans'])->middleware('auth','teller');
@@ -124,7 +131,9 @@ Route::get('/laporan/tebus',['as'=>'laporan.tebus','uses'=>'KhazanahController@l
Route::post('laporan/tebus/cetak',['as'=>'tebus.laporancetak','uses'=>'KhazanahController@cetakLaporanPenebusan'])->middleware('auth','khazanah');
Route::get('/khazanah/pelanggan',['as'=>'khazanah.pelanggan','uses'=>'KhazanahController@index'])->middleware('auth','khazanah');
Route::get('/khazanah/customer_info',['as'=>'khazanah.customer_info','uses'=>'KhazanahController@info'])->middleware('auth','khazanah');
+Route::get('/khazanah/searchpelanggan',['as'=>'khazanah.searchpelanggan','uses'=>'KhazanahController@search'])->middleware('auth','khazanah');
Route::post('/khazanah/pendahuluanserahanHQ',['as'=>'khazanah.pendahuluanserahanHQ','uses'=>'KhazanahController@pendahuluanserahanHQ'])->middleware('auth','khazanah');
+Route::get('/penebusankhazanah/{norujukan}',['as'=>'penebusan.khazanah','uses' => 'PenebusanController@PenebusanKhazanah'])->middleware('auth','khazanah');
Route::post('/kakitangan/harian',['as'=>'kakitangan.harian','uses'=>'KakitanganController@kakitanganHarian'])->middleware('auth','khazanah');
Route::get('/lelong',['as'=>'lelong','uses'=>'LelongController@lelong']);
@@ -142,7 +151,7 @@ Route::get('/kakitangan',['as'=>'khazanah.kakitangan','uses'=>'KhazanahControlle
Route::get('/dashboard',['as'=>'khazanah.dashboard','uses'=>'KhazanahController@dashboard'])->middleware('auth','khazanah');
Route::get('/capaian',['as'=>'khazanah.capaian','uses'=>'KhazanahController@capaian'])->middleware('auth','khazanah');
Route::get('/alirantunai',['as'=>'khazanah.alirantunai','uses'=>'KhazanahController@alirantunai'])->middleware('auth','khazanah');
-Route::get('/pelangganan',['as'=>'khazanah.pelanggan','uses'=>'KhazanahController@pelanggan'])->middleware('auth','khazanah');
+Route::get('/pelangganan',['as'=>'khazanah.pelangganan','uses'=>'KhazanahController@pelanggan'])->middleware('auth','khazanah');
Route::get('/unjuran',['as'=>'khazanah.unjuran','uses'=>'KhazanahController@unjuran'])->middleware('auth','khazanah');
Route::get('/panjar',['as'=>'khazanah.panjar','uses'=>'KhazanahController@panjar'])->middleware('auth','khazanah');
Route::get('/getkelulusan',['as'=>'khazanah.getkelulusan','uses'=>'KhazanahController@getkelulusan'])->middleware('auth','teller');
@@ -195,6 +204,8 @@ Route::post('/laporan/agingbulanan/cetak', ['as'=>'agingbulan.cetaklaporan', 'us
Route::get('/laporan/perbelanjaan', [ 'as'=>'laporan.perbelanjaan', 'uses'=>'KhazanahController@laporan_Perbelanjaan'])->middleware('auth','khazanah');
Route::post('/laporan/perbelanjaan/cetak', ['as'=>'perbelanjaan.cetaklaporan', 'uses'=>'KhazanahController@cetaklaporan_Perbelanjaan'])->middleware('auth','khazanah');
Route::get('/laporan/perbelanjaan/cetak/{baucer}', ['as'=>'perbelanjaan.cetaklaporanbaucer', 'uses'=>'KhazanahController@cetaklaporan_Perbelanjaan_Baucer'])->middleware('auth','khazanah');
+Route::get('/laporan/tuntutbaki', [ 'as'=>'laporan.tuntutbaki', 'uses'=>'KhazanahController@laporan_tuntutbaki'])->middleware('auth','khazanah');
+Route::post('/laporan/tuntutbaki/cetak', ['as'=>'tuntutbaki.cetaklaporan', 'uses'=>'KhazanahController@cetaklaporan_tuntutbaki'])->middleware('auth','khazanah');
// Route::get('/laporan/agingbulanan', [ 'as'=>'laporan.agingbulanan', 'uses'=>'KhazanahController@laporanAging_Bulanan'])->middleware('auth','khazanah');
// Route::post('/laporan/agingbulanan/cetak', ['as'=>'agingbulan.cetaklaporan', 'uses'=>'KhazanahController@cetaklaporang_Aging'])->middleware('auth','khazanah');
@@ -211,6 +222,7 @@ Route::get('/resit/tebusseparuh/{id}',['as'=>'resit.tebusseparuh','uses'=>'Gadai
Route::get('/resit/belumtebus/{id}',['as'=>'resit.belumtebus','uses'=>'GadaianController@resitbelumtebus'])->middleware('auth','teller');
Route::get('/resit/tambahpinjam/{id}',['as'=>'resit.tambahpinjam','uses'=>'GadaianController@resittambahpinjam'])->middleware('auth','teller');
Route::get('/resit/tuntutbaki/{id}',['as'=>'resit.tuntutbaki','uses'=>'LelongController@resittuntutbaki'])->middleware('auth','teller');
+Route::get('/resit/tebusautotawarruq/{id}',['as'=>'resit.autotawarruq','uses'=>'GadaianController@resitautotawarruq'])->middleware('auth','teller');
Route::post('/barcodescanned',['as'=>'barcode.scanned','uses'=>'KhazanahController@barcodescanned'])->middleware('auth','khazanah');
@@ -231,9 +243,7 @@ Route::get('/komoditi',['as'=>'komuditi','uses'=>'KomuditiController@index']);
Route::get('/komoditi/rekod',['as'=>'rekod.komoditi','uses'=>'KomuditiController@rekodKomoditi']);
Route::get('/komoditi/rekod/print',['as'=>'komoditi.rekod.print','uses'=>'KomuditiController@printRekodTransaksi']);
-
-
-
+Route::post('/khazanah/suratakuangadaian',['as'=>'agh.create','uses'=>'KhazanahController@SuratAkuanGadaian'])->middleware('auth','khazanah');
Route::get('/laporan/stokauditbersih', ['as'=>'laporan.stokauditbersih', 'uses'=>'KhazanahController@stokAuditBersih'])->middleware('auth','khazanah');
Route::post('/laporan/stokauditbersih_cetak',['as' =>'stokauditbersih.cetakstokauditbersih', 'uses'=>'KhazanahController@cetakStok_AuditBersih'])->middleware('auth','khazanah');