From b32ce941aad5fd587bcf58d46511092f72a279b7 Mon Sep 17 00:00:00 2001 From: vinhlt Date: Wed, 29 Apr 2020 16:26:58 +0700 Subject: [PATCH 1/4] Trello - Compatible Magento - Social Login 2.3.4 --- Setup/InstallSchema.php | 31 +++++++++++++++++++++++++++++++ etc/adminhtml/system.xml | 4 ++-- view/frontend/web/css/style.css | 15 +++++++++++++++ 3 files changed, 48 insertions(+), 2 deletions(-) diff --git a/Setup/InstallSchema.php b/Setup/InstallSchema.php index b2cee4e..ebdd068 100755 --- a/Setup/InstallSchema.php +++ b/Setup/InstallSchema.php @@ -75,6 +75,30 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con 'Is Send Password Email' ) ->addColumn('type', Table::TYPE_TEXT, 255, ['default' => ''], 'Type') + ->addColumn( + 'social_created_at', + Table::TYPE_TIMESTAMP, + 'Social Created At' + ) + ->addColumn( + 'user_id', + Table::TYPE_INTEGER, + 10, + [ + 'nullable' => true, + 'unsigned' => true, + ], + 'User Id' + ) + ->addColumn( + 'status', + Table::TYPE_TEXT, + 255, + [ + 'nullable' => true, + ], + 'Status' + ) ->addForeignKey( $installer->getFkName('mageplaza_social_customer', 'customer_id', 'customer_entity', 'entity_id'), 'customer_id', @@ -82,6 +106,13 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con 'entity_id', Table::ACTION_CASCADE ) + ->addForeignKey( + $installer->getFkName('mageplaza_social_customer', 'user_id', 'admin_user', 'user_id'), + 'user_id', + $installer->getTable('admin_user'), + 'user_id', + Table::ACTION_CASCADE + ) ->setComment('Social Customer Table'); $installer->getConnection()->createTable($table); diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index ad59d53..bb22a3f 100644 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -238,7 +238,7 @@ Mageplaza\SocialLogin\Block\System\RedirectUrl - Ex: http://localhost.com/dev223/sociallogin/social/callback/
+ Ex: http://yourdomain.com/sociallogin/social/callback/
]]> 1 @@ -500,4 +500,4 @@ - \ No newline at end of file + diff --git a/view/frontend/web/css/style.css b/view/frontend/web/css/style.css index 9a18fc3..6abeb0d 100644 --- a/view/frontend/web/css/style.css +++ b/view/frontend/web/css/style.css @@ -1706,6 +1706,21 @@ } } +@media only screen and (max-width: 766px) { + .secondary { + width: 93%; + padding-top: 0; + margin-top: 0; + } + #bnt-social-login-authentication { + margin-bottom: 0; + } + .forgot-pass-title { + width: 80%; + font-size: 1.45em; + } +} + .customer-account-create .account-social-login, .customer-account-login .account-social-login { display: block !important } From aea097867baf75c38b25369e3b0fa34886c921e4 Mon Sep 17 00:00:00 2001 From: vinhlt Date: Mon, 4 May 2020 15:41:41 +0700 Subject: [PATCH 2/4] Trello - Compatible Magento - Social Login 2.3.4 (2) --- etc/config.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/etc/config.xml b/etc/config.xml index e42f102..beabb0b 100755 --- a/etc/config.xml +++ b/etc/config.xml @@ -37,6 +37,16 @@ #6e716e 2 email,name,password + + #bnt-social-login-fake-email { + background-color: grey !important; + border: grey !important; + } + + #request-popup .social-login-title { + background-color: grey !important; + } + 10 From 66fddac77ff1c40f46d8f0aa9977187c1cdf4c85 Mon Sep 17 00:00:00 2001 From: vinhlt Date: Mon, 4 May 2020 15:42:42 +0700 Subject: [PATCH 3/4] Trello - Compatible Magento - Social Login 2.3.4 (2) --- etc/adminhtml/system.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index bb22a3f..7c981de 100644 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -103,6 +103,17 @@ + Quick Login or Popup Slide , you should fill this field with those class:
+ #bnt-social-login-fake-email {
+ background-color: Your Color in Style Management field !important;
+ border: Your Color in Style Management field !important;
+ }
+ + #request-popup .social-login-title {
+ background-color: Your Color in Style Management field !important;
+ }
+ ]]> From aabbd07130c1211bdc67976ed3af5df27b1c582d Mon Sep 17 00:00:00 2001 From: Brian Date: Mon, 4 May 2020 17:23:13 +0700 Subject: [PATCH 4/4] Clean code --- Setup/InstallSchema.php | 14 +- composer.json | 2 +- etc/config.xml | 170 +++++++++--------- i18n/en_US.csv | 1 - .../templates/popup/form/forgot.phtml | 108 +++++------ 5 files changed, 147 insertions(+), 148 deletions(-) diff --git a/Setup/InstallSchema.php b/Setup/InstallSchema.php index ebdd068..0605476 100755 --- a/Setup/InstallSchema.php +++ b/Setup/InstallSchema.php @@ -52,10 +52,10 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con Table::TYPE_INTEGER, 11, [ - 'identity' => true, - 'nullable' => false, - 'primary' => true, - 'unsigned' => true, + 'identity' => true, + 'nullable' => false, + 'primary' => true, + 'unsigned' => true, ], 'Social Customer ID' ) @@ -85,8 +85,8 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con Table::TYPE_INTEGER, 10, [ - 'nullable' => true, - 'unsigned' => true, + 'nullable' => true, + 'unsigned' => true, ], 'User Id' ) @@ -95,7 +95,7 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con Table::TYPE_TEXT, 255, [ - 'nullable' => true, + 'nullable' => true, ], 'Status' ) diff --git a/composer.json b/composer.json index 22bb6c9..7edc2a9 100755 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "roave/security-advisories": "dev-master" }, "type": "magento2-module", - "version": "2.8.1", + "version": "2.8.2", "license": "proprietary", "authors": [ { diff --git a/etc/config.xml b/etc/config.xml index beabb0b..c6f5cca 100755 --- a/etc/config.xml +++ b/etc/config.xml @@ -1,86 +1,86 @@ - - - - - - - 1 - - - 0 - .header.links, .section-item-content .header.links - 1 - 1,2,3,4 - popup_slide - 1 - mfp-move-from-top - #6e716e - 2 - email,name,password - - #bnt-social-login-fake-email { - background-color: grey !important; - border: grey !important; - } - - #request-popup .social-login-title { - background-color: grey !important; - } - - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - - 100 - - - 110 - - - + + + + + + + 1 + + + 0 + .header.links, .section-item-content .header.links + 1 + 1,2,3,4 + popup_slide + 1 + mfp-move-from-top + #6e716e + 2 + email,name,password + + #bnt-social-login-fake-email { + background-color: grey !important; + border: grey !important; + } + + #request-popup .social-login-title { + background-color: grey !important; + } + + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + 90 + + + 100 + + + 110 + + + \ No newline at end of file diff --git a/i18n/en_US.csv b/i18n/en_US.csv index 54d5dbb..f1e5536 100755 --- a/i18n/en_US.csv +++ b/i18n/en_US.csv @@ -77,7 +77,6 @@ Back,Back Submit,Submit "Forgot Password","Forgot Password" "Please enter your email address below to receive a password reset link.","Please enter your email address below to receive a password reset link." -"Go back","Go back" "Could not authenticate. Please try again later","Could not authenticate. Please try again later" "Social Login","Social Login" General,General diff --git a/view/frontend/templates/popup/form/forgot.phtml b/view/frontend/templates/popup/form/forgot.phtml index 2bbfcf9..eea339c 100755 --- a/view/frontend/templates/popup/form/forgot.phtml +++ b/view/frontend/templates/popup/form/forgot.phtml @@ -1,54 +1,54 @@ - - + +