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

Added shipping date to orders

Browse Source
This commit is contained in:
Frank Schubert
2021-10-29 00:01:16 +02:00
parent 5c1d75b239
commit 6ca68a60d5
3 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -187,7 +187,7 @@
<td onclick="toggleOrder(<?=$order->id?>)" colspan="2" class="pt-0" style="border-top: none;"></td>
<td onclick="toggleOrder(<?=$order->id?>)" colspan="6" class="pt-0" style="border-top: none;">
<div class="row">
<div class="mr-4 order-date-pill">Versandtermin: <span class="text-monospace">--.--.----</span></div>
<div class="mr-4 order-date-pill <?=($order->shippingdate) ? "active" : ""?>">Versandtermin: <span class="text-monospace"><?=($order->shippingdate) ? "<span class='text-success'>".date("d.m.Y", $order->shippingdate)."</span>" : "--.--.----"?></span></div>
<div class="order-date-pill <?=($order->install_date) ? "active" : ""?>">Vorortinstallation: <span class="text-monospace"><?=($order->install_date) ? "<span class='text-success'>".date("d.m.Y",$order->install_date)."</span>" : "--.--.----"?></span></div>
</div>
</td>
@@ -515,7 +515,7 @@
<div class="mr-4 order-date-pill <?=($order->terminations[0]->workflowitems["bautermin"]->value->value_string) ? "active" : ""?>">Tiefbau: <span class="text-monospace"><?=($order->terminations[0]->workflowitems["bautermin"]->value->value_string) ? "<span class='text-success'>".$order->terminations[0]->workflowitems["bautermin"]->value->value_string."</span>" : "--.--.----"?></span></div>
<div class="mr-4 order-date-pill <?=($order->terminations[0]->workflowitems["backbone_setup_date"]->value->value_string) ? "active" : ""?>">Leitungsbau Backbone: <span class="text-monospace"><?=($order->terminations[0]->workflowitems["backbone_setup_date"]->value->value_string) ? "<span class='text-success'>".$order->terminations[0]->workflowitems["backbone_setup_date"]->value->value_string."</span>" : "--.--.----"?></span></div>
<div class="mr-4 order-date-pill <?=($order->terminations[0]->workflowitems["customer_setup_date"]->value->value_string) ? "active" : ""?>">Leitungsbau Kunde: <span class="text-monospace"><?=($order->terminations[0]->workflowitems["customer_setup_date"]->value->value_string) ? "<span class='text-success'>".$order->terminations[0]->workflowitems["customer_setup_date"]->value->value_string."</span>" : "--.--.----"?></span></div>
<div class="mr-4 order-date-pill">Versandtermin: <span class="text-monospace">--.--.----</span></div>
<div class="mr-4 order-date-pill <?=($order->shippingdate) ? "active" : ""?>">Versandtermin: <span class="text-monospace"><?=($order->shippingdate) ? "<span class='text-success'>".date("d.m.Y", $order->shippingdate)."</span>" : "--.--.----"?></span></div>
<div id="date-pill-<?=$order->id?>-install_date" class="order-date-pill <?=($order->install_date) ? "active" : ""?>" id="order-install-date-<?=$order->id?>">Vorortinstallation: <span class="text-monospace"><?=($order->install_date) ? "<span class='text-success'>".date("d.m.Y",$order->install_date)."</span>" : "--.--.----"?></span></div>
</div>
</td>

1
application/Cpeshipping/CpeshippingController.php
View File

@@ -138,6 +138,7 @@ class CpeshippingController extends mfBaseController {
foreach($shippings as $prov) {
$prov->shipped = 1;
$prov->shipping_date = date('U');
$prov->shipped_by = $this->me->id;
$prov->cpeshippingfile_id = $shippingfile_id;
$prov->save();

26
application/Order/Order.php
View File

@@ -10,6 +10,7 @@ class Order extends mfBaseModel {
private $creator;
private $editor;
private $shippingdate;
public function getNewPos() {
if(!$this->id) {
@@ -47,6 +48,26 @@ class Order extends mfBaseModel {
return $terminations;
}
public function getShippingdate() {
if(!$this->id) {
return false;
}
$products = $this->getProperty("products");
if(!is_array($products) || !count($products) ) {
return false;
}
foreach($this->getProperty("products") as $product) {
if($product->cpeprovisioning) {
return $product->cpeprovisioning->shipping_date;
}
}
return false;
}
public function deletePositions() {
if(!is_array($this->getProperty("products")) || !count($this->getProperty("products"))) {
return true;
@@ -143,6 +164,11 @@ class Order extends mfBaseModel {
return $this->files;
}
if($name == "shippingdate") {
$this->shippingdate = $this->getShippingdate();
return $this->shippingdate;
}
if($name == "creator") {
$this->creator = new User($this->create_by);
return $this->creator;