🌸🥗🥔✨ Marketplace: Orders expose their Events
#1712
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
f4a9de2 to
edc109f
Compare
- #1710 Next steps: - Tidy the UI! It gross - Add Specs! It needs them! - ???
6bbf68b to
920f716
Compare
Marketplace: Orders expose their EventsMarketplace: Orders expose their Events
zspencer
commented
Aug 10, 2023
| @@ -1,6 +1,6 @@ | |||
| class Marketplace | |||
| class OrdersController < Controller | |||
| expose :order, scope: -> { orders }, model: Order | |||
| expose :order, scope: -> { orders.includes(:events, ordered_products: [:products]) }, model: Order | |||
There was a problem hiding this comment.
I am writing N+1 queries 😢. This gets rid of them.
- #1331 Adds a UI for exposing `Events` recorded for an `Order`. This is visible to everyone who can see the `Order`, which may be a bit of an over-exposure; but hey! The Pizza Tracker exists and people love that so maybe it's not TMI!
920f716 to
727fa04
Compare
daltonrpruitt
approved these changes
Aug 10, 2023
zspencer
commented
Aug 10, 2023
| @@ -26,4 +26,18 @@ | |||
| <hr class="col-span-6 mb-2" /> | |||
| <div class="col-span-4">Total</div> | |||
| <div class="col-span-2 text-right"><%= humanized_money_with_symbol(order.price_total) %></div> | |||
|
|
|||
| <%- if policy(order.events).index? %> | |||
There was a problem hiding this comment.
Because the user is already authorized at the Order level?
There was a problem hiding this comment.
More that Policy#index? returns "true" by default, so it feels kind of extraneous....
| @@ -1,6 +1,6 @@ | |||
| class Marketplace | |||
| class OrdersController < Controller | |||
| expose :order, scope: -> { orders }, model: Order | |||
| expose :order, scope: -> { orders.includes(:events, ordered_products: [:product]) }, model: Order | |||
There was a problem hiding this comment.
Lilliputian Zee would do events independently as part of this PR, and then the ordered_products after; but Gulliver Zee is just stomp stomp stomping on the orders
rosschapman
reviewed
Aug 15, 2023
| <hr class="col-span-6 my-4" /> | ||
| <div class="col-span-6 text-xs"> | ||
|
|
||
| <h3 class="mb-2 text-sm font-bold">Events</h3> |
There was a problem hiding this comment.
Is "Events" a friendly term? What about "Timeline"?
zspencer
added a commit
that referenced
this pull request
Aug 16, 2023
- #1331 - #1712 (comment) While either `History` or `Timeline` are way better than `Events`; `Timeline` felt better than `History`; since `Order History` feels like the history of all `Orders`; and `Order Timeline` feels like the `Timeline` for a single `Order`.
zspencer
added a commit
that referenced
this pull request
Aug 16, 2023
- #1331 - #1712 (comment) While either `History` or `Timeline` are way better than `Events`; `Timeline` felt better than `History`; since `Order History` feels like the history of all `Orders`; and `Order Timeline` feels like the `Timeline` for a single `Order`.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Marketplace:OrderNotifications andTimeline#1331Next steps:
After?