refactor(global): Rename folder for routes from partials to module

- Improve i18n add missing keys BREAKING CHANGE: Important: Rename folder for routes from partials to module
Roskus · Mar 18, 2024 · 41e5e47 · 41e5e47
1 parent d543ff3
commit 41e5e47
Show file tree

Hide file tree

Showing 27 changed files with 37 additions and 26 deletions.
diff --git a/app/Http/Controllers/Calendar/CalendarDeleteEventController.php b/app/Http/Controllers/Calendar/CalendarDeleteEventController.php
@@ -10,9 +10,6 @@
 
 class CalendarDeleteEventController extends MainController
 {
-    /**
-     * @return \Illuminate\Http\JsonResponse
-     */
     public function delete(Request $request, int $id)
     {
         Calendar::find($id)->delete();

diff --git a/app/Http/Controllers/Calendar/CalendarExportController.php b/app/Http/Controllers/Calendar/CalendarExportController.php
@@ -7,6 +7,7 @@
 use App\Http\Controllers\Controller;
 use App\Models\Calendar as CalendarModel;
 use DateTime;
+use Illuminate\Support\Str;
 use Spatie\IcalendarGenerator\Components\Calendar;
 use Spatie\IcalendarGenerator\Components\Event;
 
@@ -52,7 +53,7 @@ public function exportICal(int $id): \Symfony\Component\HttpFoundation\BinaryFil
 
         // Descargar el archivo iCalendar
         return response()
-            ->download($tempFilePath, $calendarEvent->title.'.ics')
+            ->download($tempFilePath, Str::slug($calendarEvent->title).'.ics')
             ->deleteFileAfterSend(true);
     }
 }
diff --git a/lang/en.json b/lang/en.json
@@ -70,6 +70,7 @@
     "In progress" : "In progress",
     "In_progress" : "In progress",
     "Industry" : "Industry",
+    "Insurance" : "Insurance",
     "Import" : "Import",
     "Job title" : "Job title",
     "Language" : "Language",
@@ -95,10 +96,13 @@
     "Notes" : "Notes",
     "Notification" : "Notification",
     "Notifications" : "Notifications",
+    "Number" : "Number",
+    "of" : "Number",
     "Open" : "Open",
     "Order" : "Order",
     "Orders" : "Orders",
     "Password" : "Password",
+    "Permission": "Permission",
     "Permissions": "Permissions",
     "Phone" : "Phone",
     "Photo" : "Photo",
@@ -116,6 +120,7 @@
     "Quantity" : "Quantity",
     "Remember contact" : "Remember contact",
     "Reports" : "Reports",
+    "results" : "results",
     "Sales report" : "Sales report",
     "Save" : "Save",
     "Search" : "Search",
@@ -125,6 +130,7 @@
     "Separator" : "Separator",
     "Setting" : "Setting",
     "Settings" : "Settings",
+    "Showing" : "Showing",
     "Signature" : "Signature",
     "Social networks" : "Social networks",
     "Source" : "Source",
@@ -136,6 +142,7 @@
     "Tags" : "Tags",
     "Tax" : "Tax",
     "Taxes" : "Taxes",
+    "to": "to",
     "To" : "To",
     "Time zone" : "Time zone",
     "Title" : "Title",

diff --git a/lang/es-ES.json b/lang/es-ES.json
@@ -25,6 +25,7 @@
     "Category" : "Categoría",
     "Categories" : "Categorías",
     "Cancel" : "Cancelar",
+    "Choose" : "Seleccionar",
     "City" : "Ciudad",
     "Close" : "Cerrar",
     "Closed" : "Cerrado",
@@ -71,6 +72,7 @@
     "In progress" : "En progreso",
     "In_progress" : "En progreso",
     "Industry" : "Industria",
+    "Insurance" : "Seguros",
     "Import" : "Importar",
     "Job title" : "Puesto",
     "Language" : "Idioma",
@@ -148,6 +150,7 @@
     "Title" : "Título",
     "Today" : "Hoy",
     "Type" : "Tipo",
+    "Type to search" : "Escribe para buscar",
     "Update" : "Actualizar",
     "Updated at" : "Fecha modificación",
     "User" : "Usuario",

diff --git a/lang/es.json b/lang/es.json
@@ -25,6 +25,7 @@
     "Category" : "Categoría",
     "Categories" : "Categorías",
     "Cancel" : "Cancelar",
