Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
ismcagdas committed Feb 21, 2020
2 parents 029db75 + baa7c5b commit 9523514
Show file tree
Hide file tree
Showing 19 changed files with 201 additions and 185 deletions.
9 changes: 8 additions & 1 deletion docs/en/Change-Logs.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,14 @@ jQuery and ASP.NET Core + Angular versions beginning from v4.1. See

The change logs in this page are just a summary of major changes. Detailed release notes are shared on the Github repository (only available to the customers).

### v8.1.0 (2019-12-20)

## v8.2.0 (2020-02-20)

* Webhook Feature
* Session Lock Screen
* Periodic Audit Log Deletion

## v8.1.0 (2019-12-20)

* ASP.NET Core 3.1 support
* Multitenant LDAP support
Expand Down
22 changes: 21 additions & 1 deletion docs/en/Features-Angular-Audit-Logs.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,26 @@ All application service methods and MVC controller actions are automatically log

Audit log report is provided by **AuditLogAppService** class.

### Periodic Log Deletion

ASP.NET Zero has built-in periodic log deletion system. To enable it, go to `*.Application/Auditing/ExpiredAuditLogDeleterWorker.cs` and set `IsEnabled` to true;

```csharp
public class ExpiredAuditLogDeleterWorker : PeriodicBackgroundWorkerBase, ISingletonDependency
{
...
public const bool IsEnabled = false;//default is false
...
```

It has two more parameter.

**CheckPeriodAsMilliseconds:** Time to wait between two controls.

**MaxDeletionCount:** The maximum number of records that can be deleted at once.

> Note: To perform smaller operations with more frequent intervals you can decrease `MaxDeletionCount` and `CheckPeriodAsMilliseconds`.

## Next

- [Entity History](Features-Angular-Entity-History)
- [Entity History](Features-Angular-Entity-History)
25 changes: 25 additions & 0 deletions docs/en/Features-Angular-Subscription.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,31 @@ When the subscription of a Tenant is expired, **SubscriptionExpirationCheckWorke
* If "**deactive tenant**" option is selected for the Edition of the Tenant, tenant will be disabled and will not be able to use the system.
* If the subscription expires for a tenant who subscribed for trial usage, the tenant will be disabled and will not be able to use the system.

#### Minimum Update Amount

