Finishing table sorting according to it's attributes
final updated working version
resolving the conflict
solving some proplems regarding to inverse of
solving inverse of proplem
resolving the conflict
fixing final version conflicts
s
Merge pull request #113 from DevYah/T5_mahmoudeldesouky_5.9

sprint 0 task 5.9
trying to fix
resolving the conflict
Merge branch 'master' of https://github.com/DevYah/smartsoft-14
resolving the conflictand proplems with order class
trying to solve another ones conflict
final updates on item
Merge branch 'master' of https://github.com/DevYah/smartsoft-14 into T3_MahmoudWalid_3.2
Merge pull request #133 from DevYah/T3_samehmetias_3.3

added the warehouse page of the retailer with liks to all pages
re-resolving the conflict
Merge branch 'master' of https://github.com/DevYah/smartsoft-14 into T3_MahmoudWalid_3.2
Merge pull request #136 from DevYah/T3_MahmoudWalid_3.2

T3 mahmoud walid 3.2