DS_PrivateSales - Version 1.0.4

Version Notes

1.0.4
added compatibility for CE 1.9 (including RWD theme)
custom reg panel content now also applies to onepage checkout if applicable (1.9+ only)
fixed bug that configured no-cookies page was not shown after login attempt with disabled cookies
fixed bug that products could be accessed by guests using product tags even when catalog pages have been configured to be locked
fixed bug that invalid template resources could lead to 404 error page after successful login
fixed bug that error message from invalid login attempt could be suppressed by multiple redirects
special thanks to Psynapse (psynapse.com.au) for supporting this new release

1.0.3
added options to overwrite error messages when trying to access locked registration / forgot password
added compatibility for CE 1.8 / 1.8.1

1.0.2.1
fixed a php notice when trying to check the capability of retrieving the magento edition

1.0.2
added option to hide or customize registration panel at login page
registration panel can be customized by configuring header, text, button visibility and button label
registration panel can be hidden or customized even when registration remains enabled
disabled registration removes all registration hints when entering onepage checkout as guest
disabled forgot password now also removes the links at login and onepage checkout page

note: new templates have been added so you may check them to match with your skin after update

1.0.1
fixed redirect to startpage not working when customer_startup_redirect_dashboard is disabled
fixed hive navigation option not working in ce 1.7
fixed fatal error on after login redirect in ce 1.5

1.0.0
initial release

Download this release

Release Info

Developer Design:Slider GbR
Extension DS_PrivateSales
Version 1.0.4
Comparing to
See all releases


Code changes from version 1.0.3 to 1.0.4

Files changed (11) hide show
  1. app/code/community/DS/PrivateSales/Block/Checkout/Onepage/Login.php +16 -7
  2. app/code/community/DS/PrivateSales/Block/Customer/Form/Login.php +16 -7
  3. app/code/community/DS/PrivateSales/CHANGE.LOG +11 -2
  4. app/code/community/DS/PrivateSales/Model/Observer.php +22 -6
  5. app/code/community/DS/PrivateSales/controllers/Customer/AccountController.php +5 -4
  6. app/code/community/DS/PrivateSales/etc/config.xml +1 -1
  7. app/design/frontend/default/default/template/ds/privatesales/login_ce19.phtml +92 -0
  8. app/design/frontend/default/default/template/ds/privatesales/opc_ce19.phtml +158 -0
  9. app/design/frontend/rwd/default/template/ds/privatesales/login_ce19.phtml +101 -0
  10. app/design/frontend/rwd/default/template/ds/privatesales/opc_ce19.phtml +158 -0
  11. package.xml +16 -6
app/code/community/DS/PrivateSales/Block/Checkout/Onepage/Login.php CHANGED
@@ -16,21 +16,30 @@ class DS_PrivateSales_Block_Checkout_Onepage_Login extends Mage_Checkout_Block_O
16
  *
17
  * @return Mage_Core_Block_Abstract
18
  * @see Mage_Core_Block_Template::_beforeToHtml
 
 
 
19
  */
20
  protected function _beforeToHtml()
21
  {
 
22
  // Set latest available template as default
23
- $this->setTemplate('ds/privatesales/opc_ce17_18.phtml');
24
-
25
  // Use older template depending on magento version (is there a layout xml based solution for that?)
26
  $e = method_exists('Mage', 'getEdition') ? Mage::getEdition() : 'Community';
27
  $v = Mage::getVersion();
28
- if ($e = 'Community' && version_compare($v, '1.7') < 0) {
29
-
30
- // Use CE 1.4 - 1.6.2 compatible template
31
- $this->setTemplate('ds/privatesales/opc_ce14_15_16.phtml');
32
  }
33
-
 
 
 
 
 
34
  return $this;
35
  }
36
  }
16
  *
17
  * @return Mage_Core_Block_Abstract
18
  * @see Mage_Core_Block_Template::_beforeToHtml
19
+ * @since 2014/11/02 added CE 1.9 support
20
+ * @since 2014/11/02 added proper directory separators to support windows based systems
21
+ * @since 2014/11/02 fixed that enterprise versions have been compared like there were community versions (still no really EE support yet)
22
  */
23
  protected function _beforeToHtml()
24
  {
25
+
26
  // Set latest available template as default
27
+ $this->setTemplate('ds'.DIRECTORY_SEPARATOR.'privatesales'.DIRECTORY_SEPARATOR.'opc_ce19.phtml');
28
+
29
  // Use older template depending on magento version (is there a layout xml based solution for that?)
30
  $e = method_exists('Mage', 'getEdition') ? Mage::getEdition() : 'Community';
31
  $v = Mage::getVersion();
32
+
33
+ // Use CE 1.4 - 1.6.2 compatible template
34
+ if ($e == 'Community' && version_compare($v, '1.7') < 0) {
35
+ $this->setTemplate('ds'.DIRECTORY_SEPARATOR.'privatesales'.DIRECTORY_SEPARATOR.'opc_ce14_15_16.phtml');
36
  }
37
+
38
+ // Use CE 1.7 - 1.8 compatible template
39
+ elseif ($e == 'Community' && version_compare($v, '1.9') < 0) {
40
+ $this->setTemplate('ds'.DIRECTORY_SEPARATOR.'privatesales'.DIRECTORY_SEPARATOR.'opc_ce17_18.phtml');
41
+ }
42
+
43
  return $this;
44
  }
45
  }
app/code/community/DS/PrivateSales/Block/Customer/Form/Login.php CHANGED
@@ -16,21 +16,30 @@ class DS_PrivateSales_Block_Customer_Form_Login extends Mage_Customer_Block_Form
16
  *
17
  * @return Mage_Core_Block_Abstract
18
  * @see Mage_Core_Block_Template::_beforeToHtml
 
 
 
19
  */
20
  protected function _beforeToHtml()
21
  {
 
22
  // Set latest available template as default
23
- $this->setTemplate('ds/privatesales/login_ce17_18.phtml');
24
-
25
  // Use older template depending on magento version (is there a layout xml based solution for that?)
26
  $e = method_exists('Mage', 'getEdition') ? Mage::getEdition() : 'Community';
27
  $v = Mage::getVersion();
28
- if ($e = 'Community' && version_compare($v, '1.7') < 0) {
29
-
30
- // Use CE 1.4 - 1.6.2 compatible template
31
- $this->setTemplate('ds/privatesales/login_ce14_15_16.phtml');
32
  }
33
-
 
 
 
 
 
34
  return $this;
35
  }
36
  }
16
  *
17
  * @return Mage_Core_Block_Abstract
18
  * @see Mage_Core_Block_Template::_beforeToHtml
19
+ * @since 2014/11/02 added CE 1.9 support
20
+ * @since 2014/11/02 added proper directory separators to support windows based systems
21
+ * @since 2014/11/02 fixed that enterprise versions have been compared like there were community versions (still no really EE support yet)
22
  */
23
  protected function _beforeToHtml()
