Merge branch 'developer' into production

app/code/Joshine/InstagramFeed/etc/config.xml

@@ -6,6 +6,7 @@
                 <notice_enable>1</notice_enable>
                 <notice_type>announcement,new_update,marketing</notice_type>
                 <menu>0</menu>
+                <enabled>0</enabled>
             </general>
         </joshine>
     </default>

app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/list.phtml

@@ -108,12 +108,14 @@ $_helper = $block->getData('outputHelper');
                                 break;
                             }
                             if (in_array($img->getData('position'),[0,1,2])) {
-                                $arr[] = $img;
+                                $arr[$img->getData('position')] = $img;
                             }
                         }
 
-                        if (isset($arr[1])) {
+                        if (key_exists("0",$arr)) {
                             $hoverImg = $imageHelper->init($_product, 'product_page_image_large')->setImageFile($arr[1]->getFile())->resize($productImage->getWidth(),$productImage->getHeight())->getUrl();
+                        }elseif (key_exists("2",$arr)){
+                            $hoverImg = $imageHelper->init($_product, 'product_page_image_large')->setImageFile($arr[2]->getFile())->resize($productImage->getWidth(),$productImage->getHeight())->getUrl();
                         }
 
                         if ($pos != null) {

app/design/frontend/Joshine/breeze/Magento_Cms/templates/default/home.phtml

@@ -9,5 +9,7 @@
 <?php echo $block->getLayout()->createBlock('Joshine\Banner\Block\Index')->setTemplate('Joshine_Banner::index.phtml')->toHtml(); ?>
 <?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('home_top_category_thumnail')->toHtml();?>
 <?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('home_new_arrivals')->toHtml();?>
-<?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('flashsaleproduct')->toHtml();?>
-<?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('home_category_thumnail')->toHtml();?>
\ No newline at end of file
+<?php /*echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->toHtml();*/?>
+
+
+