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 ourterms of serviceand privacy statement.We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use organization default fixedPrice if self-serve/default price is passed in #15966

Merged
merged 10 commits into from
Aug 7, 2024

Conversation

sean-brydon
Copy link
Member

Mandatory Tasks (DO NOT REMOVE)

  • I have self-reviewed the code (A decent size PR without self-review might be rejected).
  • I have added a Docs issuehereif this PR makes changes that would require adocumentation change.If N/A, write N/A here and check the checkbox.
  • I confirm automated tests are in place that prove my fix is effective or that my feature works.

How should this be tested?

  • Create an Organization via self serve flow

  • Check stripe to ensure subscription gets added to the fixed priceId

  • Create an Organization via the admin flow

  • Check to see custom price has been created under the product.

@graphite-app graphite-app bot requested a review froma team July 29, 2024 08:51
@keithwillcode keithwillcode added consumer core area: core, team members only labels Jul 29, 2024
@dosubot dosubot bot added billing area: billing, stripe, payments, paypal, get paid platform Anything related to our platform plan labels Jul 29, 2024
@graphite-app graphite-app bot requested a review froma team July 29, 2024 08:51
Copy link

vercel bot commented Jul 29, 2024

The latest updates on your projects.Learn more aboutVercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
ai ✅ Ready (Inspect) Visit Preview 💬Add feedback Aug 7, 2024 8:26am
2 Skipped Deployments
Name Status Preview Comments Updated (UTC)
cal ⬜️ Ignored (Inspect) Visit Preview Aug 7, 2024 8:26am
calcom-web-canary ⬜️ Ignored (Inspect) Visit Preview Aug 7, 2024 8:26am

Copy link

graphite-app bot commented Jul 29, 2024

Graphite Automations

"Add consumer team as reviewer"took an action on this PR • (07/29/24)

1 reviewer was added to this PR based on Keith Williams's automation.

"Add platform team as reviewer"took an action on this PR • (07/29/24)

1 reviewer was added to this PR based on Keith Williams's automation.

.env.example Outdated Show resolved Hide resolved
hariombalhara
hariombalhara previously approved these changes Aug 5, 2024
Copy link
Member

@hariombalhara hariombalhara left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

LGTM now!!

@hariombalhara hariombalhara enabled auto-merge (squash) August 5, 2024 09:26
@hariombalhara hariombalhara merged commitd429f0e into main Aug 7, 2024
36 checks passed
@hariombalhara hariombalhara deleted the fix/organization-prices branch August 7, 2024 09:36
zomars pushed a commit that referenced this pull request Aug 7, 2024
…is passed in (#15966)

* Use fixed price if default (selfserve) is used

* fix conditional

* use.env instead of hard coded values

* feedback
zomars pushed a commit that referenced this pull request Aug 7, 2024
…is passed in (#15966)

* Use fixed price if default (selfserve) is used

* fix conditional

* use.env instead of hard coded values

* feedback
PeerRich added a commit that referenced this pull request Aug 8, 2024
* fix: uncaught errors in PaymentService

* fix: uncaught errors in WebhookService

* fix: uncaught errors in sendPayload

* fix: uncaught PaymentService typings in payment utils

* fix: Remove missing users from assignment (#16115)

* remove missing users from assignment

* early return

* fix: use organization default fixedPrice if self-serve/default price is passed in (#15966)

* Use fixed price if default (selfserve) is used

* fix conditional

* use.env instead of hard coded values

* feedback

* fix: display skeleton loader (#16114)

* fix: display loader

* fix: updated skelton loader

* feat: create new markNoShow endpoint (#15738)

* feat: create new markNoShow endpoint

* chore: add schema

* chore: update name

* chore: save progress

* refactor: improve code and types

* fix: unit test

* chore: improvements

* chore: move query to booking repository

* fix: type error

* chore: Remove cal.ai email assistant (#16003)

* Delete apps/ai directory

* removed cal-ai app from app store

---------

Co-authored-by: Anik Dhabal Babu <[email protected] >
Co-authored-by: Carina Wollendorfer <[email protected] >
Co-authored-by: Hariom Balhara <hariombalhara@gmail >

* feat: Add upcoming bookings feature to GET /api/bookings endpoint (#16060)

* feat: Add upcoming bookings feature to GET /api/bookings endpoint

- Added support for filtering upcoming bookings by adding the `upcoming` query parameter to the GET /api/bookings endpoint.
- When `upcoming` is set to "true", only upcoming bookings are returned.
- Regular users can now retrieve only their upcoming bookings by setting `upcoming` to "true".
- System-wide admins and organization admins can also retrieve only upcoming bookings by setting `upcoming` to "true".

* feat: Add status filter to booking API endpoint

This commit adds a new `status` filter to the booking API endpoint. The `status` filter allows filtering bookings by their status, overriding the `dateFrom` and `dateTo` filters. The only valid value for the `status` filter is "upcoming".

* Update _get.ts

---------

Co-authored-by: Anik Dhabal Babu <[email protected] >

* fix: Hide personal booking theme when in an organization (#16117)

Co-authored-by: Peer Richelsen <peeroke@gmail >

* fix: uncaught errors in WebhookService

* fix: uncaught errors in sendPayload

---------

Co-authored-by: Syed Ali Shahbaz <[email protected] >
Co-authored-by: sean-brydon <[email protected] >
Co-authored-by: Udit Takkar <[email protected] >
Co-authored-by: Peer Richelsen <peeroke@gmail >
Co-authored-by: Anik Dhabal Babu <[email protected] >
Co-authored-by: Carina Wollendorfer <[email protected] >
Co-authored-by: Hariom Balhara <hariombalhara@gmail >
Co-authored-by: Imamuzzaki Abu Salam <imamuzzaki@gmail >
Co-authored-by: Joe Au-Yeung <[email protected] >
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
billing area: billing, stripe, payments, paypal, get paid consumer core area: core, team members only ❗️.env changes contains changes to env variables platform Anything related to our platform plan ready-for-e2e
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants