Commit Graph

486 Commits (ae6772e4342e7fcf9a82317c9fd068d203a23af0)

Author SHA1 Message Date
nextwo d3bee4f39a gas refill comments 2 years ago
Sikander Saleem a7f5fcb911 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
Sikander Saleem 8079646728 timer on device transfer, 2 years ago
nextwo 6b740549a5 my requests pagination + Sender only close sender request Sender,
Receiver can do both jobs, sender & receiver.
2 years ago
nextwo b463dfe3a6 THE REQUESTS ARE LABELED AS "IN PROGRESS" BUT LISTED BELOW THE "OPEN"
The "Type of Request" should be always a maintenance request.
2 years ago
zaid_daoud 4309c509e8 Assistant Engineer can be unselected 2 years ago
zaid_daoud bd954c6873 Fix visit date issue in work oder details 2 years ago
zaid_daoud 3e3bdf2ce6 Remove loan availability 2 years ago
zaid_daoud 7200efcbca ppm issues fixed & code formatting 2 years ago
zaid_daoud df9fa59f1b prevent update ppm on complete 2 years ago
zaid_daoud 2ac79188d9 change some labels 2 years ago
zaid_daoud f88c438022 Apply design changes on labels 2 years ago
zaid_daoud 9e2baae2e2 Change Chart Design && Update dark theme colors 2 years ago
zaid_daoud 04da316440 Fix Asset Filter Pagination Issue 2 years ago
zaid_daoud c2eb7b0dad Enhancements on comments bottom sheet 2 years ago
zaid_daoud d5060d119f delivered qty issue on update gas refill 2 years ago
zaid_daoud 76f2623d5d Fix Asset Type Issue & Add Repair Location Field (Work Order & Sub Work Order) 2 years ago
zaid_daoud b1e6a6fe64 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
zaid_daoud 82720bf831 Enhancements 2 years ago
Sikander Saleem 593cecbe55 improvements 2 years ago
Sikander Saleem e98bd62be9 profile image change improvement 2 years ago
zaid_daoud af17525c3c Enhancements 2 years ago
zaid_daoud 03926a1fd1 Multiple spare parts in all places 2 years ago
zaid_daoud 88048fb11e Multiple parts in create work order 2 years ago
zaid_daoud 51ef873770 Reformatting code 2 years ago
zaid.daoud 4f116b1ea4 Update Gas refill issues fixed 2 years ago
zaid.daoud 5bf73172f6 Previous Business Logic in Work order & sub work order 2 years ago
Sikander Saleem aad9c3dde1 improvements. 2 years ago
Sikander Saleem 686c70e3db profile image improvement & notificaiton 2 years ago
zaid_daoud 8800cabf32 Gas refill status color in details screen 2 years ago
zaid_daoud 95b8351ede First Action Bottom sheet fixed 2 years ago
nextwo 1e467fc78c On gas refill detail, there is no date, but we are showing it . 2 years ago
nextwo df147f3ef1 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
nextwo ae71e5a53d Add timer in gas refill update & also nurse & engineer signatures should be added. 2 years ago
zaid_daoud 6289a72e01 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
zaid_daoud 042d7df708 Sub work order screen done 2 years ago
Sikander Saleem 09f24edb35 eSignature fixed, 2 years ago
Sikander Saleem 322403f23d no data text added on work order. 2 years ago
Sikander Saleem f5b069c318 replace visit date to return to service 2 years ago
zaid_daoud 884471009a Sub work order screen under testing 2 years ago
zaid_daoud db3053bc3a Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
Sikander Saleem a602dbe2eb Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
Sikander Saleem 29e414a703 user profile change added & improvements. 2 years ago
zaid_daoud cd3d9e1455 Working on create sub work order screen 2 years ago
zaid_daoud f07a70462a Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
zaid_daoud 15c98e873e Enhancement 2 years ago
Sikander Saleem 708e7c80d1 improvements. 2 years ago
Sikander Saleem ab83963c65 improvements 2 years ago
Sikander Saleem f8ba08a44b ppm flow added. 2 years ago
Sikander Saleem 7ecd90a556 gas refill flow added. 2 years ago
Sikander Saleem c96f611051 service request flow added & improvements 2 years ago
zaid_daoud 19ba1f9ad0 Enhancement 2 years ago
Sikander Saleem b51555c2f4 improvements. 2 years ago
nextwo 4757c73737 dark / ligth dark 2 years ago
nextwo 204305f705 dark / ligth dark 2 years ago
zaid_daoud 753d9577d5 Improvements 2 years ago
zaid_daoud 9ce5ca2f09 Improvements 2 years ago
zaid_daoud eb8a9cc971 Improvements 2 years ago
nextwo 4ec0b27afa loclization 2 years ago
Sikander Saleem 63cbbe48d1 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
Sikander Saleem fe624596a1 request fragment added on dashboard. 2 years ago
zaid_daoud 649ddf6c01 Fix preventive maintenance status colors 2 years ago
zaid_daoud a5393b5a85 Fix loading issue in comments bottom sheet 2 years ago
zaid_daoud 37a9cd3cc9 service request comment done 2 years ago
zaid_daoud 675572be40 Profile Screen DONE 2 years ago
zaid_daoud 5e1d6517de Change Notifications Screen Design DONE 2 years ago
Sikander Saleem b03f350a2c Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
Sikander Saleem 2c9f2dce08 notifications api added. 2 years ago
zaid_daoud a2e2d9ac12 Timer For Working Hours 2 years ago
zaid_daoud 932841cbef PPM Done 2 years ago
zaid_daoud 2ebf36ca2f Calibration Tool & PM Kit Design DONE 2 years ago
zaid_daoud 3464666485 PPM TBS DONE 2 years ago
zaid_daoud 3299c0c7a4 Working on ppm 2 years ago
nextwo a85d8f4880 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/l10n/app_ar.arb
#	lib/l10n/app_en.arb
2 years ago
nextwo 57abce1b75 device transfer 2 years ago
zaid_daoud daa427bac2 Update Work Order Screen DONE 2 years ago
zaid_daoud c3d6643ead Enhancements 2 years ago
zaid_daoud 8b7aa8235d Update Service Request DONE 2 years ago
zaid_daoud 18d0bdbd60 Fix Service Details Design 2 years ago
zaid_daoud 477e6751aa Enhancements 2 years ago
zaid_daoud 19845bd9d8 Enhancements 2 years ago
zaid_daoud c281fba1ac Enhancements 2 years ago
zaid_daoud 73d090cb9e Edit wo only for eng 2 years ago
zaid_daoud 7a06f251be Create New Work Order Done 2 years ago
zaid_daoud 743bb28b1d Create New Work Order Done 2 years ago
nextwo 1daf9b4437 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
nextwo 62f6f135bb device transfer 2 years ago
zaid_daoud 43b2f18a1a New Work Order [In Progress] 2 years ago
zaid_daoud e407b00630 New Work Order [In Progress] 2 years ago
zaid_daoud 402f7513bd First Action Bottom Sheet Done 2 years ago
nextwo cef6b1a77c gas refill 2 years ago
nextwo e21bde0153 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/l10n/app_ar.arb
#	lib/l10n/app_en.arb
#	lib/new_views/common_widgets/single_item_drop_down_menu.dart
2 years ago
nextwo 4cc12691ac gas refill 2 years ago
zaid_daoud 957e3d9e6f Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/l10n/app_en.arb
2 years ago
zaid_daoud 3959068858 Asset Transfer Done + Multiple Image Picker + Enhancements 2 years ago
nextwo d6de203ba0 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
Sikander Saleem 4ffe899ff9 asset list & detail screens, models, added. 2 years ago
nextwo 2604d8b253 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	pubspec.yaml
2 years ago
zaid_daoud 84c9efda5a Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/l10n/app_en.arb
2 years ago
zaid_daoud e419b17bd1 Service request design done 2 years ago
Sikander Saleem 0e30fef10c work order list ui changed. 2 years ago
Sikander Saleem 2d553b56e0 service request detail ui changed. 2 years ago
nextwo 8f11ef577e gas refill 2 years ago
nextwo 64b249a0cd gas refill 2 years ago
Sikander Saleem 1ee58eeed9 merge conflict resolved. 2 years ago
Sikander Saleem 47b863c479 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/main.dart
#	lib/new_views/common_widgets/app_floating_action_button.dart
#	lib/new_views/common_widgets/app_text_form_field.dart
#	lib/new_views/pages/new_gas_refill_request_page.dart
#	lib/new_views/pages/new_service_request_page.dart
#	lib/views/pages/device_transfer/device_transfer_details.dart
#	lib/views/pages/device_transfer/update_device_transfer.dart
#	lib/views/pages/user/requests/create_request.dart
#	lib/views/pages/user/requests/request_details.dart
#	lib/views/widgets/device_trancfer/device_transfer_info_section.dart
#	lib/views/widgets/device_trancfer/device_transfer_item.dart
#	lib/views/widgets/device_trancfer/device_transfer_list.dart
#	lib/views/widgets/equipment/auto_complete_devices_field.dart
#	lib/views/widgets/equipment/auto_complete_models_field.dart
#	lib/views/widgets/equipment/device_button.dart
#	lib/views/widgets/equipment/device_item.dart
#	lib/views/widgets/equipment/single_device_picker.dart
#	lib/views/widgets/pentry/auto_complete_fields/auto_complete_devices_field.dart
#	lib/views/widgets/requests/service_request_item.dart
#	lib/views/widgets/search/asset_transfer_search_dialog.dart
2 years ago
Sikander Saleem 7e17bd2558 localization i18 implementation 2 years ago
zaid_daoud 1e1ac215ea Rename asset to be device as it was before 2 years ago
zaid_daoud c7d6b68fd2 Change Asset & Asset Transfer models 2 years ago
Sikander Saleem 392182e234 track service request cont. 2 years ago
Sikander Saleem 150ad60de6 track service request 2 years ago
zaid_daoud c66acbd1ee Gas refill screen 2 years ago
zaid_daoud ed759f5dcf Still working on gas refill request 2 years ago
zaid_daoud 085674ee18 adding radio buttons for theme 2 years ago
zaid_daoud bb1a516f0a add the old route 2 years ago
zaid_daoud a8e7d26355 Back to the old dashboard 2 years ago
zaid_daoud 3bdae42769 1- change text form field code
2- app bar design
3- working on request gas refill screen
2 years ago
zaid_daoud a8a7b5a613 Activate light and dark theme 2 years ago
Sikander Saleem f0c605b07d improvements 2 years ago
Sikander Saleem 71ccd100b5 Merge branch 'zaid_development_new' into sikander-development
# Conflicts:
#	lib/controllers/api_routes/urls.dart
2 years ago
zaid_daoud 2d0c72b138 1- prevent the user from creating a new gas refill request if the department isn't selected.
2- working on host: https://atomsmdev.hmg.com
2 years ago
Sikander Saleem 5fc2aceecf ppm disable edit on closed, gaz refill site fix, & print statements remove. 2 years ago
Sikander Saleem 09f2ae32eb improvements 2 years ago
zaid_daoud 9dca070121 add asset id to spare parts API
add attachments and signature to the sender & receiver info
2 years ago
zaid_daoud 5c14375d6f Fixing PPM issues 2 years ago
nextwo 91be46db22 confirm the call last situation has a part in some cases
add time in date picker, when first action is need a visit
disable update, edit workorder & create work order if status is a complete or closed
2 years ago
nextwo a85ea2d799 Merge branch 'zaid_development_new' into majd_development_new 2 years ago
nextwo 7d37d66e62 fix bugs 2 years ago
Sikander Saleem 300bc0a1a6 improvements 2 years ago
zaid_daoud ea5738f705 Gas refill update reflected on the details screen 2 years ago
zaid_daoud 05d3b7dd5d department name shown in the gas refill details screen & the delivered quantity is reflected on the details screen 2 years ago
zaid_daoud 58c5b434e2 Fault Desc Issue Fixed 2 years ago
nextwo 8df2900254 Merge branch 'zaid_development_new' into majd_development_new 2 years ago
nextwo 350ea3f9e7 fix bugs 2 years ago
zaid_daoud 2384bab11f Fault Desc Issue Fixed 2 years ago
Sikander Saleem d63a18226a ppm attachments fix 2 years ago
zaid_daoud a9d4d2a373 Enhancements 2 years ago
zaid_daoud 0950639c22 Merge remote-tracking branch 'origin/sikander-development' into zaid_development_new 2 years ago
zaid_daoud fe9ca387ed Multiple Images Everywhere 2 years ago
Sikander Saleem 830bf6e5e6 first action improvement. 2 years ago
Sikander Saleem bf30e1d763 update service request attachment fixed. 2 years ago
Sikander Saleem c9705e0b74 attachments improvements. 2 years ago
Sikander Saleem 8624515433 local & network files opener added. 2 years ago
Sikander Saleem 90aabebe12 calling api to get complete data for service request to show attachments and voice notes. & improvements 2 years ago
zaid_daoud ad48521170 Merge remote-tracking branch 'origin/sikander-development' into zaid_development_new 2 years ago
zaid_daoud 0b46974c47 Change Pick Image to Pick File 2 years ago
Sikander Saleem f3349b0209 improvements. 2 years ago
zaid_daoud ec4916d4ec hide create service request module form engineer session 2 years ago
zaid_daoud 05d1976969 Make QR code searches for a specific elements which are equal to asset no. 2 years ago
zaid_daoud 232713f841 Track Gaz Refills [Most Recent] 2 years ago
zaid_daoud c52d7cd527 Preventive Maintenance [Most Recent] 2 years ago
zaid_daoud 61c28aa8b8 FIX 2 years ago
zaid_daoud 8932871e12 Back to the previous commit 2 years ago
zaid_daoud 6145f8a0cb Fix 2 years ago
Sikander Saleem 07c8acf3a3 improvement 2 years ago
zaid_daoud 6c2480edd2 stop loading on null values 2 years ago
zaid_daoud 4cbedc0b60 add start and end time to gas refill details 2 years ago
Sikander Saleem 2549157eee rename fixes. 2 years ago
nextwo eee1b0dc51 fix bugs 2 years ago
nextwo 798faf51a4 Merge branch 'zaid_development_new' into majd_development_new 2 years ago
nextwo b3c577d03e fix bugs 2 years ago
zaid_daoud a3264f4f1c Multiple types of attachments 2 years ago
Sikander Saleem 591e1513a2 enable sub workorder & name to create 2 years ago
nextwo d33c97d1df make return to service not required 2 years ago
nextwo f5bc07c3a2 Merge branch 'zaid_development_new' into majd_development_new 2 years ago
nextwo f132004c11 remove expected date 2 years ago
zaid_daoud 871274433b Merge remote-tracking branch 'origin/zaid_development_new' into zaid_development_new 2 years ago
zaid_daoud 7a02b2e715 fault description is disabled when create new work order 2 years ago
Sikander Saleem b02a4ab1fc Merge remote-tracking branch 'origin/zaid_development_new' into zaid_development_new 2 years ago
Sikander Saleem 311c8c974d gaz refill status fix, when change from web. 2 years ago
zaid_daoud 29c5f0e5cf in ppm summery if no employee found it will be empty 2 years ago
zaid_daoud d80e28f706 gaz refill timer 2 years ago
zaid_daoud 349ac7dba4 Simple Updates 2 years ago
zaid_daoud bd299e2a6d Some changes on work orders model attributes & change File Base Url (Still under testing) 2 years ago
zaid_daoud 383c634c50 User departments in create new service request 2 years ago
zaid_daoud ac38159b0a User Model Change 2 years ago
Sikander Saleem 3c8791b590 Merge remote-tracking branch 'origin/zaid_development_new' into zaid_development_new 2 years ago
Sikander Saleem c14aaceb5e rename device with asset 2 years ago
zaid_daoud 99c16197f2 Service Request Type for end user profile should be by default Maintenance Request and locked field. 2 years ago
zaid_daoud 66100c36a4 Enhancements 2 years ago
zaid_daoud 6caab58171 Merge With Majd [part #2] 2 years ago
zaid_daoud 984f46913a Merge remote-tracking branch 'origin/majd_development_new' into zaid_development_new
# Conflicts:
#	lib/models/visits/visits_search.dart
#	lib/views/pages/device_transfer/device_transfer_details.dart
#	lib/views/pages/user/gas_refill/request_gas_refill.dart
#	lib/views/widgets/device_trancfer/device_transfer_info_section.dart
#	lib/views/widgets/search/service_request_search_bar.dart
#	lib/views/widgets/search/visits_search_bar.dart
2 years ago
nextwo be636bb18b some changes 2 years ago
zaid_daoud 1e3a9825af Cloud logo 2 years ago
zaid_daoud 60a2e372a3 Change To Powered By Cloud Solutions, and remove engineer name from the track device transfer info, in addition to merge with majd's branch 2 years ago
zaid_daoud 460c3138fd Merge remote-tracking branch 'origin/majd_development_new' into zaid_development_new
# Conflicts:
#	lib/models/visits/visits_search.dart
#	lib/views/pages/device_transfer/device_transfer_details.dart
#	lib/views/pages/user/visits/visit_details.dart
#	lib/views/widgets/search/service_request_search_bar.dart
#	lib/views/widgets/search/visits_search_bar.dart
2 years ago
zaid_daoud bec9c38269 In track gas refill update:
- add timer for working hours.
 - enable the engineer to add start and end date.
2 years ago
zaid_daoud b8f2a72cad Update Gas Refill : enable status menu 2 years ago
zaid_daoud 3e79091d7e In Update gas refill : add expected Date field and enable the engineer to updated. 2 years ago
nextwo c393f29829 some changes 2 years ago
zaid_daoud 2592478ea6 In track gas refill summery to rename the title to Gas Refill Requests. 2 years ago
zaid_daoud 4d3c128191 Remove Search Work Order Module and add the following filters in search service request:
○ Assigned Employee
○ Call ID
○ Call Date (Service Request Date)
2 years ago
zaid_daoud 11f95b9578 Search in service request, preventive maintenance, gas refill, and transfer to arrange the requests from most recent to earliestt 2 years ago
zaid_daoud 8df2edd55f Rename Transfer Device to Transfer Asset 2 years ago
zaid_daoud 64d9305b84 Site Field locked and the data retrieved from user info 2 years ago
zaid_daoud 54854ee9e8 1- Service Request Type for end user profile should be by default Maintenance Request and locked field.
2- Through field in new service request should be by default APP and locked or hidden.

3- Rename text to speech to speech to text.
2 years ago
zaid_daoud 21f7986fa4 1- Service Request Type for end user profile should be by default Maintenance Request and locked field.
2- Through field in new service request should be by default APP and locked or hidden.

3- Rename text to speech to speech to text.
2 years ago
zaid_daoud 58bd5075ed Merge branch 'main_latest_merged' into zaid_development_new 2 years ago
zaid_daoud 519d5a9f42 No Assigned Employee 2 years ago
Sikander Saleem 55cbf99264 Merge branch 'majd_development_new' into main_latest_merged 2 years ago
zaid_daoud 4997e1e3df Timer Fixed 2 years ago
Sikander Saleem b8051a40fe signature fixes 2 years ago
nextwo b40727b920 review comment 2 years ago
Sikander Saleem da286ea075 fixes 2 years ago
zaid_daoud 5890835f7b Simple Changes 2 years ago
Sikander Saleem be6a418bb6 sender & receiver transfer edit login update & fixes 2 years ago
nextwo 44654e1e38 some edits 2 years ago
nextwo 3737c3b41c Merge remote-tracking branch 'origin/main_latest_merged' into majd_development_new
# Conflicts:
#	lib/views/pages/user/requests/report/edit_service_report.dart
#	lib/views/widgets/equipment/single_device_picker.dart
2 years ago
nextwo c58a86758c some edits 2 years ago
zaid_daoud 0459ab14e2 PPM Updates Done 2 years ago
zaid_daoud 0563c545b5 Add Engineer Signature & Nurse Signature to Update Gas Refill 2 years ago
zaid_daoud 53c1f83bac Enhancements 2 years ago
zaid_daoud 8e8cdb6bfe Dropdown issue 2 years ago
zaid_daoud d4a1607392 First Action Date 2 years ago
zaid_daoud 77e2b7402b Rename (PK Kits) to (PM Kits) 2 years ago
zaid_daoud 9cf9c7f30c - New Gas Refill -> Status Disabled With ("Open") default value.
- Rename (Pentry) to (PM Entry)
2 years ago
zaid_daoud 45b66e6b2a Convert (Start Date & End Date) to Timer 2 years ago
Sikander Saleem a2edcadc1a edit work order added. 2 years ago
Sikander Saleem 4d70fe2c36 improvements 2 years ago
zaid_daoud 3010458cd8 Enhancements 2 years ago
zaid_daoud e0d2f8360e Enhancements 2 years ago
zaid_daoud 6aab5e6750 Enhancements 2 years ago
zaid_daoud 19cee08954 Updating Search Work Order Model 2 years ago
zaid_daoud d13bfa5f60 Wo Details Bottom Sheet & Spare Parts Bottom Sheet Design Done
[without activating update buttons]
2 years ago
zaid_daoud 27d3a74d3b Search Sub Work Order Screen DONE 2 years ago
Sikander Saleem b9263ae1d8 Merge branch 'main_latest_merged' into zaid_development_new
# Conflicts:
#	assets/subtitles/ar_subtitle.json
#	assets/subtitles/en_subtitle.json
#	lib/models/subtitle.dart
2 years ago
Sikander Saleem de7aff6b9f imp 2 years ago
zaid_daoud d470a19bef Need some enhancements 2 years ago
Sikander Saleem ffacf3949e startdate, end date & working hours fixed. 2 years ago
zaid_daoud c24fe473ff Add Delivered Quantity Field 2 years ago
zaid_daoud 7828e52c64 Fixing 2 years ago
zaid_daoud 83bf02e69f Track Gaz Refill Done 2 years ago
zaid_daoud ee4498a55e Date Time Fields (Gas Refill) 2 years ago
Sikander Saleem 8e2b21bd9d gas refill cont. 2 years ago
Sikander Saleem 333c684670 improvements 2 years ago
Sikander Saleem 13c5b3891a equipment status added. 2 years ago
Sikander Saleem 79d987d49e improvement 2 years ago
Sikander Saleem b4aac2a8b8 new work order, service type, fault description fixes 2 years ago
zaid_daoud f72d2cc41a Minor Bug Fixed 2 years ago
Sikander Saleem dd7c866e39 improvements. 2 years ago
zaid_daoud c8f498db6a Merged with main_latest 2 years ago
zaid_daoud 47b1a0ff36 Merge branch 'main_latest_merged' into zaid_development_new
# Conflicts:
#	lib/controllers/providers/api/service_requests_provider.dart
#	lib/models/service_report.dart
#	lib/views/pages/user/requests/report/create_service_report.dart
2 years ago
zaid_daoud 655f96049c Fault Description Became a Dropdown Menu 2 years ago
zaid_daoud 29466092b0 Service Type Became Read Only 2 years ago
zaid_daoud a19bd39516 Enhancements on Add Work Order Screen 2 years ago
zaid_daoud c0f801c1c1 Review Comment in Add Work Order Screen 2 years ago
zaid_daoud 19edc321f5 Merge branch 'main_latest_merged' into zaid_development_new
# Conflicts:
#	lib/views/pages/user/requests/create_request.dart
2 years ago
Sikander Saleem 74b7fc4130 add work order improvements. 2 years ago
zaid_daoud 4c75debbd5 Merge remote-tracking branch 'origin/zaid_development_new' into zaid_development_new 2 years ago
zaid_daoud 59ca4277a9 Enhancements 2 years ago