Final fixes

Sylius · Jun 11, 2021 · 0ab7fed · 0ab7fed
1 parent e480edc
commit 0ab7fed
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 6 deletions.
diff --git a/src/Doctrine/ORM/InvoiceRepository.php b/src/Doctrine/ORM/InvoiceRepository.php
@@ -26,4 +26,16 @@ public function findOneByOrder(OrderInterface $order): ?InvoiceInterface
 
         return $invoice;
     }
+
+    public function findByOrderNumber(string $orderNumber): array
+    {
+        return $this
+            ->createQueryBuilder('invoice')
+            ->innerJoin('invoice.order', 'o')
+            ->where('o.number = :orderNumber')
+            ->setParameter('orderNumber', $orderNumber)
+            ->getQuery()
+            ->getResult()
+        ;
+    }
 }
diff --git a/src/Doctrine/ORM/InvoiceRepositoryInterface.php b/src/Doctrine/ORM/InvoiceRepositoryInterface.php
@@ -20,4 +20,6 @@
 interface InvoiceRepositoryInterface extends RepositoryInterface
 {
     public function findOneByOrder(OrderInterface $order): ?InvoiceInterface;
+
+    public function findByOrderNumber(string $orderNumber): array;
 }
diff --git a/src/Resources/views/Invoice/Email/invoiceGenerated.html.twig b/src/Resources/views/Invoice/Email/invoiceGenerated.html.twig
@@ -6,7 +6,7 @@
 
 {% block body %}
     {% autoescape %}
-        Invoice with id {{ invoice.id }} was generated for order with number #{{ invoice.orderNumber }}.
+        Invoice with id {{ invoice.id }} was generated for order with number #{{ invoice.order.number }}.
         <br/><br/>
         You can find the document in this email's attachments.
     {% endautoescape %}

diff --git a/src/Resources/views/Invoice/Show/_header.html.twig b/src/Resources/views/Invoice/Show/_header.html.twig
@@ -8,7 +8,7 @@
                     {{ 'sylius_invoicing_plugin.ui.issued_at'|trans }}: <span id="invoice-issued-at">{{ invoice.issuedAt|format_datetime }}</span>
                 </div>
                 <div class="item">
-                    {{ 'sylius_invoicing_plugin.ui.issued_for_order'|trans }}: #{{ invoice.orderNumber }}
+                    {{ 'sylius_invoicing_plugin.ui.issued_for_order'|trans }}: #{{ invoice.order.number }}
                 </div>
                 <div class="item">
                     {{ 'sylius_invoicing_plugin.ui.issued_from'|trans }}

diff --git a/tests/Behat/Context/Domain/GeneratingInvoiceContext.php b/tests/Behat/Context/Domain/GeneratingInvoiceContext.php
@@ -27,7 +27,7 @@ public function __construct(ObjectManager $invoiceManager, InvoiceRepositoryInte
      */
     public function orderHasLostAllOfItsInvoices(string $orderNumber): void
     {
-        $invoice = $this->invoiceRepository->findOneByOrderNumber($orderNumber);
+        $invoice = $this->invoiceRepository->findByOrderNumber($orderNumber)[0];
 
         $this->invoiceManager->remove($invoice);
     }

diff --git a/tests/Behat/Context/Ui/Admin/ManagingInvoicesContext.php b/tests/Behat/Context/Ui/Admin/ManagingInvoicesContext.php
@@ -93,7 +93,7 @@ public function viewSummaryOfInvoiceForOrder(OrderInterface $order): void
     {
         $this->indexPage->open();
 
-        $invoiceId = $this->invoiceRepository->findOneByOrderNumber($order->getNumber())->id();
+        $invoiceId = $this->invoiceRepository->findByOrderNumber($order->getNumber())[0]->id();
 
         $this->showPage->open(['id' => $invoiceId]);
     }

diff --git a/tests/Behat/Context/Ui/Shop/CustomerBrowsingInvoicesContext.php b/tests/Behat/Context/Ui/Shop/CustomerBrowsingInvoicesContext.php
@@ -54,7 +54,7 @@ public function pdfFileForThisInvoiceShouldBeDownloadedSuccessfully(): void
     public function tryToDownloadInvoiceForOrder(string $orderNumber): void
     {
         /** @var InvoiceInterface $invoice */
-        $invoice = $this->invoiceRepository->findOneByOrderNumber($orderNumber);
+        $invoice = $this->invoiceRepository->findByOrderNumber($orderNumber)[0];
 
         $this->downloadInvoicePage->tryToOpen(['id' => $invoice->id()]);
     }
@@ -65,7 +65,7 @@ public function tryToDownloadInvoiceForOrder(string $orderNumber): void
     public function invoiceForOrderShouldNotBeDownloaded(string $orderNumber): void
     {
         /** @var InvoiceInterface $invoice */
-        $invoice = $this->invoiceRepository->findOneByOrderNumber($orderNumber);
+        $invoice = $this->invoiceRepository->findByOrderNumber($orderNumber)[0];
 
         Assert::false($this->downloadInvoicePage->isOpen(['id' => $invoice->id()]));
     }