diff --git a/README.md b/README.md index fe148e7..2e65e3f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# MMF - Freescout Restricted Customers +# Millions Missing France - Freescout Restricted Customers ## Description @@ -19,7 +19,7 @@ You have been warned. ### Install the package with composer ``` -composer require "mmf/freescount-restricted-customers" "0.1.0" +composer require "millions-missing-france/freescount-restricted-customers" "0.1.1" ``` ### Edit the application routes @@ -44,11 +44,11 @@ should be replaced with: ```php // Customers -Route::get('/customers/{id}/edit', '\MMF\FreescoutRestrictedCustomers\Http\Controllers\CustomersController@update')->name('customers.update'); -Route::post('/customers/{id}/edit', '\MMF\FreescoutRestrictedCustomers\Http\Controllers\CustomersController@updateSave'); -Route::get('/customers/{id}/', '\MMF\FreescoutRestrictedCustomers\Http\Controllers\CustomersController@conversations')->name('customers.conversations'); -Route::get('/customers/ajax-search', ['uses' => '\MMF\FreescoutRestrictedCustomers\Http\Controllers\CustomersController@ajaxSearch', 'laroute' => true])->name('customers.ajax_search'); -Route::post('/customers/ajax', ['uses' => '\MMF\FreescoutRestrictedCustomers\Http\Controllers\CustomersController@ajax', 'laroute' => true])->name('customers.ajax'); +Route::get('/customers/{id}/edit', '\MillionsMissingFrance\FreescoutRestrictedCustomers\Http\Controllers\CustomersController@update')->name('customers.update'); +Route::post('/customers/{id}/edit', '\MillionsMissingFrance\FreescoutRestrictedCustomers\Http\Controllers\CustomersController@updateSave'); +Route::get('/customers/{id}/', '\MillionsMissingFrance\FreescoutRestrictedCustomers\Http\Controllers\CustomersController@conversations')->name('customers.conversations'); +Route::get('/customers/ajax-search', ['uses' => '\MillionsMissingFrance\FreescoutRestrictedCustomers\Http\Controllers\CustomersController@ajaxSearch', 'laroute' => true])->name('customers.ajax_search'); +Route::post('/customers/ajax', ['uses' => '\MillionsMissingFrance\FreescoutRestrictedCustomers\Http\Controllers\CustomersController@ajax', 'laroute' => true])->name('customers.ajax'); ``` This other section should be edited too: @@ -78,7 +78,7 @@ Route::get('/mailbox/{mailbox_id}/new-ticket', 'ConversationsController@create') Route::get('/mailbox/{mailbox_id}/clone-ticket/{from_thread_id}', 'ConversationsController@cloneConversation')->name('conversations.clone_conversation'); //Route::get('/conversation/draft/{id}', 'ConversationsController@draft')->name('conversations.draft'); Route::get('/conversation/ajax-html/{action}', ['uses' => 'ConversationsController@ajaxHtml', 'laroute' => true])->name('conversations.ajax_html'); -Route::get('/search', '\MMF\FreescoutRestrictedCustomers\Http\Controllers\ConversationsController@search')->name('conversations.search'); +Route::get('/search', '\MillionsMissingFrance\FreescoutRestrictedCustomers\Http\Controllers\ConversationsController@search')->name('conversations.search'); Route::get('/conversation/undo-reply/{thread_id}', 'ConversationsController@undoReply')->name('conversations.undo'); Route::get('/mailbox/{mailbox_id}/chats', 'ConversationsController@chats')->name('conversations.chats'); ``` @@ -107,21 +107,21 @@ Route::group(['middleware' => ['web', 'auth', 'roles'], 'roles' => ['admin'], 'p should be replaced with: ```php -Route::group(['middleware' => ['web', 'auth', 'roles'], 'roles' => ['user', 'admin'], 'prefix' => \Helper::getSubdirectory(), 'namespace' => 'MMF\FreescoutRestrictedCustomers\Http\Controllers'], function() +Route::group(['middleware' => ['web', 'auth', 'roles'], 'roles' => ['user', 'admin'], 'prefix' => \Helper::getSubdirectory(), 'namespace' => 'MillionsMissingFrance\FreescoutRestrictedCustomers\Http\Controllers'], function() { - Route::get('/customers/new', '\MMF\FreescoutRestrictedCustomers\Http\Controllers\CrmController@createCustomer')->name('freescout-restricted-customers.create_customer'); + Route::get('/customers/new', '\MillionsMissingFrance\FreescoutRestrictedCustomers\Http\Controllers\CrmController@createCustomer')->name('freescout-restricted-customers.create_customer'); // The Crm module initialization will crash if no route named "crm.create_customer" is set. - Route::get('/customers/new', '\MMF\FreescoutRestrictedCustomers\Http\Controllers\CrmController@createCustomer')->name('crm.create_customer'); - Route::post('/customers/new', '\MMF\FreescoutRestrictedCustomers\Http\Controllers\CrmController@createCustomerSave'); - Route::get('/crm/ajax-html/{action}/{param?}', ['uses' => '\MMF\FreescoutRestrictedCustomers\Http\Controllers\CrmController@ajaxHtml'])->name('crm.ajax_html'); - Route::get('/customers/fields/ajax-search', ['uses' => '\MMF\FreescoutRestrictedCustomers\Http\Controllers\CrmController@ajaxSearch', 'laroute' => true])->name('crm.ajax_search'); - Route::post('/crm/ajax', ['uses' => '\MMF\FreescoutRestrictedCustomers\Http\Controllers\CrmController@ajax', 'laroute' => true])->name('crm.ajax'); + Route::get('/customers/new', '\MillionsMissingFrance\FreescoutRestrictedCustomers\Http\Controllers\CrmController@createCustomer')->name('crm.create_customer'); + Route::post('/customers/new', '\MillionsMissingFrance\FreescoutRestrictedCustomers\Http\Controllers\CrmController@createCustomerSave'); + Route::get('/crm/ajax-html/{action}/{param?}', ['uses' => '\MillionsMissingFrance\FreescoutRestrictedCustomers\Http\Controllers\CrmController@ajaxHtml'])->name('crm.ajax_html'); + Route::get('/customers/fields/ajax-search', ['uses' => '\MillionsMissingFrance\FreescoutRestrictedCustomers\Http\Controllers\CrmController@ajaxSearch', 'laroute' => true])->name('crm.ajax_search'); + Route::post('/crm/ajax', ['uses' => '\MillionsMissingFrance\FreescoutRestrictedCustomers\Http\Controllers\CrmController@ajax', 'laroute' => true])->name('crm.ajax'); }); -Route::group(['middleware' => ['web', 'auth', 'roles'], 'roles' => ['admin'], 'prefix' => \Helper::getSubdirectory(), 'namespace' => '\MMF\FreescoutRestrictedCustomers\Http\Controllers'], function() +Route::group(['middleware' => ['web', 'auth', 'roles'], 'roles' => ['admin'], 'prefix' => \Helper::getSubdirectory(), 'namespace' => '\MillionsMissingFrance\FreescoutRestrictedCustomers\Http\Controllers'], function() { - Route::post('/customers/export', ['uses' => '\MMF\FreescoutRestrictedCustomers\Http\Controllers\CrmController@export'])->name('crm.export'); - Route::post('/crm/ajax-admin', ['uses' => '\MMF\FreescoutRestrictedCustomers\Http\Controllers\CrmController@ajaxAdmin', 'laroute' => true])->name('crm.ajax_admin'); + Route::post('/customers/export', ['uses' => '\MillionsMissingFrance\FreescoutRestrictedCustomers\Http\Controllers\CrmController@export'])->name('crm.export'); + Route::post('/crm/ajax-admin', ['uses' => '\MillionsMissingFrance\FreescoutRestrictedCustomers\Http\Controllers\CrmController@ajaxAdmin', 'laroute' => true])->name('crm.ajax_admin'); }); ``` diff --git a/composer.json b/composer.json index 7952a95..59dcbc0 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { - "name": "mmf/freescout-restricted-customers", - "description": "MMF Freescout restricted customers - Restrict access to Freescout customers to the account that created them", - "version": "0.1.0", + "name": "millions-missing-france/freescout-restricted-customers", + "description": "Freescout restricted customers - Restrict access to Freescout customers to specific mailboxes", + "version": "0.1.1", "type": "library", "license": ["AGPL"], "authors": [ @@ -15,13 +15,13 @@ }, "autoload": { "psr-4": { - "MMF\\FreescoutRestrictedCustomers\\": "src" + "MillionsMissingFrance\\FreescoutRestrictedCustomers\\": "src" } }, "extra": { "laravel": { "providers": [ - "MMF\\FreescoutRestrictedCustomers\\FreescoutRestrictedCustomersServiceProvider" + "MillionsMissingFrance\\FreescoutRestrictedCustomers\\FreescoutRestrictedCustomersServiceProvider" ] } } diff --git a/database/migrations/2024_07_03_135202_add_mailbox_id_column_to_customers_table.php b/database/migrations/2024_07_03_135202_add_mailbox_id_column_to_customers_table.php index 6d46639..88c5f5d 100644 --- a/database/migrations/2024_07_03_135202_add_mailbox_id_column_to_customers_table.php +++ b/database/migrations/2024_07_03_135202_add_mailbox_id_column_to_customers_table.php @@ -7,7 +7,7 @@ use Illuminate\Support\Facades\Schema; use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Migrations\Migration; -use MMF\FreescoutRestrictedCustomers\Customer; +use MillionsMissingFrance\FreescoutRestrictedCustomers\Customer; class AddMailboxIdColumnToCustomersTable extends Migration { /** diff --git a/resources/views/create_customer.blade.php b/resources/views/create_customer.blade.php index 5d08703..316b0a6 100644 --- a/resources/views/create_customer.blade.php +++ b/resources/views/create_customer.blade.php @@ -1,6 +1,6 @@ @extends('layouts.app') -@section('title', 'Add Customer (MMF)') +@section('title', 'Add Customer (MillionsMissingFrance)') @section('content') @include('freescout-restricted-customers::customers/partials/edit_form', ['save_button_title' => __('Add')]) diff --git a/routes/web.php b/routes/web.php index 244db90..e98e065 100644 --- a/routes/web.php +++ b/routes/web.php @@ -5,9 +5,9 @@ */ use Illuminate\Support\Facades\Route; -use MMF\FreescoutRestrictedCustomers\Http\Controllers\ConversationsController; -use MMF\FreescoutRestrictedCustomers\Http\Controllers\CrmController; -use MMF\FreescoutRestrictedCustomers\Http\Controllers\CustomersController; +use MillionsMissingFrance\FreescoutRestrictedCustomers\Http\Controllers\ConversationsController; +use MillionsMissingFrance\FreescoutRestrictedCustomers\Http\Controllers\CrmController; +use MillionsMissingFrance\FreescoutRestrictedCustomers\Http\Controllers\CustomersController; // FIXME: Routes are not correctly exposed to the main application, // routes/web.php and Modules/Crm/Http/routes.php must be manually edited. diff --git a/src/Customer.php b/src/Customer.php index 589ec5f..6eec440 100644 --- a/src/Customer.php +++ b/src/Customer.php @@ -4,7 +4,7 @@ SPDX-FileCopyrightText: © 2024 Millions Missing FRANCE */ -namespace MMF\FreescoutRestrictedCustomers; +namespace MillionsMissingFrance\FreescoutRestrictedCustomers; use App\Email; use App\CustomerChannel; @@ -12,7 +12,7 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Storage; use Watson\Rememberable\Rememberable; -use MMF\FreescoutRestrictedCustomers\Mailbox; +use MillionsMissingFrance\FreescoutRestrictedCustomers\Mailbox; use App\Customer as BaseCustomer; class Customer extends BaseCustomer { diff --git a/src/FreescoutRestrictedCustomersServiceProvider.php b/src/FreescoutRestrictedCustomersServiceProvider.php index b6d3553..df2214e 100644 --- a/src/FreescoutRestrictedCustomersServiceProvider.php +++ b/src/FreescoutRestrictedCustomersServiceProvider.php @@ -4,7 +4,7 @@ SPDX-FileCopyrightText: © 2024 Millions Missing FRANCE */ -namespace MMF\FreescoutRestrictedCustomers; +namespace MillionsMissingFrance\FreescoutRestrictedCustomers; use Illuminate\Support\Facades\Route; use Illuminate\Support\ServiceProvider; diff --git a/src/Http/Controllers/ConversationsController.php b/src/Http/Controllers/ConversationsController.php index ff699b3..fb998b3 100644 --- a/src/Http/Controllers/ConversationsController.php +++ b/src/Http/Controllers/ConversationsController.php @@ -4,12 +4,12 @@ SPDX-FileCopyrightText: © 2024 Millions Missing FRANCE */ -namespace MMF\FreescoutRestrictedCustomers\Http\Controllers; +namespace MillionsMissingFrance\FreescoutRestrictedCustomers\Http\Controllers; use App\Conversation; use Illuminate\Http\Request; use App\Http\Controllers\ConversationsController as BaseConversationsController; -use MMF\FreescoutRestrictedCustomers\Customer; +use MillionsMissingFrance\FreescoutRestrictedCustomers\Customer; class ConversationsController extends BaseConversationsController { /** diff --git a/src/Http/Controllers/CrmController.php b/src/Http/Controllers/CrmController.php index bd7d1d5..70abd4a 100644 --- a/src/Http/Controllers/CrmController.php +++ b/src/Http/Controllers/CrmController.php @@ -4,7 +4,7 @@ SPDX-FileCopyrightText: © 2024 Millions Missing FRANCE */ -namespace MMF\FreescoutRestrictedCustomers\Http\Controllers; +namespace MillionsMissingFrance\FreescoutRestrictedCustomers\Http\Controllers; use App\Conversation; use App\Email; @@ -15,7 +15,7 @@ use Illuminate\Http\Request; use Illuminate\Http\Response; use Illuminate\Routing\Controller; use Modules\Crm\Http\Controllers\CrmController as BaseCrmController; -use MMF\FreescoutRestrictedCustomers\Customer; +use MillionsMissingFrance\FreescoutRestrictedCustomers\Customer; class CrmController extends BaseCrmController { public function createCustomer(Request $request) { diff --git a/src/Http/Controllers/CustomersController.php b/src/Http/Controllers/CustomersController.php index 41d7e0d..434e9e6 100644 --- a/src/Http/Controllers/CustomersController.php +++ b/src/Http/Controllers/CustomersController.php @@ -4,14 +4,14 @@ SPDX-FileCopyrightText: © 2024 Millions Missing FRANCE */ -namespace MMF\FreescoutRestrictedCustomers\Http\Controllers; +namespace MillionsMissingFrance\FreescoutRestrictedCustomers\Http\Controllers; use App\Conversation; use App\Email; use Illuminate\Http\Request; use Validator; use App\Http\Controllers\CustomersController as BaseCustomersController; -use MMF\FreescoutRestrictedCustomers\Customer; +use MillionsMissingFrance\FreescoutRestrictedCustomers\Customer; class CustomersController extends BaseCustomersController { /** @@ -372,7 +372,7 @@ class CustomersController extends BaseCustomersController { // Conversations navigation case 'customers_pagination': - $customers = app('MMF\FreescoutRestrictedCustomers\Http\Controllers\ConversationsController')->searchCustomers($request, $user); + $customers = app('MillionsMissingFrance\FreescoutRestrictedCustomers\Http\Controllers\ConversationsController')->searchCustomers($request, $user); $response['status'] = 'success'; diff --git a/src/Mailbox.php b/src/Mailbox.php index 9428d8f..be4ced3 100644 --- a/src/Mailbox.php +++ b/src/Mailbox.php @@ -4,9 +4,9 @@ SPDX-FileCopyrightText: © 2024 Millions Missing FRANCE */ -namespace MMF\FreescoutRestrictedCustomers; +namespace MillionsMissingFrance\FreescoutRestrictedCustomers; -use MMF\FreescoutRestrictedCustomers\Customer; +use MillionsMissingFrance\FreescoutRestrictedCustomers\Customer; use App\Mailbox as BaseMailbox; class Mailbox extends BaseMailbox {