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

Merge branch 'apiaku' of https://gitlab.com/online-sistem1/api_arrahn into apiaku

Browse Source
This commit is contained in:
hafifierahman
2021-09-23 10:36:38 +08:00
parent b3c6362cb0 decf5c62e7
commit 814268c655
6 changed files with 112 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+3 -1
View File
@@ -2411,7 +2411,9 @@ class GadaiController extends Controller
->sum('pinjaman');
if($kodcaw === '011232')
$rekod_pinjamandiberi -= 282;
{
$rekod_pinjamandiberi -= 282;
}
$array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu];
app/Http/Controllers/LelongController.php
+46 -41
View File
@@ -13,6 +13,8 @@ use App\AnsRugi;
use App\SerahBaki;
use App\Tebus;
use App\Advansur;
use App\LelTebus;
use App\LelMarhun;
use Illuminate\Http\Request;
@@ -169,7 +171,7 @@ class LelongController extends Controller
->where('t_jual','<=',$request->tarikh)
->where(function($query) use ($tarikhbaru){
$query->whereNull('trkhtuntut')
->orWhere('trkhtuntut','>','2021-02-25');
->orWhere('trkhtuntut','>',$tarikhbaru);
})
->where('baki','>=',0)
->sum('baki');
@@ -221,7 +223,9 @@ class LelongController extends Controller
}
if($kodcaw === '011232')
{
$bakilelong += 6;
}
$arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal];
@@ -234,57 +238,18 @@ class LelongController extends Controller
$tarikhbaru = $request->mula;
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
if($kodcaw == 'KB2')
{
if($request->tarikh <= '2021-02-25')
{
$bakilelong = Lelong::on($cawangan['mysql'])
->where('t_jual','>=',$request->mula)
->where('t_jual','<=',$request->hingga)
->where(function($query) use ($tarikhbaru){
$query->whereNull('trkhtuntut')
->orWhere('trkhtuntut','>',$tarikhbaru);
})
->where('baki','>=',0)
->sum('baki');
}else{
$bakilelong = Lelong::on($cawangan['mysql'])
->where('t_jual','>=',$request->mula)
->where('t_jual','<=',$request->hingga)
->where(function($query) use ($tarikhbaru){
$query->whereNull('trkhtuntut')
->orWhere('trkhtuntut','>','2021-02-25');
})
->where('baki','>=',0)
->sum('baki');
}
}else{
$bakilelong = Lelong::on($cawangan['mysql'])
->where('trkhtuntut','>=',$request->mula)
->where('trkhtuntut','<=',$request->hingga)
// ->where(function($query) use ($tarikhbaru){
// $query->whereNull('trkhtuntut')
// ->orWhere('trkhtuntut','>',$tarikhbaru);
// })
->where('baki','>=',0)
->sum('baki');
}
$ansrugi = AnsRugi::on($cawangan['mysql'])
->sum('bayaran');
$rugilelong = Lelong::on($cawangan['mysql'])
->where('trkhtuntut','>=',$request->mula)
->where('trkhtuntut','<=',$request->hingga)
//->where(function($query) use ($tarikhbaru)
//{
// $query->whereNull('t_jual')
// ->orWhere('t_jual','>',$tarikhbaru);
//})
->where('baki','<',0)
->sum('baki');
// $rugitotal = $rugilelong + $ansrugi;
$rugitotal = $rugilelong;
$arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal];
@@ -422,6 +387,20 @@ class LelongController extends Controller
return response()->json($tuntutbaki,200);
}
public function showTuntutBakiTarikh($kodcaw,Request $request){
$current = Carbon::now();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$tuntutbaki = TuntutBaki::on($cawangan['mysql'])
->where('tarikh','=', $request->tarikh)
->get();
return response()->json($tuntutbaki,200);
}
public function showTuntutBakiTeller($kodcaw,Request $request){
$current = Carbon::now();
@@ -494,7 +473,7 @@ class LelongController extends Controller
->sum('cajlelong');
if($kodcaw === '011232')
$cajlelong += 122.5;
$cajlelong +=122.5;
return response()->json($cajlelong,200);
}
@@ -558,6 +537,32 @@ class LelongController extends Controller
foreach($cawangan_all as $index=>$cawangan){
$list_tebus_today = Tebus::on($cawangan['mysql'])->where('t_tebus',$current->toDateString())->pluck('norujukan')->toArray();
$list_advansur_today = Advansur::on($cawangan['mysql'])->where('tarikh',$current->toDateString())->pluck('norujukan')->toArray();
$gadai_tebus = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$list_tebus_today)->update([
'taglel' => 0
]);
$gadai_advansur = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$list_advansur_today)->update([
'sttebus' => '',
'taglel' => 0
]);
$lelong_tebus = Lelong::on($cawangan['mysql'])->whereIn('norujukan',$list_tebus_today)->get();
foreach($lelong_tebus as $index=>$tebus_lelong){
$tebus_detail = Tebus::on($cawangan['mysql'])->where('norujukan',$tebus_lelong['norujukan'])->first();
$lel_tebus = LelTebus::on($cawangan['mysql'])->create([
'tarikh' => $current->toDateString(),
'teller' => $tebus_detail['teller'],
'norujukan' => $tebus_lelong['norujukan'],
'batch_no' => $tebus_lelong['batchno'],
'nilai_marhun' => $tebus_lelong['nilaimarhun'],
'pinjaman' => $tebus_lelong['pinjaman'],
'upah' => $tebus_detail['bakiupah'],
'jbg' => $tebus_detail['jbg'],
'jenis_tebus' => 'T',
]);
}
$lelong_marhun_tebus = LelMarhun::on($cawangan['mysql'])->whereIn('norujukan',$list_tebus_today)->delete();
$lelong_marhun_adv = LelMarhun::on($cawangan['mysql'])->whereIn('norujukan',$list_advansur_today)->delete();
$lelong_tebus = Lelong::on($cawangan['mysql'])->whereIn('norujukan',$list_tebus_today)->delete();
$lelong_advansur = Lelong::on($cawangan['mysql'])->whereIn('norujukan',$list_advansur_today)->delete();
}
app/Http/Controllers/TebusController.php
+5 -2
View File
@@ -568,7 +568,8 @@ class TebusController extends Controller
->whereNotNull('hargajualan')
->where('hargajualan','<>','bakihargajualan');
$totalpenebusantawarruq = ($tebustawarruq->sum('tebus.pinjaman') - $tebustawarruqansuran->sum('gad.pinjaman')) + $tebustawarruqansuran->sum('gad.bakipjm');
// $totalpenebusantawarruq = ($tebustawarruq->sum('tebus.pinjaman') - $tebustawarruqansuran->sum('gad.pinjaman')) + $tebustawarruqansuran->sum('gad.bakipjm');
$totalpenebusantawarruq = $tebustawarruq->sum('tebus.pinjaman');
$bilpenebusantawarruq = $tebustawarruq->count();
$totalrebatetawarruq = $tebustawarruq->sum('tebus.rebate');
$totalkeuntungantawarruq = $tebustawarruq->sum('tebus.bakiupah');
@@ -929,7 +930,9 @@ class TebusController extends Controller
$total = $keuntungansebelumtawarruq + $keuntungan;
if($kodcaw === '011232')
$total += 623.5;
{
$total +=623.5;
}
return response()->json($total,200);
}
app/Http/Controllers/VaultController.php
-10
View File
@@ -400,16 +400,6 @@ class VaultController extends Controller
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
// $pendahuluan = Vault::on($cawangan['mysql'])
// ->where('kodcaw','=',$kodcaw)
// ->where('tarikh','<=', $request->tarikh)
// ->sum('pendahuluan');
// $serahan = Vault::on($cawangan['mysql'])
// ->where('kodcaw','=',$kodcaw)
// ->where('tarikh','<=', $request->tarikh)
// ->sum('serahan');
$serahanpkb = '1000/020';
$serahanjmc = '1000/026';
$pendahuluanpkb = '7000/102';
app/LelMarhun.php
+24
View File
@@ -0,0 +1,24 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class LelMarhun extends Model
{
protected $table = 'lelmarhun';
public $timestamps = false;
/**
* The attributes that are mass assignable.
*
* @var array
*/
/**
* The attributes excluded from the model's JSON form.
*
* @var array
*/
// protected $hidden = [];
}
app/LelTebus.php
+34
View File
@@ -0,0 +1,34 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class LelTebus extends Model
{
protected $table = 'lelong_tebus';
public $timestamps = false;
/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = [
'tarikh',
'teller',
'norujukan',
'batch_no',
'nilai_marhun',
'pinjaman',
'upah',
'jbg',
'jenis_tebus',
];
/**
* The attributes excluded from the model's JSON form.
*
* @var array
*/
// protected $hidden = [];
}