From e0b84da2e4991fbc1878ecf1615530e3c534977d Mon Sep 17 00:00:00 2001
From: Alexander Smirnov <fredeom@mail.ru>
Date: Tue, 20 Aug 2024 12:07:50 +0300
Subject: [PATCH] =?utf8?q?[ERP-144]=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?utf8?q?=D0=BB=D0=B5=D0=BD=D0=BE=20pgsql=20=D1=84=D0=BE=D1=80=D0=BC?=
 =?utf8?q?=D0=B0=D1=82=20=D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=B8,=20?=
 =?utf8?q?=D1=87=D0=B0=D1=81=D0=BE=D0=B2=20=D0=B8=20=D0=BC=D0=B8=D0=BD?=
 =?utf8?q?=D1=83=D1=82:=20HH:MM=20->=20HH24:MI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/controllers/EmployeeSalesReportController.php | 6 +++---
 erp24/modul/bonus/bonus_users.php                   | 2 +-
 erp24/modul/orders/ajaxOrdersPays.php               | 2 +-
 erp24/modul/orders/info_db2.php                     | 2 +-
 erp24/modul/orders/samovivoz.php                    | 2 +-
 erp24/services/SalesService.php                     | 2 +-
 erp24/views/write-offs/comments.php                 | 2 +-
 erp24/views/write-offs/index.php                    | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/erp24/controllers/EmployeeSalesReportController.php b/erp24/controllers/EmployeeSalesReportController.php
