Merge branch 'release/3.815.0'

VirtoCommerce · Dec 19, 2024 · 89aeb27 · 89aeb27
2 parents ca99b12 + 022e03a
commit 89aeb27
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 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.814.0</VersionPrefix>
+    <VersionPrefix>3.815.0</VersionPrefix>
     <VersionSuffix>
     </VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

diff --git a/src/VirtoCommerce.CoreModule.Web/Scripts/dynamicConditions/all-templates.html b/src/VirtoCommerce.CoreModule.Web/Scripts/dynamicConditions/all-templates.html
@@ -101,7 +101,7 @@
         <ul class="menu __context" role="menu" id="compareCondition_menu{{element1.id}}">
             <li class="menu-item" ng-click='element1.compareCondition="Exactly";'>exactly</li>
             <li class="menu-item" ng-click='element1.compareCondition="AtLeast";'>at least</li>
-            <li class="menu-item" ng-click='element1.compareCondition="IsLessThanOrEqual";'>exacly or less than</li>
+            <li class="menu-item" ng-click='element1.compareCondition="IsLessThanOrEqual";'>exactly or less than</li>
             <li class="menu-item" ng-click='element1.compareCondition="Between";element1.subTotalSecond = element1.subTotal;'>between</li>
         </ul>
 </script>
@@ -118,7 +118,7 @@
         <ul class="menu __context" role="menu" id="compareCondition_menu{{element1.id}}">
             <li class="menu-item" ng-click='element1.compareCondition="Exactly";'>exactly</li>
             <li class="menu-item" ng-click='element1.compareCondition="AtLeast";'>at least</li>
-            <li class="menu-item" ng-click='element1.compareCondition="IsLessThanOrEqual";'>exacly or less than</li>
+            <li class="menu-item" ng-click='element1.compareCondition="IsLessThanOrEqual";'>exactly or less than</li>
             <li class="menu-item" ng-click='element1.compareCondition="Between";element1.numItemSecond = element1.numItem;'>between</li>
         </ul>
 </script>
@@ -137,7 +137,7 @@
         <ul class="menu __context" role="menu" id="compareCondition_menu{{element1.id}}">
             <li class="menu-item" ng-click='element1.compareCondition="Exactly";'>exactly</li>
             <li class="menu-item" ng-click='element1.compareCondition="AtLeast";'>at least</li>
-            <li class="menu-item" ng-click='element1.compareCondition="IsLessThanOrEqual";'>exacly or less than</li>
+            <li class="menu-item" ng-click='element1.compareCondition="IsLessThanOrEqual";'>exactly or less than</li>
             <li class="menu-item" ng-click='element1.compareCondition="Between";element1.numItemSecond = element1.numItem;'>between</li>
         </ul>
 
@@ -238,7 +238,6 @@
     <a class="__link" ng-click="openItemSelectWizard(element1)">{{element1.productName?element1.productName + ' (' + element1.productCode + ')' : 'select product' }}</a>
 </script>
 <script type="text/ng-template" id="expression-RewardItemGetOfRel.html">
-
     <div class="form-input __mini __number">
         <input smart-float num-type="float" required ng-model="element1.amount">
     </div>% off for
@@ -247,7 +246,12 @@
     <div class="form-input __mini">
         <input money required ng-model="element1.maxLimit">
     </div>
-
+    , <a class="__link" left-click-menu data-target="trueFalse_menu_{{element1.$$hashKey}}">{{ element1.roundAmountPerItem | boolToValue:'round':"don't round"}}</a>
+    <ul class="menu __context" role="menu" id="trueFalse_menu_{{element1.$$hashKey}}">
+        <li class="menu-item" ng-click='element1.roundAmountPerItem=true;'>round</li>
+        <li class="menu-item" ng-click='element1.roundAmountPerItem=false;'>don't round</li>
+    </ul>
+     amount per item
 </script>
 <script type="text/ng-template" id="expression-RewardItemGetOfAbsForNum.html">
     $
@@ -258,9 +262,14 @@
         <input smart-float num-type="integer" required ng-model="element1.numItem">
     </div>items of this product:
     <a class="__link" ng-click="openItemSelectWizard(element1)">{{element1.productName?element1.productName + ' (' + element1.productCode + ')' : 'select product' }}</a>
+    , <a class="__link" left-click-menu data-target="trueFalse_menu_{{element1.$$hashKey}}">{{ element1.roundAmountPerItem | boolToValue:'round':"don't round"}}</a>
+    <ul class="menu __context" role="menu" id="trueFalse_menu_{{element1.$$hashKey}}">
+        <li class="menu-item" ng-click='element1.roundAmountPerItem=true;'>round</li>
+        <li class="menu-item" ng-click='element1.roundAmountPerItem=false;'>don't round</li>
+    </ul>
+     amount per item
 </script>
 <script type="text/ng-template" id="expression-RewardItemGetOfRelForNum.html">
-
     <div class="form-input __mini __number">
         <input smart-float num-type="float" required ng-model="element1.amount">
     </div>% off, no more than $
@@ -273,8 +282,13 @@
     <div>
         items of this product:
         <a class="__link" ng-click="openItemSelectWizard(element1)">{{element1.productName?element1.productName + ' (' + element1.productCode + ')' : 'select product' }}</a>
-
     </div>
+    , <a class="__link" left-click-menu data-target="trueFalse_menu_{{element1.$$hashKey}}">{{ element1.roundAmountPerItem | boolToValue:'round':"don't round"}}</a>
+    <ul class="menu __context" role="menu" id="trueFalse_menu_{{element1.$$hashKey}}">
+        <li class="menu-item" ng-click='element1.roundAmountPerItem=true;'>round</li>
+        <li class="menu-item" ng-click='element1.roundAmountPerItem=false;'>don't round</li>
+    </ul>
+     amount per item
 </script>
 <script type="text/ng-template" id="expression-RewardShippingGetOfAbsShippingMethod.html">
     $
@@ -355,6 +369,12 @@
             <input money required ng-model="element1.maxLimit">
         </div>
     </div>
+    , <a class="__link" left-click-menu data-target="trueFalse_menu_{{element1.$$hashKey}}">{{ element1.roundAmountPerItem | boolToValue:'round':"don't round"}}</a>
+    <ul class="menu __context" role="menu" id="trueFalse_menu_{{element1.$$hashKey}}">
+        <li class="menu-item" ng-click='element1.roundAmountPerItem=true;'>round</li>
+        <li class="menu-item" ng-click='element1.roundAmountPerItem=false;'>don't round</li>
+    </ul>
+     amount per item
 </script>
 <script type="text/ng-template" id="expression-RewardItemForEveryNumOtherItemInGetOfRel.html">
     For

diff --git a/src/VirtoCommerce.CoreModule.Web/module.manifest b/src/VirtoCommerce.CoreModule.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.Core</id>
-  <version>3.814.0</version>
+  <version>3.815.0</version>
   <version-tag />
   <platformVersion>3.853.0</platformVersion>
   <title>Commerce core module</title>