2a10f9af38
**Shiplogic API Integration:**
- Fixed API base URL configuration (removed /api suffix)
- Implemented comprehensive request/response logging for rates and shipments endpoints
- Fixed PDF fetching: API returns S3 URLs, now downloads actual PDFs from S3
- Added tests and mock API responses for local development (routes/shiplogic-mock.php)
**Courier Service Enhancements:**
- Added redownloadShipmentPdfs() public method for re-downloading corrupted PDFs
- Enhanced error logging with full request/response bodies for debugging
- Proper binary PDF storage using Laravel Storage facade
- URL and S3 download handling for Shiplogic API responses
**Workflow & Operations:**
- Changed to manual "Ready for Collection" button instead of automatic move
- Operators now: scan QR → apply labels → click "Ready for Collection" → moves to Awaiting Collection
- Removed duplicate PDF attachments to Trello (was adding twice from two listeners)
- Fixed NotifySlackOnShipmentCreated to only handle Slack notifications
**Mobile-Optimized Ops Page:**
- Removed QR code display from order detail page
- Implemented responsive single-column layout for mobile phones
- Large touch-friendly buttons (full width, increased padding)
- Bold typography for better readability on small screens
- Larger input fields and tracking number displays
- Clear step-by-step instructions for warehouse operators
- Re-download PDF button for damaged/corrupted labels
**New Features:**
- POST /ops/orders/{uuid}/ready-for-collection endpoint
- Re-download PDFs functionality accessible from awaiting_collection and in_transit states
- Full audit logging for all operations via ops interface
- Proper error handling and user feedback
**Testing:**
- Added ShipmentCreationTest with mock HTTP client
- Created comprehensive testing guide (SHIPLOGIC_TESTING.md)
- Mock API routes for local development without hitting live API
225 lines
10 KiB
PHP
225 lines
10 KiB
PHP
<?php
|
|
use Filament\Support\Enums\FontWeight;
|
|
use Filament\Support\Enums\IconPosition;
|
|
use Filament\Support\Enums\IconSize;
|
|
use Filament\Support\Enums\Size;
|
|
use Filament\Support\View\Components\BadgeComponent;
|
|
use Filament\Support\View\Components\LinkComponent;
|
|
use Illuminate\View\ComponentAttributeBag;
|
|
?>
|
|
|
|
<?php $attributes ??= new \Illuminate\View\ComponentAttributeBag;
|
|
|
|
$__newAttributes = [];
|
|
$__propNames = \Illuminate\View\ComponentAttributeBag::extractPropNames(([
|
|
'badge' => null,
|
|
'badgeColor' => 'primary',
|
|
'badgeSize' => Size::ExtraSmall,
|
|
'color' => 'primary',
|
|
'disabled' => false,
|
|
'form' => null,
|
|
'formId' => null,
|
|
'href' => null,
|
|
'icon' => null,
|
|
'iconAlias' => null,
|
|
'iconPosition' => IconPosition::Before,
|
|
'iconSize' => null,
|
|
'keyBindings' => null,
|
|
'labelSrOnly' => false,
|
|
'loadingIndicator' => true,
|
|
'size' => Size::Medium,
|
|
'spaMode' => null,
|
|
'tag' => 'a',
|
|
'target' => null,
|
|
'tooltip' => null,
|
|
'type' => 'button',
|
|
'weight' => null,
|
|
]));
|
|
|
|
foreach ($attributes->all() as $__key => $__value) {
|
|
if (in_array($__key, $__propNames)) {
|
|
$$__key = $$__key ?? $__value;
|
|
} else {
|
|
$__newAttributes[$__key] = $__value;
|
|
}
|
|
}
|
|
|
|
$attributes = new \Illuminate\View\ComponentAttributeBag($__newAttributes);
|
|
|
|
unset($__propNames);
|
|
unset($__newAttributes);
|
|
|
|
foreach (array_filter(([
|
|
'badge' => null,
|
|
'badgeColor' => 'primary',
|
|
'badgeSize' => Size::ExtraSmall,
|
|
'color' => 'primary',
|
|
'disabled' => false,
|
|
'form' => null,
|
|
'formId' => null,
|
|
'href' => null,
|
|
'icon' => null,
|
|
'iconAlias' => null,
|
|
'iconPosition' => IconPosition::Before,
|
|
'iconSize' => null,
|
|
'keyBindings' => null,
|
|
'labelSrOnly' => false,
|
|
'loadingIndicator' => true,
|
|
'size' => Size::Medium,
|
|
'spaMode' => null,
|
|
'tag' => 'a',
|
|
'target' => null,
|
|
'tooltip' => null,
|
|
'type' => 'button',
|
|
'weight' => null,
|
|
]), 'is_string', ARRAY_FILTER_USE_KEY) as $__key => $__value) {
|
|
$$__key = $$__key ?? $__value;
|
|
}
|
|
|
|
$__defined_vars = get_defined_vars();
|
|
|
|
foreach ($attributes->all() as $__key => $__value) {
|
|
if (array_key_exists($__key, $__defined_vars)) unset($$__key);
|
|
}
|
|
|
|
unset($__defined_vars, $__key, $__value); ?>
|
|
|
|
<?php
|
|
if (! $iconPosition instanceof IconPosition) {
|
|
$iconPosition = filled($iconPosition) ? (IconPosition::tryFrom($iconPosition) ?? $iconPosition) : null;
|
|
}
|
|
|
|
if (! $badgeSize instanceof Size) {
|
|
$badgeSize = filled($badgeSize) ? (Size::tryFrom($badgeSize) ?? $badgeSize) : null;
|
|
}
|
|
|
|
if (! $size instanceof Size) {
|
|
$size = filled($size) ? (Size::tryFrom($size) ?? $size) : null;
|
|
}
|
|
|
|
if (filled($iconSize) && (! $iconSize instanceof IconSize)) {
|
|
$iconSize = IconSize::tryFrom($iconSize) ?? $iconSize;
|
|
}
|
|
|
|
$iconSize ??= match ($size) {
|
|
Size::ExtraSmall, Size::Small => IconSize::Small,
|
|
default => null,
|
|
};
|
|
|
|
if (! $weight instanceof FontWeight) {
|
|
$weight = filled($weight) ? (FontWeight::tryFrom($weight) ?? $weight) : null;
|
|
}
|
|
|
|
$wireTarget = $loadingIndicator ? $attributes->whereStartsWith(['wire:target', 'wire:click'])->filter(fn ($value): bool => filled($value))->first() : null;
|
|
|
|
$hasLoadingIndicator = filled($wireTarget) || ($type === 'submit' && filled($form));
|
|
|
|
if ($hasLoadingIndicator) {
|
|
$loadingIndicatorTarget = html_entity_decode($wireTarget ?: $form, ENT_QUOTES);
|
|
}
|
|
|
|
$hasTooltip = filled($tooltip);
|
|
?>
|
|
|
|
<<?php echo e($tag); ?>
|
|
|
|
<?php if(($tag === 'a') && (! ($disabled && $hasTooltip))): ?>
|
|
<?php echo e(\Filament\Support\generate_href_html($href, $target === '_blank', $spaMode)); ?>
|
|
|
|
<?php endif; ?>
|
|
<?php if($keyBindings): ?>
|
|
x-bind:id="$id('key-bindings')"
|
|
x-mousetrap.global.<?php echo e(collect($keyBindings)->map(fn (string $keyBinding): string => str_replace('+', '-', $keyBinding))->implode('.')); ?>="document.getElementById($el.id)?.click()"
|
|
<?php endif; ?>
|
|
<?php if($hasTooltip): ?>
|
|
x-tooltip="{
|
|
content: <?php echo \Illuminate\Support\Js::from($tooltip)->toHtml() ?>,
|
|
theme: $store.theme,
|
|
allowHTML: <?php echo \Illuminate\Support\Js::from($tooltip instanceof \Illuminate\Contracts\Support\Htmlable)->toHtml() ?>,
|
|
}"
|
|
<?php endif; ?>
|
|
<?php echo e($attributes
|
|
->merge([
|
|
'aria-disabled' => $disabled ? 'true' : null,
|
|
'disabled' => $disabled && blank($tooltip),
|
|
'form' => $formId,
|
|
'type' => $tag === 'button' ? $type : null,
|
|
'wire:loading.attr' => $tag === 'button' ? 'disabled' : null,
|
|
'wire:target' => ($hasLoadingIndicator && $loadingIndicatorTarget) ? $loadingIndicatorTarget : null,
|
|
], escape: false)
|
|
->when(
|
|
$disabled && $hasTooltip,
|
|
fn (ComponentAttributeBag $attributes) => $attributes->filter(
|
|
fn (mixed $value, string $key): bool => ! str($key)->startsWith(['href', 'x-on:', 'wire:click']),
|
|
),
|
|
)
|
|
->class([
|
|
'fi-link',
|
|
'fi-disabled' => $disabled,
|
|
($size instanceof Size) ? "fi-size-{$size->value}" : (is_string($size) ? $size : ''),
|
|
($weight instanceof FontWeight) ? "fi-font-{$weight->value}" : (is_string($weight) ? $weight : ''),
|
|
])
|
|
->color(LinkComponent::class, $color)); ?>
|
|
|
|
>
|
|
<?php if(\Livewire\Mechanisms\ExtendBlade\ExtendBlade::isRenderingLivewireComponent()): ?><!--[if BLOCK]><![endif]--><?php endif; ?><?php if($iconPosition === IconPosition::Before): ?>
|
|
<?php if(\Livewire\Mechanisms\ExtendBlade\ExtendBlade::isRenderingLivewireComponent()): ?><!--[if BLOCK]><![endif]--><?php endif; ?><?php if($icon): ?>
|
|
<?php echo e(\Filament\Support\generate_icon_html($icon, $iconAlias, (new \Illuminate\View\ComponentAttributeBag([
|
|
'wire:loading.remove.delay.' . config('filament.livewire_loading_delay', 'default') => $hasLoadingIndicator,
|
|
'wire:target' => $hasLoadingIndicator ? $loadingIndicatorTarget : false,
|
|
])), size: $iconSize)); ?>
|
|
|
|
<?php endif; ?><?php if(\Livewire\Mechanisms\ExtendBlade\ExtendBlade::isRenderingLivewireComponent()): ?><!--[if ENDBLOCK]><![endif]--><?php endif; ?>
|
|
|
|
<?php if(\Livewire\Mechanisms\ExtendBlade\ExtendBlade::isRenderingLivewireComponent()): ?><!--[if BLOCK]><![endif]--><?php endif; ?><?php if($hasLoadingIndicator): ?>
|
|
<?php echo e(\Filament\Support\generate_loading_indicator_html((new \Illuminate\View\ComponentAttributeBag([
|
|
'wire:loading.delay.' . config('filament.livewire_loading_delay', 'default') => '',
|
|
'wire:target' => $loadingIndicatorTarget,
|
|
])), size: $iconSize)); ?>
|
|
|
|
<?php endif; ?><?php if(\Livewire\Mechanisms\ExtendBlade\ExtendBlade::isRenderingLivewireComponent()): ?><!--[if ENDBLOCK]><![endif]--><?php endif; ?>
|
|
<?php endif; ?><?php if(\Livewire\Mechanisms\ExtendBlade\ExtendBlade::isRenderingLivewireComponent()): ?><!--[if ENDBLOCK]><![endif]--><?php endif; ?>
|
|
|
|
<?php if(\Livewire\Mechanisms\ExtendBlade\ExtendBlade::isRenderingLivewireComponent()): ?><!--[if BLOCK]><![endif]--><?php endif; ?><?php if(! $labelSrOnly): ?>
|
|
<?php echo e($slot); ?>
|
|
|
|
<?php endif; ?><?php if(\Livewire\Mechanisms\ExtendBlade\ExtendBlade::isRenderingLivewireComponent()): ?><!--[if ENDBLOCK]><![endif]--><?php endif; ?>
|
|
|
|
<?php if(\Livewire\Mechanisms\ExtendBlade\ExtendBlade::isRenderingLivewireComponent()): ?><!--[if BLOCK]><![endif]--><?php endif; ?><?php if($iconPosition === IconPosition::After): ?>
|
|
<?php if(\Livewire\Mechanisms\ExtendBlade\ExtendBlade::isRenderingLivewireComponent()): ?><!--[if BLOCK]><![endif]--><?php endif; ?><?php if($icon): ?>
|
|
<?php echo e(\Filament\Support\generate_icon_html($icon, $iconAlias, (new \Illuminate\View\ComponentAttributeBag([
|
|
'wire:loading.remove.delay.' . config('filament.livewire_loading_delay', 'default') => $hasLoadingIndicator,
|
|
'wire:target' => $hasLoadingIndicator ? $loadingIndicatorTarget : false,
|
|
])), size: $iconSize)); ?>
|
|
|
|
<?php endif; ?><?php if(\Livewire\Mechanisms\ExtendBlade\ExtendBlade::isRenderingLivewireComponent()): ?><!--[if ENDBLOCK]><![endif]--><?php endif; ?>
|
|
|
|
<?php if(\Livewire\Mechanisms\ExtendBlade\ExtendBlade::isRenderingLivewireComponent()): ?><!--[if BLOCK]><![endif]--><?php endif; ?><?php if($hasLoadingIndicator): ?>
|
|
<?php echo e(\Filament\Support\generate_loading_indicator_html((new \Illuminate\View\ComponentAttributeBag([
|
|
'wire:loading.delay.' . config('filament.livewire_loading_delay', 'default') => '',
|
|
'wire:target' => $loadingIndicatorTarget,
|
|
])), size: $iconSize)); ?>
|
|
|
|
<?php endif; ?><?php if(\Livewire\Mechanisms\ExtendBlade\ExtendBlade::isRenderingLivewireComponent()): ?><!--[if ENDBLOCK]><![endif]--><?php endif; ?>
|
|
<?php endif; ?><?php if(\Livewire\Mechanisms\ExtendBlade\ExtendBlade::isRenderingLivewireComponent()): ?><!--[if ENDBLOCK]><![endif]--><?php endif; ?>
|
|
|
|
<?php if(\Livewire\Mechanisms\ExtendBlade\ExtendBlade::isRenderingLivewireComponent()): ?><!--[if BLOCK]><![endif]--><?php endif; ?><?php if(filled($badge)): ?>
|
|
<div class="fi-link-badge-ctn">
|
|
<?php if(\Livewire\Mechanisms\ExtendBlade\ExtendBlade::isRenderingLivewireComponent()): ?><!--[if BLOCK]><![endif]--><?php endif; ?><?php if($badge instanceof \Illuminate\View\ComponentSlot): ?>
|
|
<?php echo e($badge); ?>
|
|
|
|
<?php else: ?>
|
|
<span
|
|
<?php echo e((new ComponentAttributeBag)->color(BadgeComponent::class, $badgeColor)->class([
|
|
'fi-badge',
|
|
($badgeSize instanceof Size) ? "fi-size-{$badgeSize->value}" : (is_string($badgeSize) ? $badgeSize : ''),
|
|
])); ?>
|
|
|
|
>
|
|
<?php echo e($badge); ?>
|
|
|
|
</span>
|
|
<?php endif; ?><?php if(\Livewire\Mechanisms\ExtendBlade\ExtendBlade::isRenderingLivewireComponent()): ?><!--[if ENDBLOCK]><![endif]--><?php endif; ?>
|
|
</div>
|
|
<?php endif; ?><?php if(\Livewire\Mechanisms\ExtendBlade\ExtendBlade::isRenderingLivewireComponent()): ?><!--[if ENDBLOCK]><![endif]--><?php endif; ?>
|
|
</<?php echo e($tag); ?>><?php /**PATH /var/www/additional_design/vendor/filament/support/resources/views/components/link.blade.php ENDPATH**/ ?>
|