diff --git a/src/api/ADempiere/userInterface/defaultValue.ts b/src/api/ADempiere/field/defaultValue.ts similarity index 82% rename from src/api/ADempiere/userInterface/defaultValue.ts rename to src/api/ADempiere/field/defaultValue.ts index 4a18a3f2ffe..68bb4f01122 100644 --- a/src/api/ADempiere/userInterface/defaultValue.ts +++ b/src/api/ADempiere/field/defaultValue.ts @@ -53,28 +53,28 @@ export function requestDefaultValue({ let url switch (true) { case (!isEmptyValue(column_name) && isEmptyValue(table_name)): - url = `/user-interface/default-value/${table_name}/${column_name}` + url = `/fields/default-value/${table_name}/${column_name}` break case !isEmptyValue(column_id): - url = `/user-interface/default-value/column/${column_id}` + url = `/fields/default-value/column/${column_id}` break case !isEmptyValue(id): - url = `/user-interface/default-value/field/${id}` + url = `/fields/default-value/field/${id}` break case !isEmptyValue(process_parameter_id): - url = `/user-interface/default-value/parameter/${process_parameter_id}` + url = `/fields/default-value/parameter/${process_parameter_id}` break case !isEmptyValue(process_parameter_to_id): - url = `/user-interface/default-value/parameter/${process_parameter_to_id}/to` + url = `/fields/default-value/parameter/${process_parameter_to_id}/to` break case !isEmptyValue(browse_field_id): - url = `/user-interface/default-value/query-criteria/${browse_field_id}` + url = `/fields/default-value/query-criteria/${browse_field_id}` break case !isEmptyValue(browse_field_to_id): - url = `/user-interface/default-value/query-criteria/${browse_field_to_id}/to` + url = `/fields/default-value/query-criteria/${browse_field_to_id}/to` break default: - url = `/user-interface/default-value/` + url = `/fields/default-value/` break } return request({ diff --git a/src/api/ADempiere/userInterface/lookups.ts b/src/api/ADempiere/field/lookups.ts similarity index 88% rename from src/api/ADempiere/userInterface/lookups.ts rename to src/api/ADempiere/field/lookups.ts index 5b9f3ea7aa9..399f9dffa61 100644 --- a/src/api/ADempiere/userInterface/lookups.ts +++ b/src/api/ADempiere/field/lookups.ts @@ -55,19 +55,19 @@ export function requestLookupList({ let url switch (true) { case (!isEmptyValue(columnId)): - url = `/user-interface/lookups/column/${columnId}` + url = `/fields/lookups/column/${columnId}` break case !isEmptyValue(fieldId): - url = `/user-interface/lookups/field/${fieldId}` + url = `/fields/lookups/field/${fieldId}` break case !isEmptyValue(processParameterId): - url = `/user-interface/lookups/parameter/${processParameterId}` + url = `/fields/lookups/parameter/${processParameterId}` break case !isEmptyValue(browseFieldId): - url = `/user-interface/lookups/query-criteria/${browseFieldId}` + url = `/fields/lookups/query-criteria/${browseFieldId}` break default: - url = `/user-interface/lookups/${tableName}/${columnName}` + url = `/fields/lookups/${tableName}/${columnName}` break } diff --git a/src/api/ADempiere/field/search/business-partner.ts b/src/api/ADempiere/field/search/business-partner.ts index bb9e76293f9..9b9bb79324a 100644 --- a/src/api/ADempiere/field/search/business-partner.ts +++ b/src/api/ADempiere/field/search/business-partner.ts @@ -63,19 +63,19 @@ export function requestListBusinessPartner({ let url switch (true) { case !isEmptyValue(fieldId): - url = `/field/business-partners/field/${fieldId}` + url = `/fields/business-partners/field/${fieldId}` break case !isEmptyValue(processParameterId): - url = `/field/business-partners/parameter/${processParameterId}` + url = `/fields/business-partners/parameter/${processParameterId}` break case !isEmptyValue(browseFieldId): - url = `/field/business-partners/query-criteria/${browseFieldId}` + url = `/fields/business-partners/query-criteria/${browseFieldId}` break case !isEmptyValue(columnId): - url = `/field/business-partners/column/${columnId}` + url = `/fields/business-partners/column/${columnId}` break case (!isEmptyValue(tableName) && !isEmptyValue(columnName)): - url = `/field/business-partners/table/${tableName}/${columnName}` + url = `/fields/business-partners/table/${tableName}/${columnName}` break } diff --git a/src/api/ADempiere/field/search/index.js b/src/api/ADempiere/field/search/index.js index 5ddf373335f..60b4aa215ad 100644 --- a/src/api/ADempiere/field/search/index.js +++ b/src/api/ADempiere/field/search/index.js @@ -51,22 +51,22 @@ export function requestGridGeneralInfo({ // } // }) - let url = 'user-interface/search-records' + let url = 'fields/searchs' switch (true) { case !isEmptyValue(fieldId): - url = `/user-interface/search-records/field/${fieldId}` + url = `/fields/searchs/field/${fieldId}` break case !isEmptyValue(processParameterId): - url = `/user-interface/search-records/parameter/${processParameterId}` + url = `/fields/searchs/parameter/${processParameterId}` break case !isEmptyValue(browseFieldId): - url = `/user-interface/search-records/query-criteria/${browseFieldId}` + url = `/fields/searchs/query-criteria/${browseFieldId}` break case !isEmptyValue(columnId): - url = `/user-interface/search-records/column/${columnId}` + url = `/fields/searchs/column/${columnId}` break case (!isEmptyValue(tableName) && !isEmptyValue(columnName)): - url = `/user-interface/search-records/${tableName}/${columnName}` + url = `/fields/searchs/${tableName}/${columnName}` break } diff --git a/src/api/ADempiere/field/search/invoice.ts b/src/api/ADempiere/field/search/invoice.ts index 02056f022d4..1c8163d5459 100644 --- a/src/api/ADempiere/field/search/invoice.ts +++ b/src/api/ADempiere/field/search/invoice.ts @@ -38,7 +38,7 @@ export function requestListOrders({ is_sales_transaction }) { return request({ - url: '/field/invoices/orders', + url: '/fields/invoices/orders', method: 'get', params: { filters, @@ -68,7 +68,7 @@ export function requestListBusinessPartners({ is_sales_transaction }) { return request({ - url: '/field/invoices/business-partners', + url: '/fields/invoices/business-partners', method: 'get', params: { filters, @@ -116,19 +116,19 @@ export function requestListInvoicesInfo({ let url switch (true) { case !isEmptyValue(fieldId): - url = `/field/invoices/field/${fieldId}` + url = `/fields/invoices/field/${fieldId}` break case !isEmptyValue(processParameterId): - url = `/field/invoices/parameter/${processParameterId}` + url = `/fields/invoices/parameter/${processParameterId}` break case !isEmptyValue(browseFieldId): - url = `/field/invoices/query-criteria/${browseFieldId}` + url = `/fields/invoices/query-criteria/${browseFieldId}` break case !isEmptyValue(columnId): - url = `/field/invoices/column/${columnId}` + url = `/fields/invoices/column/${columnId}` break case (!isEmptyValue(tableName) && !isEmptyValue(columnName)): - url = `/field/invoices/table/${tableName}/${columnName}` + url = `/fields/invoices/table/${tableName}/${columnName}` break } diff --git a/src/api/ADempiere/field/search/order.ts b/src/api/ADempiere/field/search/order.ts index 859c2acf707..5a5b24dd83f 100644 --- a/src/api/ADempiere/field/search/order.ts +++ b/src/api/ADempiere/field/search/order.ts @@ -38,7 +38,7 @@ export function requestListBusinessPartners({ is_sales_transaction }) { return request({ - url: '/field/orders/customers', + url: '/fields/orders/customers', method: 'get', params: { filters, @@ -86,19 +86,19 @@ export function requestListOrderInfo({ let url switch (true) { case !isEmptyValue(fieldId): - url = `/field/orders/field/${fieldId}` + url = `/fields/orders/field/${fieldId}` break case !isEmptyValue(processParameterId): - url = `/field/orders/parameter/${processParameterId}` + url = `/fields/orders/parameter/${processParameterId}` break case !isEmptyValue(browseFieldId): - url = `/field/orders/query-criteria/${browseFieldId}` + url = `/fields/orders/query-criteria/${browseFieldId}` break case !isEmptyValue(columnId): - url = `/field/orders/column/${columnId}` + url = `/fields/orders/column/${columnId}` break case (!isEmptyValue(tableName) && !isEmptyValue(columnName)): - url = `/field/orders/table/${tableName}/${columnName}` + url = `/fields/orders/table/${tableName}/${columnName}` break } @@ -139,7 +139,7 @@ export function requestGetOrderInfo({ id }) { return request({ - url: `/field/orders/${id}`, + url: `/fields/orders/${id}`, method: 'get' }) } diff --git a/src/api/ADempiere/field/search/payment.ts b/src/api/ADempiere/field/search/payment.ts index c6377398de6..5d9fecf23f0 100644 --- a/src/api/ADempiere/field/search/payment.ts +++ b/src/api/ADempiere/field/search/payment.ts @@ -38,7 +38,7 @@ export function requestListBusinessPartners({ is_sales_transaction }) { return request({ - url: '/field/payments/business-partners', + url: '/fields/payments/business-partners', method: 'get', params: { filters, @@ -68,7 +68,7 @@ export function requesListBankAccount({ is_sales_transaction }) { return request({ - url: '/field/payments/bank-account', + url: '/fields/payments/bank-account', method: 'get', params: { filters, @@ -113,25 +113,25 @@ export function requestListPaymentsInfo({ orderId, isWithoutValidation }) { - let url = '/field/payments' + let url = '/fields/payments' switch (true) { case !isEmptyValue(fieldId): - url = `/field/payments/field/${fieldId}` + url = `/fields/payments/field/${fieldId}` break case !isEmptyValue(processParameterId): - url = `/field/payments/parameter/${processParameterId}` + url = `/fields/payments/parameter/${processParameterId}` break case !isEmptyValue(browseFieldId): - url = `/field/payments/query-criteria/${browseFieldId}` + url = `/fields/payments/query-criteria/${browseFieldId}` break case (!isEmptyValue(tableName) && !isEmptyValue(columnName)): - url = `/field/payments/table/${tableName}/${columnName}` + url = `/fields/payments/table/${tableName}/${columnName}` break case !isEmptyValue(columnId): - url = `/field/payments/column/${columnId}` + url = `/fields/payments/column/${columnId}` break default: - url = `/field/payments` + url = `/fields/payments` break } @@ -172,7 +172,7 @@ export function requestGetOrderInfo({ id }) { return request({ - url: `/field/payments/${id}`, + url: `/fields/payments/${id}`, method: 'get' }) } diff --git a/src/api/ADempiere/field/search/product.ts b/src/api/ADempiere/field/search/product.ts index b8adfaf09bf..22fba58d7cf 100644 --- a/src/api/ADempiere/field/search/product.ts +++ b/src/api/ADempiere/field/search/product.ts @@ -31,7 +31,7 @@ export function requestListProductCategories({ pageSize = ROWS_OF_RECORDS_BY_PAGE }) { return request({ - url: `/field/products/categories`, + url: `/fields/products/categories`, method: 'get', params: { is_only_active_records: true, @@ -53,7 +53,7 @@ export function requestListProductGroups({ pageSize = ROWS_OF_RECORDS_BY_PAGE }) { return request({ - url: `/field/products/groups`, + url: `/fields/products/groups`, method: 'get', params: { is_only_active_records: true, @@ -75,7 +75,7 @@ export function requestListProductClasess({ pageSize = ROWS_OF_RECORDS_BY_PAGE }) { return request({ - url: `/field/products/clasess`, + url: `/fields/products/clasess`, method: 'get', params: { is_only_active_records: true, @@ -97,7 +97,7 @@ export function requestListProductClassifications({ pageSize = ROWS_OF_RECORDS_BY_PAGE }) { return request({ - url: `/field/products/classifications`, + url: `/fields/products/classifications`, method: 'get', params: { is_only_active_records: true, @@ -129,7 +129,7 @@ export function requestListWarehouses({ }) } return request({ - url: `/field/products/warehouses`, + url: `/fields/products/warehouses`, method: 'get', params: { context_attributes: contextAttributes, @@ -150,7 +150,7 @@ export function requestGetPriceListVersion({ dateInvoiced }) { return request({ - url: `/field/products/prices-lists-versions/${priceListId}`, + url: `/fields/products/prices-lists-versions/${priceListId}`, method: 'get', params: { // price_list_id: priceListId, @@ -178,7 +178,7 @@ export function requestListPricesListVersions({ }) } return request({ - url: `/field/products/prices-lists-versions`, + url: `/fields/products/prices-lists-versions`, method: 'get', params: { context_attributes: contextAttributes, @@ -211,7 +211,7 @@ export function requestListAttributeSets({ }) } return request({ - url: `/field/products/attribute-sets`, + url: `/fields/products/attribute-sets`, method: 'get', params: { context_attributes: contextAttributes, @@ -244,7 +244,7 @@ export function requestListVendors({ }) } return request({ - url: `/field/products/vendors`, + url: `/fields/products/vendors`, method: 'get', params: { context_attributes: contextAttributes, @@ -300,22 +300,22 @@ export function requestListProducts({ // } // }) - let url = '/field/products' + let url = '/fields/products' switch (true) { case !isEmptyValue(fieldId): - url = `/field/products/field/${fieldId}` + url = `/fields/products/field/${fieldId}` break case !isEmptyValue(processParameterId): - url = `/field/products/parameter/${processParameterId}` + url = `/fields/products/parameter/${processParameterId}` break case !isEmptyValue(browseFieldId): - url = `/field/products/query-criteria/${browseFieldId}` + url = `/fields/products/query-criteria/${browseFieldId}` break case !isEmptyValue(columnId): - url = `/field/products/column/${columnId}` + url = `/fields/products/column/${columnId}` break case (!isEmptyValue(tableName) && !isEmptyValue(columnName)): - url = `/field/products/table/${tableName}/${columnName}` + url = `/fields/products/table/${tableName}/${columnName}` break } @@ -355,7 +355,7 @@ export function requestListWarehouseStocks({ productId }) { return request({ - url: `/field/products/${productId}/warehouse-stocks`, + url: `/fields/products/${productId}/warehouse-stocks`, method: 'get' }) } @@ -365,7 +365,7 @@ export function requestListSubstituteProducts({ priceList }) { return request({ - url: `/field/products/${productId}/substitutes`, + url: `/fields/products/${productId}/substitutes`, method: 'get', params: { price_list_version_id: priceList @@ -378,7 +378,7 @@ export function requestListRelatedProducts({ priceList }) { return request({ - url: `/field/products/${productId}/relateds`, + url: `/fields/products/${productId}/relateds`, method: 'get', params: { price_list_version_id: priceList @@ -390,7 +390,7 @@ export function requestListAvailableToPromises({ productId }) { return request({ - url: `/field/products/${productId}/available-to-promises`, + url: `/fields/products/${productId}/available-to-promises`, method: 'get' }) } @@ -399,7 +399,7 @@ export function requestListVendorPurchases({ productId }) { return request({ - url: `/field/products/${productId}/vendor-purchases`, + url: `/fields/products/${productId}/vendor-purchases`, method: 'get' }) } diff --git a/src/api/ADempiere/field/zoom.js b/src/api/ADempiere/field/zoom.js index 4b2dcf3914e..444fee384ce 100644 --- a/src/api/ADempiere/field/zoom.js +++ b/src/api/ADempiere/field/zoom.js @@ -41,19 +41,19 @@ export function listZoomWindowsRequest({ let url switch (true) { case (!isEmptyValue(field_id)): - url = `/field/zooms/field/${field_id}` + url = `/fields/zooms/field/${field_id}` break case (!isEmptyValue(process_parameter_id)): - url = `/field/zooms/parameter/${process_parameter_id}` + url = `/fields/zooms/parameter/${process_parameter_id}` break case (!isEmptyValue(browse_field_id)): - url = `/field/zooms/query-criteria/${browse_field_id}` + url = `/fields/zooms/query-criteria/${browse_field_id}` break case (!isEmptyValue(table_name) && !isEmptyValue(column_name)): - url = `/field/zooms/${table_name}/${column_name}` + url = `/fields/zooms/${table_name}/${column_name}` break case !isEmptyValue(column_id): - url = `/field/zooms/column/${column_id}` + url = `/fields/zooms/column/${column_id}` break } return request({ @@ -68,7 +68,7 @@ export function getZoomParentRecord({ value }) { return request({ - url: `/field/zooms/record/${window_id}/${tab_id}`, + url: `/fields/zooms/record/${window_id}/${tab_id}`, method: 'get', params: { value diff --git a/src/store/modules/ADempiere/defaultValueManager.js b/src/store/modules/ADempiere/defaultValueManager.js index ec4bc0583a2..8dd9e273d0a 100644 --- a/src/store/modules/ADempiere/defaultValueManager.js +++ b/src/store/modules/ADempiere/defaultValueManager.js @@ -19,7 +19,7 @@ import Vue from 'vue' // API Request Methods -import { requestDefaultValue } from '@/api/ADempiere/userInterface/defaultValue.ts' +import { requestDefaultValue } from '@/api/ADempiere/field/defaultValue.ts' // Constants import { diff --git a/src/store/modules/ADempiere/lookupManager.js b/src/store/modules/ADempiere/lookupManager.js index 88b9f750bce..3492de87ca3 100644 --- a/src/store/modules/ADempiere/lookupManager.js +++ b/src/store/modules/ADempiere/lookupManager.js @@ -21,7 +21,7 @@ import Vue from 'vue' import lang from '@/lang' // API Request Methods -import { requestLookupList } from '@/api/ADempiere/userInterface/lookups.ts' +import { requestLookupList } from '@/api/ADempiere/field/lookups.ts' // Utils and Helper Methods import { isEmptyValue } from '@/utils/ADempiere/valueUtils.js'