Merge branch 'dev' into 7289_sales_already_moved

back/model-config.json

@@ -79,6 +79,9 @@
     "ImageCollectionSize": {
         "dataSource": "vn"
     },
+    "ImageConfig": {
+        "dataSource": "vn"
+    },
     "ImageContainer": {
         "dataSource": "imageStorage"
     },

back/models/image-config.json

@@ -0,0 +1,22 @@
+{
+    "name": "ImageConfig",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "hedera.imageConfig"
+        }
+    },
+    "properties": {
+        "url": {
+            "type": "string"
+        }
+    },
+    "acls": [
+        {
+            "accessType": "READ",
+            "principalType": "ROLE",
+            "principalId": "$authenticated",
+            "permission": "ALLOW"
+        }
+    ]
+}

modules/item/back/models/item-shelving.json

@@ -41,6 +41,9 @@
 		},
 		"available": {
 			"type": "number"
+		},
+		"buyFk": {
+			"type": "number"
 		}
 	},
 	"relations": {

modules/shelving/back/models/shelving.json

@@ -1,6 +1,6 @@
 {
     "name": "Shelving",
-	"base": "VnModel",
+    "base": "VnModel",
     "mixins": {
         "Loggable": true
     },
@@ -44,6 +44,11 @@
             "type": "belongsTo",
             "model": "Worker",
             "foreignKey": "id"
+        },
+        "itemShelving": {
+            "type": "hasMany",
+            "model": "ItemShelving",
+            "foreignKey": "shelvingFk"
         }
     }
 }