Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added progress bar to multiple shipping address checkout #29045

Open
wants to merge 6 commits into
base: 2.4-develop
Choose a base branch
from
Open

Added progress bar to multiple shipping address checkout #29045

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
96aef3e
Added progress bar to multiple shipping address checkout
rav-redchamps Jul 8, 2020
cd448f5
Merge branch '2.4-develop' into multiple-shipping-address-progress-bar
engcom-Golf Sep 28, 2020
88b6e0e
MFTF test coverage, fix static
Sep 29, 2020
7fb7d08
Merge branch '2.4-develop' into multiple-shipping-address-progress-bar
engcom-Golf Sep 29, 2020
35bbbce
bugs with steps quantity and progress bar location fix
engcom-Hotel Oct 5, 2020
8745e83
Merge branch '2.4-develop' into multiple-shipping-address-progress-bar
engcom-Hotel Oct 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions app/code/Magento/Multishipping/Block/Checkout/State.php
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,14 @@
* See COPYING.txt for license details.
*/

namespace Magento\Multishipping\Block\Checkout;

/**
* Multishipping checkout state
*
* @api
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Multishipping\Block\Checkout;

class State extends \Magento\Framework\View\Element\Template
{
/**
@@ -33,10 +34,25 @@ public function __construct(
}

/**
* Return multishipping steps
*
* @return array
*/
public function getSteps()
{
return $this->_multishippingState->getSteps();
}

/**
* Return multishipping steps to render
*
* @return array
*/
public function getStepsToRender(): array
{
$allSteps = $this->_multishippingState->getSteps();
array_splice($allSteps, -2);

return $allSteps;
}
}
15 changes: 15 additions & 0 deletions ...nto/Multishipping/Test/Mftf/ActionGroup/AssertMultipleAddressesProgressBarActionGroup.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="AssertMultipleAddressesProgressBarActionGroup">
<waitForPageLoad stepKey="waitForShippingInformation"/>
<seeElement selector="{{MultishippingSection.progressBar}}" stepKey="seeProgressBar"/>
</actionGroup>
</actionGroups>
1 change: 1 addition & 0 deletions ...ode/Magento/Multishipping/Test/Mftf/Section/MultishippingSection/MultishippingSection.xml
View file
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
<section name="MultishippingSection">
<element name="pageTitle" type="text" selector="//span[text()='Ship to Multiple Addresses']"/>
<element name="progressBar" type="block" selector="#checkout-progress-state"/>
<element name="checkoutWithMultipleAddresses" type="button" selector="//span[text()='Check Out with Multiple Addresses']"/>
<element name="shippingMultipleCheckout" type="button" selector=".action.multicheckout"/>
<element name="shippingAddressSelector" type="select" selector="//tr[position()={{addressPosition}}]//td[@data-th='Send To']//select" parameterized="true"/>
1 change: 1 addition & 0 deletions app/code/Magento/Multishipping/Test/Mftf/Test/StoreFrontCheckingWithMultishipmentTest.xml
View file
Original file line number Diff line number Diff line change
@@ -47,6 +47,7 @@
</actionGroup>
<actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openCart"/>
<actionGroup ref="CheckingWithMultipleAddressesActionGroup" stepKey="checkoutWithMultipleAddresses"/>
<actionGroup ref="AssertMultipleAddressesProgressBarActionGroup" stepKey="checkProgressBar"/>
<actionGroup ref="SelectMultiShippingInfoActionGroup" stepKey="checkoutWithMultipleShipping"/>
<actionGroup ref="SelectBillingInfoActionGroup" stepKey="checkoutWithPaymentMethod"/>
<actionGroup ref="ReviewOrderForMultiShipmentActionGroup" stepKey="reviewOrderForMultiShipment"/>
6 changes: 5 additions & 1 deletion app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout.xml
View file
Original file line number Diff line number Diff line change
@@ -6,5 +6,9 @@
*/
-->
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="checkout" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd" label="Multishipping Checkout" design_abstraction="custom">
<body/>
<body>
<referenceContainer name="columns.top">
<block class="Magento\Multishipping\Block\Checkout\State" name="checkout_state" template="Magento_Multishipping::checkout/state.phtml" before="-"/>
</referenceContainer>
</body>
</page>
9 changes: 5 additions & 4 deletions app/code/Magento/Multishipping/view/frontend/templates/checkout/state.phtml
View file
Original file line number Diff line number Diff line change
@@ -14,10 +14,11 @@
* @see \Magento\Multishipping\Block\Checkout\State
*/
?>
<ol class="block multicheckout progress items" id="checkout-progress-state">
<?php foreach ($block->getSteps() as $_step) : ?>
<li title="<?= $block->escapeHtmlAttr($_step->getLabel()) ?>" class="item<?= ($_step->getIsActive()) ? ' active' : '' ?>">
<ul class="block multicheckout progress items opc-progress-bar" id="checkout-progress-state">
<?php foreach ($block->getStepsToRender() as $_step): ?>
<li title="<?= $block->escapeHtmlAttr($_step->getLabel()) ?>"
class="opc-progress-bar-item item<?= ($_step->getIsActive()) ? ' _active' : '' ?>">
<span><?= $block->escapeHtml($_step->getLabel()) ?></span>
</li>
<?php endforeach; ?>
</ol>
</ul>