diff --git a/config/packages/catalyst_auth.yaml b/config/packages/catalyst_auth.yaml index 7e02d5c0..e03cdc32 100644 --- a/config/packages/catalyst_auth.yaml +++ b/config/packages/catalyst_auth.yaml @@ -662,18 +662,18 @@ catalyst_auth: - id: item_type.delete label: Delete - - id: item - label: Item + - id: item_price + label: Item Price acls: - - id: item.menu + - id: item_price.menu label: Menu - - id: item.list + - id: item_price.list label: List - - id: item.add + - id: item_price.add label: Add - - id: item.update + - id: item_price.update label: Update - - id: item.delete + - id: item_price.delete label: Delete - id: item_pricing label: Item Pricing diff --git a/config/packages/catalyst_menu.yaml b/config/packages/catalyst_menu.yaml index c861471d..83f7e852 100644 --- a/config/packages/catalyst_menu.yaml +++ b/config/packages/catalyst_menu.yaml @@ -306,7 +306,7 @@ catalyst_menu: acl: item_pricing.update label: Item Pricing parent: item - - id: item_list - acl: item.list + - id: item_price_list + acl: item_price.list label: Items parent: item diff --git a/config/routes/item_price.yaml b/config/routes/item_price.yaml new file mode 100644 index 00000000..607dc3cd --- /dev/null +++ b/config/routes/item_price.yaml @@ -0,0 +1,34 @@ +item_price_list: + path: /items + controller: App\Controller\ItemPriceController::index + methods: [GET] + +item_price_rows: + path: /items/rowdata + controller: App\Controller\ItemPriceController::datatableRows + methods: [POST] + +item_price_add_form: + path: /items/newform + controller: App\Controller\ItemPriceController::addForm + methods: [GET] + +item_price_add_submit: + path: /items + controller: App\Controller\ItemPriceController::addSubmit + methods: [POST] + +item_price_update_form: + path: /items/{id} + controller: App\Controller\ItemPriceController::updateForm + methods: [GET] + +item_price_update_submit: + path: /items/{id} + controller: App\Controller\ItemPriceController::updateSubmit + methods: [POST] + +item_price_delete: + path: /items/{id} + controller: App\Controller\ItemPriceController::deleteSubmit + methods: [DELETE] diff --git a/src/Controller/ItemPriceController.php b/src/Controller/ItemPriceController.php new file mode 100644 index 00000000..0a41994c --- /dev/null +++ b/src/Controller/ItemPriceController.php @@ -0,0 +1,126 @@ +render('item-price/list.html.twig'); + } + + /** + * @IsGranted("item_price.list") + */ + public function datatableRows(Request $req) + { + // get query builder + $qb = $this->getDoctrine() + ->getRepository(ItemPrice::class) + ->createQueryBuilder('q'); + + // get datatable params + $datatable = $req->request->get('datatable'); + + // count total records + $tquery = $qb->select('COUNT(q)') + ->innerJoin('q.battery', 'b', 'WITH', 'b.id = q.item_id') + ->innerJoin('q.service_offering', 'so', 'WITH', 'so.id = q.item_id'); + $this->setQueryFilters($datatable, $tquery); + $total = $tquery->getQuery() + ->getSingleScalarResult(); + + // get current page number + $page = $datatable['pagination']['page'] ?? 1; + + $perpage = $datatable['pagination']['perpage']; + $offset = ($page - 1) * $perpage; + + // add metadata + $meta = [ + 'page' => $page, + 'perpage' => $perpage, + 'pages' => ceil($total / $perpage), + 'total' => $total, + 'sort' => 'asc', + 'field' => 'id' + ]; + + // build query + $query = $qb->select('q') + ->innerJoin('q.battery', 'b', 'WITH', 'b.id = q.item_id') + ->innerJoin('q.service_offering', 'so', 'WITH', 'so.id = q.item_id'); + $this->setQueryFilters($datatable, $query); + + // check if sorting is present, otherwise use default + if (isset($datatable['sort']['field']) && !empty($datatable['sort']['field'])) { + $order = $datatable['sort']['sort'] ?? 'asc'; + $query->orderBy('q.' . $datatable['sort']['field'], $order); + } else { + $query->orderBy('q.id', 'asc'); + } + + // get rows for this page + $obj_rows = $query->setFirstResult($offset) + ->setMaxResults($perpage) + ->getQuery() + ->getResult(); + + // process rows + $rows = []; + foreach ($obj_rows as $orow) { + // add row data + $row['id'] = $orow->getID(); + + // add row metadata + $row['meta'] = [ + 'update_url' => '', + 'delete_url' => '' + ]; + + // add crud urls + if ($this->isGranted('item_price.update')) + $row['meta']['update_url'] = $this->generateUrl('item_price_update_form', ['id' => $row['id']]); + if ($this->isGranted('item_price.delete')) + $row['meta']['delete_url'] = $this->generateUrl('item_price_delete', ['id' => $row['id']]); + + $rows[] = $row; + } + + // response + return $this->json([ + 'meta' => $meta, + 'data' => $rows + ]); + } + + protected function setQueryFilters($datatable, QueryBuilder $query) + { + if (isset($datatable['query']['data-rows-search']) && !empty($datatable['query']['data-rows-search'])) { + $query->where('q.name LIKE :filter') + ->setParameter('filter', '%' . $datatable['query']['data-rows-search'] . '%'); + } + } +} diff --git a/src/Controller/ItemPricingController.php b/src/Controller/ItemPricingController.php index 9aba9f68..ddfd60bf 100644 --- a/src/Controller/ItemPricingController.php +++ b/src/Controller/ItemPricingController.php @@ -53,13 +53,20 @@ class ItemPricingController extends Controller /** * @IsGranted("item_pricing.update") */ - public function (EntityManagerInterface $em, $id) + public function itemPrices(EntityManagerInterface $em, $id) { $pt_prices = []; // check if default prices are needed if ($id != 0) { - // get the price tier prices + // get the price tier + $pt = $em->getRepository(PriceTier::class)->find($id); + + // get the item prices under the price tier + $pt_item_prices = $pt->getItemPrices(); + foreach ($pt_item_prices as $pt_item_price) + { + } } else { @@ -73,4 +80,4 @@ class ItemPricingController extends Controller 'items' => $data_items, ]); } - +}