diff --git a/application/controllers/cashbook.php b/application/controllers/cashbook.php index a554341c..72371caa 100644 --- a/application/controllers/cashbook.php +++ b/application/controllers/cashbook.php @@ -477,7 +477,8 @@ class cashbook extends BaseController echo ""; + "; + redirect('Bankingstatement','refresh'); } else @@ -797,7 +798,8 @@ class cashbook extends BaseController echo ""; + "; + redirect('Bankingstatement','refresh'); } else @@ -1518,7 +1520,8 @@ class cashbook extends BaseController $this->global['pageTitle'] = $this->CompanyName.' : Bank Statement'; if($this->input->post('btn_submit')) - { + { + //$this->global['pageTitle'] = $this->CompanyName.' : bankstatement'; $ab=$this->input->post('financialyear'); $fa=substr($ab,0,-5); @@ -1629,13 +1632,13 @@ class cashbook extends BaseController $tdate = $this->input->post('to_date'); $bankid= $_GET['d']; $data['clearbalance']=$_GET['cb']; - if($data['clearbalance']==0) - { - echo ""; - redirect('Bankingstatement','refresh'); - } - else - { + // if($data['clearbalance']==0) + // { + // echo ""; + // redirect('Bankingstatement','refresh'); + // } + // else + // { $data['balancetoclear']=$_GET['btc']; $data['mappingcashbook']=$this->cashbook_model->mappingcash($SupplierName,$fdate,$tdate,$bankid); $data['mappingiv'] = $this->cashbook_model->creditinvoicelist($bankid); @@ -1644,7 +1647,7 @@ class cashbook extends BaseController $data['supplier'] = $this->cashbook_model->getsupplier(); //redirect('Bankingstatement','refresh'); $this->loadViews("bankinvoicesettlement", $this->global,$data,NULL); - } + //} } public function mappingdebit() { diff --git a/application/controllers/user.php b/application/controllers/user.php index 06de7840..56d8d39b 100755 --- a/application/controllers/user.php +++ b/application/controllers/user.php @@ -1346,6 +1346,55 @@ function attendanceyear($empID ='') $this->loadViews("Report_Material_inward_Register", $this->global,$data,NULL); } + + + + + + /* + *favourite add function and load view + */ + + function favourite() + { + //$this->global['pageTitle'] = 'Siddharth :Favourite '; + $this->global['pageTitle'] = $this->CompanyName.' : Add Favourite'; + + + // $data['ponoreset']=$this->purchaseorder_model->ponoresetfinyear(); + + + $this->loadViews("Favourite", $this->global,Null); + + } + function favouriteadd() + { + $name = $this->input->post('name'); + $url = $this->input->post('url'); + $status = $this->input->post('status'); + $CreateBy = $this->session->userdata ( 'userId' ); + + $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata')); + $createddt = $dt->format('Y-m-d H:i:s'); + $menu = $this->input->post('menu'); + // $RowCount = $this->input->post('txtRowCount'); + // $DeletedRow = $this->input->post('txtDeletedRow'); + // $comma_separated = explode(':', $DeletedRow); + $favourite = array('Menu_Name'=>$name,'Menu_URL'=>$url,'Status'=>$status,'Created_BY'=>$CreateBy,'Created_ON'=>$createddt,'Menu_ID'=>$menu); + $getdata= $this->user_model->favouriteadd($favourite); + // print_r($favourite); + // die(); + if($getdata==1) + + { + echo"success"; + + } + else{ + echo"failed"; + } + + } } ?> \ No newline at end of file diff --git a/application/helpers/cias_helper.php b/application/helpers/cias_helper.php index d1f0b702..52f533db 100755 --- a/application/helpers/cias_helper.php +++ b/application/helpers/cias_helper.php @@ -47,4 +47,17 @@ if(!function_exists('verifyHashedPassword')) } } + +function get_fav($user) + { + $CI = &get_instance(); + $CI->load->database(); + $user = (int)$user; + $CI->db->reconnect(); + $CI->db->where('Created_BY',$user); + $CI->db->where('Status',1); + return $CI->db->get('T_fav_add')->result(); + + } + ?> \ No newline at end of file diff --git a/application/models/cashbook_model.php b/application/models/cashbook_model.php index 0d1adb87..3463d1c9 100755 --- a/application/models/cashbook_model.php +++ b/application/models/cashbook_model.php @@ -374,7 +374,7 @@ class cashbook_model extends CI_Model $query = $this->db->query($sql); return $query->result(); - + } function bankfile($FileDetails) @@ -607,7 +607,7 @@ function debitbankstatemet($Supplierid,$fdate,$tdate) function igrmastermultiple($igrno,$pono) { $this->db->distinct(); - $this->db->select('BillNo,IGRNO,FilePath,PONO,Remarks'); + $this->db->select('BillNo,IGRNO,FilePath,PONO'); $this->db->from('T_Inwardgateregister_fileupload'); if(!empty($igrno) && !empty($pono)){ $this->db->where('PONO',$pono); diff --git a/application/models/user_model.php b/application/models/user_model.php index edc1be28..8a4a2a5c 100755 --- a/application/models/user_model.php +++ b/application/models/user_model.php @@ -299,20 +299,28 @@ GROUP BY financial_year"; } + /* + *fav model + */ + function favouriteadd($favourite) + { //echo $favourite['Menu_ID'];die; + if($favourite['Menu_ID'] !=''){ + //echo "if"; + // $this->db->where('id', $id); + // return $this->db->delete('employee'); + $this->db->where('Menu_ID',$favourite['Menu_ID']); + $this->db->delete('T_fav_add'); + + }else{ + //echo "else"; - - - - - - - - - - - + $this->db->insert('T_fav_add',$favourite); + $r = $this->db->affected_rows(); + return $r; + } + } } diff --git a/application/views/Favourite.php b/application/views/Favourite.php new file mode 100644 index 00000000..7cfe4524 --- /dev/null +++ b/application/views/Favourite.php @@ -0,0 +1,1220 @@ + + + + + + + + + + + +
+ + + session->userdata('userId')); + $count=sizeof($fav); + + //$get_fav = $fav;( + if(!empty($fav)){ + foreach($fav as $getfav){ + ?> + + + + + +
+
+ +

+
+ +
+ + + + + +
+
+
+

Requisition

+
+
+
+
Raise Requisition
+
Update Service PO Status
+
Approve Requisition
+ + + +
Purchase Order From Requisition
+ + + + + + AssDep; + + if($assd == PURCHASE || $DEPCode == PURCHASE){?> + +
Purchase Order From Requisition
+ + + + +
+
+
+
+ + + + + + + +
+
+
+

Store Requisition

+
+
+
+
Store Requisition
+
Approve Store Requisition
+ + + + + + +
Store Requisition Listing
+ + + + + + + + + AssDep; + + if($assd == STORE || $assd == QUALITY || $DEPCode == STORE || $DEPCode == QUALITY || $DEPCode == PRODUCTION || $assd == PRODUCTION){ $check =1;?> +
Store Requisition Listing
+ + + + +
+
+
+
+ + + + + + + + + + +
+
+
+

Stock Details

+
+
+
+
Final Product
+ + +
Finished Product History
+ + +
Final Product Listing
+ + +
Material Adjustment
+ +
Material Adjustment List
+
+
+
+
+ + +AssDep; + if($assd == PRODUCTION || $DEPCode == PRODUCTION){ + $check25 =1 + ?> + + +
+
+
+

Stock Details

+
+
+
+
Final Product
+ + +
Finished Product History
+ + +
Final Product Listing
+ + +
Material Adjustment
+ +
Material Adjustment List
+ +
Material History
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + AssDep; + + if( $assd == QUALITY || $DEPCode == QUALITY ){ $check =1;?> + + + + + + + + + + + + + + + + + + + + + + + + + + AssDep; + + if($assd == PRODUCTION || $DEPCode == PRODUCTION ){ $check =1;?> + + + + + + + + +
+
+ + + + + + + + + + + + + + + AssDep; + + if($assd == PRODUCTION || $DEPCode == PRODUCTION ){ $check =1;?> + + + + + + + + + + + + + + + +
+ +
+
+

Master Details

+
+
+
+ +
Cost Details
+ +
Asset Details
+ + + +
Employee Details
+ + + +
Supplier Details
+ + + +
Company Master
+ +
Employee Details
+ +
Config Master
+ +
Department Master
+ +
Material Master
+ +
Machine History/Master
+ +
Users
+ + +
+
+
+ +
+ + + + + + + + + AssDep; + + if($assd == FINANCE || $assd == HR || $assd == SALES || $assd == SYSTEM_ADMIN || $DEPCode == FINANCE || $DEPCode == HR || $DEPCode ==SALES || $DEPCode == ADMIN){ $check= $check+1;?> + + + +
+
+
+

Master Details

+
+
+
+ AssDep;?> + + + +
Supplier Details
+ + + + + + + AssDep; + + ?> + + +
Cost Details
+
Asset Details
+ + + + + + + AssDep;?> + + + + +
Company Master
+ +
Employee Details
+ + +
Config Master
+ + +
Department Master
+ +
Material Master
+ + + +
Users
+ + + + + + + + + + +
+
+
+
+ + + + + + + AssDep; + + if($assd == SALES || $DEPCode == SALES){?> + + + + + + + + +
+
+
+

Purchase order

+
+
+
+ +
Approve Purchase Order
+ + + +
Release Purchase Order
+ + + + +
Emergency Purchase Order
+
Purchase Order List
+
Amendment Purchase Order
+ +
+
+
+
+ + + + +
+
+
+

Advance Request

+
+
+
+
Advance Request
+ +
+
+
+
+ + + + + AssDep; + if($assd == PURCHASE || $assd == FINANCE || $assd == MANAGEMENT || $DEPCode == PURCHASE || $DEPCode == FINANCE || $DEPCode == MANAGEMENT){ $check = $check+1;?> + + + + + +
+
+
+

Purchase order

+
+
+
+ + AssDep; $check1=1;?> + + +
Approve Purchase Order
+ + + + + AssDep; $check1=1;?> + + +
Release Purchase Order
+ + + + + + AssDep; $check1=1;?> + + +
Emergency Purchase Order
+
Purchase Order List
+
Amendment Purchase Order
+ + + +
+
+
+
+ + + + + + AssDep; $check1=1;?> + + + +
+
+
+

Advance Request

+
+
+
+
Advance Request
+ +
+
+
+
+ + + + + + + + + + + + + + + + + +
+
+
+

Billing

+
+
+
+
MRIR Billing
+
Service PO Billing
+
+
+
+
+ +
+
+
+

Cash Book

+
+
+
+
Account Master
+
Receipt and Payment
+
Advance
+
+
+
+
+
+
+
+

Banking

+
+
+
+
Bank Statement Upload
+
Bank Statements
+
Amount Paid Reports(PO)
+
Amount Recived Reports(Inv)
+
+
+
+
+ + + + + + AssDep; + + if($assd == FINANCE || $DEPCode == FINANCE){ $check = $check+1;?> + + +
+
+
+

Billing

+
+
+
+
MRIR Billing
+
Service PO Billing
+
+
+
+
+
+
+
+

Cash Book

+
+
+
+
Account Master
+
Receipt and Payment
+
Advance
+
+
+
+
+
+
+
+

Banking

+
+
+
+
Bank Statement Upload
+
Bank Statements
+
Amount Paid Reports(PO)
+
Amount Recived Reports(Inv)
+
+
+
+
+ + + + + + + + + +
+
+
+

Inspection

+
+ +
+
+ +
Inward Gate Register Entry
+ +
View Inward Gate Register
+ +
Outward Gate Register Entry
+ +
View Outward Gate Register
+ + + + + +
View Inward Gate Register
+ +
View Material Inspection Report
+ + + +
Product Test Specification Master
+ + +
Product Test Report
+ + +
Inward Material Test Report
+ + + +
+
+
+
+ + +
+
+
+

Stock Details

+
+
+
+
Stock Details
+
+
+
+
+ + + + + + AssDep; + + //echo $assd; + + if($assd == STORE || $DEPCode == QUALITY || $assd == QUALITY || $DEPCode == STORE || $DEPCode == SECURITY || $assd == SECURITY){ $check8 = $check8+1;?> + + +
+
+
+

Inspection

+
+
+
+
View Inward Gate Register
+
View Material Inspection Report
+ + + +
Inward Gate Register Entry
+
View Inward Gate Register
+
Outward Gate Register Entry
+
View Outward Gate Register
+ +
+
+
+
+ + + AssDep;?> + + +
+
+
+

Stock Details

+
+
+
+
Stock Details
+
+
+
+
+ + + + + + + + + + + + + + + + +
+
+
+

PaySlip

+
+
+
+
Monthly Pay Information
+
PaySlip Generator
+
Edit Payslip
+
Employee Salary Details
+
Bank Report
+
Public Holidays
+
Loan Reports
+ +
+
+
+
+ + + + + AssDep; + if($assd == HR || $DEPCode == HR){ $check = $check+1;?> + + +
+
+
+

PaySlip

+
+
+
+
Monthly Pay Information
+
PaySlip Generator
+
Edit Payslip
+
Employee Salary Details
+
Bank Report
+
Public Holidays
+
Loan Reports
+
Incentives and Bonus Reports
+
+
+
+
+ + + + + + + + + + + +
+
+
+

ReportList

+
+
+
+
ReportList
+
+
+
+
+ + + + + + + AssDep;?> + +
+
+
+

ReportList

+
+
+
+
ReportList
+
+
+
+
+ + + + + + + + + + + + + + +
+
+
+

Attendance

+
+
+
+
Monthly Attendance
+
+ +
+
Permission Slip
+
+
+
+
+ + + + + + AssDep;?> + +
+
+
+

Attendance

+
+
+
+
Monthly Attendance
+
+ +
+ +
+
+
+
+ + + + + + +
+ +
+
+ + + + + \ No newline at end of file diff --git a/application/views/bankamountpaid.php b/application/views/bankamountpaid.php index 75f1de84..902310b4 100644 --- a/application/views/bankamountpaid.php +++ b/application/views/bankamountpaid.php @@ -432,7 +432,7 @@ $( function() { return date; } } ); - function igrno(i) + function igrno(i) { var igrno=$('#igrno'+i).text(); var pono =$('#pono'+i).text(); diff --git a/application/views/bankcashnew.php b/application/views/bankcashnew.php index 62e86da4..d37cfa06 100644 --- a/application/views/bankcashnew.php +++ b/application/views/bankcashnew.php @@ -103,7 +103,8 @@ function isNumberKey(evt) return true; } -$(document).ready(function(){ +$(document).ready(function() +{ // var recDiv = document.getElementById('Recepit'); // var payDiv = document.getElementById('Payment'); $("#supplier,#Paymentsupplier").select2(); @@ -141,10 +142,10 @@ $(document).ready(function(){ $("#merchantgst").val(supplier_gstno); } } - }); + }); } - } - }); + } + }); /**** receipt autocomplete ends here ********/ diff --git a/application/views/includes/header.php b/application/views/includes/header.php index 6f9f7a77..df225cb1 100755 --- a/application/views/includes/header.php +++ b/application/views/includes/header.php @@ -226,17 +226,68 @@ - + +
  • + +
    • + + + +