From d55dbb1bab13bfd1866b81e9281efae9eb3850db Mon Sep 17 00:00:00 2001
From: Yamel Senih <ysenih@erpya.com>
Date: Fri, 20 Nov 2020 20:50:40 -0400
Subject: [PATCH] Add corporate branding image support

---
 .../ADempiere/Form/PriceChecking/index.vue      |  2 +-
 src/store/getters.js                            |  1 +
 src/store/modules/user.js                       |  6 +++++-
 src/utils/ADempiere/apiConverts/core.js         | 17 +++++++++--------
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/components/ADempiere/Form/PriceChecking/index.vue b/src/components/ADempiere/Form/PriceChecking/index.vue
index a7948670..92a7cbf8 100644
--- a/src/components/ADempiere/Form/PriceChecking/index.vue
+++ b/src/components/ADempiere/Form/PriceChecking/index.vue
@@ -96,7 +96,7 @@ export default {
   },
   computed: {
     organizationImagePath() {
-      return this.$store.getters.avatar
+      return this.$store.getters.corporateBrandingImage
     },
     defaultImage() {
       return require('@/image/ADempiere/priceChecking/no-image.jpg')
diff --git a/src/store/getters.js b/src/store/getters.js
index b4203a1d..488bbd82 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -8,6 +8,7 @@ const getters = {
   cachedViews: state => state.tagsView.cachedViews,
   token: state => state.user.token,
   avatar: state => state.user.avatar,
+  corporateBrandingImage: state => state.user.corporateBrandingImage,
   name: state => state.user.name,
   router: state => state.permission.addRoutes,
   introduction: state => state.user.introduction,
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index ae45e756..71975a0e 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -45,7 +45,8 @@ const state = {
   warehousesList: [],
   warehouse: {},
   isSession: false,
-  sessionInfo: {}
+  sessionInfo: {},
+  corporateBrandingImage: ''
 }
 
 const mutations = {
@@ -72,6 +73,9 @@ const mutations = {
   },
   SET_ORGANIZATION: (state, organization) => {
     state.organization = organization
+    if (organization) {
+      state.corporateBrandingImage = organization.corporateBrandingImage
+    }
   },
   SET_WAREHOUSES_LIST: (state, payload) => {
     state.warehousesList = payload
diff --git a/src/utils/ADempiere/apiConverts/core.js b/src/utils/ADempiere/apiConverts/core.js
index b812ef15..9ba3b746 100644
--- a/src/utils/ADempiere/apiConverts/core.js
+++ b/src/utils/ADempiere/apiConverts/core.js
@@ -61,20 +61,21 @@ export function convertCriteria(criteriaToConvert) {
   }
 }
 
-export function convertOrganization(organizationToConvert) {
-  const { id, uuid, name, description } = organizationToConvert
+export function convertOrganization(organization) {
+  const { id, uuid, name, description } = organization
 
   return {
     id,
     uuid,
     name,
     description,
-    isReadOnly: organizationToConvert.is_read_only,
-    duns: organizationToConvert.duns,
-    taxId: organizationToConvert.tax_id,
-    phone: organizationToConvert.phone,
-    phone2: organizationToConvert.phone2,
-    fax: organizationToConvert.fax
+    isReadOnly: organization.is_read_only,
+    duns: organization.duns,
+    taxId: organization.tax_id,
+    phone: organization.phone,
+    phone2: organization.phone2,
+    fax: organization.fax,
+    corporateBrandingImage: organization.corporate_branding_image
   }
 }