Merge branch '349-place-order' of https://github.com/olasunkanmi-SE/r…

…estaurant into 349-place-order
olasunkanmi-SE · Jan 19, 2024 · 082fae9 · 082fae9
2 parents adf63c5 + b535490
commit 082fae9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/backend/src/restaurant/restaurant.mapper.ts b/backend/src/restaurant/restaurant.mapper.ts
@@ -7,6 +7,7 @@ import { RestaurantData } from './../infrastructure/data_access/repositories/sch
 import { LocationMapper } from './../location/location.mapper';
 import { SingleClientMapper } from './../singleclient/singleclient.mapper';
 import { Restaurant } from './restaurant';
+
 @Injectable()
 export class RestaurantMapper implements IMapper<Restaurant, RestaurantData> {
   constructor(

diff --git a/frontend/src/apis/orderApi.ts b/frontend/src/apis/orderApi.ts
@@ -43,6 +43,7 @@ export const OrderApi = () => {
     return totalSelectedItemsPrice;
   };
 
+
   const cartItemsMapper = (orderSummary: OrderSummary[]): IcartItems[] => {
     const menus = orderSummary.flatMap((summary) => summary.menus);
     const cartItems = menus.map((menu) => {

diff --git a/frontend/src/components/Cart/ShoppinCartDetails.tsx b/frontend/src/components/Cart/ShoppinCartDetails.tsx
@@ -210,6 +210,14 @@ export const ShoppingCartDetails = () => {
         >
           PLACE ORDER RM{handleCalculateTotalOrder() + calculateServiceCharge(calculateTotalOrderAmount())}
         </Button>
+        <div>
+          {handleCreateOrder.isLoading ? (
+            "Creating Order..."
+          ) : (
+            <>{handleCreateOrder.isError ? <div>An error occurred: {handleCreateOrder.error.message}</div> : null}</>
+          )}
+          {handleCreateOrder.isSuccess ? <div>Order processed successfully</div> : null}
+        </div>
       </div>
       <div>
         {showClearCartModal && (