index 5c3e6f66..98412001 100644
--- a/erp24/controllers/EmployeeSalesReportController.php
+++ b/erp24/controllers/EmployeeSalesReportController.php
@@ -56,12 +56,12 @@ class EmployeeSalesReportController extends Controller {
                 date("Y-m-d 23:59:59", strtotime($model->date_end))
             ]);
         if ($model->shift == 1) {
-            $salesQuery->andWhere(['between', "TO_CHAR(date, 'HH:MM')", "08:00", "19:59"]);
+            $salesQuery->andWhere(['between', "TO_CHAR(date, 'HH24:MI')", "08:00", "19:59"]);
         }
         if ($model->shift ==2) {
             $salesQuery->andWhere(['or',
-                ['>=', "TO_CHAR(date, 'HH:MM')", "20:00"],
-                ['<=', "TO_CHAR(date, 'HH:MM')", "07:59"]
+                ['>=', "TO_CHAR(date, 'HH24:MI')", "20:00"],
+                ['<=', "TO_CHAR(date, 'HH24:MI')", "07:59"]
             ]);
         }
         if ($model->scope > 0) {
diff --git a/erp24/modul/bonus/bonus_users.php b/erp24/modul/bonus/bonus_users.php
index 44873cb7..782da87b 100644
--- a/erp24/modul/bonus/bonus_users.php
+++ b/erp24/modul/bonus/bonus_users.php
@@ -85,7 +85,7 @@ $offset=(int)$offset;
 
 $where .= " order by $sort_by $asc_desc";
 echo $where;
-$sql = "SELECT *,TO_CHAR(bdate,'DD.MM.YYYY') as bdate2, TO_CHAR(date,'DD.MM.YYYY HH:MM') as date2 FROM users WHERE 1=1 $where   LIMIT $limit OFFSET $offset";
+$sql = "SELECT *,TO_CHAR(bdate,'DD.MM.YYYY') as bdate2, TO_CHAR(date,'DD.MM.YYYY HH24:MI') as date2 FROM users WHERE 1=1 $where   LIMIT $limit OFFSET $offset";
 $data = $db::getRows($sql, $binding);
 echo"<h1>Клиенты в программе лояльности</h1> ";
 // $where ".print_r($binding)."
diff --git a/erp24/modul/orders/ajaxOrdersPays.php b/erp24/modul/orders/ajaxOrdersPays.php
index b04a9ac7..ccedd880 100644
--- a/erp24/modul/orders/ajaxOrdersPays.php
+++ b/erp24/modul/orders/ajaxOrdersPays.php
@@ -11,7 +11,7 @@ if(!empty($_REQUEST["delivery_date"])) $delivery_date=htmlentities($_REQUEST["de
 if(!empty($_REQUEST["phone"])) $phone=(int)$_REQUEST["phone"];
 
 
-$order=$db::getRow("SELECT  *,TO_CHAR(created_at, 'DD.MM.YYYY в HH:MM') as date FROM orders_amo WHERE id=?",[$id]);
+$order=$db::getRow("SELECT  *,TO_CHAR(created_at, 'DD.MM.YYYY в HH24:MI') as date FROM orders_amo WHERE id=?",[$id]);
 
 echo"$id  $price $delivery_date 
 price=".$order["price"]."
diff --git a/erp24/modul/orders/info_db2.php b/erp24/modul/orders/info_db2.php
index addc738b..5a4ee746 100644
--- a/erp24/modul/orders/info_db2.php
+++ b/erp24/modul/orders/info_db2.php
@@ -17,7 +17,7 @@ if(!empty($_REQUEST["id"])) $id=(int)$_REQUEST["id"];
  foreach ($data as $row)  $users_arr[$row["id"]]=$row["name"];
 
 
-$order=$db::getRow("SELECT  *,TO_CHAR(created_at, 'DD.MM.YYYY в HH:MM') as date FROM orders_amo WHERE id=?",[$id]);
+$order=$db::getRow("SELECT  *,TO_CHAR(created_at, 'DD.MM.YYYY в HH24:MI') as date FROM orders_amo WHERE id=?",[$id]);
 
 
 echo'<b>'.$order["name"].'</b> Сумма'.$order["price"].' Дата доставки: '.$order["delivery_date"].' '.$order["delivery_time"].'
diff --git a/erp24/modul/orders/samovivoz.php b/erp24/modul/orders/samovivoz.php
index d90f9f1f..ee961591 100644
--- a/erp24/modul/orders/samovivoz.php
+++ b/erp24/modul/orders/samovivoz.php
@@ -47,7 +47,7 @@ echo"</select></td><td><button type=submit class=\"btn btn-success\" name=show>
 
 //$where  created_at>='$date1 00:00:00' AND created_at<='$date2 23:59:59' AND
 
-$sql = "SELECT *,TO_CHAR(created_at, 'DD.MM.YYYY в HH:MM') as created,
+$sql = "SELECT *,TO_CHAR(created_at, 'DD.MM.YYYY в HH24:MI') as created,
  TO_CHAR(delivery_date, 'DD.MM.YYYY') as delivery_date2
  
  FROM $sql_table WHERE  status_id='39041956' order by delivery_date DESC, created_at DESC";
diff --git a/erp24/services/SalesService.php b/erp24/services/SalesService.php
index 8b1b5772..f6179f28 100755
--- a/erp24/services/SalesService.php
+++ b/erp24/services/SalesService.php
@@ -1597,7 +1597,7 @@ class SalesService
         $command = $connection->createCommand("
             SELECT 
                 DISTINCT (sales.id),
-                TO_CHAR(sales.date, 'DD.MM в HH:MM') as dt,
+                TO_CHAR(sales.date, 'DD.MM в HH24:MI') as dt,
                 TO_CHAR(sales.date, 'YYYY-MM-DD') as sales_date_dt,
                 sales.date,
                 sales.matrix, 
diff --git a/erp24/views/write-offs/comments.php b/erp24/views/write-offs/comments.php
index df583d1e..9f236f1c 100644
--- 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 *,TO_CHAR(date, 'DD.MM.YYYY HH:MI') as date2 FROM write_offs WHERE id=?",[$write_offs_id]);
+$data=$db::getRows("SELECT *,TO_CHAR(date, 'DD.MM.YYYY HH24: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 c9838bf1..6b917d79 100644
--- a/erp24/views/write-offs/index.php
+++ b/erp24/views/write-offs/index.php
@@ -100,7 +100,7 @@ echo '<div class="e-table"><div class="table-responsive table-lg mt-3">
 
 </tr></thead><tbody>';
 $summ_retail = 0;
-$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";
+$sql = "SELECT *,TO_CHAR(date, 'DD.MM.YYYY HH24: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;
 $summ = 0;
-- 
2.39.5