Merge branch 'release/3.807.0'

VirtoCommerce · Mar 6, 2024 · b004a7c · b004a7c
2 parents 08c20a6 + d281aed
commit b004a7c
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 41 deletions.
diff --git a/.github/workflows/module-ci.yml b/.github/workflows/module-ci.yml
@@ -1,5 +1,5 @@
-# v3.800.3
-# https://virtocommerce.atlassian.net/browse/VCST-570
+# v3.800.4
+# https://virtocommerce.atlassian.net/browse/VCST-488
 name: Module CI
 
 on:
@@ -241,7 +241,7 @@ jobs:
     if: ${{ ((github.ref == 'refs/heads/dev') && (github.event_name == 'push') && (needs.ci.outputs.run-e2e == 'true')) ||
         (github.event_name == 'workflow_dispatch')}}
     needs: 'ci'
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].2
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].4
     with:
       katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon'
       katalonRepoBranch: 'dev'
@@ -261,7 +261,7 @@ jobs:
         (github.ref == 'refs/heads/dev')) && 
         github.event_name == 'push' }}
     needs: ci
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].2
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].4
     with:
       releaseSource: module
       moduleId: ${{ needs.ci.outputs.moduleId }}

diff --git a/.github/workflows/module-release-hotfix.yml b/.github/workflows/module-release-hotfix.yml
@@ -1,5 +1,5 @@
-# v3.800.3
-# https://virtocommerce.atlassian.net/browse/VCST-570
+# v3.800.4
+# https://virtocommerce.atlassian.net/browse/VCST-488
 name: Release hotfix
 
 on:
@@ -13,12 +13,12 @@ on:
 
 jobs:
   test:
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].2
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].4
     secrets:
       sonarToken: ${{ secrets.SONAR_TOKEN }}
 
   build:
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].2
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].4
     with:
       uploadPackage: 'true'
       uploadDocker: 'false'
@@ -46,7 +46,7 @@ jobs:
   publish-github-release:
     needs:
       [build, test, get-metadata]
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].2
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].4
     with:
       fullKey: ${{ needs.build.outputs.packageFullKey }}
       changeLog: '${{ needs.get-metadata.outputs.changeLog }}'

diff --git a/.github/workflows/publish-nugets.yml b/.github/workflows/publish-nugets.yml
@@ -1,5 +1,5 @@
-# v3.800.3
-# https://virtocommerce.atlassian.net/browse/VCST-570
+# v3.800.4
+# https://virtocommerce.atlassian.net/browse/VCST-488
 name: Publish nuget
 
 on:
@@ -13,12 +13,12 @@ on:
 
 jobs:
   test:
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].2
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].4
     secrets:
       sonarToken: ${{ secrets.SONAR_TOKEN }}
 
   build:
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].2
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].4
     with:
       uploadPackage: 'true'
       uploadDocker: 'false'
@@ -29,7 +29,7 @@ jobs:
   publish-nuget:
     needs:
       [build, test]
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].2
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].4
     with:
       fullKey: ${{ needs.build.outputs.packageFullKey }}
       forceGithub: false

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,12 +1,12 @@
-# v3.800.3
-# https://virtocommerce.atlassian.net/browse/VCST-570
+# v3.800.4
+# https://virtocommerce.atlassian.net/browse/VCST-488
 name: Release
 
 on:
   workflow_dispatch:
 
 jobs:
   release:
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].2
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].4
     secrets:
       envPAT: ${{ secrets.REPO_TOKEN }}
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.806.0</VersionPrefix>
+    <VersionPrefix>3.807.0</VersionPrefix>
     <VersionSuffix>
     </VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

diff --git a/src/VirtoCommerce.OrdersModule.Core/VirtoCommerce.OrdersModule.Core.csproj b/src/VirtoCommerce.OrdersModule.Core/VirtoCommerce.OrdersModule.Core.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     <PackageReference Include="VirtoCommerce.CartModule.Core" Version="3.800.0" />
     <PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.803.0" />
-    <PackageReference Include="VirtoCommerce.CustomerModule.Core" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.CustomerModule.Core" Version="3.803.0" />
     <PackageReference Include="VirtoCommerce.NotificationsModule.Core" Version="3.800.0" />
     <PackageReference Include="VirtoCommerce.PaymentModule.Core" Version="3.800.0" />
     <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.800.0" />

diff --git a/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/customerOrder-detail.js b/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/customerOrder-detail.js
@@ -1,6 +1,8 @@
 angular.module('virtoCommerce.orderModule')
