Merge branch 'abpframework:dev' into dev

abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json

@@ -904,6 +904,8 @@
     "DoesTheSubscriptionRenewAutomatically": "Does the subscription renew automatically?",
     "DoesTheSubscriptionRenewAutomaticallyExplanation": "The ABP Commercial does not have an auto-renewal billing model. Therefore <strong>your subscription will not be automatically renewed</strong> at the end of your license period. If you want to continue to have the benefits of ABP Commercial, you need to manually renew it at the <a href=\"/my-organizations\">organization management page</a>. If you have multiple organizations, click the \"Manage\" button at your expiring organization and then click the \"Extend Now\" button to renew your license. You may also want to take a look at the <a href=\"/faq#what-happens-when-license-ends\">What Happens When My License Ends?</a> section.",
     "ExtraQuestionCreditsFaqTitle": "Can I purchase extra support question credits?",
-    "ExtraQuestionCreditsFaqExplanation": "Yes, you can. To buy extra question credits, send an e-mail to <a href=\"mailto:info@abp.io\">info@abp.io</a> with your organization's name. Here's the price list for the extra question credits: <ul><li>50 questions pack $999</li><li>25 questions pack $625</li><li>15 questions pack $450</li></ul>"
+    "ExtraQuestionCreditsFaqExplanation": "Yes, you can. To buy extra question credits, send an e-mail to <a href=\"mailto:info@abp.io\">info@abp.io</a> with your organization's name. Here's the price list for the extra question credits: <ul><li>50 questions pack $999</li><li>25 questions pack $625</li><li>15 questions pack $450</li></ul>",
+    "PricingExplanation2": "30 days money back guarantee *. <a href=\"/faq#refund-policy\">Learn more</a>",
+    "MoneyBackGuaranteeText": "* 30-day money-back guarantee on all licenses! 100% refund on Team, 60% refund on Business and Enterprise licenses within 30 days."
   }
 }

npm/ng-packs/packages/setting-management/config/src/lib/proxy/email-settings.service.ts

@@ -2,6 +2,9 @@ import type { EmailSettingsDto, SendTestEmailInput, UpdateEmailSettingsDto } fro
 import { RestService } from '@abp/ng.core';
 import { Injectable } from '@angular/core';
 
+/**
+@deprecated This method is deprecated, use it from @abp/ng.setting-management/proxy
+*/
 @Injectable({
   providedIn: 'root',
 })

npm/ng-packs/packages/setting-management/project.json

@@ -34,7 +34,9 @@
       "options": {
         "lintFilePatterns": [
           "packages/setting-management/src/**/*.ts",
-          "packages/setting-management/src/**/*.html"
+          "packages/setting-management/src/**/*.html",
+          "packages/setting-management/proxy/**/*.ts",
+          "packages/setting-management/proxy/**/*.html"
         ]
       },
       "outputs": ["{options.outputFile}"]

npm/ng-packs/packages/setting-management/proxy/ng-package.json

@@ -0,0 +1,7 @@
+{
+  "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
+  "dest": "../../../dist/packages/setting-management/proxy",
+  "lib": {
+    "entryFile": "src/public-api.ts"
+  }
+}

npm/ng-packs/packages/setting-management/proxy/src/lib/proxy/email-settings.service.ts

@@ -0,0 +1,38 @@
+import type { EmailSettingsDto, SendTestEmailInput, UpdateEmailSettingsDto } from './models';
+import { RestService, Rest } from '@abp/ng.core';
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class EmailSettingsService {
+  apiName = 'SettingManagement';
+  
+
+  get = (config?: Partial<Rest.Config>) =>
+    this.restService.request<any, EmailSettingsDto>({
+      method: 'GET',
+      url: '/api/setting-management/emailing',
+    },
+    { apiName: this.apiName,...config });
+  
+
+  sendTestEmail = (input: SendTestEmailInput, config?: Partial<Rest.Config>) =>
+    this.restService.request<any, void>({
+      method: 'POST',
+      url: '/api/setting-management/emailing/send-test-email',
+      body: input,
+    },
+    { apiName: this.apiName,...config });
+  
+
+  update = (input: UpdateEmailSettingsDto, config?: Partial<Rest.Config>) =>
+    this.restService.request<any, void>({
+      method: 'POST',
+      url: '/api/setting-management/emailing',
+      body: input,
+    },
+    { apiName: this.apiName,...config });
+
+  constructor(private restService: RestService) {}
+}

