Skip to content

Commit

Permalink
fix(ZMS-3267): fix calling appointment again
Browse files Browse the repository at this point in the history
  • Loading branch information
manjencic committed Nov 18, 2024
1 parent dd7a6c5 commit 8feb9f5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions zmsadmin/js/page/availabilityDay/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,8 @@ export const cleanupFormData = data => {
return Object.assign({}, data, {
workstationCount_callcenter: callcenterCount,
workstationCount_public: publicCount,
open_from: (data.open_from === "0" || data.open_from === data.openFromDefault) ? "" : data.open_from,
open_to: (data.open_to === "0" || data.open_to === data.openToDefault) ? "" : data.open_to
open_from: (data.open_from === data.openFromDefault) ? "" : data.open_from,
open_to: (data.open_to === data.openToDefault) ? "" : data.open_to
})
}

Expand Down
2 changes: 1 addition & 1 deletion zmsdb/src/Zmsdb/Query/Availability.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public function getEntityMapping($type = null)
'scope__id' => 'availability.StandortID',
'bookable__startInDays' => self::expression(
'CAST(
IF(`availability`.`Offen_ab`, `availability`.`Offen_ab`, `availabilityscope`.`Termine_ab`)
IF(`availability`.`Offen_ab` = "0" OR `availability`.`Offen_ab`, `availability`.`Offen_ab`, `availabilityscope`.`Termine_ab`)
AS SIGNED)'
),
'bookable__endInDays' => self::expression(
Expand Down

0 comments on commit 8feb9f5

Please sign in to comment.