mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-02-27 01:43:22 +00:00
Add step 3
This commit is contained in:
committed by
Matt-Yorkley
parent
4c81f0f27b
commit
b66b1fcdae
3
app/assets/images/edit-with-pen.svg
Normal file
3
app/assets/images/edit-with-pen.svg
Normal file
@@ -0,0 +1,3 @@
|
||||
<svg viewBox="0 0 13 13" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M9.08646 2.11037L11.1222 4.40105C11.208 4.49756 11.208 4.65501 11.1222 4.75151L6.19306 10.2979L4.09861 10.5595C3.81875 10.595 3.58177 10.3284 3.61337 10.0135L3.84583 7.65677L8.775 2.11037C8.86076 2.01387 9.00069 2.01387 9.08646 2.11037ZM12.7427 1.52881L11.6413 0.28951C11.2983 -0.0965032 10.7408 -0.0965032 10.3955 0.28951L9.59653 1.18851C9.51076 1.28502 9.51076 1.44247 9.59653 1.53897L11.6323 3.82965C11.7181 3.92616 11.858 3.92616 11.9438 3.82965L12.7427 2.93065C13.0858 2.5421 13.0858 1.91483 12.7427 1.52881ZM8.66667 8.78941V11.3747H1.44444V3.2481H6.6309C6.70312 3.2481 6.77083 3.21508 6.82274 3.15921L7.72552 2.14339C7.89705 1.95038 7.77517 1.62278 7.53368 1.62278H1.08333C0.485243 1.62278 0 2.16878 0 2.84177V11.781C0 12.454 0.485243 13 1.08333 13H9.02778C9.62587 13 10.1111 12.454 10.1111 11.781V7.77359C10.1111 7.50186 9.81997 7.36726 9.64844 7.55773L8.74566 8.57355C8.69601 8.63196 8.66667 8.70815 8.66667 8.78941Z" fill="#4CB5C5"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.0 KiB |
@@ -113,6 +113,11 @@
|
||||
white-space: pre-wrap;
|
||||
}
|
||||
}
|
||||
|
||||
a {
|
||||
color: $teal-400;
|
||||
text-decoration: underline;
|
||||
}
|
||||
}
|
||||
|
||||
.checkout-submit {
|
||||
@@ -134,3 +139,34 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.summary {
|
||||
margin-bottom: 2px;
|
||||
font-size: 0.875rem;
|
||||
|
||||
.summary-label {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.summary-value {
|
||||
|
||||
}
|
||||
|
||||
.summary-edit {
|
||||
color: $teal-400;
|
||||
text-decoration: underline;
|
||||
display: block;
|
||||
margin-top: 5px;
|
||||
&:after {
|
||||
background-image: image-url("edit-with-pen.svg");
|
||||
content: " ";
|
||||
display: inline-block;
|
||||
width: 1em;
|
||||
height: 1em;
|
||||
margin-left: 5px;
|
||||
line-height: 1em;
|
||||
position: relative;
|
||||
top: 2px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -32,6 +32,7 @@ class SplitCheckoutController < ::BaseController
|
||||
before_action :enable_embedded_shopfront
|
||||
|
||||
helper 'spree/orders'
|
||||
helper OrderHelper
|
||||
|
||||
def edit
|
||||
return handle_redirect_from_stripe if valid_payment_intent_provided?
|
||||
|
||||
115
app/views/split_checkout/_summary.html.haml
Normal file
115
app/views/split_checkout/_summary.html.haml
Normal file
@@ -0,0 +1,115 @@
|
||||
%div.checkout-substep
|
||||
%div.checkout-title
|
||||
= t("split_checkout.step3.your_details.title")
|
||||
|
||||
%div.summary
|
||||
%span.summary-label
|
||||
= t("split_checkout.step1.your_details.first_name.label")
|
||||
%span.summary-value
|
||||
= @order.bill_address.firstname
|
||||
|
||||
%div.summary
|
||||
%span.summary-label
|
||||
= t("split_checkout.step1.your_details.last_name.label")
|
||||
%span.summary-value
|
||||
= @order.bill_address.lastname
|
||||
|
||||
%div.summary
|
||||
%span.summary-label
|
||||
= t("split_checkout.step1.your_details.email.label")
|
||||
%span.summary-value
|
||||
= @order.user.email
|
||||
|
||||
%div.summary
|
||||
%span.summary-label
|
||||
= t("split_checkout.step1.your_details.phone.label")
|
||||
%span.summary-value
|
||||
= @order.bill_address.phone
|
||||
|
||||
%div.checkout-substep
|
||||
%div.checkout-title
|
||||
= t("split_checkout.step3.billing_address.title")
|
||||
|
||||
%div.summary
|
||||
%span.summary-label
|
||||
= t("split_checkout.step1.billing_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.billing_address.address2.label")
|
||||
%span.summary-value
|
||||
= @order.bill_address.address2
|
||||
|
||||
%div.summary
|
||||
%span.summary-label
|
||||
= t("split_checkout.step1.billing_address.city.label")
|
||||
%span.summary-value
|
||||
= @order.bill_address.city
|
||||
|
||||
%div.summary
|
||||
%span.summary-label
|
||||
= t("split_checkout.step1.billing_address.state_id.label")
|
||||
%span.summary-value
|
||||
= @order.bill_address.state
|
||||
|
||||
%div.summary
|
||||
%span.summary-label
|
||||
= t("split_checkout.step1.billing_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.delivery_info.title")
|
||||
|
||||
%div.summary
|
||||
%span.summary-label
|
||||
= t("split_checkout.step1.delivery_address.title")
|
||||
%span.summary-value
|
||||
= @order.shipping_method.name
|
||||
%div
|
||||
= @order.shipping_method.description
|
||||
|
||||
%a.summary-edit{href: main_app.checkout_step_path(:details)}
|
||||
= t("split_checkout.step3.your_details.edit")
|
||||
|
||||
%div.checkout-substep
|
||||
%div.checkout-title
|
||||
= t("split_checkout.step3.payment_method.title")
|
||||
|
||||
%div.summary
|
||||
%span.summary-value
|
||||
= last_payment_method(@order)&.name
|
||||
%p.text-small.text-skinny.pre-line
|
||||
%em= last_payment_method(@order)&.description
|
||||
%a.summary-edit{href: main_app.checkout_step_path(:payment)}
|
||||
= t("split_checkout.step3.payment_method.edit")
|
||||
|
||||
|
||||
%div.checkout-substep
|
||||
%div.checkout-title
|
||||
= t("split_checkout.step3.order.title")
|
||||
|
||||
= render 'spree/orders/summary', order: @order
|
||||
|
||||
%div.checkout-substep
|
||||
%div.checkout-input
|
||||
= f.check_box :accept_terms, {id: 'accept_terms', "checked": "#{all_terms_and_conditions_already_accepted?}"}
|
||||
= f.label :accept_terms, t('split_checkout.step3.terms_and_conditions.message_html', terms_and_conditions_link: link_to( t("split_checkout.step3.terms_and_conditions.link_text"), @order.distributor.terms_and_conditions.url, target: '_blank'), tos_link: link_to_platform_terms), {for: "accept_terms"}
|
||||
|
||||
%div.checkout-input
|
||||
= t("split_checkout.step3.agree")
|
||||
|
||||
%div.checkout-submit
|
||||
= f.submit t("split_checkout.step3.submit"), class: "button primary", disabled: @terms_and_conditions_accepted == false || @platform_tos_accepted == false
|
||||
%a.button.cancel{href: main_app.cart_path}
|
||||
= t("split_checkout.step3.cancel")
|
||||
@@ -1667,6 +1667,25 @@ en:
|
||||
explaination: You can review and confirm your order in the next step which includes the final costs.
|
||||
submit: Next - Order summary
|
||||
cancel: Back to Your details
|
||||
step3:
|
||||
your_details:
|
||||
title: Your details
|
||||
edit: Edit your details
|
||||
billing_address:
|
||||
title: Billing address
|
||||
delivery_info:
|
||||
title: Delivery info
|
||||
payment_method:
|
||||
title: Payment method
|
||||
edit: Edit payment method
|
||||
order:
|
||||
title: Order total
|
||||
terms_and_conditions:
|
||||
message_html: "I agree to the seller's %{terms_and_conditions_link}."
|
||||
link_text: "Terms and Conditions"
|
||||
agree: By clickin 'Complete order' you agree to your order being processed.
|
||||
submit: Complete order
|
||||
cancel: Back to Payment method
|
||||
errors:
|
||||
required: Field cannot be blank
|
||||
invalid_number: "Please enter a valid phone number"
|
||||
|
||||
Reference in New Issue
Block a user