24
  {
25
+
26
  // Set latest available template as default
27
+ $this->setTemplate('ds'.DIRECTORY_SEPARATOR.'privatesales'.DIRECTORY_SEPARATOR.'login_ce19.phtml');
28
+
29
  // Use older template depending on magento version (is there a layout xml based solution for that?)
30
  $e = method_exists('Mage', 'getEdition') ? Mage::getEdition() : 'Community';
31
  $v = Mage::getVersion();
32
+
33
+ // Use CE 1.4 - 1.6.2 compatible template
34
+ if ($e == 'Community' && version_compare($v, '1.7') < 0) {
35
+ $this->setTemplate('ds'.DIRECTORY_SEPARATOR.'privatesales'.DIRECTORY_SEPARATOR.'login_ce14_15_16.phtml');
36
  }
37
+
38
+ // Use CE 1.7 - 1.8 compatible template
39
+ elseif ($e == 'Community' && version_compare($v, '1.9') < 0) {
40
+ $this->setTemplate('ds'.DIRECTORY_SEPARATOR.'privatesales'.DIRECTORY_SEPARATOR.'login_ce17_18.phtml');
41
+ }
42
+
43
  return $this;
44
  }
45
  }
app/code/community/DS/PrivateSales/CHANGE.LOG CHANGED
@@ -1,5 +1,14 @@
1
  DS_PrivateSales
2
 
 
 
 
 
 
 
 
 
 
3
  1.0.3
4
  added options to overwrite error messages when trying to access locked registration / forgot password
5
  added compatibility for CE 1.8 / 1.8.1
@@ -18,8 +27,8 @@ DS_PrivateSales
18
 
19
  1.0.1
20
  fixed redirect to startpage not working when customer_startup_redirect_dashboard is disabled
21
- fixed hive navigation option not working in ce 1.7
22
- fixed fatal error on after login redirect in ce 1.5
23
 
24
  1.0.0
25
  initial release
1
  DS_PrivateSales
2
 
3
+ 1.0.4
4
+ added compatibility for CE 1.9 (including RWD theme)
5
+ custom reg panel content now also applies to onepage checkout if applicable (1.9+ only)
6
+ fixed bug that configured no-cookies page was not shown after login attempt with disabled cookies
7
+ fixed bug that products could be accessed by guests using product tags even when catalog pages have been configured to be locked
8
+ fixed bug that invalid template resources could lead to 404 error page after successful login
9
+ fixed bug that error message from invalid login attempt could be suppressed by multiple redirects
10
+ special thanks to Psynapse (psynapse.com.au) for supporting this new release
11
+
12
  1.0.3
13
  added options to overwrite error messages when trying to access locked registration / forgot password
14
  added compatibility for CE 1.8 / 1.8.1
27
 
28
  1.0.1
29
  fixed redirect to startpage not working when customer_startup_redirect_dashboard is disabled
30
+ fixed hive navigation option not working in CE 1.7
31
+ fixed fatal error on after login redirect in CE 1.5
32
 
33
  1.0.0
34
  initial release
app/code/community/DS/PrivateSales/Model/Observer.php CHANGED
@@ -57,10 +57,11 @@ class DS_PrivateSales_Model_Observer
57
  (Mage::getSingleton('admin/session')->isLoggedIn()) ||
58
  (self::$m=='admin') ||
59
  (self::$m=='api') ||
60
- (self::$m=='customer' && self::$c=='account')
 
61
  );
62
  }
63
-
64
  /**
65
  * Check if current request points to blockable catalog page
66
  *
@@ -68,7 +69,7 @@ class DS_PrivateSales_Model_Observer
68
  */
69
  private function _isCatalogPage()
70
  {
71
- return (self::$m=='catalog' || self::$m=='catalogsearch' || self::$m=='checkout');
72
  }
73
 
74
  /**
@@ -78,9 +79,24 @@ class DS_PrivateSales_Model_Observer
78
  */
79
  private function _isCmsPage()
80
  {
81
- return (self::$m=='cms' && self::$c=='page' && self::$a=='view');
82
  }
83
-
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
84
  /**
85
  * Redirect user to login page
86
  */
@@ -93,7 +109,7 @@ class DS_PrivateSales_Model_Observer
93
  );
94
 
95
  Mage::app()->getResponse()->setRedirect(
96
- Mage::getUrl('customer/account/login')
97
  );
98
 
99
  self::$_virgin = false;
57
  (Mage::getSingleton('admin/session')->isLoggedIn()) ||
58
  (self::$m=='admin') ||
59
  (self::$m=='api') ||
60
+ (self::$m=='customer' && self::$c=='account') ||
61
+ $this->_isWhitelistedPage()
62
  );
63
  }
64
+
65
  /**
66
  * Check if current request points to blockable catalog page
67
  *
69
  */
70
  private function _isCatalogPage()
71
  {
72
+ return (!$this->_isWhitelistedPage() && (self::$m=='catalog' || self::$m=='catalogsearch' || self::$m=='checkout' || self::$m=='tag'));
73
  }
74
 
75
  /**
79
  */
80
  private function _isCmsPage()
81
  {
82
+ return (!$this->_isWhitelistedPage() && self::$m=='cms' && self::$c=='page' && self::$a=='view');
83
  }
84
+
85
+ /**
86
+ * Check if current page is whitelisted
87
+ *
88
+ * @return boolean
89
+ */
90
+ private function _isWhitelistedPage() {
91
+ return in_array(
92
+ Mage::getSingleton('cms/page')->getIdentifier(),
93
+ array(
94
+ Mage::getStoreConfig(Mage_Cms_Helper_Page::XML_PATH_NO_ROUTE_PAGE),
95
+ Mage::getStoreConfig(Mage_Cms_Helper_Page::XML_PATH_NO_COOKIES_PAGE)
96
+ )
97
+ );
98
+ }
99
+
100
  /**
101
  * Redirect user to login page
102
  */
109
  );
110
 
111
  Mage::app()->getResponse()->setRedirect(
112
+ Mage::helper('customer')->getLoginUrl()
113
  );
114
 
115
  self::$_virgin = false;
app/code/community/DS/PrivateSales/controllers/Customer/AccountController.php CHANGED
@@ -92,21 +92,22 @@ class DS_PrivateSales_Customer_AccountController extends Mage_Customer_AccountCo
92
  * Define target URL and redirect customer after logging in
93
  *
94
  * @see Mage_Customer_AccountController::_loginPostRedirect
 
95
  */
96
  protected function _loginPostRedirect()
