s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2024-12-25 14:10:28 +01:00
Code Issues Projects Releases Wiki Activity

Bugfix date display

Browse Source
This commit is contained in:
Andreas Palm 2022-12-27 21:38:48 +01:00
parent 781fbc2600
commit 5bac7c479c
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/Modules/SubscriptionCycle/Scheduler/SubscriptionCycleManualJobTask.php
View File

@ -36,7 +36,7 @@ final class SubscriptionCycleManualJobTask
Database $db, Database $db,
TaskMutexServiceInterface $taskMutexService, TaskMutexServiceInterface $taskMutexService,
SubscriptionCycleJobService $cycleJobService, SubscriptionCycleJobService $cycleJobService,
SubscriptionModuleInterface $subscriptionModule, SubscriptionModuleInterface $subscriptionModule
) { ) {
$this->app = $app; $this->app = $app;
$this->db = $db; $this->db = $db;

16
classes/Modules/SubscriptionCycle/SubscriptionModule.php
View File

@ -74,10 +74,14 @@ class SubscriptionModule implements SubscriptionModuleInterface
$this->app->erp->LoadRechnungStandardwerte($invoice, $address); $this->app->erp->LoadRechnungStandardwerte($invoice, $address);
foreach ($positions as $pos) { foreach ($positions as $pos) {
$beschreibung = $pos['beschreibung']; $beschreibung = $pos['beschreibung'];
$beschreibung .= "<br>Zeitraum: {$pos['start']} - {$pos['end']}";
$starts = DateTimeImmutable::createFromFormat('Y-m-d', $pos['start'])->format('d.m.Y');
$newends = DateTimeImmutable::createFromFormat('Y-m-d', $pos['newend'])->format('d.m.Y');
$beschreibung .= "<br>Zeitraum: $starts - $newends";
$this->app->erp->AddRechnungPositionManuell($invoice, $pos['artikel'], $pos['preis'], $this->app->erp->AddRechnungPositionManuell($invoice, $pos['artikel'], $pos['preis'],
$pos['menge']*$pos['cycles'], $pos['bezeichnung'], $beschreibung, $pos['waehrung'], $pos['rabatt']); $pos['menge']*$pos['cycles'], $pos['bezeichnung'], $beschreibung, $pos['waehrung'], $pos['rabatt']);
$this->db->update("UPDATE abrechnungsartikel SET abgerechnetbis='{$pos['newend']}' WHERE id={$pos['id']}"); $this->db->exec("UPDATE abrechnungsartikel SET abgerechnetbis='{$pos['newend']}' WHERE id={$pos['id']}");
} }
$this->app->erp->RechnungNeuberechnen($invoice); $this->app->erp->RechnungNeuberechnen($invoice);
//$this->app->erp->BelegFreigabe('rechnung', $invoice); //$this->app->erp->BelegFreigabe('rechnung', $invoice);
@ -92,10 +96,14 @@ class SubscriptionModule implements SubscriptionModuleInterface
$this->app->erp->LoadAuftragStandardwerte($orderid, $address); $this->app->erp->LoadAuftragStandardwerte($orderid, $address);
foreach ($positions as $pos) { foreach ($positions as $pos) {
$beschreibung = $pos['beschreibung']; $beschreibung = $pos['beschreibung'];
$beschreibung .= "<br>Zeitraum: {$pos['start']} - {$pos['end']}";
$starts = DateTimeImmutable::createFromFormat('Y-m-d', $pos['start'])->format('d.m.Y');
$newends = DateTimeImmutable::createFromFormat('Y-m-d', $pos['newend'])->format('d.m.Y');
$beschreibung .= "<br>Zeitraum: $starts - $newends";
$this->app->erp->AddAuftragPositionManuell($orderid, $pos['artikel'], $pos['preis'], $this->app->erp->AddAuftragPositionManuell($orderid, $pos['artikel'], $pos['preis'],
$pos['menge']*$pos['cycles'], $pos['bezeichnung'], $beschreibung, $pos['waehrung'], $pos['rabatt']); $pos['menge']*$pos['cycles'], $pos['bezeichnung'], $beschreibung, $pos['waehrung'], $pos['rabatt']);
$this->db->update("UPDATE abrechnungsartikel SET abgerechnetbis='{$pos['newend']}' WHERE id={$pos['id']}"); $this->db->exec("UPDATE abrechnungsartikel SET abgerechnetbis='{$pos['newend']}' WHERE id={$pos['id']}");
} }
$this->app->erp->AuftragNeuberechnen($orderid); $this->app->erp->AuftragNeuberechnen($orderid);
//$this->app->erp->BelegFreigabe('auftrag', $orderid); //$this->app->erp->BelegFreigabe('auftrag', $orderid);