From 71a61f1cb1361b190dcd795d16bfd04567b5f069 Mon Sep 17 00:00:00 2001
From: Yamel Senih <ysenih@erpya.com>
Date: Fri, 4 Jun 2021 17:07:39 -0400
Subject: [PATCH] Feature/add endpoint setup (#907)

* Minor change
- Rename API Services
- Add endpoint

* set method name
---
 config/default.json                           |  6 ++
 src/api/ADempiere/form/point-of-sales.js      | 66 +++++++++----------
 src/api/ADempiere/form/price-checking.js      |  5 +-
 .../ADempiere/Form/BarcodeReader/index.vue    |  3 +-
 .../ADempiere/Form/PriceChecking/index.vue    |  6 +-
 .../ADempiere/Form/VPOS/Options/index.vue     |  8 +--
 .../Form/VPOS/Order/orderLineMixin.js         | 12 ++--
 .../ADempiere/Form/VPOS/posMixin.js           |  6 +-
 .../ADempiere/pointOfSales/order/actions.js   | 22 +++----
 .../pointOfSales/orderLine/actions.js         |  4 +-
 .../ADempiere/pointOfSales/point/actions.js   |  4 +-
 11 files changed, 74 insertions(+), 68 deletions(-)

diff --git a/config/default.json b/config/default.json
index 8723c5e4..db047de6 100644
--- a/config/default.json
+++ b/config/default.json
@@ -27,5 +27,11 @@
     "report": false,
     "smartBrowser": false,
     "form": false
+  },
+  "pointOfSales": {
+    "endpoint": "/form/addons/point-of-sales"
+  },
+  "priceChecking": {
+    "endpoint": "/form/addons/point-of-sales"
   }
 }
diff --git a/src/api/ADempiere/form/point-of-sales.js b/src/api/ADempiere/form/point-of-sales.js
index fa32e7b3..9e97b869 100644
--- a/src/api/ADempiere/form/point-of-sales.js
+++ b/src/api/ADempiere/form/point-of-sales.js
@@ -16,22 +16,22 @@
 
 // Get Instance for connection
 import { request } from '@/utils/ADempiere/request'
-
+import { config } from '@/utils/ADempiere/config'
 import { isEmptyValue } from '@/utils/ADempiere'
 
 /**
- * method in api/price-checking.js as requestGetProductPrice
+ * method in api/price-checking.js as getProductPrice
  * @author elsiosanchez <elsiosanches@gmail.com>
  */
-export { requestGetProductPrice as findProduct } from '@/api/ADempiere/form/price-checking.js'
+export { getProductPrice as findProduct } from '@/api/ADempiere/form/price-checking.js'
 export { requestGetConversionRate } from '@/api/ADempiere/system-core.js'
 
 // List Point of sales
