@sellout/models 0.0.104 → 0.0.107

package/src/schemas/Event.ts

@@ -379,6 +379,10 @@ const TicketType = {
     },
   ],
   tiers: [TicketTier],
+  description: {
+    type: String,
+    required: false
+  },
   rollFees: {
     type: Boolean,
     required: true,
@@ -442,6 +446,11 @@ export default {
     type: Boolean,
     default: true
   },
+  cancel: {
+    type: Boolean,
+    required: true,
+    default: false
+  },
   userAgreement: {
     type: String,
     required: false
@@ -468,5 +477,10 @@ export default {
   published: {
     type: Boolean,
     default: false,
-  }
+  },
+  salesBeginImmediately: {
+    type: Boolean,
+    required: true,
+    default: true
+  },
 };

package/src/schemas/Order.ts

@@ -20,6 +20,10 @@ const Refund = {
     type: Number,
     required: false,
   },
+  refundReason: {
+    type: String,
+    required: false,
+  },
 };
 
 const Scan = {
@@ -272,6 +276,9 @@ export default {
     type: Number,
     required: false,
   },
+  processingFee: {
+    refund: Refund
+  },
   refundReason: {
     type: String,
     required: false,

package/src/utils/AnalyticsUtil.ts

@@ -11,6 +11,7 @@ import IOrder from "../interfaces/IOrder";
 import IOrderTicket from "../interfaces/IOrderTicket";
 import IOrderUpgrade from "../interfaces/IOrderUpgrade";
 import { OrderTypeEnum } from "../interfaces/IOrderType";
+// import { OrderStateEnum } from "../interfaces/IOrderState";
 import * as Time from "@sellout/utils/.dist/time";
 import * as Price from '@sellout/utils/.dist/price';
 
@@ -227,9 +228,7 @@ export default {
     endDate?: number,
     interval?: AnalyticsIntervalEnum,
   ): IAnalytics {
-
     const intervalInfo = getIntervalInfo(orders, startDate, endDate, interval);
-
     switch (type) {
       case AnalyticsTypeEnum.Overview:
         return this.overview(type, orders, intervalInfo);
@@ -288,7 +287,7 @@ export default {
       orders
         .filter(order => order.type === OrderTypeEnum.Paid)
         .reduce((cur, order) => cur + sum(order.tickets.map(ticket => ticket.price)) + sum(order.upgrades.map(upgrade => upgrade.price)), 0);
-
+    
     const coordinates = makeCoordinates(orders, intervalInfo, coordinatesSumFn);
     const { interval, intervalOptions } = intervalInfo;
 
@@ -308,7 +307,10 @@ export default {
       type: AnalyticsValueTypeEnum.Quantity,
     };
     segments.push(segment);
-    const coordinatesSumFn3 = (orders: IOrder[]) => orders.length;
+    const coordinatesSumFn3 = (orders: IOrder[]) => orders.length//sum(orders.map(order => { return order.state != OrderStateEnum.Refunded ? 1 : 0} ))
+      // .reduce((cur,order) => cur + sum(order.tickets.map(ticket => { return ticket.refund.refunded == false ? 1 : 0})),0)
+    
+    // const coordinatesSumFn3 = (orders: IOrder[]) => orders.length;
     const segmentCoordinates2 = makeCoordinates(orders, intervalInfo, coordinatesSumFn3);
     segment = {
       label: 'Orders',
@@ -341,8 +343,7 @@ export default {
     const coordinatesSumFn = (orders: IOrder[]) =>
       orders
         .filter(order => order.type === OrderTypeEnum.Paid)
-        .reduce((cur, order) => cur + sum(order.tickets.map(ticket => ticket.price)) + sum(order.upgrades.map(upgrade => upgrade.price)), 0);
-
+        .reduce((cur, order) => cur + sum(order.tickets.map(ticket => ticket.price )) + sum(order.upgrades.map(upgrade => upgrade.price)), 0);
     let segmentTypes;
     let segmentCoordinatesHOSumFn;
     // if (showSegments) {
@@ -585,7 +586,7 @@ export default {
         orders
           .filter(order => order.type === OrderTypeEnum.Paid)
           .reduce((cur, order) =>
-            cur + order.upgrades.filter((upgrade) => upgrade.name === segmentType).length, 0);
+            cur + order.upgrades.filter((upgrade) => upgrade.name === segmentType ).length, 0);
     }
 
     return makeAnalytics(
@@ -684,8 +685,7 @@ export default {
     orders: IOrder[],
     intervalInfo: IntervalInfo,
   ): IAnalytics {
-    const coordinatesSumFn = (orders: IOrder[]) => orders.length;
-
+    const coordinatesSumFn = (orders: IOrder[]) => orders.length
     return makeAnalytics(
       type,
       orders,