diff --git a/app/Http/Controllers/Frontend/DashboardController.php b/app/Http/Controllers/Frontend/DashboardController.php index 1016520..f18c8da 100644 --- a/app/Http/Controllers/Frontend/DashboardController.php +++ b/app/Http/Controllers/Frontend/DashboardController.php @@ -1047,20 +1047,20 @@ class DashboardController extends Controller // 'contact_number' => $request->contact_number, // 'email' => $request->email, // ]); - $data = [ - 'name' => $request->name, - 'city' => $request->city, - 'country' => $request->country, - 'postal_code' => $request->postal_code, - 'contact_number' => $request->contact_number, - 'email' => $request->email, - ]; - session::put('sellerFormData', $data); - if (session::has('sellerFormData')) { + // $data = [ + // 'name' => $request->name, + // 'city' => $request->city, + // 'country' => $request->country, + // 'postal_code' => $request->postal_code, + // 'contact_number' => $request->contact_number, + // 'email' => $request->email, + // ]; + // session::put('sellerFormData', $data); + // if (session::has('sellerFormData')) { return response()->json(['status' => 200, 'message' => 'Seller Form Reviewed & Submitted!']); // return response()->json(['status' => 200, 'message' => 'Thank you for submitting the seller form. Our team will promptly review your submission and keep you informed regarding the status of your product listing.']); - } - return response()->json(['status' => 400, 'message' => 'Seller Form Could Not Be Reviewed & Submitted!']); + // } + // return response()->json(['status' => 400, 'message' => 'Seller Form Could Not Be Reviewed & Submitted!']); } public function marketplaceAIFFormAPI(Request $request) @@ -1083,7 +1083,12 @@ class DashboardController extends Controller 'no_of_units_you_wish_to_sell' => 'required', 'expected_sale_per_unit' => 'required', 'latest_valuation_date'=>'required', - + 'name' => 'required', + 'city' => 'required', + 'country' => 'required', + 'postal_code' => 'required', + 'contact_number' => 'required|digits:10', + 'email' => 'required', ], [ 'required' => 'The :attribute field must be required', 'unique' => 'The :attribute field should be unique' @@ -1095,12 +1100,19 @@ class DashboardController extends Controller if ($validationMessage) { return response()->json(['status' => 400, 'message' => $validationMessage]); } - if (!session::has('sellerFormData')) { - return response()->json(['status' => 400, 'message' => 'Please fill seller form again']); - } + // if (!session::has('sellerFormData')) { + // return response()->json(['status' => 400, 'message' => 'Please fill seller form again']); + // } $sellerFormUpdateCreate = MarketplaceSellerForm::updateOrCreate([ 'users_id' => $request->user()->id - ],session::get('sellerFormData')); + ],[ + 'name'=>$request->name, + 'city'=>$request->city, + 'country'=>$request->country, + 'postal_code'=>$request->postal_code, + 'contact_number'=>$request->contact_number, + 'email'=>$request->email, + ]); $aifSellerForm = MarketplaceAlternativeInvestmentFundSeller::create([ 'seller_forms_id' => MarketplaceSellerForm::where('users_id', $request->user()->id)->value('id'), @@ -1148,8 +1160,13 @@ class DashboardController extends Controller 'original_amount_invested' => 'required', 'current_market_value_of_the_property' => 'required', 'expected_selling_price' => 'required', - 'latest_valuation_date'=>'required', - + 'latest_valuation_date'=>'required', + 'name' => 'required', + 'city' => 'required', + 'country' => 'required', + 'postal_code' => 'required', + 'contact_number' => 'required|digits:10', + 'email' => 'required', ], [ 'required' => 'The :attribute field must be required', 'unique' => 'The :attribute field should be unique' @@ -1160,13 +1177,20 @@ class DashboardController extends Controller if ($validationMessage) { return response()->json(['status' => 400, 'message' => $validationMessage]); } - if (!session::has('sellerFormData')) { - return response()->json(['status' => 400, 'message' => 'Please fill seller form again']); - } - + // if (!session::has('sellerFormData')) { + // return response()->json(['status' => 400, 'message' => 'Please fill seller form again']); + // } + $sellerFormUpdateCreate = MarketplaceSellerForm::updateOrCreate([ 'users_id' => $request->user()->id - ],session::get('sellerFormData')); + ],[ + 'name'=>$request->name, + 'city'=>$request->city, + 'country'=>$request->country, + 'postal_code'=>$request->postal_code, + 'contact_number'=>$request->contact_number, + 'email'=>$request->email, + ]); // dd($request->all(),$request->user()->id,request()->user()->id); $freSellerForm = MarketplaceFractionalRealEstateSeller::create([ diff --git a/resources/views/Admin/Pages/pre_owned_investment/partial/overview-row.blade.php b/resources/views/Admin/Pages/pre_owned_investment/partial/overview-row.blade.php index c89aaf2..8557ea1 100644 --- a/resources/views/Admin/Pages/pre_owned_investment/partial/overview-row.blade.php +++ b/resources/views/Admin/Pages/pre_owned_investment/partial/overview-row.blade.php @@ -40,7 +40,7 @@ - + @endif @@ -51,7 +51,7 @@ - + diff --git a/resources/views/Admin/Pages/pre_owned_investment/pre_owned_investmentV2.blade.php b/resources/views/Admin/Pages/pre_owned_investment/pre_owned_investmentV2.blade.php index 485cd64..74f09a3 100644 --- a/resources/views/Admin/Pages/pre_owned_investment/pre_owned_investmentV2.blade.php +++ b/resources/views/Admin/Pages/pre_owned_investment/pre_owned_investmentV2.blade.php @@ -292,6 +292,7 @@ +
@@ -397,7 +398,7 @@ } }) - function listingStatus(id, status, table, email = null) { + function listingStatus(id, status, table, email = null, username = null) { Swal.fire({ title: `Do you want to move this investment listing to ${status} section?`, showDenyButton: false, @@ -426,6 +427,7 @@ // alert(email); $('#to_email').html(email); $('#email_send').val(email); + $('#username').val(username); $('#send_mail_reply').modal('show'); }