diff --git a/Admin/Installer.php b/Admin/Installer.php index 0a7faea..7ced5b7 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -141,9 +141,9 @@ final class Installer extends InstallerAbstract continue; } - $billAttrType[$attribute['name']] = !\is_array($responseData['response']) - ? $responseData['response']->toArray() - : $responseData['response']; + $billAttrType[$attribute['name']] = \is_array($responseData['response']) + ? $responseData['response'] + : $responseData['response']->toArray(); $isFirst = true; foreach ($attribute['l11n'] as $language => $l11n) { @@ -212,9 +212,9 @@ final class Installer extends InstallerAbstract continue; } - $attrValue = !\is_array($responseData['response']) - ? $responseData['response']->toArray() - : $responseData['response']; + $attrValue = \is_array($responseData['response']) + ? $responseData['response'] + : $responseData['response']->toArray(); $billAttrValue[$attribute['name']][] = $attrValue; @@ -298,9 +298,9 @@ final class Installer extends InstallerAbstract continue; } - $result = !\is_array($responseData['response']) - ? $responseData['response']->toArray() - : $responseData['response']; + $result = \is_array($responseData['response']) + ? $responseData['response'] + : $responseData['response']->toArray(); $results[] = $result; } @@ -350,9 +350,9 @@ final class Installer extends InstallerAbstract continue; } - $billType = !\is_array($responseData['response']) - ? $responseData['response']->toArray() - : $responseData['response']; + $billType = \is_array($responseData['response']) + ? $responseData['response'] + : $responseData['response']->toArray(); $billTypes[] = $billType; diff --git a/Controller/ApiBillController.php b/Controller/ApiBillController.php index 39ddce1..4078921 100755 --- a/Controller/ApiBillController.php +++ b/Controller/ApiBillController.php @@ -321,14 +321,12 @@ final class ApiBillController extends Controller $taxCode = $this->app->moduleManager->get('Billing', 'ApiTax') ->getTaxCodeFromClientItem($client, $item, $request->header->l11n->country); - $element = BillElement::fromItem( + return BillElement::fromItem( $item, $taxCode, $request->getDataInt('quantity') ?? 1, $bill->id ); - - return $element; } /** diff --git a/Theme/Backend/bill-create.tpl.php b/Theme/Backend/bill-create.tpl.php index c575002..d8e30bc 100755 --- a/Theme/Backend/bill-create.tpl.php +++ b/Theme/Backend/bill-create.tpl.php @@ -42,7 +42,7 @@ $archive = $bill->getFileByTypeName('original'); $logs = $this->data['logs'] ?? []; $editable = $bill->id === 0 || \in_array($bill->getStatus(), [BillStatus::DRAFT, BillStatus::UNPARSED]); -$disabled = !$editable ? ' disabled' : ''; +$disabled = $editable ? '' : ' disabled'; echo $this->data['nav']->render(); ?> diff --git a/Theme/Backend/user-purchase-bill-dashboard.tpl.php b/Theme/Backend/user-purchase-bill-dashboard.tpl.php index 2bb596b..c66623b 100755 --- a/Theme/Backend/user-purchase-bill-dashboard.tpl.php +++ b/Theme/Backend/user-purchase-bill-dashboard.tpl.php @@ -171,11 +171,11 @@ echo $this->data['nav']->render(); ?> ?>">= $value->billAddress; ?>