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

Merge branch 'production' of https://bitbucket.org/arrahn-pkb/api_arrahn into annur-rebate

Browse Source
This commit is contained in:
nurafrinaalimi16
2025-01-26 12:56:45 +08:00
parent 91cbcf87db 94f64e53ab
commit 282e8705b2
41 changed files with 2928 additions and 531 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AdminPageController.php
+41 -8
View File
@@ -17,6 +17,7 @@ use App\AddTunai;
use App\TuntutBaki;
use App\Advansur;
use App\AkruNet;
use App\AkruNetPecahan;
use App\TransaksiKeuntungan;
use App\Bajet;
use App\BajetTahunan;
@@ -3111,7 +3112,7 @@ class AdminPageController extends Controller
}
public function AkruKeuntunganSebenar(Request $request){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$current = Carbon::now();
@@ -3181,11 +3182,14 @@ class AdminPageController extends Controller
// $total = $sum_keuntungan + $sum_bayaran + $summation_ansuran;
$lastDayPreviousMonth = $tarikh->subMonthsNoOverflow()->endOfMonth()->toDateString();
$get_imbangduga = imbangdugabackup::on($cawangan['mysql'])->where('tarikh',$lastDayPreviousMonth)->first()->toArray();
if(Carbon::parse($lastDayPreviousMonth)->year == Carbon::now()->year){
$get_imbangduga = imbangdugabackup::on($cawangan['mysql'])->where('tarikh',$lastDayPreviousMonth)->first();
$get_imbangduga = optional($get_imbangduga)->toArray() ?? [];
}
$collection_trans = Transaction::on('mysql7')
->leftJoin('transaksi_keuntungan as trans', function ($join) {
$join->on('transaction.norujukan', '=', 'trans.norujukan');
@@ -3224,7 +3228,9 @@ class AdminPageController extends Controller
return $transaction->trans_type !== 'A';
})->sum('keuntungan_rebet');
$total = $total_ansuran + $total_tebus + $get_imbangduga['keun_sebenar'];
$backdate_keun_sebenar = isset($get_imbangduga['keun_sebenar']) ? $get_imbangduga['keun_sebenar'] : 0;
$total = $total_ansuran + $total_tebus + $backdate_keun_sebenar;
return response()->json($total);
}
@@ -3673,11 +3679,11 @@ class AdminPageController extends Controller
$keuntungansebenar = ($keuntungan + $keuntunganreducing + $ansuran + $bukanansuran);
$previousYear = Carbon::now()->subYears(1);
$previousYear = Carbon::parse($request->tarikh)->subYears();
$get_norujukan = Gadai::on($cawangan['mysql'])
->selectRaw("norujukan,CASE WHEN (YEAR(t_gadai) = YEAR(t_update) and MONTH(t_gadai) = MONTH(t_update)) THEN '1' ELSE '0' END AS result")
->whereNotNull('hargajualan')->having('result','=',1)->whereYear('t_gadai','>=','2022')->whereYear('t_gadai','<=',$previousYear)->where('sttebus','<>','')->pluck('norujukan');
->whereNotNull('hargajualan')->having('result','=',1)->whereYear('t_gadai','>=','2022')->whereYear('t_gadai','<=','2023')->where('sttebus','<>','')->pluck('norujukan');
$sum_keun = Transaction::on('mysql7')
->selectRaw("trans.norujukan,SUM(CASE WHEN (transaction.trans_type) <> 'A' THEN (trans.keuntungan_rebet) ELSE 0 END) AS sum_keun,SUM(CASE WHEN (transaction.trans_type) = 'A' THEN (trans.bayaran_keuntungan) ELSE 0 END) AS sum_bayaran")
@@ -3693,11 +3699,38 @@ class AdminPageController extends Controller
$total_keuntungan_sebenar = $sum_keuntungan + $sum_bayaran;
$backdate_keun_sebenar = 0;
$recentDate = Carbon::now()->subYear();
while ($recentDate->year > 2023) {
$exception_case = 0;
$lastDayOfYear = $recentDate->endOfYear()->toDateString();
$get_imbangduga = imbangdugabackup::on($cawangan['mysql'])->where('tarikh', $lastDayOfYear)->first();
$get_imbangduga = optional($get_imbangduga)->toArray() ?? [];
if(empty($get_imbangduga)){
$requestData = new Request([
'tarikh' => $request->tarikh,
'kodcaw' => $kodcaw,
]);
$exception_case = $this->AkruKeuntunganSebenar($requestData);
}
$backdate_keun_sebenar += isset($get_imbangduga['keun_sebenar']) ? $get_imbangduga['keun_sebenar'] : 0;
$backdate_keun_sebenar += $exception_case;
$recentDate->subYear()->startOfYear();
}
$total_keuntungan_sebenar = $sum_keuntungan + $sum_bayaran + $backdate_keun_sebenar;
$available_akru = AkruNet::on($cawangan['mysql'])
->where('tahun','<=',$previousYear->year)
->sum('jumlah');
$total = ($utgrugilama + $lelong + $upahsimpantebus + $upahsimpanlelong + $upahsimpanansur + $gstcajlelong + $keuntungansebenar + $upahsimpankeuntungansebelumtawarruq + $available_akru + $total_keuntungan_sebenar) + $parameter;
$akru_ujrah = AkruNetPecahan::on($cawangan['mysql'])->where('tahun','<=',$previousYear->year)->sum('pend_akru_ujrah');
$akru_1percent = AkruNetPecahan::on($cawangan['mysql'])->where('tahun','<=',$previousYear->year)->sum('pend_akru_1persen');
$total = ($utgrugilama + $lelong + $upahsimpantebus + $upahsimpanlelong + $upahsimpanansur + $gstcajlelong + $keuntungansebenar + $upahsimpankeuntungansebelumtawarruq + $available_akru + $total_keuntungan_sebenar + $akru_ujrah + $akru_1percent) + $parameter;
if($kodcaw == '011229')
$total -= 45390.37;
app/Http/Controllers/CustomerController.php
+138 -50
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);
}
@@ -344,6 +345,7 @@ class CustomerController extends Controller
'nosiri'=>$request->nosiri,
'nota'=>$request->nota,
'kodkerja'=>$request->kodkerja,
'nota_pekerjaan'=>$request->nota_pekerjaan,
'tujuangadai'=>$request->tujuangadai
]);
@@ -361,10 +363,12 @@ class CustomerController extends Controller
'poskod' => $request->poskod,
'koddaerah' => $poskod['koddaerah'],
'kodnegeri' => $poskod['kodnegeri'],
'kodkerja'=>$request->kodkerja,
'nota_pekerjaan'=>$request->nota_pekerjaan,
'telefon' => $request->telefon1,
'telefon2' => $request->telefon2
));
return response()->json($customer_update, 200);
}
@@ -376,7 +380,7 @@ class CustomerController extends Controller
$poskod = Poskod::on('mysql7')->where('poskod','=',$request->poskod)->first();
$customer_info = DB::connection('mysql7')->table('customer')
->select('kodcaw','tarikhdaftar','nopelanggan','kpbaru','kplama','nama','t_lahir','jantina','alamat1','poskod','telefon','telefon2')
->select('kodcaw','kodkerja','nota_pekerjaan','tarikhdaftar','nopelanggan','kpbaru','kplama','nama','t_lahir','jantina','alamat1','poskod','telefon','telefon2')
->where('kplama','=',$nokp)
->orWhere('kpbaru','=',$nokp)
->get()->toArray();
@@ -391,6 +395,9 @@ class CustomerController extends Controller
'telefon' => $request->telefon1,
'telefon2' => $request->telefon2,
'kodbank' => $request->kodbank,
'kodkerja' => $request->kodkerja,
// 'nota_pekerjaan' => $request->nota_pekerjaan,
'nota_pekerjaan' => $request->kodkerja === '6' ? $request->nota_pekerjaan : null,
'noakaun' => $request->noakaun,
'nota' => $request->nota,
'alamat1' => $request->alamat,
@@ -402,13 +409,13 @@ class CustomerController extends Controller
if($customer_update)
{
$customer_info_new = DB::connection('mysql7')->table('customer')
->select('kodcaw','tarikhdaftar','nopelanggan','kpbaru','kplama','nama','t_lahir','jantina','alamat1','poskod','telefon','telefon2')
->select('kodcaw','kodkerja','nota_pekerjaan','tarikhdaftar','nopelanggan','kpbaru','kplama','nama','t_lahir','jantina','alamat1','poskod','telefon','telefon2')
->where('kplama','=',$nokp)
->orWhere('kpbaru','=',$nokp)
->get()->toArray();
$new_data = json_encode($customer_info_new);
$audit_customer = DB::connection('mysql7')
->table('audit_customer')
->insert([
@@ -431,11 +438,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{
@@ -457,6 +464,8 @@ class CustomerController extends Controller
'telefon' => $request->telefon1,
'telefon2' => $request->telefon2,
'kodbank' => $request->kodbank,
'kodkerja' => $request->kodkerja,
'nota_pekerjaan' => $request->nota_pekerjaan,
'noakaun' => $request->noakaun,
'nota' => $request->nota,
'nama' => $request->nama,
@@ -476,7 +485,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 +499,7 @@ class CustomerController extends Controller
'customer_nokp' => $nokp,
]);
}
DB::connection('mysql7')->commit();
@@ -500,8 +509,8 @@ class CustomerController extends Controller
DB::connection('mysql7')->rollback();
return response()->json($e->getMessage(),400);
}
}
}
public function customerUpdateAdmin(Request $request){
@@ -521,12 +530,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 +610,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 +624,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 +669,7 @@ class CustomerController extends Controller
return response('Deleted Successfully', 200);
}
public function akaunBankMobile($nokp)
{
$customer_detail = [];
@@ -672,7 +681,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 +689,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 +711,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 +770,7 @@ class CustomerController extends Controller
}
public function blacklistCustomer(Request $request){
$blacklist = Blacklist::where('nokp',$request->nokp)->first();
return response()->json($blacklist);
@@ -778,8 +787,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 +814,9 @@ class CustomerController extends Controller
return response()->json($dataCustomer);
}
public function AdminsearchCustomerByName(Request $request)
{
{
$nama = strtoupper($request->nama);
if(empty($nama))
@@ -821,12 +830,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 +850,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/DenominasiController.php
+38 -1
View File
@@ -5,12 +5,49 @@ namespace App\Http\Controllers;
use App\CawanganDetail;
use App\Cawangan;
use App\Denominasi;
use App\Services\CashFlow\TellerServices;
use Illuminate\Http\Request;
use App\Services\Miscellaneous\PanjarServices;
use Log;
use Carbon\Carbon;
class DenominasiController extends Controller
{
public function cashdeposit($kodcaw,Request $request){
$teller = new TellerServices($kodcaw);
$response = $teller->CashDeposit($request);
return response()->json($response);
}
public function cashwithdraw($kodcaw,Request $request){
$teller = new TellerServices($kodcaw);
$response = $teller->CashWithdrawals($request);
return response()->json($response);
}
public function createpanjar($kodcaw,Request $request){
$teller = new PanjarServices($kodcaw);
$response = $teller->create($request);
return response()->json($response);
}
public function deletepanjar($kodcaw,Request $request){
$teller = new PanjarServices($kodcaw);
$response = $teller->delete($request);
return response()->json($response);
}
public function getPerubatanAmount($kodcaw,Request $request){
$teller = new PanjarServices($kodcaw);
$response = $teller->getPerubatanAmount($request->tuntutoleh);
return response()->json($response);
}
public function listdenominasi($kodcaw)
{
$current = Carbon::now();
app/Http/Controllers/GadaiController.php
+315 -195
View File
@@ -35,7 +35,7 @@ use Illuminate\Http\Request;
use App\Services\MasterServices;
use App\Support\OnePercent;
use App\Services\Transaction\AnsuranServices as AnsServ;
use Log;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\DB;
@@ -49,10 +49,16 @@ class GadaiController extends Controller
}
public function gadaiTransactionByCawanganAndDay($cawangan_code,$date){
try{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$cawangan_code)->first();
$gadaiTransaction = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$date)->orderBy('sirig', 'desc')->first();
}catch(\Exception $e){
Log::debug($e);
Log::debug($cawangan_code);
return response()->json('error');
}
return response()->json($gadaiTransaction);
}
@@ -132,7 +138,7 @@ class GadaiController extends Controller
}
public function create($kodcaw,Request $request){
$master = new MasterServices($kodcaw);
$response = $master->createGadai($request);
@@ -356,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();
@@ -392,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)
@@ -400,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);
}
@@ -582,7 +600,7 @@ class GadaiController extends Controller
"ujrah"=> $gadaiData['ujrah'],
"onepercent"=> $gadaiData['onepercent'],
"tagbaru"=> $gadaiData['tagbaru']
]);
}
}
@@ -1073,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
@@ -1132,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,
@@ -2017,159 +2035,188 @@ class GadaiController extends Controller
$audit->updated_at = $current;
$audit->save();
if($gadai[0]['historygadaian'] != "0" && $gadai[0]['historygadaian'] != '')
{
if($tebus['tagterima'] == 1)
try{
DB::connection($cawangan['mysql'])->beginTransaction();
DB::connection('mysql7')->beginTransaction();
if($gadai[0]['historygadaian'] != "0" && $gadai[0]['historygadaian'] != '')
{
if($tebus['jenistebus'] == 'P')
if($tebus['tagterima'] == 1)
{
if($tebus['jenistebus'] == 'P')
{
$totalkeluar = $keluar - ($tebus['addpinjaman'] + $tebus['pinjaman']);
$totalmasuk = $masuk - ($tebus['bakiupah'] + $tebus['pinjaman']);
$totalkeluar = $keluar - ($tebus['addpinjaman'] + $tebus['pinjaman']);
$totalmasuk = $masuk - ($tebus['bakiupah'] + $tebus['pinjaman']);
// $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
$bakiakhir = $baki - $tebus['bakiupah'] + $tebus['addpinjaman'];
// $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
$bakiakhir = $baki - $tebus['bakiupah'] + $tebus['addpinjaman'];
$updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
update(array(
'keluar' => $totalkeluar,
'masuk' => $totalmasuk,
'baki' => $bakiakhir
));
$updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
update(array(
'keluar' => $totalkeluar,
'masuk' => $totalmasuk,
'baki' => $bakiakhir
));
}else{
$totalmasuk = $masuk - ($tebus['pinjaman']+$tebus['bakiupah']);
$totalkeluar = $keluar - (($tebus['pinjaman'] + $tebus['bakiupah']) - $tebus['bakipjm']);
// $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
if($tebus['jenistebus'] == 'S')
$bakiakhir = $baki - $tebus['bakipjm'];
else
$bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
$updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
update(array(
'keluar' => $totalkeluar,
'masuk' => $totalmasuk,
'baki' => $bakiakhir
));
}
}else{
$totalmasuk = $masuk - ($tebus['pinjaman']+$tebus['bakiupah']);
$totalkeluar = $keluar - (($tebus['pinjaman'] + $tebus['bakiupah']) - $tebus['bakipjm']);
// $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
$bakiakhir = $baki;
if($tebus['jenistebus'] == 'S')
$bakiakhir = $baki - $tebus['bakipjm'];
else
$bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
if($tebus['jenistebus'] == 'P')
{
$updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
update(array(
'keluar' => $totalkeluar,
'masuk' => $totalmasuk,
'baki' => $bakiakhir
));
$bakiakhir = $bakiakhir - $tebus['bakiupah'] + $tebus['addpinjaman'];
$updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
update(array(
'keluar' => $keluar,
'masuk' => $masuk,
'baki' => $bakiakhir
));
}else{
$totalmasuk = $masuk;
$totalkeluar = $keluar;
if($tebus['jenistebus'] == 'S')
$bakiakhir = ($bakiakhir - $tebus['bakipjm']);
else
$bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
$updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
update(array(
'keluar' => $keluar,
'masuk' => $masuk,
'baki' => $bakiakhir
));
}
}
}else{
$bakiakhir = $baki;
if($tebus['jenistebus'] == 'P')
Gadai::on($cawangan['mysql'])->where('norujukan','=',$gadai[0]['historygadaian'])->update(['sttebus' => '']);
$saved_historygadaian = $gadai[0]['historygadaian'];
Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$gadai[0]['historygadaian'])->orderBy('id', 'desc')->limit(1)->delete();
Transaction::on('mysql7')->where('norujukan','=',$gadai[0]['historygadaian'])->orderBy('id', 'desc')->limit(1)->delete();
Tebus::on($cawangan['mysql'])->where('norujukan','=',$gadai[0]['historygadaian'])->delete();
Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
$gadaiDouble = Gadai::on($cawangan['mysql'])->where([['historygadaian',$gadai[0]['historygadaian']],['norujukan','<>',$gadai[0]['historygadaian']]])->pluck('norujukan');
if($gadaiDouble){
$isGadaianTawarruq = $saved_historygadaian !== '0' || $saved_historygadaian !== null || $saved_historygadaian !== '';
if($isGadaianTawarruq){
$this->batalKomuditiTawarruq($norujukan);
Gadai::on($cawangan['mysql'])->where('norujukan', $norujukan)->delete();
Marhun::on($cawangan['mysql'])->where('norujukan', $norujukan)->delete();
} else {
Gadai::on($cawangan['mysql'])->whereIn('norujukan',$gadaiDouble)->delete();
Marhun::on($cawangan['mysql'])->whereIn('norujukan',$gadaiDouble)->delete();
$this->batalKomuditi($gadai[0]['historygadaian'],$cawangan['mysql']);
}
}
// return response('Deleted Successfully', 200);
}
else
{
if($gadai[0]['semakbarcode'] == 'Lulus')
{
$totalkeluar = $keluar - $gadai[0]['pinjaman'];
$bakiakhir = $bakiakhir - $tebus['bakiupah'] + $tebus['addpinjaman'];
$bakiakhir = $baki;
$bakiakhir += $gadai[0]['pinjaman'];
$updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
update(array(
'keluar' => $keluar,
'masuk' => $masuk,
'baki' => $bakiakhir
'keluar' => $totalkeluar,
'masuk' => $masuk,
'baki' => $bakiakhir
));
}else{
$totalmasuk = $masuk;
$totalkeluar = $keluar;
$bakiakhir = $baki;
if($tebus['jenistebus'] == 'S')
$bakiakhir = ($bakiakhir - $tebus['bakipjm']);
else
$bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
$bakiakhir += $gadai[0]['pinjaman'];
$updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
update(array(
'keluar' => $keluar,
'masuk' => $masuk,
'baki' => $bakiakhir
'keluar' => $keluar,
'masuk' => $masuk,
'baki' => $bakiakhir
));
}
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();
// return response('Deleted Successfully', 200);
}
$array_response = [
'result' => 'success',
'data' => 1
];
Gadai::on($cawangan['mysql'])->where('norujukan','=',$gadai[0]['historygadaian'])->update(['sttebus' => '']);
DB::connection($cawangan['mysql'])->commit();
DB::connection('mysql7')->commit();
return response()->json($array_response);
}catch(\Exception $e){
DB::connection($cawangan['mysql'])->rollBack();
DB::connection('mysql7')->rollBack();
$array_response = [
'result' => 'error',
'data' => $e->getMessage()
];
$saved_historygadaian = $gadai[0]['historygadaian'];
Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$gadai[0]['historygadaian'])->orderBy('id', 'desc')->limit(1)->delete();
Transaction::on('mysql7')->where('norujukan','=',$gadai[0]['historygadaian'])->orderBy('id', 'desc')->limit(1)->delete();
Tebus::on($cawangan['mysql'])->where('norujukan','=',$gadai[0]['historygadaian'])->delete();
Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
$gadaiDouble = Gadai::on($cawangan['mysql'])->where([['historygadaian',$gadai[0]['historygadaian']],['norujukan','<>',$gadai[0]['historygadaian']]])->pluck('norujukan');
if($gadaiDouble){
$isGadaianTawarruq = $saved_historygadaian !== '0' || $saved_historygadaian !== null || $saved_historygadaian !== '';
if($isGadaianTawarruq){
$this->batalKomuditiTawarruq($norujukan);
Gadai::on($cawangan['mysql'])->where('norujukan', $norujukan)->delete();
Marhun::on($cawangan['mysql'])->where('norujukan', $norujukan)->delete();
} else {
Gadai::on($cawangan['mysql'])->whereIn('norujukan',$gadaiDouble)->delete();
Marhun::on($cawangan['mysql'])->whereIn('norujukan',$gadaiDouble)->delete();
$this->batalKomuditi($gadai[0]['historygadaian'],$cawangan['mysql']);
}
}
return response('Deleted Successfully', 200);
}
else
{
if($gadai[0]['semakbarcode'] == 'Lulus')
{
$totalkeluar = $keluar - $gadai[0]['pinjaman'];
$bakiakhir = $baki;
$bakiakhir += $gadai[0]['pinjaman'];
$updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
update(array(
'keluar' => $totalkeluar,
'masuk' => $masuk,
'baki' => $bakiakhir
));
}else{
$bakiakhir = $baki;
$bakiakhir += $gadai[0]['pinjaman'];
$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)->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();
return response('Deleted Successfully', 200);
Log::error('Transaction failed', [
'exception' => $e->getMessage(),
'line' => $e->getLine(),
'file' => $e->getFile(),
]);
return response()->json($array_response);
}
}
@@ -2202,6 +2249,7 @@ class GadaiController extends Controller
$transaksi_asal = KomuditiTransaksi::on('mysql7')->whereIn('norujukan','=',$gadaiDouble)->sum('unit_komuditi');
$unit_current = $komuditi_current['unit_komuditi'];
$update_unit = $unit_current + $transaksi_asal['unit_komuditi'];
@@ -2239,82 +2287,109 @@ class GadaiController extends Controller
$bakiakhir = $baki;
$totalkeluar = 0;
if($gadai){
return response('Bukan-Tebus', 200);
}else{
$audit = new Audit();
$audit->users = $request->kodlaluan;
$audit->actions = 'Hapus Tebus';
$audit->norujukan = $norujukan;
$audit->old_data = $gadai;
$audit->kodcaw = $kodcaw;
$audit->created_at = $current;
$audit->updated_at = $current;
$audit->save();
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
));
Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
InOutMar::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();
Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(['sttebus' => '']);
return response('Deleted Successfully', 200);
}
else
return response('Bukan-Tebus', 200);
try{
if($gadai){
return response('Bukan-Tebus', 200);
}else{
DB::connection($cawangan['mysql'])->beginTransaction();
DB::connection('mysql7')->beginTransaction();
if($tebus[0]['jenistebus'] == 'T')
$audit = new Audit();
$audit->users = $request->kodlaluan;
$audit->actions = 'Hapus Tebus';
$audit->norujukan = $norujukan;
$audit->old_data = $gadai;
$audit->kodcaw = $kodcaw;
$audit->created_at = $current;
$audit->updated_at = $current;
$audit->save();
if($tebus[0]['tagterima'] == 1)
{
if($tebus[0]['jenistebus'] == 'T')
{
$totalmasuk = $masuk - $tebus[0]['bakipjm'];
$bakiakhir = $bakiakhir - $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' => $masuk,
'baki' => $bakiakhir
));
$updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
update(array(
'keluar' => $keluar,
'masuk' => $totalmasuk,
'baki' => $bakiakhir
));
Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
InOutMar::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();
Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(['sttebus' => '']);
DB::connection($cawangan['mysql'])->commit();
DB::connection('mysql7')->commit();
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
));
Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
InOutMar::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
InOutMar::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
TransaksiKeuntungan::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();
Transaction::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(['sttebus' => '']);
Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(['sttebus' => '']);
return response('Deleted Successfully', 200);
DB::connection($cawangan['mysql'])->commit();
DB::connection('mysql7')->commit();
return response('Deleted Successfully', 200);
}
else
return response('Bukan-Tebus', 200);
}
else
return response('Bukan-Tebus', 200);
}
return response()->json($array_response);
}catch(\Exception $e){
DB::connection($cawangan['mysql'])->rollBack();
DB::connection('mysql7')->rollBack();
$array_response = [
'result' => 'error',
'data' => $e->getMessage()
];
Log::error('Transaction failed', [
'exception' => $e->getMessage(),
'line' => $e->getLine(),
'file' => $e->getFile(),
]);
return response()->json($array_response);
}
}
public function senaraiLelong($kodcaw,Request $request){
@@ -3007,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){
@@ -3083,6 +3158,51 @@ class GadaiController extends Controller
$current = Carbon::now();
$current = new Carbon();
if($request->kodcaw == 'GC'){
$transaksi_data = [];
TransaksiKeuntungan::on('mysql7')
->where('tarikh_bayaran', '<=', $daterequest)
->where('kodcaw', $request->kodcaw)
->chunk(1000, function ($transactions) use (&$transaksi_data) {
$transaksi_data = array_merge($transaksi_data, $transactions->pluck('norujukan')->toArray());
});
$gadaiData = [];
$chunkedTransaksiData = array_chunk($transaksi_data, 1000);
foreach ($chunkedTransaksiData as $chunk) {
Gadai::on($cawangan['mysql'])
->whereIn('norujukan', $chunk)
->where(function ($query) use ($request) {
$query->where([
['sttebus', '=', ''],
['hargajualan', '<>', null]
])
->orWhere([
['sttebus', '!=', ''],
['t_update', '>', $request->tarikh],
['hargajualan', '<>', null]
]);
})
->orderBy('norujukan')
->chunk(1000, function ($gadaiChunk) use (&$gadaiData) {
$gadaiData = array_merge($gadaiData, $gadaiChunk->pluck('norujukan')->toArray());
});
}
$totalPembiayaan = 0;
$chunkedGadaiData = array_chunk($gadaiData, 1000);
foreach ($chunkedGadaiData as $chunk) {
$totalPembiayaan += TransaksiKeuntungan::on('mysql7')
->whereIn('norujukan', $chunk)
->where('tarikh_bayaran', '<=', $daterequest)
->sum('bayaran_pembiayaan');
}
return response($totalPembiayaan);
}
$transaksi_data = TransaksiKeuntungan::on('mysql7')
->where('tarikh_bayaran' ,'<=', $daterequest)
->where('kodcaw',$request->kodcaw)
@@ -3278,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');
@@ -3647,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/LaporanController.php
+34 -18
View File
@@ -27,6 +27,7 @@ use App\imbangdugalama;
use App\Services\Reports\ImbangDugaService;
use App\Services\Reports\Account\GeneralLedger;
use Illuminate\Support\Facades\Log;
use DateTime;
use Illuminate\Support\Facades\DB;
@@ -50,7 +51,7 @@ class LaporanController extends Controller
$bayaranonline = $bayaranonlinequery->sum('duit_masuk');
$bilbayaranonline = $bayaranonlinequery->count();
$ansurankaunter = TransaksiKeuntungan::on('mysql7')
->leftJoin('transaction as trans', function($join)
{
@@ -108,7 +109,7 @@ class LaporanController extends Controller
$total_keuntunganansuran_kaunter = $keuntunganansuran_kaunter_query->sum('bayaran_keuntungan');
$bil_keuntunganansuran_kaunter = $keuntunganansuran_kaunter_query->count();
// $total_keuntunganansuran = 0;
// if($total_keuntunganansuran_data){
// foreach($total_keuntunganansuran_data as $index=>$total_keuntunganansuranData){
@@ -167,7 +168,7 @@ class LaporanController extends Controller
// ->pluck('transaksi_keuntungan.norujukan');
// dd($total_keuntunganbukanansuran_data_kaunter);
// $gadaiDataKaunter = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$total_keuntunganbukanansuran_data_kaunter)->whereNotNull('hargajualan')->pluck('norujukan');
@@ -245,7 +246,6 @@ class LaporanController extends Controller
$keuntungan_kaunter = $keuntungan_kaunter_query->sum('bayaran_keuntungan');
$bil_keuntungan_kaunter = $keuntungan_kaunter_query->count();
// $keuntungan = 0;
@@ -364,7 +364,7 @@ class LaporanController extends Controller
$panjar_harian = Panjar::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->sum('bayaran');
$panjar_bulanan = Panjar::on($cawangan['mysql'])->where([['tarikh','<=',$request->tarikh],['tarikh','>=',$firstDay]])->sum('bayaran');
$panjar_tahunan = Panjar::on($cawangan['mysql'])->where([['tarikh','<=',$request->tarikh],['tarikh','>=',$firstDayYear]])->sum('bayaran');
//e
$tarikhtawarruq = '';
@@ -497,21 +497,37 @@ class LaporanController extends Controller
$daterequest = new Carbon($request->tarikh);
$daterequest->addDays(1);
$bayaranpendahuluan_data = TransaksiKeuntungan::on('mysql7')
->where('tarikh_bayaran' ,'<=', $daterequest)
->where('kodcaw',$request->kodcaw)
->pluck('norujukan');
// $bayaranpendahuluan_data = TransaksiKeuntungan::on('mysql7')
// ->where('tarikh_bayaran' ,'<=', $daterequest)
// ->where('kodcaw',$request->kodcaw)
// ->pluck('norujukan');
$gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$bayaranpendahuluan_data)
->where([['sttebus',''],['hargajualan','<>','null']])
->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['hargajualan','<>','null']])
->pluck('norujukan');
// $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$bayaranpendahuluan_data)
// ->where([['sttebus',''],['hargajualan','<>','null']])
// ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['hargajualan','<>','null']])
// ->pluck('norujukan');
$bayaranpendahuluan = TransaksiKeuntungan::on('mysql7')
->whereIn('norujukan',$gadaiData)
->where('tarikh_bayaran' ,'<=', $daterequest)
->sum('bayaran_pembiayaan');
//$bayaranpendahuluan = TransaksiKeuntungan::on('mysql7')
// ->whereIn('norujukan',$gadaiData)
// ->where('tarikh_bayaran' ,'<=', $daterequest)
// ->sum('bayaran_pembiayaan');
$date = new Carbon($request->tarikh);
$lastDayPreviousMonth = $date->subMonthsNoOverflow()->endOfMonth()->toDateString();
$get_imbangduga = imbangdugabackup::on($cawangan['mysql'])->where('tarikh',$lastDayPreviousMonth)->first()->toArray();
$start = new Carbon($request->tarikh);
$start_date = $start->startOfMonth()->toDateString();
//$general_ledger = new GeneralLedger($request->kodcaw,$start_date,$request->tarikh);
//$bayaran_pendahuluan = $general_ledger->getBayaranPendahuluan();
//$total_bayaran_current = $bayaran_pendahuluan['keluar'] - $bayaran_pendahuluan['masuk'];
// Log::info($bayaran_pendahuluan);
// $bayaranpendahuluan = $get_imbangduga['bayaranpendahuluan'] + $total_bayaran_current;
$bayaranpendahuluan = 0;
//$bayaranpendahuluan = 0;
// $bayaranpendahuluan = 0;
app/Http/Controllers/LelongController.php
+61 -43
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);
}
@@ -259,6 +276,7 @@ class LelongController extends Controller
if($kodcaw == 'GC'){
$bakilelong += 2135.75;
$bakilelong -= 3; //added 15/10/2024 sebab ada kemusykilan 3 ringgit daripada rugi lelong
}
$arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal];
@@ -598,11 +616,11 @@ class LelongController extends Controller
if($cawangan['tagarrahnbid'] == 1){
if(env('APP_ENV') != 'production'){
$link = 'https://niklah.arrahn.com.my/api/portalApi';
$link = 'http://niklah.arrahn.com.my/api/portalApi';
}else{
$link = 'http://adminbid.arrahn/api/portalApi';
}
$lelong = Http::withOptions(['verify' => true])->get($link,[
'norujukan' => $request->norujukan
])->json();
@@ -623,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);
@@ -662,7 +680,7 @@ class LelongController extends Controller
}
else{
$lelong = Lelong::on($cawangan['mysql'])
->where('norujukan', '=', $request->norujukan)
->select('norujukan', 't_lelong')
@@ -970,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)
@@ -985,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);
@@ -1031,7 +1049,7 @@ class LelongController extends Controller
->orderBy('gadai.sirig','asc')
->where('gadai.taglel','=', 1);
}
$lelonglist = $lelong->get();
foreach($lelonglist as $index=>$lel)
@@ -1106,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
@@ -1208,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);
@@ -1323,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')
@@ -1334,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');
@@ -1366,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')
@@ -1376,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'])
@@ -1385,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);
@@ -1403,7 +1421,7 @@ class LelongController extends Controller
// dd($lelong);
}
return response()->json($lelong);
}
@@ -1421,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')
@@ -1430,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'])
@@ -1441,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,
@@ -1464,7 +1482,7 @@ class LelongController extends Controller
// dd($lelong);
}
return response()->json($lelong);
}
@@ -1482,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')
@@ -1491,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'])
@@ -1502,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'])
@@ -1525,7 +1543,7 @@ class LelongController extends Controller
// dd($lelong);
}
return response()->json($lelong);
}
@@ -1543,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')
@@ -1554,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');
@@ -1586,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')
@@ -1596,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'])
@@ -1607,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'])
@@ -1629,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();
@@ -1655,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];
@@ -1664,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();
@@ -1697,7 +1715,7 @@ class LelongController extends Controller
->first();
$onepercentservices = new Calculation();
// $cawangan = $kodcaw;
$gadai_data = Gadai::on($cawangan['mysql'])
@@ -1712,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($logoutsession);
}
}
app/Http/Controllers/PekerjaanController.php
+1 -1
View File
@@ -12,4 +12,4 @@ class PekerjaanController extends Controller
return response()->json($kerja);
}
}
}
app/Http/Controllers/PolisController.php
+16 -6
View File
@@ -108,12 +108,22 @@ class PolisController extends Controller
return response()->json(['error' => 'Invalid kodcaw'], 403);
}
$polis = Polis::on($cawangan['mysql'])
->where('komen1','=',$request->alasan)
// ->where('tarikh','=',$request->tarikh)
->whereBetween('tarikh', [$request->tarikh_mula, $request->tarikh_akhir])
->get();
if($request->alasan == 'all'){
$polis = Polis::on($cawangan['mysql'])
->select('gadai.sttebus','gadai.t_update','gadai.norujukan','gadai.nokp','polis.komen1','polis.komen2','polis.tarikh','polis.teller','polis.caj','polis.kodnegeri','polis.koddaerah','polis.tebus')
->join('gadai','gadai.norujukan','=','polis.norujukan')
->whereBetween('polis.tarikh', [$request->tarikh_mula, $request->tarikh_akhir])
->get();
}else{
$polis = Polis::on($cawangan['mysql'])
->select('gadai.sttebus','gadai.t_update','gadai.norujukan','gadai.nokp','polis.komen1','polis.komen2','polis.tarikh','polis.teller','polis.caj','polis.kodnegeri','polis.koddaerah','polis.tebus')
->join('gadai','gadai.norujukan','=','polis.norujukan')
->where('komen1','=',$request->alasan)
// ->where('tarikh','=',$request->tarikh)
->whereBetween('polis.tarikh', [$request->tarikh_mula, $request->tarikh_akhir])
->get();
}
return response()->json($polis);
}
app/Http/Controllers/Reports/BalanceSheetsController.php
+2 -2
View File
@@ -31,8 +31,8 @@ class BalanceSheetsController extends Controller
}
public function updateIGBalanceSheets(Request $request){
$cawangan = Cawangan::on('mysql7')->where('zone','<>',1)->get();
$date = Carbon::now()->month($request->month);
$cawangan = Cawangan::on('mysql7')->where('version','v2')->get();
$date = Carbon::create($request->year)->month($request->month);
$lastDay = (clone $date)->endOfMonth();
try{
app/Http/Controllers/Reports/RingkasanHarianController.php
+5 -2
View File
@@ -16,9 +16,12 @@ class RingkasanHarianController extends Controller
$reportRingkasanHarianService = new ReportRingkasanHarianService($kod_cawangan, $request);
$reportKawalanStokService = new KawalanStokService($kod_cawangan, $request);
$ringkasan_report = $reportRingkasanHarianService->getLaporanCawangan()->getContent();
$ringkasan_kawalan = $reportKawalanStokService->getLaporanCawangan()->getContent();
$reports = [
'reportRingkasanHarian' => $reportRingkasanHarianService->getLaporanCawangan(),
'reportKawalanStok' => $reportKawalanStokService->getLaporanCawangan(),
'reportRingkasanHarian' => json_decode($ringkasan_report),
'reportKawalanStok' => json_decode($ringkasan_kawalan),
];
return response()->json($reports);
app/Http/Controllers/TebusController.php
+65 -47
View File
@@ -182,6 +182,13 @@ class TebusController extends Controller
return $response;
}
public function tebusUpdateTambahPinjaman($kodcaw,$norujukan,Request $request){
$master = new MasterServices($kodcaw);
$response = $master->tebusUpdateTambahPinjaman($kodcaw,$norujukan,$request);
return $response;
}
public function getLaporanTebus($kodcaw,$tarikh){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
@@ -224,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']
]);
@@ -301,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']
@@ -314,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);
}
@@ -371,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,
@@ -395,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');
@@ -408,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');
@@ -435,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,
@@ -479,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();
@@ -492,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');
@@ -529,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'])
@@ -752,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);
@@ -1449,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)
@@ -1657,7 +1675,7 @@ class TebusController extends Controller
return response(0);
}
public function calculationKeuntunganPenggadai($kodcaw,Request $request)
{
@@ -1672,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]])
@@ -1687,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);
}
@@ -1717,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;
}
}
@@ -1733,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;
@@ -1799,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){
@@ -1810,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)
{
@@ -1844,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();
@@ -1871,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);
@@ -1891,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();
@@ -1914,10 +1932,10 @@ class TebusController extends Controller
$akrunet->save();
}
}
$total_accrual_net = $jumlahakru + ($accrual_net - $total);
}
return response()->json($total_accrual_net);
}
@@ -1928,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');
@@ -1970,7 +1988,7 @@ class TebusController extends Controller
/* Keuntungan Lelong */
$upahlelong = Lelong::on($cawangan['mysql'])
->where([['t_jual', '>=', $firstMonth], ['t_jual', '<=', $lastMonth], ['t_jual', '>', '2022-07-24']])
->where([['tagujrah','0'],['t_jual', '>=', $firstMonth], ['t_jual', '<=', $lastMonth], ['t_jual', '>', '2022-07-24']])
->whereYear('t_jual', '=', $currentDate->year)
->sum('bakiupah');
app/Http/Controllers/TransactionOnlineController.php
+1 -1
View File
@@ -438,7 +438,7 @@ class TransactionOnlineController extends Controller
} else {
$onepercent = new OnePercentServices();
$keuntungan = $onepercent->kiraanKeuntunganSebenar($gadai['bakipjm'], $gadai['nilaimarhun'], $gadai['kadarupah'], $margin_semasa);
$keuntungan = $onepercent->kiraanKeuntunganRebet($gadai['bakipjm'], $gadai['nilaimarhun'], $gadai['kadarupah'], $gadai['margin_semasa']);
$ujrahasal = $onepercent->kiraanUjrahSebenar($gadai['nilaimarhun'], $gadai['kadarupah'], $gadai['percentpinj']);
$onepercentasal = $gadai['pinjaman'] * (1 / 100);
app/Http/Controllers/TunaiController.php
+102 -2
View File
@@ -6,12 +6,14 @@ 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;
class TunaiController extends Controller
{
@@ -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)
@@ -194,7 +207,28 @@ class TunaiController extends Controller
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
//Same Note e.g P1 and S1
$same_note = AddTunai::on($cawangan['mysql'])
->where('kodlaluan', $request->kodlaluan)
->where('nota',$request->nota)
->where('tarikh',$current->toDateString())->first();
if($same_note){
Log::error('Error: same-note :' . $kodcaw . ': Name :' . $request->kodlaluan);
return 'same-note';
}
//Time Interval
$latestRecord = AddTunai::on($cawangan['mysql'])->where('kodlaluan', $request->kodlaluan)->latest()->first();
if($latestRecord){
$time = Carbon::parse($latestRecord->created_at);
$time_end = $time->copy()->addMinutes(1);
if($current->between($time,$time_end)){
Log::error('Error: within 1 minute :' . $kodcaw . ': Name :' . $request->kodlaluan);
return 'within 1 minute';
}
}
$addtunai=AddTunai::on($cawangan['mysql'])->create([
@@ -203,7 +237,8 @@ class TunaiController extends Controller
'kodlaluan'=>$request->kodlaluan,
'tambah'=>$request->tambah,
'kurang'=>$request->kurang,
'nota'=>$request->nota
'nota'=>$request->nota,
'created_at'=>$current
]);
return response()->json($addtunai,201);
@@ -269,6 +304,33 @@ class TunaiController extends Controller
return response()->json($addtunai);
}
public function updateRequestTellerDeno($kodcaw,Request $request){
$requestteller = RequestTeller::on('mysql7')->where([['no','=',$request->no],['kodcaw','=',$kodcaw],['kodlaluan','=',$request->kodlaluan],['update','=',0]])->update(array(
'update' => 1,
'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,
) );
return response()->json($requestteller);
}
public function getRequestTeller($kodcaw)
{
@@ -290,6 +352,15 @@ class TunaiController extends Controller
return response()->json($requestteller);
}
public function getRequestTellerByRecno($kodcaw,Request $request){
$current = Carbon::now();
$current = new Carbon();
$requestteller=RequestTeller::on('mysql7')->where([['kodcaw','=',$kodcaw],['update','=',1],['recno','=',$request->recno],['kodlaluan','=',$request->teller]])->get();
return response()->json($requestteller);
}
public function getRequestTellerLaporanSerahanBerkala($kodcaw,Request $request)
{
@@ -316,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
@@ -370,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);
}
@@ -644,4 +736,12 @@ class TunaiController extends Controller
return response()->json($requestteller);
}
public function getAccStatement($kodcaw, Request $request){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$addtunai = AddTunai::on($cawangan['mysql'])->where('tarikh',$request->tarikh)->where('kodlaluan',$request->teller)->get();
return $addtunai;
}
}
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();