deon/osb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix invoices not being generated when price is null, service update rendering updates

Browse Source
This commit is contained in:
Deon George
2022-10-18 17:24:53 +11:00
parent a87560ff96
commit bfd17b0686
6 changed files with 95 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/ServiceController.php
View File

@@ -421,6 +421,12 @@ class ServiceController extends Controller
if ($request->post('recur_schedule'))
$o->recur_schedule = $request->recur_schedule;
$o->suspend_billing = ($request->suspend_billing == 'on');
$o->external_billing = ($request->external_billing == 'on');
// @todo Cant have both price and price_override - show an exception. (price_override shows a discount, whereas price shows the price)
$o->price = $request->price ?: NULL;
$o->price_override = $request->price_override ?: NULL;
// Also update our service start_at date.
// @todo We may want to make start_at/stop_at dynamic values calculated by the type records
if ($request->post('start_at'))

2
app/Models/Service.php
View File

@@ -1190,7 +1190,7 @@ class Service extends Model implements IDs
*/
public function isBilled(): bool
{
return ! ($this->external_billing || $this->suspend_billing || ($this->price == 0));
return ! ($this->external_billing || $this->suspend_billing || ($this->price === 0));
}
/**