Merge pull request #605 from jitendra-webkul/jitendra

Issue #581 fixed

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

@@ -1,4 +1,4 @@
 {
-    "/js/shop.js": "/js/shop.js?id=e25827d4b84cbe5d76fb",
+    "/js/shop.js": "/js/shop.js?id=391400bc9a994e60b97f",
     "/css/shop.css": "/css/shop.css?id=f55c895c4bc57f6cd61b"
 }

packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue

@@ -1,7 +1,9 @@
 <template>
     <li>
-        <a :href="url+'/categories/'+this.item['translations'][0].slug">{{ this.item['translations'][0].name }}&emsp;<i class="icon dropdown-right-icon"
-        v-if="haveChildren && item.parent_id != null"></i></a>
+        <a :href="url+'/categories/'+this.item['translations'][0].slug">
+            {{ name }}&emsp;
+            <i class="icon dropdown-right-icon" v-if="haveChildren && item.parent_id != null"></i>
+        </a>
 
         <i :class="[show ? 'icon icon-arrow-down mt-15' : 'icon dropdown-right-icon left mt-15']"
         v-if="haveChildren"  @click="showOrHide"></i>
@@ -24,22 +26,37 @@ export default {
 		item:  Object,
         url: String,
     },
-    data(){
+
+    data() {
         return {
             items_count:0,
             show: false,
         };
     },
+
     mounted: function() {
         if(window.innerWidth > 770){
             this.show = true;
         }
     },
+
     computed: {
         haveChildren() {
             return this.item.children.length ? true : false;
+        },
+
+        name() {
+            if (this.item.translations && this.item.translations.length) {
+                this.item.translations.forEach(function(translation) {
+                    if (translation.locale == document.documentElement.lang)
+                        return translation.name;
+                });
+            }
+
+            return this.item.name;
         }
     },
+
     methods: {
         showOrHide: function() {
             this.show = !this.show;

packages/Webkul/Shop/src/Resources/assets/js/components/category-nav.vue

@@ -19,13 +19,16 @@ export default {
             required: false,
             default: () => ([])
         },
+
         url: String
     },
+
     data(){
         return {
             items_count:0
         };
     },
+    
     computed: {
         items () {
             return JSON.parse(this.categories)