Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/admin/resources/lang/ar/order.php
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@
'shipped_at' => 'تاريخ الشحن',
'handed_over' => [
'shipping' => 'تاريخ الشحن',
'collection' => 'تاريخ الاستلام',
'pickup' => 'تاريخ الاستلام',
'digital' => 'تاريخ التوفير',
],
'handed_over_default' => 'تاريخ التنفيذ',
Expand Down Expand Up @@ -339,7 +339,7 @@
'label' => 'وضع علامة كمنفّذة',
'modal_heading' => 'وضع علامة على عملية التنفيذ كمنفّذة',
'labels' => [
'collection' => 'وضع علامة كمستلَمة',
'pickup' => 'وضع علامة كمستلَمة',
],
'notification' => [
'success' => 'تم وضع علامة على عملية التنفيذ كمنفّذة.',
Expand Down
4 changes: 2 additions & 2 deletions packages/admin/resources/lang/bg/order.php
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@
'shipped_at' => 'Изпратено на',
'handed_over' => [
'shipping' => 'Изпратено на',
'collection' => 'Получено на',
'pickup' => 'Получено на',
'digital' => 'Предоставено на',
],
'handed_over_default' => 'Изпълнено на',
Expand Down Expand Up @@ -339,7 +339,7 @@
'label' => 'Отбележи като изпълнено',
'modal_heading' => 'Отбележи изпълнението като изпълнено',
'labels' => [
'collection' => 'Отбележи като получено',
'pickup' => 'Отбележи като получено',
],
'notification' => [
'success' => 'Изпълнението е отбелязано като изпълнено.',
Expand Down
4 changes: 2 additions & 2 deletions packages/admin/resources/lang/de/order.php
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@
'shipped_at' => 'Versendet am',
'handed_over' => [
'shipping' => 'Versendet am',
'collection' => 'Abgeholt am',
'pickup' => 'Abgeholt am',
'digital' => 'Bereitgestellt am',
],
'handed_over_default' => 'Erfüllt am',
Expand Down Expand Up @@ -339,7 +339,7 @@
'label' => 'Als erfüllt markieren',
'modal_heading' => 'Fulfillment als erfüllt markieren',
'labels' => [
'collection' => 'Als abgeholt markieren',
'pickup' => 'Als abgeholt markieren',
],
'notification' => [
'success' => 'Fulfillment als erfüllt markiert.',
Expand Down
4 changes: 2 additions & 2 deletions packages/admin/resources/lang/en/order.php
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@
'shipped_at' => 'Shipped at',
'handed_over' => [
'shipping' => 'Shipped at',
'collection' => 'Collected at',
'pickup' => 'Picked up at',
'digital' => 'Provisioned at',
],
'handed_over_default' => 'Fulfilled at',
Expand Down Expand Up @@ -357,7 +357,7 @@
'label' => 'Mark fulfilled',
'modal_heading' => 'Mark fulfilment as fulfilled',
'labels' => [
'collection' => 'Mark collected',
'pickup' => 'Mark picked up',
],
'notification' => [
'success' => 'Fulfilment marked as fulfilled.',
Expand Down
4 changes: 2 additions & 2 deletions packages/admin/resources/lang/es/order.php
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@
'shipped_at' => 'Enviado el',
'handed_over' => [
'shipping' => 'Enviado el',
'collection' => 'Recogido el',
'pickup' => 'Recogido el',
'digital' => 'Aprovisionado el',
],
'handed_over_default' => 'Cumplido el',
Expand Down Expand Up @@ -339,7 +339,7 @@
'label' => 'Marcar como cumplido',
'modal_heading' => 'Marcar el cumplimiento como cumplido',
'labels' => [
'collection' => 'Marcar como recogido',
'pickup' => 'Marcar como recogido',
],
'notification' => [
'success' => 'Cumplimiento marcado como cumplido.',
Expand Down
4 changes: 2 additions & 2 deletions packages/admin/resources/lang/fa/order.php
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@
'shipped_at' => 'زمان ارسال',
'handed_over' => [
'shipping' => 'زمان ارسال',
'collection' => 'زمان تحویل حضوری',
'pickup' => 'زمان تحویل حضوری',
'digital' => 'زمان تأمین دیجیتال',
],
'handed_over_default' => 'زمان تأمین',
Expand Down Expand Up @@ -339,7 +339,7 @@
'label' => 'علامت‌گذاری به‌عنوان تأمین‌شده',
'modal_heading' => 'علامت‌گذاری تأمین سفارش به‌عنوان تأمین‌شده',
'labels' => [
'collection' => 'علامت‌گذاری به‌عنوان تحویل‌گرفته‌شده',
'pickup' => 'علامت‌گذاری به‌عنوان تحویل‌گرفته‌شده',
],
'notification' => [
'success' => 'تأمین سفارش به‌عنوان تأمین‌شده علامت‌گذاری شد.',
Expand Down
4 changes: 2 additions & 2 deletions packages/admin/resources/lang/fr/order.php
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@
'shipped_at' => 'Expédié le',
'handed_over' => [
'shipping' => 'Expédié le',
'collection' => 'Retiré le',
'pickup' => 'Retiré le',
'digital' => 'Mis à disposition le',
],
'handed_over_default' => 'Traité le',
Expand Down Expand Up @@ -339,7 +339,7 @@
'label' => 'Marquer comme traité',
'modal_heading' => 'Marquer le traitement comme traité',
'labels' => [
'collection' => 'Marquer comme retiré',
'pickup' => 'Marquer comme retiré',
],
'notification' => [
'success' => 'Traitement marqué comme traité.',
Expand Down
4 changes: 2 additions & 2 deletions packages/admin/resources/lang/hr/order.php
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@
'shipped_at' => 'Otpremljeno',
'handed_over' => [
'shipping' => 'Otpremljeno',
'collection' => 'Preuzeto',
'pickup' => 'Preuzeto',
'digital' => 'Stavljeno na raspolaganje',
],
'handed_over_default' => 'Ispunjeno',
Expand Down Expand Up @@ -339,7 +339,7 @@
'label' => 'Označi ispunjeno',
'modal_heading' => 'Označi ispunjenje kao ispunjeno',
'labels' => [
'collection' => 'Označi preuzeto',
'pickup' => 'Označi preuzeto',
],
'notification' => [
'success' => 'Ispunjenje označeno kao ispunjeno.',
Expand Down
4 changes: 2 additions & 2 deletions packages/admin/resources/lang/hu/order.php
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@
'shipped_at' => 'Kiszállítva',
'handed_over' => [
'shipping' => 'Kiszállítva',
'collection' => 'Átvéve',
'pickup' => 'Átvéve',
'digital' => 'Hozzáférhetővé téve',
],
'handed_over_default' => 'Teljesítve',
Expand Down Expand Up @@ -339,7 +339,7 @@
'label' => 'Teljesítettnek jelölés',
'modal_heading' => 'Teljesítés megjelölése teljesítettként',
'labels' => [
'collection' => 'Átvettnek jelölés',
'pickup' => 'Átvettnek jelölés',
],
'notification' => [
'success' => 'Teljesítés teljesítettként megjelölve.',
Expand Down
4 changes: 2 additions & 2 deletions packages/admin/resources/lang/mn/order.php
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@
'shipped_at' => 'Илгээсэн огноо',
'handed_over' => [
'shipping' => 'Илгээсэн огноо',
'collection' => 'Хүлээн авсан огноо',
'pickup' => 'Хүлээн авсан огноо',
'digital' => 'Нийлүүлсэн огноо',
],
'handed_over_default' => 'Биелүүлсэн огноо',
Expand Down Expand Up @@ -339,7 +339,7 @@
'label' => 'Биелүүлсэн гэж тэмдэглэх',
'modal_heading' => 'Биелүүлэлтийг биелүүлсэн гэж тэмдэглэх',
'labels' => [
'collection' => 'Хүлээн авсан гэж тэмдэглэх',
'pickup' => 'Хүлээн авсан гэж тэмдэглэх',
],
'notification' => [
'success' => 'Биелүүлэлтийг биелүүлсэн гэж тэмдэглэв.',
Expand Down
4 changes: 2 additions & 2 deletions packages/admin/resources/lang/nl/order.php
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@
'shipped_at' => 'Verzonden op',
'handed_over' => [
'shipping' => 'Verzonden op',
'collection' => 'Afgehaald op',
'pickup' => 'Afgehaald op',
'digital' => 'Beschikbaar gesteld op',
],
'handed_over_default' => 'Afgehandeld op',
Expand Down Expand Up @@ -339,7 +339,7 @@
'label' => 'Markeren als afgehandeld',
'modal_heading' => 'Fulfilment markeren als afgehandeld',
'labels' => [
'collection' => 'Markeren als afgehaald',
'pickup' => 'Markeren als afgehaald',
],
'notification' => [
'success' => 'Fulfilment gemarkeerd als afgehandeld.',
Expand Down
4 changes: 2 additions & 2 deletions packages/admin/resources/lang/pl/order.php
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@
'shipped_at' => 'Data wysyłki',
'handed_over' => [
'shipping' => 'Data wysyłki',
'collection' => 'Data odbioru',
'pickup' => 'Data odbioru',
'digital' => 'Data udostępnienia',
],
'handed_over_default' => 'Data realizacji',
Expand Down Expand Up @@ -339,7 +339,7 @@
'label' => 'Oznacz jako zrealizowaną',
'modal_heading' => 'Oznacz realizację jako zrealizowaną',
'labels' => [
'collection' => 'Oznacz jako odebraną',
'pickup' => 'Oznacz jako odebraną',
],
'notification' => [
'success' => 'Realizacja oznaczona jako zrealizowana.',
Expand Down
4 changes: 2 additions & 2 deletions packages/admin/resources/lang/pt_BR/order.php
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@
'shipped_at' => 'Enviado em',
'handed_over' => [
'shipping' => 'Enviado em',
'collection' => 'Retirado em',
'pickup' => 'Retirado em',
'digital' => 'Disponibilizado em',
],
'handed_over_default' => 'Concluído em',
Expand Down Expand Up @@ -339,7 +339,7 @@
'label' => 'Marcar como concluído',
'modal_heading' => 'Marcar fulfillment como concluído',
'labels' => [
'collection' => 'Marcar como retirado',
'pickup' => 'Marcar como retirado',
],
'notification' => [
'success' => 'Fulfillment marcado como concluído.',
Expand Down
4 changes: 2 additions & 2 deletions packages/admin/resources/lang/ro/order.php
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@
'shipped_at' => 'Expediat la',
'handed_over' => [
'shipping' => 'Expediat la',
'collection' => 'Ridicat la',
'pickup' => 'Ridicat la',
'digital' => 'Furnizat la',
],
'handed_over_default' => 'Onorat la',
Expand Down Expand Up @@ -339,7 +339,7 @@
'label' => 'Marchează onorat',
'modal_heading' => 'Marchează onorarea ca onorată',
'labels' => [
'collection' => 'Marchează ridicat',
'pickup' => 'Marchează ridicat',
],
'notification' => [
'success' => 'Onorare marcată ca onorată.',
Expand Down
4 changes: 2 additions & 2 deletions packages/admin/resources/lang/tr/order.php
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@
'shipped_at' => 'Gönderim tarihi',
'handed_over' => [
'shipping' => 'Gönderim tarihi',
'collection' => 'Teslim alma tarihi',
'pickup' => 'Teslim alma tarihi',
'digital' => 'Sağlanma tarihi',
],
'handed_over_default' => 'Karşılanma tarihi',
Expand Down Expand Up @@ -339,7 +339,7 @@
'label' => 'Karşılandı olarak işaretle',
'modal_heading' => 'Karşılamayı karşılandı olarak işaretle',
'labels' => [
'collection' => 'Teslim alındı olarak işaretle',
'pickup' => 'Teslim alındı olarak işaretle',
],
'notification' => [
'success' => 'Karşılama karşılandı olarak işaretlendi.',
Expand Down
4 changes: 2 additions & 2 deletions packages/admin/resources/lang/vi/order.php
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@
'shipped_at' => 'Thời điểm giao',
'handed_over' => [
'shipping' => 'Thời điểm giao',
'collection' => 'Thời điểm nhận',
'pickup' => 'Thời điểm nhận',
'digital' => 'Thời điểm cung cấp',
],
'handed_over_default' => 'Thời điểm hoàn thành',
Expand Down Expand Up @@ -339,7 +339,7 @@
'label' => 'Đánh dấu đã hoàn thành',
'modal_heading' => 'Đánh dấu đơn giao hàng là đã hoàn thành',
'labels' => [
'collection' => 'Đánh dấu đã nhận',
'pickup' => 'Đánh dấu đã nhận',
],
'notification' => [
'success' => 'Đã đánh dấu đơn giao hàng là đã hoàn thành.',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ public function shipAction(): Action

/**
* The no-tracking terminal action for methods that don't carry tracking
* (collection → "Mark collected", digital → "Mark fulfilled"). Routes
* (pickup → "Mark picked up", digital → "Mark fulfilled"). Routes
* through the `fulfil()` verb, so the agent/API path is identical.
*/
public function fulfilAction(): Action
Expand All @@ -201,7 +201,7 @@ public function fulfilAction(): Action

/**
* The terminal action label for a method — a per-method override (e.g.
* collection → "Mark collected") falling back to the generic label.
* pickup → "Mark picked up") falling back to the generic label.
*/
protected function fulfilLabel(Fulfilment $fulfilment): string
{
Expand All @@ -214,7 +214,7 @@ protected function fulfilLabel(Fulfilment $fulfilment): string

/**
* The handed-over timestamp label for a fulfilment — a per-method override
* (shipped at / collected at / provisioned at) falling back to a generic
* (shipped at / picked up at / provisioned at) falling back to a generic
* "fulfilled at". Public so the card can render it off `shipped_at`.
*/
public function handedOverLabel(Fulfilment $fulfilment): string
Expand Down Expand Up @@ -475,7 +475,7 @@ public function returnAction(): Action

/**
* Undo a mistaken return — moves the fulfilment back to its method's fulfilled
* state (shipped / collected), keeping the handover (shipped_at + tracking)
* state (shipped / picked up), keeping the handover (shipped_at + tracking)
* intact. Only the return is reversed.
*/
public function undoReturnAction(): Action
Expand Down
10 changes: 5 additions & 5 deletions packages/core/database/factories/FulfilmentFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,16 @@ public function returned(): static
]);
}

public function collection(): static
public function pickup(): static
{
return $this->state(fn () => ['method' => 'collection']);
return $this->state(fn () => ['method' => 'pickup']);
}

public function collected(): static
public function pickedUp(): static
{
return $this->state(fn () => [
'method' => 'collection',
'state' => 'collected',
'method' => 'pickup',
'state' => 'picked-up',
'shipped_at' => now(),
]);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/core/resources/lang/ar/fulfilment.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

'methods' => [
'shipping' => 'الشحن',
'collection' => 'الاستلام',
'pickup' => 'الاستلام',
'digital' => 'رقمي',
],

Expand Down
4 changes: 2 additions & 2 deletions packages/core/resources/lang/ar/states.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@
'fulfilment' => [
'pending' => 'قيد الانتظار',
'in-progress' => 'قيد التنفيذ',
'ready-for-collection' => 'جاهز للاستلام',
'ready-for-pickup' => 'جاهز للاستلام',
'shipped' => 'تم الشحن',
'collected' => 'تم الاستلام',
'picked-up' => 'تم الاستلام',
'provisioned' => 'تم التوفير',
'cancelled' => 'مُلغى',
'returned' => 'مُرتجَع',
Expand Down
2 changes: 1 addition & 1 deletion packages/core/resources/lang/bg/fulfilment.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

'methods' => [
'shipping' => 'Доставка',
'collection' => 'Получаване на място',
'pickup' => 'Получаване на място',
'digital' => 'Дигитално',
],

Expand Down
4 changes: 2 additions & 2 deletions packages/core/resources/lang/bg/states.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@
'fulfilment' => [
'pending' => 'Изчакващо',
'in-progress' => 'В процес',
'ready-for-collection' => 'Готово за получаване',
'ready-for-pickup' => 'Готово за получаване',
'shipped' => 'Изпратено',
'collected' => 'Получено',
'picked-up' => 'Получено',
'provisioned' => 'Предоставено',
'cancelled' => 'Отменено',
'returned' => 'Върнато',
Expand Down
2 changes: 1 addition & 1 deletion packages/core/resources/lang/de/fulfilment.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

'methods' => [
'shipping' => 'Versand',
'collection' => 'Abholung',
'pickup' => 'Abholung',
'digital' => 'Digital',
],

Expand Down
Loading
Loading