fix bug to pgsql and port for pg

diff --git a/erp24/config/db.php b/erp24/config/db.php
index 92a443056c18bb1f5315a967abd8dcb6912742bc..1e278e47c152bfaa8ec00d5ea43d0a0e61a9cefb 100644 (file)
--- 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 e7812eb9a74e2cdd7716166625c0e51d23937cf4..5be4a1df910a3b1e309bb0addc597d379112645b 100755 (executable)
--- 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 f3aaeffd7cfe32fb6d7235e8eb5621a7ef16580c..b6fb9437ba8510ab120f40376e49aae1ccbbf939 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,
-                DATE_FORMAT(date,'%Y-%m-%d') as date_t
+                TO_CHAR(date,'%Y-%m-%d') as date_t
             FROM 
                 users
             WHERE