Skip to content

Commit

Permalink
Merge pull request #2301 from graphcommerce-org/feature/GCOM-1383
Browse files Browse the repository at this point in the history
Feature/gcom 1383
  • Loading branch information
paales authored Jun 26, 2024
2 parents 9cb8043 + 59ad2d6 commit e534e45
Show file tree
Hide file tree
Showing 51 changed files with 443 additions and 136 deletions.
9 changes: 9 additions & 0 deletions .changeset/lucky-bananas-carry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
"@graphcommerce/magento-cart-email": patch
"@graphcommerce/magento-newsletter": patch
"@graphcommerce/magento-customer": patch
"@graphcommerce/ecommerce-ui": patch
"@graphcommerce/magento-cart": patch
---

Created a new EmailElement component to make re-use easier
7 changes: 7 additions & 0 deletions .changeset/stale-coins-explode.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@graphcommerce/magento-graphcms": minor
"@graphcommerce/magento-customer": minor
"@graphcommerce/magento-store": minor
---

Implement confirm email functionality
8 changes: 0 additions & 8 deletions docs/framework/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -169,14 +169,6 @@ Determines if, after adding a cross-sell item to the cart, the user should be re

Default: 'false'

#### customerRequireEmailConfirmation: boolean

Due to a limitation in the GraphQL API of Magento 2, we need to know if the
customer requires email confirmation.

This value should match Magento 2's configuration value for
`customer/create_account/confirm` and should be removed once we can query

#### dataLayer: [DatalayerConfig](#DatalayerConfig)

#### debug: [GraphCommerceDebugConfig](#GraphCommerceDebugConfig)
Expand Down
24 changes: 21 additions & 3 deletions examples/magento-graphcms/locales/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ msgstr "Über <0/>"
msgid "Account"
msgstr "Kundenkonto"

msgid "Account confirmation"
msgstr "Bestätigung des Kontos"

msgid "Account confirmed. You can now proceed to sign in."
msgstr "Konto bestätigt. Sie können sich jetzt anmelden."

msgid "Add address"
msgstr "Adresse hinzufügen"

Expand Down Expand Up @@ -109,6 +115,9 @@ msgstr "Warenkorb"
msgid "Cart ({0})"
msgstr "Warenkorb ({0})"

msgid "Categories"
msgstr "Kategorien"

msgid "Change"
msgstr "Ändern"

Expand Down Expand Up @@ -157,6 +166,9 @@ msgstr "Neue E-Mail bestätigen"
msgid "Confirm password"
msgstr "Passwort bestätigen"

msgid "Confirm registration"
msgstr "Bestätigung der Registrierung"

msgid "Confirmation + Track & trace"
msgstr "Bestätigung + Track & Trace"

Expand Down Expand Up @@ -259,6 +271,9 @@ msgstr "Vergleichsliste leeren"
msgid "Fill in your e-mail to login or create an account"
msgstr "Geben Sie Ihre E-Mail-Adresse ein, um sich anzumelden oder ein Kundenkonto zu erstellen"

msgid "Fill in your email to confirm registration"
msgstr "Füllen Sie Ihre E-Mail aus, um die Registrierung zu bestätigen"

msgid "Fill in your new password, confirm it and click on the save button."
msgstr "Geben Sie Ihr neues Passwort ein, bestätigen Sie es und klicken Sie auf die Schaltfläche „Speichern“."

Expand Down Expand Up @@ -493,9 +508,6 @@ msgstr "Persönliche Daten"
msgid "Place order"
msgstr "Kostenpflichtig bestellen"

msgid "Please check your inbox to validate your email ({email})"
msgstr "Bitte überprüfen Sie Ihren Posteingang, um Ihre E-Mail-Adresse zu bestätigen ({email})"

msgid "Please enter a valid email address"
msgstr "Bitte geben Sie eine gültige E-Mail-Adresse ein"

Expand Down Expand Up @@ -544,6 +556,9 @@ msgstr "Kürzlich angesehene Produkte"
msgid "Region"
msgstr "Region"

