Liveagent - Version 2.5.7

Version Notes

changes:
- minor bugfixes

Download this release

Release Info

Developer Juraj Simon
Extension Liveagent
Version 2.5.7
Comparing to
See all releases


Code changes from version 2.5.6 to 2.5.7

Files changed (5) hide show
  1. app/code/local/Qualityunit/Liveagent/Block/Waiting.php +9 -9
  2. app/code/local/Qualityunit/Liveagent/Helper/Auth.php +1 -1
  3. app/code/local/Qualityunit/Liveagent/Helper/Settings.php +0 -1
  4. app/code/local/Qualityunit/Liveagent/controllers/Adminhtml/LiveagentController.php +8 -6
  5. package.xml +4 -6
app/code/local/Qualityunit/Liveagent/Block/Waiting.php CHANGED
@@ -2,12 +2,12 @@
2
  class Qualityunit_Liveagent_Block_Waiting extends Qualityunit_Liveagent_Block_Base {
3
  protected function _prepareLayout() {
4
  parent::_prepareLayout();
5
- $this->assignVariable('dialogCaption', Mage::helper('adminhtml')->__('LiveAgent - Live chat and helpdesk plugin for Magento'));
6
  $this->assignVariable('sectionCaption', Mage::helper('adminhtml')->__('Account Installation'));
7
  $this->assignVariable('completeUrlAction', $this->getUrl('*/*/post'));
8
  $this->assignVariable('installingText', Mage::helper('adminhtml')->__('Thank you! Your account will be online within next few minutes. Please wait...'));
9
  $this->assignVariable('confEmailText', Mage::helper('adminhtml')->__('You should recieve confirmation email with your account credentials shortly.'));
10
- $this->assignVariable('bitLongerText', Mage::helper('adminhtml')->__('Note: Sometimes account creation process may take a'));
11
  $this->assignVariable('bitLongerLink', Mage::helper('adminhtml')->__('bit longer'));
12
  $this->assignVariable('installText', Mage::helper('adminhtml')->__('Installing'));
13
  $this->assignVariable('formKey', Mage::getSingleton('core/session')->getFormKey());
@@ -24,11 +24,11 @@ class Qualityunit_Liveagent_Block_Waiting extends Qualityunit_Liveagent_Block_Ba
24
  <div class="content-header">
25
  <table cellspacing="0">
26
  <tbody><tr>
27
- <td style="width:50%;"><h3 class="icon-head head-promo-catalog">{dialogCaption}</h3></td>
28
  </tr>
29
  </tbody>
30
  </table>
31
- </div>
32
  <div class="entry-edit">
33
  <div class="entry-edit-head"><h4>{sectionCaption}</h4></div>
34
  <fieldset>
@@ -36,7 +36,7 @@ class Qualityunit_Liveagent_Block_Waiting extends Qualityunit_Liveagent_Block_Ba
36
  <tbody>
37
  <tr>
38
  <td>{installingText}</td>
39
- </tr>
40
  <tr>
41
  <td>{confEmailText}</td>
42
  </tr>
@@ -51,13 +51,13 @@ class Qualityunit_Liveagent_Block_Waiting extends Qualityunit_Liveagent_Block_Ba
51
  </tr>
52
  <tr>
53
  <td><i>{bitLongerText}</i><a href="http://support.qualityunit.com/knowledgebase/live-agent/integration/magento-plugin/frequently-asked-questions.html" target="_blank">{bitLongerLink}</a></td>
54
- </tr>
55
  </tbody>
56
  </table>
57
  </fieldset>
58
  </div>
59
  <script type="text/javascript"><!--//--><![CDATA[//><!--
60
- setTimeout("document.getElementById(\'liveagent_wait_status\').innerHTML = \'{initializingText}\'", 10);
61
  var timer = 3000;
62
  var percentage = 4;
63
  for (i=0;i<24;i++) {
@@ -66,7 +66,7 @@ class Qualityunit_Liveagent_Block_Waiting extends Qualityunit_Liveagent_Block_Ba
66
  percentage+=4;
67
  }
68
  setTimeout("window.location.reload()", timer);
69
- //--><!]]></script>
70
  ';
71
  }
72
- }
2
  class Qualityunit_Liveagent_Block_Waiting extends Qualityunit_Liveagent_Block_Base {
3
  protected function _prepareLayout() {
4
  parent::_prepareLayout();
5
+ $this->assignVariable('dialogCaption', Mage::helper('adminhtml')->__('LiveAgent - Free live chat and helpdesk plugin for Magento'));
6
  $this->assignVariable('sectionCaption', Mage::helper('adminhtml')->__('Account Installation'));
7
  $this->assignVariable('completeUrlAction', $this->getUrl('*/*/post'));
8
  $this->assignVariable('installingText', Mage::helper('adminhtml')->__('Thank you! Your account will be online within next few minutes. Please wait...'));
9
  $this->assignVariable('confEmailText', Mage::helper('adminhtml')->__('You should recieve confirmation email with your account credentials shortly.'));
10
+ $this->assignVariable('bitLongerText', Mage::helper('adminhtml')->__('Note: Sometimes account creation process may take a '));
11
  $this->assignVariable('bitLongerLink', Mage::helper('adminhtml')->__('bit longer'));
12
  $this->assignVariable('installText', Mage::helper('adminhtml')->__('Installing'));
13
  $this->assignVariable('formKey', Mage::getSingleton('core/session')->getFormKey());
24
  <div class="content-header">
25
  <table cellspacing="0">
26
  <tbody><tr>
27
+ <td style="width:50%;"><h3 class="icon-head head-promo-catalog">{dialogCaption}</h3></td>
28
  </tr>
29
  </tbody>
30
  </table>
31
+ </div>
32
  <div class="entry-edit">
33
  <div class="entry-edit-head"><h4>{sectionCaption}</h4></div>
34
  <fieldset>
36
  <tbody>
37
  <tr>
38
  <td>{installingText}</td>
39
+ </tr>
40
  <tr>
41
  <td>{confEmailText}</td>
42
  </tr>
51
  </tr>
52
  <tr>
53
  <td><i>{bitLongerText}</i><a href="http://support.qualityunit.com/knowledgebase/live-agent/integration/magento-plugin/frequently-asked-questions.html" target="_blank">{bitLongerLink}</a></td>
54
+ </tr>
55
  </tbody>
56
  </table>
57
  </fieldset>
58
  </div>
59
  <script type="text/javascript"><!--//--><![CDATA[//><!--
60
+ setTimeout("document.getElementById(\'liveagent_wait_status\').innerHTML = \'{initializingText}\'", 5);
61
  var timer = 3000;
62
  var percentage = 4;
63
  for (i=0;i<24;i++) {
66
  percentage+=4;
67
  }
68
  setTimeout("window.location.reload()", timer);
69
+ //--><!]]></script>
70
  ';
71
  }
72
+ }
app/code/local/Qualityunit/Liveagent/Helper/Auth.php CHANGED
@@ -88,4 +88,4 @@ class Qualityunit_Liveagent_Helper_Auth extends Qualityunit_Liveagent_Helper_Bas
88
  return $request->getData();
