From dfb35ec8610a3d0d5514295fb9697aa49ad93e55 Mon Sep 17 00:00:00 2001 From: Aleksey Kravchenko Date: Mon, 20 Mar 2017 22:30:13 +0300 Subject: [PATCH 1/6] Update CallbacksAdmin.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Добавлено счетчики новых сообщений --- backend/CallbacksAdmin.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/backend/CallbacksAdmin.php b/backend/CallbacksAdmin.php index 1460ee9a..a7f05a74 100644 --- a/backend/CallbacksAdmin.php +++ b/backend/CallbacksAdmin.php @@ -47,9 +47,24 @@ public function fetch() { $this->design->assign('callbacks', $callbacks); $this->design->assign('callbacks_count', $callbacks_count); + // счетчик новых сообщений + $new_orders_counter = $this->orders->count_orders(array('status'=>0)); + $this->design->assign("new_orders_counter", $new_orders_counter); + + $new_comments_counter = $this->comments->count_comments(array('approved'=>0)); + $this->design->assign("new_comments_counter", $new_comments_counter); + + $new_feedbacks = $this->feedbacks->get_feedbacks(array('processed'=>0)); + $new_feedbacks_counter = count($new_feedbacks); + $this->design->assign("new_feedbacks_counter", $new_feedbacks_counter); + + $new_callbacks = $this->callbacks->get_callbacks(array('processed'=>0)); + $new_callbacks_counter = count($new_callbacks); + $this->design->assign("new_callbacks_counter", $new_callbacks_counter); + return $this->design->fetch('callbacks.tpl'); } } -?> \ No newline at end of file +?> From 0e0393093907eecffbbc3568ac8b501fbca45d6e Mon Sep 17 00:00:00 2001 From: Aleksey Kravchenko Date: Mon, 20 Mar 2017 22:31:04 +0300 Subject: [PATCH 2/6] Update CommentsAdmin.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Добавлено счетчики новых сообщений --- backend/CommentsAdmin.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/backend/CommentsAdmin.php b/backend/CommentsAdmin.php index 17d34b50..d534f823 100644 --- a/backend/CommentsAdmin.php +++ b/backend/CommentsAdmin.php @@ -116,9 +116,24 @@ public function fetch() { $this->design->assign('comments', $comments); $this->design->assign('comments_count', $comments_count); + // счетчик новых сообщений + $new_orders_counter = $this->orders->count_orders(array('status'=>0)); + $this->design->assign("new_orders_counter", $new_orders_counter); + + $new_comments_counter = $this->comments->count_comments(array('approved'=>0)); + $this->design->assign("new_comments_counter", $new_comments_counter); + + $new_feedbacks = $this->feedbacks->get_feedbacks(array('processed'=>0)); + $new_feedbacks_counter = count($new_feedbacks); + $this->design->assign("new_feedbacks_counter", $new_feedbacks_counter); + + $new_callbacks = $this->callbacks->get_callbacks(array('processed'=>0)); + $new_callbacks_counter = count($new_callbacks); + $this->design->assign("new_callbacks_counter", $new_callbacks_counter); + return $this->design->fetch('comments.tpl'); } } -?> \ No newline at end of file +?> From d8a32fabb9b1aa9417f3da44e8460d2a49ff8b6f Mon Sep 17 00:00:00 2001 From: Aleksey Kravchenko Date: Mon, 20 Mar 2017 22:31:50 +0300 Subject: [PATCH 3/6] Update FeedbacksAdmin.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Добавлены счетчики новых сообщений --- backend/FeedbacksAdmin.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/backend/FeedbacksAdmin.php b/backend/FeedbacksAdmin.php index 541ca6f7..726ceda5 100644 --- a/backend/FeedbacksAdmin.php +++ b/backend/FeedbacksAdmin.php @@ -54,9 +54,24 @@ public function fetch() { $this->design->assign('feedbacks', $feedbacks); $this->design->assign('feedbacks_count', $feedbacks_count); + // счетчик новых сообщений + $new_orders_counter = $this->orders->count_orders(array('status'=>0)); + $this->design->assign("new_orders_counter", $new_orders_counter); + + $new_comments_counter = $this->comments->count_comments(array('approved'=>0)); + $this->design->assign("new_comments_counter", $new_comments_counter); + + $new_feedbacks = $this->feedbacks->get_feedbacks(array('processed'=>0)); + $new_feedbacks_counter = count($new_feedbacks); + $this->design->assign("new_feedbacks_counter", $new_feedbacks_counter); + + $new_callbacks = $this->callbacks->get_callbacks(array('processed'=>0)); + $new_callbacks_counter = count($new_callbacks); + $this->design->assign("new_callbacks_counter", $new_callbacks_counter); + return $this->design->fetch('feedbacks.tpl'); } } -?> \ No newline at end of file +?> From 0bf4c4d6759b32979975351a00b0a24299f73fbb Mon Sep 17 00:00:00 2001 From: Aleksey Kravchenko Date: Mon, 20 Mar 2017 22:32:42 +0300 Subject: [PATCH 4/6] Update callbacks.tpl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Добавлены счетчики новых сообщений --- backend/design/html/callbacks.tpl | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/backend/design/html/callbacks.tpl b/backend/design/html/callbacks.tpl index 7375d9e7..9a8768b5 100644 --- a/backend/design/html/callbacks.tpl +++ b/backend/design/html/callbacks.tpl @@ -2,16 +2,28 @@ {capture name=tabs} {if in_array('comments', $manager->permissions)}
  • - Комментарии + Комментарии + {if $new_comments_counter} + {$new_comments_counter} + {/if} +
    • {/if} {if in_array('feedbacks', $manager->permissions)}
  • - Обратная связь + Обратная связь + {if $new_feedbacks_counter} + {$new_feedbacks_counter} + {/if} +
    • {/if}
  • - Заказ обратного звонка + Заказ обратного звонка + {if $new_callbacks_counter} + {$new_callbacks_counter} + {/if} +
    • {/capture} From e95d627d164da21851fb5a9fb22676ff9d4f550b Mon Sep 17 00:00:00 2001 From: Aleksey Kravchenko Date: Mon, 20 Mar 2017 22:33:22 +0300 Subject: [PATCH 5/6] Update comments.tpl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Добавлено счетчики новых сообщений --- backend/design/html/comments.tpl | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/backend/design/html/comments.tpl b/backend/design/html/comments.tpl index 1a850854..6d19da82 100644 --- a/backend/design/html/comments.tpl +++ b/backend/design/html/comments.tpl @@ -1,11 +1,28 @@ {* Вкладки *} {capture name=tabs} -
  • Комментарии
    • +
  • + Комментарии + {if $new_comments_counter} + {$new_comments_counter} + {/if} + +
    • {if in_array('feedbacks', $manager->permissions)} -
  • Обратная связь
    • +
  • Обратная связь + {if $new_feedbacks_counter} + {$new_feedbacks_counter} + {/if} + +
    • {/if} {if in_array('callbacks', $manager->permissions)} -
  • Заказ обратного звонка
    • +
  • + Заказ обратного звонка + {if $new_callbacks_counter} + {$new_callbacks_counter} + {/if} + +
    • {/if} {/capture} From 79a2a7def6dc6a512c3d6f4a2e23a20c6b10d1e6 Mon Sep 17 00:00:00 2001 From: Aleksey Kravchenko Date: Mon, 20 Mar 2017 22:34:04 +0300 Subject: [PATCH 6/6] Update feedbacks.tpl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Добавлено счетчики новых сообщений --- backend/design/html/feedbacks.tpl | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/backend/design/html/feedbacks.tpl b/backend/design/html/feedbacks.tpl index d1f79628..b2628f83 100644 --- a/backend/design/html/feedbacks.tpl +++ b/backend/design/html/feedbacks.tpl @@ -2,15 +2,27 @@ {capture name=tabs} {if in_array('comments', $manager->permissions)}
  • - Комментарии + Комментарии + {if $new_comments_counter} + {$new_comments_counter} + {/if} +
    • {/if}
  • - Обратная связь + Обратная связь + {if $new_feedbacks_counter} + {$new_feedbacks_counter} + {/if} +
    • {if in_array('callbacks', $manager->permissions)}
  • - Заказ обратного звонка + Заказ обратного звонка + {if $new_callbacks_counter} + {$new_callbacks_counter} + {/if} +
    • {/if} {/capture}