@sellout/models 0.0.62 → 0.0.64

package/.dist/utils/PaymentUtil.js

@@ -2,38 +2,139 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const IFee_1 = require("../interfaces/IFee");
 const PaymentMethodTypeEnum_1 = require("../enums/PaymentMethodTypeEnum");
+// interface IOrderItems {
+//   tickets: ICreateOrderTicketParams[];
+//   upgrades: ICreateOrderUpgradeParams[];
+// }
 exports.default = {
+    // DOES NOT WORK! Work in Progress :)
+    // calculateOrderItemPrices(params: IPaymentCalculatorParams): IOrderItems {
+    //   let {
+    //     tickets = [], 
+    //     upgrades = [],
+    //     fees = [],
+    //     paymentMethodType,
+    //   } = params;
+    //   // Filter fees
+    //   fees = fees.filter((fee: IFee) => {
+    //     // Ignore card reader fees for non card reader payemnts
+    //     if (fee.filters && fee.filters.includes(FeeFiltersEnum.CardReader) && paymentMethodType !== PaymentMethodTypeEnum.CardReader) {
+    //       return false;
+    //     }
+    //     // Ignore card entry fees for non card entry payemnts
+    //     if (fee.filters && fee.filters.includes(FeeFiltersEnum.CardEntry) && paymentMethodType !== PaymentMethodTypeEnum.CardEntry) {
+    //       return false;
+    //     }
+    //     return true;
+    //   });
+    //   const ticketFees = fees.filter(f => f.appliedTo === FeeAppliedToEnum.Ticket)
+    //     .sort(({ type }) => {
+    //       if (type === FeeTypeEnum.Flat) return -1;
+    //       else return 1;
+    //     });
+    //   const upgradeFees = fees.filter(f => f.appliedTo === FeeAppliedToEnum.Upgrade);
+    //   // Orders mattes here. Flat type fees must be applied before Percent type fees
+    //   const orderFees = fees.filter(f => f.appliedTo === FeeAppliedToEnum.Order)
+    //   .sort(({ type }) => {
+    //     if (type === FeeTypeEnum.Percent) return -1;
+    //     else return 1;
+    //   })
+    //   .map(fee => {
+    //     if(fee.type === FeeTypeEnum.Flat) {
+    //       return {
+    //         ...fee,
+    //         value: fee.value / tickets.length,
+    //       }
+    //     }
+    //     else return fee;
+    //   });
+    //   const reverseApplyFee = (price: number, ticket: ICreateOrderTicketParams, fee: IFee): number => {
+    //     // Ignore seated fees
+    //     if (fee.filters && fee.filters.includes(FeeFiltersEnum.Seated) && !ticket.seat) {
+    //       return price;
+    //     }
+    //     const minFee = fee.minAppliedToPrice || 0;
+    //     const maxFee = fee.maxAppliedToPrice || Infinity;
+    //     if (minFee <= price && price <= maxFee) {
+    // console.log(fee);
+    //       if (fee.type === FeeTypeEnum.Flat) {
+    //         return price - fee.value;
+    //       } if (fee.type === FeeTypeEnum.Percent) {
+    //         return price * (1 - fee.value / 100);
+    //       }
+    //     }
+    //     // if(fee.type === FeeTypeEnum.Percent) {
+    //     //   return price * (1 - fee.value / 100);
+    //     // }
+    //     // if(fee.type === FeeTypeEnum.Flat) {
+    //     //   return price - fee.value;
+    //     // }
+    //     return price;
+    //   }
+    //   function calculateTicketPrice(ticket: ICreateOrderTicketParams): number {
+    //     if(!ticket.rollFees) return ticket.price;
+    //     const allFees = [...orderFees, ...ticketFees];
+    //     return allFees.reduce((cur, fee) => {
+    //       const next = reverseApplyFee(cur, ticket, fee);
+    //       return next;
+    //     }, ticket.price);
+    //   }
+    //   tickets = tickets.map((ticket: ICreateOrderTicketParams): ICreateOrderTicketParams => {
+    //     const price = Math.floor(calculateTicketPrice(ticket));
+    // console.log(`Ticket Price: `, price);
+    //     return {
+    //       ...ticket,
+    //       price,
+    //     }
+    //   });
+    //   // upgrades = upgrades.map((upgrade: ICreateOrderUpgradeParams): ICreateOrderUpgradeParams => {
+    //   //   return {
+    //   //     ...upgrade,
+    //   //     price: calculateUpgradePrice(upgrade),
+    //   //   }
+    //   // });
+    //   return {
+    //     tickets,
+    //     upgrades,
+    //   };
+    // },
     calculateTotal(params) {
-        const { tickets = [], upgrades = [], fees = [], paymentMethodType, } = params;
-        console.log(fees);
+        let { tickets = [], upgrades = [], fees = [], paymentMethodType, } = params;
         // No items, total is always 0
         if (!tickets.length && !upgrades.length)
             return 0;
-        const ticketFees = fees.filter(f => f.appliedTo === IFee_1.FeeAppliedToEnum.Ticket);
+        // Filter fees
+        fees = fees.filter((fee) => {
+            // Ignore card reader fees for non card reader payemnts
+            if (fee.filters && fee.filters.includes(IFee_1.FeeFiltersEnum.CardReader) && paymentMethodType !== PaymentMethodTypeEnum_1.PaymentMethodTypeEnum.CardReader) {
+                return false;
+            }
+            // Ignore card entry fees for non card entry payemnts
+            if (fee.filters && fee.filters.includes(IFee_1.FeeFiltersEnum.CardEntry) && paymentMethodType !== PaymentMethodTypeEnum_1.PaymentMethodTypeEnum.CardEntry) {
+                return false;
+            }
+            return true;
+        });
+        const ticketFees = fees.filter(f => f.appliedTo === IFee_1.FeeAppliedToEnum.Ticket)
+            .sort(({ type }) => {
+            if (type === IFee_1.FeeTypeEnum.Flat)
+                return -1;
+            else
+                return 1;
+        });
         const upgradeFees = fees.filter(f => f.appliedTo === IFee_1.FeeAppliedToEnum.Upgrade);
         // Orders mattes here. Flat type fees must be applied before Percent type fees
         const orderFees = fees.filter(f => f.appliedTo === IFee_1.FeeAppliedToEnum.Order).sort(({ type }) => {
             if (type === 'Flat')
                 return -1;
-            return 1;
+            else
+                return 1;
         });
         function applyTicketFee(ticket, fee) {
-            // // Ignore rolled fees
-            // if (ticket.rollFees) {
-            //   return 0;
-            // }
-            // Ignore seated fees
+            // Ignore seated fees if not seated
             if (fee.filters && fee.filters.includes(IFee_1.FeeFiltersEnum.Seated) && !ticket.seat) {
                 return 0;
             }
-            // Ignore card reader fees for non card reader payemnts
-            if (fee.filters && fee.filters.includes(IFee_1.FeeFiltersEnum.CardReader) && paymentMethodType !== PaymentMethodTypeEnum_1.PaymentMethodTypeEnum.CardReader) {
-                return 0;
-            }
-            // Ignore card entry fees for non card entry payemnts
-            if (fee.filters && fee.filters.includes(IFee_1.FeeFiltersEnum.CardEntry) && paymentMethodType !== PaymentMethodTypeEnum_1.PaymentMethodTypeEnum.CardEntry) {
-                return 0;
-            }
             const minFee = fee.minAppliedToPrice || 0;
             const maxFee = fee.maxAppliedToPrice || Infinity;
             if (minFee <= ticket.price && ticket.price <= maxFee) {
@@ -50,18 +151,14 @@ exports.default = {
             return 0;
         }
         function applyUpgradeFee(upgrade, fee) {
-            // // Ignore rolled fees
-            // if (upgrade.rollFees) {
-            //   return 0;
-            // }
             const minFee = fee.minAppliedToPrice || 0;
             const maxFee = fee.maxAppliedToPrice || Infinity;
             if (minFee <= upgrade.price && upgrade.price <= maxFee) {
                 if (fee.type === IFee_1.FeeTypeEnum.Flat) {
-                    return fee.value;
+                    return upgrade.price + fee.value;
                 }
                 if (fee.type === IFee_1.FeeTypeEnum.Percent) {
-                    return (upgrade.price * fee.value / 100);
+                    return (upgrade.price / (1 - fee.value / 100));
                 }
             }
             else {
@@ -79,17 +176,23 @@ exports.default = {
         }
         const ticketTotal = tickets.reduce((cur, ticket) => cur + ticket.price, 0);
         const ticketFeeTotal = tickets.reduce((cur, ticket) => {
-            return cur + ticketFees.reduce((cur, fee) => cur + applyTicketFee(ticket, fee), 0);
+            return cur + ticketFees.reduce((cur, fee) => {
+                const value = cur + applyTicketFee(ticket, fee);
+                // console.log(`${fee.name}: ${value}`);
+                return value;
+            }, 0);
         }, 0);
         const upgradeTotal = upgrades.reduce((cur, upgrade) => cur + upgrade.price, 0);
         const upgradeFeeTotal = upgrades.reduce((cur, upgrade) => {
             return cur + upgradeFees.reduce((cur, fee) => cur + applyUpgradeFee(upgrade, fee), 0);
         }, 0);
-        const orderSubtotal = ticketTotal + ticketFeeTotal + upgradeTotal + upgradeFeeTotal;
+        const orderSubtotal = Math.round(ticketTotal + ticketFeeTotal + upgradeTotal + upgradeFeeTotal);
+        // console.log(`Order SubTotal:`, orderSubtotal);
         const orderTotal = orderFees.reduce((cur, fee) => {
             return applyOrderFee(cur, fee);
         }, orderSubtotal);
-        return Math.round(orderTotal);
+        // console.log(`Order Total`, orderTotal);
+        return orderTotal;
     }
 };
 //# sourceMappingURL=PaymentUtil.js.map

package/.dist/utils/PaymentUtil.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sellout/models",
-  "version": "0.0.62",
+  "version": "0.0.64",
   "description": "Sellout.io models",
   "main": "index.js",
   "scripts": {
@@ -16,8 +16,8 @@
   "author": "samheutmaker@gmail.com",
   "license": "MIT",
   "dependencies": {
-    "@sellout/service": "^0.0.62",
-    "@sellout/utils": "^0.0.62",
+    "@sellout/service": "^0.0.64",
+    "@sellout/utils": "^0.0.64",
     "@types/shortid": "0.0.29",
     "apollo-link-debounce": "^2.1.0",
     "graphql": "^14.6.0",
@@ -30,5 +30,5 @@
     "protobufjs": "~6.10.1",
     "typescript": "^3.8.3"
   },
-  "gitHead": "ef82386b2ae4a2bdcb987b3a2cc6fbe951d05cef"
+  "gitHead": "33349f3d3da7633d43b091f233c5de22b6df6ee1"
 }

package/src/enums/OrderItemTypeEnum.ts

@@ -0,0 +1,4 @@
+export enum OrderItemTypeEnum {
+  Upgrade = 'Upgrade',
+  Ticket = 'Ticket',
+};

package/src/graphql/fragments/order.fragment.ts

@@ -28,6 +28,8 @@ Order.fragments = {
         ticketTierId
         price
         seat
+        qrCodeUrl
+        state
         refund {
           refunded
           refundedAt
@@ -49,6 +51,8 @@ Order.fragments = {
         name
         upgradeId
         price
+        qrCodeUrl
+        state
         refund {
           refunded
           refundedAt

package/src/graphql/mutations/attachStripePaymentMethod.mutation.ts

@@ -2,7 +2,16 @@ import gql from 'graphql-tag';
 
 const mutation = gql`
   mutation attachStripePaymentMethod($paymentMethodId: String!) {
-    attachStripePaymentMethod(paymentMethodId: $paymentMethodId) 
+    attachStripePaymentMethod(paymentMethodId: $paymentMethodId) {
+      paymentMethodId
+      brand
+      last4
+      expMonth
+      expYear
+      funding
+      country
+      type
+    }
   }
 `;
 

package/src/graphql/mutations/breakApartOrder.ts

@@ -0,0 +1,39 @@
+import gql from "graphql-tag";
+import Order from '../fragments/order.fragment';
+
+const mutation = gql`
+  mutation breakApartOrder($orderId: String!) {
+    breakApartOrder(orderId: $orderId) {
+      _id
+      event {
+        _id
+        name
+        subtitle
+        performances {
+          schedule {
+            doorsAt
+            startsAt
+          }
+        }
+        venue {
+          name
+          address {
+            state
+            city
+          }
+        }
+        organization {
+          orgName
+        }
+      }
+      state
+      type
+      ...OrderTickets
+      ...OrderUpgrades
+    }
+  }
+  ${Order.fragments.tickets}
+  ${Order.fragments.upgrades}
+`;
+
+export default mutation;

package/src/graphql/mutations/register.mutation.ts

@@ -3,15 +3,8 @@ import gql from 'graphql-tag';
 const mutation = gql`
   mutation Register($user: UserInput!) {
     register(user: $user) {
-      user {
-        _id
-        firstName
-        lastName
-        email
-        phoneNumber
-        createdAt
-      }
-      token
+      registered
+      emailVerified
     }
   }
 `;

package/src/graphql/queries/order.query.ts

@@ -18,7 +18,9 @@ const query = gql`
       orgId
       eventId
       event {
+        _id
         name
+        subtitle
         posterImageUrl
         sendQRCode
         performances {

package/src/graphql/queries/publicEvent.query.ts

@@ -21,6 +21,7 @@ const query = gql`
       sendQRCode
       organization {
         orgName
+        stripeId
       }
       venue {
         name

package/src/graphql/queries/userProfile.query.ts

@@ -4,6 +4,7 @@ const query = gql`
   query userProfile {
     userProfile {
       user {
+        _id
         firstName
         lastName
         phoneNumber
@@ -11,8 +12,8 @@ const query = gql`
       }
       stripeCustomerId
       stripeCustomer {
-        sources {
-          sourceId
+        paymentMethods {
+          paymentMethodId
           brand
           last4
           expMonth

package/src/interfaces/ICreateOrderParams.ts

@@ -1,6 +1,5 @@
 import IOrderCustomField from "../interfaces/IOrderCustomField";
 import { OrderTypeEnum } from "../interfaces/IOrderType";
-import { OrderDeliveryMethodEnum } from "../enums/OrderDeliveryMethodEnum";
 import { PaymentMethodTypeEnum } from '../enums/PaymentMethodTypeEnum';
 
 export default interface ICreateOrderParams {
@@ -12,8 +11,8 @@ export default interface ICreateOrderParams {
   type: OrderTypeEnum;
   promotionCode: string;
   customFields: IOrderCustomField[];
-  deliveryMethod: OrderDeliveryMethodEnum;
   paymentMethodType: PaymentMethodTypeEnum;
+  paymentMethodId: string;
   holdToken?: string;
 }
 

package/src/interfaces/IOrder.ts

@@ -5,7 +5,6 @@ import IOrderUpgrade from './IOrderUpgrade';
 import IOrderCustomField from './IOrderCustomField'
 import { OrderStateEnum } from './IOrderState';
 import { OrderTypeEnum } from './IOrderType';
-import { OrderDeliveryMethodEnum } from "../enums/OrderDeliveryMethodEnum";
 
 export default interface IOrder {
   _id?: string;
@@ -33,5 +32,4 @@ export default interface IOrder {
   customFields?: IOrderCustomField[];
   refundReason?: string; // BACKFILL
   payments: IPayment[];
-  deliveryMethod: OrderDeliveryMethodEnum,
 };

package/src/interfaces/IOrderTicket.ts

@@ -14,4 +14,5 @@ export default interface IOrderTicket {
   refund: IRefund;
   scan: IScan;
   state: OrderItemStateEnum;
+  qrCodeUrl?: string;
 };

package/src/interfaces/IOrderUpgrade.ts

@@ -12,4 +12,5 @@ export default interface IOrderUpgrade {
   refund: IRefund;
   scan: IScan;
   state: OrderItemStateEnum;
+  qrCodeUrl?: string;
 }

package/src/interfaces/IStripeCustomer.ts

@@ -1,7 +1,7 @@
-import IStripeSource from './IStripeSource';
+import IStripePaymentMethod from './IStripePaymentMethod';
 
 export default interface IStripeCustomer {
   stripeCustomerId: string;
   email: string;
-  sources: IStripeSource[];
+  paymentMethods: IStripePaymentMethod[];
 }

package/src/interfaces/{IStripeSource.ts → IStripePaymentMethod.ts}

@@ -1,5 +1,5 @@
-export default interface IStripeSource {
-  sourceId: string;
+export default interface IStripePaymentMethod {
+  paymentMethodId: string;
   brand: string;
   last4: string;
   expMonth: string;

package/src/proto/order.proto

@@ -32,7 +32,6 @@ message Order {
   repeated OrderCustomField customFields = 21;
   string refundReason = 22;
   repeated Payment payments = 23;
-  string deliveryMethod = 24;
 }
 
 message OrderTicket {
@@ -47,6 +46,7 @@ message OrderTicket {
   Refund refund = 8;
   Scan scan = 9;
   string state = 10;
+  string qrCodeUrl = 11;
 }
 
 message OrderUpgrade {
@@ -59,6 +59,7 @@ message OrderUpgrade {
   Refund refund = 6;
   Scan scan = 7;
   string state = 8;
+  string qrCodeUrl = 9;
 }
 
 message Scan {
@@ -108,10 +109,9 @@ message CreateOrderParams {
   string type = 5;
   string promotionCode = 6;
   repeated OrderCustomField customFields = 7;
-  string deliveryMethod = 8;
-  string paymentMethodType = 9;
-  string holdToken = 10;
-  string ipAddress = 11;
+  string paymentMethodType = 8;
+  string holdToken = 9;
+  string ipAddress = 10;
 }
 
 message CreateOrderTicketParams {
@@ -327,6 +327,21 @@ message QueryOrderAnalyticsResponse {
   repeated Analytics analytics = 2;
 }
 
+/****************************************************************************************
+  Break Apart Order
+****************************************************************************************/
+
+message BreakApartOrderRequest {
+  string spanContext = 0;
+  string orderId = 1;
+}
+
+message BreakApartOrderResponse {
+  StatusCode status = 0;
+  repeated Error errors = 1;
+  Order order = 2;
+}
+
 service OrderService {
   // Create
   rpc createOrder(CreateOrderRequest) returns (CreateOrderResponse) {}
@@ -335,6 +350,7 @@ service OrderService {
   rpc sendOrderReceiptEmail(SendOrderReceiptEmailRequest) returns (SendOrderReceiptEmailResponse) {}
   rpc sendOrderRefundEmail(SendOrderRefundEmailRequest) returns (SendOrderRefundEmailResponse) {}
   rpc scanOrder(ScanOrderRequest) returns (ScanOrderResponse) {}
+  rpc breakApartOrder(BreakApartOrderRequest) returns (BreakApartOrderResponse) {}
   // Refund
   rpc refundOrder(RefundOrderRequest) returns (RefundOrderResponse) {}
   rpc refundEventOrders(RefundEventOrdersRequest) returns (RefundEventOrdersResponse) {}

package/src/proto/stripe.proto

@@ -22,7 +22,7 @@ message StripeCharge {
 message StripeCustomer {
   string stripeCustomerId = 0;
   string email = 1;
-  repeated StripeSource sources = 2;
+  repeated StripePaymentMethod paymentMethods = 2;
 }
 
 message StripeSource {
@@ -36,6 +36,17 @@ message StripeSource {
   string type = 7;
 }
 
+message StripePaymentMethod {
+  string paymentMethodId = 0;
+  string brand = 1;
+  string last4 = 2;
+  string expMonth = 3;
+  string expYear = 4;
+  string funding = 5;
+  string country = 6;
+  string type = 7;
+}
+
 /***************************************************************************************
   Connect Account
 ****************************************************************************************/
@@ -122,7 +133,6 @@ message RetrieveStripeChargeResponse {
 message CreateStripeCustomerRequest {
   string spanContext = 0;
   string userId = 1;
-  string stripeToken = 2;
 }
 
 message CreateStripeCustomerResponse {
@@ -189,7 +199,7 @@ message AttachStripePaymentMethodRequest {
 message AttachStripePaymentMethodResponse {
   StatusCode status = 0;
   repeated Error errors = 1;
-  bool success = 2;
+  StripePaymentMethod paymentMethod = 2;
 }
 
 /***************************************************************************************
@@ -210,6 +220,7 @@ message CreateStripePaymentIntentRequest {
   int32 feeAmount = 5;
   string description = 6;
   string currency = 7;
+  string paymentMethodId = 8;
 }
 
 message CreateStripePaymentIntentResponse {

package/src/schemas/Order.ts

@@ -82,6 +82,11 @@ const OrderTicket = {
     type: String,
     required: true,
   },
+  qrCodeUrl: {
+    type: String,
+    required: false,
+    default: null,
+  },
 };
 
 const OrderUpgrade = {
@@ -118,6 +123,11 @@ const OrderUpgrade = {
     type: String,
     required: true,
   },
+  qrCodeUrl: {
+    type: String,
+    required: false,
+    default: null,
+  },
 };
 
 const OrderCustomField = {
@@ -280,10 +290,6 @@ export default {
     type: String,
     required: true,
   },
-  deliveryMethod: {
-    type: String,
-    required: true,
-  },
   address: Address,
   customFields: [OrderCustomField],
   payments: [Payment],