Labels Milestones

Refund CR Complete with Demop (faiz_dev) #335

Open

FaizHashmiCS22 wants to merge 20 commits from faiz_dev into master

pull from: faiz_dev

merge into: Haroon6138:master

Haroon6138:haroon_dev

Haroon6138:master

Haroon6138:taha_dev

Haroon6138:dev_sultan

Haroon6138:faiz_dev_symptoms_checker

Haroon6138:Main_App_Replacement

Haroon6138:watch_integration

Haroon6138:inpatient_services

Haroon6138:live_activities

Haroon6138:CR-19328-LiveCare-Enhancements

Haroon6138:offers_discounts

Haroon6138:faiz_dev_tools_imp

Haroon6138:notification_center_id_Dev_sultan

Haroon6138:lab_result_changes

Haroon6138:dev_aamir

Haroon6138:symtomcheckers

Haroon6138:Android_16_KB_page_size

Haroon6138:changes

Haroon6138:maptype

Haroon6138:lab-graph

Haroon6138:dev_sikander

Haroon6138:ambulance_selection_change

Haroon6138:reminer

Haroon6138:labs_graph_pdf

Haroon6138:translation-context

Haroon6138:calender_pacakge_changes

Haroon6138:calender_package

Haroon6138:fatima

Haroon6138:unware-clinic-bottomsheet

Haroon6138:main

Haroon6138:ambulance_service

Haroon6138:hospital_filter

Haroon6138:lab-result-changes

Haroon6138:calender_reminder

Haroon6138:ambulance_ui

Conversation 0 Commits 20 Files Changed 32

FaizHashmiCS22 commented 2 months ago

Collaborator

There is no content yet.

FaizHashmiCS22 added 11 commits 2 months ago

7ec72460e7 added advances list in in wallet refund and other refactoring.

34a55396b0 Added invoice type checks

3d4609a1a9 completed refund CR

e7f3095308 refund module feedback changes completed

f2061de166 added text changes

42aad44cd4 Merge branch 'refs/heads/master' into faiz_dev ...

# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/api/api_client.dart
#	lib/core/api_consts.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/habib_wallet/habib_wallet_page.dart
#	lib/presentation/my_invoices/widgets/invoice_list_card.dart
#	lib/widgets/image_picker.dart

00869beb14 merge conflicts resolved

10296efd12 added threshold API

864b19d166 Merge branch 'master' into faiz_dev ...

# Conflicts:
#	lib/core/api/api_client.dart

bcbdbb295d completed the demo

9a0f11b245 refund CR completed and demo done with QA

FaizHashmiCS22 added 1 commit 2 months ago

6bb04401cf Merge branch 'master' into faiz_dev ...

# Conflicts:
#	lib/core/api/api_client.dart

FaizHashmiCS22 added 1 commit 2 months ago

47b733c186 fixed strings bugs

FaizHashmiCS22 added 1 commit 2 months ago

144f8f98a0 fixed strings bugs

FaizHashmiCS22 added 2 commits 2 months ago

fd88e8f381 Merge branch 'master' into faiz_dev ...

# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/api_consts.dart
#	lib/generated/locale_keys.g.dart

556aa6171c merged into master

FaizHashmiCS22 added 1 commit 1 month ago

7855258529 fixed PMA 1205 and PMA 1204

FaizHashmiCS22 added 1 commit 1 month ago

37e47a098b added pharmacy check

FaizHashmiCS22 added 1 commit 1 week ago

bd96e26845 Updated messages in refund module

FaizHashmiCS22 added 1 commit 1 day ago

b75e72636a Merge branch 'refs/heads/master' into faiz_dev ...

# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/api_consts.dart
#	lib/presentation/contact_us/feedback_page.dart

This pull request can be merged automatically.

You are not authorized to merge this pull request.

You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.

git checkout -b faiz_dev master

git pull origin faiz_dev

Step 2:

Merge the changes and update on Gitea.

git checkout master

git merge --no-ff faiz_dev

git push origin master

Sign in to join this conversation.

Reviewers

Request review

No reviewers

Labels

Apply labels

Clear labels

No items

No Label

Milestone

Set milestone

Clear milestone

No items

No Milestone

Projects

Set Project

Clear projects

No project

Assignees

Assign users

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Haroon6138/HMG_Patient_App_New#335

Write Preview

Loading…

Cancel

Save

There is no content yet.