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

Merge branch 'master' of https://gitlab.com/online-sistem1/api_arrahn

Browse Source
This commit is contained in:
e.arrahn
2021-10-05 12:58:11 +08:00
parent 733607bd32 9f2b17795c
commit 77c1e0b8b6
27 changed files with 2000 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/CustomerController.php
+72 -103
View File
@@ -17,66 +17,38 @@ use Carbon\Carbon;
class CustomerController extends Controller
{
public function showAllCustomers()
{
// $cawangan_all = Cawangan::on('mysql7')->get();
// $customer_all = [];
// foreach($cawangan_all as $index=>$cawangan){
$customer = Customer::on('mysql7')->get();
// if($customer != null){
// array_push($customer_all,$customer);
// }
// }
public function showAllCustomers(){
$customer = Customer::on('mysql7')->get();
return response()->json($customer);
}
public function getLatestCustomer($kodcaw){
// $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$customer = Customer::on('mysql7')->orderBy('tarikhdaftar','desc')->orderBy('nosiri','desc')->first();
return response()->json($customer);
}
public function showAllCustomersByCawangan($kodcaw)
{
// $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
public function showAllCustomersByCawangan($kodcaw){
$customer = Customer::on('mysql7')->get();
return response()->json($customer);
}
public function showOneCustomerByIC($ic){
// $cawangan_all = Cawangan::on('mysql7')->get();
// $customer_all = [];
// foreach($cawangan_all as $index=>$cawangan){
$customer = Customer::on('mysql7')
->where('kplama','=',$ic)
->orWhere('kpbaru','=',$ic)
->first();
// if($customer != null){
// array_push($customer_all,$customer);
// }
// }
$customer = Customer::on('mysql7')
->where('kplama','=',$ic)
->orWhere('kpbaru','=',$ic)
->first();
return response()->json($customer);
}
public function showOneCustomerByICAdmin(Request $request){
// $cawangan_all = Cawangan::on('mysql7')->get();
// $customer_all = [];
// foreach($cawangan_all as $index=>$cawangan){
$customer = Customer::on('mysql7')
->where('kplama','=',$request->ic)
->orWhere('kpbaru','=',$request->ic)
->first();
// if($customer != null){
// array_push($customer_all,$customer);
// }
// }
$customer = Customer::on('mysql7')
->where('kplama','=',$request->ic)
->orWhere('kpbaru','=',$request->ic)
->first();
return response()->json($customer);
}
@@ -315,8 +287,6 @@ class CustomerController extends Controller
public function getLaporanCustomers($kodcaw, $tarikh)
{
// $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$gadai = Customer::on('mysql7')
->where([['tarikhdaftar','=',$tarikh],['kodcaw',$kodcaw]])
->orderBy('tarikhdaftar', 'desc')
@@ -364,28 +334,19 @@ class CustomerController extends Controller
}
public function customerUpdate($nokp,Request $request){
// $cawangan_all = Cawangan::on('mysql7')->get();
// foreach($cawangan_all as $index=>$cawangan){
// $customer = Customer::on($cawangan['mysql'])
// ->where('kplama','=',$nokp)
// ->orWhere('kpbaru','=',$nokp)
// ->first();
// if($customer != null){
$poskod = Poskod::on('mysql7')->where('poskod','=',$request->poskod)->first();
$customer_update = Customer::on('mysql7')
->where('kplama','=',$nokp)
->orWhere('kpbaru','=',$nokp)
->update(array(
'alamat1' => $request->alamat,
'alamat2' => '',
'poskod' => $request->poskod,
'koddaerah' => $poskod['koddaerah'],
'kodnegeri' => $poskod['kodnegeri'],
'telefon' => $request->telefon1,
'telefon2' => $request->telefon2
));
// }
// }
$poskod = Poskod::on('mysql7')->where('poskod','=',$request->poskod)->first();
$customer_update = Customer::on('mysql7')
->where('kplama','=',$nokp)
->orWhere('kpbaru','=',$nokp)
->update(array(
'alamat1' => $request->alamat,
'alamat2' => '',
'poskod' => $request->poskod,
'koddaerah' => $poskod['koddaerah'],
'kodnegeri' => $poskod['kodnegeri'],
'telefon' => $request->telefon1,
'telefon2' => $request->telefon2
));
return response()->json($customer_update, 200);
}
@@ -412,32 +373,24 @@ class CustomerController extends Controller
}
public function customerUpdateKhazanah($nokp,Request $request){
// $cawangan_all = Cawangan::on('mysql7')->get();
// foreach($cawangan_all as $index=>$cawangan){
// $customer = Customer::on($cawangan['mysql'])
// ->where('kplama','=',$nokp)
// ->orWhere('kpbaru','=',$nokp)
// ->first();
// if($customer != null){
$poskod = Poskod::on('mysql7')->where('poskod','=',$request->poskod)->first();
$poskod = Poskod::on('mysql7')->where('poskod','=',$request->poskod)->first();
$customer_update = Customer::on('mysql7')
->where('kplama','=',$nokp)
->orWhere('kpbaru','=',$nokp)
->update(array(
'telefon' => $request->telefon1,
'telefon2' => $request->telefon2,
'kodbank' => $request->kodbank,
'noakaun' => $request->noakaun,
'nota' => $request->nota,
'nama' => $request->nama,
'alamat1' => $request->alamat,
'poskod' => $request->poskod,
'koddaerah' => $poskod['koddaerah'],
'kodnegeri' => $poskod['kodnegeri']
));
// }
// }
$customer_update = Customer::on('mysql7')
->where('kplama','=',$nokp)
->orWhere('kpbaru','=',$nokp)
->update(array(
'telefon' => $request->telefon1,
'telefon2' => $request->telefon2,
'kodbank' => $request->kodbank,
'noakaun' => $request->noakaun,
'nota' => $request->nota,
'nama' => $request->nama,
'alamat1' => $request->alamat,
'poskod' => $request->poskod,
'koddaerah' => $poskod['koddaerah'],
'kodnegeri' => $poskod['kodnegeri']
));
return response()->json($customer_update, 200);
}
@@ -654,21 +607,18 @@ class CustomerController extends Controller
public function insertAkaunBankMobile(Request $request)
{
// $cawangan_all = Cawangan::on('mysql7')->get();
// foreach($cawangan_all as $index=>$cawangan)
// {
$customer = Customer::on('mysql7')
->where('kplama','=',$request->nokp)
->orWhere('kpbaru','=',$request->nokp)
->first();
$customer = Customer::on('mysql7')
->where('kplama','=',$request->nokp)
->orWhere('kpbaru','=',$request->nokp)
->first();
if(!empty($customer))
{
$customer->kodbank = $request->kodbank;
$customer->noakaun = $request->noakaun;
$customer->save();
}
// }
if(!empty($customer))
{
$customer->kodbank = $request->kodbank;
$customer->noakaun = $request->noakaun;
$customer->save();
}
return response()->json($customer, 200);
}
@@ -707,4 +657,23 @@ class CustomerController extends Controller
return response()->json($blacklist);
}
public function showCustomerByEachCawangan($ic)
{
$cawangan_all = Cawangan::on('mysql7')->get();
$custcawangan = array();
foreach($cawangan_all as $index=>$cawangan)
{
$customer = Gadai::on($cawangan['mysql'])
->select('kodcaw')
->where('nokp', '=', $ic)
->first();
if($customer)
array_push($custcawangan,['kodcaw' => $customer['kodcaw'], 'namacawangan' => $cawangan['details_caw']]);
}
return response()->json($custcawangan);
}
}
app/Http/Controllers/DenominasiController.php
-2
View File
@@ -11,8 +11,6 @@ use Carbon\Carbon;
class DenominasiController extends Controller
{
public function listdenominasi($kodcaw)
{
$current = Carbon::now();
app/Http/Controllers/GadaiController.php
+459 -141
View File
@@ -21,6 +21,8 @@ use App\Komuditi;
use App\KawalanStokLama;
use App\KawalanStok;
use App\Moratorium;
use App\Audit;
use App\Customer;
use Illuminate\Http\Request;
@@ -216,6 +218,9 @@ class GadaiController extends Controller
$cawangan = Cawangan::on('mysql7')
->where('kodcaw','=',$request->kodcaw)
->first();
if($request->transaction == 'Ubah Gadai'){
$old_data = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
}
$gadai = Gadai::on($cawangan['mysql'])
->where('norujukan','=',$norujukan)
->update(array(
@@ -244,6 +249,22 @@ class GadaiController extends Controller
'tempohbayar' => 0.00,
'lelong_tawarruq' => 1
));
$new_data = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
$audit = new Audit();
$audit->users = $request->teller;
$audit->actions = $request->transaction;
$audit->norujukan = $norujukan;
$audit->new_data = $new_data;
if($request->transaction == 'Ubah Gadai'){
$audit->old_data = $old_data;
}
$audit->kodcaw = $request->kodcaw;
$audit->created_at = $current;
$audit->updated_at = $current;
$audit->save();
return response()->json($gadai, 200);
}
@@ -384,6 +405,8 @@ class GadaiController extends Controller
$lelong_tawarruq = 1;
}
$old_data = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
$baki_hargajualan = $gadai['bakihargajualan'] - $request->bayaran;
$baki_bayaran = $request->bayaran - $upahsemasa;
@@ -418,6 +441,20 @@ class GadaiController extends Controller
'tempohbayar' => $gadai['tempoh'],
'lelong_tawarruq' => $lelong_tawarruq
));
$new_data = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
$audit = new Audit();
$audit->users = $request->teller;
$audit->actions = 'Bayaran Ansuran';
$audit->norujukan = $norujukan;
$audit->new_data = $new_data;
$audit->old_data = $old_data;
$audit->kodcaw = $kodcaw;
$audit->created_at = $current;
$audit->updated_at = $current;
$audit->save();
return response()->json($update_gadai, 200);
}
@@ -453,12 +490,28 @@ class GadaiController extends Controller
return response()->json($gadai);
}
public function batalGadai($kodcaw, $norujukan){
public function batalGadai($kodcaw, $norujukan,Request $request){
$current = Carbon::now();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$old_data = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
$audit = new Audit();
$audit->users = $request->teller;
$audit->actions = $request->transaction;
$audit->norujukan = $norujukan;
$audit->old_data = $old_data;
$audit->kodcaw = $request->kodcaw;
$audit->created_at = $current;
$audit->updated_at = $current;
$audit->save();
return response('Batal Berjaya', 200);
}
@@ -575,17 +628,34 @@ class GadaiController extends Controller
public function getLaporanGadai($kodcaw,$tarikh){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$gadai = Gadai::on($cawangan['mysql'])
->select('gadai.t_gadai','gadai.norujukan','cust.nama','gadai.nokp','gadai.semakbarcode','gadai.masa','gadai.berat','gadai.nilaimarhun','gadai.pinjaman','gadai.upah12','gadai.percentpinj','cust.alamat1','gadai.teller')
->join('online_arrahn.customer as cust', function($join)
{
$join->on('gadai.nokp', '=', 'cust.kpbaru');
$join->orOn('gadai.nokp', '=', 'cust.kplama');
})
->where('gadai.t_gadai','=',$tarikh)
->orderBy('gadai.teller')
->orderBy('gadai.sirig')
->get();
$gadai_data = Gadai::on($cawangan['mysql'])->select('t_gadai','norujukan','nokp','semakbarcode','masa','berat','nilaimarhun','pinjaman','upah12','percentpinj','teller','nokp')
->where('t_gadai','=',$tarikh)
->orderBy('teller')
->orderBy('sirig')
->get();
$gadai = [];
if($gadai_data){
foreach($gadai_data as $index=>$gadaiData){
$customer_info = Customer::on('mysql7')->where('kplama','=',$gadaiData['nokp'])->orWhere('kpbaru','=',$gadaiData['nokp'])->first();
array_push($gadai,[
"t_gadai"=> $gadaiData['t_gadai'],
"norujukan"=> $gadaiData['norujukan'],
"nama"=> $customer_info['nama'],
"nokp"=> $gadaiData['nokp'],
"semakbarcode"=> $gadaiData['semakbarcode'],
"masa"=> $gadaiData['masa'],
"berat"=> $gadaiData['berat'],
"nilaimarhun"=> $gadaiData['nilaimarhun'],
"pinjaman"=> $gadaiData['pinjaman'],
"upah12"=> $gadaiData['upah12'],
"percentpinj"=> $gadaiData['percentpinj'],
"alamat1"=> $customer_info['alamat1'],
"teller"=> $gadaiData['teller']
]);
}
}
return response()->json($gadai);
}
@@ -845,13 +915,6 @@ class GadaiController extends Controller
->orderBy('t_gadai')
->get();
// $tebus = Gadai::on($cawangan['mysql'])
// ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman, SUM(bakiupah) as upahsimpan')
// ->where('t_gadai','=',$request->tarikh)
// ->where('sttebus','=','T')
// ->orderBy('t_gadai')
// ->get();
$tebus = Tebus::on($cawangan['mysql'])
->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman, SUM(bakiupah) as upahsimpan')
->where('t_tebus','=',$request->tarikh)
@@ -925,8 +988,8 @@ class GadaiController extends Controller
$dateans = new Carbon($request->tarikh);
$ansuran = Transaction::on('mysql7')
->select('transaction.norujukan','trans.tarikh_bayaran','transaction.nokp','transaction.kodcaw','transaction.trans_type','cust.nama','db2.tempoh','db2.bakipjm','trans.bayaran_pembiayaan','transaction.duit_masuk','trans.bayaran_keuntungan','transaction.teller')
$ansuran_data = Transaction::on('mysql7')
->select('transaction.norujukan','trans.tarikh_bayaran','transaction.nokp','transaction.kodcaw','transaction.trans_type','cust.nama','trans.bayaran_pembiayaan','transaction.duit_masuk','trans.bayaran_keuntungan','transaction.teller')
->leftJoin('transaksi_keuntungan as trans', function($join)
{
$join->on('transaction.norujukan', '=', 'trans.norujukan');
@@ -937,13 +1000,35 @@ class GadaiController extends Controller
$join->on('transaction.nokp', '=', 'cust.kpbaru');
$join->orOn('transaction.nokp', '=', 'cust.kplama');
})
->leftJoin($cawangan['db_name'].'.gadai as db2','transaction.norujukan','=','db2.norujukan')
->where('transaction.kodcaw','=',$kodcaw)
->where('transaction.trans_type','=','A')
->whereDate('transaction.created_at','=',$dateans)
->orderBy('transaction.teller')
->get();
$ansuran = [];
if($ansuran_data){
foreach($ansuran_data as $index=>$ansuranData){
$gadai = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuranData['norujukan'])->first();
array_push($ansuran,[
"norujukan" => $ansuranData['norujukan'],
"tarikh_bayaran" => $ansuranData['tarikh_bayaran'],
"nokp" => $ansuranData['nokp'],
"kodcaw" => $ansuranData['kodcaw'],
"trans_type" => $ansuranData['trans_type'],
"nama" => $ansuranData['nama'],
"tempoh" => $gadai['tempoh'],
"bakipjm" => $gadai['bakipjm'],
"bayaran_pembiayaan" => $ansuranData['bayaran_pembiayaan'],
"duit_masuk" => $ansuranData['duit_masuk'],
"bayaran_keuntungan" => $ansuranData['bayaran_keuntungan'],
"teller" => $ansuranData['teller']
]);
}
}
return response()->json($ansuran);
}
@@ -1261,91 +1346,150 @@ class GadaiController extends Controller
$daterequest = new Carbon($tarikh);
$ansuran1 = TransaksiKeuntungan::on('mysql7')
$ansuran1_data = TransaksiKeuntungan::on('mysql7')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
->where('trans.created_at','<',$daterequest)
->where('trans.trans_type','=','A')
->where('db2.sttebus','=','')
->whereBetween('nilaimarhun', [1, 400.99])
->groupBy('trans.id')
->get();
$ansuranharini1 = TransaksiKeuntungan::on('mysql7')
$ansuran1 = [];
if($ansuran1_data){
foreach($ansuran1_data as $index=>$ansuran1Data){
$gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuran1Data['norujukan'])->first();
if($gadaiData){
if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 1 && $gadaiData['nilaimarhun'] <= 400.99){
array_push($ansuran1,['bayaran_pembiayaan'=>$ansuran1Data['bayaran_pembiayaan']]);
}
}
}
}
$ansuranharini1_data = TransaksiKeuntungan::on('mysql7')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
// ->where('trans.created_at','=',$daterequest)
->whereDate('trans.created_at','=',$tarikh)
->where('trans.trans_type','=','A')
->where('db2.sttebus','=','')
->whereBetween('nilaimarhun', [1, 400.99])
->groupBy('trans.id')
->get();
$ansuran2 = TransaksiKeuntungan::on('mysql7')
$ansuranharini1 = [];
if($ansuranharini1_data){
foreach($ansuranharini1_data as $index=>$ansuranharini1Data){
$gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuranharini1Data['norujukan'])->first();
if($gadaiData){
if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 1 && $gadaiData['nilaimarhun'] <= 400.99){
array_push($ansuranharini1,['bayaran_pembiayaan'=>$ansuranharini1Data['bayaran_pembiayaan']]);
}
}
}
}
$ansuran2_data = TransaksiKeuntungan::on('mysql7')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
->where('trans.created_at','<',$daterequest)
->where('trans.trans_type','=','A')
->where('db2.sttebus','=','')
->whereBetween('nilaimarhun', [401, 2000.99])
->groupBy('trans.id')
->get();
$ansuranharini2 = TransaksiKeuntungan::on('mysql7')
$ansuran2 = [];
if($ansuran2_data){
foreach($ansuran2_data as $index=>$ansuran2Data){
$gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuran2Data['norujukan'])->first();
if($gadaiData){
if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 401 && $gadaiData['nilaimarhun'] <= 2000.99){
array_push($ansuran2,['bayaran_pembiayaan'=>$ansuran2Data['bayaran_pembiayaan']]);
}
}
}
}
$ansuranharini2_data = TransaksiKeuntungan::on('mysql7')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
->whereDate('trans.created_at','=',$tarikh)
->where('trans.trans_type','=','A')
->where('db2.sttebus','=','')
->whereBetween('nilaimarhun', [401, 2000.99])
->groupBy('trans.id')
->get();
$ansuran3 = TransaksiKeuntungan::on('mysql7')
$ansuranharini2 = [];
if($ansuranharini2_data){
foreach($ansuranharini2_data as $index=>$ansuranharini2Data){
$gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuranharini2Data['norujukan'])->first();
if($gadaiData){
if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 401 && $gadaiData['nilaimarhun'] <= 2000.99){
array_push($ansuranharini2,['bayaran_pembiayaan'=>$ansuranharini2Data['bayaran_pembiayaan']]);
}
}
}
}
$ansuran3_data = TransaksiKeuntungan::on('mysql7')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
->where('trans.created_at','<',$daterequest)
->where('trans.trans_type','=','A')
->where('db2.sttebus','=','')
->whereBetween('nilaimarhun', [2001, 100000])
->groupBy('trans.id')
->get();
$ansuran3 = [];
if($ansuran3_data){
foreach($ansuran3_data as $index=>$ansuran3Data){
$gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuran3Data['norujukan'])->first();
if($gadaiData){
if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 2001 && $gadaiData['nilaimarhun'] <= 100000){
array_push($ansuran3,['bayaran_pembiayaan'=>$ansuran3Data['bayaran_pembiayaan']]);
}
}
}
}
$ansuranharini3 = TransaksiKeuntungan::on('mysql7')
$ansuranharini3_data = TransaksiKeuntungan::on('mysql7')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
->whereDate('trans.created_at','=',$tarikh)
->where('trans.trans_type','=','A')
->where('db2.sttebus','=','')
->whereBetween('nilaimarhun', [2001, 100000])
->groupBy('trans.id')
->get();
$ansuranharini3 = [];
if($ansuranharini3_data){
foreach($ansuranharini3_data as $index=>$ansuranharini3Data){
$gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuranharini3Data['norujukan'])->first();
if($gadaiData){
if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 2001 && $gadaiData['nilaimarhun'] <= 100000){
array_push($ansuranharini3,['bayaran_pembiayaan'=>$ansuranharini3Data['bayaran_pembiayaan']]);
}
}
}
}
//Calculation Ansuran guna foreach
$totalans1 = 0;$totalharinians1 = 0;
@@ -1737,6 +1881,16 @@ class GadaiController extends Controller
$bakiakhir = 0;
$totalkeluar = 0;
$audit = new Audit();
$audit->users = $request->kodlaluan;
$audit->actions = 'Hapus Gadai';
$audit->norujukan = $norujukan;
$audit->old_data = $gadai;
$audit->kodcaw = $kodcaw;
$audit->created_at = $current;
$audit->updated_at = $current;
$audit->save();
if($gadai[0]['historygadaian'] != "0" && $gadai[0]['historygadaian'] != '')
{
@@ -1862,8 +2016,8 @@ class GadaiController extends Controller
Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
// TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
// Transaction::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
Transaction::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
return response('Deleted Successfully', 200);
}
@@ -1879,6 +2033,8 @@ class GadaiController extends Controller
$tebus = Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->get();
$gadai = Gadai::on($cawangan['mysql'])->where([['sttebus',''],['historygadaian',$norujukan]])->first();
$tunai=Tunai::on($cawangan['mysql'])->where([['kodcaw','=',$kodcaw],['tarikh','=',$current->toDateString()],['kodlaluan','=',$request->kodlaluan]])
->orderBy('tarikh','desc')
->first();
@@ -1893,62 +2049,77 @@ class GadaiController extends Controller
$bakiakhir = $baki;
$totalkeluar = 0;
if($tebus[0]['tagterima'] == 1)
{
if($tebus[0]['jenistebus'] == 'T')
{
$totalmasuk = $masuk - $tebus[0]['bakipjm'];
// $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
$bakiakhir = $baki - $tebus[0]['bakipjm'];
$updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
update(array(
'keluar' => $keluar,
'masuk' => $totalmasuk,
'baki' => $bakiakhir
));
Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(['sttebus' => '']);
Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
Transaction::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
return response('Deleted Successfully', 200);
}
else
return response('Bukan-Tebus', 200);
if($gadai){
return response('Bukan-Tebus', 200);
}else{
$audit = new Audit();
$audit->users = $request->kodlaluan;
$audit->actions = 'Hapus Gadai';
$audit->norujukan = $norujukan;
$audit->old_data = $gadai;
$audit->kodcaw = $kodcaw;
$audit->created_at = $current;
$audit->updated_at = $current;
$audit->save();
if($tebus[0]['jenistebus'] == 'T')
if($tebus[0]['tagterima'] == 1)
{
$bakiakhir = $bakiakhir - $tebus[0]['bakipjm'];
$updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
update(array(
'keluar' => $keluar,
'masuk' => $masuk,
'baki' => $bakiakhir
));
Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(['sttebus' => '']);
Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
if($tebus[0]['jenistebus'] == 'T')
{
$totalmasuk = $masuk - $tebus[0]['bakipjm'];
// $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
$bakiakhir = $baki - $tebus[0]['bakipjm'];
$updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
update(array(
'keluar' => $keluar,
'masuk' => $totalmasuk,
'baki' => $bakiakhir
));
Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(['sttebus' => '']);
Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
Transaction::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
Transaction::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
return response('Deleted Successfully', 200);
return response('Deleted Successfully', 200);
}
else
return response('Bukan-Tebus', 200);
}else{
if($tebus[0]['jenistebus'] == 'T')
{
$bakiakhir = $bakiakhir - $tebus[0]['bakipjm'];
$updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
update(array(
'keluar' => $keluar,
'masuk' => $masuk,
'baki' => $bakiakhir
));
Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(['sttebus' => '']);
Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
Transaction::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
return response('Deleted Successfully', 200);
}
else
return response('Bukan-Tebus', 200);
}
else
return response('Bukan-Tebus', 200);
}
}
}
public function senaraiLelong($kodcaw,Request $request){
@@ -2402,7 +2573,6 @@ class GadaiController extends Controller
$rekod_emaspalsu = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',1)
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
// ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
->sum('pinjaman');
$rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
@@ -2411,12 +2581,10 @@ class GadaiController extends Controller
->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$tarikhtawarruq]])
->sum('pinjaman');
// $gadaibaru = Gadai::on($cawangan['mysql'])
// ->where('tagpalsu','=',0)
// ->where([['t_gadai','>=','2021-04-14'],['sttebus','=',''],['t_gadai','<=',$request->tarikh]])
// ->sum('pinjaman');
// $rekod_pinjamandiberi;
if($kodcaw === '011232')
{
$rekod_pinjamandiberi -= 282;
}
$array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu];
@@ -2565,11 +2733,6 @@ class GadaiController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
// $Gadai = Gadai::on($cawangan['mysql'])
// ->where('tagpalsu','=',0)
// ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['sttebus','=',''],['hargajualan','<>','NULL']])
// ->orWhere([['t_update','>',$request->mula],['sttebus','!=',''],['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','null']])
// ->sum('pinjaman');
$Gadai = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','NULL']])->sum('pinjaman');
$Tebus = Gadai::on($cawangan['mysql'])
@@ -2596,25 +2759,25 @@ class GadaiController extends Controller
$keuntungan = Gadai::on($cawangan['mysql'])
->where('t_gadai','<=',$request->tarikh)
// ->where('t_gadai','>=','2021-04-14')
->where('hargajualan','<>','null')
// ->where('sttebus','=','')
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']])
->whereNotNull('upah12')
->sum('upah12');
$transaksi = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
// ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
$transaksi_data = TransaksiKeuntungan::on('mysql7')
->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('bayaran_keuntungan');
->get();
// $transaksi = TransaksiKeuntungan::on('mysql7')
// ->where('tarikh_bayaran' ,'>=', $datetawarruq)
// ->where('tarikh_bayaran' ,'<=', $daterequest)
// ->sum('bayaran_keuntungan');
$transaksi = 0;
if($transaksi_data){
foreach($transaksi_data as $index=>$transaksiData){
$gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$transaksiData['norujukan'])->whereNotNull('hargajualan')->first();
if($gadaiData){
$transaksi += $transaksiData['bayaran_keuntungan'];
}
}
}
$totalkeuntungan = $keuntungan - $transaksi;
@@ -2636,16 +2799,6 @@ class GadaiController extends Controller
->whereNotNull('upah12')
->sum('upah12');
// $transaksi = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
// ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula)
// ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
// ->whereYear('tarikh_bayaran','=',$current->year)
// ->whereNotNull('db2.hargajualan')
// ->sum('bayaran_keuntungan');
// $totalkeuntungan = $keuntungan - $transaksi;
$totalkeuntungan = $keuntungan;
return response()->json($totalkeuntungan,200);
@@ -2662,11 +2815,42 @@ class GadaiController extends Controller
$current = Carbon::now();
$current = new Carbon();
$transaksi_data = TransaksiKeuntungan::on('mysql7')
->where('tarikh_bayaran' ,'<=', $daterequest)
->where('kodcaw',$request->kodcaw)
->pluck('norujukan');
$gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$transaksi_data)
->where([['sttebus',''],['hargajualan','<>','null']])
->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['hargajualan','<>','null']])
->pluck('norujukan');
$transaksi = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'<=', $daterequest]])
->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->tarikh],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'<=', $daterequest]])
->sum('bayaran_pembiayaan');
->whereIn('norujukan',$gadaiData)
->where('tarikh_bayaran' ,'<=', $daterequest)
->sum('bayaran_pembiayaan');
// $transaksi_data = TransaksiKeuntungan::on('mysql7')
// // ->select('norujukan','tarikh_bayaran')
// ->where('tarikh_bayaran' ,'<=', $daterequest)
// // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
// // ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'<=', $daterequest]])
// // ->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->tarikh],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'<=', $daterequest]])
// // ->sum('bayaran_pembiayaan');
// ->pluck('norujukan');
// // ->get();
// $transaksi = 0;
// if($transaksi_data){
// foreach($transaksi_data as $index=>$transaksiData){
// $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$transaksiData['norujukan'])->first();
// if($gadaiData && (($gadaiData['sttebus'] == '' && $gadaiData['hargajualan'] != null) || ($gadaiData['sttebus'] != '' && $gadaiData['t_update'] > $request->tarikh && $gadaiData['hargajualan'] != null))){
// $transaksi += $transaksiData['bayaran_pembiayaan'];
// }
// }
// }
return response($transaksi);
}
@@ -2685,11 +2869,40 @@ class GadaiController extends Controller
$current = Carbon::now();
$current = new Carbon();
$transaksi_data = TransaksiKeuntungan::on('mysql7')
->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
->where('kodcaw',$request->kodcaw)
->pluck('norujukan');
$gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$transaksi_data)
->where([['sttebus',''],['hargajualan','<>','null']])
->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['hargajualan','<>','null']])
->pluck('norujukan');
$transaksi = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->mula],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
->sum('bayaran_pembiayaan');
->whereIn('norujukan',$gadaiData)
->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
->sum('bayaran_pembiayaan');
// $transaksi_data = TransaksiKeuntungan::on('mysql7')
// ->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
// // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
// // ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
// // ->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->mula],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
// // ->sum('bayaran_pembiayaan');
// ->get();
// $transaksi = 0;
// if($transaksi_data){
// foreach($transaksi_data as $index=>$transaksiData){
// $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$transaksiData['norujukan'])->first();
// if($gadaiData && (($gadaiData['sttebus'] == '' && $gadaiData['hargajualan'] != null) || ($gadaiData['sttebus'] != '' && $gadaiData['t_update'] > $request->mula && $gadaiData['hargajualan'] != null))){
// $transaksi += $transaksiData['bayaran_pembiayaan'];
// }
// }
// }
return response($transaksi);
}
@@ -2778,4 +2991,109 @@ class GadaiController extends Controller
}
return response()->json('successful',200);
}
public function PembiayaanBulanan(Request $request){
$current = Carbon::now();
$current = new Carbon();
$monthly = Carbon::now();
$monthly = new Carbon();
$monthly_array = Carbon::now();
$monthly_array = new Carbon();
$monthly_date = $monthly->startOfMonth()->subMonths(11)->toDateString();
$cawangan_all = Cawangan::on('mysql7')->get();
$arraybulanan = [];
$array_totalup = [];
for($i=0;$i<12;$i++){
if($i == 0){
$monthly_array_date = $monthly_array->startOfMonth()->subMonths(0);
}else{
$monthly_array_date = $monthly_array->startOfMonth()->subMonths(1);
}
if($monthly_array_date->year === $current->year)
{
switch($monthly_array_date->month){
case 1: $namabulan = 'Jan';
break;
case 2: $namabulan = 'Feb';
break;
case 3: $namabulan = 'Mac';
break;
case 4: $namabulan = 'Apr';
break;
case 5: $namabulan = 'Mei';
break;
case 6: $namabulan = 'Jun';
break;
case 7: $namabulan = 'Jul';
break;
case 8: $namabulan = 'Aug';
break;
case 9: $namabulan = 'Sep';
break;
case 10: $namabulan = 'Okt';
break;
case 11: $namabulan = 'Nov';
break;
case 12: $namabulan = 'Dis';
}
array_push($array_totalup,['tarikh'=>$monthly_array_date->year.'-'.sprintf("%02d", $monthly_array_date->month),'namabulan'=>$namabulan,'pembiayaan'=>0,'bayaran'=>0]);
}
}
foreach($cawangan_all as $index=>$cawangan){
$gadai = Gadai::on($cawangan['mysql'])
->selectRaw('SUM(pinjaman) AS totalpinjaman')
->addSelect(DB::connection($cawangan['mysql'])
->raw('DATE_FORMAT(t_gadai, "%Y-%m") as t_gadai'))
->groupBy(DB::connection($cawangan['mysql'])
->raw("DATE_FORMAT(t_gadai,'%Y%m')"))
->whereYear('t_gadai',2021)
->where([['nokp','=',$request->icno],['t_gadai','<=',$current->toDateString()],['t_gadai','>=',$monthly_date]])
->orderBy('t_gadai','desc')
->get();
foreach($array_totalup as $array_index=>$totalup){
foreach($gadai as $indexgadai=>$gadai_detail){
if($totalup['tarikh'] == $gadai_detail['t_gadai']){
$total_gadai = $totalup['pembiayaan'];
$total_gadai += $gadai_detail['totalpinjaman'];
$array_totalup[$array_index]['pembiayaan'] = $total_gadai;
}
}
}
}
$bayaran = Transaction::on('mysql7')->selectRaw('SUM(duit_masuk) AS totalbayaran')
->addSelect(DB::connection('mysql7')
->raw('DATE_FORMAT(created_at, "%Y-%m") as created_at'))
->groupBy(DB::connection('mysql7')
->raw("DATE_FORMAT(created_at,'%Y%m')"))
->where([['nokp','=',$request->icno],['created_at','<=',$current->toDateString()],['created_at','>=',$monthly_date]])
->orderBy('created_at','desc')
->get();
foreach($array_totalup as $array_index=>$totalup){
foreach($bayaran as $indexbayaran=>$bayaran_detail){
if($totalup['tarikh'] == $bayaran_detail['created_at']){
$total_bayaran = $totalup['bayaran'];
$total_bayaran += $bayaran_detail['totalbayaran'];
$array_totalup[$array_index]['bayaran'] = $total_bayaran;
}
}
}
// asort($array_totalup);
return response()->json($array_totalup);
}
}
app/Http/Controllers/GlejerController.php
+32 -119
View File
@@ -12,10 +12,6 @@ use Illuminate\Support\Facades\DB;
use Carbon\Carbon;
class GlejerController extends Controller
{
public function getGlejer($kodcaw, Request $request)
{
$current = Carbon::now();
@@ -27,13 +23,6 @@ class GlejerController extends Controller
}
public function Getglejer_Data($tarikh1,$tarikh2,$kodcaw)
{
@@ -68,122 +57,55 @@ class GlejerController extends Controller
}
public function getSemalam_Glejer($kodcaw, Request $request)
{
public function getSemalam_Glejer($kodcaw, Request $request){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$glejer=Glejer::on($cawangan['mysql'])->where('glcode','=',$request->glcode)->orderBy('tarikh','DESC')->limit(1)->get();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$glejer=Glejer::on($cawangan['mysql'])->where('glcode','=',$request->glcode)->orderBy('tarikh','DESC')->limit(1)->get();
return response()->json($glejer);
return response()->json($glejer);
}
public function Create_Glejer($kodcaw,Request $request){
}
public function Create_Glejer($kodcaw,Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$current = Carbon::now();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$glejer=Glejer::on($cawangan['mysql'])->create([
// 'tarikh' => $current->toDateString(),
'kodcaw'=> $request->kodcaw,
'tarikh'=>$current->toDateString(),
'glcode'=>$request->glcode,
'descpt'=>$request->descpt,
'debit'=>$request->debit,
'kredit'=>$request->kredit,
'hariini'=>$request->hariini,
'kelmarin'=>$request->kelmarin,
'jumlah'=>$request->jumlah,
'bulanini'=>$request->bulanini,
'tahunini'=>$request->tahunini,
'acttype'=>$request->acttype
]);
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$glejer=Glejer::on($cawangan['mysql'])->create([
// 'tarikh' => $current->toDateString(),
'kodcaw'=> $request->kodcaw,
'tarikh'=>$current->toDateString(),
'glcode'=>$request->glcode,
'descpt'=>$request->descpt,
'debit'=>$request->debit,
'kredit'=>$request->kredit,
'hariini'=>$request->hariini,
'kelmarin'=>$request->kelmarin,
'jumlah'=>$request->jumlah,
'bulanini'=>$request->bulanini,
'tahunini'=>$request->tahunini,
'acttype'=>$request->acttype
]);
return response()->json($glejer,201);
return response()->json($glejer,201);
}
}
public function carianBulananTahun_glejer($kodcaw,Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$yr = Carbon::now()->format('Y');
$month= Carbon::now()->format('m');
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$glejerMy=Glejer::on ($cawangan['mysql'])->whereYear('tarikh','=',$yr)->whereMonth('tarikh', '=',$month)->where('glcode', '=',$request->glcode)->
orderBy('tarikh','ASC')->get();
return response()->json($glejerMy);
$glejerMy=Glejer::on ($cawangan['mysql'])->whereYear('tarikh','=',$yr)->whereMonth('tarikh', '=',$month)->where('glcode', '=',$request->glcode)->
orderBy('tarikh','ASC')->get();
return response()->json($glejerMy);
}
/*public function updateRequestTeller($kodcaw,Request $request)
{
$requestteller = RequestTeller::on('mysql7')->
where([['no','=',$request->no],['kodcaw','=',$kodcaw],['kodlaluan','=',$request->kodlaluan],['update','=',0]])
->update(array(
'update' => 1
) );
}
*/
public function Kemaskini_Glejer($kodcaw, Request $request)
{
@@ -199,30 +121,21 @@ class GlejerController extends Controller
'hariini'=>$request->hariini,
'kelmarin'=>$request->kelmarin
) );
));
return response()->json($updateGLejer,200);
return response()->json($updateGLejer,200);
}
public function carianTahun_glejer($kodcaw,Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$yr = Carbon::now()->format('Y');
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$db=$cawangan['mysql'];
$db=$cawangan['mysql'];
$gelejerYear=Glejer::on($cawangan['mysql'])->whereYear('tarikh','=',$yr)->where('glcode', '=',$request->glcode)->
orderBy('tarikh','ASC')->get();
return response()->json($gelejerYear);
}
}
app/Http/Controllers/ImbangDugaLamaController.php
+6 -17
View File
@@ -10,23 +10,12 @@ use Illuminate\Http\Request;
class ImbangDugaLamaController extends Controller
{
public function GetImbangDuga_Lama($kodcaw)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$getImbangDugaLama=imbangdugalama::on($cawangan['mysql'])->get();
public function GetImbangDuga_Lama($kodcaw)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$getImbangDugaLama=imbangdugalama::on($cawangan['mysql'])->get();
return response()->json($getImbangDugaLama);
}
return response()->json($getImbangDugaLama);
}
}
app/Http/Controllers/KelulusanController.php
+38 -3
View File
@@ -208,13 +208,18 @@ class KelulusanController extends Controller
'norujukan'=> $norujukan,
'siri' => $request->siri,
'komen' => $request->komen,
'lastdategadai' => $request->dategadai,
'margin' => $request->margin,
'nilaimarhun' => $request->nilaimarhun,
'berat' => $request->berat,
'status' => $request->status,
'bilgad' => $request->bilgadai,
'jumpinj' => $request->jumpinjam,
'jenistebus' => $request->jenistebus,
'teller' => $request->teller,
'pelulus' => ($request->pelulus) ? $request->pelulus : ''
]);
}
else if($roles == "operasi")
@@ -226,7 +231,10 @@ class KelulusanController extends Controller
'norujukan'=> $norujukan,
'siri' => $request->siri,
'komen' => $request->komen,
'lastdategadai' => $request->dategadai,
'margin' => $request->margin,
'nilaimarhun' => $request->nilaimarhun,
'berat' => $request->berat,
'status' => $request->status,
'bilgad' => $request->bilgadai,
'jumpinj' => $request->jumpinjam,
'jenistebus' => $request->jenistebus,
@@ -255,7 +263,11 @@ class KelulusanController extends Controller
'tarikh'=> $harini->toDateString(),
'mohon' => $request->mohon,
'norujukan' => $norujukan,
'katalaluan' => $request->message,
'katalaluan' => '',
'pinjaman' => $request->pinjaman,
'nilaimarhun' => $request->nilaimarhun,
'berat' => $request->berat,
'margin' => $request->margin,
'benar' => '0',
'teller' => $request->teller
]);
@@ -276,6 +288,7 @@ class KelulusanController extends Controller
->where('tarikh','=',$harini->toDateString())
->where('norujukan','=',$norujukan)
->update(array(
'katalaluan' => $request->komen,
'benar' => '2',
'id' => $request->khazanah
));
@@ -347,4 +360,26 @@ class KelulusanController extends Controller
return response()->json($arraykelulusan,200);
}
public function listoperasikelulusan()
{
$harini = Carbon::now();
$harini = new Carbon;
$cawangan_all = Cawangan::on('mysql7')->get();
$arraykelulusan = [];
foreach($cawangan_all as $index=>$cawangan){
$kelulusan=Mohon::on($cawangan['mysql'])
->where('peloperasi','=','operasi')
->where('operasi','!=','')
->get();
if(sizeof($kelulusan) != 0){
array_push($arraykelulusan,["kelulusanall" => $kelulusan,"cawangan" => $cawangan['details_caw'],"cawangankod" => $cawangan['kodcaw']]);
}
}
return response()->json($arraykelulusan,200);
}
}
app/Http/Controllers/LaporanController.php
+158 -20
View File
@@ -40,7 +40,8 @@ class LaporanController extends Controller
$total_upah = Advansur::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->sum('upahdibayar');
$total_keuntungantebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$request->tarikh)->sum('bakiupah');
$total_keuntunganansuran = TransaksiKeuntungan::on('mysql7')
$total_keuntunganansuran_data = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
@@ -49,12 +50,124 @@ class LaporanController extends Controller
->whereDate('trans.created_at','=',$request->tarikh)
->where('trans.kodcaw','=',$request->kodcaw)
->where('trans.trans_type','=','A')
// ->groupBy('trans.id')
->sum('bayaran_keuntungan');
->where('trans.kodcaw',$request->kodcaw)
// ->whereNotNull('db2.hargajualan')
// ->sum('bayaran_keuntungan');
// ->get();
->pluck('transaksi_keuntungan.norujukan');
$gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$total_keuntunganansuran_data)->whereNotNull('hargajualan')->pluck('norujukan');
$total_keuntunganansuran = TransaksiKeuntungan::on('mysql7')->whereIn('norujukan',$gadaiData)->sum('bayaran_keuntungan');
// $total_keuntunganansuran = 0;
// if($total_keuntunganansuran_data){
// foreach($total_keuntunganansuran_data as $index=>$total_keuntunganansuranData){
// $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$total_keuntunganansuranData['norujukan']],['hargajualan','<>',null]])->first();
// if($gadaiData){
// $total_keuntunganansuran += $total_keuntunganansuranData['bayaran_keuntungan'];
// }
// }
// }
$total_keuntunganbukanansuran_data = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->where('trans.trans_type','!=','A')
->whereDate('trans.created_at','=',$request->tarikh)
->where('trans.kodcaw','=',$request->kodcaw)
// ->whereNotNull('db2.hargajualan')
// ->sum('keuntungan_rebet');
// ->get();
->pluck('transaksi_keuntungan.norujukan');
$gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$total_keuntunganbukanansuran_data)->whereNotNull('hargajualan')->pluck('norujukan');
$total_keuntunganbukanansuran = TransaksiKeuntungan::on('mysql7')->whereIn('norujukan',$gadaiData)->sum('keuntungan_rebet');
$total_keuntunganbukanansuran = TransaksiKeuntungan::on('mysql7')
->whereIn('norujukan',$gadaiData)
->whereDate('tarikh_bayaran','=',$request->tarikh)
->sum('keuntungan_rebet');
// $total_keuntunganbukanansuran = 0;
// if($total_keuntunganbukanansuran_data){
// foreach($total_keuntunganbukanansuran_data as $index=>$total_keuntunganbukanansuranData){
// $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$total_keuntunganbukanansuranData['norujukan']],['hargajualan','<>',null]])->first();
// if($gadaiData){
// $total_keuntunganbukanansuran += $total_keuntunganbukanansuranData['keuntungan_rebet'];
// }
// }
// }
// dd($total_keuntunganbukanansuran);
$keuntungan_data = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'=', $request->tarikh)
// ->whereNull('db2.hargajualan')
// ->sum('bayaran_keuntungan');
// ->get();
->pluck('norujukan');
// $total_ansuran = number_format($total_ansuran,2);
$total_keuntungan = floatval($total_upah) + floatval($total_keuntunganansuran) + floatval($total_keuntungantebus);
$gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntungan_data)->whereNotNull('hargajualan')->pluck('norujukan');
$keuntungan = TransaksiKeuntungan::on('mysql7')->whereIn('norujukan',$gadaiData)->sum('bayaran_keuntungan');
// $keuntungan = 0;
// if($keuntungan_data){
// foreach($keuntungan_data as $index=>$keuntunganData){
// $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$keuntunganData['norujukan']],['hargajualan',null]])->first();
// if($gadaiData){
// $keuntungan += $keuntunganData['bayaran_keuntungan'];
// }
// }
// }
$upahtebus = Tebus::on($cawangan['mysql'])
->where('t_tebus','=',$request->tarikh)
->sum('upahdibayar');
$upahlelong = Lelong::on($cawangan['mysql'])
->where('t_jual','=',$request->tarikh)
->sum('bakiupah');
$upahansur = Advansur::on($cawangan['mysql'])
->where('tarikh','=',$request->tarikh)
->sum('upahdibayar');
$upahsimpan = $keuntungan + $upahtebus + $upahlelong + $upahansur;
$keuntungansebenar = $total_keuntunganansuran + $total_keuntunganbukanansuran;
$total_keuntungan = floatval($upahsimpan) + floatval($keuntungansebenar);
$tebus = Tebus::on($cawangan['mysql'])
->select('tebus.t_tebus', 'gad.t_gadai','gad.hargajualan','gad.bakihargajualan','gad.bakipjm as gadaibakipjm','tebus.nilaimarhun','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','gad.nokp','tebus.jbg')
->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
->where('tebus.t_tebus','=',$request->tarikh)
->get();
$totalpenebusan = 0;
foreach($tebus as $index1=>$teb)
{
if($teb['gad.hargajualan'] != $teb['bakihargajualan'])
{
$totalpenebusan += $teb['gadaibakipjm'];
}else{
$totalpenebusan += $teb['pinjaman'];
}
}
//b
@@ -124,12 +237,39 @@ class LaporanController extends Controller
$daterequest = new Carbon($request->tarikh);
$daterequest->addDays(1);
$bayaranpendahuluan_data = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
// ->where('db2.sttebus','=','')
// ->where('db2.hargajualan','<>','null')
->where('tarikh_bayaran' ,'<=', $daterequest)
->where('kodcaw',$request->kodcaw)
// ->sum('bayaran_pembiayaan');
// ->get();
->pluck('norujukan');
$gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$bayaranpendahuluan_data)
->where('sttebus' , '')
->whereNotNull('hargajualan')
->pluck('norujukan');
$bayaranpendahuluan = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->where('db2.sttebus','=','')
->where('db2.hargajualan','<>','null')
->whereIn('norujukan',$gadaiData)
->where('tarikh_bayaran' ,'<=', $daterequest)
->sum('bayaran_pembiayaan');
// $bayaranpendahuluan = 0;
// if($bayaranpendahuluan_data){
// foreach($bayaranpendahuluan_data as $index=>$bayaranpendahuluanData){
// $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$bayaranpendahuluanData['norujukan']],['sttebus',''],['hargajualan','<>','null']])->first();
// if($gadaiData){
// $bayaranpendahuluan += $bayaranpendahuluanData['bayaran_pembiayaan'];
// }
// }
// }
// dd($bayaranpendahuluan);
$outstandingimbangduga = floatval($rekodkoop) + floatval($rekodtawarruq) - floatval($bayaranpendahuluan);
@@ -156,11 +296,6 @@ class LaporanController extends Controller
/* Kawalan Stok */
//f
$data_lelong = Lelong::on($cawangan['mysql'])->where('t_jual','=',$request->tarikh)->get();
$bilangan_lelong = Lelong::on($cawangan['mysql'])->where('t_jual','=',$request->tarikh)->count();
@@ -183,10 +318,12 @@ class LaporanController extends Controller
}
//g
$tuntut_baki = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh);
$tuntut_baki_rugi = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->where('jumlah','<',0);
$tuntut_baki_bayar = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->where('jumlah','>',0);
$bayar_rugi_lelong = $tuntut_baki_rugi->sum('jumlah');
$bayar_baki_lelong = $tuntut_baki_bayar->sum('jumlah');
$bayar_rugi_lelong = $tuntut_baki->where('jumlah','<',0)->sum('jumlah');
$bayar_baki_lelong = $tuntut_baki->where('jumlah','>',0)->sum('jumlah');
//h
$gadai_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','<=',70]])->sum('pinjaman');
@@ -209,7 +346,7 @@ class LaporanController extends Controller
array_push($laporan_harian,[
'total_gadai'=>$total_gadai,
'total_tebus'=>$total_tebus,
'total_tebus'=>$totalpenebusan,
'total_ansuran'=>$total_ansuran,
'bilangan_gadai'=>$bilangan_gadai,
'bilangan_tebus'=>$bilangan_tebus,
@@ -316,10 +453,11 @@ class LaporanController extends Controller
}
//g
$tuntut_baki = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]]);
$tuntut_baki_rugi = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]])->where('jumlah','<',0);
$tuntut_baki_bayar = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]])->where('jumlah','>',0);
$bayar_rugi_lelong = $tuntut_baki->where('jumlah','<',0)->sum('jumlah');
$bayar_baki_lelong = $tuntut_baki->where('jumlah','>',0)->sum('jumlah');
$bayar_rugi_lelong = $tuntut_baki_rugi->sum('jumlah');
$bayar_baki_lelong = $tuntut_baki_bayar->sum('jumlah');
//h
$gadai_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','<=',70]])->sum('pinjaman');
app/Http/Controllers/LelongController.php
+58 -46
View File
@@ -13,6 +13,8 @@ use App\AnsRugi;
use App\SerahBaki;
use App\Tebus;
use App\Advansur;
use App\LelTebus;
use App\LelMarhun;
use Illuminate\Http\Request;
@@ -169,7 +171,7 @@ class LelongController extends Controller
->where('t_jual','<=',$request->tarikh)
->where(function($query) use ($tarikhbaru){
$query->whereNull('trkhtuntut')
->orWhere('trkhtuntut','>','2021-02-25');
->orWhere('trkhtuntut','>',$tarikhbaru);
})
->where('baki','>=',0)
->sum('baki');
@@ -220,6 +222,11 @@ class LelongController extends Controller
$rugitotal += 0.01;
}
if($kodcaw === '011232')
{
$bakilelong += 6;
}
$arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal];
return response()->json($arraylelong,200);
@@ -231,57 +238,19 @@ class LelongController extends Controller
$tarikhbaru = $request->mula;
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
if($kodcaw == 'KB2')
{
if($request->tarikh <= '2021-02-25')
{
$bakilelong = Lelong::on($cawangan['mysql'])
->where('t_jual','>=',$request->mula)
->where('t_jual','<=',$request->hingga)
->where(function($query) use ($tarikhbaru){
$query->whereNull('trkhtuntut')
->orWhere('trkhtuntut','>',$tarikhbaru);
})
->where('baki','>=',0)
->sum('baki');
}else{
$bakilelong = Lelong::on($cawangan['mysql'])
->where('t_jual','>=',$request->mula)
->where('t_jual','<=',$request->hingga)
->where(function($query) use ($tarikhbaru){
$query->whereNull('trkhtuntut')
->orWhere('trkhtuntut','>','2021-02-25');
})
->where('baki','>=',0)
->sum('baki');
}
}else{
$bakilelong = Lelong::on($cawangan['mysql'])
->where('trkhtuntut','>=',$request->mula)
->where('trkhtuntut','<=',$request->hingga)
// ->where(function($query) use ($tarikhbaru){
// $query->whereNull('trkhtuntut')
// ->orWhere('trkhtuntut','>',$tarikhbaru);
// })
->where('baki','>=',0)
->sum('baki');
}
$ansrugi = AnsRugi::on($cawangan['mysql'])
->sum('bayaran');
$bakilelong = Lelong::on($cawangan['mysql'])
->where('trkhtuntut','>=',$request->mula)
->where('trkhtuntut','<=',$request->hingga)
->where('baki','>=',0)
->sum('baki');
$rugilelong = Lelong::on($cawangan['mysql'])
->where('trkhtuntut','>=',$request->mula)
->where('trkhtuntut','<=',$request->hingga)
//->where(function($query) use ($tarikhbaru)
//{
// $query->whereNull('t_jual')
// ->orWhere('t_jual','>',$tarikhbaru);
//})
->where('baki','<',0)
->sum('baki');
// $rugitotal = $rugilelong + $ansrugi;
$rugitotal = $rugilelong;
$arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal];
@@ -419,6 +388,20 @@ class LelongController extends Controller
return response()->json($tuntutbaki,200);
}
public function showTuntutBakiTarikh($kodcaw,Request $request){
$current = Carbon::now();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$tuntutbaki = TuntutBaki::on($cawangan['mysql'])
->where('tarikh','=', $request->tarikh)
->get();
return response()->json($tuntutbaki,200);
}
public function showTuntutBakiTeller($kodcaw,Request $request){
$current = Carbon::now();
@@ -490,6 +473,9 @@ class LelongController extends Controller
->whereYear('t_jual','=',$current->year)
->sum('cajlelong');
if($kodcaw === '011232')
$cajlelong +=122.5;
return response()->json($cajlelong,200);
}
@@ -552,6 +538,32 @@ class LelongController extends Controller
foreach($cawangan_all as $index=>$cawangan){
$list_tebus_today = Tebus::on($cawangan['mysql'])->where('t_tebus',$current->toDateString())->pluck('norujukan')->toArray();
$list_advansur_today = Advansur::on($cawangan['mysql'])->where('tarikh',$current->toDateString())->pluck('norujukan')->toArray();
$gadai_tebus = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$list_tebus_today)->update([
'taglel' => 0
]);
$gadai_advansur = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$list_advansur_today)->update([
'sttebus' => '',
'taglel' => 0
]);
$lelong_tebus = Lelong::on($cawangan['mysql'])->whereIn('norujukan',$list_tebus_today)->get();
foreach($lelong_tebus as $index=>$tebus_lelong){
$tebus_detail = Tebus::on($cawangan['mysql'])->where('norujukan',$tebus_lelong['norujukan'])->first();
$lel_tebus = LelTebus::on($cawangan['mysql'])->create([
'tarikh' => $current->toDateString(),
'teller' => $tebus_detail['teller'],
'norujukan' => $tebus_lelong['norujukan'],
'batch_no' => $tebus_lelong['batchno'],
'nilai_marhun' => $tebus_lelong['nilaimarhun'],
'pinjaman' => $tebus_lelong['pinjaman'],
'upah' => $tebus_detail['bakiupah'],
'jbg' => $tebus_detail['jbg'],
'jenis_tebus' => 'T',
]);
}
$lelong_marhun_tebus = LelMarhun::on($cawangan['mysql'])->whereIn('norujukan',$list_tebus_today)->delete();
$lelong_marhun_adv = LelMarhun::on($cawangan['mysql'])->whereIn('norujukan',$list_advansur_today)->delete();
$lelong_tebus = Lelong::on($cawangan['mysql'])->whereIn('norujukan',$list_tebus_today)->delete();
$lelong_advansur = Lelong::on($cawangan['mysql'])->whereIn('norujukan',$list_advansur_today)->delete();
}
app/Http/Controllers/MarhunController.php
+47 -1
View File
@@ -6,6 +6,7 @@ use App\Marhun;
use App\Jemas;
use App\Cawangan;
use Illuminate\Http\Request;
use App\Audit;
use Carbon\Carbon;
@@ -62,6 +63,16 @@ class MarhunController extends Controller
'n_marhun' => $request->nilai_marhun
]);
$audit = new Audit();
$audit->users = $request->teller;
$audit->actions = 'Daftar Marhun';
$audit->norujukan = $request->norujukan;
$audit->new_data = $marhun;
$audit->kodcaw = $kodcaw;
$audit->created_at = $current;
$audit->updated_at = $current;
$audit->save();
return response()->json($marhun, 201);
}
@@ -81,17 +92,39 @@ class MarhunController extends Controller
public function deletemarhun($kodcaw,$norujukan,Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$old_data = Marhun::on($cawangan['mysql'])->where([['recno','=',$request->recno],['norujukan','=',$norujukan]])->first();
$jemas = Marhun::on($cawangan['mysql'])->where([['recno','=',$request->recno],['norujukan','=',$norujukan]])->delete();
$audit = new Audit();
$audit->users = $request->teller;
$audit->actions = 'Hapus Marhun';
$audit->norujukan = $norujukan;
$audit->old_data = $old_data;
$audit->kodcaw = $kodcaw;
$audit->created_at = $current;
$audit->updated_at = $current;
$audit->save();
return response('Deleted Successfully', 200);
}
public function editmarhun($kodcaw,$norujukan,Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$old_data = Marhun::on($cawangan['mysql'])->where([['recno','=',$request->recno],['norujukan','=',$norujukan]])->first();
$jemas = Marhun::on($cawangan['mysql'])->where([['recno','=',$request->recno],['norujukan','=',$norujukan]])->update(
[
'karat' => $request->karat,
@@ -102,6 +135,19 @@ class MarhunController extends Controller
'n_marhun' => $request->n_marhun
]);
$new_data = Marhun::on($cawangan['mysql'])->where([['recno','=',$request->recno],['norujukan','=',$norujukan]])->first();
$audit = new Audit();
$audit->users = $request->teller;
$audit->actions = 'Ubah Marhun';
$audit->norujukan = $norujukan;
$audit->old_data = $old_data;
$audit->new_data = $new_data;
$audit->kodcaw = $kodcaw;
$audit->created_at = $current;
$audit->updated_at = $current;
$audit->save();
return response('Edit Successfully', 200);
}
@@ -138,4 +184,4 @@ class MarhunController extends Controller
return response()->json($marhun);
}
}
}
app/Http/Controllers/PanjarController.php
+28 -7
View File
@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
use App\Panjar;
use App\Cawangan;
use App\DenoPanjar;
use App\Audit;
use Carbon\Carbon;
@@ -75,8 +76,6 @@ class PanjarController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$kelulusan=Panjar::on($cawangan['mysql'])
->where('tarikh','=',$harini->toDateString())
->where('norujukan','=',$norujukan)
@@ -110,16 +109,38 @@ class PanjarController extends Controller
'tuntutoleh' => $request->tuntutoleh
]);
$audit = new Audit();
$audit->users = $request->tuntutoleh;
$audit->actions = "Daftar Perbelanjaan";
$audit->new_data = $panjar;
$audit->kodcaw = $kodcaw;
$audit->created_at = $harini;
$audit->updated_at = $harini;
$audit->save();
return response()->json($panjar);
}
public function delete(REQUEST $request,$kodcaw)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
Panjar::on($cawangan['mysql'])->where('recno','=',$request->recno)->delete();
return response('Batal Berjaya', 200);
$harini = Carbon::now();
$harini = new Carbon;
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$panjar = Panjar::on($cawangan['mysql'])->where('recno','=',$request->recno)->first();
Panjar::on($cawangan['mysql'])->where('recno','=',$request->recno)->delete();
$audit = new Audit();
$audit->users = $request->users;
$audit->actions = "Hapus Perbelanjaan";
$audit->old_data = $panjar;
$audit->kodcaw = $kodcaw;
$audit->created_at = $harini;
$audit->updated_at = $harini;
$audit->save();
return response('Batal Berjaya', 200);
}
public function calculationpanjar(Request $request,$kodcaw)
app/Http/Controllers/PendahuluanSerahanController.php
+84
View File
@@ -0,0 +1,84 @@
<?php
namespace App\Http\Controllers;
use App\Cawangan;
use App\DenoPendSer;
use App\GlDetail;
use Carbon\Carbon;
use Illuminate\Http\Request;
class PendahuluanSerahanController extends Controller
{
public function createDenoPendSer($kodcaw,Request $request){
$current = Carbon::now();
$current = new Carbon();
$denopendser = DenoPendSer::on('mysql7')->create([
'tarikh' => $current->toDateString(),
'masa' => $current->toTimeString(),
'kodcaw' => $kodcaw,
'kodlaluan' => $request->kodlaluan,
'amaun' => $request->amaun,
'bd1' => $request->bd1,
'bd5' => $request->bd5,
'bd10' => $request->bd10,
'bd20' => $request->bd20,
'bd50' => $request->bd50,
'bd100' => $request->bd100,
'txtring1' => $request->txtring1,
'txtring5' => $request->txtring5,
'txtring10' => $request->txtring10,
'txtring20' => $request->txtring20,
'txtring50' => $request->txtring50,
'txtring100' => $request->txtring100,
'txtring1000' => $request->txtring1000,
'txtsen1' => $request->txtsen1,
'txtsen5' => $request->txtsen5,
'txtsen10' => $request->txtsen10,
'txtsen20' => $request->txtsen20,
'txtsen50' => $request->txtsen50,
'jenis' =>$request->jenis,
'recno' =>$request->recno,
'update' => '0'
]);
return response()->json($denopendser,200);
}
public function getDenoPendSer($kodcaw,Request $request){
$current = Carbon::now();
$current = new Carbon();
$denopendser = DenoPendSer::on('mysql7')->where('kodcaw','=', $kodcaw)->where('recno','=', $request->recno)->get();
return response()->json($denopendser,200);
}
public function updateDenoPendSer($kodcaw,Request $request){
$current = Carbon::now();
$current = new Carbon();
$denopendser = DenoPendSer::on('mysql7')
->where('recno','=', $request->recno)
->update(array(
'pelulus' => $request->pelulus,
'masalulus'=> $harini->toTimeString()
));
return response()->json($denopendser,200);
}
public function delete(REQUEST $request,$kodcaw){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
GlDetail::on($cawangan['mysql'])->where('recno','=',$request->recno)->delete();
return response('Batal Berjaya', 200);
}
}
app/Http/Controllers/PolisController.php
+6 -2
View File
@@ -48,7 +48,9 @@ class PolisController extends Controller
'komen2' => $request->komen2,
'tebus' => 0,
'teller' => $request->teller,
'caj' => 0.00
'caj' => 0.00,
'kodnegeri' => $request->kodnegeri,
'koddaerah' => $request->koddaerah
]);
return response()->json($polis);
@@ -67,7 +69,9 @@ class PolisController extends Controller
->update([
'komen1' => $request->komen1,
'komen2' => $request->komen2,
'teller' => $request->teller
'teller' => $request->teller,
'kodnegeri' => $request->kodnegeri,
'koddaerah' => $request->koddaerah
]);
return response()->json($polis);
app/Http/Controllers/TebusController.php
+357 -72
View File
@@ -19,6 +19,7 @@ use App\Parameter;
use App\Panjar;
use App\HargaEmas;
use App\Moratorium;
use App\Audit;
use Illuminate\Http\Request;
@@ -62,11 +63,11 @@ class TebusController extends Controller
$upahsemasa_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
$upah_semasa_round = number_format($upahsemasa_raw,2);
if(strpos($upah_semasa_round,',')){
if(strpos($upah_semasa_round,',')){
$upah_semasa_round = str_replace(',','',$upah_semasa_round);
}
$upah_semasa = (float)substr($upah_semasa_round, 0, -1);
if(strpos($upah_semasa,',')){
if(strpos($upah_semasa,',')){
$upah_semasa = str_replace(',','',$upah_semasa);
}
@@ -87,11 +88,11 @@ class TebusController extends Controller
$upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
$upah_rebet_round = number_format($upahrebet_raw,2);
if(strpos($upah_rebet_round,',')){
if(strpos($upah_rebet_round,',')){
$upah_rebet_round = str_replace(',','',$upah_rebet_round);
}
$upah_rebet = (float)substr($upah_rebet_round, 0, -1);
if(strpos($upah_rebet,',')){
if(strpos($upah_rebet,',')){
$upah_rebet = str_replace(',','',$upah_rebet);
}
@@ -164,6 +165,8 @@ class TebusController extends Controller
public function getMoratorium(){
$bln_mora = Moratorium::first();
return response()->json($bln_mora);
}
public function updateMoratorium(Request $request){
@@ -203,6 +206,10 @@ class TebusController extends Controller
}
$upah_semasa = (float)$upah_semasa - $upahtelahbayar;
if($upah_semasa <= 0){
$upah_semasa = 0;
}
return $upah_semasa;
}
@@ -238,6 +245,10 @@ class TebusController extends Controller
$upah_semasa = str_replace(',','',$upah_semasa);
}
$upah_semasa = (float)$upah_semasa - $upahtelahbayar;
if($upah_semasa <= 0){
$upah_semasa = 0;
}
return response()->json($upah_semasa);
}
@@ -427,6 +438,22 @@ class TebusController extends Controller
'bakiharga' => $baki_hargajualan,
]);
}
$audit = new Audit();
$audit->users = $request->teller;
if($request->jenistebus == 'P'){
$audit->actions = "Tambah Pembiayaan";
}else if($request->jenistebus == 'S'){
$audit->actions = "Tebus Separuh";
}else if($request->jenistebus == 'T'){
$audit->actions = "Tebus Penuh";
}
$audit->norujukan = $norujukan;
$audit->new_data = $create_tebus;
$audit->kodcaw = $kodcaw;
$audit->created_at = $current;
$audit->updated_at = $current;
$audit->save();
return response()->json($update_gadai, 201);
}
@@ -519,6 +546,16 @@ class TebusController extends Controller
'created_at' => $current,
'bakiharga' => 0,
]);
$audit = new Audit();
$audit->users = $request->teller;
$audit->actions = "Auto Tawarruq";
$audit->norujukan = $norujukan;
$audit->new_data = $create_tebus;
$audit->kodcaw = $kodcaw;
$audit->created_at = $current;
$audit->updated_at = $current;
$audit->save();
return response()->json($update_gadai, 201);
}
@@ -526,20 +563,49 @@ class TebusController extends Controller
public function getLaporanTebus($kodcaw,$tarikh){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$tebus = Tebus::on($cawangan['mysql'])
->select('tebus.t_tebus', 'gad.t_gadai','gad.hargajualan','gad.bakihargajualan','gad.bakipjm as gadaibakipjm','trans.tarikh_bayaran','tebus.nilaimarhun','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','cust.nama','gad.nokp','tebus.jbg')
$tebus_data = Tebus::on($cawangan['mysql'])
->select('tebus.t_tebus', 'gad.t_gadai','gad.hargajualan','gad.bakihargajualan','gad.bakipjm as gadaibakipjm','tebus.nilaimarhun','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','gad.nokp','tebus.jbg')
->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
->join('online_arrahn.customer as cust', function($join)
{
$join->on('gad.nokp', '=', 'cust.kpbaru');
$join->orOn('gad.nokp', '=', 'cust.kplama');
})
->join('online_arrahn.transaksi_keuntungan as trans','tebus.norujukan','=','trans.norujukan')
// ->join('online_arrahn.customer as cust', function($join)
// {
// $join->on('gad.nokp', '=', 'cust.kpbaru');
// $join->orOn('gad.nokp', '=', 'cust.kplama');
// })
// ->join('online_arrahn.transaksi_keuntungan as trans','tebus.norujukan','=','trans.norujukan')
->where('tebus.t_tebus','=',$tarikh)
->groupBy('tebus.norujukan')
->orderBy('tebus.teller')
->orderBy('tebus.sirit')
->get();
$tebus = [];
if($tebus_data){
foreach($tebus_data as $index=>$tebusData){
$customer_info = Customer::on('mysql7')->where('kplama','=',$tebusData['nokp'])->orWhere('kpbaru','=',$tebusData['nokp'])->first();
$trans = TransaksiKeuntungan::on('mysql7')->where('norujukan',$tebusData['norujukan'])->orderBy('tarikh_bayaran','desc')->first();
array_push($tebus,[
"t_tebus"=>$tebusData['t_tebus'],
"t_gadai"=>$tebusData['t_gadai'],
"hargajualan"=>$tebusData['hargajualan'],
"bakihargajualan"=>$tebusData['bakihargajualan'],
"gadaibakipjm"=>$tebusData['gadaibakipjm'],
"tarikh_bayaran"=>$trans['tarikh_bayaran'],
"nilaimarhun"=>$tebusData['nilaimarhun'],
"tagterima"=>$tebusData['tagterima'],
"teller"=>$tebusData['teller'],
"jenistebus"=>$tebusData['jenistebus'],
"pinjaman"=>$tebusData['pinjaman'],
"bakiupah"=>$tebusData['bakiupah'],
"bakipjm"=>$tebusData['bakipjm'],
"norujukan"=>$tebusData['norujukan'],
"nama"=>$customer_info['nama'],
"nokp"=>$tebusData['nokp'],
"jbg"=>$tebusData['jbg']
]);
}
}
return response()->json($tebus);
}
@@ -568,7 +634,8 @@ class TebusController extends Controller
->whereNotNull('hargajualan')
->where('hargajualan','<>','bakihargajualan');
$totalpenebusantawarruq = ($tebustawarruq->sum('tebus.pinjaman') - $tebustawarruqansuran->sum('gad.pinjaman')) + $tebustawarruqansuran->sum('gad.bakipjm');
// $totalpenebusantawarruq = ($tebustawarruq->sum('tebus.pinjaman') - $tebustawarruqansuran->sum('gad.pinjaman')) + $tebustawarruqansuran->sum('gad.bakipjm');
$totalpenebusantawarruq = $tebustawarruq->sum('tebus.pinjaman');
$bilpenebusantawarruq = $tebustawarruq->count();
$totalrebatetawarruq = $tebustawarruq->sum('tebus.rebate');
$totalkeuntungantawarruq = $tebustawarruq->sum('tebus.bakiupah');
@@ -882,27 +949,39 @@ class TebusController extends Controller
$daterequest = new Carbon($request->tarikh);
$daterequest->addDays(1);
//Keuntungan Selepas Tawarruq
$keuntungan_data = TransaksiKeuntungan::on('mysql7')
->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year)
->where('kodcaw',$kodcaw)
->pluck('norujukan');
$gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan', $keuntungan_data)->whereNull('hargajualan')->pluck('norujukan');
$keuntungan = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year)
->whereNull('db2.hargajualan')
->where('tarikh_bayaran' ,'<=', $daterequest)
->whereYear('tarikh_bayaran','=',$current->year)
->whereIn('norujukan',$gadaiData)
->sum('bayaran_keuntungan');
// $keuntunganselepastawarruqrebate = Tebus::on($cawangan['mysql'])
// ->where('t_tebus','<=',$request->tarikh)
// ->where('t_tebus','>=','2021-03-14')
// ->whereYear('t_tebus','=',$current->year)
// ->whereNotNull('rebate')
// ->sum('rebate');
// //Keuntungan Selepas Tawarruq
// $keuntungan_data = TransaksiKeuntungan::on('mysql7')
// // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
// ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
// ->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year)
// // ->whereNull('db2.hargajualan')
// // ->sum('bayaran_keuntungan');
// ->get();
// $keuntungan = 0;
// if($keuntungan_data){
// foreach($keuntungan_data as $index=>$keuntunganData){
// $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$keuntunganData['norujukan']],['hargajualan',null]])->first();
// if($gadaiData){
// $keuntungan += $keuntunganData['bayaran_keuntungan'];
// }
// }
// }
// $keuntunganselepastawarruqupah = Tebus::on($cawangan['mysql'])
// ->where('t_tebus','<=',$request->tarikh)
// ->where('t_tebus','>','2021-04-13')
// ->whereYear('t_tebus','=',$current->year)
// ->whereNotNull('bakiupah')
// ->sum('bakiupah');
$upahtebus = Tebus::on($cawangan['mysql'])
->where([['t_tebus','<=',$request->tarikh],['t_tebus','>','2013-12-31']])
@@ -922,12 +1001,13 @@ class TebusController extends Controller
$keuntungansebelumtawarruq = $upahtebus + $upahlelong + $upahansur;
// $keuntunganselepastawarruq = $keuntunganselepastawarruqupah;
// $total = $keuntungansebelumtawarruq + $keuntunganselepastawarruq;
$total = $keuntungansebelumtawarruq + $keuntungan;
if($kodcaw === '011232')
{
$total +=623.5;
}
return response()->json($total,200);
}
@@ -945,13 +1025,29 @@ class TebusController extends Controller
$daterequest->addDays(1);
//Keuntungan Selepas Tawarruq
$keuntungan = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
$keuntungan_data = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year)
->whereNull('db2.hargajualan')
->sum('bayaran_keuntungan');
// ->whereNull('db2.hargajualan')
// ->sum('bayaran_keuntungan');
// ->get();
->pluck('norujukan');
$gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan', $keuntungan_data)->whereNull('hargajualan')->pluck('norujukan');
$keuntungan = TransaksiKeuntungan::on('mysql7')->whereIn('norujukan',$gadaiData)->sum('bayaran_keuntungan');
// $keuntungan = 0;
// if($keuntungan_data){
// foreach($keuntungan_data as $index=>$keuntunganData){
// $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$keuntunganData['norujukan']],['hargajualan',null]])->first();
// if($gadaiData){
// $keuntungan += $keuntunganData['bayaran_keuntungan'];
// }
// }
// }
$upahtebus = Tebus::on($cawangan['mysql'])
->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->hingga],['t_tebus','>','2013-12-31']])
@@ -1100,46 +1196,132 @@ class TebusController extends Controller
if($request->tarikh < '2021-06-09')
{
$keuntungan = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
$keuntungan_data = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->where('kodcaw',$request->kodcaw)
// ->whereNotNull('db2.hargajualan')
// ->sum('bayaran_keuntungan');
->pluck('norujukan');
$gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntungan_data)->whereNotNull('hargajualan')->pluck('norujukan');
$keuntungan = TransaksiKeuntungan::on('mysql7')
->whereIn('norujukan',$gadaiData)
->whereDate('tarikh_bayaran', '<=', $request->tarikh)
->whereDate('tarikh_bayaran' ,'<', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->sum('bayaran_keuntungan');
$keuntunganreducing = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
// $keuntungan = 0;
// if($keuntungan_data){
// foreach($keuntungan_data as $index=>$keuntunganData){
// $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$keuntunganData['norujukan']],['hargajualan','<>',null]])->first();
// if($gadaiData){
// $keuntungan += $keuntunganData['bayaran_keuntungan'];
// }
// }
// }
$keuntunganreducing_data = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->where('kodcaw',$request->kodcaw)
// ->whereNotNull('db2.hargajualan')
// ->sum('keuntungan_rebet');
// ->get();
->pluck('norujukan');
$gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntungan_data)->whereNotNull('hargajualan')->pluck('norujukan');
$keuntungan = TransaksiKeuntungan::on('mysql7')
->whereIn('norujukan',$gadaiData)
->whereDate('tarikh_bayaran' ,'<=', $request->tarikh)
->whereDate('tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->sum('keuntungan_rebet');
// $keuntunganreducing = 0;
// if($keuntunganreducing_data){
// foreach($keuntunganreducing_data as $index=>$keuntunganreducingData){
// $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$keuntunganreducingData['norujukan']],['hargajualan','<>',null]])->first();
// if($gadaiData){
// $keuntunganreducing += $keuntunganreducingData['keuntungan_rebet'];
// }
// }
// }
$total = ($keuntungan + $keuntunganreducing);
}else{
$keuntungan = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
$keuntungan_data = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('bayaran_keuntungan');
->where('kodcaw',$request->kodcaw)
// ->whereNotNull('db2.hargajualan')
// ->sum('bayaran_keuntungan');
// ->get();
->pluck('norujukan');
$keuntunganreducing = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
$gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntungan_data)->whereNotNull('hargajualan')->pluck('norujukan');
$keuntungan = TransaksiKeuntungan::on('mysql7')->whereIn('norujukan',$gadaiData)->sum('bayaran_keuntungan');
// $keuntungan = 0;
// if($keuntungan_data){
// foreach($keuntungan_data as $index=>$keuntunganData){
// $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$keuntunganData['norujukan']],['hargajualan','<>',null]])->first();
// if($gadaiData){
// $keuntungan += $keuntunganData['bayaran_keuntungan'];
// }
// }
// }
// dd($keuntungan);
$keuntunganreducing_data = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', '2021-06-09')
->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('keuntungan_rebet');
->where('kodcaw',$request->kodcaw)
// ->whereNotNull('db2.hargajualan')
// ->sum('keuntungan_rebet');
// ->get();
->pluck('norujukan');
$bukanansuran = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
$gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntunganreducing_data)->whereNotNull('hargajualan')->pluck('norujukan');
$keuntunganreducing = TransaksiKeuntungan::on('mysql7')
->whereIn('norujukan',$gadaiData)
->whereDate('tarikh_bayaran' ,'<', '2021-06-09')
->whereDate('tarikh_bayaran','>=', $dateSM)
->sum('keuntungan_rebet');
// $keuntunganreducing = 0;
// if($keuntunganreducing_data){
// foreach($keuntunganreducing_data as $index=>$keuntunganreducingData){
// $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$keuntunganreducingData['norujukan']],['hargajualan','<>',null]])->first();
// if($gadaiData){
// $keuntunganreducing += $keuntunganreducingData['keuntungan_rebet'];
// }
// }
// }
// dd($keuntunganreducing);
$bukanansuran_data = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
@@ -1150,11 +1332,44 @@ class TebusController extends Controller
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
// ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('keuntungan_rebet');
->where('trans.kodcaw',$request->kodcaw)
// ->whereNotNull('db2.hargajualan')
// ->sum('keuntungan_rebet');
// ->get();
->pluck('transaksi_keuntungan.norujukan');
$ansuran = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
$gadaiData = Gadai::on($cawangan['mysql'])
->whereIn('norujukan',$bukanansuran_data)
->whereNotNull('hargajualan')
->pluck('norujukan');
$bukanansuran = TransaksiKeuntungan::on('mysql7')
->whereIn('transaksi_keuntungan.norujukan',$gadaiData)
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->where('trans.trans_type','!=','A')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year)
->sum('transaksi_keuntungan.keuntungan_rebet');
// $bukanansuran = 0;
// if($bukanansuran_data){
// foreach($bukanansuran_data as $index=>$bukanansuranData){
// $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$bukanansuranData['norujukan']],['hargajualan','<>',null]])->first();
// if($gadaiData){
// $bukanansuran += $bukanansuranData['keuntungan_rebet'];
// }
// }
// }
// dd($bukanansuran);
$ansuran_data = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
@@ -1165,8 +1380,41 @@ class TebusController extends Controller
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
// ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('bayaran_keuntungan');
->where('trans.kodcaw',$request->kodcaw)
// ->whereNotNull('db2.hargajualan')
// ->sum('bayaran_keuntungan');
// ->get();
->pluck('transaksi_keuntungan.norujukan');
$gadaiData = Gadai::on($cawangan['mysql'])
->whereIn('norujukan',$ansuran_data)
->whereNotNull('hargajualan')
->pluck('norujukan');
$ansuran = TransaksiKeuntungan::on('mysql7')
->whereIn('transaksi_keuntungan.norujukan',$gadaiData)
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->where('trans.trans_type','=','A')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year)
->sum('transaksi_keuntungan.bayaran_keuntungan');
// $ansuran = 0;
// if($ansuran_data){
// foreach($ansuran_data as $index=>$ansuranData){
// $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$ansuranData['norujukan']],['hargajualan','<>',null]])->first();
// if($gadaiData){
// $ansuran += $ansuranData['bayaran_keuntungan'];
// }
// }
// }
// dd($ansuran);
$total = ($keuntungan + $keuntunganreducing + $ansuran + $bukanansuran);
@@ -1188,8 +1436,8 @@ class TebusController extends Controller
$current = Carbon::now();
$current = new Carbon();
$bukanansuran = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
$bukanansuran_data = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
@@ -1199,11 +1447,23 @@ class TebusController extends Controller
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('keuntungan_rebet');
->where('trans.kodcaw',$request->kodcaw)
// ->whereNotNull('db2.hargajualan')
// ->sum('keuntungan_rebet');
->get();
$ansuran = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
$bukanansuran = 0;
if($bukanansuran_data){
foreach($bukanansuran_data as $index=>$bukanansuranData){
$gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$bukanansuranData['norujukan']],['hargajualan','<>',null]])->first();
if($gadaiData){
$bukanansuran += $bukanansuranData['keuntungan_rebet'];
}
}
}
$ansuran_data = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
@@ -1213,10 +1473,22 @@ class TebusController extends Controller
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('bayaran_keuntungan');
->where('trans.kodcaw',$request->kodcaw)
// ->whereNotNull('db2.hargajualan')
// ->sum('bayaran_keuntungan');
->get();
$total = ($ansuran + $bukanansuran);
$ansuran = 0;
if($ansuran_data){
foreach($ansuran_data as $index=>$ansuranData){
$gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$ansuranData['norujukan']],['hargajualan','<>',null]])->first();
if($gadaiData){
$ansuran += $ansuranData['bayaran_keuntungan'];
}
}
}
$total = ($ansuran + $bukanansuran);
return response($total);
}
@@ -1226,7 +1498,7 @@ class TebusController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$rebet = Tebus::on($cawangan['mysql'])
->join($cawangan['db_name'].'.gadai as db2','tebus.norujukan','=','db2.norujukan')
->join('gadai as db2','tebus.norujukan','=','db2.norujukan')
// ->where('tebus.t_tebus','>','2021-04-13')
->where('tebus.t_tebus','<=',$request->tarikh)
->where('db2.hargajualan','>','0') // tambahan 2021-05-07
@@ -1241,7 +1513,7 @@ class TebusController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$rebet = Tebus::on($cawangan['mysql'])
->join($cawangan['db_name'].'.gadai as db2','tebus.norujukan','=','db2.norujukan')
->join('gadai as db2','tebus.norujukan','=','db2.norujukan')
->where('tebus.t_tebus','>=',$request->mula)
->where('tebus.t_tebus','<=',$request->hingga)
->where('db2.hargajualan','>','0')
@@ -1272,10 +1544,23 @@ class TebusController extends Controller
public function removeUpahLamaToday($kodcaw,$norujukan)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$current = Carbon::now();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$data_ansuran = Advansur::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
$removed = Advansur::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
$audit = new Audit();
$audit->users = $request->teller;
$audit->actions = "Hapus Upah";
$audit->norujukan = $norujukan;
$audit->old_data = $data_ansuran;
$audit->kodcaw = $kodcaw;
$audit->created_at = $current;
$audit->updated_at = $current;
$audit->save();
if($removed)
return response(1);
else
app/Http/Controllers/TransactionController.php
+15
View File
@@ -3,6 +3,7 @@
namespace App\Http\Controllers;
use App\Transaction;
use App\TransaksiKeuntungan;
use App\Pengguna;
use App\Cawangan;
@@ -103,4 +104,18 @@ class TransactionController extends Controller
return response()->json($transaction);
}
public function TransaksiPelanggan(Request $request){
$transaction = TransaksiKeuntungan::on('mysql7')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->where('trans.norujukan','=',$request->norujukan)
->get();
return response()->json($transaction);
}
}
app/Http/Controllers/TunaiController.php
+169 -1
View File
@@ -7,6 +7,8 @@ use App\Tunai;
use App\Gadai;
use App\AddTunai;
use App\RequestTeller;
use App\Denominasi;
use App\Vault;
use Illuminate\Http\Request;
use Carbon\Carbon;
@@ -393,12 +395,178 @@ class TunaiController extends Controller
$teller = Tunai::on($cawangan['mysql'])
->select('kodlaluan')
->whereRaw('LENGTH(kodlaluan) > 14')
->whereRaw('LENGTH(kodlaluan) > 10')
->orWhere('kodlaluan','=','LELONG')
->distinct()
->get();
return response()->json($teller);
}
public function initiateTunai(){
$current = new Carbon();
$current = Carbon::now();
$cawangan_all = Cawangan::on('mysql7')->get();
foreach($cawangan_all as $index=>$cawangan){
$getdate = Tunai::on($cawangan['mysql'])
->select('tarikh')
->where('tarikh', '<', $current->toDateString())
->orderBy('recno','desc')
->first();
$tunai=Tunai::on($cawangan['mysql'])
->where([['kodcaw','=',$kodcaw],['tarikh','=', $getdate['tarikh']],['baki','<>',0]])
->GroupBy('kodlaluan')
->get();
if($tunai)
{
foreach($tunai as $index=>$tunsem){
$latesttunai=Tunai::on($cawangan['mysql'])
->where([['kodcaw','=',$cawangan['kodcaw']],['tarikh','=',$current->toDateString()],['kodlaluan','=',$tunsem['kodlaluan']]])
->orderBy('tarikh','desc')
->first();
if(sizeof($latesttunai) == 0)
{
$tunai=Tunai::on($cawangan['mysql'])->create([
'tarikh' => $current->toDateString(),
'kodcaw'=> $cawangan['kodcaw'],
'kodlaluan'=>$tunsem['kodlaluan'],
'bakiawal'=>$tunsem['baki'],
'masuk'=>0.00,
'yuran'=>0.00,
'keluar'=>0.00,
'baki'=>$tunsem['baki'],
'tambah'=>0.00,
'kurang'=>0.00
]);
}
}
//Denominasi
$denominasi=Denominasi::on($cawangan['mysql'])->where('tarikh','=',$current->toDateString())->limit(1)->get();
if(sizeof($denominasi) == 0)
{
$deno = Denominasi::on($cawangan['mysql'])->orderby('tarikh','desc')->first();
if($deno)
{
$savedeno = Denominasi::on($cawangan['mysql'])->create([
'tarikh' => $current->toDateString(),
'bd1' => $deno['bd1'],
'b1' => $deno['b1'],
'bd5' => $deno['bd5'],
'b5' => $deno['b5'],
'bd10' => $deno['bd10'],
'b10' => $deno['b10'],
'bd20' => $deno['bd20'],
'b20' => $deno['b20'],
'bd50' => $deno['bd50'],
'b50' => $deno['b50'],
'bd100' => $deno['bd100'],
'b100' => $deno['b100'],
'txtring1' => $deno['txtring1'],
'k1' => $deno['k1'],
'txtring5' => $deno['txtring5'],
'k5' => $deno['k5'],
'txtsen1' => $deno['txtsen1'],
'k01' => $deno['k01'],
'txtsen5' => $deno['txtsen5'],
'k05' => $deno['k05'],
'txtsen10' => $deno['txtsen10'],
'k010' => $deno['k010'],
'txtsen20' => $deno['txtsen20'],
'k020' => $deno['k020'],
'txtsen50' => $deno['txtsen50'],
'k050' => $deno['k050'],
'txtring10' => $deno['txtring10'],
'k10' => $deno['k10'],
'txtring20' => $deno['txtring20'],
'k20' => $deno['k20'],
'txtring50' => $deno['txtring50'],
'k50' => $deno['k50'],
'txtring100' => $deno['txtring100'],
'k100' => $deno['k100'],
'txtring1000' => $deno['txtring1000'],
'k1000' => $deno['k1000'],
'jumlahbundle' => $deno['jumlahbundle'],
'txtjumlah' => $deno['txtjumlah'],
'lebihan' => $deno['lebihan'],
'nota' => $deno['nota'],
'jumlahkeping' => $deno['jumlahkeping']
]);
}else{
$savedeno = Denominasi::on($cawangan['mysql'])->create([
'tarikh' => $current->toDateString(),
'bd1' => 0,
'b1' => 0,
'bd5' => 0,
'b5' => 0,
'bd10' => 0,
'b10' => 0,
'bd20' => 0,
'b20' => 0,
'bd50' => 0,
'b50' => 0,
'bd100' => 0,
'b100' => 0,
'txtring1' => 0,
'k1' => 0,
'txtring5' => 0,
'k5' => 0,
'txtsen1' => 0,
'k01' => 0,
'txtsen5' => 0,
'k05' => 0,
'txtsen10' => 0,
'k010' => 0,
'txtsen20' => 0,
'k020' => 0,
'txtsen50' => 0,
'k050' => 0,
'txtring10' => 0,
'k10' => 0,
'txtring20' => 0,
'k20' => 0,
'txtring50' => 0,
'k50' => 0,
'txtring100' => 0,
'k100' => 0,
'txtring1000' => 0,
'k1000' => 0,
'jumlahbundle' => 0,
'txtjumlah' => 0,
'lebihan' => 0,
'nota' => 0,
'jumlahkeping' => 0
]);
}
}
//Peti Besi Cawangan
$getVault=Http::get( config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json();
$getVault=Vault::on($cawangan['mysql'])
->where('kodcaw','=',$cawangan['kodcaw'])
->where('tarikh','=',$current->toDateString())
->orderby('tarikh','desc')->limit(1)->get();
if(sizeof($getVault) == 0)
{
$peti_besi_terkini=Http::post(config('api.url').'/api/daftarVault/'.$auth_user['cawangan'])->json();
$getVault = $peti_besi_terkini['bakiakhir'];
}
}
}
}
}
app/Http/Controllers/TunaiGadTebController.php
-38
View File
@@ -13,14 +13,8 @@ use Carbon\Carbon;
class TunaiGadTebController extends Controller
{
public function getCurrentTunaiGadTeb($kodcaw,Request $request)
{
$current = Carbon::now();
$current = new Carbon();
@@ -31,18 +25,10 @@ class TunaiGadTebController extends Controller
->orderBy('tarikh','desc')
->first();
return response()->json($tunaiGadteb);
}
public function UpdateTunaiGadTeb($kodcaw, Request $request)
{
$current = Carbon::now();
$current = new Carbon();
@@ -56,26 +42,10 @@ class TunaiGadTebController extends Controller
));
return response()->json($updatetunaiGD, 200);
}
public function createTunaiGadTeb($kodcaw, Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
@@ -94,14 +64,6 @@ class TunaiGadTebController extends Controller
]);
return response()->json($tunaigadteb,201);
}
}
app/Http/Controllers/VaultController.php
+33 -10
View File
@@ -8,6 +8,7 @@ use App\AddTunai;
use App\GlDetail;
use App\imbangdugalama;
use App\GlCode;
use App\Panjar;
use Illuminate\Http\Request;
use Carbon\Carbon;
@@ -163,6 +164,38 @@ class VaultController extends Controller
return response()->json($updateVault, 200);
}
public function updateVaultDeletePendahuluanSerahan($kodcaw, Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$vault=Vault::on($cawangan['mysql'])->where('kodcaw','=',$kodcaw)->where('tarikh','=',$current->toDateString())->orderby('tarikh','desc')->first();
$bakiawal = $vault['bakiawal'];
$keluar = $vault['keluar'];
$masuk = $vault['masuk'];
$bakiakhir = $vault['bakiakhir'];
$bakieod = $vault['bakieod'];
$pendahuluan = $vault['pendahuluan'];
$serahan = $vault['serahan'];
$totpanjaran = $vault['totpanjar'];
$glpend = GlDetail::on($cawangan['mysql'])->where('tarikh','=', $current->toDateString())->sum('pendahuluan');
$glser = GlDetail::on($cawangan['mysql'])->where('tarikh','=', $current->toDateString())->sum('serahan');
$bakiakhir = $bakiawal - $keluar + $masuk + $glpend - $glser - $totpanjaran;
$updateVault=Vault::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()],['kodcaw','=', $kodcaw]])->update(array(
'pendahuluan' => $glpend,
'serahan' => $glser,
'bakiakhir'=>$bakiakhir,
'bakieod'=>$bakiakhir
));
return response()->json($updateVault, 200);
}
public function create($kodcaw,Request $request)
{
$current = Carbon::now();
@@ -400,16 +433,6 @@ class VaultController extends Controller
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
// $pendahuluan = Vault::on($cawangan['mysql'])
// ->where('kodcaw','=',$kodcaw)
// ->where('tarikh','<=', $request->tarikh)
// ->sum('pendahuluan');
// $serahan = Vault::on($cawangan['mysql'])
// ->where('kodcaw','=',$kodcaw)
// ->where('tarikh','<=', $request->tarikh)
// ->sum('serahan');
$serahanpkb = '1000/020';
$serahanjmc = '1000/026';
$pendahuluanpkb = '7000/102';