Select default client and contact when creating a new quote or invoice (

#224) Fixes #138
SolidInvoice · Nov 6, 2018 · c8b5dae · c8b5dae
1 parent aec5cb8
commit c8b5dae
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 7 deletions.
diff --git a/src/ClientBundle/Resources/public/js/view/client_select.js b/src/ClientBundle/Resources/public/js/view/client_select.js
@@ -22,6 +22,7 @@ define(
                 if (!this.model.isEmpty()) {
                     this.ui.clientSelect.hide();
                 }
+                this.selectDefaultClientContact();
             },
             clientChange: function(event) {
                 event.preventDefault();
@@ -59,7 +60,8 @@ define(
                 );
             },
             _toggleContactInfo: function(show) {
-                let clientSelect = this.$('#client-select');
+                const clientSelect = this.$('#client-select');
+                const clientSelectContainer = this.$('#client-select-container');
                 clientSelect.toggle();
 
                 if (clientSelect.is(':visible')) {
@@ -68,12 +70,19 @@ define(
 
                 if (!_.isUndefined(show)) {
                     if (true === show) {
-                        this.$('#client-select-container').show();
+                        clientSelectContainer.show();
                     } else {
-                        this.$('#client-select-container').hide();
+                        clientSelectContainer.hide();
                     }
                 } else {
-                    this.$('#client-select-container').toggle();
+                    clientSelectContainer.toggle();
+                }
+            },
+            selectDefaultClientContact: function () {
+                const clientSelectContainer = this.$('#client-select-container');
+                const clientSelectContainerCheckbox = clientSelectContainer.find('input[type="checkbox"]');
+                if (clientSelectContainerCheckbox.length === 1){
+                    clientSelectContainerCheckbox.prop("checked", true);
                 }
             }
         });

diff --git a/src/ClientBundle/Resources/views/Ajax/info.html.twig b/src/ClientBundle/Resources/views/Ajax/info.html.twig
@@ -31,7 +31,8 @@
                     <li class="item">
                         <div class="checkbox">
                             <label for="client-contact-{{ contact.id }}">
-                                <input type="checkbox" name="{{ type }}[users][]" value="{{ contact.id }}" id="client-contact-{{ contact.id }}" />
+                                <input type="checkbox" name="{{ type }}[users][]" value="{{ contact.id }}" id="client-contact-{{ contact.id }}"
+                                    {{ client.contacts|length == 1 ? "checked" : ""}}/>
                                 {{ contact }}
                             </label>
                         </div>

diff --git a/src/InvoiceBundle/Action/Create.php b/src/InvoiceBundle/Action/Create.php
@@ -41,9 +41,13 @@ public function __construct(FormHandler $handler, ClientRepository $clientReposi
 
     public function __invoke(Request $request, Client $client = null)
     {
-        if (!$this->clientRepository->getTotalClients()) {
+        $totalClientsCount = $this->clientRepository->getTotalClients();
+        if (!$totalClientsCount) {
             return new Template('@SolidInvoiceInvoice/Default/empty_clients.html.twig');
         }
+        if (1 === $totalClientsCount && null === $client) {
+            $client = $this->clientRepository->findOneBy([]);
+        }
 
         $invoice = new Invoice();
         $invoice->setClient($client);

diff --git a/src/QuoteBundle/Action/Create.php b/src/QuoteBundle/Action/Create.php
@@ -41,9 +41,13 @@ public function __construct(ClientRepository $repository, FormHandler $handler)
 
     public function __invoke(Request $request, Client $client = null)
     {
-        if (!$this->repository->getTotalClients()) {
+        $totalClientsCount = $this->repository->getTotalClients();
+        if (!$totalClientsCount) {
             return new Template('@SolidInvoiceQuote/Default/empty_clients.html.twig');
         }
+        if (1 === $totalClientsCount && null === $client) {
+            $client = $this->repository->findOneBy([]);
+        }
 
         $quote = new Quote();
         $quote->setClient($client);