Merge remote-tracking branch 'upstream/develop' into REDSHOP-6083

redCOMPONENT-COM · Aug 24, 2020 · ed34cc1 · ed34cc1
2 parents c609319 + 4e9b592
commit ed34cc1
Show file tree

Hide file tree

Showing 44 changed files with 529 additions and 500 deletions.
diff --git a/component/site/views/login/tmpl/default.php b/component/site/views/login/tmpl/default.php
@@ -23,6 +23,8 @@
 $params       = $app->getParams('com_redshop');
 $returnitemid = $params->get('login', $Itemid);
 
+$thirdPartyLogin = Redshop\Helper\Login::getThirdPartyLogin();
+
 ?>
 <form action="<?php echo JRoute::_($loginlink); ?>" method="post">
     <div class="redshop-login form-horizontal">
@@ -60,3 +62,16 @@
     <input type="hidden" name="returnitemid" id="returnitemid" value="<?php echo $returnitemid; ?>">
     <input type="hidden" name="option" id="option" value="com_redshop"/>
 </form>
+<div class="form-group">
+	<div class="third-party-login ">
+        <?php foreach ($thirdPartyLogin as $login): ?>
+            <?php if (!empty($login['plugin']) && !empty($login['linkLogin'])): ?>
+				<div class="row login-<?php echo $login['plugin'] ?>">
+					<a href="<?php echo $login['linkLogin']; ?>" class="btn btn-primary login-button">
+                        <?php echo ucfirst($login['plugin']) ?>
+					</a>
+				</div>
+            <?php endif; ?>
+        <?php endforeach; ?>
+	</div>
+</div>
diff --git a/libraries/redshop/composer.json b/libraries/redshop/composer.json
@@ -12,9 +12,7 @@
     "whichbrowser/parser": "2.0.32",
     "imagine/imagine": "^0.7.1",
     "ps/image-optimizer": "^1.1.2",
-    "facebook/graph-sdk": "^5.7",
-    "guzzlehttp/guzzle": "^6.5",
-    "google/apiclient": "^2.4"
+    "guzzlehttp/guzzle": "^6.5"
   },
   "autoload": {
     "psr-4": {

diff --git a/libraries/redshop/layouts/tags/checkout/onestep/login.html.twig b/libraries/redshop/layouts/tags/checkout/onestep/login.html.twig
@@ -18,3 +18,16 @@
         {{ jtext('COM_REDSHOP_FORGOT_PWD_LINK') }}
     </a>
 </form>
+{% if thirdPartyLogin|length > 0 %}
+<div class="third-party-login">
+	{% for login in thirdPartyLogin %}
+		{% if login['plugin'] != '' %}
+			<div class="row login-{{ login['plugin'] }}">
+				<a href="{{ login['linkLogin'] }}" class="btn btn-primary login-button">
+					{{ login['plugin']|title }}
+				</a>
+			</div>
+		{% endif %}
+	{% endfor %}
+</div>
+{% endif %}
diff --git a/libraries/redshop/layouts/tags/login/form.html.twig b/libraries/redshop/layouts/tags/login/form.html.twig
@@ -1 +1,14 @@
-<form action="{{ jroute('index.php') }}" method="post">{{ content }}</form>
+<form action="{{ jroute('index.php') }}" method="post">{{ content }}</form>
+{% if thirdPartyLogin|length > 0 %}
+	<div class="third-party-login">
+		{% for login in thirdPartyLogin %}
+			{% if login['plugin'] != '' %}
+				<div class="row login-{{ login['plugin'] }}">
+					<a href="{{ login['linkLogin'] }}" class="btn btn-primary login-button">
+						{{ login['plugin']|title }}
+					</a>
+				</div>
+			{% endif %}
+		{% endfor %}
+	</div>
+{% endif %}
diff --git a/libraries/redshop/src/Helper/Login.php b/libraries/redshop/src/Helper/Login.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * @package     RedShop
+ * @subpackage  Libraries
+ *
+ * @copyright   Copyright (C) 2008 - 2019 redCOMPONENT.com. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Redshop\Helper;
+
+defined('_JEXEC') or die;
+
+/**
+ * Login helper class
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class Login
+{
+    /**
+     * @param $data
+     *
+     * @throws \Exception
+     */
+    public static function loginJoomlaRedShop($data) {
+        $app = \JFactory::getApplication();
+        $jUser = \JUserHelper::getUserId($data['email']);
+
+        if ($jUser > 0) {
+            $jUser = \JFactory::getUser($jUser);
+
+            \JPluginHelper::importPlugin('user');
+
+            $options           = array();
+            $options['action'] = 'core.login.site';
+
+            $result = $app->triggerEvent('onUserLogin', array($data, $options));
+        } else {
+            $jUser = \RedshopHelperJoomla::createJoomlaUser($data, 1);
+        }
+
+        $check = \RedshopHelperUser::getUserInformation($jUser->id);
+
+        if (empty($check)) {
+            $redUser = \RedshopHelperUser::storeRedshopUser($data, $jUser->id);
+        }
+
+        $app->redirect(\JUri::root());
+    }
+
+    /**
+     * @return array
+     */
+    public static function getThirdPartyLogin() {
+        \JPluginHelper::importPlugin('redshop_login');
+       return \RedshopHelperUtility::getDispatcher()->trigger('onThirdPartyLogin');
+    }
+}
diff --git a/libraries/redshop/tags/sections/login.php b/libraries/redshop/tags/sections/login.php
@@ -111,10 +111,12 @@ public function replace()
 
         $this->addReplace('{forget_password_link}', $forgotPwd);
 
-        $this->template = RedshopLayoutHelper::render(
+        $thirdPartyLogin = Redshop\Helper\Login::getThirdPartyLogin();
+        $this->template  = RedshopLayoutHelper::render(
             'tags.login.form',
             array(
-                'content' => $this->template
+                'content' => $this->template,
+                'thirdPartyLogin' => $thirdPartyLogin
             ),
             '',
             $layoutOption

diff --git a/libraries/redshop/tags/sections/onestepcheckout.php b/libraries/redshop/tags/sections/onestepcheckout.php
@@ -83,6 +83,8 @@ public function replace()
             $usersInfoId = $billingAddresses->users_info_id;
         }
 
+        $thirdPartyLogin = Redshop\Helper\Login::getThirdPartyLogin();
+
         $loginTemplate = "";
 
         if (!$usersInfoId && Redshop::getConfig()->getInt('REGISTER_METHOD') != 1
@@ -91,7 +93,8 @@ public function replace()
                 'tags.checkout.onestep.login',
                 array(
                     'itemId'    => $itemId,
-                    'returnUrl' => base64_encode(JRoute::_('index.php?option=com_redshop&view=checkout', false))
+                    'returnUrl' => base64_encode(JRoute::_('index.php?option=com_redshop&view=checkout', false)),
+                    'thirdPartyLogin' => $thirdPartyLogin
                 ),
                 '',
                 RedshopLayoutHelper::$layoutOption