Merge pull request 'added branches' (#22) from paulcortezl5 into main

Reviewed-on: #22
pull/23/head
paul 5 months ago
commit f9cf255fff

@ -55,6 +55,7 @@ $route['exec/(:any)'] = 'executive_view/$1';
$route['api/sf'] = 'api/StoreFrontAPIController/index';
$route['api/sfmodel/(:any)'] = 'api/StoreFrontAPIController/itemModel/$1';
$route['api/sficode/(:any)'] = 'api/StoreFrontAPIController/itemCode/$1';
$route['api/sfibranches'] = 'api/StoreFrontAPIController/branchesActive';
$route['(:any)'] = 'pages/$1';
$route['default_controller'] = 'pages/dashboard';

@ -40,28 +40,28 @@ class StoreFrontAPIController extends RestController
foreach($resultBranches->result() as $rowBranches )
{
$branches[] = [
'itemcode' => $rowBranches->itemcode,
'brCode' => $rowBranches->brCode,
'endingqty' => $rowBranches->endingqty
'Itemcode' => $rowBranches->itemcode,
'Branch' => $rowBranches->brCode,
'QTY' => $rowBranches->endingqty
];
}
$item = [
'itemcode' => $row->itemcode,
'modelno' => $row->modelno,
'seriescode' => $row->seriescode,
'item_desc' => $row->item_desc,
'karat' => $row->karat,
'size' => $row->size,
'grams' => $row->grams,
'Itemcode' => $row->itemcode,
'Model No' => $row->modelno,
'Series' => $row->seriescode,
'Description' => $row->item_desc,
'Karat' => $row->karat,
'Size' => $row->size,
'Grams' => $row->grams,
'cts' => $row->cts,
'srp' => $row->srp,
'SRP' => number_format($row->srp, 2),
//'mrp' => $row->mrp,
'mrp' => '0',
'MRP' => '0.00',
'pic' => '',
'catCode' => $row->catCode,
'goldID' => $row->goldID,
'supCode' => $row->supCode,
'Category' => $row->catCode,
'Gold ID' => $row->goldID,
'Supplier' => $row->supCode,
'modifieddate' => $row->modifieddate,
'others' => '',
'remarks' => '',
@ -97,28 +97,28 @@ class StoreFrontAPIController extends RestController
foreach($resultBranches->result() as $rowBranches )
{
$branches[] = [
'itemcode' => $rowBranches->itemcode,
'brCode' => $rowBranches->brCode,
'endingqty' => $rowBranches->endingqty
'Itemcode' => $rowBranches->itemcode,
'Branch' => $rowBranches->brCode,
'QTY' => $rowBranches->endingqty
];
}
$item = [
'itemcode' => $row->itemcode,
'modelno' => $row->modelno,
'seriescode' => $row->seriescode,
'item_desc' => $row->item_desc,
'karat' => $row->karat,
'size' => $row->size,
'grams' => $row->grams,
'Itemcode' => $row->itemcode,
'Model No' => $row->modelno,
'Series' => $row->seriescode,
'Description' => $row->item_desc,
'Karat' => $row->karat,
'Size' => $row->size,
'Grams' => $row->grams,
'cts' => $row->cts,
'srp' => $row->srp,
'SRP' => number_format($row->srp, 2),
//'mrp' => $row->mrp,
'mrp' => '0',
'MRP' => '0.00',
'pic' => '',
'catCode' => $row->catCode,
'goldID' => $row->goldID,
'supCode' => $row->supCode,
'Category' => $row->catCode,
'Gold ID' => $row->goldID,
'Supplier' => $row->supCode,
'modifieddate' => $row->modifieddate,
'others' => '',
'remarks' => '',
@ -134,4 +134,17 @@ class StoreFrontAPIController extends RestController
$this->response($data, 200);
}
public function branchesActive_get()
{
$this->load->model("Branch");
$data = [];
$result = $this->Branch->getbrCodeAndDescWithBranchExcempt();
foreach($result->result() as $row)
$data[] = ['Branch Code' => $row->brCode, 'Discription' => $row->brCode.' ['.$row->brDesc.']'];
$this->response($data, 200);
}
}
Loading…
Cancel
Save