89
  }
90
  }
91
- ?>
88
  return $request->getData();
89
  }
90
  }
91
+
app/code/local/Qualityunit/Liveagent/Helper/Settings.php CHANGED
@@ -144,4 +144,3 @@ function(e){});
144
  return $this->getOption(Qualityunit_Liveagent_Helper_Settings::LA_URL_SETTING_NAME) == '' && $this->getOption(Qualityunit_Liveagent_Helper_Settings::LA_OWNER_EMAIL_SETTING_NAME) == '';
145
  }
146
  }
147
-
144
  return $this->getOption(Qualityunit_Liveagent_Helper_Settings::LA_URL_SETTING_NAME) == '' && $this->getOption(Qualityunit_Liveagent_Helper_Settings::LA_OWNER_EMAIL_SETTING_NAME) == '';
145
  }
146
  }
 
app/code/local/Qualityunit/Liveagent/controllers/Adminhtml/LiveagentController.php CHANGED
@@ -188,7 +188,11 @@ class Qualityunit_Liveagent_Adminhtml_LiveagentController extends Mage_Adminhtml
188
  if ($oldUrl == $post[Qualityunit_Liveagent_Helper_Settings::LA_URL_SETTING_NAME]) {
189
  return;
190
  }
191
- $this->settings->saveDefaultButtonCode();
 
 
 
 
192
  }
