Merge remote-tracking branch 'origin/3.x-dev' into new_submoduels

Conflicts:
	tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt

1 files changed, 40 insertions, 40 deletions

diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
index fbdff0c5ca..f04022a9ad 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
@@ -476,10 +476,10 @@
                                                                                                 1
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                0
+                                                                                                1
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                $ 0
+                                                                                                $ 250
                                                                                     </td>
                                     </tr>
                         </tbody>
@@ -605,7 +605,7 @@
                                                     
                                                                     <tr style="background-color: rgb(242,242,242);line-height: 22px;">
                                                                 <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                                                                                        ValueIsZero                                                                                                                        </td>
+                                                                                                                                                                        ValueIsZero - Custom Variable value not defined                                                                                                                        </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
@@ -628,7 +628,7 @@
                             
                                                                     <tr style=";line-height: 22px;">
                                                                 <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                                                                                        VisitorType                                                                                                                        </td>
+                                                                                                                                                                        VisitorType - NewLoggedOut                                                                                                                        </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
@@ -651,7 +651,7 @@
                             
                                                                     <tr style="background-color: rgb(242,242,242);line-height: 22px;">
                                                                 <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                                                                                        VisitorName                                                                                                                        </td>
+                                                                                                                                                                        VisitorName - Great name!                                                                                                                        </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4
                                                                                     </td>
@@ -4032,7 +4032,7 @@
                                                                     <tr style="background-color: rgb(242,242,242);line-height: 22px;">
                                                                 <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                             <a style="color: rgb(13,13,13);" href='http://example.org/index.htm'>
-                                                                        /index.htm                                                                            </a>
+                                                                        index.htm                                                                            </a>
                                                                                                                         </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 16
@@ -4082,7 +4082,7 @@
                                                                     <tr style="background-color: rgb(242,242,242);line-height: 22px;">
                                                                 <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                             <a style="color: rgb(13,13,13);" href='http://example.org/index.htm'>
-                                                                        /index.htm                                                                            </a>
+                                                                        index.htm                                                                            </a>
                                                                                                                         </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4
@@ -4125,7 +4125,7 @@
                                                     
                                                                     <tr style="background-color: rgb(242,242,242);line-height: 22px;">
                                                                 <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                                                                                         View product left in cart                                                                                                                        </td>
+                                                                                                                                                                        View product left in cart                                                                                                                        </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
@@ -4139,7 +4139,7 @@
                             
                                                                     <tr style=";line-height: 22px;">
                                                                 <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                                                                                         incredible title!                                                                                                                        </td>
+                                                                                                                                                                        incredible title!                                                                                                                        </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
@@ -4153,7 +4153,7 @@
                             
                                                                     <tr style="background-color: rgb(242,242,242);line-height: 22px;">
                                                                 <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                                                                                         Looking at Electronics &amp; Cameras page with a page level custom variable                                                                                                                        </td>
+                                                                                                                                                                        Looking at Electronics &amp; Cameras page with a page level custom variable                                                                                                                        </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
@@ -4196,7 +4196,7 @@
                                                                     <tr style="background-color: rgb(242,242,242);line-height: 22px;">
                                                                 <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                             <a style="color: rgb(13,13,13);" href='http://example.org/index.htm'>
-                                                                        /index.htm                                                                            </a>
+                                                                        index.htm                                                                            </a>
                                                                                                                         </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4
@@ -4239,7 +4239,7 @@
                                                     
                                                                     <tr style="background-color: rgb(242,242,242);line-height: 22px;">
                                                                 <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                                                                                         View product left in cart                                                                                                                        </td>
+                                                                                                                                                                        View product left in cart                                                                                                                        </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
@@ -4253,7 +4253,7 @@
                             
                                                                     <tr style=";line-height: 22px;">
                                                                 <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                                                                                         Another Product page with multiple categories                                                                                                                        </td>
+                                                                                                                                                                        Another Product page with multiple categories                                                                                                                        </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
@@ -4301,7 +4301,7 @@
                                                     
                                                                     <tr style="background-color: rgb(242,242,242);line-height: 22px;">
                                                                 <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                                                                                         View product left in cart                                                                                                                        </td>
+                                                                                                                                                                        View product left in cart                                                                                                                        </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 9
                                                                                     </td>
@@ -4321,7 +4321,7 @@
                             
                                                                     <tr style=";line-height: 22px;">
                                                                 <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                                                                                         Another Product page                                                                                                                        </td>
