davidl/ploi-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source 
# Conflicts:
#	public/js/app.js
This commit is contained in:
Dennis
2021-05-17 12:10:01 +02:00
parent 120b4c9df7 08fcb0ce01
commit 180803cd8a
7 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/Http/Controllers/Profile/ProfileBillingController.php
View File

@@ -53,17 +53,9 @@ class ProfileBillingController extends Controller
})
->get()
->transform(function (Package $package) {
$currencies = [
Package::CURRENCY_EURO => '€',
Package::CURRENCY_USD => '$',
Package::CURRENCY_NOK => 'KR ',
Package::CURRENCY_CAD => 'CAD $',
Package::CURRENCY_AUD => 'AUD $',
Package::CURRENCY_GBP => 'GBP £',
Package::CURRENCY_INR => 'INR ',
];
$currency = $this->transformCurrency($package->currency);
$package->price_monthly = ($currencies[$package->currency] ?? '[Unknown currency]') . number_format($package->price_monthly, 2, ',', '.');
$package->price_monthly = ($currency ?? '[Unknown currency]') . number_format($package->price_monthly, 2, ',', '.');
return $package;
});
@@ -175,7 +167,7 @@ class ProfileBillingController extends Controller
public function invoices(Request $request)
{
return $request->user()->invoices()->map(function ($invoice) {
$symbol = $invoice->currency === Package::CURRENCY_EURO ? '€' : '$';
$symbol = $this->transformCurrency($invoice->currency);
return [
'id' => $invoice->id,
@@ -195,4 +187,19 @@ class ProfileBillingController extends Controller
'product' => 'Webhosting'
]);
}
protected function transformCurrency($key)
{
$currencies = [
Package::CURRENCY_EURO => '€',
Package::CURRENCY_USD => '$',
Package::CURRENCY_NOK => 'KR ',
Package::CURRENCY_CAD => 'CAD $',
Package::CURRENCY_AUD => 'AUD $',
Package::CURRENCY_GBP => 'GBP £',
Package::CURRENCY_INR => 'INR ₹',
];
return $currencies[strtolower($key)];
}
}

1
public/js/1382.js vendored
View File

File diff suppressed because one or more lines are too long

1
public/js/2076.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
public/js/3028.js vendored
View File

File diff suppressed because one or more lines are too long

1
public/js/7566.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
resources/js/Pages/Admin/Packages/Create.vue
View File

@@ -35,7 +35,7 @@
<option value="nok">{{ __('NOK (Norwegian Krone)') }}</option>
<option value="aud">{{ __('AUD (Australian dollar)') }}</option>
<option value="cad">{{ __('CAD (Canadian dollar)') }}</option>
<option value="inr">{{ __('INR (Indian rupee)') }}</option>
<option value="inr">{{ __('INR ₹ (Indian rupee)') }}</option>
</FormSelect>
<div class="space-y-4">

2
resources/js/Pages/Admin/Packages/Edit.vue
View File

@@ -37,7 +37,7 @@
<option value="nok">{{ __('NOK (Norwegian Krone)') }}</option>
<option value="aud">{{ __('AUD (Australian dollar)') }}</option>
<option value="cad">{{ __('CAD (Canadian dollar)') }}</option>
<option value="inr">{{ __('INR (Indian rupee)') }}</option>
<option value="inr">{{ __('INR ₹ (Indian rupee)') }}</option>
</FormSelect>
<div class="space-y-4">