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

Merge branch 'adminapi' into 'master'

Browse Source 
Adminapi

See merge request online-sistem1/api_arrahn!154
This commit is contained in:
hafifie rahman
2022-08-02 18:30:13 +00:00
parent e4ffdd9e59 a3972ab123
commit f0fa6bc66c
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AdminPageController.php
+14 -10
View File
@@ -1663,24 +1663,28 @@ class AdminPageController extends Controller
public function UpdateNotisLelong($kodcaw,Request $request){ public function UpdateNotisLelong($kodcaw,Request $request){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $cawangan_all = Cawangan::on('mysql7')->get()->toArray();
$detailslelong = Pelelong::on($cawangan['mysql'])-> foreach($cawangan_all as $index=>$cawangan){
update(array( $detailslelong = Pelelong::on($cawangan['mysql'])->
'para2'=>$request->content update(array(
)); 'para2'=>$request->content
));
}
return response()->json($detailslelong, 200); return response()->json($detailslelong, 200);
} }
public function UpdateNotisLelong2($kodcaw,Request $request){ public function UpdateNotisLelong2($kodcaw,Request $request){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $cawangan_all = Cawangan::on('mysql7')->get()->toArray();
$detailslelong = Pelelong::on($cawangan['mysql'])-> foreach($cawangan_all as $index=>$cawangan){
update(array( $detailslelong = Pelelong::on($cawangan['mysql'])->
'para3'=>$request->content update(array(
)); 'para3'=>$request->content
));
}
return response()->json($detailslelong, 200); return response()->json($detailslelong, 200);
} }
app/Http/Controllers/TebusController.php
+1 -1
View File
@@ -1187,7 +1187,7 @@ class TebusController extends Controller
->sum('upahdibayar'); ->sum('upahdibayar');
$upahlelong = Lelong::on($cawangan['mysql']) $upahlelong = Lelong::on($cawangan['mysql'])
->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->hingga],['t_jual','>','2013-12-31']]) ->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->hingga],['t_jual','>','2013-12-31'],['t_jual','<=','2022-07-24']])
// ->whereYear('t_jual','=',$current->year) // ->whereYear('t_jual','=',$current->year)
->sum('bakiupah'); ->sum('bakiupah');