Browse Source

Merge branch 'dev'

master
Guillaume 3 years ago
parent
commit
14d609d88b
2 changed files with 2 additions and 2 deletions
  1. +0
    -1
      common/mail/orderConfirm-html.php
  2. +2
    -1
      producer/controllers/OrderController.php

+ 0
- 1
common/mail/orderConfirm-html.php View File

@@ -38,7 +38,6 @@ termes.

use common\models\Producer ;
use common\helpers\GlobalParam ;
$producer = GlobalParam::getCurrentProducer() ;

?>


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

@@ -478,7 +478,8 @@ class OrderController extends ProducerBaseController
'order' => $order,
'pointSale' => $pointSale,
'distribution' => $distribution,
'user' => $user
'user' => $user,
'producer' => $producer
]
] ;


Loading…
Cancel
Save