Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme

app/Models/Ipinvoice_model.php

@@ -237,7 +237,7 @@ class Ipinvoice_model extends Model
             ->join('ip_invoice_items b', 'a.invoice_id = b.invoice_id', 'left')
             ->join('ip_invoice_item_amounts c', 'b.item_id = c.item_id', 'left')
             ->where('a.invoice_date_created', date('Y-m-d'))
-            ->where('a.invoice_status_id', 2);
+            ->whereIn('a.invoice_status_id', [2,5]);
         
         $query = $builder->get();
         return $query->getRow(); // Assuming you want a single row of aggregated results
@@ -270,7 +270,7 @@ class Ipinvoice_model extends Model
             ->join('ip_invoice_items b', 'a.invoice_id = b.invoice_id', 'left')
             ->join('ip_invoice_item_amounts c', 'b.item_id = c.item_id', 'left')
             ->where('a.invoice_date_created >=', $fiscalMonthStart)
-            ->where('a.invoice_status_id', 2);
+            ->whereIn('a.invoice_status_id', [2,5]);
 
         // Execute the query
         $query = $builder->get();
@@ -308,7 +308,7 @@ class Ipinvoice_model extends Model
             ->join('ip_invoice_items b', 'a.invoice_id = b.invoice_id', 'left')
             ->join('ip_invoice_item_amounts c', 'b.item_id = c.item_id', 'left')
             ->where('a.invoice_date_created >=', $fiscalYearStart)
-            ->where('a.invoice_status_id', 2);
+            ->whereIn('a.invoice_status_id', [2,5]);
 
         // Execute the query
         $query = $builder->get();

app/Views/drierMachineDetails.php

@@ -164,6 +164,27 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
     .modal {
         padding-right: 30% ! important;
     }
+
+
+
+
+
+
+
+/* #drierTable th:nth-child(1),
+#drierTable th:nth-child(2),
+#drierTable td:nth-child(1),
+#drierTable td:nth-child(2) {
+    position: sticky;
+    left: 0;
+    background-color: white; 
+    z-index: 2;
+    border-right: 1px solid #ddd; 
+}
+#drierTable th:nth-child(1),
+#drierTable td:nth-child(1) {
+    z-index: 3;
+} */
 </style>
 <div class="content-page">
     <div class="content">

app/Views/includes/new_header.php

@@ -76,6 +76,10 @@
     <link href="<?php echo base_url(); ?>public/new_assets/libs/bootstrap-datepicker/css/bootstrap-datepicker.min.css" rel="stylesheet" type="text/css" />
   
     <style>
+        .dropdown-menu{
+            box-shadow: 0px 10px 43px 0 rgb(76 76 76 / 39%);
+            z-index: 20;
+        }
         .mce-edit-area.mce-container.mce-panel.mce-first.mce-last.mce-stack-layout-item {
             border-width: 0px 0px 0px !important;
         }