-    .controller('virtoCommerce.orderModule.customerOrderDetailController', ['$scope', '$window', 'platformWebApp.bladeNavigationService', 'platformWebApp.dialogService', 'virtoCommerce.customerModule.members', 'virtoCommerce.customerModule.memberTypesResolverService', 'virtoCommerce.orderModule.securityAccounts', 'platformWebApp.authService',
-        function ($scope, $window, bladeNavigationService, dialogService, members, memberTypesResolverService, securityAccounts, authService) {
+    .controller('virtoCommerce.orderModule.customerOrderDetailController', ['$scope', '$window', 'platformWebApp.bladeNavigationService',
+        'platformWebApp.dialogService', 'virtoCommerce.customerModule.members', 'virtoCommerce.customerModule.memberTypesResolverService',
+        'platformWebApp.authService',
+        function ($scope, $window, bladeNavigationService, dialogService, members, memberTypesResolverService, authService) {
             var blade = $scope.blade;
             blade.currentEntityId = blade.customerOrder.id;
 
@@ -42,20 +44,17 @@ angular.module('virtoCommerce.orderModule')
 
             blade.openCustomerDetails = function () {
                 if (blade.customerOrder.customerId) {
-                    securityAccounts.get({ id: blade.customerOrder.customerId }, function (account) {
-                        var contactId = (account && account.memberId) ? account.memberId : blade.customerOrder.customerId;
-                        members.get({ id: contactId }, function (member) {
-                            if (member && member.id) {
-                                showCustomerDetailBlade(member);
-                            }
-                        });
+                    members.getByUserId({ userId: blade.customerOrder.customerId }, function (member) {
+                        if (member && member.id) {
+                            showCustomerDetailBlade(member);
+                        }
                     });
                 }
             };
 
             blade.openOrganizationDetails = function () {
                 if (blade.customerOrder.organizationId) {
-                        members.get({ id: organizationId }, function (member) {
+                    members.get({ id: blade.customerOrder.organizationId }, function (member) {
                             if (member && member.id) {
                                 showCustomerDetailBlade(member);
                             }

diff --git a/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/customerOrder-detail.tpl.html b/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/customerOrder-detail.tpl.html
@@ -5,7 +5,7 @@
                 <div class="status" ng-bind="blade.currentEntity.status | settingTranslate:'Order.Status'"></div>
                 <div class="reason" ng-bind="blade.currentEntity.cancelReason" ng-if="blade.currentEntity.isCancelled"></div>
             </div>
-            <form name="formScope" ng-controller="virtoCommerce.orderModule.customerOrderDetailController">
+            <form name="formScope" class="form" ng-controller="virtoCommerce.orderModule.customerOrderDetailController">
                 <fieldset ng-disabled="blade.isLocked">
                     <va-metaform registered-inputs="blade.metaFields" blade="blade" column-count="2" ng-init="setForm(formScope)"></va-metaform>
                 </fieldset>

diff --git a/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/filter-detail.js b/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/filter-detail.js
@@ -1,6 +1,7 @@
 angular.module('virtoCommerce.orderModule')
-    .controller('virtoCommerce.orderModule.filterDetailController', ['$scope', '$localStorage', 'virtoCommerce.customerModule.members', '$translate', 'platformWebApp.metaFormsService', 'platformWebApp.accounts',
-        function ($scope, $localStorage, members, $translate, metaFormsService, securityAccounts) {
+    .controller('virtoCommerce.orderModule.filterDetailController', ['$scope', '$localStorage', 'virtoCommerce.customerModule.members',
+        '$translate', 'platformWebApp.metaFormsService',
+        function ($scope, $localStorage, members, $translate, metaFormsService) {
         var blade = $scope.blade;
 
         blade.metaFields = blade.metaFields ? blade.metaFields : metaFormsService.getMetaFields('orderFilterDetail');
@@ -37,9 +38,10 @@ angular.module('virtoCommerce.orderModule')
 
         $scope.saveChanges = function () {
             if (blade.currentEntity.customerId) {
-                // Search for accounts by memberId (because customerID in order is an account)
-                securityAccounts.search({ MemberIds: [blade.currentEntity.customerId] }, function (data) {
-                    blade.currentEntity.customerIds = _.pluck(data.users, 'id');
+                members.get({ id: blade.currentEntity.customerId }, function (member) {
+                    blade.currentEntity.customerIds = member.securityAccounts.map(function (account) {
+                        return account.id;
+                    });
                     $scope.applyCriteria();
                 });
             }

diff --git a/src/VirtoCommerce.OrdersModule.Web/Scripts/resources/securityAccounts.js b/src/VirtoCommerce.OrdersModule.Web/Scripts/resources/securityAccounts.js
diff --git a/src/VirtoCommerce.OrdersModule.Web/module.manifest b/src/VirtoCommerce.OrdersModule.Web/module.manifest
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
   <id>VirtoCommerce.Orders</id>
-  <version>3.806.0</version>
+  <version>3.807.0</version>
   <version-tag />
   <platformVersion>3.800.0</platformVersion>
   <dependencies>
     <dependency id="VirtoCommerce.Cart" version="3.800.0" />
     <dependency id="VirtoCommerce.Catalog" version="3.800.0" />
     <dependency id="VirtoCommerce.Core" version="3.803.0" />
-    <dependency id="VirtoCommerce.Customer" version="3.800.0" />
+    <dependency id="VirtoCommerce.Customer" version="3.803.0" />
     <dependency id="VirtoCommerce.Inventory" version="3.800.0" />
     <dependency id="VirtoCommerce.Notifications" version="3.800.0" />
     <dependency id="VirtoCommerce.Payment" version="3.800.0" />