placed the new order under create order button
placed the new order under create order button
fixing merge errors
Merge branch 'foodlink4' of https://github.com/truly-auto/SENG403 into foodlink4

Conflicts:
	src/main/java/FoodLink/gui/SupermarketSys.java
	src/main/java/FoodLink/gui/SupplierSys.java
	src/main/resources/SQL/Tables.sql
fixing merge conflict
placed the new order under create order button
Merge branch 'foodlink4' of https://github.com/truly-auto/SENG403 into foodlink4

Conflicts:
	src/main/java/FoodLink/gui/SupermarketSys.java
	src/main/java/FoodLink/gui/SupplierSys.java
	src/main/resources/SQL/Tables.sql
made the grandTotal into double type
fixing merge conflict
Merge branch 'foodlink4' of https://github.com/truly-auto/SENG403 into foodlink4

Conflicts:
	src/main/java/FoodLink/gui/SupermarketSys.java
fixed the submit and cancel order buttons
fixing merge conflict
merge conflict