Bladeren bron

Merge branch 'dev'

master
Guillaume 3 jaren geleden
bovenliggende
commit
14d609d88b
2 gewijzigde bestanden met toevoegingen van 2 en 2 verwijderingen
  1. +0
    -1
      common/mail/orderConfirm-html.php
  2. +2
    -1
      producer/controllers/OrderController.php

+ 0
- 1
common/mail/orderConfirm-html.php Bestand weergeven



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


?> ?>



+ 2
- 1
producer/controllers/OrderController.php Bestand weergeven

'order' => $order, 'order' => $order,
'pointSale' => $pointSale, 'pointSale' => $pointSale,
'distribution' => $distribution, 'distribution' => $distribution,
'user' => $user
'user' => $user,
'producer' => $producer
] ]
] ; ] ;



Laden…
Annuleren
Opslaan