diff --git a/Models/Bill.php b/Models/Bill.php index 867a4b6..c00784b 100755 --- a/Models/Bill.php +++ b/Models/Bill.php @@ -84,7 +84,13 @@ class Bill implements \JsonSerializable */ public int $status = BillStatus::DRAFT; - private int $paymentStatus = BillPaymentStatus::UNPAID; + /** + * Bill payment status + * + * @var int + * @since 1.0.0 + */ + public int $paymentStatus = BillPaymentStatus::UNPAID; /** * Bill created at. diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php index d5b6450..f98745f 100755 --- a/Theme/Backend/Lang/de.lang.php +++ b/Theme/Backend/Lang/de.lang.php @@ -13,30 +13,41 @@ declare(strict_types=1); return ['Billing' => [ + 'Amount' => 'Betrag', + 'Billing' => 'Rechnungsstellung', + 'CreateBill' => 'Erstelle Rechnung', + 'Archive' => 'Archiev', + 'Email' => 'Email', + 'PazmentPlan' => 'Zahlplan', + 'Types' => 'Typen', + 'Original' => 'Original', 'Address' => 'Adresse', 'Addresses' => 'Adressen', - 'Africa' => '#VALUE!', + 'Africa' => 'Afrika', + 'Africa' => 'Africa', + 'Currency' => 'Währung', + 'Language' => 'Sprache', 'AlreadyPaid' => 'Bereits bezahlt', - 'America' => '#VALUE!', - 'Analyse' => '#VALUE!', - 'Articles' => '#VALUE!', - 'Asia' => '#VALUE!', - 'Attribute' => '#VALUE!', - 'BaseTime' => '#VALUE!', + 'America' => 'Amerika', + 'Analyse' => 'Analyse', + 'Articles' => 'Artikel', + 'Asia' => 'Asien', + 'Attribute' => 'Attribute', + 'BaseTime' => 'Basiszeit', 'Bills' => 'Rechnungen', 'Bonus' => 'Bonus', - 'CIS' => '#VALUE!', + 'CIS' => 'CIS', 'Cashback' => 'Kennzeichnen', 'City' => 'Stadt', 'Client' => 'Klient', 'ClientID' => 'Kunden ID', - 'ComparisonTime' => '#VALUE!', + 'ComparisonTime' => 'Vergleichszeit', 'Confirmation' => 'Bestätigung', 'Country' => 'Land', 'Created' => 'Erstellt', 'CreditCard' => 'Kreditkarte', 'CreditNote' => 'Gutschrift', - 'Customers' => '#VALUE!', + 'Customers' => 'Kunden', 'Date' => 'Datum', 'Delivery' => 'Die Zustellung', 'DeliveryNote' => 'Lieferschein', @@ -44,10 +55,10 @@ return ['Billing' => [ 'Discount' => 'Rabatt', 'DiscountP' => 'Rabatt %', 'Due' => 'Fällig', - 'Europe' => '#VALUE!', - 'Filter' => '#VALUE!', + 'Europe' => 'Europa', + 'Filter' => 'Filter', 'Freightage' => 'Fracht', - 'General' => '#VALUE!', + 'General' => 'Allgemein', 'Gross' => 'Grob', 'Invoice' => 'Rechnung', 'Invoices' => 'Rechnungen', @@ -60,7 +71,7 @@ return ['Billing' => [ 'Name' => 'Name', 'Net' => 'Netz', 'Offer' => 'Angebot', - 'Other' => '#VALUE!', + 'Other' => 'Sonstige', 'Payment' => 'Zahlung', 'Postal' => 'Post', 'Prepaid' => 'Vorausbezahlt', @@ -69,9 +80,9 @@ return ['Billing' => [ 'Profit' => 'Profitieren', 'Quantity' => 'Menge', 'Recipient' => 'Empfänger', - 'Region' => '#VALUE!', - 'Rep' => '#VALUE!', - 'Sales' => '#VALUE!', + 'Region' => 'Region', + 'Rep' => 'Vertreter', + 'Sales' => 'Umsatz', 'Select' => 'Wählen', 'Shipment' => 'Sendung', 'Source' => 'Quelle', @@ -82,7 +93,7 @@ return ['Billing' => [ 'Total' => 'Gesamt', 'Type' => 'Typ', 'Upload' => 'Hochladen', - 'Value' => '#VALUE!', + 'Value' => 'Wert', 'Variation' => 'Variation', 'Zip' => 'Reißverschluss', ]]; diff --git a/Theme/Cli/Lang/de.lang.php b/Theme/Cli/Lang/de.lang.php new file mode 100644 index 0000000..776cf84 --- /dev/null +++ b/Theme/Cli/Lang/de.lang.php @@ -0,0 +1,16 @@ + [ +]]; diff --git a/tests/Models/BillTest.php b/tests/Models/BillTest.php index 715d66c..00b361f 100755 --- a/tests/Models/BillTest.php +++ b/tests/Models/BillTest.php @@ -48,13 +48,13 @@ final class BillTest extends \PHPUnit\Framework\TestCase self::assertEquals('', $this->bill->info); self::assertInstanceOf('\Modules\Billing\Models\NullBillType', $this->bill->type); self::assertInstanceOf('\DateTimeImmutable', $this->bill->createdAt); - self::assertInstanceOf('\DateTime', $this->bill->performanceDate); + self::assertEquals(null, $this->bill->performanceDate); self::assertNull($this->bill->send); self::assertNull($this->bill->client); self::assertNull($this->bill->supplier); self::assertEquals([], $this->bill->getVouchers()); self::assertEquals([], $this->bill->getTrackings()); - self::assertEquals([], $this->bill->getMediaByType(0)); + self::assertEquals([], $this->bill->getFileByType(0)); self::assertEquals('', $this->bill->shipTo); self::assertEquals('', $this->bill->shipFAO); @@ -70,14 +70,14 @@ final class BillTest extends \PHPUnit\Framework\TestCase self::assertEquals('', $this->bill->billZip); self::assertEquals('', $this->bill->billCountry); - self::assertInstanceOf('\phpOMS\Localization\Money', $this->bill->netSales); - self::assertInstanceOf('\phpOMS\Localization\Money', $this->bill->grossSales); + self::assertInstanceOf('\phpOMS\Stdlib\Base\FloatInt', $this->bill->netSales); + self::assertInstanceOf('\phpOMS\Stdlib\Base\FloatInt', $this->bill->grossSales); - self::assertInstanceOf('\phpOMS\Localization\Money', $this->bill->netProfit); - self::assertInstanceOf('\phpOMS\Localization\Money', $this->bill->grossProfit); + self::assertInstanceOf('\phpOMS\Stdlib\Base\FloatInt', $this->bill->netProfit); + self::assertInstanceOf('\phpOMS\Stdlib\Base\FloatInt', $this->bill->grossProfit); - self::assertInstanceOf('\phpOMS\Localization\Money', $this->bill->netCosts); - self::assertInstanceOf('\phpOMS\Localization\Money', $this->bill->grossCosts); + self::assertInstanceOf('\phpOMS\Stdlib\Base\FloatInt', $this->bill->netCosts); + self::assertInstanceOf('\phpOMS\Stdlib\Base\FloatInt', $this->bill->grossCosts); self::assertEquals(0, $this->bill->payment); self::assertEquals('', $this->bill->paymentText);