Skip to content

Commit 3c0dc7f

Browse files
muratcakirmuratcakir
committed
Minor fixes
1 parent 6799f04 commit 3c0dc7f

File tree

6 files changed

+41
-59
lines changed

6 files changed

+41
-59
lines changed

‎src/Libraries/SmartStore.Data/Setup/TestDatabaseInitializer.cs‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎src/Libraries/SmartStore.Data/SmartStore.Data.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,6 @@
293293
<Compile Include="Mapping\Shipping\ShipmentItemMap.cs" />
294294
<Compile Include="Mapping\Tasks\ScheduleTaskMap.cs" />
295295
<Compile Include="Setup\Builder\BuilderDbContextExtensions.cs" />
296-
<Compile Include="Setup\TestDatabaseInitializer.cs" />
297296
<Compile Include="SmartDbConfiguration.cs" />
298297
<Compile Include="SqlServerDataProvider.cs" />
299298
<Compile Include="SqlCeDataProvider.cs" />

‎src/Libraries/SmartStore.Services/Catalog/PriceCalculationService.cs‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ protected virtual IList<Discount> GetAllowedDiscounts(Product product, Customer
124124
/// <returns>Price</returns>
125125
protected virtual decimal? GetMinimumTierPrice(Product product, Customer customer, int quantity)
126126
{
127-
if (!product.HasTierPrices)
127+
if (!product.HasTierPrices)
128128
return decimal.Zero;
129129

130130
var tierPrices = product.TierPrices
@@ -334,7 +334,8 @@ public virtual decimal GetFinalPrice(Product product,
334334
/// <param name="quantity">Shopping cart item quantity</param>
335335
/// <param name="bundleItem">A product bundle item</param>
336336
/// <returns>Final price</returns>
337-
public virtual decimal GetFinalPrice(Product product,
337+
public virtual decimal GetFinalPrice(
338+
Product product,
338339
Customer customer,
339340
decimal additionalCharge,
340341
bool includeDiscounts,
@@ -353,8 +354,8 @@ public virtual decimal GetFinalPrice(Product product,
353354
if (product.HasTierPrices && !bundleItem.IsValid())
354355
{
355356
decimal? tierPrice = GetMinimumTierPrice(product, customer, quantity);
356-
if (tierPrice.HasValue)
357-
result = Math.Min(result, tierPrice.Value);
357+
if (tierPrice.HasValue)
358+
result = Math.Min(result, tierPrice.Value);
358359
}
359360

360361
//discount + additional charge
@@ -384,8 +385,14 @@ public virtual decimal GetFinalPrice(Product product,
384385
/// <param name="quantity">Shopping cart item quantity</param>
385386
/// <param name="bundleItem">A product bundle item</param>
386387
/// <returns>Final price</returns>
387-
public virtual decimal GetFinalPrice(Product product, IList<ProductBundleItemData> bundleItems,
388-
Customer customer, decimal additionalCharge, bool includeDiscounts, int quantity, ProductBundleItemData bundleItem = null)
388+
public virtual decimal GetFinalPrice(
389+
Product product,
390+
IList<ProductBundleItemData> bundleItems,
391+
Customer customer,
392+
decimal additionalCharge,
393+
bool includeDiscounts,
394+
int quantity,
395+
ProductBundleItemData bundleItem = null)
389396
{
390397
if (product.ProductType == ProductType.BundledProduct && product.BundlePerItemPricing)
391398
{

‎src/Presentation/SmartStore.Web/Administration/Infrastructure/AutoMapperStartupTask.cs‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ public void Execute()
179179
//category
180180
Mapper.CreateMap<Category, CategoryModel>()
181181
.ForMember(dest => dest.AvailableCategoryTemplates, mo => mo.Ignore())
182+
.ForMember(dest => dest.AvailableDefaultViewModes, mo => mo.Ignore())
182183
.ForMember(dest => dest.Locales, mo => mo.Ignore())
183184
.ForMember(dest => dest.Breadcrumb, mo => mo.Ignore())
184185
.ForMember(dest => dest.ParentCategoryBreadcrumb, mo => mo.Ignore())
@@ -236,6 +237,7 @@ public void Execute()
236237
.ForMember(dest => dest.AvailableStores, mo => mo.Ignore())
237238
.ForMember(dest => dest.SelectedStoreIds, mo => mo.Ignore())
238239
.ForMember(dest => dest.AvailableTaxCategories, mo => mo.Ignore())
240+
.ForMember(dest => dest.AvailableMeasureUnits, mo => mo.Ignore())
239241
.ForMember(dest => dest.PrimaryStoreCurrencyCode, mo => mo.Ignore())
240242
.ForMember(dest => dest.CreatedOn, mo => mo.Ignore())
241243
.ForMember(dest => dest.UpdatedOn, mo => mo.Ignore())
@@ -329,13 +331,15 @@ public void Execute()
329331
// Measure unit
330332
Mapper.CreateMap<QuantityUnit, QuantityUnitModel>()
331333
.ForMember(dest => dest.Locales, mo => mo.Ignore());
332-
Mapper.CreateMap<QuantityUnitModel, QuantityUnit>();
334+
Mapper.CreateMap<QuantityUnitModel, QuantityUnit>()
335+
.ForMember(dest => dest.DisplayLocale, mo => mo.Ignore());
333336

334337
// ContentSlider slides
335338
Mapper.CreateMap<ContentSliderSettings, ContentSliderSettingsModel>()
336339
.ForMember(dest => dest.Id, mo => mo.Ignore())
337340
.ForMember(dest => dest.AvailableStores, mo => mo.Ignore())
338-
.ForMember(dest => dest.SearchStoreId, mo => mo.Ignore());
341+
.ForMember(dest => dest.SearchStoreId, mo => mo.Ignore())
342+
.ForMember(dest => dest.StoreCount, mo => mo.Ignore());
339343
Mapper.CreateMap<ContentSliderSettingsModel, ContentSliderSettings>();
340344

341345
Mapper.CreateMap<ContentSliderSlideSettings, ContentSliderSlideModel>()
@@ -364,6 +368,7 @@ public void Execute()
364368
.ForMember(dest => dest.QuantityUnit, mo => mo.Ignore())
365369
.ForMember(dest => dest.Product, mo => mo.Ignore())
366370
.ForMember(dest => dest.AssignedPictureIds, mo => mo.Ignore())
371+
.ForMember(dest => dest.QuantityUnitId, mo => mo.Ignore())
367372
.AfterMap((src, dest) => dest.SetAssignedPictureIds(src.AssignedPictureIds));
368373

369374
//measure weights
@@ -388,7 +393,12 @@ public void Execute()
388393
.ForMember(dest => dest.SelectedStoreIds, mo => mo.Ignore())
389394
.ForMember(dest => dest.Locales, mo => mo.Ignore())
390395
.ForMember(dest => dest.IconUrl, mo => mo.Ignore())
391-
.ForMember(dest => dest.ConfigurationRoute, mo => mo.Ignore());
396+
.ForMember(dest => dest.ConfigurationRoute, mo => mo.Ignore())
397+
.ForMember(dest => dest.LicenseUrl, mo => mo.Ignore())
398+
.ForMember(dest => dest.IsLicensable, mo => mo.Ignore())
399+
.ForMember(dest => dest.LicenseState, mo => mo.Ignore())
400+
.ForMember(dest => dest.TruncatedLicenseKey, mo => mo.Ignore())
401+
.ForMember(dest => dest.RemainingDemoUsageDays, mo => mo.Ignore());
392402
//newsLetter subscriptions
393403
Mapper.CreateMap<NewsLetterSubscription, NewsLetterSubscriptionModel>()
394404
.ForMember(dest => dest.CreatedOn, mo => mo.Ignore())
@@ -477,7 +487,8 @@ public void Execute()
477487
Mapper.CreateMap<ProductAttributeModel, ProductAttribute>();
478488
//specification attributes
479489
Mapper.CreateMap<SpecificationAttribute, SpecificationAttributeModel>()
480-
.ForMember(dest => dest.Locales, mo => mo.Ignore());
490+
.ForMember(dest => dest.Locales, mo => mo.Ignore())
491+
.ForMember(dest => dest.OptionCount, mo => mo.Ignore());
481492
Mapper.CreateMap<SpecificationAttributeModel, SpecificationAttribute>()
482493
.ForMember(dest => dest.SpecificationAttributeOptions, mo => mo.Ignore());
483494
Mapper.CreateMap<SpecificationAttributeOption, SpecificationAttributeOptionModel>()
@@ -615,10 +626,11 @@ public void Execute()
615626
.ForMember(dest => dest.Id, mo => mo.Ignore());
616627
Mapper.CreateMap<ShoppingCartSettings, ShoppingCartSettingsModel>();
617628
Mapper.CreateMap<ShoppingCartSettingsModel, ShoppingCartSettings>()
618-
.ForMember(dest => dest.MoveItemsFromWishlistToCart, mo => mo.Ignore());
619-
Mapper.CreateMap<MediaSettings, MediaSettingsModel>()
620-
.ForMember(dest => dest.PicturesStoredIntoDatabase, mo => mo.Ignore())
621-
.ForMember(dest => dest.AvailablePictureZoomTypes, mo => mo.Ignore());
629+
.ForMember(dest => dest.MoveItemsFromWishlistToCart, mo => mo.Ignore())
630+
.ForMember(dest => dest.ShowItemsFromWishlistToCartButton, mo => mo.Ignore());
631+
Mapper.CreateMap<MediaSettings, MediaSettingsModel>()
632+
.ForMember(dest => dest.PicturesStoredIntoDatabase, mo => mo.Ignore())
633+
.ForMember(dest => dest.AvailablePictureZoomTypes, mo => mo.Ignore());
622634
Mapper.CreateMap<MediaSettingsModel, MediaSettings>()
623635
//.ForMember(dest => dest.DefaultPictureZoomEnabled, mo => mo.Ignore())
624636
.ForMember(dest => dest.DefaultImageQuality, mo => mo.Ignore())

‎src/Tests/SmartStore.Data.Tests/GlobalSetup.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ public class GlobalSetup
1515
public void SetUp()
1616
{
1717
var ctx = new SmartObjectContext(GetTestDbName());
18-
ctx.Database.Delete();
19-
Database.SetInitializer(new TestDatabaseInitializer<SmartObjectContext, MigrationsConfiguration>(GetTestDbName()));
18+
Database.SetInitializer(new DropCreateDatabaseAlways<SmartObjectContext>());
2019
ctx.Database.Initialize(true);
2120
}
2221

@@ -29,7 +28,7 @@ public void TearDown()
2928

3029
public static string GetTestDbName()
3130
{
32-
string testDbName = "Data Source=" + (System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location)) + @"\\SmartStore.Data.Tests.Db.sdf;Persist Security Info=False";
31+
string testDbName = "Data Source=" + (System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location)) + @"\SmartStore.Data.Tests.Db.sdf;Persist Security Info=False";
3332
return testDbName;
3433
}
3534
}

‎src/Tests/SmartStore.Services.Tests/Catalog/PriceCalculationServiceTests.cs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public class PriceCalculationServiceTests : ServiceTest
5353

5454
_downloadService = MockRepository.GenerateMock<IDownloadService>();
5555
_commonServices = MockRepository.GenerateMock<ICommonServices>();
56+
_commonServices.Expect(x => x.StoreContext).Return(_storeContext);
5657
_httpRequestBase = MockRepository.GenerateMock<HttpRequestBase>();
5758
_taxService = MockRepository.GenerateMock<ITaxService>();
5859

@@ -95,22 +96,23 @@ public void Can_get_final_product_price_with_tier_prices()
9596
};
9697

9798
//add tier prices
98-
product.TierPrices.Add(new TierPrice()
99+
product.TierPrices.Add(new TierPrice
99100
{
100101
Price = 10,
101102
Quantity = 2,
102103
Product = product
103104
});
104-
product.TierPrices.Add(new TierPrice()
105+
product.TierPrices.Add(new TierPrice
105106
{
106107
Price = 8,
107108
Quantity = 5,
108109
Product = product
109110
});
110-
//set HasTierPrices property
111+
112+
// set HasTierPrices property
111113
product.HasTierPrices = true;
112114

113-
//customer
115+
// customer
114116
Customer customer = null;
115117

116118
_priceCalcService.GetFinalPrice(product, customer, 0, false, 1).ShouldEqual(12.34M);

0 commit comments

Comments
 (0)