diff --git a/packages/manager/modules/account/src/identity-documents/components/identity-documents-proof-tile/template.html b/packages/manager/modules/account/src/identity-documents/components/identity-documents-proof-tile/template.html index 836858a36392..d28b3b9c2360 100644 --- a/packages/manager/modules/account/src/identity-documents/components/identity-documents-proof-tile/template.html +++ b/packages/manager/modules/account/src/identity-documents/components/identity-documents-proof-tile/template.html @@ -12,7 +12,7 @@ data-translate="{{'user_account_identity_documents_proof_tile_heading_' + $ctrl.proof}}" >

diff --git a/packages/manager/modules/account/src/identity-documents/components/identity-documents-proof-tile/translations/Messages_fr_FR.json b/packages/manager/modules/account/src/identity-documents/components/identity-documents-proof-tile/translations/Messages_fr_FR.json index 3b7ebdaeb17f..167c60a11fbd 100644 --- a/packages/manager/modules/account/src/identity-documents/components/identity-documents-proof-tile/translations/Messages_fr_FR.json +++ b/packages/manager/modules/account/src/identity-documents/components/identity-documents-proof-tile/translations/Messages_fr_FR.json @@ -7,9 +7,9 @@ "user_account_identity_documents_proof_tile_heading_vat": "Preuve de TVA", "user_account_identity_documents_proof_tile_heading_authority_declaration": "Attestation sur l'honneur", "user_account_identity_documents_proof_tile_text_particular_identity": "Carte Aadhaar, carte d'identité, passeport, permis de conduire, carte d'électeur indienne.", - "user_account_identity_documents_proof_tile_text_particular_address": "Carte Aadhaar, certificat GST, facture (électricité, gaz, eau, internet ou téléphone), relevé bancaire.", + "user_account_identity_documents_proof_tile_text_particular_address": "Carte Aadhaar, certificat GST (taxe sur les produits et services), facture (électricité, gaz, eau, internet ou téléphone), relevé bancaire.", "user_account_identity_documents_proof_tile_text_non_individual_identity": "Carte Aadhaar, carte d'identité, passeport, permis de conduire, carte d'électeur indienne.", - "user_account_identity_documents_proof_tile_text_non_individual_address": "Certificat GST, facture (électricité, gaz, eau, internet ou téléphone), relevé bancaire.", + "user_account_identity_documents_proof_tile_text_non_individual_address": "Certificat GST (taxe sur les produits et services), facture (électricité, gaz, eau, internet ou téléphone), relevé bancaire.", "user_account_identity_documents_proof_tile_text_non_individual_vat": "Certificat GST (taxe sur les produits et services)", "user_account_identity_documents_proof_tile_text_non_individual_authority_declaration": "Document vous donnant l'autorisation d'agir au nom de la société.", "user_account_identity_documents_proof_tile_extended_identity": "Document du représentant légal, du directeur des opérations ou de tout autre contact mentionné dans le certificat GST.", diff --git a/packages/manager/modules/account/src/identity-documents/components/identity-documents-upload-detail/template.html b/packages/manager/modules/account/src/identity-documents/components/identity-documents-upload-detail/template.html index 9a1fd4008d91..84525c299e9a 100644 --- a/packages/manager/modules/account/src/identity-documents/components/identity-documents-upload-detail/template.html +++ b/packages/manager/modules/account/src/identity-documents/components/identity-documents-upload-detail/template.html @@ -29,10 +29,10 @@ class="my-3 w-100" >
-