97
  {
 
 
98
  # retrieve xml path constant (ce >= 1.6)
99
  if (defined('Mage_Customer_Helper_Data::XML_PATH_CUSTOMER_STARTUP_REDIRECT_TO_DASHBOARD'))
100
  {
101
  $this->xmlPathCustomerStartupRedirectToDashboard = Mage_Customer_Helper_Data::XML_PATH_CUSTOMER_STARTUP_REDIRECT_TO_DASHBOARD;
102
  }
103
 
104
- # use default behaviour if privatesales disabled or customer_startup_redirect_dashboard is configured
105
- if (!Mage::helper('privatesales')->isEnabled() || Mage::getStoreConfigFlag($this->xmlPathCustomerStartupRedirectToDashboard)) {
106
  return parent::_loginPostRedirect();
107
  }
108
-
109
- $session = $this->_getSession();
110
 
111
  if (!$session->getBeforeAuthUrl()) { #no baseurl comparison here, default logic after here
112
 
92
  * Define target URL and redirect customer after logging in
93
  *
94
  * @see Mage_Customer_AccountController::_loginPostRedirect
95
+ * @since 2014/11/05 use default redirect if login was not successful to avoid error message display is being suppressed by multiple redirects
96
  */
97
  protected function _loginPostRedirect()
98
  {
99
+ $session = $this->_getSession();
100
+
101
  # retrieve xml path constant (ce >= 1.6)
102
  if (defined('Mage_Customer_Helper_Data::XML_PATH_CUSTOMER_STARTUP_REDIRECT_TO_DASHBOARD'))
103
  {
104
  $this->xmlPathCustomerStartupRedirectToDashboard = Mage_Customer_Helper_Data::XML_PATH_CUSTOMER_STARTUP_REDIRECT_TO_DASHBOARD;
105
  }
106
 
107
+ # use default behaviour if privatesales disabled OR login failed OR customer_startup_redirect_dashboard is configured
108
+ if (!Mage::helper('privatesales')->isEnabled() || !$session->isLoggedIn() || Mage::getStoreConfigFlag($this->xmlPathCustomerStartupRedirectToDashboard)) {
109
  return parent::_loginPostRedirect();
110
  }
 
 
111
 
112
  if (!$session->getBeforeAuthUrl()) { #no baseurl comparison here, default logic after here
113
 
app/code/community/DS/PrivateSales/etc/config.xml CHANGED
@@ -3,7 +3,7 @@
3
 
4
  <modules>
5
  <DS_PrivateSales>
6
- <version>1.0.3</version>
7
  </DS_PrivateSales>
8
  </modules>
9
 
3
 
4
  <modules>
5
  <DS_PrivateSales>
6
+ <version>1.0.4</version>
7
  </DS_PrivateSales>
8
  </modules>
9
 
app/design/frontend/default/default/template/ds/privatesales/login_ce19.phtml ADDED
@@ -0,0 +1,92 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Customer Login Template for Community Edition 1.9
4
+ *
5
+ * @author Design:Slider GbR <magento@design-slider.de>
6
+ * @copyright (C)Design:Slider GbR <www.design-slider.de>
7
+ * @license OSL <http://opensource.org/licenses/osl-3.0.php>
8
+ * @link http://www.design-slider.de/magento-onlineshop/magento-extensions/private-sales/
9
+ * @package DS_PrivateSales
10
+ */
11
+
12
+ $helper = Mage::helper('privatesales');
13
+ /* @var $helper DS_PrivateSales_Helper_Data */
14
+
15
+ $canShowRegPanel = $helper->canShowRegistrationLoginPanel();
16
+ $customRegPanel = ($helper->getShowRegistrationLoginPanel()==2);
17
+ $customRegHeader = $helper->getRegistrationPanelHeader();
18
+ $customRegText = $helper->getRegistrationPanelText();
19
+ $canShowRegButton = $helper->canShowRegistrationPanelButton();
20
+ $customButtonText = $helper->getRegistrationPanelButtonText();
21
+ $isForgotPasswordEnabled = $helper->canShowForgotPassword();
22
+ $isRegistrationEnabled = $helper->canShowRegistration();
23
+ ?>
24
+ <div class="account-login">
25
+ <div class="page-title">
26
+ <h1><?php echo (!$isRegistrationEnabled) ? Mage::helper('customer')->__('Login') : Mage::helper('customer')->__('Login or Create an Account') ?></h1>
27
+ </div>
28
+ <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
29
+ <?php /* Extensions placeholder */ ?>
30
+ <?php echo $this->getChildHtml('customer.form.login.extra')?>
31
+ <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="login-form">
32
+ <?php echo $this->getBlockHtml('formkey'); ?>
33
+ <div<?php if ($canShowRegPanel): ?> class="col2-set"<?php endif; ?>>
34
+ <?php if ($canShowRegPanel): ?>
35
+ <div class="col-1 new-users">
36
+ <div class="content">
37
+ <h2><?php echo ($customRegPanel && strlen($customRegHeader)) ? $customRegHeader : Mage::helper('customer')->__('New Customers') ?></h2>
38
+ <p><?php echo ($customRegPanel && strlen($customRegText)) ? nl2br($customRegText) : Mage::helper('customer')->__('By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.') ?></p>
39
+ </div>
40
+ </div>
41
+ <?php endif; ?>
42
+ <div class="col-2 registered-users">
43
+ <div class="content">
44
+ <h2><?php echo Mage::helper('customer')->__('Registered Customers') ?></h2>
45
+ <p><?php echo Mage::helper('customer')->__('If you have an account with us, please log in.') ?></p>
46
+ <ul class="form-list">
47
+ <li>
48
+ <label for="email" class="required"><em>*</em><?php echo Mage::helper('customer')->__('Email Address') ?></label>
49
+ <div class="input-box">
50
+ <input type="text" name="login[username]" value="<?php echo $this->escapeHtml($this->getUsername()) ?>" id="email" class="input-text required-entry validate-email" title="<?php echo Mage::helper('customer')->__('Email Address') ?>" />
51
+ </div>
52
+ </li>
53
+ <li>
54
+ <label for="pass" class="required"><em>*</em><?php echo Mage::helper('customer')->__('Password') ?></label>
55
+ <div class="input-box">
56
+ <input type="password" name="login[password]" class="input-text required-entry validate-password" id="pass" title="<?php echo Mage::helper('customer')->__('Password') ?>" />
57
+ </div>
58
+ </li>
59
+ <?php echo $this->getChildHtml('form.additional.info'); ?>
60
+ </ul>
61
+ <p class="required"><?php echo Mage::helper('customer')->__('* Required Fields') ?></p>
62
+ </div>
63
+ </div>
64
+ </div>
65
+ <div<?php if ($canShowRegPanel): ?> class="col2-set"<?php endif; ?>>
66
+ <?php if ($canShowRegPanel): ?>
67
+ <div class="col-1 new-users">
68
+ <div class="buttons-set">
69
+ <?php if (!$customRegPanel || $canShowRegButton): ?>
70
+ <button type="button" title="<?php echo ($customRegPanel && strlen($customButtonText)) ? $customButtonText : Mage::helper('customer')->__('Create an Account') ?>" class="button" onclick="window.location='<?php echo $this->getCreateAccountUrl() ?>';"><span><span><?php echo ($customRegPanel && strlen($customButtonText)) ? $customButtonText : Mage::helper('customer')->__('Create an Account') ?></span></span></button>
71
+ <?php else: ?>
72
+ <button type="button" class="button" style="visibility:hidden;" disabled="disabled"><span><span></span></span></button>
73
+ <?php endif; ?>
74
+ </div>
75
+ </div>
76
+ <?php endif; ?>
77
+ <div class="col-2 registered-users">
78
+ <div class="buttons-set">
79
+ <?php if ($isForgotPasswordEnabled): ?>
80
+ <a href="<?php echo $this->getForgotPasswordUrl() ?>" class="f-left"><?php echo Mage::helper('customer')->__('Forgot Your Password?') ?></a>
81
+ <?php endif; ?>
82
+ <button type="submit" class="button" title="<?php echo Mage::helper('customer')->__('Login') ?>" name="send" id="send2"><span><span><?php echo Mage::helper('customer')->__('Login') ?></span></span></button>
83
+ </div>
84
+ </div>
85
+ </div>
86
+ </form>
87
+ <script type="text/javascript">
88
+ //<![CDATA[
89
+ var dataForm = new VarienForm('login-form', true);
90
+ //]]>
91
+ </script>
92
+ </div>
app/design/frontend/default/default/template/ds/privatesales/opc_ce19.phtml ADDED
@@ -0,0 +1,158 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Onepage Checkout Login Template for Community Edition 1.9
4
+ *
5
+ * @author Design:Slider GbR <magento@design-slider.de>
6
+ * @copyright (C)Design:Slider GbR <www.design-slider.de>
7
+ * @license OSL <http://opensource.org/licenses/osl-3.0.php>
8
+ * @link http://www.design-slider.de/magento-onlineshop/magento-extensions/private-sales/
9
+ * @package DS_PrivateSales
10
+ */
11
+
12
+ $helper = Mage::helper('privatesales');
13
+ /* @var $helper DS_PrivateSales_Helper_Data */
14
+
15
+ $isForgotPasswordEnabled = $helper->canShowForgotPassword();
16
+ $isRegistrationEnabled = $helper->canShowRegistration();
17
+ $showPanel = (($isRegistrationEnabled && $helper->getShowRegistrationLoginPanel()!=0) || $this->getQuote()->isAllowedGuestCheckout());
18
+ $customRegPanel = ($helper->getShowRegistrationLoginPanel()==2);
19
+ $customRegHeader = $helper->getRegistrationPanelHeader();
20
+ $customRegText = $helper->getRegistrationPanelText();
21
+ $canShowRegButton = $helper->canShowRegistrationPanelButton();
22
+ $customButtonText = $helper->getRegistrationPanelButtonText();
23
+ ?>
24
+ <?php /* Extensions placeholder */ ?>
25
+ <?php echo $this->getChildHtml('checkout.onepage.login.extra')?>
26
+ <div<?php if ($showPanel): ?> class="col2-set"<?php endif; ?>>
27
+ <?php echo $this->getChildHtml('login_before')?>
28
+
29
+ <?php if ($showPanel): ?>
30
+ <div class="col-1">
31
+
32
+ <?php if ($isRegistrationEnabled): ?>
33
+ <h3><?php if( $this->getQuote()->isAllowedGuestCheckout() ): ?><?php echo Mage::helper('checkout')->__('Checkout as a Guest or Register') ?><?php else: ?><?php echo ($customRegPanel && strlen($customRegHeader)) ? $customRegHeader : Mage::helper('checkout')->__('Register to Create an Account') ?><?php endif; ?></h3>
34
+ <?php elseif ($this->getQuote()->isAllowedGuestCheckout()): ?>
35
+ <h3><?php echo Mage::helper('checkout')->__('Checkout as Guest') ?></h3>
36
+ <?php endif; ?>
37
+
38
+ <?php if ($isRegistrationEnabled): ?>
39
+ <?php if( $this->getQuote()->isAllowedGuestCheckout() ): ?>
40
+ <p><?php echo Mage::helper('checkout')->__('Register with us for future convenience:') ?></p>
41
+ <?php else: ?>
42
+ <?php if ($customRegPanel && strlen($customRegText)): ?>
43
+ <?php echo nl2br($customRegText); ?>
44
+ <?php else: ?>
45
+ <p><strong><?php echo Mage::helper('checkout')->__('Register and save time!') ?></strong><br />
46
+ <?php echo Mage::helper('checkout')->__('Register with us for future convenience:') ?></p>
47
+ <ul>
48
+ <li><?php echo Mage::helper('checkout')->__('Fast and easy check out') ?></li>
49
+ <li><?php echo Mage::helper('checkout')->__('Easy access to your order history and status') ?></li>
50
+ </ul>
51
+ <?php endif; ?>
52
+ <?php endif; ?>
53
+ <?php endif; ?>
54
+
55
+ <?php if( $this->getQuote()->isAllowedGuestCheckout() ): ?>
56
+ <ul class="form-list">
57
+ <?php if( $this->getQuote()->isAllowedGuestCheckout() ): ?>
58
+ <li class="control">
59
+ <input type="radio" name="checkout_method" id="login:guest" value="guest"<?php if($this->getQuote()->getCheckoutMethod()==Mage_Checkout_Model_Type_Onepage::METHOD_GUEST): ?> checked="checked"<?php endif; ?> class="radio" /><label for="login:guest"><?php echo Mage::helper('checkout')->__('Checkout as Guest') ?></label>
60
+ </li>
61
+ <?php endif; ?>
62
+
63
+ <?php if ($isRegistrationEnabled): ?>
64
+ <li class="control">
65
+ <input type="radio" name="checkout_method" id="login:register" value="register"<?php if($this->getQuote()->getCheckoutMethod()==Mage_Checkout_Model_Type_Onepage::METHOD_REGISTER || !$this->getQuote()->isAllowedGuestCheckout()): ?> checked="checked"<?php endif ?> class="radio" /><label for="login:register"><?php echo Mage::helper('checkout')->__('Register') ?></label>
66
+ </li>
67
+ <?php endif; ?>
68
+
69
+ </ul>
70
+
71
+ <?php if ($isRegistrationEnabled): ?>
72
+ <?php if ($customRegPanel && strlen($customRegText)): ?>
73
+ <?php echo nl2br($customRegText); ?>
74
+ <?php else: ?>
75
+ <h4><?php echo Mage::helper('checkout')->__('Register and save time!') ?></h4>
76
+ <p><?php echo Mage::helper('checkout')->__('Register with us for future convenience:') ?></p>
77
+ <ul class="ul">
78
+ <li><?php echo Mage::helper('checkout')->__('Fast and easy check out') ?></li>
79
+ <li><?php echo Mage::helper('checkout')->__('Easy access to your order history and status') ?></li>
80
+ </ul>
81
+ <?php endif; ?>
82
+ <?php endif; ?>
83
+
84
+ <?php elseif ($isRegistrationEnabled): ?>
85
+ <input type="hidden" name="checkout_method" id="login:register" value="register" checked="checked" />
86
+ <?php endif; ?>
87
+ </div>
88
+ <?php endif; ?>
89
+
90
+ <div class="col-2">
91
+ <h3><?php echo Mage::helper('checkout')->__('Login') ?></h3>
92
+ <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
93
+ <form id="login-form" action="<?php echo $this->getPostAction() ?>" method="post">
94
+ <fieldset>
95
+ <?php echo $this->getBlockHtml('formkey'); ?>
96
+ <h4><?php echo Mage::helper('checkout')->__('Already registered?') ?></h4>
97
+ <p><?php echo Mage::helper('checkout')->__('Please log in below:') ?></p>
98
+ <ul class="form-list">
99
+ <li>
100
+ <label for="login-email" class="required"><em>*</em><?php echo Mage::helper('checkout')->__('Email Address') ?></label>
101
+ <div class="input-box">
102
+ <input type="text" class="input-text required-entry validate-email" id="login-email" name="login[username]" value="<?php echo $this->escapeHtml($this->getUsername()) ?>" />
103
+ </div>
104
+ </li>
105
+ <li>
106
+ <label for="login-password" class="required"><em>*</em><?php echo Mage::helper('checkout')->__('Password') ?></label>
107
+ <div class="input-box">
108
+ <input type="password" class="input-text required-entry" id="login-password" name="login[password]" />
109
+ </div>
110
+ </li>
111
+ <?php echo $this->getChildHtml('form.additional.info'); ?>
112
+ </ul>
113
+ </fieldset>
114
+ </form>
115
+ </div>
116
+ </div>
117
+ <div<?php if ($showPanel): ?> class="col2-set"<?php endif; ?>>
118
+ <?php if ($showPanel): ?>
119
+ <div class="col-1">
120
+ <?php if ($this->getQuote()->isAllowedGuestCheckout() || $canShowRegButton): ?>
121
+ <div class="buttons-set">
122
+ <p class="required">&nbsp;</p>
123
+ <button type="button" class="button" onclick="checkout.setMethod();"><span><span><?php echo ($this->getQuote()->isAllowedGuestCheckout() ? Mage::helper('checkout')->__('Continue') : (($customRegPanel && strlen($customButtonText)) ? $customButtonText : Mage::helper('checkout')->__('Register'))) ?></span></span></button>
124
+ </div>
125
+ <?php endif; ?>
126
+ </div>
127
+ <?php endif; ?>
128
+ <div class="col-2">
129
+ <div class="buttons-set">
130
+ <p class="required"><?php echo Mage::helper('checkout')->__('* Required Fields') ?></p>
131
+
132
+ <?php if ($isForgotPasswordEnabled): ?>
133
+ <a href="<?php echo $this->getUrl('customer/account/forgotpassword') ?>" class="f-left"><?php echo Mage::helper('checkout')->__('Forgot your password?') ?></a>
134
+ <?php endif; ?>
135
+
136
+ <button type="submit" class="button" onclick="onepageLogin(this)"><span><span><?php echo Mage::helper('checkout')->__('Login') ?></span></span></button>
137
+ </div>
138
+ </div>
139
+ </div>
140
+ <script type="text/javascript">
141
+ //<![CDATA[
142
+ var loginForm = new VarienForm('login-form', true);
143
+ $('login-email').observe('keypress', bindLoginPost);
144
+ $('login-password').observe('keypress', bindLoginPost);
145
+ function bindLoginPost(evt){
146
+ if (evt.keyCode == Event.KEY_RETURN) {
147
+ loginForm.submit();
148
+ }
149
+ }
150
+ function onepageLogin(button)
151
+ {
152
+ if(loginForm.validator && loginForm.validator.validate()){
153
+ button.disabled = true;
154
+ loginForm.submit();
155
+ }
156
+ }
157
+ //]]>
158
+ </script>
app/design/frontend/rwd/default/template/ds/privatesales/login_ce19.phtml ADDED
@@ -0,0 +1,101 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Customer Login Template for Community Edition 1.9 RWD THEME
4
+ *
5
+ * @author Design:Slider GbR <magento@design-slider.de>
6
+ * @copyright (C)Design:Slider GbR <www.design-slider.de>
7
+ * @license OSL <http://opensource.org/licenses/osl-3.0.php>
8
+ * @link http://www.design-slider.de/magento-onlineshop/magento-extensions/private-sales/
9
+ * @package DS_PrivateSales
10
+ */
11
+
12
+ $helper = Mage::helper('privatesales');
13
+ /* @var $helper DS_PrivateSales_Helper_Data */
14
+
15
+ $canShowRegPanel = $helper->canShowRegistrationLoginPanel();
16
+ $customRegPanel = ($helper->getShowRegistrationLoginPanel()==2);
17
+ $customRegHeader = $helper->getRegistrationPanelHeader();
18
+ $customRegText = $helper->getRegistrationPanelText();
19
+ $canShowRegButton = $helper->canShowRegistrationPanelButton();
20
+ $customButtonText = $helper->getRegistrationPanelButtonText();
21
+ $isForgotPasswordEnabled = $helper->canShowForgotPassword();
22
+ $isRegistrationEnabled = $helper->canShowRegistration();
23
+ ?>
24
+ <div class="account-login<?php if (!$this->helper('customer')->isRegistrationAllowed()) echo ' login-only' ?>">
25
+ <div class="page-title">
26
+ <h1><?php if ($this->helper('customer')->isRegistrationAllowed()): ?>
27
+ <?php echo $this->__('Login or Create an Account') ?>
28
+ <?php else: ?>
29
+ <?php echo $this->__('Login'); ?>
30
+ <?php endif; ?></h1>
31
+ </div>
32
+ <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
33
+ <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="login-form" class="scaffold-form">
34
+ <?php echo $this->getBlockHtml('formkey'); ?>
35
+ <div<?php if ($canShowRegPanel): ?> class="col2-set"<?php endif; ?>>
36
+ <?php if ($canShowRegPanel && $this->helper('customer')->isRegistrationAllowed()): ?>
37
+ <div class="col-1 new-users">
38
+ <div class="content">
39
+ <h2><?php echo ($customRegPanel && strlen($customRegHeader)) ? $customRegHeader : $this->__('New Here?') ?></h2>
40
+ <?php if ($customRegPanel && strlen($customRegText)): ?>
41
+ <?php echo nl2br($customRegText); ?>
42
+ <?php else: ?>
43
+ <p class="form-instructions"><?php echo $this->__('Registration is free and easy!') ?></p>
44
+ <ul class="benefits">
45
+ <li><?php echo $this->__('Faster checkout') ?></li>
46
+ <li><?php echo $this->__('Save multiple shipping addresses') ?></li>
47
+ <li><?php echo $this->__('View and track orders and more') ?></li>
48
+ </ul>
49
+ <?php endif; ?>
50
+ </div>
51
+ <div class="buttons-set">
52
+ <?php if (!$customRegPanel || $canShowRegButton): ?>
53
+ <a title="<?php echo ($customRegPanel && strlen($customButtonText)) ? $customButtonText : $this->__('Create an Account') ?>" class="button" href="<?php echo Mage::helper('persistent')->getCreateAccountUrl($this->getCreateAccountUrl()) ?>"><span><span><?php echo ($customRegPanel && strlen($customButtonText)) ? $customButtonText : $this->__('Create an Account') ?></span></span></a>
54
+ <?php endif; ?>
55
+ </div>
56
+ </div>
57
+ <?php endif; ?>
58
+ <?php // This column should be col-1 if the registration column is not displayed ?>
59
+ <div class="<?php if ($canShowRegPanel && $this->helper('customer')->isRegistrationAllowed()): ?>col-2<?php else: ?>col-1<?php endif; ?> registered-users">
60
+ <div class="content fieldset">
61
+ <h2><?php echo $this->__('Already registered?') ?></h2>
62
+ <p class="form-instructions"><?php echo $this->__('If you have an account with us, please log in.') ?></p>
63
+ <p class="required"><?php echo $this->__('* Required Fields') ?></p>
64
+ <ul class="form-list">
65
+ <li>
66
+ <label for="email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
67
+ <div class="input-box">
68
+ <input type="email" autocapitalize="off" autocorrect="off" spellcheck="false" name="login[username]" value="<?php echo $this->escapeHtml($this->getUsername()) ?>" id="email" class="input-text required-entry validate-email" title="<?php echo $this->__('Email Address') ?>" />
69
+ </div>
70
+ </li>
71
+ <li>
72
+ <label for="pass" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
73
+ <div class="input-box">
74
+ <input type="password" name="login[password]" class="input-text required-entry validate-password" id="pass" title="<?php echo $this->__('Password') ?>" />
75
+ </div>
76
+ </li>
77
+ <?php echo $this->getChildHtml('form.additional.info'); ?>
78
+ <?php if ($isForgotPasswordEnabled): ?>
79
+ <li>
80
+ <a href="<?php echo $this->getForgotPasswordUrl() ?>" class="f-left"><?php echo $this->__('Forgot Your Password?') ?></a>
81
+ </li>
82
+ <?php endif; ?>
83
+ <?php echo $this->getChildHtml('persistent.remember.me'); ?>
84
+ </ul>
85
+ <?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
86
+ </div>
87
+ <div class="buttons-set">
88
+ <button type="submit" class="button" title="<?php echo $this->__('Login') ?>" name="send" id="send2"><span><span><?php echo $this->__('Login') ?></span></span></button>
89
+ </div>
90
+ </div>
91
+ </div>
92
+ <?php if (Mage::helper('checkout')->isContextCheckout()): ?>
93
+ <input name="context" type="hidden" value="checkout" />
94
+ <?php endif; ?>
95
+ </form>
96
+ <script type="text/javascript">
97
+ //<![CDATA[
98
+ var dataForm = new VarienForm('login-form', true);
99
+ //]]>
100
+ </script>
101
+ </div>
app/design/frontend/rwd/default/template/ds/privatesales/opc_ce19.phtml ADDED
@@ -0,0 +1,158 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Onepage Checkout Login Template for Community Edition 1.7
4
+ *
5
+ * @author Design:Slider GbR <magento@design-slider.de>
6
+ * @copyright (C)Design:Slider GbR <www.design-slider.de>
7
+ * @license OSL <http://opensource.org/licenses/osl-3.0.php>
8
+ * @link http://www.design-slider.de/magento-onlineshop/magento-extensions/private-sales/
9
+ * @package DS_PrivateSales
10
+ */
11
+
12
+ $helper = Mage::helper('privatesales');
13
+ /* @var $helper DS_PrivateSales_Helper_Data */
14
+
15
+ $isForgotPasswordEnabled = $helper->canShowForgotPassword();
16
+ $isRegistrationEnabled = ($helper->canShowRegistration() && $this->helper('customer')->isRegistrationAllowed());
17
+ $showPanel = ($isRegistrationEnabled || $this->getQuote()->isAllowedGuestCheckout());
18
+ $customRegPanel = ($helper->getShowRegistrationLoginPanel()==2);
19
+ $customRegHeader = $helper->getRegistrationPanelHeader();
20
+ $customRegText = $helper->getRegistrationPanelText();
21
+ $canShowRegButton = $helper->canShowRegistrationPanelButton();
22
+ $customButtonText = $helper->getRegistrationPanelButtonText();
23
+ ?>
24
+ <?php echo $this->getChildHtml('login_before') ?>
25
+ <div class="<?php echo $showPanel ? 'col2-set' : 'login-only'?>">
26
+
27
+ <?php if ($showPanel): ?>
28
+ <div class="col-1">
29
+ <h3>
30
+ <?php if( $this->getQuote()->isAllowedGuestCheckout() && $isRegistrationEnabled ): ?>
31
+ <?php echo $this->__('Checkout as a Guest or Register') ?>
32
+ <?php elseif ( $this->getQuote()->isAllowedGuestCheckout() && !$isRegistrationEnabled ): ?>
33
+ <?php echo $this->__('Checkout as a Guest') ?>
34
+ <?php else: ?>
35
+ <?php echo ($customRegPanel && strlen($customRegHeader)) ? $customRegHeader : $this->__('Register to Create an Account') ?>
36
+ <?php endif; ?>
37
+ </h3>
38
+ <?php if( !$this->getQuote()->isAllowedGuestCheckout() && $isRegistrationEnabled ): ?>
39
+ <?php if ($customRegPanel && strlen($customRegText)): ?>
40
+ <?php echo nl2br($customRegText); ?>
41
+ <?php else: ?>
42
+ <p class="description"><?php echo $this->__('Register and save time!') ?></strong><br />
43
+ <?php echo $this->__('Register with us for future convenience:') ?></p>
44
+ <ul>
45
+ <li><?php echo $this->__('Fast and easy check out') ?></li>
46
+ <li><?php echo $this->__('Easy access to your order history and status') ?></li>
47
+ </ul>
48
+ <?php endif; ?>
49
+ <?php elseif( $this->getQuote()->isAllowedGuestCheckout() && $isRegistrationEnabled ): ?>
50
+ <p class="description"><?php echo $this->__('Register with us for future convenience:') ?></p>
51
+ <?php endif ?>
52
+ <?php if( $this->getQuote()->isAllowedGuestCheckout() ): ?>
53
+ <ul class="form-list">
54
+ <?php if( $this->getQuote()->isAllowedGuestCheckout() ): ?>
55
+ <li class="control">
56
+ <input type="radio" name="checkout_method" id="login:guest" value="guest"<?php if($this->getQuote()->getCheckoutMethod()!=Mage_Checkout_Model_Type_Onepage::METHOD_REGISTER): ?> checked="checked"<?php endif; ?> class="radio" /><label for="login:guest"><?php echo $this->__('Checkout as Guest') ?></label>
57
+ </li>
58
+ <?php endif; ?>
59
+ <?php if( $isRegistrationEnabled ): ?>
60
+ <li class="control">
61
+ <input type="radio" name="checkout_method" id="login:register" value="register"<?php if($this->getQuote()->getCheckoutMethod()==Mage_Checkout_Model_Type_Onepage::METHOD_REGISTER || !$this->getQuote()->isAllowedGuestCheckout()): ?> checked="checked"<?php endif ?> class="radio" />
62
+ <label for="login:register"><?php echo $this->__('Register and Checkout') ?></label>
63
+ </li>
64
+ <?php endif; ?>
65
+ </ul>
66
+ <?php elseif ($isRegistrationEnabled): ?>
67
+ <input type="hidden" name="checkout_method" id="login:register" value="register" checked="checked" />
68
+ <?php endif; ?>
69
+ <div class="buttons-set">
70
+ <p class="required">&nbsp;</p>
71
+ <?php if ($this->getQuote()->isAllowedGuestCheckout()): ?>
72
+ <button id="onepage-guest-register-button" type="button" class="button" onclick="checkout.setMethod();"><span><span><?php echo $this->__('Continue') ?></span></span></button>
73
+ <?php elseif ($isRegistrationEnabled && $canShowRegButton && $this->helper('checkout')->isCustomerMustBeLogged()): ?>
74
+ <button id="onepage-guest-register-button" type="button" class="button" onclick="window.location='<?php echo $this->helper('checkout/url')->getRegistrationUrl();?>'"><span><span><?php echo ($customRegPanel && strlen($customButtonText)) ? $customButtonText : $this->__('Register') ?></span></span></button>
75
+ <?php elseif ($isRegistrationEnabled && $canShowRegButton): ?>
76
+ <form action="<?php echo $this->getUrl('persistent/index/saveMethod'); ?>">
77
+ <button id="onepage-guest-register-button" type="submit" class="button"><span><span><?php echo ($customRegPanel && strlen($customButtonText)) ? $customButtonText : $this->__('Register') ?></span></span></button>
78
+ </form>
79
+ <?php endif; ?>
80
+ </div>
81
+ </div>
82
+ <?php endif; ?>
83
+
84
+ <div class="col-2">
85
+ <h3><?php echo $this->__('Returning Customers') ?></h3>
86
+ <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
87
+ <form id="login-form" action="<?php echo $this->getPostAction() ?>" method="post">
88
+ <div class="fieldset">
89
+ <?php echo $this->getBlockHtml('formkey'); ?>
90
+ <p class="description"><?php echo $this->__('Sign in to speed up your checkout process') ?></p>
91
+ <p class="required"><?php echo $this->__('* Required Fields') ?></p>
92
+ <ul class="form-list">
93
+ <li>
94
+ <label for="login-email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
95
+ <div class="input-box">
96
+ <input type="email" autocapitalize="off" autocorrect="off" spellcheck="false" class="input-text required-entry validate-email" id="login-email" name="login[username]" value="<?php echo $this->escapeHtml($this->getUsername()) ?>" />
97
+ </div>
98
+ </li>
99
+ <li>
100
+ <label for="login-password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
101
+ <div class="input-box">
102
+ <input type="password" class="input-text validate-password required-entry" id="login-password" name="login[password]" />
103
+ </div>
104
+ </li>
105
+
106
+ <?php if ($isForgotPasswordEnabled): ?>
107
+ <li>
108
+ <a href="<?php echo $this->getUrl('customer/account/forgotpassword') ?>" class="f-left"><?php echo $this->__('Forgot your password?') ?></a>
109
+ </li>
110
+ <?php endif; ?>
111
+
112
+ <?php echo $this->getChildHtml('form.additional.info'); ?>
113
+ <?php echo $this->getChildHtml('persistent.remember.me'); ?>
114
+ </ul>
115
+ <?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
116
+ <input name="context" type="hidden" value="checkout" />
117
+ </div>
118
+ </form>
119
+ <div class="buttons-set">
120
+ <button type="submit" class="button" onclick="onepageLogin(this)"><span><span><?php echo $this->__('Login') ?></span></span></button>
121
+ </div>
122
+ </div>
123
+ </div>
124
+
125
+ <script type="text/javascript">
126
+ //<![CDATA[
127
+ var loginForm = new VarienForm('login-form', true);
128
+ $('login-email').observe('keypress', bindLoginPost);
129
+ $('login-password').observe('keypress', bindLoginPost);
130
+ function bindLoginPost(evt){
131
+ if (evt.keyCode == Event.KEY_RETURN) {
132
+ loginForm.submit();
133
+ }
134
+ }
135
+ function onepageLogin(button)
136
+ {
137
+ if(loginForm.validator && loginForm.validator.validate()){
138
+ button.disabled = true;
139
+ loginForm.submit();
140
+ }
141
+ }
142
+ //]]>
143
+ </script>
144
+ <?php
145
+ $registerParam = $this->getRequest()->getParam('register');
146
+ if ($registerParam || $registerParam === ''):
147
+ ?>
148
+ <script type="text/javascript">
149
+ //<![CDATA[
150
+ document.observe("dom:loaded", function() {
151
+ if($('login:register')) {
152
+ $('login:register').checked = true;
153
+ checkout.setMethod();
154
+ }
155
+ })
156
+ //]]>
157
+ </script>
158
+ <?php endif; ?>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>DS_PrivateSales</name>
4
- <version>1.0.3</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL</license>
7
  <channel>community</channel>
@@ -25,8 +25,18 @@
25
  &lt;p&gt;All restrictions move away once the user is logged in.&lt;/p&gt;&#xD;
26
  &lt;p&gt;Included translations: de_DE&lt;/p&gt;&#xD;
27
  &lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; To avoid 404 errors in admin please re-login after first installation.&lt;/p&gt;&#xD;
28
- &lt;p&gt;For more information please visit our &lt;a href="http://www.design-slider.de/magento-onlineshop/magento-extensions/private-sales/"&gt;official extension page&lt;/a&gt; (currently in german only).&lt;/p&gt;</description>
29
- <notes>1.0.3&#xD;
 
 
 
 
 
 
 
 
 
 
30
  added options to overwrite error messages when trying to access locked registration / forgot password&#xD;
31
  added compatibility for CE 1.8 / 1.8.1&#xD;
32
  &#xD;
@@ -50,9 +60,9 @@
50
  1.0.0&#xD;
51
  initial release</notes>
52
  <authors><author><name>Design:Slider GbR</name><user>DesignSliderGbR</user><email>magento@design-slider.de</email></author></authors>
53
- <date>2014-02-23</date>
54
- <time>15:07:02</time>
55
- <contents><target name="magelocale"><dir><dir name="de_DE"><file name="DS_PrivateSales.csv" hash="fcbd4787ff1421feed0f301b93285e88"/></dir></dir></target><target name="magecommunity"><dir name="DS"><dir name="PrivateSales"><dir name="Block"><dir name="Checkout"><dir name="Onepage"><file name="Login.php" hash="c77f6b5327fff3f7eabd1c3b25798b6e"/></dir></dir><dir name="Customer"><dir name="Form"><file name="Login.php" hash="95d7e63c31e6aa19e40741e783ef37e1"/></dir></dir><file name="Navigation.php" hash="585f907774ac18e7fbefa60f9fb2d746"/><file name="Topmenu.php" hash="41c13dedf4527c26b4f72eeef4a503cf"/></dir><file name="CHANGE.LOG" hash="5c386d8e5aafc95c1b4c29a8bd55a023"/><dir name="Helper"><file name="Data.php" hash="cbac28c3f13df528c2d72dafee30a331"/></dir><dir name="Model"><file name="Observer.php" hash="f127b2735a3cc2b681c09e9726944c34"/></dir><dir name="controllers"><dir name="Customer"><file name="AccountController.php" hash="2743d62fccd1403eae4bffa229272db8"/></dir></dir><dir name="etc"><file name="config.xml" hash="b20c3e34e2bbbfadf2f96dfb32a2a4cc"/><file name="system.xml" hash="d2fb336529cf2e3245e967b8fc273981"/></dir><dir name="sql"><dir name="ds_privatesales_setup"><file name="upgrade-1.0.1-1.0.2.php" hash="533b2fc7238456b967efe5a4cb1d57fc"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="DS_PrivateSales.xml" hash="1b870d4aec398bf9a9d6424cc58656e9"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="default"><dir name="template"><dir name="ds"><dir name="privatesales"><file name="login_ce14_15_16.phtml" hash="f89afa1794bf7aef7fc41bed2bdf3c2b"/><file name="login_ce17_18.phtml" hash="2cd3290ac19117dcae7ad0454c6f7ddd"/><file name="opc_ce14_15_16.phtml" hash="a3050dd164da2b002b2aa6fdf4a5174a"/><file name="opc_ce17_18.phtml" hash="abe6960b443776a8119d3e5a4eb849c2"/></dir></dir></dir></dir></dir></dir></target></contents>
56
  <compatible/>
57
  <dependencies><required><php><min>5.0.0</min><max>6.0.0</max></php><package><name>Mage_Customer</name><channel>core</channel><min>1.4.0.0.13</min><max></max></package><package><name>Mage_Checkout</name><channel>core</channel><min>0.9.5</min><max></max></package></required></dependencies>
58
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>DS_PrivateSales</name>
4
+ <version>1.0.4</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL</license>
7
  <channel>community</channel>
25
  &lt;p&gt;All restrictions move away once the user is logged in.&lt;/p&gt;&#xD;
26
  &lt;p&gt;Included translations: de_DE&lt;/p&gt;&#xD;
27
  &lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; To avoid 404 errors in admin please re-login after first installation.&lt;/p&gt;&#xD;
28
+ &lt;p&gt;For more information please visit our &lt;a href="http://www.design-slider.de/magento-onlineshop/magento-extensions/private-sales/"&gt;official extension page&lt;/a&gt; (currently in german only).&lt;/p&gt;&#xD;
29
+ &lt;p&gt;Special Thanks to Psynapse (psynapse.com.au) for supporting this extension.&lt;/p&gt;</description>
30
+ <notes>1.0.4&#xD;
31
+ added compatibility for CE 1.9 (including RWD theme)&#xD;
32
+ custom reg panel content now also applies to onepage checkout if applicable (1.9+ only)&#xD;
33
+ fixed bug that configured no-cookies page was not shown after login attempt with disabled cookies&#xD;
34
+ fixed bug that products could be accessed by guests using product tags even when catalog pages have been configured to be locked&#xD;
35
+ fixed bug that invalid template resources could lead to 404 error page after successful login&#xD;
36
+ fixed bug that error message from invalid login attempt could be suppressed by multiple redirects&#xD;
37
+ special thanks to Psynapse (psynapse.com.au) for supporting this new release&#xD;
38
+ &#xD;
39
+ 1.0.3&#xD;
40
  added options to overwrite error messages when trying to access locked registration / forgot password&#xD;
41
  added compatibility for CE 1.8 / 1.8.1&#xD;
42
  &#xD;
60
  1.0.0&#xD;
61
  initial release</notes>
62
  <authors><author><name>Design:Slider GbR</name><user>DesignSliderGbR</user><email>magento@design-slider.de</email></author></authors>
63
+ <date>2014-11-05</date>
64
+ <time>18:17:21</time>
65
+ <contents><target name="magelocale"><dir><dir name="de_DE"><file name="DS_PrivateSales.csv" hash="fcbd4787ff1421feed0f301b93285e88"/></dir></dir></target><target name="magecommunity"><dir name="DS"><dir name="PrivateSales"><dir name="Block"><dir name="Checkout"><dir name="Onepage"><file name="Login.php" hash="f861f5a125029de6dbcfd48326a069a1"/></dir></dir><dir name="Customer"><dir name="Form"><file name="Login.php" hash="c54adb0ff971d5b08abaf94cdf726828"/></dir></dir><file name="Navigation.php" hash="585f907774ac18e7fbefa60f9fb2d746"/><file name="Topmenu.php" hash="41c13dedf4527c26b4f72eeef4a503cf"/></dir><file name="CHANGE.LOG" hash="250392d072b58d0d66a06abf5f5cb271"/><dir name="Helper"><file name="Data.php" hash="cbac28c3f13df528c2d72dafee30a331"/></dir><dir name="Model"><file name="Observer.php" hash="dad2e2004a700dc279aeb71ac6525577"/></dir><dir name="controllers"><dir name="Customer"><file name="AccountController.php" hash="f2ad826e1d64b490f19bcc980cbfcbf1"/></dir></dir><dir name="etc"><file name="config.xml" hash="fa7129774f94095888e1a4669df66f7f"/><file name="system.xml" hash="d2fb336529cf2e3245e967b8fc273981"/></dir><dir name="sql"><dir name="ds_privatesales_setup"><file name="upgrade-1.0.1-1.0.2.php" hash="533b2fc7238456b967efe5a4cb1d57fc"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="DS_PrivateSales.xml" hash="1b870d4aec398bf9a9d6424cc58656e9"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="default"><dir name="template"><dir name="ds"><dir name="privatesales"><file name="login_ce14_15_16.phtml" hash="f89afa1794bf7aef7fc41bed2bdf3c2b"/><file name="login_ce17_18.phtml" hash="2cd3290ac19117dcae7ad0454c6f7ddd"/><file name="login_ce19.phtml" hash="7cc25c34f1c2d1034aa11843c36faf01"/><file name="opc_ce14_15_16.phtml" hash="a3050dd164da2b002b2aa6fdf4a5174a"/><file name="opc_ce17_18.phtml" hash="abe6960b443776a8119d3e5a4eb849c2"/><file name="opc_ce19.phtml" hash="e2c3d193a621da20f85e2f37c1b1d221"/></dir></dir></dir></dir></dir><dir name="rwd"><dir name="default"><dir name="template"><dir name="ds"><dir name="privatesales"><file name="login_ce19.phtml" hash="3abdfb06d51679f9add50c2eafdce329"/><file name="opc_ce19.phtml" hash="9127b99d123d1d7de77f1f785604dab2"/></dir></dir></dir></dir></dir></dir></target></contents>
66
  <compatible/>
67
  <dependencies><required><php><min>5.0.0</min><max>6.0.0</max></php><package><name>Mage_Customer</name><channel>core</channel><min>1.4.0.0.13</min><max></max></package><package><name>Mage_Checkout</name><channel>core</channel><min>0.9.5</min><max></max></package></required></dependencies>
68
  </package>