baiki conflict server 24/7/2023
This commit is contained in:
@@ -0,0 +1,35 @@
|
|||||||
|
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App;
|
||||||
|
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
|
class BayaranHutang extends Model
|
||||||
|
{
|
||||||
|
protected $table = 'bayaran_hutang';
|
||||||
|
// public $timestamps = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The attributes that are mass assignable.
|
||||||
|
*
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
|
||||||
|
protected $fillable = [
|
||||||
|
'serialno',
|
||||||
|
'tarikh',
|
||||||
|
'bayaran',
|
||||||
|
'ID',
|
||||||
|
'IDPelulus',
|
||||||
|
'nota',
|
||||||
|
'rechutang'
|
||||||
|
];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The attributes excluded from the model's JSON form.
|
||||||
|
*
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
// protected $hidden = [];
|
||||||
|
}
|
||||||
@@ -44,9 +44,11 @@ use App\StokAudit10;
|
|||||||
use App\StokAudit11;
|
use App\StokAudit11;
|
||||||
use App\StokAudit12;
|
use App\StokAudit12;
|
||||||
use App\AuditCustomer;
|
use App\AuditCustomer;
|
||||||
|
use App\BayaranHutang;
|
||||||
use App\imbangdugalama;
|
use App\imbangdugalama;
|
||||||
use App\HapusKira;
|
use App\HapusKira;
|
||||||
use App\MaxPinjaman;
|
use App\MaxPinjaman;
|
||||||
|
use App\Penghutang;
|
||||||
use App\RingkasanAnsuran;
|
use App\RingkasanAnsuran;
|
||||||
use App\RingkasanGadai;
|
use App\RingkasanGadai;
|
||||||
use App\RingkasanLelong;
|
use App\RingkasanLelong;
|
||||||
@@ -3728,4 +3730,23 @@ class AdminPageController extends Controller
|
|||||||
return response('error');
|
return response('error');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
public function ListPenghutang(Request $request){
|
||||||
|
if($request->kodcaw == '010219'){
|
||||||
|
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
|
||||||
|
$hutang = Penghutang::on($cawangan['mysql'])->where('tarikh','<=',$request->tarikh)->sum('hutang');
|
||||||
|
$bakihutang = Penghutang::on($cawangan['mysql'])->where('tarikh','<=',$request->tarikh)->sum('baki_hutang');
|
||||||
|
$array_hutang = ['hutang' => $hutang, 'bakihutang' => $bakihutang];
|
||||||
|
|
||||||
|
return response()->json($array_hutang);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function SenaraiBayaranHutang(Request $request){
|
||||||
|
if($request->kodcaw == '010219'){
|
||||||
|
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
|
||||||
|
$bayaran = BayaranHutang::on($cawangan['mysql'])->where('tarikh','<=',$request->tarikh)->sum('bayaran');
|
||||||
|
$bayaran = (float)$bayaran;
|
||||||
|
return response()->json($bayaran);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App;
|
||||||
|
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
|
class Penghutang extends Model
|
||||||
|
{
|
||||||
|
protected $table = 'penghutang';
|
||||||
|
// public $timestamps = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The attributes that are mass assignable.
|
||||||
|
*
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
|
||||||
|
protected $fillable = [
|
||||||
|
'recno',
|
||||||
|
'tarikh',
|
||||||
|
'nota',
|
||||||
|
'IDPelulus',
|
||||||
|
'ID',
|
||||||
|
'Hutang',
|
||||||
|
'baki_hutang'
|
||||||
|
];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The attributes excluded from the model's JSON form.
|
||||||
|
*
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
// protected $hidden = [];
|
||||||
|
}
|
||||||
+2
-3
@@ -766,9 +766,8 @@ $router->group(['prefix'=>'admin'], function () use ($router){
|
|||||||
$router->get('store/ringkasanharian',['uses'=>'AdminPageController@StoreRingkasanHarian']);
|
$router->get('store/ringkasanharian',['uses'=>'AdminPageController@StoreRingkasanHarian']);
|
||||||
$router->get('get/ringkasanharian',['uses'=>'AdminPageController@getRingkasanHarian']);
|
$router->get('get/ringkasanharian',['uses'=>'AdminPageController@getRingkasanHarian']);
|
||||||
|
|
||||||
|
$router->get('ig/penghutang',['uses'=>'AdminPageController@ListPenghutang']);
|
||||||
|
$router->get('ig/bayaran_penghutang',['uses'=>'AdminPageController@SenaraiBayaranHutang']);
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
$router->group(['prefix'=>'lelong'], function () use ($router){
|
$router->group(['prefix'=>'lelong'], function () use ($router){
|
||||||
|
|||||||
Reference in New Issue
Block a user