From: Aleksey Filippov Date: Wed, 15 May 2024 18:06:29 +0000 (+0000) Subject: Merge branch 'bug_filippov_ERP-19_add_bonus_fix' into 'develop' X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=fc95ac80d7de63fecbe1af1793d98bf804cbb1f0;p=yii-erp24%2F.git Merge branch 'bug_filippov_ERP-19_add_bonus_fix' into 'develop' правка по добавлению вонусов через api и логирование See merge request gitlab-instance/yii-erp24!137 --- fc95ac80d7de63fecbe1af1793d98bf804cbb1f0 diff --cc erp24/api2/controllers/BonusController.php index 368ef44,e4c180a..98a2c9f --- a/erp24/api2/controllers/BonusController.php +++ b/erp24/api2/controllers/BonusController.php @@@ -576,9 -653,11 +653,12 @@@ class BonusController extends BaseContr $mess = []; + file_put_contents(self::OUT_DIR . '/sale_bonuses_' . $fl . '.json', PHP_EOL . '--' . __LINE__, FILE_APPEND); $user = Users::find()->where(['phone' => $result['phone']])->andWhere(['phone_true' => '1'])->one(); + /** @var $user Users */ if (!$user) { + + file_put_contents(self::OUT_DIR . '/sale_bonuses_' . $fl . '.json', PHP_EOL . '--' . __LINE__, FILE_APPEND); $mess["error"] = "Покупателя " . $result['phone'] . " нет в бонусной программе!"; return $this->asJson($mess);