Merge remote-tracking branch 'origin/main' into chore/merge-main-into-develop

# Conflicts:
#	backend/lang/pl.json
#	backend/resources/views/packaging/admin.blade.php
#	backend/resources/views/packaging/eans/index.blade.php
#	backend/resources/views/packaging/station.blade.php

Author: jakubprzepiora-cyber

backend/README.md

@@ -1,59 +1,11 @@
-<p align="center"><a href="https://laravel.com" target="_blank"><img src="https://raw.githubusercontent.com/laravel/art/master/logo-lockup/5%20SVG/2%20CMYK/1%20Full%20Color/laravel-logolockup-cmyk-red.svg" width="400" alt="Laravel Logo"></a></p>
+# OpenMES — Laravel backend
 
-<p align="center">
-<a href="https://github.com/laravel/framework/actions"><img src="https://github.com/laravel/framework/workflows/tests/badge.svg" alt="Build Status"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/dt/laravel/framework" alt="Total Downloads"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/v/laravel/framework" alt="Latest Stable Version"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/l/laravel/framework" alt="License"></a>
-</p>
+This directory contains the Laravel application that powers OpenMES.
 
-## About Laravel
+For project overview, features, installation, and license, see the root
+[README.md](../README.md). OpenMES is released under the **GNU AGPL-3.0**
+(see [LICENSE](../LICENSE)).
 
-Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable and creative experience to be truly fulfilling. Laravel takes the pain out of development by easing common tasks used in many web projects, such as:
-
-- [Simple, fast routing engine](https://laravel.com/docs/routing).
-- [Powerful dependency injection container](https://laravel.com/docs/container).
-- Multiple back-ends for [session](https://laravel.com/docs/session) and [cache](https://laravel.com/docs/cache) storage.
-- Expressive, intuitive [database ORM](https://laravel.com/docs/eloquent).
-- Database agnostic [schema migrations](https://laravel.com/docs/migrations).
-- [Robust background job processing](https://laravel.com/docs/queues).
-- [Real-time event broadcasting](https://laravel.com/docs/broadcasting).
-
-Laravel is accessible, powerful, and provides tools required for large, robust applications.
-
-## Learning Laravel
-
-Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of all modern web application frameworks, making it a breeze to get started with the framework. You can also check out [Laravel Learn](https://laravel.com/learn), where you will be guided through building a modern Laravel application.
-
-If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Laracasts contains thousands of video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost your skills by digging into our comprehensive video library.
-
-## Laravel Sponsors
-
-We would like to extend our thanks to the following sponsors for funding Laravel development. If you are interested in becoming a sponsor, please visit the [Laravel Partners program](https://partners.laravel.com).
-
-### Premium Partners
-
-- **[Vehikl](https://vehikl.com)**
-- **[Tighten Co.](https://tighten.co)**
-- **[Kirschbaum Development Group](https://kirschbaumdevelopment.com)**
-- **[64 Robots](https://64robots.com)**
-- **[Curotec](https://www.curotec.com/services/technologies/laravel)**
-- **[DevSquad](https://devsquad.com/hire-laravel-developers)**
-- **[Redberry](https://redberry.international/laravel-development)**
-- **[Active Logic](https://activelogic.com)**
-
-## Contributing
-
-Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](https://laravel.com/docs/contributions).
-
-## Code of Conduct
-
-In order to ensure that the Laravel community is welcoming to all, please review and abide by the [Code of Conduct](https://laravel.com/docs/contributions#code-of-conduct).
-
-## Security Vulnerabilities
-
-If you discover a security vulnerability within Laravel, please send an e-mail to Taylor Otwell via [taylor@laravel.com](mailto:taylor@laravel.com). All security vulnerabilities will be promptly addressed.
-
-## License
-
-The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).
+The underlying [Laravel framework](https://laravel.com) is an independent
+project with its own license — refer to Laravel's documentation for those
+terms.

backend/composer.json

@@ -1,10 +1,10 @@
 {
     "$schema": "https://getcomposer.org/schema.json",
-    "name": "laravel/laravel",
+    "name": "mes-open/openmes",
     "type": "project",
-    "description": "The skeleton application for the Laravel framework.",
-    "keywords": ["laravel", "framework"],
-    "license": "MIT",
+    "description": "OpenMES — open-source Manufacturing Execution System.",
+    "keywords": ["openmes", "mes", "manufacturing", "laravel"],
+    "license": "AGPL-3.0-only",
     "require": {
         "php": "^8.2",
         "aldas/modbus-tcp-client": "^3.6",

backend/lang/en.json

@@ -1251,5 +1251,45 @@
     "— Select factory —": "— Select factory —",
     "— Select type —": "— Select type —",
     "— Unassigned —": "— Unassigned —",
-    "← Back": "← Back"
+    "← Back": "← Back",
+    "← Packaging overview": "← Packaging overview",
+    "Add EAN": "Add EAN",
+    "Add EAN code": "Add EAN code",
+    "Assign barcodes to production work orders": "Assign barcodes to production work orders",
+    "Current shift:": "Current shift:",
+    "Delete EAN code :ean?": "Delete EAN code :ean?",
+    "EAN Codes": "EAN Codes",
+    "EAN Codes — Management": "EAN Codes — Management",
+    "EAN Code Management": "EAN Code Management",
+    "EAN code": "EAN code",
+    "Error": "Error",
+    "Last scan": "Last scan",
+    "Logged in:": "Logged in:",
+    "Manage EAN": "Manage EAN",
+    "No EAN": "No EAN",
+    "No results": "No results",
+    "No scans in this shift": "No scans in this shift",
+    "No work orders with assigned EAN codes": "No work orders with assigned EAN codes",
+    "Open station": "Open station",
+    "Packed": "Packed",
+    "Packed (shift)": "Packed (shift)",
+    "Packed / Plan": "Packed / Plan",
+    "Packaging": "Packaging",
+    "Packaging — Overview": "Packaging — Overview",
+    "Packaging Station": "Packaging Station",
+    "Plan": "Plan",
+    "Production work order": "Production work order",
+    "Scan EAN code…": "Scan EAN code…",
+    "Scan error": "Scan error",
+    "Scan history (shift)": "Scan history (shift)",
+    "Scanned!": "Scanned!",
+    "Scanning active": "Scanning active",
+    "Search by order number…": "Search by order number…",
+    "Shift:": "Shift:",
+    "Total plan": "Total plan",
+    "Waiting for scan…": "Waiting for scan…",
+    "Work orders to pack": "Work orders to pack",
+    "e.g. 5901234123457": "e.g. 5901234123457",
+    "pcs.": "pcs.",
+    "— select work order —": "— select work order —"
 }

backend/lang/pl.json

@@ -1124,7 +1124,6 @@
     "View Details": "Szczegóły",
     "View Steps": "Zobacz kroki",
     "View Template": "Szablon widoku",
-    "View Templates": "Szablony widoku",
     "View all": "Zobacz wszystkie",
     "View issues": "Zobacz problemy",
     "View mode": "Tryb widoku",
@@ -1307,7 +1306,6 @@
     "Quantity corrections are not allowed.": "Korekty ilości są niedozwolone.",
     "The correction time window has expired.": "Okno czasowe korekty wygasło.",
     "Production Date": "Data produkcji",
-    "Shift": "Zmiana",
     "Download example CSV file for materials import": "Pobierz przykładowy plik CSV do importu materiałów",
     "Download example CSV file for product types import": "Pobierz przykładowy plik CSV do importu typów produktów",
     "Download example CSV file for lines import": "Pobierz przykładowy plik CSV do importu linii produkcyjnych",
@@ -1333,7 +1331,7 @@
     "How long browsers cache preflight responses. 0 = no caching (strictest).": "Jak długo przeglądarki cachują odpowiedzi preflight. 0 = brak cachowania (najsurowsze).",
     "Maintenance Reminder": "Przypomnienie o konserwacji",
     "Packaging": "Pakowanie",
-    "Packaging Station": "Stanowisko Pakowania",
+    "Packaging Station": "Stanowisko pakowania",
     "Packaging - Overview": "Pakowanie - Przegląd",
     "Open station": "Otwórz stanowisko",
     "Manage EANs": "Zarządzaj kodami EAN",
@@ -1369,7 +1367,7 @@
     "Scanned!": "Zeskanowano!",
     "Scanning error": "Błąd skanowania",
     "Work orders to pack": "Zlecenia do spakowania",
-    "Packed": "Spakowano",
+    "Packed": "Spakowane",
     "Plan": "Plan",
     "No work orders with assigned EAN codes": "Brak zleceń z przypisanymi kodami EAN",
     "Scan history (shift)": "Historia skanowań (zmiana)",
@@ -1413,5 +1411,21 @@
     "Packed / Plan": "Spakowano / Plan",
     "Delete EAN code": "Usunąć kod EAN",
     "No EAN": "Brak EAN",
-    "No results": "Brak wyników"
+    "No results": "Brak wyników",
+    "← Packaging overview": "← Przegląd pakowania",
+    "Assign barcodes to production work orders": "Przypisuj kody kreskowe do zleceń produkcyjnych",
+    "Current shift:": "Bieżąca zmiana:",
+    "Delete EAN code :ean?": "Usunąć kod EAN :ean?",
+    "EAN Codes — Management": "Kody EAN — Zarządzanie",
+    "EAN Code Management": "Zarządzanie kodami EAN",
+    "Logged in:": "Zalogowany:",
+    "Manage EAN": "Zarządzaj EAN",
+    "Packaging — Overview": "Pakowanie — Przegląd",
+    "Production work order": "Zlecenie produkcyjne",
+    "Scan EAN code…": "Skanuj kod EAN…",
+    "Scan error": "Błąd skanowania",
+    "Scanning active": "Skanowanie aktywne",
+    "Shift:": "Zmiana:",
+    "Waiting for scan…": "Oczekiwanie na skanowanie…",
+    "— select work order —": "— wybierz zlecenie —"
 }

backend/resources/views/packaging/admin.blade.php

@@ -1,25 +1,25 @@
 @extends('layouts.app')
 
-@section('title', __('Packaging - Overview'))
+@section('title', __('Packaging — Overview'))
 
 @section('content')
 <div class="max-w-7xl mx-auto">
     <x-breadcrumbs :items="[
-        ['label' => __('Dashboard'), 'url' => route('admin.dashboard')],
+        ['label' => 'Dashboard', 'url' => route('admin.dashboard')],
         ['label' => __('Packaging'), 'url' => null],
     ]" />
 
     <div class="flex flex-col sm:flex-row items-start sm:items-center justify-between gap-3 mb-6">
         <div>
-            <h1 class="text-2xl font-bold text-gray-800 dark:text-white">{{ __('Packaging - Overview') }}</h1>
-            <p class="text-sm text-gray-500 mt-1">{{ __('Current shift') }}: {{ (now()->hour >= 6 && now()->hour < 18) ? '06:00 - 18:00' : '18:00 - 06:00' }}</p>
+            <h1 class="text-2xl font-bold text-gray-800 dark:text-white">{{ __('Packaging — Overview') }}</h1>
+            <p class="text-sm text-gray-500 mt-1">{{ __('Current shift:') }} {{ (now()->hour >= 6 && now()->hour < 18) ? '06:00 – 18:00' : '18:00 – 06:00' }}</p>
         </div>
         <div class="flex gap-2">
             <a href="{{ route('packaging.station') }}" class="btn-touch btn-primary">
                 {{ __('Open station') }}
             </a>
             <a href="{{ route('packaging.eans.index') }}" class="btn-touch btn-secondary">
-                {{ __('Manage EANs') }}
+                {{ __('Manage EAN') }}
             </a>
         </div>
     </div>
@@ -41,16 +41,16 @@
             <p class="text-xs text-gray-500 mt-1">{{ __('Backlog') }}</p>
         </div>
         @php
-            $completion = $stats['plan'] > 0 ? min(100, round($stats['total_packed'] / $stats['plan'] * 100)) : 0;
+            $realizacja = $stats['plan'] > 0 ? min(100, round($stats['total_packed'] / $stats['plan'] * 100)) : 0;
         @endphp
         <div class="card text-center">
-            <p class="text-3xl font-extrabold {{ $completion >= 100 ? 'text-green-600' : ($completion >= 50 ? 'text-yellow-600' : 'text-red-600') }}">
-                {{ $completion }}%
+            <p class="text-3xl font-extrabold {{ $realizacja >= 100 ? 'text-green-600' : ($realizacja >= 50 ? 'text-yellow-600' : 'text-red-600') }}">
+                {{ $realizacja }}%
             </p>
             <p class="text-xs text-gray-500 mt-1">{{ __('Completion') }}</p>
             <div class="w-full bg-gray-200 dark:bg-gray-700 rounded-full h-1.5 mt-2">
-                <div class="h-1.5 rounded-full {{ $completion >= 100 ? 'bg-green-500' : ($completion >= 50 ? 'bg-yellow-500' : 'bg-red-500') }}"
-                     style="width: {{ $completion }}%"></div>
+                <div class="h-1.5 rounded-full {{ $realizacja >= 100 ? 'bg-green-500' : ($realizacja >= 50 ? 'bg-yellow-500' : 'bg-red-500') }}"
+                     style="width: {{ $realizacja }}%"></div>
             </div>
         </div>
     </div>
@@ -66,10 +66,10 @@
             <table class="min-w-full divide-y divide-gray-200 dark:divide-gray-700 text-sm">
                 <thead class="bg-gray-50 dark:bg-gray-800">
                     <tr>
-                        <th class="px-4 py-2.5 text-left text-xs font-semibold text-gray-500 uppercase">{{ __('Order') }}</th>
+                        <th class="px-4 py-2.5 text-left text-xs font-semibold text-gray-500 uppercase">{{ __('Work Order') }}</th>
                         <th class="px-4 py-2.5 text-left text-xs font-semibold text-gray-500 uppercase">{{ __('Product') }}</th>
                         <th class="px-4 py-2.5 text-left text-xs font-semibold text-gray-500 uppercase">{{ __('Line') }}</th>
-                        <th class="px-4 py-2.5 text-left text-xs font-semibold text-gray-500 uppercase">{{ __('EAN') }}</th>
+                        <th class="px-4 py-2.5 text-left text-xs font-semibold text-gray-500 uppercase">EAN</th>
                         <th class="px-4 py-2.5 text-right text-xs font-semibold text-gray-500 uppercase">{{ __('Packed') }}</th>
                         <th class="px-4 py-2.5 text-right text-xs font-semibold text-gray-500 uppercase">{{ __('Plan') }}</th>
                         <th class="px-4 py-2.5 text-left text-xs font-semibold text-gray-500 uppercase w-32">{{ __('Progress') }}</th>
@@ -105,7 +105,7 @@
                                     </span>
                                 @elseif($item['status'] === 'DONE')
                                     <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-yellow-100 text-yellow-800 dark:bg-yellow-900/30 dark:text-yellow-300">
-                                        {{ __('In progress') }}
+                                        {{ __('In Progress') }}
                                     </span>
                                 @else
                                     <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-blue-100 text-blue-800 dark:bg-blue-900/30 dark:text-blue-300">