Merge pull request #91 from Shape-and-Shift/esd-3.0.1

ESD-3.0.1

CHANGELOG_de-DE.md

@@ -1,3 +1,6 @@
+# 3.0.1
+- Verbessert den Upload der Seriennummer per csv-Datei
+
 # 3.0.0
 - Shopware 6 Kompatibilität
 

CHANGELOG_en-GB.md

@@ -1,3 +1,6 @@
+# 3.0.1
+- Improved the upload serial number by csv file
+
 # 3.0.0
 - Shopware 6 compatibility
 

composer.json

@@ -3,7 +3,7 @@
     "description":"ESD / Download plugin",
     "type":"shopware-platform-plugin",
     "keywords": ["esd", "download"],
-    "version":"3.0.0",
+    "version":"3.0.1",
     "license":"proprietary",
     "authors":[
         {

makefile

@@ -64,3 +64,6 @@ review: ## Review
 	make ecs -B
 	make phpunit -B
 	make eslint -B
+
+zip:
+	shopware-cli extension zip . --release --disable-git --output-directory ../

src/Resources/app/administration/src/module/sas-esd/component/sas-esd-modal-csv/index.js

@@ -179,8 +179,8 @@ export default {
             _this.callback(this.form.csv);
         },
         buildMappedCsv() {
-            const _this = this;
             const csv = this.hasHeaders ? drop(this.csv) : this.csv;
+            const _this = this;
             return map(csv, (row) => {
                 const newRow = {};
                 forEach(_this.map, (column, field) => {
@@ -224,6 +224,7 @@ export default {
         },
         toggleHasHeaders() {
             this.hasHeaders = !this.hasHeaders;
+            this.map = this.hasHeaders ? { serial: null } : { serial: 0 };
         },
         makeId(id) {
             return `${id}${this._uid}`;
@@ -242,12 +243,13 @@ export default {
     watch: {
         map: {
             deep: true,
-            handler: (newVal) => {
+            immediate: true,
+            handler(newVal) {
                 if (!this.url) {
                     const hasAllKeys = Array.isArray(this.mapFields) ? every(this.mapFields, (item) => {
-                        return newVal.hasOwnProperty(item);
+                        return newVal.hasOwnProperty(item) && newVal[item] !== null;
                     }) : every(this.mapFields, (item, key) => {
-                        return newVal.hasOwnProperty(key);
+                        return newVal.hasOwnProperty(key) && newVal[key] !== null;
                     });
                     if (hasAllKeys) {
                         this.createNotificationSuccess({
@@ -257,6 +259,8 @@ export default {
                             ),
                         });
                         this.isDisabled = false;
+                    } else {
+                        this.isDisabled = true;
                     }
                 }
             },
@@ -278,6 +282,12 @@ export default {
                 }
             }
         },
+        isValidFileMimeType() {
+            if (this.isValidFileMimeType) {
+                this.load();
+                this.map = this.hasHeaders ? this.map : { serial: 0 };
+            }
+        },
     },
     computed: {
         ...mapState('swProductDetail', [

src/Resources/app/administration/src/module/sas-esd/component/sas-esd-modal-csv/sas-esd-modal-csv.html.twig

@@ -24,7 +24,7 @@ name="hasHeaders"
 :value="hasHeaders"
 :class="checkboxClass"
 :label="$tc('sas-esd.sas-esd-modal-csv.checkboxLabel')"
-@@update:value="toggleHasHeaders"
+@update:value="toggleHasHeaders"
 />
                     </slot>
                 </div>
@@ -84,7 +84,10 @@ size="small"
 v-if="sample"
 class="vue-csv-mapping"
 >
-                    <table :class="tableClass">
+                    <table
+v-if="hasHeaders"
+:class="tableClass"
+>
                         <slot name="thead">
                             <thead>
                             <tr>

src/Resources/public/static/css/152.css

@@ -0,0 +1 @@
+.sas-process-bar-container{background:#f0f0f0;height:10px;width:100%;border-radius:10px}.sas-process-bar{background:#189eff;height:10px;width:0;border-radius:10px;transition:width 400ms}

src/Resources/public/static/css/167.css

@@ -0,0 +1 @@
+

src/Resources/public/static/css/447.css

@@ -0,0 +1 @@
+

src/Resources/public/static/css/639.css

@@ -0,0 +1 @@
+.sas-esd-csv-import .sw-alert{margin-top:5px}.sas-esd-csv-import .sw-alert.sw-alert--error{padding:5px}.sas-esd-csv-import .csv-import-file{margin-top:24px;margin-bottom:22px}