Merge branch 'dev' into prod

UofT-Frosh-Orientation · Jul 5, 2024 · dd6372e · dd6372e
2 parents 6391975 + 3db3566
commit dd6372e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/client/src/pages/Profile/PageProfileFrosh.jsx b/client/src/pages/Profile/PageProfileFrosh.jsx
@@ -54,7 +54,7 @@ const PageProfileFrosh = () => {
       <div className="profile-info-row">
         <div className="profile-info-row-right">
           {user?.attendingScunt === true ? <ProfilePageFroshScuntMessage /> : null}
-          {isRegistered ? <ProfilePageRetreat /> : null}
+          {isRegistered ? /*<ProfilePageRetreat />*/ null : null}
           {/* <ProfilePageNitelife /> */}
           <ProfilePageInstagrams />
           <ProfilePageAnnouncements />

diff --git a/server/src/services/PaymentServices.js b/server/src/services/PaymentServices.js
@@ -124,6 +124,11 @@ const PaymentServices = {
           quantity: 1,
         },
       ],
+      discounts: [
+        {
+          coupon: 'MSH2gI9n',
+        },
+      ],
       mode: 'payment',
       success_url: `${process.env.CLIENT_BASE_URL}${
         products[type]?.relativeUrlSuccess ?? products['orientation'].relativeUrlSuccess