Get real invoice value

.github/dependabot.yml

@@ -0,0 +1,17 @@
+# Basic set up for three package managers
+
+version: 2
+updates:
+
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    # Workflow files stored in the default location of `.github/workflows`. (You don't need to specify `/.github/workflows` for `directory`. You can use `directory: "/"`.)
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
+  # Maintain dependencies for Composer
+  - package-ecosystem: "composer"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/ci.yml

@@ -1,6 +1,6 @@
 name: CI
 
-on: [push, pull_request]
+on: [ pull_request]
 
 jobs:
   ci:
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
+        php-version: ['8.2', '8.3']
         include:
           - php-version: '8.2'
             deploy: ${{ github.ref == 'refs/heads/master' }}
@@ -19,7 +19,7 @@ jobs:
     steps:
       # Download code from repository
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Setup PHP
       - name: Setup PHP

.gitignore

@@ -1,2 +1,3 @@
 /vendor
-composer.lock
+composer.lock
+.idea

src/AllowanceOrCharge.php

@@ -7,6 +7,8 @@ class AllowanceOrCharge {
     protected $reasonCode = null;
     protected $reason = null;
     protected $amount = null;
+    protected $baseAmount = null;
+    protected $factorMultiplier = null;
     protected $isPercentage = false;
 
     use VatTrait;
@@ -71,6 +73,46 @@ public function setAmount(float $amount): self {
     }
 
 
+    /**
+     * Get base amount
+     * @return float|null Allowance/charge base amount
+     */
+    public function getBaseAmount(): ?float {
+        return $this->baseAmount;
+    }
+
+
+    /**
+     * Set base amount
+     * @param  float $baseAmount Allowance/charge base amount
+     * @return self          This instance
+     */
+    public function setBaseAmount(float $baseAmount): self {
+        $this->baseAmount = $baseAmount;
+        return $this;
+    }
+
+
+    /**
+     * Get factor multiplier
+     * @return float|null Allowance/charge factor multiplier
+     */
+    public function getFactorMultiplier(): ?float {
+        return $this->factorMultiplier;
+    }
+
+
+    /**
+     * Set factor multiplier
+     * @param  float $factorMultiplier Allowance/charge factor multiplier
+     * @return self          This instance
+     */
+    public function setFactorMultiplier(float $factorMultiplier): self {
+        $this->factorMultiplier = $factorMultiplier;
+        return $this;
+    }
+
+
     /**
      * Is percentage
      * @return boolean Whether amount is a percentage or not
@@ -102,15 +144,13 @@ public function markAsFixedAmount(): self {
 
     /**
      * Get effective amount relative to base amount
-     * @param  float $baseAmount Base amount
      * @return float             Effective amount
      */
-    public function getEffectiveAmount(float $baseAmount): float {
-        $amount = $this->getAmount();
+    public function getEffectiveAmount(): float {
         if ($this->isPercentage()) {
-            $amount = $baseAmount * ($amount / 100);
+            return $this->baseAmount * ($this->factorMultiplier / 100);
         }
 
-        return $amount;
+        return $this->getAmount();
     }
 }

src/Invoice.php

@@ -4,6 +4,7 @@
 use DateTime;
 use Einvoicing\Models\InvoiceTotals;
 use Einvoicing\Payments\Payment;
+use Einvoicing\Payments\PaymentTerms;
 use Einvoicing\Presets\AbstractPreset;
 use Einvoicing\Traits\AllowanceOrChargeTrait;
 use Einvoicing\Traits\AttachmentsTrait;
@@ -244,6 +245,7 @@ class Invoice {
     protected $businessProcess = null;
     protected $number = null;
     protected $type = self::TYPE_COMMERCIAL_INVOICE;
+    protected $legacySum = true;
     protected $currency = "EUR"; // TODO: add constants
     protected $vatCurrency = null;
     protected $issueDate = null;
@@ -252,7 +254,9 @@ class Invoice {
     protected $notes = [];
     protected $buyerReference = null;
     protected $purchaseOrderReference = null;
+    protected $despatchDocumentReference = null;
     protected $salesOrderReference = null;
+    protected $projectReference = null;
     protected $tenderOrLotReference = null;
     protected $contractReference = null;
     protected $paidAmount = 0;
@@ -262,8 +266,10 @@ class Invoice {
     protected $buyer = null;
     protected $payee = null;
     protected $delivery = null;
-    protected $payment = null;
+    protected $payments = [];
+    protected $paymentTerms = null;
     protected $lines = [];
+    protected $totals = null;
 
     use AllowanceOrChargeTrait;
     use AttachmentsTrait;
@@ -388,6 +394,25 @@ public function setNumber(string $number): self {
         return $this;
     }
 
+    /**
+     * Get legacy sum
+     * @return bool legacy sum
+     */
+    public function getLegacySum(): bool {
+        return $this->legacySum;
+    }
+
+
+    /**
+     * Set legacy sum
+     * @param  bool $legacySum legacy sum
+     * @return self           Invoice instance
+     */
+    public function setLegacySum(bool $legacySum): self {
+        $this->legacySum = $legacySum;
+        return $this;
+    }
+
 
     /**
      * Get invoice type code
@@ -619,6 +644,46 @@ public function setPurchaseOrderReference(?string $purchaseOrderReference): self
     }
 
 
+    /**
+     * Get despatch document reference
+     * @return string|null despatch document reference
+     */
+    public function getDespatchDocumentReference(): ?string {
+        return $this->despatchDocumentReference;
+    }
+
+
+    /**
+     * Set despatch document reference
+     * @param  string|null $despatchDocumentReference despatch document reference
+     * @return self                                Invoice instance
+     */
+    public function setDespatchDocumentReference(?string $despatchDocumentReference): self {
+        $this->despatchDocumentReference = $despatchDocumentReference;
+        return $this;
+    }
+
+
+    /**
+     * Get project reference
+     * @return string|null Project reference
+     */
+    public function getProjectReference(): ?string {
+        return $this->projectReference;
+    }
+
+
+    /**
+     * Set project reference
+     * @param  string|null $projectReference Project reference
+     * @return self                                Invoice instance
+     */
+    public function setProjectReference(?string $projectReference): self {
+        $this->projectReference = $projectReference;
+        return $this;
+    }
+
+
     /**
      * Get sales order reference
      * @return string|null Sales order reference
@@ -819,22 +884,42 @@ public function setDelivery(?Delivery $delivery): self {
     }
 
 
+    /**
+     * Get payment terms information
+     * @return PaymentTerms|null PaymentTerms instance
+     */
+    public function getPaymentTerms(): ?PaymentTerms {
+        return $this->paymentTerms;
+    }
+
+
+    /**
+     * Set payment terms information
+     * @param  PaymentTerms|null $paymentTerms PaymentTerms instance
+     * @return self                            Invoice instance
+     */
+    public function setPaymentTerms(?PaymentTerms $paymentTerms): self {
+        $this->paymentTerms = $paymentTerms;
+        return $this;
+    }
+
+
     /**
      * Get payment information
-     * @return Payment|null Payment instance
+     * @return Payment[] Payment instance
      */
-    public function getPayment(): ?Payment {
-        return $this->payment;
+    public function getPayments(): array {
+        return $this->payments;
     }
 
 
     /**
      * Set payment information
-     * @param  Payment|null $payment Payment instance
-     * @return self                  Invoice instance
+     * @param  Payment  $payment  Payment instance
+     * @return self               Invoice instance
      */
-    public function setPayment(?Payment $payment): self {
-        $this->payment = $payment;
+    public function addPayment(Payment $payment): self {
+        $this->payments[] = $payment;
         return $this;
     }
 
@@ -889,6 +974,20 @@ public function clearLines(): self {
      * @return InvoiceTotals Invoice totals
      */
     public function getTotals(): InvoiceTotals {
+        if (! empty($this->totals)) {
+            return $this->totals;
+        }
+
         return InvoiceTotals::fromInvoice($this);
     }
+
+
+    /**
+     * Set invoice total
+     * @return self Invoice instance
+     */
+    public function setTotals(InvoiceTotals $invoiceTotals): self {
+        $this->totals = $invoiceTotals;
+        return $this;
+    }
 }

src/InvoiceLine.php

@@ -21,7 +21,7 @@ class InvoiceLine {
     protected $quantity = 1;
     protected $unit = "C62"; // TODO: add constants
     protected $price = null;
-    protected $baseQuantity = 1;
+    protected $baseQuantity = 1.0;
 
     use AllowanceOrChargeTrait;
     use AttributesTrait;
@@ -289,7 +289,7 @@ public function getBaseQuantity(): float {
      * @return self                Invoice line instance
      */
     public function setBaseQuantity(float $baseQuantity): self {
-        $this->baseQuantity = $baseQuantity;
+        $this->baseQuantity = $baseQuantity != 0.0 ? $baseQuantity : 1.0;
         return $this;
     }
 
@@ -312,9 +312,8 @@ public function getNetAmountBeforeAllowancesCharges(): ?float {
      */
     public function getAllowancesAmount(): float {
         $allowancesAmount = 0;
-        $baseAmount = $this->getNetAmountBeforeAllowancesCharges() ?? 0.0;
         foreach ($this->getAllowances() as $item) {
-            $allowancesAmount += $item->getEffectiveAmount($baseAmount);
+            $allowancesAmount += $item->getEffectiveAmount();
         }
         return $allowancesAmount;
     }
@@ -326,9 +325,8 @@ public function getAllowancesAmount(): float {
      */
     public function getChargesAmount(): float {
         $chargesAmount = 0;
-        $baseAmount = $this->getNetAmountBeforeAllowancesCharges() ?? 0.0;
         foreach ($this->getCharges() as $item) {
-            $chargesAmount += $item->getEffectiveAmount($baseAmount);
+            $chargesAmount += $item->getEffectiveAmount();
         }
         return $chargesAmount;
     }