From acd509a2ae09f449da7daf8bc31faf4d954c5f76 Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Mon, 25 Apr 2016 17:42:39 +0300 Subject: [PATCH] 090316 --- src/app/backend/controllers/SeoController.php | 23 +++++++++++++++++++++++ src/app/backend/views/partial/sidebar.php | 4 +++- src/app/backend/views/promo_codes/addEdit.php | 1 + src/app/backend/views/seo/setReconciliation.php | 31 +++++++++++++++++++++++++++++++ src/app/frontend/controllers/DealerController.php | 40 +++++++++++++++++++++++++++++++++++++++- src/app/frontend/messages/ru.php | 4 +++- src/app/frontend/messages/ua.php | 4 +++- src/app/frontend/views/dealer/financialCalculations.php | 182 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------- src/app/frontend/views/index.php | 16 +++++++++++++++- src/app/frontend/views/layouts/dealer.php | 3 +++ src/app/frontend/views/partial/dealer.php | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/app/frontend/views/sendmail/message_9.phtml | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/lib/models.php | 12 ++++++++++++ src/lib/models/manager_mail.php | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/lib/sendmail.php | 25 +++++++++++++++++++------ www-backend/index.php | 10 +++++++++- www/css/dealers.css | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++- www/css/main.css | 14 +++++++++++++- www/images/icon_catalog_18x18_01.png | Bin 0 -> 283 bytes www/index.php | 16 ++++++++++++++-- www/js/main.js | 12 ++++++++++++ www/plugins/daterangepicker/daterangepicker.js | 160 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------- www/plugins/daterangepicker/moment.js | 666 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 23 files changed, 1022 insertions(+), 436 deletions(-) create mode 100644 src/app/backend/views/seo/setReconciliation.php create mode 100644 src/app/frontend/views/sendmail/message_9.phtml create mode 100644 src/lib/models/manager_mail.php create mode 100644 www/images/icon_catalog_18x18_01.png diff --git a/src/app/backend/controllers/SeoController.php b/src/app/backend/controllers/SeoController.php index ee22640..623140d 100644 --- a/src/app/backend/controllers/SeoController.php +++ b/src/app/backend/controllers/SeoController.php @@ -156,4 +156,27 @@ class SeoController extends \Phalcon\Mvc\Controller exit; } + + function setReconciliationAction(){ + if( !$this->session->get('isAdminAuth') ) + { + return $this->response->redirect([ 'for' => 'admin_login' ]); + } + + $post['text'] = $this->request->getPost('text', 'string', NULL ); + if(!(empty($post['text']))){ + $this->models->getManagerMail()->UpdateData($post); + + $data = $this->models->getManagerMail()->getData(); + + return $this->response->redirect([ 'for' => 'set_reconciliation','page' => $data[0] ]); + } else { + $data = $this->models->getManagerMail()->getData(); + + $this->view->setVars([ + 'page' => $data[0] + ]); + } + } + } \ No newline at end of file diff --git a/src/app/backend/views/partial/sidebar.php b/src/app/backend/views/partial/sidebar.php index 71fe999..5fa4ee4 100644 --- a/src/app/backend/views/partial/sidebar.php +++ b/src/app/backend/views/partial/sidebar.php @@ -14,7 +14,7 @@
    • -
    • +
    • @@ -67,6 +68,7 @@
  • Динамический ремаркетинг
  • Выгрузка пользователей
  • Загрузить PDF файл
    • +
  • Редактировать эмейлы для сверки
    • \ No newline at end of file diff --git a/src/app/backend/views/promo_codes/addEdit.php b/src/app/backend/views/promo_codes/addEdit.php index a92e01d..4a92676 100644 --- a/src/app/backend/views/promo_codes/addEdit.php +++ b/src/app/backend/views/promo_codes/addEdit.php @@ -142,6 +142,7 @@ + + \ No newline at end of file diff --git a/src/app/frontend/views/index.php b/src/app/frontend/views/index.php index 1d6728e..407d0cb 100644 --- a/src/app/frontend/views/index.php +++ b/src/app/frontend/views/index.php @@ -8,6 +8,7 @@ + assets->outputCss() ?> @@ -102,12 +103,25 @@ $page_title = isset( $page_title ) && !empty( $page_title ) ? $page_title : ''; Інтернет-магазин насіння + + + +
    ">
    " class="">_("your_cart")?>
    - '.(!empty( $customer['name'] ) ? $customer['name'] : $t->_("personal_account")).'
    ' ?> + + '.(!empty( $customer['name'] ) ? $customer['name'] : $t->_("personal_account")).' +
    '; + + if(!$this->getDi()->get('request')->get('_url') || $this->getDi()->get('request')->get('_url')=="/ru" ){?> +
    + _("file_download_link")?> +
    + +
    diff --git a/src/app/frontend/views/layouts/dealer.php b/src/app/frontend/views/layouts/dealer.php index 00e3d2c..6d5c670 100644 --- a/src/app/frontend/views/layouts/dealer.php +++ b/src/app/frontend/views/layouts/dealer.php @@ -10,6 +10,7 @@ + partial('partial/popupCart') ?>
    @@ -22,6 +23,8 @@
    + + partial('partial/footer', ['lang' => $lang]) ?> diff --git a/src/app/frontend/views/partial/dealer.php b/src/app/frontend/views/partial/dealer.php index bfea7a9..c3cfc23 100644 --- a/src/app/frontend/views/partial/dealer.php +++ b/src/app/frontend/views/partial/dealer.php @@ -1,3 +1,54 @@ +