From ad44177e7fb1cab4a40881e6f804ea1bca2bc2f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Let=C3=ADcia=20Camara?= <lettcamara@gmail.com>
Date: Mon, 12 Nov 2018 01:03:05 -0200
Subject: [PATCH] Add phone, clicable website and telegram to merchants map
 pins

---
 src/components/pages/MerchantsPage.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/components/pages/MerchantsPage.js b/src/components/pages/MerchantsPage.js
index 1f92dc2..25e1958 100644
--- a/src/components/pages/MerchantsPage.js
+++ b/src/components/pages/MerchantsPage.js
@@ -55,6 +55,8 @@ const mapsStyles = {
 const columnData = [
   { id: 'name', numeric: false, disablePadding: true, label: 'Name' },
   { 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: 'link', numeric: false, disablePadding: false, label: 'Website' },
   { id: 'telegram', numeric: false, disablePadding: true, label: 'telegram' },
@@ -225,6 +227,10 @@ class MerchantsPage extends Component {
           href={merchant.website}>{stripProtocol(merchant.website)}</a>
         )
       };
+      merchant.location = {
+        searchText: `${merchant.country} - ${merchant.city}`,
+        value: (merchant.city) ? `${merchant.city} - ${merchant.country}`: merchant.country
+      }
       merchant.map = <Button
         className="App-button"
         variant="contained"
@@ -284,6 +290,15 @@ class MerchantsPage extends Component {
       const infoDescription = <div>
       <div><b>Address</b>: {merchant.address}</div>
       {(merchant.phone) && (<div><b>Phone</b>: {merchant.phone}</div>)}
+      {(merchant.telegram_original) && (<div><b>Telegram</b>:
+        <a
+          href={`https://t.me/${(merchant.telegram_original.trim().charAt(0) === '@') ? merchant.telegram_original.trim().slice(1): merchant.telegram_original.trim()}`}
+          target="_blank"
+          rel="noopener noreferrer"
+        >{merchant.telegram_original}</a>
+        </div>)}
+      {(merchant.website) && (<div><b>Website:</b>: <a target="_blank" rel="noopener noreferrer"
+        href={merchant.website}>{stripProtocol(merchant.website)}</a></div>)}
       </div>;
       const marker = {
         lat: merchant.lat,