From 254d83a52a73c583db87a6007fa0993cf5b3b1f4 Mon Sep 17 00:00:00 2001
From: MilesChou <jangconan@gmail.com>
Date: Fri, 7 Jul 2023 01:50:15 +0800
Subject: [PATCH] Feature: CustomerQuestion

---
 .../Controllers/Admin/AdminController.php     |  2 +
 .../Admin/CustomerQuestion/MessDelete.php     | 27 ++++++
 .../Admin/CustomerQuestion/Reply.php          | 24 ++++++
 .../Admin/CustomerQuestion/ReplyView.php      | 19 +++++
 .../Controllers/Api/CustomerQuestionApi.php   | 38 +++++++++
 .../User/CustomerQuestion/Destroy.php         | 28 +++++++
 .../User/CustomerQuestion/Index.php           | 26 ++++++
 .../User/CustomerQuestion/Store.php           | 32 +++++++
 app/Http/Controllers/User/ShowProduct.php     |  6 ++
 .../Admin/ReplyCustomerQuestionRequest.php    | 23 +++++
 app/Models/CustomerQuestion.php               | 36 ++++++++
 app/Models/Product.php                        |  7 +-
 app/Models/User.php                           |  5 ++
 ...000000_create_customer_questions_table.php | 25 ++++++
 .../customer/customer-question.blade.php      | 84 +++++++++++++++++++
 .../views/admin/customer/reply.blade.php      | 73 ++++++++++++++++
 resources/views/admin/dashboard.blade.php     | 30 +++++--
 .../views/customer-question/index.blade.php   | 72 ++++++++++++++++
 resources/views/inc/admin/sidebar.blade.php   | 23 ++++-
 resources/views/inc/admin/topbar.blade.php    | 28 +++++--
 .../views/inc/app/user-sidebar.blade.php      |  9 +-
 resources/views/shop/show.blade.php           | 71 ++++++++++++++++
 routes/admin.php                              | 13 +++
 routes/api.php                                |  4 +
 routes/web.php                                | 11 +++
 .../Http/Controllers/CustomerQuestionTest.php | 50 +++++++++++
 26 files changed, 748 insertions(+), 18 deletions(-)
 create mode 100644 app/Http/Controllers/Admin/CustomerQuestion/MessDelete.php
 create mode 100644 app/Http/Controllers/Admin/CustomerQuestion/Reply.php
 create mode 100644 app/Http/Controllers/Admin/CustomerQuestion/ReplyView.php
 create mode 100644 app/Http/Controllers/Api/CustomerQuestionApi.php
 create mode 100644 app/Http/Controllers/User/CustomerQuestion/Destroy.php
 create mode 100644 app/Http/Controllers/User/CustomerQuestion/Index.php
 create mode 100644 app/Http/Controllers/User/CustomerQuestion/Store.php
 create mode 100644 app/Http/Requests/Admin/ReplyCustomerQuestionRequest.php
 create mode 100644 app/Models/CustomerQuestion.php
 create mode 100644 database/migrations/2023_07_01_000000_create_customer_questions_table.php
 create mode 100644 resources/views/admin/customer/customer-question.blade.php
 create mode 100644 resources/views/admin/customer/reply.blade.php
 create mode 100644 resources/views/customer-question/index.blade.php
 create mode 100644 tests/Feature/Http/Controllers/CustomerQuestionTest.php

diff --git a/app/Http/Controllers/Admin/AdminController.php b/app/Http/Controllers/Admin/AdminController.php
index 9f5722eb..d4301845 100644
--- a/app/Http/Controllers/Admin/AdminController.php
+++ b/app/Http/Controllers/Admin/AdminController.php
@@ -5,6 +5,7 @@
 use App\Http\Controllers\Controller;
 use App\Models\Order;
 use App\Models\Product;
+use App\Models\CustomerQuestion;
 use Illuminate\Contracts\View\View;
 use Illuminate\Support\Facades\View as ViewFactory;
 
@@ -16,6 +17,7 @@ public function dashboard(): View
             'productsCount' => Product::count(),
             'ordersCount' => Order::where('status', 'PENDING')->count(),
             'readyToShipCount' => Order::where('status', 'READY TO SHIP')->count(),
+            'customerQueryCount' => CustomerQuestion::whereNUll('reply')->count(),
         ]);
     }
 }
