turf-common 1.4.1-beta.7 → 1.4.1-beta.9

package/build/src/models/entity/pricing-plan-entity-model.js

@@ -183,20 +183,26 @@ var PricingPlanEntityModelV2 = /** @class */ (function () {
         };
         var billingCycle = (_b = this.subscriptionCycle) === null || _b === void 0 ? void 0 : _b.split(",");
         billingCycle === null || billingCycle === void 0 ? void 0 : billingCycle.forEach(function (billing, index) {
-            var billingArray = billing.split("_");
+            var billingArray = billing.split('_');
             responseObj.billing_cycle[index] = {
                 from: Number(billingArray[0].slice(0, 3)),
                 to: Number(billingArray[0].slice(3, 6)),
                 // discount: billingArray[1],
-                name: billingArray.slice(2).join("_"),
-                key: billingArray.slice(2).join("-").toLowerCase().replace(/ /g, "-"),
+                name: billingArray.slice(2).join('_'),
+                key: billingArray.slice(2).join('-').toLowerCase().replace(/ /g, '-'),
             };
         });
-        this.billingCostCode.split(",").forEach(function (code, index) {
-            var costCode = code.split("#");
+        var billingCycleSet = new Set();
+        this.billingCostCode.split(',').forEach(function (code, index) {
+            var costCode = code.split('#');
+            billingCycleSet.add(costCode[0]);
+        });
+        billingCycleSet.forEach(function (pitchRange, index) {
+            var from = Number(pitchRange.split('_')[0]);
+            var to = Number(pitchRange.split('_')[1]);
             responseObj.pitch_slab[index] = {
-                from: Number(costCode[0]),
-                to: Number(costCode[0]),
+                from: from,
+                to: to,
                 // discount: costCode[1],
             };
         });
@@ -206,6 +212,46 @@ var PricingPlanEntityModelV2 = /** @class */ (function () {
         responseObj.base_price = this.basePrice;
         return responseObj;
     };
+    // toObject(): GetPricingPlanByDateResponseV2 {
+    //   const responseObj: GetPricingPlanByDateResponseV2 = {
+    //     id: this.id,
+    //     effective_from_date: 0,
+    //     effective_to_date: 0,
+    //     base_price: 0,
+    //     unit: "per_hour_per_pitch",
+    //     pitch_slab: {},
+    //     billing_cycle: {},
+    //     billing_cost_code: this.billingCostCode??''
+    //   };
+    //   const billingCycle = this.subscriptionCycle?.split(",");
+    //   billingCycle?.forEach((billing, index) => {
+    //     const billingArray = billing.split("_");
+    //     responseObj.billing_cycle[index] = {
+    //       from: Number(billingArray[0].slice(0, 3)),
+    //       to: Number(billingArray[0].slice(3, 6)),
+    //       // discount: billingArray[1],
+    //       name: billingArray.slice(2).join("_"),
+    //       key: billingArray.slice(2).join("-").toLowerCase().replace(/ /g, "-"),
+    //     };
+    //   });
+    //   this.billingCostCode!.split(",").forEach((code, index) => {
+    //     const costCode = code.split("#");
+    //     responseObj.pitch_slab[index] = {
+    //       from: Number(costCode[0]),
+    //       to: Number(costCode[0]),
+    //       // discount: costCode[1],
+    //     };
+    //   });
+    //   responseObj.effective_from_date = Number(
+    //     BookingCode.getDateCode(this.effectiveFrom)
+    //   );
+    //   responseObj.effective_to_date = Number(
+    //     BookingCode.getDateCode(this.effectiveTo)
+    //   );
+    //   responseObj.unit = this.unit;
+    //   responseObj.base_price = this.basePrice;
+    //   return responseObj;
+    // }
     PricingPlanEntityModelV2.prototype.toPitchSlabs = function () {
         return this.billingCostCode
             .split(",")

package/build/src/models/subscribed-pricing-plan-model.js

@@ -167,8 +167,19 @@ var SubscribedPricingPlanModelV2 = /** @class */ (function (_super) {
         // return codes ? codes[0] : "";
     };
     SubscribedPricingPlanModelV2.prototype.getDiscount = function () {
-        var codes = this.getCodeByPitchCountCycle();
-        return codes === null || codes === void 0 ? void 0 : codes.split("#")[3];
+        var _this = this;
+        var codes = this.billing_cost_code.split(",");
+        // Filter by pitch count
+        codes = codes.filter(function (code) {
+            var _a = code.split("_"), from = _a[0], to = _a[1];
+            return _this.pitchCount >= parseInt(from) && _this.pitchCount <= parseInt(to);
+        });
+        codes.sort();
+        // Filter by billing cycle
+        codes = codes.filter(function (code) {
+            return _this.selectedBillingCycle.to === Number(code.split("#")[1]);
+        });
+        return codes ? codes[0].split("#")[3] : "";
     };
     SubscribedPricingPlanModelV2.prototype.getBasePriceByPitchSlab = function () {
         var _this = this;

package/package.json

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