beenull/ctrlpanel
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' into localization

Browse source
This commit is contained in:
Dennis 2021-12-14 16:06:45 +01:00 committed by GitHub
parent 82ce13fcbd 42ec17b873
commit d572a603d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Models/PaypalProduct.php
View file

@ -43,7 +43,7 @@ class PaypalProduct extends Model
/** /**
* @param mixed $value * @param mixed $value
* @param string $locale * @param string $locale
* *
* @return float * @return float
*/ */
public function formatToCurrency($value,$locale = 'en_US') public function formatToCurrency($value,$locale = 'en_US')
@ -70,7 +70,7 @@ class PaypalProduct extends Model
*/ */
public function getTaxValue() public function getTaxValue()
{ {
return $this->price*$this->getTaxPercent()/100; return number_format($this->price*$this->getTaxPercent()/100,2);
} }
/** /**
@ -78,8 +78,8 @@ class PaypalProduct extends Model
* *
* @return float * @return float
*/ */
public function getTotalPrice() public function getTotalPrice()
{ {
return $this->price+($this->getTaxValue()); return number_format($this->price+$this->getTaxValue(),2);
} }
} }

4
resources/views/admin/products/index.blade.php
View file

@ -28,6 +28,7 @@
<div class="card-header"> <div class="card-header">
<div class="d-flex justify-content-between"> <div class="d-flex justify-content-between">
<h5 class="card-title"><i class="fas fa-sliders-h mr-2"></i>{{__('Products')}}</h5> <h5 class="card-title"><i class="fas fa-sliders-h mr-2"></i>{{__('Products')}}</h5>
<a href="{{route('admin.products.create')}}" class="btn btn-sm btn-primary"><i <a href="{{route('admin.products.create')}}" class="btn btn-sm btn-primary"><i
class="fas fa-plus mr-1"></i>{{__('Create new')}}</a> class="fas fa-plus mr-1"></i>{{__('Create new')}}</a>
@ -39,6 +40,7 @@
<table id="datatable" class="table table-striped"> <table id="datatable" class="table table-striped">
<thead> <thead>
<tr> <tr>
<th>{{__('Active')}}</th> <th>{{__('Active')}}</th>
<th>{{__('Name')}}</th> <th>{{__('Name')}}</th>
<th>{{__('Price')}}</th> <th>{{__('Price')}}</th>
@ -52,6 +54,7 @@
<th>{{__('Eggs')}}</th> <th>{{__('Eggs')}}</th>
<th>{{__('Servers')}}</th> <th>{{__('Servers')}}</th>
<th>{{__('Created at')}}</th> <th>{{__('Created at')}}</th>
<th></th> <th></th>
</tr> </tr>
</thead> </thead>
@ -77,6 +80,7 @@
language: { language: {
url: '//cdn.datatables.net/plug-ins/1.11.3/i18n/{{config("app.datatable_locale")}}.json' url: '//cdn.datatables.net/plug-ins/1.11.3/i18n/{{config("app.datatable_locale")}}.json'
}, },
processing: true, processing: true,
serverSide: true, serverSide: true,
stateSave: true, stateSave: true,