Migrate Ticket Template add to ajax-modal, add category type option if not defined, add product type if not defined

admin/includes/side_nav.php

@@ -162,7 +162,7 @@
                         <a href="/admin/ticket_template.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['ticket_template.php', 'ticket_template_details.php']) ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-life-ring"></i>
                             <p>
-                                <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/admin/modals/ticket_template/ticket_template_add.php"></span>
+                                <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/admin/modals/ticket_template/ticket_template_add.php" data-modal-size="lg"></span>
                                 Ticket Templates
                             </p>
                         </a>

admin/modals/category/category_add.php

@@ -2,7 +2,9 @@
 
 require_once '../../../includes/modal_header.php';
 
-$category = nullable_htmlentities($_GET['category']);
+$category = nullable_htmlentities($_GET['category'] ?? '');
+
+$category_types_array = ['Expense', 'Income', 'Referral', 'Ticket'];
 
 ?>
 
@@ -13,10 +15,30 @@ $category = nullable_htmlentities($_GET['category']);
     </button>
 </div>
 <form action="post.php" method="post" autocomplete="off">
-    <input type="hidden" name="type" value="<?php echo ($category); ?>">
 
     <div class="modal-body">
 
+        <?php if ($category) { ?>
+        <input type="hidden" name="type" value="<?= $category ?>">
+        <?php } else { ?>
+
+        <div class="form-group">
+            <label>Type <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                </div>
+                <select class="form-control select2" name="type" required>
+                    <option value="">- Select Type -</option>
+                    <?php foreach ($category_types_array as $type_select) { ?>
+                        <option><?= $type_select ?></option>
+                    <?php } ?>
+                </select>
+            </div>
+        </div>
+
+        <?php } ?>
+
         <div class="form-group">
             <label>Name <strong class="text-danger">*</strong></label>
             <div class="input-group">
@@ -39,7 +61,7 @@ $category = nullable_htmlentities($_GET['category']);
 
     </div>
     <div class="modal-footer">
-        <button type="submit" name="add_category" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
+        <button type="submit" name="add_category" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create Category</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
 </form>

admin/modals/ticket_template/ticket_template_add.php

@@ -1,13 +1,17 @@
-<div class="modal" id="addTicketTemplateModal" tabindex="-1">
+<?php
-    <div class="modal-dialog modal-lg">
+
-        <div class="modal-content">
+require_once '../../../includes/modal_header.php';
-            <div class="modal-header bg-dark">
+
-                <h5 class="modal-title"><i class="fa fa-fw fa-life-ring mr-2"></i>Creating Ticket Template</h5>
+ob_start();
+
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-life-ring mr-2"></i>New Ticket Template</h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
     </button>
-            </div>
+</div>
-            <form action="post.php" method="post" autocomplete="off">
+<form action="post.php" method="post" autocomplete="off">
     <div class="modal-body">
 
         <div class="form-group">
@@ -66,10 +70,10 @@
         </div>
     </div>
     <div class="modal-footer">
-                    <button type="submit" name="add_ticket_template" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
+        <button type="submit" name="add_ticket_template" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create Template</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
-            </form>
+</form>
-        </div>
+
-    </div>
+<?php
-</div>
+require_once '../../../includes/modal_footer.php';

admin/ticket_template.php

@@ -27,7 +27,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     <div class="card-header py-2">
         <h3 class="card-title mt-2"><i class="fas fa-fw fa-life-ring mr-2"></i>Ticket Templates</h3>
         <div class="card-tools">
-            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTicketTemplateModal"><i class="fas fa-plus mr-2"></i>New Ticket Template</button>
+            <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/ticket_template/ticket_template_add.php" data-modal-size="lg"><i class="fas fa-plus mr-2"></i>New Ticket Template</button>
         </div>
     </div>
     <div class="card-body">
@@ -120,5 +120,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 </div>
 
 <?php
-require_once "modals/ticket_template/ticket_template_add.php";
 require_once "../includes/footer.php";

agent/modals/product/product_add.php

@@ -9,9 +9,12 @@ if ($type == 'product') {
     $type_icon = "fa-wrench";
 }
 
+$product_types_array = ['product', 'service'];
+
 ob_start();
 
 ?>
+
 <div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw <?= $type_icon ?> mr-2"></i>New <strong><?= ucwords($type); ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
@@ -19,7 +22,6 @@ ob_start();
     </button>
 </div>
 <form action="post.php" method="post" autocomplete="off">
-    <input type="hidden" name="type" value="<?= $type ?>">
 
     <div class="modal-body">
 
@@ -33,6 +35,27 @@ ob_start();
             </div>
         </div>
 
+        <?php if ($type) { ?>
+        <input type="hidden" name="type" value="<?= $type ?>">
+        <?php } else { ?>
+
+        <div class="form-group">
+            <label>Type <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                </div>
+                <select class="form-control select2" name="type" required>
+                    <option value="">- Select Type -</option>
+                    <?php foreach ($product_types_array as $type_select) { ?>
+                        <option><?= $type_select ?></option>
+                    <?php } ?>
+                </select>
+            </div>
+        </div>
+
+        <?php } ?>
+
         <div class="form-group">
             <label>Category <strong class="text-danger">*</strong></label>
             <div class="input-group">