msgid "Registration successful. Please check your inbox to confirm your email address ({email})"
msgstr "Registrierung erfolgreich. Bitte überprüfen Sie Ihren Posteingang, um Ihre E-Mail-Adresse zu bestätigen ({email})"

msgid "Relevance"
msgstr "Relevanz"

Expand Down Expand Up @@ -805,6 +820,9 @@ msgstr "Sie bewerten {0}"
msgid "You can now <0>sign in again</0>."
msgstr "Sie können sich jetzt <0>erneut anmelden</0>."

msgid "You can only confirm you account by clicking on the link in your email."
msgstr "Sie können Ihr Konto nur bestätigen, indem Sie auf den Link in Ihrer E-Mail klicken."

msgid "You can track your order status and much more!"
msgstr "Sie können Ihren Bestellstatus und vieles mehr verfolgen!"

Expand Down
24 changes: 21 additions & 3 deletions examples/magento-graphcms/locales/en.po
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ msgstr "Above <0/>"
msgid "Account"
msgstr "Account"

msgid "Account confirmation"
msgstr "Account confirmation"

msgid "Account confirmed. You can now proceed to sign in."
msgstr "Account confirmed. You can now proceed to sign in."

msgid "Add address"
msgstr "Add address"

Expand Down Expand Up @@ -109,6 +115,9 @@ msgstr "Cart"
msgid "Cart ({0})"
msgstr "Cart ({0})"

msgid "Categories"
msgstr "Categories"

msgid "Change"
msgstr "Change"

Expand Down Expand Up @@ -157,6 +166,9 @@ msgstr "Confirm new email"
msgid "Confirm password"
msgstr "Confirm password"

msgid "Confirm registration"
msgstr "Confirm registration"

msgid "Confirmation + Track & trace"
msgstr "Confirmation + Track & trace"

Expand Down Expand Up @@ -259,6 +271,9 @@ msgstr "Empty comparelist"
msgid "Fill in your e-mail to login or create an account"
msgstr "Fill in your e-mail to login or create an account"

msgid "Fill in your email to confirm registration"
msgstr "Fill in your email to confirm registration"

msgid "Fill in your new password, confirm it and click on the save button."
msgstr "Fill in your new password, confirm it and click on the save button."

Expand Down Expand Up @@ -493,9 +508,6 @@ msgstr "Personal details"
msgid "Place order"
msgstr "Place order"

msgid "Please check your inbox to validate your email ({email})"
msgstr "Please check your inbox to validate your email ({email})"

msgid "Please enter a valid email address"
msgstr "Please enter a valid email address"

Expand Down Expand Up @@ -544,6 +556,9 @@ msgstr "Recently viewed products"
msgid "Region"
msgstr "Region"

msgid "Registration successful. Please check your inbox to confirm your email address ({email})"
msgstr "Registration successful. Please check your inbox to confirm your email address ({email})"

msgid "Relevance"
msgstr "Relevance"

Expand Down Expand Up @@ -805,6 +820,9 @@ msgstr "You are reviewing {0}"
msgid "You can now <0>sign in again</0>."
msgstr "You can now <0>sign in again</0>."

msgid "You can only confirm you account by clicking on the link in your email."
msgstr "You can only confirm you account by clicking on the link in your email."

msgid "You can track your order status and much more!"
msgstr "You can track your order status and much more!"

Expand Down
24 changes: 21 additions & 3 deletions examples/magento-graphcms/locales/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ msgstr "Arriba <0/>"
msgid "Account"
msgstr "Cuenta"

msgid "Account confirmation"
msgstr "Confirmación de cuenta"

msgid "Account confirmed. You can now proceed to sign in."
msgstr "Cuenta confirmada. Ahora puede proceder a iniciar sesión."

msgid "Add address"
msgstr "Añadir dirección"

Expand Down Expand Up @@ -109,6 +115,9 @@ msgstr "Carrito"
msgid "Cart ({0})"
msgstr "Carrito ({0})"

msgid "Categories"
msgstr "Categorías"

