commitda2693567cAuthor: John Yeo <johnyeocx@gmail.com> Date: Mon Sep 22 14:45:25 2025 +0100 chore: ran biome format commitdb19928ceaMerge:3005d452d5d285a2Author: John Yeo <johnyeocx@gmail.com> Date: Mon Sep 22 13:25:11 2025 +0100 Merge branch 'staging' of https://github.com/useautumn/autumn into staging commit3005d45252Merge:5cb89756784f7f92Author: John Yeo <johnyeocx@gmail.com> Date: Mon Sep 22 13:25:01 2025 +0100 Merge branch 'main' into staging commitd5d285a25bMerge:894f943fb3952a27Author: John Yeo <51376134+johnyeocx@users.noreply.github.com> Date: Mon Sep 22 13:19:48 2025 +0100 Merge pull request #224 from muhammadusmandev/fix/create-product-prevent-empty-name-submission Fix: Create product prevent API call if product name field is empty and invalid characters commit894f943f31Merge:5cb8975659aaf3c4Author: John Yeo <51376134+johnyeocx@users.noreply.github.com> Date: Mon Sep 22 13:19:15 2025 +0100 Merge pull request #223 from sidgaikwad/Fixes/Update-logic-reward-program Fixes/update logic reward program commit59aaf3c430Author: John Yeo <johnyeocx@gmail.com> Date: Mon Sep 22 13:17:56 2025 +0100 Fixes/Update-logic-reward-program commit5f9eb4f02dMerge:7b1b2cd25cb89756Author: John Yeo <johnyeocx@gmail.com> Date: Mon Sep 22 13:17:46 2025 +0100 Merge branch 'staging' into Fixes/Update-logic-reward-program commit7b1b2cd278Author: John Yeo <johnyeocx@gmail.com> Date: Mon Sep 22 13:12:39 2025 +0100 fix: show error message for update reward program commit5cb897560dMerge:79cf0f5894dd5ba5Author: John Yeo <johnyeocx@gmail.com> Date: Mon Sep 22 13:06:11 2025 +0100 Merge branch 'staging' of https://github.com/useautumn/autumn into staging commit79cf0f5839Author: John Yeo <johnyeocx@gmail.com> Date: Mon Sep 22 13:06:09 2025 +0100 fix: update feature modal scrolls commit94dd5ba5b1Merge:9715e04e609bd24bAuthor: John Yeo <51376134+johnyeocx@users.noreply.github.com> Date: Mon Sep 22 12:58:51 2025 +0100 Merge pull request #215 from shreyash1231/fix/Disabled-Create-Customer-Button-Until-Id-Or-Email-is-Filled-To-Prevent-API-CALL Fix/disabled create customer button until id or email is filled to prevent api call commit9715e04eddMerge:97190711fe96c87aAuthor: John Yeo <51376134+johnyeocx@users.noreply.github.com> Date: Mon Sep 22 12:44:40 2025 +0100 Merge pull request #213 from SirTenzin/fix/event-timezone fix: 🐛 timezones not localised commit9719071149Merge:9c1862b47e201daeAuthor: John Yeo <51376134+johnyeocx@users.noreply.github.com> Date: Mon Sep 22 12:44:28 2025 +0100 Merge pull request #217 from SirTenzin/fix/trmnl-values fix: 🐛 only counted row instead of value commit9c1862b405Merge:6040c1034fd25cc1Author: John Yeo <51376134+johnyeocx@users.noreply.github.com> Date: Mon Sep 22 12:43:36 2025 +0100 Merge pull request #216 from SirTenzin/feat/reward-migrations fix: 🐛 reward price_ids migrations commit4fd25cc161Author: John Yeo <johnyeocx@gmail.com> Date: Mon Sep 22 12:43:06 2025 +0100 fix: ent rollover null / undefined difference commit784f7f9290Merge:dd0e9f1f6040c103Author: John Yeo <johnyeocx@gmail.com> Date: Mon Sep 22 10:40:49 2025 +0100 fix: referral program coupon reward, apply to redeemer commitdd0e9f1fd7Author: John Yeo <johnyeocx@gmail.com> Date: Mon Sep 22 10:06:27 2025 +0100 fix: referral utils apply to both coupon commite40e5a06f9Author: John Yeo <johnyeocx@gmail.com> Date: Mon Sep 22 09:53:38 2025 +0100 chore: fixing reward migrations commite161cbec83Merge:e8ff791a6040c103Author: John Yeo <johnyeocx@gmail.com> Date: Sun Sep 21 18:24:24 2025 +0100 Merge branch 'staging' into feat/reward-migrations commitb3952a2702Author: Muhammad Usman <muhammadusmandev@yahoo.com> Date: Sat Sep 20 08:28:35 2025 -0700 Fix: Create product prevent API call if product name field is empty and not valid commit1f609eb592Author: sidgaikwad <gaikwadsiddharth039@gmail.com> Date: Sat Sep 20 00:53:46 2025 +0530 changes for the update logic for passing proper id commit86222adfa9Author: sidgaikwad <gaikwadsiddharth039@gmail.com> Date: Sat Sep 20 00:20:44 2025 +0530 `feat(rewardPrograms): Update RewardProgramService to support idOrInternalId and add update endpoint` commitab655107fcAuthor: sidgaikwad <gaikwadsiddharth039@gmail.com> Date: Fri Sep 19 23:21:05 2025 +0530 changes to have view for the updaterewardprogram and also the service for it commite8ff791aceAuthor: amianthus <49116958+SirTenzin@users.noreply.github.com> Date: Fri Sep 19 12:58:48 2025 +0100 fix: 🐛 dont use unmatched prices commite2528194fdAuthor: amianthus <49116958+SirTenzin@users.noreply.github.com> Date: Fri Sep 19 12:53:06 2025 +0100 feat: 🎸 toast to alert of any unmigrated prices commit7e201dae41Author: amianthus <49116958+SirTenzin@users.noreply.github.com> Date: Tue Sep 16 14:47:04 2025 +0100 fix: 🐛 only counted row instead of value commit590a2ae86fAuthor: amianthus <49116958+SirTenzin@users.noreply.github.com> Date: Tue Sep 16 14:23:26 2025 +0100 refactor: 💡 clean up commitd529d6adb7Author: amianthus <49116958+SirTenzin@users.noreply.github.com> Date: Tue Sep 16 13:52:35 2025 +0100 refactor: 💡 types commitd6e9802cdcAuthor: amianthus <49116958+SirTenzin@users.noreply.github.com> Date: Tue Sep 16 13:52:28 2025 +0100 feat: 🎸 reward migrations commit609bd24b60Author: shreyash1231 <chandwadkarshreyash@gmail.com> Date: Tue Sep 16 17:08:33 2025 +0530 fix/Disabled-Create-Customer-Button-Until-Id-Or-Email-is-Filled-To-Prevent-API-CALL commitd13505621cAuthor: shreyash1231 <chandwadkarshreyash@gmail.com> Date: Tue Sep 16 16:41:45 2025 +0530 Disabled-Create-Customer-Button-Until-Name-Id-Or-Email-isfilled-to-Prevent-API-CALL commitc26bd73627Author: amianthus <49116958+SirTenzin@users.noreply.github.com> Date: Mon Sep 15 15:25:47 2025 +0100 refactor: 💡 type sugar :) commit77790cb176Author: amianthus <49116958+SirTenzin@users.noreply.github.com> Date: Mon Sep 15 15:11:05 2025 +0100 fix: 🐛 applying to all commitfe96c87a7aAuthor: amianthus <49116958+SirTenzin@users.noreply.github.com> Date: Mon Sep 15 14:47:16 2025 +0100 fix: 🐛 timezones not localised
114 lines
2.9 KiB
TypeScript
114 lines
2.9 KiB
TypeScript
import { FullCustomerEntitlement } from "../../models/cusProductModels/cusEntModels/cusEntModels.js";
|
|
import { FullCusProduct } from "../../models/cusProductModels/cusProductModels.js";
|
|
import { FeatureType } from "../../models/featureModels/featureEnums.js";
|
|
import { AllowanceType } from "../../models/productModels/entModels/entModels.js";
|
|
import { entIntervalToValue } from "../intervalUtils.js";
|
|
|
|
export const sortCusEntsForDeduction = (
|
|
cusEnts: (FullCustomerEntitlement & {
|
|
customer_product?: FullCusProduct;
|
|
})[],
|
|
reverseOrder: boolean = false,
|
|
) => {
|
|
cusEnts.sort((a, b) => {
|
|
const aEnt = a.entitlement;
|
|
const bEnt = b.entitlement;
|
|
|
|
// 1. If boolean, go first
|
|
if (aEnt.feature.type == FeatureType.Boolean) {
|
|
return -1;
|
|
}
|
|
|
|
if (bEnt.feature.type == FeatureType.Boolean) {
|
|
return 1;
|
|
}
|
|
|
|
// 1. If a is credit system and b is not, a should go last
|
|
if (
|
|
aEnt.feature.type == FeatureType.CreditSystem &&
|
|
bEnt.feature.type != FeatureType.CreditSystem
|
|
) {
|
|
return 1;
|
|
}
|
|
|
|
// 2. If a is not credit system and b is, a should go first
|
|
if (
|
|
aEnt.feature.type != FeatureType.CreditSystem &&
|
|
bEnt.feature.type == FeatureType.CreditSystem
|
|
) {
|
|
return -1;
|
|
}
|
|
|
|
// 2. Sort by unlimited (unlimited goes first)
|
|
if (
|
|
aEnt.allowance_type == AllowanceType.Unlimited &&
|
|
bEnt.allowance_type != AllowanceType.Unlimited
|
|
) {
|
|
return -1;
|
|
}
|
|
|
|
if (
|
|
aEnt.allowance_type != AllowanceType.Unlimited &&
|
|
bEnt.allowance_type == AllowanceType.Unlimited
|
|
) {
|
|
return 1;
|
|
}
|
|
|
|
// If one has usage_allowed, it should go last
|
|
if (!a.usage_allowed && b.usage_allowed) {
|
|
return -1;
|
|
}
|
|
|
|
if (!b.usage_allowed && a.usage_allowed) {
|
|
return 1;
|
|
}
|
|
|
|
// If one has a next_reset_at, it should go first
|
|
let nextResetFirst = reverseOrder ? 1 : -1;
|
|
|
|
if (a.next_reset_at && !b.next_reset_at) {
|
|
return nextResetFirst;
|
|
}
|
|
|
|
// If b has a next_reset_at, it should go first
|
|
if (!a.next_reset_at && b.next_reset_at) {
|
|
return -nextResetFirst;
|
|
}
|
|
|
|
// 3. Sort by interval
|
|
let aVal = entIntervalToValue(aEnt.interval, aEnt.interval_count);
|
|
let bVal = entIntervalToValue(bEnt.interval, bEnt.interval_count);
|
|
if (aEnt.interval && bEnt.interval && !aVal.eq(bVal)) {
|
|
if (reverseOrder) {
|
|
return bVal.sub(aVal).toNumber();
|
|
// return intervalOrder[bEnt.interval] - intervalOrder[aEnt.interval];
|
|
} else {
|
|
return aVal.sub(bVal).toNumber();
|
|
// return intervalOrder[aEnt.interval] - intervalOrder[bEnt.interval];
|
|
}
|
|
}
|
|
|
|
// Check if a is main product
|
|
let aIsAddOn = a.customer_product?.product?.is_add_on;
|
|
let bIsAddOn = b.customer_product?.product?.is_add_on;
|
|
|
|
if (aIsAddOn && !bIsAddOn) {
|
|
return 1;
|
|
}
|
|
|
|
if (!aIsAddOn && bIsAddOn) {
|
|
return -1;
|
|
}
|
|
|
|
// 4. Sort by created_at
|
|
return a.created_at - b.created_at;
|
|
});
|
|
|
|
// console.log(
|
|
// `Cus ents after (${reverseOrder ? "reversed" : "normal"})`,
|
|
// cusEnts.map(
|
|
// (ce) => `${ce.entitlement.feature_id} - ${ce.entitlement.interval}`
|
|
// )
|
|
// );
|
|
};
|