From 2f2c1489a2dda15dc2da120a1bd4e581dd1a8b7b Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 16 May 2021 14:15:10 +0300
Subject: [PATCH] add menus lk

---
 app/api/book.php                   | 44 +++++++++++++++++++++++++++--
 app/helpers/picbook.php            | 10 +++++++
 app/index.php                      |  5 +++-
 app/routes/books.php               | 23 +++++++++++----
 app/routes/client.php              |  1 +
 app/views/allbooks.phtml           | 45 +-----------------------------
 app/views/blocks/auth.phtml        |  1 +
 app/views/book.phtml               | 13 ++++++---
 app/views/books.phtml              | 17 +++++++++++
 app/views/layout.phtml             |  6 ++++
 app/views/login.phtml              |  3 +-
 app/views/menus/lkmenu.phtml       | 28 +++++++++++++++++++
 app/views/menus/mainmenu.phtml     |  0
 app/views/menus/menucategory.phtml | 11 ++++++++
 app/views/menus/menusubbook.phtml  |  0
 app/views/menus/subscripmenu.phtml |  5 ++++
 16 files changed, 154 insertions(+), 58 deletions(-)
 create mode 100644 app/helpers/picbook.php
 create mode 100644 app/views/books.phtml
 create mode 100644 app/views/menus/lkmenu.phtml
 create mode 100644 app/views/menus/mainmenu.phtml
 create mode 100644 app/views/menus/menucategory.phtml
 create mode 100644 app/views/menus/menusubbook.phtml
 create mode 100644 app/views/menus/subscripmenu.phtml

diff --git a/app/api/book.php b/app/api/book.php
index 57a865f..e3a0076 100644
--- a/app/api/book.php
+++ b/app/api/book.php
@@ -3,10 +3,9 @@
  * 
  */
 
-
 function bookid_kuri($hash) {
     
-    $query =  "SELECT `price_id`, `pricename`, `BeginDate`, `priceanons`, `priceimg`, `pricehash` FROM `price` WHERE `pricehash` = '$hash' LIMIT 1";
+    $query =  "SELECT `price_id`, `pricename`, `BeginDate`, `priceanons`, `priceimg`, `pricehash`, `price` FROM `price` WHERE `pricehash` = '$hash' LIMIT 1";
 
     $book = dbl_get($query);
 
@@ -21,6 +20,47 @@ function bookid_kuri($hash) {
     }    
 
 
+}
+
+
+
+
+
+
+/**
+ * вернуть товары магазина (все или по фильтру)
+ */
+function api_books_kuri($category = 'all', $page = 1){
+
+    $limit = 25;
+
+    if ($page > 1){
+        $offset = $limit * ($page - 1);
+        $offset_str = ", $offset";
+    }
+    else {
+        $offset_str = '';
+    }
+
+    if ($category == 'all'){
+        $where = '';
+    }
+    else {
+
+        $category_sql = "SELECT `category_id` FROM `pricecategory` WHERE `categoryslug` = '$category' LIMIT 1";
+        
+        $category = db_get($category_sql);
+        
+        if (isset($category['category_id'])) {
+            $category_id = $category['category_id'];
+            $where = "WHERE `category_id` = $category_id";
+        }    
+             
+    }
+    
+    $sql_books = "SELECT * FROM  `price` $where ORDER BY `price_id` DESC LIMIT $limit $offset_str";
+
+   return db_get($sql_books);
 
 
 }
\ No newline at end of file
diff --git a/app/helpers/picbook.php b/app/helpers/picbook.php
new file mode 100644
index 0000000..4a3f230
--- /dev/null
+++ b/app/helpers/picbook.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * url image book
+ */
+
+function picbook($item, $width, $height) {
+
+    return IMGSRV.'price/'.$width.'x'.$height.'/'.$item['price_id'].'.'.$item['priceimg'];
+
+}
\ No newline at end of file
diff --git a/app/index.php b/app/index.php
index f2df308..6728c57 100644
--- a/app/index.php
+++ b/app/index.php
@@ -12,12 +12,15 @@ require 'routes/pdfserver.php';
 require 'routes/email.php';
 require 'routes/books.php';
 
