Skip to content

Commit 227b98e

Browse files
hryvinskyihryvinskyi
committed
fix bugs
1 parent f82d4b5 commit 227b98e

File tree

12 files changed

+103
-87
lines changed

12 files changed

+103
-87
lines changed

‎Block/QuickView.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<?php
2-
2+
/**
3+
* Copyright (c) 2017. Volodumur Hryvinskyi. All rights reserved.
4+
* @author: <mailto:volodumur@hryvinskyi.com>
5+
* @github: <https://github.com/scriptua>
6+
*/
37

48
namespace Script\QuickView\Block;
59

‎Controller/Catalog/Product/View.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
<?php
2+
/**
3+
* Copyright (c) 2017. Volodumur Hryvinskyi. All rights reserved.
4+
* @author: <mailto:volodumur@hryvinskyi.com>
5+
* @github: <https://github.com/scriptua>
6+
*/
27

38
namespace Script\QuickView\Controller\Catalog\Product;
49

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
"require": {
55
"php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
66
"magento/module-catalog": "102.* |101.* | 100.*",
7-
"scriptua/magento2-base": "*"
7+
"scriptua/magento2-base": "1.0.*"
88
},
99
"type": "magento2-module",
10-
"version": "1.0.0",
10+
"version": "1.0.1",
1111
"license": "GNU-3.0",
1212
"autoload": {
1313
"files": [

‎etc/module.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77

88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
9-
<module name="Script_QuickView" setup_version="1.0.0" >
9+
<module name="Script_QuickView" setup_version="1.0.1" >
1010
<sequence>
1111
<module name="Magento_Catalog"/>
1212
<module name="Script_Base"/>

‎view/frontend/layout/script_quickview_catalog_product_view.xml‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,18 +66,18 @@
6666
<block class="Magento\Catalog\Block\Product\View" name="product.info.addtocart" as="addtocart" template="product/view/addtocart.phtml"/>
6767
</container>
6868
<block class="Magento\Framework\View\Element\Template" name="product.info.form.options" as="options_container">
69-
<block class="Magento\Catalog\Block\Product\View" name="product.info.options.wrapper" as="product_options_wrapper" template="product/view/options/wrapper.phtml">
70-
<block class="Magento\Catalog\Block\Product\View\Options" name="product.info.options" as="product_options" template="product/view/options.phtml">
71-
<block class="Magento\Catalog\Block\Product\View\Options\Type\DefaultType" as="default" template="product/view/options/type/default.phtml"/>
72-
<block class="Magento\Catalog\Block\Product\View\Options\Type\Text" as="text" template="product/view/options/type/text.phtml"/>
73-
<block class="Magento\Catalog\Block\Product\View\Options\Type\File" as="file" template="product/view/options/type/file.phtml"/>
74-
<block class="Magento\Catalog\Block\Product\View\Options\Type\Select" as="select" template="product/view/options/type/select.phtml"/>
75-
<block class="Magento\Catalog\Block\Product\View\Options\Type\Date" as="date" template="product/view/options/type/date.phtml"/>
69+
<block class="Magento\Catalog\Block\Product\View" name="product.info.options.wrapper" as="product_options_wrapper" template="Magento_Catalog::product/view/options/wrapper.phtml">
70+
<block class="Magento\Catalog\Block\Product\View\Options" name="product.info.options" as="product_options" template="Magento_Catalog::product/view/options.phtml">
71+
<block class="Magento\Catalog\Block\Product\View\Options\Type\DefaultType" name="product.info.options.default" as="default" template="Magento_Catalog::product/view/options/type/default.phtml"/>
72+
<block class="Magento\Catalog\Block\Product\View\Options\Type\Text" name="product.info.options.text" as="text" template="Magento_Catalog::product/view/options/type/text.phtml"/>
73+
<block class="Magento\Catalog\Block\Product\View\Options\Type\File" name="product.info.options.file" as="file" template="Magento_Catalog::product/view/options/type/file.phtml"/>
74+
<block class="Magento\Catalog\Block\Product\View\Options\Type\Select" name="product.info.options.select" as="select" template="Magento_Catalog::product/view/options/type/select.phtml"/>
75+
<block class="Magento\Catalog\Block\Product\View\Options\Type\Date" name="product.info.options.date" as="date" template="Magento_Catalog::product/view/options/type/date.phtml"/>
7676
</block>
7777
<block class="Magento\Framework\View\Element\Html\Calendar" name="html_calendar" as="html_calendar" template="Magento_Theme::js/calendar.phtml"/>
7878
</block>
79-
<block class="Magento\Catalog\Block\Product\View" name="product.info.options.wrapper.bottom" as="product_options_wrapper_bottom" template="product/view/options/wrapper/bottom.phtml">
80-
<block class="Magento\Catalog\Block\Product\View" name="product.info.addtocart.additional" as="product.info.addtocart" template="product/view/addtocart.phtml"/>
79+
<block class="Magento\Catalog\Block\Product\View" name="product.info.options.wrapper.bottom" as="product_options_wrapper_bottom" template="Magento_Catalog::product/view/options/wrapper/bottom.phtml">
80+
<block class="Magento\Catalog\Block\Product\View" name="product.info.addtocart.additional" as="product.info.addtocart" template="Magento_Catalog::product/view/addtocart.phtml"/>
8181
</block>
8282
</block>
8383
</block>
@@ -143,6 +143,15 @@
143143
<block class="Magento\Review\Block\Product\Review" name="reviews" as="reviews" template="Magento_Review::review.phtml" group="detailed_info">
144144
<block class="Magento\Review\Block\Form" name="product.review.form" as="review_form">
145145
<container name="product.review.form.fields.before" as="form_fields_before" label="Review Form Fields Before"/>
146+
<arguments>
147+
<argument name="jsLayout" xsi:type="array">
148+
<item name="components" xsi:type="array">
149+
<item name="review-form" xsi:type="array">
150+
<item name="component" xsi:type="string">Magento_Review/js/view/review</item>
151+
</item>
152+
</item>
153+
</argument>
154+
</arguments>
146155
</block>
147156
</block>
148157
</block>

‎view/frontend/layout/script_quickview_catalog_product_view_type_configurable.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</container>
1919
</referenceContainer>
2020
<referenceBlock name="product.info.options.wrapper">
21-
<block class="Magento\ConfigurableProduct\Block\Product\View\Type\Configurable" name="product.info.options.configurable" as="options_configurable" before="-" template="product/view/type/options/configurable.phtml"/>
21+
<block class="Magento\ConfigurableProduct\Block\Product\View\Type\Configurable" name="product.info.options.configurable" as="options_configurable" before="-" template="Magento_ConfigurableProduct::product/view/type/options/configurable.phtml"/>
2222
</referenceBlock>
2323
<!-- SWATCHES -->
2424
<!--referenceContainer name="product.info.options.configurable" remove="true"/-->

‎view/frontend/templates/product/view/attribute.phtml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@
1010
* Product view template
1111
*
1212
* @see \Magento\Catalog\Block\Product\View
13+
* @var $block \Magento\Catalog\Block\Product\View\Description
1314
*/
14-
?>
15-
<?php
15+
16+
1617
$_helper = $this->helper('Magento\Catalog\Helper\Output');
1718
$_product = $block->getProduct();
1819
$_call = $block->getAtCall();
@@ -34,7 +35,10 @@ if ($_attributeType && $_attributeType == 'text') {
3435

3536
<?php if ($_attributeValue): ?>
3637
<div class="product attibute <?php /* @escapeNotVerified */ echo $_className?>">
37-
<?php if ($_attributeLabel != 'none'): ?><strong class="type"><?php /* @escapeNotVerified */ echo $_attributeLabel?></strong><?php endif; ?>
38+
<?php if ($_attributeLabel != 'none'): ?>
39+
<strong class="type"><?php /* @escapeNotVerified */ echo $_attributeLabel?></strong>
40+
<?php endif; ?>
41+
3842
<div class="value" <?php /* @escapeNotVerified */ echo $_attributeAddAttribute;?>><?php /* @escapeNotVerified */ echo $_attributeValue; ?></div>
3943
</div>
4044
<?php endif; ?>

‎view/frontend/templates/product/view/button.phtml‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,21 @@
11
<?php
2+
/**
3+
* Copyright (c) 2017. Volodumur Hryvinskyi. All rights reserved.
4+
* @author: <mailto:volodumur@hryvinskyi.com>
5+
* @github: <https://github.com/scriptua>
6+
*/
7+
8+
// @codingStandardsIgnoreFile
9+
10+
/** @var $block \Magento\Catalog\Block\Product\View */
11+
12+
use \Script\Base\Helpers\Html;
213

3-
$_product = $block->getProduct();
414
?>
515
<div id="btnGotoProduct" class="btn-go-to-product">
6-
<a target="_blank" href="<?= $_product->getUrlModel()->getUrl($_product) ?>" title="Go To Product" class="action primary">
7-
<span>Go To Product</span>
8-
</a>
16+
<?php echo Html::a('<span>' . __('Go To Product') . '</span>', $block->getProduct()->getProductUrl(), [
17+
'target' => '_blank',
18+
'title' => __('Go To Product'),
19+
'class' => ['action', 'primary']
20+
]); ?>
921
</div>

‎view/frontend/templates/product/view/description.phtml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?php
22
/**
3-
* Copyright © 2015 Magento. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright (c) 2017. Volodumur Hryvinskyi. All rights reserved.
4+
* @author: <mailto:volodumur@hryvinskyi.com>
5+
* @github: <https://github.com/scriptua>
56
*/
67

78
// @codingStandardsIgnoreFile
@@ -11,5 +12,7 @@
1112
*
1213
* @var $block \Magento\Catalog\Block\Product\View\Description
1314
*/
14-
?>
15-
<?php /* @escapeNotVerified */ echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($block->getProduct(), $block->getProduct()->getDescription(), 'description') ?>
15+
16+
/* @escapeNotVerified */
17+
echo $this->helper('Magento\Catalog\Helper\Output')
18+
->productAttribute($block->getProduct(), $block->getProduct()->getDescription(), 'description');

‎view/frontend/templates/product/view/gallery.phtml‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
1+
<?php
2+
/**
3+
* Copyright (c) 2017. Volodumur Hryvinskyi. All rights reserved.
4+
* @author: <mailto:volodumur@hryvinskyi.com>
5+
* @github: <https://github.com/scriptua>
6+
*/
7+
8+
use Script\Base\Helpers\Html;
9+
10+
11+
/** @var $block Magento\ProductVideo\Block\Product\View\Gallery */
12+
?>
13+
114
<div class="gallery-placeholder _block-content-loading" data-gallery-role="gallery-placeholder">
215
<div data-role="loader" class="loading-mask">
316
<div class="loader">
4-
<img src="<?php echo $block->getViewFileUrl('images/loader-1.gif'); ?>" alt="<?php echo __('Loading...') ?>">
17+
<?php echo Html::img($block->getViewFileUrl('images/loader-1.gif'), ['alt' => __('Loading...')]) ?>
518
</div>
619
</div>
720
</div>
@@ -76,4 +89,4 @@
7689
}
7790
}
7891
</script>
79-
92+

0 commit comments

Comments
 (0)