diff --git a/app/Config/Routes.php b/app/Config/Routes.php index aa81e5b6..72eb1f88 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -275,6 +275,7 @@ $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'EditStoreRequisition', 'Storer $routes->get('AddIGR', 'Inwardgateregister::addIGR'); // ADD IGR page - working $routes->get('ViewIGR', 'Inwardgateregister::viewIGR'); // View IGR PAGE - Working $routes->post('ViewIGR', 'Inwardgateregister::viewIGR');//for filter purpose +$routes->get('accountsDashboard', 'Inwardgateregister::accountsDashboard'); // View IGR PAGE - Working $routes->post('ViewIGRDetails', 'Inwardgateregister::viewIGRDetails'); $routes->post('GetIGRLineItemDetails', 'Inwardgateregister::getIGRLineItemDetails'); $routes->post('SaveIGR', 'Inwardgateregister::SaveIGR');// Save IGR PAGE - Working diff --git a/app/Controllers/Inwardgateregister.php b/app/Controllers/Inwardgateregister.php index 86bc1379..89aadcd7 100755 --- a/app/Controllers/Inwardgateregister.php +++ b/app/Controllers/Inwardgateregister.php @@ -92,6 +92,43 @@ class Inwardgateregister extends BaseController $this->loadViews("viewinwardgateregister", $this->global, $data, NULL); } + + function accountsDashboard(){ + + $toDate = date('Y-m-d'); + $fromDate = date('Y-m-d'); + + + $this->global['pageTitle'] = 'Accounts Dashboard'; + $result = $this->inwardgateregister_model->ViewigrListing($fromDate, $toDate); + $igrList = $result[0]; + + foreach ($igrList as &$igr) { + $igrNo = $igr->IGRNO; + $fileDetails = $this->inwardgateregister_model->getAllIgrFileDetails($igrNo); + $igr->isIgrFilePresent = false; // Initialize the key + + foreach ($fileDetails as $file) { + if (!empty($file->file)) { + $igr->isIgrFilePresent = true; + break; + } + } + } + + // Unset reference to avoid side effects + unset($igr); + + $data['IGR'] = $igrList; + $data['IGRDownload'] = $result[1]; + $data['userRole'] = $this->session->get('role'); + $data['transporter'] = $this->inwardgateregister_model->transporter(); + $data['fromDate'] = date('d-m-Y', strtotime($fromDate)); + $data['toDate'] = date('d-m-Y', strtotime($toDate)); + + $this->loadViews("accountsDashboard", $this->global, $data, NULL); + } + function addIGR() { diff --git a/app/Views/accountsDashboard.php b/app/Views/accountsDashboard.php new file mode 100644 index 00000000..5e958bc5 --- /dev/null +++ b/app/Views/accountsDashboard.php @@ -0,0 +1,1792 @@ + + + + + + + + + +
+
+ +
+ +
+
+
+
+
+
    +
  1. Inward
    2. +
  2. +

    Accounts Dashboard

    +
    3. +
+
+
+
+ +
+ getFlashdata('message')): ?> + + + +
+
+
+
+
+
+ + + + + + + + + + + + +
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + CreatedDate); + $date = $createddate->format('d-m-Y'); + $time = $createddate->format('h:i A'); + $draft = []; + $record->IGRStatus == 'ST074'? $draft [] = $record:''; + if(!empty($draft)){ + ?> + + + + + + + + + + + + + + + + + + +
Create DateIGR NoPO NoSupplier NameInvoice NoInvoice Date Item CountRec QtyNet WeightVechicle NoDriverTransporterIGR StatusAction
+ IGRNO ?> + + PONO ?> + SupplierName ?>DeliveryChellanOrInvoiceNo ?>DeliveryChellanDate); + echo $date->format('d-m-Y'); ?>itemCount ?>ReceivedQuantity ?>NetWeight ?>VehicleNo ?>DriverName ?>TransporterName ?>IGRStatus == 'ST074' ? 'Draft' : 'Completed'; ?> + + + + + +   + + + isIgrFilePresent)){ ?> + + + +   + +
+ + +
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/Views/includes/new_header.php b/app/Views/includes/new_header.php index fd93e8b7..d59c3d27 100755 --- a/app/Views/includes/new_header.php +++ b/app/Views/includes/new_header.php @@ -52,6 +52,13 @@ + + + + + + + @@ -840,15 +847,20 @@ - - + + + + +
  • + +
    • + diff --git a/app/Views/incomingSilicaSandDetails.php b/app/Views/incomingSilicaSandDetails.php index 0ea74056..e8b3680e 100644 --- a/app/Views/incomingSilicaSandDetails.php +++ b/app/Views/incomingSilicaSandDetails.php @@ -153,6 +153,16 @@ height: 20px; } + + #invoice-logo { + max-width: 10em !important; + max-height: 8em !important; + margin-top: 1em; + text-align: right + } + + + @@ -275,6 +285,7 @@ MaterialCode Update Lab Report id + Download Report @@ -301,12 +312,12 @@ - + - + + + + + + @@ -538,6 +555,8 @@ + +