@sellout/models 0.0.75 → 0.0.77

package/src/proto/order.proto

@@ -90,7 +90,7 @@ message Payment {
   int32 amount = 2;
   int32 transferAmount = 3;
   int32 feeAmount = 4;
-  string feeIds = 5;
+  repeated string feeIds = 5;
   int32 createdAt = 6;
   string createdBy = 7;
   string promotionCode = 8;

package/src/utils/OrderUtil.ts

@@ -3,6 +3,9 @@ import IOrder from "../interfaces/IOrder";
 import { OrderTypeEnum } from "../interfaces/IOrderType";
 import IOrderCustomField from '../interfaces/IOrderCustomField';
 import ICreateOrderParams from '../interfaces/ICreateOrderParams';
+import IPayment from '../interfaces/IPayment';
+import PaymentUtil from './PaymentUtil';
+// import IFee from '../interfaces/IFee';
 
 export default {
   isComp(order) {
@@ -16,83 +19,15 @@ export default {
   /*****************************************************************************************
   Order
   *****************************************************************************************/
-  orderTotal(order, fees) {
-    if (order.type === OrderTypeEnum.Complimentary) return 0;
-    if (order.type === OrderTypeEnum.RSVP) fees = [];
-
-    if (
-      (!order.tickets || !order.tickets.length)
-      && (!order.upgrades || !order.upgrades.length)
-    ) return 0;
-
-    if (!order.tickets) order.tickets = [];
-    if (!order.upgrades) order.upgrades = [];
-
-    const ticketFees = fees.filter(f => f.appliedTo === 'Ticket');
-    const upgradeFees = fees.filter(f => f.appliedTo === 'Upgrade');
-    let orderFees = fees.filter(f => f.appliedTo === 'Order');
-
-    function applyTicketFee(ticket, fee) {
-      if (fee.filters && fee.filters.includes('Seated') && !ticket.seat) return 0;
-      const noMax = fee.maxAppliedToPrice === 0;
-      if ((fee.minAppliedToPrice <= ticket.price && ticket.price <= fee.maxAppliedToPrice) || noMax) {
-        if (fee.type === 'Flat') {
-          return fee.value;
-        } if (fee.type === 'Percent') {
-          return (ticket.price * fee.value / 100);
-        }
-      } else {
-        return 0;
-      }
-    }
-
-    function applyUpgradeFee(upgrade, fee) {
-      const noMax = fee.maxAppliedToPrice === 0;
-      if ((fee.minAppliedToPrice <= upgrade.price && upgrade.price <= fee.minAppliedToPrice) || noMax) {
-        if (fee.type === 'Flat') {
-          return fee.value;
-        } if (fee.type === 'Percent') {
-          return (upgrade.price * fee.value / 100);
-        }
-      } else {
-        return 0;
-      }
-    }
-
-    function applyOrderFee(orderSubtotal, fee) {
-      if (fee.type === 'Flat') {
-        return orderSubtotal + fee.value;
-      } if (fee.type === 'Percent') {
-        return (orderSubtotal / (1 - fee.value / 100));
-      }
-    }
-
-    const ticketTotal = order.tickets.reduce((cur, ticket) => cur + ticket.price, 0);
-
-    const ticketFeeTotal = order.tickets.reduce((cur, ticket) => {
-      return cur + ticketFees.reduce((cur, fee) => cur + applyTicketFee(ticket, fee), 0);
-    }, 0);
-
-    const upgradeTotal = order.upgrades.reduce((cur, upgrade) => cur + upgrade.price, 0);
-
-    const upgradeFeeTotal = order.upgrades.reduce((cur, upgrade) => {
-      return cur + upgradeFees.reduce((cur, fee) => cur + applyUpgradeFee(upgrade, fee), 0);
+  orderTotal(order: IOrder, fees: any[]): number {
+    return order.payments.reduce((cur: number, payment: IPayment): number => {
+      return cur + PaymentUtil.calculatePaymentTotal({
+        tickets: order.tickets.filter(ticket => ticket.paymentId === payment._id),
+        upgrades: order.upgrades.filter(upgrade => upgrade.paymentId === payment._id),
+        fees: fees,
+        paymentMethodType: payment.paymentMethodType,
+      })
     }, 0);
-
-    const orderSubtotal = ticketTotal + ticketFeeTotal + upgradeTotal + upgradeFeeTotal;
-
-    // Order matters here. Flat type fees must be
-    // applied before Percent type fees
-    orderFees = orderFees.sort(({ type }) => {
-      if (type === 'Flat') return -1;
-      return 1;
-    });
-
-    const orderTotal = orderFees.reduce((cur, fee) => {
-      return applyOrderFee(cur, fee);
-    }, orderSubtotal);
-
-    return Math.round(orderTotal);
   },
   orderTotalWithRefund(order, fees) {
     return this.orderTotal(order, fees) - (order.refundedAmount || 0);
@@ -101,14 +36,15 @@ export default {
     const promoterFees = FeeUtil.promoterFees(fees);
     return this.orderTotalWithRefund(order, promoterFees);
   },
-  orderSubtotal(order) {
-    if (order.type === OrderTypeEnum.Complimentary) return 0;
-    if (!order.tickets) order.tickets = [];
-    if (!order.upgrades) order.upgrades = [];
-
-    const ticketTotal = order.tickets.reduce((cur, ticket) => cur + ticket.price, 0);
-    const upgradeTotal = order.upgrades.reduce((cur, upgrade) => cur + upgrade.price, 0);
-    return ticketTotal + upgradeTotal;
+  orderSubtotal(order: IOrder): number {
+    return order.payments.reduce((cur: number, payment: IPayment): number => {
+      return cur + PaymentUtil.calculatePaymentSubtotal({
+        tickets: order.tickets.filter(ticket => ticket.paymentId === payment._id),
+        upgrades: order.upgrades.filter(upgrade => upgrade.paymentId === payment._id),
+        fees: [],
+        paymentMethodType: payment.paymentMethodType,
+      })
+    }, 0);
   },
   orderSubtotalWithRefund(order) {
     if (order.type === OrderTypeEnum.Complimentary) return 0;

package/src/utils/PaymentUtil.ts

@@ -1,6 +1,9 @@
+import FeeUtil from './FeeUtil';
 import { ICreateOrderTicketParams, ICreateOrderUpgradeParams } from '../interfaces/ICreateOrderParams';
 import IFee, { FeeAppliedToEnum, FeeFiltersEnum, FeeTypeEnum } from '../interfaces/IFee';
 import { PaymentMethodTypeEnum } from '../enums/PaymentMethodTypeEnum';
+// import IPayment from 'src/interfaces/IPayment';
+// import IPayment from 'src/interfaces/IPayment';
 // import { OrderTypeEnum } from 'src/interfaces/IOrderType';
 
 interface IPaymentCalculatorParams {
@@ -15,7 +18,7 @@ interface IPaymentCalculatorParams {
 //   upgrades: ICreateOrderUpgradeParams[];
 // }
 
-export default {
+class PaymentUtil {
   // DOES NOT WORK! Work in Progress :)
   // calculateOrderItemPrices(params: IPaymentCalculatorParams): IOrderItems {
 
@@ -129,7 +132,7 @@ export default {
   //     upgrades,
   //   };
   // },
-  calculateTotal(params: IPaymentCalculatorParams): number {
+  calculatePaymentTotal(params: IPaymentCalculatorParams): number {
     let {
       tickets = [],
       upgrades = [],
@@ -241,6 +244,73 @@ export default {
 
     // console.log(`Order Total`, orderTotal);
 
-    return orderTotal;
+    return Math.round(orderTotal);
   }
-}
+  calculatePaymentSubtotal(params: IPaymentCalculatorParams): number {
+    let {
+      tickets = [],
+      upgrades = [],
+      paymentMethodType,
+    } = params;
+
+    if(paymentMethodType === PaymentMethodTypeEnum.None) return 0;
+    const ticketTotal = tickets.reduce((cur, ticket) => cur + ticket.price, 0);
+    const upgradeTotal = upgrades.reduce((cur, upgrade) => cur + upgrade.price, 0);
+    return ticketTotal + upgradeTotal;
+  }
+  calculateFee(params: IPaymentCalculatorParams): number {
+    const total = this.calculatePaymentTotal(params);
+    const subtotal = this.calculatePaymentSubtotal(params);
+    return Math.round(total - subtotal);
+  }
+  calculateOrganizationFee(params: IPaymentCalculatorParams): number {
+    let {
+      tickets = [],
+      upgrades = [],
+      fees = [],
+      paymentMethodType,
+    } = params;
+
+    fees = FeeUtil.promoterFees(fees);
+
+    return this.calculateFee({
+      tickets,
+      upgrades,
+      fees,
+      paymentMethodType,
+    });
+  }
+  calculatePlatformFee(params: IPaymentCalculatorParams): number {
+    let {
+      tickets = [],
+      upgrades = [],
+      fees = [],
+      paymentMethodType,
+    } = params;
+
+    fees = FeeUtil.selloutFees(fees);
+
+    return this.calculateFee({
+      tickets,
+      upgrades,
+      fees,
+      paymentMethodType,
+    });
+  }
+  calculateStripeFee(params: IPaymentCalculatorParams): number {
+    const total = this.calculatePaymentTotal(params);
+    const subtotal = this.calculatePaymentSubtotal(params);
+    const platformFees = this.calculatePlatformFee(params);
+    const organizationFee = this.calculateOrganizationFee(params);
+    return total - subtotal - platformFees - organizationFee;
+  }
+  calculateProcessingFee(params: IPaymentCalculatorParams): number {
+    const total = this.calculatePaymentTotal(params);
+    const subtotal = this.calculatePaymentSubtotal(params);
+    const organizationFee = this.calculateOrganizationFee(params);
+    return total - subtotal  - organizationFee;
+  }
+
+}
+
+export default new PaymentUtil();

package/.dist/graphql/mutations/resetPasswordInApp.mutation.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"resetPasswordInApp.mutation.js","sourceRoot":"","sources":["../../../src/graphql/mutations/resetPasswordInApp.mutation.ts"],"names":[],"mappings":";;;;;AAAA,8DAA8B;AAE9B,MAAM,QAAQ,GAAG,qBAAG,CAAA;;;;CAInB,CAAC;AAEF,kBAAe,QAAQ,CAAC"}

package/.dist/graphql/mutations/setUserOrgContextId.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"setUserOrgContextId.js","sourceRoot":"","sources":["../../../src/graphql/mutations/setUserOrgContextId.ts"],"names":[],"mappings":";;;;;AAAA,8DAA8B;AAE9B,MAAM,QAAQ,GAAG,qBAAG,CAAA;;;;;;CAMnB,CAAC;AAEF,kBAAe,QAAQ,CAAC"}

package/.dist/graphql/queries/customerProfile.js

@@ -1,42 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const graphql_tag_1 = __importDefault(require("graphql-tag"));
-const query = graphql_tag_1.default `
-  query userProfiles($query: UserProfileQueryInput) {
-    userProfiles(query: $query) {
-      _id
-      imageUrl
-      user {
-        _id
-        email
-        firstName
-        lastName
-        phoneNumber
-        phoneNumberVerifiedAt
-      }
-      metrics {
-        orgId
-        yearToDateValue
-        lifeTimeValue
-        createdAt
-        lifeTimeTicketsPurchased
-        lifeTimeUpgradesPurchased
-      }
-      stripeCustomerId
-      address {
-        address1
-        address2
-        city
-        state
-        zip
-        country
-        phone
-      }
-    }
-  }
-`;
-exports.default = query;
-//# sourceMappingURL=customerProfile.js.map

package/.dist/graphql/queries/customerProfile.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"customerProfile.js","sourceRoot":"","sources":["../../../src/graphql/queries/customerProfile.ts"],"names":[],"mappings":";;;;;AAAA,8DAA8B;AAE9B,MAAM,KAAK,GAAG,qBAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiChB,CAAC;AAEF,kBAAe,KAAK,CAAC"}

package/.dist/graphql/queries/organization.query.js

@@ -1,49 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const graphql_tag_1 = __importDefault(require("graphql-tag"));
-const query = graphql_tag_1.default `
-  query organizations {
-    organizations {
-      _id
-      orgName
-      orgUrls
-      orgLogoUrl
-      createdAt
-      address {
-        address1
-        address2
-        city
-        state
-        zip
-        country
-      }
-      user {
-        email
-      }
-      seating {
-        publicKey
-        secretKey
-        designerKey
-      }
-      webFlow {
-        sites {
-          name
-          webFlowId
-          enabled
-          createdAt
-          updatedAt
-          previewUrl
-          domains {
-            lastPublishedAt
-            name
-          }
-        }
-      }
-    }
-  }
-`;
-exports.default = query;
-//# sourceMappingURL=organization.query.js.map

package/.dist/graphql/queries/organization.query.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"organization.query.js","sourceRoot":"","sources":["../../../src/graphql/queries/organization.query.ts"],"names":[],"mappings":";;;;;AAAA,8DAA8B;AAE9B,MAAM,KAAK,GAAG,qBAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwChB,CAAC;AAEF,kBAAe,KAAK,CAAC"}

package/.dist/graphql/queries/organizations.js

@@ -1,49 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const graphql_tag_1 = __importDefault(require("graphql-tag"));
-const query = graphql_tag_1.default `
-  query organizations {
-    organizations {
-      _id
-      orgName
-      orgUrls
-      orgLogoUrl
-      createdAt
-      address {
-        address1
-        address2
-        city
-        state
-        zip
-        country
-      }
-      user {
-        email
-      }
-      seating {
-        publicKey
-        secretKey
-        designerKey
-      }
-      webFlow {
-        sites {
-          name
-          webFlowId
-          enabled
-          createdAt
-          updatedAt
-          previewUrl
-          domains {
-            lastPublishedAt
-            name
-          }
-        }
-      }
-    }
-  }
-`;
-exports.default = query;
-//# sourceMappingURL=organizations.js.map

package/.dist/graphql/queries/organizations.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"organizations.js","sourceRoot":"","sources":["../../../src/graphql/queries/organizations.ts"],"names":[],"mappings":";;;;;AAAA,8DAA8B;AAE9B,MAAM,KAAK,GAAG,qBAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwChB,CAAC;AAEF,kBAAe,KAAK,CAAC"}

package/.dist/interfaces/ISecondaryEmail.d.ts

@@ -1,4 +0,0 @@
-export default interface ISecondaryEmail {
-    email: string;
-    verifiedAt?: number;
-}

package/.dist/interfaces/ISecondaryEmail.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ISecondaryEmail.js","sourceRoot":"","sources":["../../src/interfaces/ISecondaryEmail.ts"],"names":[],"mappings":""}

package/.dist/schemas/SecondaryEmail.d.ts

@@ -1,12 +0,0 @@
-declare const _default: {
-    email: {
-        type: StringConstructor;
-        required: boolean;
-    };
-    verifiedAt: {
-        type: NumberConstructor;
-        required: boolean;
-        default: number;
-    };
-};
-export default _default;

package/.dist/schemas/SecondaryEmail.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = {
-    email: {
-        type: String,
-        required: true,
-    },
-    verifiedAt: {
-        type: Number,
-        required: false,
-        default: 0,
-    },
-};
-//# sourceMappingURL=SecondaryEmail.js.map

package/.dist/schemas/SecondaryEmail.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"SecondaryEmail.js","sourceRoot":"","sources":["../../src/schemas/SecondaryEmail.ts"],"names":[],"mappings":";;AAAA,kBAAe;IACb,KAAK,EAAE;QACL,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,IAAI;KACf;IACD,UAAU,EAAE;QACV,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,KAAK;QACf,OAAO,EAAE,CAAC;KACX;CACF,CAAC"}