CC-32421 Merchant Relation Requests & Enhanced Merchant Relations. (#…

…2457) CC-32421 Merchant Relation Requests & Enhanced Merchant Relations.
spryker-shop · Mar 27, 2024 · 71bf559 · 71bf559
1 parent 1d2d30f
commit 71bf559
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 14 deletions.
diff --git a/composer.json b/composer.json
@@ -39,6 +39,8 @@
     "suggest": {
         "spryker-shop/company-user-invitation-page": "If you want to import new invitations from file: ^2.1.0",
         "spryker-shop/customer-page": "If you wat to use CompanyUserPreAuthUserCheckPlugin: ^2.34.0",
+        "spryker-shop/merchant-relation-request-widget": "Add the module if you want to use MerchantRelationRequestMenuItemWidget.",
+        "spryker-shop/merchant-relationship-widget": "If you want to use MerchantRelationshipMenuItemWidget: ^1.0.0",
         "spryker/company-business-unit-sales-connector": "If you want to use CompanyBusinessUnitOrderSearchFormExpanderPlugin, CompanyBusinessUnitOrderSearchFormHandlerPlugin: ^1.0.0",
         "spryker/company-sales-connector": "If you want to use CompanyBusinessUnitOrderSearchFormExpanderPlugin, CompanyBusinessUnitOrderSearchFormHandlerPlugin: ^1.0.0",
         "spryker/silex": "*"

diff --git a/...CompanyPage/Theme/default/components/molecules/company-navigation/company-navigation.twig b/...CompanyPage/Theme/default/components/molecules/company-navigation/company-navigation.twig
@@ -30,5 +30,7 @@
             <a href="{{ path('company/business-unit') }}" data-id="sidebar-business-unit">{{ 'company.account.business_unit' | trans }}</a>
             {% block businessUnitSubmenu %}{% endblock %}
         </li>
+        {% widget 'MerchantRelationshipMenuItemWidget' args [data.activePage] only %}{% endwidget %}
+        {% widget 'MerchantRelationRequestMenuItemWidget' args [data.activePage] only %}{% endwidget %}
     </ul>
 {% endblock %}
diff --git a/...hop/Yves/CompanyPage/Theme/default/templates/page-layout-company/page-layout-company.twig b/...hop/Yves/CompanyPage/Theme/default/templates/page-layout-company/page-layout-company.twig
@@ -2,23 +2,28 @@
 
 {% define data = {
     activePage: 'overview',
-    currentBreadcrumb: 'customer.account.overview'
+    currentBreadcrumb: 'customer.account.overview',
 } %}
 
 {% block breadcrumbs %}
-    {% include molecule('breadcrumb') with {
-        data: {
-            steps: [
-                {
-                    label: 'company.account.page-title' | trans,
-                    url: url('company/overview')
-                },
-                {
-                    label: data.currentBreadcrumb | trans
-                }
-            ]
-        }
-    } only %}
+    {% set breadcrumbs = [] %}
+
+    {% block breadcrumbsContent %}
+        {% set breadcrumbBase = [{
+            label: 'company.account.page-title' | trans,
+            url: url('company/overview'),
+        }] %}
+
+        {% set breadcrumbsList = data.currentBreadcrumb ? breadcrumbBase | merge([{
+            label: data.currentBreadcrumb | trans
+        }]) : breadcrumbBase | merge(breadcrumbs) %}
+
+        {% include molecule('breadcrumb') with {
+            data: {
+                steps: breadcrumbsList,
+            }
+        } only %}
+    {% endblock %}
 {% endblock %}
 
 {% block content %}