vynte-infra/calendar
2
0
Fork 0
Code Issues Pull Requests Actions 2.0k Packages Projects Releases Wiki Activity
9,819 Commits 3 Branches 0 Tags
23a17c4e8ae0aed84a35fc2c1936bfb4cbbd04db
Commit Graph
67 Commits
Author SHA1 Message Date
Amit SharmaGitHubJoe Au-YeungUdit Takkar
 		b6a57381c7 feat: redirect after booking: option to forward parameters (#14235) 
* feat: redirect after booking: option to forward parameters

* fix: unit test

* fix: stripe passing its own params

* fix: manually add stripe params

---------

Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
 2024-05-07 12:15:20 -04:00
Omar LópezGitHubJoe Au-Yeungsean-brydon
 		3f02de8214 chore: icon cleanup (#13770) 
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
 2024-04-03 23:23:57 +00:00
Udit TakkarGitHubzomars
 		e6cd016cad fix: usage of CAL_URL (#13326) 
Co-authored-by: zomars <zomars@me.com>
 2024-02-13 06:03:45 +00:00
Benny JooandGitHub 827d8995a1 chore: [app-router-migration 38]: Refactor migrated pages and fix generateMetadata functions (#13314) 
* refactor to keep consistencies in files

* manual: more refactors

* revert unnecessary changes

* fix type errors

* fix build error

* fix
 2024-01-22 17:32:15 -03:00
DmytroHryshynGitHubBenny Joo
 		a28b9cacd2 chore: [app-router-migration 17]: migrate payments page (#13039) 
* chore: migrate payments page

* migrate page to WithLayout HOC, replace new ssrInit

* fix type error

* fix

* revert version changes

* fix

---------

Co-authored-by: Benny Joo <sldisek783@gmail.com>
 2024-01-12 18:36:48 -03:00
Udit TakkarGitHubsean-brydon
 		7dc6df2ad6 chore: improve logs (#12467) 
* chore: improve logs

* fix: import

* chore: use safe stringify

* chore: add more logs to google calendar

* chore: use this.log

---------

Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
 2023-11-29 19:39:25 +05:30
DmytroHryshynGitHubzomars
 		28acbe549a chore: [app dir bootstrapping 9]: replace useSearchParams with useCompatSearchParams hook (#12056) 
Co-authored-by: zomars <zomars@me.com>
 2023-11-16 13:38:27 -07:00
MorganandGitHub 1f9880204e fix: payment cancel button redirects properly (#12254) 2023-11-08 12:34:50 +02:00
Siddharth MovaliyaandGitHub 79a6aef0e7 fix: text colour for no-show acknowledgment (#12132) 2023-10-31 16:41:25 +00:00
Greg PabianGitHubOmar López
 		a9535d3fd4 chore: [app dir bootstrapping 4.1] check nullability of navigation hook return values part 2 (#12065) 
Co-authored-by: Omar López <zomars@me.com>
 2023-10-24 20:52:59 +00:00
Greg PabianandGitHub 39cfe18ffe chore: [app dir bootstrapping 4] check nullability of navigation hook return values (#12005) 2023-10-20 16:47:05 -07:00
Benny JooGitHubzomars
 		63416d4f33 chore: update tslog from 3.2.1 to 4.9.2 (#11717) 
Co-authored-by: zomars <zomars@me.com>
 2023-10-17 19:00:48 +00:00
AldrinGitHubPeer Richelsenzomars
 		3e08c66888 refactor: Use template literal instead of '+' operator (#11444) 
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: zomars <zomars@me.com>
 2023-10-03 11:52:19 -07:00
Hariom BalharaGitHubalannnc
 		20898e1505 fix: Handle payment flow webhooks in case of event requiring confirmation (#11458) 
Co-authored-by: alannnc <alannnc@gmail.com>
 2023-09-30 10:22:32 +05:30
RolandGitHubPeer RichelsenalannncHariom BalharaPeer Richelsen
 		2021b641ce feat: Alby integration (#11495) 
Co-authored-by: Peer Richelsen <peer@cal.com>
Co-authored-by: alannnc <alannnc@gmail.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
 2023-09-28 12:03:01 +00:00
Udit TakkarGitHubAlex van Andel
 		13caf6f2cd fix: add a default timezone (#11475) 
Co-authored-by: Alex van Andel <me@alexvanandel.com>
 2023-09-25 15:08:41 +02:00
Keith WilliamsGitHubzomars
 		bd21b2dfe1 fix: Import prisma (#11369) 
Co-authored-by: zomars <zomars@me.com>
 2023-09-14 19:47:25 +00:00
Joe Au-YeungGitHubShivam KalrazomarsAlan
 		197b435b6f fix: Duplicate calendar events (#11327) 
Co-authored-by: Shivam Kalra <shivamkalra98@gmail.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: Alan <alannnc@gmail.com>
 2023-09-14 09:53:58 -07:00
alannncandGitHub 75f9f045b8 fix: payments on round-robin events (#11248) 
* Fix condition when no users are found for event type

* fix for types
 2023-09-12 08:59:32 -07:00
VIneet PradhanGitHubVIneet PradhanUdit Takkar
 		f73d38b632 fix: color tokens are not used in payment form (#10806) 
Co-authored-by: VIneet Pradhan <138296762+vineetpradhan-dev@users.noreply.github.com>
Co-authored-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>
 2023-09-04 15:02:21 +02:00
alannncandGitHub c4e5d168a5 fix: handle collective multiple host on destinationCalendar (#10967) 2023-08-31 10:47:02 -07:00
Aswath SGitHubHariom Balhara
 		16bb5c3384 feat: Added more query params to successRedirect page (#8271) 
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
 2023-08-22 12:18:36 +00:00
WesleyGitHubJoe Au-YeungJoe Au-Yeung
 		d66095bf9c test: adding confirmed payment test cases on Stripe (#10243) 
Co-authored-by: Joe Au-Yeung <j.auyeung419@gmail.com>
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
 2023-08-21 11:12:39 +02:00
zomars e148ee7823 chore: Removes all traces of ".prisma/client" 2023-08-14 17:28:43 -07:00
alannncGitHubsean-brydonOmar López
 		471b2687c4 feat: app paypal payment (#8797) 
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
Co-authored-by: Omar López <zomars@me.com>
 2023-08-11 23:29:48 +00:00
Omar LópezGitHubAlex van AndelPeer RichelsenBailey PumfleetPeer RichelsenHariom Balhara
 		b7851e6e53 refactor: next/router hooks with next/navigation hooks (#9105) 
Co-authored-by: Alex van Andel <me@alexvanandel.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Bailey Pumfleet <bailey@pumfleet.co.uk>
Co-authored-by: Peer Richelsen <peer@cal.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
 2023-08-02 11:35:48 +02:00
sean-brydonandGitHub 610c86837a feat: orgs - user management v2 
figma: https://www.figma.com/file/ZJNAFHCAq6rnuGRgUFxjzQ/Organizations----New-features?type=design&node-id=4304-330348&mode=design&t=nKonHZpucwxnqwQI-4 (Not all features are in this PR)
loom: https://www.loom.com/share/30e8ef20a5b34a708dca160d8c04ae6f

shoutout @shadcn for the base of this table <3 

Member View: 
![CleanShot 2023-07-14 at 14 09 02](https://github.com/calcom/cal.com/assets/55134778/5db6eedb-bece-4955-91f0-9f2b3b042300)

Admin view:
![CleanShot 2023-07-14 at 14 09 07](https://github.com/calcom/cal.com/assets/55134778/708c624d-1990-4075-8b32-d4587d09deff)

How to test 
- Create ORG
- add members
- view settings -> orgs -> members
 2023-07-19 12:45:13 -07:00
MontoandGitHub 26e458be6d feat: dynamic time format rendering in workflows based on user settings (#10229) 2023-07-19 10:30:37 -04:00
zomars 6b5c8935c5 fix: formatting 2023-07-18 13:27:54 -07:00
Sai KrishnaandGitHub 6d19cc22a5 fix: cancel button not working on payment page (#10006) 2023-07-10 15:58:38 +02:00
Omar LópezandGitHub 2d6eebcd8a chore: Sync packages mismatches (#9725) 2023-06-22 15:25:37 -07:00
Julius MarmingeGitHubAlex van Andel
 		53748eb380 add an enum generator, stop importing from @prisma/client (#8548) 
* add an enum generator and start importing from it

* keep moving imports

* fix remaining

* Header simplified

* Removed generated file from repo

* Updated .gitignore to exclude enums directory

* Add eslint rule to check for @prisma/client Prisma enum import

* Added another enum import + exclude PrismaClient

---------

Co-authored-by: Alex van Andel <me@alexvanandel.com>
 2023-05-02 13:44:05 +02:00
Joe Au-YeungGitHubHariom Balhara
 		7ff5b66f46 Bookings with no-show fee to set proper location & prevent broken payments from blocking payment page (#8508) 
* Better error logging on Stripe payment service

* Update booking

* If missing payment, load rest of bookings

* Address feedback

* Move requires confirmation threshold to webhook

* Use requiresConfirmation

* Revert unnecessary prettier changes

---------

Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
 2023-04-26 10:12:14 -04:00
Lucas SmithGitHubOmar LópezPeer RichelsenEfraín RochínKeith Williams
 		1eeb91a793 perf: lazy load tRPC routes (#8167) 
* experiment: cold start perf

* fix: update failing test

* chore: add database indexes

* chore: use json protocol and add query batching back

* Update [status].tsx

* Update [trpc].ts

* Delete getSlimSession.ts

* Update createContext.ts

* remove trpc caller

* correctly import Prisma

* lazy ethRouter

* replace crypto with md5

* import fixes

* public event endpoint refactor

* Update yarn.lock

* Update yarn.lock

* Using yarn.lock from main

---------

Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Efraín Rochín <roae.85@gmail.com>
Co-authored-by: Keith Williams <keithwillcode@gmail.com>
 2023-04-25 19:39:47 -03:00
alannncGitHubAlex van Andel
 		fe996b4e41 Fix/user creds (#8393) 
* fix-user-creds

* Type fixes

* Type fixes

* Type fixes

---------

Co-authored-by: Alex van Andel <me@alexvanandel.com>
 2023-04-20 15:55:19 +00:00
Joe Au-YeungGitHubAlex van AndelOmar López
 		b0530d59af Remove Intl.Provider (#8208) 
* Add payment option to schema

* Add payment option to Stripe zod

* Set payment option on event type

* Create manual payment intent in Stripe

* Set payment option from Stripe app

* Add payment option to DB

* Pass React.ReactNode to checkbox

* Create uncaptured payment intent

* WIP

* Capture card in setup intent

* Show charge card option

* Charge card from booking page

* Bug fixes

* Clean up

* Clean up app card

* Add no-show fee messaging on booking page

* Send payment email on payment & add price

* Fix messaging

* Create no show fee charged email

* Send charge fee collected email

* Disable submit on card failure

* Clean up

* Serverside prevent charging card again if already charged

* Only confirm booking if paid for

* Type fixes

* More type fixes

* More type fixes

* Type fix

* Type fixes

* UI changes

* Payment component rework

* Update apps/web/public/static/locales/en/common.json

Co-authored-by: Alex van Andel <me@alexvanandel.com>

* Update apps/web/public/static/locales/en/common.json

Co-authored-by: Alex van Andel <me@alexvanandel.com>

* Update apps/web/components/dialog/ChargeCardDialog.tsx

Co-authored-by: Alex van Andel <me@alexvanandel.com>

* Update packages/trpc/server/routers/viewer/payments.tsx

Co-authored-by: Alex van Andel <me@alexvanandel.com>

* Revert GTM config

* Adjust payment option dropdown

* Show alert when seats are set

* Small bug fixes

* Create collect card method

* clean up

* Prevent seats & charge no-show fee to be enabled together

* Do not charge no-show fee on unconfirmed bookings

* Add check to collect card method

* Webhook send request emails

* Fix some dark mode colours

* Change awaiting payment language

* Type fixes

* Set height of Select and TextField both to 38px to fix alignment

* Fix message seats & payment error message

* Type fix

* Remove Intl.Provider

* Add percentFeePercentage

* WIP

* Use i18n language

* Type fix

---------

Co-authored-by: Alex van Andel <me@alexvanandel.com>
Co-authored-by: Omar López <zomars@me.com>
 2023-04-19 21:38:06 +00:00
Joe Au-YeungandGitHub 2ac5ef10ba Add event type redirect URL (#8385) 2023-04-19 13:46:59 -07:00
Joe Au-YeungandGitHub f00b112792 Change Stripe <CardElement /> to <PaymentElement /> (#8268) 
* Use Stripe PaymentElement

* Only show needs confirmation, if the booking needs it

* Clean up

* Type fix

* More type fixes
 2023-04-14 21:56:16 +00:00
Abdallah AlsammanGitHubAlex van Andel
 		91f381bce9 Replace react icons with lucidedev (#8146) 
* migrate from react-icons to lucide-react

* replace react-icon with lucide-dev: Webhook Icon

* add lucide transformer

* Fix LinkIcon import

* Update yarn.lock to include monorepo deps

* Migrated icons in ChargeCardDialog

* Port Storybook to new icons as well

* Adjust Info & Globe icons size to match react-icons size

---------

Co-authored-by: Alex van Andel <me@alexvanandel.com>
 2023-04-12 17:26:31 +02:00
Joe Au-YeungGitHubAlex van Andel
 		817e20f11e Stripe add the ability to place hold on cards (#8022) 
* Add payment option to schema

* Add payment option to Stripe zod

* Set payment option on event type

* Create manual payment intent in Stripe

* Set payment option from Stripe app

* Add payment option to DB

* Pass React.ReactNode to checkbox

* Create uncaptured payment intent

* WIP

* Capture card in setup intent

* Show charge card option

* Charge card from booking page

* Bug fixes

* Clean up

* Clean up app card

* Add no-show fee messaging on booking page

* Send payment email on payment & add price

* Fix messaging

* Create no show fee charged email

* Send charge fee collected email

* Disable submit on card failure

* Clean up

* Serverside prevent charging card again if already charged

* Only confirm booking if paid for

* Type fixes

* More type fixes

* More type fixes

* Type fix

* Type fixes

* UI changes

* Payment component rework

* Update apps/web/public/static/locales/en/common.json

Co-authored-by: Alex van Andel <me@alexvanandel.com>

* Update apps/web/public/static/locales/en/common.json

Co-authored-by: Alex van Andel <me@alexvanandel.com>

* Update apps/web/components/dialog/ChargeCardDialog.tsx

Co-authored-by: Alex van Andel <me@alexvanandel.com>

* Update packages/trpc/server/routers/viewer/payments.tsx

Co-authored-by: Alex van Andel <me@alexvanandel.com>

* Revert GTM config

* Adjust payment option dropdown

* Show alert when seats are set

* Small bug fixes

* Create collect card method

* clean up

* Prevent seats & charge no-show fee to be enabled together

* Do not charge no-show fee on unconfirmed bookings

* Add check to collect card method

* Webhook send request emails

* Fix some dark mode colours

* Change awaiting payment language

* Type fixes

* Set height of Select and TextField both to 38px to fix alignment

* Fix message seats & payment error message

* Type fix

---------

Co-authored-by: Alex van Andel <me@alexvanandel.com>
 2023-04-11 23:44:14 +02:00
Hariom BalharaandGitHub e465c1d71d Redirect on top iframe always - This is to make sure embed redirects on top frame (#8164) 2023-04-11 07:50:15 +05:30
sean-brydonandGitHub 4b0d22655d Feat/tokens + darkmode + theme support (#7876) 2023-04-05 18:14:46 +00:00
Hariom BalharaGitHubAlex van AndelCarinaWolli
 		e504f5cd9e Fix/send responses everywhere customInputs were being sent. (#7898) 
Co-authored-by: Alex van Andel <me@alexvanandel.com>
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
 2023-04-04 10:29:09 +05:30
Omar LópezandGitHub ddb752102f Zomars/cal 884 paid events not sending the link (#7318) 
* WIP

* Sends correct emails for paid bookings

* Update PaymentService.ts

* Update webhook.ts

* Update webhook.ts
 2023-02-24 20:57:49 -07:00
Omar LópezandGitHub 7c749299bb Enforces explicit type imports (#7158) 
* Enforces explicit type imports

* Upgrades typescript-eslint

* Upgrades eslint related dependencies

* Update config

* Sync packages mismatches

* Syncs prettier version

* Linting

* Relocks node version

* Fixes

* Locks @vitejs/plugin-react to 1.3.2

* Linting
 2023-02-16 15:39:57 -07:00
alannncandGitHub c3e7981917 Fix/bookings unintended confirmations on rejection 6975 (#7047) 
* Fixed translation message and added paymentStatus to booking page

* Fix booking confirmation with payment

* Remove previous code unnecesary
 2023-02-13 12:26:28 +00:00
alannncGitHubzomarsHariom Balhara
 		2f628a17df feat/payment-service-6438-cal-767 (#6677) 
* WIP paymentService

* Changes for payment Service

* Fix for stripe payment flow

* Remove logs/comments

* Refactored refund for stripe app

* Move stripe handlePayment to own lib

* Move stripe delete payments to paymentService

* lint fix

* Change handleRefundError as generic function

* remove log

* remove logs

* remove logs

* Return stripe default export to lib/server

* Fixing types

* Fix types

* Upgrades typescript

* Update yarn lock

* Typings

* Hotfix: ping,riverside,whereby and around not showing up in list (#6712)

* Hotfix: ping,riverside,whereby and around not showing up in list (#6712) (#6713)

* Adds deployment settings to DB (#6706)

* WIP

* Adds DeploymentTheme

* Add missing migrations

* Adds client extensions for deployment

* Cleanup

* Revert "lint fix"

This reverts commit e1a2e4a357e58e6673c47399888ae2e00d1351a6.

* Add validation

* Revert changes removed in force push

* Removing abstract class and just leaving interface implementation

* Fix types for handlePayments

* Fix payment test appStore import

* Fix stripe metadata in event type

* Move migration to separate PR

* Revert "Move migration to separate PR"

This reverts commit 48aa64e0724a522d3cc2fefaaaee5792ee9cd9e6.

* Update packages/prisma/migrations/20230125175109_remove_type_from_payment_and_add_app_relationship/migration.sql

Co-authored-by: Omar López <zomars@me.com>

---------

Co-authored-by: zomars <zomars@me.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
 2023-02-08 13:36:22 -07:00
Josh AvantandGitHub 7f65d7f3c3 Removes pay_later_instructions (#6824) 2023-02-01 09:17:11 +01:00
Jeroen ReumkensGitHubAlex van AndelOmar López
 		cfa8fd8b67 Reduce bundle size by importing single icons at a time (#6644) 
* Removed barrel import for icons to reduce bundle size.

* Fixed replacement mistakes

* Reverted unneccesary yarn.lock updates

* Added some missed Icon. import conversions

* Remove merge artifact import in @calcom/ui

* Don't import Icon in pages/[user]

* Update packages/ui/package.json

Co-authored-by: Alex van Andel <me@alexvanandel.com>
Co-authored-by: Omar López <zomars@me.com>
 2023-01-23 23:08:01 +00:00
sean-brydonandGitHub f21c4eb11e Fixing colors (#6429) 2023-01-12 16:57:43 +00:00