Merge the latest changes from developer (#713)

* Solved an InvalidCastException when using the TenantStaticFileProvider * Trying to solve the issue #711 by adding existing references of the user and the payment. * Fixed issue #688 where the sorting by date is not correct in the datatable. * Added the viewport option trying to fix the tests. * Set the ExpirationTime to a maximum of 15 years. #675
banco-alimentar · Nov 30, 2022 · c8151d9 · c8151d9
1 parent d5c5e8d
commit c8151d9
Show file tree

Hide file tree

Showing 172 changed files with 20,781 additions and 24,631 deletions.
diff --git a/BancoAlimentar.AlimentaEstaIdeia.Repository/PaymentNotificationRepository.cs b/BancoAlimentar.AlimentaEstaIdeia.Repository/PaymentNotificationRepository.cs
@@ -50,13 +50,10 @@ public bool EmailNotificationExits(int paymentId)
         /// <summary>
         /// Adds the payment notification to the database.
         /// </summary>
-        /// <param name="userId">User id.</param>
-        /// <param name="paymentId">PaymentId.</param>
-        public void AddEmailNotification(string userId, int paymentId)
+        /// <param name="user">User.</param>
+        /// <param name="payment">Payment.</param>
+        public void AddEmailNotification(WebUser user, BasePayment payment)
         {
-            WebUser? user = this.userRepository.FindUserById(userId);
-            BasePayment? payment = this.DbContext.Payments.Where(p => p.Id == paymentId).FirstOrDefault();
-
             if (user != null && payment != null)
             {
                 this.DbContext.PaymentNotifications.Add(new PaymentNotifications()

diff --git a/BancoAlimentar.AlimentaEstaIdeia.Web.EndToEndTests/DevelopmentDonations.cs b/BancoAlimentar.AlimentaEstaIdeia.Web.EndToEndTests/DevelopmentDonations.cs
@@ -38,6 +38,8 @@ public override BrowserNewContextOptions ContextOptions()
 
             options.Locale = "en-US";
             options.RecordVideoDir = "videos/";
+            options.ScreenSize = new ScreenSize() { Width = 1980, Height = 1080 };
+            options.ViewportSize = new ViewportSize() { Width = 1980, Height = 1080 };
             return options;
         }
 

diff --git a/BancoAlimentar.AlimentaEstaIdeia.Web/Api/EasyPayControllerBase.cs b/BancoAlimentar.AlimentaEstaIdeia.Web/Api/EasyPayControllerBase.cs
@@ -86,7 +86,7 @@ protected async Task SendInvoiceEmail(int donationId, string transactionKey, int
                                     { "PublicId", donation.PublicId.ToString() },
                                     { "ConfirmedPayment.Status", donation.ConfirmedPayment.Status },
                                     });
-                                this.context.PaymentNotificationRepository.AddEmailNotification(donation.User.Id, donation.ConfirmedPayment.Id);
+                                this.context.PaymentNotificationRepository.AddEmailNotification(donation.User, donation.ConfirmedPayment);
                             }
                             else
                             {

diff --git a/BancoAlimentar.AlimentaEstaIdeia.Web/Api/PaymentNotification.cs b/BancoAlimentar.AlimentaEstaIdeia.Web/Api/PaymentNotification.cs
@@ -90,8 +90,8 @@ public IActionResult Get(int multibankId, string key)
                             configuration))
                     {
                         context.PaymentNotificationRepository.AddEmailNotification(
-                            user.Id,
-                            multibanco.Id);
+                            user,
+                            multibanco);
                     }
                 }
 

diff --git a/...limentar.AlimentaEstaIdeia.Web/Areas/Identity/Pages/Account/Manage/DonationHistory.cshtml b/...limentar.AlimentaEstaIdeia.Web/Areas/Identity/Pages/Account/Manage/DonationHistory.cshtml
@@ -68,7 +68,7 @@
                     columns: [
                         { "data": "Id" },
                         { "data": "DonationDate", render: function ( data, type, row ) {
-                                                        return moment(new Date(data)).format("DD/MM/YYYY HH:mm");
+                                                        return moment(new Date(data)).format("DD/MM/YYYY");
                                                     }},
                         { "data": "FoodBank" },
                         { "data": "DonationAmount", render: $.fn.dataTable.render.number(',', '.', 2, '', ' €') },

diff --git a/...ntar.AlimentaEstaIdeia.Web/Areas/Identity/Pages/Account/Manage/Subscriptions/Index.cshtml b/...ntar.AlimentaEstaIdeia.Web/Areas/Identity/Pages/Account/Manage/Subscriptions/Index.cshtml
@@ -71,13 +71,13 @@
                     columns: [
                         { "data": "Id" },
                         { "data": "Created", render: function ( data, type, row ) {
-                                                        return moment(new Date(data)).format("DD/MM/YYYY HH:mm");
+                                                        return moment(new Date(data)).format("DD/MM/YYYY");
                                                     }},
                         { "data": "ExpirationTime", render: function ( data, type, row ) {
-                                                        return moment(new Date(data)).format("DD/MM/YYYY HH:mm");
+                                                        return moment(new Date(data)).format("DD/MM/YYYY");
                                                     }},
                         { "data": "StartTime", render: function ( data, type, row ) {
-                                                        return moment(new Date(data)).format("DD/MM/YYYY HH:mm");
+                                                        return moment(new Date(data)).format("DD/MM/YYYY");
                                                     }},
                         { "data": "SubscriptionType" },
                         { "data": "Status", 

diff --git a/BancoAlimentar.AlimentaEstaIdeia.Web/Pages/SubscriptionPayment.cshtml.cs b/BancoAlimentar.AlimentaEstaIdeia.Web/Pages/SubscriptionPayment.cshtml.cs
@@ -227,7 +227,7 @@ private DateTime ConvertFrequencyToDateTime(PaymentSubscription.FrequencyEnum fr
                     new SinglePaymentRequestCapture("Alimente esta ideia Donation subscription", transactionKey)))
             {
                 Key = transactionKey,
-                ExpirationTime = DateTime.UtcNow.AddYears(5).GetEasyPayDateTimeString(),
+                ExpirationTime = DateTime.UtcNow.AddYears(value: 15).GetEasyPayDateTimeString(),
                 Currency = PaymentSubscription.CurrencyEnum.EUR,
                 Customer = new Customer()
                 {

diff --git a/BancoAlimentar.AlimentaEstaIdeia.Web/libman.json b/BancoAlimentar.AlimentaEstaIdeia.Web/libman.json
@@ -3,15 +3,15 @@
   "defaultProvider": "cdnjs",
   "libraries": [
     {
-      "library": "[email protected].0",
+      "library": "[email protected].2",
       "destination": "wwwroot/lib/bootstrap/"
     },
     {
-      "library": "[email protected].0",
+      "library": "[email protected].1",
       "destination": "wwwroot/lib/jquery/"
     },
     {
-      "library": "[email protected].3",
+      "library": "[email protected].5",
       "destination": "wwwroot/lib/jquery-validation/"
     },
     {