tg-core-components 5.4.5-bethard → 5.5.1-master

package/lib/widgets/CashierAccordion/Deposit/BonusCodeInput/index.js

@@ -10,9 +10,13 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
-var _Input = require('../../../../components/Input');
+var _TextInput = require('../../../../components/Deposit/TextInput');
 
-var _Input2 = _interopRequireDefault(_Input);
+var _TextInput2 = _interopRequireDefault(_TextInput);
+
+var _Icon = require('../../../../components/Icon');
+
+var _Icon2 = _interopRequireDefault(_Icon);
 
 var _reactIntl = require('react-intl');
 
@@ -66,14 +70,16 @@ var BonusCodeInput = function (_Component) {
         return _react2.default.createElement(
           'div',
           { className: 'bonus-code-input-wrapper' },
-          _react2.default.createElement(_Input2.default, {
+          _react2.default.createElement(_TextInput2.default, {
             name: 'bonusCode',
-            value: bonusCode,
-            onChange: onChange,
             autoFocus: true,
-            label: (0, _translate2.default)({ id: 'cashier.bonus_code' }, intl),
+            placeholder: (0, _translate2.default)({ id: 'cashier.bonus_code' }, intl),
             disabled: disabled,
-            status: status === 'active' && 'success' || status === 'pending' && 'loading'
+            onChange: onChange
+          }),
+          status && _react2.default.createElement(_Icon2.default, {
+            icon: status === 'active' ? 'check' : '',
+            className: 'bonus-icon bonus-' + status
           })
         );
       }

package/lib/widgets/CashierAccordion/Deposit/DepositWidget/index.js

@@ -46,9 +46,9 @@ var _marked = require('marked');
 
 var _marked2 = _interopRequireDefault(_marked);
 
-var _Input = require('../../../../components/Input');
+var _TextInput = require('../../../../components/Deposit/TextInput');
 
-var _Input2 = _interopRequireDefault(_Input);
+var _TextInput2 = _interopRequireDefault(_TextInput);
 
 var _PaymentAmountSelector = require('../../Payment/PaymentAmountSelector');
 
@@ -90,6 +90,8 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }
+
 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; }
