Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

2.4 develop #396

Merged
merged 3 commits into from
Jan 31, 2023
Merged

2.4 develop #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e03dc7b
Update add field gender to customer data to sync
HuyPhuc98 Dec 9, 2022
f31982f
Update composer.json
HuyPhuc98 Jan 31, 2023
cb3e330
Update translate
HuyPhuc98 Jan 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Helper/EmailMarketing.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1479,6 +1479,7 @@ public function getCustomerData(
'firstName' => $customer->getFirstname(),
'lastName' => $customer->getLastname(),
'phoneNumber' => $address ? $address->getTelephone() : '',
'gender' => $customer->getGender(),
'description' => '',
'isSubscriber' => $isSubscriber,
'tags' => $this->getTags($customer),
Expand Down
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"name": "mageplaza/module-smtp",
"description": "SMTP Extension for Magento 2 helps the owner of store simply install SMTP (Simple Mail Transfer Protocol) server which transmits the messages into codes or numbers",
"require": {
"mageplaza/module-core": "^1.4.12"
"mageplaza/module-core": "^1.5.1"
},
"type": "magento2-module",
"version": "4.7.4",
"version": "4.7.5",
"license": "proprietary",
"authors": [
{
Expand Down
57 changes: 47 additions & 10 deletions i18n/en_US.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ None,None
"US West (Oregon)","US West (Oregon)"
"EU (Ireland)","EU (Ireland)"
Mailgun,Mailgun
Migomail,Migomail
Mandrill,Mandrill
Sendinblue,Sendinblue
Sendgrid,Sendgrid
Expand Down Expand Up @@ -43,6 +44,8 @@ Verizon,Verizon
OVH,OVH
SMTP2GO,SMTP2GO
"Customer synchronization has been completed.","Customer synchronization has been completed."
"Order synchronization has been completed.","Order synchronization has been completed."
"Subscriber synchronization has been completed.","Subscriber synchronization has been completed."
"The recovery succeeded.","The recovery succeeded."
"Marketing Automation is disabled.","Marketing Automation is disabled."
"The link is not available for your use","The link is not available for your use"
Expand All @@ -69,19 +72,37 @@ Success,Success
"A total of %1 record(s) have been sent.","A total of %1 record(s) have been sent."
"App ID or Secret Key is empty","App ID or Secret Key is empty"
"No customers to synchronize.","No customers to synchronize."
"No Orders to synchronize.","No Orders to synchronize."
"No subscriber to synchronize.","No subscriber to synchronize."
"Sent successfully! Please check your email box.","Sent successfully! Please check your email box."
"Test Error","Test Error"
"Email marketing connection is working properly.","Email marketing connection is working properly."
"Can't connect to the email marketing app. Please check the app id and secret key.","Can't connect to the email marketing app. Please check the app id and secret key."
"Can't connect to the email marketing app. %1","Can't connect to the email marketing app. %1"
"Error : %1","Error : %1"
UNKNOWN,UNKNOWN
"%1 not found.","%1 not found."
"A host is necessary for smtp transport, but none was given","A host is necessary for smtp transport, but none was given"
NONE,NONE
PLAIN,PLAIN
LOGIN,LOGIN
CRAM-MD5,CRAM-MD5
Lifetime,Lifetime
90,90
"1 Year","1 Year"
"2 Years","2 Years"
"Choose Date Range","Choose Date Range"
All,All
"Only Subscribed","Only Subscribed"
SSL,SSL
TLS,TLS
"New Object Only","New Object Only"
Customers,Customers
Orders,Orders
Subscribers,Subscribers
Everything,Everything
"Marketing automation is disabled.","Marketing automation is disabled."
"Invalid app id or secret key.","Invalid app id or secret key."
"From and To fields are required.","From and To fields are required."
Sent,Sent
"Wait for send","Wait for send"
Error,Error
Expand All @@ -92,8 +113,15 @@ Resend,Resend
Delete,Delete
"Delete Log","Delete Log"
"Are you sure you want to delete this log?","Are you sure you want to delete this log?"
"Created From","Created From"
"Select Date","Select Date"
To,To
"Load Settings","Load Settings"
Syncing...,Syncing...
"Syncing Customers...","Syncing Customers..."
"Syncing Orders...","Syncing Orders..."
"Syncing Subscribers...","Syncing Subscribers..."
"Download log","Download log"
"Cart Recovery Information","Cart Recovery Information"
"Cart Recovery Link","Cart Recovery Link"
"Copy link","Copy link"
Expand Down Expand Up @@ -126,7 +154,6 @@ Send,Send
Preview,Preview
Back,Back
Sender,Sender
To,To
"Email Template","Email Template"
"You can go to <strong>Marketing > Communications > Email Template</strong> to create new template or edit available template","You can go to <strong>Marketing > Communications > Email Template</strong> to create new template or edit available template"
"Additional Message","Additional Message"
Expand All @@ -146,6 +173,10 @@ Image,Image
"<a href=""%cart_recovery_link"">Go to your cart</a>","<a href=""%cart_recovery_link"">Go to your cart</a>"
"TEST EMAIL from Custom SMTP","TEST EMAIL from Custom SMTP"
"Your store has been connected with a custom SMTP successfully. Now you can Save Config and use this connection.","Your store has been connected with a custom SMTP successfully. Now you can Save Config and use this connection."
"Success: ","Success: "
"Error: ","Error: "
"Item ID: ","Item ID: "
"Changes you made may not be saved.","Changes you made may not be saved."
"Mageplaza Smtp","Mageplaza Smtp"
"Emails Log","Emails Log"
"Abandoned Cart","Abandoned Cart"
Expand Down Expand Up @@ -181,12 +212,25 @@ Developer,Developer
"Developer Mode","Developer Mode"
"If Enable, Magento will not delivery any email to receiver. This is useful for developers.","If Enable, Magento will not delivery any email to receiver. This is useful for developers."
"Marketing Automation","Marketing Automation"
Configuration,Configuration
Enable,Enable
"By enable AVADA Email Marketing, it means that you agree with the <a href=""https://avada.io/tos.html"" target=""_blank"">Terms & Conditions</a> and <a href=""https://avada.io/dpa.html"" target=""_blank"">Data processing agreement</a>.","By enable AVADA Email Marketing, it means that you agree with the <a href=""https://avada.io/tos.html"" target=""_blank"">Terms & Conditions</a> and <a href=""https://avada.io/dpa.html"" target=""_blank"">Data processing agreement</a>."
"By enabling <a href=""https://avada.io/platform/magento/?utm_source=m2-smtp"" target=""_blank"">Marketing Automation</a>, you agree to the <a href=""https://avada.io/tos.html"" target=""_blank"">Terms & Conditions</a> and <a href=""https://avada.io/dpa.html"" target=""_blank"">Data processing agreement</a>.","By enabling <a href=""https://avada.io/platform/magento/?utm_source=m2-smtp"" target=""_blank"">Marketing Automation</a>, you agree to the <a href=""https://avada.io/tos.html"" target=""_blank"">Terms & Conditions</a> and <a href=""https://avada.io/dpa.html"" target=""_blank"">Data processing agreement</a>."
"Attribute Code for Vendor","Attribute Code for Vendor"
"Only applicable with an attribute code </br>
Go to <strong>Stores>Attributes>Product</strong> to get field information Attribute Code of <strong>Vendor</strong> attribute","Only applicable with an attribute code </br>
Go to <strong>Stores>Attributes>Product</strong> to get field information Attribute Code of <strong>Vendor</strong> attribute"
"Sync Newsletter Subscribers","Sync Newsletter Subscribers"
"App ID","App ID"
"Create API key <a href=""https://app.avada.io/manage/keys"" target=""_blank"">here</a>.","Create API key <a href=""https://app.avada.io/manage/keys"" target=""_blank"">here</a>."
"Secret key","Secret key"
"Tracking Enable","Tracking Enable"
"Push Notification","Push Notification"
Synchronization,Synchronization
"Sync type","Sync type"
"Choose what to sync","Choose what to sync"
"If ""New Object Only"" is selected, only sync objects that have never been synced to Marketing Automation App","If ""New Object Only"" is selected, only sync objects that have never been synced to Marketing Automation App"
Days,Days
"If ""Choose Date Range"" is selected, all the records will be sync if the ""Created From - To"" is empty.","If ""Choose Date Range"" is selected, all the records will be sync if the ""Created From - To"" is empty."
"All Store Views","All Store Views"
Customer,Customer
Status,Status
Expand All @@ -199,10 +243,3 @@ ID,ID
Recipient,Recipient
Cc,Cc
Bcc,Bcc
"Order synchronization has been completed.","Order synchronization has been completed."
"Subscriber synchronization has been completed.","Subscriber synchronization has been completed."
"Smtp is disabled.","Smtp is disabled."
"From and To fields are required.","From and To fields are required."
"The store with store ID is %d doesn't exist.","The store with store ID is %d doesn't exist."
"Marketing automation is disabled.","Marketing automation is disabled."
"Invalid app id or secret key.","Invalid app id or secret key."