Merge branch 'release/3.417.0'

VirtoCommerce · Oct 26, 2023 · f3af99e · f3af99e
2 parents eb21b08 + c3efea5
commit f3af99e
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 27 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.416.0</VersionPrefix>
+    <VersionPrefix>3.417.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>

diff --git a/src/VirtoCommerce.OrdersModule.Web/Controllers/Api/OrderModuleController.cs b/src/VirtoCommerce.OrdersModule.Web/Controllers/Api/OrderModuleController.cs
@@ -406,21 +406,26 @@ public async Task<ActionResult> UpdateOrder([FromBody] CustomerOrder customerOrd
         public async Task<ActionResult<Shipment>> GetNewShipment(string id)
         {
             var order = await _customerOrderService.GetNoCloneAsync(id, CustomerOrderResponseGroup.Full.ToString());
-            if (order != null)
+            if (order == null)
             {
-                var retVal = AbstractTypeFactory<Shipment>.TryCreateInstance();
-                retVal.Id = Guid.NewGuid().ToString();
-                retVal.Currency = order.Currency;
-                retVal.Status = "New";
-
-                var store = await _storeService.GetNoCloneAsync(order.StoreId, StoreResponseGroup.StoreInfo.ToString());
-                var numberTemplate = store.Settings.GetValue<string>(ModuleConstants.Settings.General.OrderShipmentNewNumberTemplate);
-                retVal.Number = _uniqueNumberGenerator.GenerateNumber(numberTemplate.ToString());
+                return NotFound();
+            }
 
-                return Ok(retVal);
+            var store = await _storeService.GetNoCloneAsync(order.StoreId, StoreResponseGroup.StoreInfo.ToString());
+            if (store == null)
+            {
+                return BadRequest(GetNoStoreErrorMessage(order));
             }
 
-            return NotFound();
+            var retVal = AbstractTypeFactory<Shipment>.TryCreateInstance();
+            retVal.Id = Guid.NewGuid().ToString();
+            retVal.Currency = order.Currency;
+            retVal.Status = "New";
+
+            var numberTemplate = store.Settings.GetValue<string>(ModuleConstants.Settings.General.OrderShipmentNewNumberTemplate);
+            retVal.Number = _uniqueNumberGenerator.GenerateNumber(numberTemplate.ToString());
+
+            return Ok(retVal);
         }
 
         /// <summary>
@@ -433,23 +438,29 @@ public async Task<ActionResult<Shipment>> GetNewShipment(string id)
         public async Task<ActionResult<PaymentIn>> GetNewPayment(string id)
         {
             var order = await _customerOrderService.GetNoCloneAsync(id, CustomerOrderResponseGroup.Full.ToString());
-            if (order != null)
+            if (order == null)
             {
-                var retVal = AbstractTypeFactory<PaymentIn>.TryCreateInstance();
-                retVal.Id = Guid.NewGuid().ToString();
-                retVal.Currency = order.Currency;
-                retVal.CustomerId = order.CustomerId;
-                retVal.Status = retVal.PaymentStatus.ToString();
+                return NotFound();
+            }
 
-                var store = await _storeService.GetNoCloneAsync(order.StoreId, StoreResponseGroup.StoreInfo.ToString());
-                var numberTemplate = store.Settings.GetValue<string>(ModuleConstants.Settings.General.OrderPaymentInNewNumberTemplate);
-                retVal.Number = _uniqueNumberGenerator.GenerateNumber(numberTemplate.ToString());
-                return Ok(retVal);
+            var store = await _storeService.GetNoCloneAsync(order.StoreId, StoreResponseGroup.StoreInfo.ToString());
+            if (store == null)
+            {
+                return BadRequest(GetNoStoreErrorMessage(order));
             }
 
-            return NotFound();
+            var retVal = AbstractTypeFactory<PaymentIn>.TryCreateInstance();
+            retVal.Id = Guid.NewGuid().ToString();
+            retVal.Currency = order.Currency;
+            retVal.CustomerId = order.CustomerId;
+            retVal.Status = retVal.PaymentStatus.ToString();
+
+            var numberTemplate = store.Settings.GetValue<string>(ModuleConstants.Settings.General.OrderPaymentInNewNumberTemplate);
+            retVal.Number = _uniqueNumberGenerator.GenerateNumber(numberTemplate.ToString());
+            return Ok(retVal);
         }
 
+
         /// <summary>
         ///  Delete a whole customer orders
         /// </summary>
@@ -741,5 +752,10 @@ private async Task<ValidationResult> ValidateAsync(CustomerOrder customerOrder)
 
             return new ValidationResult();
         }