193
 
194
  public function indexAction() {
@@ -306,11 +310,6 @@ class Qualityunit_Liveagent_Adminhtml_LiveagentController extends Mage_Adminhtml
306
  throw new Qualityunit_Liveagent_Exception_SignupFailed($e->getMessage());
307
  }
308
  Mage::log("Signup response recieved: " . print_r($response, true), Zend_log::DEBUG);
309
-
310
- // if ($response->success != "Y") {
311
- // Mage::log("Response contain error:" . $response->errorMessage, Zend_log::DEBUG);
312
- // throw new Qualityunit_Liveagent_Exception_SignupFailed($response->errorMessage);
313
- // }
314
  Mage::log("Response OK", Zend_log::DEBUG);
315
  }
316
 
@@ -320,11 +319,14 @@ class Qualityunit_Liveagent_Adminhtml_LiveagentController extends Mage_Adminhtml
320
  $this->settings->setOption(Qualityunit_Liveagent_Helper_Settings::LA_OWNER_EMAIL_SETTING_NAME, $email);
321
  $this->settings->setOption(Qualityunit_Liveagent_Helper_Settings::LA_OWNER_PASSWORD_SETTING_NAME, $password);
322
  $this->settings->setOption(Qualityunit_Liveagent_Helper_Settings::LA_USE_API_KEY, 'Y');
 
 
323
  $this->settings->saveDefaultButtonCode();
324
  $this->settings->setOption(Qualityunit_Liveagent_Helper_Settings::ACCOUNT_STATUS, Qualityunit_Liveagent_Helper_Base::ACCOUNT_STATUS_WAIT);
325
  }
326
 
327
  private function skipWaitAction() {
 
328
  $this->settings->setOption(Qualityunit_Liveagent_Helper_Settings::ACCOUNT_STATUS, Qualityunit_Liveagent_Helper_Base::ACCOUNT_STATUS_SET);
329
  $this->settings->setOption(Qualityunit_Liveagent_Helper_Settings::ACCOUNT_NOT_REACHABLE_TIMES, 0);
330
  }
188
  if ($oldUrl == $post[Qualityunit_Liveagent_Helper_Settings::LA_URL_SETTING_NAME]) {
189
  return;
190
  }
191
+ if ($this->settings->useApiKey()) {
192
+
193
+ } else {
194
+ $this->settings->saveDefaultButtonCode();
195
+ }
196
  }
197
 
198
  public function indexAction() {
310
  throw new Qualityunit_Liveagent_Exception_SignupFailed($e->getMessage());
311
  }
312
  Mage::log("Signup response recieved: " . print_r($response, true), Zend_log::DEBUG);
 
 
 
 
 
313
  Mage::log("Response OK", Zend_log::DEBUG);
314
  }
315
 
319
  $this->settings->setOption(Qualityunit_Liveagent_Helper_Settings::LA_OWNER_EMAIL_SETTING_NAME, $email);
320
  $this->settings->setOption(Qualityunit_Liveagent_Helper_Settings::LA_OWNER_PASSWORD_SETTING_NAME, $password);
321
  $this->settings->setOption(Qualityunit_Liveagent_Helper_Settings::LA_USE_API_KEY, 'Y');
