From: Alexander Smirnov <fredeom@mail.ru>
Date: Tue, 2 Apr 2024 10:03:18 +0000 (+0300)
Subject: fix bug to pgsql and port for pg
X-Git-Tag: 1.1~162^2~8
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=0818b6ae2b83c49021b65e9d1dc687eb74a2e8bb;p=erp24_rep%2Fyii-erp24%2F.git

fix bug to pgsql and port for pg
---

diff --git a/erp24/config/db.php b/erp24/config/db.php
index 92a44305..1e278e47 100644
--- a/erp24/config/db.php
+++ b/erp24/config/db.php
@@ -4,7 +4,7 @@ return 1 == 1 ? [
     'class' => yii\db\Connection::class,
     'dsn' => strtr('pgsql:host={host};port={port};dbname={dbname}', [
         '{host}' => getenv('POSTGRES_HOSTNAME') ?: '127.0.0.1',
-        '{port}' => getenv('POSTGRES_PORT') ?: 3306,
+        '{port}' => getenv('POSTGRES_PORT') ?: 5432,
         '{dbname}' => getenv('POSTGRES_SCHEMA') ?: 'erp24',
     ]),
     'username' => getenv('POSTGRES_USER') ?: 'bazacvetov24',
diff --git a/erp24/services/SalesService.php b/erp24/services/SalesService.php
index e7812eb9..5be4a1df 100755
--- a/erp24/services/SalesService.php
+++ b/erp24/services/SalesService.php
@@ -1553,7 +1553,7 @@ class SalesService
         $command = $connection->createCommand("
             SELECT
                 sales.id,
-                sum(if(($where_serv),sales_items.summa,0)) as summ
+                sum(CASE WHEN $where_serv THEN sales_items.summa ELSE 0 END) as summ
             FROM 
                 sales
             RIGHT JOIN
diff --git a/erp24/services/UsersService.php b/erp24/services/UsersService.php
index f3aaeffd..b6fb9437 100755
--- a/erp24/services/UsersService.php
+++ b/erp24/services/UsersService.php
@@ -24,7 +24,7 @@ class UsersService
             SELECT 
                 count(*) as cnt,
                 created_store_id,
-                DATE_FORMAT(date,'%Y-%m-%d') as date_t
+                TO_CHAR(date,'%Y-%m-%d') as date_t
             FROM 
                 users
             WHERE