Skip to content

Commit 5f82274

Browse files
haitv282haitv282
authored
Merge pull request #71 from mageplaza/develop
Develop
2 parents dfcc688 + e915f04 commit 5f82274

File tree

8 files changed

+82
-39
lines changed

8 files changed

+82
-39
lines changed

‎Observer/AddBlock.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public function execute(Observer $observer)
8585
$fullActionName = $this->request->getFullActionName();
8686
$output = $observer->getTransport()->getOutput();
8787
foreach ($this->helperData->getActiveSliders() as $slider) {
88-
list($pageType, $location) = explode('.', $slider->getLocation());
88+
[$pageType, $location] = explode('.', $slider->getLocation());
8989
if ($fullActionName == $pageType || $pageType == 'allpage') {
9090
$content = $layout->createBlock($this->productType->getBlockMap($slider->getProductType()))
9191
->setSlider($slider)

‎composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"mageplaza/module-core": "^1.4.5"
66
},
77
"type": "magento2-module",
8-
"version": "2.0.5",
8+
"version": "2.0.6",
99
"license": "proprietary",
1010
"authors": [
1111
{

‎i18n/en_US.csv

+2
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ Edit,Edit
7070
"Add to Cart","Add to Cart"
7171
"In stock","In stock"
7272
"Out of stock","Out of stock"
73+
"Add to Wish List","Add to Wish List"
74+
"Add to Compare","Add to Compare"
7375
"Product Slider","Product Slider"
7476
"General Configuration","General Configuration"
7577
"Select Yes to enable this module","Select Yes to enable this module"

‎view/frontend/requirejs-config.js

-25
This file was deleted.

‎view/frontend/templates/productslider.phtml

+24-3
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ use Magento\Framework\App\Action\Action;
2525
/** @var AbstractSlider $block */
2626
$mode = 'grid';
2727
$title = $block->getTitle();
28-
$blockId = $block->getSliderId();
28+
$blockId = $block->getSliderId() . uniqid('-', false);
2929
$items = $block->getProductCollection();
3030
if ($items && $items->getSize()) : ?>
3131
<div class="mp-product-slider-block block widget block-products-list <?= /** @noEscape */ $mode ?>">
3232
<h2 class="mp-product-slider-title"><?= $block->escapeHtml($title) ?></h2>
3333
<p class="mp-ps-info"><?= $block->escapeHtml($block->getDescription()) ?></p>
3434
</div>
35-
<div class="block-content">
35+
<div class="block-content mp-product-slider-content">
3636
<div class="products-<?= /** @noEscape */ $mode ?> <?= /** @noEscape */ $mode ?>">
3737
<ol class="product-items widget-viewed-grid">
3838
<?php $iterator = 1; ?>
@@ -60,7 +60,7 @@ if ($items && $items->getSize()) : ?>
6060
<?= /** @noEscape */ $block->getProductPrice($_item) ?>
6161
<?php endif; ?>
6262

63-
<div class="product actions slider-product-item-actions">
63+
<div class="product actions slider-product-item-actions product-item-actions">
6464
<?php if ($block->canShowAddToCart()) : ?>
6565
<div class="actions-primary">
6666
<?php if ($_item->isSaleable()) : ?>
@@ -83,6 +83,26 @@ if ($items && $items->getSize()) : ?>
8383
<?php endif; ?>
8484
<?php endif; ?>
8585
</div>
86+
<div class="secondary-addto-links actions-secondary"
87+
data-role="add-to-links">
88+
<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
89+
<a href="#"
90+
data-post='<?= /** @noEscape */ $block->getAddToWishlistParams($_item); ?>'
91+
class="action towishlist" data-action="add-to-wishlist"
92+
title="<?= /** @noEscape */ __('Add to Wish List') ?>">
93+
<span><?= /** @noEscape */ __('Add to Wish List') ?></span>
94+
</a>
95+
<?php endif; ?>
96+
<?php if ($block->getAddToCompareUrl()) : ?>
97+
<?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare'); ?>
98+
<a href="#" class="action tocompare"
99+
data-post='<?= /** @noEscape */ $compareHelper->getPostDataParams($_item); ?>'
100+
data-role="add-to-links"
101+
title="<?= /** @noEscape */ __('Add to Compare') ?>">
102+
<span><?= /** @noEscape */ __('Add to Compare') ?></span>
103+
</a>
104+
<?php endif; ?>
105+
</div>
86106
<?php endif; ?>
87107
</div>
88108
</div>
@@ -100,3 +120,4 @@ if ($items && $items->getSize()) : ?>
100120
});
101121
</script>
102122
<?php endif; ?>
123+

‎view/frontend/templates/widget/productslider.phtml

+22-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ if ($items = $block->getProductCollection()) : ?>
3232
<h2 class="mp-product-slider-title"><?= $block->escapeHtml($block->getTitle()) ?></h2>
3333
<p class="mp-ps-info"><?= $block->escapeHtml($block->getDescription()) ?></p>
3434
</div>
35-
<div class="block-content">
35+
<div class="block-content mp-product-slider-content">
3636
<div class="products-grid grid">
3737
<ol class="product-items widget-viewed-grid">
3838
<?php $iterator = 1; ?>
@@ -61,7 +61,7 @@ if ($items = $block->getProductCollection()) : ?>
6161
<?= /** @noEscape */ $block->getProductPrice($_item) ?>
6262
<?php endif; ?>
6363

64-
<div class="product actions slider-product-item-actions">
64+
<div class="product actions slider-product-item-actions product-item-actions">
6565
<?php if ($block->canShowAddToCart()) : ?>
6666
<div class="actions-primary">
6767
<?php if ($_item->isSaleable()) : ?>
@@ -84,6 +84,26 @@ if ($items = $block->getProductCollection()) : ?>
8484
<?php endif; ?>
8585
<?php endif; ?>
8686
</div>
87+
<div class="secondary-addto-links actions-secondary"
88+
data-role="add-to-links">
89+
<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
90+
<a href="#"
91+
data-post='<?= /** @noEscape */ $block->getAddToWishlistParams($_item); ?>'
92+
class="action towishlist" data-action="add-to-wishlist"
93+
title="<?= /** @noEscape */ __('Add to Wish List') ?>">
94+
<span><?= /** @noEscape */ __('Add to Wish List') ?></span>
95+
</a>
96+
<?php endif; ?>
97+
<?php if ($block->getAddToCompareUrl()) : ?>
98+
<?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare'); ?>
99+
<a href="#" class="action tocompare"
100+
data-post='<?= /** @noEscape */ $compareHelper->getPostDataParams($_item); ?>'
101+
data-role="add-to-links"
102+
title="<?= /** @noEscape */ __('Add to Compare') ?>">
103+
<span><?= /** @noEscape */ __('Add to Compare') ?></span>
104+
</a>
105+
<?php endif; ?>
106+
</div>
87107
<?php endif; ?>
88108
</div>
89109
</div>

‎view/frontend/web/css/source/_module.less

+32
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,38 @@
1717
* @copyright Copyright (c) Mageplaza (https://www.mageplaza.com/)
1818
* @license https://www.mageplaza.com/LICENSE.txt
1919
*/
20+
.mp-product-slider-content .owl-nav{
21+
font-size: 80px;
22+
}
23+
24+
.mp-product-slider-content .owl-nav button span{
25+
color: #D6D6D6;
26+
}
27+
28+
.mp-product-slider-content .owl-nav button span:hover{
29+
color: #869791;
30+
}
31+
32+
.mp-product-slider-content .owl-nav .owl-prev{
33+
position: absolute;
34+
top: 40%;
35+
left: 0;
36+
z-index: 999;
37+
text-shadow: none;
38+
background: none;
39+
border: none;
40+
}
41+
42+
.mp-product-slider-content .owl-nav .owl-next{
43+
position: absolute;
44+
top: 40%;
45+
right: 0;
46+
z-index: 999;
47+
text-shadow: none;
48+
background: none;
49+
border: none;
50+
}
51+
2052
.owl-item li.product-slider {
2153
width: 100% !important;
2254
}

‎view/frontend/web/js/owl.carousel.min.js

-7
This file was deleted.

0 commit comments

Comments
 (0)