diff --git a/app/Http/Controllers/Admin/CustomerQuestion/MessDelete.php b/app/Http/Controllers/Admin/CustomerQuestion/MessDelete.php
new file mode 100644
index 00000000..99fb3232
--- /dev/null
+++ b/app/Http/Controllers/Admin/CustomerQuestion/MessDelete.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Controllers\Admin\CustomerQuestion;
+
+use App\Models\CustomerQuestion;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Redirect;
+use RealRashid\SweetAlert\Facades\Alert;
+
+class MessDelete
+{
+    public function __invoke(Request $request): RedirectResponse
+    {
+        $ids = $request->get('ids');
+
+        $questions = CustomerQuestion::whereIn('id', $ids)->get(['id']);
+
+        foreach ($questions as $order) {
+            $order->delete();
+        }
+
+        Alert::toast('Removed', 'success');
+
+        return Redirect::route('customerQuestion.adminView');
+    }
+}
diff --git a/app/Http/Controllers/Admin/CustomerQuestion/Reply.php b/app/Http/Controllers/Admin/CustomerQuestion/Reply.php
new file mode 100644
index 00000000..6f414890
--- /dev/null
+++ b/app/Http/Controllers/Admin/CustomerQuestion/Reply.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Controllers\Admin\CustomerQuestion;
+
+use App\Http\Controllers\Controller;
+use App\Http\Requests\Admin\ReplyCustomerQuestionRequest;
+use App\Models\CustomerQuestion;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Support\Facades\Redirect;
+
+/**
+ * 管理者回應客戶的問題
+ */
+class Reply extends Controller
+{
+    public function __invoke(CustomerQuestion $question, ReplyCustomerQuestionRequest $request): RedirectResponse
+    {
+        $question->update([
+            'reply' => $request->reply,
+        ]);
+
+        return Redirect::route('customerQuestion.adminView');
+    }
+}
diff --git a/app/Http/Controllers/Admin/CustomerQuestion/ReplyView.php b/app/Http/Controllers/Admin/CustomerQuestion/ReplyView.php
new file mode 100644
index 00000000..1018ff73
--- /dev/null
+++ b/app/Http/Controllers/Admin/CustomerQuestion/ReplyView.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Admin\CustomerQuestion;
+
+use App\Models\CustomerQuestion;
+use Illuminate\Contracts\View\View;
+use Illuminate\Support\Facades\View as ViewFactory;
+
+class ReplyView
+{
+    public function __invoke($id): View
+    {
+        $question = CustomerQuestion::where('id', $id)
+            ->with('user', 'product.productImage')
+            ->first();
+
+        return ViewFactory::make('admin.customer.reply', compact('question'));
+    }
+}
diff --git a/app/Http/Controllers/Api/CustomerQuestionApi.php b/app/Http/Controllers/Api/CustomerQuestionApi.php
new file mode 100644
index 00000000..738f6ac9
--- /dev/null
+++ b/app/Http/Controllers/Api/CustomerQuestionApi.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Http\Controllers\Controller;
+use App\Models\CustomerQuestion;
+use Yajra\DataTables\DataTables;
+
+class CustomerQuestionApi extends Controller
+{
+    public function __invoke()
+    {
+        $questions = CustomerQuestion::latest()->get();
+
+        return DataTables::of($questions)
+        ->addColumn('select', function ($row) {
+            $item = '<input type="checkbox" name="ids[]" class="selectbox" value="' . $row->id . '">
+        ';
+            return $item;
+        })
+        ->addColumn('created_at', function ($row) {
+            return date('d/m/Y h:i A', strtotime($row->created_at));
+        })
+        ->addColumn('reply', function ($row) {
+            $class = $row->reply ? 'text-danger' : 'text-danger';
+            $val = $row->reply ?? '<p class="' . $class . '">pending</p>';
+            return $val;
+        })
+        ->addColumn('action', function ($row) {
+            $item = '<a href="/admin/customer-question/' . $row->id . '/reply" class="btn btn-sm btn-success">Reply</a>
+        ';
+            return $item;
+        })
+
+        ->rawColumns(['select', 'action', 'reply'])
+        ->make(true);
+    }
+}
diff --git a/app/Http/Controllers/User/CustomerQuestion/Destroy.php b/app/Http/Controllers/User/CustomerQuestion/Destroy.php
new file mode 100644
index 00000000..1e5d46e3
--- /dev/null
+++ b/app/Http/Controllers/User/CustomerQuestion/Destroy.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Controllers\User\CustomerQuestion;
+
+use App\Models\User;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Redirect;
+use RealRashid\SweetAlert\Facades\Alert;
+
+/**
+ * DELETE /customer-question/{id}
+ */
+class Destroy
+{
+    public function __invoke($id): RedirectResponse
+    {
+        /** @var User $user */
+        $user = Auth::user();
+        $user->questions()
+            ->where('id', $id)
+            ->delete();
+
+        Alert::toast('Deleted!', 'success');
+
+        return Redirect::route('customerQuestion.index');
+    }
+}
diff --git a/app/Http/Controllers/User/CustomerQuestion/Index.php b/app/Http/Controllers/User/CustomerQuestion/Index.php
new file mode 100644
index 00000000..fae9fc69
--- /dev/null
+++ b/app/Http/Controllers/User/CustomerQuestion/Index.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Controllers\User\CustomerQuestion;
+
+use App\Http\Controllers\Controller;
+use App\Models\User;
+use Illuminate\Contracts\View\View;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\View as ViewFactory;
+
+class Index extends Controller
+{
+    public function __invoke(): View
+    {
+        /** @var User $user */
+        $user = Auth::user();
+
+        $questions = $user->questions()
+            ->with('product')
+            ->paginate(20);
+
+        return ViewFactory::make('customer-question.index')->with([
+            'questions' => $questions,
+        ]);
+    }
+}
diff --git a/app/Http/Controllers/User/CustomerQuestion/Store.php b/app/Http/Controllers/User/CustomerQuestion/Store.php
new file mode 100644
index 00000000..690a6aa7
--- /dev/null
+++ b/app/Http/Controllers/User/CustomerQuestion/Store.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Controllers\User\CustomerQuestion;
+
+use App\Models\CustomerQuestion;
+use App\Models\Product;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Redirect;
+
+/**
+ * POST /customer-question
+ */
+class Store
+{
+    public function __invoke(Request $request): RedirectResponse
+    {
+        $request->validate([
+            'question' => 'required|max:255',
+        ]);
+        //product imported to redirect to its path
+        $product = Product::findOrFail($request->product_id);
+
+        $question = new CustomerQuestion();
+        $question->user_id = auth()->user()->id;
+        $question->product_id = $request->product_id;
+        $question->question = $request->question;
+        $question->save();
+
+        return Redirect::to($product->path());
+    }
+}
diff --git a/app/Http/Controllers/User/ShowProduct.php b/app/Http/Controllers/User/ShowProduct.php
index eebe41d5..bbe0a4a2 100644
--- a/app/Http/Controllers/User/ShowProduct.php
+++ b/app/Http/Controllers/User/ShowProduct.php
@@ -20,6 +20,11 @@ public function __invoke($id): View
             ->with('productImage')
             ->first();
 
