Skip to content

Commit f310274

Browse files
muratcakirmuratcakir
committed
Manual merge fixing
1 parent aa1bc43 commit f310274

11 files changed

Lines changed: 262 additions & 385 deletions

File tree

‎src/Libraries/SmartStore.Services/Discounts/DiscountService.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -338,16 +338,12 @@ public virtual bool IsDiscountValid(Discount discount, Customer customer, string
338338

339339
// discount requirements
340340
var requirements = discount.DiscountRequirements;
341-
int storeId = _storeContext.CurrentStore.Id;
342341
foreach (var req in requirements)
343342
{
344343
var requirementRule = LoadDiscountRequirementRuleBySystemName(req.DiscountRequirementRuleSystemName, storeId);
345344
if (requirementRule == null)
346345
continue;
347346

348-
if (!(storeId == 0 || _settingService.GetSettingByKey<string>(requirementRule.PluginDescriptor.GetSettingKey("LimitedToStores")).ToIntArrayContains(storeId, true)))
349-
continue;
350-
351347
var request = new CheckDiscountRequirementRequest()
352348
{
353349
DiscountRequirement = req,

‎src/Libraries/SmartStore.Services/Payments/PaymentService.cs‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,8 @@ public virtual IEnumerable<Provider<IPaymentMethod>> LoadActivePaymentMethods(in
9191
/// </summary>
9292
public virtual bool IsPaymentMethodActive(string systemName, int storeId = 0)
9393
{
94-
var method = LoadActivePaymentMethods()
95-
.FirstOrDefault(x => x.PluginDescriptor.SystemName == systemName && x.PluginDescriptor.Installed);
96-
97-
if (method != null)
98-
{
99-
if (storeId == 0 || _settingService.GetSettingByKey<string>(method.PluginDescriptor.GetSettingKey("LimitedToStores")).ToIntArrayContains(storeId, true))
100-
return true;
101-
}
102-
103-
return false;
94+
var method = LoadPaymentMethodBySystemName(systemName, true, storeId);
95+
return method != null;
10496
}
10597

10698
/// <summary>

‎src/Plugins/Feed.Froogle/Controllers/FeedFroogleController.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ public ActionResult ProductEditTab(int productId)
5151

5252
if (entity != null)
5353
{
54-
model.GoogleCategory = entity.Taxonomy;
54+
model.Taxonomy = entity.Taxonomy;
5555
model.Gender = entity.Gender;
5656
model.AgeGroup = entity.AgeGroup;
5757
model.Color = entity.Color;
58-
model.GoogleSize = entity.Size;
58+
model.Size = entity.Size;
5959
model.Material = entity.Material;
6060
model.Pattern = entity.Pattern;
6161
}

‎src/Plugins/Feed.Froogle/Events.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void HandleEvent(ModelBoundEvent eventMessage)
4848

4949
var entity = _googleService.GetGoogleProductRecord(model.ProductId);
5050
var insert = (entity == null);
51-
var delete = model.GoogleCategory.IsEmpty() && model.AgeGroup.IsEmpty() && model.Color.IsEmpty() && model.Gender.IsEmpty() && model.GoogleSize.IsEmpty() && model.Pattern.IsEmpty() && model.Material.IsEmpty();
51+
var delete = model.Taxonomy.IsEmpty() && model.AgeGroup.IsEmpty() && model.Color.IsEmpty() && model.Gender.IsEmpty() && model.Size.IsEmpty() && model.Pattern.IsEmpty() && model.Material.IsEmpty();
5252

5353
if (insert && delete)
5454
{
@@ -76,8 +76,8 @@ public void HandleEvent(ModelBoundEvent eventMessage)
7676
entity.AgeGroup = model.AgeGroup;
7777
entity.Color = model.Color;
7878
entity.Gender = model.Gender;
79-
entity.Size = model.GoogleSize;
80-
entity.Taxonomy = model.GoogleCategory;
79+
entity.Size = model.Size;
80+
entity.Taxonomy = model.Taxonomy;
8181
entity.Material = model.Material;
8282
entity.Pattern = model.Pattern;
8383

‎src/Plugins/Feed.Froogle/Models/FeedFroogleModel.cs‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,11 @@ public class GoogleProductModel : ModelBase
193193

194194
//this attribute is required to disable editing
195195
[ScaffoldColumn(false)]
196-
public int ProductId { get { return Id; } }
196+
public int ProductId
197+
{
198+
get { return Id; }
199+
set { Id = value; }
200+
}
197201
public int Id { get; set; }
198202

199203
//this attribute is required to disable editing
@@ -227,16 +231,16 @@ public string ProductTypeLabelHint
227231
[SmartResourceDisplayName("Plugins.Feed.Froogle.Products.GoogleCategory")]
228232
public string Taxonomy { get; set; }
229233

230-
[SmartResourceDisplayName("Plugins.Feed.Froogle.Gender")]
234+
[SmartResourceDisplayName("Plugins.Feed.Froogle.Products.Gender")]
231235
public string Gender { get; set; }
232236

233-
[SmartResourceDisplayName("Plugins.Feed.Froogle.AgeGroup")]
237+
[SmartResourceDisplayName("Plugins.Feed.Froogle.Products.AgeGroup")]
234238
public string AgeGroup { get; set; }
235239

236-
[SmartResourceDisplayName("Plugins.Feed.Froogle.Color")]
240+
[SmartResourceDisplayName("Plugins.Feed.Froogle.Products.Color")]
237241
public string Color { get; set; }
238242

239-
[SmartResourceDisplayName("Plugins.Feed.Froogle.Size")]
243+
[SmartResourceDisplayName("Plugins.Feed.Froogle.Products.Size")]
240244
public string Size { get; set; }
241245

242246
[SmartResourceDisplayName("Plugins.Feed.Froogle.Products.Material")]

‎src/Plugins/Feed.Froogle/Services/GoogleFeedService.cs‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
using Autofac;
2-
using Telerik.Web.Mvc;
31
using System;
2+
using System.Collections.Generic;
43
using System.Globalization;
54
using System.IO;
65
using System.Linq;
@@ -9,33 +8,20 @@
98
using System.Web.Mvc;
109
using System.Xml;
1110
using Autofac;
12-
using SmartStore.Core;
13-
using System.Web;
14-
using System.Web.Mvc;
15-
using System.Collections.Generic;
16-
using System.Globalization;
17-
using SmartStore.Web.Framework.Plugins;
18-
using SmartStore.Plugin.Feed.Froogle.Domain;
19-
using SmartStore.Plugin.Feed.Froogle.Models;
2011
using SmartStore.Core.Data;
2112
using SmartStore.Core.Domain.Catalog;
13+
using SmartStore.Core.Domain.Common;
2214
using SmartStore.Core.Domain.Directory;
2315
using SmartStore.Core.Domain.Stores;
2416
using SmartStore.Core.Logging;
25-
using SmartStore.Services.Catalog;
2617
using SmartStore.Plugin.Feed.Froogle.Domain;
2718
using SmartStore.Plugin.Feed.Froogle.Models;
2819
using SmartStore.Services.Catalog;
2920
using SmartStore.Services.Directory;
30-
using SmartStore.Services.Stores;
21+
using SmartStore.Services.Localization;
22+
using SmartStore.Services.Tasks;
3123
using SmartStore.Web.Framework.Plugins;
3224
using Telerik.Web.Mvc;
33-
using SmartStore.Services.Tasks;
34-
using System.Collections.Generic;
35-
using SmartStore.Services.Localization;
36-
using SmartStore.Core.Infrastructure;
37-
using SmartStore.Data;
38-
using SmartStore.Core.Domain.Common;
3925

4026
namespace SmartStore.Plugin.Feed.Froogle.Services
4127
{

‎src/Plugins/Feed.Froogle/Views/FeedFroogle/ProductEditTab.cshtml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
$(function () {
99
var googCategories;
1010
11-
$('#@Html.IdFor(m => m.GoogleCategory)').typeahead({
11+
$('#@Html.IdFor(m => m.Taxonomy)').typeahead({
1212
items: 18,
1313
source: function (query, process) {
1414
if (googCategories === undefined) {
@@ -38,11 +38,11 @@
3838
<table class="adminContent">
3939
<tr>
4040
<td class="adminTitle">
41-
@Html.SmartLabelFor(m => m.GoogleCategory)
41+
@Html.SmartLabelFor(m => m.Taxonomy)
4242
</td>
4343
<td class="adminData">
44-
@Html.TextBoxFor(m => m.GoogleCategory, new { data_provide = "typeahead", placeholder = ViewBag.DefaultCategory, style = "width: 97%", autocomplete = "off" })
45-
@Html.ValidationMessageFor(m => m.GoogleCategory)
44+
@Html.TextBoxFor(m => m.Taxonomy, new { data_provide = "typeahead", placeholder = ViewBag.DefaultCategory, style = "width: 97%", autocomplete = "off" })
45+
@Html.ValidationMessageFor(m => m.Taxonomy)
4646
</td>
4747
</tr>
4848
<tr>
@@ -74,11 +74,11 @@
7474
</tr>
7575
<tr>
7676
<td class="adminTitle">
77-
@Html.SmartLabelFor(m => m.GoogleSize)
77+
@Html.SmartLabelFor(m => m.Size)
7878
</td>
7979
<td class="adminData">
80-
@Html.TextBoxFor(m => m.GoogleSize, new { placeholder = ViewBag.DefaultSize })
81-
@Html.ValidationMessageFor(m => m.GoogleSize)
80+
@Html.TextBoxFor(m => m.Size, new { placeholder = ViewBag.DefaultSize })
81+
@Html.ValidationMessageFor(m => m.Size)
8282
</td>
8383
</tr>
8484
<tr>

‎src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ public ProductDetailsModel PrepareProductDetailsPageModel(Product product, bool
160160
Manufacturers = PrepareManufacturersOverviewModel(_manufacturerService.GetProductManufacturersByProductId(product.Id)),
161161
ReviewCount = product.ApprovedTotalReviews, /* codehint: sm-add */
162162
DisplayAdminLink = _services.Permissions.Authorize(StandardPermissionProvider.AccessAdminPanel),
163-
EnableHtmlTextCollapser = Convert.ToBoolean(_settingService.GetSettingByKey<string>("CatalogSettings.EnableHtmlTextCollapser")),
164-
HtmlTextCollapsedHeight = Convert.ToString(_settingService.GetSettingByKey<string>("CatalogSettings.HtmlTextCollapsedHeight")),
163+
//EnableHtmlTextCollapser = Convert.ToBoolean(_settingService.GetSettingByKey<string>("CatalogSettings.EnableHtmlTextCollapser")),
164+
//HtmlTextCollapsedHeight = Convert.ToString(_settingService.GetSettingByKey<string>("CatalogSettings.HtmlTextCollapsedHeight")),
165165
ShowSku = _catalogSettings.ShowProductSku,
166166
Sku = product.Sku,
167167
ShowManufacturerPartNumber = _catalogSettings.ShowManufacturerPartNumber,

‎src/Presentation/SmartStore.Web/Controllers/CheckoutController.cs‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -191,13 +191,12 @@ protected CheckoutShippingAddressModel PrepareShippingAddressModel(int? selected
191191
return model;
192192
}
193193

194-
[NonAction]
194+
[NonAction]
195195
protected CheckoutShippingMethodModel PrepareShippingMethodModel(IList<OrganizedShoppingCartItem> cart)
196-
{
197-
var model = new CheckoutShippingMethodModel();
196+
{
197+
var model = new CheckoutShippingMethodModel();
198198

199-
var getShippingOptionResponse = _shippingService .GetShippingOptions(cart, _workContext.CurrentCustomer.ShippingAddress,
200-
"", _storeContext.CurrentStore.Id);
199+
var getShippingOptionResponse = _shippingService.GetShippingOptions(cart, _workContext.CurrentCustomer.ShippingAddress, "", _storeContext.CurrentStore.Id);
201200

202201
if (getShippingOptionResponse.Success)
203202
{
@@ -208,12 +207,6 @@ protected CheckoutShippingMethodModel PrepareShippingMethodModel(IList<Organized
208207

209208
var shippingMethods = _shippingService.GetAllShippingMethods();
210209

211-
// codehint: sm-add (determine brand image of shipping method)
212-
var plugin = PluginManager.ReferencedPlugins.Where(p => p.SystemName == shippingOption.ShippingRateComputationMethodSystemName).FirstOrDefault();
213-
if (plugin != null && plugin.BrandImageFileName.HasValue())
214-
{
215-
soModel.BrandUrl = "~/Plugins/{0}/Content/{1}".FormatInvariant(plugin.SystemName, plugin.BrandImageFileName);
216-
}
217210
foreach (var shippingOption in getShippingOptionResponse.ShippingOptions)
218211
{
219212
var soModel = new CheckoutShippingMethodModel.ShippingMethodModel()
@@ -223,11 +216,10 @@ protected CheckoutShippingMethodModel PrepareShippingMethodModel(IList<Organized
223216
ShippingRateComputationMethodSystemName = shippingOption.ShippingRateComputationMethodSystemName,
224217
};
225218

226-
// codehint: sm-add (determine brand image of shipping method)
227-
var plugin = PluginManager.ReferencedPlugins.Where(p => p.SystemName == shippingOption.ShippingRateComputationMethodSystemName).FirstOrDefault();
228-
if (plugin != null && plugin.BrandImageFileName.HasValue())
219+
var srcmProvider = _shippingService.LoadShippingRateComputationMethodBySystemName(shippingOption.ShippingRateComputationMethodSystemName);
220+
if (srcmProvider != null)
229221
{
230-
soModel.BrandUrl = "~/Plugins/{0}/{1}".FormatInvariant(plugin.SystemName, plugin.BrandImageFileName);
222+
soModel.BrandUrl = _pluginMediator.GetBrandImageUrl(srcmProvider.Metadata);
231223
}
232224

233225
//adjust rate
@@ -267,8 +259,8 @@ protected CheckoutShippingMethodModel PrepareShippingMethodModel(IList<Organized
267259
model.Warnings.Add(error);
268260
}
269261

270-
return model;
271-
}
262+
return model;
263+
}
272264

273265
[NonAction]
274266
protected CheckoutPaymentMethodModel PreparePaymentMethodModel(IList<OrganizedShoppingCartItem> cart)

‎src/Presentation/SmartStore.Web/Controllers/ReturnRequestController.cs‎

Lines changed: 0 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -203,75 +203,6 @@ public ActionResult ReturnRequestSubmit(int orderId, SubmitReturnRequestModel mo
203203
return View(model);
204204
}
205205

206-
[NonAction]
207-
protected SubmitReturnRequestModel PrepareReturnRequestModel(SubmitReturnRequestModel model, Order order)
208-
{
209-
if (order == null)
210-
throw new ArgumentNullException("order");
211-
212-
if (model == null)
213-
throw new ArgumentNullException("model");
214-
215-
model.OrderId = order.Id;
216-
217-
//return reasons
218-
if (_orderSettings.ReturnRequestReasons != null)
219-
foreach (var rrr in _orderSettings.ReturnRequestReasons)
220-
{
221-
model.AvailableReturnReasons.Add(new SelectListItem()
222-
{
223-
Text = rrr,
224-
Value = rrr
225-
});
226-
}
227-
228-
//return actions
229-
if (_orderSettings.ReturnRequestActions != null)
230-
foreach (var rra in _orderSettings.ReturnRequestActions)
231-
{
232-
model.AvailableReturnActions.Add(new SelectListItem()
233-
{
234-
Text = rra,
235-
Value = rra
236-
});
237-
}
238-
239-
//products
240-
var orderItems = _orderService.GetAllOrderItems(order.Id, null, null, null, null, null, null);
241-
foreach (var orderItem in orderItems)
242-
{
243-
var orderItemModel = new SubmitReturnRequestModel.OrderItemModel()
244-
{
245-
Id = orderItem.Id,
246-
ProductId = orderItem.Product.Id,
247-
ProductName = orderItem.Product.GetLocalized(x => x.Name),
248-
ProductSeName = orderItem.Product.GetSeName(),
249-
AttributeInfo = orderItem.AttributeDescription,
250-
Quantity = orderItem.Quantity
251-
};
252-
model.Items.Add(orderItemModel);
253-
254-
//unit price
255-
switch (order.CustomerTaxDisplayType)
256-
{
257-
case TaxDisplayType.ExcludingTax:
258-
{
259-
var unitPriceExclTaxInCustomerCurrency = _currencyService.ConvertCurrency(orderItem.UnitPriceExclTax, order.CurrencyRate);
260-
orderItemModel.UnitPrice = _priceFormatter.FormatPrice(unitPriceExclTaxInCustomerCurrency, true, order.CustomerCurrencyCode, _workContext.WorkingLanguage, false);
261-
}
262-
break;
263-
case TaxDisplayType.IncludingTax:
264-
{
265-
var unitPriceInclTaxInCustomerCurrency = _currencyService.ConvertCurrency(orderItem.UnitPriceInclTax, order.CurrencyRate);
266-
orderItemModel.UnitPrice = _priceFormatter.FormatPrice(unitPriceInclTaxInCustomerCurrency, true, order.CustomerCurrencyCode, _workContext.WorkingLanguage, true);
267-
}
268-
break;
269-
}
270-
}
271-
272-
return model;
273-
}
274-
275206
#endregion
276207
}
277208
}

0 commit comments

Comments
 (0)