ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changes un Basket logic to adapt to websites logic

Browse Source
This commit is contained in:
Javier Suárez Ruiz 2017-01-10 18:18:41 +01:00
parent 4d58ee27a9
commit 5f32ca1947
5 changed files with 18 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/BasketViewModel.cs
View File

@ -99,39 +99,25 @@ namespace eShopOnContainers.Core.ViewModels
private void AddCatalogItem(CatalogItem item) private void AddCatalogItem(CatalogItem item)
{ {
if (BasketItems.Any(o => o.ProductId.Equals(item.Id, StringComparison.CurrentCultureIgnoreCase))) BasketItems.Add(new BasketItem
{ {
var orderItem = BasketItems.First(o => o.ProductId.Equals(item.Id, StringComparison.CurrentCultureIgnoreCase)); ProductId = item.Id,
orderItem.Quantity++; ProductName = item.Name,
} PictureUrl = item.PictureUri,
else UnitPrice = item.Price,
{ Quantity = 1
BasketItems.Add(new BasketItem });
{
ProductId = item.Id,
ProductName = item.Name,
PictureUrl = item.PictureUri,
UnitPrice = item.Price,
Quantity = 1
});
}
ReCalculateTotal(); ReCalculateTotal();
} }
private void AddItem(BasketItem parameter) private void AddItem(BasketItem item)
{ {
BadgeCount++; BadgeCount++;
var basketItem = BasketItems AddBasketItem(item);
.FirstOrDefault(bi => bi.ProductId.Equals(parameter.ProductId,
StringComparison.CurrentCultureIgnoreCase));
basketItem.Quantity++;
RaisePropertyChanged(() => BasketItems); RaisePropertyChanged(() => BasketItems);
ReCalculateTotal();
} }
private void AddBasketItem(BasketItem item) private void AddBasketItem(BasketItem item)

24
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/ProfileView.xaml
View File

@ -9,14 +9,6 @@
<ContentPage.Resources> <ContentPage.Resources>
<ResourceDictionary> <ResourceDictionary>
<Style x:Key="LogoutLabelStyle"
TargetType="{x:Type Label}">
<Setter Property="HorizontalOptions"
Value="Center" />
<Setter Property="VerticalOptions"
Value="Center" />
</Style>
<Style x:Key="LoginButtonStyle" <Style x:Key="LoginButtonStyle"
TargetType="{x:Type Label}"> TargetType="{x:Type Label}">
<Setter Property="FontFamily" <Setter Property="FontFamily"
@ -55,18 +47,12 @@
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<!-- LOG OUT BUTTON --> <!-- LOG OUT BUTTON -->
<Grid <Button
Grid.Row="0" Grid.Row="0"
BackgroundColor="{StaticResource GrayColor}"> Text="LOG OUT"
<Label TextColor="{StaticResource BlackColor}"
Text="LOG OUT" BackgroundColor="{StaticResource GrayColor}"
Style="{StaticResource LogoutLabelStyle}"/> Command="{Binding LogoutCommand}" />
<Grid.GestureRecognizers>
<TapGestureRecognizer
Command="{Binding LogoutCommand}"
NumberOfTapsRequired="1" />
</Grid.GestureRecognizers>
</Grid>
<!-- ORDERS --> <!-- ORDERS -->
<Grid <Grid
Grid.Row="1"> Grid.Row="1">

22
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/Templates/BasketItemTemplate.xaml
View File

@ -86,33 +86,15 @@
<RowDefinition Height="1" /> <RowDefinition Height="1" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<!-- IMAGE --> <!-- IMAGE -->
<ffimageloading:CachedImage <Image
Grid.Column="0" Grid.Column="0"
Grid.Row="0" Grid.Row="0"
Source="{Binding PictureUrl, Converter={StaticResource ImageConverter}}" Source="{Binding PictureUrl, Converter={StaticResource ImageConverter}}"
CacheDuration="30"
CacheType="Disk"
DownsampleToViewSize="True"
HeightRequest="108" HeightRequest="108"
WidthRequest="108" WidthRequest="108"
Aspect="AspectFit" Aspect="AspectFit"
VerticalOptions="Start" VerticalOptions="Start"
Margin="12,0,0,0"> Margin="12,0,0,0" />
<ffimageloading:CachedImage.LoadingPlaceholder>
<OnPlatform
x:TypeArguments="ImageSource"
iOS="default_product"
Android="default_product"
WinPhone="Assets/default_product.png"/>
</ffimageloading:CachedImage.LoadingPlaceholder>
<ffimageloading:CachedImage.ErrorPlaceholder>
<OnPlatform
x:TypeArguments="ImageSource"
iOS="noimage"
Android="noimage"
WinPhone="Assets/noimage.png"/>
</ffimageloading:CachedImage.ErrorPlaceholder>
</ffimageloading:CachedImage>
<Grid <Grid
Grid.Column="1" Grid.Column="1"
Grid.Row="0" Grid.Row="0"

22
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/Templates/OrderItemTemplate.xaml
View File

@ -70,33 +70,15 @@
<RowDefinition Height="1" /> <RowDefinition Height="1" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<!-- IMAGE --> <!-- IMAGE -->
<ffimageloading:CachedImage <Image
Grid.Column="0" Grid.Column="0"
Grid.Row="0" Grid.Row="0"
Source="{Binding PictureUrl, Converter={StaticResource ImageConverter}}" Source="{Binding PictureUrl, Converter={StaticResource ImageConverter}}"
CacheDuration="30"
CacheType="Disk"
DownsampleToViewSize="True"
HeightRequest="108" HeightRequest="108"
WidthRequest="108" WidthRequest="108"
Aspect="AspectFit" Aspect="AspectFit"
VerticalOptions="Start" VerticalOptions="Start"
Margin="12,0,0,0"> Margin="12,0,0,0" />
<ffimageloading:CachedImage.LoadingPlaceholder>
<OnPlatform
x:TypeArguments="ImageSource"
iOS="default_product"
Android="default_product"
WinPhone="Assets/default_product.png"/>
</ffimageloading:CachedImage.LoadingPlaceholder>
<ffimageloading:CachedImage.ErrorPlaceholder>
<OnPlatform
x:TypeArguments="ImageSource"
iOS="noimage"
Android="noimage"
WinPhone="Assets/noimage.png"/>
</ffimageloading:CachedImage.ErrorPlaceholder>
</ffimageloading:CachedImage>
<Grid <Grid
Grid.Column="1" Grid.Column="1"
Grid.Row="0" Grid.Row="0"

3
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/Templates/ProductTemplate.xaml
View File

@ -74,9 +74,6 @@
<ffimageloading:CachedImage <ffimageloading:CachedImage
Grid.Row="0" Grid.Row="0"
Source="{Binding PictureUri}" Source="{Binding PictureUri}"
CacheDuration="30"
CacheType="Disk"
DownsampleToViewSize="True"
Aspect="AspectFill"> Aspect="AspectFill">
<ffimageloading:CachedImage.LoadingPlaceholder> <ffimageloading:CachedImage.LoadingPlaceholder>
<OnPlatform <OnPlatform