Преглед на файлове

Merge branch 'develop'

master
Guillaume Bourgeois преди 1 година
родител
ревизия
893f5696b6
променени са 3 файла, в които са добавени 4 реда и са изтрити 7 реда
  1. +2
    -5
      backend/controllers/CronController.php
  2. +1
    -1
      common/logic/ProducerContextTrait.php
  3. +1
    -1
      common/logic/User/User/Model/User.php

+ 2
- 5
backend/controllers/CronController.php Целия файл

@@ -176,11 +176,7 @@ class CronController extends BackendController

foreach ($arrayProducers as $producer) {

$producerManager->setProducerContext($producer);
$distributionManager->setProducerContext($producer);
$orderManager->setProducerContext($producer);
$creditHistoryManager->setProducerContext($producer);
$userManager->setProducerContext($producer);
$this->getLogic()->setProducerContext($producer);

$countOrders = 0;
$mailOrdersSend = false;
@@ -203,6 +199,7 @@ class CronController extends BackendController

if ($arrayOrders && is_array($arrayOrders)) {
foreach ($arrayOrders as $order) {
$orderManager->initOrder($order);
if ($order->auto_payment && $configCredit) {
if ($orderManager->getOrderAmount($order, Order::AMOUNT_REMAINING) > 0) {
$creditHistoryManager->createCreditHistory(

+ 1
- 1
common/logic/ProducerContextTrait.php Целия файл

@@ -19,7 +19,7 @@ trait ProducerContextTrait
public function getProducerContext(): Producer
{
if(is_null($this->producerContext)) {
throw new ErrorException("Le contexte producteur n''est pas défini.");
throw new ErrorException("Le contexte producteur n'est pas défini.");
}

return $this->producerContext;

+ 1
- 1
common/logic/User/User/Model/User.php Целия файл

@@ -61,7 +61,7 @@ class User extends ActiveRecordCommon implements IdentityInterface
const STATUS_PRODUCER = 11;
const STATUS_ADMIN = 13;

const ID_USER_SYSTEM = 0;
const ID_USER_SYSTEM = 2;

var $password_old;
var $password_new;

Loading…
Отказ
Запис