VCST-156: correct pagination in subscription orders (#86)

Co-authored-by: AlexTzykin <[email protected]>
VirtoCommerce · Jan 17, 2024 · 2e1250d · 2e1250d
1 parent 6c2f07d
commit 2e1250d
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 11 deletions.
diff --git a/src/VirtoCommerce.SubscriptionModule.Core/VirtoCommerce.SubscriptionModule.Core.csproj b/src/VirtoCommerce.SubscriptionModule.Core/VirtoCommerce.SubscriptionModule.Core.csproj
@@ -16,7 +16,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
     <PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.400.0" />
-    <PackageReference Include="VirtoCommerce.OrdersModule.Core" Version="3.400.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.400.0" />
+    <PackageReference Include="VirtoCommerce.OrdersModule.Core" Version="3.426.2" />
+    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.447.0" />
   </ItemGroup>
 </Project>
diff --git a/src/VirtoCommerce.SubscriptionModule.Data/Services/SubscriptionBuilder.cs b/src/VirtoCommerce.SubscriptionModule.Data/Services/SubscriptionBuilder.cs
@@ -86,7 +86,7 @@ public virtual async Task<Subscription> TryCreateSubscriptionFromOrderAsync(Cust
 
             //Generate numbers for new subscriptions
             var store = await _storeService.GetNoCloneAsync(order.StoreId, StoreResponseGroup.StoreInfo.ToString());
-            var numberTemplate = store.Settings.GetSettingValue(ModuleConstants.Settings.General.NewNumberTemplate.Name, ModuleConstants.Settings.General.NewNumberTemplate.DefaultValue.ToString());
+            var numberTemplate = store.Settings.GetValue<string>(ModuleConstants.Settings.General.NewNumberTemplate);
 
             if (paymentPlan != null)
             {

diff --git a/src/VirtoCommerce.SubscriptionModule.Data/Services/SubscriptionService.cs b/src/VirtoCommerce.SubscriptionModule.Data/Services/SubscriptionService.cs
@@ -109,7 +109,7 @@ public virtual async Task SaveSubscriptionsAsync(Subscription[] subscriptions)
                     if (string.IsNullOrEmpty(subscription.Number))
                     {
                         var store = await _storeService.GetNoCloneAsync(subscription.StoreId, StoreResponseGroup.StoreInfo.ToString());
-                        var numberTemplate = store?.Settings.GetSettingValue(ModuleConstants.Settings.General.NewNumberTemplate.Name, ModuleConstants.Settings.General.NewNumberTemplate.DefaultValue.ToString());
+                        var numberTemplate = store?.Settings.GetValue<string>(ModuleConstants.Settings.General.NewNumberTemplate);
                         subscription.Number = _uniqueNumberGenerator.GenerateNumber(numberTemplate);
                     }
 

diff --git a/src/VirtoCommerce.SubscriptionModule.Web/Scripts/widgets/subscription-orders-widget.js b/src/VirtoCommerce.SubscriptionModule.Web/Scripts/widgets/subscription-orders-widget.js
@@ -14,9 +14,12 @@ angular.module('virtoCommerce.subscriptionModule')
                     };
 
                     if (blade.currentEntity.id) {
-                        newBlade.refreshCallback = function () {
+                        newBlade.refreshCallback = function (orderBlade, orderBladeCriteria) {
                             var criteria = {
-                                subscriptionIds: [blade.currentEntity.id]
+                                subscriptionIds: [blade.currentEntity.id],
+                                sort: orderBladeCriteria.sort,
+                                skip: orderBladeCriteria.skip,
+                                take: orderBladeCriteria.take
                             };
 
                             return orders.search(criteria);
@@ -27,4 +30,18 @@ angular.module('virtoCommerce.subscriptionModule')
                 }
             };
 
+            function refresh() {
+                $scope.ordersCount = '...';
+
+                var countSearchCriteria = {
+                    subscriptionIds: [blade.entityNode.id],
+                    take: 0
+                };
+
+                orders.search(countSearchCriteria, function (data) {
+                    $scope.ordersCount = data.totalCount;
+                });
+            }
+
+            refresh();
         }]);
diff --git a/src/VirtoCommerce.SubscriptionModule.Web/Scripts/widgets/subscription-orders-widget.tpl.html b/src/VirtoCommerce.SubscriptionModule.Web/Scripts/widgets/subscription-orders-widget.tpl.html
@@ -1,6 +1,6 @@
-<div class="gridster-cnt" ng-click="openBlade()">
+<div class="gridster-cnt" ng-click="openBlade()">
     <div class="cnt-inner">
-        <div class="list-count">{{blade.currentEntity.customerOrders ? blade.currentEntity.customerOrders.length : '...'}}</div>
+        <div class="list-count">{{ordersCount | number:0}}</div>
         <div class="list-t">{{'subscription.widgets.subscription-orders.title' | translate}}</div>
     </div>
 </div>
diff --git a/src/VirtoCommerce.SubscriptionModule.Web/module.manifest b/src/VirtoCommerce.SubscriptionModule.Web/module.manifest
@@ -3,12 +3,12 @@
   <id>VirtoCommerce.Subscription</id>
   <version>3.402.0</version>
   <version-tag />
-  <platformVersion>3.400.0</platformVersion>
+  <platformVersion>3.447.0</platformVersion>
   <dependencies>
     <dependency id="VirtoCommerce.Core" version="3.400.0" />
     <dependency id="VirtoCommerce.Customer" version="3.400.0" />
     <dependency id="VirtoCommerce.Notifications" version="3.400.0" />
-    <dependency id="VirtoCommerce.Orders" version="3.400.0" />
+    <dependency id="VirtoCommerce.Orders" version="3.426.2" />
     <dependency id="VirtoCommerce.Store" version="3.400.0" />
   </dependencies>
   <title>Subscriptions</title>
@@ -31,4 +31,4 @@
     <group>commerce</group>
   </groups>
   <useFullTypeNameInSwagger>false</useFullTypeNameInSwagger>
-</module>
+</module>