+    "Choose" : "Seleccionar",
     "City" : "Ciudad",
     "Close" : "Cerrar",
     "Closed" : "Cerrado",
@@ -71,6 +72,7 @@
     "In progress" : "En progreso",
     "In_progress" : "En progreso",
     "Industry" : "Industria",
+    "Insurance" : "Seguros",
     "Import" : "Importar",
     "Job title" : "Puesto",
     "Language" : "Idioma",

diff --git a/resources/views/bank/index.blade.php b/resources/views/bank/index.blade.php
@@ -20,7 +20,7 @@
     </div>
 </div>
 
-<div class="card">
+<div class="card mt-2">
     <div class="card-body">
         <div class="table-responsive">
         <table class="table table-bordered table-stiped">

diff --git a/resources/views/calendar/calendar.blade.php b/resources/views/calendar/calendar.blade.php
@@ -14,7 +14,7 @@ class="las la-chevron-left"></i></a>
                 <a href="{{ route('calendar.index',$date->copy()->addMonth()->toDateString()) }}"
                     class="btn btn-outline-dark me-2" title="{{ __('Next month') }}"><i
                         class="las la-chevron-right"></i></a>
-                <span class="fs-5">{{ __('calendar.'.$date->format('F')) }} {{ $date->format('Y') }}</span>
+                <span class="fs-5">{{ __($date->format('F')) }} {{ $date->format('Y') }}</span>
             </div>
         </div>
     </div>

diff --git a/routes/partials/bank.php → routes/module/bank.php b/routes/partials/bank.php → routes/module/bank.php
diff --git a/routes/partials/bank_account.php → routes/module/bank_account.php b/routes/partials/bank_account.php → routes/module/bank_account.php
diff --git a/routes/partials/brand.php → routes/module/brand.php b/routes/partials/brand.php → routes/module/brand.php
diff --git a/routes/partials/calendar.php → routes/module/calendar.php b/routes/partials/calendar.php → routes/module/calendar.php
@@ -10,7 +10,7 @@
     ->name('calendar.save');
 Route::get('/calendar/event/update/{id}',
     [\App\Http\Controllers\Calendar\CalendarUpdateEventController::class, 'update'])->name('calendar.update');
