фикс модуля write-offs

diff --git a/erp24/views/write-offs/comments.php b/erp24/views/write-offs/comments.php
index dcc870d78171b852937fa143e84eeeb656aa3641..df583d1ee36f5fce0db36eec820080de66238621 100644 (file)
--- a/erp24/views/write-offs/comments.php
+++ b/erp24/views/write-offs/comments.php
@@ -96,7 +96,7 @@ foreach($data as $row) $comments[$row["product_id"]][$row["comment_id"]]=$row["q
 
 
 
-$data=$db::getRows("SELECT *,DATE_FORMAT(date, '%d.%m.%Y %H:%i') as date2 FROM write_offs WHERE id=?",[$write_offs_id]);
+$data=$db::getRows("SELECT *,TO_CHAR(date, 'DD.MM.YYYY HH:MI') as date2 FROM write_offs WHERE id=?",[$write_offs_id]);
 foreach($data as $row) {
     $items=json_decode($row["items"],true,512,JSON_UNESCAPED_UNICODE);
 

diff --git a/erp24/views/write-offs/index.php b/erp24/views/write-offs/index.php
index bf56f5d22cff5a6d94b6a7f958325656b766575b..aa8d01228e16537f37fb2b8b70ae0a357ecd86c1 100644 (file)
--- a/erp24/views/write-offs/index.php
+++ b/erp24/views/write-offs/index.php
@@ -62,7 +62,7 @@ $limit = 100;
 $offset = !empty($_GET['p']) ? (($_GET['p'] - 1) * $limit) : 0;
 $offset = (int)$offset;
 //получаем количество записей
-$resultNum = $db::run("SELECT COUNT(*) as postNum FROM write_offs WHERE 1 $where");
+$resultNum = $db::run("SELECT COUNT(*) as postNum FROM write_offs WHERE 1=1 $where");
 $resultNum = $resultNum ? $resultNum->fetchAll() : false;
 $rowCount = isset($resultNum['postNum']) ? $resultNum['postNum'] : 0;
 //инициализируем класс pagination
@@ -96,7 +96,8 @@ echo '<div class="e-table"><div class="table-responsive table-lg mt-3">
 
 </tr></thead><tbody>';
 $summ_retail = 0;
-$data = $db::run("SELECT *,DATE_FORMAT(date, '%d.%m.%Y %H:%i') as date2 FROM write_offs WHERE 1 $where order by date  DESC LIMIT $offset,$limit");
+$sql = "SELECT *,TO_CHAR(date, 'DD.MM.YYYY HH:MI') as date2 FROM write_offs WHERE 1=1 $where order by date  DESC LIMIT $limit OFFSET $offset";
+$data = $db::run($sql);
 $data = $data ? $data->fetchAll() : false;
 foreach (is_array($data) ? $data : [] as $row) {
 
@@ -112,12 +113,12 @@ foreach (is_array($data) ? $data : [] as $row) {
 
     if (empty($store_id)) echo '<span class="tag m-1">' . $stores[$row["store_id"]] . '</span> ';
 
-    echo '
-
-<a href="/' . $modul . '/comments/?write_offs_id=' . $row["id"] . '" class="btn btn-info">комментарии</a>
-' . $row["date2"] . ' ' . $row["type"] . '</td>
-<td><a href=/' . $modul . '/show/?id=' . $row["id"] . '>' . $row["number"] . ' ' . $row["based_on"] . ' ' . $row["comment"] . '</a>
-';
+//    echo '
+//
+//<a href="/' . $modul . '/comments/?write_offs_id=' . $row["id"] . '" class="btn btn-info">комментарии</a>
+//' . $row["date2"] . ' ' . $row["type"] . '</td>
+//<td><a href=/' . $modul . '/show/?id=' . $row["id"] . '>' . $row["number"] . ' ' . $row["based_on"] . ' ' . $row["comment"] . '</a>
+//';
     echo '</td></tr>';
 
     echo '<tr id="dd__' . $row["id"] . '" style="display:none;"><td colspan=5>';