Skip to content

Develop #218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ucswift merged 2 commits into from
May 14, 2025
Merged

Develop #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e7237b
CU-868d85dv8 Fixing bug with addon call due to upgrade in api.
ucswift May 9, 2025
c2afe5c
CU-868dxr26u Fixing "Delete Account" button visible for viewed profiles.
ucswift May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions Core/Resgrid.Services/SubscriptionsService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,12 +631,15 @@ public async Task<List<PaymentAddon>> GetCurrentPaymentAddonsForDepartmentAsync(
{
if (!String.IsNullOrWhiteSpace(Config.SystemBehaviorConfig.BillingApiBaseUrl) && !String.IsNullOrWhiteSpace(Config.ApiConfig.BackendInternalApikey))
{
if (planAddonIds == null || planAddonIds.Count == 0)
return new List<PaymentAddon>();

var client = new RestClient(Config.SystemBehaviorConfig.BillingApiBaseUrl, configureSerialization: s => s.UseNewtonsoftJson());
var request = new RestRequest($"/api/Billing/GetCurrentPaymentAddonsForDepartment", Method.Get);
var request = new RestRequest($"/api/Billing/GetCurrentPaymentAddonsForDepartmentPost", Method.Post);
request.AddHeader("X-API-Key", Config.ApiConfig.BackendInternalApikey);
request.AddHeader("Content-Type", "application/json");
request.AddParameter("departmentId", departmentId, ParameterType.QueryString);
request.AddParameter("planAddonIds", planAddonIds.ToString(), ParameterType.QueryString);
request.AddHeader("Content-Type", "application/json; charset=utf-8");
//request.AddParameter("departmentId", departmentId, ParameterType.QueryString);
request.AddBody(new { DepartmentId = departmentId, PlanAddonIds = planAddonIds.ToArray() });

var response = await client.ExecuteAsync<GetAllPaymentAddonsForDepartmentResult>(request);

Expand Down Expand Up @@ -680,7 +683,7 @@ public async Task<List<PlanAddon>> GetAllAddonPlansByTypeAsync(PlanAddonTypes pl
var request = new RestRequest($"/api/Billing/GetAllAddonPlansByType", Method.Get);
request.AddHeader("X-API-Key", Config.ApiConfig.BackendInternalApikey);
request.AddHeader("Content-Type", "application/json");
request.AddParameter("planAddonType", planAddonType, ParameterType.QueryString);
request.AddParameter("type", (int)planAddonType, ParameterType.QueryString);

var response = await client.ExecuteAsync<GetAllPlanAddonsByTypeResult>(request);

Expand Down
12 changes: 0 additions & 12 deletions Web/Resgrid.Web.Services/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,24 +45,12 @@
using Resgrid.Web.Services.Models;
using Microsoft.EntityFrameworkCore;
using static OpenIddict.Abstractions.OpenIddictConstants;
using Microsoft.IdentityModel.Tokens;
using OpenTelemetry;
using OpenTelemetry.Exporter;
using OpenTelemetry.Instrumentation.AspNetCore;
//using OpenTelemetry.Metrics;
using OpenTelemetry.Resources;
using OpenTelemetry.Trace;
using OpenIddict.Abstractions;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Swashbuckle.AspNetCore.Swagger;
using System.Security.Cryptography.X509Certificates;
using Resgrid.Web.Services;
using Microsoft.ApplicationInsights.AspNetCore.Extensions;
using Microsoft.ApplicationInsights.Extensibility;
using Sentry.Extensibility;
using Resgrid.Web.ServicesCore.Middleware;
using IPNetwork = Microsoft.AspNetCore.HttpOverrides.IPNetwork;
using OpenTelemetry.Metrics;
using System.Net.Http;
using Resgrid.Providers.Messaging;

Expand Down
29 changes: 16 additions & 13 deletions Web/Resgrid.Web/Areas/User/Views/Home/EditUserProfile.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,23 +529,26 @@
</div>
</div>
</div>
<div class="ibox">
<div class="ibox-title">
<h5>@localizer["DeleteUserAccount"]</h5>
</div>
<div class="ibox-content">
<div class='row'>
<div class="col-md-12">
<p>@localizer["DeleteUserAccountInfo"]</p>
</div>
@if (Model.IsOwnProfile)
{
<div class="ibox">
<div class="ibox-title">
<h5>@localizer["DeleteUserAccount"]</h5>
</div>
<div class="form-group">
<div class="col-sm-12">
<a class="btn btn-w-m btn-block btn-danger" asp-controller="Account" asp-action="DeleteAccount" asp-route-area="User">@localizer["DeleteUserAccount"]</a>
<div class="ibox-content">
<div class='row'>
<div class="col-md-12">
<p>@localizer["DeleteUserAccountInfo"]</p>
</div>
</div>
<div class="form-group">
<div class="col-sm-12">
<a class="btn btn-w-m btn-block btn-danger" asp-controller="Account" asp-action="DeleteAccount" asp-route-area="User">@localizer["DeleteUserAccount"]</a>
</div>
</div>
</div>
</div>
</div>
}
</div>
</div>
</div>
Expand Down
Loading