Commit Graph

60 Commits (3bc9b4e64af502f6964e7ce87e8660b75e7d62af)

Author SHA1 Message Date
Elham Rababah 3bc9b4e64a ES-185:fix issues 5 years ago
Elham Rababah 1356709c66 ES-185:add pharmacy order id 5 years ago
Elham Rababah 45927ed8f1 ES-185:fix resend opt 5 years ago
Elham Rababah e40bd96418 ES-185:forget password function works 5 years ago
Elham Rababah af43ec86ae ES-187: Fix orders List 5 years ago
Elham Rababah 8fc13464a8 fix order number 5 years ago
Elham Rababah 9dfaee792b fix loading issue in splash_screen_page 5 years ago
Elham Rababah 618cb27814 Undelivered Packages section is working now home screen. 5 years ago
Elham Rababah ae3853ad96 finish location request permission 5 years ago
Elham Rababah fcfb19963c request_permission on location 5 years ago
hussam al-habibeh 979f04de81 update apr scaffold 5 years ago
Elham Rababah bde8ca60d4 fix issues on login 5 years ago
Elham Rababah a0277d39f9 add logout function 5 years ago
hussam al-habibeh af815a4585 design updates 5 years ago
hussam al-habibeh e9223d3e97 delivery info page updates 5 years ago
Elham Rababah 5880b70749 Merge branches 'design_update' and 'merge_branches_into_dev' of https://gitlab.com/Cloud_Solution/driver-app into merge_branches_into_dev
 Conflicts:
	lib/pages/delivery/delivery_confirmed_page.dart
	lib/pages/delivery/information_page.dart
5 years ago
Elham Rababah c85b82d553 fix login issue 5 years ago
hussam al-habibeh 3eedb7e667 service update and design updates 5 years ago
hussam al-habibeh 00e108e36c updates 5 years ago
hussam al-habibeh 237f0b12a8 Merge branch 'master' of https://gitlab.com/Cloud_Solution/driver-app into order_list
 Conflicts:
	lib/core/service/orders_service.dart
	lib/pages/dashboard/dashboard_screen.dart
5 years ago
hussam al-habibeh 651c1e85d6 add order list info 5 years ago
hussam al-habibeh 783f7fcbf5 add order list info 5 years ago
Elham Rababah e3610b0804 Merge branch 'fix_auth_issue' of https://gitlab.com/Cloud_Solution/driver-app into merge_auth_fixes_into_dev
 Conflicts:
	lib/pages/authentication/login_page.dart
	lib/pages/delivery/information_page.dart
5 years ago
Elham Rababah caa2306218 fix issue in merge request 5 years ago
hussam al-habibeh c52a58af23 Merge branch 'master' of https://gitlab.com/Cloud_Solution/driver-app into order_list
 Conflicts:
	lib/core/service/orders_service.dart
5 years ago
hussam al-habibeh 5fa4c55ab3 Merge branch 'order_list' of https://gitlab.com/Cloud_Solution/driver-app into merge_into_dev_9/7
 Conflicts:
	lib/core/service/orders_service.dart
5 years ago
hussam al-habibeh 4ab78aa0be deliverd order list 5 years ago
Elham Rababah 41c66fc8ff fix auth issue 5 years ago
Elham Rababah 384710e9b6 finish next orders service 5 years ago
Elham Rababah aa1332676a First step form next orders service 5 years ago
Elham Rababah e27093311f Merge branch 'dashboard_landscape' of https://gitlab.com/Cloud_Solution/driver-app into merge_dashboard_into_dev
 Conflicts:
	lib/config/localized_values.dart
	lib/pages/dashboard/dashboard_screen.dart
	lib/pages/delivery/information_page.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
hussam al-habibeh 27a070f778 dashboard updates 5 years ago
Elham Rababah 4f93f8b0db Finish QR code 5 years ago
Elham Rababah c9461bfef8 finish update order status function 5 years ago
Elham Rababah 621f594ad9 bottom sheet almost done 5 years ago
enadhilal df0049cd35 add MediaQuery into the design and make Package Content appear dynamic. 5 years ago
Elham Rababah d4b1476d74 Merge branch 'dashboard_landscape' of https://gitlab.com/Cloud_Solution/driver-app into merge_landscape_into_dev
 Conflicts:
	lib/core/service/orders_service.dart
	lib/core/viewModels/orders_view_model.dart
	lib/pages/dashboard/dashboard_screen.dart
	lib/pages/orders/pending_orders_page.dart
5 years ago
hussam al-habibeh e3dbfe8dcb code reformat 5 years ago
hussam al-habibeh 5d53500e66 add pending orders response model 5 years ago
enadhilal 208d903e0a Enad Commit to merge master with delivery_confirmed branch.
there was conflicts in (localized_values.dart) and (translations_delegate_base.dart) and accept both changes.
5 years ago
Elham Rababah 8a839a5424 Merge branch 'PendingOrders' of https://gitlab.com/Cloud_Solution/driver-app into merge_trans_dash_into_dev
 Conflicts:
	lib/pages/dashboard/dashboard_screen.dart
5 years ago
Elham Rababah f1813b0443 fix login issue 5 years ago
Elham Rababah 0de2156b1e Merge branch 'delivery_confirmed' of https://gitlab.com/Cloud_Solution/driver-app into merge_delivery_into_dev
 Conflicts:
	lib/pages/dashboard/dashboard_screen.dart
5 years ago
hussam al-habibeh dcedc989e1 updates 5 years ago
enadhilal de394ec807 add changes based on the comment. 5 years ago
enadhilal 5b35d5d09a add route from dashboard and delivery info with item data 5 years ago
Elham Rababah 699de4df42 add token 5 years ago
Elham Rababah aa2d4e9ab8 add token 5 years ago
Elham Rababah 2dfe4ca1dd fix bug 5 years ago
Elham Rababah bf79a6427e refactor orders Concept 5 years ago