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

Co-authored-by: AlexTzykin <52533659+AlexTzykin@users.noreply.github.com>
VirtoCommerce · Jan 17, 2024 · 356ef80 · 356ef80
1 parent 92ae461
commit 356ef80
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 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="8.0.0" PrivateAssets="All" />
     <PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.800.0" />
-    <PackageReference Include="VirtoCommerce.OrdersModule.Core" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.OrdersModule.Core" Version="3.801.0" />
     <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.800.0" />
   </ItemGroup>
 </Project>
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
@@ -9,7 +9,7 @@
     <dependency id="VirtoCommerce.Core" version="3.800.0" />
     <dependency id="VirtoCommerce.Customer" version="3.800.0" />
     <dependency id="VirtoCommerce.Notifications" version="3.800.0" />
-    <dependency id="VirtoCommerce.Orders" version="3.800.0" />
+    <dependency id="VirtoCommerce.Orders" version="3.801.0" />
     <dependency id="VirtoCommerce.Store" version="3.800.0" />
   </dependencies>