-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Make field names a little more consistent - Update implementations and tests Ticket: https://phabricator.wikimedia.org/T364953
- Loading branch information
Showing
17 changed files
with
394 additions
and
277 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,30 @@ | ||
| import { GetterTree } from 'vuex'; | ||
| import { BankAccount } from '@src/view_models/BankAccount'; | ||
| import { Validity } from '@src/view_models/Validity'; | ||
| import { looksLikeIban } from '@src/util/bank_account_number_helpers'; | ||
|
|
||
| export const getters: GetterTree<BankAccount, any> = { | ||
| bankDataIsInvalid: function ( state: BankAccount ): boolean { | ||
| return state.validity.bankdata === Validity.INVALID; | ||
| if ( state.values.accountNumber === '' || looksLikeIban( state.values.accountNumber ) ) { | ||
| return state.validity.accountNumber === Validity.INVALID; | ||
| } | ||
|
|
||
| return state.validity.accountNumber === Validity.INVALID || state.validity.bankCode === Validity.INVALID; | ||
| }, | ||
| bankDataIsValid: function ( state: BankAccount ): boolean { | ||
| return state.validity.bankdata === Validity.VALID; | ||
| if ( state.values.accountNumber === '' || looksLikeIban( state.values.accountNumber ) ) { | ||
| return state.validity.accountNumber === Validity.VALID; | ||
| } | ||
|
|
||
| return state.validity.accountNumber === Validity.VALID && state.validity.bankCode === Validity.VALID; | ||
| }, | ||
| getBankName: function ( state: BankAccount ): string { | ||
| return state.values.bankName; | ||
| accountNumber: function ( state: BankAccount ): string { | ||
| return state.values.accountNumber; | ||
| }, | ||
| getAccountId: function ( state: BankAccount ): string { | ||
| return state.values.iban; | ||
| bankCode: function ( state: BankAccount ): string { | ||
| return state.values.bankCode; | ||
| }, | ||
| getBankId: function ( state: BankAccount ): string { | ||
| return state.values.bic; | ||
| bankName: function ( state: BankAccount ): string { | ||
| return state.values.bankName; | ||
| }, | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,36 @@ | ||
| import { MutationTree } from 'vuex'; | ||
| import { BankAccount } from '@src/view_models/BankAccount'; | ||
| import { Validity } from '@src/view_models/Validity'; | ||
| import { looksLikeIban } from '@src/util/bank_account_number_helpers'; | ||
|
|
||
| export const mutations: MutationTree<BankAccount> = { | ||
| SET_BANKDATA( state: BankAccount, bankData: any ) { | ||
| state.values.iban = bankData.accountId; | ||
| state.values.bic = bankData.bankId; | ||
| SET_ACCOUNT_NUMBER( state: BankAccount, accountNumber: string ) { | ||
| state.values.accountNumber = accountNumber; | ||
| }, | ||
| SET_BANKNAME( state: BankAccount, bankName: string ) { | ||
| SET_BANK_CODE( state: BankAccount, bankCode: string ) { | ||
| state.values.bankCode = bankCode; | ||
| }, | ||
| SET_BANK_NAME( state: BankAccount, bankName: string ) { | ||
| state.values.bankName = bankName; | ||
| }, | ||
| SET_BANK_DATA_VALIDITY( state: BankAccount, validity: Validity ) { | ||
| state.validity.bankdata = validity; | ||
| SET_ACCOUNT_NUMBER_VALIDITY( state: BankAccount, validity: Validity ) { | ||
| state.validity.accountNumber = validity; | ||
| }, | ||
| SET_BANK_CODE_VALIDITY( state: BankAccount, validity: Validity ) { | ||
| state.validity.bankCode = validity; | ||
| }, | ||
| SET_IS_VALIDATING( state: BankAccount, isValidating: boolean ) { | ||
| state.isValidating = isValidating; | ||
| }, | ||
| MARK_EMPTY_FIELDS_INVALID( state: BankAccount ) { | ||
| if ( state.validity.bankdata === Validity.INCOMPLETE ) { | ||
| state.validity.bankdata = Validity.INVALID; | ||
| if ( [ Validity.INCOMPLETE, Validity.RESTORED ].includes( state.validity.accountNumber ) ) { | ||
| state.validity.accountNumber = Validity.INVALID; | ||
| } | ||
|
|
||
| if ( looksLikeIban( state.values.accountNumber ) ) { | ||
| state.validity.bankCode = Validity.INCOMPLETE; | ||
| } else if ( [ Validity.INCOMPLETE, Validity.RESTORED ].includes( state.validity.bankCode ) ) { | ||
| state.validity.bankCode = Validity.INVALID; | ||
| } | ||
| }, | ||
| MARK_BANKDATA_INCOMPLETE( state: BankAccount ) { | ||
| state.validity.bankdata = Validity.INCOMPLETE; | ||
| }, | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.