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/13.js
#	public/js/23.js
#	public/js/app.js
This commit is contained in:
Dennis
2021-03-12 14:20:12 +01:00
parent 58d1215fd6 ab50beefab
commit d981f0f899
13 changed files with 232 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,6 +59,7 @@ class ProfileBillingController extends Controller
Package::CURRENCY_NOK => 'KR ',
Package::CURRENCY_CAD => 'CAD $',
Package::CURRENCY_AUD => 'AUD $',
Package::CURRENCY_GBP => 'GBP £',
];
$package->price_monthly = ($currencies[$package->currency] ?? '[Unknown currency]') . number_format($package->price_monthly, 2, ',', '.');

1
app/Http/Requests/Admin/PackageRequest.php
View File

@@ -39,6 +39,7 @@ class PackageRequest extends FormRequest
Package::CURRENCY_NOK,
Package::CURRENCY_AUD,
Package::CURRENCY_CAD,
Package::CURRENCY_GBP,
])
],
'maximum_sites' => [

1
app/Models/Package.php
View File

@@ -12,6 +12,7 @@ class Package extends Model
const CURRENCY_NOK = 'nok';
const CURRENCY_AUD = 'aud';
const CURRENCY_CAD = 'cad';
const CURRENCY_GBP = 'gbp';
public $fillable = [
'name',

565
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

6
public/js/13.js vendored
View File

File diff suppressed because one or more lines are too long

6
public/js/23.js vendored
View File

File diff suppressed because one or more lines are too long

6
public/js/app.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/vendor/horizon/app-dark.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/vendor/horizon/app.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/vendor/horizon/app.js vendored
View File

File diff suppressed because one or more lines are too long

6
public/vendor/horizon/mix-manifest.json vendored
View File

@@ -1,5 +1,5 @@
{
"/app.js": "/app.js?id=30865fb89488803d192a",
"/app.css": "/app.css?id=1dac05f3a17f5e92eea7",
"/app-dark.css": "/app-dark.css?id=821c845f9bf3b7853c33"
"/app.js": "/app.js?id=748961c604302b4c2389",
"/app.css": "/app.css?id=58229b999b8f6c26fffe",
"/app-dark.css": "/app-dark.css?id=cc86d678620cebdafaa7"
}

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

@@ -31,6 +31,7 @@
<FormSelect :errors="$page.props.errors.currency" v-if="form.plan_id" :label="__('Currency')" v-model="form.currency">
<option value="usd">{{ __('USD $') }}</option>
<option value="eur">{{ __('Euro €') }}</option>
<option value="gbp">{{ __('GBP £') }}</option>
<option value="nok">{{ __('NOK (Norwegian Krone)') }}</option>
<option value="aud">{{ __('AUD (Australian dollar)') }}</option>
<option value="cad">{{ __('CAD (Canadian dollar)') }}</option>

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

@@ -33,6 +33,7 @@
<FormSelect :errors="$page.props.errors.currency" v-if="form.plan_id" :label="__('Currency')" v-model="form.currency">
<option value="usd">{{ __('USD $') }}</option>
<option value="eur">{{ __('Euro €') }}</option>
<option value="gbp">{{ __('GBP £') }}</option>
<option value="nok">{{ __('NOK (Norwegian Krone)') }}</option>
<option value="aud">{{ __('AUD (Australian dollar)') }}</option>
<option value="cad">{{ __('CAD (Canadian dollar)') }}</option>