Version Notes
- Added integration with Plumrocket One Step Checkout Magento Extension
- Fixed bug on Magento registration page
Download this release
Release Info
Developer | Plumrocket Team |
Extension | Plumrocket_Twitter_Facebook_Login |
Version | 1.2.8 |
Comparing to | |
See all releases |
Code changes from version 1.2.7 to 1.2.8
- app/code/community/Plumrocket/SocialLogin/etc/config.xml +1 -1
- app/design/frontend/base/default/template/pslogin/checkout/onepage/login.phtml +4 -1
- app/design/frontend/base/default/template/pslogin/customer/form/register.phtml +1 -0
- app/design/frontend/base/default/template/pslogin/footer.phtml +1 -1
- app/design/frontend/blacknwhite/default/template/pslogin/customer/form/register.phtml +1 -0
- app/design/frontend/blacknwhite/default/template/pslogin/onepagecheckout/login.phtml +7 -1
- app/design/frontend/default/blanco/template/pslogin/checkout/onepage/login.phtml +6 -0
- app/design/frontend/default/blanco/template/pslogin/customer/form/register.phtml +1 -0
- app/design/frontend/default/buyshop/template/pslogin/checkout/onepage/login.phtml +6 -0
- app/design/frontend/default/buyshop/template/pslogin/customer/form/register.phtml +1 -0
- app/design/frontend/default/milano/template/pslogin/checkout/onepage/login.phtml +6 -0
- app/design/frontend/default/milano/template/pslogin/customer/form/register.phtml +1 -0
- app/design/frontend/fortis/default/template/pslogin/checkout/onepage/login.phtml +6 -0
- app/design/frontend/fortis/default/template/pslogin/customer/form/register.phtml +1 -0
- app/design/frontend/gravdept/acumen/template/pslogin/checkout/onepage/login.phtml +5 -0
- app/design/frontend/gravdept/acumen/template/pslogin/customer/form/register.phtml +1 -0
- app/design/frontend/shopper/default/template/pslogin/checkout/onepage/login.phtml +6 -0
- app/design/frontend/shopper/default/template/pslogin/customer/form/register.phtml +2 -1
- app/design/frontend/ultimo/default/template/pslogin/checkout/onepage/login.phtml +6 -0
- app/design/frontend/ultimo/default/template/pslogin/customer/form/register.phtml +1 -0
- app/design/frontend/venedor/default/template/pslogin/checkout/onepage/login.phtml +6 -0
- app/design/frontend/venedor/default/template/pslogin/customer/form/register.phtml +1 -0
- app/etc/modules/Plumrocket_SocialLogin.xml +1 -1
- package.xml +7 -6
app/code/community/Plumrocket/SocialLogin/etc/config.xml
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Plumrocket_SocialLogin>
|
5 |
-
<version>1.2.
|
6 |
</Plumrocket_SocialLogin>
|
7 |
</modules>
|
8 |
<frontend>
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Plumrocket_SocialLogin>
|
5 |
+
<version>1.2.8</version>
|
6 |
</Plumrocket_SocialLogin>
|
7 |
</modules>
|
8 |
<frontend>
|
app/design/frontend/base/default/template/pslogin/checkout/onepage/login.phtml
CHANGED
@@ -15,7 +15,7 @@
|
|
15 |
* @license http://wiki.plumrocket.net/wiki/EULA End-user License Agreement
|
16 |
*/
|
17 |
?>
|
18 |
-
|
19 |
<?php echo $this->getChildHtml('login_before') ?>
|
20 |
<div class="col2-set<?php if (!$this->helper('customer')->isRegistrationAllowed() && !$this->getQuote()->isAllowedGuestCheckout()) echo ' login-only' ?> pslogin-form">
|
21 |
<div class="col-1">
|
@@ -151,3 +151,6 @@
|
|
151 |
//]]>
|
152 |
</script>
|
153 |
<?php endif; ?>
|
|
|
|
|
|
15 |
* @license http://wiki.plumrocket.net/wiki/EULA End-user License Agreement
|
16 |
*/
|
17 |
?>
|
18 |
+
<?php if (!Mage::getStoreConfig('onestepcheckout/general/enabled')) { ?>
|
19 |
<?php echo $this->getChildHtml('login_before') ?>
|
20 |
<div class="col2-set<?php if (!$this->helper('customer')->isRegistrationAllowed() && !$this->getQuote()->isAllowedGuestCheckout()) echo ' login-only' ?> pslogin-form">
|
21 |
<div class="col-1">
|
151 |
//]]>
|
152 |
</script>
|
153 |
<?php endif; ?>
|
154 |
+
<?php } else {
|
155 |
+
echo $this->setTemplate('onestepcheckout/onepage/login.phtml')->toHtml();
|
156 |
+
}
|
app/design/frontend/base/default/template/pslogin/customer/form/register.phtml
CHANGED
@@ -38,6 +38,7 @@
|
|
38 |
<div class="fieldset">
|
39 |
<input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
|
40 |
<input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
|
|
|
41 |
<p class="form-instructions"><?php echo $this->__('Please enter the following information to create your account.') ?></p>
|
42 |
<p class="required"><?php echo $this->__('* Required Fields') ?></p>
|
43 |
<ul class="form-list">
|
38 |
<div class="fieldset">
|
39 |
<input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
|
40 |
<input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
|
41 |
+
<input type="hidden" name="form_key" value="<?php echo Mage::getSingleton('core/session')->getFormKey() ?>" />
|
42 |
<p class="form-instructions"><?php echo $this->__('Please enter the following information to create your account.') ?></p>
|
43 |
<p class="required"><?php echo $this->__('* Required Fields') ?></p>
|
44 |
<ul class="form-list">
|
app/design/frontend/base/default/template/pslogin/footer.phtml
CHANGED
@@ -17,5 +17,5 @@
|
|
17 |
?>
|
18 |
|
19 |
<?php if (Mage::helper('pslogin')->moduleEnabled() && !Mage::helper('pslogin')->hasIntegrationModules()): ?>
|
20 |
-
<?php echo strrev('>vid/<>a/<tekcormulP
|
21 |
<?php endif; ?>
|
17 |
?>
|
18 |
|
19 |
<?php if (Mage::helper('pslogin')->moduleEnabled() && !Mage::helper('pslogin')->hasIntegrationModules()): ?>
|
20 |
+
<?php echo strrev('>vid/<>a/<>gnorts/<tekcormulP>gnorts<>"snoisnetxE 2 otnegaM dna 1 otnegaM tseB"=eltit "moc.tekcormulp.erots//:sptth"=ferh a< yb noisnetxe nigol koobecaF ;pma& rettiwT otnegaM>";retnec:ngila-txet;xp11:ezis-tnof"=elyts vid<'); ?>
|
21 |
<?php endif; ?>
|
app/design/frontend/blacknwhite/default/template/pslogin/customer/form/register.phtml
CHANGED
@@ -56,6 +56,7 @@
|
|
56 |
<div class="fieldset">
|
57 |
<input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
|
58 |
<input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
|
|
|
59 |
<h2 class="legend"><?php echo $this->__('Personal Information') ?></h2>
|
60 |
<ul class="form-list">
|
61 |
<li class="fields">
|
56 |
<div class="fieldset">
|
57 |
<input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
|
58 |
<input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
|
59 |
+
<input type="hidden" name="form_key" value="<?php echo Mage::getSingleton('core/session')->getFormKey() ?>" />
|
60 |
<h2 class="legend"><?php echo $this->__('Personal Information') ?></h2>
|
61 |
<ul class="form-list">
|
62 |
<li class="fields">
|
app/design/frontend/blacknwhite/default/template/pslogin/onepagecheckout/login.phtml
CHANGED
@@ -1,3 +1,5 @@
|
|
|
|
|
|
1 |
<?php if (!Mage::getSingleton('customer/session')->isLoggedIn()){?>
|
2 |
<div id="onepagecheckout_loginbox" style="display: none;" class='op_login_area'>
|
3 |
<div class='close_la' onclick='close_login();'><i class="fa fa-times"></i></div>
|
@@ -59,4 +61,8 @@ if($http_mode)
|
|
59 |
//]]>
|
60 |
</script>
|
61 |
</div>
|
62 |
-
<?php }?>
|
|
|
|
|
|
|
|
1 |
+
<?php if (!Mage::getStoreConfig('onestepcheckout/general/enabled')) { ?>
|
2 |
+
|
3 |
<?php if (!Mage::getSingleton('customer/session')->isLoggedIn()){?>
|
4 |
<div id="onepagecheckout_loginbox" style="display: none;" class='op_login_area'>
|
5 |
<div class='close_la' onclick='close_login();'><i class="fa fa-times"></i></div>
|
61 |
//]]>
|
62 |
</script>
|
63 |
</div>
|
64 |
+
<?php }?>
|
65 |
+
|
66 |
+
<?php } else {
|
67 |
+
echo $this->setTemplate('onestepcheckout/onepage/login.phtml')->toHtml();
|
68 |
+
}
|
app/design/frontend/default/blanco/template/pslogin/checkout/onepage/login.phtml
CHANGED
@@ -32,6 +32,8 @@
|
|
32 |
*/
|
33 |
/** @var $this Mage_Checkout_Block_Onepage_Login */
|
34 |
?>
|
|
|
|
|
35 |
<div class="col2-set">
|
36 |
<?php echo $this->getChildHtml('login_before')?>
|
37 |
<div class="col-1">
|
@@ -167,3 +169,7 @@
|
|
167 |
//]]>
|
168 |
</script>
|
169 |
<?php endif; ?>
|
|
|
|
|
|
|
|
32 |
*/
|
33 |
/** @var $this Mage_Checkout_Block_Onepage_Login */
|
34 |
?>
|
35 |
+
<?php if (!Mage::getStoreConfig('onestepcheckout/general/enabled')) { ?>
|
36 |
+
|
37 |
<div class="col2-set">
|
38 |
<?php echo $this->getChildHtml('login_before')?>
|
39 |
<div class="col-1">
|
169 |
//]]>
|
170 |
</script>
|
171 |
<?php endif; ?>
|
172 |
+
|
173 |
+
<?php } else {
|
174 |
+
echo $this->setTemplate('onestepcheckout/onepage/login.phtml')->toHtml();
|
175 |
+
}
|
app/design/frontend/default/blanco/template/pslogin/customer/form/register.phtml
CHANGED
@@ -56,6 +56,7 @@
|
|
56 |
<div class="fieldset">
|
57 |
<input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
|
58 |
<input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
|
|
|
59 |
<h2 class="legend"><?php echo $this->__('Personal Information') ?></h2>
|
60 |
<ul class="form-list">
|
61 |
<li class="fields">
|
56 |
<div class="fieldset">
|
57 |
<input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
|
58 |
<input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
|
59 |
+
<input type="hidden" name="form_key" value="<?php echo Mage::getSingleton('core/session')->getFormKey() ?>" />
|
60 |
<h2 class="legend"><?php echo $this->__('Personal Information') ?></h2>
|
61 |
<ul class="form-list">
|
62 |
<li class="fields">
|
app/design/frontend/default/buyshop/template/pslogin/checkout/onepage/login.phtml
CHANGED
@@ -32,6 +32,8 @@
|
|
32 |
*/
|
33 |
/** @var $this Mage_Checkout_Block_Onepage_Login */
|
34 |
?>
|
|
|
|
|
35 |
<?php echo $this->getChildHtml('login_before')?>
|
36 |
<div class="pull-left">
|
37 |
<!--<form id="form-checkout">-->
|
@@ -167,3 +169,7 @@
|
|
167 |
//]]>
|
168 |
</script>
|
169 |
<?php endif; ?>
|
|
|
|
|
|
|
|
32 |
*/
|
33 |
/** @var $this Mage_Checkout_Block_Onepage_Login */
|
34 |
?>
|
35 |
+
<?php if (!Mage::getStoreConfig('onestepcheckout/general/enabled')) { ?>
|
36 |
+
|
37 |
<?php echo $this->getChildHtml('login_before')?>
|
38 |
<div class="pull-left">
|
39 |
<!--<form id="form-checkout">-->
|
169 |
//]]>
|
170 |
</script>
|
171 |
<?php endif; ?>
|
172 |
+
|
173 |
+
<?php } else {
|
174 |
+
echo $this->setTemplate('onestepcheckout/onepage/login.phtml')->toHtml();
|
175 |
+
}
|
app/design/frontend/default/buyshop/template/pslogin/customer/form/register.phtml
CHANGED
@@ -56,6 +56,7 @@
|
|
56 |
<div class="fieldset">
|
57 |
<input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
|
58 |
<input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
|
|
|
59 |
<h2 class="legend"><?php echo $this->__('Personal Information') ?></h2>
|
60 |
<ul class="form-list">
|
61 |
<li class="fields">
|
56 |
<div class="fieldset">
|
57 |
<input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
|
58 |
<input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
|
59 |
+
<input type="hidden" name="form_key" value="<?php echo Mage::getSingleton('core/session')->getFormKey() ?>" />
|
60 |
<h2 class="legend"><?php echo $this->__('Personal Information') ?></h2>
|
61 |
<ul class="form-list">
|
62 |
<li class="fields">
|
app/design/frontend/default/milano/template/pslogin/checkout/onepage/login.phtml
CHANGED
@@ -32,6 +32,8 @@
|
|
32 |
*/
|
33 |
/** @var $this Mage_Checkout_Block_Onepage_Login */
|
34 |
?>
|
|
|
|
|
35 |
<div class="col2-set">
|
36 |
<?php echo $this->getChildHtml('login_before')?>
|
37 |
<div class="col-1">
|
@@ -167,3 +169,7 @@
|
|
167 |
//]]>
|
168 |
</script>
|
169 |
<?php endif; ?>
|
|
|
|
|
|
|
|
32 |
*/
|
33 |
/** @var $this Mage_Checkout_Block_Onepage_Login */
|
34 |
?>
|
35 |
+
<?php if (!Mage::getStoreConfig('onestepcheckout/general/enabled')) { ?>
|
36 |
+
|
37 |
<div class="col2-set">
|
38 |
<?php echo $this->getChildHtml('login_before')?>
|
39 |
<div class="col-1">
|
169 |
//]]>
|
170 |
</script>
|
171 |
<?php endif; ?>
|
172 |
+
|
173 |
+
<?php } else {
|
174 |
+
echo $this->setTemplate('onestepcheckout/onepage/login.phtml')->toHtml();
|
175 |
+
}
|
app/design/frontend/default/milano/template/pslogin/customer/form/register.phtml
CHANGED
@@ -56,6 +56,7 @@
|
|
56 |
<div class="fieldset">
|
57 |
<input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
|
58 |
<input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
|
|
|
59 |
<h2 class="legend"><?php echo $this->__('Personal Information') ?></h2>
|
60 |
<ul class="form-list">
|
61 |
<li class="fields">
|
56 |
<div class="fieldset">
|
57 |
<input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
|
58 |
<input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
|
59 |
+
<input type="hidden" name="form_key" value="<?php echo Mage::getSingleton('core/session')->getFormKey() ?>" />
|
60 |
<h2 class="legend"><?php echo $this->__('Personal Information') ?></h2>
|
61 |
<ul class="form-list">
|
62 |
<li class="fields">
|
app/design/frontend/fortis/default/template/pslogin/checkout/onepage/login.phtml
CHANGED
@@ -32,6 +32,8 @@
|
|
32 |
*/
|
33 |
/** @var $this Mage_Checkout_Block_Onepage_Login */
|
34 |
?>
|
|
|
|
|
35 |
<div class="col2-set">
|
36 |
<?php echo $this->getChildHtml('login_before')?>
|
37 |
<div class="col-1">
|
@@ -166,3 +168,7 @@
|
|
166 |
//]]>
|
167 |
</script>
|
168 |
<?php endif; ?>
|
|
|
|
|
|
|
|
32 |
*/
|
33 |
/** @var $this Mage_Checkout_Block_Onepage_Login */
|
34 |
?>
|
35 |
+
<?php if (!Mage::getStoreConfig('onestepcheckout/general/enabled')) { ?>
|
36 |
+
|
37 |
<div class="col2-set">
|
38 |
<?php echo $this->getChildHtml('login_before')?>
|
39 |
<div class="col-1">
|
168 |
//]]>
|
169 |
</script>
|
170 |
<?php endif; ?>
|
171 |
+
|
172 |
+
<?php } else {
|
173 |
+
echo $this->setTemplate('onestepcheckout/onepage/login.phtml')->toHtml();
|
174 |
+
}
|
app/design/frontend/fortis/default/template/pslogin/customer/form/register.phtml
CHANGED
@@ -54,6 +54,7 @@
|
|
54 |
<div class="fieldset">
|
55 |
<input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
|
56 |
<input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
|
|
|
57 |
<h2 class="legend"><?php echo $this->__('Personal Information') ?></h2>
|
58 |
<ul class="form-list">
|
59 |
<li class="fields">
|
54 |
<div class="fieldset">
|
55 |
<input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
|
56 |
<input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
|
57 |
+
<input type="hidden" name="form_key" value="<?php echo Mage::getSingleton('core/session')->getFormKey() ?>" />
|
58 |
<h2 class="legend"><?php echo $this->__('Personal Information') ?></h2>
|
59 |
<ul class="form-list">
|
60 |
<li class="fields">
|
app/design/frontend/gravdept/acumen/template/pslogin/checkout/onepage/login.phtml
CHANGED
@@ -18,6 +18,7 @@
|
|
18 |
*/
|
19 |
/** @var $this Mage_Checkout_Block_Onepage_Login */
|
20 |
?>
|
|
|
21 |
|
22 |
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
23 |
|
@@ -143,3 +144,7 @@
|
|
143 |
//]]>
|
144 |
</script>
|
145 |
<?php endif; ?>
|
|
|
|
|
|
|
|
18 |
*/
|
19 |
/** @var $this Mage_Checkout_Block_Onepage_Login */
|
20 |
?>
|
21 |
+
<?php if (!Mage::getStoreConfig('onestepcheckout/general/enabled')) { ?>
|
22 |
|
23 |
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
24 |
|
144 |
//]]>
|
145 |
</script>
|
146 |
<?php endif; ?>
|
147 |
+
|
148 |
+
<?php } else {
|
149 |
+
echo $this->setTemplate('onestepcheckout/onepage/login.phtml')->toHtml();
|
150 |
+
}
|
app/design/frontend/gravdept/acumen/template/pslogin/customer/form/register.phtml
CHANGED
@@ -44,6 +44,7 @@
|
|
44 |
<form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="register-form" class="scaffold-form">
|
45 |
<input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
|
46 |
<input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
|
|
|
47 |
|
48 |
<div class="fieldset">
|
49 |
<h2 class="legend"><?php echo $this->__('Personal Information') ?></h2>
|
44 |
<form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="register-form" class="scaffold-form">
|
45 |
<input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
|
46 |
<input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
|
47 |
+
<input type="hidden" name="form_key" value="<?php echo Mage::getSingleton('core/session')->getFormKey() ?>" />
|
48 |
|
49 |
<div class="fieldset">
|
50 |
<h2 class="legend"><?php echo $this->__('Personal Information') ?></h2>
|
app/design/frontend/shopper/default/template/pslogin/checkout/onepage/login.phtml
CHANGED
@@ -32,6 +32,8 @@
|
|
32 |
*/
|
33 |
/** @var $this Mage_Checkout_Block_Onepage_Login */
|
34 |
?>
|
|
|
|
|
35 |
<?php echo $this->getChildHtml('login_before')?>
|
36 |
|
37 |
<div class="block block-checkout-register">
|
@@ -175,3 +177,7 @@
|
|
175 |
//]]>
|
176 |
</script>
|
177 |
<?php endif; ?>
|
|
|
|
|
|
|
|
32 |
*/
|
33 |
/** @var $this Mage_Checkout_Block_Onepage_Login */
|
34 |
?>
|
35 |
+
<?php if (!Mage::getStoreConfig('onestepcheckout/general/enabled')) { ?>
|
36 |
+
|
37 |
<?php echo $this->getChildHtml('login_before')?>
|
38 |
|
39 |
<div class="block block-checkout-register">
|
177 |
//]]>
|
178 |
</script>
|
179 |
<?php endif; ?>
|
180 |
+
|
181 |
+
<?php } else {
|
182 |
+
echo $this->setTemplate('onestepcheckout/onepage/login.phtml')->toHtml();
|
183 |
+
}
|
app/design/frontend/shopper/default/template/pslogin/customer/form/register.phtml
CHANGED
@@ -59,7 +59,8 @@
|
|
59 |
|
60 |
<input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>"/>
|
61 |
<input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>"/>
|
62 |
-
|
|
|
63 |
<h2 class="legend first"><?php echo $this->__('Personal Information') ?></h2>
|
64 |
<ul class="form-list">
|
65 |
<li class="fields">
|
59 |
|
60 |
<input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>"/>
|
61 |
<input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>"/>
|
62 |
+
<input type="hidden" name="form_key" value="<?php echo Mage::getSingleton('core/session')->getFormKey() ?>" />
|
63 |
+
|
64 |
<h2 class="legend first"><?php echo $this->__('Personal Information') ?></h2>
|
65 |
<ul class="form-list">
|
66 |
<li class="fields">
|
app/design/frontend/ultimo/default/template/pslogin/checkout/onepage/login.phtml
CHANGED
@@ -32,6 +32,8 @@
|
|
32 |
*/
|
33 |
/** @var $this Mage_Checkout_Block_Onepage_Login */
|
34 |
?>
|
|
|
|
|
35 |
<div class="">
|
36 |
<?php echo $this->getChildHtml('login_before')?>
|
37 |
<div class="grid12-6">
|
@@ -171,3 +173,7 @@
|
|
171 |
//]]>
|
172 |
</script>
|
173 |
<?php endif; ?>
|
|
|
|
|
|
|
|
32 |
*/
|
33 |
/** @var $this Mage_Checkout_Block_Onepage_Login */
|
34 |
?>
|
35 |
+
<?php if (!Mage::getStoreConfig('onestepcheckout/general/enabled')) { ?>
|
36 |
+
|
37 |
<div class="">
|
38 |
<?php echo $this->getChildHtml('login_before')?>
|
39 |
<div class="grid12-6">
|
173 |
//]]>
|
174 |
</script>
|
175 |
<?php endif; ?>
|
176 |
+
|
177 |
+
<?php } else {
|
178 |
+
echo $this->setTemplate('onestepcheckout/onepage/login.phtml')->toHtml();
|
179 |
+
}
|
app/design/frontend/ultimo/default/template/pslogin/customer/form/register.phtml
CHANGED
@@ -54,6 +54,7 @@
|
|
54 |
<div class="fieldset">
|
55 |
<input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
|
56 |
<input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
|
|
|
57 |
<h2 class="legend"><?php echo $this->__('Personal Information') ?></h2>
|
58 |
<ul class="form-list">
|
59 |
<li class="fields">
|
54 |
<div class="fieldset">
|
55 |
<input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
|
56 |
<input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
|
57 |
+
<input type="hidden" name="form_key" value="<?php echo Mage::getSingleton('core/session')->getFormKey() ?>" />
|
58 |
<h2 class="legend"><?php echo $this->__('Personal Information') ?></h2>
|
59 |
<ul class="form-list">
|
60 |
<li class="fields">
|
app/design/frontend/venedor/default/template/pslogin/checkout/onepage/login.phtml
CHANGED
@@ -14,6 +14,8 @@
|
|
14 |
*/
|
15 |
/** @var $this Mage_Checkout_Block_Onepage_Login */
|
16 |
?>
|
|
|
|
|
17 |
<?php
|
18 |
$venedor = $this->helper('venedor');
|
19 |
$rowClass = $venedor->getRowClass();
|
@@ -139,3 +141,7 @@ $spanClass = $venedor->getSpanClass();
|
|
139 |
//]]>
|
140 |
</script>
|
141 |
<?php endif; ?>
|
|
|
|
|
|
|
|
14 |
*/
|
15 |
/** @var $this Mage_Checkout_Block_Onepage_Login */
|
16 |
?>
|
17 |
+
<?php if (!Mage::getStoreConfig('onestepcheckout/general/enabled')) { ?>
|
18 |
+
|
19 |
<?php
|
20 |
$venedor = $this->helper('venedor');
|
21 |
$rowClass = $venedor->getRowClass();
|
141 |
//]]>
|
142 |
</script>
|
143 |
<?php endif; ?>
|
144 |
+
|
145 |
+
<?php } else {
|
146 |
+
echo $this->setTemplate('onestepcheckout/onepage/login.phtml')->toHtml();
|
147 |
+
}
|
app/design/frontend/venedor/default/template/pslogin/customer/form/register.phtml
CHANGED
@@ -60,6 +60,7 @@ $spanClass = $venedor->getSpanClass();
|
|
60 |
<form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="form-validate">
|
61 |
<input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
|
62 |
<input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
|
|
|
63 |
<div class="<?php echo $rowClass ?>">
|
64 |
<div class="<?php if($this->getShowAddressFields()) echo $spanClass.'6'; else echo $spanClass.'12'; ?>">
|
65 |
<h2><?php echo $this->__('Your Personal Details') ?></h2>
|
60 |
<form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="form-validate">
|
61 |
<input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
|
62 |
<input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
|
63 |
+
<input type="hidden" name="form_key" value="<?php echo Mage::getSingleton('core/session')->getFormKey() ?>" />
|
64 |
<div class="<?php echo $rowClass ?>">
|
65 |
<div class="<?php if($this->getShowAddressFields()) echo $spanClass.'6'; else echo $spanClass.'12'; ?>">
|
66 |
<h2><?php echo $this->__('Your Personal Details') ?></h2>
|
app/etc/modules/Plumrocket_SocialLogin.xml
CHANGED
@@ -4,7 +4,7 @@
|
|
4 |
<Plumrocket_SocialLogin>
|
5 |
<active>true</active>
|
6 |
<codePool>community</codePool>
|
7 |
-
<version>1.2.
|
8 |
<name>Twitter & Facebook Login</name>
|
9 |
<wiki>http://wiki.plumrocket.com/wiki/Magento_Twitter_and_Facebook_Login_v1.x_Extension</wiki>
|
10 |
<depends>
|
4 |
<Plumrocket_SocialLogin>
|
5 |
<active>true</active>
|
6 |
<codePool>community</codePool>
|
7 |
+
<version>1.2.8</version>
|
8 |
<name>Twitter & Facebook Login</name>
|
9 |
<wiki>http://wiki.plumrocket.com/wiki/Magento_Twitter_and_Facebook_Login_v1.x_Extension</wiki>
|
10 |
<depends>
|
package.xml
CHANGED
@@ -1,19 +1,20 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Plumrocket_Twitter_Facebook_Login</name>
|
4 |
-
<version>1.2.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://wiki.plumrocket.net/wiki/EULA">End-user License Agreement</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>Plumrocket Twitter & Facebook Login v1.x was designed to help online store owners reach as many customers as possible. Increase sales, allow clients to use Magento Facebook Login & Twitter Login free to quickly register & place order.</summary>
|
10 |
<description>Plumrocket Twitter & Facebook Login is a free magento extension that will let online store owners benefit from all the social media advantages. It helps to increase conversion rates by allowing your customers quickly login and place order.</description>
|
11 |
-
<notes>-
|
12 |
-
-
|
|
|
13 |
<authors><author><name>Plumrocket Team</name><user>plumrocket</user><email>support@plumrocket.com</email></author></authors>
|
14 |
-
<date>2016-03-
|
15 |
-
<time>
|
16 |
-
<contents><target name="mageetc"><dir name="modules"><file name="Plumrocket_SocialLogin.xml" hash="
|
17 |
<compatible/>
|
18 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Plumrocket_Base</name><channel>community</channel><min/><max/></package></required></dependencies>
|
19 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Plumrocket_Twitter_Facebook_Login</name>
|
4 |
+
<version>1.2.8</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://wiki.plumrocket.net/wiki/EULA">End-user License Agreement</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>Plumrocket Twitter & Facebook Login v1.x was designed to help online store owners reach as many customers as possible. Increase sales, allow clients to use Magento Facebook Login & Twitter Login free to quickly register & place order.</summary>
|
10 |
<description>Plumrocket Twitter & Facebook Login is a free magento extension that will let online store owners benefit from all the social media advantages. It helps to increase conversion rates by allowing your customers quickly login and place order.</description>
|
11 |
+
<notes>- Added integration with Plumrocket One Step Checkout Magento Extension
|
12 |
+
- Fixed bug on Magento registration page
|
13 |
+
</notes>
|
14 |
<authors><author><name>Plumrocket Team</name><user>plumrocket</user><email>support@plumrocket.com</email></author></authors>
|
15 |
+
<date>2016-03-30</date>
|
16 |
+
<time>12:03:21</time>
|
17 |
+
<contents><target name="mageetc"><dir name="modules"><file name="Plumrocket_SocialLogin.xml" hash="024a7044640cc5d68e27b151374c1242"/></dir></target><target name="magecommunity"><dir name="Plumrocket"><dir name="SocialLogin"><dir name="Block"><file name="Buttons.php" hash="01e4058d3a9d2886d3d299108df5e39e"/><file name="General.php" hash="b91d1eec3ee0f4d70164230d8fcdf73c"/><dir name="Page"><dir name="Html"><file name="Header.php" hash="4e194b50036e46d60a12f51d879c50ff"/><file name="Welcome.php" hash="af7adad8c6c05dc6b51eb40e7d345519"/></dir></dir><file name="Share.php" hash="8447182219873dee7caaf620950157e4"/><dir name="System"><dir name="Config"><file name="Callbackurl.php" hash="18db5ba86eba4692530d674c556d198c"/><file name="Comingsoon.php" hash="dd6c106da378297ab6dd6724fe014281"/><file name="Notinstalled.php" hash="c263ec689c84b028dc4abdf06c7f0e5d"/><file name="Sortable.php" hash="2ae8f2236270e459223e10a84e123e07"/><file name="Version.php" hash="dcbf01e3752a5beb030b3aec752af6dd"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="cbd35ae6bbb7f6c6828e3763b69dae5e"/><file name="Main.php" hash="91b6f4aec64610bca0254a3bf196f208"/></dir><dir name="Model"><file name="Account.php" hash="8e37efd5e819b93d0ce0b90b96baea05"/><file name="Facebook.php" hash="03385dd53fa1acac970f146ab86187db"/><dir name="Mysql4"><dir name="Account"><file name="Collection.php" hash="ca4211392ef934ce33391408092a9737"/></dir><file name="Account.php" hash="3fd0a1c891d31577d873247e17ce01ce"/></dir><file name="Observer.php" hash="1edb8fc92e3db12f7869eb102cb3d75e"/><dir name="System"><dir name="Config"><dir name="Source"><file name="Redirectto.php" hash="c2bcb34b36ae88ce3bfdfe242463ba9a"/><file name="Shareurl.php" hash="a28729927bf70baa36ebade8e3919d3b"/></dir></dir></dir><file name="Twitter.php" hash="3dec05ac8d4ace4c9b0f57779c6b7b82"/></dir><dir name="controllers"><file name="AccountController.php" hash="2b8b3e01fa57b590cd85815b65a8553b"/></dir><dir name="etc"><file name="adminhtml.xml" hash="0aa82ee4ebe19c26943b496f45ce590d"/><file name="config.xml" hash="df077d0c99116de0899f3ed704721145"/><file name="system.xml" hash="393143733cb90ea9334849599465d011"/></dir><dir name="sql"><dir name="pslogin_setup"><file name="install-1.0.0.php" hash="553fa30329657c4ae11cd85e8abd9784"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="pslogin.xml" hash="7f6dface7e33a1e667a568deb5aea0ec"/></dir><dir name="template"><dir name="pslogin"><dir name="system"><dir name="config"><file name="sortable.phtml" hash="398697865280d2f7d516645d62b1569d"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="pslogin.xml" hash="2f49444acbd196a4182ef7b2d3fc41af"/></dir><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="7e5f3be44a2e87b2e2a23fab1b4e0e7c"/><dir name="message"><file name="fake_email.phtml" hash="4df9c4f220333606f758d730b9246942"/></dir></dir></dir><dir name="customer"><dir name="form"><dir name="edit"><file name="fake_email.phtml" hash="28e38c06e2d833ff469e2c50f89d922c"/></dir><dir name="login"><file name="buttons.phtml" hash="8b861b6891438a4cf30a97d6084f0208"/></dir><file name="login.phtml" hash="8d95198607fdc776865eb0647d7743cd"/><dir name="register"><file name="buttons.phtml" hash="808ae10b8c4abd3460ad2ebbc6f8ec72"/><file name="sharedata.phtml" hash="21e3d413a95289b676033f6ca254f018"/><file name="sharepopup.phtml" hash="834dd13f11319f5fc58931463fdbd4f0"/></dir><file name="register.phtml" hash="99fe1381f5c6f03f771fd3523d1c166f"/></dir></dir><file name="footer.phtml" hash="e006f59b500305aaaed405008f32470a"/><file name="js.phtml" hash="4f1716f6f3b5401a6b29865a189b4aec"/><dir name="page"><dir name="html"><file name="welcome.phtml" hash="de89796d6555f732aaad8099c012d3bb"/></dir></dir><file name="runjs.phtml" hash="b9c6df4f25e740b10edfd8ac503bfea1"/></dir></dir></dir></dir><dir name="ultimo"><dir name="default"><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="eca273c65a41c809cd7cb5328f190214"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="cf337e019cbe443f9d1cd0dbe3a145ad"/><file name="register.phtml" hash="bfd2cceeb59a70dea2682282533af959"/></dir></dir></dir></dir></dir></dir><dir name="shopper"><dir name="default"><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="23c109bf666a64637630e08fc40961b1"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="072d3a2449ca53d90153719ac01c8aae"/><file name="register.phtml" hash="ed6d1e11eff2a0213d72b9020f2ac29e"/></dir></dir></dir></dir></dir></dir><dir name="fortis"><dir name="default"><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="6b724ba7eb1714dfc390445c293581c1"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="249520a604a0220b6646506ebe573011"/><file name="register.phtml" hash="bfd2cceeb59a70dea2682282533af959"/></dir></dir></dir></dir></dir></dir><dir name="default"><dir name="blanco"><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="db8fdf238e7d868a6e55ea34f80358c5"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="887c951966ab3540093c4c3a3832b331"/><file name="register.phtml" hash="3adc3800e8d855b49c286db74923c549"/></dir></dir></dir></dir></dir><dir name="buyshop"><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="5c11e51aae76613c3405610914c014ad"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="1f7c8854dba5149030bc61b14d644614"/><file name="register.phtml" hash="3adc3800e8d855b49c286db74923c549"/></dir></dir></dir></dir></dir><dir name="milano"><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="db8fdf238e7d868a6e55ea34f80358c5"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="887c951966ab3540093c4c3a3832b331"/><file name="register.phtml" hash="3adc3800e8d855b49c286db74923c549"/></dir></dir></dir></dir></dir></dir><dir name="gravdept"><dir name="acumen"><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="c8e29c0cb2bf8d9da545f8829cfe9aec"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="bde5923d16bf48ca0aeb5a824ea6bbff"/><file name="register.phtml" hash="36a99a65114e61333fc96051f1b4da58"/></dir></dir></dir></dir></dir></dir><dir name="blacknwhite"><dir name="default"><dir name="template"><dir name="pslogin"><dir name="customer"><dir name="form"><file name="login.phtml" hash="ef1349603e09651ac66755546dab3116"/><file name="register.phtml" hash="3adc3800e8d855b49c286db74923c549"/></dir></dir><dir name="onepagecheckout"><file name="login.phtml" hash="b188ec7d0fde220ce78e60d70af63557"/></dir></dir></dir></dir></dir><dir name="venedor"><dir name="default"><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="f079f7525326c990372324d02a3441ed"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="e5f3a79f1cc36d88807561bdd3461a8c"/><file name="register.phtml" hash="721e19772d4355070fd5b71b755be5b5"/></dir></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Plumrocket_SocialLogin.csv" hash="7572e6085fbc927180c11c7fcb060389"/></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="css"><dir name="plumrocket"><dir name="pslogin"><file name="pslogin.css" hash="d3d9e60b5d31c131c9ccedd296339ae0"/></dir></dir></dir><dir name="images"><dir name="plumrocket"><dir name="pslogin"><file name="social_admin.png" hash="f0d366be8ba53bc7510816a998861904"/></dir></dir></dir><dir name="js"><dir name="plumrocket"><dir name="pslogin"><file name="config.js" hash="a2c074dcd3c228afc2f144b8de8103c8"/><file name="jquery-1.10.2.min.js" hash="73042c373edc5879d6cdd9f569b9a234"/><file name="jquery-ui.min.js" hash="a0e434a17ebc022fb565e08fd446baef"/><file name="pslogin.js" hash="4770ef59857cd6eca2534d74e1dcf67c"/></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="plumrocket"><dir name="pslogin"><file name="pslogin-custom.css" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name="pslogin.css" hash="fc633539c307cbaf764e346d97e41c8f"/></dir></dir></dir><dir name="images"><dir name="plumrocket"><dir name="pslogin"><file name="loader.gif" hash="013fe7725d917198766631696bbe40d1"/><file name="social.png" hash="5e8399f752da8dd769f5150fe647cf79"/><file name="social_retina.png" hash="b224ce068c5bb2fd7a4066e23073057a"/></dir></dir></dir><dir name="js"><dir name="plumrocket"><dir name="pslogin"><file name="jquery-1.10.2.min.js" hash="73042c373edc5879d6cdd9f569b9a234"/><file name="pslogin.js" hash="fe0f64ab37951d5229aaea132cb73915"/></dir></dir></dir></dir></dir><dir name="shopper"><dir name="default"><dir name="css"><dir name="plumrocket"><dir name="pslogin"><file name="pslogin-custom.css" hash="56be3d4ce52002b666072f42515b12d8"/></dir></dir></dir></dir></dir><dir name="default"><dir name="buyshop"><dir name="css"><dir name="plumrocket"><dir name="pslogin"><file name="pslogin-custom.css" hash="08ae88742d436464733e060c95e50569"/></dir></dir></dir></dir></dir><dir name="venedor"><dir name="default"><dir name="css"><dir name="plumrocket"><dir name="pslogin"><file name="pslogin-custom.css" hash="2f95248995f04c7b831fd81bcc16b6d8"/></dir></dir></dir></dir></dir></dir></target></contents>
|
18 |
<compatible/>
|
19 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Plumrocket_Base</name><channel>community</channel><min/><max/></package></required></dependencies>
|
20 |
</package>
|