Version Notes
Added custom payment terms and bug fixes
Download this release
Release Info
| Developer | developer |
| Extension | Wholesale_Customer_Activation |
| Version | 8.0.0 |
| Comparing to | |
| See all releases | |
Code changes from version 7.0.0 to 8.0.0
- app/code/community/Exinent/CustomerActivation/Block/Adminhtml/Widget/Grid/Column/Renderer/Boolean.php +1 -8
- app/code/community/Exinent/CustomerActivation/Block/Page/Html/Topmenu.php +1 -1
- app/code/community/Exinent/CustomerActivation/Model/Observer.php +8 -8
- app/code/community/Exinent/CustomerActivation/Model/Resource/Attribute/Source/Customerpayment.php +36 -29
- app/code/community/Exinent/CustomerActivation/controllers/AccountController.php +11 -7
- app/code/community/Exinent/CustomerActivation/controllers/CategoryController.php +3 -3
- app/code/community/Exinent/CustomerActivation/controllers/IndexController.php +1 -1
- app/code/community/Exinent/CustomerActivation/controllers/PageController.php +3 -3
- app/code/community/Exinent/CustomerActivation/controllers/ProductController.php +3 -3
- app/code/community/Exinent/CustomerActivation/controllers/productOrderController.php +3 -3
- app/code/community/Exinent/CustomerActivation/etc/config.xml +5 -22
- app/code/community/Exinent/CustomerActivation/sql/customeractivation_setup/mysql4-upgrade-0.2.8-0.2.9.php +0 -1
- app/code/community/Exinent/CustomerActivation/sql/customeractivation_setup/mysql4-upgrade-0.3.3-0.3.4.php +0 -1
- app/code/community/Exinent/CustomerActivation/sql/customeractivation_setup/mysql4-upgrade-0.3.5-0.3.6.php +3 -0
- app/design/frontend/base/default/template/customerActivation/checkout/onepage/payment/methods.phtml +68 -68
- app/design/frontend/base/default/template/customerActivation/checkout/onepage/shipping_method/available.phtml +2 -2
- app/design/frontend/base/default/template/customerActivation/quickorderproduct.phtml +1 -1
- app/design/frontend/base/default/template/customerActivation/wholesaleRegister.phtml +13 -12
- package.xml +10 -10
app/code/community/Exinent/CustomerActivation/Block/Adminhtml/Widget/Grid/Column/Renderer/Boolean.php
CHANGED
|
@@ -9,16 +9,9 @@ class Exinent_CustomerActivation_Block_Adminhtml_Widget_Grid_Column_Renderer_Boo
|
|
| 9 |
switch ($data) {
|
| 10 |
case 1:
|
| 11 |
return $this->__('Approved');
|
| 12 |
-
case 2:
|
| 13 |
-
return $this->__('Pending');
|
| 14 |
-
case 0:
|
| 15 |
-
return $this->__('Rejected');
|
| 16 |
case 3:
|
| 17 |
return $this->__('New');
|
| 18 |
-
|
| 19 |
-
return $this->__('In Active');
|
| 20 |
-
case 5:
|
| 21 |
-
return $this->__('On Hold');
|
| 22 |
}
|
| 23 |
}
|
| 24 |
|
| 9 |
switch ($data) {
|
| 10 |
case 1:
|
| 11 |
return $this->__('Approved');
|
|
|
|
|
|
|
|
|
|
|
|
|
| 12 |
case 3:
|
| 13 |
return $this->__('New');
|
| 14 |
+
|
|
|
|
|
|
|
|
|
|
| 15 |
}
|
| 16 |
}
|
| 17 |
|
app/code/community/Exinent/CustomerActivation/Block/Page/Html/Topmenu.php
CHANGED
|
@@ -5,7 +5,7 @@ class Exinent_CustomerActivation_Block_Page_Html_Topmenu extends Mage_Page_Block
|
|
| 5 |
protected $additionalLinks = array();
|
| 6 |
|
| 7 |
public function addLink($label, $type, $value) {
|
| 8 |
-
$ModuleStatus = Mage::getStoreConfig('customer/customeractivation/disable_ext');
|
| 9 |
|
| 10 |
if ('path' == $type && $ModuleStatus == 1) {
|
| 11 |
$_coreUrlHelper = $this->helper('core/url');
|
| 5 |
protected $additionalLinks = array();
|
| 6 |
|
| 7 |
public function addLink($label, $type, $value) {
|
| 8 |
+
$ModuleStatus = Mage::getStoreConfig('customer/customeractivation/disable_ext', Mage::app()->getStore());
|
| 9 |
|
| 10 |
if ('path' == $type && $ModuleStatus == 1) {
|
| 11 |
$_coreUrlHelper = $this->helper('core/url');
|
app/code/community/Exinent/CustomerActivation/Model/Observer.php
CHANGED
|
@@ -37,7 +37,7 @@ class Exinent_CustomerActivation_Model_Observer {
|
|
| 37 |
|
| 38 |
public function customerLogin($observer) {
|
| 39 |
|
| 40 |
-
if (Mage::getStoreConfig(self::XML_PATH_MODULE_DISABLED) == 0) {
|
| 41 |
return;
|
| 42 |
}
|
| 43 |
|
|
@@ -92,8 +92,8 @@ class Exinent_CustomerActivation_Model_Observer {
|
|
| 92 |
// Do not set the default status on the admin customer edit save action
|
| 93 |
$groupId = $customer->getGroupId();
|
| 94 |
$defaultStatus = Mage::helper('customeractivation')->getDefaultActivationStatus($groupId, $storeId);
|
| 95 |
-
$startdate = Mage::getStoreConfig(self::XML_PATH_ACTIVATION_START_DATE);
|
| 96 |
-
$enddate = Mage::getStoreConfig(self::XML_PATH_ACTIVATION_END_DATE);
|
| 97 |
|
| 98 |
$paymentDate = date('Y-m-d');
|
| 99 |
$paymentDate = date('Y-m-d', strtotime($paymentDate));
|
|
@@ -115,7 +115,7 @@ class Exinent_CustomerActivation_Model_Observer {
|
|
| 115 |
$defaultStatus = Mage::helper('customeractivation')->getDefaultActivationStatus($groupId, $storeId);
|
| 116 |
if ($customer->getGroupId() == 1) {
|
| 117 |
$customer->setCustomerActivated('1');
|
| 118 |
-
} else if (Mage::getStoreConfig(self::XML_PATH_ACTIVATION_STATUS) == 1) {
|
| 119 |
if(($date_range == 'between') || ($date_range == 'notmentioned')) {
|
| 120 |
$customer->setCustomerActivated('1');
|
| 121 |
}
|
|
@@ -152,8 +152,8 @@ class Exinent_CustomerActivation_Model_Observer {
|
|
| 152 |
return;
|
| 153 |
}
|
| 154 |
|
| 155 |
-
$startdate = Mage::getStoreConfig(self::XML_PATH_ACTIVATION_START_DATE);
|
| 156 |
-
$enddate = Mage::getStoreConfig(self::XML_PATH_ACTIVATION_END_DATE);
|
| 157 |
|
| 158 |
$paymentDate = date('Y-m-d');
|
| 159 |
$paymentDate = date('Y-m-d', strtotime($paymentDate));
|
|
@@ -176,7 +176,7 @@ class Exinent_CustomerActivation_Model_Observer {
|
|
| 176 |
|
| 177 |
if ($customer->getGroupId() == 1) {
|
| 178 |
$customer->setCustomerActivated('1');
|
| 179 |
-
} else if (Mage::getStoreConfig(self::XML_PATH_ACTIVATION_STATUS) == 1) {
|
| 180 |
if(($date_range == 'between') || ($date_range == 'notmentioned')) {
|
| 181 |
$customer->setCustomerActivated('1');
|
| 182 |
}
|
|
@@ -314,7 +314,7 @@ class Exinent_CustomerActivation_Model_Observer {
|
|
| 314 |
}
|
| 315 |
|
| 316 |
public function eavCollectionAbstractLoadBefore(Varien_Event_Observer $observer) {
|
| 317 |
-
if (Mage::getStoreConfig(self::XML_PATH_MODULE_DISABLED) == 0) {
|
| 318 |
return;
|
| 319 |
}
|
| 320 |
|
| 37 |
|
| 38 |
public function customerLogin($observer) {
|
| 39 |
|
| 40 |
+
if (Mage::getStoreConfig(self::XML_PATH_MODULE_DISABLED, Mage::app()->getStore()) == 0) {
|
| 41 |
return;
|
| 42 |
}
|
| 43 |
|
| 92 |
// Do not set the default status on the admin customer edit save action
|
| 93 |
$groupId = $customer->getGroupId();
|
| 94 |
$defaultStatus = Mage::helper('customeractivation')->getDefaultActivationStatus($groupId, $storeId);
|
| 95 |
+
$startdate = Mage::getStoreConfig(self::XML_PATH_ACTIVATION_START_DATE, Mage::app()->getStore());
|
| 96 |
+
$enddate = Mage::getStoreConfig(self::XML_PATH_ACTIVATION_END_DATE, Mage::app()->getStore());
|
| 97 |
|
| 98 |
$paymentDate = date('Y-m-d');
|
| 99 |
$paymentDate = date('Y-m-d', strtotime($paymentDate));
|
| 115 |
$defaultStatus = Mage::helper('customeractivation')->getDefaultActivationStatus($groupId, $storeId);
|
| 116 |
if ($customer->getGroupId() == 1) {
|
| 117 |
$customer->setCustomerActivated('1');
|
| 118 |
+
} else if (Mage::getStoreConfig(self::XML_PATH_ACTIVATION_STATUS, Mage::app()->getStore()) == 1) {
|
| 119 |
if(($date_range == 'between') || ($date_range == 'notmentioned')) {
|
| 120 |
$customer->setCustomerActivated('1');
|
| 121 |
}
|
| 152 |
return;
|
| 153 |
}
|
| 154 |
|
| 155 |
+
$startdate = Mage::getStoreConfig(self::XML_PATH_ACTIVATION_START_DATE, Mage::app()->getStore());
|
| 156 |
+
$enddate = Mage::getStoreConfig(self::XML_PATH_ACTIVATION_END_DATE, Mage::app()->getStore());
|
| 157 |
|
| 158 |
$paymentDate = date('Y-m-d');
|
| 159 |
$paymentDate = date('Y-m-d', strtotime($paymentDate));
|
| 176 |
|
| 177 |
if ($customer->getGroupId() == 1) {
|
| 178 |
$customer->setCustomerActivated('1');
|
| 179 |
+
} else if (Mage::getStoreConfig(self::XML_PATH_ACTIVATION_STATUS, Mage::app()->getStore()) == 1) {
|
| 180 |
if(($date_range == 'between') || ($date_range == 'notmentioned')) {
|
| 181 |
$customer->setCustomerActivated('1');
|
| 182 |
}
|
| 314 |
}
|
| 315 |
|
| 316 |
public function eavCollectionAbstractLoadBefore(Varien_Event_Observer $observer) {
|
| 317 |
+
if (Mage::getStoreConfig(self::XML_PATH_MODULE_DISABLED, Mage::app()->getStore()) == 0) {
|
| 318 |
return;
|
| 319 |
}
|
| 320 |
|
app/code/community/Exinent/CustomerActivation/Model/Resource/Attribute/Source/Customerpayment.php
CHANGED
|
@@ -2,25 +2,38 @@
|
|
| 2 |
|
| 3 |
class Exinent_CustomerActivation_Model_Resource_Attribute_Source_Customerpayment extends Mage_Eav_Model_Entity_Attribute_Source_Abstract {
|
| 4 |
|
| 5 |
-
|
|
|
|
| 6 |
if (is_null($this->_options)) {
|
| 7 |
-
$
|
| 8 |
-
|
| 9 |
-
|
| 10 |
-
|
| 11 |
-
|
| 12 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 13 |
}
|
|
|
|
| 14 |
}
|
| 15 |
|
| 16 |
public function getOptionArray() {
|
| 17 |
$_options = array();
|
| 18 |
foreach ($this->getAllOptions() as $option) {
|
| 19 |
-
$_options[$option[
|
| 20 |
}
|
| 21 |
return $_options;
|
| 22 |
}
|
| 23 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 24 |
public function getOptionText($value) {
|
| 25 |
$options = $this->getAllOptions();
|
| 26 |
foreach ($options as $option) {
|
|
@@ -31,34 +44,28 @@ class Exinent_CustomerActivation_Model_Resource_Attribute_Source_Customerpayment
|
|
| 31 |
return false;
|
| 32 |
}
|
| 33 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 34 |
public function getFlatColums() {
|
| 35 |
-
$columns = array(
|
| 36 |
-
|
| 37 |
-
|
| 38 |
-
|
| 39 |
-
|
| 40 |
-
|
| 41 |
-
|
|
|
|
| 42 |
);
|
| 43 |
-
|
| 44 |
return $columns;
|
| 45 |
}
|
| 46 |
|
| 47 |
-
public function getFlatIndexes() {
|
| 48 |
-
$indexes = array();
|
| 49 |
-
|
| 50 |
-
$index = "IDX_" . strtoupper($this->getAttribute()->getAttributeCode());
|
| 51 |
-
$indexes[$index] = array(
|
| 52 |
-
"type" => "index",
|
| 53 |
-
"fields" => array($this->getAttribute()->getAttributeCode())
|
| 54 |
-
);
|
| 55 |
-
|
| 56 |
-
return $indexes;
|
| 57 |
-
}
|
| 58 |
-
|
| 59 |
public function getFlatUpdateSelect($store) {
|
| 60 |
-
return Mage::getResourceModel(
|
| 61 |
->getFlatUpdateSelect($this->getAttribute(), $store);
|
| 62 |
}
|
| 63 |
|
|
|
|
| 64 |
}
|
| 2 |
|
| 3 |
class Exinent_CustomerActivation_Model_Resource_Attribute_Source_Customerpayment extends Mage_Eav_Model_Entity_Attribute_Source_Abstract {
|
| 4 |
|
| 5 |
+
public function getAllOptions() {
|
| 6 |
+
|
| 7 |
if (is_null($this->_options)) {
|
| 8 |
+
$this->_options = array(
|
| 9 |
+
array(
|
| 10 |
+
'label' => 'Net30',
|
| 11 |
+
'value' => 'net30'
|
| 12 |
+
),
|
| 13 |
+
array(
|
| 14 |
+
'label' => 'Net15',
|
| 15 |
+
'value' => 'net15'
|
| 16 |
+
),
|
| 17 |
+
|
| 18 |
+
);
|
| 19 |
}
|
| 20 |
+
return $this->_options;
|
| 21 |
}
|
| 22 |
|
| 23 |
public function getOptionArray() {
|
| 24 |
$_options = array();
|
| 25 |
foreach ($this->getAllOptions() as $option) {
|
| 26 |
+
$_options[$option['value']] = $option['label'];
|
| 27 |
}
|
| 28 |
return $_options;
|
| 29 |
}
|
| 30 |
|
| 31 |
+
/**
|
| 32 |
+
* Get a text for option value
|
| 33 |
+
*
|
| 34 |
+
* @param string|integer $value
|
| 35 |
+
* @return string
|
| 36 |
+
*/
|
| 37 |
public function getOptionText($value) {
|
| 38 |
$options = $this->getAllOptions();
|
| 39 |
foreach ($options as $option) {
|
| 44 |
return false;
|
| 45 |
}
|
| 46 |
|
| 47 |
+
/**
|
| 48 |
+
* Retrieve Column(s) for Flat
|
| 49 |
+
*
|
| 50 |
+
* @return array
|
| 51 |
+
*/
|
| 52 |
public function getFlatColums() {
|
| 53 |
+
$columns = array(
|
| 54 |
+
$this->getAttribute()->getAttributeCode() => array(
|
| 55 |
+
'type' => 'int',
|
| 56 |
+
'unsigned' => false,
|
| 57 |
+
'is_null' => true,
|
| 58 |
+
'default' => null,
|
| 59 |
+
'extra' => null
|
| 60 |
+
)
|
| 61 |
);
|
|
|
|
| 62 |
return $columns;
|
| 63 |
}
|
| 64 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 65 |
public function getFlatUpdateSelect($store) {
|
| 66 |
+
return Mage::getResourceModel('eav/entity_attribute')
|
| 67 |
->getFlatUpdateSelect($this->getAttribute(), $store);
|
| 68 |
}
|
| 69 |
|
| 70 |
+
|
| 71 |
}
|
app/code/community/Exinent/CustomerActivation/controllers/AccountController.php
CHANGED
|
@@ -56,13 +56,17 @@ class Exinent_CustomerActivation_AccountController extends Mage_Customer_Account
|
|
| 56 |
$brands = implode(',', $brandsCarry);
|
| 57 |
$customer->setBrandsCarry($brands);
|
| 58 |
try {
|
| 59 |
-
|
| 60 |
-
|
| 61 |
-
|
| 62 |
-
|
| 63 |
-
|
| 64 |
-
|
| 65 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 66 |
|
| 67 |
|
| 68 |
} catch (Exception $e) {
|
| 56 |
$brands = implode(',', $brandsCarry);
|
| 57 |
$customer->setBrandsCarry($brands);
|
| 58 |
try {
|
| 59 |
+
|
| 60 |
+
$logoImage='';
|
| 61 |
+
$uploader = new Varien_File_Uploader('attachment');
|
| 62 |
+
$uploader->setFilesDispersion(true);
|
| 63 |
+
$uploader->setFilenamesCaseSensitivity(false);
|
| 64 |
+
$uploader->setAllowedExtensions(array('jpg', 'jpeg', 'gif', 'png'));
|
| 65 |
+
$uploader->setAllowRenameFiles(true);
|
| 66 |
+
$path = Mage::getBaseDir('media') . DS . 'customerlogs' . DS;
|
| 67 |
+
$uploader->save($path, $_FILES['attachment']['name']);
|
| 68 |
+
$fileName = $uploader->getUploadedFileName();
|
| 69 |
+
$logoImage = 'customerlogs/' . $fileName;
|
| 70 |
|
| 71 |
|
| 72 |
} catch (Exception $e) {
|
app/code/community/Exinent/CustomerActivation/controllers/CategoryController.php
CHANGED
|
@@ -5,9 +5,9 @@ include(Mage::getBaseDir() . "/app/code/core/Mage/Catalog/controllers/CategoryCo
|
|
| 5 |
class Exinent_CustomerActivation_CategoryController extends Mage_Catalog_CategoryController {
|
| 6 |
|
| 7 |
protected function _initCatagory() {
|
| 8 |
-
$ModuleStatus = Mage::getStoreConfig('customer/customeractivation/disable_ext');
|
| 9 |
if ($ModuleStatus == 1) {
|
| 10 |
-
$cmsPagesList = Mage::getStoreConfig('customer/customeractivation/require_aunthenticate_categories');
|
| 11 |
$pages = explode(',', $cmsPagesList);
|
| 12 |
$currentUrl = Mage::helper('core/url')->getCurrentUrl();
|
| 13 |
$baseUrl = Mage::getBaseUrl();
|
|
@@ -28,7 +28,7 @@ class Exinent_CustomerActivation_CategoryController extends Mage_Catalog_Categor
|
|
| 28 |
->setRedirect(Mage::getUrl('customer/account/login'))
|
| 29 |
->sendResponse();
|
| 30 |
} else {
|
| 31 |
-
$customerGroups = Mage::getStoreConfig('customer/customeractivation/require_activation_groups');
|
| 32 |
$customers = explode(',', $customerGroups);
|
| 33 |
$customer = Mage::getSingleton('customer/session')->getCustomer();
|
| 34 |
$customerId = $customer->getGroupId();
|
| 5 |
class Exinent_CustomerActivation_CategoryController extends Mage_Catalog_CategoryController {
|
| 6 |
|
| 7 |
protected function _initCatagory() {
|
| 8 |
+
$ModuleStatus = Mage::getStoreConfig('customer/customeractivation/disable_ext', Mage::app()->getStore());
|
| 9 |
if ($ModuleStatus == 1) {
|
| 10 |
+
$cmsPagesList = Mage::getStoreConfig('customer/customeractivation/require_aunthenticate_categories', Mage::app()->getStore());
|
| 11 |
$pages = explode(',', $cmsPagesList);
|
| 12 |
$currentUrl = Mage::helper('core/url')->getCurrentUrl();
|
| 13 |
$baseUrl = Mage::getBaseUrl();
|
| 28 |
->setRedirect(Mage::getUrl('customer/account/login'))
|
| 29 |
->sendResponse();
|
| 30 |
} else {
|
| 31 |
+
$customerGroups = Mage::getStoreConfig('customer/customeractivation/require_activation_groups', Mage::app()->getStore());
|
| 32 |
$customers = explode(',', $customerGroups);
|
| 33 |
$customer = Mage::getSingleton('customer/session')->getCustomer();
|
| 34 |
$customerId = $customer->getGroupId();
|
app/code/community/Exinent/CustomerActivation/controllers/IndexController.php
CHANGED
|
@@ -6,7 +6,7 @@ class Exinent_CustomerActivation_IndexController extends Mage_Cms_IndexControlle
|
|
| 6 |
|
| 7 |
public function indexAction($coreRoute = null) {
|
| 8 |
|
| 9 |
-
$pageId = Mage::getStoreConfig(Mage_Cms_Helper_Page::XML_PATH_HOME_PAGE);
|
| 10 |
if (!Mage::helper('cms/page')->renderPage($this, $pageId)) {
|
| 11 |
$this->_forward('defaultIndex');
|
| 12 |
}
|
| 6 |
|
| 7 |
public function indexAction($coreRoute = null) {
|
| 8 |
|
| 9 |
+
$pageId = Mage::getStoreConfig(Mage_Cms_Helper_Page::XML_PATH_HOME_PAGE, Mage::app()->getStore());
|
| 10 |
if (!Mage::helper('cms/page')->renderPage($this, $pageId)) {
|
| 11 |
$this->_forward('defaultIndex');
|
| 12 |
}
|
app/code/community/Exinent/CustomerActivation/controllers/PageController.php
CHANGED
|
@@ -7,9 +7,9 @@ class Exinent_CustomerActivation_PageController extends Mage_Cms_PageController
|
|
| 7 |
public function viewAction()
|
| 8 |
{
|
| 9 |
// echo 'hii';exit;
|
| 10 |
-
$ModuleStatus = Mage::getStoreConfig('customer/customeractivation/disable_ext');
|
| 11 |
if($ModuleStatus==1){
|
| 12 |
-
$cmsPagesList = Mage::getStoreConfig('customer/customeractivation/require_aunthenticate_cms');
|
| 13 |
$pages = explode(',', $cmsPagesList);
|
| 14 |
$currentUrl = Mage::helper('core/url')->getCurrentUrl();
|
| 15 |
$baseUrl = Mage::getBaseUrl();
|
|
@@ -29,7 +29,7 @@ class Exinent_CustomerActivation_PageController extends Mage_Cms_PageController
|
|
| 29 |
->setRedirect(Mage::getUrl('customer/account/login'))
|
| 30 |
->sendResponse();
|
| 31 |
}else{
|
| 32 |
-
$customerGroups = Mage::getStoreConfig('customer/customeractivation/require_activation_groups');
|
| 33 |
$customers = explode(',', $customerGroups);
|
| 34 |
$customer = Mage::getSingleton('customer/session')->getCustomer();
|
| 35 |
$customerId = $customer->getGroupId();
|
| 7 |
public function viewAction()
|
| 8 |
{
|
| 9 |
// echo 'hii';exit;
|
| 10 |
+
$ModuleStatus = Mage::getStoreConfig('customer/customeractivation/disable_ext', Mage::app()->getStore());
|
| 11 |
if($ModuleStatus==1){
|
| 12 |
+
$cmsPagesList = Mage::getStoreConfig('customer/customeractivation/require_aunthenticate_cms', Mage::app()->getStore());
|
| 13 |
$pages = explode(',', $cmsPagesList);
|
| 14 |
$currentUrl = Mage::helper('core/url')->getCurrentUrl();
|
| 15 |
$baseUrl = Mage::getBaseUrl();
|
| 29 |
->setRedirect(Mage::getUrl('customer/account/login'))
|
| 30 |
->sendResponse();
|
| 31 |
}else{
|
| 32 |
+
$customerGroups = Mage::getStoreConfig('customer/customeractivation/require_activation_groups', Mage::app()->getStore());
|
| 33 |
$customers = explode(',', $customerGroups);
|
| 34 |
$customer = Mage::getSingleton('customer/session')->getCustomer();
|
| 35 |
$customerId = $customer->getGroupId();
|
app/code/community/Exinent/CustomerActivation/controllers/ProductController.php
CHANGED
|
@@ -5,9 +5,9 @@ include(Mage::getBaseDir() . "/app/code/core/Mage/Catalog/controllers/ProductCon
|
|
| 5 |
class Exinent_CustomerActivation_ProductController extends Mage_Catalog_ProductController {
|
| 6 |
|
| 7 |
public function viewAction() {
|
| 8 |
-
$ModuleStatus = Mage::getStoreConfig('customer/customeractivation/disable_ext');
|
| 9 |
if($ModuleStatus==1){
|
| 10 |
-
$cmsPagesList = Mage::getStoreConfig('customer/customeractivation/require_aunthenticate_products');
|
| 11 |
$pages = explode(',', $cmsPagesList);
|
| 12 |
$currentUrl = Mage::helper('core/url')->getCurrentUrl();
|
| 13 |
$baseUrl = Mage::getBaseUrl();
|
|
@@ -26,7 +26,7 @@ class Exinent_CustomerActivation_ProductController extends Mage_Catalog_ProductC
|
|
| 26 |
->setRedirect(Mage::getUrl('customer/account/login'))
|
| 27 |
->sendResponse();
|
| 28 |
}else{
|
| 29 |
-
$customerGroups = Mage::getStoreConfig('customer/customeractivation/require_activation_groups');
|
| 30 |
$customers = explode(',', $customerGroups);
|
| 31 |
$customer = Mage::getSingleton('customer/session')->getCustomer();
|
| 32 |
$customerId = $customer->getGroupId();
|
| 5 |
class Exinent_CustomerActivation_ProductController extends Mage_Catalog_ProductController {
|
| 6 |
|
| 7 |
public function viewAction() {
|
| 8 |
+
$ModuleStatus = Mage::getStoreConfig('customer/customeractivation/disable_ext', Mage::app()->getStore());
|
| 9 |
if($ModuleStatus==1){
|
| 10 |
+
$cmsPagesList = Mage::getStoreConfig('customer/customeractivation/require_aunthenticate_products', Mage::app()->getStore());
|
| 11 |
$pages = explode(',', $cmsPagesList);
|
| 12 |
$currentUrl = Mage::helper('core/url')->getCurrentUrl();
|
| 13 |
$baseUrl = Mage::getBaseUrl();
|
| 26 |
->setRedirect(Mage::getUrl('customer/account/login'))
|
| 27 |
->sendResponse();
|
| 28 |
}else{
|
| 29 |
+
$customerGroups = Mage::getStoreConfig('customer/customeractivation/require_activation_groups', Mage::app()->getStore());
|
| 30 |
$customers = explode(',', $customerGroups);
|
| 31 |
$customer = Mage::getSingleton('customer/session')->getCustomer();
|
| 32 |
$customerId = $customer->getGroupId();
|
app/code/community/Exinent/CustomerActivation/controllers/productOrderController.php
CHANGED
|
@@ -6,9 +6,9 @@ class Exinent_CustomerActivation_productOrderController extends Mage_Core_Contro
|
|
| 6 |
parent::preDispatch();
|
| 7 |
$action = $this->getRequest()->getActionName();
|
| 8 |
$loginUrl = Mage::helper('customer')->getLoginUrl();
|
| 9 |
-
$ModuleStatus = Mage::getStoreConfig('customer/customeractivation/disable_ext');
|
| 10 |
|
| 11 |
-
$customerGroups = Mage::getStoreConfig('customer/customeractivation/require_activation_groups');
|
| 12 |
$customers = explode(',', $customerGroups);
|
| 13 |
$customer = Mage::getSingleton('customer/session')->getCustomer();
|
| 14 |
$customerId = $customer->getGroupId();
|
|
@@ -39,7 +39,7 @@ class Exinent_CustomerActivation_productOrderController extends Mage_Core_Contro
|
|
| 39 |
}
|
| 40 |
|
| 41 |
public function submitorderbySimpleproductAction() {
|
| 42 |
-
$minQty = Mage::getStoreConfig('customer/customeractivation/min_qty');
|
| 43 |
|
| 44 |
$params = $this->getRequest()->getParams();
|
| 45 |
$cart = Mage::getModel('checkout/cart');
|
| 6 |
parent::preDispatch();
|
| 7 |
$action = $this->getRequest()->getActionName();
|
| 8 |
$loginUrl = Mage::helper('customer')->getLoginUrl();
|
| 9 |
+
$ModuleStatus = Mage::getStoreConfig('customer/customeractivation/disable_ext', Mage::app()->getStore());
|
| 10 |
|
| 11 |
+
$customerGroups = Mage::getStoreConfig('customer/customeractivation/require_activation_groups', Mage::app()->getStore());
|
| 12 |
$customers = explode(',', $customerGroups);
|
| 13 |
$customer = Mage::getSingleton('customer/session')->getCustomer();
|
| 14 |
$customerId = $customer->getGroupId();
|
| 39 |
}
|
| 40 |
|
| 41 |
public function submitorderbySimpleproductAction() {
|
| 42 |
+
$minQty = Mage::getStoreConfig('customer/customeractivation/min_qty', Mage::app()->getStore());
|
| 43 |
|
| 44 |
$params = $this->getRequest()->getParams();
|
| 45 |
$cart = Mage::getModel('checkout/cart');
|
app/code/community/Exinent/CustomerActivation/etc/config.xml
CHANGED
|
@@ -46,16 +46,12 @@
|
|
| 46 |
<html_topmenu>Exinent_CustomerActivation_Block_Page_Html_Topmenu</html_topmenu>
|
| 47 |
</rewrite>
|
| 48 |
</page>
|
| 49 |
-
|
| 50 |
-
|
| 51 |
<adminhtml>
|
| 52 |
<rewrite>
|
| 53 |
<widget_form_renderer_fieldset>Exinent_CustomerActivation_Block_Adminhtml_Rewrite_Fieldset</widget_form_renderer_fieldset>
|
| 54 |
</rewrite>
|
| 55 |
-
</adminhtml>
|
| 56 |
-
|
| 57 |
-
|
| 58 |
-
|
| 59 |
</blocks>
|
| 60 |
<resources>
|
| 61 |
<customeractivation_setup>
|
|
@@ -65,20 +61,7 @@
|
|
| 65 |
</setup>
|
| 66 |
</customeractivation_setup>
|
| 67 |
</resources>
|
| 68 |
-
|
| 69 |
-
<email>
|
| 70 |
-
<customer_customeractivation_registration_admin_template translate="label" module="customeractivation">
|
| 71 |
-
<label>Customer Registration Admin Notification</label>
|
| 72 |
-
<file>Exinent/customeractivation/customer_registration_admin.html</file>
|
| 73 |
-
<type>html</type>
|
| 74 |
-
</customer_customeractivation_registration_admin_template>
|
| 75 |
-
<customer_customeractivation_activation_template translate="label" module="customeractivation">
|
| 76 |
-
<label>Customer Activation Notification</label>
|
| 77 |
-
<file>Exinent/customeractivation/customer_activation.html</file>
|
| 78 |
-
<type>html</type>
|
| 79 |
-
</customer_customeractivation_activation_template>
|
| 80 |
-
</email>
|
| 81 |
-
</template>
|
| 82 |
<events>
|
| 83 |
|
| 84 |
|
|
@@ -171,7 +154,7 @@
|
|
| 171 |
</customeractivation>
|
| 172 |
</observers>
|
| 173 |
</customer_login>
|
| 174 |
-
|
| 175 |
<observers>
|
| 176 |
<customeractivation>
|
| 177 |
<type>singleton</type>
|
|
@@ -179,7 +162,7 @@
|
|
| 179 |
<method>salesCovertQuoteAddressToOrder</method>
|
| 180 |
</customeractivation>
|
| 181 |
</observers>
|
| 182 |
-
</sales_convert_quote_address_to_order>
|
| 183 |
</events>
|
| 184 |
<translate>
|
| 185 |
<modules>
|
| 46 |
<html_topmenu>Exinent_CustomerActivation_Block_Page_Html_Topmenu</html_topmenu>
|
| 47 |
</rewrite>
|
| 48 |
</page>
|
| 49 |
+
|
|
|
|
| 50 |
<adminhtml>
|
| 51 |
<rewrite>
|
| 52 |
<widget_form_renderer_fieldset>Exinent_CustomerActivation_Block_Adminhtml_Rewrite_Fieldset</widget_form_renderer_fieldset>
|
| 53 |
</rewrite>
|
| 54 |
+
</adminhtml>
|
|
|
|
|
|
|
|
|
|
| 55 |
</blocks>
|
| 56 |
<resources>
|
| 57 |
<customeractivation_setup>
|
| 61 |
</setup>
|
| 62 |
</customeractivation_setup>
|
| 63 |
</resources>
|
| 64 |
+
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 65 |
<events>
|
| 66 |
|
| 67 |
|
| 154 |
</customeractivation>
|
| 155 |
</observers>
|
| 156 |
</customer_login>
|
| 157 |
+
<!-- <sales_convert_quote_address_to_order>
|
| 158 |
<observers>
|
| 159 |
<customeractivation>
|
| 160 |
<type>singleton</type>
|
| 162 |
<method>salesCovertQuoteAddressToOrder</method>
|
| 163 |
</customeractivation>
|
| 164 |
</observers>
|
| 165 |
+
</sales_convert_quote_address_to_order> -->
|
| 166 |
</events>
|
| 167 |
<translate>
|
| 168 |
<modules>
|
app/code/community/Exinent/CustomerActivation/sql/customeractivation_setup/mysql4-upgrade-0.2.8-0.2.9.php
CHANGED
|
@@ -10,7 +10,6 @@ $installer->addAttribute("customer", "paymentmethods", array(
|
|
| 10 |
"label" => "Payment Methods",
|
| 11 |
"input" => "multiselect",
|
| 12 |
"source" => "customeractivation/resource_attribute_source_Customerpayment",
|
| 13 |
-
"backend" => "",
|
| 14 |
"user_defined" => "1",
|
| 15 |
"visible" => true,
|
| 16 |
"required" => false,
|
| 10 |
"label" => "Payment Methods",
|
| 11 |
"input" => "multiselect",
|
| 12 |
"source" => "customeractivation/resource_attribute_source_Customerpayment",
|
|
|
|
| 13 |
"user_defined" => "1",
|
| 14 |
"visible" => true,
|
| 15 |
"required" => false,
|
app/code/community/Exinent/CustomerActivation/sql/customeractivation_setup/mysql4-upgrade-0.3.3-0.3.4.php
CHANGED
|
@@ -9,7 +9,6 @@ $installer->addAttribute("customer", "shippingmethods", array(
|
|
| 9 |
"label" => "Shipping Methods",
|
| 10 |
"input" => "multiselect",
|
| 11 |
"source" => "customeractivation/resource_attribute_source_Customershippingmethods",
|
| 12 |
-
"backend" => "",
|
| 13 |
"user_defined" => "1",
|
| 14 |
"visible" => true,
|
| 15 |
"required" => false,
|
| 9 |
"label" => "Shipping Methods",
|
| 10 |
"input" => "multiselect",
|
| 11 |
"source" => "customeractivation/resource_attribute_source_Customershippingmethods",
|
|
|
|
| 12 |
"user_defined" => "1",
|
| 13 |
"visible" => true,
|
| 14 |
"required" => false,
|
app/code/community/Exinent/CustomerActivation/sql/customeractivation_setup/mysql4-upgrade-0.3.5-0.3.6.php
ADDED
|
@@ -0,0 +1,3 @@
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
$setup = new Mage_Eav_Model_Entity_Setup('core_setup');
|
| 3 |
+
$setup->updateAttribute('customer', 'customer_activated', 'used_in_forms', 'adminhtml_customer');
|
app/design/frontend/base/default/template/customerActivation/checkout/onepage/payment/methods.phtml
CHANGED
|
@@ -1,4 +1,30 @@
|
|
| 1 |
<?php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 2 |
/**
|
| 3 |
* One page checkout payment methods
|
| 4 |
*
|
|
@@ -7,84 +33,58 @@
|
|
| 7 |
?>
|
| 8 |
|
| 9 |
<?php
|
| 10 |
-
$methods = $this->getMethods();
|
| 11 |
-
$oneMethod = count($methods) <= 1;
|
| 12 |
-
$checkoutObject = Mage::getSingleton('checkout/session')->getQuote();
|
| 13 |
-
|
| 14 |
-
|
| 15 |
-
|
| 16 |
-
$
|
| 17 |
-
|
| 18 |
-
|
| 19 |
-
|
| 20 |
-
|
| 21 |
-
|
| 22 |
-
$paymentMethods = explode(',', $customerPaymentMethods);
|
| 23 |
-
// print_r($paymentMethods);
|
| 24 |
-
}
|
| 25 |
-
$customerGroupIdconfig = Mage::helper('customeractivation')->getCustomerGroupId();
|
| 26 |
-
$cofigGroupsIds = explode(',', $customerGroupIdconfig);
|
| 27 |
?>
|
| 28 |
<?php if (empty($methods)): ?>
|
| 29 |
<dt>
|
| 30 |
-
|
| 31 |
</dt>
|
| 32 |
-
|
| 33 |
-
else:
|
| 34 |
foreach ($methods as $_method):
|
| 35 |
-
|
| 36 |
-
|
| 37 |
-
|
| 38 |
-
|
| 39 |
-
|
| 40 |
-
|
| 41 |
-
|
| 42 |
-
?>
|
| 43 |
-
<dt>
|
| 44 |
-
<?php if (!$oneMethod): ?>
|
| 45 |
-
<input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" title="<?php echo $this->escapeHtml($_method->getTitle()) ?>" onclick="payment.switchMethod('<?php echo $_code ?>')"<?php if ($this->getSelectedMethodCode() == $_code): ?> checked="checked"<?php endif; ?> class="radio" />
|
| 46 |
-
<?php else: ?>
|
| 47 |
-
<span class="no-display"><input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" checked="checked" class="radio" /></span>
|
| 48 |
-
<?php $oneMethod = $_code; ?>
|
| 49 |
-
<?php endif; ?>
|
| 50 |
-
<label for="p_method_<?php echo $_code ?>"><?php echo $this->escapeHtml($this->getMethodTitle($_method)) ?> <?php echo $this->getMethodLabelAfterHtml($_method) ?></label>
|
| 51 |
-
</dt>
|
| 52 |
-
<?php if ($html = $this->getPaymentMethodFormHtml($_method)): ?>
|
| 53 |
-
<dd>
|
| 54 |
-
<?php echo $html; ?>
|
| 55 |
-
</dd>
|
| 56 |
-
<?php endif; ?>
|
| 57 |
-
<?php
|
| 58 |
-
} endforeach;
|
| 59 |
-
} else {
|
| 60 |
-
?>
|
| 61 |
-
<dt>
|
| 62 |
-
<?php if (!$oneMethod): ?>
|
| 63 |
-
<input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" title="<?php echo $this->escapeHtml($_method->getTitle()) ?>" onclick="payment.switchMethod('<?php echo $_code ?>')"<?php if ($this->getSelectedMethodCode() == $_code): ?> checked="checked"<?php endif; ?> class="radio" />
|
| 64 |
-
<?php else: ?>
|
| 65 |
-
<span class="no-display"><input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" checked="checked" class="radio" /></span>
|
| 66 |
-
<?php $oneMethod = $_code; ?>
|
| 67 |
-
<?php endif; ?>
|
| 68 |
-
<label for="p_method_<?php echo $_code ?>"><?php echo $this->escapeHtml($this->getMethodTitle($_method)) ?> <?php echo $this->getMethodLabelAfterHtml($_method) ?></label>
|
| 69 |
-
</dt>
|
| 70 |
-
<?php if ($html = $this->getPaymentMethodFormHtml($_method)): ?>
|
| 71 |
-
<dd>
|
| 72 |
-
<?php echo $html; ?>
|
| 73 |
-
</dd>
|
| 74 |
-
<?php endif; ?>
|
| 75 |
-
|
| 76 |
-
<?php } ?>
|
| 77 |
-
<?php
|
| 78 |
-
endforeach;
|
| 79 |
endif;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 80 |
?>
|
| 81 |
<?php echo $this->getChildChildHtml('additional'); ?>
|
| 82 |
<script type="text/javascript">
|
| 83 |
//<![CDATA[
|
| 84 |
-
<?php echo $this->getChildChildHtml('scripts'); ?>
|
| 85 |
payment.init();
|
| 86 |
-
<?php if (is_string($oneMethod)): ?>
|
| 87 |
-
|
| 88 |
-
<?php endif; ?>
|
| 89 |
//]]>
|
| 90 |
</script>
|
| 1 |
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package base_default
|
| 23 |
+
* @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php
|
| 28 |
/**
|
| 29 |
* One page checkout payment methods
|
| 30 |
*
|
| 33 |
?>
|
| 34 |
|
| 35 |
<?php
|
| 36 |
+
$methods = $this->getMethods();
|
| 37 |
+
$oneMethod = count($methods) <= 1;
|
| 38 |
+
$checkoutObject = Mage::getSingleton('checkout/session')->getQuote();
|
| 39 |
+
if ($checkoutObject->getCustomerGroupId()) {
|
| 40 |
+
$customerGroupId = $checkoutObject->getCustomerGroupId();
|
| 41 |
+
}
|
| 42 |
+
if($checkoutObject->getCustomerId()) {
|
| 43 |
+
$customerObject = Mage::getModel('customer/customer')->load($checkoutObject->getCustomerId());
|
| 44 |
+
$customerPaymentMethods = $customerObject->getPaymentmethods();
|
| 45 |
+
$paymentMethods = explode(',', $customerPaymentMethods);
|
| 46 |
+
}
|
| 47 |
+
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 48 |
?>
|
| 49 |
<?php if (empty($methods)): ?>
|
| 50 |
<dt>
|
| 51 |
+
<?php echo $this->__('No Payment Methods') ?>
|
| 52 |
</dt>
|
| 53 |
+
<?php else:
|
|
|
|
| 54 |
foreach ($methods as $_method):
|
| 55 |
+
$_code='';
|
| 56 |
+
$_code = $_method->getCode($_code);
|
| 57 |
+
|
| 58 |
+
if($customerGroupId != 2 && ($_code == 'net30' || $_code == 'net15' || $_code=='purchaseorder')):
|
| 59 |
+
continue;
|
| 60 |
+
elseif(($_code == 'net30' || $_code == 'net15' ) && !in_array($_code,$paymentMethods)):
|
| 61 |
+
continue;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 62 |
endif;
|
| 63 |
+
?>
|
| 64 |
+
<dt>
|
| 65 |
+
<?php if(!$oneMethod): ?>
|
| 66 |
+
<input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" title="<?php echo $this->escapeHtml($_method->getTitle()) ?>" onclick="payment.switchMethod('<?php echo $_code ?>')"<?php if($this->getSelectedMethodCode()==$_code): ?> checked="checked"<?php endif; ?> class="radio" />
|
| 67 |
+
<?php else: ?>
|
| 68 |
+
<span class="no-display"><input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" checked="checked" class="radio" /></span>
|
| 69 |
+
<?php $oneMethod = $_code; ?>
|
| 70 |
+
<?php endif; ?>
|
| 71 |
+
<label for="p_method_<?php echo $_code ?>"><?php echo $this->escapeHtml($this->getMethodTitle($_method)) ?> <?php echo $this->getMethodLabelAfterHtml($_method) ?></label>
|
| 72 |
+
</dt>
|
| 73 |
+
<?php if ($html = $this->getPaymentMethodFormHtml($_method)): ?>
|
| 74 |
+
<dd>
|
| 75 |
+
<?php echo $html; ?>
|
| 76 |
+
</dd>
|
| 77 |
+
<?php endif; ?>
|
| 78 |
+
<?php endforeach;
|
| 79 |
+
endif;
|
| 80 |
?>
|
| 81 |
<?php echo $this->getChildChildHtml('additional'); ?>
|
| 82 |
<script type="text/javascript">
|
| 83 |
//<![CDATA[
|
| 84 |
+
<?php echo $this->getChildChildHtml('scripts'); ?>
|
| 85 |
payment.init();
|
| 86 |
+
<?php if (is_string($oneMethod)): ?>
|
| 87 |
+
payment.switchMethod('<?php echo $oneMethod ?>');
|
| 88 |
+
<?php endif; ?>
|
| 89 |
//]]>
|
| 90 |
</script>
|
app/design/frontend/base/default/template/customerActivation/checkout/onepage/shipping_method/available.phtml
CHANGED
|
@@ -3,13 +3,13 @@
|
|
| 3 |
<?php $_shippingRateGroups = $this->getShippingRates(); ?>
|
| 4 |
<?php
|
| 5 |
$flag = 0;
|
| 6 |
-
|
| 7 |
$customerObj = Mage::getModel('customer/customer')->load($customer->getId());
|
| 8 |
$customerGroupId = $customerObj->getGroupId();
|
| 9 |
$customerShippingmethods = $customerObj->getShippingmethods();
|
| 10 |
$shippingMethods = explode(',', $customerShippingmethods);
|
| 11 |
$customerGroupIdconfig = Mage::helper('customeractivation')->getCustomerGroupId();
|
| 12 |
-
$cofigGroupsIds = explode(',', $customerGroupIdconfig)
|
| 13 |
?>
|
| 14 |
<?php if (!$_shippingRateGroups): ?>
|
| 15 |
<p><?php echo $this->__('Sorry, no quotes are available for this order at this time.') ?></p>
|
| 3 |
<?php $_shippingRateGroups = $this->getShippingRates(); ?>
|
| 4 |
<?php
|
| 5 |
$flag = 0;
|
| 6 |
+
/*$customer = Mage::getSingleton('customer/session')->getCustomer();
|
| 7 |
$customerObj = Mage::getModel('customer/customer')->load($customer->getId());
|
| 8 |
$customerGroupId = $customerObj->getGroupId();
|
| 9 |
$customerShippingmethods = $customerObj->getShippingmethods();
|
| 10 |
$shippingMethods = explode(',', $customerShippingmethods);
|
| 11 |
$customerGroupIdconfig = Mage::helper('customeractivation')->getCustomerGroupId();
|
| 12 |
+
$cofigGroupsIds = explode(',', $customerGroupIdconfig);*/
|
| 13 |
?>
|
| 14 |
<?php if (!$_shippingRateGroups): ?>
|
| 15 |
<p><?php echo $this->__('Sorry, no quotes are available for this order at this time.') ?></p>
|
app/design/frontend/base/default/template/customerActivation/quickorderproduct.phtml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?php
|
| 2 |
$orderSimpleProductsCollection = $this->getOrderSimpleProducts();
|
| 3 |
$baseUrl = Mage::getBaseUrl();
|
| 4 |
-
$minQty = Mage::getStoreConfig('customer/customeractivation/min_qty');
|
| 5 |
if($minQty){
|
| 6 |
?>
|
| 7 |
<div><h5>Minimum Order Quantity <?php echo $minQty; ?></h5></div>
|
| 1 |
<?php
|
| 2 |
$orderSimpleProductsCollection = $this->getOrderSimpleProducts();
|
| 3 |
$baseUrl = Mage::getBaseUrl();
|
| 4 |
+
$minQty = Mage::getStoreConfig('customer/customeractivation/min_qty', Mage::app()->getStore());
|
| 5 |
if($minQty){
|
| 6 |
?>
|
| 7 |
<div><h5>Minimum Order Quantity <?php echo $minQty; ?></h5></div>
|
app/design/frontend/base/default/template/customerActivation/wholesaleRegister.phtml
CHANGED
|
@@ -49,7 +49,7 @@
|
|
| 49 |
<div class="fieldset">
|
| 50 |
|
| 51 |
<ul class="form-list">
|
| 52 |
-
<?php $addressconfig = Mage::getStoreConfig('customer/customeractivation/address_field'); ?>
|
| 53 |
<?php if ($addressconfig == 1): ?>
|
| 54 |
<input type="hidden" name="create_address" value="1" />
|
| 55 |
<li class="fields">
|
|
@@ -249,7 +249,7 @@
|
|
| 249 |
</li> -->
|
| 250 |
</ul>
|
| 251 |
</div>
|
| 252 |
-
<?php if (Mage::getStoreConfig("fontis_recaptcha/recaptcha/customer")): ?>
|
| 253 |
<?php echo $this->getChildHtml('recaptcha_box') ?>
|
| 254 |
<?php endif; ?>
|
| 255 |
|
|
@@ -273,7 +273,7 @@
|
|
| 273 |
var fup = document.getElementById('attachment');
|
| 274 |
var fileName = fup.value;
|
| 275 |
var imagename = fileName.substring(0,fileName.lastIndexOf('.'));
|
| 276 |
-
var ck_username = /^[
|
| 277 |
|
| 278 |
|
| 279 |
var ext = fileName.substring(fileName.lastIndexOf('.') + 1);
|
|
@@ -292,18 +292,19 @@
|
|
| 292 |
//alert("Upload PNG or JPG Images only");
|
| 293 |
return false;
|
| 294 |
}
|
| 295 |
-
|
| 296 |
-
|
| 297 |
-
document.getElementById("imgerror").innerHTML="Please upload valid FileName";
|
| 298 |
-
return false;
|
| 299 |
-
}else
|
| 300 |
-
{
|
| 301 |
-
|
| 302 |
-
jQuery('#imgerror').removeClass( 'validation-advice' );
|
| 303 |
document.getElementById("imgerror").innerHTML="";
|
| 304 |
//alert("Upload PNG or JPG Images only");
|
| 305 |
return true;;
|
| 306 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 307 |
|
| 308 |
}
|
| 309 |
var paymentterms = jQuery('#paymentterms').val();
|
| 49 |
<div class="fieldset">
|
| 50 |
|
| 51 |
<ul class="form-list">
|
| 52 |
+
<?php $addressconfig = Mage::getStoreConfig('customer/customeractivation/address_field', Mage::app()->getStore()); ?>
|
| 53 |
<?php if ($addressconfig == 1): ?>
|
| 54 |
<input type="hidden" name="create_address" value="1" />
|
| 55 |
<li class="fields">
|
| 249 |
</li> -->
|
| 250 |
</ul>
|
| 251 |
</div>
|
| 252 |
+
<?php if (Mage::getStoreConfig("fontis_recaptcha/recaptcha/customer", Mage::app()->getStore())): ?>
|
| 253 |
<?php echo $this->getChildHtml('recaptcha_box') ?>
|
| 254 |
<?php endif; ?>
|
| 255 |
|
| 273 |
var fup = document.getElementById('attachment');
|
| 274 |
var fileName = fup.value;
|
| 275 |
var imagename = fileName.substring(0,fileName.lastIndexOf('.'));
|
| 276 |
+
var ck_username = /^[0-9a-zA-Z\.\_\-]*$/;
|
| 277 |
|
| 278 |
|
| 279 |
var ext = fileName.substring(fileName.lastIndexOf('.') + 1);
|
| 292 |
//alert("Upload PNG or JPG Images only");
|
| 293 |
return false;
|
| 294 |
}
|
| 295 |
+
/* if (ck_username.test(imagename)) {
|
| 296 |
+
jQuery('#imgerror').removeClass( 'validation-advice' );
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 297 |
document.getElementById("imgerror").innerHTML="";
|
| 298 |
//alert("Upload PNG or JPG Images only");
|
| 299 |
return true;;
|
| 300 |
+
|
| 301 |
+
}else
|
| 302 |
+
{
|
| 303 |
+
jQuery('#imgerror').addClass( 'validation-advice' );
|
| 304 |
+
document.getElementById("imgerror").innerHTML="Please upload valid FileName";
|
| 305 |
+
return false;
|
| 306 |
+
|
| 307 |
+
}*/
|
| 308 |
|
| 309 |
}
|
| 310 |
var paymentterms = jQuery('#paymentterms').val();
|
package.xml
CHANGED
|
@@ -1,18 +1,18 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Wholesale_Customer_Activation</name>
|
| 4 |
-
<version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
-
<license>Open Software License</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
-
<summary>
|
| 10 |
-
<description>
|
| 11 |
-
<notes>
|
| 12 |
-
<authors><author><name>
|
| 13 |
-
<date>2015-04-
|
| 14 |
-
<time>
|
| 15 |
-
<contents><target name="magecommunity"><dir name="Exinent"><dir name="CustomerActivation"><dir name="Block"><dir name="Adminhtml"><dir name="Customer"><dir name="Edit"><dir name="Tab"><file name="Customerimages.php" hash="ec2737955a76186f2b87bcaf6d6343f8"/></dir></dir></dir><dir name="Rewrite"><file name="Fieldset.php" hash="321e2819e5846b44669cef7a1b66d341"/></dir><dir name="System"><dir name="Config"><file name="Date.php" hash="d2f7482b63e9737fd0974828fd644ab5"/></dir></dir><dir name="Widget"><dir name="Grid"><dir name="Column"><dir name="Renderer"><file name="Boolean.php" hash="
|
| 16 |
<compatible/>
|
| 17 |
-
<dependencies><required><php><min>5.
|
| 18 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Wholesale_Customer_Activation</name>
|
| 4 |
+
<version>8.0.0</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
+
<license>Open Software License (OSL)</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
+
<summary>Added custom payment terms and bug fixes</summary>
|
| 10 |
+
<description>Added custom payment terms and bug fixes</description>
|
| 11 |
+
<notes>Added custom payment terms and bug fixes</notes>
|
| 12 |
+
<authors><author><name>Devlopment</name><user>Exinent</user><email>developer@exinent.com</email></author></authors>
|
| 13 |
+
<date>2015-04-22</date>
|
| 14 |
+
<time>10:28:45</time>
|
| 15 |
+
<contents><target name="magecommunity"><dir name="Exinent"><dir name="CustomerActivation"><dir name="Block"><dir name="Adminhtml"><dir name="Customer"><dir name="Edit"><dir name="Tab"><file name="Customerimages.php" hash="ec2737955a76186f2b87bcaf6d6343f8"/></dir></dir></dir><dir name="Rewrite"><file name="Fieldset.php" hash="321e2819e5846b44669cef7a1b66d341"/></dir><dir name="System"><dir name="Config"><file name="Date.php" hash="d2f7482b63e9737fd0974828fd644ab5"/></dir></dir><dir name="Widget"><dir name="Grid"><dir name="Column"><dir name="Renderer"><file name="Boolean.php" hash="35e589b6e0eb6fb07f578075914faea6"/></dir></dir></dir></dir></dir><file name="Orderproduct.php" hash="ec5f2831bb78470510604e71ac35ebae"/><dir name="Page"><dir name="Html"><file name="Topmenu.php" hash="1d16a8414ad816faeb1c41bb813acb4e"/></dir></dir><file name="Purchaseorder.php" hash="523393a9a08456231a552576f9a9623d"/><file name="Purchaseorderinfo.php" hash="0f21876ad1e1d7870a56e842e34b2c79"/><dir name="Rewrite"><file name="Fieldset.php" hash="d796319c6cde74e5cfa1934c5263b7d8"/></dir><dir name="collection"><file name="toobar.php" hash="413b12a74f97d71ef9a5da03364dc2e3"/></dir><file name="toobar.php" hash="413b12a74f97d71ef9a5da03364dc2e3"/></dir><dir name="Helper"><file name="Data.php" hash="1391011773d402f2d8eb62afe955663b"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Source"><dir name="Categories"><dir name="Group"><file name="Multiselect.php" hash="a8dc5c2fbff41fa315043ec348ca360b"/></dir></dir><dir name="Customer"><dir name="Group"><file name="Multiselect.php" hash="21f9f4f675cf60dce1a8ce945084f1bd"/></dir></dir><dir name="Pages"><dir name="Group"><file name="Multiselect.php" hash="9bdf2acc492fe0b8c924f2fb41c3afcd"/></dir></dir><dir name="Products"><dir name="Group"><file name="Multiselect.php" hash="ad4f5f67ef290444e6bc8c617da013c1"/></dir><dir name="Price"><file name="Multiselect.php" hash="490373ac424eade10f0479a5e14d2a9c"/></dir></dir></dir></dir></dir></dir><file name="Customer.php" hash="4124537f87d8f57809525875c79d5eb2"/><file name="Info.php" hash="156b808fd5aaeb2b6efa1aba81460218"/><dir name="Mysql4"><file name="Info.php" hash="07051efccbacd7f0c81307bf9fcc23e7"/><dir name="Subscriber"><file name="Collection.php" hash="56da157699fd0627ddc9f991b41fd613"/></dir><file name="Subscriber.php" hash="bfffd406f9eddba5ed714fba7ad99a25"/></dir><file name="Net15.php" hash="bcb24ede3b498f7488a1986b3a33acb5"/><file name="Net30.php" hash="2dcface31c58114c204db5aca3ca65f8"/><file name="Observer.php" hash="a002c8697faf763fb9d9c0bbf9c722ee"/><file name="Order.php" hash="7eaebf565655776cd7bcba2fce39b641"/><dir name="Resource"><dir name="Attribute"><dir name="Source"><file name="Customeractivation.php" hash="ac458e05c1bb963d73cbd19d3c2aecd9"/><file name="Customerpayment.php" hash="a3f52ad5f8f57cd16aaa08644d224dc8"/><file name="Customershippingmethods.php" hash="a6f870b8425acd1dab692f2e1494e859"/><file name="Iswebsitelive.php" hash="7d8ae067b8885639e6dd5f4f443226b1"/><file name="StoreType.php" hash="8bd57ac868cb24486a9361d8146a965d"/></dir></dir><file name="Customer.php" hash="d4909a22628e2c448a7be2f98cb4a011"/></dir><file name="Subscriber.php" hash="5ae9d8289a4a9d031154250e6ea6e636"/><file name="Thirdparty.php" hash="ad9ba9fe7110b8ef640f4ddc7aad51ee"/><file name="Thirdpartyfed.php" hash="f29004693ca109b35e26a1ede67a7e1b"/><file name="Thirdpartyfedex.php" hash="9074b87a23c4648ecb76e4c7faee211e"/><file name="Thirdpartyups.php" hash="13898e8a383d27fd33c6f587e574228d"/></dir><dir name="controllers"><file name="AccountController.php" hash="d18801d6198c9b2a581e6bb55a991344"/><file name="AdminController.php" hash="d585098ce860d3644d28852d9ffe1526"/><file name="CategoryController.php" hash="bcbabbc5c65c1d666def8c36228bead4"/><file name="IndexController.php" hash="b70c9967c7099b3b90a29d5d0571bba2"/><file name="PageController.php" hash="95aaac064dfaa6e4f072e57c47e308bd"/><file name="ProductController.php" hash="a74507f5ebdb32f4fb30af77aeee78d5"/><file name="productOrderController.php" hash="d3e3e6ee8470f7e25241ce6437eb5155"/></dir><dir name="etc"><file name="config.xml" hash="7e8cdcbd0a1630b99e5b471db36a4897"/><file name="system.xml" hash="80e9ed6e8e77e6517e87f1c258e51ae5"/></dir><dir name="sql"><dir name="customeractivation_setup"><file name="install-0.1.0.php" hash="daba549afd5282910754038d4bc1c637"/><file name="mysql4-install-0.1.0.php" hash="0b688c4f0c39efb95d4031c632f6b14d"/><file name="mysql4-upgrade-0.2.3-0.2.4.php" hash="d0739de5c91381e11828a033cb496659"/><file name="mysql4-upgrade-0.2.4-0.2.5.php" hash="3be30bef278024b66199c2df6526784d"/><file name="mysql4-upgrade-0.2.7-0.2.8.php" hash="086ef43b26c39e14e7d1211ad444576a"/><file name="mysql4-upgrade-0.2.8-0.2.9.php" hash="ac0250c5b6c2a807e1de7ce792fa6529"/><file name="mysql4-upgrade-0.2.9-0.3.0.php" hash="86e1cd5ae59f0591e3720f31c41fdf54"/><file name="mysql4-upgrade-0.3.0-0.3.1.php" hash="df03a10a2d5468cd083a800fbfdfe8ee"/><file name="mysql4-upgrade-0.3.1-0.3.2.php" hash="80cf342b3125b4411ffb038446aa25c2"/><file name="mysql4-upgrade-0.3.2-0.3.3.php" hash="7a49fbb49f7515b02385369dae61744e"/><file name="mysql4-upgrade-0.3.3-0.3.4.php" hash="7cd333f3336f391af3235cb3ebc1734a"/><file name="mysql4-upgrade-0.3.4-0.3.5.php" hash="520def5968f83a974b59a94e9ec7f043"/><file name="mysql4-upgrade-0.3.5-0.3.6.php" hash="d2f000af8029b235abb14ac9c9ff67ee"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="customerActivation.xml" hash="3e8b4f8041c225a3e16c825ffa9deb42"/></dir><dir name="template"><dir name="customerActivation"><file name="customerActivation.phtml" hash="617232d6030f4d5dc8f115886f576009"/><file name="customerImages.phtml" hash="40df0fb4b7eddfec77faf04f91284117"/><file name="fieldset.phtml" hash="b4ea61336d856aeabd9f186db3c6402b"/><dir name="info"><file name="purchaseorder.phtml" hash="8288341954620536133ce8f388b1864c"/></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="customerActivation.xml" hash="80a57bc40135ecd04987c8619dc899cf"/></dir><dir name="template"><dir name="customerActivation"><dir name="checkout"><dir name="onepage"><dir name="payment"><file name="methods.phtml" hash="2b00ae2441c9b77e7c86fa8e9a0e2341"/></dir><dir name="shipping_method"><file name="available.phtml" hash="d417b4c7bad432dafc8e1bc786f023d0"/></dir></dir></dir><file name="customerActivation.phtml" hash="83d6ecadd3dfbb95d4cf37ff22261bc1"/><dir name="form"><file name="purchaseorder.phtml" hash="94707f241d7203a08860891c909142dd"/></dir><dir name="info"><file name="purchaseorder.phtml" hash="d3f2a08ee55199680d563929493d0973"/></dir><dir name="onepage"><dir name="shipping_method"><file name="available.phtml" hash="343efe739dab39cd62da8d80c591f8e5"/></dir></dir><file name="quickorderproduct.phtml" hash="fdf324fde02b92709549bea1356a3211"/><file name="wholesaleLogin.phtml" hash="16455d9db43ab72c1b385d0ab8e8caee"/><file name="wholesaleRegister.phtml" hash="cd251c3e02fe432a304fe0c6be580b3e"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Exinent_CustomerActivation.xml" hash="1c70d1597abb1a6401935436754cfc50"/></dir></target></contents>
|
| 16 |
<compatible/>
|
| 17 |
+
<dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
|
| 18 |
</package>
|
