[FEATURE] tinyDoc-->openTBS; support for .docx templates

composer.json

@@ -15,7 +15,8 @@
         "tecnickcom/tcpdf": "^6.2.12",
         "zendframework/zendframework1": "^1.12",
         "phpoffice/phpexcel": "1.8.*",
-        "tinybutstrong/tinybutstrong": "^3.10"
+        "tinybutstrong/tinybutstrong": "^3.10",
+        "tinybutstrong/opentbs": ">=1.9.11"
     },
     "require-dev": {
         "phpunit/phpunit": "3.7.*",

extensions/ki_invoice/print.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * This file is part of
- * Kimai - Open Source Time Tracking // https://www.kimai.org
+ * Kimai - Open Source Time Tracking // http://www.kimai.org
  * (c) 2006-2009 Kimai-Development-Team
  *
  * Kimai is free software; you can redistribute it and/or modify
@@ -65,8 +65,8 @@
 $customerName = html_entity_decode($customer['name']);
 $beginDate = $in;
 $endDate = $out;
-$invoiceID = $customer['name'] . "-" . date("y", $in) . "-" . date("m", $in);
 $today = time();
+$invoiceID = date("Y", $today) . "." . date("m", $today). date("d", $today) . "-" . ($today % 86400);
 $dueDate = mktime(0, 0, 0, date("m") + 1, date("d"), date("Y"));
 
 $round = 0;
@@ -123,6 +123,13 @@
     }
 }
 
+// generate invoice position numbers
+$i = 1;
+foreach ($invoiceArray as $k => $v) {
+    $invoiceArray[$k]['position'] = $i;
+    $i++;
+}
+
 $vat_rate = $customer['vat'];
 if (!is_numeric($vat_rate)) {
     $vat_rate = $kga->getDefaultVat();
@@ -163,14 +170,18 @@
 $model->setCurrencySign($kga->getCurrencySign());
 $model->setCurrencyName($kga->getCurrencyName());
 $model->setDueDate(mktime(0, 0, 0, date("m") + 1, date("d"), date("Y")));
+$model->setFttltime($fttltime);
 
 // ---------------------------------------------------------------------------
+
 $renderers = array(
-    'odt' => new Kimai_Invoice_OdtRenderer(),
+//    'odt' => new Kimai_Invoice_OdtRenderer(),
     'html' => new Kimai_Invoice_HtmlRenderer(),
-    'pdf' => new Kimai_Invoice_HtmlToPdfRenderer()
+    'pdf' => new Kimai_Invoice_HtmlToPdfRenderer(),
+    'doc-odt' => new Kimai_Invoice_DocxOdtRenderer()
 );
 
+
 /* @var $renderer Kimai_Invoice_AbstractRenderer */
 foreach ($renderers as $rendererType => $renderer) {
     $renderer->setTemplateDir($baseFolder);

libraries/Kimai/Invoice/DocxOdtRenderer.php

@@ -0,0 +1,81 @@
+<?php
+/**
+ * This file is part of
+ * Kimai - Open Source Time Tracking // http://www.kimai.org
+ * (c) Kimai-Development-Team
+ *
+ * Kimai is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; Version 3, 29 June 2007
+ *
+ * Kimai is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Kimai; If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * Class for rendering DOC and DOCX invoices.
+ *
+ * @author Kevin Papst
+ */
+
+
+include_once('../../libraries/tinybutstrong/opentbs/tbs_plugin_opentbs.php');
+
+
+class Kimai_Invoice_DocxOdtRenderer extends Kimai_Invoice_AbstractRenderer
+{
+
+
+
+    /**
+     * Render the invoice.
+     *
+     * @return mixed
+     */
+    public function render()
+    {
+        $doc = new clsTinyButStrong;
+        $doc->Plugin(TBS_INSTALL, OPENTBS_PLUGIN);
+
+
+        $templateForm = $this->getTemplateDir() . $this->getTemplateFile();
+
+        $doc->LoadTemplate($templateForm, OPENTBS_ALREADY_UTF8);
+
+
+        $customer = $this->getModel()->getCustomer();
+
+        $allCustomer = $this->prepareCustomerArray($customer);
+
+        $invoiceData = array_merge($allCustomer, $this->getModel()->toArray());
+
+        $doc->MergeField('kimai', $invoiceData);
+
+        $doc->MergeBlock('pos', $invoiceData['entries']);
+
+        $invoiceFilename = $invoiceData['invoiceId'] . '-Invoice.' . substr(strrchr($this->getTemplateFile(), "."), 1);
+
+        $doc->Show(OPENTBS_DOWNLOAD, $invoiceFilename);
+        $doc->LoadTemplate(false);
+    }
+
+    /**
+     * Returns if the file can be rendered.
+     *
+     * @return bool
+     */
+    public function canRender()
+    {
+        return (
+            (stripos($this->getTemplateFile(), '.docx') !== false || stripos($this->getTemplateFile(), '.doc') !== false ||
+             stripos($this->getTemplateFile(), '.odt') !== false || stripos($this->getTemplateFile(), '.ods') !== false
+            ) &&
+            is_file($this->getTemplateDir() . $this->getTemplateFile())
+        );
+    }
+}

libraries/Kimai/Invoice/PrintModel.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * This file is part of
- * Kimai - Open Source Time Tracking // https://www.kimai.org
+ * Kimai - Open Source Time Tracking // http://www.kimai.org
  * (c) Kimai-Development-Team
  *
  * Kimai is free software; you can redistribute it and/or modify
@@ -49,6 +49,10 @@ class Kimai_Invoice_PrintModel
      * @var int
      */
     private $total = 0;
+    /**
+     * @var string
+     */
+    private $fttltime = "";
     /**
      * @var array
      */
@@ -100,6 +104,7 @@ public function toArray()
             'vat'           => $this->getVat(),
             'vatRate'       => $this->getVatRate(),
             'total'         => $this->getTotal(),
+            'fttltime'      => $this->getfttltime(),
             'projects'      => $this->getProjects(), // array
             'invoiceId'     => $this->getInvoiceId(),
             'beginDate'     => $this->getBeginDate(),
@@ -336,6 +341,22 @@ public function getTotal()
         return $this->total;
     }
 
+    /**
+     * @param int $total
+     */
+    public function setFttltime($fttl)
+    {
+        $this->fttltime = $fttl;
+    }
+
+    /**
+     * @return int
+     */
+    public function getFttltime()
+    {
+        return $this->fttltime;
+    }
+
     /**
      * @param array $projects
      */