Merge branch 'fronkdev' into 'master'
small change in productchange ticket See merge request fronk/thetool!518
This commit is contained in:
@@ -4,7 +4,7 @@
|
|||||||
* @var Contract $origin
|
* @var Contract $origin
|
||||||
*/
|
*/
|
||||||
$this->setReturnValue([
|
$this->setReturnValue([
|
||||||
'subject' => "Produktwechsel ".$contract->owner->getCompanyOrName(),
|
'subject' => "Produktwechsel ".$contract->owner->getCompanyOrName().($contract->finish_date ? " - ".date("d.m.Y", $contract->finish_date) : ""),
|
||||||
'from_email' => "workspace.admin@xinon.at",
|
'from_email' => "workspace.admin@xinon.at",
|
||||||
'from_email_name' => "thetool"
|
'from_email_name' => "thetool"
|
||||||
]);
|
]);
|
||||||
@@ -37,11 +37,15 @@ Produkt: <?=$origin->product_name?>
|
|||||||
Vertragsinhaber: <?=$contract->owner->getCompanyOrName()?> [<?=$contract->owner->customer_number?>]
|
Vertragsinhaber: <?=$contract->owner->getCompanyOrName()?> [<?=$contract->owner->customer_number?>]
|
||||||
Produkt: <?=$contract->product_name?>
|
Produkt: <?=$contract->product_name?>
|
||||||
|
|
||||||
|
<?php if($contract->finish_date): ?>
|
||||||
|
Fertigstellungsdatum: <?=date("d.m.Y", $contract->finish_date)?>
|
||||||
|
|
||||||
|
<?php endif; ?>
|
||||||
<?=$url_prefix?><?=self::getUrl("Contract", "view", ["contract_id" => $contract->id])?>
|
<?=$url_prefix?><?=self::getUrl("Contract", "view", ["contract_id" => $contract->id])?>
|
||||||
|
|
||||||
|
|
||||||
<?php if($contract->finish_date): ?>
|
<?php if($contract->finish_date): ?>
|
||||||
Neues Produkt hat fertigstellungdatum, somit ist nach der technischen Umstellung nichts mehr zu machen.
|
Neues Produkt hat Fertigstellungdatum, somit ist nach der technischen Umstellung nichts mehr zu machen.
|
||||||
<?php else: ?>
|
<?php else: ?>
|
||||||
⚠️ Neues Produkt muss nach der technischen Umstellung in thetool FERTIGGESTELLT werden.
|
⚠️ Neues Produkt muss nach der technischen Umstellung in thetool FERTIGGESTELLT werden.
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
|
|||||||
Reference in New Issue
Block a user