[ERP-144] Исправлено pgsql формат времени, часов и минут: HH:MM -> HH24:MI

diff --git a/erp24/controllers/EmployeeSalesReportController.php b/erp24/controllers/EmployeeSalesReportController.php
index 5c3e6f6676c4babb0bf6d50a211990d1c96c00db..984120017eac270696477f5067667e102c23e487 100644 (file)
--- 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 44873cb7c5cd72d31612abb422abdf067c95a75f..782da87b27d5cd4476e8fcf8bcb4a27f411b354e 100644 (file)
--- 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 b04a9ac73d4a134d86f760fb373ab64886f610c7..ccedd880a93b54f24908220d52843fdad18aef35 100644 (file)
--- 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 addc738b63dacedabe8b12bff279d68d37c0a25f..5a4ee746173e21389f1a5bb8c4afa4f733cbf689 100644 (file)
--- 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 d90f9f1f09ad1e1eef76b339ccdfc4cebeafc208..ee961591b5b4dee4a0a12bbf8c6e6488ce71e69a 100644 (file)
--- 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 8b1b5772d228cc3f732493e1b23f345b0aec7ce3..f6179f28586729faa1c365b3105af9adf63560ad 100755 (executable)
--- 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 df583d1ee36f5fce0db36eec820080de66238621..9f236f1c882117907aa31059f00382295e00affb 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 *,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 c9838bf1ffea713edddb5712296781204221d386..6b917d792a0d83b23d583ad252f1a654a4ea7c62 100644 (file)
--- 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;