diff --git a/internal/transformer/order_transformer.go b/internal/transformer/order_transformer.go
index 2c9d7dd..eff4dc2 100644
--- a/internal/transformer/order_transformer.go
+++ b/internal/transformer/order_transformer.go
@@ -186,7 +186,6 @@ func ListOrdersQueryToModel(query *contract.ListOrdersQuery) *models.ListOrdersR
 		Limit:  query.Limit,
 	}
 
-	// Parse UUID fields
 	if query.OrganizationID != "" {
 		if organizationID, err := uuid.Parse(query.OrganizationID); err == nil {
 			req.OrganizationID = &organizationID
@@ -227,7 +226,6 @@ func ListOrdersQueryToModel(query *contract.ListOrdersQuery) *models.ListOrdersR
 		req.PaymentStatus = &paymentStatus
 	}
 
-	// Parse boolean fields
 	if query.IsVoid != "" {
 		if isVoid, err := strconv.ParseBool(query.IsVoid); err == nil {
 			req.IsVoid = &isVoid
@@ -240,19 +238,23 @@ func ListOrdersQueryToModel(query *contract.ListOrdersQuery) *models.ListOrdersR
 		}
 	}
 
-	// Parse date fields
 	if query.DateFrom != "" {
-		if dateFrom, err := time.Parse("2006-01-02", query.DateFrom); err == nil {
+		if dateFrom, err := time.Parse(ddmmyyyy, query.DateFrom); err == nil {
 			req.DateFrom = &dateFrom
 		}
 	}
 
 	if query.DateTo != "" {
-		if dateTo, err := time.Parse("2006-01-02", query.DateTo); err == nil {
+		if dateTo, err := time.Parse(ddmmyyyy, query.DateTo); err == nil {
 			req.DateTo = &dateTo
 		}
 	}
 
+	if query.DateFrom == query.DateTo {
+		newDate := req.DateTo.AddDate(0, 0, 1)
+		req.DateTo = &newDate
+	}
+
 	return req
 }