v6.1.0

cytech · Mar 27, 2023 · 2cefd18 · 2cefd18
1 parent 26cb702
commit 2cefd18
Show file tree

Hide file tree

Showing 8 changed files with 304 additions and 241 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 - adminlte to v4-dev-bs530
 - revamp skinning with bootstrap 5.3 color-modes
 - add condensed option to timesheet report
+- fix product cost to price in add product
+- fix custom fields error in add modules
+- modify client activity widget
 
 ## 6.0.6
 - update Fullcalendar to v6.x

diff --git a/app/Modules/Documentation/Views/documentation/Release-Notes.md b/app/Modules/Documentation/Views/documentation/Release-Notes.md
@@ -10,6 +10,10 @@ Release Notes
 - adminlte to v4-dev-bs530
 - revamp skinning with bootstrap 5.3 color-modes
 - add condensed option to timesheet report
+- fix product cost to price in add product
+- fix custom fields error in add modules
+- modify client activity widget
+
 
 ### BillingTrack 6.0.6 (2023-01-12)
 - update Fullcalendar to v6.x

diff --git a/app/Modules/Documentation/Views/documentation/Upgrade.md b/app/Modules/Documentation/Views/documentation/Upgrade.md
@@ -24,7 +24,7 @@ Upgrade
 - After migration completes, signin.
 
 # UPGRADE FROM BILLINGTRACK 5.X.X
-**Minimum PHP requirement for BillingTrack-Wired (v6.X.X) is PHP >= 8.0.2**
+**Minimum PHP requirement for BillingTrack-Wired (v6.X.X) is PHP >= 8.1**
 - Create a new installation/site. (see [How to Install BillingTrack](Installation.md))
 - Although it is theoretically possible to do so, do not attempt to upgrade an existing BillingTrack 5.x.x Site.
 - This is a new repository and existing cloners will not be able to pull the update.

diff --git a/app/Modules/TimeTracking/Views/time_tracking/_task_list.blade.php b/app/Modules/TimeTracking/Views/time_tracking/_task_list.blade.php
@@ -8,12 +8,12 @@
             </span>
             <input type="checkbox" class="checkbox-bulk-action" data-task-id="{{ $task->id }}">
             @if (!$task->activeTimer)
-                <button class="btn btn-sm bg-green btn-start-timer" data-task-id="{{ $task->id }}"><i
+                <button class="btn btn-sm btn-green btn-start-timer" data-task-id="{{ $task->id }}"><i
                             class="fa fa-play"></i> <strong>@lang('bt.start_timer')<br>
                         {{ $task->formatted_hours }} @lang('bt.hours')</strong>
                 </button>
             @else
-                <button class="btn btn-sm bg-red btn-stop-timer" data-timer-id="{{ $task->activeTimer->id }}"
+                <button class="btn btn-sm btn-red btn-stop-timer" data-timer-id="{{ $task->activeTimer->id }}"
                         data-task-id="{{ $task->id }}"><i class="fa fa-stop"></i> <strong>@lang('bt.stop_timer')<br>
                         <span id="hours_{{ $task->id }}">00</span>:<span id="minutes_{{ $task->id }}">00</span>:<span
                                 id="seconds_{{ $task->id }}">00</span></strong>