Version Notes
0.1.38
Download this release
Release Info
| Developer | Magento Core Team |
| Extension | Commerce_Sciences |
| Version | 0.1.38 |
| Comparing to | |
| See all releases | |
Code changes from version 1.0.36 to 0.1.38
- app/code/local/Commercesciences/Base/Block/Adminhtml/Config/Form/Renderer/About.php +5 -45
- app/code/local/Commercesciences/Base/Block/Adminhtml/Config/Form/Renderer/Campaignid.php +6 -6
- app/code/local/Commercesciences/Base/Helper/Data.php +15 -11
- app/code/local/Commercesciences/Base/Model/Adminhtml/System/Config/Source/Fontstyle.php +0 -32
- app/code/local/Commercesciences/Base/Model/Observer.php +5 -0
- app/code/local/Commercesciences/Base/controllers/ApiController.php +0 -38
- app/code/local/Commercesciences/Base/etc/config.xml +1 -1
- app/code/local/Commercesciences/Base/etc/system.xml +1 -1
- app/code/local/Commercesciences/Base/sql/commercesciences_base_setup/mysql4-install-0.0.1.php +0 -5
- app/code/local/Commercesciences/Base/sql/commercesciences_base_setup/mysql4-upgrade-0.0.1-1.0.6.php +17 -0
- package.xml +7 -7
- skin/adminhtml/default/default/commercesciences/css/skin.css +0 -14
app/code/local/Commercesciences/Base/Block/Adminhtml/Config/Form/Renderer/About.php
CHANGED
|
@@ -23,8 +23,7 @@ class Commercesciences_Base_Block_Adminhtml_Config_Form_Renderer_About extends M
|
|
| 23 |
* @return string
|
| 24 |
*/
|
| 25 |
public function render(Varien_Data_Form_Element_Abstract $element){
|
| 26 |
-
$html = '<div class="
|
| 27 |
-
<div class="cs_wrap">
|
| 28 |
<div id="main" style="">
|
| 29 |
|
| 30 |
<div class="cs_key-text-block">
|
|
@@ -35,53 +34,14 @@ class Commercesciences_Base_Block_Adminhtml_Config_Form_Renderer_About extends M
|
|
| 35 |
<h3><strong>designed to ease navigation, increase engagement and revenue</strong></h3>
|
| 36 |
</div>
|
| 37 |
</div>
|
| 38 |
-
<div class="cs_setup-takes-2-min"></div>
|
| 39 |
-
</div>
|
| 40 |
-
</div>
|
| 41 |
-
|
| 42 |
-
<div class="cs_bar-guide-block">
|
| 43 |
-
<div class="cs_bar-guide-img"></div>
|
| 44 |
-
</div>
|
| 45 |
-
|
| 46 |
-
<div class="cs_details-block">
|
| 47 |
-
<div class="cs_container">
|
| 48 |
-
<div class="cs_row cs_highlight-details" id="getIntuitive">
|
| 49 |
-
<div class="cs_span2 cs_feature-icon"></div>
|
| 50 |
-
<div class="cs_span10 cs_highlight-details-desc">
|
| 51 |
-
<h3><strong>Get Intuitive.</strong> Enable quick access to key site\'s assets, anywhere.</h3>
|
| 52 |
-
<p>Avoid shoppers abandonment due to complex navigation. Improve site usability by gathering all key assets in one intuitive place which is always-on. Adding a <strong>Personal Bar</strong>™ will ease navigation with <i>Search & Checkout</i>, emphasize customer care with <i>Chat & Feedback</i>, boost social with <i>Facebook Like & Google’s +1</i>. It\'s based on your existing site capabilities (e.g. search) as well as offers many new experiences.</p>
|
| 53 |
-
</div>
|
| 54 |
-
</div>
|
| 55 |
-
|
| 56 |
-
<div class="cs_row highlight-details" id="standOut">
|
| 57 |
-
<div class="cs_span10 cs_highlight-details-desc">
|
| 58 |
-
<h3><strong>Stand Out.</strong> Add a stunning edge to your online store in minutes.</h3>
|
| 59 |
-
<p>Improve your brand recognition through a compelling shopping experience. Creating your own <strong>Personal Bar</strong>™ is easy. You don\'t need to be a web designer or developer. Just choose or create a <strong>Personal Bar</strong>™ theme you love and customize it to your needs through our easy-to-use Config Panel. Upload your own logo and add a lovable Personal Shopper to enhance your store’s design.</p>
|
| 60 |
-
</div>
|
| 61 |
-
<div class="cs_span2 cs_feature-icon cs_stand-out"></div>
|
| 62 |
-
</div>
|
| 63 |
-
|
| 64 |
-
<div class="cs_row cs_highlight-details" id="growSales">
|
| 65 |
-
<div class="cs_span2 cs_feature-icon cs_grow-sales"></div>
|
| 66 |
-
<div class="cs_span10 cs_highlight-details-desc">
|
| 67 |
-
<h3><strong>Grow Sales.</strong> Increase your traffic and Facebook fanbase.</h3>
|
| 68 |
-
<p>In today\'s era of Social SEO, gaining social visibility is critical to your store\'s success. Recent studies show that up to 30% of traffic comes from social networks such as Facebook, Google +1 and Pinterest. The <strong>Personal Bar</strong>™ is designed to enable shoppers to easily share with their Facebook friends, join your fanbase, and click on +1 improving your Google ranking. And the best part - it encourages shoppers to further engage by rewarding them with a compelling coupon.</p>
|
| 69 |
-
</div>
|
| 70 |
-
</div>
|
| 71 |
-
|
| 72 |
-
|
| 73 |
-
</div>
|
| 74 |
-
</div>
|
| 75 |
-
|
| 76 |
-
<div class="cs_ending-block">
|
| 77 |
-
<div class="link-ph">
|
| 78 |
-
<p>Have Questions? <a class="start-now" href="http://commercesciences.com/contact">contact us</a></p>
|
| 79 |
</div>
|
| 80 |
</div>
|
| 81 |
|
|
|
|
|
|
|
| 82 |
</div>
|
| 83 |
-
|
| 84 |
-
|
| 85 |
|
| 86 |
|
| 87 |
return $html;
|
| 23 |
* @return string
|
| 24 |
*/
|
| 25 |
public function render(Varien_Data_Form_Element_Abstract $element){
|
| 26 |
+
$html = ' <div class="cs_wrap">
|
|
|
|
| 27 |
<div id="main" style="">
|
| 28 |
|
| 29 |
<div class="cs_key-text-block">
|
| 34 |
<h3><strong>designed to ease navigation, increase engagement and revenue</strong></h3>
|
| 35 |
</div>
|
| 36 |
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 37 |
</div>
|
| 38 |
</div>
|
| 39 |
|
| 40 |
+
<div class="cs_bar-guide-block">
|
| 41 |
+
<div class="cs_bar-guide-img"></div>
|
| 42 |
</div>
|
| 43 |
+
</div>
|
| 44 |
+
</div>';
|
| 45 |
|
| 46 |
|
| 47 |
return $html;
|
app/code/local/Commercesciences/Base/Block/Adminhtml/Config/Form/Renderer/Campaignid.php
CHANGED
|
@@ -24,7 +24,7 @@ class Commercesciences_Base_Block_Adminhtml_Config_Form_Renderer_Campaignid exte
|
|
| 24 |
* @return string
|
| 25 |
*/
|
| 26 |
public function render(Varien_Data_Form_Element_Abstract $element){
|
| 27 |
-
$html = '<script type="text/javascript">
|
| 28 |
document.observe("dom:loaded", function() {
|
| 29 |
|
| 30 |
$$(".scalable.save").each(function(element){
|
|
@@ -66,10 +66,10 @@ 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"
|
| 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;
|
| 75 |
}
|
|
@@ -79,14 +79,14 @@ class Commercesciences_Base_Block_Adminhtml_Config_Form_Renderer_Campaignid exte
|
|
| 79 |
$html .= '<div class="cswrapper form-list">';
|
| 80 |
$html .= '<div class="csexp11">';
|
| 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>';
|
| 87 |
$html .= '<div class="csexp11_7"><a href="'.$linkToConfBar.'" target="_blank">'.$this->__("Go to my Config Panel»").'</a></div>';
|
| 88 |
|
| 89 |
-
$html .= '</div>';
|
| 90 |
|
| 91 |
return $html;
|
| 92 |
}
|
|
@@ -97,7 +97,7 @@ class Commercesciences_Base_Block_Adminhtml_Config_Form_Renderer_Campaignid exte
|
|
| 97 |
$html .= '<div class="csexp21">'.$this->__("Personal Bar Settings").'</div>';
|
| 98 |
$html .= '<div class="csexp22">'.$this->__("The Personal Bar is fully customizable to fit your store’s look & feel and to help you increase engagement and revenue.").'</div>';
|
| 99 |
$html .= '<div class="csexp23"><a href="'.$linkToConfBar.'" target="_blank">'.$this->__("Go to my Config Panel»").'</a></div>';
|
| 100 |
-
$html .= '</div>';
|
| 101 |
|
| 102 |
return $html;
|
| 103 |
}
|
| 24 |
* @return string
|
| 25 |
*/
|
| 26 |
public function render(Varien_Data_Form_Element_Abstract $element){
|
| 27 |
+
$html = '<tr><td><script type="text/javascript">
|
| 28 |
document.observe("dom:loaded", function() {
|
| 29 |
|
| 30 |
$$(".scalable.save").each(function(element){
|
| 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"></div><div class="csexp2_right"><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></td></tr>';
|
| 73 |
|
| 74 |
return $html;
|
| 75 |
}
|
| 79 |
$html .= '<div class="cswrapper form-list">';
|
| 80 |
$html .= '<div class="csexp11">';
|
| 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>';
|
| 87 |
$html .= '<div class="csexp11_7"><a href="'.$linkToConfBar.'" target="_blank">'.$this->__("Go to my Config Panel»").'</a></div>';
|
| 88 |
|
| 89 |
+
$html .= '</div></td></tr>';
|
| 90 |
|
| 91 |
return $html;
|
| 92 |
}
|
| 97 |
$html .= '<div class="csexp21">'.$this->__("Personal Bar Settings").'</div>';
|
| 98 |
$html .= '<div class="csexp22">'.$this->__("The Personal Bar is fully customizable to fit your store’s look & feel and to help you increase engagement and revenue.").'</div>';
|
| 99 |
$html .= '<div class="csexp23"><a href="'.$linkToConfBar.'" target="_blank">'.$this->__("Go to my Config Panel»").'</a></div>';
|
| 100 |
+
$html .= '</div></td></tr>';
|
| 101 |
|
| 102 |
return $html;
|
| 103 |
}
|
app/code/local/Commercesciences/Base/Helper/Data.php
CHANGED
|
@@ -116,13 +116,12 @@ class Commercesciences_Base_Helper_Data extends Mage_Core_Helper_Abstract{
|
|
| 116 |
}
|
| 117 |
if($parsedResponseArr['good'] == false){
|
| 118 |
if(isset($parsedResponseArr['fieldErrors']) && $parsedResponseArr['fieldErrors']){
|
| 119 |
-
$fieldErrorsArr = $parsedResponseArr['fieldErrors'];
|
| 120 |
$errorMsg = '';
|
| 121 |
foreach($fieldErrorsArr as $field => $fError){
|
| 122 |
-
$errorMsg .=
|
|
|
|
| 123 |
}
|
| 124 |
-
//remove the last comma
|
| 125 |
-
$errorMsg = substr($errorMsg, 0, strlen($errorMsg)-1);
|
| 126 |
return array('error' => $errorMsg);
|
| 127 |
}elseif(isset($parsedResponseArr['globalError']) && $parsedResponseArr['globalError']){
|
| 128 |
return array('error' => $this->__($parsedResponseArr['globalError']));
|
|
@@ -150,17 +149,20 @@ class Commercesciences_Base_Helper_Data extends Mage_Core_Helper_Abstract{
|
|
| 150 |
if(!$csConfig){
|
| 151 |
$csConfig = Mage::getModel("commercesciences_base/config");
|
| 152 |
}
|
| 153 |
-
$csConfig->
|
| 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){
|
| 165 |
//timeout or other unhandled exception was thrown
|
| 166 |
return array('error' => $this->__($e->getMessage()));
|
|
@@ -204,10 +206,11 @@ class Commercesciences_Base_Helper_Data extends Mage_Core_Helper_Abstract{
|
|
| 204 |
}
|
| 205 |
if($parsedResponseArr['good'] == false){
|
| 206 |
if(isset($parsedResponseArr['fieldErrors']) && $parsedResponseArr['fieldErrors']){
|
| 207 |
-
$fieldErrorsArr = $parsedResponseArr['fieldErrors'];
|
| 208 |
$errorMsg = '';
|
| 209 |
foreach($fieldErrorsArr as $field => $fError){
|
| 210 |
-
$errorMsg .=
|
|
|
|
| 211 |
}
|
| 212 |
//remove the last comma
|
| 213 |
$errorMsg = substr($errorMsg, 0, strlen($errorMsg)-1);
|
|
@@ -293,10 +296,11 @@ class Commercesciences_Base_Helper_Data extends Mage_Core_Helper_Abstract{
|
|
| 293 |
}
|
| 294 |
if($parsedResponseArr['good'] == false){
|
| 295 |
if(isset($parsedResponseArr['fieldErrors']) && $parsedResponseArr['fieldErrors']){
|
| 296 |
-
$fieldErrorsArr = $parsedResponseArr['fieldErrors'];
|
| 297 |
$errorMsg = '';
|
| 298 |
foreach($fieldErrorsArr as $field => $fError){
|
| 299 |
-
$errorMsg .=
|
|
|
|
| 300 |
}
|
| 301 |
$errorMsg = substr($errorMsg, 0, strlen($errorMsg)-1);
|
| 302 |
return array('error' => $errorMsg);
|
| 116 |
}
|
| 117 |
if($parsedResponseArr['good'] == false){
|
| 118 |
if(isset($parsedResponseArr['fieldErrors']) && $parsedResponseArr['fieldErrors']){
|
| 119 |
+
$fieldErrorsArr = $this->stdObject2Array($parsedResponseArr['fieldErrors']);
|
| 120 |
$errorMsg = '';
|
| 121 |
foreach($fieldErrorsArr as $field => $fError){
|
| 122 |
+
$errorMsg .= "<br />";
|
| 123 |
+
$errorMsg .= $this->__($field).": ".$this->__($fError);
|
| 124 |
}
|
|
|
|
|
|
|
| 125 |
return array('error' => $errorMsg);
|
| 126 |
}elseif(isset($parsedResponseArr['globalError']) && $parsedResponseArr['globalError']){
|
| 127 |
return array('error' => $this->__($parsedResponseArr['globalError']));
|
| 149 |
if(!$csConfig){
|
| 150 |
$csConfig = Mage::getModel("commercesciences_base/config");
|
| 151 |
}
|
| 152 |
+
$csConfig->setSecurityToken($parsedResponse['securityToken'])
|
|
|
|
| 153 |
->setUserId($parsedResponse['userID'])
|
| 154 |
->setTag($parsedResponse['tag'])
|
| 155 |
->save();
|
| 156 |
}
|
| 157 |
|
| 158 |
|
| 159 |
+
$message = '';
|
| 160 |
+
if(isset($parsedResponse['message']) && $parsedResponse['message']){
|
| 161 |
+
$message = $parsedResponse['message'];
|
| 162 |
+
}
|
| 163 |
|
| 164 |
+
return array('error' => false, 'message' => $message);
|
| 165 |
|
|
|
|
| 166 |
}catch(Exception $e){
|
| 167 |
//timeout or other unhandled exception was thrown
|
| 168 |
return array('error' => $this->__($e->getMessage()));
|
| 206 |
}
|
| 207 |
if($parsedResponseArr['good'] == false){
|
| 208 |
if(isset($parsedResponseArr['fieldErrors']) && $parsedResponseArr['fieldErrors']){
|
| 209 |
+
$fieldErrorsArr = $this->stdObject2Array($parsedResponseArr['fieldErrors']);
|
| 210 |
$errorMsg = '';
|
| 211 |
foreach($fieldErrorsArr as $field => $fError){
|
| 212 |
+
$errorMsg .= "<br />";
|
| 213 |
+
$errorMsg .= $this->__($field).": ".$this->__($fError);
|
| 214 |
}
|
| 215 |
//remove the last comma
|
| 216 |
$errorMsg = substr($errorMsg, 0, strlen($errorMsg)-1);
|
| 296 |
}
|
| 297 |
if($parsedResponseArr['good'] == false){
|
| 298 |
if(isset($parsedResponseArr['fieldErrors']) && $parsedResponseArr['fieldErrors']){
|
| 299 |
+
$fieldErrorsArr = $this->stdObject2Array($parsedResponseArr['fieldErrors']);
|
| 300 |
$errorMsg = '';
|
| 301 |
foreach($fieldErrorsArr as $field => $fError){
|
| 302 |
+
$errorMsg .= "<br />";
|
| 303 |
+
$errorMsg .= $this->__($field).": ".$this->__($fError);
|
| 304 |
}
|
| 305 |
$errorMsg = substr($errorMsg, 0, strlen($errorMsg)-1);
|
| 306 |
return array('error' => $errorMsg);
|
app/code/local/Commercesciences/Base/Model/Adminhtml/System/Config/Source/Fontstyle.php
DELETED
|
@@ -1,32 +0,0 @@
|
|
| 1 |
-
<?php
|
| 2 |
-
|
| 3 |
-
|
| 4 |
-
class Commercesciences_Base_Model_Adminhtml_System_Config_Source_Fontstyle{
|
| 5 |
-
|
| 6 |
-
/**
|
| 7 |
-
* Options getter
|
| 8 |
-
*
|
| 9 |
-
* @return array
|
| 10 |
-
*/
|
| 11 |
-
public function toOptionArray()
|
| 12 |
-
{
|
| 13 |
-
$helper = Mage::helper("commercesciences_base");
|
| 14 |
-
$options = array(
|
| 15 |
-
array('value' => 0, 'label'=>$helper->__('normal')),
|
| 16 |
-
array('value' => 1, 'label'=>$helper->__('italic')),
|
| 17 |
-
array('value' => 2, 'label'=>$helper->__('oblique')),
|
| 18 |
-
);
|
| 19 |
-
|
| 20 |
-
return $options;
|
| 21 |
-
}
|
| 22 |
-
|
| 23 |
-
public function toAssocArray(){
|
| 24 |
-
$helper = Mage::helper("commercesciences_base");
|
| 25 |
-
$assocArr = array(
|
| 26 |
-
'0' => $helper->__('normal'),
|
| 27 |
-
'1' => $helper->__('italic'),
|
| 28 |
-
'2' => $helper->__('oblique')
|
| 29 |
-
);
|
| 30 |
-
return $assocArr;
|
| 31 |
-
}
|
| 32 |
-
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/local/Commercesciences/Base/Model/Observer.php
CHANGED
|
@@ -110,6 +110,11 @@ class Commercesciences_Base_Model_Observer
|
|
| 110 |
return;
|
| 111 |
}
|
| 112 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 113 |
//customer registered - clear the cache
|
| 114 |
Mage::app()->cleanCache();
|
| 115 |
}
|
| 110 |
return;
|
| 111 |
}
|
| 112 |
|
| 113 |
+
if($result['message']){
|
| 114 |
+
//Mage::log("ffff-".$result['message'], null, "debug6.log", true);
|
| 115 |
+
Mage::getSingleton('adminhtml/session')->addNotice($result['message']);
|
| 116 |
+
}
|
| 117 |
+
|
| 118 |
//customer registered - clear the cache
|
| 119 |
Mage::app()->cleanCache();
|
| 120 |
}
|
app/code/local/Commercesciences/Base/controllers/ApiController.php
DELETED
|
@@ -1,38 +0,0 @@
|
|
| 1 |
-
<?php
|
| 2 |
-
|
| 3 |
-
|
| 4 |
-
class Commercesciences_Base_ApiController extends Mage_Core_Controller_Front_Action
|
| 5 |
-
{
|
| 6 |
-
public function setisconfiguredAction()
|
| 7 |
-
{
|
| 8 |
-
$request = $this->getRequest();
|
| 9 |
-
if ($request->isPost()) {
|
| 10 |
-
$userId = $request->getParam('userId');
|
| 11 |
-
$securityToken = $request->getParam('securityToken');
|
| 12 |
-
|
| 13 |
-
$csConfig = Mage::getModel("commercesciences_base/config")->load('1');
|
| 14 |
-
if($csConfig
|
| 15 |
-
&& $csConfig->getUserId()==$userId
|
| 16 |
-
&& $csConfig->getSecurityToken()==$securityToken){
|
| 17 |
-
$csConfig->setStep(Commercesciences_Base_Helper_Data::STEP_TWO);
|
| 18 |
-
$csConfig->save();
|
| 19 |
-
$responseArray = array(
|
| 20 |
-
'good' => 'true'
|
| 21 |
-
);
|
| 22 |
-
}else{
|
| 23 |
-
$responseArray = array(
|
| 24 |
-
'good' => 'false',
|
| 25 |
-
'error' => 'The customer doesnt have such user_id/security_token in his database'
|
| 26 |
-
);
|
| 27 |
-
}
|
| 28 |
-
}else{
|
| 29 |
-
$responseArray = array(
|
| 30 |
-
'good' => 'false',
|
| 31 |
-
'error' => 'The request should be of type POST'
|
| 32 |
-
);
|
| 33 |
-
}
|
| 34 |
-
|
| 35 |
-
$this->getResponse()->setHeader('Content-Type', 'application/json', true)->setBody(json_encode($responseArray));
|
| 36 |
-
return;
|
| 37 |
-
}
|
| 38 |
-
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/local/Commercesciences/Base/etc/config.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<config>
|
| 2 |
<modules>
|
| 3 |
<Commercesciences_Base>
|
| 4 |
-
<version>
|
| 5 |
</Commercesciences_Base>
|
| 6 |
</modules>
|
| 7 |
<frontend>
|
| 1 |
<config>
|
| 2 |
<modules>
|
| 3 |
<Commercesciences_Base>
|
| 4 |
+
<version>1.0.6</version>
|
| 5 |
</Commercesciences_Base>
|
| 6 |
</modules>
|
| 7 |
<frontend>
|
app/code/local/Commercesciences/Base/etc/system.xml
CHANGED
|
@@ -17,7 +17,7 @@
|
|
| 17 |
<show_in_store>1</show_in_store>
|
| 18 |
<groups>
|
| 19 |
<required_param>
|
| 20 |
-
<label>Personal Bar
|
| 21 |
<frontend_type>text</frontend_type>
|
| 22 |
<sort_order>10</sort_order>
|
| 23 |
<show_in_default>1</show_in_default>
|
| 17 |
<show_in_store>1</show_in_store>
|
| 18 |
<groups>
|
| 19 |
<required_param>
|
| 20 |
+
<label>Personal Bar</label>
|
| 21 |
<frontend_type>text</frontend_type>
|
| 22 |
<sort_order>10</sort_order>
|
| 23 |
<show_in_default>1</show_in_default>
|
app/code/local/Commercesciences/Base/sql/commercesciences_base_setup/mysql4-install-0.0.1.php
CHANGED
|
@@ -3,15 +3,10 @@
|
|
| 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')}` (
|
| 13 |
`entity_id` int(1) unsigned NOT NULL default 1,
|
| 14 |
-
`step` int(1) unsigned default NULL,
|
| 15 |
`user_id` varchar(20) default NULL,
|
| 16 |
`security_token` varchar(1024) default NULL,
|
| 17 |
`tag` varchar(2048) default NULL,
|
| 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')}` (
|
| 9 |
`entity_id` int(1) unsigned NOT NULL default 1,
|
|
|
|
| 10 |
`user_id` varchar(20) default NULL,
|
| 11 |
`security_token` varchar(1024) default NULL,
|
| 12 |
`tag` varchar(2048) default NULL,
|
app/code/local/Commercesciences/Base/sql/commercesciences_base_setup/mysql4-upgrade-0.0.1-1.0.6.php
ADDED
|
@@ -0,0 +1,17 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
|
| 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')}` (
|
| 9 |
+
`entity_id` int(1) unsigned NOT NULL default 1,
|
| 10 |
+
`user_id` varchar(20) default NULL,
|
| 11 |
+
`security_token` varchar(1024) default NULL,
|
| 12 |
+
`tag` varchar(2048) default NULL,
|
| 13 |
+
PRIMARY KEY (`entity_id`)
|
| 14 |
+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
| 15 |
+
");
|
| 16 |
+
|
| 17 |
+
$installer->endSetup();
|
package.xml
CHANGED
|
@@ -1,18 +1,18 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Commerce_Sciences</name>
|
| 4 |
-
<version>1.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">OSL</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
-
<summary>
|
| 10 |
-
<description>
|
| 11 |
-
<notes>
|
| 12 |
<authors><author><name>CSciences</name><user>auto-converted</user><email>avivr@commercesciences.com</email></author></authors>
|
| 13 |
-
<date>2012-10-
|
| 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="a16457268fe17d002e171059bae3c34f"/></dir><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>0.1.38</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">OSL</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
+
<summary>Commerce_Sciences1501</summary>
|
| 10 |
+
<description>Commerce_Sciences1501</description>
|
| 11 |
+
<notes>0.1.38</notes>
|
| 12 |
<authors><author><name>CSciences</name><user>auto-converted</user><email>avivr@commercesciences.com</email></author></authors>
|
| 13 |
+
<date>2012-10-31</date>
|
| 14 |
+
<time>20:24:48</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="52d990b5450282c887f14c88e0bf143c"/><file name="Campaignid.php" hash="9b7e4d295f8f80a10df946e88de23e24"/><file name="Isactive.php" hash="2a25355d0f457f28a413d6a87ab45d2a"/></dir></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="219434a1266a281a2368f4a181e2f565"/></dir><dir name="Model"><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="151cd8d802d14ae78c27b0c58588a5ff"/></dir><dir name="etc"><file name="config.xml" hash="9354c6d80e935edcfa1fea8e998411be"/><file name="system.xml" hash="7bd5559f2911cf82fc30a7c4a1cd8ca4"/></dir><dir name="sql"><dir name="commercesciences_base_setup"><file name="mysql4-install-0.0.1.php" hash="e7c5c8bd79dcd828c28daae5ee449ae0"/><file name="mysql4-upgrade-0.0.1-1.0.6.php" hash="e7c5c8bd79dcd828c28daae5ee449ae0"/></dir></dir></dir></dir></target><target name="mage"><dir name="app"><dir name="etc"><dir name="modules"><file name="Commercesciences_Base.xml" hash="3223d3e6acdeac74abe8b6f10d899522"/></dir></dir></dir><dir name="skin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="commercesciences"><dir name="css"><file name="skin.css" hash="c958b0e9585f80e07311f994dc35d438"/></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></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></contents>
|
| 16 |
<compatible/>
|
| 17 |
<dependencies/>
|
| 18 |
</package>
|
skin/adminhtml/default/default/commercesciences/css/skin.css
CHANGED
|
@@ -23,20 +23,6 @@
|
|
| 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;
|
| 23 |
|
| 24 |
}
|
| 25 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 26 |
.csexp2, .csexp3{
|
| 27 |
width: 500px;
|
| 28 |
margin: 20px 0 0;
|
