AW_Onpulse - Version 1.0.12

Version Notes

* minor bugfixes

Download this release

Release Info

Developer AW_Core_Team
Extension AW_Onpulse
Version 1.0.12
Comparing to
See all releases


Code changes from version 1.0.11 to 1.0.12

Files changed (4) hide show
  1. app/code/local/AW/Onpulse/Helper/Data.php +0 -2
  2. app/code/local/AW/Onpulse/Model/Aggregator/Components/Statistics.php +10 -5
  3. app/code/local/AW/Onpulse/etc/config.xml +1 -1
  4. package.xml +4 -4
app/code/local/AW/Onpulse/Helper/Data.php CHANGED
@@ -143,8 +143,6 @@ class AW_Onpulse_Helper_Data extends Mage_Core_Helper_Abstract
143
  foreach($orders as $order) {
144
  $processedOrders[] = $this->processOrderToArray($order);
145
  }
146
- //var_dump($processedOrders);
147
- //die;
148
 
149
  $processedDashboardClientsToday = array();
150
  $processedDashboardClientsYesterday = array();
143
  foreach($orders as $order) {
144
  $processedOrders[] = $this->processOrderToArray($order);
145
  }
 
 
146
 
147
  $processedDashboardClientsToday = array();
148
  $processedDashboardClientsYesterday = array();
app/code/local/AW/Onpulse/Model/Aggregator/Components/Statistics.php CHANGED
@@ -119,16 +119,21 @@ class AW_Onpulse_Model_Aggregator_Components_Statistics extends AW_Onpulse_Model
119
  $orderItems = $order->getAllVisibleItems();
120
  if(count($orderItems)>0) {
121
  foreach($orderItems as $orderItem) {
122
- $key = array_key_exists($orderItem->getProduct()->getId(),$items);
 
123
  if($key === false) {
124
- $items[$orderItem->getProduct()->getId()] = array(
125
- 'name'=>$orderItem->getProduct()->getName(),
 
 
 
 
126
  'qty'=>0,
127
  'amount' => 0
128
  );
129
  }
130
- $items[$orderItem->getProduct()->getId()]['qty'] += $orderItem->getQtyOrdered();
131
- $items[$orderItem->getProduct()->getId()]['amount'] += $orderItem->getBaseRowTotal()-$orderItem->getBaseDiscountInvoiced();
132
  }
133
  }
134
  }
119
  $orderItems = $order->getAllVisibleItems();
120
  if(count($orderItems)>0) {
121
  foreach($orderItems as $orderItem) {
122
+
123
+ $key = array_key_exists($orderItem->getProductId(),$items);
124
  if($key === false) {
125
+ if(count($items) > 15) {
126
+ continue;
127
+ }
128
+ $product = Mage::getModel('catalog/product')->load($orderItem->getProductId());
129
+ $items[$product->getId()] = array(
130
+ 'name'=>$product->getName(),
131
  'qty'=>0,
132
  'amount' => 0
133
  );
134
  }
135
+ $items[$orderItem->getProductId()]['qty'] += $orderItem->getQtyOrdered();
136
+ $items[$orderItem->getProductId()]['amount'] += Mage::helper('awonpulse')->getPriceFormat($orderItem->getBaseRowTotal()-$orderItem->getBaseDiscountInvoiced());
137
  }
138
  }
139
  }
app/code/local/AW/Onpulse/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <AW_Onpulse>
5
- <version>1.0.11</version>
6
  </AW_Onpulse>
7
  </modules>
8
  <global>
2
  <config>
3
  <modules>
4
  <AW_Onpulse>
5
+ <version>1.0.12</version>
6
  </AW_Onpulse>
7
  </modules>
8
  <global>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>AW_Onpulse</name>
4
- <version>1.0.11</version>
5
  <stability>stable</stability>
6
  <license uri="http://onpulse.info/TOS.pdf">EULA</license>
7
  <channel>community</channel>
@@ -11,9 +11,9 @@
11
  </description>
12
  <notes>* minor bugfixes</notes>
13
  <authors><author><name>AW_Core_Team</name><user>aheadworks</user><email>no-reply@aheadworks.com</email></author></authors>