+        $questions = $product
+            ->getQuestions()
+            ->with('user')
+            ->paginate(6);
+
         $mightAlsoLike = Product::where('id', '!=', $product->id)
             ->inRandomOrder()
             ->with('productImage')
@@ -28,6 +33,7 @@ public function __invoke($id): View
 
         return ViewFactory::make('shop.show')->with([
             'product' => $product,
+            'questions' => $questions,
             'mightAlsoLike' => $mightAlsoLike
         ]);
     }
diff --git a/app/Http/Requests/Admin/ReplyCustomerQuestionRequest.php b/app/Http/Requests/Admin/ReplyCustomerQuestionRequest.php
new file mode 100644
index 00000000..6e204e25
--- /dev/null
+++ b/app/Http/Requests/Admin/ReplyCustomerQuestionRequest.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Requests\Admin;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+/**
+ * @property string reply
+ */
+class ReplyCustomerQuestionRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'reply' => 'required|max:255',
+        ];
+    }
+}
diff --git a/app/Models/CustomerQuestion.php b/app/Models/CustomerQuestion.php
new file mode 100644
index 00000000..d06c189f
--- /dev/null
+++ b/app/Models/CustomerQuestion.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Models;
+
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+/**
+ * @property int id
+ * @property int user_id
+ * @property int product_id
+ * @property string question
+ * @property string reply
+ * @property Carbon created_at
+ * @property Carbon updated_at
+ * @property Product product
+ * @property User user
+ */
+class CustomerQuestion extends Model
+{
+    use HasFactory;
+
+    protected $guarded = [];
+
+    public function product(): BelongsTo
+    {
+        return $this->belongsTo(Product::class);
+    }
+
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+}
diff --git a/app/Models/Product.php b/app/Models/Product.php
index c3c2aa74..1a6db01b 100644
--- a/app/Models/Product.php
+++ b/app/Models/Product.php
@@ -3,9 +3,9 @@
 namespace App\Models;
 
 use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\URL;
@@ -54,6 +54,11 @@ public function getImage(): HasMany
         return $this->productImage();
     }
 
+    public function getQuestions(): HasMany
+    {
+        return $this->hasMany(CustomerQuestion::class);
+    }
+
     public function scopeMightAlsoLike($query)
     {
         return $query->inRandomOrder()->with('first_image')->take(4);
diff --git a/app/Models/User.php b/app/Models/User.php
index 7805db35..283cffc3 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -74,4 +74,9 @@ public function orders(): HasMany
     {
         return $this->hasMany(Order::class);
     }
+
+    public function questions(): HasMany
+    {
+        return $this->hasMany(CustomerQuestion::class);
+    }
 }