+                                                                                                                                                                        Another Product page                                                                                                                        </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
@@ -4341,7 +4341,7 @@
                             
                                                                     <tr style="background-color: rgb(242,242,242);line-height: 22px;">
                                                                 <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                                                                                         Another Product page with multiple categories                                                                                                                        </td>
+                                                                                                                                                                        Another Product page with multiple categories                                                                                                                        </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
@@ -4361,7 +4361,7 @@
                             
                                                                     <tr style=";line-height: 22px;">
                                                                 <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                                                                                         Another Product page with no category                                                                                                                        </td>
+                                                                                                                                                                        Another Product page with no category                                                                                                                        </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
@@ -4381,7 +4381,7 @@
                             
                                                                     <tr style="background-color: rgb(242,242,242);line-height: 22px;">
                                                                 <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                                                                                         incredible title!                                                                                                                        </td>
+                                                                                                                                                                        incredible title!                                                                                                                        </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
@@ -4401,7 +4401,7 @@
                             
                                                                     <tr style=";line-height: 22px;">
                                                                 <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                                                                                         Looking at Electronics &amp; Cameras page again                                                                                                                        </td>
+                                                                                                                                                                        Looking at Electronics &amp; Cameras page again                                                                                                                        </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
@@ -4421,7 +4421,7 @@
                             
                                                                     <tr style="background-color: rgb(242,242,242);line-height: 22px;">
                                                                 <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                                                                                         Looking at Electronics &amp; Cameras page with a page level custom variable                                                                                                                        </td>
+                                                                                                                                                                        Looking at Electronics &amp; Cameras page with a page level custom variable                                                                                                                        </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
@@ -4441,7 +4441,7 @@
                             
                                                                     <tr style=";line-height: 22px;">
                                                                 <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                                                                                         Looking at product page                                                                                                                        </td>
+                                                                                                                                                                        Looking at product page                                                                                                                        </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
@@ -4707,7 +4707,7 @@
                                                                 <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Conversion Rate                                                                                                                        </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                40%
+                                                                                                0%
                                                                                     </td>
                                     </tr>
                         </tbody>
@@ -5029,7 +5029,7 @@
                                                                 <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Conversion Rate                                                                                                                        </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                60%
+                                                                                                0%
                                                                                     </td>
                                     </tr>
                         </tbody>
@@ -5349,7 +5349,7 @@
                                                                                                 1
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                $ 1500
+                                                                                                $ 0
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
@@ -5375,7 +5375,7 @@
                                                                                                 4
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                $ 255.61
+                                                                                                $ 0
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1.5
@@ -5401,7 +5401,7 @@
                                                                                                 0
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                $ 100
+                                                                                                $ 0
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 6
@@ -5427,7 +5427,7 @@
                                                                                                 0
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                $ 100
+                                                                                                $ 0
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
@@ -5519,7 +5519,7 @@
                                                                                                 0
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                $ 1500
+                                                                                                $ 0
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
@@ -5545,7 +5545,7 @@
                                                                                                 2
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                $ 255.61
+                                                                                                $ 0
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1.5
@@ -5571,7 +5571,7 @@
                                                                                                 0
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                $ 100
+                                                                                                $ 0
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 6
@@ -5597,7 +5597,7 @@
                                                                                                 0
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                $ 100
+                                                                                                $ 0
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
@@ -5715,7 +5715,7 @@
                                                                                                 3
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                $ 1000
+                                                                                                $ 0
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1.5
@@ -5741,7 +5741,7 @@
                                                                                                 1
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                $ 500
+                                                                                                $ 0
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
@@ -5767,7 +5767,7 @@
                                                                                                 1
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                $ 500
+                                                                                                $ 0
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
@@ -5793,7 +5793,7 @@
                                                                                                 1
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                $ 500
+                                                                                                $ 0
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
@@ -5819,7 +5819,7 @@
                                                                                                 1
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                $ 500
+                                                                                                $ 0
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
@@ -5845,7 +5845,7 @@
                                                                                                 4
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                $ 55.61
+                                                                                                $ 0
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3.5
@@ -5871,7 +5871,7 @@
                                                                                                 0
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                $ 100
+                                                                                                $ 0
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
@@ -5957,7 +5957,7 @@
                                                                 <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Conversion Rate                                                                                                                        </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                80%
+                                                                                                0%
                                                                                     </td>
                                     </tr>
                         </tbody>
@@ -6358,7 +6358,7 @@
                                                                 <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Conversion Rate                                                                                                                        </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                20%
+                                                                                                0%
                                                                                     </td>
                                     </tr>
                         </tbody>