Merge branch 'master' into 'local_production'

application/views/Shop/listShops.php

@@ -19,7 +19,7 @@
           </div>
           <div class="box-body">
             <?php
-                if(!empty($shop_data) && $shop_data['status'] == 'success'){ ?>
+                if(!empty($shop_data) && $shop_data['status'] == 'success' && isset($shop_data['shops'])){ ?>
             <div class="col-md-3">
               <div class="row">
                 <div class="col-md-5"><span>Shop Name </span></div>