From 950db6a3aed13d654c8014ce260893139e77899b Mon Sep 17 00:00:00 2001 From: sanjay bhatt Date: Wed, 21 Dec 2022 12:55:00 +0530 Subject: [PATCH 1/4] Issue #1138 fixed --- src/Http/routes.php | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/Http/routes.php b/src/Http/routes.php index 89161f3..0b6447f 100644 --- a/src/Http/routes.php +++ b/src/Http/routes.php @@ -1,22 +1,24 @@ 'admin/google', - 'namespace' => 'Webkul\Google\Http\Controllers', - 'middleware' => ['web'] -], function () { - - Route::group(['middleware' => ['user']], function () { - Route::get('', 'AccountController@index')->name('admin.google.index'); +Route::group(['middleware' => ['web', 'admin_locale']], function () { + Route::group([ + 'prefix' => 'admin/google', + 'namespace' => 'Webkul\Google\Http\Controllers', + 'middleware' => ['web'] + ], function () { + + Route::group(['middleware' => ['user']], function () { + Route::get('', 'AccountController@index')->name('admin.google.index'); - Route::get('oauth', 'AccountController@store')->name('admin.google.store'); + Route::get('oauth', 'AccountController@store')->name('admin.google.store'); - Route::delete('{id}', 'AccountController@destroy')->name('admin.google.destroy'); + Route::delete('{id}', 'AccountController@destroy')->name('admin.google.destroy'); - Route::post('sync/{id}', 'CalendarController@sync')->name('admin.google.calendar.sync'); + Route::post('sync/{id}', 'CalendarController@sync')->name('admin.google.calendar.sync'); - Route::post('create-link', 'MeetController@createLink')->name('admin.google.meet.create_link'); - }); + Route::post('create-link', 'MeetController@createLink')->name('admin.google.meet.create_link'); + }); - Route::post('webhook', 'WebhookController')->name('admin.google.webhook'); + Route::post('webhook', 'WebhookController')->name('admin.google.webhook'); + }); }); \ No newline at end of file From 4676fa7de37ffd4b53b4b53bb7ae5d2e690869fc Mon Sep 17 00:00:00 2001 From: suraj kashyap Date: Wed, 25 Sep 2024 12:38:39 +0530 Subject: [PATCH 2/4] fix routes and lang issue. --- src/Http/routes.php | 10 +++++----- src/Resources/lang/es/app.php | 23 +++++++++++++++++++++++ src/Resources/lang/fa/app.php | 23 +++++++++++++++++++++++ src/Resources/lang/tr/app.php | 23 +++++++++++++++++++++++ 4 files changed, 74 insertions(+), 5 deletions(-) create mode 100644 src/Resources/lang/es/app.php create mode 100644 src/Resources/lang/fa/app.php create mode 100644 src/Resources/lang/tr/app.php diff --git a/src/Http/routes.php b/src/Http/routes.php index 0b6447f..26c302c 100644 --- a/src/Http/routes.php +++ b/src/Http/routes.php @@ -1,11 +1,12 @@ ['web', 'admin_locale']], function () { - Route::group([ + Route::group([ 'prefix' => 'admin/google', 'namespace' => 'Webkul\Google\Http\Controllers', - 'middleware' => ['web'] ], function () { - Route::group(['middleware' => ['user']], function () { Route::get('', 'AccountController@index')->name('admin.google.index'); @@ -19,6 +20,5 @@ }); Route::post('webhook', 'WebhookController')->name('admin.google.webhook'); - }); -}); \ No newline at end of file +}); diff --git a/src/Resources/lang/es/app.php b/src/Resources/lang/es/app.php new file mode 100644 index 0000000..fd56c38 --- /dev/null +++ b/src/Resources/lang/es/app.php @@ -0,0 +1,23 @@ + 'Google', + 'calendar' => 'Calendario', + 'meet' => 'Meet', + 'back' => 'Atrás', + 'connect-google-calendar' => 'Conectar Calendario de Google', + 'connect-google-meet' => 'Conectar Google Meet', + 'google-calendar' => 'Calendario de Google', + 'google-meet' => 'Google Meet', + 'google-calendar-info' => 'Calendario de gestión del tiempo y programación de Google para mejorar la velocidad de trabajo.', + 'google-meet-info' => 'Crea enlaces de Meet directamente al momento de crear actividades para mejorar la velocidad de trabajo.', + 'remove' => 'Eliminar', + 'synced-account' => 'Cuenta Sincronizada', + 'select' => 'Por favor selecciona', + 'select-calendar' => 'Selecciona el calendario que deseas sincronizar', + 'select-calendar-info' => 'Los eventos recurrentes de tu calendario no se sincronizarán con el CRM.', + 'sync-success' => 'Eventos sincronizados exitosamente.', + 'destroy-success' => 'Cuenta de Google eliminada con éxito.', + 'save-sync' => 'Guardar y Sincronizar', + 'confirm-remove' => '¿Estás seguro de que deseas eliminar la cuenta de Google?' +]; diff --git a/src/Resources/lang/fa/app.php b/src/Resources/lang/fa/app.php new file mode 100644 index 0000000..76cd5eb --- /dev/null +++ b/src/Resources/lang/fa/app.php @@ -0,0 +1,23 @@ + 'گوگل', + 'calendar' => 'تقویم', + 'meet' => 'میت', + 'back' => 'بازگشت', + 'connect-google-calendar' => 'اتصال تقویم گوگل', + 'connect-google-meet' => 'اتصال گوگل میت', + 'google-calendar' => 'تقویم گوگل', + 'google-meet' => 'گوگل میت', + 'google-calendar-info' => 'تقویم مدیریت زمان و برنامه‌ریزی گوگل برای افزایش سرعت کار.', + 'google-meet-info' => 'ایجاد لینک‌های میت در زمان ایجاد فعالیت برای افزایش سرعت کار.', + 'remove' => 'حذف', + 'synced-account' => 'حساب همگام‌سازی شده', + 'select' => 'لطفاً انتخاب کنید', + 'select-calendar' => 'تقویمی را که می‌خواهید همگام کنید انتخاب کنید', + 'select-calendar-info' => 'رویدادهای تکراری از تقویم شما با CRM همگام نخواهند شد.', + 'sync-success' => 'رویدادها با موفقیت همگام‌سازی شدند.', + 'destroy-success' => 'حساب گوگل با موفقیت حذف شد.', + 'save-sync' => 'ذخیره و همگام‌سازی', + 'confirm-remove' => 'آیا مطمئن هستید که می‌خواهید حساب گوگل را حذف کنید؟' +]; diff --git a/src/Resources/lang/tr/app.php b/src/Resources/lang/tr/app.php new file mode 100644 index 0000000..8d679af --- /dev/null +++ b/src/Resources/lang/tr/app.php @@ -0,0 +1,23 @@ + 'Google', + 'calendar' => 'Takvim', + 'meet' => 'Meet', + 'back' => 'Geri', + 'connect-google-calendar' => 'Google Takvimi Bağla', + 'connect-google-meet' => 'Google Meet\'i Bağla', + 'google-calendar' => 'Google Takvimi', + 'google-meet' => 'Google Meet', + 'google-calendar-info' => 'Google zaman yönetimi ve iş hızını artırmak için takvim.', + 'google-meet-info' => 'İş hızını artırmak için etkinlik oluşturma sırasında doğrudan Meet bağlantıları oluşturur.', + 'remove' => 'Kaldır', + 'synced-account' => 'Senkronize Hesap', + 'select' => 'Lütfen seçin', + 'select-calendar' => 'Senkronize etmek istediğiniz takvimi seçin', + 'select-calendar-info' => 'Takviminizdeki yinelenen etkinlikler CRM ile senkronize edilmeyecek.', + 'sync-success' => 'Etkinlikler başarıyla senkronize edildi.', + 'destroy-success' => 'Google hesabı başarıyla kaldırıldı.', + 'save-sync' => 'Kaydet ve Senkronize Et', + 'confirm-remove' => 'Google hesabını kaldırmak istediğinizden emin misiniz?' +]; From 2a4d2f746e79f0bf88f66759526c7e50093008c2 Mon Sep 17 00:00:00 2001 From: suraj kashyap Date: Wed, 25 Sep 2024 17:31:30 +0530 Subject: [PATCH 3/4] Update changelog. --- CHANGELOG for v1.x.x.md => CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) rename CHANGELOG for v1.x.x.md => CHANGELOG.md (85%) diff --git a/CHANGELOG for v1.x.x.md b/CHANGELOG.md similarity index 85% rename from CHANGELOG for v1.x.x.md rename to CHANGELOG.md index 88bfbd2..6b90063 100644 --- a/CHANGELOG for v1.x.x.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ +## **v1.0.1 (25th of September 2024)** - *First Release* + +* #26 [fixed] There is no option to give permission for google calendar. #26 + +* #47 [fixed] If the admin is clicking on the google icon then the app locale is getting changes automatically. #47 + ## **v1.0.0 (19th of November 2021)** - *First Release* -* [feature] Admin user can connect to their google account. +* [feature] Admin user can connect to their google account. * [feature] User can fetch all events from selected calendars From 9739874d110e76498650944dea2361420f2b494a Mon Sep 17 00:00:00 2001 From: Devansh <68321766+devansh-webkul@users.noreply.github.com> Date: Wed, 25 Sep 2024 17:39:08 +0530 Subject: [PATCH 4/4] Update CHANGELOG.md --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b90063..c1e8184 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ -## **v1.0.1 (25th of September 2024)** - *First Release* +## **v1.0.1 (25th of September 2024)** -* #26 [fixed] There is no option to give permission for google calendar. #26 +* #47 [fixed] If the admin is clicking on the google icon then the app locale is getting changes automatically. -* #47 [fixed] If the admin is clicking on the google icon then the app locale is getting changes automatically. #47 +* #26 [fixed] There is no option to give permission for google calendar. ## **v1.0.0 (19th of November 2021)** - *First Release*