Skip to content

Commit 821d40d

Browse files
cparticacpartica
authored
Merge pull request #54 from magento-okapis/db-upgrade-pr
[Okapis] Db upgrade pr
2 parents 4d44447 + 841f688 commit 821d40d

File tree

2 files changed

+10
-17
lines changed

2 files changed

+10
-17
lines changed

‎app/code/Magento/CmsSampleData/fixtures/blocks/categories_static_blocks.csv

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,7 @@ Women Block,women-block,"<div class=""blocks-promo"">
186186
<h2 class=""title"">Hot Sellers</h2>
187187
<p class=""info"">Favorites from Luma shoppers</p>
188188
</div>
189-
{{widget type=""Magento\\CatalogWidget\\Block\\Product\\ProductsList"" products_per_page=""4"" products_count=""4"" template=""product/widget/content/grid.phtml"" conditions_encoded=""^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`all`,`value`:`1`,`new_child`:``^],`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`sku`,`operator`:`()`,`value`:`WS12, WT09, WH05, WP12`^]^]""}}
190-
"
189+
{{widget type=""Magento\CatalogWidget\Block\Product\ProductsList"" products_per_page=""4"" products_count=""4"" template=""product/widget/content/grid.phtml"" conditions_encoded=""^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`all`,`value`:`1`,`new_child`:``^],`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`sku`,`operator`:`()`,`value`:`WS12, WT09, WH05, WP12`^]^]""}}"
191190
Training Block,training-block,"<div class=""blocks-promo"">
192191

