Merge branch 'branch_fix' into 'master'
Branch fix See merge request online-sistem1/api_arrahn!165
This commit is contained in:
@@ -21,6 +21,7 @@ use App\GlCode;
|
|||||||
use App\GlDetail;
|
use App\GlDetail;
|
||||||
use App\Audit;
|
use App\Audit;
|
||||||
use App\AkruNet;
|
use App\AkruNet;
|
||||||
|
use App\imbangdugabackup;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use App\imbangdugalama;
|
use App\imbangdugalama;
|
||||||
|
|
||||||
@@ -1371,7 +1372,7 @@ class LaporanController extends Controller
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return response('succesfully generated!');
|
return response('succesful');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function GenerateMonthlyAkrual(Request $request){
|
public function GenerateMonthlyAkrual(Request $request){
|
||||||
@@ -1421,7 +1422,7 @@ class LaporanController extends Controller
|
|||||||
|
|
||||||
$available_akru = AkruNet::on($caw['mysql'])
|
$available_akru = AkruNet::on($caw['mysql'])
|
||||||
->where('bulan',(int)$firstmonth_behind_month)
|
->where('bulan',(int)$firstmonth_behind_month)
|
||||||
->first()->toArray();
|
->first();
|
||||||
|
|
||||||
try{
|
try{
|
||||||
if($available_akru){
|
if($available_akru){
|
||||||
@@ -1446,4 +1447,60 @@ class LaporanController extends Controller
|
|||||||
|
|
||||||
return response('succesfully generated!');
|
return response('succesfully generated!');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function InsertDailyImbangDuga(Request $request){
|
||||||
|
|
||||||
|
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
|
||||||
|
$tarikh = new Carbon($request->tarikh);
|
||||||
|
|
||||||
|
DB::connection($cawangan['mysql'])->beginTransaction();
|
||||||
|
try{
|
||||||
|
$imbangduga = new imbangdugabackup();
|
||||||
|
$imbangduga->setConnection($cawangan['mysql']);
|
||||||
|
$imbangduga->kodcaw = $request->kodcaw;
|
||||||
|
$imbangduga->tarikh = $tarikh->toDateString();
|
||||||
|
$imbangduga->tunaiditangan = $request->tunaiditangan;
|
||||||
|
$imbangduga->pembiayaantawarruq = $request->pembiayaantawarruq;
|
||||||
|
$imbangduga->bayaranpendahuluan = $request->bayaranpendahuluan;
|
||||||
|
$imbangduga->pinjamankoop = $request->pinjamankoop;
|
||||||
|
$imbangduga->emaspalsu = $request->emaspalsu;
|
||||||
|
$imbangduga->serahan = $request->serahan;
|
||||||
|
$imbangduga->bds = $request->bds;
|
||||||
|
$imbangduga->perubatan = $request->perubatan;
|
||||||
|
$imbangduga->keraian = $request->keraian;
|
||||||
|
$imbangduga->rugilelong = $request->rugilelong;
|
||||||
|
$imbangduga->bakilelong = $request->bakilelong;
|
||||||
|
$imbangduga->wtd = $request->wtd;
|
||||||
|
$imbangduga->untungrugiterkumpul = $request->untungrugiterkumpul;
|
||||||
|
$imbangduga->keun_sebenar = $request->keun_sebenar;
|
||||||
|
$imbangduga->pendahuluan = $request->pendahuluan;
|
||||||
|
$imbangduga->cajlelong = $request->cajlelong;
|
||||||
|
$imbangduga->pindahkekpkb = $request->pindahkekpkb;
|
||||||
|
$imbangduga->penghutangkaki = $request->penghutangkaki;
|
||||||
|
$imbangduga->phapuskira = $request->phapuskira;
|
||||||
|
$imbangduga->belian1stop = $request->belian1stop;
|
||||||
|
$imbangduga->keun_penggadai = $request->keun_penggadai;
|
||||||
|
$imbangduga->pend_terakru = $request->pend_terakru;
|
||||||
|
$imbangduga->cajperkhidmatan = $request->cajperkhidmatan;
|
||||||
|
$imbangduga->cajlelongxtra = $request->cajlelongxtra;
|
||||||
|
$imbangduga->upahsimpanxtra = $request->upahsimpanxtra;
|
||||||
|
$imbangduga->bakilelongxtra = $request->bakilelongxtra;
|
||||||
|
$imbangduga->rugilelongxtra = $request->rugilelongxtra;
|
||||||
|
$imbangduga->utgterkumpulxtra = $request->utgterkumpulxtra;
|
||||||
|
$imbangduga->jualan1stop = $request->jualan1stop;
|
||||||
|
$imbangduga->hapuskira = $request->hapuskira;
|
||||||
|
$imbangduga->totalharta = $request->totalharta;
|
||||||
|
$imbangduga->totaltanggungan = $request->totaltanggungan;
|
||||||
|
$imbangduga->tagtally = $request->tagtally;
|
||||||
|
$imbangduga->created_at = $tarikh->toDateTimeString();
|
||||||
|
$imbangduga->updated_at = $tarikh->toDateTimeString();
|
||||||
|
$imbangduga->save();
|
||||||
|
|
||||||
|
DB::connection($cawangan['mysql'])->commit();
|
||||||
|
return response()->json('success',200);
|
||||||
|
}catch (\Throwable $e){
|
||||||
|
DB::connection($cawangan['mysql'])->rollBack();
|
||||||
|
return response()->json($e,500);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,68 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App;
|
||||||
|
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
|
class imbangdugabackup extends Model
|
||||||
|
{
|
||||||
|
protected $table = 'imbang_duga_backup';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The attributes that are mass assignable.
|
||||||
|
*
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
protected $fillable = [
|
||||||
|
|
||||||
|
'recno',
|
||||||
|
'kodcaw',
|
||||||
|
'tarikh',
|
||||||
|
'tunaiditangan',
|
||||||
|
'pembiayaantawarruq',
|
||||||
|
'bayaranpendahuluan',
|
||||||
|
'pinjamankoop',
|
||||||
|
'emaspalsu',
|
||||||
|
'serahan',
|
||||||
|
'bds',
|
||||||
|
'perubatan',
|
||||||
|
'keraian',
|
||||||
|
'rugilelong',
|
||||||
|
'bakilelong',
|
||||||
|
'wtd',
|
||||||
|
'untungrugiterkumpul',
|
||||||
|
'keun_sebenar',
|
||||||
|
'pendahuluan',
|
||||||
|
'cajlelong',
|
||||||
|
'pindahkekpkb',
|
||||||
|
'penghutangkaki',
|
||||||
|
'phapuskira',
|
||||||
|
'belian1stop',
|
||||||
|
'keun_penggadai',
|
||||||
|
'pend_terakru',
|
||||||
|
'cajperkhidmatan',
|
||||||
|
'cajlelongxtra',
|
||||||
|
'upahsimpanxtra',
|
||||||
|
'bakilelongxtra',
|
||||||
|
'rugilelongxtra',
|
||||||
|
'utgterkumpulxtra',
|
||||||
|
'jualan1stop',
|
||||||
|
'hapuskira',
|
||||||
|
'totalharta',
|
||||||
|
'totaltanggungan',
|
||||||
|
'tagtally',
|
||||||
|
'created_at',
|
||||||
|
'updated_at'
|
||||||
|
];
|
||||||
|
|
||||||
|
public $timestamps = true;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The attributes excluded from the model's JSON form.
|
||||||
|
*
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
// protected $hidden = [];
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -741,6 +741,7 @@ $router->group(['prefix'=>'admin'], function () use ($router){
|
|||||||
$router->get('laporan/akrubulan',['uses'=>'AdminPageController@getLaporanAkruBulan']);
|
$router->get('laporan/akrubulan',['uses'=>'AdminPageController@getLaporanAkruBulan']);
|
||||||
$router->get('laporan/akrual/generateDaily',['uses'=>'LaporanController@GenerateDailyAkrual']);
|
$router->get('laporan/akrual/generateDaily',['uses'=>'LaporanController@GenerateDailyAkrual']);
|
||||||
$router->get('laporan/akrual/generateMonthly',['uses'=>'LaporanController@GenerateMonthlyAkrual']);
|
$router->get('laporan/akrual/generateMonthly',['uses'=>'LaporanController@GenerateMonthlyAkrual']);
|
||||||
|
$router->get('laporan/akrual/insertImbangDuga',['uses'=>'LaporanController@InsertDailyImbangDuga']);
|
||||||
});
|
});
|
||||||
|
|
||||||
$router->group(['prefix'=>'lelong'], function () use ($router){
|
$router->group(['prefix'=>'lelong'], function () use ($router){
|
||||||
|
|||||||
Reference in New Issue
Block a user