From 05a715a43acb841d882d584d36ec3f31a5bfce79 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Mon, 5 Jun 2023 19:52:48 +0100 Subject: [PATCH] Remove Order #distribution_set? method --- app/models/spree/order.rb | 4 ---- app/views/spree/admin/shared/_order_tabs.html.haml | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb index cd3179e5e3..ff6138e9dc 100644 --- a/app/models/spree/order.rb +++ b/app/models/spree/order.rb @@ -571,10 +571,6 @@ module Spree save! end - def distribution_set? - distributor && order_cycle - end - def shipping_tax shipment_adjustments.reload.tax.sum(:amount) end diff --git a/app/views/spree/admin/shared/_order_tabs.html.haml b/app/views/spree/admin/shared/_order_tabs.html.haml index 40cc8e323c..415c3ca861 100644 --- a/app/views/spree/admin/shared/_order_tabs.html.haml +++ b/app/views/spree/admin/shared/_order_tabs.html.haml @@ -42,7 +42,7 @@ %dd#date_complete = pretty_time(@order.completed_at) - - if @order.distribution_set? + - if @order.distributor && @order.order_cycle %nav.menu %ul - customer_details_classes = "active" if current == "Customer Details"