@@ -233,8 +235,7 @@ var DepositWidget = function (_Component) {
           renderAllowBonusWarning = _props.renderAllowBonusWarning,
           paymentStats = _props.paymentStats,
           _props$shouldAutoFocu = _props.shouldAutoFocus,
-          shouldAutoFocus = _props$shouldAutoFocu === undefined ? false : _props$shouldAutoFocu,
-          hideSelectedBonus = _props.hideSelectedBonus;
+          shouldAutoFocus = _props$shouldAutoFocu === undefined ? false : _props$shouldAutoFocu;
 
 
       var accountExclusions = payments.filter(function (provider) {
@@ -247,7 +248,11 @@ var DepositWidget = function (_Component) {
       }).map(function (provider) {
         return provider.providerType.toUpperCase();
       });
-      var customAmountExclusions = ['reversewithdrawal'];
+      var customAmountExclusions = [].concat(_toConsumableArray(payments.filter(function (provider) {
+        return provider.hideCustomAmount;
+      }).map(function (provider) {
+        return provider.providerType.toLowerCase();
+      })), ['reversewithdrawal']);
       var minMaxExclusions = ['reversewithdrawal'];
 
       var minDepositBonusAmount = this.getMinDepositBonusAmount();
@@ -258,8 +263,6 @@ var DepositWidget = function (_Component) {
         return (0, _Payment.matchProviderType)(payment, selectedMethod);
       });
 
-      var hasCustomAmounts = selectedMethodDetail && selectedMethodDetail.customAmounts;
-
       var selectedBonus = bonuses.find(function (b) {
         return b.PromoCode === bonusCode;
       });
@@ -286,13 +289,13 @@ var DepositWidget = function (_Component) {
             bonuses: bonuses,
             onSelect: this.onSelectBonus,
             selectedBonus: selectedBonus
-          }) : !hideSelectedBonus ? _react2.default.createElement(SelectedBonus, {
+          }) : _react2.default.createElement(SelectedBonus, {
             selectedBonus: selectedBonus,
             onClick: function onClick() {
               _this2.onSelectBonus('');
               _this2.setState({ showBonusSlider: true });
             }
-          }) : null),
+          })),
           _react2.default.createElement(_reactFinalForm.Form, {
             onSubmit: this.handleNextStep,
             initialValues: {
@@ -356,7 +359,7 @@ var DepositWidget = function (_Component) {
                   onSelectMethod: _this2.onSelectMethod,
                   onDeleteAccount: _this2.onDeleteAccount,
                   methodContent: function methodContent(method) {
-                    if (method.txType !== selectedMethod.txType || method.service !== selectedMethod.service) return null;
+                    if (method.txType !== selectedMethod.txType) return null;
 
                     return _react2.default.createElement(
                       _react.Fragment,
@@ -366,7 +369,7 @@ var DepositWidget = function (_Component) {
                       renderNotVerifiedNotice && renderNotVerifiedNotice(currentAmount),
                       renderCanceledNotice && renderCanceledNotice(),
                       renderAllowBonusWarning && renderAllowBonusWarning(selectedMethodDetail, _this2.state.bonusCode),
-                      selectedMethod.txType === 'SwishDeposit' && _react2.default.createElement(_Input2.default, {
+                      selectedMethod.txType === 'SwishDeposit' && _react2.default.createElement(_TextInput2.default, {
                         className: 'swish-number',
                         name: 'swishNumber',
                         type: 'tel',
@@ -374,6 +377,7 @@ var DepositWidget = function (_Component) {
                           id: 'label.mobile_number_placeholder',
                           defaultMessage: 'eg. 0701234567'
                         }, intl),
+                        isControlled: true,
                         value: _this2.state.swishNumber,
                         title: (0, _translate2.default)({
                           id: 'label.mobile_number'
@@ -402,30 +406,26 @@ var DepositWidget = function (_Component) {
                           return _this2.setState({ buttonLoading: buttonLoading });
                         }
                       }),
-                      !customAmountExclusions.includes(selectedMethod.providerType.toLowerCase()) && !hasCustomAmounts && _react2.default.createElement(
+                      !customAmountExclusions.includes(selectedMethod.providerType.toLowerCase()) && _react2.default.createElement(
                         'div',
                         { className: 'custom-amount-and-submit' },
-                        _react2.default.createElement(_Input2.default, {
-                          required: true,
+                        _react2.default.createElement(_TextInput2.default, {
                           pattern: '[0-9]*',
                           className: 'custom-amount',
                           name: 'amount',
                           type: 'number',
                           step: '0.01',
-                          label: (0, _translate2.default)({
+                          placeholder: (0, _translate2.default)({
                             id: 'label.amount'
                           }, intl),
-                          status: errors && errors.amount && errors.amount.length ? 'failure' : '',
-                          value: currentAmount,
+                          showErrorText: false,
+                          showErrorIcon: errors && errors.amount && errors.amount.length > 0,
                           onChange: function onChange(e) {
                             return _this2.setState({
                               currentAmount: e.target.value
                             });
                           },
-                          autoFocus: shouldAutoFocus,
-                          setRef: function setRef(ref) {
-                            return _this2.amountInputRef = ref;
-                          }
+                          autoFocus: shouldAutoFocus
                         }),
                         _react2.default.createElement(
                           _Button2.default,
@@ -449,7 +449,7 @@ var DepositWidget = function (_Component) {
                       _react2.default.createElement(
                         'div',
                         { className: 'bonus-limit' },
-                        !minMaxExclusions.includes(selectedMethod.providerType.toLowerCase()) && !hasCustomAmounts && selectedMethod && selectedMethod.limit && _react2.default.createElement(_MethodMinMax2.default, {
+                        !minMaxExclusions.includes(selectedMethod.providerType.toLowerCase()) && !customAmountExclusions.includes(selectedMethod.providerType.toLowerCase()) && selectedMethod && selectedMethod.limit && _react2.default.createElement(_MethodMinMax2.default, {
                           method: selectedMethod,
                           currency: currency,
                           minDepositBonusAmount: minDepositBonusAmount,
@@ -521,8 +521,7 @@ var DepositWidget = function (_Component) {
             render: function render(_ref5) {
               var handleSubmit = _ref5.handleSubmit,
                   values = _ref5.values,
-                  change = _ref5.change,
-                  form = _ref5.form;
+                  change = _ref5.change;
               return _react2.default.createElement(
                 _react.Fragment,
                 null,
@@ -547,10 +546,7 @@ var DepositWidget = function (_Component) {
                     _react2.default.createElement(
                       'div',
                       { className: 'account-details' },
-                      _react2.default.createElement(PaymentAccountForm, _extends({}, paymentAccountFormProps, {
-                        change: form.change,
-                        values: values
-                      }))
+                      _react2.default.createElement(PaymentAccountForm, paymentAccountFormProps)
                     ),
                     _react2.default.createElement(
                       _Button2.default,
@@ -696,16 +692,9 @@ var _initialiseProps = function _initialiseProps() {
         currency = _props3.currency,
         paymentStats = _props3.paymentStats,
         remainingDepositLimit = _props3.remainingDepositLimit,
-        payments = _props3.payments,
-        shouldAutoFocus = _props3.shouldAutoFocus;
+        payments = _props3.payments;
 
 
-    if (shouldAutoFocus) {
-      setTimeout(function () {
-        _this3.amountInputRef && _this3.amountInputRef.focus();
-      }, 1);
-    }
-
     var selectedMethodDetail = payments.find(function (payment) {
       return (0, _Payment.matchProviderType)(payment, method);
     });

package/lib/widgets/CashierAccordion/Deposit/PaymentForm/index.js

@@ -29,10 +29,6 @@ var _PaymentResult = require('./PaymentResult');
 
 var _PaymentResult2 = _interopRequireDefault(_PaymentResult);
 
-var _NewTab = require('./NewTab');
-
-var _NewTab2 = _interopRequireDefault(_NewTab);
-
 var _flatten = require('lodash/flatten');
 
 var _flatten2 = _interopRequireDefault(_flatten);
@@ -114,8 +110,7 @@ var PaymentForm = function (_Component) {
     value: function render() {
       var _props = this.props,
           data = _props.data,
-          onClose = _props.onClose,
-          details = _props.details;
+          onClose = _props.onClose;
 
       if (!data.success) {
         return _react2.default.createElement(PaymentError, { data: data, onClose: onClose });
@@ -134,9 +129,7 @@ var PaymentForm = function (_Component) {
         frameBorder: 0
       };
 
-      if (details && details.newTab) {
-        return _react2.default.createElement(_NewTab2.default, { url: data.redirectOutput.url });
-      } else if (data.redirectOutput.container == 'iframe' && data.redirectOutput.method == 'POST' && data.redirectOutput.html == null) {
+      if (data.redirectOutput.container == 'iframe' && data.redirectOutput.method == 'POST' && data.redirectOutput.html == null) {
         return _react2.default.createElement(FormWithIframe, _extends({
           frameProps: frameProps,
           target: frameId

package/lib/widgets/CashierAccordion/Payment/PaymentAccountForms/astroPayBankTransaltions.js

@@ -38,6 +38,18 @@ exports.default = function (intl, category, type) {
           id: 'cashier.details.accountTypes.I',
           defaultMessage: 'International account'
         }, intl);
+      },
+      M: function M() {
+        return (0, _translate2.default)({
+          id: 'cashier.details.accountTypes.M',
+          defaultMessage: 'Master account'
+        }, intl);
+      },
+      V: function V() {
+        return (0, _translate2.default)({
+          id: 'cashier.details.accountTypes.V',
+          defaultMessage: 'Salary account'
+        }, intl);
       }
     },
     services: {