x25 5.1.25 → 5.1.26

package/Header/Header.js

@@ -111,7 +111,7 @@ var Header = function Header(_ref) {
     typeof company === "undefined" || company.size === 0 ? null : showNoticeToPay ? _react2.default.createElement(
       "div",
       { className: "alert alert-warning m-2" },
-      "Conform noilor termeni \u0219i condi\u021Bii, abonamentul t\u0103u va expira  " + (0, _moment2.default)(company.get("ValabilityDate")).endOf("day").fromNow() + ".\n              Pentru a beneficia de serviciul de facturare, achita\u021Bi online sau transfer bancar.  ",
+      "Abonamentul t\u0103u va expira  " + (0, _moment2.default)(company.get("ValabilityDate")).endOf("day").fromNow() + ".\n              Pentru a beneficia de serviciul de facturare, achita\u021Bi online sau transfer bancar.  ",
       _react2.default.createElement(
         "button",
         {

package/Inputs/Business/CifField.js

@@ -6,8 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
 var _react = require("react");
 
 var _react2 = _interopRequireDefault(_react);
@@ -18,95 +16,95 @@ var _classnames2 = _interopRequireDefault(_classnames);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
-var CifField = function (_React$Component) {
-  _inherits(CifField, _React$Component);
-
-  function CifField() {
-    _classCallCheck(this, CifField);
-
-    return _possibleConstructorReturn(this, (CifField.__proto__ || Object.getPrototypeOf(CifField)).apply(this, arguments));
-  }
-
-  _createClass(CifField, [{
-    key: "shouldComponentUpdate",
-    value: function shouldComponentUpdate(nextProps) {
-      return this.props.input !== nextProps.input || this.props.meta.submitting !== nextProps.meta.submitting || this.props.meta.touched !== nextProps.meta.touched || this.props.meta.error !== nextProps.meta.error;
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      var _props = this.props,
-          input = _props.input,
-          findDetailsByCif = _props.findDetailsByCif,
-          _props$meta = _props.meta,
-          error = _props$meta.error,
-          submitting = _props$meta.submitting,
-          touched = _props$meta.touched,
-          handleKeyPressed = _props.handleKeyPressed,
-          onRegisterRef = _props.onRegisterRef;
-      var name = input.name;
-
-
-      return _react2.default.createElement(
+var CifField = function CifField(props) {
+  var input = props.input,
+      hasRequested = props.hasRequested,
+      isWaiting = props.isWaiting,
+      isGood = props.isGood,
+      findDetailsByCif = props.findDetailsByCif,
+      icon = props.icon,
+      handleKeyUp = props.handleKeyUp,
+      onRegisterRef = props.onRegisterRef,
+      right = props.right,
+      left = props.left,
+      foundData = props.foundData;
+  var name = input.name;
+  var _props$meta = props.meta,
+      error = _props$meta.error,
+      submitting = _props$meta.submitting,
+      touched = _props$meta.touched;
+
+
+  return _react2.default.createElement(
+    "div",
+    { className: "form-group row" },
+    _react2.default.createElement(
+      "label",
+      {
+        className: "text-md-right\n      form-control-label\n      form-control-lg " + (left ? left : "col-md-3"), htmlFor: name },
+      "C.I.F "
+    ),
+    _react2.default.createElement(
+      "div",
+      { className: right ? right : "col-md-9 col-lg-6" },
+      _react2.default.createElement(
         "div",
-        { className: "form-group row" },
-        _react2.default.createElement(
-          "label",
-          {
-            className: "\r col-md-3\r text-md-right\r form-control-label\r form-control-lg", htmlFor: name },
-          "C.I.F "
-        ),
+        { className: "input-group" },
+        _react2.default.createElement("input", _extends({}, input, {
+          "aria-label": "Cod de identificare fiscal\u0103",
+          className: (0, _classnames2.default)("form-control form-control-lg hide-arrrow", {
+            "is-valid": isGood,
+            "is-invalid": touched && error
+          }),
+          disabled: submitting && !(submitting && isWaiting),
+          id: name,
+          name: name,
+          onKeyUp: handleKeyUp,
+          placeholder: "ex. 51584214",
+          ref: onRegisterRef,
+          type: "tel"
+        })),
         _react2.default.createElement(
           "div",
-          { className: "col-md-9 col-lg-6" },
+          { className: "input-group-append" },
           _react2.default.createElement(
-            "div",
-            { className: "input-group" },
-            _react2.default.createElement("input", _extends({}, input, {
-              "aria-label": "Cod de identificare fiscal\u0103",
-              className: (0, _classnames2.default)("form-control form-control-lg", {
-                "is-invalid": touched && error
-              }),
-              disabled: submitting,
-              id: name,
-              name: name,
-              onKeyPress: handleKeyPressed,
-              placeholder: "ex. 51584214",
-              ref: onRegisterRef,
-              type: "text"
-            })),
-            _react2.default.createElement(
-              "div",
-              { className: "input-group-append" },
-              _react2.default.createElement(
-                "button",
-                {
-                  className: "btn btn-secondary btn-lg btn-info",
-                  disabled: submitting,
-                  onClick: findDetailsByCif(input.value),
-                  title: "Preia datele de pe Internet",
-                  type: "button" },
-                _react2.default.createElement("i", { className: "fa fa-search" })
-              )
-            )
-          ),
-          _react2.default.createElement(
-            "div",
-            { className: "invalid-feedback is-valid" },
-            touched && error ? error : null
+            "button",
+            {
+              className: "btn btn-primary btn-lg",
+              disabled: submitting || isWaiting,
+              onClick: findDetailsByCif(input.value),
+              title: "Preia datele de pe Internet",
+              type: "button" },
+            _react2.default.createElement("i", { className: "fa " + (icon ? icon : "fa-search") })
           )
         )
-      );
-    }
-  }]);
-
-  return CifField;
-}(_react2.default.Component);
+      ),
+      _react2.default.createElement(
+        "div",
+        { className: "col small" },
+        isWaiting ? _react2.default.createElement(
+          "span",
+          null,
+          _react2.default.createElement("span", { className: "spinner-border spinner-border-sm text-primary me-2", role: "status" }),
+          "Preluare automată date..."
+        ) : hasRequested ? foundData ? _react2.default.createElement(
+          "div",
+          { className: "text-success" },
+          _react2.default.createElement("i", { className: "fa fa-check me-2" }),
+          "Datele firmei au fost preluate automat"
+        ) : _react2.default.createElement(
+          "div",
+          { className: "text-warning" },
+          "Nu se pot prelua automat datele firmei"
+        ) : " "
+      ),
+      _react2.default.createElement(
+        "div",
+        { className: "invalid-feedback is-valid" },
+        touched && error ? error : null
+      )
+    )
+  );
+};
 
 exports.default = CifField;

package/Inputs/Business/CifFieldContainer.js

@@ -6,7 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }(); /* eslint-disable no-magic-numbers */
+
+// import { notify, notifyError, notifyWarning } from "Extern/actions";
 
 var _react = require("react");
 
@@ -14,144 +16,232 @@ var _react2 = _interopRequireDefault(_react);
 
 var _immutable = require("redux-form/immutable");
 
-var _reactRedux = require("react-redux");
-
 var _request = require("./request");
 
 var _actions = require("../../actions");
 
-var actions = _interopRequireWildcard(_actions);
-
 var _utility = require("../../utility");
 
 var _CifField = require("./CifField");
 
 var _CifField2 = _interopRequireDefault(_CifField);
 
+var _reactRedux = require("react-redux");
+
+var _immutable2 = require("immutable");
+
+var Immutable = _interopRequireWildcard(_immutable2);
+
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+var CifContainer = function CifContainer(props) {
+  var dispatch = (0, _reactRedux.useDispatch)(),
+      isGood = (0, _utility.isValidCIF)(props.input.value),
+      _React$useState = _react2.default.useState(Immutable.Map()),
+      _React$useState2 = _slicedToArray(_React$useState, 2),
+      theHistory = _React$useState2[0],
+      setTheHistory = _React$useState2[1],
+      _React$useState3 = _react2.default.useState(false),
+      _React$useState4 = _slicedToArray(_React$useState3, 2),
+      isWaiting = _React$useState4[0],
+      setIsWaiting = _React$useState4[1],
+      _React$useState5 = _react2.default.useState(false),
+      _React$useState6 = _slicedToArray(_React$useState5, 2),
+      foundData = _React$useState6[0],
+      setFoundData = _React$useState6[1],
+      _React$useState7 = _react2.default.useState(false),
+      _React$useState8 = _slicedToArray(_React$useState7, 2),
+      hasRequested = _React$useState8[0],
+      setHasRequested = _React$useState8[1],
+      _React$useState9 = _react2.default.useState(),
+      _React$useState10 = _slicedToArray(_React$useState9, 2),
+      clearTextTimeout = _React$useState10[0],
+      setClearTextTimeout = _React$useState10[1],
+      _React$useState11 = _react2.default.useState(),
+      _React$useState12 = _slicedToArray(_React$useState11, 2),
+      typeDelay = _React$useState12[0],
+      setTypeDelay = _React$useState12[1],
+      clearText = function clearText() {
+    clearTimeout(clearTextTimeout);
+
+    setIsWaiting(false);
+    setHasRequested(false);
+    setFoundData(false);
+  },
+      searchOnWeb = function searchOnWeb(cif) {
+    var automatic = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    return function () {
+
+      // const temp = setTimeout(() => {
+
+      // }, 2000);
+
+      // setRequestTimeout(temp);
+
+
+      var changeFields = function changeFields(data) {
+        var _iteratorNormalCompletion = true;
+        var _didIteratorError = false;
+        var _iteratorError = undefined;
+
+        try {
+          for (var _iterator = data[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+            var _ref = _step.value;
+
+            var _ref2 = _slicedToArray(_ref, 2);
+
+            var key = _ref2[0];
+            var value = _ref2[1];
+
+            if (value !== "") {
+              dispatch((0, _immutable.change)(props.formID, key, value));
+            }
+          }
+        } catch (err) {
+          _didIteratorError = true;
+          _iteratorError = err;
+        } finally {
+          try {
+            if (!_iteratorNormalCompletion && _iterator.return) {
+              _iterator.return();
+            }
+          } finally {
+            if (_didIteratorError) {
+              throw _iteratorError;
+            }
+          }
+        }
+      },
+          endRequest = function endRequest(isOk) {
+        setIsWaiting(false);
+        setFoundData(isOk);
 
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+        setTheHistory(theHistory.set(cif, true));
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+        var temp2 = setTimeout(clearText, 3000);
 
-var createPromise = function createPromise(after) {
-  return new Promise(function (resolve) {
-    after();
-    setTimeout(function () {
-      resolve();
-    });
-  });
-};
-
-var tryToGetInfo = function tryToGetInfo(_ref) {
-  var dispatch = _ref.dispatch,
-      cif = _ref.cif,
-      focusInput = _ref.focusInput,
-      formID = _ref.formID;
-  return (0, _request.getCompanyDetails)(cif).then(function (response) {
-    var before = [createPromise(function () {
-      return dispatch(actions.notify("Am preluat informațiile"));
-    })],
-        changes = Object.keys(response).map(function (key) {
-      return function () {
-        return createPromise(function () {
-          return dispatch((0, _immutable.change)(formID, key, response[key]));
-        });
+        setClearTextTimeout(temp2);
       };
-    }),
-        after = [createPromise(function () {
-      return dispatch((0, _immutable.stopSubmit)(formID));
-    }), createPromise(function () {
-      return focusInput();
-    })];
-
-    var promises = before.concat(changes).concat(after);
-
-    promises.reduce(function (prev, cur) {
-      return prev.then(cur);
-    }, Promise.resolve());
-  }).catch(function () {
-    (0, _utility.delay)().then(function () {
-      dispatch(actions.notifyError("Nu am putut prelua informațiile firmei"));
-    }).then(function () {
-      dispatch((0, _immutable.stopSubmit)(formID));
-    }).then(function () {
-      focusInput();
-    });
-  });
-};
 
-var mapDispatchToProps = function mapDispatchToProps(dispatch, _ref2) {
-  var formID = _ref2.formID,
-      focusInput = _ref2.focusInput;
-  return {
-    findDetailsByCif: function findDetailsByCif(cif) {
-      return function () {
-        dispatch((0, _immutable.startSubmit)(formID));
-
-        if ((0, _utility.isValidCIF)(cif)) {
-          tryToGetInfo({
-            dispatch: dispatch,
-            cif: cif,
-            focusInput: focusInput,
-            formID: formID
+      // dispatch(startSubmit(props.formID));
+
+      clearTimeout(clearTextTimeout);
+      clearTimeout(typeDelay);
+
+      if ((0, _utility.isValidCIF)(cif)) {
+
+        setIsWaiting(true);
+        setHasRequested(true);
+        setFoundData(false);
+
+        // clearTimeout(requestTimeout);
+
+        var mainReason = props.reason ? props.reason : "",
+            reason = mainReason + " - " + (automatic ? "automatic" : "click buton");
+
+        (0, _request.getCompanyDetails)(cif, reason).then(function (response) {
+          var map = new Map();
+
+          Object.keys(response).forEach(function (key) {
+            if (key !== "Capital") {
+              map.set(key, response[key]);
+            }
           });
-        } else {
+
           (0, _utility.delay)().then(function () {
-            dispatch(actions.notifyError("Trebuie furnizat un CIF valid"));
+            changeFields(map);
+          }).
+          // then(() => {
+          //   dispatch(notify("Am preluat informațiile"));
+          // }).
+          then(function () {
+            // dispatch(stopSubmit(props.formID));
           }).then(function () {
-            dispatch((0, _immutable.stopSubmit)(formID));
+            props.focusInput();
           }).then(function () {
-            focusInput();
+            if (typeof props.onSuccess === "function") {
+              props.onSuccess(response);
+            }
+
+            endRequest(true);
           });
-        }
-      };
-    }
-  };
-};
+        }).catch(function () {
+          if (typeof onError === "function") {
+            (0, _utility.delay)().then(function () {
+              // dispatch(stopSubmit(props.formID));
+            }).then(function () {
+              props.onError();
+            });
+          } else {
+            (0, _utility.delay)().
+            // then(() => {
+            //   dispatch(notifyError("Nu am putut prelua informațiile firmei"));
+            // }).
+            then(function () {
+              dispatch((0, _immutable.stopSubmit)(props.formID));
+            }).then(function () {
+              props.focusInput();
+            });
+          }
+
+          endRequest(false);
+        });
+      } else {
+        (0, _utility.delay)().then(function () {
+          dispatch((0, _actions.notifyWarning)("Trebuie furnizat un CIF valid"));
+        }).then(function () {
+          // dispatch(stopSubmit(props.formID));
+        }).then(function () {
+          props.focusInput();
+        });
+      }
+    };
+  },
+      checkIfNeedsToRequest = function checkIfNeedsToRequest(current) {
+    clearText();
+    clearTimeout(typeDelay);
 
-var CifFieldContainer = function (_React$Component) {
-  _inherits(CifFieldContainer, _React$Component);
+    var typeTimeout = setTimeout(function () {
+      var isValid = (0, _utility.isValidCIF)(current),
+          hasNotRequestedThis = !theHistory.has(current);
 
-  function CifFieldContainer(props) {
-    _classCallCheck(this, CifFieldContainer);
+      if (isValid && hasNotRequestedThis) {
+        searchOnWeb(current, true)();
+      }
+    }, 2000);
 
-    var _this = _possibleConstructorReturn(this, (CifFieldContainer.__proto__ || Object.getPrototypeOf(CifFieldContainer)).call(this, props));
+    setTypeDelay(typeTimeout);
+  },
+      handleKeyUp = function handleKeyUp() {
+    setHasRequested(false);
+    var current = props.input.value;
 
-    _this.handleKeyPressed = function (event) {
-      var _this$props = _this.props,
-          findDetailsByCif = _this$props.findDetailsByCif,
-          value = _this$props.input.value;
+    checkIfNeedsToRequest(current);
 
+    // const { justEnter, input: { value } } = props;
 
-      if (event.key === "Enter" && event.shiftKey) {
-        event.preventDefault();
-        event.stopPropagation();
-        findDetailsByCif(value)();
-      }
-    };
-    return _this;
-  }
-
-  _createClass(CifFieldContainer, [{
-    key: "shouldComponentUpdate",
-    value: function shouldComponentUpdate(nextProps) {
-      return this.props.input !== nextProps.input || this.props.meta.submitting !== nextProps.meta.submitting || this.props.meta.touched !== nextProps.meta.touched || this.props.meta.error !== nextProps.meta.error;
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      return _react2.default.createElement(_CifField2.default, _extends({}, this.props, {
-        handleKeyPressed: this.handleKeyPressed
-      }));
-    }
-  }]);
-
-  return CifFieldContainer;
-}(_react2.default.Component);
-
-exports.default = (0, _reactRedux.connect)(null, mapDispatchToProps)(CifFieldContainer);
+    //   const fired = (
+    //     (justEnter && event.key === "Enter") ||
+    // (!justEnter && (event.key === "Enter" && event.shiftKey))
+    //   );
+
+    // if (fired) {
+    //   event.preventDefault();
+    //   event.stopPropagation();
+    //   findDetailsByCif(value)();
+    // }
+  };
+
+  return _react2.default.createElement(_CifField2.default, _extends({}, props, {
+    findDetailsByCif: searchOnWeb,
+    foundData: foundData,
+    handleKeyUp: handleKeyUp,
+    hasRequested: hasRequested,
+    isGood: isGood,
+    isWaiting: isWaiting
+  }));
+};
+
+exports.default = CifContainer;

package/Inputs/Business/request.js

@@ -32,8 +32,8 @@ var normalizeCompanyDetails = function normalizeCompanyDetails(resolve, reject)
   };
 };
 
-var getCompanyDetails = exports.getCompanyDetails = function getCompanyDetails(cif) {
+var getCompanyDetails = exports.getCompanyDetails = function getCompanyDetails(cif, reason) {
   return new Promise(function (resolve, reject) {
-    return _superagent2.default.post("/api/extern/get-company-information/" + cif).type("json").end(normalizeCompanyDetails(resolve, reject));
+    return _superagent2.default.post("/api/extern/get-company-information/" + cif + "/" + reason).type("json").end(normalizeCompanyDetails(resolve, reject));
   });
 };

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.1.25",
+  "version": "5.1.26",
   "name": "x25",
   "description": "x25",
   "scripts": {