penambahan api untuk admin dan pembaikian untuk imbangduga

This commit is contained in:
fifi97
2022-01-01 18:35:34 +08:00
parent 198613f5cd
commit 120b35dbb4
6 changed files with 1716 additions and 12 deletions
+26
View File
@@ -0,0 +1,26 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class Bajet extends Model
{
protected $table = 'bajet';
protected $connection = 'mysql7';
/**
* The attributes that are mass assignable.
*
* @var array
*/
// protected $fillable = [
// ];
/**
* The attributes excluded from the model's JSON form.
*
* @var array
*/
// protected $hidden = [];
}
+26
View File
@@ -0,0 +1,26 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class BajetTahunan extends Model
{
protected $table = 'bajettahunan';
protected $connection = 'mysql7';
/**
* The attributes that are mass assignable.
*
* @var array
*/
// protected $fillable = [
// ];
/**
* The attributes excluded from the model's JSON form.
*
* @var array
*/
// protected $hidden = [];
}
File diff suppressed because it is too large Load Diff
-1
View File
@@ -2939,7 +2939,6 @@ class GadaiController extends Controller
})
->where('trans.trans_type','=','A')
->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year)
->get();
$transaksi = 0;
+171 -11
View File
@@ -1144,6 +1144,9 @@ class TebusController extends Controller
$current = new Carbon($request->tarikh);
$daterequest = new Carbon($request->tarikh);
$daterequest->addDays(1);
$total = 0;
//Untung Rugi Terkumpul Sebelum 01.12.2013
@@ -1187,6 +1190,22 @@ class TebusController extends Controller
->whereYear('tarikh','<',$current->year)
->sum('upahdibayar');
//Upah Tawarruq
$keuntungan_data = TransaksiKeuntungan::on('mysql7')
->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
->whereYear('transaksi_keuntungan.tarikh_bayaran','<',$current->year)
->where('kodcaw',$kodcaw)
->pluck('norujukan');
$gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan', $keuntungan_data)->whereNull('hargajualan')->pluck('norujukan');
$upahsimpankeuntungansebelumtawarruq = TransaksiKeuntungan::on('mysql7')
->where('tarikh_bayaran' ,'<=', $daterequest)
->whereYear('tarikh_bayaran','<',$current->year)
->whereIn('norujukan',$gadaiData)
->sum('bayaran_keuntungan');
$upahsimpanlama = imbangdugalama::on($cawangan['mysql'])
->sum('upah_t');
@@ -1222,8 +1241,147 @@ class TebusController extends Controller
// $parameter = Parameter::on($cawangan['mysql']) //--masuk
// ->sum('sumpanjarlama');
//Keuntungan Tawarruq Sebenar
$keuntungansebenar = 0;
$dateSM = '2021-04-24';
$total = ($utgrugilama + $lelong + $upahsimpantebus + $upahsimpanlelong + $upahsimpanansur + $gstcajlelong) + $parameter;
if($request->tarikh < '2021-06-09')
{
$keuntungan_data = TransaksiKeuntungan::on('mysql7')
->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM)
->whereYear('tarikh_bayaran','<',$current->year)
->where('kodcaw',$kodcaw)
->pluck('norujukan');
$gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntungan_data)->whereNotNull('hargajualan')->pluck('norujukan');
$keuntungan = TransaksiKeuntungan::on('mysql7')
->whereIn('norujukan',$gadaiData)
->whereDate('tarikh_bayaran', '<=', $request->tarikh)
->whereDate('tarikh_bayaran' ,'<', $dateSM)
->whereYear('tarikh_bayaran','<',$current->year)
->sum('bayaran_keuntungan');
$keuntunganreducing_data = TransaksiKeuntungan::on('mysql7')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','<',$current->year)
->where('kodcaw',$request->kodcaw)
->pluck('norujukan');
$gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntunganreducing_data)->whereNotNull('hargajualan')->pluck('norujukan');
$keuntunganreducing = TransaksiKeuntungan::on('mysql7')
->whereIn('norujukan',$gadaiData)
->whereDate('tarikh_bayaran' ,'<=', $request->tarikh)
->whereDate('tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','<',$current->year)
->sum('keuntungan_rebet');
$keuntungansebenar = ($keuntungan + $keuntunganreducing);
}else{
$keuntungan_data = TransaksiKeuntungan::on('mysql7')
->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM)
->whereYear('tarikh_bayaran','<',$current->year)
->where('kodcaw',$kodcaw)
->pluck('norujukan');
$gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntungan_data)->whereNotNull('hargajualan')->pluck('norujukan');
$keuntungan = TransaksiKeuntungan::on('mysql7')->whereIn('norujukan',$gadaiData)->sum('bayaran_keuntungan');
$keuntunganreducing_data = TransaksiKeuntungan::on('mysql7')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', '2021-06-09')
->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','<',$current->year)
->where('kodcaw',$kodcaw)
->pluck('norujukan');
$gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntunganreducing_data)->whereNotNull('hargajualan')->pluck('norujukan');
$keuntunganreducing = TransaksiKeuntungan::on('mysql7')
->whereIn('norujukan',$gadaiData)
->whereDate('tarikh_bayaran' ,'<', '2021-06-09')
->whereDate('tarikh_bayaran','>=', $dateSM)
->sum('keuntungan_rebet');
$bukanansuran_data = TransaksiKeuntungan::on('mysql7')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->where('trans.trans_type','!=','A')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
->whereYear('tarikh_bayaran','<',$current->year)
->where('trans.kodcaw',$kodcaw)
->pluck('transaksi_keuntungan.norujukan');
$gadaiData = Gadai::on($cawangan['mysql'])
->whereIn('norujukan',$bukanansuran_data)
->whereNotNull('hargajualan')
->pluck('norujukan');
$bukanansuran = TransaksiKeuntungan::on('mysql7')
->whereIn('transaksi_keuntungan.norujukan',$gadaiData)
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->where('trans.trans_type','!=','A')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
->whereYear('transaksi_keuntungan.tarikh_bayaran','<',$current->year)
->sum('transaksi_keuntungan.keuntungan_rebet');
$ansuran_data = TransaksiKeuntungan::on('mysql7')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->where('trans.trans_type','=','A')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
->whereYear('tarikh_bayaran','<',$current->year)
->where('trans.kodcaw',$kodcaw)
->pluck('transaksi_keuntungan.norujukan');
$gadaiData = Gadai::on($cawangan['mysql'])
->whereIn('norujukan',$ansuran_data)
->whereNotNull('hargajualan')
->pluck('norujukan');
$ansuran = TransaksiKeuntungan::on('mysql7')
->whereIn('transaksi_keuntungan.norujukan',$gadaiData)
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->where('trans.trans_type','=','A')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
->whereYear('transaksi_keuntungan.tarikh_bayaran','<',$current->year)
->sum('transaksi_keuntungan.bayaran_keuntungan');
$keuntungansebenar = ($keuntungan + $keuntunganreducing + $ansuran + $bukanansuran);
}
// dd($keuntungansebenar);
$total = ($utgrugilama + $lelong + $upahsimpantebus + $upahsimpanlelong + $upahsimpanansur + $gstcajlelong + $keuntungansebenar + $upahsimpankeuntungansebelumtawarruq) + $parameter;
// dd($utgrugilama,$lelong,$upahsimpantebus,$upahsimpanlelong,$upahsimpanansur,$gstcajlelong,$parameter);
if($kodcaw == '011229')
$total -= 45390.37;
@@ -1255,13 +1413,15 @@ class TebusController extends Controller
$current = Carbon::now();
$current = new Carbon();
$tarikhyear = new Carbon($request->tarikh);
if($request->tarikh < '2021-06-09')
{
$keuntungan_data = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->whereYear('tarikh_bayaran','=',$tarikhyear->year)
->where('kodcaw',$request->kodcaw)
// ->whereNotNull('db2.hargajualan')
// ->sum('bayaran_keuntungan');
@@ -1273,7 +1433,7 @@ class TebusController extends Controller
->whereIn('norujukan',$gadaiData)
->whereDate('tarikh_bayaran', '<=', $request->tarikh)
->whereDate('tarikh_bayaran' ,'<', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->whereYear('tarikh_bayaran','=',$tarikhyear->year)
->sum('bayaran_keuntungan');
// $keuntungan = 0;
@@ -1290,7 +1450,7 @@ class TebusController extends Controller
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->whereYear('tarikh_bayaran','=',$tarikhyear->year)
->where('kodcaw',$request->kodcaw)
// ->whereNotNull('db2.hargajualan')
// ->sum('keuntungan_rebet');
@@ -1303,7 +1463,7 @@ class TebusController extends Controller
->whereIn('norujukan',$gadaiData)
->whereDate('tarikh_bayaran' ,'<=', $request->tarikh)
->whereDate('tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->whereYear('tarikh_bayaran','=',$tarikhyear->year)
->sum('keuntungan_rebet');
// $keuntunganreducing = 0;
@@ -1325,7 +1485,7 @@ class TebusController extends Controller
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->whereYear('tarikh_bayaran','=',$tarikhyear->year)
->where('kodcaw',$request->kodcaw)
// ->whereNotNull('db2.hargajualan')
// ->sum('bayaran_keuntungan');
@@ -1354,7 +1514,7 @@ class TebusController extends Controller
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', '2021-06-09')
->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->whereYear('tarikh_bayaran','=',$tarikhyear->year)
->where('kodcaw',$request->kodcaw)
// ->whereNotNull('db2.hargajualan')
// ->sum('keuntungan_rebet');
@@ -1392,7 +1552,7 @@ class TebusController extends Controller
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
// ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->whereYear('tarikh_bayaran','=',$tarikhyear->year)
->where('trans.kodcaw',$request->kodcaw)
// ->whereNotNull('db2.hargajualan')
// ->sum('keuntungan_rebet');
@@ -1414,7 +1574,7 @@ class TebusController extends Controller
->where('trans.trans_type','!=','A')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year)
->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$tarikhyear->year)
->sum('transaksi_keuntungan.keuntungan_rebet');
// $bukanansuran = 0;
@@ -1440,7 +1600,7 @@ class TebusController extends Controller
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
// ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->whereYear('tarikh_bayaran','=',$tarikhyear->year)
->where('trans.kodcaw',$request->kodcaw)
// ->whereNotNull('db2.hargajualan')
// ->sum('bayaran_keuntungan');
@@ -1462,7 +1622,7 @@ class TebusController extends Controller
->where('trans.trans_type','=','A')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year)
->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$tarikhyear->year)
->sum('transaksi_keuntungan.bayaran_keuntungan');
// $ansuran = 0;
+48
View File
@@ -609,4 +609,52 @@ $router->group(['prefix'=>'portal'], function () use ($router){
$router->get('searchsagonline',['uses'=>'TransactionOnlineController@searchSAGOnline']);
});
$router->group(['prefix'=>'admin'], function () use ($router){
$router->get('getTunaiPaginate/{kodcaw}',['uses' => 'AdminPageController@TunaiPaginateforAdmin']);
$router->get('getPetiBesiPaginate/{kodcaw}',['uses' => 'AdminPageController@PetiBesiPaginateforAdmin']);
$router->get('GetTunaiByTarikh/{kodcaw}',['uses' =>'AdminPageController@getTarikhTunai']);
$router->get('getAddTunaiDateKodlaluan/{kodcaw}/',['uses' =>'AdminPageController@getAddTunaiDateKodlaluan']);
$router->get('AdvansurSearchByTarikh/{kodcaw}',['uses'=>'AdminPageController@SenaraiAdvansurTarikh']);
$router->get('TuntutBakiTarikhTeller/{kodcaw}',['uses'=>'AdminPageController@showTuntutBakiTarikhTeller']);
$router->get('lelong/tarikh/{kodcaw}',['uses'=>'AdminPageController@LelonganTarikh']);
$router->get('searchByName',['uses'=>'CustomerController@AdminsearchCustomerByName']);
$router->get('searchByIC',['uses'=>'CustomerController@AdminsearchCustomerByIC']);
$router->get('pembiayaanTahunan',['uses'=>'AdminPageController@TahunanGadai']);
$router->get('penebusanTahunan',['uses'=>'AdminPageController@TahunanTebus']);
$router->get('keuntunganTahunan',['uses'=>'AdminPageController@TahunanKeuntungan']);
$router->get('pembiayaanBulanan',['uses'=>'AdminPageController@PembiayaanBulanan']);
$router->get('penebusanBulanan',['uses'=>'AdminPageController@PenebusanBulanan']);
$router->get('keuntunganBulanan',['uses'=>'AdminPageController@KeuntunganBulanan']);
$router->get('pembiayaanToday',['uses'=>'AdminPageController@showAllGadaiToday']);
$router->get('penebusanToday',['uses'=>'AdminPageController@showAllTebusToday']);
$router->get('keuntunganToday',['uses'=>'AdminPageController@showAllUpahToday']);
$router->get('bilangan/gadai',['uses'=>'AdminPageController@BilanganGadaianBulanan']);
$router->get('bilangan/tebus',['uses'=>'AdminPageController@BilanganPenebusanBulanan']);
$router->get('senaraiBajet',['uses' => 'AdminPageController@SenaraiBajet']);
$router->get('senaraiKemaskiniBajet',['uses' => 'AdminPageController@senaraikemaskinibajet']);
$router->get('checkBajet',['uses' => 'AdminPageController@checkBajet']);
$router->post('simpanBajet',['uses'=>'AdminPageController@SimpanBajet']);
$router->put('kemaskiniBajet',['uses'=>'AdminPageController@KemaskiniBajet']);
$router->get('Customers/{id}',['uses'=>'AdminPageController@showOneCustomer']);
$router->get('PetibesiSebelumTarikh/{kodcaw}',['uses'=>'AdminPageController@getpetibesiSebelumbyTarikh']);
$router->get('GlDetailTarikh/{kodcaw}',['uses'=>'AdminPageController@getGldetailbyTarikh']);
$router->get('PanjarTarikh/{kodcaw}',['uses'=>'AdminPageController@getPanjarbyTarikh']);
$router->put('UpdatePetiBesi',['uses'=>'AdminPageController@updatePetiBesiAdmin']);
$router->get('searchSAGOnline',['uses'=>'AdminPageController@AdminsearchSagOnline']);
$router->post('simpanStatus',['uses'=>'AdminPageController@SimpanStatus']);
$router->get('SenaraiBlacklist/{kodcaw}',['uses'=>'AdminPageController@SenaraiBlacklist']);
$router->post('AddSenaraiHitam',['uses'=>'AdminPageController@AddSenaraiHitam']);
});