chitanda 发布系统代码

app_CRM/src/components/app-mpicker/app-mpicker.vue

@@ -94,6 +94,14 @@ export default class AppMpicker extends Vue {
      */
     @Prop({default: () => {}}) public acParams?: any;
 
+    /**
+     * 编辑器额外填充参数
+     *
+     * @type {string}
+     * @memberof AppMpicker
+     */
+    @Prop() public extraFillParams?: any;
+
     /**
      * 应用实体主信息属性名称
      *
@@ -231,13 +239,24 @@ export default class AppMpicker extends Vue {
      * @memberof AppMpicker
      */
     public onSelect(selects: any) {
-        let val: Array<any> = [];
+        const val: Array<any> = [];
         if (selects.length > 0) {
             selects.forEach((select: any) => {
                 let index = this.items.findIndex((item) => Object.is(item[this.deKeyField], select));
                 if (index >= 0) {
-                    let item = this.items[index];
-                    val.push({ [this.deKeyField]: item[this.deKeyField], [this.deMajorField]: item[this.deMajorField] });
+                    const item = this.items[index];
+                    const params = { [this.deKeyField]: item[this.deKeyField], [this.deMajorField]: item[this.deMajorField] };
+                    if (isExist(this.extraFillParams)) {
+                        for (const key in this.extraFillParams) {
+                            if (this.extraFillParams.hasOwnProperty(key)) {
+                                const self = this.extraFillParams[key];
+                                if (isExist(item[self.key])) {
+                                    Object.assign(params, { name: self.value, value: item[self.key]});
+                                }
+                            }
+                        }
+                    }
+                    val.push(params);
                 } else {
                     index = this.selectItems.findIndex((item: any) => Object.is(item[this.deKeyField], select));
                     if (index >= 0) {
@@ -246,7 +265,7 @@ export default class AppMpicker extends Vue {
                     }
                 }
             });
-            let value = val.length > 0 ? JSON.stringify(this.formatValue(val)) : '';
+            const value = val.length > 0 ? JSON.stringify(this.formatValue(val)) : '';
             this.$emit('formitemvaluechange', { name: this.name, value: value });
         }
     }
@@ -335,7 +354,18 @@ export default class AppMpicker extends Vue {
                         selects.push({ [this.deKeyField]: select[this.deKeyField], [this.deMajorField]: select[this.deMajorField] });
                         let index = this.items.findIndex((item) => Object.is(item[this.deKeyField], select[this.deKeyField]));
                         if (index < 0) {
-                            this.items.push({ [this.deMajorField]: select[this.deMajorField], [this.deKeyField]: select[this.deKeyField] });
+                            const params = { [this.deMajorField]: select[this.deMajorField], [this.deKeyField]: select[this.deKeyField] }
+                            if (isExist(this.extraFillParams)) {
+                                for (const key in this.extraFillParams) {
+                                    if (this.extraFillParams.hasOwnProperty(key)) {
+                                        const self = this.extraFillParams[key];
+                                        if (isExist(select[self.key])) {
+                                            Object.assign(params, { name: self.value, value: select[self.key]});
+                                        }
+                                    }
+                                }
+                            }
+                            this.items.push(params);
                         }
                     });
                 }

app_CRM/src/components/app-picker/app-picker.vue

