fixed bug
Merge https://github.com/Damian-S89/Restaraunt-Merchant-Side
fixed bug