Skip to content

Commit

Permalink
up
Browse files Browse the repository at this point in the history
  • Loading branch information
marco76tv committed Oct 3, 2024
1 parent 8d64e69 commit e7810ec
Show file tree
Hide file tree
Showing 10 changed files with 244 additions and 239 deletions.
14 changes: 7 additions & 7 deletions Actions/EsendexSendAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@

namespace Modules\Notify\Actions;

use Exception;
use Modules\Notify\Datas\SmsData;
use Spatie\QueueableAction\QueueableAction;
use Webmozart\Assert\Assert;

use function Safe\curl_exec;
use function Safe\curl_getinfo;
Expand All @@ -13,9 +16,6 @@
use function Safe\json_decode;
use function Safe\json_encode;

use Spatie\QueueableAction\QueueableAction;
use Webmozart\Assert\Assert;

/**
* @property string $base_endpoint
*/
Expand All @@ -33,7 +33,7 @@ public function execute(SmsData $smsData): array
$auth = $this->login();

if (! is_array($auth)) {
throw new \Exception('['.__LINE__.']['.class_basename($this).']');
throw new Exception('['.__LINE__.']['.class_basename($this).']');
}

$data = [
Expand Down Expand Up @@ -62,15 +62,15 @@ public function execute(SmsData $smsData): array
$info = curl_getinfo($ch);
curl_close($ch);
Assert::isArray($info);
if (201 !== $info['http_code']) {
if ($info['http_code'] !== 201) {
return [];
}

$res = json_decode((string) $response, true, 512, JSON_THROW_ON_ERROR);

dddx($res);
if (! is_array($res)) {
throw new \Exception('['.__LINE__.']['.class_basename($this).']');
throw new Exception('['.__LINE__.']['.class_basename($this).']');
}

return $res;
Expand Down Expand Up @@ -102,7 +102,7 @@ public function login(): ?array

curl_close($curlHandle);
Assert::isArray($info);
if (200 !== $info['http_code']) {
if ($info['http_code'] !== 200) {
return null;
}

Expand Down
3 changes: 2 additions & 1 deletion Filament/Clusters/Test/Pages/SendTelegram.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

namespace Modules\Notify\Filament\Clusters\Test\Pages;

use Exception;
use Filament\Actions\Action;
use Filament\Facades\Filament;
use Filament\Forms;
Expand Down Expand Up @@ -133,7 +134,7 @@ protected function getUser(): Authenticatable&Model
$user = Filament::auth()->user();

if (! $user instanceof Model) {
throw new \Exception('The authenticated user object must be an Eloquent model to allow the profile page to update it.');
throw new Exception('The authenticated user object must be an Eloquent model to allow the profile page to update it.');
}

return $user;
Expand Down
38 changes: 19 additions & 19 deletions Filament/Resources/ContactResource/Pages/ListContacts.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@

namespace Modules\Notify\Filament\Resources\ContactResource\Pages;

use Filament\Tables\Table;
use Filament\Actions\CreateAction;
use Modules\UI\Enums\TableLayoutEnum;
use Filament\Tables\Actions\EditAction;
use Filament\Tables\Enums\FiltersLayout;
use Filament\Resources\Pages\ListRecords;
use Filament\Tables\Enums\ActionsPosition;
use Filament\Tables\Actions\DeleteBulkAction;
use Filament\Tables\Actions\EditAction;
use Filament\Tables\Enums\ActionsPosition;
use Filament\Tables\Enums\FiltersLayout;
use Filament\Tables\Table;
use Modules\Notify\Filament\Resources\ContactResource;
use Modules\UI\Enums\TableLayoutEnum;
use Modules\UI\Filament\Actions\Table\TableLayoutToggleTableAction;

class ListContacts extends ListRecords
Expand All @@ -21,20 +21,6 @@ class ListContacts extends ListRecords

protected static string $resource = ContactResource::class;

protected function getTableHeaderActions(): array
{
return [
TableLayoutToggleTableAction::make(),
];
}

protected function getHeaderActions(): array
{
return [
CreateAction::make(),
];
}

public function table(Table $table): Table
{
return $table
Expand Down Expand Up @@ -81,4 +67,18 @@ public function getTableBulkActions(): array
DeleteBulkAction::make(),
];
}

protected function getTableHeaderActions(): array
{
return [
TableLayoutToggleTableAction::make(),
];
}

protected function getHeaderActions(): array
{
return [
CreateAction::make(),
];
}
}
42 changes: 21 additions & 21 deletions Filament/Resources/NotificationResource/Pages/ListNotifications.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@

namespace Modules\Notify\Filament\Resources\NotificationResource\Pages;

use Filament\Tables\Table;
use Filament\Actions\CreateAction;
use Modules\UI\Enums\TableLayoutEnum;
use Filament\Resources\Pages\ListRecords;
use Filament\Tables\Actions\DeleteBulkAction;
use Filament\Tables\Actions\EditAction;
use Filament\Tables\Columns\TextColumn;
use Filament\Tables\Enums\FiltersLayout;
use Filament\Resources\Pages\ListRecords;
use Filament\Tables\Enums\ActionsPosition;
use Modules\Xot\Filament\Traits\TransTrait;
use Filament\Tables\Actions\DeleteBulkAction;
use Filament\Tables\Enums\FiltersLayout;
use Filament\Tables\Table;
use Modules\Notify\Filament\Resources\NotificationResource;
use Modules\UI\Enums\TableLayoutEnum;
use Modules\UI\Filament\Actions\Table\TableLayoutToggleTableAction;
use Modules\Xot\Filament\Traits\TransTrait;

class ListNotifications extends ListRecords
{
Expand All @@ -25,20 +25,6 @@ class ListNotifications extends ListRecords

protected static string $resource = NotificationResource::class;

protected function getTableHeaderActions(): array
{
return [
TableLayoutToggleTableAction::make(),
];
}

protected function getHeaderActions(): array
{
return [
CreateAction::make(),
];
}

public function table(Table $table): Table
{
return $table
Expand Down Expand Up @@ -71,7 +57,7 @@ public function getListTableColumns(): array
TextColumn::make('type'),
];
}

public function getTableActions(): array
{
return [
Expand All @@ -86,4 +72,18 @@ public function getTableBulkActions(): array
DeleteBulkAction::make(),
];
}

protected function getTableHeaderActions(): array
{
return [
TableLayoutToggleTableAction::make(),
];
}

protected function getHeaderActions(): array
{
return [
CreateAction::make(),
];
}
}
8 changes: 4 additions & 4 deletions Models/BaseModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

