CC-31773 Fixed issue with missing shipment price on Order Details page.

src/Pyz/Yves/CheckoutPage/Theme/default/components/molecules/summary-sidebar/summary-sidebar.twig

@@ -5,13 +5,15 @@
 } %}
 
 {% define data = {
-    shipment: required,
+    shipmentGroup: required,
+    shipmentExpenses: required,
     isGiftCardExists: false,
     canEdit: false,
 } %}
 
 {% block body %}
-    {% set shippingAddress = data.shipment.shippingAddress %}
+    {% set shipment = data.shipmentGroup.shipment %}
+    {% set shippingAddress = shipment.shippingAddress %}
     {% set fullShippingAddress = shippingAddress.salutation ~ ' ' ~ shippingAddress.firstName ~ ' ' ~
         shippingAddress.lastName ~ ', ' ~ shippingAddress.address1 ~ ' ' ~ shippingAddress.address2 ~ ', ' ~
         shippingAddress.zipCode ~ ' ' ~ shippingAddress.city %}
@@ -28,20 +30,14 @@
     {% if not data.isGiftCardExists %}
         <div class="{{ config.name }}__item">
             <h4 class="title title--secondary-small">{{ 'checkout.step.summary.delivery_method' | trans }}</h4>
-            <h4 class="title title--secondary-small spacing-bottom grid grid--justify grid--middle">
-                <span class="col col--sm-7">{{ data.shipment.method.carrierName | trans }}</span>
-                <span class="col">
-                    {% set deliveryLogoName =  data.shipment.method.carrierName | replace({' ': ''}) | lower ~ '-logo' %}
-                    {% include atom('icon') with {
-                        class: 'col',
-                        modifiers: [deliveryLogoName],
-                        data: {
-                            name: deliveryLogoName,
-                        },
-                    } only %}
-                </span>
-            </h4>
-            <div class="{{ config.name }}__text">{{ data.shipment.method.name }}: {{ data.shipment.method.storeCurrencyPrice | money(true, data.shipment.method.currencyIsoCode) }}</div>
+
+            {% if data.shipmentExpenses[data.shipmentGroup.hash] is defined %}
+                {% include molecule('shipment-information', 'CustomerPage') ignore missing with {
+                    data: {
+                        shipmentExpense: data.shipmentExpenses[data.shipmentGroup.hash],
+                    },
+                } only %}
+            {% endif %}
 
             {% if data.canEdit %}
                 <a class="link link--secondary spacing-top spacing-top--big" href="{{ url('checkout-shipment') }}">{{ 'general.edit.button' | trans }}</a>
@@ -50,8 +46,8 @@
 
         <div class="{{ config.name }}__item">
             <h4 class="title title--secondary-small">{{ 'checkout.step.summary.requested_delivery_date' | trans }}</h4>
-            {% if data.shipment.requestedDeliveryDate %}
-                <div class="{{ config.name }}__text">{{ data.shipment.requestedDeliveryDate | formatDate }}</div>
+            {% if shipment.requestedDeliveryDate %}
+                <div class="{{ config.name }}__text">{{ shipment.requestedDeliveryDate | formatDate }}</div>
             {% endif %}
             {% if data.canEdit %}
                 <a class="link link--secondary spacing-top spacing-top--big" href="{{ url('checkout-shipment') }}">{{ 'general.edit.button' | trans }}</a>

src/Pyz/Yves/CheckoutPage/Theme/default/views/summary/summary.twig

