diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index a8c2401..2e0707b 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -27,7 +27,9 @@ use App\Audit; use App\GlDetail; use App\Pembeli; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Http; +use Log; use DB; use Carbon\Carbon; @@ -560,10 +562,17 @@ class LelongController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); - $lelong = Lelong::on($cawangan['mysql']) - ->where('norujukan', '=', $request->norujukan) - //->where('t_lelong', '<=', $current->toDateString()) - ->first(); + if($request->kodcaw == 'KB2' || $request->kodcaw == 'WCY' || $request->kodcaw == 'WB' || $request->kodcaw == 'KB1' || $request->kodcaw == 'GC' || $request->kodcaw == '020301' || $request->kodcaw == 'APM' || $request->kodcaw == 'ARM' || $request->kodcaw == '011013' || $request->kodcaw == '011412'){ + $lelong = Http::withOptions(['verify' => true])->get('https://adminbid.arrahn.com.my/api/portalApi',[ + 'norujukan' => $request->norujukan + ])->json(); + $lelong = ($lelong != null) ? $lelong['lelong'] : []; + }else{ + $lelong = Lelong::on($cawangan['mysql']) + ->where('norujukan', '=', $request->norujukan) + //->where('t_lelong', '<=', $current->toDateString()) + ->first(); + } if($lelong) { @@ -636,7 +645,13 @@ class LelongController extends Controller public function searchBlockLelong(Request $request){ $cawangan = Cawangan::on('mysql7')->where('kodcaw',$request->kodcaw)->first(); - $lelong = Lelong::on($cawangan['mysql'])->where([['norujukan',$request->norujukan]])->first(); + if($request->kodcaw == 'KB2' || $request->kodcaw == 'WCY' || $request->kodcaw == 'WB'|| $request->kodcaw == 'KB1' || $request->kodcaw == 'GC' || $request->kodcaw == '020301' || $request->kodcaw == 'APM' || $request->kodcaw == 'ARM' || $request->kodcaw == '011013' || $request->kodcaw == '011412') + { + $lelong = Http::withOptions(['verify' => true])->get('https://adminbid.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(); + } return response()->json($lelong); } @@ -780,9 +795,12 @@ class LelongController extends Controller ->where('poskod','=',$customer['poskod']) ->first(); + if($poskod) $daerah = Daerah::on('mysql7') ->where('koddaerah','=',$poskod['koddaerah']) ->first(); + else + Log::debug('poskod tiada' . $lel['nokp']); $negeri = Negeri::on('mysql7') ->where('kodnegeri','=',$poskod['kodnegeri'])