Skip to content

J
joshine
Commit 3f30ed81 by halweg
Options

Merge branch 'developer' of http://47.99.244.21:9999/root/joshine into developer

parents 3483ddbe 0302eb96
Showing with 41 additions and 12 deletions
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/cart/item/default.phtml
...@@ -53,16 +53,34 @@ $priceBlock = $objectManager->get(\Magento\Catalog\Block\Product\AbstractProduct ...@@ -53,16 +53,34 @@ $priceBlock = $objectManager->get(\Magento\Catalog\Block\Product\AbstractProduct
<!----------------------------item option start---------------------------------> <!----------------------------item option start--------------------------------->
<?php if ($_options = $block->getOptionList()) :?> <?php if ($_options = $block->getOptionList()) :?>
<div class="item-options-meta"> <div class="item-options-meta">
<?php foreach ($_options as $_option) :?> <?php
<span class="item-options-line"> $countOpt = count($_options);
<?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?> ?>
<strong style="font-weight: 600;margin-right: 10px;"><?= $block->escapeHtml($_option['label']) ?>:</strong> <?php foreach ($_options as $key=>$_option) :?>
<?php if (isset($_formatedOptionValue['full_view'])) :?> <strong style="font-weight: 600;margin-right: 10px;"><?= $block->escapeHtml($_option['label']) ?> :</strong>
<?= $block->escapeHtml($_formatedOptionValue['full_view']) ?> <span class="item-options-line">
<?php else :?> <?php
<?= $block->escapeHtml($_formatedOptionValue['value'], ['span', 'a']) ?> $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
<?php endif; ?> $resource = $objectManager->get('Magento\Framework\App\ResourceConnection');
</span><br /> $connection = $resource->getConnection();
?>
<?php if ($_option['label'] != 'Size'){ ?>
<?php
$tableName = $resource->getTableName('eav_attribute_option_value');
$sql = "Select * FROM " . $tableName ." where store_id=0 AND option_id=".$_option['option_value'];
$result = $connection->fetchRow($sql);
?>
<?= $block->escapeHtml($result['value']) ?>
<?php }else{
$tableName = $resource->getTableName('eav_attribute_option_swatch');
$sql = "Select * FROM " . $tableName ." where store_id=0 AND option_id=".$_option['option_value'];
$result = $connection->fetchRow($sql);
echo $result['value'];
} ?>
</span><br />
<?php endforeach; ?> <?php endforeach; ?>
</div> </div>
<?php endif;?> <?php endif;?>
......
app/design/frontend/Joshine/breeze/web/css/_custom.less
...@@ -827,7 +827,9 @@ p.shopbycate-title { ...@@ -827,7 +827,9 @@ p.shopbycate-title {
.checkout-index-index .method-content{ .checkout-index-index .method-content{
text-align: left; text-align: left;
} }
.checkout-cart-index span.item-options-line {
color: #555;
}
.no-enabled{ .no-enabled{
color:#cacaca!important; color:#cacaca!important;
} }
...@@ -2153,10 +2155,13 @@ footer{ ...@@ -2153,10 +2155,13 @@ footer{
max-width: 260px; max-width: 260px;
} }
.minicart-items-wrapper #mini-cart{ .minicart-items-wrapper #mini-cart{
max-height: 140px; max-height: 160px;
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
} }
.minicart-items li.product-item > div.product {
height: 160px;
}
.minicart-items li.product-item > div.product > :nth-child(1) { .minicart-items li.product-item > div.product > :nth-child(1) {
max-width: 100%!important; max-width: 100%!important;
} }
...@@ -2174,6 +2179,7 @@ footer{ ...@@ -2174,6 +2179,7 @@ footer{
#mini-cart .product-item-details .product.options.list .values{ #mini-cart .product-item-details .product.options.list .values{
color:#888; color:#888;
font-family: inherit; font-family: inherit;
display: flex;
} }
/***********************************minicart edit end*********************************************************/ /***********************************minicart edit end*********************************************************/
/***********************************cart style start**********************************************************/ /***********************************cart style start**********************************************************/
...@@ -2412,6 +2418,11 @@ footer{ ...@@ -2412,6 +2418,11 @@ footer{
position: absolute; position: absolute;
bottom: 0; bottom: 0;
} }
.checkout-cart-index .item-actions .action-delete{
display: inline-block;
text-align: left;
width: 100%;
}
/***********************************cart style end**********************************************************/ /***********************************cart style end**********************************************************/
@media (min-width: 992px) { @media (min-width: 992px) {
.product-item:hover .product-item-info .image0, .product-item:hover .product-item-info .image0,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment