Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'fronkdev' into 'master'

Browse Source 
Added email when ordering upgrade order

See merge request fronk/thetool!533
This commit is contained in:
Frank Schubert
2024-07-30 18:56:30 +00:00
parent 215d23ddc2 55916249b6
commit 914c6402e8
5 changed files with 82 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Layout/default/Emailtemplates/order/productchange-ticket-order.php Normal file
View File

@@ -0,0 +1,37 @@
<?php
/**
* @var Order $order
*/
$this->setReturnValue([
'subject' => "Produktwechsel ".$order->owner->getCompanyOrName(),
'from_email' => "workspace.admin@xinon.at",
'from_email_name' => "thetool"
]);
$url_prefix = "http".($_SERVER["HTTPS"] ? "s" : "")."://".$_SERVER["HTTP_HOST"];
?>
project: storungen-and-support
type: Produktwechsel
status: Neu
priority: Residential
Kundenname: <?=str_replace(["\n", "\r"], "", $order->owner->getCompanyOrName())?>
Telefon: <?=$order->owner->phone?>
e-Mail: <?=$order->owner->email?>
Kundennummer: <?=$order->owner->customer_number?>
Kunde: <?=str_replace(["\n", "\r"], "", $order->owner->getCompanyOrName())?>
### Neue Produkte:
<?php foreach($order->products as $product): ?>
<?=$product->product->name?>
<?php endforeach; ?>
<?=$url_prefix?><?=self::getUrl("Order", "", ["id" => $order->id])?>
⚠️ Upgradebestellung muss nach der technischen Umstellung in thetool ABGESCHLOSSEN werden.

9
Layout/default/Order/Form.php
View File

@@ -544,7 +544,14 @@
<h4>Produkte</h4>
<div class="row col-12 mt-2 mb-2">
<label><input type="checkbox" class="input-check" name="upgrade" value="1" <?=($order->upgrade) ? "checked='checked'" : ""?> /> Bestellung ist Upgrade</label>
<?php if($me->address_id == 209): ?>
<label><input type="checkbox" class="input-check" name="upgrade" value="1" <?=($order->upgrade) ? "checked='checked'" : ""?> /> Bestellung ist Upgrade</label>
<?php else: ?>
<p class="alert alert-warning">
Upgrades können ab sofort nur noch über die Upgradefunktion auf der Bestellübersicht eingegeben werden.
<a href="<?=self::getUrl("Order", "addUpgrade")?>">Klicken Sie hier</a>, um zur Upgradefunktion zu gelangen.
</p>
<?php endif; ?>
</div>
<div></div>

6
Layout/default/Order/Index.php
View File

@@ -143,7 +143,9 @@
<div class="col-12">
<div class="float-right">
<a class="btn btn-lg btn-primary mb-2" href="<?=self::getUrl("Order", "add")?>"><i class="fas fa-fw fa-square-plus "></i> Neue Bestellung anlegen</a>
<a class="btn btn-lg btn-purple mb-2 ml-2" href="<?=self::getUrl("Order", "addUpgrade")?>"><i class="fas fa-fw fa-square-up "></i> Upgrade eingeben</a>
<?php if(!$me->address_id != 209): ?>
<a class="btn btn-lg btn-purple mb-2 ml-2" href="<?=self::getUrl("Order", "addUpgrade")?>"><i class="fas fa-fw fa-square-up "></i> Upgrade eingeben</a>
<?php endif; ?>
</div>
</div>
</div>
@@ -179,11 +181,13 @@
<?php endif; ?>
</a>
</li>
<?php if(!$me->address_id != 209): ?>
<li class="nav-item">
<a class="nav-link" href="<?=self::getUrl("Order", "Upgrades", ["filter" => $filter])?>">
Upgrades
</a>
</li>
<?php endif; ?>
</ul>
<?php if($showSpecial) $lonelyOrders = $special_orders ?>