From fed81f95f6d8d26075d383afccc0551eae803d12 Mon Sep 17 00:00:00 2001
From: Sergey Yarkov <serzh.yarkov@gmail.com>
Date: Mon, 13 Jan 2020 18:28:53 +0300
Subject: [PATCH] dashboard cards & amount fix

---
 config/routes/control-panel.js      | 11 ++++++++++-
 config/routes/invoice.js            |  2 +-
 dist/views/admin/assets/scripts.pug |  4 ++--
 dist/views/admin/control-panel.pug  |  6 +++---
 dist/views/main/assets/scripts.pug  |  4 ++--
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/config/routes/control-panel.js b/config/routes/control-panel.js
index f25f56e..5e8c1cc 100644
--- a/config/routes/control-panel.js
+++ b/config/routes/control-panel.js
@@ -10,7 +10,12 @@ function checkAuthenticated(req, res, next) {
 module.exports = function (server, db) {
     server.get('/control-panel', checkAuthenticated, async (req, res) => {
         try {
-            const store = await db.collection('content').findOne({});
+            const store = await db.collection('content').findOne({}),
+                buyers = await db.collection('buyers').find({}).toArray(),
+                items = await db.collection('items').find({}).toArray(); 
+                
+            
+
             res.render('admin/control-panel', {
                 id: req.user.id,
                 name: req.user.name,
@@ -18,6 +23,9 @@ module.exports = function (server, db) {
                 title: `${store.title} | Панель управления сайтом`,
                 host: req.headers.host,
                 pageName: ['Главная', 'main'],
+                sum: buyers.reduce((sum, current) => sum.amount + current.amount),
+                quantitySold: buyers.reduce((summ, current) => summ.data.length + current.data.length),
+                count: items.length
             });
         } catch (error) {
             res.render('main/404');
@@ -28,6 +36,7 @@ module.exports = function (server, db) {
             const items = await db.collection('items').find({}).toArray();
             const store = await db.collection('content').findOne({});
             const count = items.length;
+
             res.render('admin/items', {
                 name: req.user.name,
                 email: req.user.email,
diff --git a/config/routes/invoice.js b/config/routes/invoice.js
index f85e6f8..15b1e68 100644
--- a/config/routes/invoice.js
+++ b/config/routes/invoice.js
@@ -12,7 +12,7 @@ module.exports = function(server, db, qiwiApi) {
                     email = data.customer.email,
                     method = 'qiwi',
                     date = data.status.changedDateTime,
-                    amount = data.amount.value;
+                    amount = parseFloat(data.amount.value);
 
                 if (status === 'PAID') {
                     const ids = query.item_id.split('and');
diff --git a/dist/views/admin/assets/scripts.pug b/dist/views/admin/assets/scripts.pug
index 01dfbd9..62f9b70 100644
--- a/dist/views/admin/assets/scripts.pug
+++ b/dist/views/admin/assets/scripts.pug
@@ -1,3 +1,3 @@
 script(async defer src="https://buttons.github.io/buttons.js")                                  
-script(src='../js/admin.js')
-//script(src="http://localhost:8080/admin.js")
\ No newline at end of file
+//script(src='../js/admin.js')
+script(src="http://localhost:8080/admin.js")
\ No newline at end of file
diff --git a/dist/views/admin/control-panel.pug b/dist/views/admin/control-panel.pug
index 99edae8..f8e4f8e 100644
--- a/dist/views/admin/control-panel.pug
+++ b/dist/views/admin/control-panel.pug
@@ -11,19 +11,19 @@ body.has-fixed-sidenav
                         .card-content
                             span.card-title Сумма проданных товаров
                             .divider
-                            h3 0 ₽
+                            h3 #{sum} ₽
                 .col.l4.m6.s12
                     .card
                         .card-content
                             span.card-title Кол-во проданных товаров
                             .divider
-                            h3 0
+                            h3 #{quantitySold}
                 .col.l4.s12
                     .card
                         .card-content
                             span.card-title Общее кол-во товаров на сайте
                             .divider
-                            h3 0
+                            h3 #{count}
                 .col.s12
                     .card
                         .card-content
diff --git a/dist/views/main/assets/scripts.pug b/dist/views/main/assets/scripts.pug
index bc80e1f..b361378 100644
--- a/dist/views/main/assets/scripts.pug
+++ b/dist/views/main/assets/scripts.pug
@@ -1,3 +1,3 @@
 // Script JS
-script(src='../js/main.js')
-//script(src='http://localhost:8080/main.js')
\ No newline at end of file
+//script(src='../js/main.js')
+script(src='http://localhost:8080/main.js')
\ No newline at end of file