Version Notes
Stable
Download this release
Release Info
| Developer | Magento Core Team |
| Extension | Commerce_Sciences |
| Version | 1.0.40 |
| Comparing to | |
| See all releases | |
Code changes from version 1.0.46 to 1.0.40
- app/code/local/Commercesciences/Base/Block/Adminhtml/Config/Form/Renderer/Campaignid.php +3 -2
- app/code/local/Commercesciences/Base/Block/Adminhtml/Config/Form/Renderer/Group/About.php +0 -7
- app/code/local/Commercesciences/Base/Helper/Data.php +33 -18
- app/code/local/Commercesciences/Base/Model/Observer.php +47 -27
- app/code/local/Commercesciences/Base/Model/Resource/Setup.php +1 -1
- app/code/local/Commercesciences/Base/etc/config.xml +5 -5
- app/code/local/Commercesciences/Base/etc/system.xml +1 -1
- app/code/local/Commercesciences/Base/sql/{csinstall → commercesciences_base_setup}/mysql4-install-0.0.1.php +4 -0
- package.xml +7 -7
- skin/adminhtml/default/default/commercesciences/css/skin.css +19 -3
app/code/local/Commercesciences/Base/Block/Adminhtml/Config/Form/Renderer/Campaignid.php
CHANGED
|
@@ -66,7 +66,9 @@ class Commercesciences_Base_Block_Adminhtml_Config_Form_Renderer_Campaignid exte
|
|
| 66 |
$html .= '<div class="cswrapper form-list">';
|
| 67 |
$html .= '<div class="csexp1">'.$this->__("You're almost there! Please enter your email below to activate your account (Note: this email would be used to provide you updates and reports).").'</div>';
|
| 68 |
$html .= '<div class="csexp2"><div class="csexp2_left">Email Address</div><div class="csexp2_right">'.$inputBox.'</div></div>';
|
| 69 |
-
$html .= '<div class="csexp3"><div class="csexp3_left">Is Live on your store?</div><div class="csexp2_right"><select class="csexpt_right_select" disabled="disabled"><option>No</option></select><p class="note"><span>The personal bar will be hidden from your shoppers until you click "Go Live" from your Config Panel or your Magento dashboard.</span></p>'.$saveButton->toHtml()
|
|
|
|
|
|
|
| 70 |
$html .= '</div>';
|
| 71 |
|
| 72 |
return $html;
|
|
@@ -79,7 +81,6 @@ class Commercesciences_Base_Block_Adminhtml_Config_Form_Renderer_Campaignid exte
|
|
| 79 |
$html .= '<div class="csexp11_1">'.$this->__("Congratulations! Your new Personal Bar account is now ready.").'</div>';
|
| 80 |
$html .= '<div class="csexp11_2">'.$this->__("To configure the Personal Bar Experiences, Style and more, please click on Go to my Config Panel below.").'</div>';
|
| 81 |
$html .= '<div class="csexp11_3">'.$this->__("Your personal Bar will remain hidden from your store visitors until you Publish it.").'</div>';
|
| 82 |
-
$html .= '<div class="csexp11_4">'.$this->__("You can either Publish the Personal Bar from your Config Panel or from the drop list below.").'</div>';
|
| 83 |
$html .= '</div>';
|
| 84 |
$html .= '<div class="csexp11_5">'.$this->__("Personal Bar Settings").'</div>';
|
| 85 |
$html .= '<div class="csexp11_6">'.$this->__("The Personal Bar is fully customizable to fit your store's look & feel and to help you increase engagement and revenue.").'</div>';
|
| 66 |
$html .= '<div class="cswrapper form-list">';
|
| 67 |
$html .= '<div class="csexp1">'.$this->__("You're almost there! Please enter your email below to activate your account (Note: this email would be used to provide you updates and reports).").'</div>';
|
| 68 |
$html .= '<div class="csexp2"><div class="csexp2_left">Email Address</div><div class="csexp2_right">'.$inputBox.'</div></div>';
|
| 69 |
+
$html .= '<div class="csexp3"><div class="csexp3_left">Is Live on your store?</div><div class="csexp2_right"><select class="csexpt_right_select" disabled="disabled"><option>No</option></select><p class="note"><span>The personal bar will be hidden from your shoppers until you click "Go Live" from your Config Panel or your Magento dashboard.</span></p>'.$saveButton->toHtml();
|
| 70 |
+
$html .= '<p class="note"><span style="color:#ff0000;">Before clicking "Create My Account" - Please make sure you have logged-out and logged back in from your Magento admin, <br>and that you have clicked "Flush Magento Cache" (under System > Cache Management)</span></p>';
|
| 71 |
+
$html .= '</div></div>';
|
| 72 |
$html .= '</div>';
|
| 73 |
|
| 74 |
return $html;
|
| 81 |
$html .= '<div class="csexp11_1">'.$this->__("Congratulations! Your new Personal Bar account is now ready.").'</div>';
|
| 82 |
$html .= '<div class="csexp11_2">'.$this->__("To configure the Personal Bar Experiences, Style and more, please click on Go to my Config Panel below.").'</div>';
|
| 83 |
$html .= '<div class="csexp11_3">'.$this->__("Your personal Bar will remain hidden from your store visitors until you Publish it.").'</div>';
|
|
|
|
| 84 |
$html .= '</div>';
|
| 85 |
$html .= '<div class="csexp11_5">'.$this->__("Personal Bar Settings").'</div>';
|
| 86 |
$html .= '<div class="csexp11_6">'.$this->__("The Personal Bar is fully customizable to fit your store's look & feel and to help you increase engagement and revenue.").'</div>';
|
app/code/local/Commercesciences/Base/Block/Adminhtml/Config/Form/Renderer/Group/About.php
CHANGED
|
@@ -17,13 +17,6 @@ class Commercesciences_Base_Block_Adminhtml_Config_Form_Renderer_Group_About ext
|
|
| 17 |
|
| 18 |
public function render(Varien_Data_Form_Element_Abstract $element)
|
| 19 |
{
|
| 20 |
-
$websiteCode = Mage::app()->getRequest()->getParam('website');
|
| 21 |
-
$storeCode = Mage::app()->getRequest()->getParam('store');
|
| 22 |
-
|
| 23 |
-
if(!$websiteCode || !$storeCode){
|
| 24 |
-
return '';
|
| 25 |
-
}
|
| 26 |
-
|
| 27 |
$step = $this->getCsHelper()->getStep();
|
| 28 |
if($step != Commercesciences_Base_Helper_Data::STEP_ZERO){
|
| 29 |
return '';
|
| 17 |
|
| 18 |
public function render(Varien_Data_Form_Element_Abstract $element)
|
| 19 |
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 20 |
$step = $this->getCsHelper()->getStep();
|
| 21 |
if($step != Commercesciences_Base_Helper_Data::STEP_ZERO){
|
| 22 |
return '';
|
app/code/local/Commercesciences/Base/Helper/Data.php
CHANGED
|
@@ -7,14 +7,13 @@ class Commercesciences_Base_Helper_Data extends Mage_Core_Helper_Abstract{
|
|
| 7 |
const STEP_TWO = 2;
|
| 8 |
|
| 9 |
const CONFIG_EMAIL = 'commercesciences/required_param/email';
|
| 10 |
-
const
|
| 11 |
-
|
| 12 |
|
| 13 |
/**
|
| 14 |
* handles the errors
|
| 15 |
*/
|
| 16 |
public function handleError($error){
|
| 17 |
-
Mage::log("Error:".$error, null, 'cs-error.log', true);
|
| 18 |
throw new Exception($error);
|
| 19 |
}
|
| 20 |
|
|
@@ -47,7 +46,7 @@ class Commercesciences_Base_Helper_Data extends Mage_Core_Helper_Abstract{
|
|
| 47 |
$this->_step = Commercesciences_Base_Helper_Data::STEP_TWO;
|
| 48 |
}else{
|
| 49 |
$error = $this->__("Error ocurred. Your updates weren't saved. Please contact ComemrceScience for support (error id: 005)");
|
| 50 |
-
Mage::log("Error:".$error, null, 'cs-error.log', true);
|
| 51 |
throw new Exception($error);
|
| 52 |
return;
|
| 53 |
}
|
|
@@ -85,11 +84,17 @@ class Commercesciences_Base_Helper_Data extends Mage_Core_Helper_Abstract{
|
|
| 85 |
|
| 86 |
try {
|
| 87 |
|
| 88 |
-
Mage::log("xxx", null, "debug6.log", true);
|
|
|
|
|
|
|
| 89 |
|
| 90 |
$response = $RESTClient->restPost("/magento/registerPost", array('email' => $email, 'storeURL'=>$storeUrl));
|
| 91 |
$responseJson = $response->getBody();
|
| 92 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 93 |
//fictive
|
| 94 |
//$responseJson = '{"good":true,"data":{"securityToken":"qfJpXFdiccH2LtAXy3U3mMZFRNiAbMsiGocKpk9RLarqda9001YYxXjYyQwy","userID":12296,"tag":"\u003c!-- CS Bar --\u003e\r\n\u003cscript type\u003d\u0027text/javascript\u0027\u003e\r\nvar script \u003d document.createElement(\u0027script\u0027);\r\nscript.type \u003d \u0027text/javascript\u0027;\r\nscript.src \u003d ((document.location.protocol \u003d\u003d \u0027https:\u0027) ? \u0027https://\u0027 : \u0027http://\u0027) +\r\n \u0027app.cdn-cs.com/b/4Udqvg/k9rip6/l/cs_all.js\u0027;\r\ndocument.getElementsByTagName(\u0027head\u0027)[0].appendChild(script);\r\n\u003c/script\u003e\r\n\u003c!-- end CS --\u003e\r\n"}}';
|
| 95 |
|
|
@@ -125,25 +130,35 @@ class Commercesciences_Base_Helper_Data extends Mage_Core_Helper_Abstract{
|
|
| 125 |
}
|
| 126 |
$parsedResponse = $this->stdObject2Array($parsedResponseArr['data']);
|
| 127 |
|
| 128 |
-
$csConfig = Mage::getModel("commercesciences_base/config")->load("1");
|
| 129 |
-
if(!$csConfig){
|
| 130 |
-
$csConfig = Mage::getModel("commercesciences_base/config");
|
| 131 |
-
}
|
| 132 |
-
//renew mysql connection
|
| 133 |
-
$csConfig->getResource()->getReadConnection()->closeConnection();
|
| 134 |
-
$csConfig->getResource()->getReadConnection()->getConnection();
|
| 135 |
-
|
| 136 |
if(!isset($parsedResponse['securityToken']) || !$parsedResponse['securityToken']
|
| 137 |
|| !isset($parsedResponse['userID']) || !$parsedResponse['userID']
|
| 138 |
|| !isset($parsedResponse['tag']) || !$parsedResponse['tag']){
|
| 139 |
return $this->__("Error ocurred. Your updates weren't saved. Please contact ComemrceScience for support (error id: 001)");
|
| 140 |
}
|
| 141 |
|
| 142 |
-
$
|
| 143 |
-
|
| 144 |
-
|
| 145 |
-
|
| 146 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 147 |
|
| 148 |
return array('error' => false);
|
| 149 |
}catch(Exception $e){
|
| 7 |
const STEP_TWO = 2;
|
| 8 |
|
| 9 |
const CONFIG_EMAIL = 'commercesciences/required_param/email';
|
| 10 |
+
const DEFAULT_MYSQL_TIMEOUT = 10;
|
|
|
|
| 11 |
|
| 12 |
/**
|
| 13 |
* handles the errors
|
| 14 |
*/
|
| 15 |
public function handleError($error){
|
| 16 |
+
//Mage::log("Error:".$error, null, 'cs-error.log', true);
|
| 17 |
throw new Exception($error);
|
| 18 |
}
|
| 19 |
|
| 46 |
$this->_step = Commercesciences_Base_Helper_Data::STEP_TWO;
|
| 47 |
}else{
|
| 48 |
$error = $this->__("Error ocurred. Your updates weren't saved. Please contact ComemrceScience for support (error id: 005)");
|
| 49 |
+
//Mage::log("Error:".$error, null, 'cs-error.log', true);
|
| 50 |
throw new Exception($error);
|
| 51 |
return;
|
| 52 |
}
|
| 84 |
|
| 85 |
try {
|
| 86 |
|
| 87 |
+
//Mage::log("xxx", null, "debug6.log", true);
|
| 88 |
+
|
| 89 |
+
$timeBeforeApiCall = time();
|
| 90 |
|
| 91 |
$response = $RESTClient->restPost("/magento/registerPost", array('email' => $email, 'storeURL'=>$storeUrl));
|
| 92 |
$responseJson = $response->getBody();
|
| 93 |
|
| 94 |
+
$timeAfterApiCall = time();
|
| 95 |
+
//Mage::log("yyy-".$responseJson, null, "debug6.log", true);
|
| 96 |
+
//Mage::log("zzz-".($timeAfterApiCall-$timeBeforeApiCall), null, "debug6.log", true);
|
| 97 |
+
|
| 98 |
//fictive
|
| 99 |
//$responseJson = '{"good":true,"data":{"securityToken":"qfJpXFdiccH2LtAXy3U3mMZFRNiAbMsiGocKpk9RLarqda9001YYxXjYyQwy","userID":12296,"tag":"\u003c!-- CS Bar --\u003e\r\n\u003cscript type\u003d\u0027text/javascript\u0027\u003e\r\nvar script \u003d document.createElement(\u0027script\u0027);\r\nscript.type \u003d \u0027text/javascript\u0027;\r\nscript.src \u003d ((document.location.protocol \u003d\u003d \u0027https:\u0027) ? \u0027https://\u0027 : \u0027http://\u0027) +\r\n \u0027app.cdn-cs.com/b/4Udqvg/k9rip6/l/cs_all.js\u0027;\r\ndocument.getElementsByTagName(\u0027head\u0027)[0].appendChild(script);\r\n\u003c/script\u003e\r\n\u003c!-- end CS --\u003e\r\n"}}';
|
| 100 |
|
| 130 |
}
|
| 131 |
$parsedResponse = $this->stdObject2Array($parsedResponseArr['data']);
|
| 132 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 133 |
if(!isset($parsedResponse['securityToken']) || !$parsedResponse['securityToken']
|
| 134 |
|| !isset($parsedResponse['userID']) || !$parsedResponse['userID']
|
| 135 |
|| !isset($parsedResponse['tag']) || !$parsedResponse['tag']){
|
| 136 |
return $this->__("Error ocurred. Your updates weren't saved. Please contact ComemrceScience for support (error id: 001)");
|
| 137 |
}
|
| 138 |
|
| 139 |
+
if($timeAfterApiCall-$timeBeforeApiCall > self::DEFAULT_MYSQL_TIMEOUT){
|
| 140 |
+
//Mage::log("ffff", null, "debug6.log", true);
|
| 141 |
+
|
| 142 |
+
//pobably mysql serer has gone away, save data in the session
|
| 143 |
+
|
| 144 |
+
$adminSession = Mage::getModel('customer/session');
|
| 145 |
+
$adminSession->setCsUserId($parsedResponse['userID']);
|
| 146 |
+
$adminSession->setCsSecurityToken($parsedResponse['securityToken']);
|
| 147 |
+
$adminSession->setCsTag($parsedResponse['tag']);
|
| 148 |
+
}else{
|
| 149 |
+
$csConfig = Mage::getModel("commercesciences_base/config")->load("1");
|
| 150 |
+
if(!$csConfig){
|
| 151 |
+
$csConfig = Mage::getModel("commercesciences_base/config");
|
| 152 |
+
}
|
| 153 |
+
$csConfig->setStep(Commercesciences_Base_Helper_Data::STEP_ONE)
|
| 154 |
+
->setSecurityToken($parsedResponse['securityToken'])
|
| 155 |
+
->setUserId($parsedResponse['userID'])
|
| 156 |
+
->setTag($parsedResponse['tag'])
|
| 157 |
+
->save();
|
| 158 |
+
}
|
| 159 |
+
|
| 160 |
+
|
| 161 |
+
|
| 162 |
|
| 163 |
return array('error' => false);
|
| 164 |
}catch(Exception $e){
|
app/code/local/Commercesciences/Base/Model/Observer.php
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?php
|
| 2 |
class Commercesciences_Base_Model_Observer
|
| 3 |
-
{
|
| 4 |
-
|
| 5 |
|
| 6 |
/**
|
| 7 |
* retrieve the module helper
|
|
@@ -23,14 +23,14 @@ class Commercesciences_Base_Model_Observer
|
|
| 23 |
*/
|
| 24 |
public function addCommercesciencesHtml($observer)
|
| 25 |
{
|
| 26 |
-
|
| 27 |
-
|
| 28 |
-
|
| 29 |
|
| 30 |
-
|
| 31 |
-
|
| 32 |
return;
|
| 33 |
-
|
| 34 |
|
| 35 |
|
| 36 |
|
|
@@ -39,22 +39,22 @@ class Commercesciences_Base_Model_Observer
|
|
| 39 |
return;
|
| 40 |
}
|
| 41 |
|
| 42 |
-
|
| 43 |
-
|
| 44 |
-
|
| 45 |
-
|
| 46 |
-
|
| 47 |
-
|
| 48 |
-
|
| 49 |
-
|
| 50 |
-
|
| 51 |
-
|
| 52 |
-
|
| 53 |
-
|
| 54 |
-
|
| 55 |
-
|
| 56 |
-
|
| 57 |
-
|
| 58 |
|
| 59 |
}
|
| 60 |
|
|
@@ -75,6 +75,8 @@ class Commercesciences_Base_Model_Observer
|
|
| 75 |
return;
|
| 76 |
}
|
| 77 |
|
|
|
|
|
|
|
| 78 |
$step = $this->getCsHelper()->getStep();
|
| 79 |
$csHelper = $this->getCsHelper();
|
| 80 |
|
|
@@ -90,7 +92,7 @@ class Commercesciences_Base_Model_Observer
|
|
| 90 |
if($step == Commercesciences_Base_Helper_Data::STEP_ZERO){
|
| 91 |
//check valid email
|
| 92 |
if(!isset($params['groups']['required_param']['fields']['email']['value'])
|
| 93 |
-
|
| 94 |
$csHelper->handleError($csHelper->__('The email should not be empty'));
|
| 95 |
return;
|
| 96 |
}
|
|
@@ -130,12 +132,30 @@ class Commercesciences_Base_Model_Observer
|
|
| 130 |
}
|
| 131 |
|
| 132 |
public function beforeTabLoaded($observer){
|
| 133 |
-
return;
|
| 134 |
$controller_action = $observer->getControllerAction();
|
| 135 |
$request = $controller_action->getRequest();
|
| 136 |
if($controller_action->getFullActionName() == "adminhtml_system_config_edit"){
|
| 137 |
if($request->getParam('section') == 'commercesciences'){
|
| 138 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 139 |
}
|
| 140 |
}
|
| 141 |
}
|
| 1 |
<?php
|
| 2 |
class Commercesciences_Base_Model_Observer
|
| 3 |
+
{
|
| 4 |
+
private $_putcommercesciences = false;
|
| 5 |
|
| 6 |
/**
|
| 7 |
* retrieve the module helper
|
| 23 |
*/
|
| 24 |
public function addCommercesciencesHtml($observer)
|
| 25 |
{
|
| 26 |
+
if($this->_putcommercesciences){
|
| 27 |
+
return;
|
| 28 |
+
}
|
| 29 |
|
| 30 |
+
$request = Mage::app()->getRequest();
|
| 31 |
+
if(($request->getRouteName() == "adminhtml")){
|
| 32 |
return;
|
| 33 |
+
}
|
| 34 |
|
| 35 |
|
| 36 |
|
| 39 |
return;
|
| 40 |
}
|
| 41 |
|
| 42 |
+
$block = $observer->getBlock();
|
| 43 |
+
$transport = $observer->getTransport();
|
| 44 |
+
|
| 45 |
+
if($block->getNameInLayout() == "footer"){
|
| 46 |
+
$transportHTML = $transport->getHtml();
|
| 47 |
+
$transport->setHtml($transportHTML.$commercesciencesTag);
|
| 48 |
+
$this->_putcommercesciences = true;
|
| 49 |
+
return;
|
| 50 |
+
}
|
| 51 |
+
|
| 52 |
+
if($block->getNameInLayout() == "before_body_end"){
|
| 53 |
+
$transportHTML = $transport->getHtml();
|
| 54 |
+
$transport->setHtml($transportHTML.$commercesciencesTag);
|
| 55 |
+
$this->_putcommercesciences = true;
|
| 56 |
+
return;
|
| 57 |
+
}
|
| 58 |
|
| 59 |
}
|
| 60 |
|
| 75 |
return;
|
| 76 |
}
|
| 77 |
|
| 78 |
+
|
| 79 |
+
|
| 80 |
$step = $this->getCsHelper()->getStep();
|
| 81 |
$csHelper = $this->getCsHelper();
|
| 82 |
|
| 92 |
if($step == Commercesciences_Base_Helper_Data::STEP_ZERO){
|
| 93 |
//check valid email
|
| 94 |
if(!isset($params['groups']['required_param']['fields']['email']['value'])
|
| 95 |
+
|| !trim($params['groups']['required_param']['fields']['email']['value'])){
|
| 96 |
$csHelper->handleError($csHelper->__('The email should not be empty'));
|
| 97 |
return;
|
| 98 |
}
|
| 132 |
}
|
| 133 |
|
| 134 |
public function beforeTabLoaded($observer){
|
|
|
|
| 135 |
$controller_action = $observer->getControllerAction();
|
| 136 |
$request = $controller_action->getRequest();
|
| 137 |
if($controller_action->getFullActionName() == "adminhtml_system_config_edit"){
|
| 138 |
if($request->getParam('section') == 'commercesciences'){
|
| 139 |
+
$adminSession = Mage::getModel('customer/session');
|
| 140 |
+
//Mage::log("vvvv", null, "debug6.log", true);
|
| 141 |
+
if($adminSession->getCsUserId()
|
| 142 |
+
&& $adminSession->getCsSecurityToken()
|
| 143 |
+
&& $adminSession->getCsTag()){
|
| 144 |
+
$csConfig = Mage::getModel("commercesciences_base/config")->load("1");
|
| 145 |
+
if(!$csConfig || !$csConfig->getId()){
|
| 146 |
+
$csConfig = Mage::getModel("commercesciences_base/config");
|
| 147 |
+
}
|
| 148 |
+
$csConfig->setUserId($adminSession->getCsUserId());
|
| 149 |
+
$csConfig->setSecurityToken($adminSession->getCsSecurityToken());
|
| 150 |
+
$csConfig->setTag($adminSession->getCsTag());
|
| 151 |
+
$csConfig->save();
|
| 152 |
+
|
| 153 |
+
$adminSession->unsetData("cs_user_id");
|
| 154 |
+
$adminSession->unsetData("cs_security_token");
|
| 155 |
+
$adminSession->unsetData("cs_tag");
|
| 156 |
+
|
| 157 |
+
//Mage::log("ppp-".$csConfig->getUserId(), null, "debug6.log", true);
|
| 158 |
+
}
|
| 159 |
}
|
| 160 |
}
|
| 161 |
}
|
app/code/local/Commercesciences/Base/Model/Resource/Setup.php
CHANGED
|
@@ -1,6 +1,6 @@
|
|
| 1 |
<?php
|
| 2 |
class Commercesciences_Base_Model_Resource_Setup
|
| 3 |
-
extends
|
| 4 |
{
|
| 5 |
|
| 6 |
}
|
| 1 |
<?php
|
| 2 |
class Commercesciences_Base_Model_Resource_Setup
|
| 3 |
+
extends Mage_Core_Model_Resource_Setup
|
| 4 |
{
|
| 5 |
|
| 6 |
}
|
app/code/local/Commercesciences/Base/etc/config.xml
CHANGED
|
@@ -26,7 +26,7 @@
|
|
| 26 |
</commercesciences_core_block_abstract_to_html_after>
|
| 27 |
</observers>
|
| 28 |
</core_block_abstract_to_html_after>
|
| 29 |
-
<
|
| 30 |
<observers>
|
| 31 |
<commercesciences_admin_system_config_changed_section_commercesciences>
|
| 32 |
<type>singleton</type>
|
|
@@ -34,7 +34,7 @@
|
|
| 34 |
<method>performStepLogic</method>
|
| 35 |
</commercesciences_admin_system_config_changed_section_commercesciences>
|
| 36 |
</observers>
|
| 37 |
-
</
|
| 38 |
<controller_action_predispatch_adminhtml_system_config_edit>
|
| 39 |
<observers>
|
| 40 |
<commercesciences_controller_action_predispatch_adminhtml_system_config_edit>
|
|
@@ -70,12 +70,12 @@
|
|
| 70 |
</commercesciences_base_mysql4>
|
| 71 |
</models>
|
| 72 |
<resources>
|
| 73 |
-
<
|
| 74 |
<setup>
|
| 75 |
<module>Commercesciences_Base</module>
|
| 76 |
<class>Commercesciences_Base_Model_Resource_Setup</class>
|
| 77 |
</setup>
|
| 78 |
-
</
|
| 79 |
</resources>
|
| 80 |
</global>
|
| 81 |
<default>
|
|
@@ -127,4 +127,4 @@
|
|
| 127 |
</resources>
|
| 128 |
</acl>
|
| 129 |
</adminhtml>
|
| 130 |
-
</config>
|
| 26 |
</commercesciences_core_block_abstract_to_html_after>
|
| 27 |
</observers>
|
| 28 |
</core_block_abstract_to_html_after>
|
| 29 |
+
<core_config_data_save_before>
|
| 30 |
<observers>
|
| 31 |
<commercesciences_admin_system_config_changed_section_commercesciences>
|
| 32 |
<type>singleton</type>
|
| 34 |
<method>performStepLogic</method>
|
| 35 |
</commercesciences_admin_system_config_changed_section_commercesciences>
|
| 36 |
</observers>
|
| 37 |
+
</core_config_data_save_before>
|
| 38 |
<controller_action_predispatch_adminhtml_system_config_edit>
|
| 39 |
<observers>
|
| 40 |
<commercesciences_controller_action_predispatch_adminhtml_system_config_edit>
|
| 70 |
</commercesciences_base_mysql4>
|
| 71 |
</models>
|
| 72 |
<resources>
|
| 73 |
+
<commercesciences_base_setup>
|
| 74 |
<setup>
|
| 75 |
<module>Commercesciences_Base</module>
|
| 76 |
<class>Commercesciences_Base_Model_Resource_Setup</class>
|
| 77 |
</setup>
|
| 78 |
+
</commercesciences_base_setup>
|
| 79 |
</resources>
|
| 80 |
</global>
|
| 81 |
<default>
|
| 127 |
</resources>
|
| 128 |
</acl>
|
| 129 |
</adminhtml>
|
| 130 |
+
</config>
|
app/code/local/Commercesciences/Base/etc/system.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<config>
|
| 2 |
<tabs>
|
| 3 |
<commercesciences>
|
| 4 |
-
<label>
|
| 5 |
<sort_order>800</sort_order>
|
| 6 |
</commercesciences>
|
| 7 |
</tabs>
|
| 1 |
<config>
|
| 2 |
<tabs>
|
| 3 |
<commercesciences>
|
| 4 |
+
<label>Personal Bar</label>
|
| 5 |
<sort_order>800</sort_order>
|
| 6 |
</commercesciences>
|
| 7 |
</tabs>
|
app/code/local/Commercesciences/Base/sql/{csinstall → commercesciences_base_setup}/mysql4-install-0.0.1.php
RENAMED
|
@@ -3,6 +3,10 @@
|
|
| 3 |
$installer = $this;
|
| 4 |
$installer->startSetup();
|
| 5 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 6 |
$installer->run("
|
| 7 |
DROP TABLE IF EXISTS `{$installer->getTable('commercesciences_base/config')}`;
|
| 8 |
CREATE TABLE `{$installer->getTable('commercesciences_base/config')}` (
|
| 3 |
$installer = $this;
|
| 4 |
$installer->startSetup();
|
| 5 |
|
| 6 |
+
/* iterate on the stores and delete old cs configurations */
|
| 7 |
+
//@TODO
|
| 8 |
+
|
| 9 |
+
|
| 10 |
$installer->run("
|
| 11 |
DROP TABLE IF EXISTS `{$installer->getTable('commercesciences_base/config')}`;
|
| 12 |
CREATE TABLE `{$installer->getTable('commercesciences_base/config')}` (
|
package.xml
CHANGED
|
@@ -1,18 +1,18 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Commerce_Sciences</name>
|
| 4 |
-
<version>1.0.
|
| 5 |
<stability>stable</stability>
|
| 6 |
-
<license
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
-
<summary>
|
| 10 |
-
<description>
|
| 11 |
<notes>Stable</notes>
|
| 12 |
<authors><author><name>CSciences</name><user>auto-converted</user><email>avivr@commercesciences.com</email></author></authors>
|
| 13 |
-
<date>2012-11-
|
| 14 |
-
<time>
|
| 15 |
-
<contents><target name="magelocal"><dir name="Commercesciences"><dir name="Base"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Form"><dir name="Renderer"><dir name="Group"><file name="About.php" hash="
|
| 16 |
<compatible/>
|
| 17 |
<dependencies/>
|
| 18 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Commerce_Sciences</name>
|
| 4 |
+
<version>1.0.40</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
+
<license>OSL</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
+
<summary>trial</summary>
|
| 10 |
+
<description>trial</description>
|
| 11 |
<notes>Stable</notes>
|
| 12 |
<authors><author><name>CSciences</name><user>auto-converted</user><email>avivr@commercesciences.com</email></author></authors>
|
| 13 |
+
<date>2012-11-03</date>
|
| 14 |
+
<time>14:03:06</time>
|
| 15 |
+
<contents><target name="magelocal"><dir name="Commercesciences"><dir name="Base"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Form"><dir name="Renderer"><dir name="Group"><file name="About.php" hash="a16457268fe17d002e171059bae3c34f"/></dir><file name="About.php" hash="0cb1eb47f815edbc7bd73f7b99f5e993"/><file name="Campaignid.php" hash="f57b905258ef89a5e85eccf65f8bbbab"/><file name="Isactive.php" hash="2a25355d0f457f28a413d6a87ab45d2a"/></dir></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="2a4b02da1d698ec720db77e7330abd03"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Source"><file name="Fontstyle.php" hash="c651dc8613a3a501ae7c43dd56f7ca10"/></dir></dir></dir></dir><dir name="Mysql4"><file name="Config.php" hash="4d66326f7313bbdf67ca8c16ed34e87d"/></dir><dir name="Resource"><file name="Setup.php" hash="fb19aa68ae9c60f3869247ca109904a4"/></dir><file name="Config.php" hash="5db637f6c8a9ed31c113dde29d87e9de"/><file name="Observer.php" hash="c459e567ba7a9efaee8ce115e714371b"/></dir><dir name="controllers"><file name="ApiController.php" hash="254e5482daed31d581689f988593a99b"/></dir><dir name="etc"><file name="config.xml" hash="7404d3aae752c3a638c5fa3b55a4fbd6"/><file name="system.xml" hash="d120e7366fd3045e3030098dbf1ce2b3"/></dir><dir name="sql"><dir name="commercesciences_base_setup"><file name="mysql4-install-0.0.1.php" hash="17057c596cd36ea4a1e9d87cf37bc0de"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Commercesciences_Base.xml" hash="3223d3e6acdeac74abe8b6f10d899522"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="commercesciences.xml" hash="85100232edb979c031e05c3977664781"/></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="commercesciences"><dir name="css"><file name="skin.css" hash="5f9245e592c4fb5178edcc744336e4b7"/></dir><dir name="images"><file name="CS-Logo-innerpage.png" hash="450dc4a05822cba236a3400bfa1535f7"/><file name="icons-boxed.png" hash="703749e7a6dd991cffc3767244f14887"/><file name="intro-img.png" hash="20f4193fef90371b49379e6df1e8d523"/><file name="setup-takes-2-minutes.png" hash="9b69dde5ccc771e6910adb3a153cf591"/></dir></dir></dir></dir></dir></target></contents>
|
| 16 |
<compatible/>
|
| 17 |
<dependencies/>
|
| 18 |
</package>
|
skin/adminhtml/default/default/commercesciences/css/skin.css
CHANGED
|
@@ -20,7 +20,23 @@
|
|
| 20 |
.cswrapper{
|
| 21 |
padding: 0 10px;
|
| 22 |
font-weight: bold;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 23 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 24 |
.csexp2, .csexp3{
|
| 25 |
width: 500px;
|
| 26 |
margin: 20px 0 0;
|
|
@@ -224,10 +240,10 @@
|
|
| 224 |
font-size: 75%;
|
| 225 |
}
|
| 226 |
|
| 227 |
-
.cs_key-text-block
|
| 228 |
text-align: center;
|
| 229 |
}
|
| 230 |
-
.cs_ending-block
|
| 231 |
text-align: center;
|
| 232 |
}
|
| 233 |
.cs_ending-block p {
|
|
@@ -309,4 +325,4 @@
|
|
| 309 |
font-style: normal;
|
| 310 |
font-weight: 400;
|
| 311 |
src: local('Pontano Sans'), local('PontanoSans-Regular'), url(http://themes.googleusercontent.com/static/fonts/pontanosans/v1/gTHiwyxi6S7iiHpqAoiE3HhCUOGz7vYGh680lGh-uXM.woff) format('woff');
|
| 312 |
-
}
|
| 20 |
.cswrapper{
|
| 21 |
padding: 0 10px;
|
| 22 |
font-weight: bold;
|
| 23 |
+
|
| 24 |
+
}
|
| 25 |
+
|
| 26 |
+
|
| 27 |
+
/* Fix for IE8 */
|
| 28 |
+
.cs_wrap .link-ph {
|
| 29 |
+
min-width: 900px;
|
| 30 |
+
}
|
| 31 |
+
.csexp1{
|
| 32 |
+
min-width: 900px;
|
| 33 |
}
|
| 34 |
+
.cswrapper div {
|
| 35 |
+
min-width: 900px;
|
| 36 |
+
}
|
| 37 |
+
/* End Fix for IE8 */
|
| 38 |
+
|
| 39 |
+
|
| 40 |
.csexp2, .csexp3{
|
| 41 |
width: 500px;
|
| 42 |
margin: 20px 0 0;
|
| 240 |
font-size: 75%;
|
| 241 |
}
|
| 242 |
|
| 243 |
+
.cs_key-text-block {
|
| 244 |
text-align: center;
|
| 245 |
}
|
| 246 |
+
.cs_ending-block {
|
| 247 |
text-align: center;
|
| 248 |
}
|
| 249 |
.cs_ending-block p {
|
| 325 |
font-style: normal;
|
| 326 |
font-weight: 400;
|
| 327 |
src: local('Pontano Sans'), local('PontanoSans-Regular'), url(http://themes.googleusercontent.com/static/fonts/pontanosans/v1/gTHiwyxi6S7iiHpqAoiE3HhCUOGz7vYGh680lGh-uXM.woff) format('woff');
|
| 328 |
+
}
|