msgid "Change"
msgstr "Cambiar"

Expand Down Expand Up @@ -157,6 +166,9 @@ msgstr "Confirmar nuevo correo electrónico"
msgid "Confirm password"
msgstr "Confirmar contraseña"

msgid "Confirm registration"
msgstr "Confirmar inscripción"

msgid "Confirmation + Track & trace"
msgstr "Confirmación + Seguimiento"

Expand Down Expand Up @@ -259,6 +271,9 @@ msgstr "Ecuación vacía"
msgid "Fill in your e-mail to login or create an account"
msgstr "Rellene su correo electrónico para iniciar sesión o crear una cuenta"

msgid "Fill in your email to confirm registration"
msgstr "Introduce tu correo electrónico para confirmar el registro"

msgid "Fill in your new password, confirm it and click on the save button."
msgstr "Rellene su nueva contraseña, confirme e introduzca el botón de guardar."

Expand Down Expand Up @@ -493,9 +508,6 @@ msgstr "Detalles personales"
msgid "Place order"
msgstr "Realizar pedido"

msgid "Please check your inbox to validate your email ({email})"
msgstr "Por favor, compruebe su bandeja de entrada para validar su correo electrónico ({email})"

msgid "Please enter a valid email address"
msgstr "Por favor, introduzca una dirección de correo electrónico válida"

Expand Down Expand Up @@ -544,6 +556,9 @@ msgstr "Productos vistos recientemente"
msgid "Region"
msgstr "Región"

msgid "Registration successful. Please check your inbox to confirm your email address ({email})"
msgstr "Registro exitoso. Por favor, compruebe su bandeja de entrada para confirmar su dirección de correo electrónico ({email})"

msgid "Relevance"
msgstr "Relevancia"

Expand Down Expand Up @@ -805,6 +820,9 @@ msgstr "Está revisando {0}"
msgid "You can now <0>sign in again</0>."
msgstr "Ahora puede<0>iniciar sesión de nuevo</0>."

msgid "You can only confirm you account by clicking on the link in your email."
msgstr "Solo puedes confirmar tu cuenta haciendo clic en el enlace de tu correo electrónico."

msgid "You can track your order status and much more!"
msgstr "¡Puede seguir el estado de su pedido y mucho más!"

Expand Down
24 changes: 21 additions & 3 deletions examples/magento-graphcms/locales/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ msgstr "Au-dessus de <0/>"
msgid "Account"
msgstr "Compte"

msgid "Account confirmation"
msgstr "Confirmation du compte"

msgid "Account confirmed. You can now proceed to sign in."
msgstr "Compte confirmé. Vous pouvez maintenant vous connecter."

msgid "Add address"
msgstr "Ajouter une adresse"

Expand Down Expand Up @@ -109,6 +115,9 @@ msgstr "Panier"
msgid "Cart ({0})"
msgstr "Panier ({0})"

msgid "Categories"
msgstr "Catégories"

msgid "Change"
msgstr "Changer"

Expand Down Expand Up @@ -157,6 +166,9 @@ msgstr "Confirmer le nouvel email"
msgid "Confirm password"
msgstr "Confirmer le mot de passe"

msgid "Confirm registration"
msgstr "Confirmer l'inscription"

msgid "Confirmation + Track & trace"
msgstr "Confirmation + Traçage"

Expand Down Expand Up @@ -259,6 +271,9 @@ msgstr "Équation vide"
msgid "Fill in your e-mail to login or create an account"
msgstr "Remplissez votre email pour vous connecter ou créer un compte"

msgid "Fill in your email to confirm registration"
msgstr "Remplissez votre email pour confirmer l'inscription"

msgid "Fill in your new password, confirm it and click on the save button."
msgstr "Remplissez votre nouveau mot de passe, confirmez-le et cliquez sur le bouton de sauvegarde."

Expand Down Expand Up @@ -493,9 +508,6 @@ msgstr "Informations personnelles"
msgid "Place order"
msgstr "Placer la commande"

