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.

Sign up for GitHub

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

PhonePe upi payments integrated. #114

Merged
merged 4 commits into from
Dec 5, 2023
Merged

PhonePe upi payments integrated. #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3653032
upi paymentsintegrated
sam5102 Nov 23, 2023
2f2f746
Merge branch 'main' into react-upi-integration
sam5102 Nov 24, 2023
fd1aa6c
number input scrolling fixed
sam5102 Nov 28, 2023
0cce92d
Merge branch 'main' into react-upi-integration
sam5102 Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions react-fm/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions react-fm/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"recoil": "^0.7.5"
},
"devDependencies": {
"@iconify/react": "^4.1.1",
"@trivago/prettier-plugin-sort-imports": "^3.3.0",
"@types/lodash": "^4.14.197",
"@types/node": "^18.7.21",
Expand Down
4 changes: 3 additions & 1 deletion react-fm/src/pages/matchQueues/Queue.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,8 @@ function MatchQueue() {
stripePaymentUrl={playingEvent.stripePaymentUrl}
charges={0}
date={''}
eventId={''}
uniqueEventId={playingEvent.uniqueEventId}
eventId={playingEvent.eventId}
reservedPlayersCount={playingEvent.reservedPlayersCount}
reservedPlayersList={playingEvent.reservedPlayersList}
time={''}
Expand All @@ -166,6 +167,7 @@ function MatchQueue() {

{/*Event Details*/}
<EventsCard
uniqueEventId={playingEvent.uniqueEventId}
charges={playingEvent.charges}
date={playingEvent.date}
time={playingEvent.time}
Expand Down
1 change: 1 addition & 0 deletions react-fm/src/pages/matchQueues/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const query = JSON.stringify({
cityId
cityName
events {
uniqueEventId
eventId
date
time
Expand Down
4 changes: 4 additions & 0 deletions react-fm/src/pages/matchQueues/data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const dummyData = {
dummyData: false,
events: [
{
uniqueEventId: '07-28-1-1-6',
eventId: '07-28-1',
date: 'Sun, Jan 01',
time: '8:00PM-9:00PM',
Expand Down Expand Up @@ -76,6 +77,7 @@ const dummyData = {
stripePaymentUrl: '',
},
{
uniqueEventId: '07-28-1-1-6',
eventId: '07-28-2',
date: 'Sun, Jan 01',
time: '9:00PM-10:00PM',
Expand Down Expand Up @@ -143,6 +145,7 @@ const dummyData = {
dummyData: false,
events: [
{
uniqueEventId: '07-28-1-1-6',
eventId: '07-28-1',
date: 'Sun, Jan 01',
time: '7:00PM-8:00PM',
Expand Down Expand Up @@ -222,6 +225,7 @@ const dummyData = {
stripePaymentUrl: '',
},
{
uniqueEventId: '07-28-1-1-6',
eventId: '07-28-2',
date: 'Sun, Jan 01',
time: '8:00PM-9:00PM',
Expand Down
48 changes: 48 additions & 0 deletions react-fm/src/pages/matchQueues/eventsComponents/Events.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
input[type='number']::-webkit-inner-spin-button,
input[type='number']::-webkit-outer-spin-button {
-webkit-appearance: none;
margin: 0;
}

input:-webkit-autofill,
input:-webkit-autofill:hover,
input:-webkit-autofill:focus,
input:-webkit-autofill:active {
-webkit-box-shadow: 0 0 0 30px #3d3d3d inset !important;
-webkit-text-fill-color: #fff;
}

.eventSchedule {
margin-top: 25px;
color: #fff;
Expand Down Expand Up @@ -64,3 +78,37 @@
.lock:hover {
color: #4ce95a;
}

.payViaUpi {
margin-right: 10px !important;
}

.payViaCard {
margin-left: 10px !important;
}

.paymentOptions {
width: 25%;
justify-content: space-between;
position: relative;
}

.paymentOptionsPortrait {
width: 100%;
justify-content: space-between;
position: relative;
}

.cancel,
.pay {
color: #606264;
}

.cancel:hover,
.pay:hover {
color: #fff;
}

label {
color: #fff !important;
}
4 changes: 3 additions & 1 deletion react-fm/src/pages/matchQueues/eventsComponents/Events.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export const EventsCard: FC<EventDetails> = ({
charges,
date,
time,
uniqueEventId,
eventId,
venueName,
venueLocationLink,
Expand Down Expand Up @@ -157,7 +158,8 @@ export const EventsCard: FC<EventDetails> = ({
stripePaymentUrl={stripePaymentUrl}
charges={0}
date={''}
eventId={''}
uniqueEventId={uniqueEventId}
eventId={eventId}
reservedPlayersCount={reservedPlayersCount}
reservedPlayersList={reservedPlayersList}
time={''}
Expand Down
Loading