@xsolla/payment-client-core 0.1.14-test10 → 0.1.14-test12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -17,16 +17,48 @@ export class SavePaymentMethodStatusService {
17
17
  this.nextActionService = nextActionService;
18
18
  }
19
19
  async getStatus(params) {
20
+ console.log('getStatus', params);
20
21
  this.statusRequestService.setRequestParams(params);
21
- this.startWaitingStatusUpdates(params.invoice);
22
+ // todo: get account
23
+ const accountData = await this.getPaymentAccountData(params.invoice);
24
+ // this.startWaitingStatusUpdates(params.invoice);
22
25
  this.statusRequestService.request();
23
26
  const statusResponse = await firstValueFrom(this.statusRequestService.response$);
24
- if (!this.savePaymentMethodStatus) {
27
+ // const savingFailedOrCancel = statusResponse.status?.titleClass === TitleClass.cancel || statusResponse.status?.titleClass === TitleClass.cancelUser;
28
+ // const savingSuccessful = statusResponse.status?.titleClass === TitleClass.done && accountData?.new_account;
29
+ if (!this.savingFailedOrCancel(statusResponse?.status) && !this.savingSuccessful(accountData, statusResponse?.status)) {
30
+ // todo is proccessing
31
+ this.startWaitingStatusUpdates(params.invoice);
25
32
  statusResponse.status.statusState = StatusEnum.processing;
26
33
  }
34
+ statusResponse.status.isSavePaymentAccount = true;
27
35
  return statusResponse.status;
36
+ // if (!this.savePaymentMethodStatus) {
37
+ // statusResponse.status.statusState = StatusEnum.processing;
38
+ // }
39
+ // statusResponse.status.isSavePaymentAccount = true;
40
+ // return statusResponse.status;
41
+ }
42
+ savingFailedOrCancel(status) {
43
+ return status?.titleClass === TitleClass.cancel || status?.titleClass === TitleClass.cancelUser;
44
+ }
45
+ savingSuccessful(accountData, status) {
46
+ return !!(status?.titleClass === TitleClass.done && accountData?.new_account);
47
+ }
48
+ getPaymentAccountData(invoice) {
49
+ return this.savedPaymentAccountChangesService
50
+ .request(invoice);
51
+ // .then((accountChanges: SavedPaymentAccountChanges) => {
52
+ // if (accountChanges) {
53
+ // this.handleSavingStatus(status, accountChanges.new_account);
54
+ // }
55
+ // });
28
56
  }
29
57
  startWaitingStatusUpdates(invoice) {
58
+ if (this.listenStatusSubscription) {
59
+ this.listenStatusSubscription.unsubscribe();
60
+ this.listenStatusService.stopListening();
61
+ }
30
62
  this.listenStatusService.listen(invoice);
31
63
  this.listenStatusSubscription = this.listenStatusService.statusUpdated$
32
64
  .subscribe(({ statusResponse }) => {
@@ -43,20 +75,22 @@ export class SavePaymentMethodStatusService {
43
75
  .request(status.invoice)
44
76
  .then((accountChanges) => {
45
77
  if (accountChanges) {
46
- this.handleSavingStatus(status, accountChanges.new_account);
78
+ this.handleSavingStatus(status, accountChanges);
47
79
  }
48
80
  });
49
81
  }
50
82
  handleSavingStatus(status, account) {
51
- this.listenStatusService.stopListening();
52
- this.listenStatusSubscription.unsubscribe();
53
- const updatingIsProcessing = status?.titleClass !== TitleClass.cancel && status?.titleClass !== TitleClass.cancelUser && !account;
54
- if (updatingIsProcessing) {
83
+ // const savingFailedOrCancel = status?.titleClass === TitleClass.cancel || status?.titleClass === TitleClass.cancelUser;
84
+ //
85
+ // const savingSuccessful = status?.titleClass === TitleClass.done && account;
86
+ if (!this.savingFailedOrCancel(status) && !this.savingSuccessful(account, status)) {
55
87
  return;
56
88
  }
57
- const paymentAccountWasSaved = status?.titleClass === TitleClass.done && account !== null;
89
+ this.listenStatusService.stopListening();
90
+ this.listenStatusSubscription.unsubscribe();
91
+ // const paymentAccountWasSaved = status?.titleClass === TitleClass.done && account !== null;
58
92
  const isSavePaymentMethod = true;
59
- this.savePaymentMethodStatus = paymentAccountWasSaved ? SavePaymentMethodStatus.success : SavePaymentMethodStatus.failed;
93
+ this.savePaymentMethodStatus = this.savingFailedOrCancel(status) ? SavePaymentMethodStatus.success : SavePaymentMethodStatus.failed;
60
94
  this.nextActionService.emitFlowUpdates(new StatusUpdatedAction(status, isSavePaymentMethod, this.savePaymentMethodStatus));
61
95
  }
62
96
  }
@@ -68,4 +102,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImpor
68
102
  providedIn: 'root'
69
103
  }]
70
104
  }], ctorParameters: function () { return [{ type: i1.StatusRequestService }, { type: i2.ListenStatusService }, { type: i3.SavedPaymentAccountChangesService }, { type: i4.NextActionService }]; } });
