diff --git a/Admin/Install/Media/bill.pdf.php b/Admin/Install/Media/bill.pdf.php
index 84225be..e50b2ed 100755
--- a/Admin/Install/Media/bill.pdf.php
+++ b/Admin/Install/Media/bill.pdf.php
@@ -6,282 +6,171 @@ use Mpdf\Mpdf;
* @var \phpOMS\Views\View $this
*/
$bill = $this->getData('bill');
+$elements = $bill->getElements();
$mpdf = new Mpdf([
'mode' => 'utf-8',
'format' => 'A4-L',
'orientation' => 'L',
- 'margin_left' => 0,
- 'margin_right' => 0,
- 'margin_top' => 0,
- 'margin_bottom' => 0,
- 'margin_header' => 0,
- 'margin_footer' => 0,
+ 'margin_left' => 20,
+ 'margin_right' => 15,
+ 'margin_top' => 48,
+ 'margin_bottom' => 25,
+ 'margin_header' => 10,
+ 'margin_footer' => 10
]);
$mpdf->SetDisplayMode('fullpage');
$mpdf->SetTitle($bill->getNumber());
$mpdf->SetAuthor('Orange Management');
-$mpdf->AddPage();
-
-$mpdf->SetHTMLHeader('
-');
-
-$mpdf->SetHTMLFooter('
-');
-
-$mpdf->WriteHTML('
+$html = '
-
+
+
Date: 13th November 2008
-
-SOLD TO:
345 Anotherstreet Little Village Their City CB22 6SO |
- |
-SHIP TO:
345 Anotherstreet Little Village Their City CB22 6SO |
-
-
-
-
-
-| Ref. No. |
-Quantity |
-Description |
-Unit Price |
-Amount |
-
-
-
-
-
-| MF1234567 |
-10 |
-Large pack Hoover bags |
-£2.56 |
-£25.60 |
-
-
-| MX37801982 |
-1 |
-Womans waterproof jacket Options - Red and charcoal. |
-£102.11 |
-£102.11 |
-
-
-| MR7009298 |
-25 |
-Steel nails; oval head; 30mm x 3mm. Packs of 1000. |
-£12.26 |
-£325.60 |
-
-
-| MF1234567 |
-10 |
-Large pack Hoover bags |
-£2.56 |
-£25.60 |
-
-
-| MX37801982 |
-1 |
-Womans waterproof jacket Options - Red and charcoal. |
-£102.11 |
-£102.11 |
-
-
-| MR7009298 |
-25 |
-Steel nails; oval head; 30mm x 3mm. Packs of 1000. |
-£12.26 |
-£325.60 |
-
-
-| MF1234567 |
-10 |
-Large pack Hoover bags |
-£2.56 |
-£25.60 |
-
-
-| MX37801982 |
-1 |
-Womans waterproof jacket Options - Red and charcoal. |
-£102.11 |
-£102.11 |
-
-
-| MR7009298 |
-25 |
-Steel nails; oval head; 30mm x 3mm. Packs of 1000. |
-£12.26 |
-£325.60 |
-
-
-| MF1234567 |
-10 |
-Large pack Hoover bags |
-£2.56 |
-£25.60 |
-
-
-| MX37801982 |
-1 |
-Womans waterproof jacket Options - Red and charcoal. |
-£102.11 |
-£102.11 |
-
-
-| MR7009298 |
-25 |
-Steel nails; oval head; 30mm x 3mm. Packs of 1000. |
-£12.26 |
-£325.60 |
-
-
-| MF1234567 |
-10 |
-Large pack Hoover bags |
-£2.56 |
-£25.60 |
-
-
-| MX37801982 |
-1 |
-Womans waterproof jacket Options - Red and charcoal. |
-£102.11 |
-£102.11 |
-
-
-| MF1234567 |
-10 |
-Large pack Hoover bags |
-£2.56 |
-£25.60 |
-
-
-| MX37801982 |
-1 |
-Womans waterproof jacket Options - Red and charcoal. |
-£102.11 |
-£102.11 |
-
-
-| MR7009298 |
-25 |
-Steel nails; oval head; 30mm x 3mm. Packs of 1000. |
-£12.26 |
-£325.60 |
-
-
-| MR7009298 |
-25 |
-Steel nails; oval head; 30mm x 3mm. Packs of 1000. |
-£12.26 |
-£325.60 |
-
-
-| MF1234567 |
-10 |
-Large pack Hoover bags |
-£2.56 |
-£25.60 |
-
-
-| MX37801982 |
-1 |
-Womans waterproof jacket Options - Red and charcoal. |
-£102.11 |
-£102.11 |
-
-
-| MR7009298 |
-25 |
-Steel nails; oval head; 30mm x 3mm. Packs of 1000. |
-£12.26 |
-£325.60 |
-
-
-
- |
-Subtotal: |
-£1825.60 |
-
-
-| Tax: |
-£18.25 |
-
-
-| Shipping: |
-£42.56 |
-
-
-| TOTAL: |
-£1882.56 |
-
-
-| Deposit: |
-£100.00 |
-
-
-| Balance due: |
-£1782.56 |
-
-
+
+
+
+
+ SOLD TO:
+ 345 Anotherstreet
+ Little Village
+ Their City
+ CB22 6SO
+ |
+ |
+
+ SHIP TO:
+ 345 Anotherstreet
+ Little Village
+ Their City CB22 6SO |
+
+
+
+
+
+
+ | Ref. No. |
+ Quantity |
+ Description |
+ Unit Price |
+ Amount |
+
+
+';
+
+foreach ($elements as $element) {
+$html .= '
+
+ | ' . $element->itemNumber . ' |
+ ' . $element->quantity . ' |
+ ' . $element->itemName . ' |
+ ' . $element->singleSalesPriceNet->getCurrency(null) . ' |
+ ' . $element->totalSalesPriceNet->getCurrency(null) . ' |
+
';
+}
+
+$html .= '
+
+ |
+ Subtotal: |
+ ' . $bill->net->getCurrency(null) . ' |
+
+
+ | Tax: |
+ £18.25 |
+
+
+ | Shipping: |
+ £42.56 |
+
+
+ | TOTAL: |
+ ' . $bill->gross->getCurrency(null) . ' |
+
+
+ | Deposit: |
+ £100.00 |
+
+
+ | Balance due: |
+ £1782.56 |
+
+
+
+
Payment terms: payment due in 30 days
-');
+';
+
+$mpdf->AddPage();
+$mpdf->WriteHTML($html);
$mpdf->Output($this->getData('path'), \Mpdf\Output\Destination::FILE);
diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index 58576b4..87002cc 100755
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -90,5 +90,51 @@
"children": []
}
]
+ },
+ {
+ "id": 1005106001,
+ "pid": "/",
+ "type": 2,
+ "subtype": 1,
+ "name": "Billing",
+ "uri": "{/prefix}warehouse/bill/list",
+ "target": "self",
+ "icon": null,
+ "order": 5,
+ "from": "Billing",
+ "permission": { "permission": 2, "type": null, "element": null },
+ "parent": 1001301001,
+ "children": [
+ {
+ "id": 1005106101,
+ "pid": "/warehouse/bill",
+ "type": 3,
+ "subtype": 1,
+ "name": "List",
+ "uri": "{/prefix}warehouse/bill/list",
+ "target": "self",
+ "icon": null,
+ "order": 1,
+ "from": "Billing",
+ "permission": { "permission": 2, "type": null, "element": null },
+ "parent": 1005106001,
+ "children": []
+ },
+ {
+ "id": 1005106301,
+ "pid": "/warehouse/bill",
+ "type": 3,
+ "subtype": 1,
+ "name": "Create",
+ "uri": "{/prefix}warehouse/bill/create?{?}",
+ "target": "self",
+ "icon": null,
+ "order": 5,
+ "from": "Billing",
+ "permission": { "permission": 4, "type": null, "element": null },
+ "parent": 1005106001,
+ "children": []
+ }
+ ]
}
]
diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php
index ea0aa29..3d10b3f 100755
--- a/Admin/Install/Navigation.php
+++ b/Admin/Install/Navigation.php
@@ -2,7 +2,7 @@
/**
* Orange Management
*
- * PHP Version 7.4
+ * PHP Version 8.0
*
* @package Modules\Billing\Admin\Install
* @copyright Dennis Eichhorn
diff --git a/Admin/Installer.php b/Admin/Installer.php
index 157dda7..133bcb2 100755
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -2,7 +2,7 @@
/**
* Orange Management
*
- * PHP Version 7.4
+ * PHP Version 8.0
*
* @package Modules\Billing\Admin
* @copyright Dennis Eichhorn
diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
index e123f49..57b08f6 100755
--- a/Admin/Routes/Web/Backend.php
+++ b/Admin/Routes/Web/Backend.php
@@ -72,4 +72,37 @@ return [
],
],
],
+ '^.*/warehouse/bill/create.*$' => [
+ [
+ 'dest' => '\Modules\Billing\Controller\BackendController:viewBillingStockInvoiceCreate',
+ 'verb' => RouteVerb::GET,
+ 'permission' => [
+ 'module' => BackendController::MODULE_NAME,
+ 'type' => PermissionType::CREATE,
+ 'state' => PermissionState::PURCHASE_INVOICE,
+ ],
+ ],
+ ],
+ '^.*/warehouse/bill/list.*$' => [
+ [
+ 'dest' => '\Modules\Billing\Controller\BackendController:viewBillingStockList',
+ 'verb' => RouteVerb::GET,
+ 'permission' => [
+ 'module' => BackendController::MODULE_NAME,
+ 'type' => PermissionType::READ,
+ 'state' => PermissionState::PURCHASE_INVOICE,
+ ],
+ ],
+ ],
+ '^.*/warehouse/bill\?.*$' => [
+ [
+ 'dest' => '\Modules\Billing\Controller\BackendController:viewBillingStockInvoice',
+ 'verb' => RouteVerb::GET,
+ 'permission' => [
+ 'module' => BackendController::MODULE_NAME,
+ 'type' => PermissionType::READ,
+ 'state' => PermissionState::SALES_INVOICE,
+ ],
+ ],
+ ],
];
diff --git a/Admin/Status.php b/Admin/Status.php
index d413256..f83639c 100755
--- a/Admin/Status.php
+++ b/Admin/Status.php
@@ -2,7 +2,7 @@
/**
* Orange Management
*
- * PHP Version 7.4
+ * PHP Version 8.0
*
* @package Modules\Billing\Admin
* @copyright Dennis Eichhorn
diff --git a/Admin/Uninstaller.php b/Admin/Uninstaller.php
index e128f14..944d053 100755
--- a/Admin/Uninstaller.php
+++ b/Admin/Uninstaller.php
@@ -2,7 +2,7 @@
/**
* Orange Management
*
- * PHP Version 7.4
+ * PHP Version 8.0
*
* @package Modules\Billing\Admin
* @copyright Dennis Eichhorn
diff --git a/Admin/Updater.php b/Admin/Updater.php
index 48dbd9a..91d0be8 100755
--- a/Admin/Updater.php
+++ b/Admin/Updater.php
@@ -2,7 +2,7 @@
/**
* Orange Management
*
- * PHP Version 7.4
+ * PHP Version 8.0
*
* @package Modules\Billing\Admin
* @copyright Dennis Eichhorn
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 6ee6ae1..f351c47 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -2,7 +2,7 @@
/**
* Orange Management
*
- * PHP Version 7.4
+ * PHP Version 8.0
*
* @package Modules\Billing
* @copyright Dennis Eichhorn
@@ -16,6 +16,7 @@ namespace Modules\Billing\Controller;
use Modules\Billing\Models\SalesBillMapper;
use Modules\Billing\Models\PurchaseBillMapper;
+use Modules\Billing\Models\StockBillMapper;
use Modules\Billing\Models\BillTypeL11n;
use phpOMS\Contract\RenderableInterface;
use phpOMS\Message\RequestAbstract;
@@ -178,4 +179,67 @@ final class BackendController extends Controller
return $view;
}
+
+ /**
+ * Routing end-point for application behaviour.
+ *
+ * @param RequestAbstract $request Request
+ * @param ResponseAbstract $response Response
+ * @param mixed $data Generic data
+ *
+ * @return RenderableInterface
+ *
+ * @since 1.0.0
+ * @codeCoverageIgnore
+ */
+ public function viewBillingStockList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+ {
+ $view = new View($this->app->l11nManager, $request, $response);
+ $view->setTemplate('/Modules/Billing/Theme/Backend/purchase-bill-list');
+ $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005106001, $request, $response));
+
+ if ($request->getData('ptype') === 'p') {
+ $view->setData('bills',
+ StockBillMapper::withConditional('language', $response->getLanguage(), [BillTypeL11n::class])
+ ::getStockBeforePivot((int) ($request->getData('id') ?? 0), limit: 25, depth: 3)
+ );
+ } elseif ($request->getData('ptype') === 'n') {
+ $view->setData('bills',
+ StockBillMapper::withConditional('language', $response->getLanguage(), [BillTypeL11n::class])
+ ::getStockAfterPivot((int) ($request->getData('id') ?? 0), limit: 25, depth: 3)
+ );
+ } else {
+ $view->setData('bills',
+ StockBillMapper::withConditional('language', $response->getLanguage(), [BillTypeL11n::class])
+ ::getStockAfterPivot(0, limit: 25, depth: 3)
+ );
+ }
+
+ return $view;
+ }
+
+ /**
+ * Routing end-point for application behaviour.
+ *
+ * @param RequestAbstract $request Request
+ * @param ResponseAbstract $response Response
+ * @param mixed $data Generic data
+ *
+ * @return RenderableInterface
+ *
+ * @since 1.0.0
+ * @codeCoverageIgnore
+ */
+ public function viewBillingStockInvoice(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+ {
+ $view = new View($this->app->l11nManager, $request, $response);
+ $view->setTemplate('/Modules/Billing/Theme/Backend/purchase-bill');
+ $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005106001, $request, $response));
+
+ $bill = StockBillMapper::get((int) $request->getData('id'));
+
+ $view->setData('bill', $bill);
+
+ return $view;
+ }
}
diff --git a/Controller/Controller.php b/Controller/Controller.php
index ad11ae4..6678375 100755
--- a/Controller/Controller.php
+++ b/Controller/Controller.php
@@ -2,7 +2,7 @@
/**
* Orange Management
*
- * PHP Version 7.4
+ * PHP Version 8.0
*
* @package Modules\Billing
* @copyright Dennis Eichhorn
diff --git a/Models/Bill.php b/Models/Bill.php
index f6e11ef..d8f2ba4 100755
--- a/Models/Bill.php
+++ b/Models/Bill.php
@@ -2,7 +2,7 @@
/**
* Orange Management
*
- * PHP Version 7.4
+ * PHP Version 8.0
*
* @package Modules\Billing\Models
* @copyright Dennis Eichhorn
@@ -52,9 +52,7 @@ class Bill implements \JsonSerializable
* @var int|BillType
* @since 1.0.0
*/
- public int |
-
- BillType $type = 0;
+ public int | BillType $type = 0;
/**
* Bill status.
diff --git a/Models/BillElement.php b/Models/BillElement.php
index b439987..41ecb03 100755
--- a/Models/BillElement.php
+++ b/Models/BillElement.php
@@ -2,7 +2,7 @@
/**
* Orange Management
*
- * PHP Version 7.4
+ * PHP Version 8.0
*
* @package Modules\Billing\Models
* @copyright Dennis Eichhorn
diff --git a/Models/BillElementMapper.php b/Models/BillElementMapper.php
index c5fffaa..1fe80ee 100755
--- a/Models/BillElementMapper.php
+++ b/Models/BillElementMapper.php
@@ -2,7 +2,7 @@
/**
* Orange Management
*
- * PHP Version 7.4
+ * PHP Version 8.0
*
* @package Modules\Billing\Models
* @copyright Dennis Eichhorn
diff --git a/Models/BillMapper.php b/Models/BillMapper.php
index b9df74a..186fdb0 100755
--- a/Models/BillMapper.php
+++ b/Models/BillMapper.php
@@ -2,7 +2,7 @@
/**
* Orange Management
*
- * PHP Version 7.4
+ * PHP Version 8.0
*
* @package Modules\Billing\Models
* @copyright Dennis Eichhorn
diff --git a/Models/BillStatus.php b/Models/BillStatus.php
index 67ec8d5..e3f8bbc 100755
--- a/Models/BillStatus.php
+++ b/Models/BillStatus.php
@@ -2,7 +2,7 @@
/**
* Orange Management
*
- * PHP Version 7.4
+ * PHP Version 8.0
*
* @package Modules\Billing\Models
* @copyright Dennis Eichhorn
diff --git a/Models/BillTransferType.php b/Models/BillTransferType.php
index 929ef73..473bc16 100644
--- a/Models/BillTransferType.php
+++ b/Models/BillTransferType.php
@@ -2,7 +2,7 @@
/**
* Orange Management
*
- * PHP Version 7.4
+ * PHP Version 8.0
*
* @package Modules\Billing\Models
* @copyright Dennis Eichhorn
diff --git a/Models/BillType.php b/Models/BillType.php
index 081eae6..789cf5d 100755
--- a/Models/BillType.php
+++ b/Models/BillType.php
@@ -2,7 +2,7 @@
/**
* Orange Management
*
- * PHP Version 7.4
+ * PHP Version 8.0
*
* @package Modules\Billing\Models
* @copyright Dennis Eichhorn
diff --git a/Models/PermissionState.php b/Models/PermissionState.php
index ecc567f..c55a9b4 100755
--- a/Models/PermissionState.php
+++ b/Models/PermissionState.php
@@ -2,7 +2,7 @@
/**
* Orange Management
*
- * PHP Version 7.4
+ * PHP Version 8.0
*
* @package Modules\Billing\Models
* @copyright Dennis Eichhorn
diff --git a/Models/PurchaseBillMapper.php b/Models/PurchaseBillMapper.php
index 20b4972..5b3889c 100644
--- a/Models/PurchaseBillMapper.php
+++ b/Models/PurchaseBillMapper.php
@@ -2,7 +2,7 @@
/**
* Orange Management
*
- * PHP Version 7.4
+ * PHP Version 8.0
*
* @package Modules\Billing\Models
* @copyright Dennis Eichhorn
@@ -54,22 +54,6 @@ final class PurchaseBillMapper extends BillMapper
return self::getBeforePivot($pivot, $column, $limit, $order, $relations, $depth, $query);
}
- public static function getStockBeforePivot(
- mixed $pivot,
- string $column = null,
- int $limit = 50,
- string $order = 'ASC',
- int $relations = RelationType::ALL,
- int $depth = 3,
- Builder $query = null
- ) : array
- {
- $query = self::getQuery(null, [], $relations, $depth);
- $query->where(BillTypeMapper::getTable() . '_' . ($depth - 1) . '.billing_type_transfer_type', '=', BillTransferType::STOCK);
-
- return self::getBeforePivot($pivot, $column, $limit, $order, $relations, $depth, $query);
- }
-
public static function getPurchaseAfterPivot(
mixed $pivot,
string $column = null,
@@ -86,22 +70,6 @@ final class PurchaseBillMapper extends BillMapper
return self::getAfterPivot($pivot, $column, $limit, $order, $relations, $depth, $query);
}
- public static function getStockAfterPivot(
- mixed $pivot,
- string $column = null,
- int $limit = 50,
- string $order = 'ASC',
- int $relations = RelationType::ALL,
- int $depth = 3,
- Builder $query = null
- ) : array
- {
- $query = self::getQuery(null, [], $relations, $depth);
- $query->where(BillTypeMapper::getTable() . '_' . ($depth - 1) . '.billing_type_transfer_type', '=', BillTransferType::STOCK);
-
- return self::getAfterPivot($pivot, $column, $limit, $order, $relations, $depth, $query);
- }
-
public static function getPurchaseByItemId(int $id, \DateTime $start, \DateTime $end) : Money
{
$query = new Builder(self::$db);
@@ -145,10 +113,10 @@ final class PurchaseBillMapper extends BillMapper
->execute()
->fetch();
- return new Money((int) (((int) $result[0]) / ((int) $result[1])));
+ return new Money($result === false || $result[1] == 0 ? 0 : (int) (((int) $result[0]) / ((int) $result[1])));
}
- public static function getLastOrderDateByItemId(int $id) : \DateTimeImmutable
+ public static function getLastOrderDateByItemId(int $id) : ?\DateTimeImmutable
{
// @todo: only delivers/invoice/production (no offers ...)
$query = new Builder(self::$db);
@@ -162,10 +130,10 @@ final class PurchaseBillMapper extends BillMapper
->execute()
->fetch();
- return new \DateTimeImmutable($result[0]);
+ return $result === false ? null : new \DateTimeImmutable($result[0]);
}
- public static function getLastOrderDateBySupplierId(int $id) : \DateTimeImmutable
+ public static function getLastOrderDateBySupplierId(int $id) : ?\DateTimeImmutable
{
// @todo: only delivers/invoice/production (no offers ...)
$query = new Builder(self::$db);
@@ -177,7 +145,7 @@ final class PurchaseBillMapper extends BillMapper
->execute()
->fetch();
- return new \DateTimeImmutable($result[0]);
+ return $result === false ? null : new \DateTimeImmutable($result[0]);
}
public static function getItemRetentionRate(int $id, \DateTime $start, \DateTime $end) : float
diff --git a/Models/SalesBillMapper.php b/Models/SalesBillMapper.php
index 9621f87..0a38ac6 100644
--- a/Models/SalesBillMapper.php
+++ b/Models/SalesBillMapper.php
@@ -2,7 +2,7 @@
/**
* Orange Management
*
- * PHP Version 7.4
+ * PHP Version 8.0
*
* @package Modules\Billing\Models
* @copyright Dennis Eichhorn
@@ -113,10 +113,10 @@ final class SalesBillMapper extends BillMapper
->execute()
->fetch();
- return new Money((int) (((int) $result[0]) / ((int) $result[1])));
+ return new Money($result === false || $result[1] == 0 ? 0 : (int) (((int) $result[0]) / ((int) $result[1])));
}
- public static function getLastOrderDateByItemId(int $id) : \DateTimeImmutable
+ public static function getLastOrderDateByItemId(int $id) : ?\DateTimeImmutable
{
// @todo: only delivers/invoice/production (no offers ...)
$query = new Builder(self::$db);
@@ -130,10 +130,10 @@ final class SalesBillMapper extends BillMapper
->execute()
->fetch();
- return new \DateTimeImmutable($result[0]);
+ return $result === false ? null : new \DateTimeImmutable($result[0]);
}
- public static function getLastOrderDateByClientId(int $id) : \DateTimeImmutable
+ public static function getLastOrderDateByClientId(int $id) : ?\DateTimeImmutable
{
// @todo: only delivers/invoice/production (no offers ...)
$query = new Builder(self::$db);
@@ -145,7 +145,7 @@ final class SalesBillMapper extends BillMapper
->execute()
->fetch();
- return new \DateTimeImmutable($result[0]);
+ return $result === false ? null : new \DateTimeImmutable($result[0]);
}
public static function getItemRetentionRate(int $id, \DateTime $start, \DateTime $end) : float
diff --git a/Models/StockBillMapper.php b/Models/StockBillMapper.php
new file mode 100644
index 0000000..feda358
--- /dev/null
+++ b/Models/StockBillMapper.php
@@ -0,0 +1,72 @@
+where(BillTypeMapper::getTable() . '_' . ($depth - 1) . '.billing_type_transfer_type', '=', BillTransferType::STOCK);
+
+ return self::getBeforePivot($pivot, $column, $limit, $order, $relations, $depth, $query);
+ }
+
+ public static function getStockAfterPivot(
+ mixed $pivot,
+ string $column = null,
+ int $limit = 50,
+ string $order = 'ASC',
+ int $relations = RelationType::ALL,
+ int $depth = 3,
+ Builder $query = null
+ ) : array
+ {
+ $query = self::getQuery(null, [], $relations, $depth);
+ $query->where(BillTypeMapper::getTable() . '_' . ($depth - 1) . '.billing_type_transfer_type', '=', BillTransferType::STOCK);
+
+ return self::getAfterPivot($pivot, $column, $limit, $order, $relations, $depth, $query);
+ }
+}
diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php
index f789625..445efb8 100755
--- a/Theme/Backend/Lang/Navigation.en.lang.php
+++ b/Theme/Backend/Lang/Navigation.en.lang.php
@@ -2,7 +2,7 @@
/**
* Orange Management
*
- * PHP Version 7.4
+ * PHP Version 8.0
*
* @package Modules\Billing
* @copyright Dennis Eichhorn
diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php
new file mode 100644
index 0000000..9fa6074
--- /dev/null
+++ b/Theme/Backend/Lang/de.lang.php
@@ -0,0 +1,70 @@
+ [
+ 'Address' => '',
+ 'Addresses' => '',
+ 'AlreadyPaid' => '',
+ 'Bills' => '',
+ 'Bonus' => '',
+ 'Cashback' => '',
+ 'City' => '',
+ 'Client' => '',
+ 'ClientID' => '',
+ 'Confirmation' => '',
+ 'Country' => '',
+ 'Created' => '',
+ 'CreditCard' => '',
+ 'CreditNote' => '',
+ 'Date' => '',
+ 'Delivery' => '',
+ 'DeliveryNote' => '',
+ 'DirectDebit' => '',
+ 'Discount' => '',
+ 'DiscountP' => '',
+ 'Due' => '',
+ 'Freightage' => '',
+ 'Gross' => '',
+ 'Invoice' => '',
+ 'Invoices' => '',
+ 'Item' => '',
+ 'Items' => '',
+ 'Log' => '',
+ 'Logs' => '',
+ 'Media' => '',
+ 'MoneyTransfer' => '',
+ 'Name' => '',
+ 'Net' => '',
+ 'Offer' => '',
+ 'Payment' => '',
+ 'Postal' => '',
+ 'Prepaid' => '',
+ 'Preview' => '',
+ 'Price' => '',
+ 'Profit' => '',
+ 'Quantity' => '',
+ 'Recipient' => '',
+ 'Select' => '',
+ 'Shipment' => '',
+ 'Source' => '',
+ 'Supplier' => '',
+ 'SupplierID' => '',
+ 'Tax' => '',
+ 'TermsOfDelivery' => '',
+ 'Total' => '',
+ 'Type' => '',
+ 'Upload' => '',
+ 'Variation' => '',
+ 'Zip' => '',
+]];
diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
old mode 100755
new mode 100644
index cd31fbb..870f6b3
--- a/Theme/Backend/Lang/en.lang.php
+++ b/Theme/Backend/Lang/en.lang.php
@@ -2,9 +2,9 @@
/**
* Orange Management
*
- * PHP Version 7.4
+ * PHP Version 8.0
*
- * @package Modules\Billing
+ * @package Modules\Localization
* @copyright Dennis Eichhorn
* @license OMS License 1.0
* @version 1.0.0
@@ -16,6 +16,7 @@ return ['Billing' => [
'Address' => 'Address',
'Addresses' => 'Addresses',
'AlreadyPaid' => 'Already Paid',
+ 'Bills' => 'Bills',
'Bonus' => 'Bonus',
'Cashback' => 'Cash Back',
'City' => 'City',
@@ -49,6 +50,7 @@ return ['Billing' => [
'Payment' => 'Payment',
'Postal' => 'Postal',
'Prepaid' => 'Prepaid',
+ 'Preview' => 'Preview',
'Price' => 'Price',
'Profit' => 'Profit',
'Quantity' => 'Quantity',