diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index 9aee651a..88666520 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -2,6 +2,7 @@
namespace App\Http\Controllers;
+use Illuminate\Support\Facades\Http;
use Illuminate\Http\Request;
use Spatie\Permission\Models\Role;
use Spatie\Permission\Models\Permission;
@@ -1718,8 +1719,23 @@ class MarhunController extends Controller
->orderBy('id', 'desc')
->get();
- // return view('pdf.cetakkeluarscanbarcode', compact('lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk','caw'));
- $pdf = PDF::loadView('pdf.cetakkeluarscanbarcode',compact('caw','lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk'
+ //get staf cwgn roles harian
+ $roles_harian_penilai = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[
+ 'role_harian' => 'penilai'
+ ])->json();
+
+
+ $roles_harian_khazanah = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[
+ 'role_harian' => 'khazanah'
+ ])->json();
+
+ $roles_harian_pc = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[
+ 'role_harian' => 'pc'
+ ])->json();
+ // dd($roles_harian_penilai);
+
+ // return view('pdf.cetakkeluarscanbarcode', compact('caw','lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk','roles_harian_penilai','roles_harian_khazanah','roles_harian_pc'));
+ $pdf = PDF::loadView('pdf.cetakkeluarscanbarcode',compact('caw','lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk','roles_harian_penilai','roles_harian_khazanah','roles_harian_pc'
))->setPaper('a4', 'potrait');
return $pdf->download('Senarai Keluar Peti Besi.pdf');
@@ -1746,9 +1762,22 @@ class MarhunController extends Controller
->whereNotNull('scan_masuk')
->orderBy('id', 'desc')
->get();
+
+ $roles_harian_penilai = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[
+ 'role_harian' => 'penilai'
+ ])->json();
+
+
+ $roles_harian_khazanah = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[
+ 'role_harian' => 'khazanah'
+ ])->json();
+
+ $roles_harian_pc = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[
+ 'role_harian' => 'pc'
+ ])->json();
// return view('pdf.cetakmasukscanbarcode', compact('lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk','caw'));
- $pdf = PDF::loadView('pdf.cetakmasukscanbarcode',compact('caw','lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk'
+ $pdf = PDF::loadView('pdf.cetakmasukscanbarcode',compact('caw','lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk','roles_harian_penilai','roles_harian_khazanah','roles_harian_pc'
))->setPaper('a4', 'potrait');
return $pdf->download('Senarai Masuk Peti Besi.pdf');
diff --git a/resources/views/lelong/showlelong.blade.php b/resources/views/lelong/showlelong.blade.php
index 30a8a017..5e14e83f 100644
--- a/resources/views/lelong/showlelong.blade.php
+++ b/resources/views/lelong/showlelong.blade.php
@@ -62,10 +62,10 @@
{{-- {{dd($kemaskini)}} --}}
@if($kemaskini == $today)
- Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}} /gm
+ Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}}
@else
- Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}} /gm
+ Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}}
@endif
PERMODALAN KELANTAN BERHAD |
+ PERMODALAN KELANTAN BERHAD |