diff --git a/app/Http/Controllers/Users/AgencyController.php b/app/Http/Controllers/Users/AgencyController.php index 9753b14..e0b7350 100644 --- a/app/Http/Controllers/Users/AgencyController.php +++ b/app/Http/Controllers/Users/AgencyController.php @@ -33,4 +33,22 @@ class AgencyController extends Controller return redirect()->route('users.agency.show'); } + + public function logoUpload() + { + $file = request()->validate([ + 'logo' => 'required|max:100|file_extension:png,jpg', + ]); + + \File::delete(public_path('assets/imgs/'.Option::get('agency_logo_path'))); + + $filename = $file['logo']->getClientOriginalName(); + + $file['logo']->move(public_path('assets/imgs'), $filename); + + Option::set('agency_logo_path', $filename); + + flash(trans('agency.updated'), 'success'); + return redirect()->route('users.agency.show'); + } } diff --git a/app/Http/Controllers/Users/ProfileController.php b/app/Http/Controllers/Users/ProfileController.php index a3c5bc2..bd09b0b 100644 --- a/app/Http/Controllers/Users/ProfileController.php +++ b/app/Http/Controllers/Users/ProfileController.php @@ -24,7 +24,7 @@ class ProfileController extends Controller { $user = auth()->user(); - $user->name = request('name'); + $user->name = request('name'); $user->email = request('email'); $user->save(); diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 1f4eafa..2e729eb 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -14,6 +14,9 @@ class AppServiceProvider extends ServiceProvider public function boot() { require_once app_path().'/helpers.php'; + \Validator::extend('file_extension', function ($attribute, $value, $parameters, $validator) { + return in_array($value->getClientOriginalExtension(), $parameters); + }); } /** diff --git a/app/helpers.php b/app/helpers.php index abb68b8..b27a1f7 100755 --- a/app/helpers.php +++ b/app/helpers.php @@ -14,10 +14,10 @@ function formatRp($number) { if ($number == 0) {return 'Rp. 0';} if ($number < 0) { - return '- Rp. ' . formatNo(abs($number)); + return '- Rp. '.formatNo(abs($number)); } - return 'Rp. ' . formatNo($number); + return 'Rp. '.formatNo($number); } function formatDecimal($number) @@ -67,9 +67,9 @@ function formatDate($date) $explodedDate = explode('-', $date); if (count($explodedDate) == 3 && checkdate($explodedDate[1], $explodedDate[0], $explodedDate[2])) { - return $explodedDate[2] . '-' . $explodedDate[1] . '-' . $explodedDate[0]; + return $explodedDate[2].'-'.$explodedDate[1].'-'.$explodedDate[0]; } else if (count($explodedDate) == 3 && checkdate($explodedDate[1], $explodedDate[2], $explodedDate[0])) { - return $explodedDate[2] . '-' . $explodedDate[1] . '-' . $explodedDate[0]; + return $explodedDate[2].'-'.$explodedDate[1].'-'.$explodedDate[0]; } throw new App\Exceptions\InvalidDateException('Kesalahan format tanggal'); @@ -85,7 +85,7 @@ function dateId($date) if (count($explodedDate) == 3 && checkdate($explodedDate[1], $explodedDate[2], $explodedDate[0])) { $months = getMonths(); - return $explodedDate[2] . ' ' . $months[$explodedDate[1]] . ' ' . $explodedDate[0]; + return $explodedDate[2].' '.$months[$explodedDate[1]].' '.$explodedDate[0]; } throw new App\Exceptions\InvalidDateException('Kesalahan format tanggal'); @@ -110,7 +110,7 @@ function monthId($monthNumber) function getMonths() { return [ - '' => 'Pilih Bulan', + '' => 'Pilih Bulan', '01' => 'Januari', '02' => 'Pebruari', '03' => 'Maret', @@ -163,15 +163,15 @@ function sanitizeNumber($number) function formatSizeUnits($bytes) { if ($bytes >= 1073741824) { - $bytes = number_format($bytes / 1073741824, 2) . ' GB'; + $bytes = number_format($bytes / 1073741824, 2).' GB'; } elseif ($bytes >= 1048576) { - $bytes = number_format($bytes / 1048576, 2) . ' MB'; + $bytes = number_format($bytes / 1048576, 2).' MB'; } elseif ($bytes >= 1024) { - $bytes = number_format($bytes / 1024, 2) . ' KB'; + $bytes = number_format($bytes / 1024, 2).' KB'; } elseif ($bytes > 1) { - $bytes = $bytes . ' bytes'; + $bytes = $bytes.' bytes'; } elseif ($bytes == 1) { - $bytes = $bytes . ' byte'; + $bytes = $bytes.' byte'; } else { $bytes = '0 bytes'; } @@ -189,7 +189,7 @@ function formatSizeUnits($bytes) function html_link_to_route($name, $title = null, $parameters = [], $attributes = []) { if (array_key_exists('icon', $attributes)) { - $title = ' ' . $title; + $title = ' '.$title; } return app('html')->decode(link_to_route($name, $title, $parameters, $attributes)); @@ -234,3 +234,10 @@ function paymentTypes($paymentTypeId = null) return null; } + +function appLogoImage() +{ + $logoString = ''; + return $logoString; +} diff --git a/public/assets/imgs/default-logo.png b/public/assets/imgs/default-logo.png new file mode 100644 index 0000000..173223d Binary files /dev/null and b/public/assets/imgs/default-logo.png differ diff --git a/resources/lang/id/agency.php b/resources/lang/id/agency.php index 058c519..725b237 100644 --- a/resources/lang/id/agency.php +++ b/resources/lang/id/agency.php @@ -7,15 +7,18 @@ return [ 'detail' => 'Detail Agensi', // Actions - 'edit' => 'Edit Agensi', - 'update' => 'Update Agensi', - 'updated' => 'Update data Agensi telah berhasil.', + 'edit' => 'Edit Agensi', + 'update' => 'Update Agensi', + 'updated' => 'Update data Agensi telah berhasil.', + 'logo_change' => 'Ganti Logo Agensi', + 'logo_upload' => 'Upload Logo Agensi', // Attributes - 'name' => 'Nama Agensi', - 'tagline' => 'Tagline Agensi', - 'email' => 'Email Agensi', - 'website' => 'Website Agensi', - 'address' => 'Alamat Agensi', - 'phone' => 'Telp. Agensi', + 'name' => 'Nama Agensi', + 'tagline' => 'Tagline Agensi', + 'email' => 'Email Agensi', + 'website' => 'Website Agensi', + 'address' => 'Alamat Agensi', + 'phone' => 'Telp. Agensi', + 'logo' => 'Logo Agensi', ]; diff --git a/resources/lang/id/contact.php b/resources/lang/id/contact.php index 44c8566..452e1e1 100644 --- a/resources/lang/id/contact.php +++ b/resources/lang/id/contact.php @@ -6,4 +6,5 @@ return [ 'phone_abb' => 'Telp.', 'cellphone' => 'Telepon Selular', 'email' => 'Email', + 'website' => 'Website', ]; diff --git a/resources/views/layouts/partials/sidebar.blade.php b/resources/views/layouts/partials/sidebar.blade.php index 933022c..ec573bd 100755 --- a/resources/views/layouts/partials/sidebar.blade.php +++ b/resources/views/layouts/partials/sidebar.blade.php @@ -10,7 +10,7 @@