@nimee/calculations 1.0.3 → 1.0.5

package/dist/prices.d.ts

@@ -1,6 +1,6 @@
 import { IAccountModel, IEventModel, IUserEventModel } from "@nimee/shared-types";
 export declare const getTotalTicketsAmount: (allUsersEvent: IUserEventModel[]) => number;
-export declare const calculateFinalPriceWithNimiFee: (totalPrice: number, event: IEventModel, account: IAccountModel) => {
+export declare const calculateFinalPriceWithNimiFee: (totalPriceWithoutCouponDiscount: number, event: IEventModel, account: IAccountModel, totalPriceWithCouponDiscount: number) => {
     nimiFeePercentage: number;
     nimiFee: number;
     finalPriceWithNimiFee: number;

package/dist/prices.js

@@ -27,23 +27,29 @@ const getTotalTicketsAmount = (allUsersEvent) => {
     }, 0);
 };
 exports.getTotalTicketsAmount = getTotalTicketsAmount;
-const calculateFinalPriceWithNimiFee = (totalPrice, event, account) => {
+// we need to calculate the final price with nimi fee and return the nimi fee percentage and nimi fee
+// we need the original price becuase the fee is calculated on top of the original price
+// then we return the coupon discount and the final price with nimi fee
+// then we calculate the nimi fee percentage from the final price after discount with nimi fee
+const calculateFinalPriceWithNimiFee = (totalPriceWithoutCouponDiscount, event, account, totalPriceWithCouponDiscount) => {
     switch (event.feeCollectionType) {
         case shared_types_1.IFeeCollectionType.PERCENTAGE_FROM_TICKET:
-            return { finalPriceWithNimiFee: totalPrice, nimiFee: 0, nimiFeePercentage: account.marketFee };
+            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 5
-            const unroundedValue = Math.max(3, (totalPrice * account.originalMarketFee) / 100);
-            const roundedValue = Math.round(unroundedValue * 2) / 2;
-            const nimiFeePercentageUnrounded = (roundedValue / totalPrice) * 100;
-            const nimiFeePercentage = Math.round(nimiFeePercentageUnrounded * 2) / 2;
+            // minimum 3 so we use max
+            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
+            const nimiFeePercentage = Math.min(59, (roundedFee / (totalPriceWithCouponDiscount + roundedFee)) * 100);
+            // we need to  make sure we  send marketFee  that is greater or equal to 0 so we use max  and we  must subtract payme fee from nimiFeePercentage because payme ask to send them the fee without their fee
+            const nimiFeePercentageMinusPaymeFee = Math.max(0, nimiFeePercentage - 1.1 * 1.17);
             return {
-                finalPriceWithNimiFee: roundedValue + totalPrice,
-                nimiFee: roundedValue,
-                nimiFeePercentage,
+                finalPriceWithNimiFee: roundedFee + totalPriceWithCouponDiscount,
+                nimiFee: roundedFee,
+                nimiFeePercentage: nimiFeePercentageMinusPaymeFee,
             };
         default:
-            return { finalPriceWithNimiFee: totalPrice, nimiFee: 0, nimiFeePercentage: account.marketFee };
+            return { finalPriceWithNimiFee: totalPriceWithCouponDiscount, nimiFee: 0, nimiFeePercentage: account.marketFee };
     }
 };
 exports.calculateFinalPriceWithNimiFee = calculateFinalPriceWithNimiFee;

package/dist/prices.js.map

@@ -1 +1 @@
-{"version":3,"file":"prices.js","sourceRoot":"","sources":["../src/prices.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oDAAoD;AACpD,sDAAsG;AACtG,oDAAkD;AAClD,wDAAmD;AAEnD,+EAA+E;AACxE,MAAM,qBAAqB,GAAG,CAAC,aAAgC,EAAU,EAAE;IAChF,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC,GAAW,EAAE,SAA0B,EAAE,EAAE;;QACtE,gCAAgC;QAChC,IAAI,CAAC,CAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,WAAW,0CAAE,MAAM,CAAA,EAAE;YACnC,OAAO,GAAG,GAAG,CAAC,CAAC;SAChB;QACD,iCAAiC;QACjC,OAAO,GAAG,GAAG,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC;IAC5C,CAAC,EAAE,CAAC,CAAC,CAAC;AACR,CAAC,CAAC;AATW,QAAA,qBAAqB,yBAShC;AAEK,MAAM,8BAA8B,GAAG,CAC5C,UAAkB,EAClB,KAAkB,EAClB,OAAsB,EACyD,EAAE;IACjF,QAAQ,KAAK,CAAC,iBAAiB,EAAE;QAC/B,KAAK,iCAAkB,CAAC,sBAAsB;YAC5C,OAAO,EAAE,qBAAqB,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,EAAE,iBAAiB,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC;QACjG,KAAK,iCAAkB,CAAC,gBAAgB;YACtC,YAAY;YACZ,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,UAAU,GAAG,OAAO,CAAC,iBAAiB,CAAC,GAAG,GAAG,CAAC,CAAC;YACnF,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;YAExD,MAAM,0BAA0B,GAAG,CAAC,YAAY,GAAG,UAAU,CAAC,GAAG,GAAG,CAAC;YACrE,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,0BAA0B,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;YACzE,OAAO;gBACL,qBAAqB,EAAE,YAAY,GAAG,UAAU;gBAChD,OAAO,EAAE,YAAY;gBACrB,iBAAiB;aAClB,CAAC;QACJ;YACE,OAAO,EAAE,qBAAqB,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,EAAE,iBAAiB,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC;KAClG;AACH,CAAC,CAAC;AAvBW,QAAA,8BAA8B,kCAuBzC;AACK,MAAM,qCAAqC,GAAG,CAAC,UAAkB,EAAE,cAAsB,EAAU,EAAE,CAC1G,UAAU,GAAG,cAAc,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,GAAG,cAAc,CAAC;AADvD,QAAA,qCAAqC,yCACkB;AAEpE,0FAA0F;AAC1F,iGAAiG;AAC1F,MAAM,iBAAiB,GAAG,CAAO,SAAmB,EAAE,cAAsB,EAAE,SAAiB,EAAE,OAAe,EAAE,EAAE;IACzH,MAAM,YAAY,GAAG,IAAI,0BAAY,EAAE,CAAC;IACxC,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;IACpH,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAA,EAAE;QACpB,MAAM,IAAI,2BAAW,CACnB,uCAAuC,EACvC,GAAG,EACH,sEAAsE,SAAS,kBAAkB,OAAO,EAAE,CAC3G,CAAC;KACH;IAED,MAAM,wBAAwB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAW,EAAE,MAAyB,EAAE,EAAE,CAAC,GAAG,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACnH,IAAI,wBAAwB,KAAK,CAAC,EAAE;QAClC,OAAO,IAAI,CAAC;KACb;IAED,IAAI,cAAc,EAAE;QAClB,MAAM,qBAAqB,GAAG,IAAA,6CAAqC,EAAC,wBAAwB,EAAE,cAAc,CAAC,CAAC;QAC9G,IAAI,qBAAqB,KAAK,CAAC,EAAE;YAC/B,OAAO,IAAI,CAAC;SACb;KACF;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAA,CAAC;AAxBW,QAAA,iBAAiB,qBAwB5B"}
+{"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.3",
+  "version": "1.0.5",
   "description": "nimi calculations like prices for back and front",
   "main": "dist/index.js",
   "author": "dan goldberg",
@@ -28,7 +28,7 @@
   "types": "dist/index.d.ts",
   "dependencies": {
     "@nimee/api-clients": "^1.1.15",
-    "@nimee/error-handler": "^0.0.7",
+    "@nimee/error-handler": "^0.0.9",
     "axios": "1.2.1"
   }
 }

package/src/prices.ts

@@ -15,28 +15,34 @@ export const getTotalTicketsAmount = (allUsersEvent: IUserEventModel[]): number
   }, 0);
 };
 
