0045748: Discounts availability does not work properly in Web POS

diff --git a/web/org.openbravo.retail.discounts/js/discountsengine/common/discount-rules.js b/web/org.openbravo.retail.discounts/js/discountsengine/common/discount-rules.js
index b653fb2..db49139 100644
--- a/web/org.openbravo.retail.discounts/js/discountsengine/common/discount-rules.js
+++ b/web/org.openbravo.retail.discounts/js/discountsengine/common/discount-rules.js
@@ -257,17 +257,18 @@
      * Should not check lines, only properties related to the main ticket header
      * */
     isApplicableToTicket() {
-      if (this.discountImpl.startingDate) {
-        const startingDate = new Date(this.discountImpl.startingDate);
-        if (this.ticket.date.getTime() < startingDate.getTime()) {
-          return false;
-        }
+      const currentDate = new Date(new Date().toISOString().split('T')[0]);
+      if (
+        this.discountImpl.startingDate &&
+        new Date(this.discountImpl.startingDate.split('T')[0]) > currentDate
+      ) {
+        return false;
       }
-      if (this.discountImpl.endingDate) {
-        const endingDate = new Date(this.discountImpl.endingDate);
-        if (this.ticket.date.getTime() > endingDate.getTime()) {
-          return false;
-        }
+      if (
+        this.discountImpl.endingDate &&
+        new Date(this.discountImpl.endingDate.split('T')[0]) < currentDate
+      ) {
+        return false;
       }
 
       const weekDayArray = [

diff --git a/web/org.openbravo.retail.discounts/app/model/business-logic/discounts-engine/engine/discount-rules.js b/web/org.openbravo.retail.discounts/app/model/business-logic/discounts-engine/engine/discount-rules.js
index 5e51d63..f696f64 100644
--- a/web/org.openbravo.retail.discounts/app/model/business-logic/discounts-engine/engine/discount-rules.js
+++ b/web/org.openbravo.retail.discounts/app/model/business-logic/discounts-engine/engine/discount-rules.js
@@ -347,17 +347,21 @@
      * Should not check lines, only properties related to the main ticket header
      * */
     isApplicableToTicket() {
-      if (this.discountImpl.startingDate) {
-        const startingDate = new Date(this.discountImpl.startingDate);
-        if (this.ticket.orderDate.getTime() < startingDate.getTime()) {
-          return false;
-        }
+      const orderDate = this.ticket.orderDate
+        ? new Date(this.ticket.orderDate)
+        : new Date();
+      const currentDate = new Date(orderDate.toISOString().split('T')[0]);
+      if (
+        this.discountImpl.startingDate &&
+        new Date(this.discountImpl.startingDate.split('T')[0]) > currentDate
+      ) {
+        return false;
       }
-      if (this.discountImpl.endingDate) {
-        const endingDate = new Date(this.discountImpl.endingDate);
-        if (this.ticket.orderDate.getTime() > endingDate.getTime()) {
-          return false;
-        }
+      if (
+        this.discountImpl.endingDate &&
+        new Date(this.discountImpl.endingDate.split('T')[0]) < currentDate
+      ) {
+        return false;
       }
 
       const weekDayArray = [
@@ -369,11 +373,11 @@
         'friday',
         'saturday'
       ];
-      const weekDay = weekDayArray[this.ticket.orderDate.getDay()];
+      const weekDay = weekDayArray[orderDate.getDay()];
       if (this.discountImpl.allweekdays) {
         if (this.discountImpl.startingtime) {
           if (
-            this.ticket.orderDate.getTime() <
+            orderDate.getTime() <
             new Date(this.discountImpl.startingtime).getTime()
           ) {
             return false;
@@ -381,7 +385,7 @@
         }
         if (this.discountImpl.endingtime) {
           if (
-            this.ticket.orderDate.getTime() >
+            orderDate.getTime() >
             new Date(this.discountImpl.endingtime).getTime()
           ) {
             return false;
@@ -394,18 +398,18 @@
         const startProp = `startingtime${weekDay}`;
         const endProp = `endingtime${weekDay}`;
         if (this.discountImpl[startProp]) {
-          if (
-            this.ticket.orderDate.getTime() <
-            new Date(this.discountImpl[startProp]).getTime()
-          ) {
+          const startingTime = `${orderDate.toISOString().split('T')[0]}T${
+            this.discountImpl[startProp].split('T')[1]
+          }`;
+          if (orderDate.getTime() < new Date(startingTime).getTime()) {
             return false;
           }
         }
         if (this.discountImpl[endProp]) {
-          if (
-            this.ticket.orderDate.getTime() >
-            new Date(this.discountImpl[endProp]).getTime()
-          ) {
+          const endingTime = `${orderDate.toISOString().split('T')[0]}T${
+            this.discountImpl[endProp].split('T')[1]
+          }`;
+          if (orderDate.getTime() > new Date(endingTime).getTime()) {
             return false;
           }
         }