Merge branch 'developer' into production

app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/view/addto.phtml

@@ -26,6 +26,15 @@
         }
         }
     }
     }
 
 
+    @media (min-width: 1024px) {
+        .joshine-desction {
+            height: fit-content !important;
+        }
+        .product-view-description{
+            max-height: fit-content !important;
+        }
+    }
+
     .action.towishlist{
     .action.towishlist{
         text-align: center;
         text-align: center;
         border: 1px solid #e5e5e5;
         border: 1px solid #e5e5e5;
@@ -175,8 +184,8 @@
 <style>
 <style>
     .joshine-desction,.product-view-description{
     .joshine-desction,.product-view-description{
       width:100%;
       width:100%;
-
     }
     }
+
     .joshine-desction .desction-left{
     .joshine-desction .desction-left{
         width: 90%;
         width: 90%;
         flot: left;
         flot: left;
@@ -199,7 +208,7 @@
 
 
     @media (min-width: 780px){
     @media (min-width: 780px){
         .product-view-description{
         .product-view-description{
-            max-height: 250px !important;
+            max-height: 250px;
             overflow: auto;
             overflow: auto;
         }
         }
 
 

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--------------------------------->
             <!----------------------------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) :?>
-                    <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; ?>
                     <?php endforeach; ?>
                 </div>
                 </div>
             <?php endif;?>
             <?php endif;?>

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

@@ -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;
 }
 }
@@ -3552,6 +3554,9 @@ strong#block-related-heading,strong#block-upsell-heading{ font-weight: 600; colo
 
 
   .product.media{
   .product.media{
     min-width: 880px!important;
     min-width: 880px!important;
+    top: 0;
+    position: sticky;
+    height: fit-content;
   }
   }
 
 
   #sparsh-mfp-quickview .product.media{
   #sparsh-mfp-quickview .product.media{
@@ -3559,7 +3564,7 @@ strong#block-related-heading,strong#block-upsell-heading{ font-weight: 600; colo
   }
   }
 
 
 
 
-  .gallery-placeholder__image{
+  #sparsh-mfp-quickview .gallery-placeholder__image{
     float: right;
     float: right;
     position: absolute;
     position: absolute;
     margin-left: 100px;
     margin-left: 100px;
@@ -3581,7 +3586,7 @@ strong#block-related-heading,strong#block-upsell-heading{ font-weight: 600; colo
     position:unset;
     position:unset;
   }
   }
 
 
-  .product-info-wrapper{
+  #sparsh-mfp-quickview .product-info-wrapper{
     height: 1000px;
     height: 1000px;
   }
   }