npm/ng-packs/packages/setting-management/proxy/src/lib/proxy/index.ts

@@ -0,0 +1,5 @@
+import * as Volo from './volo';
+export * from './email-settings.service';
+export * from './models';
+export * from './time-zone-settings.service';
+export { Volo };

npm/ng-packs/packages/setting-management/proxy/src/lib/proxy/models.ts

@@ -0,0 +1,31 @@
+
+export interface EmailSettingsDto {
+  smtpHost?: string;
+  smtpPort: number;
+  smtpUserName?: string;
+  smtpPassword?: string;
+  smtpDomain?: string;
+  smtpEnableSsl: boolean;
+  smtpUseDefaultCredentials: boolean;
+  defaultFromAddress?: string;
+  defaultFromDisplayName?: string;
+}
+
+export interface SendTestEmailInput {
+  senderEmailAddress: string;
+  targetEmailAddress: string;
+  subject: string;
+  body?: string;
+}
+
+export interface UpdateEmailSettingsDto {
+  smtpHost?: string;
+  smtpPort: number;
+  smtpUserName?: string;
+  smtpPassword?: string;
+  smtpDomain?: string;
+  smtpEnableSsl: boolean;
+  smtpUseDefaultCredentials: boolean;
+  defaultFromAddress: string;
+  defaultFromDisplayName: string;
+}

npm/ng-packs/packages/setting-management/proxy/src/lib/proxy/time-zone-settings.service.ts

@@ -0,0 +1,38 @@
+import type { NameValue } from './volo/abp/models';
+import { RestService, Rest } from '@abp/ng.core';
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class TimeZoneSettingsService {
+  apiName = 'SettingManagement';
+  
+
+  get = (config?: Partial<Rest.Config>) =>
+    this.restService.request<any, string>({
+      method: 'GET',
+      responseType: 'text',
+      url: '/api/setting-management/timezone',
+    },
+    { apiName: this.apiName,...config });
+  
+
+  getTimezones = (config?: Partial<Rest.Config>) =>
+    this.restService.request<any, NameValue[]>({
+      method: 'GET',
+      url: '/api/setting-management/timezone/timezones',
+    },
+    { apiName: this.apiName,...config });
+  
+
+  update = (timezone: string, config?: Partial<Rest.Config>) =>
+    this.restService.request<any, void>({
+      method: 'POST',
+      url: '/api/setting-management/timezone',
+      params: { timezone },
+    },
+    { apiName: this.apiName,...config });
+
+  constructor(private restService: RestService) {}
+}

npm/ng-packs/packages/setting-management/proxy/src/lib/proxy/volo/abp/index.ts

@@ -0,0 +1 @@
+export * from './models';

npm/ng-packs/packages/setting-management/proxy/src/lib/proxy/volo/abp/models.ts

@@ -0,0 +1,5 @@
+
+export interface NameValue<T = "string"> {
+  name?: string;
+  value: T;
+}

npm/ng-packs/packages/setting-management/proxy/src/lib/proxy/volo/index.ts

@@ -0,0 +1,2 @@
+import * as Abp from './abp';
+export { Abp };

npm/ng-packs/packages/setting-management/proxy/src/public-api.ts

@@ -0,0 +1 @@
+export * from './lib/proxy/index';

npm/ng-packs/tsconfig.base.json

@@ -37,6 +37,7 @@
       ],
       "@abp/ng.setting-management": ["packages/setting-management/src/public-api.ts"],
       "@abp/ng.setting-management/config": ["packages/setting-management/config/src/public-api.ts"],
+      "@abp/ng.setting-management/proxy": ["packages/setting-management/proxy/src/public-api.ts"],
       "@abp/ng.tenant-management": ["packages/tenant-management/src/public-api.ts"],
       "@abp/ng.tenant-management/config": ["packages/tenant-management/config/src/public-api.ts"],
       "@abp/ng.tenant-management/proxy": ["packages/tenant-management/proxy/src/public-api.ts"],