diff --git a/database/migrations/2023_07_01_000000_create_customer_questions_table.php b/database/migrations/2023_07_01_000000_create_customer_questions_table.php
new file mode 100644
index 00000000..dd0a973d
--- /dev/null
+++ b/database/migrations/2023_07_01_000000_create_customer_questions_table.php
@@ -0,0 +1,25 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateCustomerQuestionsTable extends Migration
+{
+    public function up(): void
+    {
+        Schema::create('customer_questions', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedBigInteger('user_id');
+            $table->unsignedBigInteger('product_id');
+            $table->string('question');
+            $table->string('reply')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('customer_questions');
+    }
+}
diff --git a/resources/views/admin/customer/customer-question.blade.php b/resources/views/admin/customer/customer-question.blade.php
new file mode 100644
index 00000000..49f58ea1
--- /dev/null
+++ b/resources/views/admin/customer/customer-question.blade.php
@@ -0,0 +1,84 @@
+@extends('layouts.admin')
+
+@section('content')
+<div class="container-fluid">
+  
+  <div class="card shadow mb-4">
+    <div class="card-header py-3">
+      <h6 class="m-0 font-weight-bold text-primary">Customer Questions/Queries</h6>
+    </div>
+    <div class="card-body">
+
+      <div class="mb-3">
+          <div class="form-group">
+            <label for="">Select all</label>
+            <input type="checkbox" class="selectall">
+          </div>
+          <button id="showSelected" class="btn btn-sm btn-danger">Delete</button>
+      </div>
+      <form action="{{route('customerQuestion.massDelete')}}" method="POST" id="selectorForm">
+        @csrf
+        <div class="table-responsive">
+          <table class="table table-hover table-bordered small" id="dataTable" width="100%" cellspacing="0">
+            <thead>
+              <tr>
+                <th>Select</th>
+                <th>Question</th>
+                <th>Reply</th>
+                <th>Created_at</th>
+                <th>Action</th>
+              </tr>
+            </thead>
+            <tbody></tbody>
+          </table>
+        </div>
+      </form>
+    </div>
+  </div>
+
+</div>
+@endsection
+
+@push('js')
+<script>
+$(document).ready(function(){
+  $('#dataTable').dataTable({
+  processing:true,
+  serverSide:true,
+  ajax:"{{route('customerQuestion.all')}}",
+    columns:[
+      {data:'select',orderable:false,searchable:false},
+      {data:'question'},
+      {data:'reply'},
+      {data:'created_at'},
+      {data:'action'}
+    ]
+  });
+
+	$('.selectall').click(function(){
+		$('.selectbox').prop('checked', $(this).prop('checked'));
+	})
+
+	$('.selectbox').change(function(){
+		var total = $('.selectbox').length;
+		var number = $('.selectbox:checked').length;
+		if(total == number){
+			$('.selectall').prop('checked', true);
+		} else{
+			$('.selectall').prop('checked', false);
+		}
+	})
+
+  //submit selected
+  $('#showSelected').click(function(){
+    if($('.selectbox:checked').length < 1){
+      alert('Please select atleast one of the row!');
+      return;
+    }else{
+      $('#selectorForm').submit();
+    }
+  })
+});
+
+</script>
+@endpush
\ No newline at end of file
diff --git a/resources/views/admin/customer/reply.blade.php b/resources/views/admin/customer/reply.blade.php
new file mode 100644
index 00000000..69d589d3
--- /dev/null
+++ b/resources/views/admin/customer/reply.blade.php
@@ -0,0 +1,73 @@
+@extends('layouts.admin')
+
+@section('content')
+<div class="container-fluid">
+  
+  <div class="card shadow mb-4">
+    <div class="card-header py-3">
+      <h6 class="m-0 font-weight-bold text-primary">Customer Query Reply</h6>
+    </div>
+    <div class="card-body">
+
+      <div class="row">
+        <div class="col-sm-12 col-md-8 pb-5">
+
+          <div class="my-4">
+            <div class="row">
+              <div class="col-sm-6 col-md-3">
+                <img src="{{asset($question->product->productImage->first()->thumbnail)}}" class="img-fluid" alt="">
+              </div>
+              <div class="col-sm-12 col-md-9">
+                <h4>{{$question->product->title}}</h4>
+                @if($question->product->onSale)
+                <p>Price : <span>Rs.{{number_format($question->product->price)}}</span></p>
+                <p>Sale Price : Rs.{{number_format($question->product->sale_price)}} </p>
+                @else
+                <p>Price : Rs.{{number_format($question->product->price)}} </p>
+                @endif
+              </div>
+            </div>
+          </div>
+
+
+          @if($errors->any())
+            <div class="alert alert-danger">
+              {{ implode('', $errors->all(':message')) }}
+            </div>
+          @endif
+          <form action="{{route('customerQuestion.reply',['id'=>$question->id])}}" method="POST">
+            @csrf
+            @method('PUT')
+            <div class="row">
+              <div class="col-sm-12 col-md-8">
+                <div class="form-group">
+                  <label for="">Question</label>
+                  <p class="text-gray-800 h5 alert alert-primary">{{$question->question}}</p>
+                  <p class="text-gray-700">Asked by {{$question->user->name}} on {{$question->created_at->diffForHumans()}}</p>
+                </div>
+                <div class="form-group">
+                  <label for="">Reply</label>
+                  <textarea name="reply" rows="5" class="form-control"></textarea>
+                </div>
+                <div class="d-flex justify-content-between">
+                  <button type="submit" class="btn btn-primary my-3">Reply</button>
+                </div>
+              </div>
+            </div>
+          </form>
+          <div class="d-flex justify-content-end">
+            <form action="{{route('customerQuestion.massDelete')}}" method="POST">
+              @csrf
+              <input type="hidden" name="ids[]" value="1">
+              <button type="submit" class="btn btn-danger btn-sm ">Delete Question</button>
+            </form>
+          </div>
+        </div>
+    
+      </div>
+     
+    </div>
+  </div>
+
+</div>
+@endsection
diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php
index 3cf363d7..24c4c15c 100644
--- a/resources/views/admin/dashboard.blade.php
+++ b/resources/views/admin/dashboard.blade.php
@@ -10,9 +10,9 @@
 
   <!-- Content Row -->
   <div class="row">
-
+    
     <div class="col-xl-3 col-md-6 mb-4">
-      <a href="{{route('product.index')}}" style="text-decoration: none">
+      <a href="{{route('product.index')}}" style="text-decoration: none"> 
         <div class="card border-left-info shadow h-100 py-2">
           <div class="card-body">
             <div class="row no-gutters align-items-center">
@@ -28,9 +28,9 @@
         </div>
         </a>
       </div>
-
+      
     <div class="col-xl-3 col-md-6 mb-4">
-      <a href="{{route('order.index')}}" style="text-decoration: none">
+      <a href="{{route('order.index')}}" style="text-decoration: none"> 
         <div class="card border-left-primary shadow h-100 py-2">
           <div class="card-body">
             <div class="row no-gutters align-items-center">
@@ -48,7 +48,7 @@
     </div>
 
     <div class="col-xl-3 col-md-6 mb-4">
-      <a href="{{route('readyToShip.index')}}" style="text-decoration: none">
+      <a href="{{route('readyToShip.index')}}" style="text-decoration: none"> 
         <div class="card border-left-success shadow h-100 py-2">
           <div class="card-body">
             <div class="row no-gutters align-items-center">
@@ -65,6 +65,24 @@
       </a>
     </div>
 
+    <div class="col-xl-3 col-md-6 mb-4">
+      <a href="{{route('customerQuestion.adminView')}}" style="text-decoration: none"> 
+        <div class="card border-left-danger shadow h-100 py-2">
+          <div class="card-body">
+            <div class="row no-gutters align-items-center">
+              <div class="col mr-2">
+                <div class="text-xs font-weight-bold text-danger text-uppercase mb-1">Customer Queries</div>
+                <div class="h5 mb-0 font-weight-bold text-gray-800">{{$customerQueryCount}}</div>
+              </div>
+              <div class="col-auto">
+                <i class="fas fa-question-circle fa-2x text-gray-300"></i>
+              </div>
+            </div>
+          </div>
+        </div>
+      </a>
+    </div>
+
   </div>
 
   <!-- Content Row -->
@@ -319,4 +337,4 @@ function number_format(number, decimals, dec_point, thousands_sep) {
 }
 
 </script>
-@endpush
+@endpush
\ No newline at end of file
diff --git a/resources/views/customer-question/index.blade.php b/resources/views/customer-question/index.blade.php
new file mode 100644
index 00000000..e509416a
--- /dev/null
+++ b/resources/views/customer-question/index.blade.php
@@ -0,0 +1,72 @@
+@extends('layouts.app')
+
+@section('page-title','Product queries')
+
+@section('content')
+<div class="container-fluid py-3" style="min-height: 80vh">
+  <div class="row no-gutters">
+
+    <div class="col-xl-2 col-md-2 col-sm-12 ml-auto">
+      @include('inc.app.user-sidebar')
+    </div>
+
+    <div class="col-xl-8 col-md-8 col-sm-12 mr-auto">
+      <div class="card shadow">
+        <div class="card-header bg-light border-bottom">
+          <p class="mb-0 ">Product queries</p>
+        </div>
+
+        <div class="card-body" style="min-height: 40vh">
+             
+          <div class="table-responsive">
+            <table class="table table-hover table-striped">
+              <thead>
+                <tr>
+                  <th>Product title</th>
+                  <th>Question</th>
+                  <th>Reply</th>
+                  <th>Created_at</th>
+                  <th>Action</th>
+                </tr>
+              </thead>
+              <tbody>
+                @if($questions->count())
+                  @foreach($questions as $question)
+                    <tr>
+                      <td><a href="{{$question->product->path()}}">{{$question->product->title}}</a></td>
+                      <td>{{$question->question}}</td>
+                      <td>{{$question->reply ?? 'pending' }}</td>
+                      <td>{{$question->created_at->diffForHumans()}}</td>
+                      <td>
+                        <form action="{{route('customerQuestion.destroy',['id'=>$question])}}" method="POST">
+                          @csrf
+                          @method('delete')
+                          <button type="submit" class="btn btn-danger btn-sm">Delete</a>
+                        </form>
+                      </td>
+                    </tr>
+                  @endforeach
+                @else
+                <tr>
+                  <td>No questions made on the products yet. </td>
+                  <td></td>
+                  <td></td>
+                  <td></td>
+                  <td></td>
+                  <td></td>
+                </tr>
+                <a href="{{route('shop.catalog')}}" class="btn btn-orange btn-sm">Go to products page</a>
+                @endif
+              </tbody>
+            </table>
+          </div>
+          <div class="d-flex justify-content-center">
+            {{$questions->links()}}
+          </div>
+        </div>
+
+      </div>
+    </div>
+  </div>
+</div>
+@endsection
\ No newline at end of file
diff --git a/resources/views/inc/admin/sidebar.blade.php b/resources/views/inc/admin/sidebar.blade.php
index d56c6186..783e32f1 100644
--- a/resources/views/inc/admin/sidebar.blade.php
+++ b/resources/views/inc/admin/sidebar.blade.php
@@ -14,11 +14,11 @@
       <i class="fas fa-fw fa-tachometer-alt"></i>
       <span>Dashboard</span></a>
   </li>
-
+  
   <!-- Divider -->
   <hr class="sidebar-divider">
   @endrole
-
+  
 
   @role('shipper')
   <a class="sidebar-brand d-flex align-items-center justify-content-center" href="{{route('order.index')}}">
@@ -85,6 +85,25 @@
       </div>
     </div>
   </li>
+
+  <!-- Divider -->
+  <hr class="sidebar-divider">
+  <!-- Heading -->
+  <div class="sidebar-heading">
+    Customer Information
+  </div>
+
+  <li class="nav-item">
+    <a class="nav-link collapsed" href="#" data-toggle="collapse" data-target="#customerCollapse" aria-expanded="true" aria-controls="customerCollapse">
+      <i class="fas fa-fw fa-users"></i>
+      <span>Customers</span>
+    </a>
+    <div id="customerCollapse" class="collapse" aria-labelledby="headingUtilities" data-parent="#accordionSidebar">
+      <div class="bg-white py-2 collapse-inner rounded">
+        <a class="collapse-item" href="{{route('customerQuestion.adminView')}}">Customer questions</a>
+      </div>
+    </div>
+  </li>
   @endrole
 
   <hr class="sidebar-divider">
diff --git a/resources/views/inc/admin/topbar.blade.php b/resources/views/inc/admin/topbar.blade.php
index 446a8b48..b5a73026 100644
--- a/resources/views/inc/admin/topbar.blade.php
+++ b/resources/views/inc/admin/topbar.blade.php
@@ -5,7 +5,7 @@
   <button id="sidebarToggleTop" class="btn btn-link d-md-none rounded-circle mr-3">
     <i class="fas fa-bars"></i>
   </button>
-
+  
   <!-- Topbar Search -->
   <form class="d-none d-sm-inline-block form-inline mr-auto ml-md-3 my-2 my-md-0 mw-100 navbar-search" action="">
     <div class="input-group">
@@ -17,10 +17,10 @@
       </div>
     </div>
   </form>
-
+  
   <!-- Topbar Navbar -->
   <ul class="navbar-nav ml-auto">
-
+  
     <!-- Nav Item - Search Dropdown (Visible Only XS) -->
     <li class="nav-item dropdown no-arrow d-sm-none">
       <a class="nav-link dropdown-toggle" href="#" id="searchDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -40,7 +40,21 @@
         </form>
       </div>
     </li>
-
+  
+    @role('admin')
+    <!-- Nav Item - Messages -->
+    <li class="nav-item dropdown no-arrow mx-1">
+      <a class="nav-link" href="{{route('customerQuestion.adminView')}}" role="button" >
+        <i class="fas fa-envelope fa-fw"></i>
+        <!-- Counter - Messages -->
+        <span class="badge badge-danger badge-counter">+</span>
+      </a>
+    </li>
+  
+    <div class="topbar-divider d-none d-sm-block"></div>
+  
+    @endrole
+  
     @auth
     <!-- Nav Item - User Information -->
     <li class="nav-item dropdown no-arrow">
@@ -71,8 +85,8 @@
     @guest
     <a href="{{route('login')}}" class="btn btn-primary">Login</a>
     @endguest
-
+  
   </ul>
-
+  
   </nav>
-  <!-- End of Topbar -->
+  <!-- End of Topbar --> 
\ No newline at end of file
diff --git a/resources/views/inc/app/user-sidebar.blade.php b/resources/views/inc/app/user-sidebar.blade.php
index dd270e52..33affdd4 100644
--- a/resources/views/inc/app/user-sidebar.blade.php
+++ b/resources/views/inc/app/user-sidebar.blade.php
@@ -4,7 +4,7 @@
   </li>
   <li class="list-group-item-action list-group-item">
     <a href="{{route('user.index')}}" >
-      <i class="fas fa-user-circle text-primary"></i> My Account
+      <i class="fas fa-user-circle text-primary"></i> My Account 
     </a>
   </li>
   <li class="list-group-item-action list-group-item">
@@ -22,9 +22,14 @@
       <i class="fas fa-window-close text-primary"></i> Cancellations
     </a>
   </li>
+  <li class="list-group-item-action list-group-item">
+    <a href="{{route('customerQuestion.index')}}">
+      <i class="fas fa-align-left text-primary"></i> My queries
+    </a>
+  </li>
   <li class="list-group-item-action list-group-item">
     <a href="{{route('account.logout')}}">
       <i class="fas fa-sign-out-alt text-primary"></i> Logout
     </a>
   </li>
-</ul>
+</ul>
\ No newline at end of file
diff --git a/resources/views/shop/show.blade.php b/resources/views/shop/show.blade.php
index 17f280ee..a19db67d 100644
--- a/resources/views/shop/show.blade.php
+++ b/resources/views/shop/show.blade.php
@@ -125,6 +125,77 @@ class="pl-3 border" disabled style="width: 50px">
             </div>
         </div>
 
+        <div class="card shadow my-2 mb-5">
+            <div class="card-body">
+                <div class="description-section">
+                    <div class="row">
+                        <div class="col-12 ">
+                            <h6 class="text-gray-900">Questions about the product</h6>
+                            <div class="py-2 px-1 text-gray-800">
+                                <div class="row">
+                                    <div class="col-12 bg-light shadow">
+                                        <div class="row mb-3">
+                                            <div class="col">
+                                                @auth
+                                                    <form action="{{ route('customerQuestion.store') }}" method="POST">
+                                                        @csrf
+                                                        <div class="form-group d-flex">
+                                                            <input type="hidden" name="product_id"
+                                                                   value="{{ $product->id }}">
+                                                            <input type="text" placeholder="Enter your question(s) here"
+                                                                   class="form-control" name="question">
+                                                            <button type="submit" class="btn btn-orange">Ask</button>
+                                                        </div>
+                                                    </form>
+                                                @endauth
+                                                @guest
+                                                    <p class="text-center py-2"><a href="{{ route('login') }}"
+                                                                                   class="text-primary">Login</a> or <a
+                                                            href="{{ route('register' )}}"
+                                                            class="text-primary">Register</a> to ask the seller now</p>
+                                                @endguest
+                                            </div>
+                                        </div>
+                                        @if($questions->count())
+                                            @foreach($questions as $question)
+                                                <div class="row shadow-hover mb-3 py-2 pl-2">
+                                                    <div class="col-12 mb-1">
+                                                        <div><i class="fas fa-question-circle text-warning"></i> <span
+                                                                class="text-gray-700"></span> [{{$question->user->name}}
+                                                            ] >> {{$question->question}}
+                                                            - {{$question->created_at->diffForHumans()}}</div>
+                                                    </div>
+                                                    <div class="col-12">
+                                                        @if($question->reply)
+                                                            <div>
+                                                                <i class="fas fa-comment-alt text-secondary"></i>
+                                                                <span class="text-gray-800">{{$question->reply}}</span>
+                                                            </div>
+                                                        @else
+                                                            <div>Waiting for the seller to reply.</div>
+                                                        @endif
+                                                    </div>
+                                                </div>
+                                            @endforeach
+                                        @else
+                                            <div class="text-center">
+                                                <div><i class="fas fa-envelope fa-2x text-gray-500"></i></div>
+                                                <p clas="d-block">There are not questions yet.</p>
+                                            </div>
+                                        @endif
+                                        <div class="d-flex justify-content-end">
+                                            {{$questions->links()}}
+                                        </div>
+
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
     </div>
 
 
diff --git a/routes/admin.php b/routes/admin.php
index 2b65bda0..07c179e7 100644
--- a/routes/admin.php
+++ b/routes/admin.php
@@ -3,6 +3,9 @@
 use App\Http\Controllers\Admin\AdminController;
 use App\Http\Controllers\Admin\AdminLoginController;
 use App\Http\Controllers\Admin\CategoryController;
+use App\Http\Controllers\Admin\CustomerQuestion\MessDelete;
+use App\Http\Controllers\Admin\CustomerQuestion\Reply;
+use App\Http\Controllers\Admin\CustomerQuestion\ReplyView;
 use App\Http\Controllers\Admin\DeliveredController;
 use App\Http\Controllers\Admin\InvoiceController;
 use App\Http\Controllers\Admin\OrderController;
@@ -32,6 +35,16 @@
     Route::delete('/product/{id}/image', [ProductImageController::class, 'destroy'])
         ->name('productImage.destroy');
 
+    // Customer Question functions
+    Route::view('/admin/customer-question', 'admin.customer.customer-question')
+        ->name('customerQuestion.adminView');
+    Route::get('/admin/customer-question/{id}/reply', ReplyView::class)
+        ->name('customerQuestion.adminReply');
+    Route::post('/admin/customer-question', MessDelete::class)
+        ->name('customerQuestion.massDelete');
+    Route::put('/admin/customer-question/{question}/reply', Reply::class)
+        ->name('customerQuestion.reply');
+
     Route::get('/user-management', [UserManagementController::class, 'index'])
         ->name('userManagement.index');
     Route::post('/user-management', [UserManagementController::class, 'store'])
diff --git a/routes/api.php b/routes/api.php
index 4a269e85..1eff3ed6 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -1,6 +1,7 @@
 <?php
 
 use App\Http\Controllers\Admin\ProductImageController;
+use App\Http\Controllers\Api\CustomerQuestionApi;
 use App\Http\Controllers\Api\DeliveredApiController;
 use App\Http\Controllers\Api\OrderApiController;
 use App\Http\Controllers\Api\ProductApiController;
@@ -21,6 +22,9 @@
 Route::get('/product/onsale/invert/{id}', [ProductApiController::class, 'onSaleInvert'])->name('product.onSaleInvert');
 Route::get('/product/live/invert/{id}', [ProductApiController::class, 'liveInvert'])->name('product.liveInvert');
 
+//customer question
+Route::get('/customer-question/all', CustomerQuestionApi::class)->name('customerQuestion.all');
+
 //orders api
 Route::get('/order/all', [OrderApiController::class, 'all'])->name('order.all');
 
diff --git a/routes/web.php b/routes/web.php
index 54a0e202..1b253833 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -7,6 +7,9 @@
 use App\Http\Controllers\HomeController;
 use App\Http\Controllers\MyOrderController;
 use App\Http\Controllers\User\Catalog;
+use App\Http\Controllers\User\CustomerQuestion\Destroy as DestroyCustomerQuestion;
+use App\Http\Controllers\User\CustomerQuestion\Index as IndexCustomerQuestion;
+use App\Http\Controllers\User\CustomerQuestion\Store as StoreCustomerQuestion;
 use App\Http\Controllers\User\Shop;
 use App\Http\Controllers\User\ShowProduct;
 use App\Http\Controllers\UserController;
@@ -55,4 +58,12 @@
 
     Route::get('/user', [UserController::class, 'index'])->name('user.index');
     Route::post('/user/address', [UserController::class, 'address'])->name('user.address');
+
+    // Customer Question functions
+    Route::get('/customer-question', IndexCustomerQuestion::class)
+        ->name('customerQuestion.index');
+    Route::post('/customer-question', StoreCustomerQuestion::class)
+        ->name('customerQuestion.store');
+    Route::delete('/customer-question/{id}', DestroyCustomerQuestion::class)
+        ->name('customerQuestion.destroy');
 });
