From 07b2f0a7c248749e32cce56ac93eb899a1ed6119 Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Fri, 28 Apr 2017 15:44:41 +1000 Subject: [PATCH] Showing banner for distributor of order on order summary, regardless of current_distributor --- app/views/shopping_shared/_details.html.haml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/app/views/shopping_shared/_details.html.haml b/app/views/shopping_shared/_details.html.haml index d060c130ca..ec73b2f5af 100644 --- a/app/views/shopping_shared/_details.html.haml +++ b/app/views/shopping_shared/_details.html.haml @@ -1,14 +1,18 @@ +- distributor = @order.andand.distributor || current_distributor + %navigation %distributor.details.row .small-12.medium-6.large-6.columns #distributor_title - - if current_distributor.logo? - %img.left{src: current_distributor.logo.url(:thumb)} + - if distributor.logo? + %img.left{src: distributor.logo.url(:thumb)} %h3 - = current_distributor.name - %location= current_distributor.address.city + = distributor.name + %location= distributor.address.city / Will this needs to be a drop-down to choose either pick-up point or delivery once shipping methods are implemented + .small-12.medium-6.large-6.columns = render partial: "shopping_shared/order_cycles" -= render partial: "shopping_shared/tabs" + += render partial: "shopping_shared/tabs" if distributor == current_distributor