From 6effdcb14dfe4c5967a7e88959905a7763ca407b Mon Sep 17 00:00:00 2001 From: fomichev Date: Wed, 5 Feb 2025 15:54:40 +0300 Subject: [PATCH] =?utf8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BF=D0=B0?= =?utf8?q?=D1=80=D0=BE=D0=BB=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/api2/controllers/BonusController.php | 6 ++---- erp24/commands/CronController.php | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/erp24/api2/controllers/BonusController.php b/erp24/api2/controllers/BonusController.php index 6a09fb2c..6881fe33 100644 --- a/erp24/api2/controllers/BonusController.php +++ b/erp24/api2/controllers/BonusController.php @@ -1108,7 +1108,7 @@ class BonusController extends BaseController $sale_avg_price = round($sale_price / ($sale_cnt + 1)); $user->keycode = "" . rand(1000, 9999); - $user->password = ClientHelper::generatePassword(8);; + $user->password = ClientHelper::generatePassword(8); $user->date_last_sale = date('Y-m-d H:i:s'); $user->sale_cnt = $sale_cnt + 1; if ($user->sale_cnt == 1) { @@ -1121,9 +1121,7 @@ class BonusController extends BaseController if (!$user->date) { $user->date = (new DateTime('now', new DateTimeZone('Europe/Moscow')))->format('Y-m-d H:i:sP'); } - if (!$user->password) { - $user->password = '1111'; - } + // $user->email_old = "example@example.ru"; // Поле не заполнялось в старом апи, но без него бд выдаёт ошибку при сохранении // $user->phone_old = "71111111111"; // Поле не заполнялось в старом апи, но без него бд выдаёт ошибку при сохранении // $user->check_id_forgot = "???"; // Поле не заполнялось в старом апи, но без него бд выдаёт ошибку при сохранении diff --git a/erp24/commands/CronController.php b/erp24/commands/CronController.php index 26618ada..e35a40b1 100644 --- a/erp24/commands/CronController.php +++ b/erp24/commands/CronController.php @@ -12,6 +12,7 @@ use yii\console\ExitCode; use yii\db\Expression; use yii\helpers\BaseConsole; use yii\helpers\Console; +use yii_app\helpers\ClientHelper; use yii_app\records\BonusLevels; use yii_app\records\EqualizationRemains; use yii_app\records\Product1cReplacement; @@ -969,7 +970,7 @@ class CronController extends Controller $user->date = (new DateTime('now', new DateTimeZone('Europe/Moscow')))->format('Y-m-d H:i:sP'); } if (!$user->password) { - $user->password = '1111'; + $user->password = ClientHelper::generatePassword(8); } if (!$user->save()) { $this->stdout( -- 2.39.5