@sellout/models 0.0.185 → 0.0.186

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
+        }).total || 0;
       }, 0);
     } else {
       if (
@@ -40,94 +40,121 @@ export default {
       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;
-        }
-      }
+      // console.log("order ++++++++++>>>",order);
 
-      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 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) || 0;
+
+      // console.log("orderTotal  orderTotal+++++>>",orderTotal );
+
+      // return Math.round(orderTotal);
+
 
       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);
+      // console.log("++++>>>>>>/ fees", fees)
+      const totalFee = fees.reduce(
+        (cur, fee) => cur + parseInt(fee.amount),
+        0
+      );
+      // console.log("++++>>>>>>", ticketTotal, upgradeTotal, totalFee)
       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;
-      });
+        ticketTotal + upgradeTotal + totalFee;
+      // console.log("++++",orderSubtotal)
+      return Math.round(orderSubtotal);
 
-      const orderTotal = orderFees.reduce((cur, fee) => {
-        return applyOrderFee(cur, fee);
-      }, orderSubtotal);
-
-      return Math.round(orderTotal);
     }
   },
 
@@ -180,14 +207,32 @@ export default {
     return this.orderTotalWithRefund(order, promoterFees);
   },
   orderSubtotal(order: IOrder): number {
-    const subTotal = 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,
+    let subTotal;
+    if (order.payments) {
+      subTotal = 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);
+    } else {
+      subTotal = PaymentUtil.calculatePaymentSubtotalValue({
+        tickets: order.tickets,
+        upgrades: order.upgrades
       })
-    }, 0);
+    }
+
+
+    // 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);
 
     return subTotal || 0
   },

package/src/utils/PaymentUtil.ts

@@ -568,6 +568,28 @@ class PaymentUtil {
     ); // +  (upgrade.price * tax/100)
     return ticketTotal + upgradeTotal;
   }
+
+
+  calculatePaymentSubtotalValue(params: any): number {
+    let {
+      tickets = [],
+      upgrades = [],
+      // paymentMethodType,
+      // fees
+    } = params;
+
+    // if (paymentMethodType === PaymentMethodTypeEnum.None) return 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");