valitydev/control-center
14
0
Fork 0
mirror of https://github.com/valitydev/control-center.git synced 2024-11-06 02:25:17 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Bump damsel version (#262)

Browse Source
This commit is contained in:
Ildar Galeev 2021-04-09 18:07:56 +03:00 committed by GitHub
parent 27bf6e3477
commit fbde1e47c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package-lock.json generated
View File

@ -6878,8 +6878,8 @@
"dev": true
},
"damsel": {
"version": "git+ssh://git@github.com/rbkmoney/damsel.git#2c99b42a3e8ac3ef7c8eb188b49d445f50596298",
"from": "git+ssh://git@github.com/rbkmoney/damsel.git#2c99b42a3e8ac3ef7c8eb188b49d445f50596298"
"version": "git+ssh://git@github.com/rbkmoney/damsel.git#8851c242d2953cc52397af3d916b52b164ffe4c0",
"from": "git+ssh://git@github.com/rbkmoney/damsel.git#8851c242d2953cc52397af3d916b52b164ffe4c0"
},
"dashdash": {
"version": "1.14.1",
@ -8162,9 +8162,9 @@
"dev": true
},
"eslint-plugin-react": {
"version": "7.23.1",
"resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.23.1.tgz",
"integrity": "sha512-MvFGhZjI8Z4HusajmSw0ougGrq3Gs4vT/0WgwksZgf5RrLrRa2oYAw56okU4tZJl8+j7IYNuTM+2RnFEuTSdRQ==",
"version": "7.23.2",
"resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.23.2.tgz",
"integrity": "sha512-AfjgFQB+nYszudkxRkTFu0UR1zEQig0ArVMPloKhxwlwkzaw/fBiH0QWcBBhZONlXqQC51+nfqFrkn4EzHcGBw==",
"dev": true,
"requires": {
"array-includes": "^3.1.3",

2
package.json
View File

@ -37,7 +37,7 @@
"angular2-prettyjson": "3.0.1",
"ank-proto": "git+ssh://git@github.com:rbkmoney/ank-proto.git#d638e44eb8632fd62f0d6730294e51637babcc78",
"coerce-property": "^0.3.2",
"damsel": "git+ssh://git@github.com/rbkmoney/damsel.git#2c99b42a3e8ac3ef7c8eb188b49d445f50596298",
"damsel": "git+ssh://git@github.com/rbkmoney/damsel.git#8851c242d2953cc52397af3d916b52b164ffe4c0",
"deanonimus-proto": "github:rbkmoney/deanonimus-proto#b9fab4fd1c7690186efdc5974d113c82bd5765e9",
"file-storage-proto": "git+ssh://git@github.com:rbkmoney/file-storage-proto.git#281e1ca4cea9bf32229a6c389f0dcf5d49c05a0b",
"fistful-proto": "git+ssh://git@github.com/rbkmoney/fistful-proto.git#7b3f125aa7cbc069f740f598295bb56de713c39f",

18
src/app/sections/payment-details/payment-main-info/payment-tool/bank-card/bank-card.component.html
View File

@ -1,21 +1,27 @@
<div fxLayout fxLayoutGap="8px" fxLayoutAlign="start center">
<div>{{ bankCard | toCardNumber }}</div>
<mat-icon *ngIf="bankCard.payment_system === paymentSystems?.visa" svgIcon="visa"></mat-icon>
<mat-icon
*ngIf="bankCard.payment_system === paymentSystems?.mastercard"
*ngIf="bankCard.payment_system_deprecated === legacyPaymentSystems?.visa"
svgIcon="visa"
></mat-icon>
<mat-icon
*ngIf="bankCard.payment_system_deprecated === legacyPaymentSystems?.mastercard"
svgIcon="mastercard"
></mat-icon>
<mat-icon *ngIf="bankCard.payment_system === paymentSystems?.nspkmir" svgIcon="mir"></mat-icon>
<mat-icon
*ngIf="bankCard.token_provider === tokenProviders?.applepay"
*ngIf="bankCard.payment_system_deprecated === legacyPaymentSystems?.nspkmir"
svgIcon="mir"
></mat-icon>
<mat-icon
*ngIf="bankCard.token_provider_deprecated === legacyTokenProviders?.applepay"
svgIcon="apple_pay"
></mat-icon>
<mat-icon
*ngIf="bankCard.token_provider === tokenProviders?.samsungpay"
*ngIf="bankCard.token_provider_deprecated === legacyTokenProviders?.samsungpay"
svgIcon="samsung_pay"
></mat-icon>
<mat-icon
*ngIf="bankCard.token_provider === tokenProviders?.googlepay"
*ngIf="bankCard.token_provider_deprecated === legacyTokenProviders?.googlepay"
svgIcon="google_pay"
></mat-icon>
</div>

9
src/app/sections/payment-details/payment-main-info/payment-tool/bank-card/bank-card.component.ts
View File

@ -1,8 +1,8 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
import {
BankCardPaymentSystem,
BankCardTokenProvider,
LegacyBankCardPaymentSystem,
LegacyBankCardTokenProvider,
} from '../../../../../thrift-services/damsel/gen-model/domain';
import { BankCard } from '../../../../../thrift-services/damsel/gen-model/merch_stat';
@ -14,6 +14,7 @@ import { BankCard } from '../../../../../thrift-services/damsel/gen-model/merch_
export class BankCardComponent {
@Input() bankCard: BankCard;
paymentSystems = BankCardPaymentSystem;
tokenProviders = BankCardTokenProvider;
// TODO Need migration according to: https://github.com/rbkmoney/damsel/commit/61677b86006d405619bdc5f23d6416a929688180
legacyPaymentSystems = LegacyBankCardPaymentSystem;
legacyTokenProviders = LegacyBankCardTokenProvider;
}

20
src/app/sections/payment-routing-rules/shop-payment-routing-ruleset/add-shop-payment-routing-rule-dialog/predicate/predicate.component.ts
View File

@ -12,8 +12,8 @@ import { distinctUntilChanged, map, shareReplay, startWith, tap } from 'rxjs/ope
import {
BankCardConditionDefinition,
BankCardPaymentSystem,
BankCardTokenProvider,
LegacyBankCardPaymentSystem,
LegacyBankCardTokenProvider,
Predicate,
Residence,
TokenizationMethod,
@ -154,8 +154,8 @@ export class PredicateComponent implements OnChanges {
)
).subscribe();
}
this.paymentSystems$ = this.getFilteredKeys(paymentSystem, BankCardPaymentSystem);
this.tokenProviders$ = this.getFilteredKeys(tokenProvider, BankCardTokenProvider);
this.paymentSystems$ = this.getFilteredKeys(paymentSystem, LegacyBankCardPaymentSystem);
this.tokenProviders$ = this.getFilteredKeys(tokenProvider, LegacyBankCardTokenProvider);
this.tokenizationMethods$ = this.getFilteredKeys(tokenizationMethod, TokenizationMethod);
this.residences$ = this.getFilteredKeys(residence, Residence);
}
@ -172,9 +172,9 @@ export class PredicateComponent implements OnChanges {
residence: ['', [Validators.required, this.enumValidator(Residence)]],
paymentSystem: [
'',
[Validators.required, this.enumValidator(BankCardPaymentSystem)],
[Validators.required, this.enumValidator(LegacyBankCardPaymentSystem)],
],
tokenProvider: ['', this.enumValidator(BankCardTokenProvider)],
tokenProvider: ['', this.enumValidator(LegacyBankCardTokenProvider)],
tokenizationMethod: ['', this.enumValidator(TokenizationMethod)],
}),
}),
@ -222,10 +222,14 @@ export class PredicateComponent implements OnChanges {
case BankCardType.paymentSystem:
return {
payment_system: {
payment_system_is: BankCardPaymentSystem[value.paymentSystem as string],
token_provider_is: BankCardTokenProvider[value.tokenProvider as string],
tokenization_method_is:
TokenizationMethod[value.tokenizationMethod as string],
// TODO Need migration according to: https://github.com/rbkmoney/damsel/commit/61677b86006d405619bdc5f23d6416a929688180
payment_system_is_deprecated:
LegacyBankCardPaymentSystem[value.paymentSystem as string],
token_provider_is_deprecated:
LegacyBankCardTokenProvider[value.tokenProvider as string],
},
};
case BankCardType.paymentSystemIs: