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

Feature: admin shop orders #221

Merged
merged 16 commits into from
Sep 17, 2024
Merged

Feature: admin shop orders #221

merged 16 commits into from
Sep 17, 2024

Conversation

bridgitkanini
Copy link
Collaborator

@bridgitkanini bridgitkanini commented Jul 30, 2024

Feature: admin shop orders

  • Bug fix
  • New feature

Proposed changes

Closes #200

  • Implemented the Figma designs for Orders Page and Invoice
  • Page is mobile responsive

@bridgitkanini bridgitkanini requested a review from sonylomo July 30, 2024 15:11
Copy link

vercel bot commented Jul 30, 2024

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

Name Status Preview Comments Updated (UTC)
syt-web-redesign ✅ Ready (Inspect) Visit Preview 💬 Add feedback Sep 17, 2024 3:58pm

@JimmyTron
Copy link
Member

image

@sonylomo how should the conflict in the pnpm-lock.yaml be handled 😎

@JimmyTron JimmyTron changed the title Feature/admin shop orders Feature: admin shop orders Jul 31, 2024
@JimmyTron JimmyTron enabled auto-merge (squash) July 31, 2024 08:42
Copy link
Member

@JimmyTron JimmyTron left a comment

Choose a reason for hiding this comment

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

Sort the merge conflicts then merge

sonylomo
sonylomo previously approved these changes Aug 6, 2024
Copy link
Collaborator

@sonylomo sonylomo left a comment

Choose a reason for hiding this comment

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

LGTM 👏🏾

sonylomo
sonylomo previously approved these changes Aug 6, 2024
@sonylomo sonylomo requested a review from JimmyTron August 6, 2024 10:12
sonylomo
sonylomo previously approved these changes Aug 8, 2024
Ase020
Ase020 previously approved these changes Sep 17, 2024
@sonylomo sonylomo dismissed JimmyTron’s stale review September 17, 2024 16:08

Merge has been sorted out

@JimmyTron JimmyTron merged commit 1c002a4 into Dev Sep 17, 2024
4 checks passed
@JimmyTron JimmyTron deleted the feature/admin-shop-orders branch September 17, 2024 16:08
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.

Admin Shop Pages: Orders Report
4 participants