Merge branch 'release/3.805.0'

VirtoCommerce · May 29, 2024 · 4580bf0 · 4580bf0
2 parents b52ad1d + 0312707
commit 4580bf0
Show file tree

Hide file tree

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

diff --git a/src/VirtoCommerce.SubscriptionModule.Web/Scripts/blades/schedule-detail.tpl.html b/src/VirtoCommerce.SubscriptionModule.Web/Scripts/blades/schedule-detail.tpl.html
@@ -1,9 +1,9 @@
-<div class="blade-static __bottom" ng-include="'$(Platform)/Scripts/common/templates/create.tpl.html'" ng-if="blade.isNew"></div>
+<div class="blade-static __bottom" ng-include="'$(Platform)/Scripts/common/templates/create.tpl.html'" ng-if="blade.isNew"></div>
 <div class="blade-static __bottom" ng-include="'$(Platform)/Scripts/common/templates/ok-cancel2.tpl.html'" ng-if="!blade.isApiSave"></div>
 <div class="blade-content __tree">
     <div class="blade-inner">
         <div class="inner-block">
-            <form name="formScope">
+            <form name="formScope" class="form">
                 <fieldset ng-disabled="blade.isLocked">
                     <div class="clearfix" ng-init="setForm(formScope)">
                         <div class="column">

diff --git a/src/VirtoCommerce.SubscriptionModule.Web/Scripts/blades/subscription-detail.tpl.html b/src/VirtoCommerce.SubscriptionModule.Web/Scripts/blades/subscription-detail.tpl.html
@@ -1,4 +1,4 @@
-<div class="blade-content __medium-wide">
+<div class="blade-content __medium-wide">
     <div class="blade-inner">
         <div class="inner-block" ng-controller="virtoCommerce.orderModule.customerOrderDetailController">
             <div class="order-status clearfix">
@@ -7,10 +7,10 @@
                     <div class="reason" ng-bind="blade.currentEntity.cancelReason" ng-if="blade.currentEntity.isCancelled"></div>
                 </div>
                 <div class="column">
-                    <span>{{'subscription.blades.subscription-detail.labels.balance' | translate}}:&nbsp;{{blade.currentEntity.balance | number:2}}&nbsp;{{blade.customerOrder.currency}}</span>
+                    <div class="status">{{'subscription.blades.subscription-detail.labels.balance' | translate}}:&nbsp;{{blade.currentEntity.balance | number:2}}&nbsp;{{blade.customerOrder.currency}}</div>
                 </div>
             </div>
-            <form name="formScope">
+            <form name="formScope"  class="form">
                 <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/...ce.SubscriptionModule.Web/Scripts/widgets/integrations/order-subscription-widget.tpl.html b/...ce.SubscriptionModule.Web/Scripts/widgets/integrations/order-subscription-widget.tpl.html
@@ -1,5 +1,5 @@
-<div class="gridster-cnt" ng-click="openBlade()">
+<div class="gridster-cnt" ng-click="openBlade()">
     <div class="cnt-inner">
-        <div class="list-t" translate="{{subscription.number ? 'subscription.widgets.order-subscription.title' : 'subscription.widgets.order-subscription.title-no' }}" translate-values="{{subscription}}"></div>
+        <div class="list-t" translate="{{subscription.number ? 'subscription.widgets.order-subscription.title' : 'subscription.widgets.order-subscription.title-no' }}"></div>
     </div>
 </div>
diff --git a/...irtoCommerce.SubscriptionModule.Web/Scripts/widgets/integrations/schedule-widget.tpl.html b/...irtoCommerce.SubscriptionModule.Web/Scripts/widgets/integrations/schedule-widget.tpl.html
@@ -2,6 +2,6 @@
     <div class="cnt-inner">
         <i class="fas fa-sync-alt fa-2x fa-gray"></i>
         <div class="list-count" ng-if="loading">...</div>
-        <div class="list-t" ng-if="!loading" translate="{{schedule.id ? 'subscription.widgets.product-schedule.info' : 'subscription.widgets.product-schedule.no-schedule' }}" translate-values="{{schedule}}"></div>
+        <div class="list-t" ng-if="!loading" translate="{{schedule.id ? 'subscription.widgets.product-schedule.info' : 'subscription.widgets.product-schedule.no-schedule' }}" ></div>
     </div>
 </div>
diff --git a/src/VirtoCommerce.SubscriptionModule.Web/module.manifest b/src/VirtoCommerce.SubscriptionModule.Web/module.manifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <id>VirtoCommerce.Subscription</id>
-  <version>3.804.0</version>
+  <version>3.805.0</version>
   <version-tag />
   <platformVersion>3.825.0</platformVersion>
   <dependencies>