feat: add search to order, transaction

backend/Helper/OrderQuery.cs

@@ -16,6 +16,7 @@ public class OrderQuery
         public DateTime? MinDate { get; set; } = null;
         public DateTime? MaxDate { get; set; } = null;
         public string PhoneNumber { get; set; } = string.Empty;
+        public string? SearchCustomerName { get; set; } = string.Empty;
         public double? MinTotalPrice { get; set; } = 0;
         public double? MaxTotalPrice { get; set; } = 1000000000;
         public int PageSize { get; set; } = 5;

backend/Helper/TransactionQuery.cs

@@ -7,6 +7,7 @@ namespace backend.Helper
 {
     public class TransactionQuery
     {
+        public string? SearchOrderId { get; set; } = string.Empty;
         public int? PageSize { get; set; }
         public int? PageNumber { get; set; }
     }

backend/Repository/OrderRepository.cs

@@ -217,6 +217,13 @@ public OrderRepository(ApplicationDbContext context)
                 );
             }
 
+            if (!string.IsNullOrEmpty(query.SearchCustomerName))
+            {
+                orderQueries = orderQueries.Where(x =>
+                    x.Customer!.Name.Contains(query.SearchCustomerName)
+                );
+            }
+
             if (query.SaleStaffId.HasValue)
             {
                 orderQueries = orderQueries.Where(x => x.SaleStaffId == query.SaleStaffId);

backend/Repository/TransactionRepository.cs

@@ -10,6 +10,7 @@
 using backend.Mappers;
 using backend.Models;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.IdentityModel.Tokens;
 
 namespace backend.Repository
 {
@@ -59,6 +60,13 @@ public TransactionRepository(ApplicationDbContext context)
         {
             var transactionsQuery = _context.Transactions.AsQueryable();
 
+            if (!query.SearchOrderId.IsNullOrEmpty())
+            {
+                transactionsQuery = transactionsQuery.Where( tq =>
+                    tq.OrderId!.Contains(query.SearchOrderId!)                    
+                    );
+            }
+
             var totalCount = await transactionsQuery.CountAsync();
             var totalPages = totalCount / (query.PageSize ?? 10);
             var Transactions = await transactionsQuery

frontend/src/constants/routes.tsx

@@ -27,8 +27,8 @@ import BlogsManage from "../pages/dashboard/blog/BlogsManage";
 import BlogView from "../pages/dashboard/blog/BlogView";
 import AccessoriesManage from "../pages/dashboard/accessory/AccessoriesManage";
 import AccessoryView from "../pages/dashboard/accessory/AccessoryView";
-import DiamondPriceManage from "../pages/dashboard/diamondPrice/DiamondPriceManage";
-import AccessoryPriceManage from "../pages/dashboard/accessoryPrice/AccessoryPriceManage";
+import DiamondPriceManage from "../pages/dashboard/diamondprice/DiamondPriceManage";
+import AccessoryPriceManage from "../pages/dashboard/accessoryprice/AccessoryPriceManage";
 import CustomerManage from "../pages/dashboard/customer/CustomerManage";
 import TransactionManage from "../pages/dashboard/transaction/TransactionManage";
 import OrderManage from "../pages/dashboard/order/OrderManage";

frontend/src/pages/dashboard/order/OrderManage.tsx

@@ -61,14 +61,14 @@ export default function OrderManage() {
         status === "1"
           ? "Pending"
           : status === "2"
-          ? "Processing"
-          : status === "3"
-          ? "Confirmed"
-          : status === "4"
-          ? "Delivering"
-          : status === "5"
-          ? "Completed"
-          : "Failed"
+            ? "Processing"
+            : status === "3"
+              ? "Confirmed"
+              : status === "4"
+                ? "Delivering"
+                : status === "5"
+                  ? "Completed"
+                  : "Failed"
       );
     }
   }, [location.search]);
@@ -105,11 +105,16 @@ export default function OrderManage() {
                 <Form.Item className="flex-grow">
                   <Input
                     type="text"
-                    placeholder="Search"
+                    placeholder="Search by customer name"
                     id="keyword"
-                    className="border p-2 rounded-md w-full"
+                    className="border p-2 rounded-md w-[300px]"
                     value={searchTerm}
-                    onChange={(e) => setSearchTerm(e.target.value)}
+                    onChange={(e) => {
+                      setSearchTerm(e.target.value)
+                      params.set("SearchCustomerName", e.target.value);
+                      setQueryUrl(`/api/Order?` + params.toString());
+                      navigate({ search: params.toString() });
+                    }}
                   />
                 </Form.Item>
                 <Form.Item>
@@ -129,7 +134,7 @@ export default function OrderManage() {
                     // Clear the URL parameters
                     const params = new URLSearchParams(location.search);
                     setQueryUrl(`/api/Order?` + params.toString());
-                    // params.delete("type");
+                    params.delete("SearchCustomerName");
                     navigate({ search: params.toString() });
                   }}
                 >

frontend/src/pages/dashboard/transaction/TransactionManage.tsx

@@ -80,7 +80,12 @@ export default function TransactionManage() {
                     id="keyword"
                     className="border p-2 rounded-md w-full"
                     value={searchTerm}
-                    onChange={(e) => setSearchTerm(e.target.value)}
+                    onChange={(e) => {
+                      setSearchTerm(e.target.value)
+                      params.set("SearchOrderId", e.target.value);
+                      setQueryUrl(`/api/Transactions?` + params.toString());
+                      navigate({ search: params.toString() });
+                    }}
                   />
                 </Form.Item>
               </Form>
@@ -95,8 +100,8 @@ export default function TransactionManage() {
                     setSearchTerm("");
                     // Clear the URL parameters
                     const params = new URLSearchParams(location.search);
+                    params.delete("SearchOrderId");
                     setQueryUrl(`/api/Transactions?` + params.toString());
-                    // params.delete("type");
                     navigate({ search: params.toString() });
                   }}
                 >
@@ -135,7 +140,7 @@ export default function TransactionManage() {
                         <LoadingItem key={key} />
                       ))}
                     {TransactionsList?.data &&
-                    TransactionsList?.data?.transactions?.length > 0 ? (
+                      TransactionsList?.data?.transactions?.length > 0 ? (
                       TransactionsList?.data?.transactions?.map(
                         renderTransactionsRow
                       )

frontend/src/pages/dashboard/warranty_card/CardManagement.tsx

@@ -118,6 +118,28 @@ export default function CardManagement() {
                 </Form.Item>
               </Form>
             </h3>
+
+            <div className="flex space-x-075">
+              <div className="card-action ">
+                <a
+                  href="/admin/diamonds"
+                  className="text-interactive "
+                  onClick={(event) => {
+                    event.preventDefault();
+                    setSearchTerm("");
+                    setSearchProductName("");
+                    // Clear the URL parameters
+                    const params = new URLSearchParams(location.search);
+                    params.delete("CustomerName");
+                    params.delete("ProductName");
+                    setQueryUrl(`/api/WarrantyCards?` + params.toString());
+                    navigate({ search: params.toString() });
+                  }}
+                >
+                  Clear filter
+                </a>
+              </div>
+            </div>
           </div>
           <div className="pt-lg"></div>
         </div>