322
+ $this->settings->setOption(Qualityunit_Liveagent_Helper_Settings::OWNER_AUTHTOKEN, '');
323
+ $this->settings->setOption(Qualityunit_Liveagent_Helper_Settings::OWNER_SESSIONID, '');
324
  $this->settings->saveDefaultButtonCode();
325
  $this->settings->setOption(Qualityunit_Liveagent_Helper_Settings::ACCOUNT_STATUS, Qualityunit_Liveagent_Helper_Base::ACCOUNT_STATUS_WAIT);
326
  }
327
 
328
  private function skipWaitAction() {
329
+ $this->settings->setOption(Qualityunit_Liveagent_Helper_Settings::LA_USE_API_KEY, 'Y');
330
  $this->settings->setOption(Qualityunit_Liveagent_Helper_Settings::ACCOUNT_STATUS, Qualityunit_Liveagent_Helper_Base::ACCOUNT_STATUS_SET);
331
  $this->settings->setOption(Qualityunit_Liveagent_Helper_Settings::ACCOUNT_NOT_REACHABLE_TIMES, 0);
332
  }
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Liveagent</name>
4
- <version>2.5.6</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.gnu.org/licenses/gpl-3.0.txt">GPLv3</license>
7
  <channel>community</channel>
@@ -10,13 +10,11 @@
10
  <description>Magento-LiveAgent plugin integrates full featured help desk and live chat software Live Agent into any Magento installation.&#xD;
11
  Simply add "start chat" button by few simple clicks and be live within 5 minutes.</description>
12
  <notes>changes:&#xD;
13
- - signup is using new API&#xD;
14
- - minor fixes&#xD;
15
- - default button code change</notes>
16
  <authors><author><name>Juraj Simon</name><user>jurajsim</user><email>jsimon@qualityunit.com</email></author></authors>
17
  <date>2015-05-28</date>
