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

Jump to bottom

Added Reschedule missing or cancelled pickup #238

Merged
merged 2 commits into from
Apr 27, 2024
Merged

Added Reschedule missing or cancelled pickup #238

merged 2 commits into from
Apr 27, 2024

Conversation

WishingWell13
Copy link
Contributor

@WishingWell13 WishingWell13 commented Apr 25, 2024 •
edited
Loading

Sorted pickup events by date

Allow you to reschedule pickup events (and tag properly updates without refresh)

Difference between Pickup Cancelled and Cancelled

Info

Closes [#240].

[description]

Changes

  • Added buttons for rescheduling on the user order summary page if the user missed a pickup event, or if the pickup event was cancelled
  • Also sorted pickup events by date

Type of Change

  • Bug Fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as
    expected)
  • Logistics Change (A change to a README, description, or dev workflow setup like
    linting/formatting)
  • Continuous Integration Change (Related to deployment steps or continuous integration
    workflows)
  • Other: (Fill In)

Testing

I have tested that my changes fully resolve the linked issue ...

  • locally on Desktop.
  • on the live deployment preview on Desktop.
  • on the live deployment preview on Mobile.
  • I have added new Cypress tests that are passing.

Checklist

  • I have performed a self-review of my own code.
  • I have followed the style guidelines of this project.
  • I have documented any new functions in /src/lib/* and commented hard to understand areas
    anywhere else.
  • My changes produce no new warnings.

Screenshots

@WishingWell13
Added Reschedule missing or cancelled pickup
b63a0cc 
Sorted events by status

Allow you to reschedule pickup events (and tag properly updates without refresh)

Difference between Pickup Cancelled and Cancelled
@vercel Vercel
Copy link

vercel bot commented Apr 25, 2024 •
edited
Loading

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

Name Status Preview Comments Updated (UTC)
membership-portal-ui-v2 ✅ Ready (Inspect) Visit Preview 💬 Add feedback Apr 27, 2024 6:48am
testing-membership-portal-ui-v2 ✅ Ready (Inspect) Visit Preview 💬 Add feedback Apr 27, 2024 6:48am

alexzhang1618
alexzhang1618 approved these changes Apr 27, 2024
View reviewed changes
Copy link
Contributor

@alexzhang1618 alexzhang1618 left a comment

Choose a reason for hiding this comment

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

just one nit else lgtm if functionality is bueno

src/components/store/OrderCard/index.tsx Outdated Show resolved Hide resolved
@WishingWell13 WishingWell13 merged commit d26e370 into main Apr 27, 2024
8 checks passed
@WishingWell13 WishingWell13 deleted the andy/reschedule-user-missed-cancelled branch April 27, 2024 06:48
WishingWell13 added a commit that referenced this pull request Apr 27, 2024
@WishingWell13
Revert "Added Reschedule missing or cancelled pickup (#238)"
7b84cd7 
This reverts commit d26e370.
@WishingWell13 WishingWell13 linked an issue Apr 30, 2024 that may be closed by this pull request
Fix Pickup Event Reschedule Logic #231
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexzhang1618 alexzhang1618 alexzhang1618 approved these changes

@farisashai farisashai Awaiting requested review from farisashai farisashai is a code owner

@raymosun raymosun Awaiting requested review from raymosun raymosun is a code owner

@trevorkw7 trevorkw7 Awaiting requested review from trevorkw7 trevorkw7 is a code owner

@SheepTester SheepTester Awaiting requested review from SheepTester SheepTester is a code owner

Assignees

@WishingWell13 WishingWell13

Labels
PR: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Fix Pickup Event Reschedule Logic
2 participants
@WishingWell13 @alexzhang1618