PT-13216: UI disabled when user try to create payment/shipment docume…

…nt (#373) fix: UI disabled when user try to create payment/shipment document (#373)
VirtoCommerce · Aug 18, 2023 · d5cd538 · d5cd538
1 parent 35c22f1
commit d5cd538
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/payment-detail.js b/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/payment-detail.js
@@ -20,10 +20,6 @@ angular.module('virtoCommerce.orderModule')
             blade.capturePermission = 'order:capture_payment';
             blade.refundPermission = 'order:refund';
 
-            blade.isLocked = !blade.currentEntity || (blade.currentEntity.status === 'Paid'
-                || blade.currentEntity.cancelledState === 'Requested'
-                || blade.currentEntity.cancelledState === 'Completed'
-                || blade.currentEntity.isCancelled);
             if (blade.isNew) {
                 blade.title = 'orders.blades.payment-detail.title-new';
 
@@ -34,6 +30,11 @@ angular.module('virtoCommerce.orderModule')
 
                 customerOrders.getNewPayment({ id: blade.customerOrder.id }, blade.initialize);
             } else {
+                blade.isLocked = !blade.currentEntity || (blade.currentEntity.status === 'Paid'
+                    || blade.currentEntity.cancelledState === 'Requested'
+                    || blade.currentEntity.cancelledState === 'Completed'
+                    || blade.currentEntity.isCancelled);
+
                 blade.title = 'orders.blades.payment-detail.title';
                 blade.titleValues = { number: blade.currentEntity.number };
                 blade.subtitle = 'orders.blades.payment-detail.subtitle';
@@ -104,7 +105,7 @@ angular.module('virtoCommerce.orderModule')
                 },
                 canExecuteMethod: function () {
                     return _.find(blade.captureStatuses, function (x) {
-                        return x === blade.currentEntity.status
+                        return !blade.currentEntity || x === blade.currentEntity.status
                     });
                 }
             });
@@ -130,7 +131,7 @@ angular.module('virtoCommerce.orderModule')
                 },
                 canExecuteMethod: function () {
                     return _.find(blade.refundStatuses, function (x) {
-                        return x === blade.currentEntity.status
+                        return !blade.currentEntity || x === blade.currentEntity.status
                     });
                 }
             });

diff --git a/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/shipment-detail.js b/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/shipment-detail.js
@@ -15,10 +15,6 @@ angular.module('virtoCommerce.orderModule')
         blade.isVisiblePrices = authService.checkPermission('order:read_prices');
         blade.shippingMethods = [];
 
-            blade.isLocked = !blade.currentEntity || blade.currentEntity.status === 'Send'
-                || blade.currentEntity.cancelledState === 'Completed'
-                || blade.currentEntity.cancelledState === 'Requested'
-                || blade.currentEntity.isCancelled;
         if (blade.isNew) {
             blade.title = 'orders.blades.shipment-detail.title-new';
 
@@ -29,6 +25,11 @@ angular.module('virtoCommerce.orderModule')
 
             customerOrders.getNewShipment({ id: blade.customerOrder.id }, blade.initialize);
         } else {
+            blade.isLocked = !blade.currentEntity || blade.currentEntity.status === 'Send'
+                || blade.currentEntity.cancelledState === 'Completed'
+                || blade.currentEntity.cancelledState === 'Requested'
+                || blade.currentEntity.isCancelled;
+
             blade.title = 'orders.blades.shipment-detail.title';
             blade.titleValues = { number: blade.currentEntity.number };
             blade.subtitle = 'orders.blades.shipment-detail.subtitle';
@@ -113,7 +114,10 @@ angular.module('virtoCommerce.orderModule')
         }, true);
 
         blade.customInitialize = function () {
-            blade.isLocked = !blade.currentEntity || blade.currentEntity.status === 'Send' || blade.currentEntity.cancelledState === 'Completed' || blade.currentEntity.isCancelled;
+            if (!blade.currentEntity) {
+                return;
+            }
+            blade.isLocked = blade.currentEntity.status === 'Send' || blade.currentEntity.cancelledState === 'Completed' || blade.currentEntity.isCancelled;
         };
 
         blade.customInitialize();