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

server staging

Browse Source
This commit is contained in:
Server
2023-12-17 11:40:57 +08:00
parent 32b91e9e61
commit 8579d5feea
6 changed files with 653 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+4 -5
View File
@@ -579,10 +579,9 @@ class LelongController extends Controller
if($cawangan['tagarrahnbid'] == 1){
// $lelong = Http::withOptions(['verify' => true])->get('https://niklah.arrahn.com.my/api/portalApi',[
// $lelong = Http::withOptions(['verify' => true])->get('http://adminbid.arrahn/api/portalApi',[
// 'norujukan' => $request->norujukan
// ])->json();
$lelong = null;
$lelong = Http::withOptions(['verify' => true])->get('http://stapibid.arrahn.com.my/api/portalApi',[
'norujukan' => $request->norujukan
])->json();
$lelong = ($lelong != null) ? $lelong['lelong'] : [];
if( $lelong == null )
{
@@ -699,7 +698,7 @@ class LelongController extends Controller
if($cawangan['tagarrahnbid'] == 1)
{
$lelong = Http::withOptions(['verify' => true])->get('https://adminbid.arrahn.com.my/api/portalApi',['norujukan' => $request->norujukan])->json();
$lelong = Http::withOptions(['verify' => true])->get('http://stapibid.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();
app/Services/OnePercentServices.php
+1 -1
View File
@@ -74,7 +74,7 @@ class OnePercentServices
public function getKadarUjrah(float $nilaimarhun = 0.0, $groupid) : Float{
$kadarujrah = KadarUpah::on('mysql7')->select('kadarujrah')->where([['min','<=',$nilaimarhun],['max','>=',$nilaimarhun]])->where('group_id',$groupid)->get()->toArray();
$kadarujrah = KadarUpah::on('mysql7')->select('kadarujrah')->where([['min','<=',$nilaimarhun],['max','>=',$nilaimarhun]])->where('group_id',1)->get()->toArray();
return isset($kadarujrah[0]) ? $kadarujrah[0]['kadarujrah'] : 0;
}