kimai · kernie · Feb 6, 2025 · Feb 6, 2025 · Feb 6, 2025 · Feb 6, 2025
diff --git a/src/Command/InvoiceCreateCommand.php b/src/Command/InvoiceCreateCommand.php
@@ -185,7 +185,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $searchTerm = new SearchTerm($input->getOption('search'));
         }
 
-        if ($input->getOption('preview') !== null) {
+        if (null !== $input->getOption('preview')) {
             $this->previewUniqueFile = (bool) $input->getOption('preview-unique');
             $this->previewDirectory = rtrim($input->getOption('preview'), '/') . '/';
             if (!is_dir($this->previewDirectory) || !is_writable($this->previewDirectory)) {
@@ -197,6 +197,23 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             @trigger_error('The "set-exported" option of kimai:invoice:create command has no meaning anymore, it will be removed soon', E_USER_DEPRECATED);
         }
 
+        $overwriteTemplate = null;
+        if (null !== ($tplOption = $input->getOption('template'))) {
+            if (\is_string($tplOption) || \is_int($tplOption)){
+                $tplOption = \strval($tplOption);
+                $overwriteTemplate = $this->getCommandLineArgumentTemplateForCustomer($tplOption);
+                if (null === $overwriteTemplate){
+                    $io->error('Invalid invoice template name or id given');
+
+                    return Command::FAILURE;
+                }
+            } else {
+                $io->error('Option --template must be string or int');
+
+                return Command::FAILURE;
+            }
+        }
+
         // =============== VALIDATION END ===============
 
         $defaultQuery = new InvoiceQuery();
@@ -205,6 +222,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $defaultQuery->setCurrentUser($user);
         $defaultQuery->setSearchTerm($searchTerm);
         $defaultQuery->setExported($exportedFilter);
+        if (null !== $overwriteTemplate){
+            $defaultQuery->setTemplate($overwriteTemplate);
+            $defaultQuery->setAllowTemplateOverwrite(true);
+        }
 
         /** @var Invoice[] $invoices */
         $invoices = [];
@@ -276,12 +297,15 @@ protected function createInvoicesForProjects(array $projects, InvoiceQuery $defa
             $query->addProject($project);
             $query->addCustomer($customer);
 
-            $tpl = $this->getTemplateForCustomer($input, $customer);
+            $tpl = $query->getTemplate();
             if (null === $tpl) {
-                $io->warning(\sprintf('Could not find invoice template for project "%s", skipping!', $project->getName()));
-                continue;
+                $tpl = $customer->getInvoiceTemplate();
+                if (null === $tpl) {
+                    $io->warning(\sprintf('Could not find invoice template for project "%s", skipping!', $project->getName()));
+                    continue;
+                }
+                $query->setTemplate($tpl);
             }
-            $query->setTemplate($tpl);
 
             try {
                 $model = $this->serviceInvoice->createModel($query);
@@ -351,12 +375,15 @@ protected function createInvoicesForCustomer(array $customers, InvoiceQuery $def
             $query = clone $defaultQuery;
             $query->addCustomer($customer);
 
-            $tpl = $this->getTemplateForCustomer($input, $customer);
+            $tpl = $query->getTemplate();
             if (null === $tpl) {
-                $io->warning(\sprintf('Could not find invoice template for customer "%s", skipping!', $customer->getName()));
-                continue;
+                $tpl = $customer->getInvoiceTemplate();
+                if (null === $tpl) {
+                    $io->warning(\sprintf('Could not find invoice template for customer "%s", skipping!', $customer->getName()));
+                    continue;
+                }
+                $query->setTemplate($tpl);
             }
-            $query->setTemplate($tpl);
 
             try {
                 $model = $this->serviceInvoice->createModel($query);
@@ -435,14 +462,8 @@ protected function renderInvoiceResult(InputInterface $input, OutputInterface $o
         return Command::SUCCESS;
     }
 
-    private function getTemplateForCustomer(InputInterface $input, Customer $customer): ?InvoiceTemplate
+    private function getCommandLineArgumentTemplateForCustomer(string $template): ?InvoiceTemplate
     {
-        $template = $input->getOption('template');
-
-        if (null === $template) {
-            return $customer->getInvoiceTemplate();
-        }
-
         $tpl = $this->invoiceTemplateRepository->find($template);
 
         if (null !== $tpl) {

diff --git a/tests/Command/InvoiceCreateCommandTest.php b/tests/Command/InvoiceCreateCommandTest.php
@@ -108,7 +108,7 @@
        $commandTester = $this->createInvoice($options);

        $output = $commandTester->getDisplay();
        self::assertStringContainsString('[ERROR] ' . $errorMessage, $output);
    }

    public function testCreateWithUnknownExportFilter(): void
@@ -305,4 +305,64 @@
         $output = $commandTester->getDisplay();
         self::assertStringContainsString('Created 1 invoice(s) ', $output);
     }
+
+    public function testCreateInvoiceWithTemplateOverwrite(): void
+    {
+        $start = new \DateTime('-2 months');
+        $end = new \DateTime();
+        $this->prepareFixtures($start)[0];
+
+        $commandTester = $this->createInvoice(['--user' => UserFixtures::USERNAME_SUPER_ADMIN, '--customer' => 1, '--template' => 'MyInvoice', '--exported' => 'all', '--start' => $start->format('Y-m-d'), '--end' => $end->format('Y-m-d')]);
+
+        $output = $commandTester->getDisplay();
+
+        self::assertStringContainsString('Created 1 invoice(s) ', $output);
+        self::assertStringContainsString('/tests/_data/invoices/' . ((new \DateTime())->format('Y')) . '-001-Test.pdf |', $output);
+    }
+
+    public function testCreateInvoiceWithTemplateId(): void
+    {
+        $start = new \DateTime('-2 months');
+        $end = new \DateTime();
+        $customer = $this->prepareFixtures($start)[0];
+        self::assertNotNull($customer);
+        $customerId = $customer->getId();
+        $template = $customer->getInvoiceTemplate();
+        self::assertNotNull($template);
+        $templateId = $template->getId();
+        $customer->SetInvoiceTemplate(null);
+
+        $commandTester = $this->createInvoice(['--user' => UserFixtures::USERNAME_SUPER_ADMIN, '--customer' => $customerId, '--template' => $templateId, '--exported' => 'all', '--start' => $start->format('Y-m-d'), '--end' => $end->format('Y-m-d')]);
+
+        $output = $commandTester->getDisplay();
+
+        self::assertStringContainsString('Created 1 invoice(s) ', $output);
+    }
+
+    public function testCreateInvoiceWithTemplateOverwriteProjectIdMissingTemplate(): void
+    {
+        $start = new \DateTime('-2 months');
+        $end = new \DateTime();
+
+        $customer = $this->prepareFixtures($start)[0];
+        $customer->SetInvoiceTemplate(null);
+
+        $commandTester = $this->createInvoice(['--user' => UserFixtures::USERNAME_SUPER_ADMIN, '--exported' => 'all', '--project' => '1', '--template' => 'NoInvoice', '--start' => $start->format('Y-m-d'), '--end' => $end->format('Y-m-d')]);
+        $output = $commandTester->getDisplay();
+
+        self::assertStringContainsString('Invalid invoice template name or id given', $output);
+    }
+
+    public function testCreateInvoiceByProjectIdSearchTerm(): void
+    {
+        $start = new \DateTime('-2 months');
+        $end = new \DateTime();
+
+        $this->prepareFixtures($start);
+
+        $commandTester = $this->createInvoice(['--user' => UserFixtures::USERNAME_SUPER_ADMIN, '--exported' => 'all', '--project' => '1', '--template' => 'Invoice', '--search' => 'wxjehrchskejrht', '--start' => $start->format('Y-m-d'), '--end' => $end->format('Y-m-d')]);
+        $output = $commandTester->getDisplay();
+
+        self::assertStringContainsString('Created 1 invoice(s) ', $output);
+    }
 }
diff --git a/tests/Controller/InvoiceControllerTest.php b/tests/Controller/InvoiceControllerTest.php
@@ -441,7 +441,7 @@ public function testDeleteTemplateAction(): void
         self::assertTrue($client->getResponse()->isSuccessful());
         $this->assertHasFlashSuccess($client);
 
-        self::assertEquals(0, $this->getEntityManager()->getRepository(InvoiceTemplate::class)->count([]));
+        self::assertEquals(1, $this->getEntityManager()->getRepository(InvoiceTemplate::class)->count([]));
     }
 
     public function testUploadDocumentAction(): void

diff --git a/tests/DataFixtures/InvoiceTemplateFixtures.php b/tests/DataFixtures/InvoiceTemplateFixtures.php
@@ -49,10 +49,36 @@ public function load(ObjectManager $manager): array
         $template->setRenderer('invoice');
 
         $manager->persist($template);
-        $manager->flush();
 
         $created[] = $template;
 
+        $template2 = new InvoiceTemplate();
+
+        $template2->setName('MyInvoice');
+        $template2->setTitle('Your company name');
+        $template2->setCompany($faker->company());
+        $template2->setVat(19);
+        $template2->setDueDays(14);
+        $template2->setPaymentTerms(
+            'I would like to thank you for your confidence and will gladly be there for you in the future.' .
+            PHP_EOL .
+            'Please transfer the total amount within 14 days to the given account and use the invoice number ' .
+            'as reference.'
+        );
+        $template2->setAddress(
+            $faker->streetAddress() . PHP_EOL .
+            $faker->city() . ' ' . $faker->postcode() . ', ' . $faker->country() . PHP_EOL .
+            'Phone: ' . $faker->phoneNumber() . PHP_EOL .
+            'Email: ' . $faker->safeEmail()
+        );
+        $template2->setLanguage('en');
+        $template2->setRenderer('default');
+
+        $manager->persist($template2);
+        $manager->flush();
+
+        $created[] = $template2;
+
         return $created;
     }
 }