Browse Source

Merge branch 'dev'

prodstable
Guillaume 2 years ago
parent
commit
4fb297563c
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      producer/controllers/OrderController.php
  2. +1
    -1
      producer/controllers/SiteController.php

+ 1
- 1
producer/controllers/OrderController.php View File

@@ -956,7 +956,7 @@ class OrderController extends ProducerBaseController
'restricted_access = 0 OR (restricted_access = 1 AND (SELECT COUNT(*) FROM user_point_sale WHERE point_sale.id = user_point_sale.id_point_sale AND user_point_sale.id_user = :id_user) > 0)'
)
->params([':id_user' => User::getCurrentId()])
->orderBy('code ASC, restricted_access ASC, is_bread_box ASC, name ASC')
->orderBy('default DESC, code ASC, restricted_access ASC, is_bread_box ASC, name ASC')
->all();

$creditFunctioningProducer = Producer::getConfig('credit_functioning');

+ 1
- 1
producer/controllers/SiteController.php View File

@@ -96,7 +96,7 @@ class SiteController extends ProducerBaseController
->where([
'id_producer' => $this->getProducer()->id,
'restricted_access' => 0
])->orderBy('is_bread_box ASC, name ASC'),
])->orderBy('default DESC, is_bread_box ASC, name ASC'),
'pagination' => [
'pageSize' => 50,
],

Loading…
Cancel
Save