Merge branch 'master' into multi-lang-support

packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/downloadable.blade.php

@@ -96,6 +96,7 @@
             <td>
                 <div class="control-group" style="margin-bottom: 10px;">
                     <select v-model="link.type" :name="[linkInputName + '[type]']" class="control">
+                        <option value=""></option>
                         <option value="file">{{ __('admin::app.catalog.products.upload-file') }}</option>
                         <option value="url">{{ __('admin::app.catalog.products.url') }}</option>
                     </select>
@@ -531,4 +532,4 @@
 
         });
     </script>
-@endpush
+@endpush

packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/variations.blade.php

@@ -124,7 +124,7 @@
                 <tbody>
 
                 <variant-item v-for='(variant, index) in variants' :variant="variant" :key="index"
-                              :index="variant.id"
+                              :index="index"
                               @onRemoveVariant="removeVariant($event)"></variant-item>
 
                 </tbody>
@@ -550,4 +550,4 @@
             }
         });
     </script>
-@endpush
+@endpush