Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development

This commit is contained in:
omair saleh
2022-03-10 19:45:32 +08:00
5 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -17,7 +17,7 @@ class TransactionResource extends JsonResource
public function toArray($request)
{
$booking = (int)$this->type === TransactionType::BILL ? $this->owner->owner : $this->booking;
$days = Carbon::parse($this->created_at->format('d-m-Y'))->addDays($booking->service_id === 1 ? 2 : 3);
$days = $this->updated_at->endOfDay()->addWeekdays($booking->service_id === 1 ? 1 : 3);
return [
'id' => $this->id,