Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge production to develop #310

Merged
merged 11 commits into from
Jan 3, 2024
Merged

Merge production to develop #310

merged 11 commits into from
Jan 3, 2024

Conversation

SanttuA
Copy link
Collaborator

@SanttuA SanttuA commented Jan 3, 2024

Merging changes from production to develop branch.

ezkat and others added 11 commits May 10, 2022 10:38
Previously when staff made a reservation with cash payment, their reservation would expire due to it being handled differently from normal client cash handling. This fix addresses the issue by excluding cash payments from normal payment expiration handling.
…tion

Hotfixed staff made cash payments expiring
@SanttuA SanttuA requested a review from ezkat January 3, 2024 10:42
Copy link

codecov bot commented Jan 3, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (e74ea76) 76.64% compared to head (e0b6c6f) 76.65%.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop     #310      +/-   ##
===========================================
+ Coverage    76.64%   76.65%   +0.01%     
===========================================
  Files          500      500              
  Lines        26948    26960      +12     
  Branches      2751     2751              
===========================================
+ Hits         20654    20666      +12     
  Misses        5765     5765              
  Partials       529      529              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@SanttuA SanttuA merged commit 93ba519 into develop Jan 3, 2024
7 checks passed
@ezkat ezkat deleted the sync/merge-prod-into-dev branch January 9, 2024 09:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants