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/sf'] = 'api/StoreFrontAPIController/index';
$route['api/sfmodel/(:any)'] = 'api/StoreFrontAPIController/itemModel/$1'; $route['api/sfmodel/(:any)'] = 'api/StoreFrontAPIController/itemModel/$1';
$route['api/sficode/(:any)'] = 'api/StoreFrontAPIController/itemCode/$1'; $route['api/sficode/(:any)'] = 'api/StoreFrontAPIController/itemCode/$1';
$route['api/sfibranches'] = 'api/StoreFrontAPIController/branchesActive';
$route['(:any)'] = 'pages/$1'; $route['(:any)'] = 'pages/$1';
$route['default_controller'] = 'pages/dashboard'; $route['default_controller'] = 'pages/dashboard';

@ -40,28 +40,28 @@ class StoreFrontAPIController extends RestController
foreach($resultBranches->result() as $rowBranches ) foreach($resultBranches->result() as $rowBranches )
{ {
$branches[] = [ $branches[] = [
'itemcode' => $rowBranches->itemcode, 'Itemcode' => $rowBranches->itemcode,
'brCode' => $rowBranches->brCode, 'Branch' => $rowBranches->brCode,
'endingqty' => $rowBranches->endingqty 'QTY' => $rowBranches->endingqty
]; ];
} }
$item = [ $item = [
'itemcode' => $row->itemcode, 'Itemcode' => $row->itemcode,
'modelno' => $row->modelno, 'Model No' => $row->modelno,
'seriescode' => $row->seriescode, 'Series' => $row->seriescode,
'item_desc' => $row->item_desc, 'Description' => $row->item_desc,
'karat' => $row->karat, 'Karat' => $row->karat,
'size' => $row->size, 'Size' => $row->size,
'grams' => $row->grams, 'Grams' => $row->grams,
'cts' => $row->cts, 'cts' => $row->cts,
'srp' => $row->srp, 'SRP' => number_format($row->srp, 2),
//'mrp' => $row->mrp, //'mrp' => $row->mrp,
'mrp' => '0', 'MRP' => '0.00',
'pic' => '', 'pic' => '',
'catCode' => $row->catCode, 'Category' => $row->catCode,
'goldID' => $row->goldID, 'Gold ID' => $row->goldID,
'supCode' => $row->supCode, 'Supplier' => $row->supCode,
'modifieddate' => $row->modifieddate, 'modifieddate' => $row->modifieddate,
'others' => '', 'others' => '',
'remarks' => '', 'remarks' => '',
@ -97,28 +97,28 @@ class StoreFrontAPIController extends RestController
foreach($resultBranches->result() as $rowBranches ) foreach($resultBranches->result() as $rowBranches )
{ {
$branches[] = [ $branches[] = [
'itemcode' => $rowBranches->itemcode, 'Itemcode' => $rowBranches->itemcode,
'brCode' => $rowBranches->brCode, 'Branch' => $rowBranches->brCode,
'endingqty' => $rowBranches->endingqty 'QTY' => $rowBranches->endingqty
]; ];
} }
$item = [ $item = [
'itemcode' => $row->itemcode, 'Itemcode' => $row->itemcode,
'modelno' => $row->modelno, 'Model No' => $row->modelno,
'seriescode' => $row->seriescode, 'Series' => $row->seriescode,
'item_desc' => $row->item_desc, 'Description' => $row->item_desc,
'karat' => $row->karat, 'Karat' => $row->karat,
'size' => $row->size, 'Size' => $row->size,
'grams' => $row->grams, 'Grams' => $row->grams,
'cts' => $row->cts, 'cts' => $row->cts,
'srp' => $row->srp, 'SRP' => number_format($row->srp, 2),
//'mrp' => $row->mrp, //'mrp' => $row->mrp,
'mrp' => '0', 'MRP' => '0.00',
'pic' => '', 'pic' => '',
'catCode' => $row->catCode, 'Category' => $row->catCode,
'goldID' => $row->goldID, 'Gold ID' => $row->goldID,
'supCode' => $row->supCode, 'Supplier' => $row->supCode,
'modifieddate' => $row->modifieddate, 'modifieddate' => $row->modifieddate,
'others' => '', 'others' => '',
'remarks' => '', 'remarks' => '',
@ -134,4 +134,17 @@ class StoreFrontAPIController extends RestController
$this->response($data, 200); $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