@@ -410,13 +410,13 @@ export default class AppPicker extends Vue {
      */
     public onClear($event: any): void {
         if (isExist(this.extraFillParams)) {
-                for (const key in this.extraFillParams) {
-                    if (this.extraFillParams.hasOwnProperty(key)) {
-                        const self = this.extraFillParams[key];
-                        this.$emit('formitemvaluechange', { name: self.value, value: ''});
-                    }
+            for (const key in this.extraFillParams) {
+                if (this.extraFillParams.hasOwnProperty(key)) {
+                    const self = this.extraFillParams[key];
+                    this.$emit('formitemvaluechange', { name: self.value, value: ''});
                 }
             }
+        }
         if (this.valueitem) {
             this.$emit('formitemvaluechange', { name: this.valueitem, value: '' });
         }

app_CRM/src/pages/base/central/page-register.ts

@@ -208,7 +208,6 @@ export const PageComponents = {
         Vue.component('list-account-edit-view', () => import('@pages/marketing/list-account-edit-view/list-account-edit-view.vue'));
         Vue.component('entitlement-pickup-grid-view', () => import('@pages/service/entitlement-pickup-grid-view/entitlement-pickup-grid-view.vue'));
         Vue.component('contact-grid-view', () => import('@pages/base/contact-grid-view/contact-grid-view.vue'));
-        Vue.component('incident-customer-mpickup-view', () => import('@pages/service/incident-customer-mpickup-view/incident-customer-mpickup-view.vue'));
         Vue.component('campaign-activity-by-parent-key', () => import('@pages/marketing/campaign-activity-by-parent-key/campaign-activity-by-parent-key.vue'));
         Vue.component('price-level-pickup-grid-view', () => import('@pages/product/price-level-pickup-grid-view/price-level-pickup-grid-view.vue'));
         Vue.component('ibiz-list-effective-grid-view', () => import('@pages/marketing/ibiz-list-effective-grid-view/ibiz-list-effective-grid-view.vue'));
@@ -226,8 +225,8 @@ export const PageComponents = {
         Vue.component('sales-order-by-parent-key', () => import('@pages/sales/sales-order-by-parent-key/sales-order-by-parent-key.vue'));
         Vue.component('product-pickup-grid-view', () => import('@pages/product/product-pickup-grid-view/product-pickup-grid-view.vue'));
         Vue.component('list-lead-quick-create-by-list', () => import('@pages/marketing/list-lead-quick-create-by-list/list-lead-quick-create-by-list.vue'));
-        Vue.component('goal-summary-view', () => import('@pages/sales/goal-summary-view/goal-summary-view.vue'));
         Vue.component('account-info', () => import('@pages/base/account-info/account-info.vue'));
+        Vue.component('goal-summary-view', () => import('@pages/sales/goal-summary-view/goal-summary-view.vue'));
         Vue.component('connection-role-grid-view', () => import('@pages/runtime/connection-role-grid-view/connection-role-grid-view.vue'));
         Vue.component('incident-pickup-view', () => import('@pages/service/incident-pickup-view/incident-pickup-view.vue'));
         Vue.component('contact-edit-data-panel-view', () => import('@pages/base/contact-edit-data-panel-view/contact-edit-data-panel-view.vue'));

app_CRM/src/pages/base/central/router.ts

@@ -8744,20 +8744,6 @@ const router = new Router({
                     },
                     component: () => import('@pages/base/contact-grid-view/contact-grid-view.vue'),
                 },
-                {
-                    path: 'incidentcustomers/:incidentcustomer?/mpickupview/:mpickupview?',
-                    meta: {
-                        caption: 'entities.incidentcustomer.views.mpickupview.title',
-                        info:'',
-                        parameters: [
-                            { pathName: 'central', parameterName: 'central' },
-                            { pathName: 'incidentcustomers', parameterName: 'incidentcustomer' },
-                            { pathName: 'mpickupview', parameterName: 'mpickupview' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/service/incident-customer-mpickup-view/incident-customer-mpickup-view.vue'),
-                },
                 {
                     path: 'campaignactivities/:campaignactivity?/byparentkey/:byparentkey?',
                     meta: {
@@ -9538,32 +9524,32 @@ const router = new Router({
                     component: () => import('@pages/marketing/list-lead-quick-create-by-list/list-lead-quick-create-by-list.vue'),
                 },
                 {
-                    path: 'goals/:goal?/summaryview/:summaryview?',
+                    path: 'accounts/:account?/info/:info?',
                     meta: {
-                        caption: 'entities.goal.views.summaryview.title',
+                        caption: 'entities.account.views.info.title',
                         info:'',
                         parameters: [
                             { pathName: 'central', parameterName: 'central' },
-                            { pathName: 'goals', parameterName: 'goal' },
-                            { pathName: 'summaryview', parameterName: 'summaryview' },
+                            { pathName: 'accounts', parameterName: 'account' },
+                            { pathName: 'info', parameterName: 'info' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/sales/goal-summary-view/goal-summary-view.vue'),
+                    component: () => import('@pages/base/account-info/account-info.vue'),
                 },
                 {
-                    path: 'accounts/:account?/info/:info?',
+                    path: 'goals/:goal?/summaryview/:summaryview?',
                     meta: {
-                        caption: 'entities.account.views.info.title',
+                        caption: 'entities.goal.views.summaryview.title',
                         info:'',
                         parameters: [
                             { pathName: 'central', parameterName: 'central' },
-                            { pathName: 'accounts', parameterName: 'account' },
-                            { pathName: 'info', parameterName: 'info' },
+                            { pathName: 'goals', parameterName: 'goal' },
+                            { pathName: 'summaryview', parameterName: 'summaryview' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/base/account-info/account-info.vue'),
+                    component: () => import('@pages/sales/goal-summary-view/goal-summary-view.vue'),
                 },
                 {
                     path: 'accounts/:account?/contacts/:contact?/opportunities/:opportunity?/pickupgridview/:pickupgridview?',

app_CRM/src/service/campaign/campaign-service-base.ts

@@ -79,36 +79,36 @@ export default class CampaignServiceBase extends EntityService {
             }
         }
         masterData.campaignlists = campaignlistsData;
-        let leadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
-            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
+        let campaigncampaignsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns'),'undefined')){
+            campaigncampaignsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns') as any);
+            if(campaigncampaignsData && campaigncampaignsData.length && campaigncampaignsData.length > 0){
+                campaigncampaignsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.leads = leadsData;
-        let campaigncampaignsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns'),'undefined')){
-            campaigncampaignsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns') as any);
-            if(campaigncampaignsData && campaigncampaignsData.length && campaigncampaignsData.length > 0){
-                campaigncampaignsData.forEach((item:any) => {
+        masterData.campaigncampaigns = campaigncampaignsData;
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.leadid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.campaigncampaigns = campaigncampaignsData;
+        masterData.leads = leadsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -119,8 +119,8 @@ export default class CampaignServiceBase extends EntityService {
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/campaigns`,data,isloading);
         this.tempStorage.setItem(tempContext.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
         return res;
     }
 
@@ -150,41 +150,41 @@ export default class CampaignServiceBase extends EntityService {
             }
         }
         masterData.campaignlists = campaignlistsData;
-        let leadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
-            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
+        let campaigncampaignsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns'),'undefined')){
+            campaigncampaignsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns') as any);
+            if(campaigncampaignsData && campaigncampaignsData.length && campaigncampaignsData.length > 0){
+                campaigncampaignsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.leads = leadsData;
-        let campaigncampaignsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns'),'undefined')){
-            campaigncampaignsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns') as any);
-            if(campaigncampaignsData && campaigncampaignsData.length && campaigncampaignsData.length > 0){
-                campaigncampaignsData.forEach((item:any) => {
+        masterData.campaigncampaigns = campaigncampaignsData;
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.leadid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.campaigncampaigns = campaigncampaignsData;
+        masterData.leads = leadsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/campaigns/${context.campaign}`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             return res;
     }
 
@@ -213,8 +213,8 @@ export default class CampaignServiceBase extends EntityService {
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/campaigns/${context.campaign}`,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             return res;
     }
 
@@ -231,8 +231,8 @@ export default class CampaignServiceBase extends EntityService {
         let res:any = await  Http.getInstance().get(`/campaigns/getdraft`,isloading);
         res.data.campaign = data.campaign;
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
         return res;
     }
 
@@ -290,41 +290,41 @@ export default class CampaignServiceBase extends EntityService {
             }
         }
         masterData.campaignlists = campaignlistsData;
-        let leadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
-            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
+        let campaigncampaignsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns'),'undefined')){
+            campaigncampaignsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns') as any);
+            if(campaigncampaignsData && campaigncampaignsData.length && campaigncampaignsData.length > 0){
+                campaigncampaignsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.leads = leadsData;
-        let campaigncampaignsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns'),'undefined')){
-            campaigncampaignsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns') as any);
-            if(campaigncampaignsData && campaigncampaignsData.length && campaigncampaignsData.length > 0){
-                campaigncampaignsData.forEach((item:any) => {
+        masterData.campaigncampaigns = campaigncampaignsData;
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.leadid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.campaigncampaigns = campaigncampaignsData;
+        masterData.leads = leadsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/campaigns/${context.campaign}/save`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             return res;
     }
 

app_CRM/src/service/competitor/competitor-service-base.ts

@@ -62,21 +62,6 @@ export default class CompetitorServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let leadcompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
-            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
-            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
-                leadcompetitorsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.leadcompetitors = leadcompetitorsData;
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -107,6 +92,21 @@ export default class CompetitorServiceBase extends EntityService {
             }
         }
         masterData.competitorproducts = competitorproductsData;
+        let leadcompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
+            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
+            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
+                leadcompetitorsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leadcompetitors = leadcompetitorsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -116,9 +116,9 @@ export default class CompetitorServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/competitors`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_competitorproducts',JSON.stringify(res.data.competitorproducts));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
         return res;
     }
 
@@ -133,21 +133,6 @@ export default class CompetitorServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let leadcompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
-            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
-            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
-                leadcompetitorsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.leadcompetitors = leadcompetitorsData;
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -178,11 +163,26 @@ export default class CompetitorServiceBase extends EntityService {
             }
         }
         masterData.competitorproducts = competitorproductsData;
+        let leadcompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
+            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
+            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
+                leadcompetitorsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leadcompetitors = leadcompetitorsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/competitors/${context.competitor}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_competitorproducts',JSON.stringify(res.data.competitorproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             return res;
     }
 
@@ -210,9 +210,9 @@ export default class CompetitorServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/competitors/${context.competitor}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_competitorproducts',JSON.stringify(res.data.competitorproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             return res;
     }
 
@@ -228,9 +228,9 @@ export default class CompetitorServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/competitors/getdraft`,isloading);
         res.data.competitor = data.competitor;
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_competitorproducts',JSON.stringify(res.data.competitorproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
         return res;
     }
 
@@ -258,21 +258,6 @@ export default class CompetitorServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let leadcompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
-            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
-            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
-                leadcompetitorsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.leadcompetitors = leadcompetitorsData;
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -303,11 +288,26 @@ export default class CompetitorServiceBase extends EntityService {
             }
         }
         masterData.competitorproducts = competitorproductsData;
+        let leadcompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
+            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
+            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
+                leadcompetitorsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leadcompetitors = leadcompetitorsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/competitors/${context.competitor}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_competitorproducts',JSON.stringify(res.data.competitorproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             return res;
     }
 

app_CRM/src/service/ibiz-list/ibiz-list-service-base.ts

@@ -64,11 +64,11 @@ export default class IBizListServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let campaignlistsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
-            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
-            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
-                campaignlistsData.forEach((item:any) => {
+        let listaccountsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
+            listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
+            if(listaccountsData && listaccountsData.length && listaccountsData.length > 0){
+                listaccountsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -78,12 +78,12 @@ export default class IBizListServiceBase extends EntityService {
                 });
             }
         }
-        masterData.campaignlists = campaignlistsData;
-        let listcontactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
-            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
-            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
-                listcontactsData.forEach((item:any) => {
+        masterData.listaccounts = listaccountsData;
+        let listleadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
+            listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
+            if(listleadsData && listleadsData.length && listleadsData.length > 0){
+                listleadsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -93,12 +93,12 @@ export default class IBizListServiceBase extends EntityService {
                 });
             }
         }
-        masterData.listcontacts = listcontactsData;
-        let listaccountsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
-            listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
-            if(listaccountsData && listaccountsData.length && listaccountsData.length > 0){
-                listaccountsData.forEach((item:any) => {
+        masterData.listleads = listleadsData;
+        let listcontactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
+            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
+            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
+                listcontactsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -108,12 +108,12 @@ export default class IBizListServiceBase extends EntityService {
                 });
             }
         }
-        masterData.listaccounts = listaccountsData;
-        let listleadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
-            listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
-            if(listleadsData && listleadsData.length && listleadsData.length > 0){
-                listleadsData.forEach((item:any) => {
+        masterData.listcontacts = listcontactsData;
+        let campaignlistsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
+            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
+            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
+                campaignlistsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -123,7 +123,7 @@ export default class IBizListServiceBase extends EntityService {
                 });
             }
         }
-        masterData.listleads = listleadsData;
+        masterData.campaignlists = campaignlistsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -133,10 +133,10 @@ export default class IBizListServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/ibizlists`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
         return res;
     }
 
@@ -151,11 +151,11 @@ export default class IBizListServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let campaignlistsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
-            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
-            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
-                campaignlistsData.forEach((item:any) => {
+        let listaccountsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
+            listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
+            if(listaccountsData && listaccountsData.length && listaccountsData.length > 0){
+                listaccountsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -165,12 +165,12 @@ export default class IBizListServiceBase extends EntityService {
                 });
             }
         }
-        masterData.campaignlists = campaignlistsData;
-        let listcontactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
-            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
-            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
-                listcontactsData.forEach((item:any) => {
+        masterData.listaccounts = listaccountsData;
+        let listleadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
+            listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
+            if(listleadsData && listleadsData.length && listleadsData.length > 0){
+                listleadsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -180,12 +180,12 @@ export default class IBizListServiceBase extends EntityService {
                 });
             }
         }
-        masterData.listcontacts = listcontactsData;
-        let listaccountsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
-            listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
-            if(listaccountsData && listaccountsData.length && listaccountsData.length > 0){
-                listaccountsData.forEach((item:any) => {
+        masterData.listleads = listleadsData;
+        let listcontactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
+            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
+            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
+                listcontactsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -195,12 +195,12 @@ export default class IBizListServiceBase extends EntityService {
                 });
             }
         }
-        masterData.listaccounts = listaccountsData;
-        let listleadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
-            listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
-            if(listleadsData && listleadsData.length && listleadsData.length > 0){
-                listleadsData.forEach((item:any) => {
+        masterData.listcontacts = listcontactsData;
+        let campaignlistsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
+            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
+            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
+                campaignlistsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -210,13 +210,13 @@ export default class IBizListServiceBase extends EntityService {
                 });
             }
         }
-        masterData.listleads = listleadsData;
+        masterData.campaignlists = campaignlistsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/ibizlists/${context.ibizlist}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             return res;
     }
 
@@ -244,10 +244,10 @@ export default class IBizListServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/ibizlists/${context.ibizlist}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             return res;
     }
 
@@ -263,10 +263,10 @@ export default class IBizListServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/ibizlists/getdraft`,isloading);
         res.data.ibizlist = data.ibizlist;
-            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
         return res;
     }
 
@@ -309,11 +309,11 @@ export default class IBizListServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let campaignlistsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
-            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
-            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
-                campaignlistsData.forEach((item:any) => {
+        let listaccountsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
+            listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
+            if(listaccountsData && listaccountsData.length && listaccountsData.length > 0){
+                listaccountsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -323,12 +323,12 @@ export default class IBizListServiceBase extends EntityService {
                 });
             }
         }
-        masterData.campaignlists = campaignlistsData;
-        let listcontactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
-            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
-            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
-                listcontactsData.forEach((item:any) => {
+        masterData.listaccounts = listaccountsData;
+        let listleadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
+            listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
+            if(listleadsData && listleadsData.length && listleadsData.length > 0){
+                listleadsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -338,12 +338,12 @@ export default class IBizListServiceBase extends EntityService {
                 });
             }
         }
-        masterData.listcontacts = listcontactsData;
-        let listaccountsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
-            listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
-            if(listaccountsData && listaccountsData.length && listaccountsData.length > 0){
-                listaccountsData.forEach((item:any) => {
+        masterData.listleads = listleadsData;
+        let listcontactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
+            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
+            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
+                listcontactsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -353,12 +353,12 @@ export default class IBizListServiceBase extends EntityService {
                 });
             }
         }
-        masterData.listaccounts = listaccountsData;
-        let listleadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
-            listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
-            if(listleadsData && listleadsData.length && listleadsData.length > 0){
-                listleadsData.forEach((item:any) => {
+        masterData.listcontacts = listcontactsData;
+        let campaignlistsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
+            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
+            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
+                campaignlistsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -368,13 +368,13 @@ export default class IBizListServiceBase extends EntityService {
                 });
             }
         }
-        masterData.listleads = listleadsData;
+        masterData.campaignlists = campaignlistsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/ibizlists/${context.ibizlist}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             return res;
     }
 

app_CRM/src/service/opportunity/opportunity-service-base.ts

@@ -89,36 +89,36 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        let opportunitycompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
+            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
-        let opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        let quotesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
+            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
+            if(quotesData && quotesData.length && quotesData.length > 0){
+                quotesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.quotes = quotesData;
             Object.assign(data,masterData);
             if(!data.srffrontuf || data.srffrontuf !== "1"){
                 data[this.APPDEKEY] = null;
@@ -129,8 +129,8 @@ export default class OpportunityServiceBase extends EntityService {
             let tempContext:any = JSON.parse(JSON.stringify(context));
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities`,data,isloading);
             this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
         if(context.contact && true){
@@ -150,36 +150,36 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        let opportunitycompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
+            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
-        let opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        let quotesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
+            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
+            if(quotesData && quotesData.length && quotesData.length > 0){
+                quotesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.quotes = quotesData;
             Object.assign(data,masterData);
             if(!data.srffrontuf || data.srffrontuf !== "1"){
                 data[this.APPDEKEY] = null;
@@ -190,8 +190,8 @@ export default class OpportunityServiceBase extends EntityService {
             let tempContext:any = JSON.parse(JSON.stringify(context));
             let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities`,data,isloading);
             this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
         if(context.account && true){
@@ -211,36 +211,36 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        let opportunitycompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
+            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
-        let opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        let quotesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
+            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
+            if(quotesData && quotesData.length && quotesData.length > 0){
+                quotesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.quotes = quotesData;
             Object.assign(data,masterData);
             if(!data.srffrontuf || data.srffrontuf !== "1"){
                 data[this.APPDEKEY] = null;
@@ -251,8 +251,8 @@ export default class OpportunityServiceBase extends EntityService {
             let tempContext:any = JSON.parse(JSON.stringify(context));
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities`,data,isloading);
             this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
         let masterData:any = {};
@@ -271,36 +271,36 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        let opportunitycompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
+            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
-        let opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        let quotesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
+            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
+            if(quotesData && quotesData.length && quotesData.length > 0){
+                quotesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.quotes = quotesData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -311,8 +311,8 @@ export default class OpportunityServiceBase extends EntityService {
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/opportunities`,data,isloading);
         this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
         return res;
     }
 
@@ -343,41 +343,41 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        let opportunitycompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
+            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
-        let opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        let quotesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
+            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
+            if(quotesData && quotesData.length && quotesData.length > 0){
+                quotesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.quotes = quotesData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().put(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
         if(context.contact && context.opportunity){
@@ -397,41 +397,41 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        let opportunitycompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
+            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
-        let opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        let quotesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
+            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
+            if(quotesData && quotesData.length && quotesData.length > 0){
+                quotesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.quotes = quotesData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().put(`/contacts/${context.contact}/opportunities/${context.opportunity}`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
         if(context.account && context.opportunity){
@@ -451,41 +451,41 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        let opportunitycompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
+            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
-        let opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        let quotesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
+            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
+            if(quotesData && quotesData.length && quotesData.length > 0){
+                quotesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.quotes = quotesData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().put(`/accounts/${context.account}/opportunities/${context.opportunity}`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
         let masterData:any = {};
@@ -504,41 +504,41 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        let opportunitycompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
+            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
-        let opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        let quotesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
+            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
+            if(quotesData && quotesData.length && quotesData.length > 0){
+                quotesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.quotes = quotesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/opportunities/${context.opportunity}`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
     }
 
@@ -577,28 +577,28 @@ export default class OpportunityServiceBase extends EntityService {
         if(context.account && context.contact && context.opportunity){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}`,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
         if(context.contact && context.opportunity){
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}/opportunities/${context.opportunity}`,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
         if(context.account && context.opportunity){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/opportunities/${context.opportunity}`,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
             let res:any = await Http.getInstance().get(`/opportunities/${context.opportunity}`,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
     }
 
@@ -616,31 +616,31 @@ export default class OpportunityServiceBase extends EntityService {
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}/opportunities/getdraft`,isloading);
             res.data.opportunity = data.opportunity;
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
         if(context.contact && true){
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}/opportunities/getdraft`,isloading);
             res.data.opportunity = data.opportunity;
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
         if(context.account && true){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/opportunities/getdraft`,isloading);
             res.data.opportunity = data.opportunity;
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
         let res:any = await  Http.getInstance().get(`/opportunities/getdraft`,isloading);
         res.data.opportunity = data.opportunity;
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
         return res;
     }
 
@@ -671,41 +671,41 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        let opportunitycompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
+            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
-        let opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        let quotesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
+            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
+            if(quotesData && quotesData.length && quotesData.length > 0){
+                quotesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.quotes = quotesData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/active`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
         if(context.contact && context.opportunity){
@@ -725,41 +725,41 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        let opportunitycompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
+            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
-        let opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        let quotesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
+            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
+            if(quotesData && quotesData.length && quotesData.length > 0){
+                quotesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.quotes = quotesData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/active`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
         if(context.account && context.opportunity){
@@ -779,41 +779,41 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        let opportunitycompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
+            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
-        let opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        let quotesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
+            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
+            if(quotesData && quotesData.length && quotesData.length > 0){
+                quotesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.quotes = quotesData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/active`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
             return Http.getInstance().post(`/opportunities/${context.opportunity}/active`,data,isloading);
@@ -846,41 +846,41 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        let opportunitycompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
+            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
-        let opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        let quotesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
+            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
+            if(quotesData && quotesData.length && quotesData.length > 0){
+                quotesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.quotes = quotesData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/checkkey`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
         if(context.contact && context.opportunity){
@@ -900,41 +900,41 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        let opportunitycompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
+            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
-        let opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        let quotesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
+            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
+            if(quotesData && quotesData.length && quotesData.length > 0){
+                quotesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.quotes = quotesData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/checkkey`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
         if(context.account && context.opportunity){
@@ -954,41 +954,41 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        let opportunitycompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
+            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
-        let opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        let quotesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
+            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
+            if(quotesData && quotesData.length && quotesData.length > 0){
+                quotesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.quotes = quotesData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/checkkey`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
             return Http.getInstance().post(`/opportunities/${context.opportunity}/checkkey`,data,isloading);
@@ -1036,41 +1036,41 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        let opportunitycompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
+            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
-        let opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        let quotesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
+            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
+            if(quotesData && quotesData.length && quotesData.length > 0){
+                quotesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.quotes = quotesData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/save`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
         if(context.contact && context.opportunity){
@@ -1090,41 +1090,41 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        let opportunitycompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
+            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
-        let opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        let quotesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
+            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
+            if(quotesData && quotesData.length && quotesData.length > 0){
+                quotesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.quotes = quotesData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/save`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
         if(context.account && context.opportunity){
@@ -1144,41 +1144,41 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        let opportunitycompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
+            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
-        let opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        let quotesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
+            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
+            if(quotesData && quotesData.length && quotesData.length > 0){
+                quotesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.quotes = quotesData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/save`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
         let masterData:any = {};
@@ -1197,41 +1197,41 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        let opportunitycompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
+            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
-        let opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        let quotesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
+            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
+            if(quotesData && quotesData.length && quotesData.length > 0){
+                quotesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.quotes = quotesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/opportunities/${context.opportunity}/save`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
     }
 

app_CRM/src/service/sales-literature/sales-literature-service-base.ts

@@ -62,11 +62,11 @@ export default class SalesLiteratureServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let productsalesliteraturesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures'),'undefined')){
-            productsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures') as any);
-            if(productsalesliteraturesData && productsalesliteraturesData.length && productsalesliteraturesData.length > 0){
-                productsalesliteraturesData.forEach((item:any) => {
+        let competitorsalesliteraturesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures'),'undefined')){
+            competitorsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures') as any);
+            if(competitorsalesliteraturesData && competitorsalesliteraturesData.length && competitorsalesliteraturesData.length > 0){
+                competitorsalesliteraturesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -76,7 +76,7 @@ export default class SalesLiteratureServiceBase extends EntityService {
                 });
             }
         }
-        masterData.productsalesliteratures = productsalesliteraturesData;
+        masterData.competitorsalesliteratures = competitorsalesliteraturesData;
         let salesliteratureitemsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems'),'undefined')){
             salesliteratureitemsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems') as any);
@@ -92,11 +92,11 @@ export default class SalesLiteratureServiceBase extends EntityService {
             }
         }
         masterData.salesliteratureitems = salesliteratureitemsData;
-        let competitorsalesliteraturesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures'),'undefined')){
-            competitorsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures') as any);
-            if(competitorsalesliteraturesData && competitorsalesliteraturesData.length && competitorsalesliteraturesData.length > 0){
-                competitorsalesliteraturesData.forEach((item:any) => {
+        let productsalesliteraturesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures'),'undefined')){
+            productsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures') as any);
+            if(productsalesliteraturesData && productsalesliteraturesData.length && productsalesliteraturesData.length > 0){
+                productsalesliteraturesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -106,7 +106,7 @@ export default class SalesLiteratureServiceBase extends EntityService {
                 });
             }
         }
-        masterData.competitorsalesliteratures = competitorsalesliteraturesData;
+        masterData.productsalesliteratures = productsalesliteraturesData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -116,9 +116,9 @@ export default class SalesLiteratureServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/salesliteratures`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
         return res;
     }
 
@@ -133,11 +133,11 @@ export default class SalesLiteratureServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let productsalesliteraturesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures'),'undefined')){
-            productsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures') as any);
-            if(productsalesliteraturesData && productsalesliteraturesData.length && productsalesliteraturesData.length > 0){
-                productsalesliteraturesData.forEach((item:any) => {
+        let competitorsalesliteraturesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures'),'undefined')){
+            competitorsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures') as any);
+            if(competitorsalesliteraturesData && competitorsalesliteraturesData.length && competitorsalesliteraturesData.length > 0){
+                competitorsalesliteraturesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -147,7 +147,7 @@ export default class SalesLiteratureServiceBase extends EntityService {
                 });
             }
         }
-        masterData.productsalesliteratures = productsalesliteraturesData;
+        masterData.competitorsalesliteratures = competitorsalesliteraturesData;
         let salesliteratureitemsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems'),'undefined')){
             salesliteratureitemsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems') as any);
@@ -163,11 +163,11 @@ export default class SalesLiteratureServiceBase extends EntityService {
             }
         }
         masterData.salesliteratureitems = salesliteratureitemsData;
-        let competitorsalesliteraturesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures'),'undefined')){
-            competitorsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures') as any);
-            if(competitorsalesliteraturesData && competitorsalesliteraturesData.length && competitorsalesliteraturesData.length > 0){
-                competitorsalesliteraturesData.forEach((item:any) => {
+        let productsalesliteraturesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures'),'undefined')){
+            productsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures') as any);
+            if(productsalesliteraturesData && productsalesliteraturesData.length && productsalesliteraturesData.length > 0){
+                productsalesliteraturesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -177,12 +177,12 @@ export default class SalesLiteratureServiceBase extends EntityService {
                 });
             }
         }
-        masterData.competitorsalesliteratures = competitorsalesliteraturesData;
+        masterData.productsalesliteratures = productsalesliteraturesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/salesliteratures/${context.salesliterature}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
             this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
+            this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
             return res;
     }
 
@@ -210,9 +210,9 @@ export default class SalesLiteratureServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/salesliteratures/${context.salesliterature}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
             this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
+            this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
             return res;
     }
 
@@ -228,9 +228,9 @@ export default class SalesLiteratureServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/salesliteratures/getdraft`,isloading);
         res.data.salesliterature = data.salesliterature;
-            this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
             this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
+            this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
         return res;
     }
 
@@ -258,11 +258,11 @@ export default class SalesLiteratureServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let productsalesliteraturesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures'),'undefined')){
-            productsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures') as any);
-            if(productsalesliteraturesData && productsalesliteraturesData.length && productsalesliteraturesData.length > 0){
-                productsalesliteraturesData.forEach((item:any) => {
+        let competitorsalesliteraturesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures'),'undefined')){
+            competitorsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures') as any);
+            if(competitorsalesliteraturesData && competitorsalesliteraturesData.length && competitorsalesliteraturesData.length > 0){
+                competitorsalesliteraturesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -272,7 +272,7 @@ export default class SalesLiteratureServiceBase extends EntityService {
                 });
             }
         }
-        masterData.productsalesliteratures = productsalesliteraturesData;
+        masterData.competitorsalesliteratures = competitorsalesliteraturesData;
         let salesliteratureitemsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems'),'undefined')){
             salesliteratureitemsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems') as any);
@@ -288,11 +288,11 @@ export default class SalesLiteratureServiceBase extends EntityService {
             }
         }
         masterData.salesliteratureitems = salesliteratureitemsData;
-        let competitorsalesliteraturesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures'),'undefined')){
-            competitorsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures') as any);
-            if(competitorsalesliteraturesData && competitorsalesliteraturesData.length && competitorsalesliteraturesData.length > 0){
-                competitorsalesliteraturesData.forEach((item:any) => {
+        let productsalesliteraturesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures'),'undefined')){
+            productsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures') as any);
+            if(productsalesliteraturesData && productsalesliteraturesData.length && productsalesliteraturesData.length > 0){
+                productsalesliteraturesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -302,12 +302,12 @@ export default class SalesLiteratureServiceBase extends EntityService {
                 });
             }
         }
-        masterData.competitorsalesliteratures = competitorsalesliteraturesData;
+        masterData.productsalesliteratures = productsalesliteraturesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/salesliteratures/${context.salesliterature}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
             this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
+            this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
             return res;
     }
 

app_CRM/src/service/sales-order/sales-order-service-base.ts

@@ -80,21 +80,6 @@ export default class SalesOrderServiceBase extends EntityService {
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity && context.quote && true){
             let masterData:any = {};
-        let salesorderdetailsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
-            salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
-            if(salesorderdetailsData && salesorderdetailsData.length && salesorderdetailsData.length > 0){
-                salesorderdetailsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.salesorderdetailid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.salesorderdetails = salesorderdetailsData;
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -110,21 +95,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            if(!data.srffrontuf || data.srffrontuf !== "1"){
-                data[this.APPDEKEY] = null;
-            }
-            if(data.srffrontuf){
-                delete data.srffrontuf;
-            }
-            let tempContext:any = JSON.parse(JSON.stringify(context));
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.contact && context.opportunity && context.quote && true){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -140,6 +110,21 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.contact && context.opportunity && context.quote && true){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -155,21 +140,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            if(!data.srffrontuf || data.srffrontuf !== "1"){
-                data[this.APPDEKEY] = null;
-            }
-            if(data.srffrontuf){
-                delete data.srffrontuf;
-            }
-            let tempContext:any = JSON.parse(JSON.stringify(context));
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.account && context.opportunity && context.quote && true){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -185,6 +155,21 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.account && context.opportunity && context.quote && true){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -200,21 +185,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            if(!data.srffrontuf || data.srffrontuf !== "1"){
-                data[this.APPDEKEY] = null;
-            }
-            if(data.srffrontuf){
-                delete data.srffrontuf;
-            }
-            let tempContext:any = JSON.parse(JSON.stringify(context));
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.opportunity && context.quote && true){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -230,6 +200,21 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.opportunity && context.quote && true){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -245,21 +230,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            if(!data.srffrontuf || data.srffrontuf !== "1"){
-                data[this.APPDEKEY] = null;
-            }
-            if(data.srffrontuf){
-                delete data.srffrontuf;
-            }
-            let tempContext:any = JSON.parse(JSON.stringify(context));
-            let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.quote && true){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -275,6 +245,21 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.quote && true){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -290,20 +275,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            if(!data.srffrontuf || data.srffrontuf !== "1"){
-                data[this.APPDEKEY] = null;
-            }
-            if(data.srffrontuf){
-                delete data.srffrontuf;
-            }
-            let tempContext:any = JSON.parse(JSON.stringify(context));
-            let res:any = await Http.getInstance().post(`/quotes/${context.quote}/salesorders`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -319,6 +290,20 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/quotes/${context.quote}/salesorders`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -334,6 +319,21 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+        let salesorderdetailsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
+            salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
+            if(salesorderdetailsData && salesorderdetailsData.length && salesorderdetailsData.length > 0){
+                salesorderdetailsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.salesorderdetailid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.salesorderdetails = salesorderdetailsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -343,8 +343,8 @@ export default class SalesOrderServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/salesorders`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
         return res;
     }
 
@@ -360,21 +360,6 @@ export default class SalesOrderServiceBase extends EntityService {
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity && context.quote && context.salesorder){
             let masterData:any = {};
-        let salesorderdetailsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
-            salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
-            if(salesorderdetailsData && salesorderdetailsData.length && salesorderdetailsData.length > 0){
-                salesorderdetailsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.salesorderdetailid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.salesorderdetails = salesorderdetailsData;
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -390,14 +375,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.contact && context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -413,6 +390,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.contact && context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -428,14 +413,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.account && context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -451,6 +428,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.account && context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -466,14 +451,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -489,6 +466,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -504,14 +489,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -527,6 +504,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -542,13 +527,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/quotes/${context.quote}/salesorders/${context.salesorder}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -564,6 +542,13 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/quotes/${context.quote}/salesorders/${context.salesorder}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -579,10 +564,25 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+        let salesorderdetailsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
+            salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
+            if(salesorderdetailsData && salesorderdetailsData.length && salesorderdetailsData.length > 0){
+                salesorderdetailsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.salesorderdetailid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.salesorderdetails = salesorderdetailsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/salesorders/${context.salesorder}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             return res;
     }
 
@@ -626,37 +626,37 @@ export default class SalesOrderServiceBase extends EntityService {
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity && context.quote && context.salesorder){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             return res;
         }
         if(context.contact && context.opportunity && context.quote && context.salesorder){
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             return res;
         }
         if(context.account && context.opportunity && context.quote && context.salesorder){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             return res;
         }
         if(context.opportunity && context.quote && context.salesorder){
             let res:any = await Http.getInstance().get(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             return res;
         }
         if(context.quote && context.salesorder){
             let res:any = await Http.getInstance().get(`/quotes/${context.quote}/salesorders/${context.salesorder}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             return res;
         }
             let res:any = await Http.getInstance().get(`/salesorders/${context.salesorder}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             return res;
     }
 
@@ -673,42 +673,42 @@ export default class SalesOrderServiceBase extends EntityService {
         if(context.account && context.contact && context.opportunity && context.quote && true){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/getdraft`,isloading);
             res.data.salesorder = data.salesorder;
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             return res;
         }
         if(context.contact && context.opportunity && context.quote && true){
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/getdraft`,isloading);
             res.data.salesorder = data.salesorder;
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             return res;
         }
         if(context.account && context.opportunity && context.quote && true){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/getdraft`,isloading);
             res.data.salesorder = data.salesorder;
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             return res;
         }
         if(context.opportunity && context.quote && true){
             let res:any = await Http.getInstance().get(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/getdraft`,isloading);
             res.data.salesorder = data.salesorder;
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             return res;
         }
         if(context.quote && true){
             let res:any = await Http.getInstance().get(`/quotes/${context.quote}/salesorders/getdraft`,isloading);
             res.data.salesorder = data.salesorder;
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             return res;
         }
         let res:any = await  Http.getInstance().get(`/salesorders/getdraft`,isloading);
         res.data.salesorder = data.salesorder;
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
         return res;
     }
 
@@ -739,21 +739,6 @@ export default class SalesOrderServiceBase extends EntityService {
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity && context.quote && context.salesorder){
             let masterData:any = {};
-        let salesorderdetailsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
-            salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
-            if(salesorderdetailsData && salesorderdetailsData.length && salesorderdetailsData.length > 0){
-                salesorderdetailsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.salesorderdetailid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.salesorderdetails = salesorderdetailsData;
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -769,14 +754,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.contact && context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -792,6 +769,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.contact && context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -807,14 +792,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.account && context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -830,6 +807,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.account && context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -845,14 +830,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -868,6 +845,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -883,14 +868,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -906,6 +883,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -921,10 +906,25 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+        let salesorderdetailsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
+            salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
+            if(salesorderdetailsData && salesorderdetailsData.length && salesorderdetailsData.length > 0){
+                salesorderdetailsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.salesorderdetailid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.salesorderdetails = salesorderdetailsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/quotes/${context.quote}/salesorders/${context.salesorder}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             return res;
         }
             return Http.getInstance().post(`/salesorders/${context.salesorder}/checkkey`,data,isloading);
@@ -957,21 +957,6 @@ export default class SalesOrderServiceBase extends EntityService {
     public async GenInvoice(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity && context.quote && context.salesorder){
             let masterData:any = {};
-        let salesorderdetailsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
-            salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
-            if(salesorderdetailsData && salesorderdetailsData.length && salesorderdetailsData.length > 0){
-                salesorderdetailsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.salesorderdetailid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.salesorderdetails = salesorderdetailsData;
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -987,14 +972,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/geninvoice`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.contact && context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -1010,6 +987,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/geninvoice`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.contact && context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -1025,14 +1010,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/geninvoice`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.account && context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -1048,6 +1025,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/geninvoice`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.account && context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -1063,14 +1048,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/geninvoice`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -1086,6 +1063,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/geninvoice`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -1101,14 +1086,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/geninvoice`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -1124,6 +1101,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/geninvoice`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -1139,10 +1124,25 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+        let salesorderdetailsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
+            salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
+            if(salesorderdetailsData && salesorderdetailsData.length && salesorderdetailsData.length > 0){
+                salesorderdetailsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.salesorderdetailid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.salesorderdetails = salesorderdetailsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/quotes/${context.quote}/salesorders/${context.salesorder}/geninvoice`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             return res;
         }
             return Http.getInstance().post(`/salesorders/${context.salesorder}/geninvoice`,data,isloading);
@@ -1160,21 +1160,6 @@ export default class SalesOrderServiceBase extends EntityService {
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity && context.quote && context.salesorder){
             let masterData:any = {};
-        let salesorderdetailsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
-            salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
-            if(salesorderdetailsData && salesorderdetailsData.length && salesorderdetailsData.length > 0){
-                salesorderdetailsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.salesorderdetailid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.salesorderdetails = salesorderdetailsData;
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -1190,14 +1175,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.contact && context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -1213,6 +1190,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.contact && context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -1228,14 +1213,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.account && context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -1251,6 +1228,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.account && context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -1266,14 +1251,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -1289,6 +1266,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -1304,14 +1289,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -1327,6 +1304,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -1342,13 +1327,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/quotes/${context.quote}/salesorders/${context.salesorder}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -1364,6 +1342,13 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/quotes/${context.quote}/salesorders/${context.salesorder}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -1379,10 +1364,25 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+        let salesorderdetailsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
+            salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
+            if(salesorderdetailsData && salesorderdetailsData.length && salesorderdetailsData.length > 0){
+                salesorderdetailsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.salesorderdetailid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.salesorderdetails = salesorderdetailsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/salesorders/${context.salesorder}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             return res;
     }
 

app_CRM/src/store/modules/view-action/state.ts

@@ -1102,7 +1102,6 @@ export const viewstate: any = {
                 '05d66c9ecb6eeb18a00a23cca19bf042',
                 'e52af970c14fd89546ac8ccaecab460c',
                 'ba34ee36c1d0de288403607e17e7eb3e',
-                '5f31eceb2d615687c16eab39b11af0b9',
                 '0dff48c04927315f77dd70a9a2767b59',
             ],
         },
@@ -1155,16 +1154,6 @@ export const viewstate: any = {
                 'c420212fae385872d6ae89e3d237350a',
             ],
         },
-        {
-            viewtag: '5f31eceb2d615687c16eab39b11af0b9',
-            viewmodule: 'Service',
-            viewname: 'IncidentCustomerMPickupView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-                '8dca8823a924f513bf8c52bc3d321cff',
-            ],
-        },
         {
             viewtag: '5f8f689d5dccc3db6d2b74a24a8b24ef',
             viewmodule: 'Sales',
@@ -1302,7 +1291,6 @@ export const viewstate: any = {
                 '05d66c9ecb6eeb18a00a23cca19bf042',
                 'e52af970c14fd89546ac8ccaecab460c',
                 'ba34ee36c1d0de288403607e17e7eb3e',
-                '5f31eceb2d615687c16eab39b11af0b9',
                 '0dff48c04927315f77dd70a9a2767b59',
             ],
         },

app_CRM/src/widgets/incident/by-parent-key-form/by-parent-key-form.html

@@ -151,24 +151,7 @@
 <i-col v-show="detailsModel.description.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='description' :itemRules="this.rules.description" class='' :caption="$t('entities.incident.byparentkey_form.details.description')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.description.error" :isEmptyCaption="false" labelPos="LEFT">
     
-<app-mpicker
-    :activeData="data"
-    :disabled="detailsModel.description.disabled"
-    :curvalue="data.description"
-    name="description"
-    :context="context"
-    :viewparams="viewparams"
-    :localContext ='{ }' 
-    :localParam ='{ }' 
-    :service="service"
-    valueitem=''
-    deMajorField='customername'
-    deKeyField='incidentcustomer'
-    :acParams="{ serviceName: 'IncidentCustomerService', interfaceName: 'FetchDefault'}"
-    :pickupView="{ viewname: 'incident-customer-mpickup-view', title: $t('entities.incidentcustomer.views.mpickupview.title'), deResParameters: [], parameters: [{ pathName: 'incidentcustomers', parameterName: 'incidentcustomer' }, { pathName: 'mpickupview', parameterName: 'mpickupview' } ], placement:'' }"
-    @formitemvaluechange="onFormItemValueChange($event)" 
-    style="">
-</app-mpicker>
+// description多项选择编辑器未配置选择视图
 
 </app-form-item>
 

app_CRM/src/widgets/incident/quick-create-form/quick-create-form.html

@@ -140,24 +140,7 @@
 <i-col v-show="detailsModel.description.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='description' :itemRules="this.rules.description" class='' :caption="$t('entities.incident.quickcreate_form.details.description')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.description.error" :isEmptyCaption="false" labelPos="LEFT">
     
-<app-mpicker
-    :activeData="data"
-    :disabled="detailsModel.description.disabled"
-    :curvalue="data.description"
-    name="description"
-    :context="context"
-    :viewparams="viewparams"
-    :localContext ='{ }' 
-    :localParam ='{ }' 
-    :service="service"
-    valueitem=''
-    deMajorField='customername'
-    deKeyField='incidentcustomer'
-    :acParams="{ serviceName: 'IncidentCustomerService', interfaceName: 'FetchDefault'}"
-    :pickupView="{ viewname: 'incident-customer-mpickup-view', title: $t('entities.incidentcustomer.views.mpickupview.title'), deResParameters: [], parameters: [{ pathName: 'incidentcustomers', parameterName: 'incidentcustomer' }, { pathName: 'mpickupview', parameterName: 'mpickupview' } ], placement:'' }"
-    @formitemvaluechange="onFormItemValueChange($event)" 
-    style="">
-</app-mpicker>
+// description多项选择编辑器未配置选择视图
 
 </app-form-item>
 

businesscentral-core/src/main/resources/liquibase/h2_table.xml

@@ -4769,7 +4769,7 @@
 
 
     <!--输出实体[INCIDENT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-incident-110-59">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-incident-114-59">
         <createTable tableName="INCIDENT">
                 <column name="LASTONHOLDTIME" remarks="" type="DATETIME">
                 </column>
@@ -11357,43 +11357,43 @@
        <addForeignKeyConstraint baseColumnNames="RESOURCESPECID" baseTableName="SERVICE" constraintName="DER1N_SERVICE__RESOURCESPEC__R" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="RESOURCESPECID" referencedTableName="RESOURCESPEC" validate="true"/>
     </changeSet>
         <!--输出实体[INCIDENT]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-110-260">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-114-260">
        <addForeignKeyConstraint baseColumnNames="PRIMARYCONTACTID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__CONTACT__PRIMA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTACTID" referencedTableName="CONTACT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-110-261">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-114-261">
        <addForeignKeyConstraint baseColumnNames="RESPONSIBLECONTACTID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__CONTACT__RESPO" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTACTID" referencedTableName="CONTACT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-110-262">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-114-262">
        <addForeignKeyConstraint baseColumnNames="CONTRACTDETAILID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__CONTRACTDETAIL" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTRACTDETAILID" referencedTableName="CONTRACTDETAIL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-110-263">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-114-263">
        <addForeignKeyConstraint baseColumnNames="CONTRACTID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__CONTRACT__CONT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTRACTID" referencedTableName="CONTRACT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-110-264">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-114-264">
        <addForeignKeyConstraint baseColumnNames="ENTITLEMENTID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__ENTITLEMENT__E" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ENTITLEMENTID" referencedTableName="ENTITLEMENT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-110-265">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-114-265">
        <addForeignKeyConstraint baseColumnNames="EXISTINGCASE" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__INCIDENT__EXIS" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="INCIDENTID" referencedTableName="INCIDENT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-110-266">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-114-266">
        <addForeignKeyConstraint baseColumnNames="MASTERID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__INCIDENT__MAST" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="INCIDENTID" referencedTableName="INCIDENT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-110-267">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-114-267">
        <addForeignKeyConstraint baseColumnNames="PARENTCASEID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__INCIDENT__PARE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="INCIDENTID" referencedTableName="INCIDENT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-110-268">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-114-268">
        <addForeignKeyConstraint baseColumnNames="PRODUCTID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__PRODUCT__PRODU" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRODUCTID" referencedTableName="PRODUCT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-110-269">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-114-269">
        <addForeignKeyConstraint baseColumnNames="FIRSTRESPONSEBYKPIID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__SLAKPIINSTANCE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAKPIINSTANCEID" referencedTableName="SLAKPIINSTANCE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-110-271">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-114-271">
        <addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-110-272">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-114-272">
        <addForeignKeyConstraint baseColumnNames="SUBJECTID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__SUBJECT__SUBJE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SUBJECTID" referencedTableName="SUBJECT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-110-273">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-114-273">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__TRANSACTIONCUR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[INCIDENTCUSTOMER]外键关系 -->