updated the index to get the suppliers
commented some stuff for the editing submitted orders
removed some extra lines
updated the index to get the suppliers
commented some stuff for the editing submitted orders
removed some extra lines
Merge branch 'foodlink4' of https://github.com/truly-auto/SENG403 into foodlink4
updated the index to get the suppliers
commented some stuff for the editing submitted orders
removed some extra lines
solving conflict
Merge branch 'foodlink4' of https://github.com/truly-auto/SENG403 into foodlink4
updated the index to get the suppliers
commented some stuff for the editing submitted orders
removed some extra lines
commented some stuff for the editing submitted orders
commented some stuff for the editing submitted orders
solving conflict
Merge branch 'foodlink4' of https://github.com/truly-auto/SENG403 into foodlink4

Conflicts:
	src/main/java/FoodLink/gui/SupermarketSys.java
added the store_id and the supplier_id in the ORDER_HISTORY table