Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/grandnode/grandnode into…
Browse files Browse the repository at this point in the history 
… develop
  • Loading branch information
@PatrykPorabik
PatrykPorabik committed Apr 16, 2019
2 parents de9332f + a6c27c3 commit 3700cfd
Show file tree
Hide file tree
Showing 2,176 changed files with 384 additions and 76,885 deletions.
14 changes: 7 additions & 7 deletions Grand.Core/Grand.Core.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
<PackageReference Include="Autofac" Version="4.9.1" />
<PackageReference Include="Autofac" Version="4.9.2" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.4.0" />
<PackageReference Include="AutoMapper" Version="8.0.0" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="6.0.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.10.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="2.10.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.0.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
<PackageReference Include="MongoDB.Bson" Version="2.7.3" />
<PackageReference Include="MongoDB.Driver" Version="2.7.3" />
<PackageReference Include="MongoDB.Driver.Core" Version="2.7.3" />
<PackageReference Include="MongoDB.Driver.GridFS" Version="2.7.3" />
<PackageReference Include="MongoDB.Bson" Version="2.8.0" />
<PackageReference Include="MongoDB.Driver" Version="2.8.0" />
<PackageReference Include="MongoDB.Driver.Core" Version="2.8.0" />
<PackageReference Include="MongoDB.Driver.GridFS" Version="2.8.0" />
<PackageReference Include="DotLiquid" Version="2.0.298" />
</ItemGroup>
</Project>
10 changes: 5 additions & 5 deletions Grand.Framework/Grand.Framework.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
<PackageReference Include="Microsoft.AspNetCore.Rewrite" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor" Version="2.2.0" />
<PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="2.2.2" />
<PackageReference Include="BundlerMinifier.Core" Version="2.8.391" />
<PackageReference Include="FluentValidation" Version="8.1.3" />
<PackageReference Include="FluentValidation.AspNetCore" Version="8.1.3" />
<PackageReference Include="FluentValidation.ValidatorAttribute" Version="8.1.3" />
<PackageReference Include="BundlerMinifier.Core" Version="2.9.406" />
<PackageReference Include="FluentValidation" Version="8.2.3" />
<PackageReference Include="FluentValidation.AspNetCore" Version="8.2.2" />
<PackageReference Include="FluentValidation.ValidatorAttribute" Version="8.2.3" />
<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.0.165" />
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.9.0" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.5.0" />
<PackageReference Include="WebMarkupMin.AspNetCore2" Version="2.5.0" />
<PackageReference Include="WebMarkupMin.Core" Version="2.5.5" />
<PackageReference Include="WebMarkupMin.Core" Version="2.5.7" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Grand.Services/Catalog/ProductService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1498,7 +1498,7 @@ public virtual async Task ReserveInventoryCombination(Product product, ProductAt
var pwi = productInventory[0];
pwi.ReservedQuantity += qty;
}
combination.StockQuantity = combination.WarehouseInventory.Sum(x => x.StockQuantity);
combination.StockQuantity = combination.WarehouseInventory.Sum(x => x.StockQuantity-x.ReservedQuantity);
var builder = Builders<Product>.Filter;
var filter = builder.Eq(x => x.Id, combination.ProductId);
filter = filter & builder.ElemMatch(x => x.ProductAttributeCombinations, y => y.Id == combination.Id);
Expand Down
2 changes: 1 addition & 1 deletion Grand.Services/ExportImport/ExportManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public virtual async Task<string> ExportManufacturersToXml(IList<Manufacturer> m
xmlWriter.WriteElementString("MetaDescription", null, manufacturer.MetaDescription);
xmlWriter.WriteElementString("MetaTitle", null, manufacturer.MetaTitle);
xmlWriter.WriteElementString("SEName", null, manufacturer.GetSeName(""));
xmlWriter.WriteElementString("PictureId", null, manufacturer.PictureId.ToString());
xmlWriter.WriteElementString("PictureId", null, manufacturer.PictureId);
xmlWriter.WriteElementString("PageSize", null, manufacturer.PageSize.ToString());
xmlWriter.WriteElementString("AllowCustomersToSelectPageSize", null, manufacturer.AllowCustomersToSelectPageSize.ToString());
xmlWriter.WriteElementString("PageSizeOptions", null, manufacturer.PageSizeOptions);
Expand Down
12 changes: 6 additions & 6 deletions Grand.Services/Grand.Services.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.Core" Version="3.3.31.12" />
<PackageReference Include="AWSSDK.S3" Version="3.3.31.20" />
<PackageReference Include="AWSSDK.Core" Version="3.3.100.5" />
<PackageReference Include="AWSSDK.S3" Version="3.3.101.3" />
<PackageReference Include="EPPlus" Version="4.5.3.1" />
<PackageReference Include="Google.Apis" Version="1.38.0" />
<PackageReference Include="Google.Apis.AnalyticsReporting.v4" Version="1.38.0.1485" />
<PackageReference Include="iTextSharp.LGPLv2.Core" Version="1.4.6" />
<PackageReference Include="MailKit" Version="2.1.3" />
<PackageReference Include="Google.Apis" Version="1.38.2" />
<PackageReference Include="Google.Apis.AnalyticsReporting.v4" Version="1.38.2.1551" />
<PackageReference Include="iTextSharp.LGPLv2.Core" Version="1.5.0" />
<PackageReference Include="MailKit" Version="2.1.4" />
<PackageReference Include="MaxMind.GeoIP2" Version="3.0.0" />
<PackageReference Include="System.ServiceModel.Duplex" Version="4.5.3" />
<PackageReference Include="System.ServiceModel.Http" Version="4.5.3" />
Expand Down
10 changes: 5 additions & 5 deletions Grand.Web/Areas/Admin/Views/Affiliate/_CreateOrUpdate.TabInfo.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<div class="form-body">
@if (!String.IsNullOrEmpty(Model.Id))
{
<div class="form-group">
<admin-label asp-for="Id" />
<div class="col-md-9 col-sm-9">
<label class="control-label">@Model.Id</label>
</div>
<div class="form-group">
<admin-label asp-for="Id" />
<div class="col-md-9 col-sm-9">
<label class="control-label">@Model.Id</label>
</div>
</div>
<div class="form-group">
<admin-label asp-for="Url" />
<div class="col-md-9 col-sm-9">
Expand Down
36 changes: 18 additions & 18 deletions Grand.Web/Areas/Admin/Views/Customer/List.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@

<div class="form-body">
<div class="form-group popup">
<admin-label asp-for="SearchEmail" class="control-label col-sm-2" />
<div class="col-xs-8 col-md-4 col-sm-4">
<admin-label asp-for="SearchEmail" class="col-xs-2 control-label col-sm-2" />
<div class="col-xs-10 col-md-4 col-sm-4">
<admin-input asp-for="SearchEmail" />
</div>
<div class="col-xs-8 col-md-4 col-sm-4 mt-mobile-10">
Expand All @@ -68,61 +68,61 @@
@if (Model.UsernamesEnabled)
{
<div class="form-group">
<admin-label asp-for="SearchUsername" class="control-label col-xs-8 col-md-4 col-sm-4" />
<div class="col-xs-4 col-md-8 col-sm-8">
<admin-label asp-for="SearchUsername" class="control-label col-xs-4 col-md-4 col-sm-4" />
<div class="col-xs-8 col-md-8 col-sm-8">
<admin-input asp-for="SearchUsername" />
</div>
</div>
}
<div class="form-group">
<admin-label asp-for="SearchFirstName" class="control-label col-xs-8 col-md-4 col-sm-4" />
<div class="col-xs-4 col-md-8 col-sm-8">
<admin-label asp-for="SearchFirstName" class="control-label col-xs-4 col-md-4 col-sm-4" />
<div class="col-xs-8 col-md-8 col-sm-8">
<admin-input asp-for="SearchFirstName" />
</div>
</div>
<div class="form-group">
<admin-label asp-for="SearchLastName" class="control-label col-xs-8 col-md-4 col-sm-4" />
<div class="col-xs-4 col-md-8 col-sm-8">
<admin-label asp-for="SearchLastName" class="control-label col-xs-4 col-md-4 col-sm-4" />
<div class="col-xs-8 col-md-8 col-sm-8">
<admin-input asp-for="SearchLastName" />
</div>
</div>
@if (Model.CompanyEnabled)
{
<div class="form-group">
<admin-label asp-for="SearchCompany" class="control-label col-xs-8 col-md-4 col-sm-4" />
<div class="col-xs-4 col-md-8 col-sm-8">
<admin-label asp-for="SearchCompany" class="control-label col-xs-4 col-md-4 col-sm-4" />
<div class="col-xs-8 col-md-8 col-sm-8">
<admin-input asp-for="SearchCompany" />
</div>
</div>
}
</div>
<div class="form-body col-md-6 extend-collapse">
<div class="form-group">
<admin-label asp-for="SearchCustomerRoleIds" class="control-label col-xs-8 col-md-4 col-sm-4" />
<div class="col-xs-4 col-md-8 col-sm-8">
<admin-label asp-for="SearchCustomerRoleIds" class="control-label col-xs-4 col-md-4 col-sm-4" />
<div class="col-xs-8 col-md-8 col-sm-8">
<admin-input asp-for="SearchCustomerRoleIds" asp-template="MultiSelect" asp-selectitem="Model.AvailableCustomerRoles" />
</div>
</div>
<div class="form-group">
<admin-label asp-for="SearchCustomerTagIds" class="control-label col-xs-8 col-md-4 col-sm-4" />
<div class="col-xs-4 col-md-8 col-sm-8">
<admin-label asp-for="SearchCustomerTagIds" class="control-label col-xs-4 col-md-4 col-sm-4" />
<div class="col-xs-8 col-md-8 col-sm-8">
<admin-input asp-for="SearchCustomerTagIds" asp-template="MultiSelect" asp-selectitem="Model.AvailableCustomerTags" />
</div>
</div>
@if (Model.PhoneEnabled)
{
<div class="form-group">
<admin-label asp-for="SearchPhone" class="control-label col-xs-8 col-md-4 col-sm-4" />
<div class="col-xs-4 col-md-8 col-sm-8">
<admin-label asp-for="SearchPhone" class="control-label col-xs-4 col-md-4 col-sm-4" />
<div class="col-xs-8 col-md-8 col-sm-8">
<admin-input asp-for="SearchPhone" />
</div>
</div>
}
@if (Model.ZipPostalCodeEnabled)
{
<div class="form-group">
<admin-label asp-for="SearchZipPostalCode" class="control-label col-xs-8 col-md-4 col-sm-4" />
<div class="col-xs-4 col-md-8 col-sm-8">
<admin-label asp-for="SearchZipPostalCode" class="control-label col-xs-4 col-md-4 col-sm-4" />
<div class="col-xs-8 col-md-8 col-sm-8">
<admin-input asp-for="SearchZipPostalCode" />
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion Grand.Web/Areas/Admin/Views/Home/Index.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@
],
"firstDay": 1
},
opens: (App.isRTL() ? 'right' : 'left'),
opens: ('left'),
}, function (start, end, label) {
$('#dashboard-report-range span').html(start.format('MMMM D, YYYY') + ' - ' + end.format('MMMM D, YYYY'));
});
Expand Down
Loading

0 comments on commit 3700cfd

Please sign in to comment.