-
 #api
 require 'api/apiclient.php';
 require 'api/apicontent.php';
 require 'api/book.php';
 
+#helpers
+require 'helpers/picbook.php';
+
+
 _kuri();
 
 function index_kuri(){
diff --git a/app/routes/books.php b/app/routes/books.php
index 0a8203f..31fd4fd 100644
--- a/app/routes/books.php
+++ b/app/routes/books.php
@@ -2,14 +2,25 @@
 
 function book_kuri($hash){
 
-      $book = bookid_kuri($hash);
+    $book = bookid_kuri($hash);
+
+    $title = $book['pricename'].' - Аргументы Недели';
+    $description = 'Читайте и покупайте '.$book['pricename'].'. Издательский дом "Аргументы Недели"';
+
+    $login = check_login_kuri(); // залогин или нет
+   
+    $tempcontent = VIEWPATH.'book.phtml';
+    include VIEWPATH.'layout.phtml';
 
 
-      $title = $book['pricename'].' - Аргументы Недели';
-      $description = 'Читайте и покупайте '.$book['pricename'].'. Издательский дом "Аргументы Недели"';
-      
-      $tempcontent = VIEWPATH.'book.phtml';
-      include VIEWPATH.'layout.phtml';
+}
 
 
+function books_kuri($category = 'all', $filter = 'all', $page = 1){
+
+    $books = api_books_kuri($category, $page);
+
+    $tempcontent = VIEWPATH.'books.phtml';
+    include VIEWPATH.'layout.phtml';
+
 }
\ No newline at end of file
diff --git a/app/routes/client.php b/app/routes/client.php
index 2252e6b..6d7e8c8 100644
--- a/app/routes/client.php
+++ b/app/routes/client.php
@@ -134,6 +134,7 @@ function mybooks_kuri($category = 'gazeta', $filter = 'all', $page = 1){
        header('Location: '.SITE.'login');
        exit;
     }
+    
     $type='mybooks';
     if ($category == 'gazeta')
         $category_id = 1;
diff --git a/app/views/allbooks.phtml b/app/views/allbooks.phtml
index 56d42c5..584b7a7 100644
--- a/app/views/allbooks.phtml
+++ b/app/views/allbooks.phtml
@@ -1,48 +1,5 @@
-<div id="lk-menu">
-    <div id="menu_category">
-        <ul>
-            <?if ($category == 'gazeta'):?>
-                <li class="active">Газета</li>
-                <li><a href="<?=SITE?>mybooks/books/all/1">Книги</a></li>
-            <?else:?>
-                <li><a href="<?=SITE?>mybooks/gazeta/all/1">Газета</a></li>
-                <li class="active">Книги</li>
-            <?endif?>
-        </ul>
-    </div>
-
-    <?if ($items['subscript'] == true):?>
-        <div class="small-mob-hidden"><p>Вам доступен весь архив</p></div>
-    <?else:?>
-        <div class="small-mob-hidden"><p>Всего покупок: <?=$items['count']?></p></div>
-    <?endif?>
-
-    <?if ($category == 'gazeta'):?>
-    <div id="years">
-        <p>
-            <select id="year_filter" onchange="changeyear()">
-            <option value="all"<?=$selected?>>Все года</option>
-            <?for ($y = date('Y'); $y >= 2006; $y--):?>
-                <?$selected = ($filter == $y) ? ' selected' : ''?>
-                <option value="<?=$y?>"<?=$selected?>><?=$y?> год</option>
-            <?endfor?>
-            </select>
-            <i class="fas fa-chevron-down"></i>
-        </p>
-    </div>
-    <?endif?>
-    <div>
-        <a href="<?=SITE?>payments">Мои покупки</a>
-    </div>
-    <div class="hid460">
-        <a href="<?=SITE?>form">Консультации</a>
-    </div>
-
-</div>
-
-
-
 <div class="lib_container">
+
 <?foreach ($items['books'] as $book):?>
     <div class="book_skeleton">
         <div class="book_mini">
diff --git a/app/views/blocks/auth.phtml b/app/views/blocks/auth.phtml
index 9b6daee..3312539 100644
--- a/app/views/blocks/auth.phtml
+++ b/app/views/blocks/auth.phtml
@@ -5,6 +5,7 @@
         <a href="<?=SITE?>login">Войти</a>      
     <?else:?>
         <?=$checklogin['clientmail']?>
+        <a href="<?=SITE?>mybooks">Моя библиотека</a>&nbsp;
         <a href="<?=SITE?>out">Выйти</a>
     <?endif?>
 </div>    
\ No newline at end of file
diff --git a/app/views/book.phtml b/app/views/book.phtml
index 7bf55f7..5531b84 100644
--- a/app/views/book.phtml
+++ b/app/views/book.phtml
@@ -2,10 +2,15 @@
         <div class="book_mini">
                 <img src="<?=$book['pic']?>">
                 <p class="book_mini_title"><?=$book['pricename']?></p>
-                <p><a href="<?=$book['links']['pdf']?>">Режим pdf</a></p>
-                <p><a href="<?=$book['links']['text']?>">Режим для чтения</a></p>
-                <p><a href="<?=$book['links']['download']?>">Скачать PDF</a></p>
+                <?if (isset($login['client_id'])):?>
+                    <p><a href="<?=$book['links']['pdf']?>">Режим pdf</a></p>
+                    <p><a href="<?=$book['links']['text']?>">Режим для чтения</a></p>
+                    <p><a href="<?=$book['links']['download']?>">Скачать PDF</a></p>
+                <?else:?>
+                     <?$paylink = 'https://argumenti.ru/robomail/'.$book['price_id']?>
+                     <p><?=$book['price']?> руб.</p>
+                     <p><a href="<?=$paylink?>">Купить</a></p>
+                <?endif?>  
         </div>
-
         <div><?=$book['priceanons']?></div>
     </div>
\ No newline at end of file
diff --git a/app/views/books.phtml b/app/views/books.phtml
new file mode 100644
index 0000000..6cec2bc
--- /dev/null
+++ b/app/views/books.phtml
@@ -0,0 +1,17 @@
+
+<div class="lib_container">
+<?foreach ($books as $book):?>
+    <div class="book_skeleton">
+        <div class="book_mini">
+            <a href="<?=$book['link']?>" target="_blank">
+                <img src="<?=picbook($book, 180, 280)?>" alt="<?=$book['pricename']?>">
+                <p class="book_mini_title"><?=$book['pricename']?></p>
+                <p><a href="<?=$paylink?>">Купить</a></p>
+            </a>
+        </div>
+    </div>
+<?endforeach?>
+
+</div>
+
+<?include 'blocks/pagenav.phtml'?>
\ No newline at end of file
diff --git a/app/views/layout.phtml b/app/views/layout.phtml
index a69e8cd..43c11d2 100644
--- a/app/views/layout.phtml
+++ b/app/views/layout.phtml
@@ -115,6 +115,12 @@ _tmr.push({id: "1069168", type: "pageView", start: (new Date()).getTime()});
 </script>
 </div>
 <?endif?>
+
+<div id="lk-menu">
+    <? include VIEWPATH.'menus/menucategory.phtml';?>
+    <? include VIEWPATH.'menus/lkmenu.phtml';?>
+</div>
+
 <?if (isset($tempcontent))
     include($tempcontent);
 ?>
diff --git a/app/views/login.phtml b/app/views/login.phtml
index 7ea2d6d..858392f 100644
--- a/app/views/login.phtml
+++ b/app/views/login.phtml
@@ -11,6 +11,7 @@
 <div>
     <p><a href="<?=SITE?>reminder">Забыли пароль?</a></p>
     <p><a href="<?=SITE?>reminder">Создать пароль</a></p>
+    <p><a href="https://argumenti.ru/robomail/486?utm_source=klan&utm_medium=subscript&utm_campaign=login">Оформить годовой членский взнос</a></p>
 </div> 
 
 
@@ -18,7 +19,7 @@
     <div id="error" style="color: red;"><?=$error?></div>
 <?endif?>
     <div style="text-align:left;">
-        <p style="display:block;">Чтобы войти в КЛАН оформите пожалуйста Годовой членский взнос пройдя по <a href="https://argumenti.ru/robomail/486?utm_source=klan&utm_medium=subscript&utm_campaign=login" target="_blank">этой ссылке</a>. Вас ждут:</p>
+        <p style="display:block;">Участникам КЛАНА доступны:</p>
         <ul style="padding:0px;">
             <li style="margin-bottom:10px;">Каждый вторник - свежий номер «Аргументы Недели», со скидкой более чем 70%, вместе с эксклюзивными материалами, не вошедшими в полосы газеты. Более 200 авторских статей в месяц - регулярные рубрики, качественная аналитика, уникальные интервью</li>
             <li style="margin-bottom:10px;">Доступ к эксклюзивному материалу - возможность пользоваться архивом еженедельника «АН» за 14 лет (более чем 700 вышедших номеров)</li>
diff --git a/app/views/menus/lkmenu.phtml b/app/views/menus/lkmenu.phtml
new file mode 100644
index 0000000..24141df
--- /dev/null
+++ b/app/views/menus/lkmenu.phtml
@@ -0,0 +1,28 @@
+<?if ($items['subscript'] == true):?>
+    <div class="small-mob-hidden"><p>Вам доступен весь архив</p></div>
+<?else:?>
+    <div class="small-mob-hidden"><p>Всего покупок: <?=$items['count']?></p></div>
+<?endif?>
+
+<?if ($category == 'gazeta'):?>
+    <div id="years">
+        <p>
+            <select id="year_filter" onchange="changeyear()">
+            <option value="all"<?=$selected?>>Все года</option>
+            <?for ($y = date('Y'); $y >= 2006; $y--):?>
+                <?$selected = ($filter == $y) ? ' selected' : ''?>
+                <option value="<?=$y?>"<?=$selected?>><?=$y?> год</option>
+            <?endfor?>
+            </select>
+            <i class="fas fa-chevron-down"></i>
+        </p>
+    </div>
+<?endif?>
+   
+<div>
+    <a href="<?=SITE?>payments">Мои покупки</a>
+</div>
+<div class="hid460">
+    <a href="<?=SITE?>form">Консультации</a>
+</div>
+
diff --git a/app/views/menus/mainmenu.phtml b/app/views/menus/mainmenu.phtml
new file mode 100644
index 0000000..e69de29
diff --git a/app/views/menus/menucategory.phtml b/app/views/menus/menucategory.phtml
new file mode 100644
index 0000000..dc9ff43
--- /dev/null
+++ b/app/views/menus/menucategory.phtml
@@ -0,0 +1,11 @@
+<div id="menu_category">
+    <ul>
+        <?if ($category == 'gazeta'):?>
+            <li class="active">Газета</li>
+            <li><a href="<?=SITE?>mybooks/books/all/1">Книги</a></li>
+        <?else:?>
+            <li><a href="<?=SITE?>mybooks/gazeta/all/1">Газета</a></li>
+            <li class="active">Книги</li>
+        <?endif?>
+    </ul>
+</div>
\ No newline at end of file
diff --git a/app/views/menus/menusubbook.phtml b/app/views/menus/menusubbook.phtml
new file mode 100644
index 0000000..e69de29
diff --git a/app/views/menus/subscripmenu.phtml b/app/views/menus/subscripmenu.phtml
new file mode 100644
index 0000000..157299e
--- /dev/null
+++ b/app/views/menus/subscripmenu.phtml
@@ -0,0 +1,5 @@
+<?if ($items['subscript'] == true):?>
+    <div class="small-mob-hidden"><p>Вам доступен весь архив</p></div>
+<?else:?>
+    <div class="small-mob-hidden"><p>Всего покупок: <?=$items['count']?></p></div>
+<?endif?>
\ No newline at end of file