Merge remote-tracking branch 'origin' into afiqhamzah-feat-mykad-reader-registration-backend
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -172,10 +172,164 @@ class BackupStokAuditController extends Controller
|
||||
return 'success';
|
||||
}
|
||||
|
||||
public function backupStokAuditProblem(Request $request){
|
||||
// if($request->zone == 'all'){
|
||||
// $cawangan = Cawangan::on('mysql7')->get();
|
||||
// }else{
|
||||
// $cawangan = Cawangan::on('mysql7')->where('zone',$request->zone)->get();
|
||||
// }
|
||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw',$request->kodcaw)->first();
|
||||
// $tarikh = Carbon::now();
|
||||
// $tarikh = $tarikh->subDay(1);
|
||||
$tarikh = Carbon::parse($request->dateProblem . ' 00:00:00');
|
||||
$month = $tarikh->month;
|
||||
$year = $tarikh->year;
|
||||
|
||||
$all_gadai = Gadai::on($cawangan['mysql'])
|
||||
->where([['tagpalsu','=',0],['sttebus','=','']])
|
||||
->orderBy('t_gadai', 'ASC')
|
||||
->orderBy('sirig', 'ASC')->get();
|
||||
$data = [];
|
||||
foreach($all_gadai as $gadai){
|
||||
$tarikh_gadai = Carbon::parse($gadai['t_gadai']. ' 00:00:00');
|
||||
// $current = Carbon::now();
|
||||
// $current = $current->subDay(1);
|
||||
$current = Carbon::parse($request->dateProblem . ' 00:00:00');
|
||||
|
||||
$tahun_gadai = $tarikh_gadai->year;
|
||||
$bulan_gadai = $tarikh_gadai->month;
|
||||
$hari_gadai = $tarikh_gadai->day;
|
||||
|
||||
$tahun_semasa = $current->year;
|
||||
$bulan_semasa = $current->month;
|
||||
$hari_semasa = $current->day;
|
||||
|
||||
if($hari_semasa >= $hari_gadai){
|
||||
$beza_hari = $hari_semasa - $hari_gadai + 1;
|
||||
}else if($hari_semasa < $hari_gadai){
|
||||
$bulan_semasa = $bulan_semasa - 1;
|
||||
$beza_hari = ($hari_semasa + 30) - $hari_gadai + 1;
|
||||
}
|
||||
|
||||
$extensivemonth_gadai = 0;
|
||||
|
||||
if($beza_hari >= 1 && $beza_hari <= 15){
|
||||
$extensivemonth_gadai = 0.5;
|
||||
}else if($beza_hari >= 16){
|
||||
$extensivemonth_gadai = 1;
|
||||
}else{
|
||||
$extensivemonth_gadai = 0;
|
||||
}
|
||||
|
||||
$beza_tahun = $tahun_semasa - $tahun_gadai;
|
||||
|
||||
$beza_bulan = ($bulan_semasa + ($beza_tahun * 12)) - $bulan_gadai;
|
||||
|
||||
$tempoh_gadai = $beza_bulan + $extensivemonth_gadai;
|
||||
|
||||
$upah_semasa = $this->kiraupahTawarruqStokAudit($tempoh_gadai,$gadai['tempohbayar'],$gadai['kadarupah'],$gadai['bakipjm']);
|
||||
|
||||
Gadai::on($cawangan['mysql'])->where('norujukan','=',$gadai['norujukan'])->update(array(
|
||||
'jbg' => $tempoh_gadai,
|
||||
'tempoh' => $tempoh_gadai,
|
||||
'tunggakan' => $upah_semasa
|
||||
));
|
||||
|
||||
$data_gadai = [
|
||||
'tahun' => $year,
|
||||
'bulan' => $month,
|
||||
'norujukan' => $gadai['norujukan'],
|
||||
'tempoh' => $tempoh_gadai,
|
||||
'nokp' => $gadai['nokp'],
|
||||
'berat' => $gadai['berat'],
|
||||
'nilaimarhun' => $gadai['nilaimarhun'],
|
||||
'pinjaman' => $gadai['pinjaman'],
|
||||
'bakipjm' => $gadai['bakipjm'],
|
||||
'kadarupah' => $gadai['kadarupah'],
|
||||
'tempohblmbyar' => $gadai['tempoh'] - $gadai['tempohbayar'],
|
||||
'upahblmbyar' => $upah_semasa,
|
||||
'lanjutan' => $gadai['lelong_tawarruq']
|
||||
];
|
||||
|
||||
array_push($data,$data_gadai);
|
||||
}
|
||||
|
||||
if($month == 1){
|
||||
foreach (array_chunk($data,1000) as $t)
|
||||
{
|
||||
StokAudit1::on($cawangan['mysql'])->insert($t);
|
||||
}
|
||||
}elseif($month == 2){
|
||||
foreach (array_chunk($data,1000) as $t)
|
||||
{
|
||||
StokAudit2::on($cawangan['mysql'])->insert($t);
|
||||
}
|
||||
}elseif($month == 3){
|
||||
foreach (array_chunk($data,1000) as $t)
|
||||
{
|
||||
StokAudit3::on($cawangan['mysql'])->insert($t);
|
||||
}
|
||||
}elseif($month == 4){
|
||||
foreach (array_chunk($data,1000) as $t)
|
||||
{
|
||||
StokAudit4::on($cawangan['mysql'])->insert($t);
|
||||
}
|
||||
}elseif($month == 5){
|
||||
foreach (array_chunk($data,1000) as $t)
|
||||
{
|
||||
StokAudit5::on($cawangan['mysql'])->insert($t);
|
||||
}
|
||||
}elseif($month == 6){
|
||||
foreach (array_chunk($data,1000) as $t)
|
||||
{
|
||||
StokAudit6::on($cawangan['mysql'])->insert($t);
|
||||
}
|
||||
}elseif($month == 7){
|
||||
foreach (array_chunk($data,1000) as $t)
|
||||
{
|
||||
StokAudit7::on($cawangan['mysql'])->insert($t);
|
||||
}
|
||||
}elseif($month == 8){
|
||||
foreach (array_chunk($data,1000) as $t)
|
||||
{
|
||||
StokAudit8::on($cawangan['mysql'])->insert($t);
|
||||
}
|
||||
}elseif($month == 9){
|
||||
foreach (array_chunk($data,1000) as $t)
|
||||
{
|
||||
StokAudit9::on($cawangan['mysql'])->insert($t);
|
||||
}
|
||||
}elseif($month == 10){
|
||||
foreach (array_chunk($data,1000) as $t)
|
||||
{
|
||||
StokAudit10::on($cawangan['mysql'])->insert($t);
|
||||
}
|
||||
}elseif($month == 11){
|
||||
foreach (array_chunk($data,1000) as $t)
|
||||
{
|
||||
StokAudit11::on($cawangan['mysql'])->insert($t);
|
||||
}
|
||||
}elseif($month == 12){
|
||||
foreach (array_chunk($data,1000) as $t)
|
||||
{
|
||||
StokAudit12::on($cawangan['mysql'])->insert($t);
|
||||
}
|
||||
}
|
||||
// foreach($cawangan as $cawangan_mysql){
|
||||
|
||||
// }
|
||||
|
||||
return 'success';
|
||||
}
|
||||
|
||||
public function kiraupahTawarruqStokAudit($tempoh,$tempohbayar,$kadarupah,$bakipinjaman){
|
||||
|
||||
$bilang_bln = $tempoh - $tempohbayar;
|
||||
|
||||
if($bilang_bln > 12){
|
||||
$bilang_bln = 12;
|
||||
}
|
||||
|
||||
$upahsemasa_raw = $bilang_bln * (($kadarupah/100 )* $bakipinjaman);
|
||||
|
||||
$upah_semasa_round = number_format($upahsemasa_raw,2);
|
||||
|
||||
@@ -459,6 +459,7 @@ class GadaiController extends Controller
|
||||
'duit_masuk' => $request->bayaran,
|
||||
'created_at' => $current,
|
||||
'bakiharga' => $baki_hargajualan,
|
||||
'nowakil' => (int)$request->nowakil
|
||||
]);
|
||||
|
||||
$transaction_upah = TransaksiKeuntungan::on('mysql7')->create([
|
||||
|
||||
@@ -1244,6 +1244,9 @@ class LaporanController extends Controller
|
||||
$current = Carbon::now();
|
||||
$current = new Carbon();
|
||||
|
||||
$mulaCarbon = new Carbon($request->mula);
|
||||
$hinggaCarbon = new Carbon($request->hingga);
|
||||
|
||||
/* Start Keuntungan Sebenar Calculation */
|
||||
$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")
|
||||
@@ -1278,13 +1281,13 @@ class LaporanController extends Controller
|
||||
->whereIn('trans.norujukan',$get_norujukan)
|
||||
->whereDate('trans.tarikh_bayaran' ,'>=', $request->mula)
|
||||
->whereDate('trans.tarikh_bayaran' ,'<=', $request->hingga)
|
||||
->whereYear('tarikh_bayaran','=',$current->year)
|
||||
->whereYear('tarikh_bayaran','=',$mulaCarbon->year)
|
||||
->where('trans.kodcaw',$request->kodcaw)
|
||||
->get()->toArray();
|
||||
|
||||
$upahlelong = Lelong::on($cawangan['mysql'])
|
||||
->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->hingga],['t_jual','>','2022-07-24']])
|
||||
->whereYear('t_jual','=',$current->year)
|
||||
->whereYear('t_jual','=',$mulaCarbon->year)
|
||||
->sum('bakiupah');
|
||||
|
||||
$sum_keuntungan = ($summation) ? $summation[0]['sum_keun'] : 0;
|
||||
@@ -1386,10 +1389,15 @@ class LaporanController extends Controller
|
||||
|
||||
public function GenerateMonthlyAkrual(Request $request){
|
||||
|
||||
$firstmonth_behind = Carbon::now()->startOfMonth()->subMonthsNoOverflow(1);
|
||||
$secondmonth_behind = Carbon::now()->startOfMonth()->subMonthsNoOverflow(2);
|
||||
$tarikh = $request->tahun . '-' . $request->bulan . '-01';
|
||||
$month_request = $current = new Carbon($tarikh);
|
||||
$firstmonth_behind = clone $month_request;
|
||||
$secondmonth_behind = clone $month_request;
|
||||
$firstmonth_behind_end = clone $month_request;
|
||||
|
||||
$firstmonth_behind_end = Carbon::now()->endOfMonth()->subMonthsNoOverflow(1);
|
||||
$firstmonth_behind->startOfMonth();
|
||||
$secondmonth_behind->startOfMonth()->subMonthsNoOverflow(1);
|
||||
$firstmonth_behind_end->endOfMonth();
|
||||
|
||||
$firstmonth_behind_month = $firstmonth_behind->format('m');
|
||||
$secondmonth_behind_month = $secondmonth_behind->format('m');
|
||||
@@ -1408,7 +1416,9 @@ class LaporanController extends Controller
|
||||
|
||||
if($secondmonth_behind_year == 2022 && (int)$secondmonth_behind_month > 4){
|
||||
$audit_backdate = $tebuscontroller->StokAuditGenerateTerakru($secondmonth_behind_month,$caw,$secondmonth_behind_year);
|
||||
}
|
||||
}else if($secondmonth_behind_year > 2022){
|
||||
$audit_backdate = $tebuscontroller->StokAuditGenerateTerakru($secondmonth_behind_month,$caw,$secondmonth_behind_year);
|
||||
}
|
||||
|
||||
$result_audit_stated = $tebuscontroller->StokAuditGenerateTerakru($firstmonth_behind_month,$caw,$firstmonth_behind_year);
|
||||
|
||||
@@ -1431,13 +1441,16 @@ class LaporanController extends Controller
|
||||
|
||||
$available_akru = AkruNet::on($caw['mysql'])
|
||||
->where('bulan',(int)$firstmonth_behind_month)
|
||||
->where('tahun',(int)$firstmonth_behind_year)
|
||||
->first();
|
||||
|
||||
try{
|
||||
if($available_akru){
|
||||
if($available_akru['jumlah'] !== $accrual_net){
|
||||
AkruNet::on($caw['mysql'])->where('bulan','=',(int)$firstmonth_behind_month)
|
||||
->update(['jumlah' => $accrual_net]);
|
||||
AkruNet::on($caw['mysql'])
|
||||
->where('bulan','=',(int)$firstmonth_behind_month)
|
||||
->where('tahun','=',(int)$firstmonth_behind_year)
|
||||
->update(['jumlah' => $accrual_net]);
|
||||
}
|
||||
}else{
|
||||
$akrunet = new AkruNet();
|
||||
@@ -1525,4 +1538,91 @@ class LaporanController extends Controller
|
||||
return response('notfound');
|
||||
}
|
||||
}
|
||||
|
||||
public function UpdateDailyImbangDuga(Request $request){
|
||||
|
||||
// $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->get();
|
||||
$tarikh = new Carbon($request->tarikh);
|
||||
$firstmonth_behind = clone $tarikh;
|
||||
$secondmonth_behind = clone $tarikh;
|
||||
$firstmonth_behind_end = clone $tarikh;
|
||||
|
||||
$firstmonth_behind->startOfMonth();
|
||||
$secondmonth_behind->startOfMonth()->subMonthsNoOverflow(1);
|
||||
$firstmonth_behind_end->endOfMonth();
|
||||
|
||||
$firstmonth_behind_month = $firstmonth_behind->format('m');
|
||||
$secondmonth_behind_month = $secondmonth_behind->format('m');
|
||||
$firstmonth_behind_year = $firstmonth_behind->format('Y');
|
||||
$secondmonth_behind_year = $secondmonth_behind->format('Y');
|
||||
|
||||
$firstmonth_behind_extension = $firstmonth_behind->toDateString();
|
||||
$firstmonth_behind_extension_end = $firstmonth_behind_end->toDateString();
|
||||
|
||||
$cawangan = Cawangan::on('mysql7')->where('zone',$request->zone)->get();
|
||||
|
||||
$tebuscontroller = new TebusController();
|
||||
|
||||
foreach($cawangan as $index=>$caw){
|
||||
DB::connection($caw['mysql'])->beginTransaction();
|
||||
|
||||
if($secondmonth_behind_year == 2022 && (int)$secondmonth_behind_month > 4){
|
||||
$audit_backdate = $tebuscontroller->StokAuditGenerateTerakru($secondmonth_behind_month,$caw,$secondmonth_behind_year);
|
||||
}else if($secondmonth_behind_year > 2022){
|
||||
$audit_backdate = $tebuscontroller->StokAuditGenerateTerakru($secondmonth_behind_month,$caw,$secondmonth_behind_year);
|
||||
}
|
||||
|
||||
$result_audit_stated = $tebuscontroller->StokAuditGenerateTerakru($firstmonth_behind_month,$caw,$firstmonth_behind_year);
|
||||
|
||||
$totaltunggakan_now = $result_audit_stated->sum('upahblmbyar');
|
||||
$totaltunggakan_past = $audit_backdate->sum('upahblmbyar');
|
||||
|
||||
$request_generate = new \Illuminate\Http\Request([
|
||||
'mula' => $firstmonth_behind_extension,
|
||||
'hingga' => $firstmonth_behind_extension_end,
|
||||
'kodcaw' => $caw['kodcaw'],
|
||||
]);
|
||||
|
||||
$keuntungan = $this->SemakanKeuntunganLejer($caw['kodcaw'],$request_generate);
|
||||
|
||||
$data_keuntungan = $keuntungan->getContent();
|
||||
$data = json_decode($data_keuntungan, true);
|
||||
|
||||
$calculation = $totaltunggakan_past - $data['keuntungan_semasa'];
|
||||
$accrual_net = $totaltunggakan_now - $calculation;
|
||||
|
||||
$ab = imbangdugabackup::on($caw['mysql'])
|
||||
->where('tarikh',$request->tarikh)
|
||||
->first();
|
||||
|
||||
$total_akru = AkruNet::on($caw['mysql'])
|
||||
->where('bulan','<',(int)$firstmonth_behind_month)
|
||||
->where('tahun',(int)$firstmonth_behind_year)
|
||||
->sum('jumlah');
|
||||
|
||||
$totalpend_terakru = ($total_akru + $accrual_net);
|
||||
$totalharta = $ab['tunaiditangan'] + $ab['pembiayaantawarruq'] + $ab['bayaranpendahuluan'] + $ab['pinjamankoop'] + $ab['emaspalsu'] + $ab['pindahkekpkb'] + $ab['penghutangkaki'] + $ab['phapuskira'] + $ab['belian1stop'] + $totaltunggakan_now + $ab['serahan'];
|
||||
$totaltanggungan = $totalpend_terakru + $ab['bds'] + $ab['perubatan'] + $ab['keraian'] + $ab['rugilelong'] + $ab['bakilelong'] + $ab['wtd'] + $ab['untungrugiterkumpul'] + $ab['keun_sebenar'] + $ab['pendahuluan'] + $ab['cajlelong'] + $ab['cajperkhidmatan'] + $ab['cajlelongxtra'] + $ab['upahsimpanxtra'] + $ab['bakilelongxtra'] + $ab['rugilelongxtra'] + $ab['utgterkumpulxtra'] + $ab['jualan1stop'] + $ab['hapuskira'];
|
||||
$tally = (round($totalharta,2) == round($totaltanggungan,2)) ? 1 : 0;
|
||||
|
||||
try{
|
||||
if($ab){
|
||||
imbangdugabackup::on($caw['mysql'])->where('tarikh',$request->tarikh)->update([
|
||||
'tagtally' => $tally,
|
||||
'totalharta' => $totalharta,
|
||||
'totaltanggungan' => $totaltanggungan,
|
||||
'keun_penggadai' => $totaltunggakan_now,
|
||||
'pend_terakru' => ($total_akru + $accrual_net)
|
||||
]);
|
||||
}
|
||||
|
||||
DB::connection($caw['mysql'])->commit();
|
||||
}catch (\Throwable $e){
|
||||
DB::connection($caw['mysql'])->rollBack();
|
||||
return response($e);
|
||||
}
|
||||
}
|
||||
|
||||
return response('succesfully generated!');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -27,7 +27,9 @@ use App\Audit;
|
||||
use App\GlDetail;
|
||||
use App\Pembeli;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Http;
|
||||
|
||||
use Log;
|
||||
use DB;
|
||||
use Carbon\Carbon;
|
||||
|
||||
@@ -560,15 +562,22 @@ class LelongController extends Controller
|
||||
|
||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
|
||||
|
||||
$lelong = Lelong::on($cawangan['mysql'])
|
||||
->where('norujukan', '=', $request->norujukan)
|
||||
//->where('t_lelong', '<=', $current->toDateString())
|
||||
->first();
|
||||
if($cawangan['tagarrahnbid'] == 1){
|
||||
$lelong = Http::withOptions(['verify' => true])->get('https://adminbid.arrahn.com.my/api/portalApi',[
|
||||
'norujukan' => $request->norujukan
|
||||
])->json();
|
||||
$lelong = ($lelong != null) ? $lelong['lelong'] : [];
|
||||
}else{
|
||||
$lelong = Lelong::on($cawangan['mysql'])
|
||||
->where('norujukan', '=', $request->norujukan)
|
||||
//->where('t_lelong', '<=', $current->toDateString())
|
||||
->first();
|
||||
}
|
||||
|
||||
if($lelong)
|
||||
{
|
||||
$date_lelong = new Carbon($lelong['t_lelong']);
|
||||
|
||||
|
||||
if($lelong['t_lelong'] >= $current->toDateString())
|
||||
{
|
||||
$diff = $date_lelong->diffInDays($current);
|
||||
@@ -577,7 +586,7 @@ class LelongController extends Controller
|
||||
$diff = -$diff;
|
||||
}
|
||||
|
||||
if($diff <= 0)
|
||||
if($diff <= 1)
|
||||
{
|
||||
return response(1);
|
||||
}else{
|
||||
@@ -636,7 +645,13 @@ class LelongController extends Controller
|
||||
public function searchBlockLelong(Request $request){
|
||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw',$request->kodcaw)->first();
|
||||
|
||||
$lelong = Lelong::on($cawangan['mysql'])->where([['norujukan',$request->norujukan]])->first();
|
||||
if($cawangan['tagarrahnbid'] == 1)
|
||||
{
|
||||
$lelong = Http::withOptions(['verify' => true])->get('https://adminbid.arrahn.com.my/api/portalApi',['norujukan' => $request->norujukan])->json();
|
||||
$lelong = ($lelong != null) ? $lelong['lelong'] : [];
|
||||
}else{
|
||||
$lelong = Lelong::on($cawangan['mysql'])->where([['norujukan',$request->norujukan]])->first();
|
||||
}
|
||||
|
||||
return response()->json($lelong);
|
||||
}
|
||||
@@ -780,9 +795,12 @@ class LelongController extends Controller
|
||||
->where('poskod','=',$customer['poskod'])
|
||||
->first();
|
||||
|
||||
if($poskod)
|
||||
$daerah = Daerah::on('mysql7')
|
||||
->where('koddaerah','=',$poskod['koddaerah'])
|
||||
->first();
|
||||
else
|
||||
Log::debug('poskod tiada' . $lel['nokp']);
|
||||
|
||||
$negeri = Negeri::on('mysql7')
|
||||
->where('kodnegeri','=',$poskod['kodnegeri'])
|
||||
@@ -1016,7 +1034,7 @@ class LelongController extends Controller
|
||||
|
||||
$update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$index['norujukan'])->update(array(
|
||||
'sttebus' => "L",
|
||||
't_update' => $currentDate
|
||||
't_update' => $request->tarikh
|
||||
));
|
||||
|
||||
$lelong_to_be_inserted = new Lelong();
|
||||
@@ -1096,6 +1114,19 @@ class LelongController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
if ($request->gldetailcdm != null) {
|
||||
GlDetail::on($cawangan['mysql'])->create([
|
||||
'kodcaw' => $request->kodcaw,
|
||||
'tarikh' => $request->tarikh,
|
||||
'dtacct' => "1000/010",
|
||||
'ktacct' => "1000/020",
|
||||
'descpt' => "SERAHAN LELONG CDM, " . $request->tarikh,
|
||||
'amaun' => $request->gldetailcdm,
|
||||
'teller' => "LELONG ONLINE",
|
||||
'serahan' => $request->gldetailcdm,
|
||||
]);
|
||||
}
|
||||
|
||||
return response()->json("success");
|
||||
}
|
||||
|
||||
|
||||
@@ -543,6 +543,7 @@ class TebusController extends Controller
|
||||
'duit_masuk' => $harga_tebus,
|
||||
'created_at' => $current,
|
||||
'bakiharga' => $baki_hargajualan,
|
||||
'nowakil' => (int)$request->nowakil
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -1731,7 +1732,7 @@ class TebusController extends Controller
|
||||
|
||||
$upahlelong = Lelong::on($cawangan['mysql'])
|
||||
->where([['t_jual','<=',$request->tarikh],['t_jual','>','2022-07-24']])
|
||||
->whereYear('t_jual','=',$current->year)
|
||||
->whereYear('t_jual','=',$tarikhyear->year)
|
||||
->sum('bakiupah');
|
||||
|
||||
|
||||
@@ -2026,6 +2027,11 @@ class TebusController extends Controller
|
||||
if($year_generate == 2022 && $intmonth_sebelum > 4)
|
||||
{
|
||||
$result_audit_backdate = $this->StokAuditGenerateTerakru($month_sebelum,$cawangan,$year_generate);
|
||||
}else if($year_generate > 2022 && $intmonth_sekarang == 1){
|
||||
$previousYear = Carbon::now()->subYears(1);
|
||||
$result_audit_backdate = $this->StokAuditGenerateTerakru('12',$cawangan,$previousYear->year);
|
||||
}else{
|
||||
$result_audit_backdate = $this->StokAuditGenerateTerakru($month_sebelum,$cawangan,$year_generate);
|
||||
}
|
||||
|
||||
$get_norujukan = Gadai::on($cawangan['mysql'])
|
||||
@@ -2060,26 +2066,36 @@ class TebusController extends Controller
|
||||
|
||||
$total = $sum_keun_tebus + $sum_keun_ansuran;
|
||||
|
||||
$calculate_month = (int)$month_sekarang - $latest_month_akrunet->bulan;
|
||||
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){
|
||||
$jumlahakru = AkruNet::on($cawangan['mysql'])
|
||||
->sum('jumlah');
|
||||
}else if($calculate_month < 0){
|
||||
$jumlahakru = AkruNet::on($cawangan['mysql'])
|
||||
->where('bulan','<=',$intmonth_sekarang)
|
||||
->sum('jumlah');
|
||||
if($calculate_month > 1){
|
||||
return 'ERR_MONTH_SEBELUM';
|
||||
}else if($calculate_month == 1){
|
||||
$jumlahakru = AkruNet::on($cawangan['mysql'])
|
||||
->sum('jumlah');
|
||||
}else if($calculate_month < 0){
|
||||
$jumlahakru = AkruNet::on($cawangan['mysql'])
|
||||
->where('bulan','<=',$intmonth_sekarang)
|
||||
->sum('jumlah');
|
||||
|
||||
return response()->json($jumlahakru);
|
||||
}else if($calculate_month == 0)
|
||||
{
|
||||
$jumlahakru = AkruNet::on($cawangan['mysql'])
|
||||
->where('bulan','<',$intmonth_sekarang)
|
||||
->sum('jumlah');
|
||||
}
|
||||
}else{
|
||||
$calculate_month = 0;
|
||||
|
||||
return response()->json($jumlahakru);
|
||||
}else if($calculate_month == 0)
|
||||
{
|
||||
$jumlahakru = AkruNet::on($cawangan['mysql'])
|
||||
->where('bulan','<',$intmonth_sekarang)
|
||||
->where('tahun', $current->year)
|
||||
->sum('jumlah');
|
||||
}
|
||||
|
||||
|
||||
if($determine_past->isToday())
|
||||
{
|
||||
$audit_now = Gadai::on($cawangan['mysql'])
|
||||
@@ -2105,6 +2121,7 @@ class TebusController extends Controller
|
||||
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)
|
||||
@@ -2118,7 +2135,7 @@ class TebusController extends Controller
|
||||
}else{
|
||||
if($available_akru[0]['jumlah'] !== ($accrual_net - $total))
|
||||
{
|
||||
AkruNet::on($cawangan['mysql'])->where('bulan','=',(int)$month_sekarang)
|
||||
AkruNet::on($cawangan['mysql'])->where('bulan','=',(int)$month_sekarang)->where('tahun',$current->year)
|
||||
->update(['jumlah' => ($accrual_net - $total)]);
|
||||
}
|
||||
|
||||
|
||||
@@ -292,10 +292,17 @@ class TransactionOnlineController extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
$akanlelong = Gadai::on($cawangan['mysql'])
|
||||
->where([['sttebus','=', ''],['taglel',1],['nokp','=',$request->ic],['hargajual','=', 0]])
|
||||
->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
|
||||
->get()->toArray();
|
||||
if($cawangan['tagarrahnbid'] == 1){
|
||||
$akanlelong = Gadai::on($cawangan['mysql'])
|
||||
->where([['sttebus','=', ''],['taglel',1],['nokp','=',$request->ic]])
|
||||
->get()->toArray();
|
||||
}
|
||||
else{
|
||||
$akanlelong = Gadai::on($cawangan['mysql'])
|
||||
->where([['sttebus','=', ''],['taglel',1],['nokp','=',$request->ic]])
|
||||
->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
|
||||
->get()->toArray();
|
||||
}
|
||||
|
||||
if(sizeof($akanlelong) != 0){
|
||||
foreach($akanlelong as $lelong)
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ class Transaction extends Model
|
||||
* @var array
|
||||
*/
|
||||
protected $fillable = [
|
||||
'trans_type','norujukan','nokp','teller','kodcaw','duit_masuk','duit_keluar','created_at','bakiharga'
|
||||
'trans_type','norujukan','nokp','teller','kodcaw','duit_masuk','duit_keluar','created_at','bakiharga','nowakil'
|
||||
];
|
||||
|
||||
/**
|
||||
|
||||
@@ -567,6 +567,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
|
||||
$router->get('keluar/lelong/tawarruq',['uses'=>'LelongController@keluarLelongTawarruq']);
|
||||
|
||||
$router->get('backup/stok/audit',['uses'=>'BackupStokAuditController@backupStokAudit']);
|
||||
$router->get('backup/stok/audit/problem',['uses'=>'BackupStokAuditController@backupStokAuditProblem']);
|
||||
$router->get('stokaudit/backdate',['uses'=>'BackupStokAuditController@LaporanAuditBackdate']);
|
||||
});
|
||||
|
||||
@@ -654,6 +655,7 @@ $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('GetTunaiByTarikhSebelum/{kodcaw}',['uses' =>'AdminPageController@getTarikhTunaiSebelum']);
|
||||
$router->get('getAddTunaiDateKodlaluan/{kodcaw}/',['uses' =>'AdminPageController@getAddTunaiDateKodlaluan']);
|
||||
$router->get('AdvansurSearchByTarikh/{kodcaw}',['uses'=>'AdminPageController@SenaraiAdvansurTarikh']);
|
||||
$router->get('TuntutBakiTarikhTeller/{kodcaw}',['uses'=>'AdminPageController@showTuntutBakiTarikhTeller']);
|
||||
@@ -745,6 +747,12 @@ $router->group(['prefix'=>'admin'], function () use ($router){
|
||||
$router->get('laporan/akrual/generateDaily',['uses'=>'LaporanController@GenerateDailyAkrual']);
|
||||
$router->get('laporan/akrual/generateMonthly',['uses'=>'LaporanController@GenerateMonthlyAkrual']);
|
||||
$router->get('laporan/akrual/insertImbangDuga',['uses'=>'LaporanController@InsertDailyImbangDuga']);
|
||||
$router->get('laporan/akrual/UntungRugiTerkumpul/{kodcaw}',['uses' => 'AdminPageController@calculationUntungTerkumpulAkru']);
|
||||
$router->get('laporan/akrual/updateImbangDuga',['uses'=>'LaporanController@UpdateDailyImbangDuga']);
|
||||
|
||||
$router->get('laporan/online',['uses'=>'AdminPageController@LaporanOnline']);
|
||||
$router->get('laporan/tuntutbaki',['uses'=>'AdminPageController@LaporanTuntutBaki']);
|
||||
|
||||
});
|
||||
|
||||
$router->group(['prefix'=>'lelong'], function () use ($router){
|
||||
|
||||
Reference in New Issue
Block a user