From 12c7f7c6a31b8c5b7b2227a06cb4a1df92efb4f9 Mon Sep 17 00:00:00 2001
From: harvey_chen <harveychenwork@gmail.com>
Date: Tue, 8 Feb 2022 12:57:37 +0800
Subject: [PATCH 1/7] braftEditor update.
---
.../od/management/dishes/edit/components/basic/InfoForm.tsx | 6 +++++-
.../od/management/dishes/edit/components/media/index.less | 4 ++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/pages/od/management/dishes/edit/components/basic/InfoForm.tsx b/src/pages/od/management/dishes/edit/components/basic/InfoForm.tsx
index a47f77c9..d5913b48 100644
--- a/src/pages/od/management/dishes/edit/components/basic/InfoForm.tsx
+++ b/src/pages/od/management/dishes/edit/components/basic/InfoForm.tsx
@@ -204,7 +204,11 @@ const InfoFormContent: React.FC<any> = forwardRef((props: any, ref: any) => {
/>,
)}
</Form.Item> */}
- <BraftEditor value={state} onChange={(editorState: any) => setState({ editorState })} />
+ <BraftEditor
+ language={'en'}
+ value={state}
+ onChange={(editorState: any) => setState({ editorState })}
+ />
</Col>
<Col span={2}>
{/* <IconFont type="icon-Translate" className={styles.langIconDescription} /> */}
diff --git a/src/pages/od/management/dishes/edit/components/media/index.less b/src/pages/od/management/dishes/edit/components/media/index.less
index ef00a843..97fce6c0 100644
--- a/src/pages/od/management/dishes/edit/components/media/index.less
+++ b/src/pages/od/management/dishes/edit/components/media/index.less
@@ -7,10 +7,10 @@
border-radius: 10px;
@media screen and (min-width: @screen-lg) {
- min-height: 785px;
+ min-height: 1365px;
}
@media screen and (max-width: @screen-lg) and (min-width: @screen-xs) {
- min-height: 785px;
+ min-height: 1365px;
}
.header {
--
GitLab
From d725b8b55460ed8a4ad21892a2b5a9d64df217e0 Mon Sep 17 00:00:00 2001
From: ericliu <39144388@qq.com>
Date: Wed, 30 Mar 2022 13:59:09 +1100
Subject: [PATCH 2/7] update io
---
config/socketIoSettings.ts | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/config/socketIoSettings.ts b/config/socketIoSettings.ts
index 810bb3bd..7ba77b50 100644
--- a/config/socketIoSettings.ts
+++ b/config/socketIoSettings.ts
@@ -1,6 +1,6 @@
export default {
- dev: 'http://io.menu.dev.joidea.com/socket.io/',
- prelive: 'https://io.menu.popsup.global/socket.io/',
- prod: 'https://io.menu.popsup.global/socket.io/',
+ dev: 'http://io.retail.dev.joidea.com/socket.io/',
+ prelive: 'https://io.retail.prelive.popsup.global/socket.io/',
+ prod: 'https://io.retail.popsup.global/socket.io/',
unset: 'unset',
};
--
GitLab
From 47832fb7feaeec32375c352ef3991012e921e3c1 Mon Sep 17 00:00:00 2001
From: victor-liu <victorliu1999@gmail.com>
Date: Thu, 7 Jul 2022 14:07:33 +1000
Subject: [PATCH 3/7] fix(translation): update translation key
---
src/pages/ca/dishes/list/components/DishesTitle.tsx | 2 +-
src/pages/ca/menus/list/components/MenusTitle.tsx | 2 +-
.../process/components/orderBody/components/ButtonGroup.tsx | 2 +-
.../od/management/dishes/edit/components/basic/InfoForm.tsx | 4 ++--
.../od/management/dishes/edit/components/basic/index.tsx | 2 +-
.../view/components/gridViewTable/components/DishDetail.tsx | 2 +-
.../dishes/view/components/listViewTable/ActionDetail.tsx | 2 +-
.../components/businessInfo/stock/stockLimit/index.tsx | 2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/pages/ca/dishes/list/components/DishesTitle.tsx b/src/pages/ca/dishes/list/components/DishesTitle.tsx
index 82f41257..657b9255 100644
--- a/src/pages/ca/dishes/list/components/DishesTitle.tsx
+++ b/src/pages/ca/dishes/list/components/DishesTitle.tsx
@@ -124,7 +124,7 @@ const DishesTitle: React.FC<any> = (props: any) => {
<div className={styles.icon}>
<Icon type="arrow-left" onClick={() => router.goBack()} />
</div>
- <div className={styles.text}>{tx('CA_Deals.all_dishes')}</div>
+ <div className={styles.text}>{tx('CA_Deals.all_products')}</div>
<div className={styles.actions}>
<Icon type="search" onClick={toggleSearchBar} />
<Dropdown
diff --git a/src/pages/ca/menus/list/components/MenusTitle.tsx b/src/pages/ca/menus/list/components/MenusTitle.tsx
index 955b61df..d9c9d3ab 100644
--- a/src/pages/ca/menus/list/components/MenusTitle.tsx
+++ b/src/pages/ca/menus/list/components/MenusTitle.tsx
@@ -15,7 +15,7 @@ const MenusTitle: React.FC<any> = (props: any) => {
{/* <div className={styles.icon}>
<Icon type="arrow-left" onClick={() => router.goBack()} />
</div> */}
- <div className={styles.text}>{tx('Global.menus')}</div>
+ <div className={styles.text}>{tx('Global.categories')}</div>
<div className={styles.bottom}>
<Link to="/ca/dishes">
<div>{tx('Global.view_all_dishes')}</div>
diff --git a/src/pages/ca/order/process/components/orderBody/components/ButtonGroup.tsx b/src/pages/ca/order/process/components/orderBody/components/ButtonGroup.tsx
index a9eb1567..8e1ce0fc 100644
--- a/src/pages/ca/order/process/components/orderBody/components/ButtonGroup.tsx
+++ b/src/pages/ca/order/process/components/orderBody/components/ButtonGroup.tsx
@@ -63,7 +63,7 @@ const DineInDetail: React.FC<any> = (props: any) => {
block
>
<FontAwesomeIcon className={styles.dineIcon} icon={faStoreAlt} />
- <div>{tx('Global.dine_in')}</div>
+ <div>{tx('Global.in_shop')}</div>
</Button>
</div>
)}
diff --git a/src/pages/od/management/dishes/edit/components/basic/InfoForm.tsx b/src/pages/od/management/dishes/edit/components/basic/InfoForm.tsx
index d5913b48..dfa484c2 100644
--- a/src/pages/od/management/dishes/edit/components/basic/InfoForm.tsx
+++ b/src/pages/od/management/dishes/edit/components/basic/InfoForm.tsx
@@ -218,7 +218,7 @@ const InfoFormContent: React.FC<any> = forwardRef((props: any, ref: any) => {
<Row gutter={{ xs: 8, sm: 8, lg: 8, xl: 8 }} style={{ display: 'flex', flexWrap: 'wrap' }}>
<Col xs={22} sm={22}>
<Form.Item
- label={txo('Management_Dish_Detail.from_menu')}
+ label={txo('Management_Dish_Detail.from_category')}
className={styles.selectStyle}
>
{getFieldDecorator('menu', {
@@ -227,7 +227,7 @@ const InfoFormContent: React.FC<any> = forwardRef((props: any, ref: any) => {
<Select
mode="multiple"
maxTagCount={2}
- placeholder={txo('Management_Dish_Detail.add_into_menu')}
+ placeholder={txo('Management_Dish_Detail.add_into_category')}
tokenSeparators={[',']}
>
{allMenus.map((item: any, idx: number) => (
diff --git a/src/pages/od/management/dishes/edit/components/basic/index.tsx b/src/pages/od/management/dishes/edit/components/basic/index.tsx
index 71aac304..ec1a9f30 100644
--- a/src/pages/od/management/dishes/edit/components/basic/index.tsx
+++ b/src/pages/od/management/dishes/edit/components/basic/index.tsx
@@ -36,7 +36,7 @@ const BasicInfo: React.FC<any> = (props: any) => {
return (
<Row className={styles.itemBasicInfoContainer}>
<div className={styles.header}>
- <div className={styles.headerText}>{txo('Management_Dish_Detail.dish_information')}</div>
+ <div className={styles.headerText}>{txo('Management_Dish_Detail.product_information')}</div>
<Button
className={styles.headerButton}
shape="round"
diff --git a/src/pages/od/management/dishes/view/components/gridViewTable/components/DishDetail.tsx b/src/pages/od/management/dishes/view/components/gridViewTable/components/DishDetail.tsx
index 2f008776..ce198f92 100644
--- a/src/pages/od/management/dishes/view/components/gridViewTable/components/DishDetail.tsx
+++ b/src/pages/od/management/dishes/view/components/gridViewTable/components/DishDetail.tsx
@@ -73,7 +73,7 @@ const DishDetail: React.FC<DishDetailProps> = (props: any) => {
</Link>
<div className={styles.iconButtomRight}>
<Popconfirm
- title={`${tx('Global.do_you_want_to_delete_this_dish')}?`}
+ title={`${tx('Global.do_you_want_to_delete_this_product')}?`}
onConfirm={deleteDish}
>
<Icon type="delete" />
diff --git a/src/pages/od/management/dishes/view/components/listViewTable/ActionDetail.tsx b/src/pages/od/management/dishes/view/components/listViewTable/ActionDetail.tsx
index ccc00889..88a70b97 100644
--- a/src/pages/od/management/dishes/view/components/listViewTable/ActionDetail.tsx
+++ b/src/pages/od/management/dishes/view/components/listViewTable/ActionDetail.tsx
@@ -19,7 +19,7 @@ const ActionDetail: React.FC<any> = (props: any) => {
const showConfirm = () => {
confirm({
- title: tx('Global.do_you_want_to_delete_this_dish'),
+ title: tx('Global.do_you_want_to_delete_this_product'),
okText: tx('Global.ok'),
onOk: () => {
const payload = { key: 'single', itemId: record.id };
diff --git a/src/pages/od/settings/business/components/businessInfo/stock/stockLimit/index.tsx b/src/pages/od/settings/business/components/businessInfo/stock/stockLimit/index.tsx
index 77b518a1..0ee9cd61 100644
--- a/src/pages/od/settings/business/components/businessInfo/stock/stockLimit/index.tsx
+++ b/src/pages/od/settings/business/components/businessInfo/stock/stockLimit/index.tsx
@@ -34,7 +34,7 @@ const Index: React.FC<any> = (props: any) => {
<Row className={styles.row}>
<div className={styles.switch}>
<Switch checked={Boolean(isChecked)} onChange={onChangeStock} />
- <div className={styles.text}>{txo('Global.total_stock_limit_on_all_dishes')}</div>
+ <div className={styles.text}>{txo('Global.total_stock_limit_on_all_products')}</div>
</div>
{isChecked && (
<Col xs={24} sm={24} md={24} lg={15} xl={12}>
--
GitLab
From eca282984ff04aebb980f8bc1d326866369c5c8a Mon Sep 17 00:00:00 2001
From: victor-liu <victorliu1999@gmail.com>
Date: Fri, 8 Jul 2022 14:43:06 +1000
Subject: [PATCH 4/7] feat(header): hide translation select in od and login
---
src/components/GlobalHeader/RightContent.tsx | 5 +++--
src/components/GlobalHeader/index.less | 7 ++-----
src/layouts/user/Header.tsx | 11 ++++-------
3 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/src/components/GlobalHeader/RightContent.tsx b/src/components/GlobalHeader/RightContent.tsx
index 51694203..c88c4603 100644
--- a/src/components/GlobalHeader/RightContent.tsx
+++ b/src/components/GlobalHeader/RightContent.tsx
@@ -81,9 +81,10 @@ const GlobalHeaderRight: React.FC<any> = props => {
{/* <Avatar /> */}
<HeaderAvatar modelKey="od" />
- <span className={styles.action}>
+ {/* Hide since 08/07/22 */}
+ {/* <span className={styles.action}>
<SelectLang modelKey="od" />
- </span>
+ </span> */}
</div>
);
};
diff --git a/src/components/GlobalHeader/index.less b/src/components/GlobalHeader/index.less
index 01471075..9bc7aa1e 100644
--- a/src/components/GlobalHeader/index.less
+++ b/src/components/GlobalHeader/index.less
@@ -9,9 +9,6 @@
:global(.ant-dropdown-menu-item) {
min-width: 160px;
}
-
-
-
}
.right {
@@ -19,11 +16,11 @@
height: 100%;
margin-left: auto;
overflow: hidden;
- min-width: 200px;
+ min-width: 70px;
display: flex;
align-items: center;
- .business{
+ .business {
color: @primary-color;
padding-right: 8px;
}
diff --git a/src/layouts/user/Header.tsx b/src/layouts/user/Header.tsx
index dbce67ff..4ea0e9e5 100644
--- a/src/layouts/user/Header.tsx
+++ b/src/layouts/user/Header.tsx
@@ -5,12 +5,9 @@ import { connect } from 'dva';
import SelectLang from '@/components/SelectLang';
import styles from './style.less';
-const Header: React.FC<any> = (props:any)=>{
- return(
- <div className={styles.lang}>
- <SelectLang modelKey='user' />
- </div>
- )
+const Header: React.FC<any> = (props: any) => {
+ // Hide since 08/07/22
+ return <div className={styles.lang}>{/* <SelectLang modelKey='user' /> */}</div>;
};
-export default connect(getMapStateToProps(['meta', 'loading',]))(Header);
+export default connect(getMapStateToProps(['meta', 'loading']))(Header);
--
GitLab
From 1bb8b5d84faec5727da74385371aa7d354c4778b Mon Sep 17 00:00:00 2001
From: victor-liu <victorliu1999@gmail.com>
Date: Fri, 8 Jul 2022 15:00:51 +1000
Subject: [PATCH 5/7] fix(style): add margin to header
---
src/components/GlobalHeader/index.less | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/components/GlobalHeader/index.less b/src/components/GlobalHeader/index.less
index 9bc7aa1e..9771fffb 100644
--- a/src/components/GlobalHeader/index.less
+++ b/src/components/GlobalHeader/index.less
@@ -19,6 +19,7 @@
min-width: 70px;
display: flex;
align-items: center;
+ margin-right: 20px;
.business {
color: @primary-color;
--
GitLab
From 113c7f078e15ad22d152440ae8d0eeb739041afc Mon Sep 17 00:00:00 2001
From: victor-liu <victorliu1999@gmail.com>
Date: Tue, 12 Jul 2022 14:43:42 +1000
Subject: [PATCH 6/7] fix(stripeKey): update stripe key
---
config/stripeSettings.ts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/config/stripeSettings.ts b/config/stripeSettings.ts
index 9c6212bc..66373d94 100644
--- a/config/stripeSettings.ts
+++ b/config/stripeSettings.ts
@@ -1,7 +1,7 @@
export default {
dev:
'pk_test_51ITybAGbwfjXBvRH5sB6j9b8H3r4IALrSsN84lALSVlKM0lHTrQ8yvgXc3tnPfl1Tbe88BUijsEnzM0RcRI9yrdu009mGBRBRv',
- prelive: 'pk_live_j0FQa1KotJNlenq9jc8MMBSm',
- prod: 'pk_live_j0FQa1KotJNlenq9jc8MMBSm',
+ prelive: 'pk_live_51KflcHG3Eym3g0bArZfUqfkuWjwqJr3zwKWTyAShn4iozdM2ZiAXsL61l5Wl01l0pQn0DpWGAgF95l4TXJPEt76I00GLz2wBb1',
+ prod: 'pk_live_51KflcHG3Eym3g0bArZfUqfkuWjwqJr3zwKWTyAShn4iozdM2ZiAXsL61l5Wl01l0pQn0DpWGAgF95l4TXJPEt76I00GLz2wBb1',
unset: 'unset',
};
--
GitLab
From ddf6e5cd61b96ac82ca7d28807fdc899bbc6d255 Mon Sep 17 00:00:00 2001
From: victor-liu <victorliu1999@gmail.com>
Date: Tue, 19 Jul 2022 16:12:51 +1000
Subject: [PATCH 7/7] fix(ca): display of rich text editor text correctly
---
.../list/components/dataList/ItemDescription.tsx | 11 +++--------
.../ca/dishes/list/components/dataList/style.less | 7 ++++++-
.../ca/dishes/view/components/dishInfo/index.tsx | 11 +++++++----
.../components/menuBody/dataList/ItemDescription.tsx | 4 ++--
.../view/components/menuBody/dataList/style.less | 9 +++++++--
src/utils/utils.ts | 4 ++++
6 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/src/pages/ca/dishes/list/components/dataList/ItemDescription.tsx b/src/pages/ca/dishes/list/components/dataList/ItemDescription.tsx
index 90669173..8d6b6518 100644
--- a/src/pages/ca/dishes/list/components/dataList/ItemDescription.tsx
+++ b/src/pages/ca/dishes/list/components/dataList/ItemDescription.tsx
@@ -1,12 +1,7 @@
-import React, { Component } from 'react';
+import React from 'react';
import { connect } from 'dva';
-import { getMapStateToProps } from '@/utils/utils';
+import { getMapStateToProps, createMarkup } from '@/utils/utils';
import styles from './style.less';
-import { Typography, Row } from 'antd';
-import { Icon } from 'antd';
-import Link from 'umi/link';
-
-const { Paragraph } = Typography;
interface ItemDecriptionProps {
item: any;
}
@@ -21,7 +16,7 @@ const ItemDescription: React.FC<ItemDecriptionProps> = (props: any) => {
return (
<div className={styles.descContainer}>
- <Paragraph className={styles.desc} ellipsis={{ rows:2}}>{description}</Paragraph>
+ <div dangerouslySetInnerHTML={createMarkup(description)} className={styles.desc} />
<div className={styles.taste}>{renderTag}</div>
</div>
);
diff --git a/src/pages/ca/dishes/list/components/dataList/style.less b/src/pages/ca/dishes/list/components/dataList/style.less
index 3d69a3d8..f217568c 100644
--- a/src/pages/ca/dishes/list/components/dataList/style.less
+++ b/src/pages/ca/dishes/list/components/dataList/style.less
@@ -1,7 +1,12 @@
.descContainer {
font-size: 10px;
.desc {
- line-height: 15px;
+ max-height: 50px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: block;
+ -webkit-line-clamp: 2;
+ -webkit-box-orient: vertical;
}
.taste {
color: #c4c4c4;
diff --git a/src/pages/ca/dishes/view/components/dishInfo/index.tsx b/src/pages/ca/dishes/view/components/dishInfo/index.tsx
index 99b9dc08..367a2006 100644
--- a/src/pages/ca/dishes/view/components/dishInfo/index.tsx
+++ b/src/pages/ca/dishes/view/components/dishInfo/index.tsx
@@ -3,7 +3,7 @@ import { connect } from 'dva';
import _ from 'lodash';
import styles from './index.less';
-import { getMapStateToProps } from '@/utils/utils';
+import { getMapStateToProps, createMarkup } from '@/utils/utils';
import { Button, Tag, Divider } from 'antd';
import Link from 'umi/link';
import { spaceName } from '../../config';
@@ -25,9 +25,12 @@ const MediaInfo: React.FC<any> = (props: any) => {
<div>{dishData.name}</div>
{dishData.price !== '0.00' && <div>{`$${dishData.price}`}</div>}
</div>
- <div className={styles.descInfo}>
- <span>{dishData.description}</span>
- </div>
+
+ <div
+ className={styles.descInfo}
+ dangerouslySetInnerHTML={createMarkup(dishData.description)}
+ />
+
<div>
{dishData.tag.map((item: string, key: any) => (
<Tag key={key}>{item}</Tag>
diff --git a/src/pages/ca/menus/view/components/menuBody/dataList/ItemDescription.tsx b/src/pages/ca/menus/view/components/menuBody/dataList/ItemDescription.tsx
index f4b82a13..25e56619 100644
--- a/src/pages/ca/menus/view/components/menuBody/dataList/ItemDescription.tsx
+++ b/src/pages/ca/menus/view/components/menuBody/dataList/ItemDescription.tsx
@@ -1,6 +1,6 @@
import React, { Component } from 'react';
import { connect } from 'dva';
-import { getMapStateToProps } from '@/utils/utils';
+import { getMapStateToProps, createMarkup } from '@/utils/utils';
import styles from './style.less';
import { Icon } from 'antd';
import { Typography } from 'antd';
@@ -20,7 +20,7 @@ const ItemDescription: React.FC<ItemDecriptionProps> = (props: any) => {
return (
<div className={styles.descContainer}>
- <Paragraph ellipsis={{rows: 2}} className={styles.descFont}>{item.description}</Paragraph>
+ <div dangerouslySetInnerHTML={createMarkup(item.description)} className={styles.descFont} />
<div className={styles.taste}>{tags}</div>
</div>
);
diff --git a/src/pages/ca/menus/view/components/menuBody/dataList/style.less b/src/pages/ca/menus/view/components/menuBody/dataList/style.less
index ea0e4e37..e2a8d23b 100644
--- a/src/pages/ca/menus/view/components/menuBody/dataList/style.less
+++ b/src/pages/ca/menus/view/components/menuBody/dataList/style.less
@@ -8,8 +8,13 @@
}
}
.descFont {
- line-height: 20px;
- font-size: 15px;
+ line-height: 15px;
+ max-height: 32px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: block;
+ -webkit-line-clamp: 2;
+ -webkit-box-orient: vertical;
}
.taste {
color: #c4c4c4;
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index 5a25abaa..5e394ebe 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -306,3 +306,7 @@ export const checkIsPassedListValid = (selectedList: number[], requireList: numb
}
return false;
};
+
+export const createMarkup = (content: any) => {
+ return { __html: content };
+};
--
GitLab