Floorplan Updated

bin/Debug/net6.0/site.map

@@ -7,7 +7,6 @@
 /ajax/getActiveTables/%i, GET, 
 /ajax/tableIsOpen/%i, GET, 
 /ajax/tableExists/%i, GET, 
-/ajax/deleteTable/%i, GET, 
 /ajax/authenticateClerk, POST, 
 /ajax/getTableData, POST, 
 /ajax/updateTableShape, POST, 
@@ -16,7 +15,10 @@
 /ajax/addDecoration, POST, 
 /ajax/updateDecoration, POST, 
 /ajax/deleteDecoration, POST, 
+/ajax/deleteTable, POST, 
+/ajax/mergeTables, POST, 
 /ajax/newEmptyReservation, POST, 
+/ajax/updateReservation, POST, 
 /ajax/getReservation, POST, 
 /ajax/unreserveTable, POST, 
 , NotFoundHandler, 

bin/Debug/net6.0/wwwroot/languages/english/keyboardlayout.json

@@ -117,10 +117,10 @@
       "<",
       ">",
       "?"
-    ], 
+    ],
 	"row5": [
       "[space]space"
-    ],	
+    ],
 	"row5_shift": [
       "[space]&nbsp;"
     ]

bin/Debug/net6.0/wwwroot/languages/english/main.json

@@ -14,7 +14,7 @@
    "logged_in_as":"Logged in as [1]",
    "covers":"[1] Covers",
    "selected_cover":"Cover [1]",
-   "activeTable":"Table [1]",
+   "active_table":"Table [1]",
    "totalPrice":"Total Price: [1]",
    "selectedPrice":"([1] Selected)",
    "next_page":"Next Page",
@@ -60,7 +60,8 @@
    "delete_table":"Delete Table",
    "change_shape":"Change Shape",
    "new_table_number":"New Table Number",
-   "transfer_table":"Transfer to New Table",
+   "transfer_table":"Transfer to Other Table",
+   "transfer_self_error":"Cannot transfer a table to itself.",
    "add_decoration":"Add Decoration",
    "choose_decoration":"Choose a Decoration",
    "delete_decoration":"Delete Decoration",
@@ -68,9 +69,11 @@
    "reserved_for":"Reserved for [1]",
    "reserved":"Reserved",
    "confirm_delete_reservation":"Are you sure you want to delete the reservation on table [1]?",
+   "confirm_reservation_name":"Who is this reservation for?",
    "error_table_exists":"Table already exists in room \"[1]\"",
    "error_table_exists_merged":"Table already exists in room \"[1]\", it is merged with table [2].",
    "error_delete_existing_table":"Can't delete a table that's currently active.",
+   "error_self_merge" : "You can't merge a table with itself",
    "confirm_delete_table":"Are you sure you want to delete table [1]?",
    "orig_qty_header":"Original Qty",
    "selected_qty_header":"Selected Qty",