fix! Обновление статуса сделки из битрикса в ЛК после переработки модуля

app/Modules/Bitrix/Http/Controllers/BitrixApiController.php

@@ -5,74 +5,74 @@
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
-use App\Models\Deal\Deal;
+use Modules\Main\Models\Deal\Deal;
-use App\Models\Deal\DealStatus;
+use Modules\Main\Models\Deal\DealStatus;
 use App\Notifications\UniqueContact;
 use App\Notifications\NotUniqueContact;
 use App\Notifications\Deal\DealUnique;
 use App\Notifications\Deal\DealNotUnique;
 
+use Modules\Bitrix\Models\BitrixId;
+
 use Illuminate\Support\Facades\Log;
 
 class BitrixApiController extends Controller
 {
-    public const ACTION_CONFIRM_DEAL    = 'confirm_deal';
+    public const ACTION_CONFIRM_DEAL = 'confirm_deal';
     public const ACTION_UPDATE_CONTRACT = 'update_contract';
     public const ACTION_CONFIRM_COMPANY = 'confirm_company';
     public function index(Request $request)
     {
-            switch ( $request->action )
+        if (!$bxId = BitrixId::where('token', $request->token)->first()) {
-            {
+            return false;
-                case $this::ACTION_CONFIRM_DEAL:
+        };
-                    $deal = Deal::where('confirm_token', $request->token)->first();
+        $object = $bxId->bitrixable;
-                    $this->confirmDeal($deal, $request);
+        switch ($request->action) {
-                    break;
+            case $this::ACTION_CONFIRM_DEAL:
-                case $this::ACTION_UPDATE_CONTRACT:
+                $this->confirmDeal($object, $request);
-                    $deal = Deal::where('confirm_token', $request->token)->first();
+                break;
-                    $this->updateContract($deal, $request);
+            case $this::ACTION_UPDATE_CONTRACT:
-                    break;
+                $this->updateContract($object, $request);
-                case $this::ACTION_CONFIRM_COMPANY:
+                break;
-                    $this->confirmCompany($request);
+            case $this::ACTION_CONFIRM_COMPANY:
-                    break;
+                $this->confirmCompany($request, $object);
-            }
+                break;
+        }
         return false;
     }
 
-    public function confirmCompany(Request $request)
+    public function confirmCompany(Request $request, $company)
     {
         $confirmer = new ConfirmCompanyController;
-        $confirmer($request);
+        $confirmer($request, $company);
     }
     public function confirmDeal(Deal $deal, Request $request)
     {
         $agent = $deal->agent;
-        if ((bool) $request->is_unique == true)
+        $request->is_unique = json_decode($request->is_unique, true);
-        {
+        if ($request->is_unique == true) {
             $deal->status = DealStatus::UNIQUE;
             $agent->user->notify(new UniqueContact($deal));
             $deal->notify(new DealUnique());
-        }
+        } else {
-        else
-        {
             $deal->status = DealStatus::NOT_UNIQUE;
             $agent->user->notify(new NotUniqueContact($deal));
             $deal->notify(new DealNotUnique());
         }
 
-        if (!$agent->bitrixId())
+        if (!$agent->bitrixId()) {
-        {
             $agent->setBitrixId($request->agent_id);
         }
 
         Log::build([
             'driver' => 'single',
-            'path'   => storage_path('logs/bitrix.log'),
+            'path' => storage_path('logs/bitrix.log'),
         ])->error(
                 json_encode(
                     [
                         'is_unique' => $request->is_unique,
-                        'deal'      => $deal->id,
+                        'deal' => $deal->id,
-                        'status'    => $deal->status
+                        'status' => $deal->status
                     ]
                 )
             );

app/Modules/Bitrix/Http/Controllers/ConfirmCompanyController.php

@@ -20,9 +20,8 @@ class ConfirmCompanyController extends Controller
      * @param $reqest['status'] - new|accepted|declined
      * @return bool
      */
-    public function __invoke(Request $request)
+    public function __invoke(Request $request, Company $company)
     {
-        $company = Company::find($request->company_id);
         if ($company->secret == $request->token)
         {
             $company->status = $request->status;

app/Modules/Bitrix/Models/BitrixId.php

@@ -67,7 +67,7 @@ protected static function booted()
             {
                 $bitrixId->token = Hash::make(json_encode([$object]));
                 $sender->setCallbackUrl(
-                    route('api.company.confirm', [
+                    route('api.bx.action', [
                         'token' => $bitrixId->token
                     ])
                 );

app/Modules/Bitrix/Models/BitrixSender.php

@@ -8,17 +8,21 @@
 
 class BitrixSender
 {
-    private $callbackUrl = false;
+    protected $callbackUrl = false;
     protected $data;
     public $resultData;
     public function __construct()
     {
-
+        $this->data = [];
     }
     public function setCallbackUrl($callbackUrl)
     {
         $this->callbackUrl = $callbackUrl;
     }
+
+    public function addDataItem($key, $value) {
+        $this->data[$key] = $value;
+    }
     protected function getUrl()
     {
         $webhookEnumItem = false;

app/Modules/Bitrix/Models/SendAgent.php

@@ -12,9 +12,7 @@ class SendAgent extends BitrixSender
     use HasFactory;
     public function __construct(Agent $agent)
     {
-        $this->data = [
+        $this->addDataItem('name', $agent->user->name);
-            'name'   => $agent->user->name,
+        $this->addDataItem('phones', [$agent->user->phone]);
-            'phones' => [$agent->user->phone],
-        ];
     }
 }

app/Modules/Bitrix/Models/SendClient.php

@@ -12,9 +12,7 @@ class SendClient extends BitrixSender
     use HasFactory;
     public function __construct(Client $client)
     {
-        $this->data = [
+        $this->addDataItem('name', $client->name);
-            'name'   => $client->name,
+        $this->addDataItem('phones', $client->phone);
-            'phones' => [$client->phone],
-        ];
     }
 }

app/Modules/Bitrix/Models/SendCompany.php

@@ -11,16 +11,10 @@ class SendCompany extends BitrixSender
     use HasFactory;
     public function __construct(Company $company)
     {
-        $this->data = [
+        $this->addDataItem('name', $company->name);
-            'name'        => $company->name,
+        $this->addDataItem('inn', $company->inn);
-            'inn'         => $company->inn,
+        $this->addDataItem('email', $company->email);
-            'email'       => $company->email,
+        $this->addDataItem('phone', $company->phone);
-            'phone'       => $company->phone,
+        $this->addDataItem('address', $company->legal_address);
-            'address'     => $company->legal_address,
-            'callbackUrl' => route('api.company.confirm', [
-                'token' => $company->secret
-            ])
-
-        ];
     }
 }

app/Modules/Bitrix/Models/SendDeal.php

@@ -12,9 +12,6 @@ class SendDeal extends BitrixSender
     use HasFactory;
     public function __construct(Deal $deal)
     {
-        $this->data = [
+        $this->addDataItem('complexName', $deal->complex->name);
-            'token' => $deal->confirm_token,
-            'complexName' => $deal->complex->name
-        ];
     }
 }

app/Modules/Bitrix/Providers/RouteServiceProvider.php

@@ -20,8 +20,10 @@ protected function registerWebRoutes()
             //Set Default Controllers Namespace
             ->namespace('Modules\\Bitrix\\Http\\Controllers')
             ->group(app_path('Modules/Bitrix/Routes/web.php'));
+
         Route::middleware('api')
-            ->prefix('api')
+            ->namespace('Modules\\Bitrix\\Http\\Controllers')
-            ->group(base_path('Modules/Bitrix/Routes/api.php'));
+            ->prefix('api/bx')
+            ->group(app_path('Modules/Bitrix/Routes/api.php'));
     }
 }

app/Modules/Bitrix/Routes/api.php

@@ -21,4 +21,5 @@
     return $request->user();
 });
 
-Route::get('/action', [BitrixApiController::class, 'index']);
+Route::post('/action', [BitrixApiController::class, 'index'])->name('api.bx.action');
+Route::get('/action', [BitrixApiController::class, 'index']);

app/Notifications/NotUniqueContact.php

@@ -7,8 +7,8 @@
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Notification;
 
-use App\Models\Deal\Deal;
+use Modules\Main\Models\Deal\Deal;
-use App\Models\Deal\DealStatus;
+use Modules\Main\Models\Deal\DealStatus;
 
 class NotUniqueContact extends Notification
 {
@@ -54,9 +54,12 @@ public function toMail(object $notifiable): MailMessage
      */
     public function toArray(object $notifiable): array
     {
+        $clientsNames = $this->deal->clients->pluck('name')->toArray();
         return [
             'deal' => $this->deal->id,
-            'text' => __('notifications.' . get_class($this), ['contact' => $this->deal->user->name])
+            'text' => __('notifications.' . get_class($this), [
+                'contact' => implode(', ', $clientsNames)
+            ])
         ];
     }
 }

app/Notifications/UniqueContact.php

@@ -7,8 +7,8 @@
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Notification;
 
-use App\Models\Deal\Deal;
+use Modules\Main\Models\Deal\Deal;
-use App\Models\Deal\DealStatus;
+use Modules\Main\Models\Deal\DealStatus;
 
 class UniqueContact extends Notification
 {
@@ -54,9 +54,13 @@ public function toMail(object $notifiable): MailMessage
      */
     public function toArray(object $notifiable): array
     {
+        $clientsNames = $this->deal->clients->pluck('name')->toArray();
         return [
             'deal' => $this->deal->id,
-            'text' => __('notifications.' . get_class($this), ['contact' => $this->deal->user->name])
+            'text' => __('notifications.' . get_class($this), 
+            [
+                'contact' => implode(', ', $clientsNames)
+            ])
         ];
     }
 }

routes/api.php

@@ -24,9 +24,3 @@
     return $request->user();
 });
 
-Route::post('/client', [BitrixApiController::class, 'index'])->name('api.client');
-Route::post('/company/confirm', [BitrixApiController::class, 'index'])->name('api.company.confirm');
-
-
-//Route::post('/client/confirm', [ConfirmClientFromBitrix::class, 'confirm'])->name('deal.confirm');
-//Route::post('/client/{$deal}/contract', CoController::class)->name('company.status.update');