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

🌸 Marketplace: Group Delivery Window and Address #1705

Merged
merged 1 commit into from
Jul 26, 2023
Merged

🌸 Marketplace: Group Delivery Window and Address #1705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions app/furniture/marketplace/cart/deliveries/_delivery.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
<div id="<%=dom_id(delivery) %>" class="flex flex-wrap items-center justify-between text-sm mt-1 sm:mt-2">
<span>
<p class="text-left px-2 sm:px-4 py-2 text-sm">
<span class="font-bold">Delivery Time:</span>
<%= render(Marketplace::Cart::DeliveryExpectationsComponent.new(cart: delivery.cart)) %>
</p>
<% if delivery.details_filled_in? || delivery.delivery_area.present? %>
<span class="font-bold">Delivering to:</span>
<%= delivery.delivery_address if delivery.delivery_address.present? %>
<%= render(delivery.delivery_area) if delivery.delivery_area.present? %>
<p class="text-left px-2 sm:px-4 py-2 text-sm">
<span class="font-bold">Delivering to:</span>
<%= delivery.delivery_address if delivery.delivery_address.present? %>
<%= render(delivery.delivery_area) if delivery.delivery_area.present? %>
Comment on lines +10 to +11
Copy link
Contributor

Choose a reason for hiding this comment

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

FYI @KellyAH and I discussed this becoming a small DeliveryWindowComponent.

</p>
<% end %>
</span>

Expand Down
4 changes: 0 additions & 4 deletions app/furniture/marketplace/carts/_cart.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,4 @@
<%= render "marketplace/carts/footer", cart: cart %>
</table>
</div>

<p class="text-right px-2 sm:px-4 py-2 text-sm">
<%= render(Marketplace::Cart::DeliveryExpectationsComponent.new(cart: cart)) %>
</p>
</div>