mobile_assistant_connector - Version 1.2.9

Version Notes

Fixed:
- stats in dashboard
- pagination for order items
- improved compatibility with Magento Mobile Assistant 3.0.0.3

*Works only with release of app (2.6.1) and higher

Download this release

Release Info

Developer eMagicOne
Extension mobile_assistant_connector
Version 1.2.9
Comparing to
See all releases


Code changes from version 1.2.8 to 1.2.9

Files changed (5) hide show
  1. app/code/community/Emagicone/Mobassistantconnector/Model/Observer.php +1 -0
  2. app/code/community/Emagicone/Mobassistantconnector/controllers/IndexController.php +4 -2
  3. app/code/community/Emagicone/Mobassistantconnector/etc/config.xml +1 -1
  4. app/design/adminhtml/default/default/template/mobassistantconnector/jsinit.phtml +1 -0
  5. package.xml +7 -5
app/code/community/Emagicone/Mobassistantconnector/Model/Observer.php CHANGED
@@ -110,6 +110,7 @@ class Emagicone_Mobassistantconnector_Model_Observer
110
  $storeUrl = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB);
111
  $storeUrl = str_replace('http://', '', $storeUrl);
112
  $storeUrl = str_replace('https://', '', $storeUrl);
 
113
 
114
  preg_replace('/\/*$/i', '', $storeUrl);
115
 
110
  $storeUrl = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB);
111
  $storeUrl = str_replace('http://', '', $storeUrl);
112
  $storeUrl = str_replace('https://', '', $storeUrl);
113
+ $storeUrl = rtrim($storeUrl, '/' );
114
 
115
  preg_replace('/\/*$/i', '', $storeUrl);
116
 
app/code/community/Emagicone/Mobassistantconnector/controllers/IndexController.php CHANGED
@@ -678,7 +678,8 @@ class Emagicone_Mobassistantconnector_IndexController extends Mage_Core_Controll
678
  // $row['count_orders'] = $ordersCollection->getSize();
679
  $row['count_orders'] = $first['count_orders'];
680
 
681
- $nice_nm = $this->bd_nice_number($ordersSum);
 
682
 
683
  $row['total_sales'] = $this->_price_format($this->def_currency, 1, $nice_nm, $this->currency_code, 0, true);
684
  $store_stats = array_merge($store_stats, $row);
@@ -1360,7 +1361,8 @@ class Emagicone_Mobassistantconnector_IndexController extends Mage_Core_Controll
1360
  }
1361
 
1362
  if (!empty($this->page) && !empty($this->show)) {
1363
- $ordersItemsCollection->setPage($this->page, $this->show);
 
1364
  }
1365
 
1366
  $block = Mage::app()->getLayout()->createBlock('sales/order_item_renderer_default');
678
  // $row['count_orders'] = $ordersCollection->getSize();
679
  $row['count_orders'] = $first['count_orders'];
680
 
681
+ // $nice_nm = $this->bd_nice_number($ordersSum);
682
+ $nice_nm = $ordersSum;
683
 
684
  $row['total_sales'] = $this->_price_format($this->def_currency, 1, $nice_nm, $this->currency_code, 0, true);
685
  $store_stats = array_merge($store_stats, $row);
1361
  }
1362
 
1363
  if (!empty($this->page) && !empty($this->show)) {
1364
+ $ordersItemsCollection->getSelect()->limit($this->show, ($this->page - 1) * $this->show);
1365
+ // $ordersItemsCollection->setPage($this->page, $this->show);
1366
  }
1367
 
1368
  $block = Mage::app()->getLayout()->createBlock('sales/order_item_renderer_default');
app/code/community/Emagicone/Mobassistantconnector/etc/config.xml CHANGED
@@ -15,7 +15,7 @@
15
 
16
  <modules>
17
  <Emagicone_Mobassistantconnector>
18
- <version>1.2.8</version>
19
  </Emagicone_Mobassistantconnector>
20
  </modules>
21
  <frontend>
15
 
16
  <modules>
17
  <Emagicone_Mobassistantconnector>
18
+ <version>1.2.9</version>
19
  </Emagicone_Mobassistantconnector>
20
  </modules>
21
  <frontend>
app/design/adminhtml/default/default/template/mobassistantconnector/jsinit.phtml CHANGED
@@ -4,6 +4,7 @@
4
  $store_url = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB);
5
  $store_url = str_replace('http://', '', $store_url);
6
  $store_url = str_replace('https://', '', $store_url);
 
7
  preg_replace('/\/*$/i', '', $store_url);
8
  $array['url'] = $store_url;
9
  $array['login'] = $login;
4
  $store_url = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB);
