From c9e6baff5deaf8919b36ebf0757679bbbf727141 Mon Sep 17 00:00:00 2001
From: Vivek Sharma <viveksh047@webkul.com>
Date: Wed, 12 Feb 2020 17:11:21 +0530
Subject: [PATCH] [Fixed: issue #2440 has been resolved.]

---
 .../advertisement-four.blade.php              | 21 ++++++++++---------
 .../advertisement-three.blade.php             | 17 ++++++++-------
 .../advertisement-two.blade.php               | 13 ++++++------
 3 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/home/advertisements/advertisement-four.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/home/advertisements/advertisement-four.blade.php
index fa86a1217..5b869486c 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/home/advertisements/advertisement-four.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/home/advertisements/advertisement-four.blade.php
@@ -6,8 +6,9 @@
 @if ($velocityMetaData && $velocityMetaData->advertisement)
     @php
         $advertisement = json_decode($velocityMetaData->advertisement, true);
-        if (isset($advertisement[4])) {
-            $advertisementFour = $advertisement[4];
+        
+        if (isset($advertisement[4]) && is_array($advertisement[4])) {
+            $advertisementFour = array_values(array_filter($advertisement[4]));
         }
     @endphp
 
@@ -18,29 +19,29 @@
 
         <div class="container-fluid advertisement-four-container">
             <div class="row">
-                @if ( isset($advertisementFour[1]))
+                @if ( isset($advertisementFour[0]))
                     <a @if (isset($one)) href="{{ $one }}" @endif class="col-lg-4 col-12 no-padding">
-                        <img class="col-12" src="{{ asset('/storage/' . $advertisementFour[1]) }}" />
+                        <img class="col-12" src="{{ asset('/storage/' . $advertisementFour[0]) }}" />
                     </a>
                 @endif
 
                 <div class="col-lg-4 col-12 offers-ct-panel">
-                    @if ( isset($advertisementFour[2]))
+                    @if ( isset($advertisementFour[1]))
                         <a @if (isset($two)) href="{{ $two }}" @endif class="row col-12 remove-padding-margin">
-                            <img class="col-12 offers-ct-top" src="{{ asset('/storage/' . $advertisementFour[2]) }}" />
+                            <img class="col-12 offers-ct-top" src="{{ asset('/storage/' . $advertisementFour[1]) }}" />
                         </a>
                     @endif
 
-                    @if ( isset($advertisementFour[3]))
+                    @if ( isset($advertisementFour[2]))
                         <a @if (isset($three)) href="{{ $three }}" @endif class="row col-12 remove-padding-margin">
-                            <img class="col-12 offers-ct-bottom" src="{{ asset('/storage/' . $advertisementFour[3]) }}" />
+                            <img class="col-12 offers-ct-bottom" src="{{ asset('/storage/' . $advertisementFour[2]) }}" />
                         </a>
                     @endif
                 </div>
 
-                @if ( isset($advertisementFour[4]))
+                @if ( isset($advertisementFour[3]))
                     <a @if (isset($four)) href="{{ $four }}" @endif class="col-lg-4 col-12 no-padding">
-                        <img class="col-12" src="{{ asset('/storage/' . $advertisementFour[4]) }}" />
+                        <img class="col-12" src="{{ asset('/storage/' . $advertisementFour[3]) }}" />
                     </a>
                 @endif
             </div>
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/home/advertisements/advertisement-three.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/home/advertisements/advertisement-three.blade.php
index 12baf91a1..2be87ee0d 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/home/advertisements/advertisement-three.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/home/advertisements/advertisement-three.blade.php
@@ -6,8 +6,9 @@
 @if ($velocityMetaData && $velocityMetaData->advertisement)
     @php
         $advertisement = json_decode($velocityMetaData->advertisement, true);
-        if (isset($advertisement[3])) {
-            $advertisementThree = $advertisement[3];
+        
+        if (isset($advertisement[3]) && is_array($advertisement[3])) {
+            $advertisementThree = array_values(array_filter($advertisement[3]));
         }
     @endphp
 
@@ -18,21 +19,21 @@
 
         <div class="container-fluid advertisement-three-container">
             <div class="row">
-                @if ( isset($advertisementThree[1]))
+                @if ( isset($advertisementThree[0]))
                     <a @if (isset($one)) href="{{ $one }}" @endif class="col-lg-6 col-md-12 no-padding">
-                        <img src="{{ asset('/storage/' . $advertisementThree[1]) }}" class="full-width" />
+                        <img src="{{ asset('/storage/' . $advertisementThree[0]) }}" class="full-width" />
                     </a>
                 @endif
 
                 <div class="col-lg-6 col-md-12 second-panel">
-                    @if ( isset($advertisementThree[2]))
+                    @if ( isset($advertisementThree[1]))
                         <a @if (isset($two)) href="{{ $two }}" @endif class="row top-container">
-                            <img src="{{ asset('/storage/' . $advertisementThree[2]) }}" class="col-12 pr0" />
+                            <img src="{{ asset('/storage/' . $advertisementThree[1]) }}" class="col-12 pr0" />
                         </a>
                     @endif
-                    @if ( isset($advertisementThree[3]))
+                    @if ( isset($advertisementThree[2]))
                         <a @if (isset($three)) href="{{ $three }}" @endif class="row bottom-container">
-                            <img src="{{ asset('/storage/' . $advertisementThree[3]) }}" class="col-12 pr0" />
+                            <img src="{{ asset('/storage/' . $advertisementThree[2]) }}" class="col-12 pr0" />
                         </a>
                     @endif
                 </div>
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/home/advertisements/advertisement-two.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/home/advertisements/advertisement-two.blade.php
index 9ca611a14..2c3348dcd 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/home/advertisements/advertisement-two.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/home/advertisements/advertisement-two.blade.php
@@ -6,8 +6,9 @@
 @if ($velocityMetaData && $velocityMetaData->advertisement)
     @php
         $advertisement = json_decode($velocityMetaData->advertisement, true);
-        if (isset($advertisement[2])) {
-            $advertisementTwo = $advertisement[2];
+        
+        if (isset($advertisement[2]) && is_array($advertisement[2])) {
+            $advertisementTwo = array_values(array_filter($advertisement[2]));
         }
     @endphp
 
@@ -18,15 +19,15 @@
 
         <div class="container-fluid advertisement-two-container">
             <div class="row">
-                @if ( isset($advertisementTwo[1]))
+                @if ( isset($advertisementTwo[0]))
                     <a class="col-lg-9 col-md-12 no-padding">
-                        <img src="{{ asset('/storage/' . $advertisementTwo[1]) }}" />
+                        <img src="{{ asset('/storage/' . $advertisementTwo[0]) }}" />
                     </a>
                 @endif
                 
-                @if ( isset($advertisementTwo[2]))
+                @if ( isset($advertisementTwo[1]))
                     <a class="col-lg-3 col-md-12 pr0">
-                        <img src="{{ asset('/storage/' . $advertisementTwo[2]) }}" />
+                        <img src="{{ asset('/storage/' . $advertisementTwo[1]) }}" />
                     </a>
                 @endif
             </div>