fix

ptibogxiv · Nov 5, 2024 · 393df28 · 393df28
1 parent d9a14bf
commit 393df28
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/dashboard/templates.php b/dashboard/templates.php
@@ -881,7 +881,7 @@ function dolishop_display($content) {
           $date = new DateTime(); 
           $date->modify('NOW');
           $lastdate = $date->format('Y-m-d');
-          $request = "/discountprice?sortfield=t.".$field."&sortorder=".$order."&limit=".$limit."&page=".$page."&pagination_data=true&sqlfilters=(t.date_begin%3A%3E%3D%3A'".$lastdate."')and(t.date_end%3A%3C%3D%3A'".$lastdate."')and(d.tosell:=:1)";
+          $request = "/discountprice?sortfield=t.".$field."&sortorder=".$order."&limit=".$limit."&page=".$page."&pagination_data=true&sqlfilters=(t.date_begin%3A%3C%3D%3A'".$lastdate."')and(t.date_end%3A%3E%3D%3A'".$lastdate."')and(d.tosell:=:1)";
           $object = callDoliApi("GET", $request, null, dolidelay('product', esc_attr(isset($_GET["refresh"]) ? $_GET["refresh"] : null)));
         } elseif (!isset($_GET["category"]) || isset($_GET["category"]) && $_GET["category"] == 'all') {
           $request = "/products?sortfield=t.".$field."&sortorder=".$order."&limit=".$limit."&page=".$page."&category=".esc_attr($shop)."&pagination_data=true&sqlfilters=(t.tosell:=:1)";

diff --git a/functions/widgets.php b/functions/widgets.php
@@ -461,11 +461,11 @@ public function widget( $args, $instance ) {
 		$date->modify('NOW');
 		$lastdate = $date->format('Y-m-d');
 		if ( doliversion('19.0.0') ) { 
-			$requestp = "/discountprice?sortfield=t.".$field."&sortorder=".$order."&limit=".$limit."&page=".$page."&pagination_data=true&sqlfilters=(t.date_begin%3A%3E%3D%3A'".$lastdate."')and(t.date_end%3A%3C%3D%3A'".$lastdate."')and(d.tosell:=:1)";
+			$requestp = "/discountprice?sortfield=t.".$field."&sortorder=".$order."&limit=".$limit."&page=".$page."&pagination_data=true&sqlfilters=(t.date_begin%3A%3C%3D%3A'".$lastdate."')and(t.date_end%3A%3E%3D%3A'".$lastdate."')and(d.tosell:=:1)";
 			$listproduct = callDoliApi("GET", $requestp, null, dolidelay('product', esc_attr(isset($_GET["refresh"]) ? $_GET["refresh"] : null)));  
 			$count = $listproduct->pagination->total;
 		} else { 
-			$requestp = "/discountprice?sortfield=t.rowid&sortorder=DESC&sqlfilters=(t.date_begin%3A%3E%3D%3A'".$lastdate."')and(t.date_end%3A%3C%3D%3A'".$lastdate."')and(d.tosell:=:1)";
+			$requestp = "/discountprice?sortfield=t.rowid&sortorder=DESC&sqlfilters=(t.date_begin%3A%3C%3D%3A'".$lastdate."')and(t.date_end%3A%3E%3D%3A'".$lastdate."')and(d.tosell:=:1)";
 			$listproduct = callDoliApi("GET", $requestp, null, dolidelay('product', esc_attr(isset($_GET["refresh"]) ? $_GET["refresh"] : null)));
 			if (empty($listproduct) || isset($listproduct->error)) {
 				$count = 0;