71
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"save-payment-method-status.service.js","sourceRoot":"","sources":["../../../../../../../../packages/payment-client-core/src/lib/core/payment/status/save-payment-method-status/save-payment-method-status.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { StatusRequestParams } from '../status-request/status-request-params.interface';\nimport { Status } from '../status.interface';\nimport { firstValueFrom, skip, Subscription } from 'rxjs';\nimport { StatusRequestService } from '../status-request/status-request.service';\nimport { StatusUpdatedAction } from '../../actions/status-updated/status-updated.action.class';\nimport { ListenStatusService } from '../listen-status/listen-status.service';\nimport { SavedPaymentAccountChanges } from './api/saved-payment-account-changes.interface';\nimport { SavedPaymentAccountChangesService } from './api/saved-payment-account-changes.service';\nimport { SavedPaymentAccount } from './api/saved-payment-account.interface';\nimport { TitleClass } from '../title-class.enum';\nimport { NextActionService } from '../../actions/next-action.service';\nimport { StatusEnum } from '../status.enum';\nimport { SavePaymentMethodStatus } from './save-payment-method-status.enum';\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class SavePaymentMethodStatusService {\n  private savePaymentMethodStatus?: SavePaymentMethodStatus;\n  private listenStatusSubscription!: Subscription;\n\n  public constructor(\n    private readonly statusRequestService: StatusRequestService,\n    private readonly listenStatusService: ListenStatusService,\n    private readonly savedPaymentAccountChangesService: SavedPaymentAccountChangesService,\n    private readonly nextActionService: NextActionService) { }\n  public async getStatus(params: StatusRequestParams): Promise<Status> {\n\n    this.statusRequestService.setRequestParams(params);\n\n    this.startWaitingStatusUpdates(params.invoice);\n\n    this.statusRequestService.request();\n\n    const statusResponse = await firstValueFrom(\n      this.statusRequestService.response$\n    );\n\n    if (!this.savePaymentMethodStatus) {\n      statusResponse.status.statusState = StatusEnum.processing;\n    }\n    return statusResponse.status;\n  }\n\n  private startWaitingStatusUpdates(invoice: number): void {\n    this.listenStatusService.listen(invoice);\n\n    this.listenStatusSubscription = this.listenStatusService.statusUpdated$\n      .subscribe(({ statusResponse }) => {\n\n        if (statusResponse.status) {\n          this.loadNewPaymentAccountData(statusResponse.status)\n        }\n      });\n  }\n\n  private loadNewPaymentAccountData(status: Status): void {\n    if (!status.invoice) {\n      return;\n    }\n    void this.savedPaymentAccountChangesService\n      .request(status.invoice)\n      .then((accountChanges: SavedPaymentAccountChanges) => {\n        if (accountChanges) {\n          this.handleSavingStatus(status, accountChanges.new_account);\n        }\n      });\n  }\n\n  private handleSavingStatus(\n    status: Status,\n    account: SavedPaymentAccount | null\n  ): void {\n    this.listenStatusService.stopListening();\n    this.listenStatusSubscription.unsubscribe();\n\n    const updatingIsProcessing = status?.titleClass !== TitleClass.cancel && status?.titleClass !== TitleClass.cancelUser && !account;\n\n    if (updatingIsProcessing) {\n      return;\n    }\n\n    const paymentAccountWasSaved = status?.titleClass === TitleClass.done && account !== null;\n    const isSavePaymentMethod = true;\n\n    this.savePaymentMethodStatus = paymentAccountWasSaved ? SavePaymentMethodStatus.success : SavePaymentMethodStatus.failed;\n\n    this.nextActionService.emitFlowUpdates(\n      new StatusUpdatedAction(status, isSavePaymentMethod, this.savePaymentMethodStatus)\n    );\n  }\n}\n"]}
105
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"save-payment-method-status.service.js","sourceRoot":"","sources":["../../../../../../../../packages/payment-client-core/src/lib/core/payment/status/save-payment-method-status/save-payment-method-status.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { StatusRequestParams } from '../status-request/status-request-params.interface';\nimport { Status } from '../status.interface';\nimport { firstValueFrom, Subscription } from 'rxjs';\nimport { StatusRequestService } from '../status-request/status-request.service';\nimport { StatusUpdatedAction } from '../../actions/status-updated/status-updated.action.class';\nimport { ListenStatusService } from '../listen-status/listen-status.service';\nimport { SavedPaymentAccountChanges } from './api/saved-payment-account-changes.interface';\nimport { SavedPaymentAccountChangesService } from './api/saved-payment-account-changes.service';\nimport { SavedPaymentAccount } from './api/saved-payment-account.interface';\nimport { TitleClass } from '../title-class.enum';\nimport { NextActionService } from '../../actions/next-action.service';\nimport { StatusEnum } from '../status.enum';\nimport { SavePaymentMethodStatus } from './save-payment-method-status.enum';\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class SavePaymentMethodStatusService {\n  private savePaymentMethodStatus?: SavePaymentMethodStatus;\n  private listenStatusSubscription!: Subscription;\n\n  public constructor(\n    private readonly statusRequestService: StatusRequestService,\n    private readonly listenStatusService: ListenStatusService,\n    private readonly savedPaymentAccountChangesService: SavedPaymentAccountChangesService,\n    private readonly nextActionService: NextActionService) { }\n  public async getStatus(params: StatusRequestParams): Promise<Status> {\n    console.log('getStatus', params);\n\n    this.statusRequestService.setRequestParams(params);\n\n    // todo: get account\n    const accountData = await this.getPaymentAccountData(params.invoice);\n    // this.startWaitingStatusUpdates(params.invoice);\n\n    this.statusRequestService.request();\n\n    const statusResponse = await firstValueFrom(\n      this.statusRequestService.response$\n    );\n\n\n\n    // const savingFailedOrCancel = statusResponse.status?.titleClass === TitleClass.cancel || statusResponse.status?.titleClass === TitleClass.cancelUser;\n\n    // const savingSuccessful = statusResponse.status?.titleClass === TitleClass.done && accountData?.new_account;\n\n    if (!this.savingFailedOrCancel(statusResponse?.status) && !this.savingSuccessful(accountData, statusResponse?.status)) {\n      // todo is proccessing\n\n      this.startWaitingStatusUpdates(params.invoice);\n      statusResponse.status.statusState = StatusEnum.processing;\n    }\n    statusResponse.status.isSavePaymentAccount = true;\n    return statusResponse.status;\n\n    // if (!this.savePaymentMethodStatus) {\n    //   statusResponse.status.statusState = StatusEnum.processing;\n    // }\n    // statusResponse.status.isSavePaymentAccount = true;\n    // return statusResponse.status;\n  }\n\n  private savingFailedOrCancel(status?: Status): boolean {\n    return status?.titleClass === TitleClass.cancel || status?.titleClass === TitleClass.cancelUser;\n  }\n\n  private savingSuccessful(accountData: SavedPaymentAccountChanges, status?: Status): boolean {\n    return !!(status?.titleClass === TitleClass.done && accountData?.new_account);\n  }\n\n  private getPaymentAccountData(invoice: number): Promise<SavedPaymentAccountChanges> {\n    return this.savedPaymentAccountChangesService\n      .request(invoice)\n      // .then((accountChanges: SavedPaymentAccountChanges) => {\n      //   if (accountChanges) {\n      //     this.handleSavingStatus(status, accountChanges.new_account);\n      //   }\n      // });\n  }\n\n  private startWaitingStatusUpdates(invoice: number): void {\n    if (this.listenStatusSubscription) {\n      this.listenStatusSubscription.unsubscribe();\n      this.listenStatusService.stopListening();\n    }\n    this.listenStatusService.listen(invoice);\n\n    this.listenStatusSubscription = this.listenStatusService.statusUpdated$\n      .subscribe(({ statusResponse }) => {\n\n        if (statusResponse.status) {\n          this.loadNewPaymentAccountData(statusResponse.status)\n        }\n      });\n  }\n\n  private loadNewPaymentAccountData(status: Status): void {\n\n\n    if (!status.invoice) {\n      return;\n    }\n    void this.savedPaymentAccountChangesService\n      .request(status.invoice)\n      .then((accountChanges: SavedPaymentAccountChanges) => {\n\n\n        if (accountChanges) {\n\n          this.handleSavingStatus(status, accountChanges);\n        }\n      });\n  }\n\n  private handleSavingStatus(\n    status: Status,\n    account: SavedPaymentAccountChanges\n  ): void {\n\n    // const savingFailedOrCancel = status?.titleClass === TitleClass.cancel || status?.titleClass === TitleClass.cancelUser;\n    //\n    // const savingSuccessful = status?.titleClass === TitleClass.done && account;\n\n\n    if (!this.savingFailedOrCancel(status) && !this.savingSuccessful(account, status)) {\n      return;\n    }\n    this.listenStatusService.stopListening();\n    this.listenStatusSubscription.unsubscribe();\n\n    // const paymentAccountWasSaved = status?.titleClass === TitleClass.done && account !== null;\n    const isSavePaymentMethod = true;\n\n    this.savePaymentMethodStatus = this.savingFailedOrCancel(status) ? SavePaymentMethodStatus.success : SavePaymentMethodStatus.failed;\n\n    this.nextActionService.emitFlowUpdates(\n      new StatusUpdatedAction(status, isSavePaymentMethod, this.savePaymentMethodStatus)\n    );\n  }\n}\n"]}
@@ -1,2 +1,2 @@
1
1
  export {};
