Preorderlogistics QR Code WIP
This commit is contained in:
Frank Schubert
@@ -97,8 +97,8 @@
|
||||
</tr>
|
||||
<?php foreach($preorders as $preorder): ?>
|
||||
<tr class="preorder-list-tr" id="preorder-<?=$preorder->id?>">
|
||||
<td><button type="button" class="btn btn-sm btn-success" onclick="printShippingSlip(<?=$preorder->id?>)">Versandetikett und<br />Beipackzettel drucken</button> </td>
|
||||
<td>
|
||||
<td class="text-right align-middle"><button type="button" class="btn btn-sm btn-success font-weight-bold" onclick="printShippingSlip(<?=$preorder->id?>)"><i class="fas fa-fw fa-print"></i> DRUCKEN</button> </td>
|
||||
<td class="text-center align-middle">
|
||||
<label>Versandt <i class="fas fa-check text-success hidden"></i><input type="checkbox" class="form-control pointer" name="sent" value="1" id="sent-<?=$preorder->id?>" /></label>
|
||||
</td>
|
||||
<td>
|
||||
@@ -145,7 +145,9 @@
|
||||
<script type="text/javascript">
|
||||
|
||||
function printShippingSlip(id) {
|
||||
window.location.href = "<?=self::getUrl("Preorderlogistics", "print")?>?id=" + id;
|
||||
|
||||
var w = window.open("<?=self::getUrl("Preorderlogistics", "print")?>?id=" + id, "_blank", "popup=yes");
|
||||
w.print();
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
@@ -1 +1,82 @@
|
||||
test
|
||||
<?php
|
||||
|
||||
$this->setReturnValue([
|
||||
'filename' => "ichwillglasfaser-versand-".$preorder->ucode.".pdf"
|
||||
]);
|
||||
?>
|
||||
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>Ichwillglasfaser Hausanschlussversand</title>
|
||||
<meta charset="utf-8" />
|
||||
<link href="<?=self::getResourcePath()?>fontawesome/css/all.min.css" rel="stylesheet" type="text/css" />
|
||||
<!--link href="<?=self::getResourcePath()?>assets/css/bootstrap.min.css" rel="stylesheet" type="text/css" /-->
|
||||
<link href="<?=self::getResourcePath()?>assets/css/print.css" rel="stylesheet" type="text/css" />
|
||||
|
||||
<style>
|
||||
body {
|
||||
margin-top: 0;
|
||||
padding-top: 20pt;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<div style="border-top: 1pt solid #000">
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div style="height:24pt;"></div>
|
||||
|
||||
<h3>Wichtige Information</h3>
|
||||
|
||||
<div style="height:24pt;"></div>
|
||||
|
||||
<div>
|
||||
<?php if($preorder->company): ?>
|
||||
<?=nl2br($preorder->company)?><br />
|
||||
<?php endif; ?>
|
||||
<?php if($preorder->lastname): ?>
|
||||
<?=$preorder->firstname?> <?=$preorder->lastname?><br />
|
||||
<?php endif; ?>
|
||||
<?=$preorder->street?><br />
|
||||
<?=$preorder->zip?> <?=$preorder->city?>
|
||||
</div>
|
||||
|
||||
<div style="height:24pt;"></div>
|
||||
|
||||
<div>
|
||||
<p>Sehr geehrte Damen und Herren,</p>
|
||||
<p>Vielen Dank, dass Sie sich für einen Glasfaseranschluss entschieden haben.</p>
|
||||
<p>In diesem Paket finden Sie das Lehrrohr, welches auf Ihrem Grundstück eingegrageb
|
||||
werden muss.</p>
|
||||
<p>Sobald die Lehrrohrinstallation Ihrerseits erledigt wurde, teilen Sie uns dies bitte mit.
|
||||
Scannen Sie dazu einfach den folgenden QR-Code auf Ihrem Smartphone ein und bestätigen Sie
|
||||
uns die Fertigstellung der Installation:</p>
|
||||
</div>
|
||||
|
||||
<div style="height:1.5pt;"></div>
|
||||
|
||||
<div>
|
||||
<img src="<?=self::getResourcePath()?>assets/images/qr-placeholder.png" />
|
||||
</div>
|
||||
|
||||
<div style="height:1.5pt;"></div>
|
||||
|
||||
<div>
|
||||
<p><strong>Sollten Sie noch Fragen haben wenden Sie sich bitte an Ihrem Internetprovider.</strong></p>
|
||||
</div>
|
||||
|
||||
<div style="height:32pt;"></div>
|
||||
|
||||
<div>
|
||||
<p>Mit besten Grüßen,</p>
|
||||
|
||||
<p>RML Infrastruktur Liezen</p>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@@ -465,10 +465,10 @@ class PreorderModel {
|
||||
}
|
||||
}
|
||||
|
||||
if(array_key_exists("cifcode", $filter)) {
|
||||
$cifcode = FronkDB::singleton()->escape($filter['cifcode']);
|
||||
if($cifcode) {
|
||||
$where .= " AND cifcode LIKE '$cifcode'";
|
||||
if(array_key_exists("ciftoken", $filter)) {
|
||||
$ciftoken = FronkDB::singleton()->escape($filter['ciftoken']);
|
||||
if($ciftoken) {
|
||||
$where .= " AND ciftoken LIKE '$ciftoken'";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
26
application/Preorderlogistics/Preorderlogistics.php
Normal file
26
application/Preorderlogistics/Preorderlogistics.php
Normal file
@@ -0,0 +1,26 @@
|
||||
<?php
|
||||
|
||||
use \chillerlan\QRCode;
|
||||
|
||||
class Preorderlogistics extends mfBaseModel {
|
||||
|
||||
|
||||
public function generateCifQrPng() {
|
||||
$qr_opts = new QROptions();
|
||||
$qr_opts->outputType = QROutputInterface::GDIMAGE_PNG;
|
||||
$qr = new QRCode($qr_opts);
|
||||
try {
|
||||
$png_data = $qr->render("https://fronk.at/");
|
||||
} catch (Exception $ex) {
|
||||
throw $ex;
|
||||
}
|
||||
|
||||
if(!$png_data) {
|
||||
echo "Kein png data!";exit;
|
||||
}
|
||||
|
||||
var_dump($png_data);
|
||||
exit;
|
||||
|
||||
}
|
||||
}
|
||||
@@ -165,7 +165,7 @@ class PreorderlogisticsController extends mfBaseController {
|
||||
$this->layout()->setFlash("Vorbestellung nicht gefunden (3)", "error");
|
||||
$this->redirect("Preorderlogistics");
|
||||
}
|
||||
var_dump($preorder->adb_hausnummer->netzgebiet_id, $user_network_ids);
|
||||
//var_dump($preorder->adb_hausnummer->netzgebiet_id, $user_network_ids);exit;
|
||||
|
||||
$network = NetworkModel::getFirst(["adb_network_id" => $preorder->adb_hausnummer->netzgebiet_id]);
|
||||
if(!$network) {
|
||||
@@ -186,10 +186,27 @@ class PreorderlogisticsController extends mfBaseController {
|
||||
$preorder->save();
|
||||
}
|
||||
|
||||
$plog = PreorderlogisticsModel::getFirst(["preorder_id" => $preorder->id]);
|
||||
if(!$plog) {
|
||||
$plog = PreorderlogisticsModel::create([
|
||||
"preorder_id" => $preorder->id,
|
||||
"sent" => 0
|
||||
]);
|
||||
if(!$plog->save()) {
|
||||
$this->layout()->setFlash("Eintrag konnte nicht gespeichert werden");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
$this->layout()->set("preorder", $preorder);
|
||||
|
||||
}
|
||||
|
||||
|
||||
private function setSentApi() {
|
||||
|
||||
}
|
||||
}
|
||||
249
application/Preorderlogistics/PreorderlogisticsModel.php
Normal file
249
application/Preorderlogistics/PreorderlogisticsModel.php
Normal file
@@ -0,0 +1,249 @@
|
||||
<?php
|
||||
|
||||
class PreorderlogisticsModel {
|
||||
|
||||
public $preorder_id;
|
||||
public $sent;
|
||||
|
||||
public $create_by = null;
|
||||
public $edit_by = null;
|
||||
public $create = null;
|
||||
public $edit = null;
|
||||
|
||||
public static function create(Array $data) {
|
||||
$model = new Building();
|
||||
|
||||
foreach ($data as $field => $value) {
|
||||
if (property_exists(get_called_class(), $field)) {
|
||||
$model->$field = $value;
|
||||
}
|
||||
}
|
||||
|
||||
$me = mfValuecache::singleton()->get("me");
|
||||
if (!$me) {
|
||||
$me = new User();
|
||||
$me->loadMe();
|
||||
mfValuecache::singleton()->set("me", $me);
|
||||
}
|
||||
|
||||
if ($model->create_by === null) {
|
||||
$model->create_by = $me->id;
|
||||
}
|
||||
if ($model->edit_by === null) {
|
||||
$model->edit_by = $me->id;
|
||||
}
|
||||
|
||||
return $model;
|
||||
}
|
||||
|
||||
public static function getFirst($filter = []) {
|
||||
$db = FronkDB::singleton();
|
||||
|
||||
$where = self::getSqlFilter($filter);
|
||||
$res = $db->select("Building", "*", "$where ORDER BY network_id,pop_id,street,zip,city LIMIT 1");
|
||||
if ($db->num_rows($res)) {
|
||||
$data = $db->fetch_object($res);
|
||||
$item = new Building($data);
|
||||
if ($item->id) {
|
||||
return $item;
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public static function getAll() {
|
||||
$items = [];
|
||||
|
||||
$db = FronkDB::singleton();
|
||||
|
||||
$res = $db->select("Building", "*", "1=1 ORDER BY network_id,pop_id,street,zip,city");
|
||||
if ($db->num_rows($res)) {
|
||||
while ($data = $db->fetch_object($res)) {
|
||||
$items[] = new Building($data);
|
||||
}
|
||||
}
|
||||
return $items;
|
||||
}
|
||||
|
||||
public static function count($filter) {
|
||||
$db = FronkDB::singleton();
|
||||
|
||||
$where = self::getSqlFilter($filter);
|
||||
$sql = "SELECT COUNT(*) as cnt FROM Building
|
||||
LEFT JOIN Buildingtype ON (Buildingtype.id = Building.type_id)
|
||||
LEFT JOIN Buildingstatus ON (Buildingstatus.id = Building.status_id)
|
||||
WHERE $where
|
||||
";
|
||||
|
||||
$res = $db->query($sql);
|
||||
if ($db->num_rows($res)) {
|
||||
$data = $db->fetch_object($res);
|
||||
return $data->cnt;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
public static function search($filter = [], $limit = false) {
|
||||
$items = [];
|
||||
$db = FronkDB::singleton();
|
||||
|
||||
$where = self::getSqlFilter($filter);
|
||||
$sql = "SELECT Building.* FROM Building
|
||||
LEFT JOIN Buildingtype ON (Buildingtype.id = Building.type_id)
|
||||
LEFT JOIN Buildingstatus ON (Buildingstatus.id = Building.status_id)
|
||||
WHERE $where
|
||||
ORDER BY network_id, pop_id, street, zip, city";
|
||||
|
||||
mfLoghandler::singleton()->debug($sql);
|
||||
if (is_array($limit) && count($limit)) {
|
||||
if (is_numeric($limit['start']) && is_numeric($limit['count'])) {
|
||||
$sql .= " LIMIT " . $limit['start'] . ", " . $limit['count'];
|
||||
} elseif (is_numeric($count)) {
|
||||
$sql .= " LIMIT " . $limit['count'];
|
||||
}
|
||||
}
|
||||
|
||||
$res = $db->query($sql);
|
||||
if ($db->num_rows($res)) {
|
||||
while ($data = $db->fetch_object($res)) {
|
||||
$items[] = new Building($data);
|
||||
}
|
||||
}
|
||||
return $items;
|
||||
}
|
||||
|
||||
private static function getSqlFilter($filter) {
|
||||
$where = "1=1 ";
|
||||
|
||||
if (array_key_exists("network_id", $filter)) {
|
||||
$network_id = $filter['network_id'];
|
||||
if (is_numeric($network_id)) {
|
||||
$where .= " AND Building.network_id=$network_id";
|
||||
} elseif (is_array($network_id) && count($network_id)) {
|
||||
$where .= " AND Building.network_id IN (" . implode(",", $network_id) . ")";
|
||||
}
|
||||
}
|
||||
|
||||
if (array_key_exists("networksection_id", $filter)) {
|
||||
$networksection_id = $filter['networksection_id'];
|
||||
if (is_numeric($networksection_id)) {
|
||||
$where .= " AND Building.networksection_id=$networksection_id";
|
||||
}
|
||||
}
|
||||
|
||||
if (array_key_exists("status_id", $filter)) {
|
||||
$status_id = $filter['status_id'];
|
||||
if (is_numeric($status_id)) {
|
||||
$where .= " AND Building.status_id=$status_id";
|
||||
}
|
||||
}
|
||||
|
||||
if (array_key_exists("pipeworker_id", $filter)) {
|
||||
$pipeworker_id = $filter['pipeworker_id'];
|
||||
if (is_numeric($pipeworker_id)) {
|
||||
$where .= " AND Building.pipeworker_id=$pipeworker_id";
|
||||
}
|
||||
}
|
||||
|
||||
if (array_key_exists("type", $filter) && is_array($filter['type']) && count($filter['type'])) {
|
||||
$ot = $filter['type'];
|
||||
$in = [];
|
||||
foreach ($ot as $type) {
|
||||
$type = FronkDB::singleton()->escape($type);
|
||||
$in[] = "Buildingtype.name = '$type'";
|
||||
}
|
||||
|
||||
$or = "";
|
||||
if (count($in)) {
|
||||
$or = implode(" OR ", $in);
|
||||
$where .= " AND ( $or )";
|
||||
}
|
||||
}
|
||||
|
||||
if (array_key_exists("status", $filter)) {
|
||||
if (in_array(substr($filter['status'], 1, 2), ["<=", ">="])) {
|
||||
$op = substr($filter['status'], 1, 2);
|
||||
$status = substr($filter['status'], 3);
|
||||
} elseif (in_array(substr($filter['status'], 1, 1), ["<", ">"])) {
|
||||
$op = substr($filter['status'], 1, 1);
|
||||
$status = substr($filter['status'], 2);
|
||||
} else {
|
||||
$op = "=";
|
||||
$status = $filter['status'];
|
||||
}
|
||||
|
||||
if (is_numeric($status)) {
|
||||
$where .= " AND Buildingstatus.code $op $status";
|
||||
} else {
|
||||
// get code of statusname
|
||||
$code = Buildingstatus::getOne(["name" => $status]);
|
||||
if ($code) {
|
||||
$status = FronkDB::singleton()->escape($status);
|
||||
$where .= " AND Buildingstatus.code $op '$status'";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (array_key_exists("code", $filter)) {
|
||||
$code = FronkDB::singleton()->escape($filter['code']);
|
||||
if ($code) {
|
||||
$where .= " AND Building.`code` like '%$code%'";
|
||||
}
|
||||
}
|
||||
|
||||
if (array_key_exists("oaid", $filter)) {
|
||||
$oaid = FronkDB::singleton()->escape($filter['oaid']);
|
||||
if ($oaid) {
|
||||
$where .= " AND Building.`oaid` like '%$oaid%'";
|
||||
}
|
||||
}
|
||||
|
||||
if (array_key_exists("street", $filter)) {
|
||||
$street = FronkDB::singleton()->escape($filter["street"]);
|
||||
if ($street) {
|
||||
$where .= " AND street like '%$street%'";
|
||||
}
|
||||
}
|
||||
|
||||
if (array_key_exists("=street", $filter)) {
|
||||
$street = FronkDB::singleton()->escape($filter["=street"]);
|
||||
if ($street) {
|
||||
$where .= " AND street like '$street'";
|
||||
}
|
||||
}
|
||||
|
||||
if (array_key_exists("zip", $filter)) {
|
||||
$zip = FronkDB::singleton()->escape($filter["zip"]);
|
||||
if ($zip) {
|
||||
$where .= " AND zip like '%$zip%'";
|
||||
}
|
||||
}
|
||||
|
||||
if (array_key_exists("=zip", $filter)) {
|
||||
$zip = FronkDB::singleton()->escape($filter["=zip"]);
|
||||
if ($zip) {
|
||||
$where .= " AND zip like '$zip'";
|
||||
}
|
||||
}
|
||||
|
||||
if (array_key_exists("city", $filter)) {
|
||||
$city = FronkDB::singleton()->escape($filter["city"]);
|
||||
if ($city) {
|
||||
$where .= " AND city like '%$city%'";
|
||||
}
|
||||
}
|
||||
|
||||
if (array_key_exists("=city", $filter)) {
|
||||
$city = FronkDB::singleton()->escape($filter["=city"]);
|
||||
if ($city) {
|
||||
$where .= " AND city like '$city'";
|
||||
}
|
||||
}
|
||||
|
||||
//var_dump($filter, $where);exit;
|
||||
return $where;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
use Phinx\Migration\AbstractMigration;
|
||||
|
||||
final class CreatePreorderlogisticsTable extends AbstractMigration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
if($this->getEnvironment() == "thetool") {
|
||||
$table = $this->table("Preorderlogistics");
|
||||
$table->addColumn("preorder_id", "integer", ["null" => false]);
|
||||
$table->addColumn("sent", "integer", ["null" => false, "default" => 0]);
|
||||
$table->addColumn("sent_by", "integer", ["null" => true, "default" => null]);
|
||||
$table->addColumn("create_by", "integer", ["null" => false]);
|
||||
$table->addColumn("edit_by", "integer", ["null" => false]);
|
||||
$table->addColumn("create", "integer", ["null" => false]);
|
||||
$table->addColumn("edit", "integer", ["null" => false]);
|
||||
$table->create();
|
||||
|
||||
|
||||
}
|
||||
|
||||
if($this->getEnvironment() == "addressdb") {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
if($this->getEnvironment() == "thetool") {
|
||||
$this->table("Preorderlogistics")->drop()->save();
|
||||
}
|
||||
|
||||
if($this->getEnvironment() == "addressdb") {
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -15,9 +15,9 @@ html {
|
||||
}
|
||||
|
||||
body {
|
||||
font-family: "Open Sans", "Dejavu Sans", dejavusans;
|
||||
font-family: "Open Sans", "Dejavu Sans", dejavusans, sans-serif;
|
||||
font-size:11pt;
|
||||
height:100%;
|
||||
/*height:100%;*/
|
||||
margin-top: 20pt;
|
||||
}
|
||||
|
||||
|
||||
BIN
public/assets/images/qr-placeholder.png
Normal file
BIN
public/assets/images/qr-placeholder.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
Reference in New Issue
Block a user