Compare commits
25 Commits
4915d12c7d
...
renovate/e
| Author | SHA1 | Date | |
|---|---|---|---|
| c841ff830d | |||
| f99bc12603 | |||
|
2b3d423769 | ||
| efd469e07d | |||
|
|
e0ed67dfc0 | ||
| dd88bdca78 | |||
|
|
efd5416ced | ||
| 229a69b82a | |||
|
|
03df2f50dc | ||
| 3d404d93ef | |||
|
|
aaaa021597 | ||
| d1f170440c | |||
|
|
78961a7436 | ||
| 01bda8f736 | |||
|
|
f0bb74690f | ||
| 0b83b7cb22 | |||
|
|
88e00b2f8a | ||
| 3bb3674d39 | |||
|
|
ab79a2235a | ||
| f02598feeb | |||
|
|
c17bc3be3a | ||
| f84a579224 | |||
|
|
4edac7987d | ||
| 15241feae2 | |||
|
|
9cbeb5166f |
@@ -337,7 +337,7 @@ class Scheduler extends Command
|
||||
}
|
||||
break;
|
||||
case 'Daily':
|
||||
if (now()->format('H:i') == '11:10') {
|
||||
if (now()->format('H:i') == '11:30') {
|
||||
try {
|
||||
\Artisan::call('send-import-transit', [
|
||||
'schedule_type' => $rule->schedule_type,
|
||||
|
||||
@@ -92,9 +92,14 @@ class SendImportTransit extends Command
|
||||
// ->where('status', '!=', 'Delivered')
|
||||
// ->get();
|
||||
|
||||
$tableData = ImportTransit::where('status', '!=', 'Delivered')->get();
|
||||
$tableData = ImportTransit::where('status', '!=', 'Delivered')->orderByRaw("
|
||||
CAST(
|
||||
regexp_replace(cri_rfq_number, '.*-([0-9]+).*', '\\1')
|
||||
AS INTEGER
|
||||
)
|
||||
")->get();
|
||||
|
||||
|
||||
|
||||
if ($tableData->isEmpty()) {
|
||||
$this->info('No pending Import Transit records found. Mail skipped.');
|
||||
return;
|
||||
|
||||
@@ -40,16 +40,16 @@ class ImportTransitResource extends Resource
|
||||
->schema([
|
||||
Forms\Components\TextInput::make('cri_rfq_number')
|
||||
->label('CRI/RFQ Number')
|
||||
->disabled(fn ($operation) => $operation == 'edit')
|
||||
->unique(ignoreRecord: true),
|
||||
->required()
|
||||
->disabled(fn ($operation) => $operation == 'edit'),
|
||||
Forms\Components\DatePicker::make('mail_received_date')
|
||||
->label('Mail Received Date')
|
||||
->required(),
|
||||
Forms\Components\TextInput::make('pricol_ref_number')
|
||||
->label('Pricol Ref Number')
|
||||
->afterStateUpdated(function (callable $set) {
|
||||
$set('updated_by', Filament::auth()->user()?->name);
|
||||
}),
|
||||
// Forms\Components\TextInput::make('pricol_ref_number')
|
||||
// ->label('Ref Number')
|
||||
// ->afterStateUpdated(function (callable $set) {
|
||||
// $set('updated_by', Filament::auth()->user()?->name);
|
||||
// }),
|
||||
Forms\Components\TextInput::make('requester')
|
||||
->label('Requester')
|
||||
->afterStateUpdated(function (callable $set) {
|
||||
@@ -220,158 +220,158 @@ class ImportTransitResource extends Resource
|
||||
}),
|
||||
Tables\Columns\TextColumn::make('cri_rfq_number')
|
||||
->label('CRI/RFQ Number')
|
||||
->serachable()
|
||||
->searchable()
|
||||
->alignCenter()
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('mail_received_date')
|
||||
->label('Mail Received Date')
|
||||
->serachable()
|
||||
->searchable()
|
||||
->date()
|
||||
->alignCenter()
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('pricol_ref_number')
|
||||
->label('Ref Number')
|
||||
->serachable()
|
||||
->searchable()
|
||||
->alignCenter()
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('requester')
|
||||
->label('Requester')
|
||||
->serachable()
|
||||
->searchable()
|
||||
->alignCenter()
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('shipper')
|
||||
->label('Shipper')
|
||||
->serachable()
|
||||
->searchable()
|
||||
->alignCenter()
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('shipper_location')
|
||||
->label('Shipper Location')
|
||||
->serachable()
|
||||
->searchable()
|
||||
->alignCenter()
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('shipper_invoice')
|
||||
->label('Shipper Invoice')
|
||||
->serachable()
|
||||
->searchable()
|
||||
->alignCenter()
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('shipper_invoice_date')
|
||||
->label('Shipper Invoice Date')
|
||||
->serachable()
|
||||
->searchable()
|
||||
->date()
|
||||
->formatStateUsing(fn ($state) => $state?->format('Y-m-d'))
|
||||
->alignCenter()
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('inv_value')
|
||||
->label('Inv Value')
|
||||
->serachable()
|
||||
->searchable()
|
||||
->alignCenter()
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('freight_charge')
|
||||
->label('Freight Charge')
|
||||
->serachable()
|
||||
->searchable()
|
||||
->alignCenter()
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('customs_agent_name')
|
||||
->label('Customs Agent Name')
|
||||
->serachable()
|
||||
->searchable()
|
||||
->alignCenter()
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('eta_date')
|
||||
->label('ETA Date')
|
||||
->serachable()
|
||||
->searchable()
|
||||
->date()
|
||||
->alignCenter()
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('status')
|
||||
->label('Status')
|
||||
->serachable()
|
||||
->searchable()
|
||||
->alignCenter()
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('insurance_status')
|
||||
->label('Insurance Status')
|
||||
->serachable()
|
||||
->searchable()
|
||||
->alignCenter()
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('delivery_location')
|
||||
->label('Delivery Location')
|
||||
->serachable()
|
||||
->searchable()
|
||||
->alignCenter()
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('etd_date')
|
||||
->label('ETD Date')
|
||||
->serachable()
|
||||
->searchable()
|
||||
->date()
|
||||
->alignCenter()
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('mode')
|
||||
->label('Mode')
|
||||
->serachable()
|
||||
->searchable()
|
||||
->alignCenter()
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('inco_terms')
|
||||
->label('Inco Terms')
|
||||
->serachable()
|
||||
->searchable()
|
||||
->alignCenter()
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('port_of_loading')
|
||||
->label('Port of Loading')
|
||||
->serachable()
|
||||
->searchable()
|
||||
->alignCenter()
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('port_of_discharge')
|
||||
->label('Port of Discharge')
|
||||
->serachable()
|
||||
->searchable()
|
||||
->alignCenter()
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('delivery_city')
|
||||
->label('Delivery City')
|
||||
->serachable()
|
||||
->searchable()
|
||||
->alignCenter()
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('packages')
|
||||
->label('Packages')
|
||||
->serachable()
|
||||
->searchable()
|
||||
->alignCenter()
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('type_of_package')
|
||||
->label('Type of Package')
|
||||
->serachable()
|
||||
->searchable()
|
||||
->alignCenter()
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('gross_weight')
|
||||
->label('Gross Weight')
|
||||
->serachable()
|
||||
->searchable()
|
||||
->alignCenter()
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('volume')
|
||||
->label('Volume')
|
||||
->serachable()
|
||||
->searchable()
|
||||
->alignCenter()
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('bill_number')
|
||||
->label('Bill Number')
|
||||
->serachable()
|
||||
->searchable()
|
||||
->alignCenter()
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('bill_received_date')
|
||||
->label('Bill Received Date')
|
||||
->serachable()
|
||||
->searchable()
|
||||
->alignCenter()
|
||||
->date()
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('vessel_number')
|
||||
->label('Vessel Number')
|
||||
->serachable()
|
||||
->searchable()
|
||||
->alignCenter()
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('remark')
|
||||
->label('Remark')
|
||||
->serachable()
|
||||
->searchable()
|
||||
->alignCenter()
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('is_transit_identified')
|
||||
->label('Is Transit Identified')
|
||||
->serachable()
|
||||
->searchable()
|
||||
->alignCenter()
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('created_at')
|
||||
|
||||
@@ -520,7 +520,7 @@ class CharacteristicsController extends Controller
|
||||
|
||||
if (Str::contains($modelHeading, 'PRESSURE BOOSTER SYSTEM', ignoreCase: true)) {
|
||||
$typesToCreate = ['MOTOR', 'PUMP', 'NAME_PLATE'];
|
||||
} elseif (Str::contains($modelHeading, 'PUMPS', ignoreCase: true) || Str::contains($modelHeading, 'PUMPSET', ignoreCase: true)) {
|
||||
} elseif (Str::contains($modelHeading, 'PUMP SET', ignoreCase: true) || Str::contains($modelHeading, 'PUMPSET', ignoreCase: true) || Str::contains($modelHeading, 'PUMPS', ignoreCase: true)) {
|
||||
$typesToCreate = ['MOTOR', 'PUMP'];
|
||||
} elseif (Str::contains($modelHeading, 'PUMP', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMP SET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPSET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPS', ignoreCase: true)) {
|
||||
$typesToCreate = ['PUMP'];
|
||||
@@ -673,7 +673,7 @@ class CharacteristicsController extends Controller
|
||||
// 'status_description' => "Serial number '{$serialNumber}' doesn't have pumpset model to proceed!",
|
||||
// ], 404);
|
||||
}
|
||||
} elseif (! Str::contains($curHead, 'PUMPS', ignoreCase: true) && ! Str::contains($curHead, 'PUMPSET', ignoreCase: true)) {
|
||||
} elseif (! Str::contains($curHead, 'PUMP SET', ignoreCase: true) && ! Str::contains($curHead, 'PUMPSET', ignoreCase: true) && ! Str::contains($curHead, 'PUMPS', ignoreCase: true)) {
|
||||
return response()->json([
|
||||
'status_code' => 'ERROR',
|
||||
'status_description' => "Serial number '{$serialNumber}' doesn't have valid model type to proceed!",
|
||||
@@ -1562,7 +1562,7 @@ class CharacteristicsController extends Controller
|
||||
|
||||
if (Str::contains($modelHeading, 'PRESSURE BOOSTER SYSTEM', ignoreCase: true)) {
|
||||
$typesToCreate = ['MOTOR', 'PUMP', 'NAME_PLATE'];
|
||||
} elseif (Str::contains($modelHeading, 'PUMPS', ignoreCase: true) || Str::contains($modelHeading, 'PUMPSET', ignoreCase: true)) {
|
||||
} elseif (Str::contains($modelHeading, 'PUMP SET', ignoreCase: true) || Str::contains($modelHeading, 'PUMPSET', ignoreCase: true) || Str::contains($modelHeading, 'PUMPS', ignoreCase: true)) {
|
||||
$typesToCreate = ['MOTOR', 'PUMP'];
|
||||
} elseif (Str::contains($modelHeading, 'PUMP', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMP SET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPSET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPS', ignoreCase: true)) {
|
||||
$typesToCreate = ['PUMP'];
|
||||
@@ -1941,7 +1941,7 @@ class CharacteristicsController extends Controller
|
||||
|
||||
if (Str::contains($modelHeading, 'PRESSURE BOOSTER SYSTEM', ignoreCase: true)) {
|
||||
$typesToCreate = ['MOTOR', 'PUMP', 'NAME_PLATE'];
|
||||
} elseif (Str::contains($modelHeading, 'PUMPS', ignoreCase: true) || Str::contains($modelHeading, 'PUMPSET', ignoreCase: true)) {
|
||||
} elseif (Str::contains($modelHeading, 'PUMP SET', ignoreCase: true) || Str::contains($modelHeading, 'PUMPSET', ignoreCase: true) || Str::contains($modelHeading, 'PUMPS', ignoreCase: true)) {
|
||||
$typesToCreate = ['MOTOR', 'PUMP'];
|
||||
} elseif (Str::contains($modelHeading, 'PUMP', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMP SET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPSET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPS', ignoreCase: true)) {
|
||||
$typesToCreate = ['PUMP'];
|
||||
@@ -2399,7 +2399,7 @@ class CharacteristicsController extends Controller
|
||||
// 'status_description' => "Serial number '{$serialNumber}' doesn't have pumpset model to proceed!",
|
||||
// ], 404);
|
||||
}
|
||||
} elseif (! Str::contains($curHead, 'PUMPS', ignoreCase: true) && ! Str::contains($curHead, 'PUMPSET', ignoreCase: true)) {
|
||||
} elseif (! Str::contains($curHead, 'PUMP SET', ignoreCase: true) && ! Str::contains($curHead, 'PUMPSET', ignoreCase: true) && ! Str::contains($curHead, 'PUMPS', ignoreCase: true)) {
|
||||
return response()->json([
|
||||
'status_code' => 'ERROR',
|
||||
'status_description' => "Serial number '{$serialNumber}' doesn't have valid model type to proceed!",
|
||||
@@ -3666,7 +3666,7 @@ class CharacteristicsController extends Controller
|
||||
|
||||
if (Str::contains($modelHeading, 'PRESSURE BOOSTER SYSTEM', ignoreCase: true)) {
|
||||
$typesToCreate = ['MOTOR', 'PUMP', 'NAME_PLATE'];
|
||||
} elseif (Str::contains($modelHeading, 'PUMPS', ignoreCase: true) || Str::contains($modelHeading, 'PUMPSET', ignoreCase: true)) {
|
||||
} elseif (Str::contains($modelHeading, 'PUMP SET', ignoreCase: true) || Str::contains($modelHeading, 'PUMPSET', ignoreCase: true) || Str::contains($modelHeading, 'PUMPS', ignoreCase: true)) {
|
||||
$typesToCreate = ['MOTOR', 'PUMP'];
|
||||
} elseif (Str::contains($modelHeading, 'PUMP', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMP SET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPSET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPS', ignoreCase: true)) {
|
||||
$typesToCreate = ['PUMP'];
|
||||
@@ -4701,7 +4701,7 @@ class CharacteristicsController extends Controller
|
||||
|
||||
if (Str::contains($modelHeading, 'PRESSURE BOOSTER SYSTEM', ignoreCase: true)) {
|
||||
$typesToCreate = ['MOTOR', 'PUMP', 'NAME_PLATE'];
|
||||
} elseif (Str::contains($modelHeading, 'PUMPS', ignoreCase: true) || Str::contains($modelHeading, 'PUMPSET', ignoreCase: true)) {
|
||||
} elseif (Str::contains($modelHeading, 'PUMP SET', ignoreCase: true) || Str::contains($modelHeading, 'PUMPSET', ignoreCase: true) || Str::contains($modelHeading, 'PUMPS', ignoreCase: true)) {
|
||||
$typesToCreate = ['MOTOR', 'PUMP'];
|
||||
} elseif (Str::contains($modelHeading, 'PUMP', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMP SET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPSET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPS', ignoreCase: true)) {
|
||||
$typesToCreate = ['PUMP'];
|
||||
|
||||
@@ -25,15 +25,15 @@ class ProductionCheckList extends Component
|
||||
|
||||
public $existingRecords = [];
|
||||
|
||||
public bool $shouldSkipChecklist = false;
|
||||
// public bool $shouldSkipChecklist = false;
|
||||
|
||||
public array $checklist = [];
|
||||
|
||||
public $showChecklist = false;
|
||||
|
||||
public $skipChecklistValidation = false;
|
||||
// public $skipChecklistValidation = false;
|
||||
|
||||
protected $listeners = ['focus-item-id' => 'handleFocus', 'trigger-create' => 'doCreate',];
|
||||
// protected $listeners = ['focus-item-id' => 'handleFocus', 'trigger-create' => 'doCreate',];
|
||||
|
||||
public $data =
|
||||
[
|
||||
@@ -45,23 +45,21 @@ class ProductionCheckList extends Component
|
||||
'checklist' => [],
|
||||
];
|
||||
|
||||
#[On('focus-item-id')]
|
||||
public function handleFocus()
|
||||
{
|
||||
$this->dispatch('focus-input');
|
||||
}
|
||||
|
||||
public function doCreate()
|
||||
{
|
||||
$this->create();
|
||||
|
||||
$this->shouldSkipChecklist = false;
|
||||
}
|
||||
// public function doCreate()
|
||||
// {
|
||||
// $this->create();
|
||||
|
||||
// $this->shouldSkipChecklist = false;
|
||||
// }
|
||||
|
||||
public function mount($records = [])
|
||||
{
|
||||
$this->records = collect($records);
|
||||
// $this->records = collect($records);
|
||||
$this->records = $records;
|
||||
|
||||
foreach ($records as $record) {
|
||||
$this->checklist[$record['id']] = 'ok';
|
||||
}
|
||||
}
|
||||
|
||||
public function cancel()
|
||||
@@ -255,11 +253,10 @@ class ProductionCheckList extends Component
|
||||
];
|
||||
}
|
||||
|
||||
public function updatedDataChecklist()
|
||||
{
|
||||
$this->dispatch('checklistUpdated', $this->data['checklist']);
|
||||
}
|
||||
|
||||
// public function updatedDataChecklist()
|
||||
// {
|
||||
// $this->dispatch('checklistUpdated', $this->data['checklist']);
|
||||
// }
|
||||
|
||||
public function render()
|
||||
{
|
||||
|
||||
@@ -40,7 +40,7 @@ class ImportTransitMail extends Mailable
|
||||
public function envelope(): Envelope
|
||||
{
|
||||
return new Envelope(
|
||||
subject: 'Import Transit Mail',
|
||||
subject: 'Import Shipment InTransit Mail',
|
||||
);
|
||||
}
|
||||
|
||||
@@ -51,7 +51,7 @@ class ImportTransitMail extends Mailable
|
||||
{
|
||||
$now = now();
|
||||
$reportDate = $now->format('d/m/Y');
|
||||
$greeting = '<b>Dear Sir/Madam</b>,<br>Kindly find attached the Pending Import Shipment Status Report as on ' . $reportDate . ' for your reference.<br>We request you to review the shipments highlighted in <span style="background-color: yellow; font-weight: bold;">yellow</span> and arrange for their clearance at the earliest to avoid further delays and additional charges.<br>Please note that for shipments pending under <b>Telex Release</b> and <b>Duty Payment</b>, CFS charges have already commenced. We therefore urge you to expedite the necessary actions at your end.';
|
||||
$greeting = '<b>Dear Sir/Madam</b>,<br>Kindly find attached the Pending Import Shipment Status Report as on ' . $reportDate . ' for your reference.<br>We request you to review the shipments highlighted in <span style="background-color: yellow; font-weight: bold;">yellow</span> and arrange for their clearance at the earliest to avoid further delays and additional charges.<br>Please note that for shipments pending under <b>Telex Release</b> and <b>Duty Payment</b>, CFS charges will be commenced post ETA. We therefore urge you to expedite the necessary actions at your end.';
|
||||
|
||||
//$greeting1 = 'Dear C.R.I Branch Team, <br><br> Please follow and ensure the same';
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
"alperenersoy/filament-export": "^3.0",
|
||||
"althinect/filament-spatie-roles-permissions": "^2.3",
|
||||
"diogogpinto/filament-auth-ui-enhancer": "^1.0",
|
||||
"erag/laravel-pwa": "^1.9",
|
||||
"erag/laravel-pwa": "^2.0",
|
||||
"filament/filament": "^3.3",
|
||||
"intervention/image": "^3.11",
|
||||
"irazasyed/telegram-bot-sdk": "^3.15",
|
||||
|
||||
@@ -1,7 +1,11 @@
|
||||
<div class="fixed inset-0 flex items-center justify-center z-50">
|
||||
|
||||
<div class="bg-white max-h-[80vh] overflow-hidden p-6 rounded-lg shadow-lg pointer-events-auto"
|
||||
style="width:30vw !important; max-width:none !important;">
|
||||
{{-- <div class="bg-white max-h-[80vh] overflow-hidden p-6 rounded-lg shadow-lg pointer-events-auto"
|
||||
style="width:30vw !important; max-width:none !important;"> --}}
|
||||
|
||||
<div
|
||||
class="bg-white rounded-lg shadow-lg pointer-events-auto
|
||||
w-full max-w-2xl max-h-[90vh] flex flex-col">
|
||||
|
||||
{{-- @if($records && $records->count()) --}}
|
||||
@if(!empty($records) && count($records))
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
table {
|
||||
border-collapse: collapse;
|
||||
width: 100%;
|
||||
font-size: 14px;
|
||||
font-size: 10px;
|
||||
white-space: nowrap !important;
|
||||
}
|
||||
th, td {
|
||||
|
||||
Reference in New Issue
Block a user