mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-02-27 01:43:22 +00:00
Fix 'Ship Order': requested changes
- deletes local variables in view - factor logic in helper
This commit is contained in:
committed by
Sigmund Petersen
parent
901c29c97b
commit
ba68f4b252
@@ -34,6 +34,10 @@ module Spree
|
||||
links
|
||||
end
|
||||
|
||||
def order_shipment_ready?(order)
|
||||
order.ready_to_ship?
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def complete_order_links(order)
|
||||
|
||||
@@ -6,10 +6,8 @@
|
||||
%i.icon-check
|
||||
= I18n.t 'admin.actions'
|
||||
%div.menu{"data-action": "click->dropdown#closeOnMenu"}
|
||||
- shipment_ready = false
|
||||
- order_links(@order).each do |link|
|
||||
- if link[:name] == t(:ship_order)
|
||||
- shipment_ready = true
|
||||
%a.menu_item{ href: link[:url], target: link[:target] || "_self", data: { "modal-link-target-value": dom_id(@order, :ship), "action": "click->modal-link#open", "controller": "modal-link" } }
|
||||
%span
|
||||
%i{ class: link[:icon] }
|
||||
@@ -21,6 +19,6 @@
|
||||
%span=link[:name]
|
||||
|
||||
= render 'spree/admin/shared/custom-confirm'
|
||||
- if shipment_ready
|
||||
- if order_shipment_ready?(@order)
|
||||
%form
|
||||
= render ShipOrderComponent.new(order: @order)
|
||||
|
||||
Reference in New Issue
Block a user