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

OCC-186: Product Image #352

Merged
merged 12 commits into from
Sep 23, 2023
Merged

OCC-186: Product Image #352

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ff742ed
Addig media fields for the product part
DemeSzabolcs Sep 17, 2023
fb3d536
Trying to fix images fo UI tests
DemeSzabolcs Sep 17, 2023
923a777
Fixing images during UI testing
DemeSzabolcs Sep 17, 2023
9c3b4ed
Removing interactive mode
DemeSzabolcs Sep 17, 2023
daaecc4
Trying to fix ui tests
DemeSzabolcs Sep 17, 2023
a516713
Typo
DemeSzabolcs Sep 17, 2023
480eb2b
Trying to fix UI test
DemeSzabolcs Sep 17, 2023
7a2a44a
Renaming image on other places
DemeSzabolcs Sep 17, 2023
b626968
Fixing paths
DemeSzabolcs Sep 17, 2023
ac809f9
Fixing minor problems
DemeSzabolcs Sep 21, 2023
c0847b0
Adding UI test
DemeSzabolcs Sep 21, 2023
9c262ef
Removing extra line
DemeSzabolcs Sep 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/Modules/OrchardCore.Commerce/Migrations/ProductMigrations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
using OrchardCore.ContentManagement.Metadata;
using OrchardCore.ContentManagement.Metadata.Settings;
using OrchardCore.Data.Migration;
using OrchardCore.Media.Fields;
using OrchardCore.Media.Settings;
using YesSql.Sql;

namespace OrchardCore.Commerce.Migrations;
Expand All @@ -21,6 +23,10 @@ public int Create()
{
_contentDefinitionManager
.AlterPartDefinition(nameof(ProductPart), builder => builder
sarahelsaig marked this conversation as resolved.
Show resolved Hide resolved
.WithField("ProductImage", field => field
sarahelsaig marked this conversation as resolved.
Show resolved Hide resolved
sarahelsaig marked this conversation as resolved.
Show resolved Hide resolved
.OfType(nameof(MediaField))
.WithDisplayName("Product Image")
.WithSettings(new MediaFieldSettings { Multiple = false }))
.Attachable()
.WithDescription("Makes a content item into a product."));

Expand Down
7 changes: 7 additions & 0 deletions src/Modules/OrchardCore.Commerce/OrchardCore.Commerce.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,13 @@
<ProjectReference Include="..\OrchardCore.Commerce.Tax\OrchardCore.Commerce.Tax.csproj" />
<ProjectReference Include="..\OrchardCore.Commerce.Inventory\OrchardCore.Commerce.Inventory.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="Recipes\Media\**\*.*">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

<PropertyGroup>
<LombiqNodeJsExtensionsPath>..\..\..\..\..\Utilities\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions</LombiqNodeJsExtensionsPath>
</PropertyGroup>
Expand Down
Binary file added ...ules/OrchardCore.Commerce/Recipes/Media/Product Images/sample-product-image.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
57 changes: 53 additions & 4 deletions src/Modules/OrchardCore.Commerce/Recipes/OrchardCore.Commerce.Samples.Product.recipe.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,15 @@
"ProductSku": "TESTPRODUCTVARIANT"
},
"ProductPart": {
"Sku": "TESTPRODUCTVARIANT"
"Sku": "TESTPRODUCTVARIANT",
"ProductImage": {
"Paths": [
"Product Images/sample-product-image.png"
],
"MediaTexts": [
""
]
}
},
"ContainedPart": {
"ListContentItemId": "mainproductlist00000000000",
Expand Down Expand Up @@ -204,7 +212,15 @@
"Html": ""
},
"ProductPart": {
"Sku": "TESTPRODUCT"
"Sku": "TESTPRODUCT",
"ProductImage": {
"Paths": [
"Product Images/sample-product-image.png"
sarahelsaig marked this conversation as resolved.
Show resolved Hide resolved
],
"MediaTexts": [
""
]
}
},
"PricePart": {
"Price": {
Expand Down Expand Up @@ -269,7 +285,15 @@
"Html": ""
},
"ProductPart": {
"Sku": "TESTFREEPRODUCT"
"Sku": "TESTFREEPRODUCT",
"ProductImage": {
"Paths": [
"Product Images/sample-product-image.png"
],
"MediaTexts": [
""
]
}
},
"PricePart": {
"Price": {
Expand Down Expand Up @@ -334,7 +358,15 @@
"Html": ""
},
"ProductPart": {
"Sku": "TESTDISCOUNTEDPRODUCT"
"Sku": "TESTDISCOUNTEDPRODUCT",
"ProductImage": {
"Paths": [
"Product Images/sample-product-image.png"
],
"MediaTexts": [
""
]
}
},
"PricePart": {
"Price": {
Expand Down Expand Up @@ -414,6 +446,14 @@
},
"ProductPart": {
"Sku": "LOCALIZED",
"ProductImage": {
"Paths": [
"Product Images/sample-product-image.png"
],
"MediaTexts": [
""
]
},
"CanBeBought": {}
},
"PricePart": {
Expand All @@ -435,6 +475,15 @@
}
}
]
},
{
"name": "media",
"Files": [
{
"SourcePath": "Media/Product Images/sample-product-image.png",
"TargetPath": "Product Images/sample-product-image.png"
}
]
}
]
}
2 changes: 1 addition & 1 deletion test/OrchardCore.Commerce.Tests.UI/OrchardCore.Commerce.Tests.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion ...chardCore.Commerce.Tests.UI/Tests/LocalizedProductTests/LocalizedProductBehaviourTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Lombiq.Tests.UI.Attributes;
using Lombiq.Tests.UI.Attributes;
using Lombiq.Tests.UI.Extensions;
using Lombiq.Tests.UI.Services;
using OpenQA.Selenium;
Expand Down