diff --git a/tests/Feature/Http/Controllers/CustomerQuestionTest.php b/tests/Feature/Http/Controllers/CustomerQuestionTest.php
new file mode 100644
index 00000000..3785bbca
--- /dev/null
+++ b/tests/Feature/Http/Controllers/CustomerQuestionTest.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Tests\Feature\Http\Controllers;
+
+use App\Models\CustomerQuestion;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Foundation\Testing\WithFaker;
+use Illuminate\Support\Facades\Auth;
+use PHPUnit\Framework\Attributes\Test;
+use Tests\TestCase;
+
+class CustomerQuestionTest extends TestCase
+{
+    use RefreshDatabase;
+
+    #[Test]
+    public function onlyAdminsCanGoToAdminView()
+    {
+        Artisan::call('db:seed');
+        Auth::loginUsingId(1); //admin according to the seeder
+
+        $response = $this->get('/admin/customer-question');
+        $response->assertStatus(200);
+    }
+
+    #[Test]
+    public function usersAreRestrictedToGoToAdminView()
+    {
+        Artisan::call('db:seed');
+        Auth::loginUsingId(2); //user according to the seeder
+
+        $response = $this->get('/admin/customer-question');
+        $response->assertForbidden();
+    }
+
+    #[Test]
+    public function userCanStoreQuestionToProduct()
+    {
+        Artisan::call('db:seed');
+        Auth::loginUsingId(3); //user according to the seeder
+
+        $response = $this->post('/customer-question', [
+            'question' => 'Is is good?',
+            'product_id' => 1
+        ]);
+        $response->assertStatus(302);
+        $this->assertCount(1, CustomerQuestion::all());
+    }
+}