sampanna/BBnepal-Accounts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changes

Browse Source
This commit is contained in:
Sampanna Rimal 2024-07-12 17:57:29 +05:45
parent 9cd05ef3cb
commit 7ffe31e260
22 changed files with 209 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
account/application/controllers/inventory/Itemcategories.php
View File

@ -17,42 +17,60 @@ class Itemcategories extends CI_Controller
switch ($alias) {
case 'add':
if (isset($_POST['submit'])) {
$TableData = array(
'units_id' => filter_var($_POST['units_id']),
'title' => filter_var($_POST['title']),
'description' => filter_var($_POST['description']),
'display_order' => filter_var($_POST['display_order']),
'status' => 1,
'remarks' => filter_var($_POST['remarks']),
'created_on' => date('Y-m-d H:i:s'),
'created_by' => 'admin',
);
$this->db->insert('tbl_itemcategories', $TableData);
redirect("inventory/itemcategories/list");
$title = filter_var($_POST['title']);
$this->db->where('title',$title);
$query = $this->db->get('tbl_itemcategories');
if($query->num_rows() > 0){
echo "Title or code already exists.";die;
}else{
$TableData = array(
'units_id' => filter_var($_POST['units_id']),
'title' => filter_var($_POST['title']),
'description' => filter_var($_POST['description']),
'display_order' => filter_var($_POST['display_order']),
'status' => 1,
'remarks' => filter_var($_POST['remarks']),
'created_on' => date('Y-m-d H:i:s'),
'created_by' => 'admin',
);
$this->db->insert('tbl_itemcategories', $TableData);
redirect("inventory/itemcategories/list");
}
}
loadView("inventory/itemcategories/add", $data);
break;
case 'edit':
if (isset($_POST['submit'])) {
$id = $this->uri->segment(4);
$TableData = array(
'units_id' => filter_var($_POST['units_id']),
'title' => filter_var($_POST['title']),
'description' => filter_var($_POST['description']),
'display_order' => filter_var($_POST['display_order']),
'status' => 1,
'remarks' => filter_var($_POST['remarks']),
'created_on' => date('Y-m-d H:i:s'),
'created_by' => 'admin',
);
$this->db->where('itemcategory_id', $id);
$this->db->update('tbl_itemcategories', $TableData);
redirect("inventory/itemcategories/list");
$title = filter_var($_POST['title']);
$this->db->where('status',1);
$this->db->where('itemcategory_id !=', $id);
$this->db->where('title',$title);
$query = $this->db->get('tbl_itemcategories');
if($query->num_rows() > 0){
echo "Title or description already exists.";die;
}else{
$TableData = array(
'units_id' => filter_var($_POST['units_id']),
'title' => filter_var($_POST['title']),
'description' => filter_var($_POST['description']),
'display_order' => filter_var($_POST['display_order']),
'status' => 1,
'remarks' => filter_var($_POST['remarks']),
'created_on' => date('Y-m-d H:i:s'),
'created_by' => 'admin',
);
$this->db->where('itemcategory_id', $id);
$this->db->update('tbl_itemcategories', $TableData);
redirect("inventory/itemcategories/list");
}
}
$id = $this->uri->segment(4);
$this->db->where('itemcategory_id', $id);
$data['itemcategory']=$this->db->get("tbl_itemcategories")->row();
loadView("inventory/itemcategories/add", $data);
loadView("inventory/itemcategories/list", $data);
break;
case 'delete':
$id = $this->uri->segment(4);

88
account/application/controllers/inventory/Items.php
View File

@ -23,45 +23,67 @@ class Items extends CI_Controller
switch ($alias) {
case 'add':
if (isset($_POST['submit'])) {
$TableData = array(
'itemcategories_id' => filter_var($_POST['itemcategories_id']),
'item_code' => filter_var($_POST['item_code']),
'title' => filter_var($_POST['title']),
'description' => filter_var($_POST['description']),
'units_id' => filter_var($_POST['units_id']),
'status' => 1,
'created_on' => date('Y-m-d H:i:s'),
'created_by' => 'admin',
);
$this->db->insert('tbl_items', $TableData);
$item_id = $this->db->insert_id();
$id = $item_id;
$qty = $_POST['opening_stock'];
$rate = $_POST['opening_stock_rate'];
$this->MStocks->addOpeningStock($id, $qty, $rate);
redirect("inventory/items/list");
$title = filter_var($_POST['title']);
$item_code = filter_var($_POST['item_code']);
$this->db->where('title',$title);
$this->db->or_where('item_code',$item_code);
$query = $this->db->get('tbl_items');
if($query->num_rows() > 0){
echo "Title or code already exists.";die;
}else{
$TableData = array(
'itemcategories_id' => filter_var($_POST['itemcategories_id']),
'item_code' => filter_var($_POST['item_code']),
'title' => filter_var($_POST['title']),
'description' => filter_var($_POST['description']),
'units_id' => filter_var($_POST['units_id']),
'status' => 1,
'created_on' => date('Y-m-d H:i:s'),
'created_by' => 'admin',
);
$this->db->insert('tbl_items', $TableData);
$item_id = $this->db->insert_id();
$id = $item_id;
$qty = $_POST['opening_stock'];
$rate = $_POST['opening_stock_rate'];
$this->MStocks->addOpeningStock($id, $qty, $rate);
redirect("inventory/items/list");
}
}
loadView("inventory/items/add", $data);
break;
case 'edit':
if (isset($_POST['submit'])) {
$id = $this->uri->segment(4);
$TableData = array(
'itemcategories_id' => filter_var($_POST['itemcategories_id']),
'item_code' => filter_var($_POST['item_code']),
'title' => filter_var($_POST['title']),
'description' => filter_var($_POST['description']),
'units_id' => filter_var($_POST['units_id']),
'status' => 1,
'created_on' => date('Y-m-d H:i:s'),
'created_by' => 'admin',
);
$this->db->where('item_id', $id);
$this->db->update('tbl_items', $TableData);
$qty = $_POST['opening_stock'];
$rate = $_POST['opening_stock_rate'];
$this->MStocks->updateOpeningStock($id, $qty, $rate);
redirect("inventory/items/list");
$title = filter_var($_POST['title']);
$item_code = filter_var($_POST['item_code']);
$this->db->where('status',1);
$this->db->where('item_id !=', $id);
$this->db->where('title',$title);
$this->db->or_where('item_code',$item_code);
$query = $this->db->get('tbl_items');
if($query->num_rows() > 0){
echo "Title or description already exists.";die;
}else{
$TableData = array(
'itemcategories_id' => filter_var($_POST['itemcategories_id']),
'item_code' => filter_var($_POST['item_code']),
'title' => filter_var($_POST['title']),
'description' => filter_var($_POST['description']),
'units_id' => filter_var($_POST['units_id']),
'status' => 1,
'created_on' => date('Y-m-d H:i:s'),
'created_by' => 'admin',
);
$this->db->where('item_id', $id);
$this->db->update('tbl_items', $TableData);
$qty = $_POST['opening_stock'];
$rate = $_POST['opening_stock_rate'];
$this->MStocks->updateOpeningStock($id, $qty, $rate);
redirect("inventory/items/list");
}
}
$id = $this->uri->segment(4);
$this->db->where('item_id', $id);

1
account/application/controllers/inventory/Purchases.php
View File

@ -90,6 +90,7 @@ class Purchases extends CI_Controller
case 'purchase_register':
$data['PurchaseRecords'] = $this->MPurchases->getPurchaseRecords();
loadView("inventory/purchases/register", $data);
break;
default:
$data['PurchaseRecords'] = $this->MPurchases->getPurchaseRecords();
loadView("inventory/purchases/list", $data);

8
account/application/controllers/inventory/Sales.php
View File

@ -9,6 +9,9 @@ class Sales extends CI_Controller
$this->load->model('MSales');
checkLogin();
}
public function _remap($alias = "", $params = array())
{
$data['dataValue'] = $this->session;
@ -100,4 +103,9 @@ class Sales extends CI_Controller
loadView("inventory/sales/list", $data);
}
}
// public function getUnitByItemId($id) {
// $unitName = $this->MStocks->getUnitByItemId($id);
// echo json_encode(['unitName' => $unitName]);
// }
}