18
- <time>12:17:26</time>
19
- <contents><target name="magelocal"><dir name="Qualityunit"><dir name="Liveagent"><dir name="Block"><file name="Account.php" hash="9cd8d7fdab5c6b88e3593edd5eb3ab38"/><file name="Base.php" hash="dc71cde05c3010139be7ccab1b9a9120"/><file name="Buttoncode.php" hash="4ff97380c40bdb7bec87464a7c06b6f9"/><file name="Signup.php" hash="861d0dc0d8dc1302e59b4a46c1a18153"/><file name="Waiting.php" hash="223cd9f902b00860c53d1f4fd395ee3f"/></dir><dir name="Exception"><file name="Base.php" hash="6efd9dcda657c33bc9cfe6709300b883"/><file name="ConnectProblem.php" hash="f2c9840d533e6389ba84989337de32c9"/><file name="SignupFailed.php" hash="e370773d3b306bb8c24e5263d1491860"/></dir><dir name="Helper"><file name="Account.php" hash="e82e7c5f8bfc34ce8016a50d9c072046"/><file name="Auth.php" hash="5fc9f40dd7a6b5e412361b27033b09b7"/><file name="Base.php" hash="5d7b663453478d14458103a694ab9137"/><file name="Data.php" hash="006a11910d2f5365f4d3fddb2a4058bf"/><file name="PhpApi.php" hash="adb77eb5ef4cc7a2d5b2adc076a3ee81"/><file name="Settings.php" hash="a859c416fdd16f61b6e3a035ef22807d"/><file name="Signup.php" hash="ef096f5f677389616d4bad8fb006b323"/></dir><dir name="Model"><file name="Buttons.php" hash="2db48b5ff722dc0aa13c27ee0d625e74"/><file name="Liveagent.php" hash="91844f01d97d79cff0ee0c91496fa3a3"/><dir name="Mysql4"><dir name="Buttons"><file name="Collection.php" hash="b93a104561a802454e06bfb8ffc29ef5"/></dir><file name="Buttons.php" hash="12ea6a6a4cd03692c1665bfd86b81aa8"/><dir name="Liveagent"><file name="Collection.php" hash="3682b0f4f0ec4b640c5ee215cec222f1"/></dir><file name="Liveagent.php" hash="c52f750808b18966862ef49738eb8daf"/><dir name="Settings"><file name="Collection.php" hash="19b1f3e92b930af46d36d436fb0cdc23"/></dir><file name="Settings.php" hash="7e02819c52cc34ffd14d27aad6165697"/></dir><file name="Settings.php" hash="0c99b933072e01be32b202315367fce9"/><file name="Status.php" hash="c743fdabadd7527820e7b8ede6937f38"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="LiveagentController.php" hash="d9cbbc574f1a9df57bdd0d9282403ff1"/></dir><file name="IndexController.php" hash="425c0f6b8d7e19d42ad491c5248efded"/></dir><dir name="etc"><file name="config.xml" hash="698ba467e2f87a54844e0ab544b55875"/></dir><dir name="sql"><dir name="liveagent_setup"><file name="mysql4-install-0.1.0.php" hash="21c2e292c7366bc46ff9a7b53ed72678"/><file name="mysql4-install-2.5.4.php" hash="ab55adfa2214c5ae0bb19053159377b3"/></dir></dir></dir><file name=".buildpath" hash="0d2475e3be03419439e2a22ebc4e0813"/><file name=".project" hash="41fa1353a5ab19352d5636d52e17351d"/><dir name=".settings"><file name="org.eclipse.php.core.prefs" hash="abf8f34f8087365ab830524698638d7c"/><file name="org.eclipse.wst.jsdt.ui.superType.container" hash="b27d1cf62dde4473bab7c433317bb0ce"/><file name="org.eclipse.wst.jsdt.ui.superType.name" hash="c89686a387d2b12b3c729ce35a0bcb5b"/><file name=".jsdtscope" hash="d098ed1fa924b2d9d9cb377fb391d758"/></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="liveagent.xml" hash="e07cbd75c0faa7d86c9c0a8a2ff53df1"/></dir><dir name="template"><dir name="liveagent"><file name="button.phtml" hash="3cef6df19c905140c8c8ce01520f0ebd"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Qualityunit_Liveagent.xml" hash="db13786c45588e15d5a390201a1709e4"/></dir></target><target name="magelocale"><dir name="en_US"><file name="qualityunit_liveagent.csv" hash="234db3c1cdc05df98928ae633500bc04"/></dir></target></contents>
20
  <compatible/>
21
  <dependencies><required><php><min>5.2.0</min><max>5.6.0</max></php><extension><name>curl</name><min/><max/></extension></required></dependencies>
22
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Liveagent</name>
4
+ <version>2.5.7</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.gnu.org/licenses/gpl-3.0.txt">GPLv3</license>
7
  <channel>community</channel>
10
  <description>Magento-LiveAgent plugin integrates full featured help desk and live chat software Live Agent into any Magento installation.&#xD;
11
  Simply add "start chat" button by few simple clicks and be live within 5 minutes.</description>
12
  <notes>changes:&#xD;
13
+ - minor bugfixes</notes>
 
 
14
  <authors><author><name>Juraj Simon</name><user>jurajsim</user><email>jsimon@qualityunit.com</email></author></authors>
15
  <date>2015-05-28</date>