+// we need to calculate the final price with nimi fee and return the nimi fee percentage and nimi fee
+// we need the original price becuase the fee is calculated on top of the original price
+// then we return the coupon discount and the final price with nimi fee
+// then we calculate the nimi fee percentage from the final price after discount with nimi fee
 export const calculateFinalPriceWithNimiFee = (
-  totalPrice: number,
+  totalPriceWithoutCouponDiscount: number,
   event: IEventModel,
-  account: IAccountModel
+  account: IAccountModel,
+  totalPriceWithCouponDiscount: number
 ): { nimiFeePercentage: number; nimiFee: number; finalPriceWithNimiFee: number } => {
   switch (event.feeCollectionType) {
     case IFeeCollectionType.PERCENTAGE_FROM_TICKET:
-      return { finalPriceWithNimiFee: totalPrice, nimiFee: 0, nimiFeePercentage: account.marketFee };
+      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 5
-      const unroundedValue = Math.max(3, (totalPrice * account.originalMarketFee) / 100);
-      const roundedValue = Math.round(unroundedValue * 2) / 2;
-
-      const nimiFeePercentageUnrounded = (roundedValue / totalPrice) * 100;
-      const nimiFeePercentage = Math.round(nimiFeePercentageUnrounded * 2) / 2;
+      // minimum 3 so we use max
+      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
+      const nimiFeePercentage = Math.min(59, (roundedFee / (totalPriceWithCouponDiscount + roundedFee)) * 100);
+      // we need to  make sure we  send marketFee  that is greater or equal to 0 so we use max  and we  must subtract payme fee from nimiFeePercentage because payme ask to send them the fee without their fee
+      const nimiFeePercentageMinusPaymeFee = Math.max(0, nimiFeePercentage - 1.1 * 1.17);
       return {
-        finalPriceWithNimiFee: roundedValue + totalPrice,
-        nimiFee: roundedValue,
-        nimiFeePercentage,
+        finalPriceWithNimiFee: roundedFee + totalPriceWithCouponDiscount,
+        nimiFee: roundedFee,
+        nimiFeePercentage: nimiFeePercentageMinusPaymeFee,
       };
     default:
-      return { finalPriceWithNimiFee: totalPrice, nimiFee: 0, nimiFeePercentage: account.marketFee };
+      return { finalPriceWithNimiFee: totalPriceWithCouponDiscount, nimiFee: 0, nimiFeePercentage: account.marketFee };
   }
 };
 export const calculateFinalPriceWithCouponDiscount = (totalPrice: number, couponDiscount: number): number =>