59
account/application/controllers/inventory/Units.php
View File

@ -17,7 +17,15 @@ class Units extends CI_Controller
switch ($alias) {
case 'add':
if (isset($_POST['submit'])) {
$TableData = array(
$title = filter_var($_POST['title']);
$description = filter_var($_POST['description']);
$this->db->where('title',$title);
$this->db->or_where('description',$description);
$query = $this->db->get('tbl_units');
if($query->num_rows() > 0){
echo "Title or code already exists.";die;
}else{
$TableData = array(
'title' => filter_var($_POST['title']),
'alias' => filter_var($_POST['alias']),
'description' => filter_var($_POST['description']),
@ -26,33 +34,48 @@ class Units extends CI_Controller
'remarks' => filter_var($_POST['remarks']),
'created_on' => date('Y-m-d H:i:s'),
'created_by' => 'admin',
);
$this->db->insert('tbl_units', $TableData);
redirect("inventory/units/list");
);
$this->db->insert('tbl_units', $TableData);
redirect("inventory/units/list");
}
}
loadView("inventory/units/add", $data);
break;
case 'edit':
if (isset($_POST['submit'])) {
$id = $this->uri->segment(4);
$TableData = array(
'title' => filter_var($_POST['title']),
'alias' => filter_var($_POST['alias']),
'description' => filter_var($_POST['description']),
'display_order' => filter_var($_POST['display_order']),
'status' => 1,
'remarks' => filter_var($_POST['remarks']),
'created_on' => date('Y-m-d H:i:s'),
'created_by' => 'admin',
);
$this->db->where('unit_id', $id);
$this->db->update('tbl_units', $TableData);
redirect("inventory/units/list");
$title = filter_var($_POST['title']);
$description = filter_var($_POST['description']);
$this->db->where('status',1);
$this->db->where('unit_id !=', $id);
$this->db->where('title',$title);
$this->db->or_where('description',$description);
$query = $this->db->get('tbl_units');
if($query->num_rows() > 0){
echo "Title or description already exists.";die;
}else{
$TableData = array(
'title' => filter_var($_POST['title']),
'alias' => filter_var($_POST['alias']),
'description' => filter_var($_POST['description']),
'display_order' => filter_var($_POST['display_order']),
'status' => 1,
'remarks' => filter_var($_POST['remarks']),
'created_on' => date('Y-m-d H:i:s'),
'created_by' => 'admin',
);
$this->db->where('unit_id', $id);
$this->db->update('tbl_units', $TableData);
redirect("inventory/units/list");
}
}
$id = $this->uri->segment(4);
$this->db->where('unit_id', $id);
$data['unit'] = $this->db->get("tbl_units")->row();
loadView("inventory/units/add", $data);
loadView("inventory/units/list", $data);
break;
case 'delete':
$id = $this->uri->segment(4);

2
account/application/controllers/master/Accategories.php
View File

@ -158,7 +158,7 @@ class Accategories extends CI_Controller
loadView("accounts/accategories/list-parents-only", $data);
break;
case 'childs':
$data['pageTitle'] = "Account Groups";
$data['pageTitle'] = "Account Group";
// $data['ACCategories'] = $this->db->query("select *, (select accategory_name from tbl_accategories as a where a.parent_category_id=b.accategory_id) as parent_category, (select acgroup_name from tbl_acgroups where tbl_acgroups.acgroup_id=b.acgroup_id) as acgroup_name from tbl_accategories as b where status=1")->result();
$data['ACCategories'] = $this->myaccounts->getAccountCategories();

4
account/application/libraries/Myaccounts.php
View File

@ -222,10 +222,10 @@ class myaccounts
<div class=\"modal-body\" id=\"details_container\">
Ledger Details Goes Here
</div>
<div class=\"modal-footer\">
<!--<div class=\"modal-footer\">
<button type=\"button\" class=\"btn btn-secondary\" data-dismiss=\"modal\">Close</button>
<button type=\"button\" class=\"btn btn-success\" data-dismiss=\"modal\">Print</button>
</div>
</div>-->
</div>
</div>
</div>";

9
account/application/models/MStocks.php
View File

@ -208,4 +208,13 @@ class MStocks extends CI_Model
$this->db->insert("tbl_stocks", $TableData);
}
}
// public function getUnitByItemId($id)
// {
// $this->db->where('status', 1);
// $Item = $this->db->where("item_id", $id)->get("tbl_items")->row();
// $Unit = $this->db->where("unit_id", $Item->units_id)->get("tbl_units")->row();
// $unitname = $Unit->title;
// return $unitname;
// }
}

