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 Preorder discount code import and statusupdate import

See merge request fronk/thetool!392
This commit is contained in:
Frank Schubert
2024-06-04 16:10:20 +00:00
parent 660550b289 ce3e8f07e6
commit 004d173c50
11 changed files with 593 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Layout/default/Preorder/Statusupdateimport.php
+64
View File
@@ -0,0 +1,64 @@
<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
<!-- start page title -->
<div class="row">
<div class="col-12">
<div class="page-title-box">
<div class="page-title-right">
<ol class="breadcrumb m-0">
<li class="breadcrumb-item"><a href="<?=self::getUrl("Dashboard")?>"><?=MFAPPNAME_SLUG?></a></li>
<li class="breadcrumb-item active">Vorbestellung</li>
</ol>
</div>
<h4 class="page-title">Statusupdates importieren</h4>
</div>
</div>
</div>
<!-- end page title -->
<div class="row">
<div class="col-lg-12">
<div class="card bg-light">
<div class="card-body">
<h4 class="header-title mb-2">Statusupdates importieren</h4>
<form class="form-horizontal" method="post" action="<?=self::getUrl("Preorder", "saveStatusupdateimport")?>" enctype="multipart/form-data">
<div class="card">
<div class="card-body">
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="statusupdate_csv">Statusupdate CSV</label>
<div class="col-lg-10">
<input type="file" class="form-control" name="statusupdate_csv" />
<small>Format: <span class="text-monospace">OAID;Neuer Status Code</span></small>
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label"></label>
<div class="col-lg-10">
<label>
<input type="checkbox" value="1" name="headline" />
Erste Zeile enthält Überschrift
</label>
</div>
</div>
<div class="form-group row">
<label class="col-lg-2"></label>
<div class="col-lg-10">
<button type="submit" class="btn btn-primary">Importieren</button>
</div>
</div>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/footer.php"); ?>
Layout/default/Preorder/include/preorder-detail.php
+21 -2
View File
@@ -143,6 +143,25 @@
<td><?=($preorder->address_info == "address") ? "Anschlussadresse" : "Kontaktadresse"?></td>
</tr>
</table>
<?php if($preorder->discounts): ?>
<h3>Gutscheincodes</h3>
<table class="table table-sm table-striped">
<tr>
<th>Code</th>
<th>Zugewiesen</th>
<th>Info</th>
</tr>
<?php foreach($preorder->discounts as $discount): ?>
<tr>
<td class="text-monospace"><?=$discount->code?></td>
<td class="text-monospace"><?=date("d.m.Y H:i", $discount->assigned)?></td>
<td><?=htmlentities($discount->info)?></td>
</tr>
<?php endforeach; ?>
</tr>
</table>
<?php endif; ?>
</div>
<div class="col-6">
@@ -398,12 +417,12 @@
data-default="<?=($preorder->adb_wohneinheit->patch_cluster) ? $preorder->adb_wohneinheit->patch_cluster : $preorder->adb_hausnummer->netzgebiet->extref?>"
/></td>
</tr><tr>
<th>Shelf:</td>
<th>Shelf:</th>
<td><input type="text" class="form-control" name="patch_shelf"
data-default="<?=$preorder->adb_wohneinheit->patch_shelf?>"
/></td>
</tr><tr>
<th>Module:</td>
<th>Module:</th>
<td><input type="text" class="form-control" name="patch_module"
data-default="<?=$preorder->adb_wohneinheit->patch_module?>"
/></td>
Layout/default/PreorderDiscount/Import.php
+64
View File
@@ -0,0 +1,64 @@
<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
<!-- start page title -->
<div class="row">
<div class="col-12">
<div class="page-title-box">
<div class="page-title-right">
<ol class="breadcrumb m-0">
<li class="breadcrumb-item"><a href="<?=self::getUrl("Dashboard")?>"><?=MFAPPNAME_SLUG?></a></li>
<li class="breadcrumb-item active">Vorbestellung</li>
</ol>
</div>
<h4 class="page-title">Gutscheincodes importieren</h4>
</div>
</div>
</div>
<!-- end page title -->
<div class="row">
<div class="col-lg-12">
<div class="card bg-light">
<div class="card-body">
<h4 class="header-title mb-2">Gutscheincodes importieren</h4>
<form class="form-horizontal" method="post" action="<?=self::getUrl("PreorderDiscount", "saveImport")?>" enctype="multipart/form-data">
<div class="card">
<div class="card-body">
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="discount_csv">Gutscheincode CSV</label>
<div class="col-lg-10">
<input type="file" class="form-control" name="discount_csv" />
<small>Format: <span class="text-monospace">OAID;Gutscheincode</span></small>
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label"></label>
<div class="col-lg-10">
<label>
<input type="checkbox" value="1" name="headline" />
Erste Zeile enthält Überschrift
</label>
</div>
</div>
<div class="form-group row">
<label class="col-lg-2"></label>
<div class="col-lg-10">
<button type="submit" class="btn btn-primary">Importieren</button>
</div>
</div>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/footer.php"); ?>
Layout/default/Preordercampaign/Index.php
+11 -2
View File
@@ -74,8 +74,17 @@
</div>
</div>
<?php if($me->address_id == 1 || $me->address_id == 4807): // xinon, rml ?>
<div class="card">
<div class="card-body">
<a class="btn btn-purple" href="<?=self::getUrl("PreorderDiscount", "import")?>"><i class="fas fa-tags fa-fw"></i> Gutscheincodes importieren</a>
<a class="btn btn-purple ml-1" href="<?=self::getUrl("Preorder", "statusupdateimport")?>"><i class="fas fa-retweet fa-fw"></i> Statusupdates importieren</a>
</div>
</div>
<?php endif; ?>
<div class="card">
<div class="card-body mb-3">
<div class="float-left">