Since payment systems have accepted the minimum payment amount, you may need to set the minimum payment amount according to your payment system. Settings are located in [`*.Core.Shared/AbpZeroTemplateConsts.cs`](https://github.com/aspnetzero/aspnet-zero-core/blob/dev/aspnet-core/src/MyCompanyName.AbpZeroTemplate.Core.Shared/AbpZeroTemplateConsts.cs#L24)

```csharp
// Note:
// Minimum accepted payment amount. If a payment amount is less then that minimum value payment progress will continue without charging payment
// Even though we can use multiple payment methods, users always can go and use the highest accepted payment amount.
//For example, you use Stripe and PayPal. Let say that Stripe accepts min 5$ and PayPal accepts min 3$. If your payment amount is 4$.
// User will prefer to use a payment method with the highest accept value which is a Stripe in this case.
public const decimal MinimumUpgradePaymentAmount = 1M;
```

and [`angular/src/shared/AppConsts.ts`](https://github.com/aspnetzero/aspnet-zero-core/blob/dev/angular/src/shared/AppConsts.ts#L31) .

```typescript
static readonly MinimumUpgradePaymentAmount = 1;
```

Default value is **1**.

Payment progress will be continued without charging any amount if the payment amount is less than given value.



## Next

* [PayPal Integration](Features-Angular-Subscription-PayPal-Integration)
Expand Down
22 changes: 21 additions & 1 deletion docs/en/Features-Mvc-Core-Audit-Logs.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,26 @@ see all details an audit log:

Audit log report is provided by **AuditLogAppService** class.

### Periodic Log Deletion

ASP.NET Zero has built-in periodic log deletion system. To enable it, go to `*.Application/Auditing/ExpiredAuditLogDeleterWorker.cs` and set `IsEnabled` to true;

```csharp
public class ExpiredAuditLogDeleterWorker : PeriodicBackgroundWorkerBase, ISingletonDependency
{
...
public const bool IsEnabled = false;//default is false
...
```

It has two more parameter.

**CheckPeriodAsMilliseconds:** Time to wait between two controls.

**MaxDeletionCount:** The maximum number of records that can be deleted at once.

> Note: To perform smaller operations with more frequent intervals you can decrease `MaxDeletionCount` and `CheckPeriodAsMilliseconds`.

## Next

- [Entity History](Features-Mvc-Core-Entity-History)
- [Entity History](Features-Mvc-Core-Entity-History)
23 changes: 23 additions & 0 deletions docs/en/Features-Mvc-Core-Subscription.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,29 @@ When the subscription of a Tenant is expired, **SubscriptionExpirationCheckWorke
* If "**deactive tenant**" option is selected for the Edition of the Tenant, tenant will be disabled and will not be able to use the system.
* If the subscription expires for a tenant who subscribed for trial usage, the tenant will be disabled and will not be able to use the system.

#### Minimum Update Amount

Since payment systems have accepted the minimum payment amount, you may need to set the minimum payment amount according to your payment system. Settings are located in [`*.Core.Shared/AbpZeroTemplateConsts.cs`](https://github.com/aspnetzero/aspnet-zero-core/blob/dev/aspnet-core/src/MyCompanyName.AbpZeroTemplate.Core.Shared/AbpZeroTemplateConsts.cs#L24)

```csharp
// Note:
// Minimum accepted payment amount. If a payment amount is less then that minimum value payment progress will continue without charging payment
// Even though we can use multiple payment methods, users always can go and use the highest accepted payment amount.
//For example, you use Stripe and PayPal. Let say that Stripe accepts min 5$ and PayPal accepts min 3$. If your payment amount is 4$.
// User will prefer to use a payment method with the highest accept value which is a Stripe in this case.
public const decimal MinimumUpgradePaymentAmount = 1M;
```

and [`angular/src/shared/AppConsts.ts`](https://github.com/aspnetzero/aspnet-zero-core/blob/dev/angular/src/shared/AppConsts.ts#L31) .

```typescript
static readonly MinimumUpgradePaymentAmount = 1;
```

Default value is **1**.

Payment progress will be continued without charging any amount if the payment amount is less than given value.

## Next

- [PayPal Integration](Features-Mvc-Core-Subscription-PayPal)
Expand Down
23 changes: 23 additions & 0 deletions docs/en/Features-Webhooks.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Webhooks

ASP.NET ZERO has built-in webhook system designed with pub/sub pattern.

In **Webhook Subscriptions** page, you can see all of your webhook subscriptions:

<img src="images/feature-webhooks-1.png" alt="Audit logs" class="img-thumbnail" />

You can click a row to see detail of a subscription.

<img src="images/feature-webhooks-2.png" alt="Audit logs" class="img-thumbnail" />

In **Webhook Subscription Detail** page, you can edit, activate or deactivate a subscription. You can also see all webhook send attempts that your subscription received.

<img src="images/feature-webhooks-3.png" alt="Audit logs" class="img-thumbnail" />

You can resend a webhook with same parameter or view webhook event.

<img src="images/feature-webhooks-4.png" alt="Audit logs" class="img-thumbnail" />

In **Webhook Event Detail** page, you can see the detail of a created webhook. And you can see all send attempts for all of your subscriptions.

For more information. You can check [ASP.NET Boilerplate webhook documentation](https://aspnetboilerplate.com/Pages/Documents/Webhook-System).
10 changes: 5 additions & 5 deletions docs/en/HealthChecks.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Health checks settings are located in the `appsettings.json` file
"HealthChecks": [
{
"Name": "MyCompanyName.AbpZeroTemplate.Web.MVC", //your app name
"Uri": "http://localhost:62114/healthz" /* your_project_url/healthz
"Uri": "http://localhost:62114/health" /* your_project_url/health
you should change that url before you publish your project*/
}
],
Expand All @@ -30,7 +30,7 @@ Health checks settings are located in the `appsettings.json` file



> Note: If you enable Health Checks UI, don't forget to change your `healthz` URL before you publish your website.
> Note: If you enable Health Checks UI, don't forget to change your `health` URL before you publish your website.


Expand Down Expand Up @@ -100,19 +100,19 @@ After adding your new health check here, you will be able to see its status in J

Health checks UI endpoint: http://localhost:62114/healthchecks-ui (if it is enabled)

Health checks JSON result endpoint: http://localhost:62114/healthz (if it is enabled)
Health checks JSON result endpoint: http://localhost:62114/health (if it is enabled)

- *Host project (Available in ASP.NET Core versions but designed for Angular project)*

Health checks UI endpoint: http://localhost:22742/healthchecks-ui (if it is enabled)

Health checks JSON result endpoint: http://localhost:22742/healthz (if it is enabled)
Health checks JSON result endpoint: http://localhost:22742/health (if it is enabled)

- *Public Website*

Health checks UI endpoint: http://localhost:45776/healthchecks-ui (if it is enabled)

Health checks JSON result endpoint: http://localhost:45776/healthz (if it is enabled)
Health checks JSON result endpoint: http://localhost:45776/health (if it is enabled)

see also:
https://github.com/xabaril/AspNetCore.Diagnostics.HealthChecks
Expand Down
Loading

0 comments on commit 9523514

Please sign in to comment.