Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix fixtures inconsistencies #10410

Merged
merged 4 commits into from Sep 13, 2018
Merged

Fix fixtures inconsistencies #10410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7c38b27
fix fixtures inconsistencies
jocel1 Sep 12, 2018
2c86671
fix categories
jocel1 Sep 13, 2018
e9bd23c
typo
jocel1 Sep 13, 2018
6d332e7
change the men / women categories assignation
jocel1 Sep 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions install-dev/fixtures/fashion/data/cart_product.xml
View file
Open in desktop
Expand Up @@ -10,10 +10,10 @@
<entities>
<cart_product id="cart_product_1_2_10" id_cart="cart_1" id_product="Hummingbird_printed_t-shirt" id_address_delivery="3" id_product_attribute="product_attribute_46" quantity="1"/>
<cart_product id="cart_product_1_3_13" id_cart="cart_1" id_product="Hummingbird_printed_sweater" id_address_delivery="3" id_product_attribute="product_attribute_62" quantity="1"/>
<cart_product id="cart_product_2_2_10" id_cart="cart_2" id_product="The_adventure_begins_Framed_poster" id_address_delivery="3" id_product_attribute="product_attribute_73" quantity="1"/>
<cart_product id="cart_product_2_2_10" id_cart="cart_2" id_product="The_adventure_begins_Framed_poster" id_address_delivery="3" id_product_attribute="product_attribute_75" quantity="1"/>
<cart_product id="cart_product_2_6_32" id_cart="cart_2" id_product="Mug_Today_is_a_good_day" id_address_delivery="3" id_product_attribute="" quantity="1"/>
<cart_product id="cart_product_3_2_10" id_cart="cart_3" id_product="Mountain_fox_notebook" id_address_delivery="3" id_product_attribute="product_attribute_85" quantity="1"/>
<cart_product id="cart_product_4_1_1" id_cart="cart_4" id_product="Mountain_fox_notebook" id_address_delivery="3" id_product_attribute="product_attribute_82" quantity="1"/>
<cart_product id="cart_product_5_1_1" id_cart="cart_5" id_product="Brown_bear_cushion" id_address_delivery="3" id_product_attribute="product_attribute_1" quantity="1"/>
<cart_product id="cart_product_4_1_1" id_cart="cart_4" id_product="Mountain_fox_notebook" id_address_delivery="3" id_product_attribute="product_attribute_86" quantity="1"/>
<cart_product id="cart_product_5_1_1" id_cart="cart_5" id_product="Brown_bear_cushion" id_address_delivery="3" id_product_attribute="product_attribute_82" quantity="1"/>
</entities>
</entity_cart_product>
8 changes: 4 additions & 4 deletions install-dev/fixtures/fashion/data/feature_product.xml
View file
Open in desktop
Expand Up @@ -6,9 +6,9 @@
<field name="id_feature_value"/>
</fields>
<entities>
<feature_product id="feature_product_5_8" id_feature="5" id_product="8" id_feature_value="5"/>
<feature_product id="feature_product_5_10" id_feature="5" id_product="10" id_feature_value="5"/>
<feature_product id="feature_product_8_28" id_feature="8" id_product="28" id_feature_value="37"/>
<feature_product id="feature_product_8_29" id_feature="8" id_product="29" id_feature_value="37"/>
<feature_product id="feature_product_6_9" id_feature="3" id_product="6" id_feature_value="9"/>
<feature_product id="feature_product_7_9" id_feature="3" id_product="7" id_feature_value="9"/>
<feature_product id="feature_product_8_9" id_feature="3" id_product="8" id_feature_value="9"/>
<feature_product id="feature_product_19_9" id_feature="3" id_product="19" id_feature_value="9"/>
</entities>
</entity_feature_product>
35 changes: 17 additions & 18 deletions install-dev/fixtures/fashion/data/feature_value.xml
View file
Open in desktop
Expand Up @@ -5,23 +5,22 @@
<field name="custom"/>
</fields>
<entities>
<feature_value id="Polyester" id_feature="5" custom="0"/>
<feature_value id="Wool" id_feature="5" custom="0"/>
<feature_value id="Elastane" id_feature="5" custom="0"/>
<feature_value id="Cotton" id_feature="5" custom="0"/>
<feature_value id="Ruled" id_feature="8" custom="0"/>
<feature_value id="Plain" id_feature="8" custom="0"/>
<feature_value id="Squarred" id_feature="8" custom="0"/>
<feature_value id="Doted" id_feature="8" custom="0"/>
<feature_value id="White" id_feature="9" custom="0"/>
<feature_value id="Black" id_feature="9" custom="0"/>
<feature_value id="S" id_feature="10" custom="0"/>
<feature_value id="M" id_feature="10" custom="0"/>
<feature_value id="L" id_feature="10" custom="0"/>
<feature_value id="XL" id_feature="10" custom="0"/>
<feature_value id="40x60cm" id_feature="11" custom="0"/>
<feature_value id="60x90cm" id_feature="11" custom="0"/>
<feature_value id="80x120cm" id_feature="11" custom="0"/>
<feature_value id="80x120cm_1" id_feature="11" custom="0"/>
<feature_value id="Polyester" id_feature="1" custom="0"/>
<feature_value id="Wool" id_feature="1" custom="0"/>
<feature_value id="Elastane" id_feature="1" custom="0"/>
<feature_value id="Cotton" id_feature="1" custom="0"/>
<feature_value id="Ruled" id_feature="2" custom="0"/>
<feature_value id="Plain" id_feature="2" custom="0"/>
<feature_value id="Squarred" id_feature="2" custom="0"/>
<feature_value id="Doted" id_feature="2" custom="0"/>
<feature_value id="White" id_feature="3" custom="0"/>
<feature_value id="Black" id_feature="3" custom="0"/>
<feature_value id="S" id_feature="4" custom="0"/>
<feature_value id="M" id_feature="4" custom="0"/>
<feature_value id="L" id_feature="4" custom="0"/>
<feature_value id="XL" id_feature="4" custom="0"/>
<feature_value id="40x60cm" id_feature="5" custom="0"/>
<feature_value id="60x90cm" id_feature="5" custom="0"/>
<feature_value id="80x120cm" id_feature="5" custom="0"/>
</entities>
</entity_feature_value>
2 changes: 1 addition & 1 deletion install-dev/fixtures/fashion/data/order_detail.xml
View file
Open in desktop
Expand Up @@ -77,7 +77,7 @@
<download_hash/>
</order_detail>
<order_detail id="order_detail_3" id_order="2" id_order_invoice="0" id_warehouse="0" id_shop="1"
product_id="The_adventure_begins_Framed_poster" product_attribute_id="product_attribute_73" product_quantity="2"
product_id="The_adventure_begins_Framed_poster" product_attribute_id="product_attribute_75" product_quantity="2"
product_quantity_in_stock="3" product_quantity_refunded="0" product_quantity_return="0"
product_quantity_reinjected="0" product_price="29.000000" reduction_percent="0.00"
reduction_amount="0.000000" reduction_amount_tax_incl="0.000000"
Expand Down
6 changes: 3 additions & 3 deletions install-dev/fixtures/fashion/data/product.xml
View file
Open in desktop
Expand Up @@ -47,15 +47,15 @@
<unity/>
<location/>
</product>
<product id="Hummingbird_printed_sweater" id_supplier="Fashion_Supplier" id_manufacturer="Studio_Design" id_category_default="Home" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="35.900000" wholesale_price="0.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="demo_3" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.000000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="62" advanced_stock_management="0">
<product id="Hummingbird_printed_sweater" id_supplier="Fashion_Supplier" id_manufacturer="Studio_Design" id_category_default="Women" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="35.900000" wholesale_price="0.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="demo_3" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.000000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="404" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="62" advanced_stock_management="0">
<unity/>
<location/>
</product>
<product id="The_best_is_yet_to_come_Framed_poster" id_supplier="Fashion_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Art" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="29.000000" wholesale_price="0.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="demo_6" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.000000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="70" advanced_stock_management="0">
<unity/>
<location/>
</product>
<product id="The_adventure_begins_Framed_poster" id_supplier="Fashion_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Home" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="29.000000" wholesale_price="0.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="demo_5" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.000000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="73" advanced_stock_management="0">
<product id="The_adventure_begins_Framed_poster" id_supplier="Fashion_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Art" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="29.000000" wholesale_price="0.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="demo_5" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.000000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="404" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="73" advanced_stock_management="0">
<unity/>
<location/>
</product>
Expand All @@ -71,7 +71,7 @@
<unity/>
<location/>
</product>
<product id="Mug_Today_is_a_good_day" id_supplier="Fashion_Supplier" id_manufacturer="Studio_Design" id_category_default="Home" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="11.900000" wholesale_price="0.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="demo_13" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.000000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0">
<product id="Mug_Today_is_a_good_day" id_supplier="Fashion_Supplier" id_manufacturer="Studio_Design" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="11.900000" wholesale_price="0.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="demo_13" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.000000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="404" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0">
<unity/>
<location/>
</product>
Expand Down
3 changes: 0 additions & 3 deletions install-dev/fixtures/fashion/langs/en/data/feature_value.xml
View file
Open in desktop
Expand Up @@ -51,7 +51,4 @@
<feature_value id="80x120cm">
<value>80x120cm</value>
</feature_value>
<feature_value id="80x120cm_1">
<value>80x120cm</value>
</feature_value>
</entity_feature_value>
3 changes: 0 additions & 3 deletions install-dev/fixtures/fashion/langs/fa/data/feature_value.xml
View file
Open in desktop
Expand Up @@ -51,7 +51,4 @@
<feature_value id="80x120cm">
<value>80x120 سانتی متر</value>
</feature_value>
<feature_value id="80x120cm_1">
<value>80x120 سانتی متر</value>
</feature_value>
</entity_feature_value>
4 changes: 2 additions & 2 deletions install-dev/fixtures/fashion/langs/fr/data/feature.xml
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
<name>Compositions</name>
</feature>
<feature id="Paper_Type">
<name>Paper Type</name>
<name>Type de papier</name>
</feature>
<feature id="Color">
<name>Couleur</name>
Expand All @@ -13,6 +13,6 @@
<name>Taille</name>
</feature>
<feature id="Frame_Size">
<name>Frame Size</name>
<name>Taille du cadre</name>
</feature>
</entity_feature>
3 changes: 0 additions & 3 deletions install-dev/fixtures/fashion/langs/fr/data/feature_value.xml
View file
Open in desktop
Expand Up @@ -51,7 +51,4 @@
<feature_value id="80x120cm">
<value>80x120cm</value>
</feature_value>
<feature_value id="80x120cm_1">
<value>80x120cm</value>
</feature_value>
</entity_feature_value>