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

Merged in bugfix/auditTrail (pull request #245)

Browse Source 
Bugfix/auditTrail
This commit is contained in:
Ain Izazi Aziz
2024-12-31 05:09:16 +00:00
parent 56669b8abd 038ece5425
commit f1140f36b0
11 changed files with 523 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/CustomerController.php
+128 -48
View File
@@ -2,6 +2,7 @@
namespace App\Http\Controllers;
use App\Audit;
use App\Marhun;
use App\BankMaster;
use App\Customer;
@@ -49,7 +50,7 @@ class CustomerController extends Controller
}
public function showOneCustomerByICAdmin(Request $request){
$customer = Customer::on('mysql7')
->where('kplama','=',$request->ic)
->orWhere('kpbaru','=',$request->ic)
@@ -111,7 +112,7 @@ class CustomerController extends Controller
}
}
}
return response()->json($gadai_all);
}
@@ -142,7 +143,7 @@ class CustomerController extends Controller
}
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
if($status == 'belum_tebus'){
$gadai = Gadai::on($cawangan['mysql'])
->where([['sttebus','=',$gadai_status],['nokp','=',$ic]])
@@ -165,7 +166,7 @@ class CustomerController extends Controller
$gadai[0]['datatuntut'] = $tuntutbaki;
}
}
}
}
return response()->json($gadai);
}
@@ -202,7 +203,7 @@ class CustomerController extends Controller
}
}
}
return response()->json($gadai_all);
}
@@ -227,7 +228,7 @@ class CustomerController extends Controller
));
}
}
return $barang;
}
@@ -259,10 +260,10 @@ class CustomerController extends Controller
'tarikhgadai' => $gd->t_gadai,
'hargajualan' => $gd->hargajualan,
'bakihargajualan' => $gd->bakihargajualan,
'barang' => $this->marhun($cawangan, $gd->norujukan) ?? ' tiada data',
));
'barang' => $this->marhun($cawangan, $gd->norujukan) ?? ' tiada data',
));
}
}
elseif($gd->sttebus == 'T')
{
array_push($sttebus_T, array(
@@ -270,22 +271,22 @@ class CustomerController extends Controller
'pembiayaan' => number_format($gd->pinjaman,2),
'tarikhgadai' => $gd->t_gadai,
'hargajualan' => $gd->hargajualan,
'bakihargajualan' => $gd->bakihargajualan,
'barang' => $this->marhun($cawangan, $gd->norujukan) ?? ' tiada data',
'bakihargajualan' => $gd->bakihargajualan,
'barang' => $this->marhun($cawangan, $gd->norujukan) ?? ' tiada data',
));
}
elseif($gd->sttebus == 'L')
{
{
array_push($sttebus_L, array(
'norujukan' => $gd->norujukan,
'pembiayaan' => number_format($gd->pinjaman,2),
'tarikhgadai' => $gd->t_gadai,
'hargajualan' => $gd->hargajualan,
'bakihargajualan' => $gd->bakihargajualan,
'barang' => $this->marhun($cawangan, $gd->norujukan) ?? ' tiada data',
'bakihargajualan' => $gd->bakihargajualan,
'barang' => $this->marhun($cawangan, $gd->norujukan) ?? ' tiada data',
));
}
}
}
}
else
@@ -308,7 +309,7 @@ class CustomerController extends Controller
->where([['tarikhdaftar','=',$tarikh],['kodcaw',$kodcaw]])
->orderBy('tarikhdaftar', 'desc')
->get();
return response()->json($gadai);
}
@@ -364,7 +365,7 @@ class CustomerController extends Controller
'telefon' => $request->telefon1,
'telefon2' => $request->telefon2
));
return response()->json($customer_update, 200);
}
@@ -408,7 +409,7 @@ class CustomerController extends Controller
->get()->toArray();
$new_data = json_encode($customer_info_new);
$audit_customer = DB::connection('mysql7')
->table('audit_customer')
->insert([
@@ -431,11 +432,11 @@ class CustomerController extends Controller
DB::connection('mysql7')->rollback();
return response()->json($e->getMessage(),400);
}
}
}
public function customerUpdateKhazanah($nokp,Request $request){
DB::connection('mysql7')->beginTransaction();
try{
@@ -476,7 +477,7 @@ class CustomerController extends Controller
->get()->toArray();
$new_data = json_encode($customer_info_new);
$audit_customer = DB::connection('mysql7')
->table('audit_customer')
->insert([
@@ -490,7 +491,7 @@ class CustomerController extends Controller
'customer_nokp' => $nokp,
]);
}
DB::connection('mysql7')->commit();
@@ -500,8 +501,8 @@ class CustomerController extends Controller
DB::connection('mysql7')->rollback();
return response()->json($e->getMessage(),400);
}
}
}
public function customerUpdateAdmin(Request $request){
@@ -521,12 +522,12 @@ class CustomerController extends Controller
'nokp'=>$request->icno
]);
}
$data_asal = $customer_update = Customer::on('mysql7')
->where('kplama','=',$request->ic_asal)
->orWhere('kpbaru','=',$request->ic_asal)
->first();
if($data_asal['kpbaru'] != null){
$customer_update = Customer::on('mysql7')
->where('kplama','=',$request->ic_asal)
@@ -601,7 +602,7 @@ class CustomerController extends Controller
return response()->json($array_norujukan);
}
public function countNorujukanMobile($nokp){
$cawangan_all = Cawangan::on('mysql7')->get();
$bilangan_sag = 0;
@@ -615,7 +616,7 @@ class CustomerController extends Controller
public function getGadaiDetailMobile(Request $request)
{
$array_norujukan = $request->norujukan;
$array_norujukan = $request->norujukan;
$array_kodcaw = $request->kodcaw;
$array_gadai = [];
$gadai_payment = [];
@@ -660,7 +661,7 @@ class CustomerController extends Controller
return response('Deleted Successfully', 200);
}
public function akaunBankMobile($nokp)
{
$customer_detail = [];
@@ -672,7 +673,7 @@ class CustomerController extends Controller
->where('kplama','=',$nokp)
->orWhere('kpbaru','=',$nokp)
->rightJoin('online_arrahn.bank', 'bank.id', '=', 'customer.kodbank')
->first();
->first();
if(!empty($customer))
{
@@ -680,14 +681,14 @@ class CustomerController extends Controller
$customer_detail['namabank'] = $customer['name'];
$customer_detail['kodbank'] = $customer['id'];
return response()->json($customer_detail);
}
}
else
{
return $customer_detail;
}
}
}
public function bankListMobile()
{
$bank_array = [];
@@ -702,32 +703,32 @@ class CustomerController extends Controller
{
array_push($bank_array, array(
'kodbank' => $banklist->id,
'namabank' => $banklist->name,
));
'namabank' => $banklist->name,
));
}
return response()->json($bank_array);
}
else
{
return response()->json('Data Not Found');
}
}
}
}
public function insertAkaunBankMobile(Request $request)
{
$customer = Customer::on('mysql7')
$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();
$customer->save();
}
return response()->json($customer, 200);
}
@@ -761,7 +762,7 @@ class CustomerController extends Controller
}
public function blacklistCustomer(Request $request){
$blacklist = Blacklist::where('nokp',$request->nokp)->first();
return response()->json($blacklist);
@@ -778,8 +779,8 @@ class CustomerController extends Controller
->select('kodcaw')
->where('nokp', '=', $ic)
->first();
if($customer)
if($customer)
array_push($custcawangan,['kodcaw' => $customer['kodcaw'], 'namacawangan' => $cawangan['details_caw']]);
}
@@ -805,9 +806,9 @@ class CustomerController extends Controller
return response()->json($dataCustomer);
}
public function AdminsearchCustomerByName(Request $request)
{
{
$nama = strtoupper($request->nama);
if(empty($nama))
@@ -821,12 +822,12 @@ class CustomerController extends Controller
->take(3)
->get();
}
return response()->json($customer);
}
public function AdminsearchCustomerByIC(Request $request)
{
{
if(isset($request->kodcaw))
{
$customer = Customer::on('mysql7')
@@ -841,8 +842,87 @@ class CustomerController extends Controller
->take(3)
->get();
}
return response()->json($customer);
}
public function changepassword(Request $request, $kodcaw, $id) {
$current = Carbon::now();
// log::info ($request->name);
$audit = new Audit();
$audit->users = $request->nama;
$audit->actions = "Tukar Kata Laluan";
// $audit->new_data = json_encode($request->new_password);
$audit->kodcaw = $kodcaw;
$audit->created_at = $current;
$audit->updated_at = $current;
$audit->save();
}
public function TukarCawangan(Request $request, $kodcaw)
{
$current = Carbon::now();
$current = new Carbon();
// Log::info('dalam tukar taraf');
$audit = new Audit();
$audit->users = $request->namaoperasi;
$audit->actions = "Tukar Cawangan";
$audit->old_data = json_encode($request->old_data);
$audit->new_data = json_encode($request->new_data);
$audit->kodcaw = $kodcaw;
$audit->created_at = $current;
$audit->updated_at = $current;
$audit->save();
return json_encode(['status'=> 'success']);
}
public function kakitangan(Request $request, $kodcaw)
{
$current = Carbon::now();
// Log::info('pegesahan kakitangan');
$audit = new Audit();
$audit->users = $request->namaoperasi;
$audit->actions = "pengesahan kakitangan";
$audit->old_data = json_encode($request->old_data);
$audit->new_data = json_encode($request->new_data);
$audit->kodcaw = $kodcaw;
$audit->created_at = $current;
$audit->updated_at = $current;
$audit->save();
return json_encode(['status'=> 'success']);
}
public function TukarTaraf(Request $request, $kodcaw)
{
// return json_encode(['test'=> 'taraf']);
//setiap request perlu htr something
$current = Carbon::now();
$current = new Carbon();
// Log::info('dalam tukar taraf');
$audit = new Audit();
$audit->users = $request->namaoperasi;
$audit->actions = "Tukar Taraf";
$audit->old_data = json_encode($request->old_data);
$audit->new_data = json_encode($request->new_data);
$audit->kodcaw = $kodcaw;
$audit->created_at = $current;
$audit->updated_at = $current;
$audit->save();
return json_encode(['status'=> 'success']);
}
}
app/Http/Controllers/GadaiController.php
+27 -15
View File
@@ -138,7 +138,7 @@ class GadaiController extends Controller
}
public function create($kodcaw,Request $request){
$master = new MasterServices($kodcaw);
$response = $master->createGadai($request);
@@ -362,8 +362,8 @@ class GadaiController extends Controller
// $old_data = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
$old_data = Gadai::on($cawangan['mysql'])->where([['norujukan','=',$norujukan],['pinjaman','=','NULL']])->orWhere([['norujukan','=',$norujukan],['pinjaman','=',0.00]])->first();
if($old_data){
Gadai::on($cawangan['mysql'])->where([['norujukan','=',$norujukan],['pinjaman','=','NULL']])->delete();
Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
@@ -398,6 +398,8 @@ class GadaiController extends Controller
}
public function cetakSAG($kodcaw,$norujukan,Request $request){
$harini = Carbon::now();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$gadai = Gadai::on($cawangan['mysql'])
->where('norujukan','=',$norujukan)
@@ -406,6 +408,16 @@ class GadaiController extends Controller
'penilai' => $request->penilai
));
$audit = new Audit();
$audit->users = isset($request->penilai) ? $request->penilai : '';
$audit->actions = "Cetak SAG";
$audit->norujukan = $request->norujukan;
// $audit->new_data = $request->norujukan;
$audit->kodcaw = $kodcaw;
$audit->created_at = $harini;
$audit->updated_at = $harini;
$audit->save();
return response()->json($gadai,200);
}
@@ -588,7 +600,7 @@ class GadaiController extends Controller
"ujrah"=> $gadaiData['ujrah'],
"onepercent"=> $gadaiData['onepercent'],
"tagbaru"=> $gadaiData['tagbaru']
]);
}
}
@@ -1079,14 +1091,14 @@ class GadaiController extends Controller
$onepercentonline = $ansuransonline->sum('trans.onepercent');
$arrayansuran = [
'totalpendahuluankaunter' => $pendahuluankaunter,
'totalkeuntungankaunter' => $keuntungankaunter,
'totalpendahuluankaunter' => $pendahuluankaunter,
'totalkeuntungankaunter' => $keuntungankaunter,
'bilangankaunter' => $bilangankaunter,
'totalujrahkaunter' => $ujrahkaunter,
'totalonepercentkaunter' => $onepercentkaunter,
'totalpendahuluanonline' => $pendahuluanonline,
'totalkeuntunganonline' => $keuntunganonline,
'totalpendahuluanonline' => $pendahuluanonline,
'totalkeuntunganonline' => $keuntunganonline,
'bilanganonline' => $bilanganonline,
'totalujrahonline' => $ujrahonline,
'totalonepercentonline' => $onepercentonline
@@ -1138,14 +1150,14 @@ class GadaiController extends Controller
$onepercentonline = $ansuransonline->sum('trans.onepercent');
$arrayansuran = [
'totalpendahuluankaunter' => $pendahuluankaunter,
'totalkeuntungankaunter' => $keuntungankaunter,
'totalpendahuluankaunter' => $pendahuluankaunter,
'totalkeuntungankaunter' => $keuntungankaunter,
'bilangankaunter' => $bilangankaunter,
'totalujrahkaunter' => $ujrahkaunter,
'totalonepercentkaunter' => $onepercentkaunter,
'totalpendahuluanonline' => $pendahuluanonline,
'totalkeuntunganonline' => $keuntunganonline,
'totalpendahuluanonline' => $pendahuluanonline,
'totalkeuntunganonline' => $keuntunganonline,
'bilanganonline' => $bilanganonline,
'totalujrahonline' => $ujrahonline,
'totalonepercentonline' => $onepercentonline,
@@ -3070,7 +3082,7 @@ class GadaiController extends Controller
->where('trans.trans_type','=','A')
->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
->get();
$transaksi = 0;
if($transaksi_data){
foreach($transaksi_data as $index=>$transaksiData){
@@ -3386,7 +3398,7 @@ class GadaiController extends Controller
$audit = Gadai::on($cawangan['mysql'])
->where([['tagpalsu','=',1],['t_gadai','<=',$request->tarikh],['sttebus','=','']])
->orWhere([['tagpalsu','=',1],['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
->orWhere([['tagpalsu','=',1],['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
->orderBy('t_gadai', 'ASC')
->orderBy('sirig', 'ASC');
@@ -3755,7 +3767,7 @@ class GadaiController extends Controller
public function getKadarUjrah(Request $request){
$onePercentServices = new Onepercent($request->kodcaw);
$kadarujrah = $onePercentServices->getKadarUjrah($request);
return $kadarujrah;
}
app/Http/Controllers/KelulusanController.php
+60 -25
View File
@@ -1,6 +1,8 @@
<?php
namespace App\Http\Controllers;
use App\Audit;
use App\Mohon;
use App\Cawangan;
use App\Mohonid;
@@ -34,13 +36,22 @@ class KelulusanController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$kelulusan=Mohon::on($cawangan['mysql'])
->where('tarikh','=',$harini->toDateString())
->where('norujukan','=',$norujukan)
->where('masalulus','<>','')
->get();
// $audit = new Audit();
// $audit->users = $request->teller;
// $audit->actions = "test";
// $audit->new_data = $kelulusan;
// $audit->kodcaw = $kodcaw;
// $audit->created_at = $harini;
// $audit->updated_at = $harini;
// $audit->save();
return response()->json($kelulusan);
}
@@ -52,13 +63,13 @@ class KelulusanController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$kelulusan=Mohon::on($cawangan['mysql'])
->where('tarikh','=',$harini->toDateString())
->where('norujukan','=',$norujukan)
->orderBy('siri','desc')
->first();
return response()->json($kelulusan);
}
@@ -116,7 +127,7 @@ class KelulusanController extends Controller
));
}
}
else if($pengesahan == 'operasi')
{
@@ -128,9 +139,9 @@ class KelulusanController extends Controller
->where('siri','=',$request->siri)
->update(array(
'pelulus' => 'operasi',
'khazanah' => $request->namakhazanah
'khazanah' => $request->namakhazanah
));
));
}
else
@@ -143,8 +154,17 @@ class KelulusanController extends Controller
'pelulus' => 'operasi',
'masalulus' => 'batal',
'khazanah' => $request->namakhazanah
));
));
}
$audit = new Audit();
$audit->users = (isset($request->namaoperasi) ? $request->namaoperasi : '');
$audit->actions = "pengesahan kelulusan 75%";
$audit->new_data = json_encode($kelulusan);
$audit->kodcaw = $kodcaw;
$audit->created_at = $harini;
$audit->updated_at = $harini;
$audit->save();
}
if($request->sahkan === 1)
@@ -157,7 +177,7 @@ class KelulusanController extends Controller
'pelulus' => 'dahlulus',
'operasi' => $request->namaoperasi,
'masalulus'=> $harini->toTimeString()
));
));
}else if($request->sahkan === 2){
$kelulusan=Mohon::on($cawangan['mysql'])
->where('tarikh','=',$harini->toDateString())
@@ -167,9 +187,17 @@ class KelulusanController extends Controller
'pelulus' => 'dahlulus',
'operasi' => $request->namaoperasi,
'masalulus'=> 'batal'
));
));
}
$audit = new Audit();
$audit->users = (isset($request->namakhazanah) ? $request->namakhazanah : '');
$audit->actions = "Pengesahan Kelulusan 75%";
$audit->kodcaw = $kodcaw;
$audit->created_at = $harini;
$audit->updated_at = $harini;
$audit->save();
return response()->json($kelulusan,201);
}
@@ -186,24 +214,23 @@ class KelulusanController extends Controller
->where('siri','=',$request->siri)
->update(array(
'komen' => $request->komen
));
return response()->json($kelulusan,201);
));
return response()->json($kelulusan,201);
}
public function create(REQUEST $request,$kodcaw,$norujukan,$roles)
public function create(REQUEST $request,$kodcaw,$norujukan,$roles)
{
$harini = Carbon::now();
$harini = new Carbon;
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
if($roles == "khazanah")
{
$kelulusan=Mohon::on($cawangan['mysql'])
->create([
->create([
'tarikh'=> $harini->toDateString(),
'norujukan'=> $norujukan,
'siri' => $request->siri,
@@ -218,15 +245,15 @@ class KelulusanController extends Controller
'teller' => $request->teller,
'pelulus' => ($request->pelulus) ? $request->pelulus : ''
]);
}
else if($roles == "operasi")
{
$kelulusan=Mohon::on($cawangan['mysql'])
->create([
->create([
'tarikh'=> $harini->toDateString(),
'norujukan'=> $norujukan,
'siri' => $request->siri,
@@ -244,7 +271,15 @@ class KelulusanController extends Controller
]);
}
$audit = new Audit();
$audit->users = (isset($request->teller) ? $request->teller : '');
$audit->actions = "Minta Pengesahan kelulusan 75%";
$audit->new_data = json_encode($kelulusan);
$audit->kodcaw = $kodcaw;
$audit->created_at = $harini;
$audit->updated_at = $harini;
$audit->save();
return response()->json($kelulusan);
}
@@ -259,7 +294,7 @@ class KelulusanController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$mohonid=Mohonid::on($cawangan['mysql'])
->create([
->create([
'tarikh'=> $harini->toDateString(),
'mohon' => $request->mohon,
'norujukan' => $norujukan,
@@ -355,7 +390,7 @@ class KelulusanController extends Controller
if(sizeof($kelulusan) != 0){
array_push($arraykelulusan,["kelulusanall" => $kelulusan,"cawangan" => $cawangan['details_caw'],"cawangankod" => $cawangan['kodcaw']]);
}
}
}
return response()->json($arraykelulusan,200);
}
@@ -377,7 +412,7 @@ class KelulusanController extends Controller
if(sizeof($kelulusan) != 0){
array_push($arraykelulusan,["kelulusanall" => $kelulusan,"cawangan" => $cawangan['details_caw'],"cawangankod" => $cawangan['kodcaw']]);
}
}
}
return response()->json($arraykelulusan,200);
}
app/Http/Controllers/KomuditiController.php
+29 -12
View File
@@ -2,6 +2,7 @@
namespace App\Http\Controllers;
use App\Audit;
use App\Komuditi;
use App\KomuditiPurchase;
use App\KomuditiTransaksi;
@@ -41,7 +42,6 @@ class KomuditiController extends Controller
public function beliKomuditi(Request $request){
$current = Carbon::now();
$current = new Carbon();
$komuditi_purchase = KomuditiPurchase::on('mysql7')->create([
'unit_komuditi' => $request->unit_komuditi,
@@ -64,12 +64,20 @@ class KomuditiController extends Controller
'harga'=> $request->nilai
]);
$audit = new Audit();
$audit->users = $request->purchased_by;
$audit->actions = "pembelian komuditi";
$audit->new_data = $komuditi_purchase;
$audit->kodcaw = $request->kodcaw;
$audit->created_at = $current;
$audit->updated_at = $current;
$audit->save();
return response()->json($komuditi_purchase);
}
public function jualKomuditi(Request $request){
$current = Carbon::now();
$current = new Carbon();
$komuditi_asal = KomuditiPurchase::on('mysql7')->where('no_sijil','=',$request->nosijil)->latest()->first();
@@ -86,6 +94,15 @@ class KomuditiController extends Controller
'harga'=> $komuditi_asal['nilai']
]);
$audit = new Audit();
$audit->users = $request->purchased_by;
$audit->actions = "penjualan komuditi";
$audit->new_data = $komuditi_asal;
$audit->kodcaw = $request->kodcaw;
$audit->created_at = $current;
$audit->updated_at = $current;
$audit->save();
return response()->json('berjaya');
}
@@ -134,7 +151,7 @@ class KomuditiController extends Controller
$update_komuditi = KomuditiPurchase::on('mysql7')->where('id','=',$komuditi_current['id'])->update([
'unit_komuditi' => $update_unit
]);
$komuditi_transaksi = KomuditiTransaksi::on('mysql7')->create([
'unit_komuditi' => $request->unit_komuditi,
'nosijil'=>$komuditi_current['no_sijil'],
@@ -175,7 +192,7 @@ class KomuditiController extends Controller
public function getKomuditiProductUnit(Request $request){
$produk = KomuditiProduk::on('mysql7')->where('kodproduk','=',$request->kodproduk)->first();
return response()->json($produk['unit']);
}
@@ -198,7 +215,7 @@ class KomuditiController extends Controller
$current = Carbon::now();
$current = new Carbon();
$komoditi = [];
$jumlahkomoditi = Komuditi::on('mysql7')->where([['date_purchase','=',$current->toDateString()], ['transaction_type', '=', 'Beli Komoditi']])->orderBy('created_at','desc')->first();
$transaksi_komoditi = KomuditiPurchase::on('mysql7')->where('date_purchase','=',$current->toDateString())->orderBy('created_at','desc')->first();
@@ -209,8 +226,8 @@ class KomuditiController extends Controller
$percentage_baki_komoditi = ($baki_komoditi/$jumlahkomoditi['unit_komuditi'])*100;
array_push($komoditi,
['komoditi_transaksi'=>number_format($transaksi_komoditi['unit_komuditi'],2),
'baki_komoditi'=>number_format($baki_komoditi,2),
['komoditi_transaksi'=>number_format($transaksi_komoditi['unit_komuditi'],2),
'baki_komoditi'=>number_format($baki_komoditi,2),
'percentage_komoditi_transaksi'=>number_format($percentage_komoditi_transaksi,1),
'percentage_baki_komoditi'=>number_format($percentage_baki_komoditi,1)]);
@@ -232,7 +249,7 @@ class KomuditiController extends Controller
$monthly_array = new Carbon();
$yearly_array = Carbon::now();
$yearly_array = new Carbon();
$array_totalup = [];
if($request->method == 'daily'){
@@ -279,13 +296,13 @@ class KomuditiController extends Controller
{
$pembeliankomuditi = Komuditi::on('mysql')->selectRaw('SUM(unit_komuditi) as totalkomoditi')->addSelect('date_purchase')->groupBy('date_purchase')
->where([['date_purchase','<=',$current->toDateString()],['date_purchase','>=',$weekly_date]])->orderBy('created_at','desc')->get();
}elseif($request->method == 'monthly')
{
$pembeliankomuditi = Komuditi::on('mysql')->selectRaw('SUM(unit_komuditi) AS totalkomoditi')->addSelect(DB::connection('mysql')->raw('DATE_FORMAT(date_purchase, "%Y-%m") as date_purchase'))
->groupBy(DB::connection('mysql')->raw("DATE_FORMAT(date_purchase,'%Y%m')"))->where([['date_purchase','<=',$current->toDateString()],['date_purchase','>=',$monthly_date]])
->orderBy('created_at','desc')->get();
}elseif($request->method == 'yearly')
{
$pembeliankomuditi = Komuditi::on('mysql')->selectRaw('SUM(unit_komuditi) AS totalkomoditi')->addSelect(DB::connection('mysql')->raw('DATE_FORMAT(date_purchase, "%Y") as date_purchase'))
@@ -303,7 +320,7 @@ class KomuditiController extends Controller
}
}
}
}
@@ -318,4 +335,4 @@ class KomuditiController extends Controller
return response()->json($rekodkomoditi);
}
}
}
app/Http/Controllers/LelongController.php
+59 -42
View File
@@ -71,11 +71,14 @@ class LelongController extends Controller
return response()->json($lelong);
}
public function showBakiLelong($noic,$jenislelong)
public function showBakiLelong($noic,$jenislelong, $kodcaw, Request $request)
{
$cawangan_all = Cawangan::on('mysql7')->get();
$bakilelongtotal = 0;
$rugilelongtotal = 0;
$current = Carbon::now();
$current = new Carbon();
if($jenislelong == 'baki')
{
@@ -91,6 +94,20 @@ class LelongController extends Controller
}
}
$audit = new Audit();
$audit->users = $request->teller;
$audit->actions = "test2";
// $audit->new_data = $bakilelongtotal;
$audit->new_data = json_encode([
'bakilelongtotal' => $bakilelongtotal,
'rugilelongtotal' => $rugilelongtotal,
]);
$audit->kodcaw = $kodcaw;
$audit->created_at = $current;
$audit->updated_at = $current;
$audit->save();
return response()->json($bakilelongtotal, 200);
}
@@ -603,7 +620,7 @@ class LelongController extends Controller
}else{
$link = 'http://adminbid.arrahn/api/portalApi';
}
$lelong = Http::withOptions(['verify' => true])->get($link,[
'norujukan' => $request->norujukan
])->json();
@@ -624,8 +641,8 @@ class LelongController extends Controller
if($lelong)
{
$date_lelong = new Carbon($lelong['t_lelong']);
$current_date = new Carbon($current->toDateString());
$current_date = new Carbon($current->toDateString());
if($lelong['t_lelong'] >= $current->toDateString())
{
$diff = $date_lelong->diffInDays($current_date);
@@ -663,7 +680,7 @@ class LelongController extends Controller
}
else{
$lelong = Lelong::on($cawangan['mysql'])
->where('norujukan', '=', $request->norujukan)
->select('norujukan', 't_lelong')
@@ -971,13 +988,13 @@ class LelongController extends Controller
if($batchnosama)
{
$dif=array_intersect($bl,$batchnosama);
if(!$dif)
{
array_push($arraybatch,['batchno' => $bl['batchno'], 'bilangantuntutbaki' => $bl['bilangan'], 'bilanganrugi' => 0,'tarikhlelong' => $bl['tarikhlelong']]);
}
}
}
foreach($batchlelrugi as $index=>$br)
@@ -986,13 +1003,13 @@ class LelongController extends Controller
if($batchnosama)
{
$dif=array_intersect($br,$batchnosama);
if(!$dif)
{
array_push($arraybatch,['batchno' => $br['batchno'], 'bilangantuntutbaki' => 0, 'bilanganrugi' => $br['bilangan'],'tarikhlelong' => $br['tarikhlelong']]);
}
}
}
}
return response()->json($arraybatch);
@@ -1032,7 +1049,7 @@ class LelongController extends Controller
->orderBy('gadai.sirig','asc')
->where('gadai.taglel','=', 1);
}
$lelonglist = $lelong->get();
foreach($lelonglist as $index=>$lel)
@@ -1107,7 +1124,7 @@ class LelongController extends Controller
'telefon' => $index['user_details']['notelbimbit'],
]);
}
$update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$index['norujukan'])->update(array(
'sttebus' => "L",
't_update' => $request->tarikh
@@ -1209,7 +1226,7 @@ class LelongController extends Controller
return response()->json("success");
}
public function getRingkasanHarian(Request $request){
public function getRingkasanHarian(Request $request){
$ringkasan = new RingkasanHarianServices;
$getData = $ringkasan->getRingkasanHarian($request->mula,$request->hingga,$request->kodcaw);
@@ -1324,7 +1341,7 @@ class LelongController extends Controller
->Where(function ($query) use($item) {
for ($i = 0; $i < count($item); $i++){
$query->orwhere('lelmarhun.nota', 'like', '%' . $item[$i] .'%');
}
}
})
->orderBy('lelong.t_lelong','asc')
->select('lelong.t_lelong','gadai.t_gadai','gadai.nokp','lelong.pinjaman','lelong.baki','lelong.batchno','lelong.norujukan')
@@ -1335,7 +1352,7 @@ class LelongController extends Controller
$groupbybatch = $lelong_data->groupBy('batchno');
$lelong = [];
foreach($groupbybatch as $index=>$lelongData){
foreach($groupbybatch as $index=>$lelongData){
$total_pembiayaan = $lelongData->sum('pinjaman');
// dd($total_pembiayaan);
$total_lelong = $lelongData->count('norujukan');
@@ -1367,7 +1384,7 @@ class LelongController extends Controller
->Where(function ($query) use($item) {
for ($i = 0; $i < count($item); $i++){
$query->orwhere('lelmarhun.nota', 'like', '%' . $item[$i] .'%');
}
}
})
->orderBy('lelong.t_lelong','asc')
->select('lelong.t_lelong','gadai.t_gadai','gadai.nokp','lelong.pinjaman','lelong.baki','lelong.batchno','lelong.norujukan')
@@ -1377,7 +1394,7 @@ class LelongController extends Controller
->get();
// dd($lelong_data);
$lelong = [];
foreach($lelong_data as $index=>$lelongData){
foreach($lelong_data as $index=>$lelongData){
// dd($lelongData->norujukan);
$lelmarhun = LelMarhun::on($cawangan['mysql'])
->where('norujukan',$lelongData['norujukan'])
@@ -1386,7 +1403,7 @@ class LelongController extends Controller
->Where(function ($query) use($item) {
for ($i = 0; $i < count($item); $i++){
$query->orwhere('nota', 'like', '%' . $item[$i] .'%');
}
}
})
->get();
// dd($lelmarhun->norujukan);
@@ -1404,7 +1421,7 @@ class LelongController extends Controller
// dd($lelong);
}
return response()->json($lelong);
}
@@ -1422,7 +1439,7 @@ class LelongController extends Controller
->where(function ($query) use($item) {
for ($i = 0; $i < count($item); $i++){
$query->orWhere('lelmarhun.nota', 'like', '%' . $item[$i] .'%');
}
}
})
->select('lelong.batchno','lelong.t_lelong','gadai.t_gadai','gadai.nokp','lelong.pinjaman','lelong.baki','lelong.batchno','lelong.norujukan','gadai.marhun')
->orderBy('lelong.t_lelong')
@@ -1431,8 +1448,8 @@ class LelongController extends Controller
->get();
// dd($lelong_data);
$lelong = [];
foreach($lelong_data as $index=>$lelongData){
foreach($lelong_data as $index=>$lelongData){
// dd($lelongData->norujukan);
$lelmarhun = LelMarhun::on($cawangan['mysql'])
->where('norujukan',$lelongData['norujukan'])
@@ -1442,13 +1459,13 @@ class LelongController extends Controller
->where(function ($query) use($item) {
for ($i = 0; $i < count($item); $i++){
$query->orWhere('nota', 'like', '%' . $item[$i] .'%');
}
}
})
->where('norujukan',$lelongData['norujukan'])
->where('batch_no',$lelongData['batchno'])
->distinct()
->get();
array_push($lelong,[
"batchno"=> $lelongData->batchno,
"norujukan"=> $lelongData->norujukan,
@@ -1465,7 +1482,7 @@ class LelongController extends Controller
// dd($lelong);
}
return response()->json($lelong);
}
@@ -1483,7 +1500,7 @@ class LelongController extends Controller
->Where(function ($query) use($item) {
for ($i = 0; $i < count($item); $i++){
$query->orwhere('lelmarhun.nota', 'like', '%' . $item[$i] .'%');
}
}
})
->select('lelong.batchno','lelong.t_lelong','gadai.t_gadai','gadai.nokp','lelong.pinjaman','lelong.baki','lelong.batchno','lelong.norujukan','gadai.marhun')
->orderBy('lelong.t_lelong')
@@ -1492,8 +1509,8 @@ class LelongController extends Controller
->get();
// dd($lelong_data);
$lelong = [];
foreach($lelong_data as $index=>$lelongData){
foreach($lelong_data as $index=>$lelongData){
$lelmarhun = LelMarhun::on($cawangan['mysql'])
->where('norujukan',$lelongData['norujukan'])
->where('batch_no',$lelongData['batchno'])
@@ -1503,7 +1520,7 @@ class LelongController extends Controller
->Where(function ($query) use($item) {
for ($i = 0; $i < count($item); $i++){
$query->orwhere('nota', 'like', '%' . $item[$i] .'%');
}
}
})
->where('batch_no',$lelongData['batchno'])
->where('norujukan',$lelongData['norujukan'])
@@ -1526,7 +1543,7 @@ class LelongController extends Controller
// dd($lelong);
}
return response()->json($lelong);
}
@@ -1544,7 +1561,7 @@ class LelongController extends Controller
->Where(function ($query) use($item) {
for ($i = 0; $i < count($item); $i++){
$query->orwhere('lelmarhun.nota', 'like', '%' . $item[$i] .'%');
}
}
})
->orderBy('lelong.t_lelong','asc')
->select('lelong.t_lelong','gadai.t_gadai','gadai.nokp','lelong.pinjaman','lelong.baki','lelong.batchno','lelong.norujukan')
@@ -1555,7 +1572,7 @@ class LelongController extends Controller
$groupbybatch = $lelong_data->groupBy('batchno');
$lelong = [];
foreach($groupbybatch as $index=>$lelongData){
foreach($groupbybatch as $index=>$lelongData){
$total_pembiayaan = $lelongData->sum('pinjaman');
// dd($total_pembiayaan);
$total_lelong = $lelongData->count('norujukan');
@@ -1587,7 +1604,7 @@ class LelongController extends Controller
->Where(function ($query) use($item) {
for ($i = 0; $i < count($item); $i++){
$query->orwhere('lelmarhun.nota', 'like', '%' . $item[$i] .'%');
}
}
})
->orderBy('lelong.t_lelong','asc')
->select('lelong.t_lelong','gadai.t_gadai','gadai.nokp','lelong.pinjaman','lelong.baki','lelong.batchno','lelong.norujukan')
@@ -1597,7 +1614,7 @@ class LelongController extends Controller
->get();
// dd($lelong_data);
$lelong = [];
foreach($lelong_data as $index=>$lelongData){
foreach($lelong_data as $index=>$lelongData){
// dd($lelongData->norujukan);
$lelmarhun = LelMarhun::on($cawangan['mysql'])
->where('norujukan',$lelongData['norujukan'])
@@ -1608,7 +1625,7 @@ class LelongController extends Controller
->Where(function ($query) use($item) {
for ($i = 0; $i < count($item); $i++){
$query->orwhere('lelmarhun.nota', 'like', '%' . $item[$i] .'%');
}
}
})
->where('batch_no',$batchno)
->where('norujukan',$lelongData['norujukan'])
@@ -1630,14 +1647,14 @@ class LelongController extends Controller
// dd($lelong);
}
return response()->json($lelong);
}
public function kiraupahUjrahOnePercent($kodcaw,$norujukan){
$onepercentservices = new OnePercentServices();
$cawangan = Cawangan::on('mysql7')
->where('kodcaw','=',$kodcaw)
->first();
@@ -1656,7 +1673,7 @@ class LelongController extends Controller
$array_upah = $onepercentservices->kiraanKeuntunganSebenar($gadai_data['pinjaman'],$gadai_data['nilaimarhun'],$gadai_data['kadarupah'],$gadai_data['percentpinj']);
$ujrah = $bilang_bln * $array_upah['ujrah'];
$onepercent = $bilang_bln * $array_upah['onepercent'];
$onepercent_semasa = $onepercent;
$onepercent_semasa = $onepercent;
$ujrah_semasa = $ujrah;
return ['ujrah' => $ujrah_semasa, 'onepercent' => $onepercent_semasa];
@@ -1665,7 +1682,7 @@ class LelongController extends Controller
// public function kiraupahUjrahOnePercentRebate($kodcaw,$norujukan){
// // $onepercentservices = new OnePercentServices();
// $onepercentservices = new Calculation();
// $cawangan = Cawangan::on('mysql7')
// ->where('kodcaw','=',$kodcaw)
// ->first();
@@ -1698,7 +1715,7 @@ class LelongController extends Controller
->first();
$onepercentservices = new Calculation();
// $cawangan = $kodcaw;
$gadai_data = Gadai::on($cawangan['mysql'])
@@ -1713,13 +1730,13 @@ class LelongController extends Controller
$bilang_bln = $tempoh - $gadai_data['tempohbayar'];
$array_upah = $onepercentservices->kiraanKeuntunganRebet($gadai_data['bakipjm'],$gadai_data['nilaimarhun'],$gadai_data['kadarupah'],$gadai_data['margin_semasa']);
// $ujrah_rounded = $onepercentservices->getRoundedMethod($array_upah['ujrah']);
// $ujrah_rounded = $onepercentservices->getRoundedMethod($array_upah['ujrah']);
// $keuntungan_rounded = $onepercentservices->getRoundedMethod($array_upah['onepercent']);
$ujrah = $bilang_bln * $array_upah['ujrah'];
$onepercent = $bilang_bln * $array_upah['onepercent'];
$ujrah = $onepercentservices->getRoundedMethod($ujrah);
$onepercent = $onepercentservices->getRoundedMethod($onepercent);
return ['ujrah' => $ujrah, 'onepercent' => $onepercent];
}
app/Http/Controllers/LogController.php
+46 -1
View File
@@ -10,6 +10,7 @@ use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Carbon\Carbon;
use App\Audit;
class LogController extends Controller
{
@@ -20,7 +21,8 @@ class LogController extends Controller
public function logSession($kodcaw, Request $request)
{
// dd($request->all());
$current = Carbon::now();
$current = new Carbon();
$logsession = Logsession::on('mysql7')->where('kodcaw', '=', $kodcaw)
->create([
@@ -31,6 +33,18 @@ class LogController extends Controller
'taraf' => $request->taraf,
]);
$audit = new Audit();
$audit->users = $request->nama;
$audit->actions = "Log Masuk";
// $audit->norujukan = $norujukan;
// $audit->old_data = $old_data;
$audit->kodcaw = $kodcaw;
$audit->created_at = $current;
$audit->updated_at = $current;
$audit->save();
return response()->json($logsession);
@@ -55,5 +69,36 @@ class LogController extends Controller
return response()->json($newnokp);
}
public function logoutSession($kodcaw, Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$logoutsession = Logsession::on('mysql7')->where('kodcaw', '=', $kodcaw)
->create([
'nama' => $request->nama,
'nokp' => $request->nokp,
'kodcaw' => $request->kodcaw,
'email' => $request->email,
'taraf' => $request->taraf,
]);
$audit = new Audit();
$audit->users = $request->nama;
$audit->actions = "Log Keluar";
// $audit->norujukan = $norujukan;
// $audit->old_data = $old_data;
$audit->kodcaw = $kodcaw;
$audit->created_at = $current;
$audit->updated_at = $current;
$audit->save();
return response()->json($logsession);
}
}
app/Http/Controllers/TebusController.php
+57 -46
View File
@@ -231,7 +231,7 @@ class TebusController extends Controller
"nama"=>$customer_info['nama'],
"nokp"=>$tebusData['nokp'],
"jbg"=>$tebusData['jbg'],
"ujrah"=>$trans['ujrah_rebet'],
"ujrah"=>$trans['ujrah_rebet'],
"onepercent"=>$trans['onepercent_rebet']
]);
@@ -308,7 +308,7 @@ class TebusController extends Controller
"nama"=>$customer_info['nama'],
"nokp"=>$tebusData['nokp'],
"jbg"=>$tebusData['jbg'],
"ujrah"=>$trans['ujrah_rebet'],
"ujrah"=>$trans['ujrah_rebet'],
"onepercent"=>$trans['onepercent_rebet'],
"tagbaru"=>$tebusData['tagbaru']
@@ -321,17 +321,17 @@ class TebusController extends Controller
if ($compare_teller === 0) {
$compare_tebus = strcmp($a['t_tebus'], $b['t_tebus']);
if ($compare_tebus === 0) {
if ($compare_tebus === 0) {
return $a['tarikh_bayaran'] <=> $b['tarikh_bayaran'];
}
return $compare_tebus;
}
return $compare_teller;
});
return response()->json($tebus);
}
@@ -378,13 +378,13 @@ class TebusController extends Controller
// dd($totalkeuntunganarrahn,$totalkeuntungantawarruq);
$array_penebusan = [
'bilarrahn' => $bilpenebusanarrahn,
'totalarrahn' => $totalpenebusanarrahn,
'keuntunganarrahn' => $totalkeuntunganarrahn,
'bilarrahn' => $bilpenebusanarrahn,
'totalarrahn' => $totalpenebusanarrahn,
'keuntunganarrahn' => $totalkeuntunganarrahn,
'ujraharrahn' => $totalujraharrahn,
'onepercentarrahn' => $totalonepercentarrahn,
'biltawarruq' => $bilpenebusantawarruq,
'biltawarruq' => $bilpenebusantawarruq,
'totaltawarruq' => $totalpenebusantawarruq,
'totalrebate' => $totalrebatetawarruq,
'keuntungantawarruq' => $totalkeuntungantawarruq,
@@ -402,7 +402,7 @@ class TebusController extends Controller
$tebusarrahn = Tebus::on($cawangan['mysql'])
->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
->where('tebus.t_tebus','>=',$request->mula)
->where('tebus.t_tebus','<=',$request->akhir)
->where('tebus.t_tebus','<=',$request->akhir)
->whereNull('hargajualan');
$totalpenebusanarrahn = $tebusarrahn->sum('tebus.pinjaman');
@@ -415,14 +415,14 @@ class TebusController extends Controller
$tebustawarruq = Tebus::on($cawangan['mysql'])
->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
->where('tebus.t_tebus','>=',$request->mula)
->where('tebus.t_tebus','<=',$request->akhir)
->where('tebus.t_tebus','<=',$request->akhir)
->whereNotNull('hargajualan');
$tebustawarruqansuran = Tebus::on($cawangan['mysql'])
->select('tebus.bakiupah','tebus.norujukan')
->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
->where('tebus.t_tebus','>=',$request->mula)
->where('tebus.t_tebus','<=',$request->akhir)
->where('tebus.t_tebus','<=',$request->akhir)
->whereNotNull('hargajualan')
->where('gad.tagbaru','=',1)
->where('hargajualan','<>','bakihargajualan');
@@ -442,13 +442,13 @@ class TebusController extends Controller
// dd($totalkeuntunganarrahn,$totalkeuntungantawarruq);
$array_penebusan = [
'bilarrahn' => $bilpenebusanarrahn,
'totalarrahn' => $totalpenebusanarrahn,
'keuntunganarrahn' => $totalkeuntunganarrahn,
'bilarrahn' => $bilpenebusanarrahn,
'totalarrahn' => $totalpenebusanarrahn,
'keuntunganarrahn' => $totalkeuntunganarrahn,
'ujraharrahn' => $totalujraharrahn,
'onepercentarrahn' => $totalonepercentarrahn,
'biltawarruq' => $bilpenebusantawarruq,
'biltawarruq' => $bilpenebusantawarruq,
'totaltawarruq' => $totalpenebusantawarruq,
'totalrebate' => $totalrebatetawarruq,
'keuntungantawarruq' => $totalkeuntungantawarruq,
@@ -486,7 +486,9 @@ class TebusController extends Controller
}
public function tagterimaupdate($kodcaw,$norujukan){
public function tagterimaupdate($kodcaw,$norujukan,Request $request){
$current = Carbon::now();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$dahscan = Tebus::on($cawangan['mysql'])->where([['norujukan','=',$norujukan],['tagterima',1]])->first();
@@ -499,7 +501,16 @@ class TebusController extends Controller
$update_inoutmar = Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
'tagterima' => 1
));
$audit = new Audit();
$audit->users = $request->nama;
$audit->actions = "Khazanah Scan Barcode Tebus";
$audit->norujukan = $norujukan;
$audit->kodcaw = $kodcaw;
$audit->created_at = $current;
$audit->updated_at = $current;
$audit->save();
return response()->json('success');
}else{
return response()->json('unavailable');
@@ -536,9 +547,9 @@ class TebusController extends Controller
$wakil = Wakil::on($cawangan['mysql'])
->orderBy('nowakil','desc')
->first();
if(!$wakil){
return response(0);
return response(0);
}
if($wakil['nowakil'])
@@ -759,9 +770,9 @@ class TebusController extends Controller
$countadvansuronline = $listadvansuronline->count();
$totaladvansuronline = $listadvansuronline->sum('upahdibayar');
$arrayadvansur = ['bilkaunter' => $countadvansurkaunter,
$arrayadvansur = ['bilkaunter' => $countadvansurkaunter,
'totalkaunter' => $totaladvansurkaunter,
'bilonline' => $countadvansuronline,
'bilonline' => $countadvansuronline,
'totalonline' => $totaladvansuronline];
return response()->json($arrayadvansur,200);
@@ -1456,8 +1467,8 @@ class TebusController extends Controller
->sum('transaksi_keuntungan.bayaran_keuntungan');
}
$upahlelong = Lelong::on($cawangan['mysql'])
->where([['t_jual','<=',$request->tarikh],['t_jual','>','2022-07-24']])
->whereYear('t_jual','=',$tarikhyear->year)
@@ -1664,7 +1675,7 @@ class TebusController extends Controller
return response(0);
}
public function calculationKeuntunganPenggadai($kodcaw,Request $request)
{
@@ -1679,8 +1690,8 @@ class TebusController extends Controller
if($determine_past->isToday())
{
$audit_now = Gadai::on($cawangan['mysql'])
->select(DB::raw('sum(tunggakan) as "akru",
sum(tunggakanujrah) as "akruujrah",
->select(DB::raw('sum(tunggakan) as "akru",
sum(tunggakanujrah) as "akruujrah",
sum(tunggakanonepercent) as "akruonepercent"'))
->where([['tagpalsu','=',0],['t_gadai','<=',$request->tarikh],['sttebus','=','']])
->orWhere([['tagpalsu','=',0],['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
@@ -1694,7 +1705,7 @@ class TebusController extends Controller
$totaltunggakan_now = $result_audit_backdate->selectRaw('SUM(upahblmbyar) + SUM(ujrah) + SUM(utgonepercent) as total_sum')->first();
$totaltunggakan_now = $totaltunggakan_now['total_sum'];
}
return response()->json($totaltunggakan_now);
}
@@ -1724,7 +1735,7 @@ class TebusController extends Controller
case '11': return $audit_backdate = StokAudit11::on($cawangan['mysql'])->where('tahun',$year_generate);
break;
case '12': return $audit_backdate = StokAudit12::on($cawangan['mysql'])->where('tahun',$year_generate);
break;
break;
}
}
@@ -1740,11 +1751,11 @@ class TebusController extends Controller
$date_sebelum = clone $date;
$determine_past = new Carbon($request->tarikh);
$date_sebelum = $date_sebelum->firstOfMonth();
$date_sebelum = $date_sebelum->firstOfMonth();
$month_sebelum = $date_sebelum->subMonth()->format('m');
$month_sekarang = $date->format('m');
$year_generate = $date->format('Y');
$haripertama = $date->firstOfMonth();
$haripertama = $date->firstOfMonth();
$haripertama_extension = $haripertama->toDateString();
$datenow = new Carbon($request->tarikh);
$year = $current->year;
@@ -1806,7 +1817,7 @@ class TebusController extends Controller
if(!$determine_past->isToday()){
$calculate_month = (int)$month_sekarang - $latest_month_akrunet->bulan;
if($calculate_month > 1){
return 'ERR_MONTH_SEBELUM';
}else if($calculate_month == 1){
@@ -1817,7 +1828,7 @@ class TebusController extends Controller
->where('bulan','<=',$intmonth_sekarang)
->where('tahun',$year)
->sum('jumlah');
return response()->json($jumlahakru);
}else if($calculate_month == 0)
{
@@ -1851,19 +1862,19 @@ class TebusController extends Controller
'hingga' => $datenow->toDateString(),
'kodcaw' => $request->kodcaw,
]);
// $calculation_keuntungan_sebenar = $this->untungrugicalculationLejer($request->kodcaw,$request_dibina);
// $upah_diterima = $calculation_keuntungan_sebenar->getContent();
$upah_diterima = $total;
$calculation = $totaltunggakan_sebelum - $upah_diterima;
$accrual_net = $totaltunggakan_now - $calculation;
if($calculate_month <= 1){
if($calculate_month <= 1){
$available_akru = AkruNet::on($cawangan['mysql'])
->where('bulan', (int)$month_sekarang)
->where('tahun', $current->year)
->get()->toArray();
if(sizeof($available_akru) == 0)
{
$akrunet = new AkruNet();
@@ -1878,10 +1889,10 @@ class TebusController extends Controller
AkruNet::on($cawangan['mysql'])->where('bulan','=',(int)$month_sekarang)->where('tahun',$current->year)
->update(['jumlah' => ($accrual_net)]);
}
}
}
//dd($jumlahakru,$accrual_net,$total);
$total_accrual_net = $jumlahakru + ($accrual_net);
@@ -1898,19 +1909,19 @@ class TebusController extends Controller
'hingga' => $date->endOfMonth()->toDateString(),
'kodcaw' => $request->kodcaw,
]);
$calculation_keuntungan_sebenar = $this->untungrugicalculationLejer($request->kodcaw,$request_dibina);
$calculation_upahsimpan = $this->calculationKeuntunganSebenarLejer($request->kodcaw,$request_dibina);
$upah_diterima = $calculation_keuntungan_sebenar->getContent() + $calculation_upahsimpan->getContent();
$calculation = $totaltunggakan_sebelum - $upah_diterima;
$accrual_net = $totaltunggakan_now - $calculation;
if($calculate_month <= 1){
if($calculate_month <= 1){
$available_akru = AkruNet::on($cawangan['mysql'])
->where('bulan', (int)$month_sekarang)
->get()->toArray();
if(sizeof($available_akru) == 0)
{
$akrunet = new AkruNet();
@@ -1921,10 +1932,10 @@ class TebusController extends Controller
$akrunet->save();
}
}
$total_accrual_net = $jumlahakru + ($accrual_net - $total);
}
return response()->json($total_accrual_net);
}
@@ -1935,7 +1946,7 @@ class TebusController extends Controller
$firstMonth = (clone $currentDate)->firstOfMonth();
$lastMonth = (clone $currentDate)->endOfMonth();
/* Start Keuntungan Semasa Calculation */
$collection_trans = Transaction::on('mysql7')
->leftJoin('transaksi_keuntungan as trans', function ($join) {
$join->on('transaction.norujukan', '=', 'trans.norujukan');
app/Http/Controllers/TunaiController.php
+34
View File
@@ -6,9 +6,11 @@ use App\Cawangan;
use App\Tunai;
use App\Gadai;
use App\AddTunai;
use App\Audit;
use App\RequestTeller;
use App\Denominasi;
use App\Vault;
use Auth0\SDK\API\Management\Users;
use Illuminate\Http\Request;
use Carbon\Carbon;
use Illuminate\Support\Facades\Log;
@@ -150,6 +152,17 @@ class TunaiController extends Controller
'Expires' => 'Mon, 01 Jan 1990 00:00:00 GMT',
]);
$audit = new Audit();
$audit->users = $request->teller;
$audit->actions = "test";
$audit->new_data = $tunai;
$audit->kodcaw = $kodcaw;
$audit->created_at = $current;
$audit->updated_at = $current;
$audit->save();
return response()->json();
}
public function getTunaiPast($kodcaw,Request $request)
@@ -374,6 +387,17 @@ class TunaiController extends Controller
public function updateRequestTeller($kodcaw,Request $request)
{
$harini = Carbon::now();
$audit = new Audit();
$audit->users = isset($request->khazanah) ? $request->khazanah : '' ;
$audit->norujukan = null;
$audit->actions = ($request->jenis == 'pendahuluan') ? "Pendahuluan Peti Besi" : "Serahan Peti Besi";
$audit->kodcaw = $kodcaw;
$audit->created_at = $harini;
$audit->updated_at = $harini;
$audit->save();
$requestteller = RequestTeller::on('mysql7')->where([['no','=',$request->no],['kodcaw','=',$kodcaw],['kodlaluan','=',$request->kodlaluan],['update','=',0]])->update(array(
'update' => 1
@@ -428,6 +452,16 @@ class TunaiController extends Controller
'update' => '0'
]);
$audit = new Audit();
$audit->users = $request->kodlaluan;
$audit->actions = ($request->modal == 0) ? "Serahan Modal" : "Pendahuluan Modal";
$audit->new_data = $reqteller;
$audit->kodcaw = $kodcaw;
$audit->created_at = $current;
$audit->updated_at = $current;
$audit->save();
return response()->json($reqteller,200);
}
app/Http/Controllers/VaultController.php
+57 -45
View File
@@ -5,6 +5,7 @@ use App\Vault;
use App\Cawangan;
use App\Tunai;
use App\AddTunai;
use App\Audit;
use App\GlDetail;
use App\imbangdugalama;
use App\GlCode;
@@ -20,7 +21,7 @@ class VaultController extends Controller
public function list($kodcaw)
{
$current = Carbon::now();
$current = new Carbon();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$vault=Vault::on($cawangan['mysql'])
@@ -29,7 +30,7 @@ class VaultController extends Controller
->orderby('tarikh','desc')->limit(1)->get();
return response()->json($vault);
}
public function listall($kodcaw)
@@ -45,7 +46,7 @@ class VaultController extends Controller
public function updateVault($kodcaw, Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$updateVault=Vault::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()],['kodcaw','=', $kodcaw]])->update(array(
@@ -62,7 +63,7 @@ class VaultController extends Controller
public function updateVaultPanjar($kodcaw, Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$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();
@@ -92,7 +93,7 @@ class VaultController extends Controller
public function updateVaultDeletePanjar($kodcaw, Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$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();
@@ -122,7 +123,7 @@ class VaultController extends Controller
public function updateVaultPendahuluanSerahan($kodcaw, Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$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();
@@ -167,7 +168,7 @@ class VaultController extends Controller
public function updateVaultDeletePendahuluanSerahan($kodcaw, Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$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();
@@ -203,12 +204,12 @@ class VaultController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$vault = Vault::on($cawangan['mysql'])->orderby('tarikh','desc')->first();
$vault = Vault::on($cawangan['mysql'])->orderby('tarikh','desc')->first();
if($vault)
{
$vaultcreate = Vault::on($cawangan['mysql'])->create([
$vaultcreate = Vault::on($cawangan['mysql'])->create([
'kodcaw'=>$request->kodcaw,
'tarikh'=> $current->toDateString(),
'bakiawal' => $vault['bakiakhir'],
@@ -230,12 +231,12 @@ class VaultController extends Controller
'rm50' => $vault['rm50'],
'rm100' => $vault['rm100'],
'rm1000' => $vault['rm1000'],
'totpanjar' => 0
'totpanjar' => 0
]);
}else{
$vaultcreate = Vault::on($cawangan['mysql'])->create([
$vaultcreate = Vault::on($cawangan['mysql'])->create([
'kodcaw'=>$request->kodcaw,
'tarikh'=> $current->toDateString(),
'bakiawal' => 0,
@@ -257,11 +258,11 @@ class VaultController extends Controller
'rm50' => 0,
'rm100' => 0,
'rm1000' => 0,
'totpanjar' => 0
'totpanjar' => 0
]);
}
return response()->json($vaultcreate,201);
}
@@ -274,7 +275,7 @@ class VaultController extends Controller
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$gldetail=GlDetail::on($cawangan['mysql'])->create([
$gldetail=GlDetail::on($cawangan['mysql'])->create([
'kodcaw' => $request->kodcaw,
'tarikh' => $current->toDateString(),
'dtacct' => '1000/020',
@@ -296,7 +297,7 @@ class VaultController extends Controller
if($request->jenisgldetail == 'pendahuluan')
{
$gldetail=GlDetail::on($cawangan['mysql'])->create([
$gldetail=GlDetail::on($cawangan['mysql'])->create([
'kodcaw' => $request->kodcaw,
'tarikh' => $current->toDateString(),
'dtacct' => $request->dtacct,
@@ -307,7 +308,7 @@ class VaultController extends Controller
]);
}else if($request->jenisgldetail == 'serahan')
{
$gldetail=GlDetail::on($cawangan['mysql'])->create([
$gldetail=GlDetail::on($cawangan['mysql'])->create([
'kodcaw' => $request->kodcaw,
'tarikh' => $current->toDateString(),
'dtacct' => $request->dtacct,
@@ -317,7 +318,7 @@ class VaultController extends Controller
'teller' => $request->teller
]);
}
return response()->json($gldetail,201);
@@ -326,21 +327,32 @@ class VaultController extends Controller
public function listgldetail($kodcaw,Request $request)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$current = Carbon::now();
$current = new Carbon();
$gldetail=GlDetail::on($cawangan['mysql'])
->where('kodcaw','=',$kodcaw)
->orderby('tarikh','desc')->get();
$audit = new Audit();
$audit->users = $request->teller;
$audit->actions = "test3";
$audit->new_data = $gldetail;
$audit->kodcaw = $kodcaw;
$audit->created_at = $current;
$audit->updated_at = $current;
$audit->save();
return response()->json($gldetail,200);
}
public function TunaiDiTangan($kodcaw,Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$current = new Carbon();
$totalbakiakhirtunai = 0;
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$vault=Vault::on($cawangan['mysql'])
->where('kodcaw','=',$kodcaw)
@@ -366,7 +378,7 @@ class VaultController extends Controller
{
$totalbakiakhirtunai = $vault['bakiakhir'];
}
return response()->json($totalbakiakhirtunai);
}
@@ -375,10 +387,10 @@ class VaultController extends Controller
$current = Carbon::now();
$current = new Carbon();
$current = new Carbon();
$totalbakiakhirtunai = 0;
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$vault=Vault::on($cawangan['mysql'])
->where('kodcaw','=',$kodcaw)
@@ -410,7 +422,7 @@ class VaultController extends Controller
$totalkeluar = $vault['keluar'] + $vault['serahan'] + $vault['totpanjar'];
$arraytunaiditangan = ['totalmasuk' => $totalmasuk, 'totalkeluar' => $totalkeluar];
return response()->json($arraytunaiditangan,200);
}
@@ -418,14 +430,14 @@ class VaultController extends Controller
public function laporanPetiBesi($kodcaw,$tarikh)
{
$current = Carbon::now();
$current = new Carbon();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$vault=Vault::on($cawangan['mysql'])
->where('kodcaw','=',$kodcaw)
->where('tarikh','=', $tarikh)
->orderby('tarikh','desc')->first();
return response()->json($vault);
}
@@ -492,7 +504,7 @@ class VaultController extends Controller
$totalserahan = $serahanpkbTawarruq + $serahanpkb + $serahanJMC;
}
//Selepas Tawarruq
@@ -501,7 +513,7 @@ class VaultController extends Controller
->where('ktacct','=',$pendahuluanpkb)
->where([['tarikh','<=', $request->tarikh],['tarikh','>','2021-03-24']])
->sum('pendahuluan');
//Sebelum Tawarruq
$pendahuluanPKB = GlDetail::on($cawangan['mysql'])
@@ -528,7 +540,7 @@ class VaultController extends Controller
if($kodcaw == '011229')
$totalserahan -= 0.10;
if($kodcaw == '011013')
$totalserahan += 641000;
@@ -588,17 +600,17 @@ class VaultController extends Controller
$totaljmc = $serahanJMC + $serahanjmclama;
$totalpkb = $serahanpkb + $serahanpkblama;
$totalserahan = $serahanpkbTawarruq + $totaljmc + $totalpkb;
}else{
$totaljmc = $serahanJMC;
$totalpkb = $serahanpkb;
$totalserahan = $serahanpkbTawarruq + $totaljmc + $totalpkb;
}
}else{
if($kodcaw == '020301')
@@ -627,7 +639,7 @@ class VaultController extends Controller
->where('ktacct','=',$pendahuluanpkb)
->where([['tarikh','>=', $mula],['tarikh','<=', $hingga],['tarikh','>','2021-03-24']])
->sum('pendahuluan');
//Sebelum Tawarruq
$pendahuluanPKB = GlDetail::on($cawangan['mysql'])
@@ -654,14 +666,14 @@ class VaultController extends Controller
->where('glcode','=',$serahankoperasi)
->sum('amaun');
}else{
$total = $pendahuluanPKBtawarruq + $pendahuluanPKB + $pendahuluanJMC;
$pindahkekpkb = 0;
}
$arraypend = ['pendahuluan' => $total,'serahan' => $totalserahan,'pindahkekpkb' => $pindahkekpkb];
return response()->json($arraypend);
@@ -670,15 +682,15 @@ class VaultController extends Controller
public function laporanPetiBesiRange($kodcaw,Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$vault=Vault::on($cawangan['mysql'])
->where('kodcaw','=',$kodcaw)
->where('tarikh','>=', $request->mula)
->where('tarikh','<=', $request->hingga)
->orderby('tarikh','desc')->get();
return response()->json($vault);
}
app/Http/Controllers/WakilController.php
+13 -1
View File
@@ -2,6 +2,7 @@
namespace App\Http\Controllers;
use App\Audit;
use App\WakilSurat;
use App\Cawangan;
@@ -44,6 +45,7 @@ class WakilController extends Controller
public function createSuratWakil($kodcaw, Request $request)
{
$harini = Carbon::now();
$cawangan = Cawangan::on('mysql7')->where('kodcaw', '=', $kodcaw)->first();
@@ -55,6 +57,16 @@ class WakilController extends Controller
]);
$audit = new Audit();
$audit->users = $request->nama;
$audit->actions = "Cetak Surat Wakil";
$audit->norujukan = $request->norujukan;
$audit->new_data = $wakil;
$audit->kodcaw = $kodcaw;
$audit->created_at = $harini;
$audit->updated_at = $harini;
$audit->save();
return response()->json($wakil);
}
@@ -77,7 +89,7 @@ class WakilController extends Controller
{
$current = Carbon::now();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw', '=', $kodcaw)->first();
routes/web.php
+13
View File
@@ -61,6 +61,18 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('customer/blacklist',['uses'=>'CustomerController@blacklistCustomer']);
$router->get('customer/eachcawangan/{ic}',['uses'=>'CustomerController@showCustomerByEachCawangan']);
//Change Password
$router->post('changepassword/{kodcaw}/{id}',['uses'=>'CustomerController@changepassword']);
//tukar cawangan
$router->post('/tukarcawangan/{kodcaw}', ['uses'=>'CustomerController@TukarCawangan']);
//pengesahan kakitangan
$router->post('/kakitangan/{kodcaw}', ['uses' => 'CustomerController@kakitangan']);
//tukar taraf
$router->get('tukartaraf/{kodcaw}/{role}',['uses'=>'CustomerController@TukarTaraf']);
//Gadai API
$router->get('gadai',['uses'=>'GadaiController@showAllGadais']);
$router->get('gadai/{noic}',['uses'=>'GadaiController@showOneGadai']);
@@ -119,6 +131,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
///Log session
$router->post('logsession/{kodcaw}',['uses'=>'LogController@logSession']);
$router->get('checknokp/{kodcaw}/{nokp}/{tarikh}',['uses'=>'LogController@checkNokpSession']);
$router->post('logoutsession/{kodcaw}',['uses'=>'LogController@logoutSession']);
//Tebus API
$router->get('tebustawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusTawarruq']);