-export function requestGetPointOfSales({
+export function getPointOfSales({
   posUuid
 }) {
   return request({
-    url: '/form/addons/point-of-sales/point-of-sales',
+    url: `${config.pointOfSales.endpoint}/point-of-sales`,
     method: 'get',
     params: {
       point_of_sales_uuid: posUuid
@@ -45,13 +45,13 @@ export function requestGetPointOfSales({
 }
 
 // List Point of sales
-export function requestListPointOfSales({
+export function listPointOfSales({
   userUuid,
   pageSize,
   pageToken
 }) {
   return request({
-    url: '/form/addons/point-of-sales/selling-points',
+    url: `${config.pointOfSales.endpoint}/selling-points`,
     method: 'get',
     params: {
       user_uuid: userUuid,
@@ -73,14 +73,14 @@ export function requestListPointOfSales({
 }
 
 // Create order from POS
-export function requestCreateOrder({
+export function createOrder({
   posUuid,
   customerUuid,
   documentTypeUuid,
   salesRepresentativeUuid
 }) {
   return request({
-    url: '/form/addons/point-of-sales/create-order',
+    url: `${config.pointOfSales.endpoint}/create-order`,
     method: 'post',
     data: {
       pos_uuid: posUuid,
@@ -97,14 +97,14 @@ export function requestCreateOrder({
 }
 
 // Update order from POS
-export function requestUpdateOrder({
+export function updateOrder({
   orderUuid,
   posUuid,
   customerUuid,
   description
 }) {
   return request({
-    url: '/form/addons/point-of-sales/update-order',
+    url: `${config.pointOfSales.endpoint}/update-order`,
     method: 'post',
     data: {
       order_uuid: orderUuid,
@@ -121,9 +121,9 @@ export function requestUpdateOrder({
 }
 
 // Get order from uuid
-export function requestGetOrder(orderUuid) {
+export function getOrder(orderUuid) {
   return request({
-    url: '/form/addons/point-of-sales/order',
+    url: `${config.pointOfSales.endpoint}/order`,
     method: 'get',
     params: {
       order_uuid: orderUuid
@@ -137,7 +137,7 @@ export function requestGetOrder(orderUuid) {
 }
 
 // Create order from POS
-export function requestDeleteOrder({
+export function deleteOrder({
   orderUuid
   // posUuid,
   // customerUuid,
@@ -145,7 +145,7 @@ export function requestDeleteOrder({
   // salesRepresentativeUuid
 }) {
   return request({
-    url: '/form/addons/point-of-sales/delete-order',
+    url: `${config.pointOfSales.endpoint}/delete-order`,
     method: 'post',
     data: {
       order_uuid: orderUuid
@@ -161,7 +161,7 @@ export function requestDeleteOrder({
 }
 
 // List orders from pos uuid
-export function requestListOrders({
+export function listOrders({
   posUuid,
   documentNo,
   businessPartnerUuid,
@@ -220,7 +220,7 @@ export function requestListOrders({
   */
 
   return request({
-    url: '/form/addons/point-of-sales/orders',
+    url: `${config.pointOfSales.endpoint}/orders`,
     method: 'get',
     params: {
       pos_uuid: posUuid,
@@ -253,7 +253,7 @@ export function requestListOrders({
 }
 
 // Create order line from order uuid and product
-export function requestCreateOrderLine({
+export function createOrderLine({
   orderUuid,
   warehouseUuid,
   productUuid,
@@ -264,7 +264,7 @@ export function requestCreateOrderLine({
   discountRate
 }) {
   return request({
-    url: '/form/addons/point-of-sales/create-order-line',
+    url: `${config.pointOfSales.endpoint}/create-order-line`,
     method: 'post',
     data: {
       order_uuid: orderUuid,
@@ -285,7 +285,7 @@ export function requestCreateOrderLine({
 }
 
 // updateOrderLine orders from pos uuid
-export function requestUpdateOrderLine({
+export function updateOrderLine({
   orderLineUuid,
   description,
   quantity,
@@ -293,7 +293,7 @@ export function requestUpdateOrderLine({
   discountRate
 }) {
   return request({
-    url: '/form/addons/point-of-sales/update-order-line',
+    url: `${config.pointOfSales.endpoint}/update-order-line`,
     method: 'post',
     data: {
       // is_add_quantity: true,
@@ -312,11 +312,11 @@ export function requestUpdateOrderLine({
 }
 
 // delete Order Line
-export function requestDeleteOrderLine({
+export function deleteOrderLine({
   orderLineUuid
 }) {
   return request({
-    url: '/form/addons/point-of-sales/delete-order-line',
+    url: `${config.pointOfSales.endpoint}/delete-order-line`,
     method: 'post',
     data: {
       order_line_uuid: orderLineUuid
@@ -327,13 +327,13 @@ export function requestDeleteOrderLine({
     })
 }
 
-export function requestListOrderLines({
+export function listOrderLines({
   orderUuid,
   pageSize,
   pageToken
 }) {
   return request({
-    url: '/form/addons/point-of-sales/order-lines',
+    url: `${config.pointOfSales.endpoint}/order-lines`,
     method: 'get',
     params: {
       order_uuid: orderUuid,
@@ -356,7 +356,7 @@ export function requestListOrderLines({
 
 export function getKeyLayout({ keyLayoutUuid }) {
   return request({
-    url: '/form/addons/point-of-sales/key-layout',
+    url: `${config.pointOfSales.endpoint}/key-layout`,
     method: 'get',
     params: {
       key_layout_uuid: keyLayoutUuid
@@ -382,7 +382,7 @@ export function getProductPriceList({
   pageToken
 }) {
   return request({
-    url: '/form/addons/point-of-sales/product-prices',
+    url: `${config.pointOfSales.endpoint}/product-prices`,
     method: 'get',
     params: {
       price_list_uuid: priceListUuid,
@@ -467,7 +467,7 @@ export function createPayment({
   currencyUuid
 }) {
   return request({
-    url: '/form/addons/point-of-sales/create-payment',
+    url: `${config.pointOfSales.endpoint}/create-payment`,
     method: 'post',
     data: {
       pos_uuid: posUuid,
@@ -499,7 +499,7 @@ export function updatePayment({
   tenderTypeCode
 }) {
   return request({
-    url: '/form/addons/point-of-sales/update-payment',
+    url: `${config.pointOfSales.endpoint}/update-payment`,
     method: 'post',
     data: {
       payment_uuid: paymentUuid,
@@ -522,7 +522,7 @@ export function deletePayment({
   paymentUuid
 }) {
   return request({
-    url: '/form/addons/point-of-sales/delete-payment',
+    url: `${config.pointOfSales.endpoint}/delete-payment`,
     method: 'post',
     data: {
       payment_uuid: paymentUuid
@@ -540,7 +540,7 @@ export function getPaymentsList({
   orderUuid
 }) {
   return request({
-    url: '/form/addons/point-of-sales/payments',
+    url: `${config.pointOfSales.endpoint}/payments`,
     method: 'get',
     params: {
       pos_uuid: posUuid,
@@ -601,7 +601,7 @@ export function processOrder({
     })
   }
   return request({
-    url: '/form/addons/point-of-sales/process-order',
+    url: `${config.pointOfSales.endpoint}/process-order`,
     method: 'post',
     data: {
       pos_uuid: posUuid,
@@ -626,7 +626,7 @@ export function validatePin({
   pin
 }) {
   return request({
-    url: '/form/addons/point-of-sales/validate-pin',
+    url: `${config.pointOfSales.endpoint}/validate-pin`,
     method: 'post',
     data: {
       pos_uuid: posUuid,
diff --git a/src/api/ADempiere/form/price-checking.js b/src/api/ADempiere/form/price-checking.js
index 8a32dd9f..0b85296d 100644
--- a/src/api/ADempiere/form/price-checking.js
+++ b/src/api/ADempiere/form/price-checking.js
@@ -17,9 +17,10 @@
 // Get Instance for connectionimport {
 import { isEmptyValue } from '@/utils/ADempiere'
 import { request } from '@/utils/ADempiere/request'
+import { config } from '@/utils/ADempiere/config'
 
 // List Point of sales
-export function requestGetProductPrice({
+export function getProductPrice({
   searchValue,
   upc,
   value,
@@ -30,7 +31,7 @@ export function requestGetProductPrice({
   validFrom
 }) {
   return request({
-    url: '/form/addons/point-of-sales/product-price',
+    url: `${config.priceChecking.endpoint}/product-price`,
     method: 'get',
     params: {
       search_value: searchValue,
diff --git a/src/components/ADempiere/Form/BarcodeReader/index.vue b/src/components/ADempiere/Form/BarcodeReader/index.vue
index c899f85f..963b8f43 100644
--- a/src/components/ADempiere/Form/BarcodeReader/index.vue
+++ b/src/components/ADempiere/Form/BarcodeReader/index.vue
@@ -92,7 +92,6 @@
 <script>
 import formMixin from '@/components/ADempiere/Form/formMixin.js'
 import fieldsList from './fieldsListBarCode.js'
-// import { requestGetProductPrice } from '@/api/ADempiere/form/price-checking.js'
 import { formatPercent, formatPrice } from '@/utils/ADempiere/valueFormat.js'
 import { buildImageFromArrayBuffer } from '@/utils/ADempiere/resource.js'
 import { requestImage } from '@/api/ADempiere/common/resource.js'
@@ -187,7 +186,7 @@ export default {
         //   // cleans all values except column name 'ProductValue'
         //   this.search = mutation.payload.value
         //   if (!this.isEmptyValue(this.search) && this.search.length >= 4) {
-        //     requestGetProductPrice({
+        //     getProductPrice({
         //       searchValue: mutation.payload.value
         //     })
         //       .then(productPrice => {
diff --git a/src/components/ADempiere/Form/PriceChecking/index.vue b/src/components/ADempiere/Form/PriceChecking/index.vue
index 40cbfc4c..fd50ff89 100644
--- a/src/components/ADempiere/Form/PriceChecking/index.vue
+++ b/src/components/ADempiere/Form/PriceChecking/index.vue
@@ -103,7 +103,7 @@
 <script>
 import formMixin from '@/components/ADempiere/Form/formMixin.js'
 import fieldsList from './fieldsList.js'
-import { requestGetProductPrice } from '@/api/ADempiere/form/price-checking.js'
+import { getProductPrice } from '@/api/ADempiere/form/price-checking.js'
 import { formatPercent, formatPrice } from '@/utils/ADempiere/valueFormat.js'
 import { buildImageFromArrayBuffer } from '@/utils/ADempiere/resource.js'
 import { requestImage } from '@/api/ADempiere/common/resource.js'
@@ -201,7 +201,7 @@ export default {
           // cleans all values except column name 'ProductValue'
           this.search = mutation.payload.value
           if (!this.isEmptyValue(this.search) && this.search.length >= 4) {
-            requestGetProductPrice({
+            getProductPrice({
               searchValue: mutation.payload.value,
               priceListUuid: this.currentPoint.priceList.uuid
             })
@@ -258,7 +258,7 @@ export default {
             if (typeof value[value.length - 1] === 'string') {
               value = mutation.payload.value.slice(0, -1)
             }
-            requestGetProductPrice({
+            getProductPrice({
               searchValue: mutation.payload.value,
               priceListUuid: this.currentPoint.priceList.uuid
             })
diff --git a/src/components/ADempiere/Form/VPOS/Options/index.vue b/src/components/ADempiere/Form/VPOS/Options/index.vue
index a623bc28..3e9053c4 100644
--- a/src/components/ADempiere/Form/VPOS/Options/index.vue
+++ b/src/components/ADempiere/Form/VPOS/Options/index.vue
@@ -288,8 +288,8 @@ import {
   withdrawal,
   createNewReturnOrder,
   cashClosing,
-  requestDeleteOrder,
-  requestCreateOrder,
+  deleteOrder,
+  createOrder,
   processOrder
 } from '@/api/ADempiere/form/point-of-sales.js'
 import ModalDialog from '@/components/ADempiere/Dialog'
@@ -472,7 +472,7 @@ export default {
         value: this.currentOrder.id
       }]
       this.$store.dispatch('addParametersProcessPos', parametersList)
-      requestCreateOrder({
+      createOrder({
         posUuid,
         customerUuid: this.currentOrder.businessPartner.uuid,
         salesRepresentativeUuid: this.currentOrder.salesRepresentative.uuid
@@ -520,7 +520,7 @@ export default {
     },
     deleteOrder() {
       this.$store.dispatch('updateOrderPos', true)
-      requestDeleteOrder({
+      deleteOrder({
         orderUuid: this.$route.query.action
       })
         .then(response => {
diff --git a/src/components/ADempiere/Form/VPOS/Order/orderLineMixin.js b/src/components/ADempiere/Form/VPOS/Order/orderLineMixin.js
index 53fd6e78..e780f5a8 100644
--- a/src/components/ADempiere/Form/VPOS/Order/orderLineMixin.js
+++ b/src/components/ADempiere/Form/VPOS/Order/orderLineMixin.js
@@ -15,9 +15,9 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 import {
-  requestCreateOrderLine,
-  requestUpdateOrderLine,
-  requestDeleteOrderLine
+  createOrderLine,
+  updateOrderLine,
+  deleteOrderLine
 } from '@/api/ADempiere/form/point-of-sales.js'
 import { formatPercent } from '@/utils/ADempiere/valueFormat.js'
 
@@ -100,7 +100,7 @@ export default {
     },
     createOrderLine(orderUuid) {
       const productUuid = this.product.uuid
-      requestCreateOrderLine({
+      createOrderLine({
         orderUuid,
         productUuid
       })
@@ -143,7 +143,7 @@ export default {
           quantity = currentLine.quantity
           break
       }
-      requestUpdateOrderLine({
+      updateOrderLine({
         orderLineUuid: currentLine.uuid,
         quantity,
         price,
@@ -171,7 +171,7 @@ export default {
     },
     deleteOrderLine(lineSelection) {
       console
-      requestDeleteOrderLine({
+      deleteOrderLine({
         orderLineUuid: lineSelection.uuid
       })
         .then(() => {
diff --git a/src/components/ADempiere/Form/VPOS/posMixin.js b/src/components/ADempiere/Form/VPOS/posMixin.js
index ff32d54f..08357a13 100644
--- a/src/components/ADempiere/Form/VPOS/posMixin.js
+++ b/src/components/ADempiere/Form/VPOS/posMixin.js
@@ -16,7 +16,7 @@
 
 import {
   findProduct,
-  requestUpdateOrderLine
+  updateOrderLine
 } from '@/api/ADempiere/form/point-of-sales.js'
 import {
   formatDate,
@@ -404,7 +404,7 @@ export default {
           this.arrowBottom()
           break
         case 'plus':
-          requestUpdateOrderLine({
+          updateOrderLine({
             orderLineUuid: this.currentOrderLine.uuid,
             quantity: this.listOrderLine[this.currentTable].quantity + 1
           })
@@ -423,7 +423,7 @@ export default {
 
           break
         case 'minus':
-          requestUpdateOrderLine({
+          updateOrderLine({
             orderLineUuid: this.currentOrderLine.uuid,
             quantity: this.listOrderLine[this.currentTable].quantity - 1
           })
diff --git a/src/store/modules/ADempiere/pointOfSales/order/actions.js b/src/store/modules/ADempiere/pointOfSales/order/actions.js
index 341e3d6b..4b005da6 100644
--- a/src/store/modules/ADempiere/pointOfSales/order/actions.js
+++ b/src/store/modules/ADempiere/pointOfSales/order/actions.js
@@ -15,11 +15,11 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 import {
-  requestCreateOrder,
-  requestGetOrder,
-  requestUpdateOrder,
-  requestCreateOrderLine,
-  requestListOrders
+  createOrder,
+  getOrder,
+  updateOrder,
+  createOrderLine,
+  listOrders
 } from '@/api/ADempiere/form/point-of-sales.js'
 import { isEmptyValue, extractPagingToken, convertValuesToSend } from '@/utils/ADempiere/valueUtils.js'
 import { showMessage } from '@/utils/ADempiere/notification.js'
@@ -39,7 +39,7 @@ export default {
     customerUuid,
     salesRepresentativeUuid
   }) {
-    return requestCreateOrder({
+    return createOrder({
       posUuid,
       customerUuid,
       salesRepresentativeUuid
@@ -71,7 +71,7 @@ export default {
     posUuid,
     customerUuid
   }) {
-    requestUpdateOrder({
+    updateOrder({
       orderUuid,
       posUuid,
       customerUuid
@@ -108,7 +108,7 @@ export default {
     price,
     discountRate
   }) {
-    requestCreateOrderLine({
+    createOrderLine({
       orderUuid,
       productUuid
     })
@@ -134,7 +134,7 @@ export default {
       orderUuid = rootGetters.posAttributes.currentPointOfSales.currentOrder.uuid // this.currentOrder.uuid
     }
     if (!isEmptyValue(orderUuid)) {
-      requestGetOrder(orderUuid)
+      getOrder(orderUuid)
         .then(orderResponse => {
           dispatch('fillOrde', {
             attribute: orderResponse,
@@ -207,7 +207,7 @@ export default {
     })
     values = convertValuesToSend(values)
     const { documentNo, businessPartnerUuid, grandTotal, openAmount, isPaid, isProcessed, isAisleSeller, isInvoiced, dateOrderedFrom, dateOrderedTo, salesRepresentativeUuid } = values
-    requestListOrders({
+    listOrders({
       posUuid,
       documentNo,
       businessPartnerUuid,
@@ -254,7 +254,7 @@ export default {
   },
   findOrderServer({ commit }, orderUuid) {
     if (typeof orderUuid === 'string' && !isEmptyValue(orderUuid)) {
-      requestGetOrder(orderUuid)
+      getOrder(orderUuid)
         .then(responseOrder => {
           commit('findOrder', responseOrder)
         })
diff --git a/src/store/modules/ADempiere/pointOfSales/orderLine/actions.js b/src/store/modules/ADempiere/pointOfSales/orderLine/actions.js
index ff7ed0a9..53159f90 100644
--- a/src/store/modules/ADempiere/pointOfSales/orderLine/actions.js
+++ b/src/store/modules/ADempiere/pointOfSales/orderLine/actions.js
@@ -15,7 +15,7 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 import {
-  requestListOrderLines
+  listOrderLines
 } from '@/api/ADempiere/form/point-of-sales.js'
 import { isEmptyValue } from '@/utils/ADempiere/valueUtils.js'
 import { showMessage } from '@/utils/ADempiere/notification.js'
@@ -30,7 +30,7 @@ export default {
     if (isEmptyValue(orderUuid)) {
       return
     }
-    requestListOrderLines({
+    listOrderLines({
       orderUuid
     })
       .then(response => {
diff --git a/src/store/modules/ADempiere/pointOfSales/point/actions.js b/src/store/modules/ADempiere/pointOfSales/point/actions.js
index e9b48dff..7ada5d9b 100644
--- a/src/store/modules/ADempiere/pointOfSales/point/actions.js
+++ b/src/store/modules/ADempiere/pointOfSales/point/actions.js
@@ -16,7 +16,7 @@
 
 import router from '@/router'
 import {
-  requestListPointOfSales
+  listPointOfSales
 } from '@/api/ADempiere/form/point-of-sales.js'
 import { isEmptyValue } from '@/utils/ADempiere/valueUtils.js'
 import { showMessage } from '@/utils/ADempiere/notification.js'
@@ -32,7 +32,7 @@ export default {
   listPointOfSalesFromServer({ commit, getters, dispatch }, posToSet = null) {
     const userUuid = getters['user/getUserUuid']
     let pos, listPos
-    requestListPointOfSales({
+    listPointOfSales({
       userUuid
     })
       .then(response => {