agorise/palmpay.mx-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into mx

Browse source
This commit is contained in:
Letícia Camara 2018-11-14 21:50:31 -02:00
commit 3aa855ef70
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/components/pages/MerchantsPage.js
View file

@ -55,12 +55,9 @@ const mapsStyles = {
const columnData = [ const columnData = [
{ id: 'name', numeric: false, disablePadding: true, label: 'Name' }, { id: 'name', numeric: false, disablePadding: true, label: 'Name' },
{ id: 'address', numeric: false, disablePadding: true, label: 'Address' }, { id: 'address', numeric: false, disablePadding: true, label: 'Address' },
{ id: 'city', numeric: false, disablePadding: true, label: 'City' },
{ id: 'country', numeric: false, disablePadding: true, label: 'Country' },
{ id: 'phone', numeric: false, disablePadding: true, label: 'Phone' }, { id: 'phone', numeric: false, disablePadding: true, label: 'Phone' },
{ id: 'link', numeric: false, disablePadding: false, label: 'Website' },
{ id: 'telegram', numeric: false, disablePadding: true, label: 'Telegram' }, { id: 'telegram', numeric: false, disablePadding: true, label: 'Telegram' },
{ id: 'website', numeric: false, disablePadding: true, label: 'Website' }, { id: 'link', numeric: false, disablePadding: false, label: 'Website' },
{ id: 'map', numeric: false, disablePadding: false, label: 'Maps', disableSearch: true} { id: 'map', numeric: false, disablePadding: false, label: 'Maps', disableSearch: true}
]; ];
@ -242,7 +239,8 @@ class MerchantsPage extends Component {
variant="contained" variant="contained"
style={{ style={{
backgroundColor: "#139657", backgroundColor: "#139657",
color: 'white' color: 'white',
whiteSpace: 'nowrap'
}} }}
onClick={() => this.openMaps( onClick={() => this.openMaps(
merchant.name, merchant.name,