@sellout/models 0.0.108 → 0.0.109

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sellout/models",
-  "version": "0.0.108",
+  "version": "0.0.109",
   "description": "Sellout.io models",
   "main": "index.js",
   "scripts": {
@@ -17,8 +17,8 @@
   "license": "MIT",
   "dependencies": {
     "@hapi/joi": "^16.1.7",
-    "@sellout/service": "^0.0.108",
-    "@sellout/utils": "^0.0.108",
+    "@sellout/service": "^0.0.109",
+    "@sellout/utils": "^0.0.109",
     "@types/hapi__joi": "^16.0.1",
     "@types/shortid": "^0.0.29",
     "apollo-link-debounce": "^2.1.0",
@@ -32,5 +32,5 @@
     "protobufjs": "^6.11.2",
     "typescript": "^4.4.2"
   },
-  "gitHead": "f64d10d501ae0ff62171846f9c4ce5b83b5bba52"
+  "gitHead": "314575a9bae7a664a22b810532633cd53920a78b"
 }

package/src/graphql/mutations/breakApartOrder.ts

@@ -20,6 +20,7 @@ const mutation = gql`
           address {
             state
             city
+            timezone
           }
         }
         organization {

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

@@ -20,6 +20,7 @@ const mutation = gql`
       age
       sendQRCode
       hasOrders
+      taxDeduction
       organization {
         orgName
       }

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

@@ -20,9 +20,9 @@ const mutation = gql`
         lng
         placeId
         placeName
-        timezone
       }
       url
+      tax
       imageUrls
       venueGlobalId
     }

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

@@ -43,6 +43,7 @@ const mutation = gql`
         imageUrls
       }
       published
+      taxDeduction
       salesBeginImmediately
       ...EventSchedule
       ...Location

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

@@ -33,6 +33,7 @@ const mutation = gql`
         imageUrls
       }
       published
+      taxDeduction
       salesBeginImmediately
       ...EventSchedule
       ...Location

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

@@ -20,9 +20,9 @@ const mutation = gql`
         lng
         placeId
         placeName
-        timezone
       }
       url
+      tax
       imageUrls
       venueGlobalId
     }

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

@@ -30,9 +30,11 @@ const query = gql`
         address {
           state
           city
+          timezone
         }
         imageUrls
       }
+      taxDeduction
       published
       salesBeginImmediately
       ...EventSchedule

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

@@ -30,10 +30,12 @@ const query = gql`
         address {
           state
           city
+          timezone
         }
         imageUrls
       }
       published
+      taxDeduction
       salesBeginImmediately
       ...EventSchedule
       ...Location

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

@@ -39,6 +39,7 @@ const query = gql`
           address {
             state
             city
+            timezone
             }
         }
       }
@@ -83,6 +84,7 @@ const query = gql`
       refundReason
       promotionCode
       type
