Merge pull request #1593 from magento-engcom/2.1-develop-prs

Public Pull Requests

#11506
#10975
#11456

Author: Oleksii Korshenko

app/code/Magento/Checkout/view/frontend/web/template/cart/shipping-rates.html

@@ -24,10 +24,10 @@
                                 checked: $parents[1].selectedShippingMethod,
                                 attr: {
                                         value: carrier_code + '_' + method_code,
-                                        id: 's_method_' + method_code
+                                        id: 's_method_' + carrier_code + '_' + method_code
                                         }
                                 "/>
-                    <label class="label" data-bind="attr: {for: 's_method_' + method_code}">
+                    <label class="label" data-bind="attr: {for: 's_method_' + carrier_code + '_' + method_code}">
                         <!-- ko text: $data.method_title --><!-- /ko -->
                         <!-- ko text: $parents[1].getFormattedPrice(amount) --><!-- /ko -->
                     </label>

app/code/Magento/Cron/etc/cron_groups.xml

@@ -11,8 +11,8 @@
         <schedule_ahead_for>20</schedule_ahead_for>
         <schedule_lifetime>15</schedule_lifetime>
         <history_cleanup_every>10</history_cleanup_every>
-        <history_success_lifetime>60</history_success_lifetime>
-        <history_failure_lifetime>600</history_failure_lifetime>
+        <history_success_lifetime>10080</history_success_lifetime>
+        <history_failure_lifetime>10080</history_failure_lifetime>
         <use_separate_process>0</use_separate_process>
     </group>
 </config>

app/code/Magento/Indexer/etc/cron_groups.xml

@@ -11,8 +11,8 @@
         <schedule_ahead_for>4</schedule_ahead_for>
         <schedule_lifetime>2</schedule_lifetime>
         <history_cleanup_every>10</history_cleanup_every>
-        <history_success_lifetime>60</history_success_lifetime>
-        <history_failure_lifetime>600</history_failure_lifetime>
+        <history_success_lifetime>10080</history_success_lifetime>
+        <history_failure_lifetime>10080</history_failure_lifetime>
         <use_separate_process>1</use_separate_process>
     </group>
 </config>

lib/web/mage/utils/arrays.js

@@ -101,7 +101,7 @@ define([
                 newIndex,
                 target;
 
-            if (typeof position === 'undefined') {
+            if (typeof position === 'undefined' || position == null) {
                 position = -1;
             } else if (typeof position === 'string') {
                 position = isNaN(+position) ? position : +position;