@hyper.software/common-helpers 2.1.14 → 2.1.16

package/lib/helpers/navigation.js

@@ -175,25 +175,16 @@ exports.getUrlWithSubdomain = getUrlWithSubdomain;
 function getMainDomain(url) {
     var http = 'http://';
     var https = 'https://';
-    var urlWithoutQuery = url.split('?')[0];
+    var baseUrl = url.split('?')[0];
     var suffixUrl = url.split('?')[1];
-    var processedUrl = urlWithoutQuery;
-    if (processedUrl.startsWith(http)) {
-        processedUrl = processedUrl.substring(http.length);
-    }
-    if (processedUrl.startsWith(https)) {
-        processedUrl = processedUrl.substring(https.length);
-    }
-    var firstSlashIndex = processedUrl.indexOf('/');
-    var domainPart = firstSlashIndex !== -1 ? processedUrl.substring(0, firstSlashIndex) : processedUrl;
-    var pathPart = firstSlashIndex !== -1 ? processedUrl.substring(firstSlashIndex) : '';
     var finalBaseUrl;
-    var domainParts = domainPart.split('.');
-    if (domainParts.length <= 2) {
-        finalBaseUrl = "".concat(domainPart).concat(pathPart);
+    var urlParts = baseUrl.split('.');
+    if (urlParts.length <= 3) {
+        finalBaseUrl = "".concat(urlParts[urlParts.length - 2].replace(http, '').replace(https, ''), ".").concat(urlParts[urlParts.length - 1]);
     }
-    else {
-        finalBaseUrl = "".concat(domainParts.slice(1).join('.')).concat(pathPart);
+    if (urlParts.length > 3) {
+        urlParts.slice(0, 1);
+        finalBaseUrl = urlParts.join('.');
     }
     return suffixUrl ? "".concat(finalBaseUrl, "?").concat(suffixUrl) : finalBaseUrl;
 }

package/lib/helpers/navigation.js.map

@@ -1 +1 @@
-{"version":3,"file":"navigation.js","sourceRoot":"","sources":["../../src/helpers/navigation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"navigation.js","sourceRoot":"","sources":["../../src/helpers/navigation.ts"],"names":[],"mappings":"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"}

package/lib/interfaces.d.ts

@@ -52,6 +52,10 @@ export declare enum CHANNEL_TYPE {
     AGODA = "AGODA",
     HRS = "HRS"
 }
+export declare enum SERVICE_TYPE {
+    PERCENTAGE = "PERCENTAGE",
+    VALUE_AMOUNT = "VALUE_AMOUNT"
+}
 export declare const ALL_CHANNEL_TYPE: CHANNEL_TYPE[];
 export interface IRoomTypePricePlanPricingInformation {
     [date: string]: number;
@@ -119,6 +123,7 @@ export interface IService extends ITimestamps {
     name?: string;
     amount?: number;
     pricingUnit?: SERVICE_PRICING_UNIT;
+    serviceType?: SERVICE_TYPE;
     taxType?: SERVICE_TAX_TYPE;
     enabledByDefault?: boolean;
     sections?: SERVICE_DISPLAY_SECTION[];