Browse Source

Merge branch 'dev'

prodstable
Guillaume 2 years ago
parent
commit
c4b1c9d69a
2 changed files with 5 additions and 1 deletions
  1. +3
    -1
      backend/controllers/DistributionController.php
  2. +2
    -0
      common/helpers/Tiller.php

+ 3
- 1
backend/controllers/DistributionController.php View File

$orders = Order::searchAll([ $orders = Order::searchAll([
'distribution.date' => $date, 'distribution.date' => $date,
'order.tiller_synchronization' => 1 'order.tiller_synchronization' => 1
]);
], [
'conditions' => 'date_delete IS NULL'
]);


$strDate = date('Y-m-d\T12:i:s+0000', strtotime($date) + 1); $strDate = date('Y-m-d\T12:i:s+0000', strtotime($date) + 1);



+ 2
- 0
common/helpers/Tiller.php View File

$ordersOpendistrib = Order::searchAll([ $ordersOpendistrib = Order::searchAll([
'distribution.date' => $date, 'distribution.date' => $date,
'order.tiller_synchronization' => 1 'order.tiller_synchronization' => 1
], [
'conditions' => 'date_delete IS NULL'
]); ]);


$ordersOpendistribSynchro = []; $ordersOpendistribSynchro = [];

Loading…
Cancel
Save