iticket-seatingplan-dev 2.0.17 → 2.0.19

package/dist/components/Controls.js

@@ -99,7 +99,7 @@ function Controls(_ref) {
     onClick: () => map.fitBounds(bounds),
     className: "leaflet-control-zoom-in"
   }, /*#__PURE__*/_react.default.createElement("img", {
-    src: "https://au-iticket-shop-legacy.azurewebsites.net/assets/images/fit-icon.jpg",
+    src: _encodedSvgs.fitIcon,
     style: {
       height: "17px"
     }
@@ -116,7 +116,7 @@ function Controls(_ref) {
     }
   }, /*#__PURE__*/_react.default.createElement("img", {
     className: isReloading ? "rotate" : "",
-    src: "https://au-iticket-shop-legacy.azurewebsites.net/assets/images/refresh.png",
+    src: _encodedSvgs.reloadIcon,
     style: {
       height: "17px"
     }
@@ -191,7 +191,7 @@ function Controls(_ref) {
     className: "leaflet-control-zoom-in single-button"
   }, /*#__PURE__*/_react.default.createElement("span", null)))), /*#__PURE__*/_react.default.createElement(_reactLeaflet.FeatureGroup, {
     ref: drawLayersRef
-  }, /*#__PURE__*/_react.default.createElement(_reactLeafletDraw.EditControl, {
+  }, drawLayersRef.current && /*#__PURE__*/_react.default.createElement(_reactLeafletDraw.EditControl, {
     position: "bottomleft",
     onCreated: handleDrawBox,
     onDrawStart: () => {
@@ -210,7 +210,8 @@ function Controls(_ref) {
     },
     edit: {
       edit: false,
-      remove: false
+      remove: false,
+      featureGroup: drawLayersRef.current
     },
     onMounted: drawInstance => {
       drawRef.current = drawInstance;

package/dist/components/Map.js

@@ -299,7 +299,7 @@ function SeatMap(_ref) {
       }
       if (highlightedSeats.length === desiredSeatQuantity) {
         setClickedSeat(null);
-        const groupedSeats = (0, _utils.groupSeatsByPriceSection)(highlightedSeats, seats.pricing, priceSectionIds);
+        const groupedSeats = (0, _utils.groupSeatsByPriceSection)(highlightedSeats, bookedSeats, seats.pricing, priceSectionIds);
         const priceages = Object.values(groupedSeats).flatMap(group => group.priceages.map(pa => pa.priceage));
         if (priceages.length === 1 && (priceages[0].q === null || priceages[0].q >= desiredSeatQuantity) && !isSingleFlexi) {
           batchAddTicketsToCart(highlightedSeats.map(s => ({
@@ -436,7 +436,12 @@ function SeatMap(_ref) {
       lng: s.x,
       radius: 110
     };
-    const seatPrices = ((_seats$pricing3 = seats.pricing) === null || _seats$pricing3 === void 0 ? void 0 : _seats$pricing3.filter(price => (!priceSectionIds || priceSectionIds.includes(price.psId)) && price.psId === s.psId)) || [];
+    const seatPrices = (((_seats$pricing3 = seats.pricing) === null || _seats$pricing3 === void 0 ? void 0 : _seats$pricing3.filter(price => (!priceSectionIds || priceSectionIds.includes(price.psId)) && price.psId === s.psId)) || []).map(p => {
+      const bookedQty = bookedSeats.filter(bs => bs.pId === p.paId && bs.psId === s.psId).length;
+      return _objectSpread(_objectSpread({}, p), {}, {
+        q: p.q === null ? null : Math.max(p.q - bookedQty, 0)
+      });
+    });
     const hasSeatPrices = (seatPrices === null || seatPrices === void 0 ? void 0 : seatPrices.length) > 0;
     const isSingleFlexi = seatPrices.length === 1 && !!seatPrices[0].pMax && !!seatPrices[0].pMin && seatPrices[0].pMax > seatPrices[0].pMin;
     const radiusInDeg = seatCenter.radius / _constants.ONE_DEG_LAT_IN_METERS;

package/dist/components/PricingPopup.js

@@ -208,11 +208,12 @@ function PricingPopup(_ref4) {
   let {
     onClose,
     selectedSeats,
+    bookedSeats,
     batchAddTicketsToCart,
     pricing,
     priceSectionIds
   } = _ref4;
-  const [seatGroupsToBook, setSeatGroupsToBook] = (0, _react.useState)(() => (0, _utils.groupSeatsByPriceSection)(selectedSeats, pricing, priceSectionIds));
+  const [seatGroupsToBook, setSeatGroupsToBook] = (0, _react.useState)(() => (0, _utils.groupSeatsByPriceSection)(selectedSeats, bookedSeats, pricing, priceSectionIds));
   const updateSeatGroupPriceage = (priceage, qty) => {
     const newSeatGroupsToBook = _objectSpread({}, seatGroupsToBook);
     const group = newSeatGroupsToBook[priceage.psId];

package/dist/components/SeatingPlan.js

@@ -561,16 +561,23 @@ const SeatingPlan = _ref => {
           throw new Error("Something went wrong. Please try again or contact support.");
         }
       }
-      setBookedSeats(data.seats.filter(s => s.s === _utils.statuses.USER_PENDING && s.bookedPrice === price).map(s => ({
-        ssId: s.ssId,
-        r: s.r,
-        c: s.c,
-        showingId: showingId,
-        p: s.p,
-        //price || s.defaultPrice,
-        pId: s.pId,
-        paName: s.paName
-      })));
+
+      // setBookedSeats(
+      //   data.seats
+      //     .filter(
+      //       (s) => s.s === statuses.USER_PENDING && s.bookedPrice === price,
+      //     )
+      //     .map((s) => ({
+      //       ssId: s.ssId,
+      //       r: s.r,
+      //       c: s.c,
+      //       showingId: showingId,
+      //       p: s.p, //price || s.defaultPrice,
+      //       pId: s.pId,
+      //       paName: s.paName,
+      //     })),
+      // );
+
       const img = new Image();
       const setupSeats = (h, w) => {
         const lat1 = 0;
@@ -656,6 +663,7 @@ const SeatingPlan = _ref => {
       setSelectedSeats([]);
     },
     selectedSeats: selectedSeats,
+    bookedSeats: bookedSeats,
     pricing: seats.pricing,
     priceSectionIds: priceSectionIds,
     batchAddTicketsToCart: batchAddTicketsToCart

package/dist/components/assets/encodedSvgs.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.wheelchairIcon = exports.userIcon = exports.handIcon = exports.flexiIcon = exports.expandIcon = exports.editIcon = exports.cursorIcon = exports.collapseIcon = exports.closeIconWhite = exports.closeIcon = void 0;
+exports.wheelchairIcon = exports.userIcon = exports.reloadIcon = exports.handIcon = exports.flexiIcon = exports.fitIcon = exports.expandIcon = exports.editIcon = exports.cursorIcon = exports.collapseIcon = exports.closeIconWhite = exports.closeIcon = void 0;
 const expandIcon = exports.expandIcon = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCIgaGVpZ2h0PSIyNCIgd2lkdGg9IjI0IiBmaWxsPSJjdXJyZW50Q29sb3IiIHN0cm9rZT0iY3VycmVudENvbG9yIj4KIDxwYXRoIGQ9Ik03IDE0SDV2NWg1di0ySDd6bS0yLTRoMlY3aDNWNUg1em0xMiA3aC0zdjJoNXYtNWgtMnpNMTQgNXYyaDN2M2gyVjV6Ij48L3BhdGg+Cjwvc3ZnPgo=";
 const collapseIcon = exports.collapseIcon = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCIgaGVpZ2h0PSIyNCIgd2lkdGg9IjI0IiBmaWxsPSJjdXJyZW50Q29sb3IiIHN0cm9rZT0iY3VycmVudENvbG9yIj4KPHBhdGggZD0iTTUgMTZoM3YzaDJ2LTVINXptMy04SDV2Mmg1VjVIOHptNiAxMWgydi0zaDN2LTJoLTV6bTItMTFWNWgtMnY1aDVWOHoiPjwvcGF0aD4KPC9zdmc+Cg==";
 const closeIcon = exports.closeIcon = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIiBzdHJva2U9ImN1cnJlbnRDb2xvciIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjxsaW5lIHgxPSIxOCIgeTE9IjYiIHgyPSI2IiB5Mj0iMTgiLz48bGluZSB4MT0iNiIgeTE9IjYiIHgyPSIxOCIgeTI9IjE4Ii8+PC9zdmc+";
@@ -13,4 +13,6 @@ const handIcon = exports.handIcon = "data:image/svg+xml;base64,PD94bWwgdmVyc2lvb
 const cursorIcon = exports.cursorIcon = "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDMyMCA1MTIiPjwhLS0hRm9udCBBd2Vzb21lIEZyZWUgNi43LjEgYnkgQGZvbnRhd2Vzb21lIC0gaHR0cHM6Ly9mb250YXdlc29tZS5jb20gTGljZW5zZSAtIGh0dHBzOi8vZm9udGF3ZXNvbWUuY29tL2xpY2Vuc2UvZnJlZSBDb3B5cmlnaHQgMjAyNCBGb250aWNvbnMsIEluYy4tLT48cGF0aCBkPSJNMCA1NS4yTDAgNDI2YzAgMTIuMiA5LjkgMjIgMjIgMjJjNi4zIDAgMTIuNC0yLjcgMTYuNi03LjVMMTIxLjIgMzQ2bDU4LjEgMTE2LjNjNy45IDE1LjggMjcuMSAyMi4yIDQyLjkgMTQuM3MyMi4yLTI3LjEgMTQuMy00Mi45TDE3OS44IDMyMGwxMTguMSAwYzEyLjIgMCAyMi4xLTkuOSAyMi4xLTIyLjFjMC02LjMtMi43LTEyLjMtNy40LTE2LjVMMzguNiAzNy45QzM0LjMgMzQuMSAyOC45IDMyIDIzLjIgMzJDMTAuNCAzMiAwIDQyLjQgMCA1NS4yeiIvPjwvc3ZnPg==";
 const flexiIcon = exports.flexiIcon = "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgZmlsbD0ibm9uZSIgdmlld0JveD0iMCAwIDI0IDI0IiBzdHJva2Utd2lkdGg9IjEuNSIgc3Ryb2tlPSJjdXJyZW50Q29sb3IiIGNsYXNzPSJzaXplLTYiPgogIDxwYXRoIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgZD0iTTIuMjUgMTggOSAxMS4yNWw0LjMwNiA0LjMwNmExMS45NSAxMS45NSAwIDAgMSA1LjgxNC01LjUxOGwyLjc0LTEuMjJtMCAwLTUuOTQtMi4yODFtNS45NCAyLjI4LTIuMjggNS45NDEiIC8+Cjwvc3ZnPg==";
 const editIcon = exports.editIcon = "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgZmlsbD0ibm9uZSIgdmlld0JveD0iMCAwIDI0IDI0IiBzdHJva2Utd2lkdGg9IjEuNSIgc3Ryb2tlPSJjdXJyZW50Q29sb3IiIGNsYXNzPSJzaXplLTYiPjxwYXRoIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgZD0ibTE2Ljg2MiA0LjQ4NyAxLjY4Ny0xLjY4OGExLjg3NSAxLjg3NSAwIDEgMSAyLjY1MiAyLjY1MkwxMC41ODIgMTYuMDdhNC41IDQuNSAwIDAgMS0xLjg5NyAxLjEzTDYgMThsLjgtMi42ODVhNC41IDQuNSAwIDAgMSAxLjEzLTEuODk3bDguOTMyLTguOTMxWm0wIDBMMTkuNSA3LjEyNU0xOCAxNHY0Ljc1QTIuMjUgMi4yNSAwIDAgMSAxNS43NSAyMUg1LjI1QTIuMjUgMi4yNSAwIDAgMSAzIDE4Ljc1VjguMjVBMi4yNSAyLjI1IDAgMCAxIDUuMjUgNkgxMCIgLz48L3N2Zz4=";
-const closeIconWhite = exports.closeIconWhite = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIiBzdHJva2U9IiNmZmZmZmYiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIj48bGluZSB4MT0iMTgiIHkxPSI2IiB4Mj0iNiIgeTI9IjE4Ii8+PGxpbmUgeDE9IjYiIHkxPSI2IiB4Mj0iMTgiIHkyPSIxOCIvPjwvc3ZnPg==";
+const closeIconWhite = exports.closeIconWhite = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIiBzdHJva2U9IiNmZmZmZmYiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIj48bGluZSB4MT0iMTgiIHkxPSI2IiB4Mj0iNiIgeTI9IjE4Ii8+PGxpbmUgeDE9IjYiIHkxPSI2IiB4Mj0iMTgiIHkyPSIxOCIvPjwvc3ZnPg==";
+const fitIcon = exports.fitIcon = "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIGRhdGEtc2xvdD0iaWNvbiIgZmlsbD0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIyLjUiIHN0cm9rZT0iY3VycmVudENvbG9yIiB2aWV3Qm94PSIwIDAgMjQgMjQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgYXJpYS1oaWRkZW49InRydWUiPjxwYXRoIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgZD0iTTMuNzUgMy43NXY0LjVtMC00LjVoNC41bS00LjUgMEw5IDlNMy43NSAyMC4yNXYtNC41bTAgNC41aDQuNW0tNC41IDBMOSAxNU0yMC4yNSAzLjc1aC00LjVtNC41IDB2NC41bTAtNC41TDE1IDltNS4yNSAxMS4yNWgtNC41bTQuNSAwdi00LjVtMCA0LjVMMTUgMTUiPjwvcGF0aD48L3N2Zz4=";
+const reloadIcon = exports.reloadIcon = "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIGRhdGEtc2xvdD0iaWNvbiIgZmlsbD0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIyLjUiIHN0cm9rZT0iY3VycmVudENvbG9yIiB2aWV3Qm94PSIwIDAgMjQgMjQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgYXJpYS1oaWRkZW49InRydWUiPjxwYXRoIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgZD0iTTE2LjAyMyA5LjM0OGg0Ljk5MnYtLjAwMU0yLjk4NSAxOS42NDR2LTQuOTkybTAgMGg0Ljk5Mm0tNC45OTMgMCAzLjE4MSAzLjE4M2E4LjI1IDguMjUgMCAwIDAgMTMuODAzLTMuN000LjAzMSA5Ljg2NWE4LjI1IDguMjUgMCAwIDEgMTMuODAzLTMuN2wzLjE4MSAzLjE4Mm0wLTQuOTkxdjQuOTkiPjwvcGF0aD48L3N2Zz4=";

package/dist/components/styles/index.css

@@ -124,7 +124,7 @@ button {
     transform: rotate(0deg);
   }
   to {
-    transform: rotate(-359deg);
+    transform: rotate(359deg);
   }
 }
 
@@ -265,8 +265,8 @@ button {
 }
 
 code {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New",
-    monospace;
+  font-family:
+    source-code-pro, Menlo, Monaco, Consolas, "Courier New", monospace;
 }
 
 .App {
@@ -566,7 +566,8 @@ svg.leaflet-image-layer.leaflet-interactive path {
   --accent-color: rgba(99, 102, 241, 0.08);
   --bg-color: rgb(249, 250, 251);
   background-color: var(--bg-color);
-  background-image: linear-gradient(var(--accent-color) 1px, transparent 1px),
+  background-image:
+    linear-gradient(var(--accent-color) 1px, transparent 1px),
     linear-gradient(to right, var(--accent-color) 1px, var(--bg-color) 1px);
   background-size: 20px 20px;
   outline-offset: 1px;
@@ -664,7 +665,10 @@ svg.leaflet-image-layer.leaflet-interactive path {
 
 .leaflet-control-zoom-in,
 .leaflet-control-zoom-out {
-  font: bold 18px "Lucida Console", Monaco, monospace;
+  font:
+    bold 18px "Lucida Console",
+    Monaco,
+    monospace;
   text-indent: 1px;
 }
 
@@ -925,7 +929,10 @@ svg.leaflet-image-layer.leaflet-interactive path {
   text-align: center;
   width: 24px;
   height: 24px;
-  font: 16px/24px Tahoma, Verdana, sans-serif;
+  font:
+    16px/24px Tahoma,
+    Verdana,
+    sans-serif;
   color: #757575;
   text-decoration: none;
   background: transparent;

package/dist/utils/helpers.js

@@ -6,6 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.groupSeatsByPriceSection = exports.getValidSeats = exports.getSeatCenterLatLng = exports.getRowSection = exports.getRetryDelay = exports.getIsTouchScreen = exports.getInitialColor = exports.getAdjacentBookedSeats = exports.createsOrphan = exports.canSelectSingleSeatGivenOrphanRules = exports.NZDollar = void 0;
 var _enums = require("./enums");
 var _constants = require("./constants");
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 const getIsTouchScreen = () => {
   let hasTouchScreen = false;
   if (typeof window !== "undefined") {
@@ -228,12 +233,18 @@ const getRetryDelay = response => {
   return delay + Math.random() * 1000;
 };
 exports.getRetryDelay = getRetryDelay;
-const groupSeatsByPriceSection = (seats, pricing, priceSectionIds) => {
+const groupSeatsByPriceSection = (seats, bookedSeats, pricing, priceSectionIds) => {
   const groupedSeats = seats.reduce((acc, curr) => {
     if (curr.psId) {
       const priceages = pricing.filter(price => price.psId === curr.psId && (!priceSectionIds || priceSectionIds.includes(price.psId)));
-      const availablePriceages = priceages.filter(p => p.q === null || p.q > 0);
-      const soldOutPriceages = priceages.filter(p => p.q === 0);
+      const adjustedPriceages = priceages.map(p => {
+        const bookedQty = bookedSeats.filter(s => s.pId === p.paId && s.psId === curr.psId).length;
+        return _objectSpread(_objectSpread({}, p), {}, {
+          q: p.q !== null ? Math.max(p.q - bookedQty, 0) : null
+        });
+      });
+      const availablePriceages = adjustedPriceages.filter(p => p.q === null || p.q > 0);
+      const soldOutPriceages = adjustedPriceages.filter(p => p.q === 0);
       const numSeats = seats.filter(s => s.psId === curr.psId).length;
       if (!acc[curr.psId]) {
         let qtyFilled = 0;

package/package.json

@@ -2,7 +2,7 @@
   "name": "iticket-seatingplan-dev",
   "description": "Seating plan with FLEXi pricing",
   "author": "gedwyne",
-  "version": "2.0.17",
+  "version": "2.0.19",
   "private": false,
   "keywords": [
     "iticket",
@@ -20,10 +20,10 @@
     "@types/leaflet-draw": "^1.0.11",
     "leaflet": "^1.9.4",
     "leaflet-draw": "^1.0.4",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "react-leaflet": "^5.0.0-rc.2",
-    "react-leaflet-draw": "^0.20.4",
+    "react": "^19.2.1",
+    "react-dom": "^19.2.1",
+    "react-leaflet": "^5.0.0",
+    "react-leaflet-draw": "0.20.3",
     "react-scripts": "^5.0.1"
   },
   "codependencies": {