Skip to content

Commit b3d2b36

Browse files
RoardomRoardom
authored
Merge pull request HDInnovations#5345 from Oha-you/donation-fixes-4
(Fix) Donation Staff views, remove hardcoded currency, make consistent
2 parents 98a2c59 + 6bc0e08 commit b3d2b36

File tree

6 files changed

+61
-22
lines changed

6 files changed

+61
-22
lines changed

‎resources/views/Staff/donation-gateway/create.blade.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,11 @@
3535
<tr>
3636
<td>
3737
<input
38-
type="number"
38+
type="text"
39+
inputmode="numeric"
40+
pattern="[0-9]+"
3941
name="position"
42+
required
4043
value=""
4144
placeholder="0"
4245
class="form__text"
@@ -46,6 +49,7 @@ class="form__text"
4649
<input
4750
type="text"
4851
name="name"
52+
required
4953
value=""
5054
placeholder="Name"
5155
class="form__text"
@@ -55,6 +59,7 @@ class="form__text"
5559
<input
5660
type="text"
5761
name="address"
62+
required
5863
value=""
5964
placeholder="Address"
6065
class="form__text"

‎resources/views/Staff/donation-gateway/edit.blade.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@
4242
<td>
4343
<input
4444
type="text"
45+
inputmode="numeric"
46+
pattern="[0-9]+"
4547
name="position"
48+
required
4649
value="{{ $gateway->position }}"
4750
class="form__text"
4851
/>
@@ -51,6 +54,7 @@ class="form__text"
5154
<input
5255
type="text"
5356
name="name"
57+
required
5458
value="{{ $gateway->name }}"
5559
class="form__text"
5660
/>
@@ -59,6 +63,7 @@ class="form__text"
5963
<input
6064
type="text"
6165
name="address"
66+
required
6267
value="{{ $gateway->address }}"
6368
class="form__text"
6469
/>

