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

Minor fixes to get charging working

Browse Source
This commit is contained in:
Deon George 2022-02-02 16:01:12 +11:00
parent db0ded44e0
commit e9ada2468e
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/Service.php
View File

@ -52,8 +52,6 @@ class Service extends Model implements IDs
'billing_price', 'billing_price',
'name_short', 'name_short',
'next_invoice', 'next_invoice',
'product_category',
'product_name',
'service_id', 'service_id',
'service_id_url', 'service_id_url',
'status', 'status',

19
resources/views/theme/backend/adminlte/a/charge/addedit.blade.php
View File

@ -89,10 +89,10 @@
<span class="invalid-feedback" role="alert"> <span class="invalid-feedback" role="alert">
@error('account_id') @error('account_id')
{{ $message }} {{ $message }}
@else @else
Account is required. Account is required.
@enderror @enderror
</span> </span>
</div> </div>
<span class="input-helper">Account to add charge to.</span> <span class="input-helper">Account to add charge to.</span>
@ -114,10 +114,10 @@
</select> </select>
<span class="invalid-feedback" role="alert"> <span class="invalid-feedback" role="alert">
@error('sweep_type') @error('sweep_type')
{{ $message }} {{ $message }}
@else @else
Sweep Type is required. Sweep Type is required.
@enderror @enderror
</span> </span>
</div> </div>
<span class="input-helper">When to add the charge to an invoice.</span> <span class="input-helper">When to add the charge to an invoice.</span>
@ -171,13 +171,16 @@
<span class="invalid-feedback" role="alert"> <span class="invalid-feedback" role="alert">
@error('service_id') @error('service_id')
{{ $message }} {{ $message }}
@else @else
Service is required. Service is required.
@enderror @enderror
</span> </span>
</div> </div>
{{--
<!-- @todo -->
<span class="input-helper"><sup>**</sup>Service inactive.</span> <span class="input-helper"><sup>**</sup>Service inactive.</span>
--}}
</div> </div>
</div> </div>
@ -332,6 +335,10 @@
$('#service_id').select2(); $('#service_id').select2();
$('#sweep_type').select2();
$('#type').select2();
if ($('#quantity').val() && $('#amount').val()) { if ($('#quantity').val() && $('#amount').val()) {
total(); total();
} }