+
+        private static string GetNoStoreErrorMessage(CustomerOrder order)
+        {
+            return $"Store {order.StoreId} does not exist in the system. Please create {order.StoreId} store or select another store for the order.";
+        }
     }
 }
diff --git a/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/payment-detail.js b/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/payment-detail.js
@@ -28,7 +28,10 @@ angular.module('virtoCommerce.orderModule')
                     foundField.isReadOnly = false;
                 }
 
-                customerOrders.getNewPayment({ id: blade.customerOrder.id }, blade.initialize);
+                customerOrders.getNewPayment({ id: blade.customerOrder.id }, blade.initialize, function (error) {
+                    blade.isLocked = true;
+                    bladeNavigationService.setError(error.data, blade);
+                });
             } else {
                 blade.isLocked = !blade.currentEntity || (blade.currentEntity.status === 'Paid'
                     || blade.currentEntity.cancelledState === 'Requested'
@@ -127,6 +130,10 @@ angular.module('virtoCommerce.orderModule')
             }
 
             blade.fetchVendors = function (criteria) {
+                if (blade.isLocked) {
+                    return [];
+                }
+
                 return members.search(criteria);
             }
 
@@ -154,7 +161,7 @@ angular.module('virtoCommerce.orderModule')
             blade.customInitialize = function () {
                 if (!blade.currentEntity) {
 					return;
-				}
+                }
                 blade.isLocked = blade.currentEntity.status === 'Paid' || blade.currentEntity.cancelledState === 'Completed' || blade.currentEntity.isCancelled;
             };
 

diff --git a/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/shipment-detail.js b/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/shipment-detail.js
@@ -23,7 +23,10 @@ angular.module('virtoCommerce.orderModule')
                 foundField.isReadOnly = false;
             }
 
-            customerOrders.getNewShipment({ id: blade.customerOrder.id }, blade.initialize);
+            customerOrders.getNewShipment({ id: blade.customerOrder.id }, blade.initialize, function (error) {
+                blade.isLocked = true;
+                bladeNavigationService.setError(error.data, blade);
+            });
         } else {
             blade.isLocked = !blade.currentEntity || blade.currentEntity.status === 'Send'
                 || blade.currentEntity.cancelledState === 'Completed'
@@ -62,6 +65,10 @@ angular.module('virtoCommerce.orderModule')
         }
 
         blade.fetchEmployees = function (criteria) {
+            if (blade.isLocked) {
+                return [];
+            }
+
             criteria.memberType = 'Employee';
             criteria.deepSearch = true;
             criteria.sort = 'name';
@@ -84,6 +91,10 @@ angular.module('virtoCommerce.orderModule')
         }
 
         blade.fetchVendors = function (criteria) {
+            if (blade.isLocked) {
+                return [];
+            }
+
             return members.search(criteria);
         }
 

diff --git a/src/VirtoCommerce.OrdersModule.Web/module.manifest b/src/VirtoCommerce.OrdersModule.Web/module.manifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
   <id>VirtoCommerce.Orders</id>
-  <version>3.416.0</version>
+  <version>3.417.0</version>
   <version-tag />
   <platformVersion>3.413.0</platformVersion>
   <dependencies>