‎resources/views/Staff/donation-package/create.blade.php‎

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<th>Position</th>
2929
<th>Name</th>
3030
<th>Description</th>
31-
<th>Cost</th>
31+
<th>Cost ({{ config('donation.currency') }})</th>
3232
<th>Upload (Bytes)</th>
3333
<th>Invite (#)</th>
3434
<th>Bonus (#)</th>
@@ -40,8 +40,11 @@
4040
<tr>
4141
<td>
4242
<input
43-
type="number"
43+
type="text"
44+
inputmode="numeric"
45+
pattern="[0-9]+"
4446
name="position"
47+
required
4548
value=""
4649
placeholder="0"
4750
class="form__text"
@@ -51,6 +54,7 @@ class="form__text"
5154
<input
5255
type="text"
5356
name="name"
57+
required
5458
value=""
5559
placeholder="Name"
5660
class="form__text"
@@ -59,23 +63,28 @@ class="form__text"
5963
<td>
6064
<textarea
6165
name="description"
66+
required
6267
placeholder="Description"
6368
class="form__textarea"
6469
></textarea>
6570
</td>
6671
<td>
6772
<input
68-
type="number"
69-
step="1.00"
73+
type="text"
74+
inputmode="numeric"
75+
pattern="[0-9]+(?:\.[0-9]{1,2})?"
7076
name="cost"
77+
required
7178
value=""
7279
placeholder="Cost"
7380
class="form__text"
7481
/>
7582
</td>
7683
<td>
7784
<input
78-
type="number"
85+
type="text"
86+
inputmode="numeric"
87+
pattern="[0-9]*"
7988
name="upload_value"
8089
value=""
8190
placeholder="nullable"
@@ -84,7 +93,9 @@ class="form__text"
8493
</td>
8594
<td>
8695
<input
87-
type="number"
96+
type="text"
97+
inputmode="numeric"
98+
pattern="[0-9]*"
8899
name="invite_value"
89100
value=""
90101
placeholder="nullable"
@@ -93,7 +104,9 @@ class="form__text"
93104
</td>
94105
<td>
95106
<input
96-
type="number"
107+
type="text"
108+
inputmode="numeric"
109+
pattern="[0-9]*"
97110
name="bonus_value"
98111
value=""
99112
placeholder="nullable"
@@ -102,7 +115,9 @@ class="form__text"
102115
</td>
103116
<td>
104117
<input
105-
type="number"
118+
type="text"
119+
inputmode="numeric"
120+
pattern="[0-9]*"
106121
name="donor_value"
107122
value=""
108123
placeholder="(empty for lifetime)"

‎resources/views/Staff/donation-package/edit.blade.php‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
<th>Position</th>
3535
<th>Name</th>
3636
<th>Description</th>
37-
<th>Cost</th>
38-
<th>Upload (GiB)</th>
37+
<th>Cost ({{ config('donation.currency') }})</th>
38+
<th>Upload (Bytes)</th>
3939
<th>Invite (#)</th>
4040
<th>Bonus (#)</th>
4141
<th>Supporter (Days)</th>
@@ -48,7 +48,10 @@
4848
<td>
4949
<input
5050
type="text"
51+
inputmode="numeric"
52+
pattern="[0-9]+"
5153
name="position"
54+
required
5255
value="{{ $package->position }}"
5356
class="form__text"
5457
/>
@@ -57,52 +60,63 @@ class="form__text"
5760
<input
5861
type="text"
5962
name="name"
63+
required
6064
value="{{ $package->name }}"
6165
class="form__text"
6266
/>
6367
</td>
6468
<td>
65-
<textarea name="description" class="form__textarea">
69+
<textarea name="description" required class="form__textarea">
6670
{{ $package->description }}</textarea
6771
>
6872
</td>
6973

7074
<td>
7175
<input
72-
type="number"
73-
step="0.01"
76+
type="text"
77+
inputmode="numeric"
78+
pattern="[0-9]+(?:\.[0-9]{1,2})?"
7479
name="cost"
80+
required
7581
value="{{ $package->cost }}"
7682
class="form__text"
7783
/>
7884
</td>
7985
<td>
8086
<input
81-
type="number"
87+
type="text"
88+
inputmode="numeric"
89+
pattern="[0-9]*"
8290
name="upload_value"
8391
value="{{ $package->upload_value }}"
8492
class="form__text"
8593
/>
8694
</td>
8795
<td>
8896
<input
89-
type="number"
97+
type="text"
98+
inputmode="numeric"
99+
pattern="[0-9]*"
90100
name="invite_value"
91101
value="{{ $package->invite_value }}"
92102
class="form__text"
93103
/>
94104
</td>
95105
<td>
96106
<input
97-
type="number"
107+
type="text"
108+
inputmode="numeric"
109+
pattern="[0-9]*"
98110
name="bonus_value"
99111
value="{{ $package->bonus_value }}"
100112
class="form__text"
101113
/>
102114
</td>
103115
<td>
104116
<input
105-
type="number"
117+
type="text"
118+
inputmode="numeric"
119+
pattern="[0-9]*"
106120
name="donor_value"
107121
value="{{ $package->donor_value }}"
108122
class="form__text"

‎resources/views/Staff/donation-package/index.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class="panel__action form__button form__button--text"
3030
<tr>
3131
<th>Position</th>
3232
<th>Name</th>
33-
<th>Cost</th>
33+
<th>Cost ({{ config('donation.currency') }})</th>
3434
<th>Upload (GiB)</th>
3535
<th>Invite (#)</th>
3636
<th>Bonus (#)</th>
@@ -50,7 +50,7 @@ class="panel__action form__button form__button--text"
5050
{{ $package->name }}
5151
</a>
5252
</td>
53-
<td>$ {{ $package->cost }}</td>
53+
<td>{{ $package->cost }}</td>
5454
<td>
5555
{{ App\Helpers\StringHelper::formatBytes($package->upload_value ?? 0) }}
5656
</td>

‎resources/views/Staff/donation/index.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<th>Date</th>
3838
<th>User</th>
3939
<th>Transaction</th>
40-
<th>Cost</th>
40+
<th>Cost ({{ config('donation.currency') }})</th>
4141
<th>Upload #</th>
4242
<th>Invite #</th>
4343
<th>Bonus #</th>
@@ -60,7 +60,7 @@
6060
class="{{ $donation->package->trashed() ? 'text-danger' : '' }}"
6161
title="{{ $donation->package->trashed() ? 'Package has been deleted' : '' }}"
6262
>
63-
$ {{ $donation->package->cost }}
63+
{{ $donation->package->cost }}
6464
</td>
6565
<td
6666
class="{{ $donation->package->trashed() ? 'text-danger' : '' }}"

0 commit comments

Comments
 (0)