Merge branch 'release/3.412.0'

VirtoCommerce · Sep 14, 2023 · 6780f74 · 6780f74
2 parents dcc7cba + d1ad181
commit 6780f74
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 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.411.0</VersionPrefix>
+    <VersionPrefix>3.412.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>

diff --git a/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/customerOrder-detail.tpl.html b/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/customerOrder-detail.tpl.html
@@ -35,7 +35,7 @@
     </label>
     <div class="form-input">
         <ui-select ng-model="blade.currentEntity.status" ng-disabled="blade.isLocked">
-            <ui-select-match placeholder="{{ 'orders.blades.customerOrder-detail.placeholders.status' | translate }}">{{$select.selected.value}}</ui-select-match>
+            <ui-select-match placeholder="{{ 'orders.blades.customerOrder-detail.placeholders.status' | translate }}">{{ blade.currentEntity.status }}</ui-select-match>
             <ui-select-choices repeat="x.key as x in blade.statuses | filter: {'value': $select.search}">
                 <span ng-bind-html="x.value | highlight: $select.search"></span>
             </ui-select-choices>

diff --git a/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/customerOrder-items.tpl.html b/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/customerOrder-items.tpl.html
@@ -49,7 +49,7 @@
                                 <div class="form-input __inline">
                                     <div class="form-input">
                                         <ui-select ng-model="data.status">
-                                            <ui-select-match allow-clear="true" placeholder="{{ 'orders.blades.customerOrder-detail.placeholders.status' | translate }}">{{$select.selected.value}}</ui-select-match>
+                                          <ui-select-match allow-clear="true" placeholder="{{ 'orders.blades.customerOrder-detail.placeholders.status' | translate }}">{{data.status}}</ui-select-match>
                                             <ui-select-choices repeat="x.key as x in blade.statuses | filter: {'value': $select.search}">
                                                 <span ng-bind-html="x.value | highlight: $select.search"></span>
                                             </ui-select-choices>

diff --git a/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/payment-detail.tpl.html b/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/payment-detail.tpl.html
@@ -48,7 +48,7 @@
                                 </label>
                                 <div class="form-input">
                                     <ui-select ng-model="blade.currentEntity.status" ng-change="blade.currentEntity.paymentStatus = $select.selected.key" ng-disabled="blade.isLocked">
-                                        <ui-select-match placeholder="{{ 'orders.blades.payment-detail.placeholders.status' | translate }}">{{$select.selected.value}}</ui-select-match>
+                                        <ui-select-match placeholder="{{ 'orders.blades.payment-detail.placeholders.status' | translate }}">{{ blade.currentEntity.status }}</ui-select-match>
                                         <ui-select-choices repeat="x.key as x in blade.statuses | filter: {'value': $select.search}">
                                             <span ng-bind-html="x.value | highlight: $select.search"></span>
                                         </ui-select-choices>

diff --git a/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/refund-detail.html b/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/refund-detail.html
@@ -20,7 +20,7 @@
                                 </label>
                                 <div class="form-input">
                                     <ui-select ng-model="blade.currentEntity.status" ng-change="blade.currentEntity.refundStatus = $select.selected.key" ng-disabled="blade.isLocked">
-                                        <ui-select-match placeholder="{{ 'orders.blades.refund-details.placeholders.status' | translate }}">{{$select.selected.value}}</ui-select-match>
+                                        <ui-select-match placeholder="{{ 'orders.blades.refund-details.placeholders.status' | translate }}">{{ blade.currentEntity.status }}</ui-select-match>
                                         <ui-select-choices repeat="x.key as x in blade.statuses | filter: {'value': $select.search}">
                                             <span ng-bind-html="x.value | highlight: $select.search"></span>
                                         </ui-select-choices>

diff --git a/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/shipment-detail.tpl.html b/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/shipment-detail.tpl.html
@@ -85,7 +85,7 @@
     </label>
     <div class="form-input">
         <ui-select ng-model="blade.currentEntity.status" ng-disabled="blade.isLocked">
-            <ui-select-match placeholder="{{ 'orders.blades.shipment-detail.placeholders.status' | translate }}">{{$select.selected.value}}</ui-select-match>
+            <ui-select-match placeholder="{{ 'orders.blades.shipment-detail.placeholders.status' | translate }}">{{ blade.currentEntity.status }}</ui-select-match>
             <ui-select-choices repeat="x.key as x in blade.statuses | filter: {'value': $select.search}">
                 <span ng-bind-html="x.value | highlight: $select.search"></span>
             </ui-select-choices>

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.411.0</version>
+  <version>3.412.0</version>
   <version-tag />
   <platformVersion>3.413.0</platformVersion>
   <dependencies>