Merged in feature/fixbugs-pointing-apiujrah (pull request #168)
change-using api_url
This commit is contained in:
@@ -581,9 +581,9 @@ class AkaunController extends Controller
|
|||||||
|
|
||||||
$request->hostname = config('app.env') == 'production' ? 'http://apiujrah.arrahn' : $request->hostname;
|
$request->hostname = config('app.env') == 'production' ? 'http://apiujrah.arrahn' : $request->hostname;
|
||||||
|
|
||||||
$tuntutbaki = Http::get($request->hostname. '/api/TuntutBakiRangeDate/'. $request->kodcaw,['mula' => $tarikh_mula,'akhir' => $tarikh_akhir])->json();
|
$tuntutbaki = Http::get($api_url. '/api/TuntutBakiRangeDate/'. $request->kodcaw,['mula' => $tarikh_mula,'akhir' => $tarikh_akhir])->json();
|
||||||
|
|
||||||
$cawangan=Http::get($request->hostname.'/api/cawangan/detail/'.$request->kodcaw)->json();
|
$cawangan=Http::get($api_url.'/api/cawangan/detail/'.$request->kodcaw)->json();
|
||||||
$cawangan_detail=$cawangan[0];
|
$cawangan_detail=$cawangan[0];
|
||||||
|
|
||||||
if(isset($request->jenis))
|
if(isset($request->jenis))
|
||||||
@@ -1730,7 +1730,7 @@ public function cetakLaporanAnsuranRangeDate(Request $request){
|
|||||||
// Tetapkan hostname ikut environment
|
// Tetapkan hostname ikut environment
|
||||||
$request->hostname = config('app.env') == 'production' ? 'http://apiujrah.arrahn' : $request->hostname;
|
$request->hostname = config('app.env') == 'production' ? 'http://apiujrah.arrahn' : $request->hostname;
|
||||||
|
|
||||||
$response = Http::get($request->hostname . '/api/ansuranujrah/laporan/' . $request->kodcaw, [
|
$response = Http::get($api_url . '/api/ansuranujrah/laporan/' . $request->kodcaw, [
|
||||||
'mula' => $mula_date,
|
'mula' => $mula_date,
|
||||||
'akhir' => $hingga_date,
|
'akhir' => $hingga_date,
|
||||||
'jenis' => $request->laporanansuran
|
'jenis' => $request->laporanansuran
|
||||||
@@ -1742,7 +1742,7 @@ public function cetakLaporanAnsuranRangeDate(Request $request){
|
|||||||
$tebus = $response->json();
|
$tebus = $response->json();
|
||||||
}
|
}
|
||||||
|
|
||||||
$cawangan = Http::get($request->hostname . '/api/cawangan/detail/' . $request->kodcaw)->json();
|
$cawangan = Http::get($api_url . '/api/cawangan/detail/' . $request->kodcaw)->json();
|
||||||
$cawangan_detail = $cawangan[0] ?? ['nama' => 'Tiada data'];
|
$cawangan_detail = $cawangan[0] ?? ['nama' => 'Tiada data'];
|
||||||
|
|
||||||
// Tajuk laporan ikut jenis
|
// Tajuk laporan ikut jenis
|
||||||
|
|||||||
Reference in New Issue
Block a user