Compare commits

..

No commits in common. "5c1489a22acf65e2e95ec080f9b36208d2158638" and "8d0a45471370d3be5b3b352966874f7d696fe0e2" have entirely different histories.

5 changed files with 13 additions and 16 deletions

View file

@ -1,7 +1,3 @@
1.1.3
* Fix emails fetching when Email::sanitizeEmail is called.
1.1.2 1.1.2
* Fix creating a new Conversation with a new Customer. * Fix creating a new Conversation with a new Customer.

View file

@ -8,12 +8,9 @@ namespace Modules\MMFRestrictedCustomers\Console\Commands;
use App\Attachment; use App\Attachment;
use App\Conversation; use App\Conversation;
use App\Email;
use App\Thread;
use App\Events\CustomerCreatedConversation; use App\Events\CustomerCreatedConversation;
use App\Events\CustomerReplied; use App\Events\CustomerReplied;
use App\Thread;
use App\Console\Commands\FetchEmails as BaseFetchEmails; use App\Console\Commands\FetchEmails as BaseFetchEmails;
use Modules\MMFRestrictedCustomers\Entities\Customer; use Modules\MMFRestrictedCustomers\Entities\Customer;
@ -679,7 +676,7 @@ class FetchEmails extends BaseFetchEmails {
} }
foreach ($recipient_emails as $recipient_email) { foreach ($recipient_emails as $recipient_email) {
// No need to check mailbox aliases. // No need to check mailbox aliases.
if (Email::sanitizeEmail($check_mailbox->email) == $recipient_email) { if (\App\Email::sanitizeEmail($check_mailbox->email) == $recipient_email) {
$this->extra_import[] = [ $this->extra_import[] = [
'mailbox' => $check_mailbox, 'mailbox' => $check_mailbox,
'message' => $message, 'message' => $message,
@ -756,6 +753,10 @@ class FetchEmails extends BaseFetchEmails {
public function createCustomers($emails, $mailbox) { public function createCustomers($emails, $mailbox) {
$exclude_emails = $mailbox->getEmails(); $exclude_emails = $mailbox->getEmails();
foreach ($emails as $item) { foreach ($emails as $item) {
// Email belongs to mailbox
// if (in_array(Email::sanitizeEmail($item->mail), $exclude_emails)) {
// continue;
// }
$data = [ $data = [
'mailbox_id' => $mailbox->id, 'mailbox_id' => $mailbox->id,
]; ];

View file

@ -33,11 +33,11 @@ So it is highly recommended to backup your customers database:
Download the [release tarball] and extract its content into `Modules/MMFRestrictedCustomers`. Download the [release tarball] and extract its content into `Modules/MMFRestrictedCustomers`.
[release tarball]: https://port.numenaute.org/MMF/freescout-restricted-customers/archive/1.1.3.tar.gz [release tarball]: https://port.numenaute.org/MMF/freescout-restricted-customers/archive/1.1.2.tar.gz
``` ```
wget https://port.numenaute.org/MMF/freescout-restricted-customers/archive/1.1.3.tar.gz -O freescout-restricted-customers-1.1.3.tar.gz wget https://port.numenaute.org/MMF/freescout-restricted-customers/archive/1.1.2.tar.gz -O freescout-restricted-customers-1.1.2.tar.gz
tar xf freescout-restricted-customers-1.1.3.tar.gz -C Modules tar xf freescout-restricted-customers-1.1.2.tar.gz -C Modules
mv Modules/freescout-restricted-customers Modules/MMFRestrictedCustomers mv Modules/freescout-restricted-customers Modules/MMFRestrictedCustomers
``` ```

View file

@ -1,7 +1,7 @@
{ {
"name": "millions-missing-france/freescout-restricted-customers", "name": "millions-missing-france/freescout-restricted-customers",
"description": "Freescout restricted customers - Restrict access to Freescout customers to specific mailboxes", "description": "Freescout restricted customers - Restrict access to Freescout customers to specific mailboxes",
"version": "1.1.3", "version": "1.1.2",
"type": "library", "type": "library",
"license": ["AGPL-3.0-only"], "license": ["AGPL-3.0-only"],
"authors": [ "authors": [

View file

@ -2,7 +2,7 @@
"name": "MMFRestrictedCustomers", "name": "MMFRestrictedCustomers",
"alias": "mmfrestrictedcustomers", "alias": "mmfrestrictedcustomers",
"description": "Freescout restricted customers - Restrict access to Freescout customers to specific mailboxes", "description": "Freescout restricted customers - Restrict access to Freescout customers to specific mailboxes",
"version": "1.1.3", "version": "1.1.2",
"detailsUrl": "", "detailsUrl": "",
"author": "Millions Missing FRANCE", "author": "Millions Missing FRANCE",
"authorUrl": "info@millionsmissing.fr", "authorUrl": "info@millionsmissing.fr",