2
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhdHVzLmludGVyZmFjZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL3BheW1lbnQtY2xpZW50LWNvcmUvc3JjL2xpYi9jb3JlL3BheW1lbnQvc3RhdHVzL3N0YXR1cy5pbnRlcmZhY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFN0YXR1c0ZpbmFuY2VJbmZvIH0gZnJvbSAnLi9zdGF0dXMtZmluYW5jZS1pbmZvLmludGVyZmFjZSc7XG5pbXBvcnQgeyBTdGF0dXNPcmRlciB9IGZyb20gJy4vc3RhdHVzLW9yZGVyLmludGVyZmFjZSc7XG5pbXBvcnQgeyBTdGF0dXNFbnVtIH0gZnJvbSAnLi9zdGF0dXMuZW51bSc7XG5pbXBvcnQgeyBUaXRsZUNsYXNzIH0gZnJvbSAnLi90aXRsZS1jbGFzcy5lbnVtJztcbmltcG9ydCB7IFdlYlNvY2tldENsaWVudFR5cGUgfSBmcm9tICcuL3dlYi1zb2NrZXQtY2xpZW50LXR5cGUuZW51bSc7XG5cbmV4cG9ydCBpbnRlcmZhY2UgU3RhdHVzIHtcbiAgcG9zdE1lc3NhZ2VTdGF0dXM6IHN0cmluZztcbiAgdmlydHVhbEN1cnJlbmN5QW1vdW50OiBudW1iZXI7XG4gIHN0YXR1c1N0YXRlOiBTdGF0dXNFbnVtO1xuICBlbWFpbDogc3RyaW5nO1xuICB3ZWJTb2NrZXRVcmw6IHN0cmluZztcbiAgd2ViU29ja2V0Q2hhbm5lbE5hbWU6IHN0cmluZztcbiAgd2ViU29ja2V0Q2xpZW50VHlwZTogV2ViU29ja2V0Q2xpZW50VHlwZTtcbiAgZmluYW5jZUluZm86IFN0YXR1c0ZpbmFuY2VJbmZvO1xuICBpc0NhbmNlbFVzZXI6IGJvb2xlYW47XG4gIGJhY2tVcmxTZXR0aW5nczoge1xuICAgIGJhY2tVcmw6IHN0cmluZztcbiAgICBiYWNrVXJsQWN0aW9uPzogc3RyaW5nO1xuICAgIGJhY2tVcmxDYXB0aW9uOiBzdHJpbmc7XG4gICAgcmV0dXJuUmVnaW9uOiBzdHJpbmc7XG4gICAgc2hvd0JhY2tCdXR0b24/OiBib29sZWFuO1xuICB9O1xuICBhZGRpdGlvbmFsQmFja0J1dHRvbjoge1xuICAgIGxpbms6IHN0cmluZztcbiAgICBhY3Rpb246IHN0cmluZztcbiAgICBsYWJlbDogc3RyaW5nO1xuICAgIHJlZ2lvbjogc3RyaW5nO1xuICAgIGlzRW5hYmxlZDogYm9vbGVhbjtcbiAgfTtcbiAgZ3JvdXA6IHN0cmluZztcbiAgbmVlZFRvQ2hlY2s6IGJvb2xlYW47XG4gIGF1dG9SZWRpcmVjdD86IHsgdGltZTogbnVtYmVyIH07XG4gIHVzZXJSZXR1cm5TdGF0dXM/OiBzdHJpbmc7XG4gIHN0YXR1c01lc3NhZ2U6IHN0cmluZztcbiAgZGlzY291bnQ6IG51bWJlciB8IG51bGw7XG4gIHVzZXJJZD86IHN0cmluZztcbiAgaW52b2ljZT86IG51bWJlcjtcbiAgcGlkPzogbnVtYmVyO1xuICBwcm9qZWN0QW1vdW50Pzoge1xuICAgIGFtb3VudDogc3RyaW5nO1xuICAgIGN1cnJlbmN5OiBzdHJpbmc7XG4gIH07XG4gIHRpdGxlQ2xhc3M6IFRpdGxlQ2xhc3M7XG4gIGlzU3VjY2Vzcz86IGJvb2xlYW47XG4gIGlzQ2FuY2VsZWQ/OiBib29sZWFuO1xuICBwYXltZW50Q291bnRyeUlzbzogc3RyaW5nO1xuICBvcmRlcj86IFN0YXR1c09yZGVyO1xufVxuIl19
2
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhdHVzLmludGVyZmFjZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL3BheW1lbnQtY2xpZW50LWNvcmUvc3JjL2xpYi9jb3JlL3BheW1lbnQvc3RhdHVzL3N0YXR1cy5pbnRlcmZhY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFN0YXR1c0ZpbmFuY2VJbmZvIH0gZnJvbSAnLi9zdGF0dXMtZmluYW5jZS1pbmZvLmludGVyZmFjZSc7XG5pbXBvcnQgeyBTdGF0dXNPcmRlciB9IGZyb20gJy4vc3RhdHVzLW9yZGVyLmludGVyZmFjZSc7XG5pbXBvcnQgeyBTdGF0dXNFbnVtIH0gZnJvbSAnLi9zdGF0dXMuZW51bSc7XG5pbXBvcnQgeyBUaXRsZUNsYXNzIH0gZnJvbSAnLi90aXRsZS1jbGFzcy5lbnVtJztcbmltcG9ydCB7IFdlYlNvY2tldENsaWVudFR5cGUgfSBmcm9tICcuL3dlYi1zb2NrZXQtY2xpZW50LXR5cGUuZW51bSc7XG5cbmV4cG9ydCBpbnRlcmZhY2UgU3RhdHVzIHtcbiAgcG9zdE1lc3NhZ2VTdGF0dXM6IHN0cmluZztcbiAgdmlydHVhbEN1cnJlbmN5QW1vdW50OiBudW1iZXI7XG4gIHN0YXR1c1N0YXRlOiBTdGF0dXNFbnVtO1xuICBlbWFpbDogc3RyaW5nO1xuICB3ZWJTb2NrZXRVcmw6IHN0cmluZztcbiAgd2ViU29ja2V0Q2hhbm5lbE5hbWU6IHN0cmluZztcbiAgd2ViU29ja2V0Q2xpZW50VHlwZTogV2ViU29ja2V0Q2xpZW50VHlwZTtcbiAgZmluYW5jZUluZm86IFN0YXR1c0ZpbmFuY2VJbmZvO1xuICBpc0NhbmNlbFVzZXI6IGJvb2xlYW47XG4gIGJhY2tVcmxTZXR0aW5nczoge1xuICAgIGJhY2tVcmw6IHN0cmluZztcbiAgICBiYWNrVXJsQWN0aW9uPzogc3RyaW5nO1xuICAgIGJhY2tVcmxDYXB0aW9uOiBzdHJpbmc7XG4gICAgcmV0dXJuUmVnaW9uOiBzdHJpbmc7XG4gICAgc2hvd0JhY2tCdXR0b24/OiBib29sZWFuO1xuICB9O1xuICBhZGRpdGlvbmFsQmFja0J1dHRvbjoge1xuICAgIGxpbms6IHN0cmluZztcbiAgICBhY3Rpb246IHN0cmluZztcbiAgICBsYWJlbDogc3RyaW5nO1xuICAgIHJlZ2lvbjogc3RyaW5nO1xuICAgIGlzRW5hYmxlZDogYm9vbGVhbjtcbiAgfTtcbiAgZ3JvdXA6IHN0cmluZztcbiAgbmVlZFRvQ2hlY2s6IGJvb2xlYW47XG4gIGF1dG9SZWRpcmVjdD86IHsgdGltZTogbnVtYmVyIH07XG4gIHVzZXJSZXR1cm5TdGF0dXM/OiBzdHJpbmc7XG4gIHN0YXR1c01lc3NhZ2U6IHN0cmluZztcbiAgZGlzY291bnQ6IG51bWJlciB8IG51bGw7XG4gIHVzZXJJZD86IHN0cmluZztcbiAgaW52b2ljZT86IG51bWJlcjtcbiAgcGlkPzogbnVtYmVyO1xuICBwcm9qZWN0QW1vdW50Pzoge1xuICAgIGFtb3VudDogc3RyaW5nO1xuICAgIGN1cnJlbmN5OiBzdHJpbmc7XG4gIH07XG4gIHRpdGxlQ2xhc3M6IFRpdGxlQ2xhc3M7XG4gIGlzU3VjY2Vzcz86IGJvb2xlYW47XG4gIGlzQ2FuY2VsZWQ/OiBib29sZWFuO1xuICBwYXltZW50Q291bnRyeUlzbzogc3RyaW5nO1xuICBvcmRlcj86IFN0YXR1c09yZGVyO1xuICBpc1NhdmVQYXltZW50QWNjb3VudD86IGJvb2xlYW47XG59XG4iXX0=
@@ -4745,17 +4745,49 @@ class SavePaymentMethodStatusService {
4745
4745
  }
