From 0ed30bbcc3a2d133b38f7b2399f1630ae2692934 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sun, 29 Dec 2019 14:18:46 +0100
Subject: [PATCH] datetime is jsonserializable, didn't know that :)

---
 Interfaces/GSD/Importer.php            |  14 +++
 Interfaces/GSD/Model/GSDCostCenter.php |   2 +-
 Interfaces/GSD/Model/GSDCostObject.php |   2 +-
 Interfaces/GSD/en.lang.php             |  15 ++-
 Interfaces/GSD/import.tpl.php          | 149 ++++++++++++++-----------
 5 files changed, 108 insertions(+), 74 deletions(-)

diff --git a/Interfaces/GSD/Importer.php b/Interfaces/GSD/Importer.php
index e9f7d72..07dc289 100644
--- a/Interfaces/GSD/Importer.php
+++ b/Interfaces/GSD/Importer.php
@@ -238,6 +238,20 @@ final class Importer extends ImporterAbstract
     {
     }
 
+    /**
+     * Import articles
+     *
+     * @param \DateTime $start Start time (inclusive)
+     * @param \DateTime $end   End time (inclusive)
+     *
+     * @return void
+     *
+     * @since 1.0.0
+     */
+    public function importArticle(\DateTime $start, \DateTime $end) : void
+    {
+    }
+
     /**
      * Import invoices
      *
diff --git a/Interfaces/GSD/Model/GSDCostCenter.php b/Interfaces/GSD/Model/GSDCostCenter.php
index b6a95f9..745cff2 100644
--- a/Interfaces/GSD/Model/GSDCostCenter.php
+++ b/Interfaces/GSD/Model/GSDCostCenter.php
@@ -182,7 +182,7 @@ final class GSDCostCenter implements \JsonSerializable
         return [
             'id' => $this->id,
             'createdBy' => $this->createdBy,
-            'createdAt' => $this->createdAt->format('Y-m-d H:i:s'),
+            'createdAt' => $this->createdAt,
             'description' => $this->description,
             'costcenter' => $this->costCenter,
         ];
diff --git a/Interfaces/GSD/Model/GSDCostObject.php b/Interfaces/GSD/Model/GSDCostObject.php
index c94e9fa..9e7bb6e 100644
--- a/Interfaces/GSD/Model/GSDCostObject.php
+++ b/Interfaces/GSD/Model/GSDCostObject.php
@@ -182,7 +182,7 @@ final class GSDCostObject implements \JsonSerializable
         return [
             'id' => $this->id,
             'createdBy' => $this->createdBy,
-            'createdAt' => $this->createdAt->format('Y-m-d H:i:s'),
+            'createdAt' => $this->createdAt,
             'description' => $this->description,
             'costObject' => $this->costObject,
         ];
diff --git a/Interfaces/GSD/en.lang.php b/Interfaces/GSD/en.lang.php
index 4c8b918..4393bc8 100644
--- a/Interfaces/GSD/en.lang.php
+++ b/Interfaces/GSD/en.lang.php
@@ -13,12 +13,15 @@
 declare(strict_types=1);
 
 return [
-    'Accounts' => 'Accounts',
-    'Articles' => 'Articles',
+    'Assets'      => 'Assets',
+    'Accounts'    => 'Accounts',
+    'Articles'    => 'Articles',
     'CostCenters' => 'Cost Centers',
     'CostObjects' => 'Cost Objects',
-    'Customers' => 'Customers',
-    'Invoices' => 'Invoices',
-    'Options' => 'Options',
-    'Suppliers' => 'Suppliers',
+    'Customers'   => 'Customers',
+    'Invoices'    => 'Invoices',
+    'Options'     => 'Options',
+    'Postings'    => 'Postings',
+    'Stocks'      => 'Stocks',
+    'Suppliers'   => 'Suppliers',
 ];
diff --git a/Interfaces/GSD/import.tpl.php b/Interfaces/GSD/import.tpl.php
index c019983..6ba0cc2 100644
--- a/Interfaces/GSD/import.tpl.php
+++ b/Interfaces/GSD/import.tpl.php
@@ -1,67 +1,84 @@
-<div class="row">
-    <div class="col-xs-12 col-md-6">
-        <section class="box wf-100">
-            <header><h1><?= $this->getHtml('Import') ?> - GSD</h1></header>
-
-            <div class="inner">
-                <form id="fImport" method="POST" action="<?= \phpOMS\Uri\UriFactory::build('{/api}admin/exchange/import/profile?{?}&exchange=GSD&csrf={$CSRF}'); ?>">
-                    <table class="layout wf-100" style="table-layout: fixed">
-                        <tbody>
-                        <tr><td><label for="iHost"><?= $this->getHtml('Host') ?></label>
-                        <tr><td><input type="text" id="iHost" name="host" placeholder="&#xf040; <?= $this->getHtml('Host') ?>" required><input type="hidden" id="iDb" name="db" value="<?= \phpOMS\DataStorage\Database\DatabaseType::SQLSRV; ?>" required>
-                        <tr><td><label for="iPort"><?= $this->getHtml('Port') ?></label>
-                        <tr><td><input type="text" id="iPort" name="port" value="1433" required>
-                        <tr><td><label for="iDatabase"><?= $this->getHtml('Database') ?></label>
-                        <tr><td><input type="text" id="iDatabase" name="database" placeholder="&#xf040; <?= $this->getHtml('Database') ?>" required>
-                        <tr><td><label for="iLogin"><?= $this->getHtml('Login') ?></label>
-                        <tr><td><input type="text" id="iLogin" name="login" placeholder="&#xf040; <?= $this->getHtml('Login') ?>" required>
-                        <tr><td><label for="iPassword"><?= $this->getHtml('Password') ?></label>
-                        <tr><td><input type="password" id="iPassword" name="password" placeholder="&#xf040; <?= $this->getHtml('Password') ?>" required>
-                        <tr><td><label for="iStart"><?= $this->getHtml('Start') ?></label>
-                        <tr><td><input type="datetime-local" id="iStart" name="start" value="<?= $this->printHtml((new \DateTime('NOW'))->format('Y-m-d\TH:i:s')); ?>">
-                        <tr><td><label for="iEnd"><?= $this->getHtml('End') ?></label>
-                        <tr><td><input type="datetime-local" id="iEnd" name="end" value="<?= $this->printHtml((new \DateTime('NOW'))->format('Y-m-d\TH:i:s')); ?>">
-                        <tr><td><?= $this->getHtml('Options') ?>
-                        <tr><td>
-                            <span class="checkbox">
-                                <input id="iCustomers" name="customers" type="checkbox" value="1">
-                                <label for="iCustomers"><?= $lang['Customers']; ?></label>
-                            </span>
-                        <tr><td>
-                            <span class="checkbox">
-                                <input id="iSuppliers" name="suppliers" type="checkbox" value="1">
-                                <label for="iSuppliers"><?= $lang['Suppliers']; ?></label>
-                            </span>
-                        <tr><td>
-                            <span class="checkbox">
-                                <input id="iAccounts" name="accounts" type="checkbox" value="1">
-                                <label for="iAccounts"><?= $lang['Accounts']; ?></label>
-                            </span>
-                        <tr><td>
-                            <span class="checkbox">
-                                <input id="iCostCenters" name="costcenters" type="checkbox" value="1">
-                                <label for="iCostCenters"><?= $lang['CostCenters']; ?></label>
-                            </span>
-                        <tr><td>
-                            <span class="checkbox">
-                                <input id="iCostObjects" name="costobjects" type="checkbox" value="1">
-                                <label for="iCostObjects"><?= $lang['CostObjects']; ?></label>
-                            </span>
-                        <tr><td>
-                            <span class="checkbox">
-                                <input id="iArticles" name="articles" type="checkbox" value="1">
-                                <label for="iArticles"><?= $lang['Articles']; ?></label>
-                            </span>
-                        <tr><td>
-                            <span class="checkbox">
-                                <input id="iInvoices" name="invoices" type="checkbox" value="1">
-                                <label for="iInvoices"><?= $lang['Invoices']; ?></label>
-                            </span>
-                        <tr><td>
-                            <input type="submit" value="<?= $this->getHtml('Import'); ?>">
-                    </table>
-                </form>
-            </div>
-        </section>
-    </div>
+<div class="row">
+    <div class="col-xs-12 col-md-6">
+        <section class="box wf-100">
+            <header><h1><?= $this->getHtml('Import') ?> - GSD</h1></header>
+
+            <div class="inner">
+                <form id="fImport" method="POST" action="<?= \phpOMS\Uri\UriFactory::build('{/api}admin/exchange/import/profile?{?}&exchange=GSD&csrf={$CSRF}'); ?>">
+                    <table class="layout wf-100" style="table-layout: fixed">
+                        <tbody>
+                        <tr><td><label for="iHost"><?= $this->getHtml('Host') ?></label>
+                        <tr><td><input type="text" id="iHost" name="host" placeholder="&#xf040; <?= $this->getHtml('Host') ?>" required><input type="hidden" id="iDb" name="db" value="<?= \phpOMS\DataStorage\Database\DatabaseType::SQLSRV; ?>" required>
+                        <tr><td><label for="iPort"><?= $this->getHtml('Port') ?></label>
+                        <tr><td><input type="text" id="iPort" name="port" value="1433" required>
+                        <tr><td><label for="iDatabase"><?= $this->getHtml('Database') ?></label>
+                        <tr><td><input type="text" id="iDatabase" name="database" placeholder="&#xf040; <?= $this->getHtml('Database') ?>" required>
+                        <tr><td><label for="iLogin"><?= $this->getHtml('Login') ?></label>
+                        <tr><td><input type="text" id="iLogin" name="login" placeholder="&#xf040; <?= $this->getHtml('Login') ?>" required>
+                        <tr><td><label for="iPassword"><?= $this->getHtml('Password') ?></label>
+                        <tr><td><input type="password" id="iPassword" name="password" placeholder="&#xf040; <?= $this->getHtml('Password') ?>" required>
+                        <tr><td><label for="iStart"><?= $this->getHtml('Start') ?></label>
+                        <tr><td><input type="datetime-local" id="iStart" name="start" value="<?= $this->printHtml((new \DateTime('NOW'))->format('Y-m-d\TH:i:s')); ?>">
+                        <tr><td><label for="iEnd"><?= $this->getHtml('End') ?></label>
+                        <tr><td><input type="datetime-local" id="iEnd" name="end" value="<?= $this->printHtml((new \DateTime('NOW'))->format('Y-m-d\TH:i:s')); ?>">
+                        <tr><td><?= $this->getHtml('Options') ?>
+                        <tr><td>
+                            <table class="layout wf-100"><tr><td>
+                            <span class="checkbox">
+                                <input id="iCustomers" name="customers" type="checkbox" value="1">
+                                <label for="iCustomers"><?= $lang['Customers']; ?></label>
+                            </span>
+                            <td>
+                            <span class="checkbox">
+                                <input id="iInvoices" name="invoices" type="checkbox" value="1">
+                                <label for="iInvoices"><?= $lang['Invoices']; ?></label>
+                            </span>
+                        <tr><td>
+                            <span class="checkbox">
+                                <input id="iSuppliers" name="suppliers" type="checkbox" value="1">
+                                <label for="iSuppliers"><?= $lang['Suppliers']; ?></label>
+                            </span>
+                            <td>
+                            <span class="checkbox">
+                                <input id="iStocks" name="stocks" type="checkbox" value="1">
+                                <label for="iStocks"><?= $lang['Stocks']; ?></label>
+                            </span>
+                        <tr><td>
+                            <span class="checkbox">
+                                <input id="iAccounts" name="accounts" type="checkbox" value="1">
+                                <label for="iAccounts"><?= $lang['Accounts']; ?></label>
+                            </span>
+                            <td>
+                            <span class="checkbox">
+                                <input id="iAssets" name="assets" type="checkbox" value="1">
+                                <label for="iAssets"><?= $lang['Assets']; ?></label>
+                            </span>
+                        <tr><td>
+                            <span class="checkbox">
+                                <input id="iCostCenters" name="costcenters" type="checkbox" value="1">
+                                <label for="iCostCenters"><?= $lang['CostCenters']; ?></label>
+                            </span>
+                            <td>
+                            <span class="checkbox">
+                                <input id="iPostings" name="postings" type="checkbox" value="1">
+                                <label for="iPostings"><?= $lang['Postings']; ?></label>
+                            </span>
+                        <tr><td>
+                            <span class="checkbox">
+                                <input id="iCostObjects" name="costobjects" type="checkbox" value="1">
+                                <label for="iCostObjects"><?= $lang['CostObjects']; ?></label>
+                            </span>
+                        <tr><td>
+                            <span class="checkbox">
+                                <input id="iArticles" name="articles" type="checkbox" value="1">
+                                <label for="iArticles"><?= $lang['Articles']; ?></label>
+                            </span>
+                        </table>
+                        <tr><td>
+                            <input type="submit" value="<?= $this->getHtml('Import'); ?>">
+                    </table>
+                </form>
+            </div>
+        </section>
+    </div>
 </div>
\ No newline at end of file