2
account/application/views/accounts/accategories/list-childs-only.php
View File

@ -52,7 +52,7 @@
<div class="col-9">
<div class="card card-primary card-outline">
<div class="card-header">
<h5 class="m-0"><?php echo $pageTitle; ?>
<h5 class="m-0"><?php echo $pageTitle . 's'; ?>
<!-- <a href="<?php //echo site_url("master/accategories/add_child");
?>" class="btn btn-sm btn-primary float-right">Create New <?php //echo $pageTitle;
?></a> -->

2
account/application/views/accounts/daybook.php
View File

@ -23,7 +23,7 @@
</form>
<div id="dataTable_Commands"></div>
<?php
$fromDate = isset($_GET['from_date']) ? NepaliToEnglishDate($_GET['from_date']) : NepaliToEnglishDate(firstDayOfNepaliMonth());
$fromDate = isset($_GET['from_date']) ? NepaliToEnglishDate($_GET['from_date']) : Today();
$toDate = isset($_GET['to_date']) ? NepaliToEnglishDate($_GET['to_date']) : Today();
// echo $toDate;
$account_id = isset($_GET['account_id']) ? $_GET['account_id'] : '';

4
account/application/views/accounts/ledger/navigate.php
View File

@ -36,10 +36,10 @@
<div class="modal-body" id="details_container">
Ledger Details Goes Here
</div>
<div class="modal-footer">
<!-- <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-success" data-dismiss="modal">Print</button>
</div>
</div> -->
</div>
</div>
</div>

