-
-
-
-
-
-
+
-
-
-
-
-
- 
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
-
+
+
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts
index a77718a65..392ce148a 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts
@@ -58,7 +58,7 @@ public salesDeclaredCustomer: any=[];
public getCustomValues:any = { UOMList: this.UOMList,frequencyList: this.frequencyList,businessExpenseList: this.businessExpenseList,businessIncomeList:this.businessIncomeList,pdid:'',company_id:'',grossProfitTypeList:this.grossProfitTypeList,salesDeclaredCustomer:this.salesDeclaredCustomer};
DailyPurchaseComponent:boolean;
PurchaseComponent:boolean;
- documentsAndFilesList: any;
+documentsAndFilesList: any = [];
//public finalData: any;
constructor(notifier: NotifierService, private route: ActivatedRoute,
private router: Router,
@@ -103,6 +103,7 @@ public viewerOptions: any = {
this.getAIMaster('FREQUENCY',2);
this.getAIMaster('BUSINESSEXPENSES',3);
this.getAIMaster('BUSINESSINCOME',4);
+ this.retriveFile();
}
// load ai details
loadAIDetails(): void{
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts
index 12b18dd8c..9373103cd 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts
@@ -242,7 +242,7 @@ export class BusinessAssetsInfoComponent implements OnInit {
let addressType = dataValue.address_type != 1 ? selectedAddressType.address_type : dataValue.address_type_others;
this.address_type = addressType;
- let address = dataValue.address + ' , ' + selectedCity.city_name + ',' + selectedState.name + '-' + (dataValue.pincode == 1 ? dataValue.pincode_others : selectedPincode.pincode);
+ let address = dataValue.address.replace(/\n/g,"") + ' , ' + selectedCity.city_name + ',' + selectedState.name + '-' + (dataValue.pincode == 1 ? dataValue.pincode_others : selectedPincode.pincode);
this.placeholderName[inx] = 'Was any business activity seen at the ' + addressType + ' during PD visit?';
let addressLabel = address + ' / ' + addressType;
@@ -284,7 +284,7 @@ export class BusinessAssetsInfoComponent implements OnInit {
let addressType = dataValue.address_type != 1 ? selectedAddressType.address_type : dataValue.address_type_others;
this.address_type = addressType;
- let address = dataValue.alternative_address + ' , ' + selectedCity.city_name + ',' + selectedState.name + '-' + (dataValue.alternative_pincode == 1 ? dataValue.alternative_pincode_others : selectedPincode.pincode);
+ let address = dataValue.alternative_address.replace(/\n/g,"") + ' , ' + selectedCity.city_name + ',' + selectedState.name + '-' + (dataValue.alternative_pincode == 1 ? dataValue.alternative_pincode_others : selectedPincode.pincode);
this.placeholderName[inx] = 'Was any business activity seen at the ' + addressType + ' during PD visit?';
let addressLabel = address + ' / ' + addressType;
@@ -566,7 +566,7 @@ export class BusinessAssetsInfoComponent implements OnInit {
initBusinessAddressDetailsWithdata(data) {
return this._formBuilder.group({
- address_label: [data.address_label],
+ address_label: [data.address_label.replace(/\n/g,"")],
business_years: [data.business_years],
business_month: [data.business_month],
business_address_availability: [data.business_address_availability],
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
index cb63fd4e5..3e5a295b4 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
@@ -1057,8 +1057,8 @@
- Countries Where Max Sales Done for
- {{wholesale.value.main_products}}
+
Countries Where The Export Is Being Done for
{{wholesale.value.main_products}}
diff --git a/ng6-seed/src/app/settings/users/user-profile/user-profile-component.html b/ng6-seed/src/app/settings/users/user-profile/user-profile-component.html
index fd36e059f..251edf7e1 100755
--- a/ng6-seed/src/app/settings/users/user-profile/user-profile-component.html
+++ b/ng6-seed/src/app/settings/users/user-profile/user-profile-component.html
@@ -30,7 +30,7 @@
-
diff --git a/ng6-seed/src/environments/environment.prod.ts b/ng6-seed/src/environments/environment.prod.ts
index 10136917c..75f9326ea 100755
--- a/ng6-seed/src/environments/environment.prod.ts
+++ b/ng6-seed/src/environments/environment.prod.ts
@@ -20,14 +20,14 @@ export const environment = {
venUserPoolId: '',
venClientId: '',
- firebase: {
- apiKey: "AIzaSyCzmyM0WJ0wdLf8UsYoZ4GreICimyt7SEk",
- authDomain: "ssa-push.firebaseapp.com",
- databaseURL: "https://ssa-push.firebaseio.com",
- projectId: "ssa-push",
- storageBucket: "ssa-push.appspot.com",
- messagingSenderId: "627754063571",
- appId: "1:627754063571:web:8cfa56d80607267b"
- }
+ firebase: {
+ apiKey: "AIzaSyCk86rasBR2-sXlVu6ACUO406EM_1mcwgo",
+ authDomain: "pdgenie-prod.firebaseapp.com",
+ databaseURL: "https://pdgenie-prod.firebaseio.com%26quot%3B%2C/",
+ projectId: "pdgenie-prod",
+ storageBucket: "",
+ messagingSenderId: "906855209078",
+ appId: "1:906855209078:web:c1583378f1fb2c71"
+ }
};
\ No newline at end of file
diff --git a/ng6-seed/src/environments/environment.stage.ts b/ng6-seed/src/environments/environment.stage.ts
index 3651580a3..e1469f6cf 100644
--- a/ng6-seed/src/environments/environment.stage.ts
+++ b/ng6-seed/src/environments/environment.stage.ts
@@ -19,13 +19,24 @@ export const environment = {
venUserPoolId: '',
venClientId: '',
+ // firebase: {
+ // apiKey: "AIzaSyCzmyM0WJ0wdLf8UsYoZ4GreICimyt7SEk",
+ // authDomain: "ssa-push.firebaseapp.com",
+ // databaseURL: "https://ssa-push.firebaseio.com",
+ // projectId: "ssa-push",
+ // storageBucket: "ssa-push.appspot.com",
+ // messagingSenderId: "627754063571",
+ // appId: "1:627754063571:web:8cfa56d80607267b"
+ // }
+
firebase: {
- apiKey: "AIzaSyCzmyM0WJ0wdLf8UsYoZ4GreICimyt7SEk",
- authDomain: "ssa-push.firebaseapp.com",
- databaseURL: "https://ssa-push.firebaseio.com",
- projectId: "ssa-push",
- storageBucket: "ssa-push.appspot.com",
- messagingSenderId: "627754063571",
- appId: "1:627754063571:web:8cfa56d80607267b"
+ apiKey: "AIzaSyCk86rasBR2-sXlVu6ACUO406EM_1mcwgo",
+ authDomain: "pdgenie-prod.firebaseapp.com",
+ databaseURL: "https://pdgenie-prod.firebaseio.com%26quot%3B%2C/",
+ projectId: "pdgenie-prod",
+ storageBucket: "",
+ messagingSenderId: "906855209078",
+ appId: "1:906855209078:web:c1583378f1fb2c71"
}
+
};
\ No newline at end of file
diff --git a/ng6-seed/src/environments/environment.ts b/ng6-seed/src/environments/environment.ts
index f93b57096..734fc0f4a 100755
--- a/ng6-seed/src/environments/environment.ts
+++ b/ng6-seed/src/environments/environment.ts
@@ -12,14 +12,24 @@ export const environment = {
authorization: 'sparqvenba2018',
+ // firebase: {
+ // apiKey: "AIzaSyCzmyM0WJ0wdLf8UsYoZ4GreICimyt7SEk",
+ // authDomain: "ssa-push.firebaseapp.com",
+ // databaseURL: "https://ssa-push.firebaseio.com",
+ // projectId: "ssa-push",
+ // storageBucket: "ssa-push.appspot.com",
+ // messagingSenderId: "627754063571",
+ // appId: "1:627754063571:web:8cfa56d80607267b"
+ // },
+
firebase: {
- apiKey: "AIzaSyCzmyM0WJ0wdLf8UsYoZ4GreICimyt7SEk",
- authDomain: "ssa-push.firebaseapp.com",
- databaseURL: "https://ssa-push.firebaseio.com",
- projectId: "ssa-push",
- storageBucket: "ssa-push.appspot.com",
- messagingSenderId: "627754063571",
- appId: "1:627754063571:web:8cfa56d80607267b"
+ apiKey: "AIzaSyCk86rasBR2-sXlVu6ACUO406EM_1mcwgo",
+ authDomain: "pdgenie-prod.firebaseapp.com",
+ databaseURL: "https://pdgenie-prod.firebaseio.com%26quot%3B%2C/",
+ projectId: "pdgenie-prod",
+ storageBucket: "",
+ messagingSenderId: "906855209078",
+ appId: "1:906855209078:web:c1583378f1fb2c71"
},
region: 'ap-south-1',
-
-
-
-
+
+
-
-
-
+
+
+
+
+
+
No Files
-No Files
+