@odynn/awayz-flights 0.2.2 → 0.2.4

package/dist/components/FlightResult/FlightResult.js

@@ -1,54 +1,57 @@
-import { jsx as r, jsxs as e } from "react/jsx-runtime";
-import k, { useState as d, useMemo as E } from "react";
-import { g as f, E as N, F as I, a as R } from "../../FlightItinerary-DgpK1LYF.js";
-import { DEFAULT_AIRLINE_PROGRAM as T, getFlightNumber as B, getLogoPath as L, getAirlineProgram as $ } from "../../utils/flightUtils.js";
-import { h as u } from "../../arrayExtensions-DWKenJCh.js";
-import { g as x } from "../../dateUtils-DeNLG5hw.js";
-import { EPaymentType as v } from "../../enums/EPaymentType.js";
-import { CashValue as M } from "@odynn/awayz-core";
-import '../../assets/FlightResult.css';function b(i) {
+import { jsx as r, jsxs as e, Fragment as I } from "react/jsx-runtime";
+import T, { useState as N, useMemo as R } from "react";
+import { g as u, E as v, F as B, a as L } from "../../FlightItinerary-DgpK1LYF.js";
+import { DEFAULT_AIRLINE_PROGRAM as $, getFlightNumber as x, getLogoPath as M, getAirlineProgram as b } from "../../utils/flightUtils.js";
+import { h as F } from "../../arrayExtensions-DWKenJCh.js";
+import { g as j } from "../../dateUtils-DeNLG5hw.js";
+import { EPaymentType as o } from "../../enums/EPaymentType.js";
+import { CashValue as y } from "@odynn/awayz-core";
+import '../../assets/FlightResult.css';function H(i) {
   if (!i || isNaN(i) || i < 0) return "N/A";
-  let n = i == null ? void 0 : i.toString().split(".")[0];
-  return n == null ? void 0 : n.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+  let a = i == null ? void 0 : i.toString().split(".")[0];
+  return a == null ? void 0 : a.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
 }
-const z = ({ details: i, onClick: n }) => {
-  const [m, y] = d(!1), l = i.origin, o = i.destination, g = i.flightDetails, C = !i.paymentOptions || i.paymentOptions.length === 1, [D, F] = d(T), S = async () => {
-    const a = await $(i.airlineProgram);
-    F(a);
-  }, { flightNumbers: c, airlines: P } = E(() => {
-    const a = [], t = [];
-    return i.flightDetails.slices.forEach((A) => {
-      A.segments.forEach((s) => {
-        const p = B(s);
-        a.includes(p) || a.push(p);
-        const h = s.operatingCarrierFlightNumber ? s.operatingCarrier : s.marketingCarrier;
-        t.some((O) => O.airline === h.name) || t.push({
-          logo: L(h.iataCode),
-          airline: h.name
+const Q = ({ details: i, onClick: a }) => {
+  var d;
+  const [g, C] = N(!1), c = i.origin, l = i.destination, p = i.flightDetails, D = !i.paymentOptions || i.paymentOptions.length === 1, [S, P] = N($), A = async () => {
+    const n = await b(i.airlineProgram);
+    P(n);
+  }, { flightNumbers: h, airlines: O } = R(() => {
+    const n = [], t = [];
+    return i.flightDetails.slices.forEach((k) => {
+      k.segments.forEach((s) => {
+        const f = x(s);
+        n.includes(f) || n.push(f);
+        const m = s.operatingCarrierFlightNumber ? s.operatingCarrier : s.marketingCarrier;
+        t.some((E) => E.airline === m.name) || t.push({
+          logo: M(m.iataCode),
+          airline: m.name
         });
       });
-    }), S(), { flightNumbers: a, airlines: t };
+    }), A(), { flightNumbers: n, airlines: t };
   }, [i.flightDetails.slices]);
-  return /* @__PURE__ */ r("div", { className: "flight-result", onClick: () => n(i), children: /* @__PURE__ */ e("div", { className: "content", children: [
+  return /* @__PURE__ */ r("div", { className: "flight-result", onClick: () => {
+    i.cash > 0 ? a(i, o.CASH) : a(i, o.POINTS);
+  }, children: /* @__PURE__ */ e("div", { className: "content", children: [
     /* @__PURE__ */ r("div", { className: "flight-info", children: /* @__PURE__ */ e("div", { className: "flight-locations", children: [
-      /* @__PURE__ */ r("div", { className: "airlines", children: P.map((a, t) => /* @__PURE__ */ r(k.Fragment, { children: /* @__PURE__ */ r("div", { className: "tip", children: /* @__PURE__ */ r("img", { src: a.logo, alt: a.airline }) }, t) }, t)) }),
+      /* @__PURE__ */ r("div", { className: "airlines", children: O.map((n, t) => /* @__PURE__ */ r(T.Fragment, { children: /* @__PURE__ */ r("div", { className: "tip", children: /* @__PURE__ */ r("img", { src: n.logo, alt: n.airline }) }, t) }, t)) }),
       /* @__PURE__ */ e("div", { className: "flight-location", children: [
         /* @__PURE__ */ e("p", { children: [
-          l.city,
+          c.city,
           ",",
-          f(l.country)
+          u(c.country)
         ] }),
-        /* @__PURE__ */ r("p", { children: u(i.departureTime).format(
+        /* @__PURE__ */ r("p", { children: F(i.departureTime).format(
           // isMobile
           //   ? EDateFormats.FlightTime
           //   :
-          N.FlightShortDate
+          v.FlightShortDate
         ) })
       ] }),
       /* @__PURE__ */ e("div", { className: "flight-duration", children: [
         /* @__PURE__ */ r("span", { className: "line" }),
         /* @__PURE__ */ e("p", { children: [
-          x(g.slices[0].duration),
+          j(p.slices[0].duration),
           " ",
           " - ",
           i.numberOfStops > 0 ? `${i.numberOfStops} Stop${i.numberOfStops > 1 ? "s" : ""}` : "Direct"
@@ -57,16 +60,16 @@ const z = ({ details: i, onClick: n }) => {
       ] }),
       /* @__PURE__ */ e("div", { children: [
         /* @__PURE__ */ e("p", { children: [
-          o.city,
+          l.city,
           ", ",
-          f(o.country)
+          u(l.country)
         ] }),
         /* @__PURE__ */ e("p", { children: [
-          u(i.arrivalTime).format(
+          F(i.arrivalTime).format(
             // isMobile
             //   ? EDateFormats.FlightTime
             //   :
-            N.FlightShortDate
+            v.FlightShortDate
           ),
           " "
         ] })
@@ -78,18 +81,18 @@ const z = ({ details: i, onClick: n }) => {
           "div",
           {
             className: "flight-detail",
-            onClick: (a) => {
-              a.stopPropagation(), y(!m);
+            onClick: (n) => {
+              n.stopPropagation(), C(!g);
             },
             children: [
               /* @__PURE__ */ r("p", { children: "Aircraft" }),
               /* @__PURE__ */ e("p", { className: "chevron-text", children: [
-                /* @__PURE__ */ r(I, {}),
+                /* @__PURE__ */ r(B, {}),
                 /* @__PURE__ */ e("span", { children: [
-                  c[0],
-                  c.length > 1 && /* @__PURE__ */ e("sup", { children: [
+                  h[0],
+                  h.length > 1 && /* @__PURE__ */ e("sup", { children: [
                     "+",
-                    c.length - 1
+                    h.length - 1
                   ] })
                 ] })
               ] })
@@ -111,13 +114,13 @@ const z = ({ details: i, onClick: n }) => {
           "div",
           {
             className: "cash-value",
-            onClick: (a) => {
-              a.stopPropagation(), n(i, v.CASH);
+            onClick: (n) => {
+              n.stopPropagation(), a(i, o.CASH);
             },
             children: [
-              /* @__PURE__ */ r("p", { children: C ? "Book For" : "From" }),
+              /* @__PURE__ */ r("p", { children: D ? "Book For" : "From" }),
               /* @__PURE__ */ r("p", { children: /* @__PURE__ */ r(
-                M,
+                y,
                 {
                   amount: i.cash,
                   currency: i.currency
@@ -130,27 +133,39 @@ const z = ({ details: i, onClick: n }) => {
           "div",
           {
             className: "points-value",
-            onClick: (a) => {
-              a.stopPropagation(), n(i, v.POINTS);
+            onClick: (n) => {
+              n.stopPropagation(), a(i, o.POINTS);
             },
             children: [
-              /* @__PURE__ */ r("img", { src: D.programLogo }),
-              /* @__PURE__ */ r("p", { children: `${b(i.points)} miles` })
+              /* @__PURE__ */ r("img", { src: S.programLogo }),
+              /* @__PURE__ */ e("p", { children: [
+                `${H(i.points)} miles`,
+                ((d = i.cashFee) == null ? void 0 : d.amount) > 0 && /* @__PURE__ */ e(I, { children: [
+                  " + ",
+                  /* @__PURE__ */ r(
+                    y,
+                    {
+                      amount: i.cashFee.amount,
+                      currency: i.cashFee.currency
+                    }
+                  )
+                ] })
+              ] })
             ]
           }
         )
       ] })
     ] }),
-    /* @__PURE__ */ r("div", { className: `flight-details ${m ? "is-open" : ""}`, children: /* @__PURE__ */ r("div", { className: "inner", children: /* @__PURE__ */ r(
-      R,
+    /* @__PURE__ */ r("div", { className: `flight-details ${g ? "is-open" : ""}`, children: /* @__PURE__ */ r("div", { className: "inner", children: /* @__PURE__ */ r(
+      L,
       {
-        itinerary: g.slices[0].segments,
-        origin: l,
-        destination: o
+        itinerary: p.slices[0].segments,
+        origin: c,
+        destination: l
       }
     ) }) })
   ] }) });
 };
 export {
-  z as FlightResult
+  Q as FlightResult
 };

package/dist/hooks/useFlightSearch/useFlightSearch.js

@@ -47,21 +47,21 @@ function oe(o, t, r) {
     if (c.length === 0)
       r == null || r(n), n = U();
     else if (u > 0) {
-      const a = s.decode(c.subarray(0, u)), d = u + (c[u + 1] === 32 ? 2 : 1), g = s.decode(c.subarray(d));
+      const a = s.decode(c.subarray(0, u)), d = u + (c[u + 1] === 32 ? 2 : 1), b = s.decode(c.subarray(d));
       switch (a) {
         case "data":
           n.data = n.data ? n.data + `
-` + g : g;
+` + b : b;
           break;
         case "event":
-          n.event = g;
+          n.event = b;
           break;
         case "id":
-          o(n.id = g);
+          o(n.id = b);
           break;
         case "retry":
-          const b = parseInt(g, 10);
-          isNaN(b) || t(n.retry = b);
+          const g = parseInt(b, 10);
+          isNaN(g) || t(n.retry = g);
           break;
       }
     }
@@ -89,8 +89,8 @@ var ae = function(o, t) {
 };
 const x = "text/event-stream", ie = 1e3, z = "last-event-id";
 function ue(o, t) {
-  var { signal: r, headers: n, onopen: s, onmessage: v, onclose: c, onerror: u, openWhenHidden: a, fetch: d } = t, g = ae(t, ["signal", "headers", "onopen", "onmessage", "onclose", "onerror", "openWhenHidden", "fetch"]);
-  return new Promise((b, _) => {
+  var { signal: r, headers: n, onopen: s, onmessage: v, onclose: c, onerror: u, openWhenHidden: a, fetch: d } = t, b = ae(t, ["signal", "headers", "onopen", "onmessage", "onclose", "onerror", "openWhenHidden", "fetch"]);
+  return new Promise((g, _) => {
     const p = Object.assign({}, n);
     p.accept || (p.accept = x);
     let m;
@@ -103,19 +103,19 @@ function ue(o, t) {
       document.removeEventListener("visibilitychange", w), window.clearTimeout(E), m.abort();
     }
     r == null || r.addEventListener("abort", () => {
-      S(), b();
+      S(), g();
     });
     const q = d ?? window.fetch, P = s ?? ce;
     async function T() {
       var C;
       m = new AbortController();
       try {
-        const O = await q(o, Object.assign(Object.assign({}, g), { headers: p, signal: m.signal }));
+        const O = await q(o, Object.assign(Object.assign({}, b), { headers: p, signal: m.signal }));
         await P(O), await ne(O.body, re(oe((h) => {
           h ? p[z] = h : delete p[z];
         }, (h) => {
           F = h;
-        }, v))), c == null || c(), S(), b();
+        }, v))), c == null || c(), S(), g();
       } catch (O) {
         if (!m.signal.aborted)
           try {
@@ -146,8 +146,8 @@ const de = 3 * 60 * 1e3, $ = (o) => {
 }, Ee = () => {
   const { token: o, config: t } = ee(), [r, n] = N(""), [s, v] = N([]), [c, u] = N(!1), a = K(null), {
     inboundResults: d,
-    outboundResults: g,
-    setInboundResults: b,
+    outboundResults: b,
+    setInboundResults: g,
     setOutboundResults: _,
     partialOfferRequestId: p,
     setPartialOfferRequestId: m
@@ -157,7 +157,7 @@ const de = 3 * 60 * 1e3, $ = (o) => {
     inbound: f
   }) => {
     const i = V(e, l);
-    return (f ? b : _)(G(i)), i;
+    return (f ? g : _)(G(i)), i;
   }, {
     mutate: F,
     status: E,
@@ -197,7 +197,6 @@ const de = 3 * 60 * 1e3, $ = (o) => {
       }
     },
     onSuccess: (e) => {
-      console.log({ result: e });
       const { success: l, data: f, partialOfferRequestId: i } = e;
       if (!l) {
         console.log("oh lol, it didn't work");
@@ -321,7 +320,7 @@ const de = 3 * 60 * 1e3, $ = (o) => {
     inboundError: T,
     roundTripFaresError: h,
     // Results
-    outboundResults: g,
+    outboundResults: b,
     inboundResults: d,
     roundTripFares: s,
     // Mutation triggers

package/dist/lib/hooks/useFlightSearch/useFlightSearch.types.d.ts

@@ -75,8 +75,10 @@ export interface IFlightPaymentOption {
     id: string;
     cash: number;
     points: number;
-    cashFeeCurrency: string;
-    cashFeeAmount: number;
+    cashFee: {
+        amount: number;
+        currency: string;
+    };
     baseCurrency: string;
     fareBrandName: string;
     program: string;
@@ -102,6 +104,10 @@ export interface IFlightResult {
     destination: IAirportLocation;
     cash: number;
     points: number;
+    cashFee: {
+        amount: number;
+        currency: string;
+    };
     numberOfStops: number;
     departureTime: Date;
     arrivalTime: Date;
@@ -151,6 +157,10 @@ export interface IFlightOffer {
     partial: boolean;
     owner: IOwner;
     id: string;
+    cashFee: {
+        amount: number;
+        currency: string;
+    };
 }
 export interface IPaymentRequirements {
     requiresInstantPayment: boolean;

package/dist/utils/flightUtils.js

@@ -1,11 +1,11 @@
-import { h as A } from "../arrayExtensions-DWKenJCh.js";
+import { h as F } from "../arrayExtensions-DWKenJCh.js";
 import { c as K } from "../dateUtils-DeNLG5hw.js";
 import "react";
 import { awayzClient as q } from "@odynn/awayz-core";
 import { WalletService as Q } from "../services/wallet/WalletService.js";
 import { ERewardProgramCategories as V } from "../services/wallet/WalletService.types.js";
 const B = (s) => s == null ? void 0 : s.map((e) => {
-  var r, t, a, n, i, o, m, h, g, M, P, N, L, F, w, d, p, c, y, C, b, l, u, D, k, O, f, z, v, _, $, Z, E, G;
+  var r, t, a, n, i, o, m, h, g, M, P, N, A, L, w, d, p, c, y, C, b, l, u, D, k, O, z, f, v, _, $, Z, E, G;
   return {
     id: e.id,
     points: (e == null ? void 0 : e.points) >= 0 ? e.points : -1,
@@ -16,25 +16,25 @@ const B = (s) => s == null ? void 0 : s.map((e) => {
       airportCode: ((m = e.slices[0].segments[0].origin) == null ? void 0 : m.iataCityCode) || ((g = (h = e.slices[0].segments[0].origin) == null ? void 0 : h.city) == null ? void 0 : g.iataCode),
       coordinates: {
         latitude: (P = (M = e.slices[0].segments[0].origin) == null ? void 0 : M.city) == null ? void 0 : P.latitude,
-        longitude: (L = (N = e.slices[0].segments[0].origin) == null ? void 0 : N.city) == null ? void 0 : L.longitude
+        longitude: (A = (N = e.slices[0].segments[0].origin) == null ? void 0 : N.city) == null ? void 0 : A.longitude
       }
     },
     destination: {
-      city: ((w = (F = e.slices[0].segments.getLast()) == null ? void 0 : F.destination) == null ? void 0 : w.cityName) || ((c = (p = (d = e.slices[0].segments.getLast()) == null ? void 0 : d.destination) == null ? void 0 : p.city) == null ? void 0 : c.name),
+      city: ((w = (L = e.slices[0].segments.getLast()) == null ? void 0 : L.destination) == null ? void 0 : w.cityName) || ((c = (p = (d = e.slices[0].segments.getLast()) == null ? void 0 : d.destination) == null ? void 0 : p.city) == null ? void 0 : c.name),
       country: ((C = (y = e.slices[0].segments.getLast()) == null ? void 0 : y.destination) == null ? void 0 : C.iataCountryCode) || ((u = (l = (b = e.slices[0].segments.getLast()) == null ? void 0 : b.destination) == null ? void 0 : l.city) == null ? void 0 : u.iataCountryCode),
-      airportCode: ((k = (D = e.slices[0].segments.getLast()) == null ? void 0 : D.destination) == null ? void 0 : k.iataCityCode) || ((z = (f = (O = e.slices[0].segments.getLast()) == null ? void 0 : O.destination) == null ? void 0 : f.city) == null ? void 0 : z.iataCode),
+      airportCode: ((k = (D = e.slices[0].segments.getLast()) == null ? void 0 : D.destination) == null ? void 0 : k.iataCityCode) || ((f = (z = (O = e.slices[0].segments.getLast()) == null ? void 0 : O.destination) == null ? void 0 : z.city) == null ? void 0 : f.iataCode),
       coordinates: {
         latitude: ($ = (_ = (v = e.slices[0].segments.getLast()) == null ? void 0 : v.destination) == null ? void 0 : _.city) == null ? void 0 : $.latitude,
         longitude: (G = (E = (Z = e.slices[0].segments.getLast()) == null ? void 0 : Z.destination) == null ? void 0 : E.city) == null ? void 0 : G.longitude
       }
     },
     airline: e.owner.name,
-    cash: parseFloat(e.totalAmount),
+    cash: e.totalAmount ? parseFloat(e.totalAmount) : 0,
     currency: e.baseCurrency,
     flightNumber: j(e.slices[0].segments[0]),
     awayzGroupId: e.slices[0].comparisonKey || e.awayzRouteId || e.awayzGroupId || e.id,
-    departureTime: A(e.slices[0].segments[0].departingAt).toDate(),
-    arrivalTime: A(
+    departureTime: F(e.slices[0].segments[0].departingAt).toDate(),
+    arrivalTime: F(
       e.slices[0].segments[e.slices[0].segments.length - 1].arrivingAt
     ).toDate(),
     numberOfStops: e.slices[0].segments.length - 1,
@@ -43,12 +43,13 @@ const B = (s) => s == null ? void 0 : s.map((e) => {
     airlineProgram: e.airlineProgram,
     paymentOptions: [],
     durationMinutes: K({
-      departureTime: A(e.slices[0].segments[0].departingAt),
-      arrivalTime: A(e.slices[0].segments.getLast().arrivingAt),
+      departureTime: F(e.slices[0].segments[0].departingAt),
+      arrivalTime: F(e.slices[0].segments.getLast().arrivingAt),
       originTimeZone: e.slices[0].segments[0].origin.timeZone,
       destinationTimeZone: e.slices[0].segments.getLast().destination.timeZone,
       duration: e.slices[0].duration
-    })
+    }),
+    cashFee: e.cashFee
   };
 }), ee = (s, e) => {
   if (!(e != null && e.length))
@@ -65,7 +66,7 @@ const B = (s) => s == null ? void 0 : s.map((e) => {
       flightNumber: T(
         m.marketingCarrierFlightNumber
       )
-    }, M = i.awayzMatchId, P = `${h.iataCode}_${g.iataCode}-${g.flightNumber}`, N = i.awayzMarketerMatchId, L = !!h.flightNumber && h.flightNumber != "", F = !!g.flightNumber && g.flightNumber != "", w = r.filter((d, p) => {
+    }, M = i.awayzMatchId, P = `${h.iataCode}_${g.iataCode}-${g.flightNumber}`, N = i.awayzMarketerMatchId, A = !!h.flightNumber && h.flightNumber != "", L = !!g.flightNumber && g.flightNumber != "", w = r.filter((d, p) => {
       const c = d.flightDetails, y = d.flightDetails.slices[0].segments[0].operatingCarrierFlightNumber, C = c.id && // TODO: Maybe expand on this - Id check ensures it is a duffel flight
       !!y && y !== "";
       if (!(c.slices[0].segments.length === (o == null ? void 0 : o.length) && !c.slices[0].segments.find(
@@ -73,7 +74,7 @@ const B = (s) => s == null ? void 0 : s.map((e) => {
       )))
         return !1;
       let l = !1;
-      return (F && L && c.awayzMatchId === M || !C && c.awayzMatchId === P || L && !F && c.awayzMarketerMatchId === N) && (l = !0), l && (a[c.id] = p), l;
+      return (L && A && c.awayzMatchId === M || !C && c.awayzMatchId === P || A && !L && c.awayzMarketerMatchId === N) && (l = !0), l && (a[c.id] = p), l;
     });
     if (w.length) {
       i.slices[0].comparisonKey = w[0].awayzGroupId;
@@ -160,10 +161,10 @@ const B = (s) => s == null ? void 0 : s.map((e) => {
           duration: t.duration,
           airlineProgram: t.airlineProgram,
           durationMinutes: K({
-            departureTime: A(
+            departureTime: F(
               t.flightDetails.slices[0].segments[0].departingAt
             ),
-            arrivalTime: A(
+            arrivalTime: F(
               t.flightDetails.slices[0].segments.getLast().arrivingAt
             ),
             originTimeZone: t.flightDetails.slices[0].segments[0].origin.timeZone,
@@ -173,7 +174,8 @@ const B = (s) => s == null ? void 0 : s.map((e) => {
           cash: m.lowestCash,
           points: m.lowestPoints,
           flightDetails: t.flightDetails,
-          currency: t.flightDetails.baseCurrency
+          currency: t.flightDetails.baseCurrency,
+          cashFee: t.cashFee
         }
       };
     }
@@ -231,11 +233,9 @@ const B = (s) => s == null ? void 0 : s.map((e) => {
   cash: s.cash,
   points: s.points,
   program: s.airlineProgram,
-  cashFeeCurrency: s.flightDetails.baseCurrency,
-  //TODO: Add Cash Fee Amount
-  cashFeeAmount: 0,
   baseCurrency: s.flightDetails.baseCurrency,
   fareBrandName: s.flightDetails.slices[0].fareBrandName,
+  cashFee: s.cashFee,
   conditions: {
     //TODO: Add Refund and Change Conditions
     refundBeforeDeparture: !0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@odynn/awayz-flights",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "type": "module",
   "files": [
     "dist"