@sellout/models 0.0.184 → 0.0.185

package/src/proto/order.proto

@@ -39,6 +39,7 @@ message Order {
   bool hidden = 28;
   bool printed = 29;
   string parentSeasonOrderId = 30;
+  repeated orderFees fees = 31;
 }
 message ProcessingFees {
   Refund refund = 0;
@@ -67,6 +68,28 @@ message OrderTicket {
   bool guestTicket = 18;
 }
 
+message orderFees {
+  string _id = 0;
+  string name = 1;
+  string orgId = 2;
+  string eventId = 3;
+  string type = 4;
+  double value = 5;
+  string appliedTo  = 6;
+  string appliedBy = 7;
+  int32 minAppliedToPrice = 8;
+  int32 maxAppliedToPrice = 9;
+  repeated string filters = 10;
+  string createdBy = 11;
+  int32 createdAt = 12;
+  string updatedBy = 13;
+  int32 updatedAt = 14;
+  bool disabled = 15;
+  string seasonId = 16;
+  int32 amount = 17;
+
+}
+
 message TeiMemberInfoParams {
     string firstName = 0;
     string lastName = 1;
@@ -615,7 +638,7 @@ service OrderService {
   rpc createSeasonOrderPaymentIntent(CreateSeasonOrderPaymentIntentRequest) returns (CreateOrderPaymentIntentResponse) {}
   // QR Code
   rpc sendOrderQRCodeEmail(SendOrderQRCodeEmailRequest) returns (SendOrderQRCodeEmailResponse) {}
-  rpc sendSeasonOrderReceiptEmail(SendOrderQRCodeEmailRequest) returns (SendOrderQRCodeEmailResponse) {}
+  rpc sendSeasonOrderReceiptEmail(SendOrderReceiptEmailRequest) returns (SendOrderReceiptEmailResponse) {}
   rpc sendOrderReceiptEmail(SendOrderReceiptEmailRequest) returns (SendOrderReceiptEmailResponse) {}
   rpc sendOrderRefundEmail(SendOrderRefundEmailRequest) returns (SendOrderRefundEmailResponse) {}
   rpc resendOrderRefundEmail(SendOrderRefundEmailRequest) returns (SendOrderRefundEmailResponse) {}

package/src/schemas/Order.ts

@@ -46,6 +46,86 @@ const Scan = {
     required: false,
   }
 };
+const Fees = {
+  _id: {
+    type: String,
+    required: false,
+  },
+  name: {
+    type: String,
+    required: false,
+  },
+  orgId: {
+    type: String,
+    required: false,
+    default: null,
+  },
+  eventId: {
+    type: String,
+    required: false,
+    default: null,
+  }, seasonId: {
+    type: String,
+    required: false,
+    default: null,
+  },
+  type: {
+    type: String,
+    required: false,
+  },
+  value: {
+    type: Number,
+    required: false,
+  },
+  appliedTo: {
+    type: String,
+    required: false,
+  },
+  appliedBy: {
+    type: String,
+    required: false,
+  },
+  minAppliedToPrice: {
+    type: Number,
+    required: false,
+    default: null,
+  },
+  maxAppliedToPrice: {
+    type: Number,
+    required: false,
+    default: null,
+  },
+  filters: [{
+    type: String,
+    required: false,
+    default: [],
+  }],
+  createdBy: {
+    type: String,
+    required: false,
+  },
+  createdAt: {
+    type: Number,
+    required: false,
+  },
+  updatedBy: {
+    type: String,
+    required: false,
+  },
+  updatedAt: {
+    type: Number,
+    required: false,
+  },
+  disabled: {
+    type: Boolean,
+    required: false,
+    default: false,
+  },
+  amount: {
+    type: Number,
+    required: false,
+  },
+};
 const TeiMemberInfoInput = {
   firstName: {
     type: String,
@@ -311,6 +391,7 @@ export default {
     required: false,
   },
   tickets: [OrderTicket],
+  fees: [Fees],
   upgrades: [OrderUpgrade],
   recipientEmails: [{
     type: String,

package/src/utils/OrderUtil.ts

@@ -28,7 +28,7 @@ export default {
           upgrades: order.upgrades.filter(upgrade => upgrade.paymentId === payment._id),
           fees: fees,
           paymentMethodType: payment.paymentMethodType,
-        })
+        }).total
       }, 0);
     } else {
       if (
@@ -131,121 +131,6 @@ export default {
     }
   },
 
-  // orderTotalExport(order: IOrder, fees: any[]): number {
-  //   if (order?.payments && order?.payments.length > 0) {
-  //     return order.payments.reduce((cur: number, payment: IPayment): number => {
-  //       const paymentTickets = order.tickets.filter(ticket => ticket.paymentId === payment._id)
-  //       const paymentUpgrades = order.upgrades.filter(upgrade => upgrade.paymentId === payment._id)
-  //       const total = PaymentUtil.calculatePaymentTotalDublicate({
-  //         tickets: paymentTickets,
-  //         upgrades: paymentUpgrades,
-  //         fees: fees,
-  //         paymentMethodType: payment.paymentMethodType,
-  //       })
-  //       return cur + total
-  //     }, 0);
-  //   } else {
-  //     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.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)
-  //       );
-  //     }, 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);
-  //   }
-  // },
-
-
 
   guestFees(order: IOrder, fees: IFee[]): any {
     let guestTicketFees = fees.find(
@@ -290,10 +175,6 @@ export default {
     const orderTotal = this.orderTotal(order, fees);
     return orderTotal - (order.refundedAmount || 0);
   },
-  // orderExportTotalWithRefund(order, fees) {
-  //   const orderTotal = this.orderTotalExport(order, fees);
-  //   return orderTotal - (order.refundedAmount || 0);
-  // },
   orderTransferAmountWithRefund(order, fees) {
     const promoterFees = FeeUtil.promoterFees(fees);
     return this.orderTotalWithRefund(order, promoterFees);
@@ -357,12 +238,6 @@ export default {
     return this.orderTotal(order, fees) - this.orderSubtotal(order);
   },
 
-  // selloutExortFees(order, fees) {
-  //   if (!order.tickets) order.tickets = [];
-  //   if (!order.upgrades) order.upgrades = [];
-  //   fees = FeeUtil.selloutFees(fees);
-  //   return this.orderTotalExport(order, fees) - this.orderSubtotal(order);
-  // },
   // This one is special because stripe fees
   // can be applied as a percentage
   stripeFees(order, fees) {
@@ -377,17 +252,6 @@ export default {
     return stripeFeeT;
   },
 
-  // stripeFeesExport(order, fees) {
-  //   if (!order.tickets) order.tickets = [];
-  //   if (!order.upgrades) order.upgrades = [];
-  //   const total = this.orderTotalExport(order, fees);
-  //   const subtotal = this.orderSubtotal(order);
-  //   const selloutFees = this.selloutExortFees(order, fees);
-  //   const promoterFees = this.promoterFees(order, fees);
-  //   let stripeFee = total - subtotal - selloutFees - promoterFees;
-  //   let stripeFeeT = stripeFee < 0 ? 0 : stripeFee;
-  //   return stripeFeeT;
-  // },
   promoterFees(order, fees) {
     if (!order.tickets) order.tickets = [];
     if (!order.upgrades) order.upgrades = [];