Merge branch 'amirah' of https://gitlab.com/azfararsyad/lelong into amirah

This commit is contained in:
Amirah22
2022-03-21 15:36:23 +08:00
25 changed files with 575 additions and 84 deletions
+11 -1
View File
@@ -1,6 +1,7 @@
<?php
namespace App\Http\Controllers;
use App\Events\LelongNotify;
use Illuminate\Http\Request;
use Spatie\Permission\Models\Role;
@@ -9,6 +10,7 @@ use Illuminate\Support\Facades\Auth;
use PDF;
use App\Models\User;
use App\Models\Cawangan;
use App\Models\Gadai;
use App\Models\JenisEmas;
use App\Models\JenisKarat;
@@ -301,6 +303,12 @@ class LelongController extends Controller
$lelongbid->status_payment =$simulasibid->status_payment;
$lelongbid->mora_upah =$simulasibid->mora_upah;
$lelongbid->save();
if($lelongbid->save())
{
$updategadai = Gadai::where('norujukan','=',$simulasibid->norujukan)->first();
$updategadai->taglel = 1;
$updategadai->save();
}
$simulasibidmarhun = SimulasiBidMarhun::where('simulasibid_id','=',$simulasibid->id)->get();
foreach($simulasibidmarhun as $simbidmarhun)
@@ -349,6 +357,7 @@ class LelongController extends Controller
public function start($id)
{
event(new LelongNotify('start'));
$currentdate = Carbon::now();
$currenttime = $currentdate->toTimeString();
$endtime = $currentdate->addHours(2);
@@ -552,6 +561,7 @@ class LelongController extends Controller
public function stop($id)
{
event(new LelongNotify('stop'));
$currentdate = Carbon::now();
$currenttime = $currentdate->toTimeString();
@@ -674,7 +684,7 @@ class LelongController extends Controller
}
public function deletemarhun(Request $request){
dd($request->checkboxdata);
// dd($request->checkboxdata);
$data = $request->checkboxdata;
foreach($data as $index=>$norujukan)
{