8
account/application/views/accounts/ledger/partywise.php
View File

@ -18,7 +18,7 @@
<div class="row">
<div class="col"><?php createNepaliDateInput("from_date", "", "from_date", isset($fromDate_Nepali) ? $fromDate_Nepali : firstDayOfNepaliMonth()); ?></div>
<div class="col"><?php createNepaliDateInput("to_date", "", "to_date", isset($toDate_Nepali) ? $toDate_Nepali : ''); ?></div>
<div class="col"><?php $this->myaccounts->showAccountsCombo("account_id", "", "account_id", "status=1", isset($_GET['account_id']) ? $_GET['account_id'] : '', $CSSclass = ""); ?> </div>
<div class="col"><?php $this->myaccounts->showAccountsCombo("account_id", "", "account_id", "status=1", isset($_GET['account_id']) ? $_GET['account_id'] : 1, $CSSclass = ""); ?> </div>
<div class="col"><?php createButton("show_ledger", "Show Ledger", "show_ledger","Submit", "btn btn-primary"); ?></div>
</div>
</form>
@ -31,7 +31,11 @@
<div id="dataTable_Commands">
</div>
<?php
if(!isset($account_id)){
$account_id = 1;
}
?>
<?php if (isset($account_id) && $account_id != "") {
$fromDate = NepaliToEnglishDate(isset($_GET['from_date']) ? $_GET['from_date'] : firstDayOfNepaliMonth());

4
account/application/views/accounts/ledger_bankbook.php
View File

@ -60,10 +60,10 @@
<div class=\"modal-body\" id=\"details_container\">
Ledger Details Goes Here
</div>
<div class=\"modal-footer\">
<!--<div class=\"modal-footer\">
<button type=\"button\" class=\"btn btn-secondary\" data-dismiss=\"modal\">Close</button>
<button type=\"button\" class=\"btn btn-success\" data-dismiss=\"modal\">Print</button>
</div>
</div>-->
</div>
</div>
</div>";

4
account/application/views/accounts/ledger_cashbook.php
View File

@ -61,10 +61,10 @@
<div class=\"modal-body\" id=\"details_container\">
Ledger Details Goes Here
</div>
<div class=\"modal-footer\">
<!--<div class=\"modal-footer\">
<button type=\"button\" class=\"btn btn-secondary\" data-dismiss=\"modal\">Close</button>
<button type=\"button\" class=\"btn btn-success\" data-dismiss=\"modal\">Print</button>
</div>
</div>-->
</div>
</div>
</div>";

6
account/application/views/inventory/itemcategories/list.php
View File

@ -43,7 +43,7 @@
<!--COL START-->
<div class="col">
<div class="form-group">
<label for="description"><?php myLang('Description'); ?></label>
<label for="description"><?php myLang('Remarks'); ?></label>
<textarea class="form-control" id="description" name="description"><?php echo isset($itemcategory) ? $itemcategory->description : ''; ?></textarea>
</div>
</div>
@ -84,13 +84,13 @@
</div>
<div class="card-body">
<?php $TableData = $this->db->query("select * from tbl_itemcategories where status=1")->result(); ?>
<table class="table table-bordered table-striped dataTable">
<table class="table table-bordered table-striped longdataTable">
<thead>
<tr>
<th width="5%"><?php myLang('S.N'); ?></th>
<th width="30%"><?php myLang('Inventory Group'); ?></th>
<!-- <th width="5%"><?php //myLang('Unit'); ?></th> -->
<th width="57%"><?php myLang('Description'); ?></th>
<th width="57%"><?php myLang('Remarks'); ?></th>
<td width="8%"><?php myLang("Action"); ?></th>
</tr>
</thead>

2
account/application/views/inventory/items/list.php
View File

@ -114,7 +114,7 @@
</h5>
</div>
<div class="card-body">
<table class="table table-bordered table-striped dataTable">
<table class="table table-bordered table-striped longdataTable">
<thead>
<tr>
<th width="5%"><?php myLang('S.N'); ?></th>

27
account/application/views/inventory/sales/create.php
View File

@ -174,6 +174,33 @@
// newRow.find('.select2').select2();
// calculateTotals();
});
// $(document).on('change', '.select_item', function(){
// var selectedOption = $(this).find(':selected');
// var selectedValue = selectedOption.val();
// alert(selectedValue);
// var unitInput = $(this).closest('.sales-detail-duplicator').find('.item_unit');
// if (selectedValue) {
// $.ajax({
// url: '<?php //echo base_url(); ?>application/controllers/inventory/Sales/getUnitByItemId/' + selectedValue,
// method: 'POST',
// success: function(response) {
// console.log(response);
// unitInput.val(unitName);
// alert("Selected Item Value: " + selectedValue + "\nUnit: " + unitName);
// },
// error: function() {
// alert("Error retrieving unit data.");
// }
// });
// } else {
// unitInput.val('');
// alert("No item selected.");
// }
// });
// $(document).on("click", ".remove-sales-detail", function() {
// $(this).closest(".sales-detail").remove();
// calculateTotals();

