OBPIH-4713 PO List fixes after QA #3488
Conversation
… be hidden by default and to allow empty submit
…tooltip issue for party and change placeholder of search field
| }; | ||
|
|
||
| const rollbackOrder = (id) => { | ||
| window.location = `/openboxes/order/rollbackOrderStatus/${id}`; |
There was a problem hiding this comment.
this should be done through the API
| Alert.error('Order must be placed in order to print'); | ||
| return; | ||
| } | ||
| window.location = `/openboxes/order/print/${id}`; |
There was a problem hiding this comment.
This should be done throught the API
| @@ -302,21 +302,21 @@ class OrderController { | |||
| } | |||
| if (orderInstance.status != OrderStatus.PENDING) { | |||
| flash.message = "${warehouse.message(code: 'default.not.deleted.message', args: [warehouse.message(code: 'order.label', default: 'Order'), orderInstance.orderNumber])}" | |||
| redirect(action: "list", id: params.id, params: [orderType: orderInstance.orderType]) | |||
| redirect(controller: "purchaseOrder", action: "list") | |||
There was a problem hiding this comment.
This should not be done like that, because this is affecting all order types.
| @@ -122,7 +122,7 @@ | |||
| <g:elseif test="${currentState}"> | |||
| <%-- Show Order --%> | |||
| <g:if test="${currentState == 'showOrder'}"> | |||
| <g:link controller="order" action="list" class="button"> | |||
| <g:link controller="purchaseOrder" action="list" class="button"> | |||
There was a problem hiding this comment.
This should not redirect to PO list other order types.
| formProps, | ||
| defaultValues, | ||
| allowEmptySubmit, | ||
| hiddenByDefault, |
There was a problem hiding this comment.
I think simple hidden would be better.
| @@ -147,32 +215,32 @@ const PurchaseOrderListTable = ({ | |||
| defaultLabel: 'Print order', | |||
| leftIcon: <RiPrinterLine />, | |||
| activityCode: ['PLACE_ORDER'], | |||
| href: '/openboxes/order/print', | |||
| onClickActionWithId: id => printOrder(id), | |||
There was a problem hiding this comment.
Why it can't be a simple: onClick?
|
|
||
| const cancelOrder = () => { | ||
| Alert.error(translate('react.default.featureNotSupported', 'This feature is not currently supported')); | ||
| // It will be implemented in the future |
There was a problem hiding this comment.
No need for this comment.
| window.location = `/openboxes/order/print/${id}`; | ||
| }; | ||
|
|
||
| const cancelOrder = () => { |
There was a problem hiding this comment.
Can we just hide/remove the option to cancel if it is not yet implemented?
kchelstowski
force-pushed
the
OBPIH-4713
branch
from
2e0c5ab
to
2228147
Compare
grails-app/conf/UrlMappings.groovy
Outdated
| @@ -609,6 +609,11 @@ class UrlMappings { | |||
| action = [GET: "statusOptions"] | |||
| } | |||
|
|
|||
| "/api/purchaseOrders/rollbackOrder/$id"(parseRequest: true) { | |||
There was a problem hiding this comment.
Endpoint should be: /api/purchaseOrders/$id/rollback and action should be called rollback
No description provided.