🌸 Marketplace: Group Delivery Window and Address (#1705)

display DeliveryExpectations above deliveryAddress
zinc-collective · Jul 26, 2023 · 4a82eb0 · 4a82eb0
1 parent e713812
commit 4a82eb0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/app/furniture/marketplace/cart/deliveries/_delivery.html.erb b/app/furniture/marketplace/cart/deliveries/_delivery.html.erb
@@ -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? %>
+        </p>
       <% end %>
     </span>
 

diff --git a/app/furniture/marketplace/carts/_cart.html.erb b/app/furniture/marketplace/carts/_cart.html.erb
@@ -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>