-Route::delete('/calendar/event/delete/{id}',
+Route::get('/calendar/event/delete/{id}',
     [\App\Http\Controllers\Calendar\CalendarDeleteEventController::class, 'delete'])->name('calendar.delete');
 Route::get('/calendar/{id}/export', [CalendarExportController::class, 'exportICal'])
     ->name('calendar.export');
diff --git a/routes/partials/campaign.php → routes/module/campaign.php b/routes/partials/campaign.php → routes/module/campaign.php
diff --git a/routes/partials/category.php → routes/module/category.php b/routes/partials/category.php → routes/module/category.php
diff --git a/routes/partials/company.php → routes/module/company.php b/routes/partials/company.php → routes/module/company.php
diff --git a/routes/partials/contact.php → routes/module/contact.php b/routes/partials/contact.php → routes/module/contact.php
@@ -3,6 +3,7 @@
 use Illuminate\Support\Facades\Route;
 
 Route::post('/contact/save', [\App\Http\Controllers\Contact\ContactSaveController::class, 'save']);
+Route::get('/contact/search/{name}', [\App\Http\Controllers\Contact\ContactGetAjaxController::class, 'searchByName']);
 Route::get('/contact/export-vcard/{id}', [\App\Http\Controllers\Contact\ContactExportVCard::class, 'export']);
 Route::get('/contact/create/{model}/{id_model}', [\App\Http\Controllers\Contact\ContactCreateController::class, 'create']);
 Route::get('/contact/update/{id}', [\App\Http\Controllers\Contact\ContactUpdateController::class, 'update']);

diff --git a/routes/partials/customer.php → routes/module/customer.php b/routes/partials/customer.php → routes/module/customer.php
diff --git a/routes/partials/email.php → routes/module/email.php b/routes/partials/email.php → routes/module/email.php
diff --git a/routes/partials/lead.php → routes/module/lead.php b/routes/partials/lead.php → routes/module/lead.php
diff --git a/routes/partials/notification.php → routes/module/notification.php b/routes/partials/notification.php → routes/module/notification.php
diff --git a/routes/partials/order.php → routes/module/order.php b/routes/partials/order.php → routes/module/order.php
diff --git a/routes/partials/payroll.php → routes/module/payroll.php b/routes/partials/payroll.php → routes/module/payroll.php
diff --git a/routes/partials/product.php → routes/module/product.php b/routes/partials/product.php → routes/module/product.php
diff --git a/routes/partials/supplier.php → routes/module/supplier.php b/routes/partials/supplier.php → routes/module/supplier.php
diff --git a/routes/partials/ticket.php → routes/module/ticket.php b/routes/partials/ticket.php → routes/module/ticket.php
diff --git a/routes/partials/user.php → routes/module/user.php b/routes/partials/user.php → routes/module/user.php
diff --git a/routes/web.php b/routes/web.php
@@ -27,35 +27,35 @@
 Route::post('/unlock', [\App\Http\Controllers\Auth\UnlockController::class, 'unlock'])->name('unlock');
 
 //Order
-require_once __DIR__.'/partials/order.php';
+require_once __DIR__.'/module/order.php';
 
 //Product
-require_once __DIR__.'/partials/product.php';
+require_once __DIR__.'/module/product.php';
 
 //Brand
-require_once __DIR__.'/partials/brand.php';
+require_once __DIR__.'/module/brand.php';
 
 // Lead
-require_once __DIR__.'/partials/lead.php';
+require_once __DIR__.'/module/lead.php';
 
 //Customer
-require_once __DIR__.'/partials/customer.php';
+require_once __DIR__.'/module/customer.php';
 
 //Category
-require_once __DIR__.'/partials/category.php';
+require_once __DIR__.'/module/category.php';
 
 // Company
-require_once __DIR__.'/partials/company.php';
+require_once __DIR__.'/module/company.php';
 
 // Contact
-require_once __DIR__.'/partials/contact.php';
+require_once __DIR__.'/module/contact.php';
 
 // Account
 Route::get('/accounting', [\App\Http\Controllers\Account\AccountIndexController::class, 'index']);
 Route::post('/account/save', [\App\Http\Controllers\Account\AccountSaveController::class, 'save']);
 
 // User
-require_once __DIR__.'/partials/user.php';
+require_once __DIR__.'/module/user.php';
 
 // Profile
 Route::get('/profile', [\App\Http\Controllers\Profile\ProfileUpdateController::class, 'update']);
@@ -65,23 +65,23 @@
 Route::get('/home', [\App\Http\Controllers\HomeController::class, 'index']);
 
 // Calendar
-require_once __DIR__.'/partials/calendar.php';
+require_once __DIR__.'/module/calendar.php';
 
 // Email
-require_once __DIR__.'/partials/email.php';
+require_once __DIR__.'/module/email.php';
 
 // Email template
 Route::match(['get', 'post'], '/email-template',
     [\App\Http\Controllers\EmailTemplate\EmailTemplateIndexController::class, 'index']);
 
 // Campaign
-require_once __DIR__.'/partials/campaign.php';
+require_once __DIR__.'/module/campaign.php';
 
 // Supplier
-require_once __DIR__.'/partials/supplier.php';
+require_once __DIR__.'/module/supplier.php';
 
 // Ticket
-require_once __DIR__.'/partials/ticket.php';
+require_once __DIR__.'/module/ticket.php';
 
 // Regions
 Route::get('ajax/region/{country}', [\App\Http\Controllers\Region\RegionGetAjaxController::class, 'index']);
@@ -95,7 +95,7 @@
 Route::get('/web-form', [\App\Http\Controllers\WebForm\WebFormIndexController::class, 'index']);
 
 // Notifications
-require_once __DIR__.'/partials/notification.php';
+require_once __DIR__.'/module/notification.php';
 
 // Unsubscribe
 Route::get('/unsubscribe', [\App\Http\Controllers\Unsubscribe\UnsubscribeUpdateController::class, 'update']);
@@ -106,10 +106,10 @@
 Route::post('/permission', [\App\Http\Controllers\Permission\PermissionSaveController::class, 'save']);
 
 //Bank
-require_once __DIR__.'/partials/bank.php';
+require_once __DIR__.'/module/bank.php';
 
 //Bank account
-require_once __DIR__.'/partials/bank_account.php';
+require_once __DIR__.'/module/bank_account.php';
 
 // Payroll
-require_once __DIR__.'/partials/payroll.php';
+require_once __DIR__.'/module/payroll.php';
diff --git a/version.php b/version.php
@@ -1,3 +1,3 @@
 <?php
 
-const APP_VERSION = '3.8.3';
+const APP_VERSION = '3.9.0';