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

Chore: update main from develop #433

Merged
merged 29 commits into from
Nov 2, 2024
Merged

Chore: update main from develop #433

merged 29 commits into from
Nov 2, 2024

Conversation

JustSamuel
Copy link
Contributor

Description

Related issues/external references

Style reworks, updated README and other fixes.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)

JustSamuel and others added 24 commits October 14, 2024 22:08
…380)

Updates the requirements on [@stripe/stripe-js](https://github.com/stripe/stripe-js) to permit the latest version.
- [Release notes](https://github.com/stripe/stripe-js/releases)
- [Commits](stripe/stripe-js@v4.4.0...v4.8.0)

---
updated-dependencies:
- dependency-name: "@stripe/stripe-js"
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…383)

---
updated-dependencies:
- dependency-name: "@tsconfig/node18"
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Updates the requirements on [axios](https://github.com/axios/axios) to permit the latest version.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](axios/axios@v1.6.8...v1.7.7)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Updates the requirements on [sass](https://github.com/sass/dart-sass) to permit the latest version.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](sass/dart-sass@1.69.7...1.80.2)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…le (#387)

---
updated-dependencies:
- dependency-name: "@tsconfig/node18"
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Updates the requirements on [axios](https://github.com/axios/axios) to permit the latest version.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](axios/axios@v1.6.8...v1.7.7)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Updates the requirements on [pinia](https://github.com/vuejs/pinia) to permit the latest version.
- [Release notes](https://github.com/vuejs/pinia/releases)
- [Commits](https://github.com/vuejs/pinia/compare/[email protected]@2.2.4)

---
updated-dependencies:
- dependency-name: pinia
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Samuel <[email protected]>
Updates the requirements on [pinia](https://github.com/vuejs/pinia) to permit the latest version.
- [Release notes](https://github.com/vuejs/pinia/releases)
- [Commits](https://github.com/vuejs/pinia/compare/[email protected]@2.2.4)

---
updated-dependencies:
- dependency-name: pinia
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Updates the requirements on [sass](https://github.com/sass/dart-sass) to permit the latest version.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](sass/dart-sass@1.63.6...1.80.2)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Updates the requirements on [axios](https://github.com/axios/axios) to permit the latest version.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](axios/axios@v1.6.8...v1.7.7)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…394)

Updates the requirements on [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) to permit the latest version.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](vuejs/eslint-plugin-vue@v9.11.0...v9.29.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-vue
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Updates the requirements on [yup](https://github.com/jquense/yup) to permit the latest version.
- [Release notes](https://github.com/jquense/yup/releases)
- [Changelog](https://github.com/jquense/yup/blob/master/CHANGELOG.md)
- [Commits](jquense/yup@v1.2.0...v1.4.0)

---
updated-dependencies:
- dependency-name: yup
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* refactor(dependencies): Move dependencies into root package.json

* refactor(deps): Fix typescript version, remove uuid and add lodash

* refactor(deps): Update yarn.lock

* refactor(dependencies): Post rebase mistakes

* refactor(dependencies): Re-introduce strict mode

* refactor(dependencies): Revert change
Copy link

Triggered from #433 by @​JustSamuel.

Checking if we can fast forward main (e5bb95a) to develop (e74fc57).

Target branch (main):

commit e5bb95a6b322a3b3a862d99c0ea67489269859ee (HEAD -> main, tag: v1.8.1, origin/main)
Author: Ruben Lagerwerf <[email protected]>
Date:   Sun Oct 13 14:04:37 2024 +0200

    fix: flagged transaction email is cut off (#365)

Pull request (develop):

commit e74fc5713ca2ba165bf7e62310e811edcd4ea3f8 (pull_request/develop)
Author: Ruben Lagerwerf <[email protected]>
Date:   Tue Oct 29 22:48:56 2024 +0100

    feat(dashboard): Add maintenance screen (#422)

It is possible to fast forward main (e5bb95a) to develop (e74fc57). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward main to develop.

@JustSamuel JustSamuel requested a review from SuperVK October 30, 2024 01:08
…iple times (#436)

Pressing the "PAY" button starts the confirmation of the Payment Intent of the
current top-up. This sends a request to Stripe which will (if successful) return
a payment redirect link for iDEAL transactions.

Unfortunately, due to various reasons it is possible to accidentally press the
"PAY" button twice. This can be due to user error, device issues, or network
issues. The result is that sometimes, the request to confirm the Payment Intent
is send twice. This means that two payment redirect links are generated by
Stripe, but only the first one will be used.

Because Stripe has generated the second link (or even more) only that link is
still active for Stripe. In other words, successful payments through the first
link are not actively confirmed by Stripe. This means that that money is
"temporarily" considered lost and the top-up is not successful.

The money will be returned to the user by Stripe within 5 business days,
however, we should do everything in our power to ensure that this does not
happen (especially because people sometimes need to do large top-ups).

This change ensures that the "PAY" button is disabled after pressing it until
the user is redirected to the iDEAL payment page. I would have loved to use an
`Idempotency-Key` instead, however, it appears that this is not directly
supported by the `confirmPayment` method.
Copy link

Triggered from #433 by @​SuperVK.

Checking if we can fast forward main (e5bb95a) to develop (026a5ed).

Target branch (main):

commit e5bb95a6b322a3b3a862d99c0ea67489269859ee (HEAD -> main, tag: v1.8.1, origin/main)
Author: Ruben Lagerwerf <[email protected]>
Date:   Sun Oct 13 14:04:37 2024 +0200

    fix: flagged transaction email is cut off (#365)

Pull request (develop):

commit 026a5ed700cf9c9126057ca0ecb132a887db7186 (pull_request/develop)
Author: Tom Udding <[email protected]>
Date:   Thu Oct 31 19:24:51 2024 +0100

    fix(dashboard/user-topup-modal): prevent clicking payment button multiple times (#436)
    
    Pressing the "PAY" button starts the confirmation of the Payment Intent of the
    current top-up. This sends a request to Stripe which will (if successful) return
    a payment redirect link for iDEAL transactions.
    
    Unfortunately, due to various reasons it is possible to accidentally press the
    "PAY" button twice. This can be due to user error, device issues, or network
    issues. The result is that sometimes, the request to confirm the Payment Intent
    is send twice. This means that two payment redirect links are generated by
    Stripe, but only the first one will be used.
    
    Because Stripe has generated the second link (or even more) only that link is
    still active for Stripe. In other words, successful payments through the first
    link are not actively confirmed by Stripe. This means that that money is
    "temporarily" considered lost and the top-up is not successful.
    
    The money will be returned to the user by Stripe within 5 business days,
    however, we should do everything in our power to ensure that this does not
    happen (especially because people sometimes need to do large top-ups).
    
    This change ensures that the "PAY" button is disabled after pressing it until
    the user is redirected to the iDEAL payment page. I would have loved to use an
    `Idempotency-Key` instead, however, it appears that this is not directly
    supported by the `confirmPayment` method.

It is possible to fast forward main (e5bb95a) to develop (026a5ed). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward main to develop.

* feat(fines): Partially waive fines

* fix(fines): Make mutation refresh after partially waiving fine

* fix(fines): Form validation for waiving above the possible amount of fines

* fix(fines): Fix issues from Samuel

* fix(fines): Add info text for waiving fines

* fix(fines): Add button to waive all fines.

* fix(fines): Typo

* fix(fines): Let the last fine waive be the placeholder

* fix(fines): Don't render waive fines when no fine

* fix(fines): Typing issues
Copy link

Triggered from #433 by @​SuperVK.

Checking if we can fast forward main (e5bb95a) to develop (201fae0).

Target branch (main):

commit e5bb95a6b322a3b3a862d99c0ea67489269859ee (HEAD -> main, tag: v1.8.1, origin/main)
Author: Ruben Lagerwerf <[email protected]>
Date:   Sun Oct 13 14:04:37 2024 +0200

    fix: flagged transaction email is cut off (#365)

Pull request (develop):

commit 201fae0ecd8c6f2b79af862e11f9c81a7b56001f (pull_request/develop)
Author: Victor Klomp <[email protected]>
Date:   Thu Oct 31 20:01:49 2024 +0100

    feat(fine): Ability to partially waive fines (#429)
    
    * feat(fines): Partially waive fines
    
    * fix(fines): Make mutation refresh after partially waiving fine
    
    * fix(fines): Form validation for waiving above the possible amount of fines
    
    * fix(fines): Fix issues from Samuel
    
    * fix(fines): Add info text for waiving fines
    
    * fix(fines): Add button to waive all fines.
    
    * fix(fines): Typo
    
    * fix(fines): Let the last fine waive be the placeholder
    
    * fix(fines): Don't render waive fines when no fine
    
    * fix(fines): Typing issues

It is possible to fast forward main (e5bb95a) to develop (201fae0). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward main to develop.

@SuperVK
Copy link
Member

SuperVK commented Oct 31, 2024

Fine by me to merge, but this will mean that the POS styling is now actuality (which is fine by me)

@JustSamuel
Copy link
Contributor Author

Fine by me to merge, but this will mean that the POS styling is now actuality (which is fine by me)

Yeah I'll change the background later, since that seems to be the "issue"

* feat(dashboard/profile) Initial addition of NFC form

* fix: added locales

added additional locales where they were still missing and improved naming of them.

* feat(dashboard/profile)

Changed where the scanner is opened and removed the dialog and form scanner should now work on mobile chrome browsers

* fix(dashboard/nfc-reader): Addresses remarks in pull request

Addresses remarks made in the pull request by @JustSamuel

* fix(dashboard/profile):

removed console.log and whitespace
Copy link

github-actions bot commented Nov 1, 2024

Triggered from #433 by @​noelvandevrie.

Checking if we can fast forward main (e5bb95a) to develop (dd10e7b).

Target branch (main):

commit e5bb95a6b322a3b3a862d99c0ea67489269859ee (HEAD -> main, tag: v1.8.1, origin/main)
Author: Ruben Lagerwerf <[email protected]>
Date:   Sun Oct 13 14:04:37 2024 +0200

    fix: flagged transaction email is cut off (#365)

Pull request (develop):

commit dd10e7b0c5b3033d2a4d60f6651012f662c96dfc (pull_request/develop)
Author: Noel van de Vrie <[email protected]>
Date:   Fri Nov 1 17:41:57 2024 +0100

    Feature/nfc update (#437)
    
    * feat(dashboard/profile) Initial addition of NFC form
    
    * fix: added locales
    
    added additional locales where they were still missing and improved naming of them.
    
    * feat(dashboard/profile)
    
    Changed where the scanner is opened and removed the dialog and form scanner should now work on mobile chrome browsers
    
    * fix(dashboard/nfc-reader): Addresses remarks in pull request
    
    Addresses remarks made in the pull request by @justSamuel
    
    * fix(dashboard/profile):
    
    removed console.log and whitespace

It is possible to fast forward main (e5bb95a) to develop (dd10e7b). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward main to develop.

Copy link

github-actions bot commented Nov 2, 2024

Triggered from #433 by @​JustSamuel.

Checking if we can fast forward main (e5bb95a) to develop (a61cdec).

Target branch (main):

commit e5bb95a6b322a3b3a862d99c0ea67489269859ee (HEAD -> main, tag: v1.8.1, origin/main)
Author: Ruben Lagerwerf <[email protected]>
Date:   Sun Oct 13 14:04:37 2024 +0200

    fix: flagged transaction email is cut off (#365)

Pull request (develop):

commit a61cdec8457a34d284334767514ee3952d783b25 (pull_request/develop)
Author: Samuel <[email protected]>
Date:   Sat Nov 2 13:18:12 2024 +0100

    fix: remove topup warning on landing page (#438)

It is possible to fast forward main (e5bb95a) to develop (a61cdec). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward main to develop.

Copy link

github-actions bot commented Nov 2, 2024

Triggered from #433 by @​JustSamuel.

Checking if we can fast forward main (e5bb95a) to develop (799b1c8).

Target branch (main):

commit e5bb95a6b322a3b3a862d99c0ea67489269859ee (HEAD -> main, tag: v1.8.1, origin/main)
Author: Ruben Lagerwerf <[email protected]>
Date:   Sun Oct 13 14:04:37 2024 +0200

    fix: flagged transaction email is cut off (#365)

Pull request (develop):

commit 799b1c8d92c7dbaa69ec5935f0f1929a4c5c9ae6 (pull_request/develop)
Author: Samuel <[email protected]>
Date:   Sat Nov 2 13:51:33 2024 +0100

    feat: post refactoring invoice ui (#335)

It is possible to fast forward main (e5bb95a) to develop (799b1c8). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward main to develop.

@JustSamuel JustSamuel merged commit 799b1c8 into main Nov 2, 2024
5 of 7 checks passed
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.

5 participants