paul
/
kwmobile
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'modified PIA' (#25) from paulcortezl5 into main

Browse Source 
Reviewed-on: #25
pull/26/head
paul 3 months ago
parent 5837b84465 62f0d312ad
commit 41e87a9f70
5 changed files with 119 additions and 6 deletions
Show Stats Download Patch File Download Diff File

58
application/controllers/Pages.php
Unescape Escape View File

@ -1332,6 +1332,64 @@ class Pages extends CI_controller
$result = $this->Items->getItemInfoByModelNo($this->input->post("modelno"));
if($result->num_rows() > 0)
{
$row = $result->row();
$resultBranches = $this->BranchItemLedger->getDataByItemcodeAllBranchWithBranchExcempt($row->itemcode);
$kwhRow = $this->ItemLedger->getItemLedgerOfKWHByItemcode($row->itemcode);
//$kwhRow = $resultKWH->row();
$resultKWHStockReceived = $this->StockReceivingView->getDtlDataByItemcode($row->itemcode);
$kwhStockReceivedRow = $resultKWHStockReceived->row();
// Log searched item
$this->ItemInquiryLog->itemcode = $row->itemcode;
$this->ItemInquiryLog->modelno = $row->modelno;
$this->ItemInquiryLog->catCode = $row->catCode;
$this->ItemInquiryLog->brCode = $this->session->user["branch"];
$this->ItemInquiryLog->searchedBy = $this->session->user["username"];
$this->ItemInquiryLog->dateSearched = date('Y-m-d');
$this->ItemInquiryLog->addNewData();
// --- END --- Log searched item
$htmlTable = "";
$htmlListOfBranchWithNoItem = "";
foreach($resultBranches->result() as $rowBranches )
{
if($rowBranches->itemcode == null)
$htmlListOfBranchWithNoItem .= "<tr><td>" . $rowBranches->brCode . "</td><td>" . $rowBranches->brDesc . "</td></tr>";
else
$htmlTable .= "<tr><td>" . $rowBranches->brCode . "</td><td>" . $rowBranches->itemcode . "</td><td>" . $rowBranches->endingqty . "</td></tr>";
}
echo json_encode(array("success"=>true,
"data" => $row,
"htmlTable" => $htmlTable,
"KWHData" => $kwhRow,
"KWHStockReceived" => $kwhStockReceivedRow,
"htmlListOfBranchWithNoItem" => $htmlListOfBranchWithNoItem
));
}
else
echo json_encode(array("success"=>false, "data" => "No Record"));
}
public function getItemInfoByItemcode()
{
if(!$this->isLogged())
redirect('login', 'refresh');
$this->load->model("Items");
$this->load->model("BranchItemLedger");
$this->load->model("ItemLedger");
$this->load->model("ItemInquiryLog");
$this->load->model("StockReceivingView");
$result = $this->Items->getItemInfoByItemcode($this->input->post("itemcode"));
if($result->num_rows() > 0)
{
$row = $result->row();

4
application/controllers/api/StoreFrontAPIController.php
Unescape Escape View File

@ -59,7 +59,7 @@ class StoreFrontAPIController extends RestController
'cts' => $row->cts,
'SRP' => number_format($row->srp, 2),
//'mrp' => $row->mrp,
'MRP' => '0.00',
//'MRP' => '0.00', ---------- requested to remove MRP
'pic' => $baseImgUrl.basename(str_replace('\\', '/', $row->pic)),
'Category' => $row->catCode,
'Gold ID' => $row->goldID,
@ -117,7 +117,7 @@ class StoreFrontAPIController extends RestController
'cts' => $row->cts,
'SRP' => number_format($row->srp, 2),
//'mrp' => $row->mrp,
'MRP' => '0.00',
//'MRP' => '0.00', ---------- requested to remove MRP
'pic' => $baseImgUrl.basename(str_replace('\\', '/', $row->pic)),
'Category' => $row->catCode,
'Gold ID' => $row->goldID,

10
application/models/BranchItemLedger.php
Unescape Escape View File

@ -37,6 +37,16 @@ class BranchItemLedger extends CI_Model
return $this->db->get_where("branchitemledger");
}
public function getDataByItemcodeAllBranchWithBranchExcempt($itemcode)
{
$this->db->select("branch.brCode AS brCode, branch.brDesc AS brDesc, branchitemledger.itemcode AS itemcode, branchitemledger.endingqty AS endingqty");
$this->db->from("branch");
$this->db->join("branchitemledger", "branch.brCode=branchitemledger.brCode AND branchitemledger.itemcode=".$itemcode, "left");
$this->db->where("branch.brCode NOT IN (SELECT brCode FROM branchexemption)");
return $this->db->get();
}
public function getDataByBrCodeItemcode($brCode, $itemcode)
{
$result = $this->db->get_where("branchitemledger", array("brCode"=>$brCode, "itemcode"=>$itemcode));

6
application/models/Items.php
Unescape Escape View File

@ -35,6 +35,12 @@ class Items extends CI_Model
return $this->db->get_where("items", array("modelno"=>$modelno));
}
public function getItemInfoByItemcode($itemcode)
{
$this->db->select("itemcode, modelno, seriescode, item_desc, karat, size, grams, cts, srp, pic, manref, catCode, goldID, supCode, modifieddate, sourceDate");
return $this->db->get_where("items", array("itemcode"=>$itemcode));
}
public function getItemByModelNo($modelno)
{
$result = $this->db->get_where("items", array("modelno"=>$modelno));

47
application/views/pages/dashboard.php
Unescape Escape View File

@ -163,6 +163,7 @@
<li class="active"><a href="#tab_1" data-toggle="tab">Search by Model No.</a></li>
<li><a href="#tab_2" data-toggle="tab">Search by Series</a></li>
<li><a href="#tab_3" data-toggle="tab">Search by Description</a></li>
<li><a href="#tab_4" data-toggle="tab">Search by Itemcode</a></li>
</ul>
<div class="tab-content">
@ -187,7 +188,7 @@
<div class="form-group">
<label for="txtSeriesNoInquiry" class="col-lg-2 control-label">Series No:</label>
<div class="col-lg-9">
<input type="text" id="txtSeriesNoInquiry" name="txtSeriesNoInquiry" class="form-control" placeholder="Enter Model Number">
<input type="text" id="txtSeriesNoInquiry" name="txtSeriesNoInquiry" class="form-control" placeholder="Enter Series Number">
</div>
<div class="col-lg-1">
<button type="submit" class="btn btn-primary">Search</button>
@ -211,6 +212,21 @@
</form>
</div>
<!-- /.tab-pane -->
<div class="tab-pane" id="tab_4">
<p>Search for an item by Itemcode</p>
<form class="form-horizontal" id="frmItemcodeInquiry" name="frmItemcodeInquiry">
<div class="form-group">
<label for="txtItemcodeInquiry" class="col-lg-2 control-label">Itemcode:</label>
<div class="col-lg-9">
<input type="text" id="txtItemcodeInquiry" name="txtItemcodeInquiry" class="form-control" placeholder="Enter Itemcode">
</div>
<div class="col-lg-1">
<button type="submit" class="btn btn-primary">Search</button>
</div>
</div>
</form>
</div>
<!-- /.tab-pane -->
</div>
<!-- /.tab-content -->
</div>
@ -399,7 +415,7 @@
' </div>';
}
function showIteminquiredInformation(data, htmlTable, KWHData, KWHStockReceived)
function showIteminquiredInformation(data, htmlTable, KWHData, KWHStockReceived, htmlListOfBranchWithNoItem)
{
return '<div class="box">' +
' <div class="box-header with-border">' +
@ -432,11 +448,20 @@
' <div class="row">' +
' <div class="col-lg-12">' +
' <table id="dtAvailabilityInBranches" class="table table-bordered table-striped">' +
' <thead><th>Itemcode</th><th>Branch</th><th>Qty</th></thead>' +
' <thead><th>Branch</th><th>Itemcode</th><th>Qty</th></thead>' +
' <tbody>' + htmlTable + '</tbody>' +
' </table>' +
' </div>' +
' </div>' +
' <h3>List of branches where there is no item supplied</h3>' +
' <div class="row">' +
' <div class="col-lg-12">' +
' <table id="dtListOfBranchWithNoItem" class="table table-bordered table-striped">' +
' <thead><th>Branch Code</th><th>Description</th></thead>' +
' <tbody>' + htmlListOfBranchWithNoItem + '</tbody>' +
' </table>' +
' </div>' +
' </div>' +
' <p>Beginning quantity: ' + ((KWHStockReceived == null) ? "0" : KWHStockReceived["qty"]) + '</p>' +
' <h3>Quantity Remaining in Warehouse: ' + KWHData["endingqty"] + '</h3>' +
' </div>' +
@ -475,7 +500,7 @@
modelno: $("#txtModelNoInquiry").val()
}, function(data) {
if (data["success"] == true) {
$("#resultContainerStoreInquiry").prepend(showIteminquiredInformation(data["data"], data["htmlTable"], data["KWHData"], data["KWHStockReceived"]));
$("#resultContainerStoreInquiry").prepend(showIteminquiredInformation(data["data"], data["htmlTable"], data["KWHData"], data["KWHStockReceived"], data["htmlListOfBranchWithNoItem"]));
} else {
$("#resultContainerStoreInquiry").prepend(errorMessage(data["data"]));
}
@ -509,6 +534,20 @@
}
}, "json");
});
$("#frmItemcodeInquiry").on("submit", function(e) {
e.preventDefault();
$.post("getItemInfoByItemcode", {
itemcode: $("#txtItemcodeInquiry").val()
}, function(data) {
if (data["success"] == true) {
$("#resultContainerStoreInquiry").prepend(showIteminquiredInformation(data["data"], data["htmlTable"], data["KWHData"], data["KWHStockReceived"]));
} else {
$("#resultContainerStoreInquiry").prepend(errorMessage(data["data"]));
}
}, "json");
});
// ------- /.Item Search Area -------
$(document).on("click", "#btnRenewCard", function() {

Write Preview
Loading…
Cancel
Save