From f43280d9cd4c14dbc0d26998a4aead766dd7e19e Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Sun, 27 Feb 2022 15:28:43 +0800 Subject: [PATCH] notis lelong latest --- app/Http/Controllers/NotisController.php | 22 +++-- ..._27_052051_add_para2_to_cawangan_table.php | 32 +++++++ resources/views/pdf/jananotis.blade.php | 88 +++++++++++-------- 3 files changed, 95 insertions(+), 47 deletions(-) create mode 100644 database/migrations/2022_02_27_052051_add_para2_to_cawangan_table.php diff --git a/app/Http/Controllers/NotisController.php b/app/Http/Controllers/NotisController.php index f961d952..ba5d6709 100644 --- a/app/Http/Controllers/NotisController.php +++ b/app/Http/Controllers/NotisController.php @@ -6,9 +6,7 @@ use Illuminate\Http\Request; use Spatie\Permission\Models\Role; use Spatie\Permission\Models\Permission; use Illuminate\Support\Facades\Auth; -use Carbon\Carbon; use App\Models\User; -use PDF; use App\Models\Cawangan; use App\Models\LelongBidder; use App\Models\Lelong; @@ -16,6 +14,10 @@ use App\Models\CawanganLelong; use App\Models\LelongBid; use App\Models\Payment; use App\Models\Resit; +use App\Models\Gadai; +use Carbon\Carbon; +use PDF; +use DateTime; class NotisController extends Controller @@ -79,24 +81,28 @@ class NotisController extends Controller $lelong_id = $lelong_id; - $payment = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') - // -join('customer','gadai.') + $current = Carbon::now(); + $current = new Carbon(); + $tarikh_cetak = $current->toDateString(); + + $payment = Gadai::join('lelongbid','gadai.norujukan','=','lelongbid.norujukan') + ->join('customer','gadai.nokp','=','customer.kpbaru') ->where('lelongbid.lelong_id', $lelong_id) - ->get()->toArray(); + ->get()->toArray(); $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') ->where('cawangan.caw_code','=',$user->kodcaw) ->where('cawangan_lelong.lelong_id', $lelong_id) - ->get(); + $lelong = Lelong::where('id', $lelongid)->get(); - // return view ('pdf.jananotis',compact('payment','lelong_id','lelongid','caw')); + // return view ('pdf.jananotis',compact('payment','lelong_id','lelongid','caw','tarikh_cetak')); - $pdf = PDF::loadView('pdf.jananotis',compact('payment','lelong_id','lelongid','caw')) + $pdf = PDF::loadView('pdf.jananotis',compact('payment','lelong_id','lelongid','caw','tarikh_cetak')) ->setPaper('a4', 'potrait'); return $pdf->download('Penjanaan Notis.pdf'); diff --git a/database/migrations/2022_02_27_052051_add_para2_to_cawangan_table.php b/database/migrations/2022_02_27_052051_add_para2_to_cawangan_table.php new file mode 100644 index 00000000..becf1755 --- /dev/null +++ b/database/migrations/2022_02_27_052051_add_para2_to_cawangan_table.php @@ -0,0 +1,32 @@ +integer('para2'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('cawangan', function (Blueprint $table) { + $table->dropColumn('para2'); + }); + } +} diff --git a/resources/views/pdf/jananotis.blade.php b/resources/views/pdf/jananotis.blade.php index 85bf95d5..99d7613a 100644 --- a/resources/views/pdf/jananotis.blade.php +++ b/resources/views/pdf/jananotis.blade.php @@ -2,24 +2,18 @@