fix to_char in dashboard/sales

diff --git a/erp24/services/SalesService.php b/erp24/services/SalesService.php
index 3c24b63f7d133bdc6696f8e5882cdc5bb7066872..8b1b5772d228cc3f732493e1b23f345b0aec7ce3 100755 (executable)
--- a/erp24/services/SalesService.php
+++ b/erp24/services/SalesService.php
@@ -246,7 +246,7 @@ class SalesService
         if ($isAdministrator) {
             $query->select([
                 'summ' => new \yii\db\Expression("SUM(summ - skidka)"),
-                'date' => new \yii\db\Expression("TO_CHAR(date,'%Y-%m-%d')"),
+                'date' => new \yii\db\Expression("TO_CHAR(date,'YYYY-MM-DD')"),
                 'operation'
             ]);
         } else {
@@ -254,9 +254,9 @@ class SalesService
                 'summ' => new \yii\db\Expression("SUM(summ - skidka)"),
                 'date' => new \yii\db\Expression("(case when (extract (HOUR from date) >= 0 and extract(HOUR from date) <= $dateTimeEndDayPreparedHour)
                  THEN
-                      TO_CHAR(date - INTERVAL '1 DAY','%Y-%m-%d')
+                      TO_CHAR(date - INTERVAL '1 DAY','YYYY-MM-DD')
                  ELSE
-                      TO_CHAR(date,'%Y-%m-%d')
+                      TO_CHAR(date,'YYYY-MM-DD')
                  END)
                  "),
                 'operation'
@@ -315,7 +315,7 @@ class SalesService
         if ($isAdministrator) {
             $query->select([
                 'summ' => new \yii\db\Expression("SUM(summ - skidka)"),
-                'date' => new \yii\db\Expression("TO_CHAR(date,'%Y-%m-%d')"),
+                'date' => new \yii\db\Expression("TO_CHAR(date,'YYYY-MM-DD')"),
                 'operation'
             ]);
         } else {
@@ -323,9 +323,9 @@ class SalesService
                 'summ' => new \yii\db\Expression("SUM(summ - skidka)"),
                 'date' => new \yii\db\Expression("(case when (HOUR(date) >= 0 and HOUR(date) < $dateTimeEndDayPreparedHour)
                  THEN
-                      TO_CHAR(date - INTERVAL '1 DAY','%Y-%m-%d')
+                      TO_CHAR(date - INTERVAL '1 DAY','YYYY-MM-DD')
                  ELSE
-                      TO_CHAR(date,'%Y-%m-%d')
+                      TO_CHAR(date,'YYYY-MM-DD')
                  END)
                  "),
                 'operation'
@@ -379,7 +379,7 @@ class SalesService
                 sum(case when phone is distinct from NULL THEN 1 ELSE 0 END) as bonus_clients_cnt,
                 sum(summ-skidka) as summ,
                 store_id,
-                to_char(date,'%Y-%m-%d') as date_t
+                to_char(date,'YYYY-MM-DD') as date_t
             FROM 
                 sales
             WHERE
@@ -465,7 +465,7 @@ class SalesService
             SELECT 
                 count(*) as cnt,
                 store_id,
-                TO_CHAR(date,'%Y-%m-%d') as date_t
+                TO_CHAR(date,'YYYY-MM-DD') as date_t
             FROM 
                 sales
             WHERE
@@ -670,9 +670,9 @@ class SalesService
                 store_id,
                 (case when (extract(HOUR from date) >= 0 and extract(HOUR from date) < 8)
                  THEN
-                      TO_CHAR(date - INTERVAL '1 DAY','%Y-%m-%d')
+                      TO_CHAR(date - INTERVAL '1 DAY','YYYY-MM-DD')
                  ELSE
-                      TO_CHAR(date,'%Y-%m-%d')
+                      TO_CHAR(date,'YYYY-MM-DD')
                  END)
                  AS date_t
             FROM 
@@ -744,13 +744,13 @@ class SalesService
             SELECT 
                 count(*) as cnt,
                 store_id,
-                (TO_CHAR(date,'%Y-%m-%d'))
+                (TO_CHAR(date,'YYYY-MM-DD'))
                  AS date_t,
-                (TO_CHAR(date,'%Y-%m-%d_%k'))
+                (TO_CHAR(date,'YYYY-MM-DD_HH24'))
                  AS date_k,
-                (TO_CHAR(date,'%k'))
+                (TO_CHAR(date,'HH24'))
                  AS date_t_h,
-                (TO_CHAR(date,'%Y-%m-%d'))
+                (TO_CHAR(date,'YYYY-MM-DD'))
                  AS date_t_d
             FROM 
                 sales
@@ -1290,15 +1290,15 @@ class SalesService
             $selectColumn = "(p.summ - p.discount) AS summ, sales.operation, sales.store_id, sales.store_id_1c";
 
             if ($isAdministrator) {
-                $selectColumn .= ", TO_CHAR(sales.date,'%Y-%m-%d') 
+                $selectColumn .= ", TO_CHAR(sales.date,'YYYY-MM-DD') 
                      AS date";
 
             } else {
                 $selectColumn .= ", (case when (extract (hour from sales.date) >= 0 and extract(hour from sales.date) < $dateTimeEndDayPreparedHour)
                      THEN
-                          TO_CHAR(sales.date - INTERVAL '1 DAY','%Y-%m-%d')
+                          TO_CHAR(sales.date - INTERVAL '1 DAY','YYYY-MM-DD')
                      ELSE
-                          TO_CHAR(sales.date,'%Y-%m-%d')
+                          TO_CHAR(sales.date,'YYYY-MM-DD')
                      END)
                      AS date
                  ";
@@ -1597,8 +1597,8 @@ class SalesService
         $command = $connection->createCommand("
             SELECT 
                 DISTINCT (sales.id),
-                TO_CHAR(sales.date, '%d.%m в %H:%i') as dt,
-                TO_CHAR(sales.date, '%Y-%m-%d') as sales_date_dt,
+                TO_CHAR(sales.date, 'DD.MM в HH:MM') as dt,
+                TO_CHAR(sales.date, 'YYYY-MM-DD') as sales_date_dt,
                 sales.date,
                 sales.matrix, 
                 sales.skidka,

diff --git a/erp24/services/UsersService.php b/erp24/services/UsersService.php
index b6fb9437ba8510ab120f40376e49aae1ccbbf939..5684b5b99bd65e27460986402d92787dc017d511 100755 (executable)
--- a/erp24/services/UsersService.php
+++ b/erp24/services/UsersService.php
@@ -24,7 +24,7 @@ class UsersService
             SELECT 
                 count(*) as cnt,
                 created_store_id,
-                TO_CHAR(date,'%Y-%m-%d') as date_t
+                TO_CHAR(date,'YYYY-MM-DD') as date_t
             FROM 
                 users
             WHERE