turf-common 1.2.1-beta.23 → 1.2.1-beta.25

package/build/models/booking-code-model.js

@@ -130,7 +130,7 @@ var BookingCode = /** @class */ (function () {
                     message: ["Coupon with code ".concat(couponCode, " is wrong ")],
                 });
             }
-            if (code && (code[0] === "P" || code[0] === "PHP")) {
+            if (code === "P" || code === "PHP") {
                 var percentDiscount = parseFloat(couponCode);
                 if (validationApply) {
                     if (percentDiscount > 90) {
@@ -142,10 +142,10 @@ var BookingCode = /** @class */ (function () {
                 }
                 discount = totalCost * (percentDiscount / 100);
             }
-            else if (code && code[0] === "U") {
+            else if (code === "U") {
                 discount = parseFloat(couponCode);
             }
-            else if (code && code[0] === "PHU") {
+            else if (code === "PHU") {
                 if (totalBookingHours === undefined) {
                     throw new app_badrequest_exception_1.AppBadRequestException({
                         key: "totalBookingHours",

package/build/models/charge-model.js

@@ -60,7 +60,7 @@ var ChargesModel = /** @class */ (function () {
                     message: ["Coupon with code ".concat(couponCode, " is wrong ")],
                 });
             }
-            if (code && (code[0] === "P" || code[0] === "PHP")) {
+            if (code === "P" || code === "PHP") {
                 var percentDiscount = parseFloat(couponCode);
                 if (validationApply && percentDiscount > 90) {
                     throw new app_badrequest_exception_1.AppBadRequestException({
@@ -70,10 +70,10 @@ var ChargesModel = /** @class */ (function () {
                 }
                 discountAmount = totalCost * (percentDiscount / 100);
             }
-            else if (code && code[0] === "U") {
+            else if (code === "U") {
                 discountAmount = parseFloat(couponCode);
             }
-            else if (code && code[0] === "PHU") {
+            else if (code === "PHU") {
                 if (totalBookingHours === undefined) {
                     throw new app_badrequest_exception_1.AppBadRequestException({
                         key: "totalBookingHours",
@@ -102,10 +102,10 @@ var ChargesModel = /** @class */ (function () {
     };
     ChargesModel.prototype.modify = function (bookingModification) {
         var oldBookingCode = bookingModification.oldBookingCode, newBookingCode = bookingModification.newBookingCode, cancellationUnit = bookingModification.cancellationUnit;
-        this.totalBookingHours =
-            this.totalBookingHours -
-                oldBookingCode.getTotalTime("hr") +
-                (newBookingCode ? newBookingCode.getTotalTime("hr") : 0);
+        // this.totalBookingHours =
+        //   this.totalBookingHours -
+        //   oldBookingCode.getTotalTime("hr") +
+        //   (newBookingCode ? newBookingCode.getTotalTime("hr") : 0);
         if (!newBookingCode) {
             return this.modifyDelete(oldBookingCode, cancellationUnit !== null && cancellationUnit !== void 0 ? cancellationUnit : "");
         }
@@ -125,7 +125,11 @@ var ChargesModel = /** @class */ (function () {
         return null;
     };
     ChargesModel.prototype.modifyExtend = function (oldBookingCode, newBookingCode) {
+        var newTotalBookingHours = this.totalBookingHours -
+            oldBookingCode.getTotalTime("hr") +
+            (newBookingCode ? newBookingCode.getTotalTime("hr") : 0);
         var newChargeModel = this.clone();
+        newChargeModel.totalBookingHours = newTotalBookingHours;
         newChargeModel.additionalBookingGrossAmount +=
             newBookingCode.getCost() - oldBookingCode.getCost();
         newChargeModel.netTotal = newChargeModel.getNetAmount();

package/build/utils/string-utils.d.ts

@@ -23,8 +23,8 @@ declare class StringUtil {
      * @throws {TypeError} - If the provided 'couponCode' is not a string.
      */
     getCouponDetails(couponCode: string): {
-        code: RegExpMatchArray | null;
-        value: RegExpMatchArray | null;
+        code: string;
+        value: string;
     };
 }
 export declare const stringUtil: StringUtil;

package/build/utils/string-utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.stringUtil = void 0;
+var app_badrequest_exception_1 = require("../exceptions/app-badrequest.exception");
 var StringUtil = /** @class */ (function () {
     function StringUtil() {
     }
@@ -65,9 +66,15 @@ var StringUtil = /** @class */ (function () {
     StringUtil.prototype.getCouponDetails = function (couponCode) {
         var code = couponCode.match(/[a-zA-Z]+/g);
         var value = couponCode.match(/\d+/g);
+        if (!code || !value) {
+            throw new app_badrequest_exception_1.AppBadRequestException({
+                key: "couponCode",
+                message: ["coupon with code ".concat(couponCode, " is wrong ")],
+            });
+        }
         return {
-            code: code,
-            value: value,
+            code: code[0],
+            value: value[0],
         };
     };
     return StringUtil;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "turf-common",
-  "version": "1.2.1-beta.23",
+  "version": "1.2.1-beta.25",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",