@riocrypto/common-server 1.0.782 → 1.0.783

package/build/helpers/get-platform-and-partner-fees.d.ts

@@ -1,6 +1,6 @@
 import { Country, Fiat, Processor, User } from "@riocrypto/common";
 import { Mongoose } from "mongoose";
-export declare const getPlatformAndPartnerFees: (mongoose: Mongoose, amountFiat: number, fiat: Fiat, processor: Processor, country: Country, discount: number, partnerId?: string, brokerId?: string, user?: User) => Promise<{
+export declare const getPlatformAndPartnerFees: (mongoose: Mongoose, amountFiat: number, fiat: Fiat, processor: Processor, country: Country, partnerId?: string, brokerId?: string, user?: User, markup?: number, discount?: number) => Promise<{
     platformFeeFiat: number;
     platformFeeFiatTax: number;
     partnerFeeFiat: number;

package/build/helpers/get-platform-and-partner-fees.js

@@ -17,7 +17,7 @@ const currency_api_client_1 = require("../clients/currency-api-client");
 const partner_1 = require("../models/partner");
 const user_1 = require("../models/user");
 const calculate_aggregate_volume_1 = require("./calculate-aggregate-volume");
-const getPlatformAndPartnerFees = (mongoose, amountFiat, fiat, processor, country, discount, partnerId, brokerId, user) => __awaiter(void 0, void 0, void 0, function* () {
+const getPlatformAndPartnerFees = (mongoose, amountFiat, fiat, processor, country, partnerId, brokerId, user, markup, discount) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;
     let platformFeeFiat;
     let platformFeeFiatTax = 0;
@@ -30,6 +30,9 @@ const getPlatformAndPartnerFees = (mongoose, amountFiat, fiat, processor, countr
     if (!rioSettings) {
         throw new common_1.RioSettingsNotFoundError();
     }
+    if (discount && markup) {
+        throw new Error("Cannot specify markup and discount");
+    }
     if (processor === common_1.Processor.Kapstar) {
         const kapstarClient = yield (0, kapstar_client_1.buildKapstarClient)();
         conversionRateToUSD = yield kapstarClient.getBRLExchangeRateUSD();
@@ -54,10 +57,16 @@ const getPlatformAndPartnerFees = (mongoose, amountFiat, fiat, processor, countr
         if (partner.feesComped) {
             feesComped = true;
         }
-        if (discount > partner.platformFee) {
+        if (discount && discount > partner.platformFee) {
             throw new Error("Discount cannot be greater than platform fee");
         }
-        const netPlatformFee = partner.platformFee - discount;
+        let netPlatformFee = partner.platformFee;
+        if (discount) {
+            netPlatformFee -= discount;
+        }
+        if (markup) {
+            netPlatformFee += markup;
+        }
         platformFeeFiat = amountFiat * netPlatformFee;
         partnerFeeFiat = amountFiat * partner.partnerFee;
     }
@@ -87,6 +96,10 @@ const getPlatformAndPartnerFees = (mongoose, amountFiat, fiat, processor, countr
                             platformFeeFiat = amountFiat * netFee;
                         }
                     }
+                    else if (markup) {
+                        const netFee = range.fee + markup;
+                        platformFeeFiat = amountFiat * netFee;
+                    }
                     else {
                         platformFeeFiat = amountFiat * range.fee;
                     }
@@ -110,6 +123,10 @@ const getPlatformAndPartnerFees = (mongoose, amountFiat, fiat, processor, countr
                     if (discount > range.fee) {
                         throw new Error("Discount cannot be greater than platform fee");
                     }
+                    else if (markup) {
+                        const netFee = range.fee + markup;
+                        platformFeeFiat = amountFiat * netFee;
+                    }
                     else {
                         const netFee = range.fee - discount;
                         platformFeeFiat = amountFiat * netFee;
@@ -123,7 +140,13 @@ const getPlatformAndPartnerFees = (mongoose, amountFiat, fiat, processor, countr
         }
         // @ts-ignore
         if (platformFeeFiat === undefined) {
-            const netPlatformFee = rioSettings.platformFee - discount;
+            let netPlatformFee = rioSettings.platformFee;
+            if (discount) {
+                netPlatformFee -= discount;
+            }
+            if (markup) {
+                netPlatformFee += markup;
+            }
             if (netPlatformFee < 0) {
                 throw new Error("Discount cannot be greater than platform fee");
             }
@@ -132,7 +155,13 @@ const getPlatformAndPartnerFees = (mongoose, amountFiat, fiat, processor, countr
         partnerFeeFiat = 0;
     }
     else {
-        const netPlatformFee = rioSettings.platformFee - discount;
+        let netPlatformFee = rioSettings.platformFee;
+        if (discount) {
+            netPlatformFee -= discount;
+        }
+        if (markup) {
+            netPlatformFee += markup;
+        }
         if (netPlatformFee < 0) {
             throw new Error("Discount cannot be greater than platform fee");
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riocrypto/common-server",
-  "version": "1.0.782",
+  "version": "1.0.783",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -24,7 +24,7 @@
     "@aws-sdk/client-s3": "^3.297.0",
     "@everapi/currencyapi-js": "^1.0.6",
     "@google-cloud/storage": "^6.9.5",
-    "@riocrypto/common": "^1.0.688",
+    "@riocrypto/common": "^1.0.689",
     "@types/express": "^4.17.13",
     "axios": "^0.27.2",
     "ccxt": "^3.0.30",