@nimee/calculations 1.0.5 → 1.0.7

package/dist/prices.d.ts

@@ -6,4 +6,4 @@ export declare const calculateFinalPriceWithNimiFee: (totalPriceWithoutCouponDis
     finalPriceWithNimiFee: number;
 };
 export declare const calculateFinalPriceWithCouponDiscount: (totalPrice: number, couponDiscount: number) => number;
-export declare const validateFreeOrder: (ticketIds: string[], couponDiscount: number, accountId: string, eventId: string) => Promise<boolean>;
+export declare const calculateFinalPriceWithEndUserSeasonTicket: (totalPrice: number, endUserSeasonTicketDiscountPrice: any) => number;

package/dist/prices.js

@@ -1,19 +1,8 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateFreeOrder = exports.calculateFinalPriceWithCouponDiscount = exports.calculateFinalPriceWithNimiFee = exports.getTotalTicketsAmount = void 0;
+exports.calculateFinalPriceWithEndUserSeasonTicket = exports.calculateFinalPriceWithCouponDiscount = exports.calculateFinalPriceWithNimiFee = exports.getTotalTicketsAmount = void 0;
 /* Central the prices logic so we won't repeat it */
 const shared_types_1 = require("@nimee/shared-types");
-const api_clients_1 = require("@nimee/api-clients");
-const error_handler_1 = require("@nimee/error-handler");
 // Support both legacy and new userEvent schema (with ticketsInfo and without.)
 const getTotalTicketsAmount = (allUsersEvent) => {
     return allUsersEvent.reduce((acc, userEvent) => {
@@ -36,7 +25,11 @@ const calculateFinalPriceWithNimiFee = (totalPriceWithoutCouponDiscount, event,
         case shared_types_1.IFeeCollectionType.PERCENTAGE_FROM_TICKET:
             return { finalPriceWithNimiFee: totalPriceWithCouponDiscount, nimiFee: 0, nimiFeePercentage: account.marketFee }; // we use here marketFee (and not  originalMarketFee) because we need to send the fee to payme without their fee
         case shared_types_1.IFeeCollectionType.ON_TOP_OF_TICKET:
-            // minimum 3 so we use max
+            // check if the totalPrice with coupon discount is 0 then we return 0 for the fee and the percentage
+            if (totalPriceWithCouponDiscount === 0) {
+                return { finalPriceWithNimiFee: 0, nimiFee: 0, nimiFeePercentage: 0 };
+            }
+            // minimum 3 so we use max we totalPriceWithoutCouponDiscount because the fee is calculated on top of the original price and not the price after discount
             const unroundedFee = Math.max(3, (totalPriceWithoutCouponDiscount * account.originalMarketFee) / 100); //  here we use originalMarketFee because we need to calculate the fee on top of the original price (later we will subtract payme fee from the fee we send to payme)
             const roundedFee = Math.round(unroundedFee);
             //  nimiFeePercentage has unknown range that need to be aware of - we get error when we send to payme with range above 60 so we use max
@@ -55,25 +48,30 @@ const calculateFinalPriceWithNimiFee = (totalPriceWithoutCouponDiscount, event,
 exports.calculateFinalPriceWithNimiFee = calculateFinalPriceWithNimiFee;
 const calculateFinalPriceWithCouponDiscount = (totalPrice, couponDiscount) => totalPrice - couponDiscount < 0 ? 0 : totalPrice - couponDiscount;
 exports.calculateFinalPriceWithCouponDiscount = calculateFinalPriceWithCouponDiscount;
+const calculateFinalPriceWithEndUserSeasonTicket = (totalPrice, endUserSeasonTicketDiscountPrice) => totalPrice - endUserSeasonTicketDiscountPrice < 0 ? 0 : totalPrice - endUserSeasonTicketDiscountPrice;
+exports.calculateFinalPriceWithEndUserSeasonTicket = calculateFinalPriceWithEndUserSeasonTicket;
 // Validate the order is really free, rather the tickets free or with the coupon discount.
 // we do this so the client won't be able to create orders with price 0 and it won't be validated
-const validateFreeOrder = (ticketIds, couponDiscount, accountId, eventId) => __awaiter(void 0, void 0, void 0, function* () {
-    const ticketClient = new api_clients_1.TicketClient();
-    const tickets = yield ticketClient.getTicketsByIds({ token: process.env.JWT_ADMIN, ticketIds, accountId, eventId });
-    if (!(tickets === null || tickets === void 0 ? void 0 : tickets.length)) {
-        throw new error_handler_1.CustomError("tickets_not_found_validate_free_order", 400, `tickets not found when try to validate free order with ticketIds - ${ticketIds} and eventId - ${eventId}`);
-    }
-    const rawOrderPriceFromTickets = tickets.reduce((acc, ticket) => acc + ticket.price, 0);
-    if (rawOrderPriceFromTickets === 0) {
-        return true;
-    }
-    if (couponDiscount) {
-        const orderPriceAfterCoupon = (0, exports.calculateFinalPriceWithCouponDiscount)(rawOrderPriceFromTickets, couponDiscount);
-        if (orderPriceAfterCoupon === 0) {
-            return true;
-        }
-    }
-    return false;
-});
-exports.validateFreeOrder = validateFreeOrder;
+// export const validateFreeOrder = async (ticketIds: string[], couponDiscount: number, accountId: string, eventId: string) => {
+//   const ticketClient = new TicketClient();
+//   const tickets = await ticketClient.getTicketsByIds({ token: process.env.JWT_ADMIN, ticketIds, accountId, eventId });
+//   if (!tickets?.length) {
+//     throw new CustomError(
+//       "tickets_not_found_validate_free_order",
+//       400,
+//       `tickets not found when try to validate free order with ticketIds - ${ticketIds} and eventId - ${eventId}`
+//     );
+//   }
+//   const rawOrderPriceFromTickets = tickets.reduce((acc: number, ticket: { price: number }) => acc + ticket.price, 0);
+//   if (rawOrderPriceFromTickets === 0) {
+//     return true;
+//   }
+//   if (couponDiscount) {
+//     const orderPriceAfterCoupon = calculateFinalPriceWithCouponDiscount(rawOrderPriceFromTickets, couponDiscount);
+//     if (orderPriceAfterCoupon === 0) {
+//       return true;
+//     }
+//   }
+//   return false;
+// };
 //# sourceMappingURL=prices.js.map

package/dist/prices.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nimee/calculations",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "nimi calculations like prices for back and front",
   "main": "dist/index.js",
   "author": "dan goldberg",
@@ -13,7 +13,7 @@
     "prettier-format": "prettier --config .prettierrc 'src/**/*.ts' --write",
     "incVersionAndPublish": "npm version patch && npm run publish-it && npm run i-all-workspaces",
     "publish-it": "npm run build && npm publish --scope=nimee --access public",
-    "i-all-workspaces": "version=${npm_package_version} npm i @nimee/calculations@$version  --workspace=@nimee/event --workspace=@nimee/user-event --workspace=@nimee/send-notification --workspace=@nimee/user  --workspace=@nimee/payment --workspace=@nimee/analytics"
+    "i-all-workspaces": "version=${npm_package_version} npm i @nimee/calculations@$version  --workspace=@nimee/event --workspace=@nimee/user-event --workspace=@nimee/send-notification --workspace=@nimee/user  --workspace=@nimee/payment --workspace=@nimee/analytics --workspace=@nimee/crm"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^5.18.0",

package/src/prices.ts

@@ -29,7 +29,11 @@ export const calculateFinalPriceWithNimiFee = (
     case IFeeCollectionType.PERCENTAGE_FROM_TICKET:
       return { finalPriceWithNimiFee: totalPriceWithCouponDiscount, nimiFee: 0, nimiFeePercentage: account.marketFee }; // we use here marketFee (and not  originalMarketFee) because we need to send the fee to payme without their fee
     case IFeeCollectionType.ON_TOP_OF_TICKET:
-      // minimum 3 so we use max
+      // check if the totalPrice with coupon discount is 0 then we return 0 for the fee and the percentage
+      if (totalPriceWithCouponDiscount === 0) {
+        return { finalPriceWithNimiFee: 0, nimiFee: 0, nimiFeePercentage: 0 };
+      }
+      // minimum 3 so we use max we totalPriceWithoutCouponDiscount because the fee is calculated on top of the original price and not the price after discount
       const unroundedFee = Math.max(3, (totalPriceWithoutCouponDiscount * account.originalMarketFee) / 100); //  here we use originalMarketFee because we need to calculate the fee on top of the original price (later we will subtract payme fee from the fee we send to payme)
       const roundedFee = Math.round(unroundedFee);
       //  nimiFeePercentage has unknown range that need to be aware of - we get error when we send to payme with range above 60 so we use max
@@ -47,31 +51,32 @@ export const calculateFinalPriceWithNimiFee = (
 };
 export const calculateFinalPriceWithCouponDiscount = (totalPrice: number, couponDiscount: number): number =>
   totalPrice - couponDiscount < 0 ? 0 : totalPrice - couponDiscount;
-
+export const calculateFinalPriceWithEndUserSeasonTicket = (totalPrice: number, endUserSeasonTicketDiscountPrice: any): number =>
+  totalPrice - endUserSeasonTicketDiscountPrice < 0 ? 0 : totalPrice - endUserSeasonTicketDiscountPrice;
 // Validate the order is really free, rather the tickets free or with the coupon discount.
 // we do this so the client won't be able to create orders with price 0 and it won't be validated
-export const validateFreeOrder = async (ticketIds: string[], couponDiscount: number, accountId: string, eventId: string) => {
-  const ticketClient = new TicketClient();
-  const tickets = await ticketClient.getTicketsByIds({ token: process.env.JWT_ADMIN, ticketIds, accountId, eventId });
-  if (!tickets?.length) {
-    throw new CustomError(
-      "tickets_not_found_validate_free_order",
-      400,
-      `tickets not found when try to validate free order with ticketIds - ${ticketIds} and eventId - ${eventId}`
-    );
-  }
+// export const validateFreeOrder = async (ticketIds: string[], couponDiscount: number, accountId: string, eventId: string) => {
+//   const ticketClient = new TicketClient();
+//   const tickets = await ticketClient.getTicketsByIds({ token: process.env.JWT_ADMIN, ticketIds, accountId, eventId });
+//   if (!tickets?.length) {
+//     throw new CustomError(
+//       "tickets_not_found_validate_free_order",
+//       400,
+//       `tickets not found when try to validate free order with ticketIds - ${ticketIds} and eventId - ${eventId}`
+//     );
+//   }
 
-  const rawOrderPriceFromTickets = tickets.reduce((acc: number, ticket: { price: number }) => acc + ticket.price, 0);
-  if (rawOrderPriceFromTickets === 0) {
-    return true;
-  }
+//   const rawOrderPriceFromTickets = tickets.reduce((acc: number, ticket: { price: number }) => acc + ticket.price, 0);
+//   if (rawOrderPriceFromTickets === 0) {
+//     return true;
+//   }
 
-  if (couponDiscount) {
-    const orderPriceAfterCoupon = calculateFinalPriceWithCouponDiscount(rawOrderPriceFromTickets, couponDiscount);
-    if (orderPriceAfterCoupon === 0) {
-      return true;
-    }
-  }
+//   if (couponDiscount) {
+//     const orderPriceAfterCoupon = calculateFinalPriceWithCouponDiscount(rawOrderPriceFromTickets, couponDiscount);
+//     if (orderPriceAfterCoupon === 0) {
+//       return true;
+//     }
+//   }
 
-  return false;
-};
+//   return false;
+// };