Cancel Refund request feature

UX Fixes

Signed-off-by: smarcet <[email protected]>

Author: smarcet

src/actions/order-actions.js

@@ -502,12 +502,7 @@ export const cancelRefundPurchaseOrder = (orderId) => (dispatch, getState) => {
         authErrorHandler
     )(params)(dispatch).then(() => {
             dispatch(stopLoading());
-            dispatch(showMessage(
-                success_message,
-                () => {
-                    history.push(`/app/summits/${currentSummit.id}/purchase-orders/${orderId}`)
-                }
-            ));
+            dispatch(showMessage(success_message));
         }
     );
 }

src/actions/ticket-actions.js

@@ -27,8 +27,6 @@ import {
     getCSV,
     escapeFilterValue
 } from 'openstack-uicore-foundation/lib/methods';
-import {ORDER_EMAIL_SENT, PURCHASE_ORDER_CANCEL_REFUND} from "./order-actions";
-
 
 export const REQUEST_TICKETS            = 'REQUEST_TICKETS';
 export const RECEIVE_TICKETS            = 'RECEIVE_TICKETS';
@@ -302,18 +300,13 @@ export const cancelRefundTicket = (orderId, ticketId) => (dispatch, getState) =>
 
     return deleteRequest(
         null,
-        createAction(TICKET_CANCEL_REFUND)({orderId}),
+        createAction(TICKET_CANCEL_REFUND)({ticketId}),
         `${window.API_BASE_URL}/api/v1/summits/all/orders/${orderId}/tickets/${ticketId}/refund/cancel`,
         {},
         authErrorHandler
     )(params)(dispatch).then(() => {
             dispatch(stopLoading());
-            dispatch(showMessage(
-                success_message,
-                () => {
-                    history.push(`/app/summits/${currentSummit.id}/purchase-orders/${orderId}`)
-                }
-            ));
+            dispatch(showMessage(success_message));
         }
     );
 }

src/pages/orders/edit-purchase-order-page.js

@@ -107,18 +107,25 @@ class EditPurchaseOrderPage extends React.Component {
             <div className="container">
                 <h3>
                     {title} {T.translate("edit_purchase_order.purchase_order")}
-                    {entity.id != 0 &&
+                    {entity.id !== 0 &&
                     <div className="pull-right form-inline">
-                        <input
+                        {
+                            (entity.status === 'RefundRequested' || entity.status === 'Paid') &&
+                            < input
                             className="form-control"
                             type="number"
                             min="0"
                             value={refund_amount}
                             onChange={this.handleRefundChange}
-                        />
-                        <button className="btn btn-sm btn-primary right-space" onClick={this.handleRefundOrder.bind(this, entity)}>
-                            {T.translate("edit_purchase_order.refund")}
-                        </button>
+                            />
+                        }
+                        {
+                            (entity.status === 'RefundRequested' || entity.status === 'Paid') &&
+                            <button className="btn btn-sm btn-primary right-space"
+                                    onClick={this.handleRefundOrder.bind(this, entity)}>
+                                {T.translate("edit_purchase_order.refund")}
+                            </button>
+                        }
                         {
                             entity.status === 'RefundRequested' &&
                             <button className="btn btn-sm btn-primary right-space" onClick={this.handleCancelRefundOrder.bind(this, entity)}>
@@ -128,7 +135,7 @@ class EditPurchaseOrderPage extends React.Component {
                         <button className="btn btn-sm btn-danger" onClick={this.handleDeleteOrder.bind(this, entity)}>
                             {T.translate("edit_purchase_order.delete_order")}
                         </button>
-                        {entity.status === 'Paid' &&
+                        { entity.status === 'Paid' &&
                         <button className="btn btn-sm btn-primary left-space"
                                 onClick={this.handleResendEmail.bind(this, entity)}>
                             {T.translate("edit_purchase_order.resend_order_email")}

src/pages/orders/edit-ticket-page.js

@@ -157,20 +157,21 @@ class EditTicketPage extends React.Component {
 
                 <div className="row">
                     <div className="col-md-6">
-                        {entity.status != 'Cancelled' &&
-                        <div className="pull-left form-inline">
-                            <input
-                                className="form-control"
-                                type="number"
-                                min="0"
-                                value={refund_amount}
-                                onChange={this.handleRefundChange}
-                            />
-                            <button className="btn btn-sm btn-primary pull-right"
-                                    onClick={this.handleRefundTicket.bind(this, entity)}>
-                                {T.translate("edit_ticket.refund_ticket")}
-                            </button>
-                        </div>
+                        {
+                            (entity.status === 'RefundRequested' || entity.status === 'Paid') &&
+                            <div className="pull-left form-inline">
+                                <input
+                                    className="form-control"
+                                    type="number"
+                                    min="0"
+                                    value={refund_amount}
+                                    onChange={this.handleRefundChange}
+                                />
+                                <button className="btn btn-sm btn-primary pull-right"
+                                        onClick={this.handleRefundTicket.bind(this, entity)}>
+                                    {T.translate("edit_ticket.refund_ticket")}
+                                </button>
+                            </div>
                         }
                     </div>
                     <div className="col-md-6">

src/reducers/orders/purchase-order-reducer.js

@@ -14,10 +14,11 @@
 import
 {
     RECEIVE_PURCHASE_ORDER,
-    RESET_PURCHASE_ORDER_FORM, UPDATE_PURCHASE_ORDER
+    RESET_PURCHASE_ORDER_FORM,
+    UPDATE_PURCHASE_ORDER,
+    PURCHASE_ORDER_CANCEL_REFUND
 } from '../../actions/order-actions';
 
-
 import { LOGOUT_USER, VALIDATE } from 'openstack-uicore-foundation/lib/actions';
 import {SET_CURRENT_SUMMIT} from "../../actions/summit-actions";
 
@@ -106,6 +107,10 @@ const purchaseOrderReducer = (state = DEFAULT_STATE, action) => {
         case VALIDATE: {
             return {...state,  errors: payload.errors };
         }
+        case PURCHASE_ORDER_CANCEL_REFUND:{
+            let { entity} = state;
+            return {...state,  entity: {...entity, status: 'Paid' }};
+        }
         break;
         default:
             return state;

src/reducers/tickets/ticket-reducer.js

@@ -16,7 +16,7 @@ import {
     UPDATE_TICKET,
     TICKET_UPDATED,
     TICKET_MEMBER_REASSIGNED,
-    BADGE_ADDED_TO_TICKET
+    BADGE_ADDED_TO_TICKET, TICKET_CANCEL_REFUND
 } from '../../actions/ticket-actions';
 import {
     BADGE_DELETED,
@@ -124,7 +124,7 @@ const ticketReducer = (state = DEFAULT_STATE, action) => {
         break;
         case FEATURE_BADGE_REMOVED: {
             let {featureId} = payload;
-            let badgeFeatures = state.entity.badge.features.filter(f => f.id != featureId);
+            let badgeFeatures = state.entity.badge.features.filter(f => f.id !== featureId);
             return {...state, entity: {...state.entity, badge: {...state.entity.badge, features: badgeFeatures} } };
         }
         break;
@@ -134,6 +134,10 @@ const ticketReducer = (state = DEFAULT_STATE, action) => {
 
             return {...state, entity: {...state.entity,  badge: {...state.entity.badge, features: badgeFeatures}} };
         }
+        case TICKET_CANCEL_REFUND:{
+            let { entity} = state;
+            return {...state,  entity: {...entity, status: 'Paid' }};
+        }
         break;
         default:
             return state;