diff --git a/app/Controllers/Report.php b/app/Controllers/Report.php
index f2c78550..9db52041 100755
--- a/app/Controllers/Report.php
+++ b/app/Controllers/Report.php
@@ -330,6 +330,7 @@ class Report extends BaseController
if ($this->request->getPost('financialyear')) {
$ab = $this->request->getPost('financialyear');
+ $data['financialyear'] = $ab;
$a = substr((string)$ab, 0, -5);
$b = substr((string)$ab, 5, 5);
$data['year'] = $this->dahsboard_Model->report_year_wise($a, $b);
@@ -585,6 +586,7 @@ class Report extends BaseController
$ab = $this->request->getPost('financialyear');
$data['financialyear'] = $ab;
$cat = $this->request->getVar('cat');
+ $data['cat'] = $cat;
$fa = substr((string)$ab, 0, -5);
$aa = substr((string)$ab, 5, 5);
$m = $this->request->getPost('month');
@@ -615,13 +617,19 @@ class Report extends BaseController
$this->global['pageTitle'] = 'Inward PO Reports';
//$this->request->getPost('btn_submit');
$cname = $this->request->getPost('client_name');
+ $data['client_name'] = $cname;
$prod = $this->request->getPost('item_name');
+ $data['item_name'] = $prod;
$ab = $this->request->getPost('financialyear');
+ $data['financialyear'] = $ab;
$fa = substr((string)$ab, 0, -5);
$aa = substr((string)$ab, 5, 5);
$m = $this->request->getPost('month');
+ $data['month'] = $m;
$frm = $this->request->getPost('from_date');
+ $data['frm'] = $frm;
$t = $this->request->getPost('to_date');
+ $data['t'] = $t;
$sid = $this->request->getVar('sid');
$mid = $this->request->getVar('mid');
@@ -637,13 +645,19 @@ class Report extends BaseController
//$this->request->getPost('btn_submit');
$cat = $this->request->getVar('cat');
$cname = $this->request->getVar('cname');
+ $data['client_name'] = $cname;
$prod = $this->request->getVar('prod');
+ $data['item_name'] = $prod;
$ab = $this->request->getVar('ab');
+ $data['financialyear'] = $ab;
$fa = substr((string)$ab, 0, -5);
$aa = substr((string)$ab, 5, 5);
$m = $this->request->getVar('m');
+ $data['month'] = $m;
$frm = $this->request->getVar('frm');
+ $data['frm'] = $frm;
$t = $this->request->getVar('t');
+ $data['t'] = $t;
$sid = $this->request->getVar('sid');
$mid = $this->request->getVar('mid');
$d = $this->request->getVar('d');
@@ -666,12 +680,17 @@ class Report extends BaseController
$this->global['pageTitle'] = 'Inward Reports - Summary';
if ($this->request->getPost('btn_submit')) {
$cname = $this->request->getPost('client_name');
+ $data['client_name'] = $cname;
$ab = $this->request->getPost('financialyear');
+ $data['financialyear'] = $ab;
$fa = substr((string)$ab, 0, -5);
$aa = substr((string)$ab, 5, 5);
$m = $this->request->getPost('month');
+ $data['month'] = $m;
$frm = $this->request->getPost('from_date');
+ $data['from_date'] = $frm;
$t = $this->request->getPost('to_date');
+ $data['to_date'] = $t;
//print_r($prod);
$data['material'] = $this->dahsboard_Model->material_name();
$data['cust'] = $this->dahsboard_Model->customer_name();
@@ -702,6 +721,7 @@ class Report extends BaseController
if ($this->request->getPost('financialyear')) {
$ab = $this->request->getPost('financialyear');
+ $data['financialyear'] = $ab;
$a = substr((string)$ab, 0, -5);
$b = substr((string)$ab, 5, 5);
$data['year'] = $this->dahsboard_Model->ireport_year_wise($a, $b);
@@ -730,17 +750,13 @@ class Report extends BaseController
$data['month'] = $this->dahsboard_Model->ireport_month_wise($month);
$this->loadviews("Report_month_wise_inward", $this->global, $data, NULL);
}
- public function iyear_wise_total()
+ public function iyear_wise_total($year)
{
$this->global['pageTitle'] = 'Inward Reports - Yearwise';
- $uri = service('uri');
- $last = $uri->getTotalSegments();
- $month = $uri->getSegment($last);
- $a = substr($month, 0, -5);
- $b = substr($month, 5, 5);
- //print_r($month);
- $data['year'] = $month;
+ $a = substr($year, 0, -5);
+ $b = substr($year, 5, 5);
+ $data['year'] = $year;
$data['ytotal'] = $this->dahsboard_Model->ireport_year_wise_total($a, $b);
$this->loadviews("Report_year_wise_total_inward", $this->global, $data, NULL);
}
@@ -751,12 +767,17 @@ class Report extends BaseController
$this->global['pageTitle'] = 'Inward Reports - Supplierwise';
if ($this->request->getPost('btn_submit')) {
$cname = $this->request->getPost('client_name');
+ $data['client_name'] = $cname;
$ab = $this->request->getPost('financialyear');
+ $data['financialyear'] = $ab;
$fa = substr((string)$ab, 0, -5);
$aa = substr((string)$ab, 5, 5);
$m = $this->request->getPost('month');
+ $data['month'] = $m;
$frm = $this->request->getPost('from_date');
+ $data['frm'] = $frm;
$t = $this->request->getPost('to_date');
+ $data['t'] = $t;
//print_r($prod);
$data['material'] = $this->dahsboard_Model->material_name();
$data['cust'] = $this->dahsboard_Model->customer_name();
@@ -779,7 +800,9 @@ class Report extends BaseController
$this->global['pageTitle'] = 'Inward Reports - Consolidate';
if ($this->request->getPost('btn_submit')) {
$cname = $this->request->getPost('client_name');
+ $data['client_name'] = $cname;
$ab = $this->request->getPost('financialyear');
+ $data['financialyear'] = $ab;
$fa = substr((string)$ab, 0, -5);
$aa = substr((string)$ab, 5, 5);
//print_r($prod);
@@ -804,10 +827,14 @@ class Report extends BaseController
$sid = $this->request->getVar('sid');
$mid = $this->request->getVar('mid');
$cname = $this->request->getVar('cname');
+ $data['client_name'] = $cname;
$prod = $this->request->getVar('prod');
+ $data['item_name'] = $prod;
//$mat = $this->request->getVar('mid');
$m = $this->request->getVar('m');
+ $data['month'] = $m;
$ab = $this->request->getVar('ab');
+ $data['financialyear'] = $ab;
$fa = substr((string)$ab, 0, -5);
$aa = substr((string)$ab, 5, 5);
//print_r($prod);
@@ -828,9 +855,12 @@ class Report extends BaseController
$sid = $this->request->getVar('sid');
$mid = $this->request->getVar('mid');
$cname = $this->request->getVar('cname');
+ $data['client_name'] = $cname;
$prod = $this->request->getVar('prod');
+ $data['item_name'] = $prod;
//$mat = $this->request->getVar('mid');
$ab = $this->request->getVar('ab');
+ $data['financialyear'] = $ab;
$fa = substr((string)$ab, 0, -5);
$aa = substr((string)$ab, 5, 5);
//print_r($prod);
@@ -861,49 +891,23 @@ class Report extends BaseController
$this->loadviews("Report_cumulative_inward", $this->global, $data, NULL);
}
- public function icum_month()
+ public function icum_month($sup,$mat)
{
-
$this->global['pageTitle'] = 'Inward Reports - Cumulative-Monthwise';
- $uri = service('uri');
- $last = $uri->getSegments();
-
-
- $sup = $last[3];
- $mat = $last[4];
- //print_r($prod);
-
$data['cum_month'] = $this->dahsboard_Model->ireport_cum_month($sup, $mat);
$this->loadviews("Report_cumulative_month_inward", $this->global, $data, NULL);
}
- public function icum_year()
+ public function icum_year($sup,$mat)
{
$this->global['pageTitle'] = 'Inward Reports - Cumulative-Yearwise ';
- $uri = service('uri');
- $last = $uri->getSegments();
-
-
- $sup = $last[3];
- $mat = $last[4];
-
- //print_r($sup);
-
$data['cum_year'] = $this->dahsboard_Model->ireport_cum_year($sup, $mat);
$this->loadviews("Report_cumulative_year_inward", $this->global, $data, NULL);
}
- public function icum_day()
+ public function icum_day($sup,$mat)
{
$this->global['pageTitle'] = 'Inward Reports - Cumulative-Daywise ';
- $uri = service('uri');
- $last = $uri->getSegments();
-
-
- $sup = $last[3];
- $mat = $last[4];
- //print_r($prod);
-
$data['cum_day'] = $this->dahsboard_Model->ireport_cum_day($sup, $mat);
$this->loadviews("Report_cumulative_day_inward", $this->global, $data, NULL);
}
@@ -959,7 +963,9 @@ class Report extends BaseController
$this->global['pageTitle'] = ' Inward Report - Consolidate ';
if ($this->request->getPost('btn_submit')) {
$cname = $this->request->getPost('client_name');
+ $data['client_name'] = $cname;
$ab = $this->request->getPost('financialyear');
+ $data['financialyear'] = $ab;
$fa = substr((string)$ab, 0, -5);
$aa = substr((string)$ab, 5, 5);
//print_r($prod);
diff --git a/app/Views/reportslink.php b/app/Views/reportslink.php
index 150d7d0d..5149411d 100644
--- a/app/Views/reportslink.php
+++ b/app/Views/reportslink.php
@@ -34,21 +34,21 @@