Skip to content
Code-Schnipsel Gruppen Projekte
Commit 34221b81 erstellt von Henning Leutz's avatar Henning Leutz :martial_arts_uniform:
Dateien durchsuchen

fix: #9

Übergeordneter 368d3ede
Keine zugehörigen Branchen gefunden
Keine zugehörigen Tags gefunden
Keine zugehörigen Merge Requests gefunden
......@@ -82,6 +82,15 @@
<de><![CDATA[Steuernummer]]></de>
<en><![CDATA[Tax number]]></en>
</locale>
<locale name="user.profile.userdata.title">
<de><![CDATA[Firmendaten]]></de>
<en><![CDATA[Company data]]></en>
</locale>
<locale name="user.profile.userdata.vatId">
<de><![CDATA[Umsatzsteuer-ID]]></de>
<en><![CDATA[VAT ID]]></en>
</locale>
</groups>
<groups name="quiqqer/erp" datatype="php">
......
......@@ -10,6 +10,7 @@
use QUI\ERP\Money\Price;
use QUI\Interfaces\Users\User as UserInterface;
use QUI\ERP\Accounting\Invoice\Invoice;
use QUI\ERP\Accounting\Invoice\InvoiceTemporary;
use QUI\ERP\Accounting\Invoice\Handler;
/**
......@@ -483,7 +484,7 @@ public static function calculateInvoicePayments(Invoice $Invoice)
/**
* Calculates the individual amounts paid of an invoice / order
*
* @param Invoice|QUI\ERP\Order\AbstractOrder $ToCalculate
* @param InvoiceTemporary|Invoice|QUI\ERP\Order\AbstractOrder $ToCalculate
* @return array
*
* @throws QUI\ERP\Exception
......@@ -506,6 +507,10 @@ public static function calculatePayments($ToCalculate)
$transactions = $Transactions->getTransactionsByHash($ToCalculate->getHash());
$calculations = $ToCalculate->getArticles()->getCalculations();
if (!isset($calculations['sum'])) {
$calculations['sum'] = 0;
}
$paidData = [];
$paidDate = 0;
$sum = 0;
......@@ -570,7 +575,6 @@ public static function calculatePayments($ToCalculate)
$ToCalculate->setAttribute('paid', $sum);
$ToCalculate->setAttribute('toPay', $toPay - $paid);
if ($ToCalculate->getAttribute('paid_status') === Handler::TYPE_INVOICE_REVERSAL
|| $ToCalculate->getAttribute('paid_status') === Handler::TYPE_INVOICE_CANCEL
) {
......@@ -606,7 +610,7 @@ public static function calculatePayments($ToCalculate)
/**
* Is the object allowed for calculation
*
* @param Invoice|QUI\ERP\Order\AbstractOrder $ToCalculate
* @param InvoiceTemporary|Invoice|QUI\ERP\Order\AbstractOrder $ToCalculate
* @return bool
*/
public static function isAllowedForCalculation($ToCalculate)
......@@ -615,6 +619,10 @@ public static function isAllowedForCalculation($ToCalculate)
return true;
}
if ($ToCalculate instanceof InvoiceTemporary) {
return true;
}
if ($ToCalculate instanceof QUI\ERP\Order\AbstractOrder) {
return true;
}
......@@ -728,6 +736,10 @@ public static function calculateTotalVatOfInvoice($vatArray)
$vatArray = json_decode($vatArray, true);
}
if (!is_array($vatArray)) {
return 0;
}
return array_sum(
array_map(function ($vat) {
return $vat['sum'];
......
<section class="quiqqer-frontendUsers-userdata-section quiqqer-erp-userProfile-vat">
<header>
<h2>{locale group="quiqqer/tax" var="user.profile.userdata.title"}</h2>
<h2>{locale group="quiqqer/erp" var="user.profile.userdata.title"}</h2>
</header>
<label class="quiqqer-order-customerData-edit-vatId">
<span class="quiqqer-frontendUsers-userdata-label">
{locale group="quiqqer/order" var="vatId"}
{locale group="quiqqer/erp" var="user.profile.userdata.vatId"}
</span>
<input type="text"
name="vatId"
......
0% Lade oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren