Merge branch 'MAGETWO-67089-Salesrule-Table-Difference' into db-upgrade-pr

Author: cpartica

app/code/Magento/SalesRuleSampleData/fixtures/sales_rules.csv

@@ -1,5 +1,5 @@
 name,description,simple_action,discount_amount,discount_step,is_active,stop_rules_processing,is_rss,apply_to_shipping,simple_free_shipping,coupon_type,coupon_code,uses_per_customer,conditions_serialized,actions_serialized
-"Buy 3 tee shirts and get the 4th free","Buy 3 tee shirts and get the 4th free","buy_x_get_y",1,3,1,0,1,0,0,1,,,"{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Combine"",""attribute"":null,""operator"":null,""value"":""1"",""is_value_processed"":null,""aggregator"":""all"",""conditions"":[{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Product\\Found"",""attribute"":null,""operator"":null,""value"":""1"",""is_value_processed"":null,""aggregator"":""all"",""conditions"":[{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Product"",""attribute"":""category_ids"",""operator"":""()"",""value"":""url_key=tees-women,url_key=tees-men"",""is_value_processed"":false}]}]}","{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Product\\Combine"",""attribute"":null,""operator"":null,""value"":""1"",""is_value_processed"":null,""aggregator"":""all""}"
+"Buy 3 tee shirts and get the 4th free","Buy 3 tee shirts and get the 4th free","buy_x_get_y",1,3,1,0,1,0,0,1,,,"{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Combine"",""attribute"":null,""operator"":null,""value"":""1"",""is_value_processed"":null,""aggregator"":""all"",""conditions"":[{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Product\\Found"",""attribute"":null,""operator"":null,""value"":""1"",""is_value_processed"":null,""aggregator"":""all"",""conditions"":[{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Product"",""attribute"":""category_ids"",""operator"":""()"",""value"":%url_key=tees-women,url_key=tees-men%,""is_value_processed"":false}]}]}","{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Product\\Combine"",""attribute"":null,""operator"":null,""value"":""1"",""is_value_processed"":null,""aggregator"":""all""}"
 "Spend $50 or more - shipping is free!","Free shipping on any purchase over $50","by_percent",0,0,1,0,1,0,2,1,,,"{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Combine"",""attribute"":null,""operator"":null,""value"":""1"",""is_value_processed"":null,""aggregator"":""all"",""conditions"":[{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Address"",""attribute"":""base_subtotal"",""operator"":"">="",""value"":""50"",""is_value_processed"":false}]}","{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Product\\Combine"",""attribute"":null,""operator"":null,""value"":""1"",""is_value_processed"":null,""aggregator"":""all""}"
-"20% OFF Ever $200-plus purchase!*","Shopping cart price rule for the cart over $200. Does not applied on other sales items","by_percent",20,0,1,0,1,0,0,1,,,"{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Combine"",""attribute"":null,""operator"":null,""value"":""1"",""is_value_processed"":null,""aggregator"":""all"",""conditions"":[{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Address"",""attribute"":""base_subtotal"",""operator"":"">="",""value"":""200"",""is_value_processed"":false}]}","{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Product\\Combine"",""attribute"":null,""operator"":null,""value"":""1"",""is_value_processed"":null,""aggregator"":""all"",""conditions"":[{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Product\\Combine"",""attribute"":null,""operator"":null,""value"":""0"",""is_value_processed"":null,""aggregator"":""all"",""conditions"":[{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Product"",""attribute"":""category_ids"",""operator"":""=="",""value"":""url_key=watches"",""is_value_processed"":false},{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Product"",""attribute"":""sale"",""operator"":""=="",""value"":""1"",""is_value_processed"":false}]}]}"
+"20% OFF Ever $200-plus purchase!*","Shopping cart price rule for the cart over $200. Does not applied on other sales items","by_percent",20,0,1,0,1,0,0,1,,,"{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Combine"",""attribute"":null,""operator"":null,""value"":""1"",""is_value_processed"":null,""aggregator"":""all"",""conditions"":[{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Address"",""attribute"":""base_subtotal"",""operator"":"">="",""value"":""200"",""is_value_processed"":false}]}","{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Product\\Combine"",""attribute"":null,""operator"":null,""value"":""1"",""is_value_processed"":null,""aggregator"":""all"",""conditions"":[{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Product\\Combine"",""attribute"":null,""operator"":null,""value"":""0"",""is_value_processed"":null,""aggregator"":""all"",""conditions"":[{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Product"",""attribute"":""category_ids"",""operator"":""=="",""value"":%url_key=watches%,""is_value_processed"":false},{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Product"",""attribute"":""sale"",""operator"":""=="",""value"":""1"",""is_value_processed"":false}]}]}"
 "$4 Luma water bottle (save 70%)","Use promo code H20 at checkout","by_percent",70,0,1,0,1,0,0,2,H20,1,"{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Combine"",""attribute"":null,""operator"":null,""value"":""1"",""is_value_processed"":null,""aggregator"":""all"",""conditions"":[{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Product\\Found"",""attribute"":null,""operator"":null,""value"":""1"",""is_value_processed"":null,""aggregator"":""all""}]}","{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Product\\Combine"",""attribute"":null,""operator"":null,""value"":""1"",""is_value_processed"":null,""aggregator"":""all"",""conditions"":[{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Product"",""attribute"":""sku"",""operator"":""=="",""value"":""24-UG06"",""is_value_processed"":false}]}"