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

app/design/frontend/Joshine/breeze/Magento_Checkout/templates/cart/item/default.phtml

@@ -53,16 +53,34 @@ $priceBlock = $objectManager->get(\Magento\Catalog\Block\Product\AbstractProduct
             <!----------------------------item option start--------------------------------->
             <?php if ($_options = $block->getOptionList()) :?>
                 <div class="item-options-meta">
-                    <?php foreach ($_options as $_option) :?>
-                    <span class="item-options-line">
-                        <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
-                        <strong style="font-weight: 600;margin-right: 10px;"><?= $block->escapeHtml($_option['label']) ?>:</strong>
-                        <?php if (isset($_formatedOptionValue['full_view'])) :?>
-                            <?= $block->escapeHtml($_formatedOptionValue['full_view']) ?>
-                        <?php else :?>
-                            <?= $block->escapeHtml($_formatedOptionValue['value'], ['span', 'a']) ?>
-                        <?php endif; ?>
-                     </span><br />
+                    <?php
+                    $countOpt = count($_options);
+                    ?>
+                    <?php foreach ($_options as $key=>$_option) :?>
+                        <strong style="font-weight: 600;margin-right: 10px;"><?= $block->escapeHtml($_option['label']) ?> :</strong>
+                        <span class="item-options-line">
+                            <?php
+                            $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+                            $resource = $objectManager->get('Magento\Framework\App\ResourceConnection');
+                            $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; ?>
                 </div>
             <?php endif;?>

app/design/frontend/Joshine/breeze/web/css/_custom.less

@@ -827,7 +827,9 @@ p.shopbycate-title {
 .checkout-index-index .method-content{
   text-align: left;
 }
-
+.checkout-cart-index span.item-options-line {
+  color: #555;
+}
 .no-enabled{
   color:#cacaca!important;
 }
@@ -2153,10 +2155,13 @@ footer{
   max-width: 260px;
 }
 .minicart-items-wrapper #mini-cart{
-  max-height: 140px;
+  max-height: 160px;
   height: 100%;
   overflow: hidden;
 }
+.minicart-items li.product-item > div.product {
+  height: 160px;
+}
 .minicart-items li.product-item > div.product > :nth-child(1) {
   max-width: 100%!important;
 }
@@ -2174,6 +2179,7 @@ footer{
 #mini-cart .product-item-details .product.options.list .values{
   color:#888;
   font-family: inherit;
+  display: flex;
 }
 /***********************************minicart edit end*********************************************************/
 /***********************************cart style start**********************************************************/
@@ -2412,6 +2418,11 @@ footer{
   position: absolute;
   bottom: 0;
 }
+.checkout-cart-index .item-actions .action-delete{
+  display: inline-block;
+  text-align: left;
+  width: 100%;
+}
 /***********************************cart style end**********************************************************/
 @media (min-width: 992px) {
   .product-item:hover .product-item-info .image0,