Merge branch 'master' of https://git.m-labs.hk/M-Labs/web2019

fix(issue#16): Shows warning only when needed
2020-04-21 11:19:21 +09:00 · 2020-04-21 11:18:46 +09:00
1 changed files with 1 additions and 1 deletions
--- a/static/js/shop.jsx
+++ b/static/js/shop.jsx
@ -680,7 +680,7 @@ class ProductCartItem extends React.PureComponent {
                <img className="alert-warning" src={warning ? `/images${warning.icon}` : null} />
              )}

-              {warning &&  (
+              {warning && model.showWarning &&  (
                <div className={`k-popup-warning ${shouldTooltipWarningClassInverted ? 'inverted': ''}`}>
                  <p className="rule warning">
                    <i>{warning.message}</i>
Author	SHA1	Message	Date
sovanna	fa8638c411	Merge branch 'master' of https://git.m-labs.hk/M-Labs/web2019	2020-04-21 11:19:21 +09:00
sovanna	41a19b9910	fix(issue#16): Shows warning only when needed	2020-04-21 11:18:46 +09:00