OBPIH-5455 Add filter for GL account

grails-app/conf/UrlMappings.groovy

@@ -67,7 +67,7 @@ class UrlMappings {
 
  // Gl account options for filters on product list page
  "/api/glAccountOptions"(parseRequest: true) {
- controller = { "productApi" }
+ controller = { "glAccount" }
  action = [GET: "glAccountOptions"]
  }
 

grails-app/controllers/org/pih/warehouse/api/ProductApiController.groovy

@@ -289,12 +289,4 @@ class ProductApiController extends BaseDomainApiController {
 
  render([data: tags] as JSON)
  }
-
- def glAccountOptions = {
- def glAccounts = GlAccount.list().collect {
- [id: it.id, label: "${it.code} - ${it.name}"]
- }
-
- render([data: glAccounts] as JSON)
- }
 }

grails-app/controllers/org/pih/warehouse/core/GlAccountController.groovy

@@ -8,10 +8,14 @@
 * You must not remove this notice, or any other, from this software.
 **/
 package org.pih.warehouse.core
+
+import grails.converters.JSON
 import org.pih.warehouse.product.Product
 
 class GlAccountController {
 
+ def GlAccountService glAccountService
+
  def index = {
  redirect(action: "list", params: params)
  }
@@ -84,4 +88,9 @@ class GlAccountController {
  redirect(action: "list")
  }
  }
+
+ def glAccountOptions = {
+ def glAccounts = glAccountService.getGlAccountsOptions()
+ render([data: glAccounts] as JSON)
+ }
 }

grails-app/services/org/pih/warehouse/core/GlAccountService.groovy

@@ -0,0 +1,19 @@
+/**
+* Copyright (c) 2012 Partners In Health. All rights reserved.
+* The use and distribution terms for this software are covered by the
+* Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+* which can be found in the file epl-v10.html at the root of this distribution.
+* By using this software in any fashion, you are agreeing to be bound by
+* the terms of this license.
+* You must not remove this notice, or any other, from this software.
+**/
+package org.pih.warehouse.core
+
+class GlAccountService {
+
+ def getGlAccountsOptions() {
+ return GlAccount.list().collect {
+ [id: it.id, label: "${it.code} - ${it.name}"]
+ }
+ }
+}

src/js/api/services/GlAccountApi.js

@@ -0,0 +1,6 @@
+import { GL_ACCOUNTS_OPTION } from 'api/urls';
+import apiClient from 'utils/apiClient';
+
+export default {
+ getGlAccountOptions: () => apiClient.get(GL_ACCOUNTS_OPTION),
+};

src/js/api/urls.js

@@ -27,3 +27,6 @@ export const STOCKLIST_CLEAR = id => `${STOCKLIST_API}/${id}/clear`;
 export const STOCKLIST_CLONE = id => `${STOCKLIST_API}/${id}/clone`;
 export const STOCKLIST_PUBLISH = id => `${STOCKLIST_API}/${id}/publish`;
 export const STOCKLIST_UNPUBLISH = id => `${STOCKLIST_API}/${id}/unpublish`;
+
+// GL ACCOUNTS
+export const GL_ACCOUNTS_OPTION = '/openboxes/api/glAccountOptions';

src/js/utils/option-utils.jsx

@@ -1,6 +1,7 @@
 import _ from 'lodash';
 import queryString from 'query-string';
 
+import glAccountApi from 'api/services/GlAccountApi';
 import apiClient from 'utils/apiClient';
 
 
@@ -220,6 +221,6 @@ export const fetchProductsTags = async () => {
 };
 
 export const fetchProductsGlAccounts = async () => {
- const response = await apiClient.get('/openboxes/api/glAccountOptions');
- return response.data.data;
+ const { data } = await glAccountApi.getGlAccountOptions();
+ return data.data;
 };