Merge branch 'InvoicePlane:development' into Preview-PDF-in-Modal-Inv…

…oicePlane#925
Verony-makesIT · Dec 5, 2023 · 90a08a7 · 90a08a7
2 parents 3aed7de + 8c76ad0
commit 90a08a7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/application/modules/clients/views/script_select2_client_id.js b/application/modules/clients/views/script_select2_client_id.js
@@ -13,7 +13,6 @@ $(".client-id-select").select2({
             };
         },
         processResults: function (data) {
-            console.log(data);
             return {
                 results: data
             };

diff --git a/application/modules/projects/views/form.php b/application/modules/projects/views/form.php
@@ -1,3 +1,8 @@
+<?php
+    $default_client_name = $this->mdl_projects->form_value('client_name', true);
+    $default_client_surname = $this->mdl_projects->form_value('client_surname', true);
+?>
+
 <script>
     $(function () {
         <?php $this->layout->load_view('clients/script_select2_client_id.js'); ?>
@@ -15,17 +20,21 @@
     </div>
 
     <div id="content">
-
         <?php $this->layout->load_view('layout/alerts'); ?>
-
         <div class="form-group">
             <label for="project_name"><?php _trans('project_name'); ?></label>
             <input type="text" name="project_name" id="project_name" class="form-control"
                    value="<?php echo $this->mdl_projects->form_value('project_name', true); ?>" required>
         </div>
         <div class="form-group">
             <label for="client_id"><?php _trans('client'); ?></label>
-            <select name="client_id" id="client_id" class="client-id-select form-control" autofocus="autofocus"></select>
+            <select name="client_id" id="client_id" class="client-id-select form-control" autofocus="autofocus">
+                <?php if(null !== $default_client_name): ?>
+                    <option value="<?php echo $default_client_name; ?>">
+                        <?php echo $default_client_name . ' ' . $default_client_surname; ?>
+                    </option>
+                <?php endif; ?>
+            </select>
         </div>
 
     </div>