diff --git a/app/Exports/UserProductExport.php b/app/Exports/UserProductExport.php new file mode 100644 index 0000000..b78c9b6 --- /dev/null +++ b/app/Exports/UserProductExport.php @@ -0,0 +1,33 @@ +data = $data; + $this->columns = $columns; + } + + public function collection() + { + // $data = monthly_update_master::select('')->get(); + return $this->data; + } + public function headings(): array + { + return $this->columns; + } +} diff --git a/app/Http/Controllers/Admin/ManageUserProductController.php b/app/Http/Controllers/Admin/ManageUserProductController.php index 016a708..a60f513 100644 --- a/app/Http/Controllers/Admin/ManageUserProductController.php +++ b/app/Http/Controllers/Admin/ManageUserProductController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers\Admin; +use App\Exports\UserProductExport; use App\Models\User; use Illuminate\Http\Request; use App\Models\MonthlyUpdateMaster; @@ -39,6 +40,33 @@ class ManageUserProductController extends Controller return view('Admin.Pages.manage_investors.manage_user_product.manage_user', compact('userProduct')); } + public function exportUserProduct() + { + // dd('hello'); + $data = MonthlyUpdateMaster::with( + ['investor' => function($query){ + $query->select('id','name'); + // },'products.categorys' => function($query){ + // $query->select('id','categories_id'); + // }])->select('id','users_id','products_id','custom_id')->get(); + },'products.categorys'])->get(); + // dd($data->toArray()); + $withClearData = collect(); + $new = []; + $data->each(function($value) use($withClearData, $new){ + $new['user_name'] = $value->investor->name; + $new['custom_id'] = $value->custom_id; + $new['investor_name'] = $value->investor->name; + $new['category'] = $value->products->categorys->category_name; + $new['holding_status'] = $value->holding_status; + $new['created_at'] = $value->created_at->format('d-m-Y'); + $withClearData->push($new); + }); + $columns = ['User Name', 'CustomId', 'Investor Name', 'Category', 'Holding Status', 'Created At']; + // dd($withClearData->sortByDesc('created_at')); + return Excel::download(new UserProductExport($withClearData->sortByDesc('created_at'), $columns), 'UsersProduct.XLSX'); + } + public function redeemWithSoldAmount(Request $request) { // dd($request->all()); diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index 48c1f57..5dc3df4 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -1028,7 +1028,7 @@ class AuthController extends Controller // 'otp' => $otp // ]); $insertOtp = User::where('contact_number', $contactNumber)->update([ - 'expire_at' => Carbon::now()->addMinutes('5'), + 'expire_at' => Carbon::now()->addMinutes('2'), 'otp' => $otp ]); if (!$insertOtp) { diff --git a/public/assets/js/admin/category.js b/public/assets/js/admin/category.js index 1693638..78bea0f 100644 --- a/public/assets/js/admin/category.js +++ b/public/assets/js/admin/category.js @@ -73,7 +73,7 @@ $("#addCategoryForm").validate({ // $("#save_btn").text("Please wait..."); // $("#save_btn").attr("disabled", true); $.ajax({ - url: "/freeU_investment/manage-investments/categories/add", + url: "/manage-investments/categories/add", type: "POST", data: formData, processData: false, @@ -139,7 +139,8 @@ $("#editCategoryForm").validate({ // $("#save_btn").text("Please wait..."); // $("#save_btn").attr("disabled", true); $.ajax({ - url: "/freeU_investment/manage-investments/categories/edit", + url: "/manage-investments/categories/edit", + // url: "{{route('manage.categories.edit')}}", type: "POST", data: formData, headers: { @@ -174,7 +175,7 @@ $('#deleteCategoryForm').submit(function(e){ e.preventDefault(); var id = $('#delete_category_id').val(); $.ajax({ - url: "/freeU_investment/manage-investments/categories/delete", + url: "/manage-investments/categories/delete", type: "delete", headers: { "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr("content"), diff --git a/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user.blade.php b/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user.blade.php index 106a24c..6c289ea 100644 --- a/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user.blade.php +++ b/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user.blade.php @@ -26,7 +26,6 @@

Manage User Product

-
+ + +
diff --git a/resources/views/Frontend/Pages/hedge-funds/product.blade.php b/resources/views/Frontend/Pages/hedge-funds/product.blade.php index cd1df8c..503c42c 100644 --- a/resources/views/Frontend/Pages/hedge-funds/product.blade.php +++ b/resources/views/Frontend/Pages/hedge-funds/product.blade.php @@ -130,7 +130,7 @@
-
+

Description

{{ $productData->description ?? '-' }}
diff --git a/resources/views/Frontend/Pages/marketplace/view-offering.blade.php b/resources/views/Frontend/Pages/marketplace/view-offering.blade.php index 2ec37bd..9c437a7 100644 --- a/resources/views/Frontend/Pages/marketplace/view-offering.blade.php +++ b/resources/views/Frontend/Pages/marketplace/view-offering.blade.php @@ -15,7 +15,8 @@ @if ($logged_in) @if (!$ownProduct) @if (!$invested) - Show Interest @else @@ -23,7 +24,8 @@ id="" data-product-id="{{ $offering->products_id }}" data-bs-target="#recipes-pop-four">Added To Investment Watchlist! --}} - List Your Asset +
  • + @if(!auth()->guard('users')->check()) + List Your Asset + @else + List Your Asset + @endif +
    • {{-- href="{{ route('market-list') }}" --}} diff --git a/routes/web.php b/routes/web.php index bcf6172..633473e 100644 --- a/routes/web.php +++ b/routes/web.php @@ -601,6 +601,7 @@ Route::middleware([BackendAccess::class])->group(function () { Route::controller(ManageUserProductController::class)->group(function () { Route::get("manage-user-product", 'index')->name('manage-user-product'); Route::get("store-user-product", 'storeUserProduct')->name('store-user-product'); + Route::get("export-user-product", 'exportUserProduct')->name('export-user-product'); Route::get('userProduct/{id}', 'userProduct')->name('userProduct'); Route::get("import-monthly-updates", 'importMonthlyUpdateBlade')->name('import-monthly-updates'); Route::get("monthly-updates/{id}", 'monthlyUpdates')->name('monthly-updates');