16
+ <time>12:56:49</time>
17
+ <contents><target name="magelocal"><dir name="Qualityunit"><dir name="Liveagent"><dir name="Block"><file name="Account.php" hash="9cd8d7fdab5c6b88e3593edd5eb3ab38"/><file name="Base.php" hash="dc71cde05c3010139be7ccab1b9a9120"/><file name="Buttoncode.php" hash="4ff97380c40bdb7bec87464a7c06b6f9"/><file name="Signup.php" hash="861d0dc0d8dc1302e59b4a46c1a18153"/><file name="Waiting.php" hash="0faf6062cac51e7dcafc760fb77ac2f2"/></dir><dir name="Exception"><file name="Base.php" hash="6efd9dcda657c33bc9cfe6709300b883"/><file name="ConnectProblem.php" hash="f2c9840d533e6389ba84989337de32c9"/><file name="SignupFailed.php" hash="e370773d3b306bb8c24e5263d1491860"/></dir><dir name="Helper"><file name="Account.php" hash="e82e7c5f8bfc34ce8016a50d9c072046"/><file name="Auth.php" hash="509062285f12bcd192fec81b6d930510"/><file name="Base.php" hash="5d7b663453478d14458103a694ab9137"/><file name="Data.php" hash="006a11910d2f5365f4d3fddb2a4058bf"/><file name="PhpApi.php" hash="adb77eb5ef4cc7a2d5b2adc076a3ee81"/><file name="Settings.php" hash="f3566e52edc41747ec79f398c1c70948"/><file name="Signup.php" hash="ef096f5f677389616d4bad8fb006b323"/></dir><dir name="Model"><file name="Buttons.php" hash="2db48b5ff722dc0aa13c27ee0d625e74"/><file name="Liveagent.php" hash="91844f01d97d79cff0ee0c91496fa3a3"/><dir name="Mysql4"><dir name="Buttons"><file name="Collection.php" hash="b93a104561a802454e06bfb8ffc29ef5"/></dir><file name="Buttons.php" hash="12ea6a6a4cd03692c1665bfd86b81aa8"/><dir name="Liveagent"><file name="Collection.php" hash="3682b0f4f0ec4b640c5ee215cec222f1"/></dir><file name="Liveagent.php" hash="c52f750808b18966862ef49738eb8daf"/><dir name="Settings"><file name="Collection.php" hash="19b1f3e92b930af46d36d436fb0cdc23"/></dir><file name="Settings.php" hash="7e02819c52cc34ffd14d27aad6165697"/></dir><file name="Settings.php" hash="0c99b933072e01be32b202315367fce9"/><file name="Status.php" hash="c743fdabadd7527820e7b8ede6937f38"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="LiveagentController.php" hash="704e70de75e12a15e99921b25a5c3100"/></dir><file name="IndexController.php" hash="425c0f6b8d7e19d42ad491c5248efded"/></dir><dir name="etc"><file name="config.xml" hash="698ba467e2f87a54844e0ab544b55875"/></dir><dir name="sql"><dir name="liveagent_setup"><file name="mysql4-install-0.1.0.php" hash="21c2e292c7366bc46ff9a7b53ed72678"/><file name="mysql4-install-2.5.4.php" hash="ab55adfa2214c5ae0bb19053159377b3"/></dir></dir></dir><file name=".buildpath" hash="0d2475e3be03419439e2a22ebc4e0813"/><file name=".project" hash="41fa1353a5ab19352d5636d52e17351d"/><dir name=".settings"><file name="org.eclipse.php.core.prefs" hash="abf8f34f8087365ab830524698638d7c"/><file name="org.eclipse.wst.jsdt.ui.superType.container" hash="b27d1cf62dde4473bab7c433317bb0ce"/><file name="org.eclipse.wst.jsdt.ui.superType.name" hash="c89686a387d2b12b3c729ce35a0bcb5b"/><file name=".jsdtscope" hash="d098ed1fa924b2d9d9cb377fb391d758"/></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="liveagent.xml" hash="e07cbd75c0faa7d86c9c0a8a2ff53df1"/></dir><dir name="template"><dir name="liveagent"><file name="button.phtml" hash="3cef6df19c905140c8c8ce01520f0ebd"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Qualityunit_Liveagent.xml" hash="db13786c45588e15d5a390201a1709e4"/></dir></target><target name="magelocale"><dir name="en_US"><file name="qualityunit_liveagent.csv" hash="234db3c1cdc05df98928ae633500bc04"/></dir></target></contents>
18
  <compatible/>
19
  <dependencies><required><php><min>5.2.0</min><max>5.6.0</max></php><extension><name>curl</name><min/><max/></extension></required></dependencies>
20
  </package>