Merge pull request #5690 in SW/shopware from sw-20188/5.3/improve-device-statistic to 5.3

* commit '1d7086815a19eb5d062773896d13f9df29b5dd0d':
  SW-20188 - Fix mobile statistic, improve device configurability

Author: soebbing

engine/Shopware/Controllers/Widgets/Index.php

@@ -32,7 +32,7 @@ class Shopware_Controllers_Widgets_Index extends Enlight_Controller_Action
      */
     public function preDispatch()
     {
-        if ($this->Request()->getActionName() == 'refreshStatistic') {
+        if ($this->Request()->getActionName() === 'refreshStatistic') {
             $this->Front()->Plugins()->ViewRenderer()->setNoRender();
         }
     }

engine/Shopware/Plugins/Default/Frontend/Statistics/Bootstrap.php

@@ -116,8 +116,10 @@ public function checkIsBot($userAgent)
     }
 
     /**
-     * @param Enlight_Controller_Request_Request $request
-     * @param $response
+     * @param Enlight_Controller_Request_Request       $request
+     * @param Enlight_Controller_Response_ResponseHttp $response
+     *
+     * @throws \Exception
      */
     public function updateLog($request, $response)
     {
@@ -194,7 +196,11 @@ public function cleanupStatistic()
     /**
      * Refresh current users
      *
+     *
      * @param \Enlight_Controller_Request_Request $request
+     *
+     * @throws \Exception
+     * @throws \Zend_Db_Adapter_Exception
      */
     public function refreshCurrentUsers(Enlight_Controller_Request_Request $request)
     {
@@ -212,7 +218,10 @@ public function refreshCurrentUsers(Enlight_Controller_Request_Request $request)
     /**
      * Refresh visitor log
      *
+     *
      * @param Enlight_Controller_Request_Request $request
+     *
+     * @throws \Exception
      */
     public function refreshLog(Enlight_Controller_Request_Request $request)
     {
@@ -250,8 +259,7 @@ public function refreshLog(Enlight_Controller_Request_Request $request)
             $isNewRecord = true;
         }
 
-        $sql = 'SELECT 1 FROM s_statistics_pool WHERE datum = CURDATE() AND remoteaddr = ?';
-        $result = Shopware()->Db()->fetchOne($sql, [$ip]);
+        $result = Shopware()->Db()->fetchOne('SELECT 1 FROM s_statistics_pool WHERE datum = CURDATE() AND remoteaddr = ?', [$ip]);
         if (empty($result)) {
             $sql = 'INSERT INTO s_statistics_pool (`remoteaddr`, `datum`) VALUES (?, NOW())';
             Shopware()->Db()->query($sql, [$ip]);
@@ -310,7 +318,7 @@ public function refreshArticleImpression($request)
         }
         $shopId = Shopware()->Shop()->getId();
         /** @var $repository \Shopware\Models\Tracking\Repository */
-        $repository = Shopware()->Models()->getRepository('Shopware\Models\Tracking\ArticleImpression');
+        $repository = Shopware()->Models()->getRepository(\Shopware\Models\Tracking\ArticleImpression::class);
         $articleImpressionQuery = $repository->getArticleImpressionQuery($articleId, $shopId, null, $deviceType);
         /** @var $articleImpression \Shopware\Models\Tracking\ArticleImpression */
         $articleImpression = $articleImpressionQuery->getOneOrNullResult();

themes/Frontend/Bare/frontend/index/index.tpl

@@ -167,6 +167,12 @@
                 asyncCallbacks.push(callback);
             };
 
+            var statisticDevices = [
+                { device: 'mobile', enter: 0, exit: 767 },
+                { device: 'tablet', enter: 768, exit: 1259 },
+                { device: 'desktop', enter: 1260, exit: 5160 }
+            ];
+
             var controller = controller || {ldelim}
                 'vat_check_enabled': '{config name='vatcheckendabled'}',
                 'vat_check_required': '{config name='vatcheckrequired'}',

themes/Frontend/Bare/widgets/index/statistic_include.tpl

@@ -21,9 +21,27 @@
             url += '&articleId=' + encodeURI("{$sArticle.articleID}");
             {/if}
 
-            var statisticRequest = document.getElementById('refresh-statistic');
-            statisticRequest.setAttribute('src', url);
+            {* Early simple device detection for statistics, duplicated in StateManager for resizes *}
+            if (document.cookie.indexOf('x-ua-device') === -1) {
+                var i = 0,
+                    device = 'desktop',
+                    width = window.innerWidth,
+                    breakpoints = window.statisticDevices;
 
+                if (typeof width !== 'number') {
+                    width = (document.documentElement.clientWidth !== 0) ? document.documentElement.clientWidth : document.body.clientWidth;
+                }
+
+                for (; i < breakpoints.length; i++) {
+                    if (width >= ~~(breakpoints[i].enter) && width <= ~~(breakpoints[i].exit)) {
+                        device = breakpoints[i].device;
+                    }
+                }
+
+                document.cookie = 'x-ua-device=' + device + '; path=/';
+            }
+
+            document.getElementById('refresh-statistic').setAttribute('src', url);
         })(window, document);
     </script>
-{/block}
+{/block}

themes/Frontend/Responsive/frontend/_public/src/js/jquery.state-manager.js

@@ -259,21 +259,21 @@
              * many parameters.
              */
             switch (args.length) {
-            case 0:
-                while (++i < len) (event = eventList[i]).callback.call(event.context);
-                return me;
-            case 1:
-                while (++i < len) (event = eventList[i]).callback.call(event.context, a1);
-                return me;
-            case 2:
-                while (++i < len) (event = eventList[i]).callback.call(event.context, a1, a2);
-                return me;
-            case 3:
-                while (++i < len) (event = eventList[i]).callback.call(event.context, a1, a2, a3);
-                return me;
-            default:
-                while (++i < len) (event = eventList[i]).callback.apply(event.context, args);
-                return me;
+                case 0:
+                    while (++i < len) (event = eventList[i]).callback.call(event.context);
+                    return me;
+                case 1:
+                    while (++i < len) (event = eventList[i]).callback.call(event.context, a1);
+                    return me;
+                case 2:
+                    while (++i < len) (event = eventList[i]).callback.call(event.context, a1, a2);
+                    return me;
+                case 3:
+                    while (++i < len) (event = eventList[i]).callback.call(event.context, a1, a2, a3);
+                    return me;
+                default:
+                    while (++i < len) (event = eventList[i]).callback.apply(event.context, args);
+                    return me;
             }
         },
 
@@ -1292,21 +1292,22 @@
         },
 
         _getCurrentDevice: function() {
-            var me = this,
-                devices = {
-                    'xs': 'mobile',
-                    's': 'mobile',
-                    'm': 'tablet',
-                    'l': 'tablet',
-                    'xl': 'desktop'
-                };
+            var i = 0,
+                width = this.getViewportWidth(),
+                device = 'desktop',
+                devices = window.statisticDevices || [];
+
+            for (; i < devices.length; i++) {
+                if (width >= ~~(devices[i].enter) && width <= ~~(devices[i].exit)) {
+                    device = devices[i].device;
+                }
+            }
 
-            return devices[me.getCurrentState()] || 'desktop';
+            return device;
         },
 
         _setDeviceCookie: function() {
-            var me = this,
-                device = me._getCurrentDevice();
+            var device = this._getCurrentDevice();
 
             document.cookie = 'x-ua-device=' + device + '; path=/';
         },