4
account/application/views/inventory/units/list.php
View File

@ -34,7 +34,7 @@
<div class="col">
<div class="form-group">
<label for="description"><?php myLang('Unit Code'); ?></label>
<input class="form-control" id="description" name="description"><?php echo isset($unit) ? $unit->description : ''; ?>
<input class="form-control" id="description" name="description" value="<?php echo isset($unit) ? $unit->description : ''; ?>" name="description" >
</div>
</div>
<!--COL END-->
@ -65,7 +65,7 @@
</div>
<div class="card-body">
<?php $TableData = $this->db->query("select * from tbl_units where status=1")->result(); ?>
<table class="table table-bordered table-striped dataTable">
<table class="table table-bordered table-striped longdataTable">
<thead>
<tr>
<th class="table-col col-1"><?php myLang('S.N'); ?></th>

2
account/application/views/translations/list.php
View File

@ -15,7 +15,7 @@
<div class="card-body ">
<?php $TableData = $this->db->query("select * from tbl_translations where status=1")->result(); ?>
<table class="table table-bordered table-striped dataTable">
<table class="table table-bordered table-striped longdataTable">
<thead>
<tr>
<th class="text-center col-1"><?php myLang('Translation Id'); ?></th>

BIN
account/pdf/ledgers/ledger_28.wpdf Normal file
View File

Binary file not shown.

BIN
account/pdf/ledgers/ledger_5.wpdf Normal file
View File

Binary file not shown.

BIN
account/pdf/vouchers/Voucher_2.pdf
View File

Binary file not shown.