Test fixes

Admin/Install/elementtypes.json

@@ -68,6 +68,20 @@
             "en": "Postage",
             "de": "Porto"
         }
+    },
+	{
+        "name": "stationary",
+        "l11n": {
+            "en": "Stationary",
+            "de": "Büromaterial"
+        }
+    },
+	{
+        "name": "it",
+        "l11n": {
+            "en": "IT",
+            "de": "IT"
+        }
     },
     {
         "name": "other",

Controller/ApiController.php

@@ -497,7 +497,7 @@ final class ApiController extends Controller
 
             $this->apiExpenseElementCreate($internalRequest, $internalResponse, $data);
 
-            $elements[] = $internalResponse->getDataArray($internalRequest->uri->__toString())['response'];
+            $elements[] = $internalResponse->getDataArray($internalRequest->uri->__toString())['response'] ?? null;
         }
 
         $this->createStandardCreateResponse($request, $response, $elements);
@@ -705,7 +705,13 @@ final class ApiController extends Controller
 
             $this->app->moduleManager->get('Billing', 'ApiPurchase')->apiSupplierBillUpload($internalRequest, $internalResponse, $data);
 
-            $bills = $internalResponse->getDataArray($internalRequest->uri->__toString())['response'];
+            $bills = $internalResponse->getDataArray($internalRequest->uri->__toString())['response'] ?? [];
+            if (empty($bills)) {
+                $response->header->status = RequestStatusCode::R_400;
+                $this->createInvalidAddResponse($request, $response, $bills);
+
+                return;
+            }
 
             $elementObj = ExpenseElementMapper::get()
                 ->where('id', $element)

Docs/Dev/en/structure.md

@@ -1,5 +0,0 @@
-# Structure
-
-## ER
-
-![ER](Modules/BusinessExpenses/Docs/Dev/img/er.png)

Docs/Help/en/SUMMARY.md

@@ -0,0 +1,5 @@
+# User Content
+
+* [Expense]({%}&page=Help/expense)
+* [Expense Element Type]({%}&page=Help/expense_element_type)
+* [Expense Type]({%}&page=Help/expense_type)

Docs/Help/en/expense.md

@@ -0,0 +1,21 @@
+# Expense
+
+## Overview
+
+In the overview you can see for which person the expense report is, which period it covers and additional general information if provided.
+
+![Expense Overview](Modules/BusinessExpenses/Docs/Help/img/expenses_overview.png)
+
+## Expenses
+
+In the expenses tab you can create and see individual expenses for this expense report.
+
+> Every expense should have it's own separate expense element.
+
+The list shows all days of the expense period, even if no expenses are recorded for a certain day. However, these days are greyed out. Expenses that are outside of the expense period are highlighted in red.
+
+![Expense Overview](Modules/BusinessExpenses/Docs/Help/img/expenses_element_invalid_date.png)
+
+After clicking on the respective expense line you will be able to see the detailed information of that expense.
+
+![Expense Overview](Modules/BusinessExpenses/Docs/Help/img/expenses_element_overview.png)

Docs/Help/en/expense_element_type.md

@@ -0,0 +1,17 @@
+# Expense Element Type
+
+The expense element type describes the type of expenses. The module provides the following default types:
+
+* Fuel
+* Parking
+* Entertainment
+* Breakfast
+* Lunch
+* Dinner
+* Hotel
+* Travelling
+* Present
+* Postage
+* Stationary
+* IT
+* Other

Docs/Help/en/expense_type.md

@@ -0,0 +1,10 @@
+# Expense Type
+
+The expense type describes the type of expense report. The module provides the following default types:
+
+* Sales (e.g. meeting with customer)
+* Supplier (e.g. meeting with supplier)
+* Education (e.g. employee training)
+* Event
+* Affiliate (e.g. shareholder/owner related)
+* Other

Docs/Help/en/introduction.md

@@ -0,0 +1,21 @@
+# Introduction
+
+The **Business Expenses** module lets you create and manage business expenses.
+
+## Target Group
+
+The target group for this module is anyone who has to create and manage business expenses (e.g. travelling sales men).
+
+# Setup
+
+This module doesn't have any additional setup requirements. However, for some automated invoice recognition please make sure you have `tesseract-ocr` installed.
+
+# Features
+
+## Expense Types
+
+Multiple expense types to indicate the type of the expense report.
+
+## Expense Element Types
+
+Multiple expense element types to indicate the type of the expense, such as hotel, dinner, travelling, ...

Docs/img.json

@@ -0,0 +1,12 @@
+[
+    [
+        "/businessexpenses/expense/view?id=1",
+        "//*[@id=\"content\"]/div[2]/div[2]/div[1]/div[2]/div/section",
+        "/BusinessExpenses/Docs/Help/img/expenses_overview.png"
+    ],
+    [
+        "/businessexpenses/expense/element/view?id=1",
+        "//*[@id=\"content\"]/div[2]/div[2]/div[1]/div/div/section",
+        "/BusinessExpenses/Docs/Help/img/expenses_element_overview.png"
+    ]
+]

Theme/Backend/expense-view.tpl.php

@@ -26,7 +26,7 @@ $sessions = $this->data['sessions'] ?? [];
 $isNew = $expense->id === 0;
 
 echo $this->data['nav']->render(); ?>
-<div class="tabview tab-2">
+<div id="iExpenseView" class="tabview tab-2 url-rewrite">
     <?php if (!$isNew) : ?>
     <div class="box">
         <ul class="tab-links">
@@ -54,6 +54,7 @@ echo $this->data['nav']->render(); ?>
                     </section>
                 </div>
 
+                <!--
                 <div class="col-xs-12 col-lg-6">
                     <section class="portlet hl-3">
                         <div class="portlet-body">
@@ -66,6 +67,7 @@ echo $this->data['nav']->render(); ?>
                         </div>
                     </section>
                 </div>
+                -->
             </div>
 
             <div class="row">
@@ -190,6 +192,15 @@ echo $this->data['nav']->render(); ?>
                                     <td colspan="3" class="empty">
                             <?php endif; ?>
                             <?php endwhile; ?>
+                            <?php while (($element = \next($elements)) !== false) :
+                                $url = UriFactory::build('{/base}/businessexpenses/expense/element/view?{?}&id=' . $element->id);
+                            ?>
+                                <tr data-href="<?= $url; ?>" class="hl-1">
+                                    <td><a href="<?= $url; ?>"><?= $element->start->format('Y-m-d H:i'); ?></a>
+                                    <td><a href="<?= $url; ?>"><?= $element->end?->format('Y-m-d H:i'); ?></a>
+                                    <td><a href="<?= $url; ?>"><?= $this->printHtml($element->type->l11n); ?></a>
+                                    <td><a href="<?= $url; ?>"><?= $this->getCurrency($element->gross, symbol: ''); ?></a>
+                            <?php endwhile; ?>
                             <tr class="hl-3">
                                 <td colspan="3"><?= $this->getHtml('Total'); ?>
                                 <td><?= $costs['total']->getAmount(); ?>

info.json

@@ -12,7 +12,7 @@
     },
     "creator": {
         "name": "Jingga",
-        "website": "jingga.app"
+        "website": "https://jingga.app"
     },
     "directory": "BusinessExpenses",
     "dependencies": {