Merge pull request #18 from R-Mielamud/dev

Added created at preview and export
R-Mielamud · Jan 24, 2021 · 1ff0f70 · 1ff0f70
2 parents 3b80f68 + bc4b1a0
commit 1ff0f70
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 7 deletions.
diff --git a/frontend/src/constants/CSVHeaders.ts b/frontend/src/constants/CSVHeaders.ts
@@ -8,6 +8,6 @@ export const CSVHeaders = {
         "requisites.delivery_name",
         "requisites.post_service",
     ],
-    MESSENGER_BILL: ["user.phone", "user.messenger", "amount", "comment"],
-    MESSENGER_ORDER: ["user.phone", "user.messenger", "books"],
+    MESSENGER_BILL: ["user.phone", "user.messenger", "amount", "comment", "created_at"],
+    MESSENGER_ORDER: ["user.phone", "user.messenger", "books", "created_at"],
 };
diff --git a/frontend/src/containers/ChatbotAdminPage/BillsTable/index.tsx b/frontend/src/containers/ChatbotAdminPage/BillsTable/index.tsx
@@ -9,6 +9,7 @@ import { CSVHeaders } from "../../../constants/CSVHeaders";
 import { FileNames } from "../../../constants/FileNames";
 import RootState from "../../../typings/rootState";
 import StdSearch, { getStdFilter } from "../StdSearch";
+// import moment from "moment";
 
 const BillsTable: React.FC = () => {
     const { t } = useTranslation();
@@ -29,6 +30,7 @@ const BillsTable: React.FC = () => {
     });
 
     const displayBills: WebApi.BotEntity.Bill[] = messengerBills.filter(filterBills);
+    // {moment(bill.created_at).format("MMMM Do YYYY, h:mm a")}
 
     return (
         <Tab.Pane>
@@ -52,7 +54,8 @@ const BillsTable: React.FC = () => {
                         <Table.Header>
                             <Table.Row>
                                 <Table.HeaderCell width={2}>{t("phone")}</Table.HeaderCell>
-                                <Table.HeaderCell width={2}>{t("messenger")}</Table.HeaderCell>
+                                <Table.HeaderCell width={1}>{t("messenger")}</Table.HeaderCell>
+                                <Table.HeaderCell width={2}>{t("creation_date")}</Table.HeaderCell>
                                 <Table.HeaderCell width={6}>{t("amount")}</Table.HeaderCell>
                                 <Table.HeaderCell width={7}>{t("comment")}</Table.HeaderCell>
                             </Table.Row>
@@ -62,6 +65,7 @@ const BillsTable: React.FC = () => {
                                 <Table.Row key={bill.id}>
                                     <Table.Cell>{bill.user.phone}</Table.Cell>
                                     <Table.Cell>{bill.user.messenger}</Table.Cell>
+                                    <Table.Cell>{bill.created_at}</Table.Cell>
                                     <Table.Cell>{bill.amount}</Table.Cell>
                                     <Table.Cell>{bill.comment}</Table.Cell>
                                 </Table.Row>

diff --git a/frontend/src/containers/ChatbotAdminPage/OrdersTable/index.tsx b/frontend/src/containers/ChatbotAdminPage/OrdersTable/index.tsx
@@ -53,15 +53,17 @@ const OrdersTable: React.FC = () => {
                         <Table.Header>
                             <Table.Row>
                                 <Table.HeaderCell width={2}>{t("phone")}</Table.HeaderCell>
-                                <Table.HeaderCell width={2}>{t("messenger")}</Table.HeaderCell>
-                                <Table.HeaderCell width={13}>{t("books")}</Table.HeaderCell>
+                                <Table.HeaderCell width={1}>{t("messenger")}</Table.HeaderCell>
+                                <Table.HeaderCell width={2}>{t("creation_date")}</Table.HeaderCell>
+                                <Table.HeaderCell>{t("books")}</Table.HeaderCell>
                             </Table.Row>
                         </Table.Header>
                         <Table.Body>
                             {displayOrders.map((order) => (
                                 <Table.Row key={order.id}>
                                     <Table.Cell>{order.user.phone}</Table.Cell>
                                     <Table.Cell>{order.user.messenger}</Table.Cell>
+                                    <Table.Cell>{order.created_at}</Table.Cell>
                                     <Table.Cell>
                                         <div className={styles.booksCell}>
                                             {order.books.map((book, i) => (

diff --git a/frontend/src/containers/ChatbotAdminPage/UsersTable/index.tsx b/frontend/src/containers/ChatbotAdminPage/UsersTable/index.tsx
@@ -51,8 +51,8 @@ const UsersTable: React.FC = () => {
                     <Table celled>
                         <Table.Header>
                             <Table.Row>
-                                <Table.HeaderCell>{t("phone")}</Table.HeaderCell>
-                                <Table.HeaderCell>{t("messenger")}</Table.HeaderCell>
+                                <Table.HeaderCell width={2}>{t("phone")}</Table.HeaderCell>
+                                <Table.HeaderCell width={1}>{t("messenger")}</Table.HeaderCell>
                                 <Table.HeaderCell>{t("delivery_contacts")}</Table.HeaderCell>
                                 <Table.HeaderCell>{t("post_service")}</Table.HeaderCell>
                                 <Table.HeaderCell>{t("delivery_address")}</Table.HeaderCell>

diff --git a/frontend/src/translations/en.ts b/frontend/src/translations/en.ts
@@ -36,4 +36,5 @@ export const en = {
     orders: "Orders",
     books: "Products",
     download_table: "Download сurrent table as CSV",
+    creation_date: "Creation date",
 };
diff --git a/frontend/src/translations/ru.ts b/frontend/src/translations/ru.ts
@@ -36,4 +36,5 @@ export const ru = {
     orders: "Заказы",
     books: "Товары",
     download_table: "Скачать отображаемую таблицу в формате CSV",
+    creation_date: "Дата создания",
 };
diff --git a/frontend/src/translations/ua.ts b/frontend/src/translations/ua.ts
@@ -36,4 +36,5 @@ export const ua = {
     orders: "Замовлення",
     books: "Товари",
     download_table: "Завантажити таблицю у форматі CSV",
+    creation_date: "Дата створення",
 };
diff --git a/frontend/src/typings/webapi.d.ts b/frontend/src/typings/webapi.d.ts
@@ -34,11 +34,13 @@ namespace WebApi.BotEntity {
         amount: string;
         comment: string;
         user: MinimalUser;
+        created_at: string;
     }
 
     interface Order extends Identified {
         books: string[];
         user: MinimalUser;
+        created_at: string;
     }
 }