193192
<a href=""{{category key=""training""}}"" class=""block-promo training-main"">
@@ -222,8 +221,7 @@ Training Block,training-block,"<div class=""blocks-promo"">
222221
<h2 class=""title"">Top Videos</h2>
223222
<p class=""info"">Stream free with subscription</p>
224223
</div>
225-
{{widget type=""Magento\\CatalogWidget\\Block\\Product\\ProductsList"" products_count=""4"" template=""product/widget/content/grid.phtml"" conditions_encoded=""^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`all`,`value`:`1`,`new_child`:``^],`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`sku`,`operator`:`()`,`value`:`241-MB08, 240-LV05, 240-LV09, 240-LV07`^]^]""}}
226-
"
224+
{{widget type=""Magento\CatalogWidget\Block\Product\ProductsList"" products_count=""4"" template=""product/widget/content/grid.phtml"" conditions_encoded=""^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`all`,`value`:`1`,`new_child`:``^],`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`sku`,`operator`:`()`,`value`:`241-MB08, 240-LV05, 240-LV09, 240-LV07`^]^]""}}"
227225
Men Block,men-block,"<div class=""blocks-promo"">
228226
<a href=""{{category key=""men""}}"" class=""block-promo mens-main"">
229227
<img src=""{{media url=""wysiwyg/mens/mens-main.jpg""}}"" alt="""" />
@@ -282,8 +280,7 @@ Men Block,men-block,"<div class=""blocks-promo"">
282280
<h2 class=""title"">Hot Sellers</h2>
283281
<p class=""info"">Favorites from Luma shoppers</p>
284282
</div>
285-
{{widget type=""Magento\\CatalogWidget\\Block\\Product\\ProductsList"" products_per_page=""4"" products_count=""4"" template=""product/widget/content/grid.phtml"" conditions_encoded=""^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`all`,`value`:`1`,`new_child`:``^],`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`sku`,`operator`:`()`,`value`:`MT07, MH07, MSH03, MP03`^]^]""}}
286-
"
283+
{{widget type=""Magento\CatalogWidget\Block\Product\ProductsList"" products_per_page=""4"" products_count=""4"" template=""product/widget/content/grid.phtml"" conditions_encoded=""^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`all`,`value`:`1`,`new_child`:``^],`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`sku`,`operator`:`()`,`value`:`MT07, MH07, MSH03, MP03`^]^]""}}"
287284
Gear Block,gear-block,"<div class=""blocks-promo"">
288285
<a href=""{{category key=""gear""}}"" class=""block-promo gear-main"">
289286
<img src=""{{media url=""wysiwyg/gear/gear-main.jpg""}}"" alt="""" />
@@ -342,8 +339,7 @@ Gear Block,gear-block,"<div class=""blocks-promo"">
342339
<h2 class=""title"">Hot Sellers</h2>
343340
<p class=""info"">Favorites from Luma shoppers</p>
344341
</div>
345-
{{widget type=""Magento\\CatalogWidget\\Block\\Product\\ProductsList"" products_per_page=""4"" products_count=""4"" template=""product/widget/content/grid.phtml"" conditions_encoded=""^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`all`,`value`:`1`,`new_child`:``^],`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`sku`,`operator`:`()`,`value`:`24-MB02, 24-WB04, 24-UG06, 24-WG080`^]^]""}}
346-
"
342+
{{widget type=""Magento\CatalogWidget\Block\Product\ProductsList"" products_per_page=""4"" products_count=""4"" template=""product/widget/content/grid.phtml"" conditions_encoded=""^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`all`,`value`:`1`,`new_child`:``^],`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`sku`,`operator`:`()`,`value`:`24-MB02, 24-WB04, 24-UG06, 24-WG080`^]^]""}}"
347343
Sale Block,sale-block,"<div class=""blocks-promo"">
348344
<a href=""{{category key=""women-sale""}}"" class=""block-promo sale-main"">
349345
<img src=""{{media url=""wysiwyg/sale/sale-main.jpg""}}"" alt="""" />
@@ -429,8 +425,7 @@ New Block,new-block,"<div class=""blocks-promo"">
429425
<h2 class=""title"">Luma's Latest</h2>
430426
<p class=""info"">Just in time for the new season!</p>
431427
</div>
432-
{{widget type=""Magento\\CatalogWidget\\Block\\Product\\ProductsList"" products_per_page=""4"" products_count=""4"" template=""product/widget/content/grid.phtml"" conditions_encoded=""^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`all`,`value`:`1`,`new_child`:``^],`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`new`,`operator`:`==`,`value`:`1`^]^]""}}
433-
"
428+
{{widget type=""Magento\CatalogWidget\Block\Product\ProductsList"" products_per_page=""4"" products_count=""4"" template=""product/widget/content/grid.phtml"" conditions_encoded=""^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`all`,`value`:`1`,`new_child`:``^],`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`new`,`operator`:`==`,`value`:`1`^]^]""}}"
434429
"Home Page Block",home-page-block,"<div class=""blocks-promo"">
435430
<a href=""{{category key=""yoga-new""}}"" class=""block-promo home-main"">
436431
<img src=""{{media url=""wysiwyg/home/home-main.jpg""}}"" alt="""" />
@@ -487,8 +482,7 @@ New Block,new-block,"<div class=""blocks-promo"">
487482
<h2 class=""title"">Hot Sellers</h2>
488483
<p class=""info"">Here is what`s trending on Luma right now</p>
489484
</div>
490-
{{widget type=""Magento\\CatalogWidget\\Block\\Product\\ProductsList"" products_per_page=""8"" products_count=""8"" template=""product/widget/content/grid.phtml"" conditions_encoded=""^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`all`,`value`:`1`,`new_child`:``^],`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`sku`,`operator`:`()`,`value`:`WS12, WT09, MT07, MH07, 24-MB02, 24-WB04, 241-MB08, 240-LV05`^]^]""}}
491-
"
485+
{{widget type=""Magento\CatalogWidget\Block\Product\ProductsList"" products_per_page=""8"" products_count=""8"" template=""product/widget/content/grid.phtml"" conditions_encoded=""^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`all`,`value`:`1`,`new_child`:``^],`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`sku`,`operator`:`()`,`value`:`WS12, WT09, MT07, MH07, 24-MB02, 24-WB04, 241-MB08, 240-LV05`^]^]""}}"
492486
"Performance Fabrics Block",performance-fabrics-block,"<div class=""blocks-promo"">
493487
<div class=""block-promo collection-performance"">
494488
<img src=""{{media url=""wysiwyg/collection/collection-performance.jpg""}}"" alt="""" />
@@ -498,7 +492,7 @@ New Block,new-block,"<div class=""blocks-promo"">
498492
</span>
499493
</div>
500494
</div>
501-
{{widget type=""Magento\\CatalogWidget\\Block\\Product\\ProductsList"" products_count=""5"" template=""product/widget/content/grid.phtml"" conditions_encoded=""^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`all`,`value`:`1`,`new_child`:``^],`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`performance_fabric`,`operator`:`==`,`value`:`1`^],`1--2`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`new`,`operator`:`==`,`value`:`1`^]^]""}}"
495+
{{widget type=""Magento\CatalogWidget\Block\Product\ProductsList"" products_count=""5"" template=""product/widget/content/grid.phtml"" conditions_encoded=""^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`all`,`value`:`1`,`new_child`:``^],`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`performance_fabric`,`operator`:`==`,`value`:`1`^],`1--2`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`new`,`operator`:`==`,`value`:`1`^]^]""}}"
502496
"Eco Friendly Block",eco-friendly-block,"<div class=""blocks-promo"">
503497
<div class=""block-promo collection-eco"">
504498
<img src=""{{media url=""wysiwyg/collection/collection-eco.jpg""}}"" alt="""" />
@@ -508,5 +502,4 @@ New Block,new-block,"<div class=""blocks-promo"">
508502
</span>
509503
</div>
510504
</div>
511-
{{widget type=""Magento\\CatalogWidget\\Block\\Product\\ProductsList"" products_count=""5"" template=""product/widget/content/grid.phtml"" conditions_encoded=""^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`all`,`value`:`1`,`new_child`:``^],`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`eco_collection`,`operator`:`==`,`value`:`1`^],`1--2`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`new`,`operator`:`==`,`value`:`1`^]^]""}}
512-
"
505+
{{widget type=""Magento\CatalogWidget\Block\Product\ProductsList"" products_count=""5"" template=""product/widget/content/grid.phtml"" conditions_encoded=""^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`all`,`value`:`1`,`new_child`:``^],`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`eco_collection`,`operator`:`==`,`value`:`1`^],`1--2`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`new`,`operator`:`==`,`value`:`1`^]^]""}}"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
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
2-
"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"":""25,16"",""is_value_processed"":false}]}]}","{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Product\\Combine"",""attribute"":null,""operator"":null,""value"":""1"",""is_value_processed"":null,""aggregator"":""all""}"
2+
"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""}"
33
"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""}"
4-
"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+
"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}]}]}"
55
"$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}]}"

0 commit comments

Comments
 (0)