Skip to content

Commit fe6562c

Browse files
authored
Merge pull request #104 from coding-blocks/coupon_cashback_tooltip
tooltip added for cashback field in coupon form
2 parents 33ae5e7 + 43e1416 commit fe6562c

File tree

3 files changed

+34
-21
lines changed

3 files changed

+34
-21
lines changed

forms/BulkCoupon.js

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import FieldWithElement from '../components/FieldWithElement';
77
import * as controller from '../controllers/v2/couponsV2'
88
import Swal from 'sweetalert2';
99
import config from "../config";
10+
import Tooltip from '@material-ui/core/Tooltip';
1011

1112
const bulkCouponSchema = Yup.object().shape({
1213
authority_doc: Yup.string().min(3)
@@ -407,16 +408,20 @@ class BulkCouponForm extends React.Component {
407408
name={"cashback(%)"} nameCols={3} elementCols={9}
408409
elementClassName={"pl-4"} errorColor={'tomato'}
409410
errors={touched.cashback && errors.cashback}>
410-
<input
411-
type="number"
412-
className={"input-text"}
413-
id={values.percentage === 100 ? "disabled-cashback" : "cashback"}
414-
placeholder="Enter cashback"
415-
name="cashback"
416-
onBlur={handleBlur}
417-
onChange={handleChange}
418-
value={values.cashback}
419-
/>
411+
412+
<Tooltip title={<span className={"mui-tooltip"}>% of product price to be added as cashback</span>}
413+
placement="bottom-end">
414+
<input
415+
type="number"
416+
className={"input-text"}
417+
id={values.percentage === 100 ? "disabled-cashback" : "cashback"}
418+
placeholder="Enter cashback"
419+
name="cashback"
420+
onBlur={handleBlur}
421+
onChange={handleChange}
422+
value={values.cashback}
423+
/>
424+
</Tooltip>
420425
</FieldWithElement>
421426

422427
</div>

forms/Coupon.js

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import SelectedUsers from "../components/SelectedUsers";
1111
import config from "../config";
1212
import CouponProductsNotice from '../components/CouponProductsNotice'
1313
import withReactContent from "sweetalert2-react-content";
14+
import Tooltip from '@material-ui/core/Tooltip';
1415

1516
const ReactSwal = withReactContent(Swal);
1617

@@ -581,17 +582,21 @@ class CouponForm extends React.Component {
581582
name={"cashback(%)"} nameCols={3} elementCols={9}
582583
elementClassName={"pl-4"} errorColor={'tomato'}
583584
errors={touched.cashback && errors.cashback}>
584-
<input
585-
type="number"
586-
className={"input-text"}
587-
id={values.percentage === 100 ? "disabled-cashback" : "cashback"}
588-
placeholder="Enter cashback"
589-
name="cashback"
590-
onBlur={handleBlur}
591-
onChange={handleChange}
592-
value={values.cashback}
593-
disabled={values.percentage === 100}
594-
/>
585+
586+
<Tooltip title={<span className={"mui-tooltip"}>% of product price to be added as cashback</span>}
587+
placement="bottom-end">
588+
<input
589+
type="number"
590+
className={"input-text"}
591+
id={values.percentage === 100 ? "disabled-cashback" : "cashback"}
592+
placeholder="Enter cashback"
593+
name="cashback"
594+
onBlur={handleBlur}
595+
onChange={handleChange}
596+
value={values.cashback}
597+
disabled={values.percentage === 100}
598+
/>
599+
</Tooltip>
595600
</FieldWithElement>
596601

597602
</div>

styles/pages/admin/coupons2.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,6 @@
3030
padding-top: 5px;
3131
}
3232

33+
.mui-tooltip {
34+
font-size: 10px;
35+
}

0 commit comments

Comments
 (0)