namespace Modules\Notify\Models;

use Illuminate\Database\Eloquent\Factories\Factory;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Modules\Xot\Traits\Updater;
use Spatie\MediaLibrary\HasMedia;
use Illuminate\Database\Eloquent\Model;
use Spatie\MediaLibrary\InteractsWithMedia;
use Illuminate\Database\Eloquent\Factories\Factory;
use Illuminate\Database\Eloquent\Factories\HasFactory;

/**
* Class BaseModel.
Expand All @@ -18,8 +18,8 @@ abstract class BaseModel extends Model implements HasMedia
{
// use Searchable;
use HasFactory;
use Updater;
use InteractsWithMedia;
use Updater;

/**
* Indicates whether attributes are snake cased on arrays.
Expand Down
7 changes: 6 additions & 1 deletion Models/Contact.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

namespace Modules\Notify\Models;

use Illuminate\Database\Eloquent\Builder;
use Illuminate\Support\Carbon;

/**
Expand Down Expand Up @@ -49,6 +48,7 @@
* @property string|null $sms_status_txt
* @property int|null $duplicate_count
* @property int|null $order_column
*
* @method static \Modules\Notify\Database\Factories\ContactFactory factory($count = null, $state = [])
* @method static \Illuminate\Database\Eloquent\Builder|Contact newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|Contact newQuery()
Expand All @@ -75,9 +75,12 @@
* @method static \Illuminate\Database\Eloquent\Builder|Contact whereUserId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Contact whereValue($value)
* @method static \Illuminate\Database\Eloquent\Builder|Contact whereVerifiedAt($value)
*
* @mixin Eloquent
*
* @property string|null $email
* @property string|null $mobile_phone
*
* @method static \Illuminate\Database\Eloquent\Builder|Contact whereAttribute1($value)
* @method static \Illuminate\Database\Eloquent\Builder|Contact whereAttribute10($value)
* @method static \Illuminate\Database\Eloquent\Builder|Contact whereAttribute11($value)
Expand All @@ -96,8 +99,10 @@
* @method static \Illuminate\Database\Eloquent\Builder|Contact whereEmail($value)
* @method static \Illuminate\Database\Eloquent\Builder|Contact whereFirstName($value)
* @method static \Illuminate\Database\Eloquent\Builder|Contact whereUsesleft($value)
*
* @property \Modules\Xot\Contracts\ProfileContract|null $creator
* @property \Modules\Xot\Contracts\ProfileContract|null $updater
*
* @mixin \Eloquent
*/
class Contact extends BaseModel
Expand Down
Loading

0 comments on commit e7810ec

Please sign in to comment.