diff --git a/backend/src/repository/OrderProductRepo.ts b/backend/src/repository/OrderProductRepo.ts index ba0d9165139a7f1e80bb20c05e0e9199afc51ae3..d84d7ade70f9dd30ce8e77696b51d1bd3a09ed55 100644 --- a/backend/src/repository/OrderProductRepo.ts +++ b/backend/src/repository/OrderProductRepo.ts @@ -15,7 +15,9 @@ interface IOrderProductRepo { export default class OrderProductRepo implements IOrderProductRepo { async getAllOrderProduct(): Promise<OrderProduct[]> { try { - return await OrderProduct.findAll(); + return await OrderProduct.findAll({ + order: [["id_product", "ASC"]], + }); } catch (error: any) { throw new Error( `Error while fetching order products: ${error.message}`, diff --git a/backend/src/repository/OrdersRepo.ts b/backend/src/repository/OrdersRepo.ts index 8793ef66cb91e48489dec4e4164ea1f301689fb6..6b8904f93a89d56ef650ef4a9b6e8faad38b3fa8 100644 --- a/backend/src/repository/OrdersRepo.ts +++ b/backend/src/repository/OrdersRepo.ts @@ -14,7 +14,9 @@ interface IOrdersRepo { export default class OrdersRepo implements IOrdersRepo { async getAllOrders(): Promise<Orders[]> { try { - return await Orders.findAll(); + return await Orders.findAll({ + order: [["id", "DESC"]], + }); } catch (error: any) { throw new Error(`Error while fetching orders: ${error.message}`); } diff --git a/backend/src/repository/PaymentsRepo.ts b/backend/src/repository/PaymentsRepo.ts index 296d92404b8ca4a85fa47a470a0700bc5b9dccb2..6b79b9b3ebcca3191826c916438773b313b9cde2 100644 --- a/backend/src/repository/PaymentsRepo.ts +++ b/backend/src/repository/PaymentsRepo.ts @@ -13,7 +13,9 @@ interface IPaymentsRepo { export default class PaymentsRepo implements IPaymentsRepo { async getAllPayments(): Promise<Payments[]> { try { - return await Payments.findAll(); + return await Payments.findAll({ + order: [["id", "DESC"]], + }); } catch (error: any) { throw new Error(`Error while fetching payments: ${error.message}`); } diff --git a/backend/src/repository/ProductsRepo.ts b/backend/src/repository/ProductsRepo.ts index 2e6f27b515344702999a3fd117f386e7cc3b2f69..58bcd9a99e271ab910ff5c4c3fc66bf8a110e095 100644 --- a/backend/src/repository/ProductsRepo.ts +++ b/backend/src/repository/ProductsRepo.ts @@ -13,7 +13,9 @@ interface IProductsRepo { export default class ProductsRepo implements IProductsRepo { async getAllProducts(): Promise<Products[]> { try { - return await Products.findAll(); + return await Products.findAll({ + order: [["id", "ASC"]], + }); } catch (error: any) { throw new Error(`Error while fetching products: ${error.message}`); } diff --git a/backend/src/repository/TablesRepo.ts b/backend/src/repository/TablesRepo.ts index 3b67116b8d4964e3b9a5c3e4605a1d87c6e81fce..588c10e43d74b6cdacb261b86e3fbf4b6daca0bc 100644 --- a/backend/src/repository/TablesRepo.ts +++ b/backend/src/repository/TablesRepo.ts @@ -13,7 +13,9 @@ export default class TablesRepo implements ITablesRepo { async getAllTables(): Promise<Tables[]> { try { console.log("masuk getTables"); - return await Tables.findAll(); + return await Tables.findAll({ + order: [["id", "ASC"]], + }); } catch (error: any) { throw new Error(`Error while fetching tables: ${error.message}`); } diff --git a/backend/src/repository/TenantsRepo.ts b/backend/src/repository/TenantsRepo.ts index 64686d365cb36868f3a3d497124e66333c7b1311..7312d5ea6bb922468d49331b431dad98eb20f604 100644 --- a/backend/src/repository/TenantsRepo.ts +++ b/backend/src/repository/TenantsRepo.ts @@ -13,7 +13,9 @@ interface ITenantRepo { export default class TenantRepo implements ITenantRepo { async getAllTenants(): Promise<Tenants[]> { try { - return await Tenants.findAll(); + return await Tenants.findAll({ + order: [["id", "ASC"]], + }); } catch (error: any) { throw new Error(`Error while fetching tenants: ${error.message}`); } diff --git a/backend/src/repository/UsersRepo.ts b/backend/src/repository/UsersRepo.ts index 72492b200c36940dfdf4e2ef3444714be2afb970..5149fa009c2622e9f2ee31fe467f8a5d727e9dae 100644 --- a/backend/src/repository/UsersRepo.ts +++ b/backend/src/repository/UsersRepo.ts @@ -13,7 +13,9 @@ interface IUsersRepo { export default class UsersRepo implements IUsersRepo { async getAllUsers(): Promise<Users[]> { try { - return await Users.findAll(); + return await Users.findAll({ + order: [["id", "ASC"]], + }); } catch (error: any) { throw new Error(`Error while fetching users: ${error.message}`); } diff --git a/frontend/src/pages/ManagePayment.tsx b/frontend/src/pages/ManagePayment.tsx index 6d694bb4cba16ad02c2005edee06b9d3d63a6568..1b3f078ec25e33860268c3cab91affc19d330d0c 100644 --- a/frontend/src/pages/ManagePayment.tsx +++ b/frontend/src/pages/ManagePayment.tsx @@ -10,6 +10,7 @@ import ConfirmPopUp from "../components/ConfirmPopUp"; import Axios from "axios"; import { useParams } from "react-router-dom"; import crypto from "crypto-js"; +import { useAuth } from "../hooks/useAuth"; interface Order { id: number; @@ -58,6 +59,7 @@ interface OrderDetails { } const ManagePayment = () => { + const { user } = useAuth(); const { orderid } = useParams(); const paymentid = orderid; const [showProfileDropDown, setShowProfileDropDown] = useState(false); @@ -218,7 +220,7 @@ const ManagePayment = () => { {/* Header */} <div className="col-span-4"> <div className="row-span-1 ms-20 mt-9 py-3 w-11/12"> - <Welcome user="Aldaebaran" /> + <Welcome user={user ? user!.fullname : ""} /> </div> <div className="absolute top-0 right-0 mt-9 mx-12"> <Profile