+ >
diff --git a/packages/manager/modules/account/src/identity-documents/upload-identity-documents-confirm/translations/Messages_de_DE.json b/packages/manager/modules/account/src/identity-documents/upload-identity-documents-confirm/translations/Messages_de_DE.json deleted file mode 100644 index abd74518447f..000000000000 --- a/packages/manager/modules/account/src/identity-documents/upload-identity-documents-confirm/translations/Messages_de_DE.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "user_account_identity_documents_upload_confirm": "Haben Sie alle angeforderten Dokumente hinzugefügt?", - "user_account_identity_documents_upload_confirm_yes": "Ja", - "user_account_identity_documents_upload_confirm_no": "Nein" -} diff --git a/packages/manager/modules/account/src/identity-documents/upload-identity-documents-confirm/translations/Messages_en_GB.json b/packages/manager/modules/account/src/identity-documents/upload-identity-documents-confirm/translations/Messages_en_GB.json deleted file mode 100644 index 2783738c6d8d..000000000000 --- a/packages/manager/modules/account/src/identity-documents/upload-identity-documents-confirm/translations/Messages_en_GB.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "user_account_identity_documents_upload_confirm": "Have you added all of the requested documents?", - "user_account_identity_documents_upload_confirm_yes": "Yes", - "user_account_identity_documents_upload_confirm_no": "No" -} diff --git a/packages/manager/modules/account/src/identity-documents/upload-identity-documents-confirm/translations/Messages_es_ES.json b/packages/manager/modules/account/src/identity-documents/upload-identity-documents-confirm/translations/Messages_es_ES.json deleted file mode 100644 index 5cdf6d646f8a..000000000000 --- a/packages/manager/modules/account/src/identity-documents/upload-identity-documents-confirm/translations/Messages_es_ES.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "user_account_identity_documents_upload_confirm": "¿Ha añadido correctamente todos los documentos solicitados?", - "user_account_identity_documents_upload_confirm_yes": "Sí", - "user_account_identity_documents_upload_confirm_no": "No" -} diff --git a/packages/manager/modules/account/src/identity-documents/upload-identity-documents-confirm/translations/Messages_fr_CA.json b/packages/manager/modules/account/src/identity-documents/upload-identity-documents-confirm/translations/Messages_fr_CA.json deleted file mode 100644 index 29a85ad7c5ba..000000000000 --- a/packages/manager/modules/account/src/identity-documents/upload-identity-documents-confirm/translations/Messages_fr_CA.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "user_account_identity_documents_upload_confirm": "Avez-vous bien ajouté l'ensemble des documents demandés ?", - "user_account_identity_documents_upload_confirm_yes": "Oui", - "user_account_identity_documents_upload_confirm_no": "Non" -} diff --git a/packages/manager/modules/account/src/identity-documents/upload-identity-documents-confirm/translations/Messages_fr_FR.json b/packages/manager/modules/account/src/identity-documents/upload-identity-documents-confirm/translations/Messages_fr_FR.json deleted file mode 100644 index 29a85ad7c5ba..000000000000 --- a/packages/manager/modules/account/src/identity-documents/upload-identity-documents-confirm/translations/Messages_fr_FR.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "user_account_identity_documents_upload_confirm": "Avez-vous bien ajouté l'ensemble des documents demandés ?", - "user_account_identity_documents_upload_confirm_yes": "Oui", - "user_account_identity_documents_upload_confirm_no": "Non" -} diff --git a/packages/manager/modules/account/src/identity-documents/upload-identity-documents-confirm/translations/Messages_it_IT.json b/packages/manager/modules/account/src/identity-documents/upload-identity-documents-confirm/translations/Messages_it_IT.json deleted file mode 100644 index 726c926e0826..000000000000 --- a/packages/manager/modules/account/src/identity-documents/upload-identity-documents-confirm/translations/Messages_it_IT.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "user_account_identity_documents_upload_confirm": "Hai aggiunto tutti i documenti richiesti?", - "user_account_identity_documents_upload_confirm_yes": "Sì", - "user_account_identity_documents_upload_confirm_no": "No" -} diff --git a/packages/manager/modules/account/src/identity-documents/upload-identity-documents-confirm/translations/Messages_pl_PL.json b/packages/manager/modules/account/src/identity-documents/upload-identity-documents-confirm/translations/Messages_pl_PL.json deleted file mode 100644 index 736888e696df..000000000000 --- a/packages/manager/modules/account/src/identity-documents/upload-identity-documents-confirm/translations/Messages_pl_PL.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "user_account_identity_documents_upload_confirm": "Czy dodałeś wszystkie wymagane dokumenty?", - "user_account_identity_documents_upload_confirm_yes": "Tak", - "user_account_identity_documents_upload_confirm_no": "Nie" -} diff --git a/packages/manager/modules/account/src/identity-documents/upload-identity-documents-confirm/translations/Messages_pt_PT.json b/packages/manager/modules/account/src/identity-documents/upload-identity-documents-confirm/translations/Messages_pt_PT.json deleted file mode 100644 index c57221e28541..000000000000 --- a/packages/manager/modules/account/src/identity-documents/upload-identity-documents-confirm/translations/Messages_pt_PT.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "user_account_identity_documents_upload_confirm": "Adicionou o conjunto dos documentos pedidos?", - "user_account_identity_documents_upload_confirm_yes": "Sim", - "user_account_identity_documents_upload_confirm_no": "Não" -} diff --git a/packages/manager/modules/account/src/identity-documents/user-identity-documents.constant.js b/packages/manager/modules/account/src/identity-documents/user-identity-documents.constant.js index c43fe88546fa..befbfa3724e4 100644 --- a/packages/manager/modules/account/src/identity-documents/user-identity-documents.constant.js +++ b/packages/manager/modules/account/src/identity-documents/user-identity-documents.constant.js @@ -291,8 +291,6 @@ export const TRACKING_TASK_TAG = { dashboard: `${TRACKING_PREFIX}::identity-files::dashboard`, openDetailView: `${TRACKING_PREFIX}::tile::button::{{name_click}}_identity-files::{{identity-files}}`, clickSendMyDocuments: `${TRACKING_PREFIX}::page::button::submit_identity-files`, - displayPopUpSendMyDocuments: `${TRACKING_PREFIX}::identity-files::pop-up::identity-files-sent`, - confirmSendMyDocuments: `${TRACKING_PREFIX}::pop-up::button::identity-files-sent::confirm`, }; export const TRACKING_VARIABLES = { diff --git a/packages/manager/modules/account/src/identity-documents/user-identity-documents.controller.js b/packages/manager/modules/account/src/identity-documents/user-identity-documents.controller.js index bbf0b2c3765b..92aa17aac225 100644 --- a/packages/manager/modules/account/src/identity-documents/user-identity-documents.controller.js +++ b/packages/manager/modules/account/src/identity-documents/user-identity-documents.controller.js @@ -53,7 +53,6 @@ export default class AccountUserIdentityDocumentsController { this.loading = false; this.showUploadOption = true; this.displayError = false; - this.isOpenModal = false; this.isOpenInformationModal = false; this.dashboardRedirectURL = this.coreURLBuilder.buildURL('hub', ''); this.user_type = USER_TYPE[this.currentUser] @@ -89,10 +88,10 @@ export default class AccountUserIdentityDocumentsController { } uploadIdentityDocuments() { + this.trackClick(TRACKING_TASK_TAG.clickSendMyDocuments); this.handleUploadConfirmModal(false); this.loading = true; this.displayError = false; - this.trackClick(TRACKING_TASK_TAG.confirmSendMyDocuments); if (this.isValid) { const promise = this.links ? // We cannot re call getUploadDocumentsLinks if it answered successfully, so if we already @@ -125,14 +124,6 @@ export default class AccountUserIdentityDocumentsController { } } - handleUploadConfirmModal(open) { - this.isOpenModal = open; - if (open) { - this.trackClick(TRACKING_TASK_TAG.clickSendMyDocuments); - this.trackPage(TRACKING_TASK_TAG.displayPopUpSendMyDocuments); - } - } - handleInformationModal(open) { this.isOpenInformationModal = open; } @@ -169,11 +160,11 @@ export default class AccountUserIdentityDocumentsController { ? this.checkInvidualValidity() : Object.keys(this.proofs).reduce( (acc, proofType) => - (acc && - (this.files[proofType] || - proofType === this.PROOF_TYPE.authority_declaration)) || - (this.user_type === this.USER_TYPE.default && - proofType === this.PROOF_TYPE.vat), + acc && + (!!this.files[proofType] || + proofType === this.PROOF_TYPE.authority_declaration || + (this.user_type === this.USER_TYPE.default && + proofType === this.PROOF_TYPE.vat)), true, ); } diff --git a/packages/manager/modules/account/src/identity-documents/user-identity-documents.html b/packages/manager/modules/account/src/identity-documents/user-identity-documents.html index 196ac106f4a8..033ed66d44ce 100644 --- a/packages/manager/modules/account/src/identity-documents/user-identity-documents.html +++ b/packages/manager/modules/account/src/identity-documents/user-identity-documents.html @@ -86,7 +86,7 @@ data-variant="primary" data-size="l" data-disabled="$ctrl.kycStatus.status === $ctrl.KYC_STATUS.OPEN || !$ctrl.isValid || $ctrl.links" - data-on-click="$ctrl.handleUploadConfirmModal(true)" + data-on-click="$ctrl.uploadIdentityDocuments()" > - - -
+