@tripian/react 5.0.3 → 5.0.6

package/components/OfferCard/OfferCard.d.ts

@@ -2,7 +2,9 @@ import React from 'react';
 import Model from '@tripian/model';
 interface IOfferCard {
     offer: Model.Offer;
-    clicked: (id: number) => void;
+    optedIn: boolean;
+    isLoadingOffer: (offerId: number) => boolean;
+    clicked: (optIn: boolean, id: number) => void;
 }
 declare const OfferCard: React.FC<IOfferCard>;
 export default OfferCard;

package/components/PoiInfo/PoiInfo.d.ts

@@ -21,7 +21,9 @@ interface IPoiInfo {
     getTourInfo?: (productId: string) => void;
     TOUR_PROVIDER_ID?: Model.PROVIDER_ID;
     TICKET_PROVIDER_ID?: Model.PROVIDER_ID;
-    offerButtonClick?: (offerId: number, offerClaimDate: string) => void;
+    myOffers: Model.Poi[];
+    isLoadingOffer: (offerId: number) => boolean;
+    offerButtonClick: (optIn: boolean, offerId: number, offerClaimDate: string) => void;
 }
 declare const PoiInfo: React.FC<IPoiInfo>;
 export default PoiInfo;

package/components/StepInfo/StepInfo.d.ts

@@ -17,6 +17,9 @@ interface IStepInfo {
     getTourInfo?: (productId: string) => void;
     TOUR_PROVIDER_ID?: Model.PROVIDER_ID;
     TICKET_PROVIDER_ID?: Model.PROVIDER_ID;
+    myOffers: Model.Poi[];
+    isLoadingOffer: (offerId: number) => boolean;
+    offerButtonClick: (optIn: boolean, offerId: number, offerClaimDate: string) => void;
 }
 declare const StepInfo: React.FC<IStepInfo>;
 export default StepInfo;

package/index.js

@@ -16293,10 +16293,12 @@ var DatePicker = function (_a) {
             react_1.default.createElement("div", { className: "date-picker-year" },
                 react_1.default.createElement("select", { className: "date-picker-select", value: month.year(), onChange: function (e) { return onYearSelect(month, e.target.value); } }, years))));
     };
