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

feat(dashboard,types): split damaged activity from received #8859

Merged
merged 3 commits into from
Aug 29, 2024
Merged

feat(dashboard,types): split damaged activity from received #8859

merged 3 commits into from
Aug 29, 2024

Conversation

riqwan
Copy link
Contributor

@riqwan riqwan commented Aug 28, 2024 •
edited
Loading

what:

  • split damaged activity from received
  • adds a popover to view return details
Screenshot 2024-08-28 at 23 23 10

RESOLVES CC-363

@vercel Vercel
Copy link

vercel bot commented Aug 28, 2024 •
edited
Loading

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

Name Status Preview Comments Updated (UTC)
medusa-dashboard ✅ Ready (Inspect) Visit Preview 💬 Add feedback Aug 29, 2024 1:51pm
6 Skipped Deployments
Name Status Preview Comments Updated (UTC)
api-reference ⬜️ Ignored (Inspect) Aug 29, 2024 1:51pm
api-reference-v2 ⬜️ Ignored (Inspect) Visit Preview Aug 29, 2024 1:51pm
docs-ui ⬜️ Ignored (Inspect) Visit Preview Aug 29, 2024 1:51pm
docs-v2 ⬜️ Ignored (Inspect) Visit Preview Aug 29, 2024 1:51pm
medusa-docs ⬜️ Ignored (Inspect) Visit Preview Aug 29, 2024 1:51pm
resources-docs ⬜️ Ignored (Inspect) Visit Preview Aug 29, 2024 1:51pm

@changeset-bot changeset-bot
Copy link

changeset-bot bot commented Aug 28, 2024 •
edited
Loading

⚠️ No Changeset found

Latest commit: edf7dce

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

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

@riqwan riqwan marked this pull request as ready for review August 28, 2024 21:30
@riqwan riqwan requested a review from a team as a code owner August 28, 2024 21:30
@riqwan riqwan force-pushed the feat/damaged-info branch from c4b106d to 5fbd329 Compare August 28, 2024 21:32
@riqwan riqwan requested review from fPolic and olivermrbl August 28, 2024 21:34
fPolic
fPolic approved these changes Aug 29, 2024
View reviewed changes
Copy link
Contributor

@fPolic fPolic left a comment

Choose a reason for hiding this comment

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

LGTM - nice!

...oard/src/routes/orders/order-detail/components/order-summary-section/return-info-popover.tsx Outdated
>
<div className="flex flex-col">
<Badge size="2xsmall" className="mb-2" rounded="full">
#{orderReturn.id.replace("return_", "")}
Copy link
Contributor

Choose a reason for hiding this comment

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

suggestion: can we keep the same number of characters consistent across the page so users can easily identifies the same return

...oard/src/routes/orders/order-detail/components/order-summary-section/return-info-popover.tsx Outdated
{t(`orders.returns.itemReceived`)}
</span>
{" · "}
{formatDate(orderReturn.received_at)}
Copy link
Contributor

Choose a reason for hiding this comment

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

suggestion: add fallback to "-" if for some reason this is null

packages/admin-next/dashboard/src/i18n/translations/en.json Outdated
Comment on lines 931 to 932
"damagedItemReceived": "Damaged items received",
"damagedItemsReturned": "{{quantity}}x Damaged items returned",
Copy link
Contributor

@fPolic fPolic Aug 29, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

suggestion/nit: can "Damaged" be lower first letter on L:932, it looks a bit off next to the return received line

@kodiakhq kodiakhq bot merged commit 2a6c6fe into develop Aug 29, 2024
23 checks passed
@kodiakhq kodiakhq bot deleted the feat/damaged-info branch August 29, 2024 14:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@carlos-r-l-rodrigues carlos-r-l-rodrigues carlos-r-l-rodrigues approved these changes

@fPolic fPolic fPolic approved these changes

@sradevski sradevski Awaiting requested review from sradevski sradevski is a code owner automatically assigned from medusajs/engineering

@christiananese christiananese Awaiting requested review from christiananese christiananese is a code owner automatically assigned from medusajs/engineering

@adrien2p adrien2p Awaiting requested review from adrien2p adrien2p is a code owner automatically assigned from medusajs/engineering

@olivermrbl olivermrbl Awaiting requested review from olivermrbl

Assignees
No one assigned
Labels
automerge team: medusa type: feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@riqwan @fPolic @carlos-r-l-rodrigues