msgid "Please check your inbox to validate your email ({email})"
msgstr "Veuillez vérifier votre boîte de réception pour valider votre email ({email})"

msgid "Please enter a valid email address"
msgstr "Veuillez entrer une adresse email valide"

Expand Down Expand Up @@ -544,6 +556,9 @@ msgstr "Derniers produits consultés"
msgid "Region"
msgstr "Région"

msgid "Registration successful. Please check your inbox to confirm your email address ({email})"
msgstr "Inscription réussie. Veuillez vérifier votre boîte de réception pour confirmer votre adresse email ({email})"

msgid "Relevance"
msgstr "Pertinence"

Expand Down Expand Up @@ -805,6 +820,9 @@ msgstr "Vous évaluez {0}"
msgid "You can now <0>sign in again</0>."
msgstr "Vous pouvez maintenant<0>vous connecter à nouveau</0>."

msgid "You can only confirm you account by clicking on the link in your email."
msgstr "Vous ne pouvez confirmer votre compte qu'en cliquant sur le lien dans votre email."

msgid "You can track your order status and much more!"
msgstr "Vous pouvez suivre l'état de votre commande et beaucoup plus!"

Expand Down
24 changes: 21 additions & 3 deletions examples/magento-graphcms/locales/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ msgstr "Sopra <0/>"
msgid "Account"
msgstr "Account"

msgid "Account confirmation"
msgstr "Conferma del conto"

msgid "Account confirmed. You can now proceed to sign in."
msgstr "Account confermato. Ora puoi procedere con l'accesso."

msgid "Add address"
msgstr "Aggiungi indirizzo"

Expand Down Expand Up @@ -109,6 +115,9 @@ msgstr "Carrello"
msgid "Cart ({0})"
msgstr "Carrello ({0})"

msgid "Categories"
msgstr "Categorie"

msgid "Change"
msgstr "Cambia"

Expand Down Expand Up @@ -157,6 +166,9 @@ msgstr "Conferma nuovo indirizzo email"
msgid "Confirm password"
msgstr "Conferma password"

msgid "Confirm registration"
msgstr "Confermare la registrazione"

msgid "Confirmation + Track & trace"
msgstr "Conferma + Track & trace"

Expand Down Expand Up @@ -259,6 +271,9 @@ msgstr "Equazione vuota"
msgid "Fill in your e-mail to login or create an account"
msgstr "Compila il tuo indirizzo email per accedere o creare un account"

msgid "Fill in your email to confirm registration"
msgstr "Inserite la vostra e-mail per confermare la registrazione"

msgid "Fill in your new password, confirm it and click on the save button."
msgstr "Compila la tua nuova password, conferma e clicca sul pulsante salva."

Expand Down Expand Up @@ -493,9 +508,6 @@ msgstr "Dati personali"
msgid "Place order"
msgstr "Effettua l'ordine"

msgid "Please check your inbox to validate your email ({email})"
msgstr "Controlla la tua casella di posta per validare la tua email ({email})"

msgid "Please enter a valid email address"
msgstr "Inserisci un indirizzo email valido"

Expand Down Expand Up @@ -544,6 +556,9 @@ msgstr "Prodotti visionati recentemente"
msgid "Region"
msgstr "Regione"

msgid "Registration successful. Please check your inbox to confirm your email address ({email})"
msgstr "Registrazione riuscita. Controlla la tua casella di posta per confermare il tuo indirizzo email ({email})"

msgid "Relevance"
msgstr "Rilevanza"

Expand Down Expand Up @@ -805,6 +820,9 @@ msgstr "Stai recensendo {0}"
msgid "You can now <0>sign in again</0>."
msgstr "Ora puoi <0>accedere nuovamente</0>."

msgid "You can only confirm you account by clicking on the link in your email."
msgstr "Puoi confermare il tuo account solo cliccando sul link nella tua email."

msgid "You can track your order status and much more!"
msgstr "Puoi controllare lo stato dell'ordine e molto altro!"

Expand Down
Loading

0 comments on commit e534e45

Please sign in to comment.