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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(admin-ui): Rename allocation to reservation #4133

Merged
merged 7 commits into from
Jun 5, 2023

Conversation

pKorsholm
Copy link
Contributor

@pKorsholm pKorsholm commented May 19, 2023

Fixes CORE-1380

@changeset-bot
Copy link

changeset-bot bot commented May 19, 2023

🦋 Changeset detected

Latest commit: 376537f

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 2 packages
Name Type
@medusajs/admin-ui Patch
@medusajs/admin Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel
Copy link

vercel bot commented May 19, 2023

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

1 Ignored Deployment
Name Status Preview Comments Updated (UTC)
medusa-docs ⬜️ Ignored (Inspect) Visit Preview Jun 5, 2023 2:08pm

@pKorsholm pKorsholm changed the title Feat/rename allocation to discount Feat(admin-ui): Rename allocation to discount May 19, 2023
@olivermrbl olivermrbl changed the title Feat(admin-ui): Rename allocation to discount feat(admin-ui): Rename allocation to reservation May 22, 2023
@pKorsholm pKorsholm force-pushed the feat/rename-allocation-to-discount branch from aa6c92d to 3ace14a Compare May 24, 2023 12:04
@pKorsholm pKorsholm marked this pull request as ready for review May 24, 2023 17:23
@pKorsholm pKorsholm requested a review from a team as a code owner May 24, 2023 17:23
Copy link
Contributor

@olivermrbl olivermrbl left a comment

Choose a reason for hiding this comment

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

LGTM with a comment 💪

variant={allItemsReserved ? "success" : "danger"}
title={allItemsReserved ? "Allocated" : "Awaits allocation"}
title={allItemsReserved ? "Allocated" : "Not fully reserved"}
Copy link
Contributor

Choose a reason for hiding this comment

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

comment: Think we can keep the allocation notion here to have consistent wording in the two possible states:
Not fully allocated / Partially allocated

}
variant={allItemsReserved || !isAllocatable ? "success" : "danger"}
title={
allItemsReserved || !isAllocatable
? "Allocated"
: "Awaits allocation"
: "Not fully reserved"
Copy link
Contributor

Choose a reason for hiding this comment

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

comment: See other comment

@olivermrbl
Copy link
Contributor

Feel free to merge after addressing the comments @pKorsholm :)

@pKorsholm pKorsholm merged commit 869628b into develop Jun 5, 2023
@github-actions github-actions bot mentioned this pull request Jun 5, 2023
olivermrbl pushed a commit that referenced this pull request Jun 14, 2023
* rename allocation -> reservation

* add changeset

* edit-reservation modal

* rename
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants