Merge branch 'release/1.1.0'

CHANGELOG.md

@@ -3,6 +3,26 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [1.1.0] - 2019-01-07
+### Added
+- Reset password styles
+- Email to a Friend page styles
+- Missing homepagge container class for top notifications
+- Support for B2B module
+- Templates for product's page breadcrumbs
+- Confirmation link page styles
+- Support for bundle products
+- Support for grouped products
+
+### Fixed
+- Missing class for product attributes
+- Customer save password/email action
+
+### Changed
+- Refactor dropdown list and nested list
+- Grid classes in whole project
+- Refactor menu and submenu templates
+
 ## [1.0.0] - 2018-10-15
 ### Changed
 - Better docs

Magento_B2b/web/template/grid/listing.html

@@ -0,0 +1,45 @@
+<div class="dashboard-table">
+    <div class="dashboard-table__content" data-role="grid-wrapper">
+        <table
+            class="data-grid dashboard-table__table table"
+            data-role="grid"
+            css="getTableClass()"
+            tabindex="0"
+            role="table"
+        >
+            <caption
+                class="table__caption"
+                translate="'Table of requisitions'"
+            ></caption>
+            <thead>
+                <tr
+                    role="row"
+                    each="data: getVisible(), as: '$col'"
+                    render="getHeader()"
+                ></tr>
+            </thead>
+            <tbody>
+                <tr
+                    class="data-row"
+                    role="row"
+                    repeat="foreach: rows, item: '$row'"
+                    css="'_odd-row': $index % 2"
+                >
+                    <td
+                        outerfasteach="data: getVisible(), as: '$col'"
+                        css="getFieldClass()"
+                        click="getFieldHandler($row())"
+                        template="getBody()"
+                        attr="'data-th': $col.label"
+                    ></td>
+                </tr>
+                <tr ifnot="hasData()" class="data-grid-tr-no-data">
+                    <td
+                        attr="colspan: countVisible()"
+                        translate="'We couldn\'t find any records.'"
+                    ></td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+</div>

Magento_B2b/web/template/grid/paging/paging.html

@@ -0,0 +1,56 @@
+<div class="quotes-grid-toolbar toolbar bottom">
+    <div class="pager">
+        <p class="toolbar-amount">
+            <span class="toolbar-number">
+                <span
+                    text="totalRecords + $t(' Item(s)')"
+                    if="isFirst() && isLast()"
+                />
+                <span
+                    text="$t('Items ') + getFirstNum() + $t(' to ') + getLastNum() + $t(' of ') + totalRecords + $t(' total')"
+                    if="pages > 1"
+                />
+            </span>
+        </p>
+    </div>
+    <div class="pages" if="pages > 1">
+        <strong class="label pages-label" text="$t('Page')" />
+        <ul class="items pages-items" aria-labelledby="paging-label">
+            <li class="item pages-item-previous" ifnot="isFirst()">
+                <a
+                    class="action previous"
+                    click="prev"
+                    attr="title: $t('Previous')"
+                >
+                    <span class="label" text="$t('Page')" />
+                    <span text="$t('Previous')" />
+                </a>
+            </li>
+            <each args="data: getPages(), as: '$page'">
+                <li
+                    class="item"
+                    click="$parent.setPage.bind($parent)"
+                    ifnot="$page === $parent.current"
+                >
+                    <a class="page" text="$page" />
+                </li>
+                <li class="item current" if="$page === $parent.current">
+                    <strong class="page">
+                        <span
+                            class="label"
+                            text="$t('You\'re currently reading page')"
+                        />
+                        <span text="$page" />
+                    </strong>
+                </li>
+            </each>
+            <li class="item pages-item-next" ifnot="isLast()">
+                <a class="action next" click="next" attr="title: $t('Next')">
+                    <span class="label" text="$t('Page')" />
+                    <span text="$t('Next')" />
+                </a>
+            </li>
+        </ul>
+    </div>
+    <scope args="sizes" render=""/>
+</div>

Magento_B2b/web/template/grid/paging/sizes.html

@@ -0,0 +1,20 @@
+<div class="toolbar__limiter toolbar__limiter--relative">
+    <div class="select toolbar__limiter-wrapper">
+        <label
+            class="label toolbar__limiter-label"
+            translate="'Show'"
+            for="limiter"
+        ></label>
+        <select
+            id="limiter"
+            data-role="limiter"
+            class="select__field select__field--native toolbar__limiter-select"
+            data-bind="
+                options: optionsArray,
+                optionsText: 'label',
+                optionsValue:'value',
+                value: value
+            "
+        ></select>
+    </div>
+</div>

Magento_Bundle/layout/catalog_product_view_type_bundle.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<page
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd"
+>
+    <body>
+        <referenceContainer name="product.info.main">
+            <referenceContainer
+                name="product.info.social"
+                htmlClass="product-view__extra-actions"
+                htmlTag="div"
+            />
+        </referenceContainer>
+
+        <referenceBlock name="customize.button" remove="true"/>
+        <referenceBlock name="bundle.back.button" remove="true"/>
+        <referenceBlock name="bundle.product.view.options.notice" remove="true"/>
+        <referenceBlock name="product.info.addtocart.bundle" remove="true"/>
+
+        <move element="product.column.right.benefits" destination="product.info.main" after="-"/>
+        <move element="product.info" destination="product.info.main"/>
+        <move element="product.info.options.wrapper" destination="product.column.right.options"/>
+        <move element="product.column.right.actions" destination="product.column.right.options" before="bundle.summary"/>
+        <move element="bundle.summary" destination="product.column.right.options"/>
+    </body>
+</page>

Magento_Bundle/templates/catalog/product/view/summary.phtml

@@ -0,0 +1,44 @@
+<?php $_product = $block->getProduct();?>
+<?php if ($_product->isSaleable() && $block->hasOptions()): ?>
+    <div
+        id="bundleSummary"
+        data-mage-init='{
+            "sticky": {
+                "container": ".product-add-form"
+            }
+        }'
+    >
+        <div class="product-view__summary">
+            <div class="product-view__summary-price">
+                <?= $block->getChildHtml('', true) ?>
+                <span class="product-view__summary-unit">
+                    / <?= __('bundle') ?>
+                </span>
+            </div>
+            <div class="bundle-summary">
+                <div class="product-view__summary-title">
+                    <?= __('Summary') ?>:
+                </div>
+                <div id="bundle-summary" data-container="product-summary">
+                    <ul
+                        class="product-view__summary-list list"
+                        data-mage-init='{"productSummary": []}'>
+                    </ul>
+                    <script data-template="bundle-summary" type="text/x-magento-template">
+                        <li class="product-view__summary-item list__item">
+                            <span class="product-view__summary-item-title">
+                                <%- data._label_ %>:
+                            </span>
+                            <div data-container="options"></div>
+                        </li>
+                    </script>
+                    <script data-template="bundle-option" type="text/x-magento-template">
+                        <div>
+                            <?= __('%1 x %2', '<%- data._quantity_ %>', '<%- data._label_ %>') ?>
+                        </div>
+                    </script>
+                </div>
+            </div>
+        </div>
+    </div>
+<?php endif; ?>

Magento_Bundle/templates/catalog/product/view/type/bundle.phtml

@@ -0,0 +1,18 @@
+<?php $_product = $block->getProduct() ?>
+<?php if ($block->displayProductStockStatus()): ?>
+    <?php if ($_product->isAvailable()): ?>
+        <div class="product-view__stock-status">
+            <?= __('In stock') ?>
+        </div>
+    <?php else: ?>
+        <div
+            class="
+                product-view__stock-status
+                product-view__stock-status--out-of-stock
+            "
+        >
+            <?= __('Out of stock') ?>
+        </div>
+    <?php endif; ?>
+<?php endif; ?>
+<?= $block->getChildHtml('bundle_prices') ?>

Magento_Bundle/templates/catalog/product/view/type/bundle/option/checkbox.phtml

@@ -0,0 +1,49 @@
+<?php /* @var $block \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox */ ?>
+<?php $_option = $block->getOption() ?>
+<?php $_selections = $_option->getSelections() ?>
+
+<div class="bundle-option">
+    <h4
+        class="
+            bundle-option__title
+            <?= ($_option->getRequired()) ? 'bundle-option__title--required': '' ?>
+        "
+    >
+        <?= $block->escapeHtml($_option->getTitle()) ?>
+    </h4>
+    <?php if ($block->showSingle()): ?>
+        <?= $block->getSelectionQtyTitlePrice($_selections[0]) ?>
+        <input
+            type="hidden"
+            class="bundle option"
+            name="bundle_option[<?= $_option->getId() ?>]"
+            value="<?= $_selections[0]->getSelectionId() ?>"
+        >
+    <?php else: ?>
+        <?php foreach($_selections as $_selection): ?>
+            <div class="checkbox">
+                <input
+                    class="checkbox__field bundle option"
+                    id="bundle-option-<?= $_option->getId() ?>-<?= $_selection->getSelectionId() ?>"
+                    type="checkbox"
+                    <?php if ($_option->getRequired()) echo 'data-validate="{\'validate-one-required-by-name\':\'input[name^=&quot;bundle_option[' . $_option->getId() . ']&quot;]:checked\'}"'?>
+                    name="bundle_option[<?= $_option->getId() ?>][<?= $_selection->getId() ?>]"
+                    data-selector="bundle_option[<?= $_option->getId() ?>][<?= $_selection->getId() ?>]"
+                    <?php if ($block->isSelected($_selection)) echo ' checked="checked"' ?>
+                    <?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>
+                    value="<?= $_selection->getSelectionId() ?>"
+                >
+                <svg class="checkbox__icon" title="Checked">
+                    <title><?= __('Checked') ?></title>
+                    <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#checked') ?>"></use>
+                </svg>
+                <label
+                    class="checkbox__label"
+                    for="bundle-option-<?= $_option->getId() ?>-<?= $_selection->getSelectionId() ?>"
+                >
+                    <?= $block->getSelectionQtyTitlePrice($_selection) ?>
+                </label>
+            </div>
+        <?php endforeach; ?>
+    <?php endif; ?>
+</div>

Magento_Bundle/templates/catalog/product/view/type/bundle/option/multi.phtml

@@ -0,0 +1,47 @@
+<?php /* @var $block \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi */ ?>
+<?php $_option = $block->getOption() ?>
+<?php $_selections = $_option->getSelections() ?>
+
+<div class="bundle-option">
+    <h4
+        class="
+            bundle-option__title
+            <?= ($_option->getRequired()) ? 'bundle-option__title--required': '' ?>
+        "
+    >
+        <?= $block->escapeHtml($_option->getTitle()) ?>
+    </h4>
+    <?php if ($block->showSingle()): ?>
+        <?= $block->getSelectionQtyTitlePrice($_selections[0]) ?>
+        <input
+            type="hidden"
+            name="bundle_option[<?= $_option->getId() ?>]"
+            value="<?= $_selections[0]->getSelectionId() ?>"
+        >
+    <?php else: ?>
+        <select
+            multiple="multiple"
+            size="5"
+            id="bundle-option-<?= $_option->getId() ?>"
+            name="bundle_option[<?= $_option->getId() ?>][]"
+            data-selector="bundle_option[<?= $_option->getId() ?>][]"
+            class="bundle option"
+            <?php if ($_option->getRequired()) echo 'data-validate={required:true}' ?>
+        >
+            <?php if(!$_option->getRequired()): ?>
+                <option value="">
+                    <?= __('None') ?>
+                </option>
+            <?php endif; ?>
+            <?php foreach ($_selections as $_selection): ?>
+                <option
+                    value="<?= $_selection->getSelectionId() ?>"
+                    <?php if ($block->isSelected($_selection)) echo ' selected="selected"' ?>
+                    <?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>
+                >
+                    <?= $block->getSelectionQtyTitlePrice($_selection, false) ?>
+                </option>
+            <?php endforeach; ?>
+        </select>
+    <?php endif; ?>
+</div>