+      tax
       channel
       ipAddress
       address {

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

@@ -14,21 +14,23 @@ const query = gql`
       }
       orgId
       eventId
-      eventName
-      # event {
-      #   _id
-      #   posterImageUrl
-      #   schedule {
-      #     startsAt
-      #   }
-        # venue {
-        #   name
-        #   address {
-        #     state
-        #     city
-        #   }
-        # }
-      # }
+      venueIds
+      eventName      
+      event {
+        _id
+        posterImageUrl
+        schedule {
+          startsAt
+        }
+        venue {
+          _id
+          address {
+            state
+            city
+            timezone
+          }
+        }
+      }
       fees {
         _id
         name
@@ -54,6 +56,7 @@ const query = gql`
       promotionCode
       type
       channel
+      tax
       ipAddress
       address {
         lat

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

@@ -33,10 +33,12 @@ const query = gql`
         address {
           state
           city
+          timezone
         }
         imageUrls
       }
       published
+      taxDeduction
       salesBeginImmediately
       ...EventSchedule
       ...Location

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

@@ -22,6 +22,7 @@ const query = gql`
         placeName
         timezone
       }
+      tax
       url
       imageUrls
       venueGlobalId

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

@@ -24,6 +24,7 @@ const query = gql`
         timezone
       }
       url
+      tax
       imageUrls
       venueGlobalId
     }

package/src/interfaces/IEvent.ts

@@ -38,6 +38,10 @@ export enum EventAgeEnum {
   TwentyOnePlus = '21+',
 }
 
+export enum EventTaxDeductionEnum {
+  false = 'No',
+  true = 'Yes',
+}
 export enum SendQRCodeEnum {
   UponOrder = 'Upon order',
   TwoWeeksBefore = 'Two weeks before show',
@@ -50,6 +54,10 @@ export enum EventProcessAsEnum {
   // Free = 'Free',
 }
 
+export enum EventSaleTaxEnum {
+  SalesTax="Sales tax"
+}
+
 export default interface IEvent {
   _id?: string;
   orgId: string;
@@ -63,6 +71,7 @@ export default interface IEvent {
   publishable: boolean;
   seatingChartKey?: string;
   age?: EventAgeEnum;
+  taxDeduction?: boolean;
   active?: boolean;
   userAgreement?: string;
   processAs?: EventProcessAsEnum;

package/src/interfaces/IOrder.ts

@@ -9,6 +9,8 @@ import { OrderChannelEnum } from '../enums/OrderChannelEnum';
 import IProcessingFee from './IProcessingFees';
 import IUser from "./IUser";
 import IFee from "./IFee";
+import IEvent from "./IEvent";
+import IVenue from "./IVenue";
 
 export default interface IOrder {
   _id?: string;
@@ -34,14 +36,19 @@ export default interface IOrder {
   promotionCode?: string;
   ipAddress?: string;
   address?: IAddress;
+  tax?: number;
   customFields?: IOrderCustomField[];
   refundReason?: string; // BACKFILL
   payments: IPayment[];
   processingFee?: IProcessingFee
 };
 
+export interface IEventGraphQL extends IEvent {
+  venue?: IVenue;
+}
 
 export interface IOrderGraphQL extends IOrder {
   user: IUser;
   fees: IFee;
+  event: IEventGraphQL;
 };

package/src/interfaces/IPayment.ts

@@ -7,6 +7,7 @@ export default interface IPayment {
   transferAmount: number;
   feeAmount: number;
   feeIds: string[];
+  tax?: number;
   createdAt: number;
   createdBy: string;
   promotionCode?: string;

package/src/interfaces/IVenue.ts

@@ -6,6 +6,7 @@ export default interface IVenue {
   name: string;
   description: string;
   capacity: number;
+  tax?: string;
   url?: string;
   imageUrls?: string[];
   venueGlobalId?: string;

package/src/proto/event.proto

@@ -33,6 +33,7 @@ message Event {
   bool published = 27;
   bool salesBeginImmediately = 28;
   bool cancel = 29;
+  bool taxDeduction = 30;
 }
 
 message EventSchedule {

package/src/proto/order.proto

@@ -34,6 +34,7 @@ message Order {
   string refundReason = 23;
   repeated Payment payments = 24;
   ProcessingFees processingFee = 25;
+  float tax = 26;
 }
 
 message ProcessingFees {
@@ -102,6 +103,7 @@ message Payment {
   string createdBy = 7;
   string promotionCode = 8;
   string paymentMethodType = 9;
+  int32 tax = 10;
 }
 
 /****************************************************************************************

package/src/proto/venue.proto

@@ -14,6 +14,7 @@ message Venue {
   repeated string imageUrls = 6;
   string venueGlobalId = 7;
   Address address = 8;
+  float tax = 9;
 }
 
 // Create Venue

package/src/schemas/Event.ts

@@ -451,6 +451,11 @@ export default {
     required: true,
     default: false
   },
+  taxDeduction: {
+    type: Boolean,
+    required: true,
+    default: false
+  },
   userAgreement: {
     type: String,
     required: false

package/src/schemas/Order.ts

@@ -180,6 +180,10 @@ const Payment = {
     type: Number,
     required: false,
   },
+  tax: {
+    type: Number,
+    required: false,
+  },
   feeIds: [{
     type: String,
     required: false,
@@ -229,6 +233,10 @@ export default {
     type: String,
     required: true,
   },
+  tax: {
+    type: Number,
+    default: null,
+  },
   venueIds: [{
     type: String,
     required: false,

package/src/schemas/Venue.ts

@@ -26,6 +26,10 @@ export default {
     type: String,
     default: null,
   },
+  tax: {
+    type: Number,
+    default: null,
+  },
   imageUrls: [
     {
       type: String,

package/src/utils/AnalyticsUtil.ts

@@ -879,20 +879,20 @@ export default {
     return intervals[interval]();
   },
 
-  getDateFormat(time: any, interval: AnalyticsIntervalEnum) {
+  getDateFormat(time: any, interval: AnalyticsIntervalEnum, timezone: string = 'America/Denver') {
     switch(interval) {
       case AnalyticsIntervalEnum.Hour:
-        return Time.format(time, 'h:mma');
+        return Time.format(time, 'h:mma',timezone);
       case AnalyticsIntervalEnum.Day:
-        return Time.format(time, 'MMM DD');
+        return Time.format(time, 'MMM DD',timezone);
       case AnalyticsIntervalEnum.Week:
-        return `${Time.format(time, 'MMM DD')} - ${Time.format(time + (Time.DAY * 7), 'MMM DD')}`;
+        return `${Time.format(time, 'MMM DD',timezone)} - ${Time.format(time + (Time.DAY * 7), 'MMM DD',timezone)}`;
       case AnalyticsIntervalEnum.Month:
-        return Time.format(time, 'MMM YYYY');
+        return Time.format(time, 'MMM YYYY',timezone);
       case AnalyticsIntervalEnum.Year:
-        return Time.format(time, 'YYYY');
+        return Time.format(time, 'YYYY',timezone);
       default:
-        return Time.format(time, 'MMM DD');
+        return Time.format(time, 'MMM DD',timezone);
     }
   },
 

package/src/utils/FeeUtil.ts

@@ -34,6 +34,15 @@ export default {
       return true;
     });
   },
+
+  taxFees(fees: any[] = []) {
+    return fees.filter((fee) => {
+      if (fee.name.toLowerCase() === 'sales tax') {
+        return true;
+      }
+      return false;
+    });
+  },
   /****************************************************************************************
    * Fee  validate
   ****************************************************************************************/

package/src/utils/PaymentUtil.ts

@@ -165,11 +165,11 @@ class PaymentUtil {
       })
     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 }) => {
+    const orderFees = fees.filter(f => f.appliedTo === FeeAppliedToEnum.Order && f.name != 'Sales tax').sort(({ type }) => {
       if (type === 'Flat') return -1;
       else return 1;
     });
-    
+    const salesTax = fees.filter(f => f.name == 'Sales tax');
 
     function applyTicketFee(ticket: ICreateOrderTicketParams, fee: IFee): number {
       // Ignore seated fees if not seated
@@ -201,7 +201,7 @@ class PaymentUtil {
         if (fee.type === FeeTypeEnum.Flat) {
           return upgrade.price + fee.value;
         } if (fee.type === FeeTypeEnum.Percent) {
-          return (upgrade.price / (1 - fee.value / 100));
+          return (upgrade.price * fee.value / 100);
         }
       } else {
         return 0;
@@ -220,21 +220,29 @@ class PaymentUtil {
 
     const ticketTotal = tickets.reduce((cur, ticket) => cur + ticket.price, 0);
 
+    const ticketTaxFeeTotal = tickets.reduce((cur, ticket) => {
+      return cur + salesTax.reduce((cur, fee) => {
+        const value = cur + applyTicketFee(ticket, fee);
+        return value;
+      }, 0);
+    }, 0);
     const ticketFeeTotal = tickets.reduce((cur, ticket) => {
       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 upgradeTaxFeeTotal = upgrades.reduce((cur, upgrade) => {
+      return cur + salesTax.reduce((curr, fee) => curr + applyUpgradeFee(upgrade, fee), 0);
+    }, 0);
+
     const upgradeFeeTotal = upgrades.reduce((cur, upgrade) => {
       return cur + upgradeFees.reduce((cur, fee) => cur + applyUpgradeFee(upgrade, fee), 0);
     }, 0);
-
-    const orderSubtotal = Math.round(ticketTotal + ticketFeeTotal + upgradeTotal + upgradeFeeTotal);
+    const orderSubtotal = Math.round(ticketTotal + ticketTaxFeeTotal + ticketFeeTotal + upgradeTaxFeeTotal + upgradeTotal + upgradeFeeTotal);
 
     // console.log(`Order SubTotal:`, orderSubtotal);
 
@@ -251,16 +259,31 @@ class PaymentUtil {
       tickets = [],
       upgrades = [],
       paymentMethodType,
+      // fees
     } = 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);
+
+    const ticketTotal = tickets.reduce((cur, ticket) => cur + ticket.price , 0); // +  (ticket.price * tax/100)
+    const upgradeTotal = upgrades.reduce((cur, upgrade) => cur + upgrade.price, 0); // +  (upgrade.price * tax/100)
     return ticketTotal + upgradeTotal;
   }
   calculateFee(params: IPaymentCalculatorParams): number {
+    let {
+    fees
+  } = params;
+    const salesTax = fees.filter(f => f.name == 'Sales tax');
+    const tax = salesTax.length > 0 ? salesTax[0].value : 0
     const total = this.calculatePaymentTotal(params);
-    const subtotal = this.calculatePaymentSubtotal(params);
+    let subtotal = this.calculatePaymentSubtotal(params);
+    subtotal = subtotal + (subtotal*tax/100)
+    return Math.round(total - subtotal);
+  }
+
+  calculateFeeWithoutTax(params: IPaymentCalculatorParams): number {
+
+    const total = this.calculatePaymentTotal(params);
+    let subtotal = this.calculatePaymentSubtotal(params);
     return Math.round(total - subtotal);
   }
   calculateOrganizationFee(params: IPaymentCalculatorParams): number {
@@ -272,7 +295,6 @@ class PaymentUtil {
     } = params;
 
     fees = FeeUtil.promoterFees(fees);
-
     return this.calculateFee({
       tickets,
       upgrades,
@@ -280,6 +302,24 @@ class PaymentUtil {
       paymentMethodType,
     });
   }
+
+
+  calculateTaxFee(params: IPaymentCalculatorParams): number {
+    let {
+      tickets = [],
+      upgrades = [],
+      fees = [],
+      paymentMethodType,
+    } = params;
+
+    fees = FeeUtil.taxFees(fees);
+    return this.calculateFeeWithoutTax({
+      tickets,
+      upgrades,
+      fees,
+      paymentMethodType,
+    });
+  }
   calculatePlatformFee(params: IPaymentCalculatorParams): number {
     let {
       tickets = [],
@@ -310,6 +350,11 @@ class PaymentUtil {
     const organizationFee = this.calculateOrganizationFee(params);
     return total - subtotal  - organizationFee;
   }
+  // calculateTaxFee(params: IPaymentCalculatorParams): number {
+  //   const organizationFee = this.calculateTaxFee(params);
+  //   console.log(organizationFee,'............................salesTax..')
+  //   return organizationFee;
+  // }
 
 }