Merge remote-tracking branch 'origin/implemBackFront' into implemBack…

…Front
StartUpNationLabs · Nov 3, 2024 · f23d290 · f23d290
2 parents 454c5da + 0b168dd
commit f23d290
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/libs/ui/common/src/lib/billing/payementAsignee.tsx b/libs/ui/common/src/lib/billing/payementAsignee.tsx
@@ -136,7 +136,7 @@ export function PayementAsignee() {
       >
         <IconButton
           onClick={() => {
-            navigate(`/mealSelectionForPayment/${groupId}/${tableId}`);
+            navigate(`/mealSelectionForPayment/${tableId}`);
           }}
         >
           <CancelIcon

diff --git a/libs/ui/common/src/lib/commandsR/otherTables.tsx b/libs/ui/common/src/lib/commandsR/otherTables.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import { Grid, Box, Typography, Divider } from '@mui/material';
 import { Item } from './Item';
+import CloseButton from '../utils/closeButton';
 
 interface OtherTableProps {
   table: {
@@ -15,11 +16,23 @@ interface OtherTableProps {
 }
 
 const OtherTable: React.FC<OtherTableProps> = ({ table, catalog, handleSelectItem }) => {
+  const handleCloseButton = () => {
+    console.log('Close button clicked');
+  };
   return (
     <>
-      <Typography variant="h3" sx={{ color: 'green', mb: 2, textAlign: 'center' }}>
-        Table Nb {table.number}
-      </Typography>
+      <Box sx={{ position: 'relative' }}>
+        <Typography variant="h3" sx={{ color: 'green', mb: 2, textAlign: 'center' }}>
+          Table Nb {table.number}
+        </Typography>
+        <CloseButton
+          onClick={handleCloseButton}
+          width="60px"
+          height="60px"
+          iconSize="40px"
+
+        />
+      </Box>
       <Box
         sx={{
           backgroundColor: 'rgba(76, 175, 80, 0.1)', 

diff --git a/libs/ui/common/src/lib/dining/diningRoomTables.tsx b/libs/ui/common/src/lib/dining/diningRoomTables.tsx
@@ -15,13 +15,13 @@ export function DiningRoomTables() {
 
   const handleBackClick = () => {
     console.log('Back button clicked');
-    navigate(`/mealSelectionForPayment/${groupId}/${tableNumber}`);
+    navigate(`/mealSelectionForPayment/${tableNumber}`);
 
   };
 
   const handleContinueClick = () => {
     console.log('Continue button clicked');
-    navigate(`/mealSelectionForPayment/${groupId}/${tableNumber}`);
+    navigate(`/mealSelectionForPayment/${tableNumber}`);
   };
 
   return (