mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-02-04 22:16:08 +00:00
3437257515
Fixes issue #3063 "Repeated translation in Order Confirmation Screen and Email". Now "Ready for" (collection time) is not repeated in place of "Collection details" (collection instructions)
56 lines
1.6 KiB
Plaintext
56 lines
1.6 KiB
Plaintext
- if @order.shipping_method.andand.delivery?
|
|
/ Delivery details
|
|
%p.callout
|
|
%strong
|
|
- if @order.shipping_method.andand.name
|
|
#{@order.shipping_method.name.html_safe}
|
|
- else
|
|
= t :email_shipping_delivery_details
|
|
|
|
- if @order.order_cycle.andand.pickup_time_for(@order.distributor)
|
|
%h4
|
|
= t :email_shipping_delivery_time
|
|
%strong #{@order.order_cycle.pickup_time_for(@order.distributor)}
|
|
- if @order.shipping_method.andand.description
|
|
%p
|
|
%em #{@order.shipping_method.description.html_safe}
|
|
%br
|
|
|
|
- if @order.ship_address
|
|
%h4
|
|
= t :email_shipping_delivery_address
|
|
%p
|
|
#{@order.ship_address.full_name}
|
|
%br
|
|
#{@order.ship_address.full_address}
|
|
%br
|
|
#{@order.ship_address.phone}
|
|
%br
|
|
|
|
|
|
- else
|
|
/ Collection details
|
|
%p.callout
|
|
%strong
|
|
- if @order.shipping_method.andand.name
|
|
#{@order.shipping_method.name.html_safe}
|
|
- else
|
|
= t :email_shipping_collection_details
|
|
|
|
- if @order.order_cycle.andand.pickup_time_for(@order.distributor).present?
|
|
%h4
|
|
= t :email_shipping_collection_time
|
|
%strong #{@order.order_cycle.pickup_time_for(@order.distributor)}
|
|
|
|
- if @order.shipping_method.andand.description.present?
|
|
%p
|
|
%em #{@order.shipping_method.description.html_safe}
|
|
%br
|
|
|
|
- if @order.order_cycle.andand.pickup_instructions_for(@order.distributor).present?
|
|
%p
|
|
%strong
|
|
= t :email_shipping_collection_instructions
|
|
%br
|
|
#{@order.order_cycle.pickup_instructions_for(@order.distributor)}
|