tf-checkout-react 1.2.4 → 1.2.7

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.2.4",
+  "version": "1.2.7",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/api/index.ts

@@ -4,7 +4,7 @@ import _get from 'lodash/get'
 import { CONFIGS, getCookieByName, setCustomCookie } from '../utils'
 
 const isWindowDefined = typeof window !== 'undefined'
-const isDocumentDefined = typeof document !== 'undefined'
+// const isDocumentDefined = typeof document !== 'undefined'
 
 const ttfHeaders: { [key: string]: any } = {
   Accept: 'application/vnd.api+json',
@@ -172,14 +172,15 @@ export function getEvent(id: string | number) {
       referralIdlocal = referral_key.split('.')[1]
     }
     referralValue = referralId || referralIdlocal
+    console.log(referralValue)
   }
 
   const response = publicRequest
     .get(`v1/event/${id}`, {
       headers: {
         ...ttfHeaders,
-        'Referer-Url': isDocumentDefined ? document.referrer : '',
-        'Referrer-Id': isWindowDefined ? referralValue : '',
+        // 'Referer-Url': isDocumentDefined ? document.referrer : '',
+        // 'Referrer-Id': isWindowDefined ? referralValue : '',
       },
     })
     .catch(error => {
@@ -211,7 +212,7 @@ export const addToCart = (id: string | number, data: any) => {
     { data },
     {
       headers: {
-        'Referer-Url': isDocumentDefined ? document.referrer : '',
+        // 'Referer-Url': isDocumentDefined ? document.referrer : '',
       },
     }
   )
@@ -253,7 +254,7 @@ export const getPaymentData = (hash: string) => {
   const response = publicRequest
     .get(`v1/order/${hash}/review/`, {
       headers: {
-        'Referer-Url': isDocumentDefined ? document.referrer : '',
+        // 'Referer-Url': isDocumentDefined ? document.referrer : '',
       },
     })
     .catch(error => {
@@ -277,7 +278,7 @@ export const handlePaymentSuccess = (orderHash: string) => {
   const res = publicRequest
     .post(`v1/order/${orderHash}/success`, undefined, {
       headers: {
-        'Referer-Url': isDocumentDefined ? document.referrer : '',
+        // 'Referer-Url': isDocumentDefined ? document.referrer : '',
       },
     })
     .catch(error => {
@@ -290,7 +291,7 @@ export const handleFreeSuccess = (orderHash: string) => {
   const res = publicRequest
     .post(`v1/order/${orderHash}/complete_free_registration`, undefined, {
       headers: {
-        'Referer-Url': isDocumentDefined ? document.referrer : '',
+        // 'Referer-Url': isDocumentDefined ? document.referrer : '',
       },
     })
     .catch(error => {

package/src/components/billing-info-container/index.tsx

@@ -718,6 +718,7 @@ export const BillingInfoContainer = ({
                                               : element.label
                                           }
                                           type={element.type}
+                                          fill={element.fill}
                                           validate={getValidateFunctions(
                                             element,
                                             states,

package/src/components/common/FormikPhoneNumberField.tsx

@@ -2,7 +2,6 @@ import React from 'react'
 import { FieldInputProps } from 'formik'
 import MuiPhoneNumber from 'material-ui-phone-number'
 import _get from 'lodash/get'
-import { removePlusSign } from '../../normalizers'
 import { useTheme } from '@mui/styles'
 
 export interface INumberInField {
@@ -17,7 +16,7 @@ interface IOtherProps {
 export const FormikPhoneNumberField = ({
   label,
   field,
-  form: { touched, errors, initialValues },
+  form: { touched, errors, values },
   setFieldValue,
   selectOptions,
   ...rest
@@ -30,8 +29,8 @@ export const FormikPhoneNumberField = ({
   return (
     <MuiPhoneNumber
       name='phone'
-      value={initialValues.phone}
-      onChange={(e: any) => setFieldValue("phone", removePlusSign(e))}
+      value={values.phone}
+      onChange={(e: any) => setFieldValue("phone", e)}
       variant="outlined" 
       defaultCountry='us'
       disableDropdown={true}

package/src/components/common/PhoneNumberField.tsx

@@ -5,7 +5,6 @@ import MuiPhoneNumber from 'material-ui-phone-number'
 import React, { useCallback, useEffect } from 'react'
 
 import { validatePhoneNumber } from '../../api'
-import { removePlusSign } from '../../normalizers'
 
 export interface IPhoneNumberField {
   label: string;
@@ -15,13 +14,23 @@ export interface IPhoneNumberField {
   // optional
   type: string;
   disableDropdown: boolean;
+  fill: boolean
 }
 
 export const PhoneNumberField = ({
   label,
   field,
-  form: { errors,touched, setFieldError, setStatus, initialValues, setFieldValue },
-  disableDropdown = true
+  form: {
+    errors,
+    touched,
+    setFieldError,
+    setStatus,
+    values,
+    initialValues,
+    setFieldValue,
+  },
+  disableDropdown = true,
+  fill = false
 }: IPhoneNumberField) => {
   const error = _get(errors, field.name)
   const isTouched = Boolean(_get(touched, field.name))
@@ -59,16 +68,17 @@ export const PhoneNumberField = ({
   return (
     <MuiPhoneNumber
       name={field.name}
-      value={initialValues.phone}
-      onChange={(e: any) => setFieldValue(field.name, removePlusSign(e))}
+      value={fill ? values.phone : initialValues.phone}
+      onChange={(e: any) => setFieldValue(field.name, e)}
       variant="outlined"
-      defaultCountry='us'
+      defaultCountry="us"
       disableDropdown={disableDropdown}
       label={label}
       error={!!error && isTouched}
       helperText={isTouched && error}
       fullWidth
       autoFormat={false}
+      disableAreaCodes={true}
     />
   )
 }

package/src/env.ts

@@ -6,7 +6,8 @@ export const ENV = {
   CLIENT_SECRET: 'b89c191eff22fdcf84ac9bfd88d005355a151ec2c83b26b9',
   STRIPE_PUBLISHABLE_KEY:
     'pk_test_51H4BkOGqveRD6EShliLrT9vd7mPOBPvQSuqmvc3wIinDqxWsCLeS2N7HonPPn6MhjU35ayYy5v4I6MLlD4jNWrd000NSgAF6UL',
-  BRAND_SLUG: 'mana-onetree-testing-brand'
+  BRAND_SLUG: 'mana-onetree-testing-brand',
+  'X_SOURCE_ORIGIN': 'manacommon.com'
 }
 
 // prod

package/src/components/common/dist/PhoneNumberField.js

@@ -1,96 +0,0 @@
-"use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-exports.__esModule = true;
-exports.PhoneNumberField = void 0;
-var TextField_1 = require("@mui/material/TextField");
-var debounce_1 = require("lodash/debounce");
-var get_1 = require("lodash/get");
-var react_1 = require("react");
-var api_1 = require("../../api");
-exports.PhoneNumberField = function (_a) {
-    var label = _a.label, _b = _a.type, type = _b === void 0 ? 'text' : _b, field = _a.field, _c = _a.form, errors = _c.errors, setFieldError = _c.setFieldError, setStatus = _c.setStatus;
-    var error = get_1["default"](errors, field.name);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    var debounceCb = react_1.useCallback(debounce_1["default"](function (cb) { return void cb(); }, 1000), []);
-    react_1.useEffect(function () {
-        var _a;
-        if (field.value) {
-            setStatus((_a = {}, _a[field.name] = true, _a));
-        }
-        debounceCb(function () { return __awaiter(void 0, void 0, void 0, function () {
-            var error_1, message;
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _b.trys.push([0, 3, 4, 5]);
-                        if (!field.value) return [3 /*break*/, 2];
-                        return [4 /*yield*/, api_1.validatePhoneNumber(field.value)];
-                    case 1:
-                        _b.sent();
-                        _b.label = 2;
-                    case 2:
-                        setFieldError(field.name, '');
-                        return [3 /*break*/, 5];
-                    case 3:
-                        error_1 = _b.sent();
-                        message = get_1["default"](error_1, 'response.data.message', 'Invalid phone number');
-                        setFieldError(field.name, message);
-                        return [3 /*break*/, 5];
-                    case 4:
-                        setStatus((_a = {}, _a[field.name] = false, _a));
-                        return [7 /*endfinally*/];
-                    case 5: return [2 /*return*/];
-                }
-            });
-        }); });
-        // eslint-disable-next-line
-    }, [field.value]);
-    return (react_1["default"].createElement(TextField_1["default"], __assign({}, field, { id: field.name, label: label, type: type, fullWidth: true, error: !!error, helperText: error, value: field.value || '', inputProps: { pattern: '[+0-9]/d+' } })));
-};