changed from server 30/12/2024
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user