diff --git a/RMuseum/Controllers/DonationAccountingController.cs b/RMuseum/Controllers/DonationAccountingController.cs
index f335505a..09e07f8b 100644
--- a/RMuseum/Controllers/DonationAccountingController.cs
+++ b/RMuseum/Controllers/DonationAccountingController.cs
@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
-using RMuseum.Models.Accounting;
+using RMuseum.Models.Accounting.ViewModels;
using RMuseum.Models.Auth.Memory;
using RMuseum.Services;
using System;
diff --git a/RMuseum/Models/Accounting/GanjoorDonationViewModel.cs b/RMuseum/Models/Accounting/ViewModels/GanjoorDonationViewModel.cs
similarity index 97%
rename from RMuseum/Models/Accounting/GanjoorDonationViewModel.cs
rename to RMuseum/Models/Accounting/ViewModels/GanjoorDonationViewModel.cs
index b2c2fa6a..fc56d3f8 100644
--- a/RMuseum/Models/Accounting/GanjoorDonationViewModel.cs
+++ b/RMuseum/Models/Accounting/ViewModels/GanjoorDonationViewModel.cs
@@ -1,6 +1,6 @@
using System;
-namespace RMuseum.Models.Accounting
+namespace RMuseum.Models.Accounting.ViewModels
{
///
/// Ganjoor Donation View Model
diff --git a/RMuseum/RMuseum.xml b/RMuseum/RMuseum.xml
index 206d642c..0579e2a6 100644
--- a/RMuseum/RMuseum.xml
+++ b/RMuseum/RMuseum.xml
@@ -584,7 +584,7 @@
-
+
add donation + regenerate donations page
@@ -1603,61 +1603,6 @@
record is imported from old HTML text of donation page
-
-
- Ganjoor Donation View Model
-
-
-
-
- id - null for POST api -
-
-
-
-
- record date
-
-
-
-
- donation amount (0 for old imported records)
-
-
-
-
- "تومان" is good, Amount Unit, if you send another string other than تومان in post api it does not try to consume the expense!
-
-
-
-
- donor name
-
-
-
-
- null for POST api - date: (donation dates have been collected in different formats, so instead of keeping their dates in a DateTime field I ought to use a string field)
-
-
-
-
- null for POST api -amount string (avoiding to parse different formats of old html text)
-
-
-
-
- null for POST api -remaining (it could be ignored later when our data has been normalized enough and be calculated using related data)
-
-
-
-
- null for POST api -expenditure desc
-
-
-
-
- null for POST api - record is imported from old HTML text of donation page
-
-
Ganjoor Expenses
@@ -1693,6 +1638,61 @@
donation expenitures
+
+
+ Ganjoor Donation View Model
+
+
+
+
+ id - null for POST api -
+
+
+
+
+ record date
+
+
+
+
+ donation amount (0 for old imported records)
+
+
+
+
+ "تومان" is good, Amount Unit, if you send another string other than تومان in post api it does not try to consume the expense!
+
+
+
+
+ donor name
+
+
+
+
+ null for POST api - date: (donation dates have been collected in different formats, so instead of keeping their dates in a DateTime field I ought to use a string field)
+
+
+
+
+ null for POST api -amount string (avoiding to parse different formats of old html text)
+
+
+
+
+ null for POST api -remaining (it could be ignored later when our data has been normalized enough and be calculated using related data)
+
+
+
+
+ null for POST api -expenditure desc
+
+
+
+
+ null for POST api - record is imported from old HTML text of donation page
+
+
Items or pictures status
@@ -6823,7 +6823,7 @@
donation service
-
+
new donation
@@ -7906,7 +7906,7 @@
donation service
-
+
new donation
diff --git a/RMuseum/Services/IDonationService.cs b/RMuseum/Services/IDonationService.cs
index 29e69c7f..c2e87d9e 100644
--- a/RMuseum/Services/IDonationService.cs
+++ b/RMuseum/Services/IDonationService.cs
@@ -1,4 +1,4 @@
-using RMuseum.Models.Accounting;
+using RMuseum.Models.Accounting.ViewModels;
using RSecurityBackend.Models.Generic;
using System;
using System.Threading.Tasks;
diff --git a/RMuseum/Services/Implementation/DonationService.cs b/RMuseum/Services/Implementation/DonationService.cs
index 6ac16e88..4c925895 100644
--- a/RMuseum/Services/Implementation/DonationService.cs
+++ b/RMuseum/Services/Implementation/DonationService.cs
@@ -12,6 +12,7 @@ using RSecurityBackend.Services;
using Microsoft.Extensions.Configuration;
using RMuseum.Models.Ganjoor.ViewModels;
using System.Globalization;
+using RMuseum.Models.Accounting.ViewModels;
namespace RMuseum.Services.Implementation
{