version $VERSION

CoScale · Aug 1, 2016 · b028d2a · b028d2a
1 parent c97bdb4
commit b028d2a
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 9 deletions.
diff --git a/app/code/community/CoScale/Monitor/Helper/Data.php b/app/code/community/CoScale/Monitor/Helper/Data.php
@@ -29,7 +29,7 @@ public function isEnabled()
 
             foreach ($tables as $id => $data) {
                 $metricTable = $resource->getTableName($data['table']);
-                if (! $connection->isTableExists(Mage::getConfig()->getTablePrefix().$metricTable)) {
+                if (! $connection->isTableExists($metricTable)) {
                     $this->debugEndError('Module checking', new Exception('Table ' . $metricTable . ' not found!'));
                     return false;
                 }

diff --git a/app/code/community/CoScale/Monitor/Model/Cronjob.php b/app/code/community/CoScale/Monitor/Model/Cronjob.php
@@ -19,5 +19,6 @@ public function dailyCron()
         // Customer metric data
         Mage::getSingleton('coscale_monitor/metric_customer')->dailyCron();
         Mage::getSingleton('coscale_monitor/metric_product')->dailyCron();
+        Mage::getSingleton('coscale_monitor/metric_order')->dailyCron();
     }
 }
diff --git a/app/code/community/CoScale/Monitor/Model/Metric/Order.php b/app/code/community/CoScale/Monitor/Model/Metric/Order.php
@@ -261,16 +261,21 @@ public function initDefaultMetrics($storeId)
             self::KEY_TIME_CURRENT_PICKPACK,
         );
 
+        $amountUnit = Mage::getStoreConfig('currency/options/base', $storeId);
+
         foreach ($initKeys as $key)
         {
             $metricData = $this->getMetric($key, $storeId);
+
+            // 'Amount' unit of a metric should always be replaced by the store currency
+            $unit = ($this->_metricData[$key]['unit'] == 'Amount' ? $amountUnit : $this->_metricData[$key]['unit']);
             if (empty($metricData)) {
                 $this->setMetric(
                     self::ACTION_UPDATE,
                     $key,
                     $storeId,
                     0,
-                    $this->_metricData[$key]['unit']
+                    $unit
                 );
             }
         }
@@ -496,8 +501,7 @@ public function updateAvgOrderValues($storeId)
             self::ACTION_UPDATE,
             self::KEY_ORDER_SIZE_AVERAGE,
             $storeId,
-            ($orderItems/$orderTotal),
-            $amountUnit
+            ($orderItems/$orderTotal)
         );
 
         $this->setMetric(
@@ -513,8 +517,7 @@ public function updateAvgOrderValues($storeId)
                 self::ACTION_UPDATE,
                 self::KEY_ORDER_SIZE_AVERAGE_NEW,
                 $storeId,
-                ($newOrderItems / $newOrderTotal),
-                $amountUnit
+                ($newOrderItems / $newOrderTotal)
             );
 
             $this->setMetric(
@@ -595,6 +598,8 @@ public function initOrderData()
         }
 
         foreach ($data as $storeId => $details) {
+            $amountUnit = Mage::getStoreConfig('currency/options/base', $storeId);
+
             $this->setMetric(
                 self::ACTION_UPDATE,
                 self::KEY_ORDER_SIZE_TOTAL,
@@ -606,7 +611,8 @@ public function initOrderData()
                 self::ACTION_UPDATE,
                 self::KEY_ORDER_AMOUNT_TOTAL,
                 $storeId,
-                $details['amount']
+                $details['amount'],
+                $amountUnit
             );
 
             $this->setMetric(
@@ -663,6 +669,17 @@ public function initOrderData()
         }
     }
 
+    /**
+     * Cronjob to update the orders metrics
+     */
+    public function dailyCron()
+    {
+        if (!$this->_helper->isEnabled()) {
+            return;
+        }
+        $this->initOrderData();
+    }
+
     /**
      * Generate output event
      *
@@ -722,6 +739,8 @@ public function getAbandonnedCarts()
             ->group('main_table.store_id');
         $output = array();
         foreach ($collection as $order) {
+            $amountUnit = Mage::getStoreConfig('currency/options/base', (int)$order->getStoreId());
+
             $output[] = array(
                 'name' => 'Abandonned carts',
                 'unit' => 'orders',
@@ -731,7 +750,7 @@ public function getAbandonnedCarts()
             );
             $output[] = array(
                 'name' => 'Total value of abandoned carts',
-                'unit' => 'Amount',
+                'unit' => $amountUnit,
                 'value' => (float)$order->getSubtotal(),
                 'store_id' => (int)$order->getStoreId(),
                 'type' => 'A'

diff --git a/app/code/community/CoScale/Monitor/etc/config.xml b/app/code/community/CoScale/Monitor/etc/config.xml
@@ -2,7 +2,7 @@
 <config>
     <modules>
         <CoScale_Monitor>
-            <version>0.13.0</version>
+            <version>0.15.0</version>
         </CoScale_Monitor>
     </modules>
     <global>

diff --git a/app/code/community/CoScale/Monitor/sql/coscale_monitor_setup/upgrade-0.14.0-0.15.0.php b/app/code/community/CoScale/Monitor/sql/coscale_monitor_setup/upgrade-0.14.0-0.15.0.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package CoScale_Monitor
+ * @author Mihai Oprea <[email protected]>
+ * @created 2016-05-18
+ * @version 0.15.0
+ */
+$installer = $this;
+
+$installer->startSetup();
+
+$metric = $installer->getConnection();
+
+/**
+ * Initialize order data for further delta processing
+ */
+Mage::getSingleton('coscale_monitor/metric_order')->initOrderData();
+Mage::getSingleton('coscale_monitor/metric_customer')->updateTotalCount();
+Mage::getSingleton('coscale_monitor/metric_product')->updateTotalCount();
+
+$installer->endSetup();