recompile and fix

packages/Webkul/Ui/publishable/assets/mix-manifest.json

@@ -0,0 +1,4 @@
+{
+    "/js/ui.js": "/js/ui.js?id=cb527fcbce0488f30069",
+    "/css/ui.css": "/css/ui.css?id=57058b6f0141496171be"
+}

packages/Webkul/Ui/src/Resources/assets/js/components/datagrid/datagrid-plus.vue

@@ -102,12 +102,12 @@ export default {
         DatagridPagination,
         DatagridTable,
         DatagridExtraFilters,
-        DatagridFilterTags
+        DatagridFilterTags,
     },
 
     mixins: [PersistDatagridAttributes],
 
-    data: function() {
+    data: function () {
         return {
             dataGridIndex: 0,
             currentSort: null,
@@ -115,11 +115,11 @@ export default {
             id: btoa(this.src),
             isDataLoaded: false,
             massActionTargets: [],
-            url: this.src
+            url: this.src,
         };
     },
 
-    mounted: function() {
+    mounted: function () {
         this.makeURL();
     },
 
@@ -162,10 +162,21 @@ export default {
 
             axios
                 .get(this.url)
-                .then(function(response) {
+                .then(function (response) {
                     if (response.status === 200) {
                         let results = response.data;
 
+                        if (
+                            ! results.records.data.length &&
+                            results.records.prev_page_url
+                        ) {
+                            self.url = results.records.prev_page_url;
+
+                            self.refresh();
+
+                            return;
+                        }
+
                         self.initResponseProps(results);
 
                         self.initDatagrid();
@@ -173,7 +184,7 @@ export default {
                         self.dataGridIndex += 1;
                     }
                 })
-                .catch(function(error) {
+                .catch(function (error) {
                     console.log(error);
                 });
         },
@@ -196,7 +207,7 @@ export default {
                     id: parseInt(id),
                     type: this.massActions[id].type,
                     action: this.massActions[id].action,
-                    confirm_text: this.massActions[id].confirm_text
+                    confirm_text: this.massActions[id].confirm_text,
                 });
             }
         },
@@ -417,7 +428,7 @@ export default {
             this.filters.push({
                 column: 'perPage',
                 cond: 'eq',
-                val: currentPerPageSelection
+                val: currentPerPageSelection,
             });
 
             this.makeURL();
@@ -452,7 +463,7 @@ export default {
                 this.url = pageLink;
                 this.refresh();
             }
-        }
-    }
+        },
+    },
 };
 </script>

packages/Webkul/Velocity/src/Resources/views/shop/layouts/top-nav/login-section.blade.php

@@ -3,7 +3,7 @@
 <div id="account">
     <div class="d-inline-block welcome-content dropdown-toggle">
         @if (auth()->guard('customer')->user() && auth()->guard('customer')->user()->image)
-            <img class= "profile-small-icon" src="{{ auth('customer')->user()->image_url }}" alt="{{ auth('customer')->user()->first_name }}"/>
+            <i class="align-vertical-top"><img class= "profile-small-icon" src="{{ auth('customer')->user()->image_url }}" alt="{{ auth('customer')->user()->first_name }}"/></i>
         @else
             <i class="material-icons align-vertical-top">perm_identity</i>
         @endif