changes
This commit is contained in:
@ -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> -->
|
||||
|
@ -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'] : '';
|
||||
|
@ -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>
|
||||
|
@ -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());
|
||||
|
@ -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>";
|
||||
|
@ -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>";
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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();
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
Reference in New Issue
Block a user