Merge remote-tracking branch 'origin/MAGETWO-53773' into MPI-BUGFIXES

viktym · viktym · commit 7811a54d9d26 · 2016-06-08T18:50:15.000+03:00
diff --git a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/RateQuery.php b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/RateQuery.php
@@ -32,7 +32,7 @@ public function prepareSelect(\Magento\Framework\DB\Select $select)
         $select->where(
             'website_id = :website_id'
         )->order(
-            ['dest_country_id DESC', 'dest_region_id DESC', 'dest_zip DESC']
+            ['dest_country_id DESC', 'dest_region_id DESC', 'dest_zip DESC', 'condition_value DESC']
         )->limit(
             1
         );

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function prepareSelect(\Magento\Framework\DB\Select $select)`
`32`	`32`	`$select->where(`
`33`	`33`	`'website_id = :website_id'`
`34`	`34`	`)->order(`
`35`		`- ['dest_country_id DESC', 'dest_region_id DESC', 'dest_zip DESC']`
	`35`	`+ ['dest_country_id DESC', 'dest_region_id DESC', 'dest_zip DESC', 'condition_value DESC']`
`36`	`36`	`)->limit(`
`37`	`37`	`1`
`38`	`38`	`);`