-    return (react_1.default.createElement(react_dates_1.SingleDatePicker, { id: "datepicker", date: date, displayFormat: "YYYY-MM-DD", hideKeyboardShortcutsPanel: true, focused: focus, orientation: smallDevice ? 'vertical' : 'horizontal', withFullScreenPortal: smallDevice, onDateChange: function (selectedDate) {
+    return (react_1.default.createElement(react_dates_1.SingleDatePicker, { id: "datepicker", date: date, displayFormat: "YYYY-MM-DD", hideKeyboardShortcutsPanel: true, focused: focus, 
+        // orientation={smallDevice ? 'vertical' : 'horizontal'}
+        withFullScreenPortal: smallDevice, onDateChange: function (selectedDate) {
             setDate(selectedDate);
             onchanged(selectedDate);
-        }, renderMonthElement: showMonthSelection ? renderMonthElement : undefined, openDirection: openDirection, block: true, numberOfMonths: smallDevice ? 2 : 1, onFocusChange: function (_a) {
+        }, renderMonthElement: showMonthSelection ? renderMonthElement : undefined, openDirection: openDirection, block: true, numberOfMonths: 1, onFocusChange: function (_a) {
             var focused = _a.focused;
             return setFocus(focused);
         }, isOutsideRange: function (day) {
@@ -44067,7 +44069,7 @@ var FormTemplateCompanion = function (_a) {
     };
     var callbackNumber = function (num) {
         var newCompanionState = model_1.helper.deepCopy(userCompanion);
-        newCompanionState.age = num !== null && num !== void 0 ? num : 24;
+        newCompanionState.age = num || 1;
         callbackFormTemplateCompanion(newCompanionState);
     };
     var userCompanionQuestionOnChange = function (selectedAnswers) {
@@ -44652,7 +44654,7 @@ var POI_CARD_ACTION;
 })(POI_CARD_ACTION || (POI_CARD_ACTION = {}));
 var PoiInfo = function (_a) {
     var _b, _c;
-    var poi = _a.poi, favorite = _a.favorite, toggleFavorite = _a.toggleFavorite, close = _a.close, addRemoveReplacePoi = _a.addRemoveReplacePoi, dayNumbers = _a.dayNumbers, _d = _a.stepOrder, stepOrder = _d === void 0 ? -1 : _d, _e = _a.replace, replace = _e === void 0 ? false : _e, _f = _a.hideActionButtons, hideActionButtons = _f === void 0 ? false : _f, bookingButtonClick = _a.bookingButtonClick, planDate = _a.planDate, favoriteLoading = _a.favoriteLoading, reservationUrl = _a.reservationUrl, hideBookingButton = _a.hideBookingButton, _g = _a.square, square = _g === void 0 ? true : _g, hideTours = _a.hideTours, getTourInfo = _a.getTourInfo, TOUR_PROVIDER_ID = _a.TOUR_PROVIDER_ID, TICKET_PROVIDER_ID = _a.TICKET_PROVIDER_ID, offerButtonClick = _a.offerButtonClick;
+    var poi = _a.poi, favorite = _a.favorite, toggleFavorite = _a.toggleFavorite, close = _a.close, addRemoveReplacePoi = _a.addRemoveReplacePoi, dayNumbers = _a.dayNumbers, _d = _a.stepOrder, stepOrder = _d === void 0 ? -1 : _d, _e = _a.replace, replace = _e === void 0 ? false : _e, _f = _a.hideActionButtons, hideActionButtons = _f === void 0 ? false : _f, bookingButtonClick = _a.bookingButtonClick, planDate = _a.planDate, favoriteLoading = _a.favoriteLoading, reservationUrl = _a.reservationUrl, hideBookingButton = _a.hideBookingButton, _g = _a.square, square = _g === void 0 ? true : _g, hideTours = _a.hideTours, getTourInfo = _a.getTourInfo, TOUR_PROVIDER_ID = _a.TOUR_PROVIDER_ID, TICKET_PROVIDER_ID = _a.TICKET_PROVIDER_ID, myOffers = _a.myOffers, isLoadingOffer = _a.isLoadingOffer, offerButtonClick = _a.offerButtonClick;
     var _h = (0, react_1.useState)(false), openTours = _h[0], setOpenTours = _h[1];
     var myRef = react_1.default.createRef();
     (0, react_1.useEffect)(function () {
@@ -44666,101 +44668,6 @@ var PoiInfo = function (_a) {
         };
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [openTours]);
-    var offers = [
-        {
-            id: 135,
-            tripianPoiId: 0,
-            businessId: 99,
-            title: 'Patron Çıldırdı !!!',
-            description: '',
-            currency: model_1.default.OFFER_CURRENCY.CAD,
-            caption: 'Buy 2 Margheritta Pizza and get 3 free.',
-            productName: 'Margheritta Pizza',
-            threshold: 2,
-            discount: 100,
-            discountedProductCount: 3,
-            quantity: 9999,
-            timeframe: {
-                start: '2022-07-19 22:13:00',
-                end: '2022-07-20 22:13:00',
-            },
-            image: {
-                id: 319,
-                url: 'https://poi-pics.s3-eu-west-1.amazonaws.com/Place/340/845386/fa616f230a051e8384dc6bc072c8b279.jpg',
-            },
-            productType: {
-                id: 2,
-                name: model_1.default.PRODUCT_TYPE_NAME.FOOD,
-                receiveMethod: model_1.default.OFFER_RECEIVE_METHOD.TAKEOUT,
-            },
-            offerType: model_1.default.OFFER_TYPE.QUANTITY,
-            usage: 0,
-            optIn: false,
-            status: model_1.default.OFFER_STATUS.ACTIVE,
-        },
-        {
-            id: 137,
-            tripianPoiId: 0,
-            businessId: 99,
-            title: 'Patron Çıldırdı !!!',
-            description: '',
-            currency: model_1.default.OFFER_CURRENCY.CAD,
-            caption: 'Get $5.00 off your purchase when you spend $50 or more.',
-            productName: '',
-            threshold: 50,
-            discount: 5,
-            discountedProductCount: 1,
-            quantity: 9999,
-            timeframe: {
-                start: '2022-07-07 22:13:00',
-                end: '2022-07-08 22:13:00',
-            },
-            image: {
-                id: 319,
-                url: 'https://poi-pics.s3-eu-west-1.amazonaws.com/Place/340/845386/fa616f230a051e8384dc6bc072c8b279.jpg',
-            },
-            productType: {
-                id: 3,
-                name: model_1.default.PRODUCT_TYPE_NAME.DRINK,
-                receiveMethod: model_1.default.OFFER_RECEIVE_METHOD.DINEIN,
-            },
-            offerType: model_1.default.OFFER_TYPE.AMOUNT,
-            usage: 0,
-            optIn: false,
-            status: model_1.default.OFFER_STATUS.ACTIVE,
-        },
-        {
-            id: 136,
-            tripianPoiId: 0,
-            businessId: 99,
-            title: 'Patron Çıldırdı !!!',
-            description: '',
-            currency: model_1.default.OFFER_CURRENCY.CAD,
-            caption: 'Get 5% off any purchase of you spend $50 or more.',
-            productName: '',
-            threshold: 50,
-            discount: 5,
-            discountedProductCount: 1,
-            quantity: 9999,
-            timeframe: {
-                start: '2022-07-25 22:13:00',
-                end: '2022-07-27 22:13:00',
-            },
-            image: {
-                id: 319,
-                url: 'https://poi-pics.s3-eu-west-1.amazonaws.com/Place/340/845386/fa616f230a051e8384dc6bc072c8b279.jpg',
-            },
-            productType: {
-                id: 3,
-                name: model_1.default.PRODUCT_TYPE_NAME.DRINK,
-                receiveMethod: model_1.default.OFFER_RECEIVE_METHOD.DINEIN,
-            },
-            offerType: model_1.default.OFFER_TYPE.PERCENTAGE,
-            usage: 0,
-            optIn: true,
-            status: model_1.default.OFFER_STATUS.ACTIVE,
-        },
-    ];
     var ticketProviderBooking = poi.bookings.find(function (booking) { return booking.providerId === TICKET_PROVIDER_ID; });
     var ticketProducts = (_b = ticketProviderBooking === null || ticketProviderBooking === void 0 ? void 0 : ticketProviderBooking.products.filter(function (product) { return product.info.includes(model_1.default.BOOKING_PRODUCT_INFO.TICKET); }).reverse()) !== null && _b !== void 0 ? _b : [];
     var tourProviderBooking = poi.bookings.find(function (booking) { return booking.providerId === TOUR_PROVIDER_ID; });
@@ -44785,13 +44692,6 @@ var PoiInfo = function (_a) {
     else if (ACTION_FLAG === POI_CARD_ACTION.REMOVE) {
         actionIconClasses.push(PoiInfo_scss_1.default.removeIcon);
     }
-    var offersData;
-    if (poi.offers && poi.offers.length > 0) {
-        offersData = poi.offers;
-    }
-    else {
-        offersData = offers;
-    }
     return (react_1.default.createElement("div", { className: PoiInfo_scss_1.default.poi },
         react_1.default.createElement("div", { className: PoiInfo_scss_1.default.poiImage },
             react_1.default.createElement(PoiInfoImage_1.default, { poi: poi, favorite: favorite, favoriteClick: function (fav) {
@@ -44808,17 +44708,16 @@ var PoiInfo = function (_a) {
                         addRemoveReplacePoi(poi, 1);
                 } })) : null),
         react_1.default.createElement(PoiInfoText_1.default, { poi: poi, dayNumbers: dayNumbers, planDate: planDate, reservationUrl: reservationUrl, hideBookingButton: hideBookingButton, bookingButtonClick: bookingButtonClick }),
-        offersData && offersData.length > 0 && (react_1.default.createElement("div", { className: "col col12 px5 pb5" }, offersData.map(function (offer, i) {
+        poi.offers && poi.offers.length > 0 && (react_1.default.createElement("div", { className: "col col12 px5 pb5" }, poi.offers.map(function (offer, i) {
             var _a, _b;
             var offerStartDate = (0, moment_1.default)((_a = offer.timeframe) === null || _a === void 0 ? void 0 : _a.start);
             var offerEndDate = (0, moment_1.default)((_b = offer.timeframe) === null || _b === void 0 ? void 0 : _b.end);
             var planDateTimeNow = (0, moment_1.default)(planDate);
-            if (planDateTimeNow.diff(offerStartDate, 'days') >= 0 && offerEndDate.diff(planDateTimeNow, 'days') >= 0) {
-                var offerClaimDate_1 = planDateTimeNow.format('YYYY-MM-DD');
+            if (planDateTimeNow.isBetween(offerStartDate, offerEndDate)) {
+                var offerClaimDate_1 = (0, moment_1.default)(planDate).format('YYYY-MM-DD');
                 return (react_1.default.createElement("div", { key: "offer-".concat(i), className: "py2" },
-                    react_1.default.createElement(OfferCard_1.default, { offer: offer, clicked: function (id) {
-                            if (offerButtonClick)
-                                offerButtonClick(id, offerClaimDate_1);
+                    react_1.default.createElement(OfferCard_1.default, { offer: offer, optedIn: myOffers.some(function (p) { return p.offers.some(function (x) { return x.id === offer.id && x.optIn; }); }), isLoadingOffer: isLoadingOffer, clicked: function (optIn, id) {
+                            offerButtonClick(optIn, id, offerClaimDate_1);
                         } })));
             }
             return null;
@@ -65100,10 +64999,11 @@ var react_1 = __importDefault(__webpack_require__(0));
 var moment_1 = __importDefault(__webpack_require__(1));
 var OfferCard_scss_1 = __importDefault(__webpack_require__(675));
 var Button_1 = __importDefault(__webpack_require__(5));
+var PreLoading_1 = __importDefault(__webpack_require__(12));
 var OfferCard = function (_a) {
     var _b, _c;
-    var offer = _a.offer, clicked = _a.clicked;
-    return (react_1.default.createElement("div", { className: OfferCard_scss_1.default.offerCard, onClick: function () { return clicked(offer.id); }, role: "button", onKeyDown: function () { }, tabIndex: 0 },
+    var offer = _a.offer, optedIn = _a.optedIn, isLoadingOffer = _a.isLoadingOffer, clicked = _a.clicked;
+    return (react_1.default.createElement("div", { className: OfferCard_scss_1.default.offerCard },
         react_1.default.createElement("div", { className: OfferCard_scss_1.default.offerCardImgDiv },
             react_1.default.createElement("img", { className: OfferCard_scss_1.default.offerCardImg, src: offer.image.url, alt: "" })),
         react_1.default.createElement("div", { className: OfferCard_scss_1.default.offerCardContent },
@@ -65116,8 +65016,12 @@ var OfferCard = function (_a) {
                     "To: ",
                     (0, moment_1.default)((_c = offer.timeframe) === null || _c === void 0 ? void 0 : _c.end).format('DD MMMM h:mm A'))),
             react_1.default.createElement("div", { className: OfferCard_scss_1.default.offerCardCaption }, offer.caption),
-            react_1.default.createElement("div", { className: OfferCard_scss_1.default.offerCardButton },
-                react_1.default.createElement(Button_1.default, { className: OfferCard_scss_1.default.offerButton, text: offer.optIn ? 'OPT-OUT' : 'OPT-IN', onClick: function () { return clicked(offer.id); }, color: "primary", size: "small" })))));
+            react_1.default.createElement("div", { className: OfferCard_scss_1.default.offerCardButton }, isLoadingOffer(offer.id) ? (react_1.default.createElement(PreLoading_1.default, null)) : (react_1.default.createElement(Button_1.default, { className: OfferCard_scss_1.default.offerButton, text: optedIn ? 'OPT-OUT' : 'OPT-IN', onClick: function () {
+                    if (optedIn)
+                        clicked(false, offer.id);
+                    else
+                        clicked(true, offer.id);
+                }, color: "primary", size: "small" }))))));
 };
 exports.default = OfferCard;
 
@@ -65830,10 +65734,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = __importDefault(__webpack_require__(0));
 var PoiInfo_1 = __importDefault(__webpack_require__(334));
 var StepInfo = function (_a) {
-    var step = _a.step, favorite = _a.favorite, toggleFavorite = _a.toggleFavorite, removeStep = _a.removeStep, close = _a.close, dayNumbers = _a.dayNumbers, hideRemoveStepButton = _a.hideRemoveStepButton, bookingButtonClick = _a.bookingButtonClick, planDate = _a.planDate, favoriteLoading = _a.favoriteLoading, reservationUrl = _a.reservationUrl, hideBookingButton = _a.hideBookingButton, hideTours = _a.hideTours, getTourInfo = _a.getTourInfo, TOUR_PROVIDER_ID = _a.TOUR_PROVIDER_ID, TICKET_PROVIDER_ID = _a.TICKET_PROVIDER_ID;
+    var step = _a.step, favorite = _a.favorite, toggleFavorite = _a.toggleFavorite, removeStep = _a.removeStep, close = _a.close, dayNumbers = _a.dayNumbers, hideRemoveStepButton = _a.hideRemoveStepButton, bookingButtonClick = _a.bookingButtonClick, planDate = _a.planDate, favoriteLoading = _a.favoriteLoading, reservationUrl = _a.reservationUrl, hideBookingButton = _a.hideBookingButton, hideTours = _a.hideTours, getTourInfo = _a.getTourInfo, TOUR_PROVIDER_ID = _a.TOUR_PROVIDER_ID, TICKET_PROVIDER_ID = _a.TICKET_PROVIDER_ID, myOffers = _a.myOffers, isLoadingOffer = _a.isLoadingOffer, offerButtonClick = _a.offerButtonClick;
     return (react_1.default.createElement(PoiInfo_1.default, { dayNumbers: dayNumbers, poi: step.poi, favorite: favorite, toggleFavorite: toggleFavorite, close: close, addRemoveReplacePoi: function () {
             removeStep(step.id);
-        }, stepOrder: step.order, hideActionButtons: hideRemoveStepButton, bookingButtonClick: bookingButtonClick, planDate: planDate, favoriteLoading: favoriteLoading, reservationUrl: reservationUrl, hideBookingButton: hideBookingButton, square: false, hideTours: hideTours, getTourInfo: getTourInfo, TOUR_PROVIDER_ID: TOUR_PROVIDER_ID, TICKET_PROVIDER_ID: TICKET_PROVIDER_ID }));
+        }, stepOrder: step.order, hideActionButtons: hideRemoveStepButton, bookingButtonClick: bookingButtonClick, planDate: planDate, favoriteLoading: favoriteLoading, reservationUrl: reservationUrl, hideBookingButton: hideBookingButton, square: false, hideTours: hideTours, getTourInfo: getTourInfo, TOUR_PROVIDER_ID: TOUR_PROVIDER_ID, TICKET_PROVIDER_ID: TICKET_PROVIDER_ID, myOffers: myOffers, isLoadingOffer: isLoadingOffer, offerButtonClick: offerButtonClick }));
 };
 exports.default = StepInfo;