simpo-component-library 3.5.31 → 3.5.34

package/fesm2022/simpo-component-library.mjs

@@ -10988,7 +10988,7 @@ class RegistrationFormComponent extends BaseSection {
         // this.payload['returnUrl'] = `https://stage.cmis.tejsoft.com/verify-payment/?url=true&type=REGISTRATION&bId=${this.businessId}` //stage
         for (let infieldDocument of this.payload.fieldItems) {
             if (infieldDocument.fieldImageUrl) {
-                let imageData = await this.imageUploadService.uploadFileInAzure(infieldDocument.fieldImageUrl);
+                let imageData = await this.imageUploadService.uploadFileInAzure(infieldDocument.selectedImageData);
                 infieldDocument.fieldImageUrl = imageData.url || imageData._response?.request?.url;
             }
         }
@@ -11004,7 +11004,7 @@ class RegistrationFormComponent extends BaseSection {
         // }
         // this.payload.studentFeeStructure['paymentPlanType'] = this.payload.paymentPlanType;
         // this.payload['returnUrl'] = `https://cmis.tejsoft.com/verify-payment/?url=true&type=ADMISSION&bId=${this.businessId}`; //production
-        this.payload['returnUrl'] = `https://stage-portal.cmis.ac.in/verify-payment/?url=true&type=ADMISSION&bId=${this.businessId}`; //dev
+        this.payload['returnUrl'] = `https://dev.cmis.tejsoft.com/verify-payment/?url=true&type=ADMISSION&bId=${this.businessId}`; //dev
         // this.payload['returnUrl'] = `https://stage.cmis.tejsoft.com/verify-payment/?url=true&type=ADMISSION&bId=${this.businessId}`; //stage
         if (this.backupDocFile) {
             let imageData = await this.imageUploadService.uploadFileInAzure(this.backupDocFile);
@@ -11024,13 +11024,15 @@ class RegistrationFormComponent extends BaseSection {
         }
         for (let infieldDocument of this.payload.fieldItems) {
             if (infieldDocument.fieldImageUrl) {
-                let imageData = await this.imageUploadService.uploadFileInAzure(infieldDocument.fieldImageUrl);
-                infieldDocument.fieldImageUrl = imageData.url || imageData._response?.request?.url;
+                if (!infieldDocument.fieldImageUrl.includes('https:')) {
+                    let imageData = await this.imageUploadService.uploadFileInAzure(infieldDocument.selectedImageData);
+                    infieldDocument.fieldImageUrl = imageData.url || imageData._response?.request?.url;
+                }
             }
         }
+        // console.log(this.payload)
         this.payload.admissionPaymentDetail.amount = this.payload.studentFeeStructureV2.totalFee;
-        console.log(this.payload);
-        this.registrationSubscription = this.restService.createPaymentForAdmission(this.payload).subscribe((res) => {
+        this.registrationSubscription = this.restService.createAdmission(this.payload).subscribe((res) => {
             // this.snackBar.open('Admission created successfully', 'close', {duration: 2000});
             this._eventService.cashFreeEvent.emit({ response: res, paymentType: 'ADMISSION' });
         });
@@ -11063,7 +11065,9 @@ class RegistrationFormComponent extends BaseSection {
                         fieldStepId: field.fieldStepId,
                         fieldStepName: step,
                         type: field.type,
-                        fieldImageUrl: field.fieldImageUrl
+                        fieldImageUrl: field.fieldImageUrl,
+                        selectedImageData: field.selectedImageData,
+                        dataType: field?.dataType
                     });
                 }
             }
@@ -11089,12 +11093,14 @@ class RegistrationFormComponent extends BaseSection {
         return response;
     }
     updateAdmissionImage(ev) {
-        this.fileData = ev.srcElement.files[0];
+        let fileInput = ev.target;
+        this.fileData = fileInput.files[0];
         const reader = new FileReader();
         reader.onload = (response) => {
             this.payload.imgUrl = response.target.result;
         };
         this.fileData ? reader.readAsDataURL(this.fileData) : null;
+        fileInput.value = '';
     }
     deleteImg() {
         this.payload.imgUrl = '';
@@ -11284,7 +11290,7 @@ class RegistrationFormComponent extends BaseSection {
             field.fieldImageUrl = response.target.result;
         };
         selectedImageData ? reader.readAsDataURL(selectedImageData) : null;
-        field.fieldImageUrl = selectedImageData;
+        field.selectedImageData = selectedImageData;
     }
     updateSelectedImage(ev, field) {
         let selectedImageData;
@@ -11294,7 +11300,7 @@ class RegistrationFormComponent extends BaseSection {
             field.fieldImageUrl = response.target.result;
         };
         selectedImageData ? reader.readAsDataURL(selectedImageData) : null;
-        field.fieldImageUrl = selectedImageData;
+        field.selectedImageData = selectedImageData;
     }
     isImage(fileUrl) {
         return typeof fileUrl === 'string' && (fileUrl.startsWith('data:image') || /\.(jpg|jpeg|png|gif)$/i.test(fileUrl));