raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

On summary page, display shipping address as well as billing one

Browse Source
This commit is contained in:
Jean-Baptiste Bellet
2021-08-25 16:31:45 +02:00
parent 642e822e0e
commit b5024c5a16
3 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
app/views/split_checkout/_summary.html.haml
View File

@@ -30,43 +30,12 @@
%div.checkout-substep
%div.checkout-title
= t("split_checkout.step3.billing_address.title")
%div.summary
%span.summary-label
= t("split_checkout.step1.address.address1.label")
%span.summary-value
= @order.bill_address.address1
- unless @order.bill_address.address2.blank?
%div.summary
%span.summary-label
= t("split_checkout.step1.address.address2.label")
%span.summary-value
= @order.bill_address.address2
= render "summary_address", address: @order.bill_address
%div.summary
%span.summary-label
= t("split_checkout.step1.address.city.label")
%span.summary-value
= @order.bill_address.city
%div.summary
%span.summary-label
= t("split_checkout.step1.address.state_id.label")
%span.summary-value
= @order.bill_address.state
%div.summary
%span.summary-label
= t("split_checkout.step1.address.zipcode.label")
%span.summary-value
= @order.bill_address.zipcode
%div.summary
%span.summary-label
= t("split_checkout.step1.billing_address.country.label")
%span.summary-value
= @order.bill_address.country
%div.checkout-substep
%div.checkout-title
= t("split_checkout.step3.shipping_address.title")
= render "summary_address", address: @order.shipping_address
%div.checkout-substep
%div.checkout-title

36
app/views/split_checkout/_summary_address.html.haml Normal file
View File

@@ -0,0 +1,36 @@
%div.summary
%span.summary-label
= t("split_checkout.step1.address.address1.label")
%span.summary-value
= address.address1
- unless @order.bill_address.address2.blank?
%div.summary
%span.summary-label
= t("split_checkout.step1.address.address2.label")
%span.summary-value
= address.address2
%div.summary
%span.summary-label
= t("split_checkout.step1.address.city.label")
%span.summary-value
= address.city
%div.summary
%span.summary-label
= t("split_checkout.step1.address.state_id.label")
%span.summary-value
= address.state
%div.summary
%span.summary-label
= t("split_checkout.step1.address.zipcode.label")
%span.summary-value
= address.zipcode
%div.summary
%span.summary-label
= t("split_checkout.step1.billing_address.country.label")
%span.summary-value
= address.country

2
config/locales/en.yml
View File

@@ -1676,6 +1676,8 @@ en:
edit: Edit your details
billing_address:
title: Billing address
shipping_address:
title: Shipping address
delivery_info:
title: Delivery info
payment_method: