@hyper.software/common-helpers 2.2.47 → 2.2.49

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -53,13 +53,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
53
53
  exports.calculateDynamicPricing = void 0;
54
54
  var moment_1 = __importDefault(require("moment"));
55
55
  var calculateDynamicPricing = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
56
- var basePriceMap, updatedPricing, period, affectedDates, _i, period_1, dateStr, manualPrice, basePrice, isAffected, dynamicPrice, isManuallyOverridden;
57
- var _c;
56
+ var basePriceMap, updatedPricing, affectedDates, _i, _c, dateStr, manualPrice, basePrice, isAffected, isManuallyOverridden, increased;
57
+ var _d;
58
58
  var currentPricing = _b.currentPricing, dynamicPricing = _b.dynamicPricing, existingBasePriceMap = _b.existingBasePriceMap, company = _b.company;
59
- return __generator(this, function (_d) {
59
+ return __generator(this, function (_e) {
60
60
  basePriceMap = __assign({}, existingBasePriceMap);
61
61
  updatedPricing = {};
62
- period = Object.keys(currentPricing);
63
62
  affectedDates = new Set((company.holidays || [])
64
63
  .filter(function (h) { return h.enableDynamicPricing; })
65
64
  .flatMap(function (h) { return [
@@ -67,26 +66,26 @@ var calculateDynamicPricing = function (_a) { return __awaiter(void 0, [_a], voi
67
66
  (0, moment_1.default)(h.date).format('YYYY-MM-DD'),
68
67
  (0, moment_1.default)(h.date).add(1, 'day').format('YYYY-MM-DD'),
69
68
  ]; }));
70
- for (_i = 0, period_1 = period; _i < period_1.length; _i++) {
71
- dateStr = period_1[_i];
69
+ for (_i = 0, _c = Object.keys(currentPricing); _i < _c.length; _i++) {
70
+ dateStr = _c[_i];
72
71
  manualPrice = currentPricing[dateStr];
73
- basePrice = (_c = basePriceMap[dateStr]) !== null && _c !== void 0 ? _c : manualPrice;
74
- basePriceMap[dateStr] = basePrice;
72
+ basePrice = (_d = basePriceMap[dateStr]) !== null && _d !== void 0 ? _d : manualPrice;
75
73
  isAffected = affectedDates.has(dateStr);
76
- if (!isAffected) {
74
+ isManuallyOverridden = manualPrice !== basePrice;
75
+ if (!(dateStr in basePriceMap)) {
76
+ basePriceMap[dateStr] = manualPrice;
77
+ }
78
+ if (!isAffected || isManuallyOverridden) {
77
79
  updatedPricing[dateStr] = manualPrice;
78
80
  continue;
79
81
  }
80
- if (!dynamicPricing.isActive) {
82
+ if (dynamicPricing.isActive) {
83
+ increased = basePrice + (dynamicPricing.amount || Math.round(basePrice * 0.05));
84
+ updatedPricing[dateStr] = Math.round(Math.min(increased, basePrice + 70));
85
+ }
86
+ else {
81
87
  updatedPricing[dateStr] = basePrice;
82
- continue;
83
88
  }
84
- dynamicPrice = basePrice + (dynamicPricing.amount || Math.round(basePrice * 0.05));
85
- if (dynamicPrice > basePrice + 70)
86
- dynamicPrice = basePrice + 70;
87
- dynamicPrice = Math.round(dynamicPrice);
88
- isManuallyOverridden = manualPrice !== dynamicPrice;
89
- updatedPricing[dateStr] = isManuallyOverridden ? manualPrice : dynamicPrice;
90
89
  }
91
90
  return [2 /*return*/, {
92
91
  updatedPricing: updatedPricing,
@@ -1 +1 @@
1
- {"version":3,"file":"dynamicPricingService.js","sourceRoot":"","sources":["../../../src/services/dynamicPricingService/dynamicPricingService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA2B;AAGpB,IAAM,uBAAuB,GAAG,iEAAO,EAc7C;;;QAbC,cAAc,oBAAA,EACd,cAAc,oBAAA,EACd,oBAAoB,0BAAA,EACpB,OAAO,aAAA;;QAcD,YAAY,gBAAQ,oBAAoB,CAAE,CAAA;QAC1C,cAAc,GAAyC,EAAE,CAAA;QACzD,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;QAEpC,aAAa,GAAG,IAAI,GAAG,CAC3B,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC;aACrB,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,oBAAoB,EAAtB,CAAsB,CAAC;aACrC,OAAO,CAAC,UAAC,CAAC,IAAK,OAAA;YACd,IAAA,gBAAM,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC;YACtD,IAAA,gBAAM,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC;YACnC,IAAA,gBAAM,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC;SAClD,EAJe,CAIf,CAAC,CACL,CAAA;QAED,WAA4B,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,EAAE,CAAC;YAApB,OAAO;YACV,WAAW,GAAG,cAAc,CAAC,OAAO,CAAC,CAAA;YACrC,SAAS,GAAG,MAAA,YAAY,CAAC,OAAO,CAAC,mCAAI,WAAW,CAAA;YACtD,YAAY,CAAC,OAAO,CAAC,GAAG,SAAS,CAAA;YAE3B,UAAU,GAAG,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YAE7C,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,cAAc,CAAC,OAAO,CAAC,GAAG,WAAW,CAAA;gBACrC,SAAQ;YACV,CAAC;YAED,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;gBAC7B,cAAc,CAAC,OAAO,CAAC,GAAG,SAAS,CAAA;gBACnC,SAAQ;YACV,CAAC;YAEG,YAAY,GAAG,SAAS,GAAG,CAAC,cAAc,CAAC,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC,CAAA;YACtF,IAAI,YAAY,GAAG,SAAS,GAAG,EAAE;gBAAE,YAAY,GAAG,SAAS,GAAG,EAAE,CAAA;YAChE,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;YAEjC,oBAAoB,GAAG,WAAW,KAAK,YAAY,CAAA;YAEzD,cAAc,CAAC,OAAO,CAAC,GAAG,oBAAoB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,YAAY,CAAA;QAC7E,CAAC;QAED,sBAAO;gBACL,cAAc,gBAAA;gBACd,mBAAmB,EAAE,YAAY;aAClC,EAAA;;KACF,CAAA;AA9DY,QAAA,uBAAuB,2BA8DnC"}
1
+ {"version":3,"file":"dynamicPricingService.js","sourceRoot":"","sources":["../../../src/services/dynamicPricingService/dynamicPricingService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA2B;AAGpB,IAAM,uBAAuB,GAAG,iEAAO,EAc7C;;;QAbC,cAAc,oBAAA,EACd,cAAc,oBAAA,EACd,oBAAoB,0BAAA,EACpB,OAAO,aAAA;;QAcD,YAAY,gBAAQ,oBAAoB,CAAE,CAAA;QAC1C,cAAc,GAAyC,EAAE,CAAA;QAEzD,aAAa,GAAG,IAAI,GAAG,CAC3B,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC;aACrB,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,oBAAoB,EAAtB,CAAsB,CAAC;aACrC,OAAO,CAAC,UAAC,CAAC,IAAK,OAAA;YACd,IAAA,gBAAM,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC;YACtD,IAAA,gBAAM,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC;YACnC,IAAA,gBAAM,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC;SAClD,EAJe,CAIf,CAAC,CACL,CAAA;QAED,WAAiD,EAA3B,KAAA,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,EAA3B,cAA2B,EAA3B,IAA2B,EAAE,CAAC;YAAzC,OAAO;YACV,WAAW,GAAG,cAAc,CAAC,OAAO,CAAC,CAAA;YACrC,SAAS,GAAG,MAAA,YAAY,CAAC,OAAO,CAAC,mCAAI,WAAW,CAAA;YAEhD,UAAU,GAAG,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YACvC,oBAAoB,GAAG,WAAW,KAAK,SAAS,CAAA;YAEtD,IAAI,CAAC,CAAC,OAAO,IAAI,YAAY,CAAC,EAAE,CAAC;gBAC/B,YAAY,CAAC,OAAO,CAAC,GAAG,WAAW,CAAA;YACrC,CAAC;YAED,IAAI,CAAC,UAAU,IAAI,oBAAoB,EAAE,CAAC;gBACxC,cAAc,CAAC,OAAO,CAAC,GAAG,WAAW,CAAA;gBACrC,SAAQ;YACV,CAAC;YAED,IAAI,cAAc,CAAC,QAAQ,EAAE,CAAC;gBACtB,SAAS,GAAG,SAAS,GAAG,CAAC,cAAc,CAAC,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC,CAAA;gBACrF,cAAc,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,GAAG,EAAE,CAAC,CAAC,CAAA;YAC3E,CAAC;iBAAM,CAAC;gBACN,cAAc,CAAC,OAAO,CAAC,GAAG,SAAS,CAAA;YACrC,CAAC;QACH,CAAC;QAED,sBAAO;gBACL,cAAc,gBAAA;gBACd,mBAAmB,EAAE,YAAY;aAClC,EAAA;;KACF,CAAA;AA3DY,QAAA,uBAAuB,2BA2DnC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hyper.software/common-helpers",
3
- "version": "2.2.47",
3
+ "version": "2.2.49",
4
4
  "author": "Raul Tomescu <tomescu.raul+hyper@gmail.com>",
5
5
  "description": "Hyper Software Common Javascript Helpers",
6
6
  "main": "lib/index.js",