@@ -96,7 +96,8 @@
                 <div class="col col--sm-12 col--lg-5">
                     {% include molecule('summary-sidebar', 'CheckoutPage') with {
                         data: {
-                            shipment: shipmentGroup.shipment,
+                            shipmentGroup: shipmentGroup,
+                            shipmentExpenses: data.shipmentExpenses,
                             isGiftCardExists: isGiftCardExists,
                             canEdit: true,
                         },

src/Pyz/Yves/CustomerPage/Theme/default/components/molecules/order-detail-table/order-detail-table.twig

@@ -130,7 +130,8 @@
             <div class="col col--sm-12 col--xl-4">
                 {% include molecule('summary-sidebar', 'CheckoutPage') ignore missing with {
                     data: {
-                        shipment: shipmentGroup.shipment,
+                        shipmentGroup: shipmentGroup,
+                        shipmentExpenses: data.orderShipmentExpenses,
                         isGiftCardExists: isGiftCardExists,
                     },
                 } only %}

src/Pyz/Yves/CustomerPage/Theme/default/components/molecules/order-detail/order-detail.twig

@@ -9,7 +9,7 @@
         {% embed molecule('action-bar') with {
             data: {
                 title: 'customer.profile.order_details' | trans,
-                titleClass: 'title title--secondary-box',
+                titleClass: 'title title--secondary-box spacing-right spacing-right--inner',
             },
             embed: {
                 order: data.order,

src/Pyz/Yves/CustomerPage/Theme/default/components/molecules/shipment-information/index.ts

@@ -0,0 +1 @@
+import './shipment-information.scss';

src/Pyz/Yves/CustomerPage/Theme/default/components/molecules/shipment-information/shipment-information.scss

@@ -0,0 +1,12 @@
+@mixin customer-page-shipment-information($name: '.shipment-information') {
+    #{$name} {
+        &__content {
+            font-weight: fw(light);
+            letter-spacing: rem(-0.18);
+        }
+
+        @content;
+    }
+}
+
+@include customer-page-shipment-information();

src/Pyz/Yves/CustomerPage/Theme/default/components/molecules/shipment-information/shipment-information.twig

@@ -0,0 +1,33 @@
+{% extends molecule('shipment-information', '@SprykerShop:CustomerPage') %}
+{% import _self as component %}
+
+{% define config = {
+    tag: 'div',
+} %}
+
+{% block class %}
+    {{- component.renderClass(config.name, modifiers, class) -}}
+{% endblock %}
+
+{% block body %}
+    {% set shipmentMethod = data.shipmentExpense.shipment.method %}
+    {% set carrierName = shipmentMethod.carrierName %}
+
+    <h4 class="title title--secondary-small spacing-bottom grid grid--justify grid--middle">
+        <span class="col col--sm-7">{{ carrierName | trans }}</span>
+        <span class="col">
+            {% set deliveryLogoName = carrierName | replace({' ': ''}) | lower ~ '-logo' %}
+
+            {% include atom('icon') with {
+                modifiers: [deliveryLogoName],
+                data: {
+                    name: deliveryLogoName,
+                },
+            } only %}
+        </span>
+    </h4>
+
+    <div class="{{ config.name }}__content">
+        {{ shipmentMethod.name }}: {{ data.shipmentExpense.sumPrice | money(true, shipmentMethod.currencyIsoCode) }}
+    </div>
+{% endblock %}

src/Pyz/Yves/CustomerReorderWidget/Theme/default/components/molecules/customer-reorder-form/customer-reorder-form.twig

@@ -1,5 +1,9 @@
 {% extends molecule('customer-reorder-form', '@SprykerShop:CustomerReorderWidget') %}
 
+{% block extraClass %}
+    box
+{% endblock %}
+
 {% block formContent %}
     {% include molecule('order-detail', 'CustomerPage') ignore missing with {
         class: 'spacing-top spacing-top--big',

src/Pyz/Yves/ShopUi/Theme/default/components/molecules/action-bar/action-bar.scss

@@ -7,12 +7,11 @@
         }
 
         &__actions {
-            margin-right: -8px;
-
             @include helper-breakpoint-media-min($md-min) {
                 display: flex;
                 flex-wrap: wrap;
                 align-items: flex-start;
+                margin-right: rem(-8);
             }
         }
     }

src/Pyz/Zed/Sales/SalesConfig.php

@@ -31,7 +31,6 @@ public function getSalesDetailExternalBlocksUrls(): array
             'cart_note_bundle_items' => '/cart-note-product-bundle-connector/sales/list', #CartNoteFeature
             'payments' => '/sales-payment-gui/sales/list',
             'giftCards' => '/gift-card/sales/list',
-            'shipment' => '/shipment/sales/list',
             'discount' => '/discount/sales/list',
             'refund' => '/refund/sales/list',
         ];