Upload Files
-
+
-
+
+
diff --git a/src/app/_modules/dashboard/home-upload/home-upload.component.ts b/src/app/_modules/dashboard/home-upload/home-upload.component.ts
index 7827c0b..b0fc70b 100644
--- a/src/app/_modules/dashboard/home-upload/home-upload.component.ts
+++ b/src/app/_modules/dashboard/home-upload/home-upload.component.ts
@@ -11,12 +11,12 @@ import { UiService } from 'src/app/_providers/_services/ui.service';
import Swal from 'sweetalert2'
import { DialogComponent } from '../dialog/dialog.component';
import { DatePipe } from '@angular/common';
-
@Component({
selector: 'app-home-upload',
templateUrl: './home-upload.component.html',
styleUrls: ['./home-upload.component.scss']
})
+
export class HomeUploadComponent implements OnInit {
phoneInvalid: boolean = false;
@@ -69,6 +69,7 @@ export class HomeUploadComponent implements OnInit {
amountPaid: boolean = false;
OnlinePayment: boolean;
+ dialogRef: any;
constructor(
private router: Router,
@@ -79,6 +80,10 @@ export class HomeUploadComponent implements OnInit {
public dialog: MatDialog,
private datePipe: DatePipe
) {
+
+
+ // this.generateUPIQRCode('atlejs47@oksbi', '100');
+
this.secuLevel = localStorage.getItem('seculevel');
this.userId = localStorage.getItem('userId');
this.tenderId = +this.route.snapshot.paramMap.get('id');
@@ -96,14 +101,11 @@ export class HomeUploadComponent implements OnInit {
this.getData();
this.getFileFormatLov();
this.paymentCheck();
-
}
- ngAfterViewInit(): void {
- setTimeout(() => {
- this.bidAmountInput.nativeElement.focus();
- }, 0);
- }
+
+
+
openDialog() {
@@ -111,7 +113,7 @@ export class HomeUploadComponent implements OnInit {
width: '500px',
data: {
details: [
- 'I hereby declare that I have read and understood the trended documents, terms and conditions, drawings and specifications. The rates quoted are based on all the necessary understanding of the site conditions and challenges to carry out the work. The rates are the best I could offer and is inclusive of all taxes and levies.',
+ 'I hereby declare that I have read and understood the tendered documents, terms and conditions, drawings and specifications. The rates quoted are based on all the necessary understanding of the site conditions and challenges to carry out the work. The rates are the best I could offer and are inclusive of all taxes and levies.',
]
}
});
@@ -122,6 +124,14 @@ export class HomeUploadComponent implements OnInit {
});
}
+ openQrImage(templateRef) {
+ // console.log('this');
+ this.dialogRef = this.dialog.open(templateRef, {
+ width: '400px',
+ disableClose: false
+ });
+ // this.verifiedOtp = true
+ }
paymentCheck(){
this._masterService.getMasterDatabyId(apiUrl.paymentCheck, `${this.userId}/${this.tenderId}`).then(res => {
@@ -365,4 +375,6 @@ if (result.isConfirmed) {
}
+
+
}
diff --git a/src/app/_modules/dashboard/home-view/home-view.component.html b/src/app/_modules/dashboard/home-view/home-view.component.html
index 8a49a05..4872bbf 100644
--- a/src/app/_modules/dashboard/home-view/home-view.component.html
+++ b/src/app/_modules/dashboard/home-view/home-view.component.html
@@ -351,6 +351,8 @@
+
+
@@ -383,7 +385,10 @@
diff --git a/src/app/_modules/dashboard/home-view/home-view.component.ts b/src/app/_modules/dashboard/home-view/home-view.component.ts
index a1e27cf..65d90da 100644
--- a/src/app/_modules/dashboard/home-view/home-view.component.ts
+++ b/src/app/_modules/dashboard/home-view/home-view.component.ts
@@ -293,31 +293,25 @@ export class HomeViewComponent implements OnInit {
async paymentGateway() {
- // if(this.seculevel != 'B'){
- this.paymentDetails = new PurchaseDto();
- this.paymentDetails.application = this.tenderId;
- this.paymentDetails.mobile = localStorage.getItem('mobile')
- this.paymentDetails.email = "accuratesoftware2022@gmail.com";
- this.paymentDetails.amount = this.tenderData.tenderFee;
- this.paymentDetails.type = "I"
-
- // this.paymentDetails.email=this.issueApplicationData.motherEmail
- // console.log('this.newPaymentRow.paymentMethod ====',this.newPaymentRow);
-
- // let paymentMethod = this.paymentMethodLovData.find(x=> x.id==this.newPaymentRow.paymentMethod)
-
- // console.log('this.paymentDetails===', this.paymentDetails);
-
- this._transactionService.createPayment(this.paymentDetails).then(
- res => {
- this.onSuccessPayment(res);
- },
- err => {
- this.onFailurePayment(err);
- // console.log("==er====", err);
- }
- );
- // }
+ // this.paymentDetails = new PurchaseDto();
+ // this.paymentDetails.application = this.tenderId;
+ // this.paymentDetails.mobile = localStorage.getItem('mobile')
+ // this.paymentDetails.email = "accuratesoftware2022@gmail.com";
+ // this.paymentDetails.amount = this.tenderData.tenderFee;
+ // this.paymentDetails.type = "I"
+
+
+ // this._transactionService.createPayment(this.paymentDetails).then(
+ // res => {
+ // this.onSuccessPayment(res);
+ // },
+ // err => {
+ // this.onFailurePayment(err);
+ // }
+ // );
+
+
+ this.router.navigate([`qr-payment/${this.tenderId}`])
}
diff --git a/src/app/_modules/dashboard/payment-details/payment-details.component.html b/src/app/_modules/dashboard/payment-details/payment-details.component.html
new file mode 100644
index 0000000..1f021ad
--- /dev/null
+++ b/src/app/_modules/dashboard/payment-details/payment-details.component.html
@@ -0,0 +1,220 @@
+
+
+
+
+;
+
+ tenderId: number;
+
+ headerData: any;
+
+ tableData: any;
+
+ tenderInputId: any;
+
+
+ paymentStatus: any;
+ userId: string;
+
+ constructor(
+ private _router: Router,
+ private _masterService: MasterService,
+ private route: ActivatedRoute,
+ private _ui:UiService,
+ ) {
+ this.tenderId = +this.route.snapshot.paramMap.get('id');
+ }
+
+ ngOnInit(): void {
+ this.getHeaderData(this.tenderId);
+ this.getTableData(this.tenderId);
+ }
+
+ getHeaderData(id) {
+ this._masterService.getMasterDatabyId(apiUrl.getTender, id).then(res => {
+ this.headerData = res;
+
+ this.tenderInputId = res.tenderId
+ })
+ }
+
+ getTableData(id) {
+ this._masterService.getMasterDatabyId(apiUrl.bidReport, id).then(res => {
+ console.log("res",res);
+
+ this.tableData = res.report
+ this.tableData.forEach(element => {
+ if (element.status === 'P') {
+ element.paymentStatus = 'P';
+ }
+ if(element.status === 'S'){
+ element.paymentStatus = 'S';
+ }
+ if(element.status === 'D'){
+ element.paymentStatus = 'D';
+ }
+ });
+
+ this.tableData.sort((a, b) => {
+ if (a.status === 'P' && b.status !== 'P') {
+ return -1;
+ } else if (a.status !== 'P' && b.status === 'P') {
+ return 1;
+ } else {
+ return 0;
+ }
+ });
+
+ this.dataSource = new MatTableDataSource(this.tableData);
+ this.dataSource.sort = this.sort;
+ })
+ }
+
+ navigateTo(destination) {
+ this._router.navigate([destination])
+ }
+
+ backButton() {
+ this.navigateTo('/dashboard')
+ // this.backClick.emit()
+ }
+
+ sortData(sort: Sort) {}
+
+ onPaymentStatusChange(userId, paymentStatus){
+ console.log("this.paymentStatus",paymentStatus);
+
+
+ let body = {
+ status : paymentStatus
+ }
+ this._masterService.postMasterData(apiUrl.paymentupdatePaymentStatus,body,`${userId}/${this.tenderId}`).then((res) =>{
+ console.log(res);
+ this._ui.toastMessage(res.data)
+
+ },err=>{
+ this._ui.toastMessage(err.error.message);
+
+
+ })
+ }
+
+}
diff --git a/src/app/_modules/dashboard/qr-payment/qr-payment.component.html b/src/app/_modules/dashboard/qr-payment/qr-payment.component.html
new file mode 100644
index 0000000..30599e6
--- /dev/null
+++ b/src/app/_modules/dashboard/qr-payment/qr-payment.component.html
@@ -0,0 +1,65 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/_modules/dashboard/qr-payment/qr-payment.component.scss b/src/app/_modules/dashboard/qr-payment/qr-payment.component.scss
new file mode 100644
index 0000000..bde6fe4
--- /dev/null
+++ b/src/app/_modules/dashboard/qr-payment/qr-payment.component.scss
@@ -0,0 +1,6 @@
+
+.md-dialog-container {
+ background-color: #000;
+ width: 600px;
+ height: 600px
+ }
\ No newline at end of file
diff --git a/src/app/_modules/dashboard/qr-payment/qr-payment.component.spec.ts b/src/app/_modules/dashboard/qr-payment/qr-payment.component.spec.ts
new file mode 100644
index 0000000..11289ca
--- /dev/null
+++ b/src/app/_modules/dashboard/qr-payment/qr-payment.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { QrPaymentComponent } from './qr-payment.component';
+
+describe('QrPaymentComponent', () => {
+ let component: QrPaymentComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [ QrPaymentComponent ]
+ })
+ .compileComponents();
+ });
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(QrPaymentComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/_modules/dashboard/qr-payment/qr-payment.component.ts b/src/app/_modules/dashboard/qr-payment/qr-payment.component.ts
new file mode 100644
index 0000000..44cd965
--- /dev/null
+++ b/src/app/_modules/dashboard/qr-payment/qr-payment.component.ts
@@ -0,0 +1,167 @@
+import { DatePipe } from '@angular/common';
+import { Component, OnInit } from '@angular/core';
+import { MatDialog } from '@angular/material/dialog';
+import { ActivatedRoute, Router } from '@angular/router';
+import * as QRCode from 'qrcode';
+import { PaymentInfoDto } from 'src/app/_dto/payment-info.dto';
+import { apiUrl } from 'src/app/_providers/_resources/api-url.properties';
+import { ErrorTranslateService } from 'src/app/_providers/_services/error-translate.service';
+import { MasterService } from 'src/app/_providers/_services/master.service';
+import { UiService } from 'src/app/_providers/_services/ui.service';
+import { environment } from 'src/environments/environment.prod';
+
+@Component({
+ selector: 'app-qr-payment',
+ templateUrl: './qr-payment.component.html',
+ styleUrls: ['./qr-payment.component.scss']
+})
+export class QrPaymentComponent implements OnInit {
+
+ secuLevel: string;
+
+ userId: string;
+
+ tenderId: number;
+
+ transactionData: PaymentInfoDto;
+
+ amountReq: any;
+
+ dialogRef: any;
+
+ paymentStatus: any;
+
+ paymentId: any;
+
+ constructor(
+ private router: Router,
+ private route: ActivatedRoute,
+ private _ui: UiService,
+ private _errorTranslate: ErrorTranslateService,
+ private _masterService: MasterService,
+ private dialog: MatDialog,
+ private datePipe: DatePipe
+ ) {
+ this.secuLevel = localStorage.getItem('seculevel');
+ this.userId = localStorage.getItem('userId');
+ this.tenderId = +this.route.snapshot.paramMap.get('id');
+ }
+
+ qrImage: boolean = false;
+
+ transId: any
+
+ ngOnInit(): void {
+
+ this.transactionData = new PaymentInfoDto()
+
+ this.getData();
+ }
+
+
+ // ngAfterViewInit(): void {
+
+ // setTimeout(() => {
+ // }, 1000);
+ // }
+
+ getData() {
+ this._masterService.getMasterDatabyId(apiUrl.getTender, this.tenderId).then(res => {
+ this.amountReq = res.tenderFee;
+ this.generateUPIQRCode(environment.upiId, this.amountReq);
+
+ })
+ this.paymentCheck();
+
+ }
+
+ paymentCheck() {
+ this._masterService.getMasterDatabyId(apiUrl.paymentUserCheck + `/${this.userId}`, this.tenderId).then(res => {
+ console.log(res);
+ if (res && res[0].status) {
+ if (res[0].status == 'P') {
+ this.paymentStatus = 'Pending'
+ }
+ if (res[0].status == 'D') {
+ this.paymentStatus = 'Declined'
+ }
+ if (res[0].status == 'S') {
+ this.paymentStatus = 'Success'
+ }
+ this.paymentId = res[0].id
+ }
+
+ }, err => {
+ if (err.error.message.trim() == "User Payment Not Found") {
+ this.paymentStatus = 'Payment Not Started'
+ this.transactionData.status = 'P'
+ }
+ })
+ }
+ generateUPIQRCode(upiID: string, amount: string): void {
+ const upiLink = `upi://pay?pa=${upiID}&am=${amount}&tn=Tender%20Fee`;
+
+ QRCode.toDataURL(upiLink, { errorCorrectionLevel: 'L' }, (err, qrDataURL) => {
+ if (err) {
+ console.error(err);
+ return;
+ }
+ // console.log('url==', qrDataURL);
+
+ const qrImageElement = document.getElementById('qrImage') as HTMLImageElement;
+ qrImageElement.src = qrDataURL;
+ this.qrImage = true
+
+ });
+ }
+
+ openHelpDialog(templateRef) {
+ this.dialogRef = this.dialog.open(templateRef, {
+ width: '700px',
+ disableClose: false
+ });
+ }
+
+ closeDialog() {
+ this.dialogRef.close()
+ }
+
+ preSave() {
+
+ if (this.transactionData.transId == 0 || this.transactionData.transId == null || this.transactionData.transId == undefined) {
+ this._ui.toastMessage(this._errorTranslate.translate("pleaseEnterTransId"), 2000, true);
+ return false;
+ }
+
+
+
+ return true;
+ }
+
+ submit() {
+ if (!this.preSave())
+ return
+
+ this.transactionData.userId = this.userId;
+ this.transactionData.tenderId = this.tenderId;
+ // this.transactionData.
+ console.log('this.paymentId==',this.paymentId);
+
+
+ if(this.paymentId){
+ this.transactionData.id = this.paymentId
+ this._masterService.updateMasterData(apiUrl.paymentMaster, this.transactionData,this.paymentId).then(res=>{
+ console.log('res==.',res);
+ this.transactionData = new PaymentInfoDto()
+ this.getData();
+
+ })
+ }
+ else
+ this._masterService.saveMasterData(apiUrl.paymentInfo, this.transactionData).then(res => {
+ console.log(res);
+ this.transactionData = new PaymentInfoDto()
+ this.getData();
+ })
+ }
+}
diff --git a/src/app/_providers/_resources/api-url.properties.ts b/src/app/_providers/_resources/api-url.properties.ts
index 1e0bb6b..7a3162d 100644
--- a/src/app/_providers/_resources/api-url.properties.ts
+++ b/src/app/_providers/_resources/api-url.properties.ts
@@ -45,8 +45,11 @@ export const apiUrl = {
paymentCheck:"payment-master/bid-payment-check",
emailUserSubmit:"auth/otp/UD",
UserUploadCheck :"tender-doc/userDocCheck",
- emailReport:"email/report"
-
+ emailReport:"email/report",
+ paymentInfo:"payment-master/paymentInfo",
+ paymentMaster:"payment-master",
+ paymentUserCheck:"payment-master/userBidPaymentCheck",
+ paymentupdatePaymentStatus:"payment-master/updatePaymentStatus"
};
export const apiFilterProperties = {
diff --git a/src/assets/i18n/error/en.json b/src/assets/i18n/error/en.json
index 05b5e70..d9ba9e2 100644
--- a/src/assets/i18n/error/en.json
+++ b/src/assets/i18n/error/en.json
@@ -143,6 +143,7 @@
"DocumentsAlreadyUploaded" : "Documents Already Uploaded",
"pleaseAgreeToTheTermsandCondition":"Please Agree To The Terms and Condition",
"pleasePayTheAmountForDoc":"Please Pay The Amount For Downloading Documents",
- "emailSentSuccessfully":"Email Sent Successfully"
+ "emailSentSuccessfully":"Email Sent Successfully",
+ "pleaseEnterTransId":"Please Enter Transaction Id"
}
\ No newline at end of file
diff --git a/src/assets/i18n/languages/en-sales.json b/src/assets/i18n/languages/en-sales.json
index 7823397..cf3033a 100644
--- a/src/assets/i18n/languages/en-sales.json
+++ b/src/assets/i18n/languages/en-sales.json
@@ -351,9 +351,13 @@
"bidEndDate":"Bid End Date",
"report":"Report",
"totalBidAmount":"Total Bid Amount",
+ "TransactionId":"Transaction ID",
"documents": "Documents",
+ "confirmPayment":"Confirm Payment",
+ "DeclinePayment":"Decline Payment",
"tender":"Tender",
"tenderId":"Tender Id",
- "status":"Status"
+ "status":"Status",
+ "Paymentstatus":"Payment Status"
}
\ No newline at end of file
diff --git a/src/assets/img/Image4.jpg b/src/assets/img/Image4.jpg
new file mode 100644
index 0000000..a205c21
Binary files /dev/null and b/src/assets/img/Image4.jpg differ
diff --git a/src/assets/img/WhatsApp Image1.jpg b/src/assets/img/WhatsApp Image1.jpg
new file mode 100644
index 0000000..bade6c7
Binary files /dev/null and b/src/assets/img/WhatsApp Image1.jpg differ
diff --git a/src/assets/img/abstract-white-skyscrapers.webp b/src/assets/img/abstract-white-skyscrapers.webp
new file mode 100644
index 0000000..9bdf075
Binary files /dev/null and b/src/assets/img/abstract-white-skyscrapers.webp differ
diff --git a/src/assets/img/call-to-action-bg.jpg b/src/assets/img/call-to-action-bg.jpg
new file mode 100644
index 0000000..2469fbd
Binary files /dev/null and b/src/assets/img/call-to-action-bg.jpg differ
diff --git a/src/assets/img/call-to-action.jpg b/src/assets/img/call-to-action.jpg
new file mode 100644
index 0000000..1422f9e
Binary files /dev/null and b/src/assets/img/call-to-action.jpg differ
diff --git a/src/assets/img/download.jpg b/src/assets/img/download.jpg
new file mode 100644
index 0000000..ddbc1aa
Binary files /dev/null and b/src/assets/img/download.jpg differ
diff --git a/src/assets/img/emblem (3).jpeg b/src/assets/img/emblem (3).jpeg
new file mode 100644
index 0000000..1a3a23b
Binary files /dev/null and b/src/assets/img/emblem (3).jpeg differ
diff --git a/src/assets/img/emblem.jpeg b/src/assets/img/emblem.jpeg
new file mode 100644
index 0000000..7b4cf83
Binary files /dev/null and b/src/assets/img/emblem.jpeg differ
diff --git a/src/assets/img/emblem.png b/src/assets/img/emblem.png
new file mode 100644
index 0000000..bb30182
Binary files /dev/null and b/src/assets/img/emblem.png differ
diff --git a/src/assets/img/emblem2.jpg b/src/assets/img/emblem2.jpg
new file mode 100644
index 0000000..ef4d637
Binary files /dev/null and b/src/assets/img/emblem2.jpg differ
diff --git a/src/assets/img/hero-background.jpg b/src/assets/img/hero-background.jpg
new file mode 100644
index 0000000..17f4b30
Binary files /dev/null and b/src/assets/img/hero-background.jpg differ
diff --git a/src/assets/img/logo.png b/src/assets/img/logo.png
new file mode 100644
index 0000000..0ff951e
Binary files /dev/null and b/src/assets/img/logo.png differ
diff --git a/src/assets/img/photo.jpeg b/src/assets/img/photo.jpeg
new file mode 100644
index 0000000..0af34b0
Binary files /dev/null and b/src/assets/img/photo.jpeg differ
diff --git a/src/assets/img/team/team-1.jpg b/src/assets/img/team/team-1.jpg
new file mode 100644
index 0000000..2b23b36
Binary files /dev/null and b/src/assets/img/team/team-1.jpg differ
diff --git a/src/assets/img/team/team-2.jpg b/src/assets/img/team/team-2.jpg
new file mode 100644
index 0000000..8f0d75d
Binary files /dev/null and b/src/assets/img/team/team-2.jpg differ
diff --git a/src/assets/img/team/team-3.jpg b/src/assets/img/team/team-3.jpg
new file mode 100644
index 0000000..bf12493
Binary files /dev/null and b/src/assets/img/team/team-3.jpg differ
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index d31e15b..0e47224 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -4,7 +4,7 @@ export const environment = {
// apiUrl:'https://sales.api.accuratesoftware.online/api/v1',
apiUrl: 'https://tenderapi.simssoftware.in/api/v1',
-
+ upiId:'thrikodithanamservicecoperativebank@icici',
production: true,
hmr: false,
timeOutLimit: 3600,
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index fb91096..248448a 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,9 +4,9 @@
export const environment = {
- // apiUrl: 'http://192.168.1.112:3500/api/v1',
- apiUrl: 'https://tenderapi.simssoftware.in/api/v1',
-
+ apiUrl: 'http://192.168.1.112:3200/api/v1',
+// apiUrl: 'https://tenderapi.simssoftware.in/api/v1',/
+ upiId:'thrikodithanamservicecoperativebank@icici',
production: false,
hmr: false,
timeOutLimit: 3600,
diff --git a/yarn.lock b/yarn.lock
index 214e0a6..36468f7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2593,6 +2593,15 @@
"strip-ansi" "^5.2.0"
"wrap-ansi" "^5.1.0"
+"cliui@^6.0.0":
+ "integrity" "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ=="
+ "resolved" "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz"
+ "version" "6.0.0"
+ dependencies:
+ "string-width" "^4.2.0"
+ "strip-ansi" "^6.0.0"
+ "wrap-ansi" "^6.2.0"
+
"cliui@^7.0.2":
"integrity" "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="
"resolved" "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz"
@@ -3366,6 +3375,11 @@
"miller-rabin" "^4.0.0"
"randombytes" "^2.0.0"
+"dijkstrajs@^1.0.1":
+ "integrity" "sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA=="
+ "resolved" "https://registry.npmjs.org/dijkstrajs/-/dijkstrajs-1.0.3.tgz"
+ "version" "1.0.3"
+
"dir-glob@^3.0.1":
"integrity" "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="
"resolved" "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"
@@ -3511,6 +3525,11 @@
"resolved" "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz"
"version" "3.0.0"
+"encode-utf8@^1.0.3":
+ "integrity" "sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw=="
+ "resolved" "https://registry.npmjs.org/encode-utf8/-/encode-utf8-1.0.3.tgz"
+ "version" "1.0.3"
+
"encodeurl@~1.0.2":
"integrity" "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
"resolved" "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"
@@ -4015,7 +4034,7 @@
dependencies:
"locate-path" "^3.0.0"
-"find-up@^4.0.0":
+"find-up@^4.0.0", "find-up@^4.1.0":
"integrity" "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="
"resolved" "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"
"version" "4.1.0"
@@ -6420,6 +6439,11 @@
"resolved" "https://registry.npmjs.org/png-js/-/png-js-1.0.0.tgz"
"version" "1.0.0"
+"pngjs@^5.0.0":
+ "integrity" "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw=="
+ "resolved" "https://registry.npmjs.org/pngjs/-/pngjs-5.0.0.tgz"
+ "version" "5.0.0"
+
"pnp-webpack-plugin@1.6.4":
"integrity" "sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg=="
"resolved" "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz"
@@ -6852,6 +6876,16 @@
"resolved" "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
"version" "1.3.2"
+"qrcode@^1.5.3":
+ "integrity" "sha512-puyri6ApkEHYiVl4CFzo1tDkAZ+ATcnbJrJ6RiBM1Fhctdn/ix9MTE3hRph33omisEbC/2fcfemsseiKgBPKZg=="
+ "resolved" "https://registry.npmjs.org/qrcode/-/qrcode-1.5.3.tgz"
+ "version" "1.5.3"
+ dependencies:
+ "dijkstrajs" "^1.0.1"
+ "encode-utf8" "^1.0.3"
+ "pngjs" "^5.0.0"
+ "yargs" "^15.3.1"
+
"qs@~6.5.2":
"integrity" "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
"resolved" "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"
@@ -9115,6 +9149,15 @@
"string-width" "^3.0.0"
"strip-ansi" "^5.0.0"
+"wrap-ansi@^6.2.0":
+ "integrity" "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="
+ "resolved" "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz"
+ "version" "6.2.0"
+ dependencies:
+ "ansi-styles" "^4.0.0"
+ "string-width" "^4.1.0"
+ "strip-ansi" "^6.0.0"
+
"wrap-ansi@^7.0.0":
"integrity" "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="
"resolved" "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
@@ -9197,6 +9240,14 @@
"camelcase" "^5.0.0"
"decamelize" "^1.2.0"
+"yargs-parser@^18.1.2":
+ "integrity" "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="
+ "resolved" "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz"
+ "version" "18.1.3"
+ dependencies:
+ "camelcase" "^5.0.0"
+ "decamelize" "^1.2.0"
+
"yargs-parser@^20.2.2":
"integrity" "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw=="
"resolved" "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz"
@@ -9218,6 +9269,23 @@
"y18n" "^4.0.0"
"yargs-parser" "^13.1.2"
+"yargs@^15.3.1":
+ "integrity" "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A=="
+ "resolved" "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz"
+ "version" "15.4.1"
+ dependencies:
+ "cliui" "^6.0.0"
+ "decamelize" "^1.2.0"
+ "find-up" "^4.1.0"
+ "get-caller-file" "^2.0.1"
+ "require-directory" "^2.1.1"
+ "require-main-filename" "^2.0.0"
+ "set-blocking" "^2.0.0"
+ "string-width" "^4.2.0"
+ "which-module" "^2.0.0"
+ "y18n" "^4.0.0"
+ "yargs-parser" "^18.1.2"
+
"yargs@^16.2.0":
"integrity" "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="
"resolved" "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz"
Documents can Only be download between {{tenderData.saleStartDate | date: 'MMM d, y, h:mm:ss a'}} and {{tenderData.saleEndDate| date: 'MMM d, y, h:mm:ss a'}}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/_modules/dashboard/payment-details/payment-details.component.scss b/src/app/_modules/dashboard/payment-details/payment-details.component.scss
new file mode 100644
index 0000000..17ddfdd
--- /dev/null
+++ b/src/app/_modules/dashboard/payment-details/payment-details.component.scss
@@ -0,0 +1,409 @@
+// .header {
+// margin-left: 4%;
+// margin-top: 20px;
+// }
+
+// .header>h6{
+// a {
+// text-decoration: none;
+// color: #262627;
+// }
+
+// a:hover {
+// text-decoration: underline;
+// cursor: pointer;
+// }
+// }
+
+// mat-card{
+// min-width: 180px ;
+// // max-width: 20vw;
+// height: 200px;
+// display: inline-block;
+// }
+
+// mat-card:hover{
+// cursor: pointer;
+// }
+
+
+// -----------------------------------------------------------------------------------
+
+
+
+.nav-link:hover {
+ color: red;
+ }
+
+
+ th,
+ td {
+ padding: 10px;
+ // border: 1px solid #ccc;
+ word-wrap: break-word;
+ white-space: normal;
+
+ }
+
+ .h2 {
+ font-family: sans-serif;
+ font-size: 26px;
+ font-weight: 500;
+ }
+
+
+ .table td {
+ word-break: break-word;
+ }
+
+ .table-break-word {
+ word-break: break-word;
+ }
+
+
+
+ .top-bar {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ border: 1px solid #e3e3e3;
+ width: 100%;
+ margin: auto;
+ padding: auto;
+ }
+
+ .header {
+ padding: 20px;
+ width: 100%;
+ min-width: 350px;
+ }
+
+ .header>h6>a {
+ text-decoration: none;
+ color: #262627;
+ }
+
+ .header>h6>a:hover {
+ text-decoration: underline;
+ cursor: pointer;
+ }
+
+ mat-card {
+ min-width: 350px;
+ }
+
+ .top-left-float {
+ display: flex;
+ min-width: 282px;
+ }
+
+ .top-right-float {
+ display: flex;
+ min-width: 161px;
+ }
+
+ .top-left-float>button,
+ .top-right-float>button {
+ margin: 5px;
+ height: 40px;
+ }
+
+ mat-table {
+ padding-top: 10px !important;
+ // table-layout: fixed;
+ width: 100%;
+ display: table;
+ overflow-x: scroll;
+
+ .table-headers {
+ padding: 5px;
+ color: #505050;
+ font-weight: 900;
+ font-size: medium;
+ background-color: #f0f0f0;
+ font-family: nucleo;
+ }
+
+ .table-headers:hover {
+ background-color: #ececec;
+ color: #46AC9E;
+ }
+
+ .table-content {
+ padding: 5px;
+ overflow-wrap: inherit;
+ font-family: nucleo;
+
+ }
+
+ .table-column {
+ width: 100%;
+ }
+ }
+
+ input {
+ border: none;
+ border-bottom: 1px solid silver;
+ }
+
+ :host ::ng-deep .mat-slide-toggle.mat-checked:not(.mat-disabled) {
+
+ .mat-slide-toggle-thumb {
+ background-color: #46AC9E;
+ }
+
+ .mat-slide-toggle-bar {
+ background-color: skyblue;
+ }
+
+ }
+
+ // .dialog-body {
+ // display: flex;
+ // justify-content: center;
+ // align-items: center;
+
+ // div {
+ // width: 90%;
+ // }
+ // }
+
+ .dialog-actions {
+ display: flex;
+ flex-wrap: wrap;
+ width: 97%;
+ justify-content: space-between;
+
+ .btn-group-left {
+ // min-width: 150px;
+ margin-top: 5px;
+ }
+
+ .btn-group-right {
+ // min-width: 95px;
+ margin-top: 5px;
+ }
+ }
+
+ .hide {
+ display: none;
+ }
+
+ :host ::ng-deep {
+ .mat-form-field-infix {
+ border-bottom: 0px solid white;
+ }
+
+ .mat-table {
+ tr {
+
+ th,
+ td {
+ vertical-align: middle;
+ }
+ }
+ }
+
+ }
+
+
+
+
+ .img-fluid {
+ margin-right: 5px;
+ max-height: 40px;
+ }
+
+ // .navbar {
+ // background-position: center;
+ // }
+
+
+ @media (max-width: 767px) {
+ .card {
+ min-width: 600px;
+ }
+ }
+
+
+ @media print {
+ .buttonCard {
+ display: none;
+ }
+
+ .backButton {
+ display: none;
+ }
+
+ .printButton {
+ display: none;
+ }
+
+ .excelButton {
+ display: none;
+ }
+ }
+
+ .mat-row:nth-child(even) {
+ background-color: rgb(255, 255, 255);
+ }
+
+ .mat-row:nth-child(odd) {
+ background-color: rgb(241, 241, 241);
+ }
+
+ .table-container {
+ margin-top: 20px
+ }
+
+
+ .backButton {
+ float: left;
+ margin-top: 5px;
+ margin-bottom: 5px;
+ color: #424242;
+ background-color: white;
+ height: 37px;
+ border-radius: 9px;
+ font-family: nucleo;
+ // width: 8%;
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+ transform: translateY(5px);
+
+ }
+
+ .backButton:hover {
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+ /* You can adjust the shadow values to your preference */
+ }
+
+ .printButton {
+ float: right;
+ margin-top: 5px;
+ margin-bottom: 5px;
+ background-color: white;
+ color: #424242;
+ height: 37px;
+ border-radius: 9px;
+ font-family: nucleo;
+ width: 8%;
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+
+ }
+
+ .printButton:hover {
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+ /* You can adjust the shadow values to your preference */
+ }
+
+ .excelButton {
+ float: right;
+ margin-top: 5px;
+ margin-bottom: 5px;
+ color: #424242;
+ background-color: white;
+ height: 37px;
+ border-radius: 9px;
+ font-family: nucleo;
+ width: 8%;
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+ margin-right: 5px;
+ }
+
+ .excelButton:hover {
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+ /* You can adjust the shadow values to your preference */
+ }
+
+ .buttonCard {
+ width: 100%;
+ background-color: #ffffff;
+ height: 50px;
+ margin: 0px;
+ padding: 0px 16px 0px 16px;
+ margin-top: 20px;
+ }
+ .buttonCardBottom{
+ width: 100%;
+ background-color: #ffffff;
+ height: 50px;
+ margin: 0px;
+ padding: 0px 16px 0px 16px;
+ margin-bottom: 20px;
+ }
+
+ .reportHeader {
+ width: 100%;
+ background-color: #ffffff;
+ // height: 50px;
+ margin: 5px 0px 0px 0px;
+ }
+
+ .bidHeading {
+ font-family: texg;
+ color: #353535;
+ }
+
+ .tenderInfo {
+ font-family: texg;
+ color: #353535;
+ }
+
+ .subHead {
+ font-family: texg;
+ color: #353535;
+ }
+
+ .subDetail {
+ font-family: nucleo;
+ color: #353535;
+ }
+
+ .captchaFont {
+ font-family: captcha;
+ font-size: large;
+ }
+
+ .captchaDiv {
+ text-align: center;
+ height: 100px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
+ background-image: url('/assets/img/captchaback.jpeg');
+ }
+
+ .captchaSubmit{
+ float: right;
+ margin-top: 5px;
+ margin-bottom: 5px;
+ color: #424242;
+ background-color: white;
+ height: 37px;
+ border-radius: 9px;
+ font-family: nucleo;
+ // width: 8%;
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+ margin-right: 5px;
+ }
+ .captchaSubmit:hover {
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4);
+ background-color: rgb(240, 240, 240);
+
+ /* You can adjust the shadow values to your preference */
+ }
+
+ .rotate-icon {
+ animation: rotate 1s infinite;
+ }
+
+ @keyframes rotate {
+ 0% { transform: rotate(0deg); }
+ 100% { transform: rotate(360deg); }
+ }
+
+ .table-responsive {
+ overflow-x: scroll;
+ }
+
\ No newline at end of file
diff --git a/src/app/_modules/dashboard/payment-details/payment-details.component.ts b/src/app/_modules/dashboard/payment-details/payment-details.component.ts
new file mode 100644
index 0000000..9248d8e
--- /dev/null
+++ b/src/app/_modules/dashboard/payment-details/payment-details.component.ts
@@ -0,0 +1,124 @@
+import { Component, OnInit, ViewChild, ElementRef } from '@angular/core';
+import { MatSort, Sort } from '@angular/material/sort';
+import { MatTableDataSource } from '@angular/material/table';
+import { ActivatedRoute, Router } from '@angular/router';
+import { apiUrl } from 'src/app/_providers/_resources/api-url.properties';
+import { MasterService } from 'src/app/_providers/_services/master.service';
+import { UiService } from 'src/app/_providers/_services/ui.service';
+
+@Component({
+ selector: 'app-payment-details',
+ templateUrl: './payment-details.component.html',
+ styleUrls: ['./payment-details.component.scss']
+})
+export class PaymentDetailsComponent implements OnInit {
+
+
+ title = 'Payment Details';
+
+ today: Date = new Date();
+
+ @ViewChild('table', { static: false }) table: ElementRef;
+
+ @ViewChild(MatSort, { static: false }) sort: MatSort;
+
+ displaycolumns: string[] = ['slNo', 'name', 'mobileNumber', 'email', 'transId', 'Paymentstatus'];
+
+ dataSource: MatTableDataSource
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Payment Details
+
+
+
+
+ Tender Information:
+
+
+
+
+
+
+ {{'tender'|translate}} :
+ {{headerData?.title}}
+
+
+
+
+
+
+
+
+ {{'tenderId'|translate}} :
+ {{tenderInputId}}
+
+
+
+ +
+
+Payment Summary:
+| + | + | + | {{title | translate}} | ++ | + |
|---|---|---|---|---|---|
| + + | Tender Name | ++ {{headerData?.title}} + | + ++ | Published Date | ++ {{headerData?.publishDate }} + | +
| + + | Tender Id | ++ {{tenderInputId }} + | ++ | Bid Open Date | ++ {{headerData?.bidOpenDate}} + | + +
+
+
+
+
+
+
+ {{i+1}}
+
+
+
+
+
+
+
+
+ {{element?.userName}}
+
+
+
+
+
+
+
+
+ {{element.rollNo }}
+
+
+
+
+
+
+
+
+
+
+ {{element?.mobileNumber}}
+
+
+
+
+
+
+
+
+ {{element?.email}}
+
+
+
+
+
+
+
+
+
+
+ {{element?.transId}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Pending
+ Decline
+ Confirm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{'slNo'|translate}}
+
+
+ {{'name'|translate}}
+
+
+ {{'admissionNo'|translate}}
+
+
+ {{'mobileNumber'|translate}}
+
+
+ {{'emailId'|translate}}
+
+
+ {{'TransactionId'|translate}}
+
+
+ {{'Paymentstatus'|translate}}
+
+ +
+
+
+![QR Code]()
+
+Payment Status : {{paymentStatus}}
++
Amount need to be paid : ₹{{amountReq}}/- Only
+ ++
+
+
+
+
+
+
+
+ Transaction ID
+
+
+
+
+
+
+
+
+ Please provide the transaction id of payment you've made successfully.
+ +
+
+
+
+
+ help?
+
+
+
+ How can I pay?
+-
+
- Launch the payment app on your smartphone +
- scan the code +
- Review the payment details to ensure they're correct, and then confirm the transaction +
How do I get my Transaction Id?
+-
+
- The method to obtain a transaction ID for a QR code payment can vary depending on the payment app you're using and the platform through which you made the payment. Generally, when you make a payment using a QR code, the transaction ID is usually generated and provided to you as a confirmation of the completed payment. please check your payment app or mail for Transaction ID +
How can I ensure that the payment was successful?
+-
+
- After your successfull payment,enter the transaction Id +
- After the confirmation from Bank, your payment status will be changed from Pending to Paid +
Can I change the Transaction ID once it has been saved?
+-
+
- You can edit the transaction ID after saving also +
- Editing Must be before the appropriate date +
more info : tscb178@gmail.com
+ +
+ Close
+
+