diff --git a/TIAM.Core/Consts/TiamConst.cs b/TIAM.Core/Consts/TiamConst.cs
index 840d873c..9fe65d79 100644
--- a/TIAM.Core/Consts/TiamConst.cs
+++ b/TIAM.Core/Consts/TiamConst.cs
@@ -13,6 +13,7 @@ public static class TiamConstClient
Guid.Parse("4cbaed43-2465-4d99-84f1-c8bc6b7025f7"),
Guid.Parse("540271f6-c604-4c16-8160-d5a7cafedf00")
};
+ public static string SystemEmailAddress = "system@touriam.com";
#if RELEASE
public static LogLevel DefaultLogLevelClient = LogLevel.Debug;
#else
diff --git a/TIAMResources/TIAMResources.Designer.cs b/TIAMResources/TIAMResources.Designer.cs
index 4f519fe5..9924db6f 100644
--- a/TIAMResources/TIAMResources.Designer.cs
+++ b/TIAMResources/TIAMResources.Designer.cs
@@ -150,6 +150,15 @@ namespace TIAM.Resources {
}
}
+ ///
+ /// Looks up a localized string similar to Commission.
+ ///
+ public static string Commission {
+ get {
+ return ResourceManager.GetString("Commission", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Confirm Email.
///
@@ -249,6 +258,15 @@ namespace TIAM.Resources {
}
}
+ ///
+ /// Looks up a localized string similar to Additional fee.
+ ///
+ public static string ExtraPrice {
+ get {
+ return ResourceManager.GetString("ExtraPrice", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Flight or train number.
///
@@ -547,7 +565,7 @@ namespace TIAM.Resources {
}
///
- /// Looks up a localized string similar to Price.
+ /// Looks up a localized string similar to Price for 1-4.
///
public static string Price {
get {
@@ -556,7 +574,7 @@ namespace TIAM.Resources {
}
///
- /// Looks up a localized string similar to Price 2.
+ /// Looks up a localized string similar to Price for 5-6.
///
public static string Price2 {
get {
@@ -565,7 +583,7 @@ namespace TIAM.Resources {
}
///
- /// Looks up a localized string similar to Price 3.
+ /// Looks up a localized string similar to Price for 7-8.
///
public static string Price3 {
get {
diff --git a/TIAMResources/TIAMResources.hu.resx b/TIAMResources/TIAMResources.hu.resx
index d0cd9b05..094cc7ab 100644
--- a/TIAMResources/TIAMResources.hu.resx
+++ b/TIAMResources/TIAMResources.hu.resx
@@ -147,6 +147,9 @@
Megjegyzés
+
+ Árrés
+
E-mail cím megerősítése
@@ -180,6 +183,9 @@
E-mail
+
+ Extra költség
+
Járatszám
@@ -280,13 +286,13 @@
Indulási idő
- Ár
+ Ár 1-4
- Ár 2
+ Ár 5-6
- Ár 3
+ Ár 7-8
Címzett azonosítója
diff --git a/TIAMResources/TIAMResources.resx b/TIAMResources/TIAMResources.resx
index 5a7be8ae..069cbdc2 100644
--- a/TIAMResources/TIAMResources.resx
+++ b/TIAMResources/TIAMResources.resx
@@ -147,6 +147,9 @@
Comment
+
+ Commission
+
Confirm Email
@@ -180,6 +183,9 @@
Email
+
+ Additional fee
+
Flight or train number
@@ -280,13 +286,13 @@
Pick up time
- Price
+ Price for 1-4
- Price 2
+ Price for 5-6
- Price 3
+ Price for 7-8
Receiver Id
diff --git a/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor b/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor
index b19e9847..268155d6 100644
--- a/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor
+++ b/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor
@@ -119,7 +119,7 @@
-
+
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinations.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinations.razor
index d2c73c4e..7ff90fa9 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinations.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinations.razor
@@ -22,12 +22,7 @@
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinations.razor.cs b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinations.razor.cs
index d24be3f3..52825045 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinations.razor.cs
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinations.razor.cs
@@ -4,6 +4,7 @@ using TIAMWebApp.Shared.Application.Interfaces;
using Microsoft.AspNetCore.Components;
using TIAMWebApp.Shared.Application.Utility;
using AyCode.Services.Loggers;
+using TIAM.Entities.Addresses;
namespace TIAMSharedUI.Pages.User.SysAdmins
{
@@ -74,15 +75,9 @@ namespace TIAMSharedUI.Pages.User.SysAdmins
// throw new NotImplementedException();
//}
- void Grid_CustomizeEditModel(GridCustomizeEditModelEventArgs e)
+ async void Grid_CustomizeEditModel(GridCustomizeEditModelEventArgs e)
{
- if (!e.IsNew) return;
-
- var newDestination = (TransferDestinationWizardModel)e.EditModel;
- newDestination.Id = Guid.NewGuid().ToString();
- newDestination.Name = "Destination name";
- newDestination.Description = "Type some description here";
- newDestination.AddressString = "The address of the destination";
+
}
void Grid_CustomizeElement(GridCustomizeElementEventArgs e)
@@ -90,73 +85,8 @@ namespace TIAMSharedUI.Pages.User.SysAdmins
}
- async Task Grid_EditModelSaving(GridEditModelSavingEventArgs e)
- {
- var transferDestinationWizardModel = (TransferDestinationWizardModel)e.EditModel;
+
- if (e.IsNew)
- {
- await TransferDataService.CreateTransferDestination(TransferDestinationWizardModel.CopyToTransferDestination(transferDestinationWizardModel));
- //await transferDataService.CreateTransferDestination(new TransferDestination
- /*{
- Id = Guid.NewGuid(),
- Name = myModel.Name,
- Description = myModel.Description,
- AddressString = myModel.AddressString,
- Price = myModel.Price,
- PriceType = myModel.PriceType
- });*/
- _logger.Info("New orderData added");
-
- //add mymodel to transferData array
- _transferDestinationWizardModels.Add(transferDestinationWizardModel);
- }
- else
- {
- _logger.Info("orderData updated");
- //modify transferData where transferData.Id == e.EditModel.Id
- //get transfer from TransferData by Id
-
- //var abg = ((TransferDestinationWizardModel[])TransferDataFromDb).Length;
-
- foreach (var transferToModify in _transferDestinationWizardModels)
- {
- if (transferToModify.Id != transferDestinationWizardModel.Id)
- continue;
-
- transferToModify.Id = transferDestinationWizardModel.Id;
- transferToModify.Name = transferDestinationWizardModel.Name;
- transferToModify.Description = transferDestinationWizardModel.Description;
- transferToModify.AddressString = transferDestinationWizardModel.AddressString;
- transferToModify.Price = transferDestinationWizardModel.Price;
- transferToModify.PriceType = transferDestinationWizardModel.PriceType;
-
- await TransferDataService.UpdateTransferDestination(TransferDestinationWizardModel.CopyToTransferDestination(transferToModify));
- }
- }
-
- //TODO: ne a teljes grid-et refresh-eljük, elég lenne csak az adott sort! - J.
- await UpdateDataAsync();
- }
-
- async Task Grid_DataItemDeleting(GridDataItemDeletingEventArgs e)
- {
- //remove orderData from orderData array
- _logger.Info("orderData deleted");
-
- //var transferDestinationWizardModel = (TransferDestinationWizardModel)e.DataItem;
- //await TransferDataService.CreateTransferDestination(TransferDestinationWizardModel.CopyToTransferDestination(transferDestinationWizardModel));
- //await UpdateDataAsync();
- }
-
- async Task UpdateDataAsync()
- {
- //await TransferDataService.GetDestinationsAsync();
- //refresh grid
-
- await FillGridDataSource();
- _logger.Info("orderData grid refreshed");
- }
protected override async Task OnInitializedAsync()
{
@@ -164,26 +94,9 @@ namespace TIAMSharedUI.Pages.User.SysAdmins
_logger = new LoggerClient(LogWriters.ToArray());
- await FillGridDataSource();
+ //await FillGridDataSource();
}
- private async Task FillGridDataSource()
- {
- var destinations = await TransferDataService.GetDestinationsAsync();
-
- foreach (var item in destinations)
- {
- _transferDestinationWizardModels.Add(new TransferDestinationWizardModel(item.Id, item.Name, item.Description, item.AddressString, item.Price, item.Price2, item.Price3, item.Address));
-
- _logger.DetailConditional($"_transferDestinationWizardModels add: {item.Name}");
- }
-
- _logger.Info($"_transferDestinationWizardModels: {_transferDestinationWizardModels.Count}");
- }
-
- void ColumnChooserButton_Click()
- {
- Grid.ShowColumnChooser();
- }
+
}
}
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationGridComponent.razor
index 0f1a2a60..5921eb78 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationGridComponent.razor
@@ -1,4 +1,5 @@
-@using TIAM.Entities.Transfers
+@using TIAM.Entities.Addresses
+@using TIAM.Entities.Transfers
@using TIAM.Entities.Drivers
@using TIAM.Models.Dtos.Users
@using TIAM.Resources
@@ -66,7 +67,7 @@
@editFormContext.GetEditor("Name")
-
+
@editFormContext.GetEditor("Description")
@@ -75,13 +76,13 @@
@editFormContext.GetEditor("Price")
-
+
@editFormContext.GetEditor("Price2")
-
+
@editFormContext.GetEditor("Price3")
-
+
@editFormContext.GetEditor("ProductCommis")
@@ -112,9 +113,12 @@
}
+
+
private void DataItemSaving(GridEditModelSavingEventArgs obj)
{
_logger.Debug($"DataItemSaving");
+
}
private void DataItemDeleting(GridDataItemDeletingEventArgs obj)
@@ -126,6 +130,15 @@
{
if (!e.IsNew) return;
+ var newDestination = (TransferDestination)e.EditModel;
+ newDestination.Id = Guid.NewGuid();
+ newDestination.Name = "Destination name";
+ newDestination.Description = "Type some description here";
+ newDestination.AddressString = "The address of the destination";
+ Guid addressId = Guid.NewGuid();
+ newDestination.Address = new Address();
+ newDestination.Address.Id = addressId;
+ newDestination.Address.AddressText = newDestination.AddressString;
}
}
\ No newline at end of file
diff --git a/TIAMSharedUI/Shared/Users/AdminNavMenu.razor b/TIAMSharedUI/Shared/Users/AdminNavMenu.razor
index 14522398..a2310dd0 100644
--- a/TIAMSharedUI/Shared/Users/AdminNavMenu.razor
+++ b/TIAMSharedUI/Shared/Users/AdminNavMenu.razor
@@ -35,7 +35,6 @@
}
-
diff --git a/TIAMWebApp/Server/appsettings.json b/TIAMWebApp/Server/appsettings.json
index c66a73ae..03453113 100644
--- a/TIAMWebApp/Server/appsettings.json
+++ b/TIAMWebApp/Server/appsettings.json
@@ -16,6 +16,7 @@
},
"SendGrid": {
//"Key": "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"
+ //"Key": "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" //TourIAm App, ID: 0uh-dfhGRjCzaFZHjFccYQ
"Key": "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"
},
diff --git a/TIAMWebApp/Shared/Utility/ResourceKeys.cs b/TIAMWebApp/Shared/Utility/ResourceKeys.cs
index ad30d472..06a658b6 100644
--- a/TIAMWebApp/Shared/Utility/ResourceKeys.cs
+++ b/TIAMWebApp/Shared/Utility/ResourceKeys.cs
@@ -25,8 +25,10 @@
public const string ConfirmPasswordReset = "ConfirmPasswordReset";
public const string ConfirmEmail = "ConfirmEmail";
public const string Price = "Price";
- public const string Price2 = "Price 2";
- public const string Price3 = "Price 3";
+ public const string Price2 = "Price2";
+ public const string Price3 = "Price3";
+ public const string ExtraPrice = "ExtraPrice";
+ public const string Commission = "Commission";
public const string Driver = "Driver";
//wizard