Merge branch 'fronkdev' into 'master'
Added estmk prefix to upgrade order email See merge request fronk/thetool!535
This commit is contained in:
@@ -3,7 +3,7 @@
|
|||||||
* @var Order $order
|
* @var Order $order
|
||||||
*/
|
*/
|
||||||
$this->setReturnValue([
|
$this->setReturnValue([
|
||||||
'subject' => "Produktwechsel ".$order->owner->getCompanyOrName(),
|
'subject' => "[ESTMK] Produktwechsel ".$order->owner->getCompanyOrName(),
|
||||||
'from_email' => "workspace.admin@xinon.at",
|
'from_email' => "workspace.admin@xinon.at",
|
||||||
'from_email_name' => "thetool"
|
'from_email_name' => "thetool"
|
||||||
]);
|
]);
|
||||||
|
|||||||
@@ -181,7 +181,7 @@
|
|||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<?php if(!$me->address_id != 209): ?>
|
<?php if($me->address_id != 209): ?>
|
||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<a class="nav-link" href="<?=self::getUrl("Order", "Upgrades", ["filter" => $filter])?>">
|
<a class="nav-link" href="<?=self::getUrl("Order", "Upgrades", ["filter" => $filter])?>">
|
||||||
Upgrades
|
Upgrades
|
||||||
|
|||||||
Reference in New Issue
Block a user