5
  $store_url = str_replace('http://', '', $store_url);
6
  $store_url = str_replace('https://', '', $store_url);
7
+ $store_url = rtrim($store_url, '/' );
8
  preg_replace('/\/*$/i', '', $store_url);
9
  $array['url'] = $store_url;
10
  $array['login'] = $login;
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>mobile_assistant_connector</name>
4
- <version>1.2.8</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.gnu.org/licenses/gpl.html">GNU</license>
7
  <channel>community</channel>
@@ -9,13 +9,15 @@
9
  <summary>Mobile Assistant Connector</summary>
10
  <description>Mobile Assistant Connector</description>
11
  <notes>Fixed:&#xD;
12
- - some redundant code&#xD;
 
 
13
  &#xD;
14
  *Works only with release of app (2.6.1) and higher</notes>
15
  <authors><author><name>eMagicOne</name><user>mobile</user><email>mobile@emagicone.com</email></author></authors>
16
- <date>2015-12-11</date>
17
- <time>11:39:48</time>
18
- <contents><target name="magecommunity"><dir name="Emagicone"><dir name="Mobassistantconnector"><dir name="Helper"><file name="Access.php" hash="c6f4c96ca225bbc72cb829c59f7808f1"/><file name="Data.php" hash="efa0278512e07a2b87bcb4ee3fe80470"/></dir><dir name="Model"><file name="Defpassword.php" hash="921e5344ba325ddf1aaba6aeb2202696"/><file name="Failed.php" hash="7da654c3cf1e9a3f5a55da7f36192117"/><file name="Login.php" hash="bedbce507924854910524fbabe1c4948"/><file name="Observer.php" hash="324a82764d34bd6684c727c7936a291b"/><file name="Order.php" hash="f3d5529e0504ea0265cb661e03f41109"/><file name="Password.php" hash="66e2050ecc7b56deb654b5476ac1746c"/><dir name="Resource"><dir name="Failed"><file name="Collection.php" hash="18980688d80660f6a663a2c4dce20f54"/></dir><file name="Failed.php" hash="a69ca1239d3400097fabc415ee02751b"/><dir name="Sessions"><file name="Collection.php" hash="397e9a6f637472b59abe42bca09ea616"/></dir><file name="Sessions.php" hash="4d9f6cdd340fd95549d287c6107285ac"/></dir><file name="Sessions.php" hash="e3a32e26446e4cd27032c99dde8d4cfa"/></dir><dir name="controllers"><file name="IndexController.php" hash="4ce0a7ba723929f67a804a79e9daff14"/><dir name="adminhtml"><file name="IndexController.php" hash="e8fc499b74daeef9dbf856e813cbefb8"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="333ed888c7f8a1e067821b6547e34340"/><file name="config.xml" hash="5580e98fcaf56b457542f0e892b000bf"/><file name="system.xml" hash="916fe7ee643e4dcb15a5498219605896"/></dir><dir name="sql"><dir name="emagicone_mobassistantconnector_setup"><file name="install-1.2.1.php" hash="2394c0bf43b7c8f15fa83d957ed15ffd"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Emagicone_Mobassistantconnector.xml" hash="7bb654478173d96ad294000fc9625820"/></dir></target><target name="magelocale"><dir><dir name="en_GB"><file name="Emagicone_Mobassistantconnector.csv" hash="eaf733f81ff47627c4389d487c93709f"/></dir><dir name="en_US"><file name="Emagicone_Mobassistantconnector.csv" hash="510d79a25c0bfb7a096aab57d8c5b458"/></dir><dir name="es_ES"><file name="Emagicone_Mobassistantconnector.csv" hash="acc37c432dd8b4134844291931b70fbf"/></dir><dir name="fr_FR"><file name="Emagicone_Mobassistantconnector.csv" hash="76c48723a6bbd59534781fd3c7f6d86e"/></dir><dir name="ru_RU"><file name="Emagicone_Mobassistantconnector.csv" hash="2346397cbe029dcc724717b953a3f38c"/></dir><dir name="uk_UA"><file name="Emagicone_Mobassistantconnector.csv" hash="cad0e0c3ec7603e6b886d815357d1766"/></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="mobassistantconnector.xml" hash="b5c4d423be8de0c5d73d64783dcb9a3c"/></dir><dir name="template"><dir name="mobassistantconnector"><file name="jsinit.phtml" hash="785c82b5cf6b2a7dc94a1436d1c9115f"/></dir></dir></dir></dir></dir></target></contents>
19
  <compatible/>
20
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php><extension><name>curl</name><min>1.0</min><max>3.0</max></extension><extension><name>json</name><min>1.0</min><max>3.0</max></extension><extension><name>date</name><min>1.0</min><max>3.0</max></extension></required></dependencies>
21
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>mobile_assistant_connector</name>
4
+ <version>1.2.9</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.gnu.org/licenses/gpl.html">GNU</license>
7
  <channel>community</channel>
9
  <summary>Mobile Assistant Connector</summary>
10
  <description>Mobile Assistant Connector</description>
11
  <notes>Fixed:&#xD;
12
+ - stats in dashboard&#xD;
13
+ - pagination for order items&#xD;
14
+ - improved compatibility with Magento Mobile Assistant 3.0.0.3&#xD;
15
  &#xD;
16
  *Works only with release of app (2.6.1) and higher</notes>
17
  <authors><author><name>eMagicOne</name><user>mobile</user><email>mobile@emagicone.com</email></author></authors>
18
+ <date>2016-02-05</date>
19
+ <time>12:47:24</time>
20
+ <contents><target name="magecommunity"><dir name="Emagicone"><dir name="Mobassistantconnector"><dir name="Helper"><file name="Access.php" hash="c6f4c96ca225bbc72cb829c59f7808f1"/><file name="Data.php" hash="efa0278512e07a2b87bcb4ee3fe80470"/></dir><dir name="Model"><file name="Defpassword.php" hash="921e5344ba325ddf1aaba6aeb2202696"/><file name="Failed.php" hash="7da654c3cf1e9a3f5a55da7f36192117"/><file name="Login.php" hash="bedbce507924854910524fbabe1c4948"/><file name="Observer.php" hash="fbf33b9ed5ae4a05910619d95245d924"/><file name="Order.php" hash="f3d5529e0504ea0265cb661e03f41109"/><file name="Password.php" hash="66e2050ecc7b56deb654b5476ac1746c"/><dir name="Resource"><dir name="Failed"><file name="Collection.php" hash="18980688d80660f6a663a2c4dce20f54"/></dir><file name="Failed.php" hash="a69ca1239d3400097fabc415ee02751b"/><dir name="Sessions"><file name="Collection.php" hash="397e9a6f637472b59abe42bca09ea616"/></dir><file name="Sessions.php" hash="4d9f6cdd340fd95549d287c6107285ac"/></dir><file name="Sessions.php" hash="e3a32e26446e4cd27032c99dde8d4cfa"/></dir><dir name="controllers"><file name="IndexController.php" hash="2920a8ac6c5050916b69f3455ac8d5db"/><dir name="adminhtml"><file name="IndexController.php" hash="e8fc499b74daeef9dbf856e813cbefb8"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="333ed888c7f8a1e067821b6547e34340"/><file name="config.xml" hash="a979fa3055925591784094284ba832bb"/><file name="system.xml" hash="916fe7ee643e4dcb15a5498219605896"/></dir><dir name="sql"><dir name="emagicone_mobassistantconnector_setup"><file name="install-1.2.1.php" hash="2394c0bf43b7c8f15fa83d957ed15ffd"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Emagicone_Mobassistantconnector.xml" hash="7bb654478173d96ad294000fc9625820"/></dir></target><target name="magelocale"><dir><dir name="en_GB"><file name="Emagicone_Mobassistantconnector.csv" hash="eaf733f81ff47627c4389d487c93709f"/></dir><dir name="en_US"><file name="Emagicone_Mobassistantconnector.csv" hash="510d79a25c0bfb7a096aab57d8c5b458"/></dir><dir name="es_ES"><file name="Emagicone_Mobassistantconnector.csv" hash="acc37c432dd8b4134844291931b70fbf"/></dir><dir name="fr_FR"><file name="Emagicone_Mobassistantconnector.csv" hash="76c48723a6bbd59534781fd3c7f6d86e"/></dir><dir name="ru_RU"><file name="Emagicone_Mobassistantconnector.csv" hash="2346397cbe029dcc724717b953a3f38c"/></dir><dir name="uk_UA"><file name="Emagicone_Mobassistantconnector.csv" hash="cad0e0c3ec7603e6b886d815357d1766"/></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="mobassistantconnector.xml" hash="b5c4d423be8de0c5d73d64783dcb9a3c"/></dir><dir name="template"><dir name="mobassistantconnector"><file name="jsinit.phtml" hash="98e914ee799ba8944a0dd9ecb5ebc54b"/></dir></dir></dir></dir></dir></target></contents>
21
  <compatible/>
22
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php><extension><name>curl</name><min>1.0</min><max>3.0</max></extension><extension><name>json</name><min>1.0</min><max>3.0</max></extension><extension><name>date</name><min>1.0</min><max>3.0</max></extension></required></dependencies>
23
  </package>