Update for current php-abraflexi

VitexSoftware · Mar 19, 2023 · 5c19b46 · 5c19b46
1 parent 99bd590
commit 5c19b46
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 20 deletions.
diff --git a/src/modules/Debtors.php b/src/modules/Debtors.php
@@ -31,10 +31,10 @@ public function dig() {
 
             foreach ($faDatakturyRaw as $faData) {
                 $currency = self::getCurrency($faData);
-                $invoicesByFirma[$faData['firma']][$faData['id']] = $faData;
+                $invoicesByFirma[(string)$faData['firma']][$faData['id']] = $faData;
 
-                if (!isset($totals[$faData['firma']][$currency])) {
-                    $totals[$faData['firma']][$currency] = 0;
+                if (!isset($totals[(string)$faData['firma']][$currency])) {
+                    $totals[(string)$faData['firma']][$currency] = 0;
                 }
                 if (!isset($totalsByCurrency[$currency])) {
                     $totalsByCurrency[$currency] = 0;
@@ -46,17 +46,17 @@ public function dig() {
                     $amount = floatval($faData['zbyvaUhradit']);
                 }
 
-                $totals[$faData['firma']][$currency] += $amount;
+                $totals[(string)$faData['firma']][$currency] += $amount;
                 $totalsByCurrency[$currency] += $amount;
 
                 $oDays = \AbraFlexi\FakturaVydana::overdueDays($faData['datSplat']);
 
-                if (array_key_exists($faData['firma'], $overdue)) {
-                    if ($oDays > $overdue[$faData['firma']]) {
-                        $overdue[$faData['firma']] = $oDays;
+                if (array_key_exists((string)$faData['firma'], $overdue)) {
+                    if ($oDays > $overdue[(string)$faData['firma']]) {
+                        $overdue[(string)$faData['firma']] = $oDays;
                     }
                 } else {
-                    $overdue[$faData['firma']] = $oDays;
+                    $overdue[(string)$faData['firma']] = $oDays;
                 }
             }
         }
@@ -85,8 +85,7 @@ public function dig() {
 
                 $adreser->setMyKey($firma);
 
-                $nazevFirmy = array_key_exists('firma@showAs',
-                                current($fakturyFirmy)) ? current($fakturyFirmy)['firma@showAs'] : \AbraFlexi\RO::uncode($firma);
+                $nazevFirmy = strlen(current($fakturyFirmy)['firma']->showAs) ? current($fakturyFirmy)['firma']->showAs : \AbraFlexi\RO::uncode($firma);
 
                 $invTable->addRowColumns([
                     new \Ease\Html\ATag($adreser->getApiURL(), $nazevFirmy),

diff --git a/src/modules/UnmatchedPayments.php b/src/modules/UnmatchedPayments.php
@@ -38,12 +38,11 @@ public function dig() {
                 _('Bank Account'), _('Company'), _('Date'), _('Amount')]);
             foreach ($incomes as $income) {
                 $adresser->dataReset();
-                if (empty($income['firma']) && !empty($income['buc'])) {
+                if (empty((string) $income['firma']) && !empty($income['buc'])) {
                     $candidates = $bucer->getColumnsFromAbraFlexi(['firma'],
                             ['buc' => $income['buc']]);
                     if (!empty($candidates)) {
-                        $income['firma'] = $candidates[0]['firma'];
-                        $income['firma@showAs'] = $candidates[0]['firma@showAs'];
+                        $income['firma'] = $candidates[0]['firma']->showAs;
                     }
                 }
                 $adresser->takeData($income);
@@ -56,19 +55,15 @@ public function dig() {
                     $total[$currency] = $amount;
                 }
 
-                $income['kod'] = new \AbraFlexi\ui\DocumentLink($income['kod'], $banker);
+                $income['kod'] = new \AbraFlexi\ui\DocumentLink('code:' . $income['kod'], $banker);
                 $income['price'] = self::getAmount($income);
                 $adresser->setMyKey($adresser);
-                $income['firma'] = new \Ease\Html\ATag(array_key_exists('firma@showAs', $income) ? $income['firma@showAs'] : '', $adresser->getApiUrl() . $income['firma']);
+                $income['firma'] = new \Ease\Html\ATag(empty($income['firma']->showAs) ? $adresser->getApiUrl() . $income['firma'] : $income['firma']->showAs);
 
                 unset($income['id']);
                 unset($income['sumCelkem']);
                 unset($income['sumCelkemMen']);
                 unset($income['mena']);
-                unset($income['mena@ref']);
-                unset($income['mena@showAs']);
-                unset($income['firma@ref']);
-                unset($income['firma@showAs']);
                 $incomesTable->addRowColumns($income);
             }
             $currDiv = new \Ease\Html\DivTag();

diff --git a/src/modules/WaitingIncome.php b/src/modules/WaitingIncome.php
@@ -58,7 +58,7 @@ public function dig() {
                     ),
                     new \Ease\Html\ATag(
                             $adreser->getApiUrl(),
-                            empty($outInvoiceData['firma']) ? '' : $outInvoiceData['firma@showAs']
+                            (string)$outInvoiceData['firma']
                     ),
                     (($currency != 'CZK') ? $outInvoiceData['sumCelkemMen'] : $outInvoiceData['sumCelkem']) . ' ' . $currency
                 ]);