14
- <date>2013-07-01</date>
15
- <time>12:03:21</time>
16
- <contents><target name="magelocal"><dir name="AW"><dir name="Onpulse"><dir name="Block"><dir name="System"><dir name="Config"><dir name="Form"><dir name="Fieldset"><dir name="Onpulse"><file name="Settings.php" hash="6ba04d380ea7140b42c54f00a0acc452"/></dir></dir></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="1dda89d83241600e59ac0e6106701e4d"/><file name="Data.php.orig" hash="fb2ab95d3268d3d8a689143dff7ffdb8"/></dir><dir name="Model"><dir name="Aggregator"><file name="Component.php" hash="721719d0df46da388b229c10d137864b"/><dir name="Components"><file name="Customer.php" hash="52df2d3be2d6196ee957b2e2c0d92cb2"/><file name="Order.php" hash="a9a23d8f678a68f1b245b97126cc3116"/><file name="Statistics.php" hash="06186f171b8e6c7eaf12558a56345302"/></dir></dir><file name="Aggregator.php" hash="fcb4342d583403a99ca7bc245115854f"/><file name="Credentials.php" hash="56d886028ae6548937a9025d34e6e921"/></dir><dir name="etc"><file name="config.xml" hash="8e14a3e478fa2ba3ffe79d2416cbb158"/><file name="system.xml" hash="11fa0896cc56063c5c572d992622e224"/></dir></dir></dir></target><target name="mage"><dir name="app"><dir name="design"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="aw_onpulse"><file name="settings.phtml" hash="10c6eea6457de53e501360b25eb50f1d"/></dir></dir></dir></dir></dir></dir><dir name="etc"><dir name="modules"><file name="AW_Onpulse.xml" hash="de39a5ffebb31ee697fbaf56bb1bfb8a"/></dir></dir><dir name="locale"><dir name="en_US"><file name="AW_Onpulse.csv" hash="23f7bee483404129d0f811a2f53cf38d"/></dir></dir></dir><dir><dir name="app"><dir name="design"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="aw_onpulse.xml" hash="5036d3b89b9a204c9420f40f3983d987"/></dir></dir></dir></dir></dir></dir></dir></target></contents>
17
  <compatible/>
18
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
19
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>AW_Onpulse</name>
4
+ <version>1.0.12</version>
5
  <stability>stable</stability>
6
  <license uri="http://onpulse.info/TOS.pdf">EULA</license>
7
  <channel>community</channel>
11
  </description>
12
  <notes>* minor bugfixes</notes>
13
  <authors><author><name>AW_Core_Team</name><user>aheadworks</user><email>no-reply@aheadworks.com</email></author></authors>
14
+ <date>2013-07-02</date>
15
+ <time>10:23:29</time>
16
+ <contents><target name="magelocal"><dir name="AW"><dir name="Onpulse"><dir name="Block"><dir name="System"><dir name="Config"><dir name="Form"><dir name="Fieldset"><dir name="Onpulse"><file name="Settings.php" hash="6ba04d380ea7140b42c54f00a0acc452"/></dir></dir></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="08b4ef40a59046502997acfde2bf4d03"/><file name="Data.php.orig" hash="fb2ab95d3268d3d8a689143dff7ffdb8"/></dir><dir name="Model"><dir name="Aggregator"><file name="Component.php" hash="721719d0df46da388b229c10d137864b"/><dir name="Components"><file name="Customer.php" hash="52df2d3be2d6196ee957b2e2c0d92cb2"/><file name="Order.php" hash="a9a23d8f678a68f1b245b97126cc3116"/><file name="Statistics.php" hash="529e224de9c8ac48731c89adee4adfbf"/></dir></dir><file name="Aggregator.php" hash="fcb4342d583403a99ca7bc245115854f"/><file name="Credentials.php" hash="56d886028ae6548937a9025d34e6e921"/></dir><dir name="etc"><file name="config.xml" hash="964cf3a74395f845f0a03a9091bc0a2e"/><file name="system.xml" hash="11fa0896cc56063c5c572d992622e224"/></dir></dir></dir></target><target name="mage"><dir name="app"><dir name="design"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="aw_onpulse"><file name="settings.phtml" hash="10c6eea6457de53e501360b25eb50f1d"/></dir></dir></dir></dir></dir></dir><dir name="etc"><dir name="modules"><file name="AW_Onpulse.xml" hash="de39a5ffebb31ee697fbaf56bb1bfb8a"/></dir></dir><dir name="locale"><dir name="en_US"><file name="AW_Onpulse.csv" hash="23f7bee483404129d0f811a2f53cf38d"/></dir></dir></dir><dir><dir name="app"><dir name="design"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="aw_onpulse.xml" hash="5036d3b89b9a204c9420f40f3983d987"/></dir></dir></dir></dir></dir></dir></dir></target></contents>
17
  <compatible/>
18
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
19
  </package>