4746
4746
  getStatus(params) {
4747
4747
  return __awaiter(this, void 0, void 0, function* () {
4748
+ console.log('getStatus', params);
4748
4749
  this.statusRequestService.setRequestParams(params);
4749
- this.startWaitingStatusUpdates(params.invoice);
4750
+ // todo: get account
4751
+ const accountData = yield this.getPaymentAccountData(params.invoice);
4752
+ // this.startWaitingStatusUpdates(params.invoice);
4750
4753
  this.statusRequestService.request();
4751
4754
  const statusResponse = yield firstValueFrom(this.statusRequestService.response$);
4752
- if (!this.savePaymentMethodStatus) {
4755
+ // const savingFailedOrCancel = statusResponse.status?.titleClass === TitleClass.cancel || statusResponse.status?.titleClass === TitleClass.cancelUser;
4756
+ // const savingSuccessful = statusResponse.status?.titleClass === TitleClass.done && accountData?.new_account;
4757
+ if (!this.savingFailedOrCancel(statusResponse === null || statusResponse === void 0 ? void 0 : statusResponse.status) && !this.savingSuccessful(accountData, statusResponse === null || statusResponse === void 0 ? void 0 : statusResponse.status)) {
4758
+ // todo is proccessing
4759
+ this.startWaitingStatusUpdates(params.invoice);
4753
4760
  statusResponse.status.statusState = StatusEnum.processing;
4754
4761
  }
4762
+ statusResponse.status.isSavePaymentAccount = true;
4755
4763
  return statusResponse.status;
4764
+ // if (!this.savePaymentMethodStatus) {
4765
+ // statusResponse.status.statusState = StatusEnum.processing;
4766
+ // }
4767
+ // statusResponse.status.isSavePaymentAccount = true;
4768
+ // return statusResponse.status;
4756
4769
  });
4757
4770
  }
4771
+ savingFailedOrCancel(status) {
4772
+ return (status === null || status === void 0 ? void 0 : status.titleClass) === TitleClass.cancel || (status === null || status === void 0 ? void 0 : status.titleClass) === TitleClass.cancelUser;
4773
+ }
4774
+ savingSuccessful(accountData, status) {
4775
+ return !!((status === null || status === void 0 ? void 0 : status.titleClass) === TitleClass.done && (accountData === null || accountData === void 0 ? void 0 : accountData.new_account));
4776
+ }
4777
+ getPaymentAccountData(invoice) {
4778
+ return this.savedPaymentAccountChangesService
4779
+ .request(invoice);
4780
+ // .then((accountChanges: SavedPaymentAccountChanges) => {
4781
+ // if (accountChanges) {
4782
+ // this.handleSavingStatus(status, accountChanges.new_account);
4783
+ // }
4784
+ // });
4785
+ }
4758
4786
  startWaitingStatusUpdates(invoice) {
4787
+ if (this.listenStatusSubscription) {
4788
+ this.listenStatusSubscription.unsubscribe();
4789
+ this.listenStatusService.stopListening();
4790
+ }
4759
4791
  this.listenStatusService.listen(invoice);
4760
4792
  this.listenStatusSubscription = this.listenStatusService.statusUpdated$
4761
4793
  .subscribe(({ statusResponse }) => {
@@ -4772,20 +4804,22 @@ class SavePaymentMethodStatusService {
4772
4804
  .request(status.invoice)
4773
4805
  .then((accountChanges) => {
4774
4806
  if (accountChanges) {
4775
- this.handleSavingStatus(status, accountChanges.new_account);
4807
+ this.handleSavingStatus(status, accountChanges);
4776
4808
  }
4777
4809
  });
4778
4810
  }
4779
4811
  handleSavingStatus(status, account) {
4780
- this.listenStatusService.stopListening();
4781
- this.listenStatusSubscription.unsubscribe();
4782
- const updatingIsProcessing = (status === null || status === void 0 ? void 0 : status.titleClass) !== TitleClass.cancel && (status === null || status === void 0 ? void 0 : status.titleClass) !== TitleClass.cancelUser && !account;
4783
- if (updatingIsProcessing) {
4812
+ // const savingFailedOrCancel = status?.titleClass === TitleClass.cancel || status?.titleClass === TitleClass.cancelUser;
4813
+ //
4814
+ // const savingSuccessful = status?.titleClass === TitleClass.done && account;
4815
+ if (!this.savingFailedOrCancel(status) && !this.savingSuccessful(account, status)) {
4784
4816
  return;
4785
4817
  }
4786
- const paymentAccountWasSaved = (status === null || status === void 0 ? void 0 : status.titleClass) === TitleClass.done && account !== null;
4818
+ this.listenStatusService.stopListening();
4819
+ this.listenStatusSubscription.unsubscribe();
4820
+ // const paymentAccountWasSaved = status?.titleClass === TitleClass.done && account !== null;
4787
4821
  const isSavePaymentMethod = true;
4788
- this.savePaymentMethodStatus = paymentAccountWasSaved ? SavePaymentMethodStatus.success : SavePaymentMethodStatus.failed;
4822
+ this.savePaymentMethodStatus = this.savingFailedOrCancel(status) ? SavePaymentMethodStatus.success : SavePaymentMethodStatus.failed;
4789
4823
  this.nextActionService.emitFlowUpdates(new StatusUpdatedAction(status, isSavePaymentMethod, this.savePaymentMethodStatus));
4790
4824
  }
4791
4825
  }