chore: update main from develop #348
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* feat(pos/seller-selection): add outline buttons for cashiers * fix: remove unused import * fix: type mismatch
Co-authored-by: Robin van Dijke <[email protected]>
* fix(pos): balance not changing when locking buyer * fix: incorrect initial state * fix(pos): clean up merge leftovers --------- Co-authored-by: Robin van Dijke <[email protected]>
|
Triggered from #348 by @CodeNamedRobin. Checking if we can fast forward Target branch ( commit 3cfd4cc52b7bec2666fe983f3e9e38a7486523d9 (HEAD -> main, tag: v1.6.1, origin/main)
Author: Samuel <[email protected]>
Date: Thu Sep 12 22:20:09 2024 +0200
fix: nginx seller payouts (#340)Pull request ( commit f6e1e651003faafe758dc53bf342ac6b93ef9931 (pull_request/develop)
Author: Roy Kakkenberg <[email protected]>
Date: Sun Sep 15 17:35:31 2024 +0200
fix(pos): balance not changing when locking buyer (#344)
* fix(pos): balance not changing when locking buyer
* fix: incorrect initial state
* fix(pos): clean up merge leftovers
---------
Co-authored-by: Robin van Dijke <[email protected]>It is possible to fast forward |
* feat(pos): fetch alc. time * fix(pos-settings): Alcohol time with better timezone calculation * fix(pos-display): Add a warning for alcohol time when tab is selected * fix(pos-display): Remove seconds from alcohol warning
|
Triggered from #348 by @SuperVK. Checking if we can fast forward Target branch ( commit 3cfd4cc52b7bec2666fe983f3e9e38a7486523d9 (HEAD -> main, tag: v1.6.1, origin/main)
Author: Samuel <[email protected]>
Date: Thu Sep 12 22:20:09 2024 +0200
fix: nginx seller payouts (#340)Pull request ( commit ccb939f6b5f0c8cfc759e53846a3c68fc7f4543a (pull_request/develop)
Author: Victor Klomp <[email protected]>
Date: Mon Sep 16 13:18:39 2024 +0200
feat(pos-display): Alcohol time warning (#347)
* feat(pos): fetch alc. time
* fix(pos-settings): Alcohol time with better timezone calculation
* fix(pos-display): Add a warning for alcohol time when tab is selected
* fix(pos-display): Remove seconds from alcohol warningIt is possible to fast forward |
SuperVK
approved these changes
Sep 16, 2024
|
/fast-forward |
|
Triggered from #348 (comment) by @CodeNamedRobin. Trying to fast forward Target branch ( commit 3cfd4cc52b7bec2666fe983f3e9e38a7486523d9 (HEAD -> main, tag: v1.6.1, origin/main)
Author: Samuel <[email protected]>
Date: Thu Sep 12 22:20:09 2024 +0200
fix: nginx seller payouts (#340)Pull request ( commit ccb939f6b5f0c8cfc759e53846a3c68fc7f4543a (pull_request/develop)
Author: Victor Klomp <[email protected]>
Date: Mon Sep 16 13:18:39 2024 +0200
feat(pos-display): Alcohol time warning (#347)
* feat(pos): fetch alc. time
* fix(pos-settings): Alcohol time with better timezone calculation
* fix(pos-display): Add a warning for alcohol time when tab is selected
* fix(pos-display): Remove seconds from alcohol warningFast forwarding $ git push origin ccb939f6b5f0c8cfc759e53846a3c68fc7f4543a:main
To https://github.com/GEWIS/sudosos-frontend.git
3cfd4cc..ccb939f ccb939f6b5f0c8cfc759e53846a3c68fc7f4543a -> main |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Includes only bug fixes, mainly on POS, but also one PIN update bug fix on dashboard
Related issues/external references
Types of changes