From 3c3c2edc4af318ad6f4be3ffa8edd81ff195cda0 Mon Sep 17 00:00:00 2001
From: Alexander Smirnov <fredeom@mail.ru>
Date: Tue, 9 Apr 2024 15:37:58 +0300
Subject: [PATCH] move orders couriers from old modul

---
 erp24/controllers/OrdersController.php |  3 +++
 erp24/inc/db.php                       | 16 +++++----------
 erp24/modul/orders/couriers.php        | 27 +++++++++++++-------------
 erp24/views/orders/couriers.php        |  5 +++++
 4 files changed, 26 insertions(+), 25 deletions(-)
 create mode 100644 erp24/views/orders/couriers.php

diff --git a/erp24/controllers/OrdersController.php b/erp24/controllers/OrdersController.php
index e37e715..a013ef2 100644
--- a/erp24/controllers/OrdersController.php
+++ b/erp24/controllers/OrdersController.php
@@ -15,6 +15,9 @@ use yii_app\records\OrdersAmoSearch;
 
 class OrdersController extends Controller
 {
+    public function actionCouriers() {
+        return $this->render('couriers');
+    }
 
     public function actionDelivery()
     {
diff --git a/erp24/inc/db.php b/erp24/inc/db.php
index 79d00eb..1ffb6e0 100644
--- a/erp24/inc/db.php
+++ b/erp24/inc/db.php
@@ -37,14 +37,9 @@ protected $config = '';
     if (self::$instance === null){
       try {
         self::$db = new PDO(
-          'mysql:host='.$config['DB_HOST'].';dbname='.$config['DB_NAME'],
+          'pgsql:host='.$config['DB_HOST'].';dbname='.$config['DB_NAME'],
           $config['DB_USER'],
           $config['DB_PASSWORD'],
-          $options = [
-              PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
-              PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
-              PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES ".$config['CHARSET']
-          ]
         );
       } catch (PDOException $e) {
           throw new Exception ($e->getMessage());
@@ -214,11 +209,10 @@ protected $config = '';
 global $db,$config;
 
 $config = [
-    'DB_HOST' => getenv('MODE') === 'dev' ? 'db-yii_erp24' : '127.0.0.1',
-    'DB_USER' => $_CONFIG_SITE["mysql_user"],
-    'DB_PASSWORD' => $_CONFIG_SITE["mysql_pass"],	
-    'DB_NAME' =>$_CONFIG_SITE["mysql_db"],	
-    'CHARSET' => 'utf8',	
+    'DB_HOST' => getenv('MODE') === 'dev' ? 'db-pgsql-yii_erp24' : '127.0.0.1',
+    'DB_USER' => getenv('POSTGRES_USER') ?: 'bazacvetov24',
+    'DB_PASSWORD' => getenv('POSTGRES_PASSWORD') ?: 'JVJruro_Xdg456o3ir',
+    'DB_NAME' => getenv('POSTGRES_SCHEMA') ?: 'erp24',
 ];
 
 
diff --git a/erp24/modul/orders/couriers.php b/erp24/modul/orders/couriers.php
index 01337ac..3a08489 100644
--- a/erp24/modul/orders/couriers.php
+++ b/erp24/modul/orders/couriers.php
@@ -1,9 +1,9 @@
-<?
-include_once("startup.php");
-include_once("inc/db.php");
-include_once("inc/base_new.php");
+<?php
+include_once(dirname(__DIR__, 2) . "/startup.php");
+include_once(dirname(__DIR__, 2) . "/inc/db.php");
+include_once(dirname(__DIR__, 2) . "/inc/base_new.php");
 
-include"templates/top.php";
+//include"templates/top.php";
 
 echo"<h1>Курьеры</h1>
 
@@ -11,27 +11,26 @@ echo"<h1>Курьеры</h1>
 
 
 <table class=\"table table-hover\"><thead><tr><th width=60>ID</th><th>пароль</th><th>Имя сотрудника</th></tr></thead><tbody>";
-include_once("inc/db2.php");
-
+//include_once(dirname(__DIR__, 2) . "/inc/db2.php");
 
 if(!empty($_GET["dell_id"])) {
-    $db2::sql("DELETE  FROM admin WHERE group_id='27' AND admin_id=? AND active='0'",[(int)$_GET["dell_id"]]);    
+    $db::sql("DELETE  FROM admin WHERE group_id='27' AND admin_id=? AND active='0'",[(int)$_GET["dell_id"]]);
 }
 
-   $data= $db2::getRows("SELECT * FROM admin WHERE group_id='27' order by active desc, name_admin ASC");
+   $data= $db::getRows("SELECT * FROM admin WHERE group_id='27' order by active desc, name ASC");
    foreach($data as $row){
 
       
-   echo"<tr ";  if($row["active"]==0) echo" class=\"bg-danger\""; echo"><td><a href=\"/admin/?id=".$row["id"]."\">".$row["admin_id"]."</a> 
+   echo"<tr ";  if($row["active"]==0) echo" class=\"bg-danger\""; echo"><td><a href=\"/admin/?id=".$row["id"]."\">".$row["id"]."</a> 
    ";
   
   if($row["active"]==0) echo"<font color=red>не активный</font>";
    echo"
-   </td><td> ".$row["pass_user"]."</td> <td><a href=\"/orders/courier_add/?id=".$row["admin_id"]."\">
-   <b>".$row["name_admin"]."</b></a></td>
+   </td><td> ".$row["pass_user"]."</td> <td><a href=\"/orders/courier_add/?id=".$row["id"]."\">
+   <b>".$row["name"]."</b></a></td>
    
   <td>";
-if($row["active"]==0)  echo"<a href=\"/orders/couriers/?dell_id=".$row["admin_id"]."\" class=\"btn btn-danger btn-sm\">удалить</a>";
+if($row["active"]==0)  echo"<a href=\"/orders/couriers/?dell_id=".$row["id"]."\" class=\"btn btn-danger btn-sm\">удалить</a>";
   
   echo"</td> 
    </tr>  ";   
@@ -41,4 +40,4 @@ if($row["active"]==0)  echo"<a href=\"/orders/couriers/?dell_id=".$row["admin_id
 echo"</tbody></table>";
 
 
-include"templates/bottom.php";
+//include"templates/bottom.php";
diff --git a/erp24/views/orders/couriers.php b/erp24/views/orders/couriers.php
new file mode 100644
index 0000000..831c429
--- /dev/null
+++ b/erp24/views/orders/couriers.php
@@ -0,0 +1,5 @@
+<?php
+
+chdir(__DIR__ . '/../../');
+
+include 'modul/orders/couriers.php';
-- 
2.39.5