diff --git a/.env b/.env index ae5ac1a..dfbf460 100644 --- a/.env +++ b/.env @@ -28,6 +28,8 @@ EXCEPTION_MAIL=exception@adametz.media SESSION_DOMAIN=.mivita.test #SESSION_DOMAIN=.mivita.care +BUSINESS_FORCE_EXECUTE=true + APP_MODE=test APP_IPINFO=true @@ -105,14 +107,24 @@ MIVITA_ADD_NUMBER_ID=946 # DHL VERSANDMODUL KONFIGURATION (acme/laravel-dhl) # ============================================================================= +# ============================================================================= +# DHL KONFIGURATION - PRIORITÄT +# ============================================================================= +# Steuert, welche Konfigurationsquelle Vorrang hat: +# - 'database' (Standard): Werte aus Admin-Settings überschreiben .env Werte +# - 'env': .env Werte überschreiben Admin-Settings +# Nützlich für Test-Server, wo du .env Werte verwenden möchtest, +# ohne die Datenbank-Settings ändern zu müssen +DHL_CONFIG_SOURCE=env + # DHL API Zugangsdaten (konsolidiert) -#DHL_BASE_URL=https://api-eu.dhl.com DHL_SANDBOX_URL=https://api-sandbox.dhl.com +DHL_BASE_URL=https://api-eu.dhl.com +DHL_SANDBOX=false +DHL_TEST_MODE=false DHL_API_KEY=AxGBdF8DBdIAmuhqvG0ASBRKFvyV7ypX -#DHL_USERNAME=riwa-tec -#DHL_PASSWORD=MivitaCare!!2025 -#DHL_BILLING_NUMBER=63144073550101 + # DHL Standard-Einstellungen DHL_PRODUCT=V01PAK @@ -127,20 +139,23 @@ DHL_PROFILE=STANDARD_GRUPPENPROFIL DHL_USE_QUEUE=false # DHL Account Numbers (für verschiedene Produkte) +DHL_USERNAME=riwa-tec +DHL_PASSWORD=MivitaCare!!2025 +DHL_BILLING_NUMBER=63144073550101 DHL_ACCOUNT_NUMBER_DEFAULT=63144073550101 DHL_ACCOUNT_NUMBER_V01PAK=63144073550101 # DHL Paket National DHL_ACCOUNT_NUMBER_V62WP=63144073556201 # Warenpost National DHL_ACCOUNT_NUMBER_V53PAK=63144073555301 # DHL Paket International DHL_ACCOUNT_NUMBER_V07PAK=63144073550701 # DHL Retoure Online #sandbox -DHL_USERNAME=user-valid -DHL_PASSWORD=SandboxPasswort2023! -DHL_BILLING_NUMBER=33333333330101 -DHL_ACCOUNT_NUMBER_DEFAULT=33333333330101 -DHL_ACCOUNT_NUMBER_V01PAK=33333333330102 # DHL Paket National -DHL_ACCOUNT_NUMBER_V62WP=33333333336601 # Warenpost National -DHL_ACCOUNT_NUMBER_V53PAK=33333333335301 # DHL Paket International -DHL_ACCOUNT_NUMBER_V07PAK=33333333330702 # DHL Retoure Online +#DHL_USERNAME=user-valid +#DHL_PASSWORD=SandboxPasswort2023! +#DHL_BILLING_NUMBER=33333333330101 +#DHL_ACCOUNT_NUMBER_DEFAULT=33333333330101 +#DHL_ACCOUNT_NUMBER_V01PAK=33333333330102 # DHL Paket National +#DHL_ACCOUNT_NUMBER_V62WP=33333333336601 # Warenpost National +#DHL_ACCOUNT_NUMBER_V53PAK=33333333335301 # DHL Paket International +#DHL_ACCOUNT_NUMBER_V07PAK=33333333330702 # DHL Retoure Online #V66WPI|33333333336601 #VO1PAK 33333333330102 33333333330101 @@ -161,5 +176,4 @@ DHL_SENDER_PHONE="+49 123 456789" # DHL Legacy/Compatibility Settings DHL_API_TYPE=developer DHL_API_SECRET=OyoeePEbYmY1EuOG -DHL_SANDBOX=true -DHL_TEST_MODE=true + diff --git a/.env.example b/.env.example index 67d49c9..edd7a4c 100644 --- a/.env.example +++ b/.env.example @@ -4,6 +4,17 @@ # Diese Datei enthält alle DHL-spezifischen Environment-Variablen # Kopieren Sie die benötigten Variablen in Ihre .env Datei +# ============================================================================= +# DHL KONFIGURATION - PRIORITÄT +# ============================================================================= +# Steuert, welche Konfigurationsquelle Vorrang hat: +# - 'database' (Standard): Werte aus Admin-Settings überschreiben .env Werte +# - 'env': .env Werte überschreiben Admin-Settings +# +# Nützlich für Test-Server, wo du .env Werte verwenden möchtest, +# ohne die Datenbank-Settings ändern zu müssen +DHL_CONFIG_SOURCE=database + # DHL API Zugangsdaten # Option 1: DHL Developer API (developer.dhl.com) - Empfohlen DHL_API_KEY=your_api_key_from_developer_dhl_com @@ -71,4 +82,8 @@ DHL_CACHE_TTL=3600 # Sekunden # Entwicklung/Testing DHL_FAKE_API_CALLS=false # true um API-Calls zu simulieren DHL_MOCK_RESPONSES=false # true um Mock-Responses zu verwenden -DHL_DEBUG_MODE=false # true für detaillierte Debug-Informationen \ No newline at end of file +DHL_DEBUG_MODE=false # true für detaillierte Debug-Informationen +# Business Commands Configuration +# Erlaubt Business-Commands an jedem Tag (nur für Test-Server!) +# Auf Live-Server muss dies false sein oder weggelassen werden +BUSINESS_FORCE_EXECUTE=false diff --git a/.mcp.json b/.mcp.json new file mode 100644 index 0000000..3cceeb6 --- /dev/null +++ b/.mcp.json @@ -0,0 +1,27 @@ +{ + "mcpServers": { + "laravel-boost": { + "command": "php", + "args": [ + "artisan", + "boost:mcp" + ] + }, + "context7": { + "command": "npx", + "args": [ + "-y", + "@upstash/context7-mcp", + "--api-key", + "ctx7sk-119cd4ab-8983-4229-8702-e84c59c34fc9" + ] + }, + "sequential-thinking": { + "command": "npx", + "args": [ + "-y", + "@modelcontextprotocol/server-sequential-thinking" + ] + } + } +} \ No newline at end of file diff --git a/.phpunit.result.cache b/.phpunit.result.cache index e98b45b..fb6a6bb 100644 --- a/.phpunit.result.cache +++ b/.phpunit.result.cache @@ -1 +1 @@ -C:37:"PHPUnit\Runner\DefaultTestResultCache":44:{a:2:{s:7:"defects";a:0:{}s:5:"times";a:0:{}}} \ No newline at end of file +{"version":1,"defects":{"Tests\\Feature\\Payment\\ConcurrentPaymentTest::it_uses_database_locking_for_invoice_numbers":5,"Tests\\Feature\\Payment\\ConcurrentPaymentTest::it_prevents_double_processing_of_same_payment":8},"times":{"Tests\\Unit\\Services\\InvoiceServiceTest::it_gets_current_invoice_number":0.002,"Tests\\Unit\\Services\\InvoiceServiceTest::it_increments_invoice_number":0.002,"Tests\\Unit\\Services\\InvoiceServiceTest::it_increments_sequentially":0.004,"Tests\\Unit\\Services\\InvoiceServiceTest::it_formats_invoice_number_with_year_prefix":0.001,"Tests\\Unit\\Services\\InvoiceServiceTest::it_generates_correct_storage_paths":0.001,"Tests\\Unit\\Services\\InvoiceServiceTest::it_generates_correct_filenames":0.001,"Tests\\Unit\\Services\\InvoiceServiceTest::it_initializes_invoice_number_when_not_exists":0.002,"Tests\\Unit\\Services\\InvoiceServiceTest::it_uses_transaction_for_invoice_number_increment":0.003,"Tests\\Unit\\Services\\InvoiceServiceTest::it_locks_setting_during_increment":0.001,"Tests\\Unit\\Services\\InvoiceServiceTest::it_pads_invoice_numbers_correctly":0.001,"Tests\\Unit\\Services\\InvoiceServiceTest::it_returns_zero_when_invoice_number_not_set":0.002,"Tests\\Unit\\Services\\InvoiceServiceTest::it_handles_rapid_increments_without_gaps":0.009,"Tests\\Unit\\Services\\InvoiceServiceTest::it_returns_integer_invoice_number":0.002,"Tests\\Feature\\Payment\\ConcurrentPaymentTest::it_generates_unique_invoice_numbers_under_concurrent_load":0.02,"Tests\\Feature\\Payment\\ConcurrentPaymentTest::it_atomically_increments_invoice_numbers":0.004,"Tests\\Feature\\Payment\\ConcurrentPaymentTest::it_does_not_skip_invoice_numbers_on_transaction_rollback":0.002,"Tests\\Feature\\Payment\\ConcurrentPaymentTest::it_uses_database_locking_for_invoice_numbers":0.003,"Tests\\Feature\\Payment\\ConcurrentPaymentTest::it_prevents_double_processing_of_same_payment":0.006,"Tests\\Feature\\Payment\\ConcurrentPaymentTest::it_can_lock_settings_for_update":0.001,"Tests\\Feature\\Payment\\ConcurrentPaymentTest::it_creates_invoice_numbers_with_correct_format":0.001,"Tests\\Feature\\Payment\\ConcurrentPaymentTest::it_handles_rapid_sequential_invoice_creation":0.012,"Tests\\Feature\\Payment\\ConcurrentPaymentTest::it_initializes_invoice_number_if_not_exists":0.002,"Tests\\Feature\\Payment\\ConcurrentPaymentTest::it_handles_concurrent_transaction_commits":0.003,"Tests\\Feature\\Payment\\PayoneRaceConditionTest::it_locks_shopping_order_during_payment_processing":0.001,"Tests\\Feature\\Payment\\PayoneRaceConditionTest::it_prevents_double_payment_processing":0.002,"Tests\\Feature\\Payment\\PayoneRaceConditionTest::it_serializes_concurrent_payment_requests":0.003,"Tests\\Feature\\Payment\\PayoneRaceConditionTest::it_rolls_back_payment_on_error":0.003,"Tests\\Feature\\Payment\\PayoneRaceConditionTest::it_tracks_payment_status_transitions":0.003,"Tests\\Feature\\Payment\\PayoneRaceConditionTest::it_handles_concurrent_payments_for_different_orders":0.003,"Tests\\Feature\\Payment\\PayoneRaceConditionTest::it_isolates_payment_transactions":0.002,"Tests\\Feature\\Payment\\PayoneRaceConditionTest::it_prevents_concurrent_modifications":0.001,"Tests\\Feature\\Payment\\PayoneRaceConditionTest::it_enforces_unique_payment_references":0.002}} \ No newline at end of file diff --git a/CLAUDE.md b/CLAUDE.md index 465710a..b16eb92 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -6,18 +6,18 @@ ## Tech Stack -| Komponente | Technologie | -|------------|-------------| -| Framework | Laravel 11 (Classic MVC) | -| Frontend | Bootstrap 4 (Appwork Theme), Blade Templates | -| Auth | Laravel Passport (OAuth2/API) | -| Database | MySQL 8 | -| Data Tables | Yajra Datatables | -| Testing | Pest PHP | -| Queue | Laravel Horizon + Redis | -| PDF | barryvdh/laravel-dompdf | -| Slugs | Eloquent-Sluggable | -| Forms | Spatie\Html | +| Komponente | Technologie | +| ----------- | -------------------------------------------- | +| Framework | Laravel 11 (Classic MVC) | +| Frontend | Bootstrap 4 (Appwork Theme), Blade Templates | +| Auth | Laravel Passport (OAuth2/API) | +| Database | MySQL 8 | +| Data Tables | Yajra Datatables | +| Testing | Pest PHP | +| Queue | Laravel Horizon + Redis | +| PDF | barryvdh/laravel-dompdf | +| Slugs | Eloquent-Sluggable | +| Forms | Spatie\Html | ## Wichtige Regeln (Constraints) @@ -30,10 +30,22 @@ ## Custom Packages -| Package | Pfad | Beschreibung | -|---------|------|--------------| -| DHL Integration | `packages/acme-laravel-dhl` | Versand-Labels und Tracking | -| Shopping Cart | `packages/digital-bird/shoppingcart` | Warenkorb-System | +| Package | Pfad | Beschreibung | +| --------------- | ------------------------------------ | --------------------------- | +| DHL Integration | `packages/acme-laravel-dhl` | Versand-Labels und Tracking | +| Shopping Cart | `packages/digital-bird/shoppingcart` | Warenkorb-System | + +## Environment + +This project runs inside a **Dev Container**. Commands are executed directly with `php`, `composer`, and `npm` — **without** the `vendor/bin/sail` prefix. All `sail`-prefixed commands in docs or rules should be translated to their direct equivalents: + +| Sail | Dev Container | +| ------------------------------ | ------------------- | +| `vendor/bin/sail artisan ...` | `php artisan ...` | +| `vendor/bin/sail composer ...` | `composer ...` | +| `vendor/bin/sail npm ...` | `npm ...` | +| `vendor/bin/sail php ...` | `php ...` | +| `vendor/bin/sail bin pint` | `./vendor/bin/pint` | ## Projekt-Struktur @@ -60,6 +72,7 @@ dev/ # Dokumentation ## Development Commands ### Laravel Basis + ```bash php artisan serve # Dev Server php artisan migrate # Migrations @@ -70,6 +83,7 @@ php artisan view:clear ``` ### Code Quality + ```bash ./vendor/bin/pint # Code formatieren ./vendor/bin/pest # Tests ausführen @@ -77,6 +91,7 @@ php artisan view:clear ``` ### IDE Helper + ```bash php artisan ide-helper:generate php artisan ide-helper:models @@ -84,12 +99,14 @@ php artisan ide-helper:meta ``` ### Assets + ```bash npm install && npm run dev # Development npm run production # Production Build ``` ### Business Commands + ```bash # Provisionsberechnung (empfohlen: optimierte Version) php artisan business:store-optimized {month} {year} @@ -114,12 +131,12 @@ php artisan business:test-account ## Scheduled Tasks (Cron) -| Zeit | Command | Beschreibung | -|------|---------|--------------| -| 02:00 | `payments:check-accounts` | Zahlungsprüfung | +| Zeit | Command | Beschreibung | +| ----- | ------------------------------ | -------------------- | +| 02:00 | `payments:check-accounts` | Zahlungsprüfung | | 03:00 | `business:store-optimized 0 0` | Provisionsberechnung | -| 03:30 | `user:cleanup` | User-Bereinigung | -| 04:00 | `user:make_abo_order` | Abo-Bestellungen | +| 03:30 | `user:cleanup` | User-Bereinigung | +| 04:00 | `user:make_abo_order` | Abo-Bestellungen | ## Docker Environment @@ -130,6 +147,7 @@ docker-compose up -d # Services starten ``` ### Services + - **laravel.test** - Hauptanwendung (Traefik + SSL) - **horizon** - Queue Worker - **mysql** - MySQL 8.0 @@ -137,6 +155,7 @@ docker-compose up -d # Services starten - **mailpit** - Mail Testing (`mivita-mail.test`) ### Domains + - Main: `mivita.test` - Wildcard: `*.mivita.test` - Mail: `mivita-mail.test` @@ -144,11 +163,13 @@ docker-compose up -d # Services starten ## MLM-Architektur ### Kernkonzepte + - **Consultants (Berater)**: Hierarchie mit Upline/Downline - **TreeCalcBotOptimized**: Provisionsberechnung für MLM-Strukturen - **BusinessPlan Services**: Sales Volumes, Ränge, Boni ### Performance + - Memory Monitoring in optimierten Commands - Automatic Garbage Collection - Performance Logging @@ -159,3 +180,269 @@ docker-compose up -d # Services starten - Prüfe Custom Packages in `packages/` vor Änderungen - Beachte Multi-Tenant Domain-Logik bei Routing-Änderungen - DHL-Integration unterstützt Sandbox/Production Mode + +=== + + +=== foundation rules === + +# Laravel Boost Guidelines + +The Laravel Boost guidelines are specifically curated by Laravel maintainers for this application. These guidelines should be followed closely to enhance the user's satisfaction building Laravel applications. + +## Foundational Context +This application is a Laravel application and its main Laravel ecosystems package & versions are below. You are an expert with them all. Ensure you abide by these specific packages & versions. + +- php - 8.4.12 +- laravel/framework (LARAVEL) - v11 +- laravel/horizon (HORIZON) - v5 +- laravel/passport (PASSPORT) - v12 +- laravel/prompts (PROMPTS) - v0 +- laravel/mcp (MCP) - v0 +- laravel/pint (PINT) - v1 +- laravel/sail (SAIL) - v1 +- pestphp/pest (PEST) - v2 +- phpunit/phpunit (PHPUNIT) - v10 + +## Conventions +- You must follow all existing code conventions used in this application. When creating or editing a file, check sibling files for the correct structure, approach, and naming. +- Use descriptive names for variables and methods. For example, `isRegisteredForDiscounts`, not `discount()`. +- Check for existing components to reuse before writing a new one. + +## Verification Scripts +- Do not create verification scripts or tinker when tests cover that functionality and prove it works. Unit and feature tests are more important. + +## Application Structure & Architecture +- Stick to existing directory structure; don't create new base folders without approval. +- Do not change the application's dependencies without approval. + +## Frontend Bundling +- If the user doesn't see a frontend change reflected in the UI, it could mean they need to run `vendor/bin/sail npm run build`, `vendor/bin/sail npm run dev`, or `vendor/bin/sail composer run dev`. Ask them. + +## Replies +- Be concise in your explanations - focus on what's important rather than explaining obvious details. + +## Documentation Files +- You must only create documentation files if explicitly requested by the user. + +=== boost rules === + +## Laravel Boost +- Laravel Boost is an MCP server that comes with powerful tools designed specifically for this application. Use them. + +## Artisan +- Use the `list-artisan-commands` tool when you need to call an Artisan command to double-check the available parameters. + +## URLs +- Whenever you share a project URL with the user, you should use the `get-absolute-url` tool to ensure you're using the correct scheme, domain/IP, and port. + +## Tinker / Debugging +- You should use the `tinker` tool when you need to execute PHP to debug code or query Eloquent models directly. +- Use the `database-query` tool when you only need to read from the database. + +## Reading Browser Logs With the `browser-logs` Tool +- You can read browser logs, errors, and exceptions using the `browser-logs` tool from Boost. +- Only recent browser logs will be useful - ignore old logs. + +## Searching Documentation (Critically Important) +- Boost comes with a powerful `search-docs` tool you should use before any other approaches when dealing with Laravel or Laravel ecosystem packages. This tool automatically passes a list of installed packages and their versions to the remote Boost API, so it returns only version-specific documentation for the user's circumstance. You should pass an array of packages to filter on if you know you need docs for particular packages. +- The `search-docs` tool is perfect for all Laravel-related packages, including Laravel, Inertia, Livewire, Filament, Tailwind, Pest, Nova, Nightwatch, etc. +- You must use this tool to search for Laravel ecosystem documentation before falling back to other approaches. +- Search the documentation before making code changes to ensure we are taking the correct approach. +- Use multiple, broad, simple, topic-based queries to start. For example: `['rate limiting', 'routing rate limiting', 'routing']`. +- Do not add package names to queries; package information is already shared. For example, use `test resource table`, not `filament 4 test resource table`. + +### Available Search Syntax +- You can and should pass multiple queries at once. The most relevant results will be returned first. + +1. Simple Word Searches with auto-stemming - query=authentication - finds 'authenticate' and 'auth'. +2. Multiple Words (AND Logic) - query=rate limit - finds knowledge containing both "rate" AND "limit". +3. Quoted Phrases (Exact Position) - query="infinite scroll" - words must be adjacent and in that order. +4. Mixed Queries - query=middleware "rate limit" - "middleware" AND exact phrase "rate limit". +5. Multiple Queries - queries=["authentication", "middleware"] - ANY of these terms. + +=== php rules === + +## PHP + +- Always use curly braces for control structures, even if it has one line. + +### Constructors +- Use PHP 8 constructor property promotion in `__construct()`. + - public function __construct(public GitHub $github) { } +- Do not allow empty `__construct()` methods with zero parameters unless the constructor is private. + +### Type Declarations +- Always use explicit return type declarations for methods and functions. +- Use appropriate PHP type hints for method parameters. + + +protected function isAccessible(User $user, ?string $path = null): bool +{ + ... +} + + +## Comments +- Prefer PHPDoc blocks over inline comments. Never use comments within the code itself unless there is something very complex going on. + +## PHPDoc Blocks +- Add useful array shape type definitions for arrays when appropriate. + +## Enums +- Typically, keys in an Enum should be TitleCase. For example: `FavoritePerson`, `BestLake`, `Monthly`. + +=== sail rules === + +## Laravel Sail + +- This project runs inside Laravel Sail's Docker containers. You MUST execute all commands through Sail. +- Start services using `vendor/bin/sail up -d` and stop them with `vendor/bin/sail stop`. +- Open the application in the browser by running `vendor/bin/sail open`. +- Always prefix PHP, Artisan, Composer, and Node commands with `vendor/bin/sail`. Examples: + - Run Artisan Commands: `vendor/bin/sail artisan migrate` + - Install Composer packages: `vendor/bin/sail composer install` + - Execute Node commands: `vendor/bin/sail npm run dev` + - Execute PHP scripts: `vendor/bin/sail php [script]` +- View all available Sail commands by running `vendor/bin/sail` without arguments. + +=== tests rules === + +## Test Enforcement + +- Every change must be programmatically tested. Write a new test or update an existing test, then run the affected tests to make sure they pass. +- Run the minimum number of tests needed to ensure code quality and speed. Use `vendor/bin/sail artisan test --compact` with a specific filename or filter. + +=== laravel/core rules === + +## Do Things the Laravel Way + +- Use `vendor/bin/sail artisan make:` commands to create new files (i.e. migrations, controllers, models, etc.). You can list available Artisan commands using the `list-artisan-commands` tool. +- If you're creating a generic PHP class, use `vendor/bin/sail artisan make:class`. +- Pass `--no-interaction` to all Artisan commands to ensure they work without user input. You should also pass the correct `--options` to ensure correct behavior. + +### Database +- Always use proper Eloquent relationship methods with return type hints. Prefer relationship methods over raw queries or manual joins. +- Use Eloquent models and relationships before suggesting raw database queries. +- Avoid `DB::`; prefer `Model::query()`. Generate code that leverages Laravel's ORM capabilities rather than bypassing them. +- Generate code that prevents N+1 query problems by using eager loading. +- Use Laravel's query builder for very complex database operations. + +### Model Creation +- When creating new models, create useful factories and seeders for them too. Ask the user if they need any other things, using `list-artisan-commands` to check the available options to `vendor/bin/sail artisan make:model`. + +### APIs & Eloquent Resources +- For APIs, default to using Eloquent API Resources and API versioning unless existing API routes do not, then you should follow existing application convention. + +### Controllers & Validation +- Always create Form Request classes for validation rather than inline validation in controllers. Include both validation rules and custom error messages. +- Check sibling Form Requests to see if the application uses array or string based validation rules. + +### Queues +- Use queued jobs for time-consuming operations with the `ShouldQueue` interface. + +### Authentication & Authorization +- Use Laravel's built-in authentication and authorization features (gates, policies, Sanctum, etc.). + +### URL Generation +- When generating links to other pages, prefer named routes and the `route()` function. + +### Configuration +- Use environment variables only in configuration files - never use the `env()` function directly outside of config files. Always use `config('app.name')`, not `env('APP_NAME')`. + +### Testing +- When creating models for tests, use the factories for the models. Check if the factory has custom states that can be used before manually setting up the model. +- Faker: Use methods such as `$this->faker->word()` or `fake()->randomDigit()`. Follow existing conventions whether to use `$this->faker` or `fake()`. +- When creating tests, make use of `vendor/bin/sail artisan make:test [options] {name}` to create a feature test, and pass `--unit` to create a unit test. Most tests should be feature tests. + +### Vite Error +- If you receive an "Illuminate\Foundation\ViteException: Unable to locate file in Vite manifest" error, you can run `vendor/bin/sail npm run build` or ask the user to run `vendor/bin/sail npm run dev` or `vendor/bin/sail composer run dev`. + +=== laravel/v11 rules === + +## Laravel 11 + +- Use the `search-docs` tool to get version-specific documentation. +- This project upgraded from Laravel 10 without migrating to the new streamlined Laravel 11 file structure. +- This is **perfectly fine** and recommended by Laravel. Follow the existing structure from Laravel 10. We do not need to migrate to the Laravel 11 structure unless the user explicitly requests it. + +### Laravel 10 Structure +- Middleware typically lives in `app/Http/Middleware/` and service providers in `app/Providers/`. +- There is no `bootstrap/app.php` application configuration in a Laravel 10 structure: + - Middleware registration is in `app/Http/Kernel.php` + - Exception handling is in `app/Exceptions/Handler.php` + - Console commands and schedule registration is in `app/Console/Kernel.php` + - Rate limits likely exist in `RouteServiceProvider` or `app/Http/Kernel.php` + +### Database +- When modifying a column, the migration must include all of the attributes that were previously defined on the column. Otherwise, they will be dropped and lost. +- Laravel 11 allows limiting eagerly loaded records natively, without external packages: `$query->latest()->limit(10);`. + +### Models +- Casts can and likely should be set in a `casts()` method on a model rather than the `$casts` property. Follow existing conventions from other models. + +### New Artisan Commands +- List Artisan commands using Boost's MCP tool, if available. New commands available in Laravel 11: + - `vendor/bin/sail artisan make:enum` + - `vendor/bin/sail artisan make:class` + - `vendor/bin/sail artisan make:interface` + +=== pint/core rules === + +## Laravel Pint Code Formatter + +- You must run `vendor/bin/sail bin pint --dirty --format agent` before finalizing changes to ensure your code matches the project's expected style. +- Do not run `vendor/bin/sail bin pint --test --format agent`, simply run `vendor/bin/sail bin pint --format agent` to fix any formatting issues. + +=== pest/core rules === + +## Pest +### Testing +- If you need to verify a feature is working, write or update a Unit / Feature test. + +### Pest Tests +- All tests must be written using Pest. Use `vendor/bin/sail artisan make:test --pest {name}`. +- You must not remove any tests or test files from the tests directory without approval. These are not temporary or helper files - these are core to the application. +- Tests should test all of the happy paths, failure paths, and weird paths. +- Tests live in the `tests/Feature` and `tests/Unit` directories. +- Pest tests look and behave like this: + +it('is true', function () { + expect(true)->toBeTrue(); +}); + + +### Running Tests +- Run the minimal number of tests using an appropriate filter before finalizing code edits. +- To run all tests: `vendor/bin/sail artisan test --compact`. +- To run all tests in a file: `vendor/bin/sail artisan test --compact tests/Feature/ExampleTest.php`. +- To filter on a particular test name: `vendor/bin/sail artisan test --compact --filter=testName` (recommended after making a change to a related file). +- When the tests relating to your changes are passing, ask the user if they would like to run the entire test suite to ensure everything is still passing. + +### Pest Assertions +- When asserting status codes on a response, use the specific method like `assertForbidden` and `assertNotFound` instead of using `assertStatus(403)` or similar, e.g.: + +it('returns all', function () { + $response = $this->postJson('/api/docs', []); + + $response->assertSuccessful(); +}); + + +### Mocking +- Mocking can be very helpful when appropriate. +- When mocking, you can use the `Pest\Laravel\mock` Pest function, but always import it via `use function Pest\Laravel\mock;` before using it. Alternatively, you can use `$this->mock()` if existing tests do. +- You can also create partial mocks using the same import or self method. + +### Datasets +- Use datasets in Pest to simplify tests that have a lot of duplicated data. This is often the case when testing validation rules, so consider this solution when writing tests for validation rules. + + +it('has emails', function (string $email) { + expect($email)->not->toBeEmpty(); +})->with([ + 'james' => 'james@laravel.com', + 'taylor' => 'taylor@laravel.com', +]); + + diff --git a/_ide_helper_models.php b/_ide_helper_models.php index 01ae5fb..c452bc0 100644 --- a/_ide_helper_models.php +++ b/_ide_helper_models.php @@ -261,6 +261,126 @@ namespace App\Models{ class DashboardNews extends \Eloquent {} } +namespace App\Models{ +/** + * @property int $id + * @property \Illuminate\Support\Carbon $period_from + * @property \Illuminate\Support\Carbon $period_to + * @property int $month + * @property int $year + * @property int $status + * @property string|null $berater_nr + * @property string|null $mandant_nr + * @property int $invoice_count + * @property int $credit_count + * @property int $cancellation_count + * @property numeric $total_revenue + * @property numeric $total_commissions + * @property string|null $filename + * @property string|null $file_path + * @property string|null $file_hash + * @property int|null $created_by + * @property int $warning_count + * @property int $error_count + * @property array|null $validation_summary + * @property \Illuminate\Support\Carbon|null $created_at + * @property \Illuminate\Support\Carbon|null $updated_at + * @property \Illuminate\Support\Carbon|null $deleted_at + * @property-read \App\User|null $creator + * @property-read string $period_label + * @property-read string $status_badge + * @property-read string $status_label + * @property-read int $total_lines + * @property-read \Illuminate\Database\Eloquent\Collection $lines + * @property-read int|null $lines_count + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport forPeriod(int $month, int $year) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport generated() + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport locked() + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport onlyTrashed() + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport query() + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport whereBeraterNr($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport whereCancellationCount($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport whereCreatedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport whereCreatedBy($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport whereCreditCount($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport whereDeletedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport whereErrorCount($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport whereFileHash($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport whereFilePath($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport whereFilename($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport whereId($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport whereInvoiceCount($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport whereMandantNr($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport whereMonth($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport wherePeriodFrom($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport wherePeriodTo($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport whereStatus($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport whereTotalCommissions($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport whereTotalRevenue($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport whereUpdatedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport whereValidationSummary($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport whereWarningCount($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport whereYear($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport withTrashed(bool $withTrashed = true) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExport withoutTrashed() + */ + class DatevExport extends \Eloquent {} +} + +namespace App\Models{ +/** + * @property int $id + * @property int $datev_export_id + * @property string $source_type + * @property int $source_id + * @property int $line_number + * @property numeric $amount_gross + * @property string $soll_haben + * @property int $konto + * @property int $gegenkonto + * @property int $bu_schluessel + * @property \Illuminate\Support\Carbon $belegdatum + * @property string $belegfeld1 + * @property string $buchungstext + * @property string|null $eu_ustid + * @property string|null $eu_land + * @property string|null $row_csv + * @property \Illuminate\Support\Carbon|null $created_at + * @property \Illuminate\Support\Carbon|null $updated_at + * @property-read \App\Models\DatevExport $datev_export + * @property-read string $formatted_amount + * @property-read string $formatted_belegdatum + * @property-read string $source_type_label + * @method static \Illuminate\Database\Eloquent\Builder|DatevExportLine cancellations() + * @method static \Illuminate\Database\Eloquent\Builder|DatevExportLine credits() + * @method static \Illuminate\Database\Eloquent\Builder|DatevExportLine invoices() + * @method static \Illuminate\Database\Eloquent\Builder|DatevExportLine newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|DatevExportLine newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|DatevExportLine query() + * @method static \Illuminate\Database\Eloquent\Builder|DatevExportLine whereAmountGross($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExportLine whereBelegdatum($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExportLine whereBelegfeld1($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExportLine whereBuSchluessel($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExportLine whereBuchungstext($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExportLine whereCreatedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExportLine whereDatevExportId($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExportLine whereEuLand($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExportLine whereEuUstid($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExportLine whereGegenkonto($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExportLine whereId($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExportLine whereKonto($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExportLine whereLineNumber($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExportLine whereRowCsv($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExportLine whereSollHaben($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExportLine whereSourceId($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExportLine whereSourceType($value) + * @method static \Illuminate\Database\Eloquent\Builder|DatevExportLine whereUpdatedAt($value) + */ + class DatevExportLine extends \Eloquent {} +} + namespace App\Models{ /** * Class DbipLookup @@ -1584,6 +1704,9 @@ namespace App\Models{ * @property-read \Illuminate\Database\Eloquent\Collection $dhlShipments * @property-read int|null $dhl_shipments_count * @mixin \Eloquent + * @property-read \App\Models\UserInvoice|null $user_cancellation_invoice + * @property-read \Illuminate\Database\Eloquent\Collection $user_invoices + * @property-read int|null $user_invoices_count */ class ShoppingOrder extends \Eloquent {} } @@ -2044,7 +2167,6 @@ namespace App\Models{ * @property Carbon|null $user_deleted_at * @property User $user * @property Collection|UserAboOrder[] $user_abo_orders - * @package App\Models * @property int|null $member_id * @property int $shopping_user_id * @property string|null $email @@ -2087,6 +2209,8 @@ namespace App\Models{ * @method static \Illuminate\Database\Eloquent\Builder|UserAbo withTrashed() * @method static \Illuminate\Database\Eloquent\Builder|UserAbo withoutTrashed() * @mixin \Eloquent + * @property-read \Illuminate\Database\Eloquent\Collection $user_abo_item_histories + * @property-read int|null $user_abo_item_histories_count */ class UserAbo extends \Eloquent {} } @@ -2122,6 +2246,61 @@ namespace App\Models{ class UserAboItem extends \Eloquent {} } +namespace App\Models{ +/** + * @property int $id + * @property int $user_abo_id + * @property int|null $user_abo_item_id + * @property int $product_id + * @property string $action + * @property string $product_name + * @property string|null $product_number + * @property float $unit_price + * @property float $total_price + * @property int|null $qty_before + * @property int|null $qty_after + * @property int|null $old_product_id + * @property string|null $old_product_name + * @property int $comp + * @property int|null $changed_by_user_id + * @property string|null $changed_by_name + * @property string $channel + * @property string|null $batch_id + * @property bool $is_initial + * @property \Illuminate\Support\Carbon|null $created_at + * @property \Illuminate\Support\Carbon|null $updated_at + * @property-read \App\User|null $changed_by + * @property-read \App\Models\Product|null $old_product + * @property-read \App\Models\Product $product + * @property-read \App\Models\UserAbo $user_abo + * @method static \Illuminate\Database\Eloquent\Builder|UserAboItemHistory newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|UserAboItemHistory newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|UserAboItemHistory query() + * @method static \Illuminate\Database\Eloquent\Builder|UserAboItemHistory whereAction($value) + * @method static \Illuminate\Database\Eloquent\Builder|UserAboItemHistory whereBatchId($value) + * @method static \Illuminate\Database\Eloquent\Builder|UserAboItemHistory whereChangedByName($value) + * @method static \Illuminate\Database\Eloquent\Builder|UserAboItemHistory whereChangedByUserId($value) + * @method static \Illuminate\Database\Eloquent\Builder|UserAboItemHistory whereChannel($value) + * @method static \Illuminate\Database\Eloquent\Builder|UserAboItemHistory whereComp($value) + * @method static \Illuminate\Database\Eloquent\Builder|UserAboItemHistory whereCreatedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|UserAboItemHistory whereId($value) + * @method static \Illuminate\Database\Eloquent\Builder|UserAboItemHistory whereIsInitial($value) + * @method static \Illuminate\Database\Eloquent\Builder|UserAboItemHistory whereOldProductId($value) + * @method static \Illuminate\Database\Eloquent\Builder|UserAboItemHistory whereOldProductName($value) + * @method static \Illuminate\Database\Eloquent\Builder|UserAboItemHistory whereProductId($value) + * @method static \Illuminate\Database\Eloquent\Builder|UserAboItemHistory whereProductName($value) + * @method static \Illuminate\Database\Eloquent\Builder|UserAboItemHistory whereProductNumber($value) + * @method static \Illuminate\Database\Eloquent\Builder|UserAboItemHistory whereQtyAfter($value) + * @method static \Illuminate\Database\Eloquent\Builder|UserAboItemHistory whereQtyBefore($value) + * @method static \Illuminate\Database\Eloquent\Builder|UserAboItemHistory whereTotalPrice($value) + * @method static \Illuminate\Database\Eloquent\Builder|UserAboItemHistory whereUnitPrice($value) + * @method static \Illuminate\Database\Eloquent\Builder|UserAboItemHistory whereUpdatedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|UserAboItemHistory whereUserAboId($value) + * @method static \Illuminate\Database\Eloquent\Builder|UserAboItemHistory whereUserAboItemId($value) + */ + class UserAboItemHistory extends \Eloquent {} +} + namespace App\Models{ /** * Class UserAboOrder @@ -2277,6 +2456,8 @@ namespace App\Models{ * @method static \Illuminate\Database\Eloquent\Builder|UserAccount whereBankOwner($value) * @mixin \Eloquent * @property string|null $shipping_postnumber + * @property string $language + * @method static \Illuminate\Database\Eloquent\Builder|UserAccount whereLanguage($value) * @method static \Illuminate\Database\Eloquent\Builder|UserAccount whereShippingPostnumber($value) */ class UserAccount extends \Eloquent {} @@ -2500,7 +2681,6 @@ namespace App\Models{ * @property string|null $deleted_at * @property User $user * @property Collection|UserCreditItem[] $user_credit_items - * @package App\Models * @property bool $taxable * @property-read int|null $user_credit_items_count * @method static \Illuminate\Database\Eloquent\Builder|UserCredit newModelQuery() @@ -2641,7 +2821,6 @@ namespace App\Models{ * @property Carbon|null $updated_at * @property string|null $deleted_at * @property ShoppingOrder $shopping_order - * @package App\Models * @property string|null $filename * @property string|null $dir * @property string|null $delivery_filename @@ -2806,7 +2985,6 @@ namespace App\Models{ * @property Carbon|null $updated_at * @property ShoppingOrder|null $shopping_order * @property User $user - * @package App\Models * @property int|null $user_invoice_id * @property int|null $month_shop_points * @property float|null $month_shop_total_net diff --git a/app/Console/Commands/BusinessStore.php b/app/Console/Commands/BusinessStore.php index 2440a0e..9f64efb 100644 --- a/app/Console/Commands/BusinessStore.php +++ b/app/Console/Commands/BusinessStore.php @@ -2,11 +2,11 @@ namespace App\Console\Commands; -use App\Models\Setting; -use Illuminate\Console\Command; use App\Cron\BusinessUsersStore; use App\Cron\UserLevelUpdate; use App\Cron\UserPaymentCredits; +use App\Models\Setting; +use Illuminate\Console\Command; class BusinessStore extends Command { @@ -27,14 +27,15 @@ class BusinessStore extends Command protected $description = 'Create Business Structure and UserDetails with optimized performance'; private $timeStart; + private $month; + private $year; private $sendCreditMail = false; + private $sendUpdateMail = false; - - /** * Create a new command instance. * @@ -45,6 +46,58 @@ class BusinessStore extends Command parent::__construct(); } + /** + * Prüft ob der Command heute ausgeführt werden soll + * + * WICHTIG: Diese Methode verhindert, dass der Command täglich läuft! + * Der Command sollte nur am konfigurierten Tag des Monats laufen. + * + * @return bool True wenn Command ausgeführt werden soll, False sonst + */ + private function shouldExecuteToday(): bool + { + // Hole konfigurierten Ausführungstag (Standard: 1 = Monatserster) + $executeDay = (int) Setting::getContentBySlug('day-exectute-business-structur'); + + // Fallback: Wenn Setting leer oder 0, verwende Tag 1 + if ($executeDay === 0) { + $executeDay = 1; + $this->warn('Setting "day-exectute-business-structur" ist leer oder 0. Verwende Standard: Tag 1'); + \Log::channel('cron')->warning('BusinessStore: Setting day-exectute-business-structur is empty, using default: 1'); + } + + $presentDay = (int) date('d'); + + // Logging für Debugging + $this->info("BusinessStore: Configured Day: {$executeDay}, Present Day: {$presentDay}"); + \Log::channel('cron')->info("BusinessStore: Configured Day: {$executeDay}, Present Day: {$presentDay}"); + + // Prüfe ob heute der konfigurierte Tag ist + if ($executeDay !== $presentDay) { + // Erlaubnis zum Überschreiben für Entwicklung/Testing + // ENV-Variable BUSINESS_FORCE_EXECUTE=true überschreibt den Check + if (env('BUSINESS_FORCE_EXECUTE', false) === true) { + $this->warn('⚠️ BUSINESS_FORCE_EXECUTE ist aktiv - Command wird trotz falschem Tag ausgeführt!'); + $this->warn('⚠️ Dies sollte NUR auf Test-Servern verwendet werden!'); + \Log::channel('cron')->warning('BusinessStore: FORCED execution via BUSINESS_FORCE_EXECUTE'); + + return true; + } + + // Command sollte heute NICHT laufen + $this->info("❌ Command wird NICHT ausgeführt - falscher Tag (erwartet: {$executeDay}, heute: {$presentDay})"); + \Log::channel('cron')->info("BusinessStore: NOT EXECUTED - wrong day (expected: {$executeDay}, today: {$presentDay})"); + + return false; + } + + // Command wird ausgeführt + $this->info("✅ Command wird ausgeführt - korrekter Tag ({$presentDay})"); + \Log::channel('cron')->info("BusinessStore: EXECUTING - correct day ({$presentDay})"); + + return true; + } + /** * Execute the console command. * @@ -53,29 +106,21 @@ class BusinessStore extends Command public function handle() { try { - $executeDay = (int) Setting::getContentBySlug('day-exectute-business-structur'); - $presentDay = (int) date('d'); - - $this->info('RUN Command BusinessStore on Day: ' . $executeDay); - $this->info('RUN Command BusinessStore present Day: ' . $presentDay); - \Log::channel('cron')->info('RUN Command BusinessStore on Day: ' . $executeDay); - \Log::channel('cron')->info('RUN Command BusinessStore present Day: ' . $presentDay); - $this->logMemoryUsage('Command Start'); - - if ($executeDay !== $presentDay) { - $this->info('NOT RUN Command BusinessStore is not present Day: ' . $presentDay); - \Log::channel('cron')->info('NOT RUN Command BusinessStore is not present Day: ' . $presentDay); + // Prüfe ob Command am richtigen Tag ausgeführt werden soll + if (! $this->shouldExecuteToday()) { return 0; } + $this->logMemoryUsage('Command Start'); + $this->timeStart = microtime(true); // Argumente mit Standardwerten für den Vormonat - $this->month = $this->argument('month') ?: (int) date("m", strtotime("-1 month")); - $this->year = $this->argument('year') ?: (int) date("Y", strtotime("-1 month")); + $this->month = $this->argument('month') ?: (int) date('m', strtotime('-1 month')); + $this->year = $this->argument('year') ?: (int) date('Y', strtotime('-1 month')); - $this->info('RUN Command BusinessStore on month: ' . $this->month . ' | year: ' . $this->year); - \Log::channel('cron')->info('RUN Command BusinessStore on month: ' . $this->month . ' | year: ' . $this->year); + $this->info('RUN Command BusinessStore on month: '.$this->month.' | year: '.$this->year); + \Log::channel('cron')->info('RUN Command BusinessStore on month: '.$this->month.' | year: '.$this->year); $this->logMemoryUsage('Parameters initialized'); // Prozesse ausführen mit Fehlerbehandlung @@ -98,9 +143,10 @@ class BusinessStore extends Command return 0; } catch (\Exception $e) { - $this->error('Command failed with error: ' . $e->getMessage()); - $this->error('Stack trace: ' . $e->getTraceAsString()); + $this->error('Command failed with error: '.$e->getMessage()); + $this->error('Stack trace: '.$e->getTraceAsString()); $this->logExecutionTime('COMMAND FAILED'); + return 1; } } @@ -108,25 +154,25 @@ class BusinessStore extends Command private function storeBusinessStructureUsersDetailMonth() { - $this->info('storeBusinessStructureUsersDetailMonth month: ' . $this->month . ' year:' . $this->year); + $this->info('storeBusinessStructureUsersDetailMonth month: '.$this->month.' year:'.$this->year); $businessUsersStore = new BusinessUsersStore($this->month, $this->year); $businessUsersStore->storeUserBusinessStructure(); $businessUsersStore->storeBusinessUsersDetail(); $bool = $businessUsersStore->storeBusinessCompleted(); - $this->logExecutionTime('END Command storeBusinessStructureUsersDetailMonth: ' . $bool); + $this->logExecutionTime('END Command storeBusinessStructureUsersDetailMonth: '.$bool); } private function userBusinessCommissionsToCredit() { - $this->info('userBusinessCommissionsToCredit month: ' . $this->month . ' year:' . $this->year); + $this->info('userBusinessCommissionsToCredit month: '.$this->month.' year:'.$this->year); $userPaymentCredits = new UserPaymentCredits($this->month, $this->year); $userBusinesses = $userPaymentCredits->getUserBusinessByMonthYear(); foreach ($userBusinesses as $userBusiness) { $ret = $userPaymentCredits->addUserCreditItem($userBusiness); - $this->info('userBusinessCredit: ' . $ret->user_id . ' : Team: ' . $ret->commission_pp_total . ' | Shop: ' . $ret->commission_shop_sales); + $this->info('userBusinessCredit: '.$ret->user_id.' : Team: '.$ret->commission_pp_total.' | Shop: '.$ret->commission_shop_sales); } $this->logExecutionTime('END Command userBusinessCommissionsToCredit:'); } @@ -134,13 +180,13 @@ class BusinessStore extends Command private function userCreatePaymentCreditsPDF() { - $this->info('userCreatePaymentCreditsPDF month: ' . $this->month . ' year:' . $this->year); + $this->info('userCreatePaymentCreditsPDF month: '.$this->month.' year:'.$this->year); $userPaymentCredits = new UserPaymentCredits($this->month, $this->year); $creditItemUsers = $userPaymentCredits->getUserCreditItemUsersByMonthYear(); foreach ($creditItemUsers as $creditItemUser) { $bool = $userPaymentCredits->makeCreditPaymentPDF($creditItemUser->user_id, $this->sendCreditMail); - $this->info('creditsPDF: ' . $bool . ' user_id: ' . $creditItemUser->user_id); + $this->info('creditsPDF: '.$bool.' user_id: '.$creditItemUser->user_id); } $this->logExecutionTime('END Command userCreatePaymentCreditsPDF:'); @@ -149,7 +195,7 @@ class BusinessStore extends Command private function userLevelUpdate() { - $this->info('userLevelUpdate month: ' . $this->month . ' year:' . $this->year); + $this->info('userLevelUpdate month: '.$this->month.' year:'.$this->year); $userLevelUpdate = new UserLevelUpdate($this->month, $this->year); $levelUpdateUsers = $userLevelUpdate->getUserBusinessByMonthYear(); @@ -157,26 +203,24 @@ class BusinessStore extends Command foreach ($levelUpdateUsers as $userBusiness) { $ret = $userLevelUpdate->makeUserLevelUpdate($userBusiness, $this->sendUpdateMail); if ($ret) { - $this->info('updateLevel: ' . $userBusiness->user->id . ' | ' . $userBusiness->user->email . ' | ' . - 'from: ' . $userBusiness->m_level_id . ' ' . $userBusiness->user_level_name . ' | ' . - 'to: ' . $ret); + $this->info('updateLevel: '.$userBusiness->user->id.' | '.$userBusiness->user->email.' | '. + 'from: '.$userBusiness->m_level_id.' '.$userBusiness->user_level_name.' | '. + 'to: '.$ret); } } $this->logExecutionTime('END Command userLevelUpdate:'); } - - private function storeBusinessStructureUsersDetailPeriod($from, $to) { for ($i = $from; $i <= $to; $i++) { - $this->info('Store Business Structure Users Detail month: ' . $i . ' year:' . $this->year); + $this->info('Store Business Structure Users Detail month: '.$i.' year:'.$this->year); $businessUsersStore = new BusinessUsersStore($i, $this->year); $businessUsersStore->storeUserBusinessStructure(); $businessUsersStore->storeBusinessUsersDetail(); $bool = $businessUsersStore->storeBusinessCompleted(); - $this->logExecutionTime('Period BusinessStore: ' . $bool); + $this->logExecutionTime('Period BusinessStore: '.$bool); } } @@ -186,6 +230,6 @@ class BusinessStore extends Command $sec = intval($diff); $micro = $diff - $sec; - $this->info($message . ' | Time: ' . $sec . 'sec :' . round($micro * 1000, 4) . " ms"); + $this->info($message.' | Time: '.$sec.'sec :'.round($micro * 1000, 4).' ms'); } } diff --git a/app/Console/Commands/BusinessStoreOptimized.php b/app/Console/Commands/BusinessStoreOptimized.php index 97f6c2e..fc37c26 100644 --- a/app/Console/Commands/BusinessStoreOptimized.php +++ b/app/Console/Commands/BusinessStoreOptimized.php @@ -2,13 +2,13 @@ namespace App\Console\Commands; -use App\Models\Setting; -use App\Models\UserBusinessStructure; -use App\Models\UserBusiness; -use Illuminate\Console\Command; use App\Cron\BusinessUsersStoreOptimized; use App\Cron\UserLevelUpdate; use App\Cron\UserPaymentCredits; +use App\Models\Setting; +use App\Models\UserBusiness; +use App\Models\UserBusinessStructure; +use Illuminate\Console\Command; class BusinessStoreOptimized extends Command { @@ -29,10 +29,13 @@ class BusinessStoreOptimized extends Command protected $description = 'Create Business Structure and UserDetails with optimized performance and monitoring'; private $timeStart; + private $month; + private $year; private $sendCreditMail = false; + private $sendUpdateMail = false; /** @@ -51,6 +54,58 @@ class BusinessStoreOptimized extends Command $this->sendUpdateMail = $sendUpdateMail; } + /** + * Prüft ob der Command heute ausgeführt werden soll + * + * WICHTIG: Diese Methode verhindert, dass der Command täglich läuft! + * Der Command sollte nur am konfigurierten Tag des Monats laufen. + * + * @return bool True wenn Command ausgeführt werden soll, False sonst + */ + private function shouldExecuteToday(): bool + { + // Hole konfigurierten Ausführungstag (Standard: 1 = Monatserster) + $executeDay = (int) Setting::getContentBySlug('day-exectute-business-structur'); + + // Fallback: Wenn Setting leer oder 0, verwende Tag 1 + if ($executeDay === 0) { + $executeDay = 1; + $this->warn('Setting "day-exectute-business-structur" ist leer oder 0. Verwende Standard: Tag 1'); + \Log::channel('cron')->warning('BusinessStoreOptimized: Setting day-exectute-business-structur is empty, using default: 1'); + } + + $presentDay = (int) date('d'); + + // Logging für Debugging + $this->info("BusinessStoreOptimized: Configured Day: {$executeDay}, Present Day: {$presentDay}"); + \Log::channel('cron')->info("BusinessStoreOptimized: Configured Day: {$executeDay}, Present Day: {$presentDay}"); + + // Prüfe ob heute der konfigurierte Tag ist + if ($executeDay !== $presentDay) { + // Erlaubnis zum Überschreiben für Entwicklung/Testing + // ENV-Variable BUSINESS_FORCE_EXECUTE=true überschreibt den Check + if (env('BUSINESS_FORCE_EXECUTE', false) === true) { + $this->warn('⚠️ BUSINESS_FORCE_EXECUTE ist aktiv - Command wird trotz falschem Tag ausgeführt!'); + $this->warn('⚠️ Dies sollte NUR auf Test-Servern verwendet werden!'); + \Log::channel('cron')->warning('BusinessStoreOptimized: FORCED execution via BUSINESS_FORCE_EXECUTE'); + + return true; + } + + // Command sollte heute NICHT laufen + $this->info("❌ Command wird NICHT ausgeführt - falscher Tag (erwartet: {$executeDay}, heute: {$presentDay})"); + \Log::channel('cron')->info("BusinessStoreOptimized: NOT EXECUTED - wrong day (expected: {$executeDay}, today: {$presentDay})"); + + return false; + } + + // Command wird ausgeführt + $this->info("✅ Command wird ausgeführt - korrekter Tag ({$presentDay})"); + \Log::channel('cron')->info("BusinessStoreOptimized: EXECUTING - correct day ({$presentDay})"); + + return true; + } + /** * Create a new command instance. * @@ -69,28 +124,20 @@ class BusinessStoreOptimized extends Command public function handle() { try { - $executeDay = (int) Setting::getContentBySlug('day-exectute-business-structur'); - $presentDay = (int) date('d'); - - $this->info('RUN Command BusinessStoreOptimized on Day: ' . $executeDay); - $this->info('RUN Command BusinessStoreOptimized present Day: ' . $presentDay); - \Log::channel('cron')->info('RUN Command BusinessStoreOptimized on Day: ' . $executeDay); - \Log::channel('cron')->info('RUN Command BusinessStoreOptimized present Day: ' . $presentDay); - $this->logMemoryUsage('Command Start'); - - if ($executeDay !== $presentDay) { - $this->info('NOT RUN Command BusinessStoreOptimized is not present Day: ' . $presentDay); - \Log::channel('cron')->info('NOT RUN Command BusinessStoreOptimized is not present Day: ' . $presentDay); - // return 0; + // Prüfe ob Command am richtigen Tag ausgeführt werden soll + if (! $this->shouldExecuteToday()) { + return 0; } + $this->logMemoryUsage('Command Start'); + $this->timeStart = microtime(true); // Argumente mit Standardwerten für den Vormonat - $this->month = $this->argument('month') ?: (int) date("m", strtotime("-1 month")); - $this->year = $this->argument('year') ?: (int) date("Y", strtotime("-1 month")); + $this->month = $this->argument('month') ?: (int) date('m', strtotime('-1 month')); + $this->year = $this->argument('year') ?: (int) date('Y', strtotime('-1 month')); - $this->info('RUN Command BusinessStoreOptimized on month: ' . $this->month . ' | year: ' . $this->year); + $this->info('RUN Command BusinessStoreOptimized on month: '.$this->month.' | year: '.$this->year); $this->logMemoryUsage('Parameters initialized'); // Prüfe --clear Option und lösche gespeicherte Daten falls gewünscht @@ -126,17 +173,18 @@ class BusinessStoreOptimized extends Command return 0; } catch (\Exception $e) { - $this->error('Command failed with error: ' . $e->getMessage()); - $this->error('Stack trace: ' . $e->getTraceAsString()); + $this->error('Command failed with error: '.$e->getMessage()); + $this->error('Stack trace: '.$e->getTraceAsString()); $this->logExecutionTime('COMMAND FAILED'); \Log::channel('cron')->info('COMMAND FAILED'); + return 1; } } private function storeBusinessStructureUsersDetailMonth() { - $this->info('storeBusinessStructureUsersDetailMonth month: ' . $this->month . ' year:' . $this->year); + $this->info('storeBusinessStructureUsersDetailMonth month: '.$this->month.' year:'.$this->year); try { $businessUsersStore = new BusinessUsersStoreOptimized($this->month, $this->year); @@ -144,16 +192,16 @@ class BusinessStoreOptimized extends Command $businessUsersStore->storeBusinessUsersDetail(); $bool = $businessUsersStore->storeBusinessCompleted(); - $this->logExecutionTime('END Command storeBusinessStructureUsersDetailMonth: ' . $bool); + $this->logExecutionTime('END Command storeBusinessStructureUsersDetailMonth: '.$bool); } catch (\Exception $e) { - $this->error('Error in storeBusinessStructureUsersDetailMonth: ' . $e->getMessage()); + $this->error('Error in storeBusinessStructureUsersDetailMonth: '.$e->getMessage()); throw $e; } } private function userBusinessCommissionsToCredit() { - $this->info('userBusinessCommissionsToCredit month: ' . $this->month . ' year:' . $this->year); + $this->info('userBusinessCommissionsToCredit month: '.$this->month.' year:'.$this->year); try { $userPaymentCredits = new UserPaymentCredits($this->month, $this->year); @@ -162,7 +210,7 @@ class BusinessStoreOptimized extends Command $processedCount = 0; foreach ($userBusinesses as $userBusiness) { $ret = $userPaymentCredits->addUserCreditItem($userBusiness); - $this->info('userBusinessCredit: ' . $ret->user_id . ' : Team: ' . $ret->commission_pp_total . ' | Shop: ' . $ret->commission_shop_sales); + $this->info('userBusinessCredit: '.$ret->user_id.' : Team: '.$ret->commission_pp_total.' | Shop: '.$ret->commission_shop_sales); $processedCount++; // Memory-Check alle 100 User @@ -174,14 +222,14 @@ class BusinessStoreOptimized extends Command $this->info("Processed {$processedCount} user businesses total"); $this->logExecutionTime('END Command userBusinessCommissionsToCredit:'); } catch (\Exception $e) { - $this->error('Error in userBusinessCommissionsToCredit: ' . $e->getMessage()); + $this->error('Error in userBusinessCommissionsToCredit: '.$e->getMessage()); throw $e; } } private function userCreatePaymentCreditsPDF() { - $this->info('userCreatePaymentCreditsPDF month: ' . $this->month . ' year:' . $this->year); + $this->info('userCreatePaymentCreditsPDF month: '.$this->month.' year:'.$this->year); try { $userPaymentCredits = new UserPaymentCredits($this->month, $this->year); @@ -190,7 +238,7 @@ class BusinessStoreOptimized extends Command $processedCount = 0; foreach ($creditItemUsers as $creditItemUser) { $bool = $userPaymentCredits->makeCreditPaymentPDF($creditItemUser->user_id, $this->sendCreditMail); - $this->info('creditsPDF: ' . $bool . ' user_id: ' . $creditItemUser->user_id); + $this->info('creditsPDF: '.$bool.' user_id: '.$creditItemUser->user_id); $processedCount++; // Memory-Check alle 50 PDFs @@ -202,7 +250,7 @@ class BusinessStoreOptimized extends Command $this->info("Created {$processedCount} PDF files total"); $this->logExecutionTime('END Command userCreatePaymentCreditsPDF:'); } catch (\Exception $e) { - $this->error('Error in userCreatePaymentCreditsPDF: ' . $e->getMessage()); + $this->error('Error in userCreatePaymentCreditsPDF: '.$e->getMessage()); throw $e; } } @@ -213,13 +261,13 @@ class BusinessStoreOptimized extends Command */ public function userLevelUpdate() { - $this->info('userLevelUpdate month: ' . $this->month . ' year:' . $this->year); + $this->info('userLevelUpdate month: '.$this->month.' year:'.$this->year); try { $userLevelUpdate = new UserLevelUpdate($this->month, $this->year); $levelUpdateUsers = $userLevelUpdate->getUserBusinessByMonthYear(); - $this->info("Found " . $levelUpdateUsers->count() . " user businesses with level promotions to process"); + $this->info('Found '.$levelUpdateUsers->count().' user businesses with level promotions to process'); $updatedCount = 0; $skippedCount = 0; @@ -229,11 +277,11 @@ class BusinessStoreOptimized extends Command try { $ret = $userLevelUpdate->makeUserLevelUpdate($userBusiness, $this->sendUpdateMail); if ($ret) { - $oldLevel = $userBusiness->m_level_id . ' ' . ($userBusiness->user_level_name ?? 'N/A'); - $this->info('updateLevel: User ' . $userBusiness->user->id . - ' | ' . $userBusiness->user->email . - ' | from: ' . $oldLevel . - ' | to: ' . $ret); + $oldLevel = $userBusiness->m_level_id.' '.($userBusiness->user_level_name ?? 'N/A'); + $this->info('updateLevel: User '.$userBusiness->user->id. + ' | '.$userBusiness->user->email. + ' | from: '.$oldLevel. + ' | to: '.$ret); $updatedCount++; } else { $skippedCount++; @@ -241,12 +289,13 @@ class BusinessStoreOptimized extends Command // Memory-Check alle 50 User if (($updatedCount + $skippedCount) % 50 === 0) { - $this->logMemoryUsage("After processing " . ($updatedCount + $skippedCount) . " users"); + $this->logMemoryUsage('After processing '.($updatedCount + $skippedCount).' users'); } } catch (\Exception $e) { $errorCount++; - $this->warn('Error updating level for UserBusiness ' . $userBusiness->id . ': ' . $e->getMessage()); - \Log::channel('cron')->warning('UserLevelUpdate error for UserBusiness ' . $userBusiness->id . ': ' . $e->getMessage()); + $this->warn('Error updating level for UserBusiness '.$userBusiness->id.': '.$e->getMessage()); + \Log::channel('cron')->warning('UserLevelUpdate error for UserBusiness '.$userBusiness->id.': '.$e->getMessage()); + // Weiter mit nächstem User statt abzubrechen continue; } @@ -256,9 +305,9 @@ class BusinessStoreOptimized extends Command $this->logExecutionTime('END Command userLevelUpdate:'); $this->logMemoryUsage('After userLevelUpdate'); } catch (\Exception $e) { - $this->error('Error in userLevelUpdate: ' . $e->getMessage()); - $this->error('Stack trace: ' . $e->getTraceAsString()); - \Log::channel('cron')->error('UserLevelUpdate command failed: ' . $e->getMessage()); + $this->error('Error in userLevelUpdate: '.$e->getMessage()); + $this->error('Stack trace: '.$e->getTraceAsString()); + \Log::channel('cron')->error('UserLevelUpdate command failed: '.$e->getMessage()); throw $e; } } @@ -267,7 +316,7 @@ class BusinessStoreOptimized extends Command { try { for ($i = $from; $i <= $to; $i++) { - $this->info('Store Business Structure Users Detail month: ' . $i . ' year:' . $this->year); + $this->info('Store Business Structure Users Detail month: '.$i.' year:'.$this->year); $this->logMemoryUsage("Before month {$i}"); $businessUsersStore = new BusinessUsersStoreOptimized($i, $this->year); @@ -275,11 +324,11 @@ class BusinessStoreOptimized extends Command $businessUsersStore->storeBusinessUsersDetail(); $bool = $businessUsersStore->storeBusinessCompleted(); - $this->logExecutionTime('Period BusinessStore: ' . $bool); + $this->logExecutionTime('Period BusinessStore: '.$bool); $this->logMemoryUsage("After month {$i}"); } } catch (\Exception $e) { - $this->error('Error in storeBusinessStructureUsersDetailPeriod: ' . $e->getMessage()); + $this->error('Error in storeBusinessStructureUsersDetailPeriod: '.$e->getMessage()); throw $e; } } @@ -297,8 +346,9 @@ class BusinessStoreOptimized extends Command ->where('month', $this->month) ->first(); - if (!$existingStructure) { + if (! $existingStructure) { $this->info('No stored business structure found to clear'); + return; } @@ -322,7 +372,7 @@ class BusinessStoreOptimized extends Command $this->info('Successfully cleared all stored business data'); $this->logMemoryUsage('After clearing data'); } catch (\Exception $e) { - $this->error('Error clearing stored data: ' . $e->getMessage()); + $this->error('Error clearing stored data: '.$e->getMessage()); throw $e; } } @@ -333,7 +383,7 @@ class BusinessStoreOptimized extends Command $sec = intval($diff); $micro = $diff - $sec; - $this->info($message . ' | Time: ' . $sec . 'sec :' . round($micro * 1000, 4) . " ms"); + $this->info($message.' | Time: '.$sec.'sec :'.round($micro * 1000, 4).' ms'); } /** @@ -353,8 +403,8 @@ class BusinessStoreOptimized extends Command $this->info("Completed: {$processName} in {$duration}ms"); $this->logMemoryUsage("After {$processName}"); } catch (\Exception $e) { - $this->error("Error in {$processName}: " . $e->getMessage()); - $this->error("Stack trace: " . $e->getTraceAsString()); + $this->error("Error in {$processName}: ".$e->getMessage()); + $this->error('Stack trace: '.$e->getTraceAsString()); throw $e; } } @@ -406,12 +456,12 @@ class BusinessStoreOptimized extends Command */ private function formatBytes(int $bytes, int $precision = 2): string { - $units = array('B', 'KB', 'MB', 'GB', 'TB'); + $units = ['B', 'KB', 'MB', 'GB', 'TB']; for ($i = 0; $bytes > 1024 && $i < count($units) - 1; $i++) { $bytes /= 1024; } - return round($bytes, $precision) . ' ' . $units[$i]; + return round($bytes, $precision).' '.$units[$i]; } } diff --git a/app/Console/Commands/DhlUpdateTracking.php b/app/Console/Commands/DhlUpdateTracking.php index 3c0fb58..0d1621f 100644 --- a/app/Console/Commands/DhlUpdateTracking.php +++ b/app/Console/Commands/DhlUpdateTracking.php @@ -17,18 +17,20 @@ class DhlUpdateTracking extends Command * @var string */ protected $signature = 'dhl:update-tracking - {--days=14 : Sendungen der letzten X Tage aktualisieren} + {--days=30 : Sendungen der letzten X Tage aktualisieren} {--send-emails : Automatisch E-Mails bei Transit-Status senden} {--dry-run : Nur simulieren, keine Änderungen} {--test-email= : Test-E-Mail an angegebene Adresse senden} - {--order= : Nur für bestimmte Bestellung (Order-ID)}'; + {--order= : Nur für bestimmte Bestellung (Order-ID)} + {--force : Intervall-Filter überspringen, alle aktiven Sendungen aktualisieren} + {--stale-days=30 : Sendungen ohne Statusänderung nach X Tagen als abgeschlossen markieren}'; /** * The console command description. * * @var string */ - protected $description = 'Aktualisiert Tracking-Status für alle aktiven DHL Sendungen und sendet automatisch E-Mails bei Transit-Status'; + protected $description = 'Aktualisiert Tracking-Status für DHL Sendungen (status-basierte Intervalle, Batch-API)'; /** * Execute the console command. @@ -40,9 +42,14 @@ class DhlUpdateTracking extends Command $dryRun = $this->option('dry-run'); $testEmail = $this->option('test-email'); $orderId = $this->option('order'); + $force = $this->option('force'); + $staleDays = (int) $this->option('stale-days'); $this->info('DHL Tracking Update gestartet'); - $this->info("Optionen: --days={$days}, --send-emails=" . ($sendEmails ? 'ja' : 'nein') . ', --dry-run=' . ($dryRun ? 'ja' : 'nein')); + $this->info("Optionen: --days={$days}, --send-emails=".($sendEmails ? 'ja' : 'nein') + .', --dry-run='.($dryRun ? 'ja' : 'nein') + .', --force='.($force ? 'ja' : 'nein') + .", --stale-days={$staleDays}"); if ($testEmail) { $this->info("Test-Modus: E-Mails werden an {$testEmail} gesendet"); } @@ -51,95 +58,185 @@ class DhlUpdateTracking extends Command } $this->newLine(); - // Hole alle aktiven Sendungen der letzten X Tage - $query = DhlShipment::active() + // Step 1: Mark stale shipments as completed (before main query) + $staleCompleted = $this->markStaleShipmentsCompleted($staleDays, $dryRun); + + // Step 2: Build query for shipments that need tracking update + $query = $this->buildShipmentQuery($days, $orderId, $force); + + $shipments = $query->orderBy('created_at', 'desc')->get(); + + // Count total active shipments for statistics (before interval filter) + $totalActive = DhlShipment::active() + ->whereNull('tracking_completed_at') ->where('created_at', '>=', now()->subDays($days)) - ->whereNotNull('dhl_shipment_no'); + ->whereNotNull('dhl_shipment_no') + ->count(); + + $total = $shipments->count(); + $skippedByInterval = $totalActive - $total; + + $this->info("Aktive Sendungen gesamt: {$totalActive}"); + $this->info('Übersprungen (Intervall): '.max(0, $skippedByInterval)); + $this->info("Zu aktualisieren: {$total}"); + + if ($total === 0) { + $this->info('Keine Sendungen zum Aktualisieren gefunden.'); + $this->printSummary(0, ['updated' => 0, 'failed' => 0, 'completed' => 0, 'emails_sent' => 0, 'skipped' => 0], $staleCompleted, max(0, $skippedByInterval)); + + return self::SUCCESS; + } + + $trackingService = new DhlTrackingService; + $stats = [ + 'updated' => 0, + 'failed' => 0, + 'completed' => 0, + 'emails_sent' => 0, + 'skipped' => 0, + ]; + + if ($dryRun) { + $stats['skipped'] = $total; + $this->info("Dry-Run: {$total} Sendungen würden aktualisiert."); + } else { + // Collect old statuses for email decision + $oldStatuses = $shipments->pluck('status', 'id')->toArray(); + + // Use batch API for efficient processing + $this->info('Starte Batch-Tracking-Update...'); + $bar = $this->output->createProgressBar($total); + $bar->start(); + + $batchResult = $trackingService->updateTrackingBatch($shipments); + + $stats['updated'] = $batchResult['updated']; + $stats['failed'] = $batchResult['failed']; + $stats['completed'] = $batchResult['completed']; + + $bar->advance($total); + $bar->finish(); + $this->newLine(2); + + // Send tracking emails if enabled + if ($sendEmails) { + $this->info('Prüfe E-Mail-Versand...'); + + foreach ($shipments as $shipment) { + $shipment->refresh(); + $oldStatus = $oldStatuses[$shipment->id] ?? ''; + + if ($this->shouldSendEmail($shipment, $oldStatus)) { + try { + $this->sendTrackingEmail($shipment, $testEmail); + $stats['emails_sent']++; + } catch (\Exception $e) { + Log::error('[DHL Cron] Failed to send tracking email', [ + 'shipment_id' => $shipment->id, + 'error' => $e->getMessage(), + ]); + } + } + } + } + } + + $this->printSummary($total, $stats, $staleCompleted, max(0, $skippedByInterval)); + + Log::info('[DHL Cron] Tracking update completed', array_merge($stats, [ + 'total' => $total, + 'stale_completed' => $staleCompleted, + 'skipped_interval' => max(0, $skippedByInterval), + ])); + + return self::SUCCESS; + } + + /** + * Build the shipment query with or without interval filtering. + */ + private function buildShipmentQuery(int $days, ?string $orderId, bool $force) + { + if ($force) { + // --force: Alle aktiven Sendungen ohne Intervall-Filter + $query = DhlShipment::active() + ->whereNull('tracking_completed_at') + ->where('created_at', '>=', now()->subDays($days)) + ->whereNotNull('dhl_shipment_no'); + } else { + // Normal: Status-basierte Intervalle beachten + $query = DhlShipment::needsTrackingUpdate() + ->where('created_at', '>=', now()->subDays($days)); + } // Filter nach Order-ID wenn angegeben if ($orderId) { $query->where('order_id', $orderId); } - $shipments = $query->orderBy('created_at', 'desc')->get(); + return $query; + } - $total = $shipments->count(); - $this->info("Gefundene aktive Sendungen: {$total}"); + /** + * Mark shipments as tracking-completed if they haven't changed status + * for a given number of days (stale shipments). + */ + private function markStaleShipmentsCompleted(int $staleDays, bool $dryRun): int + { + $staleShipments = DhlShipment::active() + ->whereNull('tracking_completed_at') + ->whereNotNull('last_tracked_at') + ->where('last_tracked_at', '<', now()->subDays($staleDays)) + ->where('created_at', '<', now()->subDays($staleDays)) + ->get(); - if ($total === 0) { - $this->info('Keine Sendungen zum Aktualisieren gefunden.'); + $count = $staleShipments->count(); - return self::SUCCESS; - } + if ($count > 0) { + $this->warn("Veraltete Sendungen gefunden: {$count} (>{$staleDays} Tage ohne Änderung)"); - $bar = $this->output->createProgressBar($total); - $bar->start(); + if (! $dryRun) { + foreach ($staleShipments as $shipment) { + $shipment->markTrackingCompleted(); - $trackingService = new DhlTrackingService; - $stats = [ - 'updated' => 0, - 'failed' => 0, - 'emails_sent' => 0, - 'skipped' => 0, - ]; - - foreach ($shipments as $shipment) { - try { - $oldStatus = $shipment->status; - - if (! $dryRun) { - // Tracking aktualisieren - $result = $trackingService->updateTracking($shipment, ['auto_retrack' => false]); - - if ($result['success']) { - $shipment->refresh(); - $stats['updated']++; - - // Prüfen ob E-Mail gesendet werden soll - if ($sendEmails && $this->shouldSendEmail($shipment, $oldStatus)) { - $this->sendTrackingEmail($shipment, $testEmail); - $stats['emails_sent']++; - } - } else { - $stats['failed']++; - Log::warning('[DHL Cron] Tracking update failed', [ - 'shipment_id' => $shipment->id, - 'message' => $result['message'] ?? 'Unknown error', - ]); - } - } else { - $stats['skipped']++; + Log::info('[DHL Cron] Stale shipment tracking completed', [ + 'shipment_id' => $shipment->id, + 'dhl_shipment_no' => $shipment->dhl_shipment_no, + 'status' => $shipment->status, + 'last_tracked_at' => $shipment->last_tracked_at?->toDateTimeString(), + ]); } - } catch (\Exception $e) { - $stats['failed']++; - Log::error('[DHL Cron] Exception during tracking update', [ - 'shipment_id' => $shipment->id, - 'error' => $e->getMessage(), - ]); - } - $bar->advance(); + $this->info(" → {$count} Sendungen als Tracking-abgeschlossen markiert."); + } else { + $this->info(" → Dry-Run: {$count} Sendungen würden als abgeschlossen markiert."); + } } - $bar->finish(); - $this->newLine(2); + $this->newLine(); - // Zusammenfassung + return $count; + } + + /** + * Print the final summary table. + */ + private function printSummary(int $total, array $stats, int $staleCompleted, int $skippedByInterval): void + { $this->info('Zusammenfassung:'); $this->table( ['Metrik', 'Anzahl'], [ - ['Gesamt', $total], + ['Zu aktualisieren', $total], ['Aktualisiert', $stats['updated']], ['Fehlgeschlagen', $stats['failed']], + ['Tracking abgeschlossen', $stats['completed']], ['E-Mails gesendet', $stats['emails_sent']], ['Übersprungen (Dry-Run)', $stats['skipped']], + ['Übersprungen (Intervall)', $skippedByInterval], + ['Veraltet → abgeschlossen', $staleCompleted], ] ); - - Log::info('[DHL Cron] Tracking update completed', $stats); - - return self::SUCCESS; } /** @@ -212,9 +309,9 @@ class DhlUpdateTracking extends Command ]); if ($allShipments->count() > 1) { - $this->line(" -> E-Mail mit {$allShipments->count()} Sendungen gesendet an: {$recipientEmail}"); + $this->line(" → E-Mail mit {$allShipments->count()} Sendungen gesendet an: {$recipientEmail}"); } else { - $this->line(" -> E-Mail gesendet an: {$recipientEmail}"); + $this->line(" → E-Mail gesendet an: {$recipientEmail}"); } } catch (\Exception $e) { Log::error('[DHL Cron] Failed to send tracking email', [ diff --git a/app/Console/Commands/FixPaymentLinkStatus.php b/app/Console/Commands/FixPaymentLinkStatus.php new file mode 100644 index 0000000..9c6455e --- /dev/null +++ b/app/Console/Commands/FixPaymentLinkStatus.php @@ -0,0 +1,119 @@ +option('dry-run'); + + if ($isDryRun) { + $this->info(' DRY RUN MODE - No changes will be made'); + $this->newLine(); + } + + $this->info('🔎 Searching for payment links with incorrect status...'); + $this->newLine(); + + // Find all ShoppingPayments with identifier that are paid + $paidPayments = ShoppingPayment::whereNotNull('identifier') + ->whereHas('shopping_order', function ($query) { + $query->where('paid', 1) + ->where('txaction', 'paid'); + }) + ->with(['shopping_order']) + ->get(); + + $this->info("Found {$paidPayments->count()} paid payments with identifiers"); + $this->newLine(); + + $fixed = 0; + $skipped = 0; + $errors = 0; + + foreach ($paidPayments as $payment) { + $identifier = $payment->identifier; + + // Find the corresponding ShoppingInstance + $instance = ShoppingInstance::where('identifier', $identifier)->first(); + + if (! $instance) { + $this->warn("⚠️ ShoppingInstance not found for identifier: {$identifier}"); + $errors++; + + continue; + } + + // Check if status needs to be updated + if ($instance->status < 10) { + $oldStatus = $instance->status; + $oldStatusName = $instance->getStatus(); + + if (! $isDryRun) { + $instance->status = 10; // link_paid + $instance->save(); + } + + $this->line(sprintf( + '%s Payment #%d: %s → %s (Order #%d, Amount: %s)', + $isDryRun ? '📋' : '✅', + $payment->id, + $oldStatusName." ($oldStatus)", + 'link_paid (10)', + $payment->shopping_order_id, + $payment->getPaymentAmount() + )); + + $fixed++; + } else { + $skipped++; + } + } + + $this->newLine(); + $this->info('📊 Summary:'); + $this->table( + ['Status', 'Count'], + [ + ['Fixed/Would fix', $fixed], + ['Already correct', $skipped], + ['Errors', $errors], + ['Total processed', $paidPayments->count()], + ] + ); + + if ($isDryRun && $fixed > 0) { + $this->newLine(); + $this->warn('⚠️ This was a DRY RUN. Run without --dry-run to apply changes.'); + } + + if (! $isDryRun && $fixed > 0) { + $this->newLine(); + $this->info("✨ Successfully updated {$fixed} payment link(s)!"); + } + + return 0; + } +} diff --git a/app/Console/Commands/UserCleanUp.php b/app/Console/Commands/UserCleanUp.php index 19f9c0a..4ad50a5 100644 --- a/app/Console/Commands/UserCleanUp.php +++ b/app/Console/Commands/UserCleanUp.php @@ -2,17 +2,14 @@ namespace App\Console\Commands; +use App\Services\UserUtil; use App\User; use Carbon\Carbon; -use App\Services\UserUtil; use Illuminate\Console\Command; - class UserCleanUp extends Command { /** - * ln -sfv /usr/bin/php73 /usr/bin/php - * php74 artisan user:cleanup * The name and signature of the console command. * * @var string @@ -24,7 +21,8 @@ class UserCleanUp extends Command * * @var string */ - protected $description = 'User Clean Up inactive for Business Structur and UserDetails'; + protected $description = 'User Clean Up inactive for Business Structure and UserDetails'; + private $timeStart; /** @@ -44,118 +42,162 @@ class UserCleanUp extends Command */ public function handle() { - $this->info('RUN Command user:cleanup'); \Log::channel('cleanup')->info('COMMAND [user:cleanup] started.'); $this->timeStart = microtime(true); - $this->deleteInavtiveUsers(); - //alle inaktive User werden deaktivert, die childs werden dem nächsten aktiven Berater (parent) zugewiesen. + // Schritt 1: User löschen, die länger als 2 Monate inaktiv sind + $this->deleteInactiveUsers(); + + // Schritt 2: Alle inaktiven User deaktivieren (länger als 2 Wochen inaktiv) + // Ihre Downline wird dem nächsten aktiven Berater (Sponsor) zugewiesen $this->cleanUpInActiveUser(); - return 0; - \Log::channel('cleanup')->info('COMMAND [user:cleanup] finished.'); - //return 0; + + return 0; } - //gibt es gelöschte Berater mit Kunden und childs??? - - private function deleteInavtiveUsers() + /** + * Löscht User, die länger als 2 Monate inaktiv sind (payment_account < -2 month) + * - Weist deren Vertriebspartner-Kinder dem nächsten aktiven Sponsor zu + * - Überträgt deren Shopping-Kunden zum neuen Sponsor + * - Konvertiert den User zu einem Shopping-Kunden + * - Löscht den User (soft delete) + */ + private function deleteInactiveUsers() { - - $this->info('START Command deleteInavtiveUsers'); + $methodStartTime = microtime(true); + $this->info('START Command deleteInactiveUsers'); $count = 0; $date = Carbon::now()->modify('-2 month'); $delete_users = User::where('admin', 0)->where('payment_account', '<', $date)->get(); foreach ($delete_users as $delete_user) { - /* - dump('delete_users ---------- '); - dump($delete_user->id); - dump($delete_user->email); - */ - //finde nächsten aktiven Sponsor $delete_user->id kann sponsor oder pre sponsor sein - $active_sponsor = UserUtil::findNextActiveSponsor($delete_user->id); - if ($active_sponsor) { - //setze alle Berater vom Sponsor für alle childs + \DB::beginTransaction(); + + try { + // Finde nächsten aktiven Sponsor + $active_sponsor = UserUtil::findNextActiveSponsor($delete_user->id); + + if (! $active_sponsor) { + \Log::channel('cleanup')->error('deleteInactiveUsers find no active_sponsor by delete_user_id: '.$delete_user->id); + \DB::rollBack(); + + continue; + } + + // Prüfe ob User Account-Daten hat + if (! $delete_user->account) { + \Log::channel('cleanup')->error('deleteInactiveUsers: User has no account data, skipping user_id: '.$delete_user->id); + \DB::rollBack(); + + continue; + } + + // Setze alle Vertriebspartner-Kinder zum neuen Sponsor UserUtil::setNewSponsorToChilds($delete_user->id, $active_sponsor->id); + + // Übertrage Shopping-User zum neuen Sponsor UserUtil::setShoppingUserToNewMember($delete_user->id, $active_sponsor->id); - } else { - \Log::channel('cleanup')->error('deleteInavtiveUsers find no active_sponsor by delete_user_id:' . $delete_user->id); + + // Konvertiere User zu Client beim neuen Sponsor + UserUtil::setUserToClient($delete_user->id, $active_sponsor->id); + + $data = [ + 'user_id' => $delete_user->id, + 'email' => $delete_user->email, + 'm_account' => $delete_user->account->m_account, + 'm_first_name' => $delete_user->account->m_first_name, + 'm_last_name' => $delete_user->account->m_last_name, + ]; + + // Lösche User (soft delete) + UserUtil::deleteUser($delete_user); + + \DB::commit(); + $count++; + \Log::channel('cleanup')->info('deleteUser: '.json_encode($data)); + } catch (\Exception $e) { + \DB::rollBack(); + \Log::channel('cleanup')->error('deleteInactiveUsers failed for user_id: '.$delete_user->id.' | Error: '.$e->getMessage()); + continue; } - /* - dump('findNextActiveSponsor'); - dump($active_sponsor->email); - */ - //make User to an Client from sponsor and delete User - UserUtil::setUserToClient($delete_user->id, $active_sponsor->id); - - $data = [ - 'user_id' => $delete_user->id, - 'email' => $delete_user->email, - 'm_account' => $delete_user->account ? $delete_user->account->m_account : '', - 'm_first_name' => $delete_user->account ? $delete_user->account->m_first_name : '', - 'm_last_name' => $delete_user->account ? $delete_user->account->m_last_name : '', - ]; - $count++; - \Log::channel('cleanup')->info('deleteUser: ' . json_encode($data)); - UserUtil::deleteUser($delete_user); } - $diff = microtime(true) - $this->timeStart; + $diff = microtime(true) - $methodStartTime; $sec = intval($diff); $micro = $diff - $sec; - $this->info('END Command deleteInavtiveUsers: ' . $count . ' | Time: ' . $sec . 'sec :' . round($micro * 1000, 4) . " ms"); + $this->info('END Command deleteInactiveUsers: '.$count.' | Time: '.$sec.'sec :'.round($micro * 1000, 4).' ms'); } + /** + * Deaktiviert User, die länger als 2 Wochen inaktiv sind + * - Weist deren Vertriebspartner-Kinder dem nächsten aktiven Sponsor zu + * - Deaktiviert den User (behält Account, speichert Sponsor in pre_sponsor) + * - Shopping-Kunden werden NICHT übertragen (bleiben beim deaktivierten User) + */ private function cleanUpInActiveUser() { - + $methodStartTime = microtime(true); $this->info('START Command cleanUpInActiveUser'); $count = 0; - //clean up user where inactive since 2 weeks + // Finde User die länger als 2 Wochen inaktiv sind $date = Carbon::now()->modify('-2 weeks'); - $inactive_users = User::where('active', true)->where('m_sponsor', '!=', null)->where('payment_account', '<', $date)->get(); - foreach ($inactive_users as $inactive_user) { - /* - dump('inactive_user ---------- '); - dump($inactive_user->id); - dump($inactive_user->email); - */ - $active_sponsor = UserUtil::findNextActiveSponsor($inactive_user->m_sponsor); - if ($active_sponsor) { - UserUtil::setNewSponsorToChilds($inactive_user->id, $active_sponsor->id); - } else { - \Log::channel('cleanup')->error('cleanUpInActiveUser find no active_sponsor by inactive_user:' . $inactive_user->id); - } - /* - dump('findNextActiveSponsor'); - dump($active_sponsor->email); - */ - $data = [ - 'user_id' => $inactive_user->id, - 'email' => $inactive_user->email, - 'm_account' => $inactive_user->account ? $inactive_user->account->m_account : '', - 'm_first_name' => $inactive_user->account ? $inactive_user->account->m_first_name : '', - 'm_last_name' => $inactive_user->account ? $inactive_user->account->m_last_name : '', - ]; - $count++; + $inactive_users = User::where('active', true) + ->where('m_sponsor', '!=', null) + ->where('payment_account', '<', $date) + ->get(); - \Log::channel('cleanup')->info('inactive_user: ' . json_encode($data)); - UserUtil::deactiveUser($inactive_user); + foreach ($inactive_users as $inactive_user) { + \DB::beginTransaction(); + + try { + // Finde nächsten aktiven Sponsor + $active_sponsor = UserUtil::findNextActiveSponsor($inactive_user->m_sponsor); + + if (! $active_sponsor) { + \Log::channel('cleanup')->error('cleanUpInActiveUser find no active_sponsor by inactive_user: '.$inactive_user->id); + \DB::rollBack(); + + continue; + } + + // Setze alle Vertriebspartner-Kinder zum neuen Sponsor + UserUtil::setNewSponsorToChilds($inactive_user->id, $active_sponsor->id); + + $data = [ + 'user_id' => $inactive_user->id, + 'email' => $inactive_user->email, + 'm_account' => $inactive_user->account ? $inactive_user->account->m_account : '', + 'm_first_name' => $inactive_user->account ? $inactive_user->account->m_first_name : '', + 'm_last_name' => $inactive_user->account ? $inactive_user->account->m_last_name : '', + ]; + + // Deaktiviere User (setzt pre_sponsor, entfernt m_sponsor, setzt active=false) + UserUtil::deactiveUser($inactive_user); + + \DB::commit(); + $count++; + \Log::channel('cleanup')->info('inactive_user: '.json_encode($data)); + } catch (\Exception $e) { + \DB::rollBack(); + \Log::channel('cleanup')->error('cleanUpInActiveUser failed for user_id: '.$inactive_user->id.' | Error: '.$e->getMessage()); + + continue; + } } - $diff = microtime(true) - $this->timeStart; + $diff = microtime(true) - $methodStartTime; $sec = intval($diff); $micro = $diff - $sec; - $this->info('END Command cleanUpInActiveUser: ' . $count . ' | Time: ' . $sec . 'sec :' . round($micro * 1000, 4) . " ms"); + $this->info('END Command cleanUpInActiveUser: '.$count.' | Time: '.$sec.'sec :'.round($micro * 1000, 4).' ms'); } } diff --git a/app/Console/Commands/UserRestore.php b/app/Console/Commands/UserRestore.php index ae0001a..a71fd9a 100644 --- a/app/Console/Commands/UserRestore.php +++ b/app/Console/Commands/UserRestore.php @@ -2,17 +2,13 @@ namespace App\Console\Commands; -use App\User; -use Carbon\Carbon; use App\Services\UserUtil; +use App\User; use Illuminate\Console\Command; - class UserRestore extends Command { /** - * ln -sfv /usr/bin/php73 /usr/bin/php - * php artisan user:restore {user_id} * The name and signature of the console command. * * @var string @@ -24,9 +20,9 @@ class UserRestore extends Command * * @var string */ - protected $description = 'User Restore active User where inactive for Business Structur and UserDetails'; + protected $description = 'User Restore: Reactivates an inactive user and restores their downline structure'; + private $timeStart; - private $user_id; /** * Create a new command instance. @@ -45,68 +41,95 @@ class UserRestore extends Command */ public function handle() { - $this->info('RUN Command user:restore'); + \Log::channel('cleanup')->info('COMMAND [user:restore] started.'); $this->timeStart = microtime(true); - $this->restoreInavtiveUsers(); - return 0; - - //\Log::info('Cron is running'); - //return 0; + $result = $this->restoreInactiveUsers(); + + \Log::channel('cleanup')->info('COMMAND [user:restore] finished.'); + + return $result; } - - //gibt es gelöschte Berater mit Kunden und childs??? - private function restoreInavtiveUsers(){ + /** + * Stellt einen deaktivierten User wieder her + * - Reaktiviert den User (setzt active=true, stellt m_sponsor wieder her) + * - Stellt die Vertriebspartner-Kinder (Downline) wieder her + * - Nutzt UserCleanUpLog um die ursprüngliche Struktur wiederherzustellen + * + * @return int + */ + private function restoreInactiveUsers() + { + $methodStartTime = microtime(true); + $this->info('START Command restoreInactiveUsers'); - $this->info('START Command restoreInavtiveUsers'); - $count = 0; + $user_id = $this->argument('user_id'); - $this->user_id = $this->argument('user_id'); + if (! $user_id) { + $this->error('ERROR: No user_id provided as argument'); + \Log::channel('cleanup')->error('restoreInactiveUsers: No user_id provided'); - if(!$this->user_id){ - $this->info('NO user_id as argument'); - return; + return 1; } - $this->info('RUN Command restoreInavtiveUsers on user_id: '.$this->user_id); + $this->info('Restoring user with ID: '.$user_id); - $user = User::find($this->user_id); + $user = User::find($user_id); + + if (! $user) { + $this->error('ERROR: User not found with ID: '.$user_id); + \Log::channel('cleanup')->error('restoreInactiveUsers: User not found, user_id: '.$user_id); + + return 1; + } + + // Prüfe ob User bereits aktiv ist + if ($user->active) { + $this->warn('WARNING: User is already active, user_id: '.$user_id); + \Log::channel('cleanup')->warning('restoreInactiveUsers: User is already active, user_id: '.$user_id); - if(!$user){ - $this->info('restoreInavtiveUsers find no user by user_id:'.$this->user_id); - \Log::channel('cleanup')->error('restoreInavtiveUsers find no user by user_id:'.$this->user_id); return 0; } - $data = [ - 'user_id' => $user->id, - 'email' => $user->email, - 'm_account' => $user->account ? $user->account->m_account : '', - 'm_first_name' => $user->account ? $user->account->m_first_name : '', - 'm_last_name' => $user->account ? $user->account->m_last_name : '', - ]; - \Log::channel('cleanup')->info('reactiveUser: '.json_encode($data)); + \DB::beginTransaction(); - UserUtil::reactiveUser($user); - //childs wieder herstellen - UserUtil::resetChildsToSponsor($user->id); + try { + $data = [ + 'user_id' => $user->id, + 'email' => $user->email, + 'm_account' => $user->account ? $user->account->m_account : '', + 'm_first_name' => $user->account ? $user->account->m_first_name : '', + 'm_last_name' => $user->account ? $user->account->m_last_name : '', + ]; + // Reaktiviere User (setzt active=true, stellt m_sponsor aus pre_sponsor wieder her) + UserUtil::reactiveUser($user); - $diff = microtime(true) - $this->timeStart; - $sec = intval($diff); - $micro = $diff - $sec; + // Stelle alle Vertriebspartner-Kinder wieder her + UserUtil::resetChildsToSponsor($user->id); - $this->info('END Command deleteInavtiveUsers: '.$count. ' | Time: '.$sec. 'sec :' . round($micro * 1000, 4) . " ms"); + \DB::commit(); + $diff = microtime(true) - $methodStartTime; + $sec = intval($diff); + $micro = $diff - $sec; + + $this->info('SUCCESS: User restored successfully'); + $this->info('END Command restoreInactiveUsers | Time: '.$sec.'sec :'.round($micro * 1000, 4).' ms'); + + \Log::channel('cleanup')->info('restoreInactiveUsers SUCCESS: '.json_encode($data)); + + return 0; + } catch (\Exception $e) { + \DB::rollBack(); + + $this->error('ERROR: Failed to restore user: '.$e->getMessage()); + \Log::channel('cleanup')->error('restoreInactiveUsers FAILED for user_id: '.$user_id.' | Error: '.$e->getMessage()); + + return 1; + } } } - - -//497 - -//489 -> de - -//478 new \ No newline at end of file diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index d5ca12a..69e79de 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -47,9 +47,9 @@ class Kernel extends ConsoleKernel // Cleanup old log files weekly (keeps logs for 30 days) $schedule->command('logs:cleanup --days=30')->weekly()->sundays()->at('05:00'); - // DHL Tracking Update: Täglich um 06:00 Uhr, automatische E-Mails bei Transit-Status - $schedule->command('dhl:update-tracking --days=14 --send-emails') - ->dailyAt('06:00') + // DHL Tracking Update: Stündlich mit status-basierten Intervallen und Batch-API + $schedule->command('dhl:update-tracking --days=30 --send-emails') + ->hourly() ->withoutOverlapping() ->runInBackground(); } diff --git a/app/Http/Controllers/Admin/AboController.php b/app/Http/Controllers/Admin/AboController.php index 00863fd..08dead6 100644 --- a/app/Http/Controllers/Admin/AboController.php +++ b/app/Http/Controllers/Admin/AboController.php @@ -2,13 +2,13 @@ namespace App\Http\Controllers\Admin; -use Request; -use App\Services\Shop; -use App\Models\UserAbo; -use App\Services\AboOrderCart; -use App\Repositories\AboRepository; use App\Http\Controllers\Controller; - +use App\Models\UserAbo; +use App\Repositories\AboRepository; +use App\Services\AboItemHistoryService; +use App\Services\AboOrderCart; +use App\Services\Shop; +use Request; class AboController extends Controller { @@ -26,26 +26,27 @@ class AboController extends Controller set_user_attr('filter_user_shop_id', null); set_user_attr('filter_status', null); set_user_attr('filter_member_id', null); + return redirect(route('admin_sales_customers')); } - //$filter_user_shops = UserAbo::join('user_shops', 'user_shop_id', '=', 'user_shops.id')->orderBy('slug')->get()->pluck('slug', 'id')->unique()->toArray(); + // $filter_user_shops = UserAbo::join('user_shops', 'user_shop_id', '=', 'user_shops.id')->orderBy('slug')->get()->pluck('slug', 'id')->unique()->toArray(); $filter_members = UserAbo::join('users', 'user_id', '=', 'users.id')->groupBy('user_id')->join('user_accounts', 'account_id', '=', 'user_accounts.id')->select('users.id', 'users.email', 'user_accounts.first_name', 'user_accounts.last_name')->get(); $data = [ - //'filter_user_shops' => $filter_user_shops, + // 'filter_user_shops' => $filter_user_shops, 'filter_members' => $filter_members, ]; + return view('admin.abo.index', $data); } - public function detail($id) { $data = Request::all(); $user_abo = UserAbo::findOrFail($id); - //init Yard + // init Yard AboOrderCart::initYard($user_abo); $customer_detail = AboOrderCart::getCustomerDetail(); AboOrderCart::makeOrderYard($user_abo); @@ -62,10 +63,10 @@ class AboController extends Controller 'view' => $user_abo->is_for, 'comp_products' => $comp_products, ]; + return view('admin.abo.detail', $data); } - public function update($id) { $data = Request::all(); @@ -74,29 +75,51 @@ class AboController extends Controller $user_abo = UserAbo::findOrFail($data['id']); $this->aboRepository->setModel($user_abo); $this->aboRepository->update($data); + return redirect(route('admin_abos_detail', [$id])); } } } + public function rollback($id) + { + $user_abo = UserAbo::findOrFail($id); + + AboOrderCart::initYard($user_abo); + + $success = AboItemHistoryService::rollbackToInitial($user_abo); + + if ($success) { + $user_abo->refresh(); + AboOrderCart::makeOrderYard($user_abo); + AboOrderCart::checkNumOfCompProducts($user_abo); + + \Session()->flash('alert-success', __('abo_history.rollback_success')); + } else { + \Session()->flash('alert-error', __('abo_history.rollback_no_data')); + } + + return redirect(route('admin_abos_detail', [$id])); + } + public function datatable() { $query = UserAbo::with('user_abo_orders')->with('shopping_user')->select('user_abos.*'); set_user_attr('filter_member_id', Request::get('filter_member_id')); - if (Request::get('filter_member_id') != "") { + if (Request::get('filter_member_id') != '') { $query->where('user_id', '=', Request::get('filter_member_id')); } set_user_attr('filter_status', Request::get('filter_status')); - if (Request::get('filter_status') != "") { + if (Request::get('filter_status') != '') { $query->where('status', '=', Request::get('filter_status')); } return \DataTables::eloquent($query) ->addColumn('id', function (UserAbo $user_abo) { - return ''; + return ''; }) ->addColumn('start_date', function (UserAbo $user_abo) { return $user_abo->start_date; @@ -121,14 +144,14 @@ class AboController extends Controller return $user_abo->getCountOrders(); }) ->addColumn('amount', function (UserAbo $user_abo) { - return $user_abo->getFormattedAmount() . ' €'; + return $user_abo->getFormattedAmount().' €'; }) ->addColumn('payment', function (UserAbo $user_abo) { return $user_abo->getPaymentType(); }) ->addColumn('member', function (UserAbo $user_abo) { if (isset($user_abo->shopping_user) && $user_abo->shopping_user->member_id > 0) { - return '' . $user_abo->shopping_user->member->getFullName() . ''; + return ''.$user_abo->shopping_user->member->getFullName().''; } }) ->addColumn('payone_userid', function (UserAbo $user_abo) { diff --git a/app/Http/Controllers/Admin/DownloadController.php b/app/Http/Controllers/Admin/DownloadController.php index 0eeb658..f7a226f 100644 --- a/app/Http/Controllers/Admin/DownloadController.php +++ b/app/Http/Controllers/Admin/DownloadController.php @@ -2,21 +2,20 @@ namespace App\Http\Controllers\Admin; - - -use Util; -use Response; -use Request; -use App\Models\DcTag; -use App\Models\DcFile; -use App\Models\DcCategory; use App\Http\Controllers\Controller; -use App\Repositories\DC\TagRepository; +use App\Models\DcCategory; +use App\Models\DcFile; +use App\Models\DcTag; use App\Repositories\DC\FileRepository; +use App\Repositories\DC\TagRepository; +use Request; +use Response; +use Util; class DownloadController extends Controller { protected $tagRepository; + protected $fileRepository; public function __construct(TagRepository $tagRepository, FileRepository $fileRepository) @@ -26,139 +25,160 @@ class DownloadController extends Controller $this->fileRepository = $fileRepository; } - public function files(){ - $q = DcFile::orderBy('id', 'desc')->get(); //File::all(); + public function files() + { + $q = DcFile::orderBy('id', 'desc')->get(); // File::all(); $data = [ 'files' => $q, ]; + return view('admin.downloadcenter.files', $data); } - public function fileEdit($id = null){ + public function fileEdit($id = null) + { $file = $id ? DcFile::find($id) : new DcFile; $data = [ 'file' => $file, 'categories' => DcCategory::where('active', true)->orderBy('pos')->get(), 'tags' => DcTag::orderBy('pos')->get(), ]; + return view('admin.downloadcenter.file_edit', $data); } - - public function fileUpdate($do, $id){ - if($do === 'make_thumb'){ + public function fileUpdate($do, $id) + { + + if ($do === 'make_thumb') { $this->fileRepository->makeThumb($id); \Session()->flash('alert-success', 'Vorschaubild erstellt!'); + return back(); } - if($do === 'delete'){ + if ($do === 'delete') { $this->fileRepository->deleteFile($id); \Session()->flash('alert-success', 'Datei gelöscht!'); + return redirect(route('admin_downloadcenter_files')); } - if($do === 'delete_thumb'){ + if ($do === 'delete_thumb') { $this->fileRepository->deleteThumb($id); \Session()->flash('alert-success', 'Vorschaubild gelöscht!'); + return back(); } - if($do === 'deactivate'){ + if ($do === 'deactivate') { $file = DcFile::findOrFail($id); $file->active = false; $file->save(); \Session()->flash('alert-success', 'Datei nicht anzeigen!'); + return back(); } - if($do === 'activate'){ + if ($do === 'activate') { $file = DcFile::findOrFail($id); $file->active = true; $file->save(); \Session()->flash('alert-success', 'Datei wird angezeigt!'); + return back(); } - if($do === 'file_tags_update'){ + if ($do === 'file_tags_update') { $file = DcFile::findOrFail($id); - $this->fileRepository->tagsUpdate($id, Request::get('nestable_check')); + $tags = Request::get('nestable_check', []); + $this->fileRepository->tagsUpdate($id, is_array($tags) ? $tags : []); \Session()->flash('alert-success', 'Tags aktualisiert!'); + return back(); } - } - public function upload(){ + public function upload() + { return view('admin.downloadcenter.file_upload'); } - public function uploadFile(){ + public function uploadFile() + { $data = Request::all(); $file = $this->fileRepository->uploadFile($data); - + return Response::json([ 'error' => false, 'filename' => $file->filename, 'filedata' => '', - 'code' => 200 + 'code' => 200, ], 200); - - //return response()->json(['success'=>basename($file)]); + + // return response()->json(['success'=>basename($file)]); } - public function tags($flash = false){ - + public function tags($flash = false) + { + $active = DcCategory::orderBy('pos')->get(); $inactive = DcTag::where('category_id', null)->get(); $data = [ 'category_active' => $active, 'tags_inactive' => $inactive, ]; - if($flash){ + if ($flash) { \Session()->flash('alert-success', 'gespeichert!'); } + return view('admin.downloadcenter.tags', $data); } - public function storeItem($obj = false){ + public function storeItem($obj = false) + { $data = Request::all(); + return $this->tagRepository->storeItem($obj, $data); + return redirect(route('admin_downloadcenter_tags')); } - - public function deleteItem($obj, $id){ + public function deleteItem($obj, $id) + { $this->tagRepository->deleteItem($obj, $id); + return redirect(route('admin_downloadcenter_tags')); } - public function datatable(){ + public function datatable() + { + + $query = DcFile::with('tags')->select('dc_files.*'); - $query = DcFile::with('tags')->select('dc_files.*'); return \DataTables::eloquent($query) ->addColumn('id', function (DcFile $file) { return ''; }) ->addColumn('image', function (DcFile $file) { - return ($file->hasThumb() && $file->hasBig()) ? - '' : + return ($file->hasThumb() && $file->hasBig()) ? + '' : ' Vorschaubild
erstellen '; }) ->addColumn('name', function (DcFile $file) { - //Storage::disk('local')->url($file->filename) }} + // Storage::disk('local')->url($file->filename) }} return ''.$file->original_name.''; - // return ''.$file->original_name.''; + // return ''.$file->original_name.''; }) ->addColumn('category', function (DcFile $file) { - //return $file->category ? $file->category->name : ''; + // return $file->category ? $file->category->name : ''; }) ->addColumn('tags', function (DcFile $file) { - //return $file->hasTags() ? '('.$file->fileTag()->count().')' : 'X'; + // return $file->hasTags() ? '('.$file->fileTag()->count().')' : 'X'; return $file->tags->implode('name', '
'); }) ->addColumn('size', function (DcFile $file) { return Util::formatBytes($file->size); - }) + }) ->addColumn('active', function (DcFile $file) { return get_active_badge($file->active); - //return $file->active ? ' aktiv' : ' inaktiv'; + // return $file->active ? ' aktiv' : ' inaktiv'; }) ->addColumn('created_at', function (DcFile $file) { return $file->created_at->format('d.m.Y H:i'); @@ -169,8 +189,8 @@ class DownloadController extends Controller ->addColumn('action', function (DcFile $file) { return ''; }) - ->filterColumn('name', function($query, $keyword) { - if($keyword != ""){ + ->filterColumn('name', function ($query, $keyword) { + if ($keyword != '') { $query->where('original_name', 'LIKE', '%'.$keyword.'%'); } }) @@ -184,5 +204,4 @@ class DownloadController extends Controller ->rawColumns(['id', 'image', 'name', 'active', 'tags', 'action']) ->make(true); } - } diff --git a/app/Http/Controllers/AdminUserCleanupController.php b/app/Http/Controllers/AdminUserCleanupController.php new file mode 100644 index 0000000..8f02732 --- /dev/null +++ b/app/Http/Controllers/AdminUserCleanupController.php @@ -0,0 +1,708 @@ +middleware('superadmin'); + } + + /** + * Übersicht deaktivierter und gelöschter User + */ + public function index() + { + return view('admin.user.cleanup.index'); + } + + /** + * Protokoll der User-Cleanup-Logs (Downline-Übertragungen) + */ + public function logs() + { + return view('admin.user.cleanup.logs'); + } + + /** + * Protokoll der Shopping-User-Member-Logs (Kunden-Übertragungen) + */ + public function shoppingLogs() + { + return view('admin.user.cleanup.shopping_logs'); + } + + /** + * DataTable für deaktivierte/gelöschte User + */ + public function getInactiveUsers() + { + // Deaktivierte User (active=false) ODER gelöschte User (mit pre_deleted_at) + $query = User::withTrashed() + ->where(function ($q) { + $q->where('active', false) + ->orWhere('pre_deleted_at', '!=', null); + }) + ->with('account') + ->select('users.*') + ->where('users.admin', '<', 5); + + return \DataTables::eloquent($query) + ->addColumn('user_id', function (User $user) { + return $user->id; + }) + ->addColumn('first_name', function (User $user) { + return $user->account ? $user->account->first_name : ''; + }) + ->addColumn('last_name', function (User $user) { + return $user->account ? $user->account->last_name : ''; + }) + ->addColumn('email', function (User $user) { + if ($user->pre_deleted_at) { + return ''.$user->email.''; + } + + return $user->email; + }) + ->addColumn('m_account', function (User $user) { + return $user->account ? $user->account->m_account : ''; + }) + ->addColumn('status', function (User $user) { + if ($user->pre_deleted_at) { + return 'Gelöscht'; + } + if (! $user->active) { + return 'Deaktiviert'; + } + + return 'Aktiv'; + }) + ->addColumn('deleted_at', function (User $user) { + if ($user->pre_deleted_at) { + return \Carbon\Carbon::parse($user->pre_deleted_at)->format('d.m.Y H:i'); + } + + return '-'; + }) + ->addColumn('payment_account', function (User $user) { + return $user->getPaymentAccountDateFormat(); + }) + ->addColumn('m_sponsor', function (User $user) { + if ($user->m_sponsor) { + $sponsor = User::find($user->m_sponsor); + + return $sponsor ? $sponsor->email : 'ID: '.$user->m_sponsor; + } + + return '-'; + }) + ->addColumn('pre_sponsor', function (User $user) { + if ($user->pre_sponsor) { + $sponsor = User::withTrashed()->find($user->pre_sponsor); + + return $sponsor ? $sponsor->email : 'ID: '.$user->pre_sponsor; + } + + return '-'; + }) + ->addColumn('childs_count', function (User $user) { + $count = User::where('m_sponsor', $user->id)->count(); + + return $count > 0 ? ''.$count.'' : '0'; + }) + ->addColumn('shopping_users_count', function (User $user) { + $count = ShoppingUser::where('member_id', $user->id)->count(); + + return $count > 0 ? ''.$count.'' : '0'; + }) + ->addColumn('action', function (User $user) { + $html = ''; + if ($user->pre_deleted_at) { + $html .= ' '; + } else { + $html .= ' '; + } + + // Historie-Button + $html .= ' '; + + // Restore-Button für gelöschte User + if ($user->pre_deleted_at) { + $html .= ' '; + } + + return $html; + }) + ->orderColumn('user_id', 'id $1') + ->orderColumn('email', 'email $1') + ->orderColumn('status', 'active $1') + ->rawColumns(['email', 'status', 'childs_count', 'shopping_users_count', 'action']) + ->make(true); + } + + /** + * DataTable für UserCleanUpLogs (Downline-Übertragungen) + */ + public function getCleanupLogs() + { + $query = UserCleanUpLog::with(['inactive_sponsor.account', 'child_user.account', 'new_sponsor.account']) + ->select('user_clean_up_logs.*'); + + return \DataTables::eloquent($query) + ->addColumn('id', function (UserCleanUpLog $log) { + return $log->id; + }) + ->addColumn('inactive_sponsor', function (UserCleanUpLog $log) { + if ($log->inactive_sponsor && $log->inactive_sponsor->account) { + $name = trim($log->inactive_sponsor->account->first_name.' '.$log->inactive_sponsor->account->last_name); + + return ($name ?: 'N/A').'
'.$log->inactive_sponsor->email.''; + } + + return 'ID: '.$log->inactive_sponsor_id; + }) + ->addColumn('child_user', function (UserCleanUpLog $log) { + if ($log->child_user && $log->child_user->account) { + $name = trim($log->child_user->account->first_name.' '.$log->child_user->account->last_name); + + return ($name ?: 'N/A').'
'.$log->child_user->email.''; + } + + return 'ID: '.$log->child_user_id; + }) + ->addColumn('new_sponsor', function (UserCleanUpLog $log) { + $html = ''; + + // Original-Sponsor aus dem Log + if ($log->new_sponsor && $log->new_sponsor->account) { + $name = trim($log->new_sponsor->account->first_name.' '.$log->new_sponsor->account->last_name); + $html .= 'Damals:
'; + $html .= ($name ?: 'N/A').'
'.$log->new_sponsor->email.''; + } else { + $html .= 'ID: '.$log->new_sponsor_id; + } + + // Prüfe aktuellen Sponsor des child_user + if ($log->child_user) { + $currentSponsorId = $log->child_user->m_sponsor; + + // Wenn aktueller Sponsor ANDERS ist als im Log + if ($currentSponsorId && $currentSponsorId != $log->new_sponsor_id) { + $currentSponsor = User::with('account')->find($currentSponsorId); + + if ($currentSponsor) { + $html .= '
'; + $html .= 'Geändert!
'; + $html .= 'Aktuell:
'; + + if ($currentSponsor->account) { + $currentName = trim($currentSponsor->account->first_name.' '.$currentSponsor->account->last_name); + $html .= ''.($currentName ?: 'N/A').'
'; + } + + $html .= ''.$currentSponsor->email.''; + } + } + } + + return $html; + }) + ->addColumn('created_at', function (UserCleanUpLog $log) { + return \Carbon\Carbon::parse($log->created_at)->format('d.m.Y H:i'); + }) + ->orderColumn('id', 'id $1') + ->rawColumns(['inactive_sponsor', 'child_user', 'new_sponsor']) + ->make(true); + } + + /** + * DataTable für ShoppingUserMemberLogs (Kunden-Übertragungen) + */ + public function getShoppingLogs() + { + $query = ShoppingUserMemberLog::with(['pre_member.account', 'shopping_user', 'new_member.account']) + ->select('shopping_user_member_logs.*'); + + return \DataTables::eloquent($query) + ->addColumn('id', function (ShoppingUserMemberLog $log) { + return $log->id; + }) + ->addColumn('pre_member', function (ShoppingUserMemberLog $log) { + if ($log->pre_member && $log->pre_member->account) { + $name = trim($log->pre_member->account->first_name.' '.$log->pre_member->account->last_name); + + return ($name ?: 'N/A').'
'.$log->pre_member->email.''; + } + + return 'ID: '.$log->pre_member_id; + }) + ->addColumn('shopping_user', function (ShoppingUserMemberLog $log) { + if ($log->shopping_user) { + $name = trim($log->shopping_user->billing_firstname.' '.$log->shopping_user->billing_lastname); + + return ($name ?: 'N/A').'
'.$log->shopping_user->billing_email.''; + } + + return 'ID: '.$log->shopping_user_id; + }) + ->addColumn('new_member', function (ShoppingUserMemberLog $log) { + $html = ''; + + // Original-Berater aus dem Log + if ($log->new_member && $log->new_member->account) { + $name = trim($log->new_member->account->first_name.' '.$log->new_member->account->last_name); + $html .= 'Damals:
'; + $html .= ($name ?: 'N/A').'
'.$log->new_member->email.''; + } else { + $html .= 'ID: '.$log->new_member_id; + } + + // Prüfe aktuellen Berater des Kunden + if ($log->shopping_user) { + $currentMemberId = $log->shopping_user->member_id; + + // Wenn aktueller Berater ANDERS ist als im Log + if ($currentMemberId && $currentMemberId != $log->new_member_id) { + $currentMember = User::with('account')->find($currentMemberId); + + if ($currentMember) { + $html .= '
'; + $html .= 'Geändert!
'; + $html .= 'Aktuell:
'; + + if ($currentMember->account) { + $currentName = trim($currentMember->account->first_name.' '.$currentMember->account->last_name); + $html .= ''.($currentName ?: 'N/A').'
'; + } + + $html .= ''.$currentMember->email.''; + } + } + } + + return $html; + }) + ->addColumn('created_at', function (ShoppingUserMemberLog $log) { + return \Carbon\Carbon::parse($log->created_at)->format('d.m.Y H:i'); + }) + ->orderColumn('id', 'id $1') + ->rawColumns(['pre_member', 'shopping_user', 'new_member']) + ->make(true); + } + + /** + * User über Artisan Command wiederherstellen + */ + public function restore(\Illuminate\Http\Request $request) + { + $userId = $request->input('user_id'); + + if (! $userId) { + return response()->json([ + 'success' => false, + 'message' => 'Keine User-ID angegeben', + ], 400); + } + + try { + // Führe Artisan Command aus + \Artisan::call('user:restore', ['user_id' => $userId]); + + $output = \Artisan::output(); + + // Prüfe ob Command erfolgreich war (Exit Code 0) + $exitCode = \Artisan::call('user:restore', ['user_id' => $userId]); + + \Log::channel('cleanup')->info('AdminUserCleanupController restore via web: user_id='.$userId.' | exitCode='.$exitCode); + + if ($exitCode === 0) { + return response()->json([ + 'success' => true, + 'message' => 'User wurde erfolgreich wiederhergestellt', + 'output' => $output, + ]); + } else { + return response()->json([ + 'success' => false, + 'message' => 'Fehler beim Wiederherstellen (Exit Code: '.$exitCode.')', + 'output' => $output, + ], 500); + } + } catch (\Exception $e) { + \Log::channel('cleanup')->error('AdminUserCleanupController restore failed: '.$e->getMessage()); + + return response()->json([ + 'success' => false, + 'message' => 'Exception: '.$e->getMessage(), + ], 500); + } + } + + /** + * Suche nach aktiven Sponsoren für Select2 + */ + public function searchSponsors(\Illuminate\Http\Request $request) + { + $search = $request->input('q'); + $userId = $request->input('exclude_user_id'); // User selbst ausschließen + $loadAll = $request->input('load_all', false); // Alle Sponsoren laden + + $query = User::where('active', true) + ->where('admin', '<', 5) + ->where('blocked', false) + ->where('payment_account', '>=', now()) + ->with('account') + ->orderBy('email', 'asc'); + + if ($userId) { + $query->where('id', '!=', $userId); + } + + // Nur filtern wenn Suche vorhanden und nicht load_all + if ($search && ! $loadAll) { + $query->where(function ($q) use ($search) { + $q->where('email', 'like', '%'.$search.'%') + ->orWhereHas('account', function ($q2) use ($search) { + $q2->where('first_name', 'like', '%'.$search.'%') + ->orWhere('last_name', 'like', '%'.$search.'%') + ->orWhere('m_account', 'like', '%'.$search.'%'); + }); + }); + } + + // Limit nur wenn nicht alle geladen werden sollen + if (! $loadAll) { + $query->limit(20); + } + + $users = $query->get()->map(function ($user) { + $name = ''; + if ($user->account) { + $name = trim($user->account->first_name.' '.$user->account->last_name); + if ($name) { + $name .= ' | '; + } + } + + return [ + 'id' => $user->id, + 'text' => $name.$user->email.($user->account && $user->account->m_account ? ' #'.$user->account->m_account : ''), + ]; + }); + + return response()->json(['results' => $users]); + } + + /** + * Sponsor manuell neu zuweisen + */ + public function reassignSponsor(\Illuminate\Http\Request $request) + { + $userId = $request->input('user_id'); + $newSponsorId = $request->input('new_sponsor_id'); + // Boolean-Werte korrekt konvertieren (auch wenn sie als String ankommen) + $transferDownline = filter_var($request->input('transfer_downline', false), FILTER_VALIDATE_BOOLEAN); + $transferCustomers = filter_var($request->input('transfer_customers', false), FILTER_VALIDATE_BOOLEAN); + + if (! $userId || ! $newSponsorId) { + return response()->json([ + 'success' => false, + 'message' => 'User-ID und neuer Sponsor sind erforderlich', + ], 400); + } + + $user = User::withTrashed()->find($userId); + $newSponsor = User::find($newSponsorId); + + if (! $user) { + return response()->json([ + 'success' => false, + 'message' => 'User nicht gefunden', + ], 404); + } + + if (! $newSponsor || ! $newSponsor->active) { + return response()->json([ + 'success' => false, + 'message' => 'Neuer Sponsor nicht gefunden oder nicht aktiv', + ], 404); + } + + \DB::beginTransaction(); + + try { + $oldSponsorId = $user->m_sponsor; + $logs = []; + + // 1. Downline neu zuweisen (aus Logs - bereits übertragene) + $childrenTransferred = 0; + if ($transferDownline) { + // Hole die Kinder aus den vorherigen Cleanup-Logs (die bereits VON diesem User weg übertragen wurden) + $cleanupLogs = UserCleanUpLog::where('inactive_sponsor_id', $userId)->get(); + + \Log::channel('cleanup')->info('Reassigning downline from logs: found '.$cleanupLogs->count().' log entries for user_id='.$userId); + + foreach ($cleanupLogs as $oldLog) { + $child = User::find($oldLog->child_user_id); + + if (! $child) { + \Log::channel('cleanup')->warning('Child user not found: '.$oldLog->child_user_id); + + continue; + } + + // Neuen Log erstellen für die Neu-Zuweisung + UserCleanUpLog::create([ + 'inactive_sponsor_id' => $child->m_sponsor, // Aktueller Sponsor (wohin es vorher übertragen wurde) + 'child_user_id' => $child->id, + 'new_sponsor_id' => $newSponsorId, // Neuer Sponsor + ]); + + // Sponsor ändern + $child->m_sponsor = $newSponsorId; + $child->save(); + + $childrenTransferred++; + + $logs[] = 'Downline: '.$child->email.' → Neuer Sponsor: '.$newSponsor->email; + } + + \Log::channel('cleanup')->info('Children reassigned: '.$childrenTransferred); + } + + // 2. Shopping-Kunden neu zuweisen (aus Logs - bereits übertragene) + $customersTransferred = 0; + if ($transferCustomers) { + // Hole die Kunden aus den vorherigen Shopping-Logs (die bereits VON diesem User weg übertragen wurden) + $shoppingLogs = ShoppingUserMemberLog::where('pre_member_id', $userId)->get(); + + \Log::channel('cleanup')->info('Reassigning customers from logs: found '.$shoppingLogs->count().' log entries for user_id='.$userId); + + foreach ($shoppingLogs as $oldLog) { + $customer = ShoppingUser::find($oldLog->shopping_user_id); + + if (! $customer) { + \Log::channel('cleanup')->warning('Shopping user not found: '.$oldLog->shopping_user_id); + + continue; + } + + // Neuen Log erstellen für die Neu-Zuweisung + ShoppingUserMemberLog::create([ + 'pre_member_id' => $customer->member_id, // Aktueller Berater (wohin es vorher übertragen wurde) + 'shopping_user_id' => $customer->id, + 'new_member_id' => $newSponsorId, // Neuer Berater + ]); + + // Member ändern + $customer->member_id = $newSponsorId; + $customer->save(); + + $customersTransferred++; + + $logs[] = 'Kunde: '.$customer->billing_email.' → Neuer Berater: '.$newSponsor->email; + } + + \Log::channel('cleanup')->info('Customers reassigned: '.$customersTransferred); + } + + // 3. User selbst dem neuen Sponsor zuweisen + $user->m_sponsor = $newSponsorId; + $user->save(); + + \DB::commit(); + + // Cleanup-Log + \Log::channel('cleanup')->info('Manual reassign sponsor: user_id='.$userId.' | old_sponsor='.$oldSponsorId.' | new_sponsor='.$newSponsorId.' | transfer_downline='.(int) $transferDownline.' | transfer_customers='.(int) $transferCustomers.' | by_admin='.Auth::id()); + + return response()->json([ + 'success' => true, + 'message' => 'Sponsor erfolgreich neu zugewiesen', + 'logs' => $logs, + 'transferred' => [ + 'downline' => $childrenTransferred, + 'customers' => $customersTransferred, + ], + ]); + } catch (\Exception $e) { + \DB::rollBack(); + \Log::channel('cleanup')->error('Manual reassign sponsor failed: user_id='.$userId.' | error='.$e->getMessage()); + + return response()->json([ + 'success' => false, + 'message' => 'Fehler beim Neu-Zuweisen: '.$e->getMessage(), + ], 500); + } + } + + /** + * Lade User-Historie: Downline-Position und Shopping-Kunden + */ + public function getUserHistory($userId) + { + $user = User::withTrashed()->with('account')->find($userId); + + if (! $user) { + return response()->json([ + 'success' => false, + 'message' => 'User nicht gefunden', + ], 404); + } + + // Aktueller/Vorheriger Sponsor + $sponsor = null; + $preSponsor = null; + + if ($user->m_sponsor) { + $sponsor = User::withTrashed()->with('account')->find($user->m_sponsor); + } + + if ($user->pre_sponsor) { + $preSponsor = User::withTrashed()->with('account')->find($user->pre_sponsor); + } + + // Direkte Downline (Kinder) - nur die, die aktuell m_sponsor haben + // pre_sponsor sind bereits deaktiviert und würden doppelt gezählt + $children = User::withTrashed() + ->with('account') + ->where('m_sponsor', $userId) + ->get() + ->map(function ($child) use ($userId) { + return [ + 'id' => $child->id, + 'name' => $child->account ? trim($child->account->first_name.' '.$child->account->last_name) : 'N/A', + 'email' => $child->email, + 'active' => $child->active, + 'deleted' => $child->pre_deleted_at ? true : false, + 'is_pre_sponsor' => $child->pre_sponsor == $userId, + ]; + }); + + // Shopping-Kunden + $shoppingUsers = ShoppingUser::where('member_id', $userId) + ->get() + ->map(function ($customer) { + return [ + 'id' => $customer->id, + 'name' => trim($customer->billing_firstname.' '.$customer->billing_lastname), + 'email' => $customer->billing_email, + 'city' => $customer->billing_city, + 'created_at' => \Carbon\Carbon::parse($customer->created_at)->format('d.m.Y'), + ]; + }); + + // Downline-Übertragungen (wo dieser User betroffen war) + $cleanupLogs = UserCleanUpLog::with(['inactive_sponsor.account', 'child_user.account', 'new_sponsor.account']) + ->where(function ($query) use ($userId) { + $query->where('inactive_sponsor_id', $userId) + ->orWhere('child_user_id', $userId); + }) + ->orderBy('created_at', 'desc') + ->get() + ->map(function ($log) use ($userId) { + $data = [ + 'type' => $log->inactive_sponsor_id == $userId ? 'as_inactive' : 'as_child', + 'child_user' => $log->child_user ? [ + 'id' => $log->child_user->id, + 'name' => $log->child_user->account ? trim($log->child_user->account->first_name.' '.$log->child_user->account->last_name) : 'N/A', + 'email' => $log->child_user->email, + 'active' => $log->child_user->active, + 'deleted' => $log->child_user->pre_deleted_at ? true : false, + ] : null, + 'inactive_sponsor' => $log->inactive_sponsor ? [ + 'id' => $log->inactive_sponsor->id, + 'name' => $log->inactive_sponsor->account ? trim($log->inactive_sponsor->account->first_name.' '.$log->inactive_sponsor->account->last_name) : 'N/A', + 'email' => $log->inactive_sponsor->email, + ] : null, + 'new_sponsor' => $log->new_sponsor ? [ + 'id' => $log->new_sponsor->id, + 'name' => $log->new_sponsor->account ? trim($log->new_sponsor->account->first_name.' '.$log->new_sponsor->account->last_name) : 'N/A', + 'email' => $log->new_sponsor->email, + ] : null, + 'created_at' => \Carbon\Carbon::parse($log->created_at)->format('d.m.Y H:i'), + ]; + + // Prüfe aktuellen Sponsor des child_user (falls geändert) + if ($log->child_user && $log->child_user->m_sponsor && $log->child_user->m_sponsor != $log->new_sponsor_id) { + $currentSponsor = User::with('account')->find($log->child_user->m_sponsor); + if ($currentSponsor) { + $data['current_sponsor'] = [ + 'id' => $currentSponsor->id, + 'name' => $currentSponsor->account ? trim($currentSponsor->account->first_name.' '.$currentSponsor->account->last_name) : 'N/A', + 'email' => $currentSponsor->email, + ]; + } + } + + return $data; + }); + + // Kunden-Übertragungen + $shoppingLogs = ShoppingUserMemberLog::with(['shopping_user', 'new_member.account']) + ->where('pre_member_id', $userId) + ->orderBy('created_at', 'desc') + ->get() + ->map(function ($log) { + $data = [ + 'customer_name' => $log->shopping_user ? trim($log->shopping_user->billing_firstname.' '.$log->shopping_user->billing_lastname) : 'N/A', + 'customer_email' => $log->shopping_user ? $log->shopping_user->billing_email : 'N/A', + 'new_member' => $log->new_member ? [ + 'id' => $log->new_member->id, + 'name' => $log->new_member->account ? trim($log->new_member->account->first_name.' '.$log->new_member->account->last_name) : 'N/A', + 'email' => $log->new_member->email, + ] : null, + 'created_at' => \Carbon\Carbon::parse($log->created_at)->format('d.m.Y H:i'), + ]; + + // Prüfe aktuellen Berater des Kunden (falls geändert) + if ($log->shopping_user && $log->shopping_user->member_id && $log->shopping_user->member_id != $log->new_member_id) { + $currentMember = User::with('account')->find($log->shopping_user->member_id); + if ($currentMember) { + $data['current_member'] = [ + 'id' => $currentMember->id, + 'name' => $currentMember->account ? trim($currentMember->account->first_name.' '.$currentMember->account->last_name) : 'N/A', + 'email' => $currentMember->email, + ]; + } + } + + return $data; + }); + + return response()->json([ + 'success' => true, + 'user' => [ + 'id' => $user->id, + 'name' => $user->account ? trim($user->account->first_name.' '.$user->account->last_name) : 'N/A', + 'email' => $user->email, + 'm_account' => $user->account ? $user->account->m_account : 'N/A', + 'active' => $user->active, + 'deleted' => $user->pre_deleted_at ? true : false, + 'deleted_at' => $user->pre_deleted_at ? \Carbon\Carbon::parse($user->pre_deleted_at)->format('d.m.Y H:i') : null, + ], + 'sponsor' => $sponsor ? [ + 'id' => $sponsor->id, + 'name' => $sponsor->account ? trim($sponsor->account->first_name.' '.$sponsor->account->last_name) : 'N/A', + 'email' => $sponsor->email, + 'active' => $sponsor->active, + ] : null, + 'pre_sponsor' => $preSponsor ? [ + 'id' => $preSponsor->id, + 'name' => $preSponsor->account ? trim($preSponsor->account->first_name.' '.$preSponsor->account->last_name) : 'N/A', + 'email' => $preSponsor->email, + 'active' => $preSponsor->active, + ] : null, + 'children' => $children, + 'shopping_users' => $shoppingUsers, + 'cleanup_logs' => $cleanupLogs, + 'shopping_logs' => $shoppingLogs, + ]); + } +} diff --git a/app/Http/Controllers/Api/PayoneController.php b/app/Http/Controllers/Api/PayoneController.php index b011581..58e0120 100644 --- a/app/Http/Controllers/Api/PayoneController.php +++ b/app/Http/Controllers/Api/PayoneController.php @@ -2,27 +2,19 @@ namespace App\Http\Controllers\Api; - -use App\Services\Shop; -use App\Services\Util; -use App\Models\UserAbo; -use App\Services\MyLog; -use App\Services\Payment; -use App\Services\AboHelper; +use App\Http\Controllers\Controller; +use App\Models\PaymentTransaction; use App\Models\ShoppingOrder; use App\Models\ShoppingPayment; -use App\Models\PaymentTransaction; -use App\Http\Controllers\Controller; +use App\Services\MyLog; +use App\Services\Payment; use App\Services\ShoppingUserService; - +use App\Services\Util; class PayoneController extends Controller { - - public function __construct() {} - public function paymentStatus() { @@ -42,14 +34,14 @@ class PayoneController extends Controller */ - if (!isset($data['key']) || !isset($data['param']) || !isset($data['userid']) || !isset($data['txid']) || !isset($data['reference']) || !isset($data['price'])) { + if (! isset($data['key']) || ! isset($data['param']) || ! isset($data['userid']) || ! isset($data['txid']) || ! isset($data['reference']) || ! isset($data['price'])) { MyLog::writeLog( 'payone', 'error', 'Error:2001 App\Http\Controllers\Api\PayoneController::paymentStatus parameter incomplete', $data ); - print("TSOK"); + echo 'TSOK'; exit; } @@ -60,31 +52,31 @@ class PayoneController extends Controller 'Error:2002 App\Http\Controllers\Api\PayoneController::paymentStatus Key error', $data ); - print("TSOK"); + echo 'TSOK'; exit; } $shopping_order = ShoppingOrder::find($data['param']); - if (!$shopping_order) { + if (! $shopping_order) { MyLog::writeLog( 'payone', 'error', 'Error:2003 App\Http\Controllers\Api\PayoneController::paymentStatus ShoppingOrder not found:', $data ); - print("TSOK"); + echo 'TSOK'; exit; } $shopping_payment = ShoppingPayment::where('reference', $data['reference'])->first(); - if (!$shopping_payment) { + if (! $shopping_payment) { MyLog::writeLog( 'payone', 'error', 'Error:2004 App\Http\Controllers\Api\PayoneController::paymentStatus ShoppingPayment not found', $data ); - print("TSOK"); + echo 'TSOK'; exit; } @@ -95,11 +87,11 @@ class PayoneController extends Controller 'Error:2005 App\Http\Controllers\Api\PayoneController::paymentStatus ShoppingPayment no realation ShoppingOrder', $data ); - print("TSOK"); + echo 'TSOK'; exit; } - $price = number_format((round($data['price'], 2) * 100), 0, '.', ''); + $price = number_format((round($data['price'], 2) * 100), 0, '.', ''); $price_amount = number_format($shopping_payment->amount, 0, '.', ''); if ($price_amount != $price) { $data['shopping_payment-amount'] = $price_amount; @@ -110,7 +102,7 @@ class PayoneController extends Controller 'Error:2006 App\Http\Controllers\Api\PayoneController::paymentStatus Price error', $data ); - print("TSOK"); + echo 'TSOK'; exit; } @@ -125,8 +117,8 @@ class PayoneController extends Controller $data, false ); - //was already paid - print("TSOK"); + // was already paid + echo 'TSOK'; exit; } else { MyLog::writeLog( @@ -139,7 +131,7 @@ class PayoneController extends Controller } } - //create transaction + // create transaction PaymentTransaction::create([ 'shopping_payment_id' => $shopping_payment->id, 'request' => 'transaction', @@ -152,10 +144,32 @@ class PayoneController extends Controller 'mode' => $data['mode'], ]); - $shopping_order->txaction = $data['txaction']; - $shopping_order->save(); - $shopping_payment->txaction = $data['txaction']; - $shopping_payment->save(); + // Define txaction priority (higher number = higher priority) + $txaction_priority = [ + 'appointed' => 1, + 'pending' => 2, + 'failed' => 3, + 'paid' => 10, // highest priority - final state + ]; + + $current_priority = isset($txaction_priority[$shopping_order->txaction]) ? $txaction_priority[$shopping_order->txaction] : 0; + $new_priority = isset($txaction_priority[$data['txaction']]) ? $txaction_priority[$data['txaction']] : 0; + + // Only update txaction if new priority is higher than current + if ($new_priority > $current_priority) { + $shopping_order->txaction = $data['txaction']; + $shopping_order->save(); + $shopping_payment->txaction = $data['txaction']; + $shopping_payment->save(); + } else { + MyLog::writeLog( + 'payone', + 'info', + 'App\Http\Controllers\Api\PayoneController::paymentStatus - txaction not updated (current: '.$shopping_order->txaction.' has higher/equal priority than new: '.$data['txaction'].')', + $data, + false + ); + } $send_link = false; $send_mail = true; @@ -170,17 +184,38 @@ class PayoneController extends Controller } if ($data['txaction'] === 'paid') { - if (!$shopping_order->paid) { - $send_link = Payment::paymentStatusPaidAction($shopping_order, true, $shopping_payment); - } else { - $send_mail = false; + // Use DB transaction and row locking to prevent race conditions + \DB::beginTransaction(); + try { + // Lock the shopping order row to prevent concurrent processing + $locked_order = ShoppingOrder::where('id', $shopping_order->id) + ->lockForUpdate() + ->first(); + + // Double-check if payment was already processed + if (! $locked_order->paid) { + $send_link = Payment::paymentStatusPaidAction($locked_order, true, $shopping_payment); + \DB::commit(); + } else { + $send_mail = false; + \DB::commit(); + } + } catch (\Exception $e) { + \DB::rollBack(); + MyLog::writeLog( + 'payone', + 'error', + 'Error:2008 App\Http\Controllers\Api\PayoneController::paymentStatus Transaction failed', + ['error' => $e->getMessage(), 'data' => $data] + ); + throw $e; } } $data['send_link'] = $send_link; if ($send_mail) { Payment::paymentStatusSendMail($shopping_order, $shopping_payment, $data); } - print("TSOK"); + echo 'TSOK'; exit; } } diff --git a/app/Http/Controllers/Api/ShoppingUserController.php b/app/Http/Controllers/Api/ShoppingUserController.php index f40d7d3..1e98dbc 100644 --- a/app/Http/Controllers/Api/ShoppingUserController.php +++ b/app/Http/Controllers/Api/ShoppingUserController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers\Api; +use App\Http\Controllers\Controller; use App\Mail\MailCheckout; use App\Models\Country; use App\Models\Product; @@ -10,28 +11,23 @@ use App\Models\ShoppingOrder; use App\Models\ShoppingOrderItem; use App\Models\ShoppingUser; use App\Services\CustomerPriority; -use Illuminate\Http\Request; -use App\Http\Controllers\Controller; use Carbon\Carbon; +use Illuminate\Http\Request; use Illuminate\Support\Facades\Mail; -use PHPUnit\Framework\Constraint\Count; use Yard; - class ShoppingUserController extends Controller { - - //protected static API_MAIL = 'api.thomas.krummel@gmail.com'; - //protected static API_PASS = 'UF(Q<9knap!ev3vH?5~!b8DP'; - + // protected static API_MAIL = 'api.thomas.krummel@gmail.com'; + // protected static API_PASS = 'UF(Q<9knap!ev3vH?5~!b8DP'; protected $successStatus = 200; - protected $member_id = 3; //service@aloe-vera.bio + protected $member_id = 3; // service@aloe-vera.bio /** - * @param Request $request - * wp_order_numbers[1234, 1234] + * @param Request $request + * wp_order_numbers[1234, 1234] * @return \Illuminate\Http\JsonResponse */ public function status(Request $request) @@ -41,23 +37,23 @@ class ShoppingUserController extends Controller 'wp_order_numbers' => 'required', ]); - if(!is_array($request->wp_order_numbers)){ + if (! is_array($request->wp_order_numbers)) { $wp_order_numbers = json_decode($request->wp_order_numbers); - }else{ - $wp_order_numbers = $request->wp_order_numbers; + } else { + $wp_order_numbers = $request->wp_order_numbers; } - if(!$wp_order_numbers || !is_array($wp_order_numbers)){ + if (! $wp_order_numbers || ! is_array($wp_order_numbers)) { return response()->json([ 'success' => false, 'message' => 'wp_order_numbers need as json [1234, 1234] ', - 'time' => Carbon::now()->toDateTimeString() + 'time' => Carbon::now()->toDateTimeString(), ], 400); } $status = []; - foreach ($wp_order_numbers as $wp_order_number){ + foreach ($wp_order_numbers as $wp_order_number) { $shopping_user = ShoppingUser::where('wp_order_number', '=', $wp_order_number)->first(); $status[] = [ 'wp_order_number' => $wp_order_number, @@ -70,14 +66,14 @@ class ShoppingUserController extends Controller return response()->json([ 'success' => true, 'data' => $status, - 'time' => Carbon::now()->toDateTimeString() + 'time' => Carbon::now()->toDateTimeString(), ], 200); } /** - * @param Request $request - * wp_order_number [1234] + * @param Request $request + * wp_order_number [1234] * @return \Illuminate\Http\JsonResponse */ public function cancel(Request $request) @@ -86,31 +82,31 @@ class ShoppingUserController extends Controller 'wp_order_number' => 'required|int', ]); $shopping_user = ShoppingUser::where('wp_order_number', '=', $request->wp_order_number)->first(); - if (!$shopping_user) { + if (! $shopping_user) { return response()->json([ 'success' => false, - 'message' => 'Entry with wp_order_number ' . $request->wp_order_number . ' not found', + 'message' => 'Entry with wp_order_number '.$request->wp_order_number.' not found', 'order' => false, 'status' => false, - 'time' => Carbon::now()->toDateTimeString() + 'time' => Carbon::now()->toDateTimeString(), ], 400); } - if(!$shopping_user->shopping_order){ + if (! $shopping_user->shopping_order) { return response()->json([ 'success' => false, - 'message' => 'Entry with wp_order_number ' . $request->wp_order_number . ' has no order', + 'message' => 'Entry with wp_order_number '.$request->wp_order_number.' has no order', 'order' => false, 'status' => $shopping_user->getAPIShippedType(), - 'time' => Carbon::now()->toDateTimeString() + 'time' => Carbon::now()->toDateTimeString(), ], 400); } - if($shopping_user->shopping_order->shipped > 0){ + if ($shopping_user->shopping_order->shipped > 0) { return response()->json([ 'success' => false, - 'message' => 'Entry with wp_order_number ' . $request->wp_order_number . ' can not cancel', + 'message' => 'Entry with wp_order_number '.$request->wp_order_number.' can not cancel', 'order' => true, 'status' => $shopping_user->getAPIShippedType(), - 'time' => Carbon::now()->toDateTimeString() + 'time' => Carbon::now()->toDateTimeString(), ], 400); } @@ -119,18 +115,17 @@ class ShoppingUserController extends Controller return response()->json([ 'success' => true, - 'message' => 'Entry with wp_order_number ' . $request->wp_order_number . ' is cancel', + 'message' => 'Entry with wp_order_number '.$request->wp_order_number.' is cancel', 'order' => true, 'status' => $shopping_user->getAPIShippedType(), - 'time' => Carbon::now()->toDateTimeString() + 'time' => Carbon::now()->toDateTimeString(), ], 200); } - /** - * @param Request $request - * wp_order_number [1234] + * @param Request $request + * wp_order_number [1234] * @return \Illuminate\Http\JsonResponse */ public function open(Request $request) @@ -139,31 +134,31 @@ class ShoppingUserController extends Controller 'wp_order_number' => 'required|int', ]); $shopping_user = ShoppingUser::where('wp_order_number', '=', $request->wp_order_number)->first(); - if (!$shopping_user) { + if (! $shopping_user) { return response()->json([ 'success' => false, - 'message' => 'Entry with wp_order_number ' . $request->wp_order_number . ' not found', + 'message' => 'Entry with wp_order_number '.$request->wp_order_number.' not found', 'order' => false, 'status' => false, - 'time' => Carbon::now()->toDateTimeString() + 'time' => Carbon::now()->toDateTimeString(), ], 400); } - if(!$shopping_user->shopping_order){ + if (! $shopping_user->shopping_order) { return response()->json([ 'success' => false, - 'message' => 'Entry with wp_order_number ' . $request->wp_order_number . ' has no order', + 'message' => 'Entry with wp_order_number '.$request->wp_order_number.' has no order', 'order' => false, 'status' => $shopping_user->getAPIShippedType(), - 'time' => Carbon::now()->toDateTimeString() + 'time' => Carbon::now()->toDateTimeString(), ], 400); } - if($shopping_user->shopping_order->shipped !== 10){ + if ($shopping_user->shopping_order->shipped !== 10) { return response()->json([ 'success' => false, - 'message' => 'Entry with wp_order_number ' . $request->wp_order_number . ' can not open', + 'message' => 'Entry with wp_order_number '.$request->wp_order_number.' can not open', 'order' => true, 'status' => $shopping_user->getAPIShippedType(), - 'time' => Carbon::now()->toDateTimeString() + 'time' => Carbon::now()->toDateTimeString(), ], 400); } @@ -172,45 +167,44 @@ class ShoppingUserController extends Controller return response()->json([ 'success' => true, - 'message' => 'Entry with wp_order_number ' . $request->wp_order_number . ' is open', + 'message' => 'Entry with wp_order_number '.$request->wp_order_number.' is open', 'order' => true, 'status' => $shopping_user->getAPIShippedType(), - 'time' => Carbon::now()->toDateTimeString() + 'time' => Carbon::now()->toDateTimeString(), ], 200); } - /** - * @param Request $request - * wp_order_numbers [1234, 1234] + * @param Request $request + * wp_order_numbers [1234, 1234] * @return \Illuminate\Http\JsonResponse */ public function show(Request $request) { - //$this->member_id = auth()->user()->m_sponsor; + // $this->member_id = auth()->user()->m_sponsor; $request->validate([ 'wp_order_numbers' => 'required', ]); - if(!is_array($request->wp_order_numbers)){ + if (! is_array($request->wp_order_numbers)) { $wp_order_numbers = json_decode($request->wp_order_numbers); - }else{ - $wp_order_numbers = $request->wp_order_numbers; + } else { + $wp_order_numbers = $request->wp_order_numbers; } - if(!$wp_order_numbers || !is_array($wp_order_numbers)){ + if (! $wp_order_numbers || ! is_array($wp_order_numbers)) { return response()->json([ 'success' => false, 'message' => 'wp_order_numbers need as json [1234, 1234] ', - 'time' => Carbon::now()->toDateTimeString() + 'time' => Carbon::now()->toDateTimeString(), ], 400); } $data = []; - foreach ($wp_order_numbers as $wp_order_number){ - $shopping_user = ShoppingUser::where('wp_order_number', '=', $wp_order_number)->first(); + foreach ($wp_order_numbers as $wp_order_number) { + $shopping_user = ShoppingUser::where('wp_order_number', '=', $wp_order_number)->first(); $user = false; $order = false; if ($shopping_user) { @@ -220,21 +214,21 @@ class ShoppingUserController extends Controller $data[] = [ 'wp_order_number' => $wp_order_number, 'user' => $user, - 'order' => $order, + 'order' => $order, 'customer_number' => $shopping_user ? $shopping_user->number : false, 'member_email' => ($shopping_user && $shopping_user->member) ? $shopping_user->member->email : false, 'status' => $shopping_user ? $shopping_user->getAPIShippedType() : false, ]; } + return response()->json([ 'success' => true, 'data' => $data, - 'time' => Carbon::now()->toDateTimeString() + 'time' => Carbon::now()->toDateTimeString(), ], 200); } /** - * @param Request $request * @return \Illuminate\Http\JsonResponse */ public function store(Request $request) @@ -254,7 +248,7 @@ class ShoppingUserController extends Controller $this->member_id = auth()->user()->m_sponsor; $data = $this->prepareForStore($request->all()); - $data['member_id'] = $this->member_id ; + $data['member_id'] = $this->member_id; $data['number'] = ShoppingUser::max('number') + 1; $data['mode'] = $request->mode ? $request->mode : 'live'; $data['is_from'] = 'extern'; @@ -262,11 +256,12 @@ class ShoppingUserController extends Controller $shopping_user = ShoppingUser::create($data); - //Kundenhoheit prüfen + // Kundenhoheit prüfen $priority = CustomerPriority::checkOne($shopping_user, true, false, true); \App\Services\Shop::newUserOrder($shopping_user->number); - //exists //like //update + // exists //like //update $user = $this->prepareForShow($shopping_user); + return response()->json([ 'success' => true, 'data' => [ @@ -276,13 +271,12 @@ class ShoppingUserController extends Controller 'customer_number' => $shopping_user->number, 'member_email' => ($shopping_user && $shopping_user->member) ? $shopping_user->member->email : false, ], - 'time' => Carbon::now()->toDateTimeString() + 'time' => Carbon::now()->toDateTimeString(), ], 200); } /** - * @param Request $request * @return \Illuminate\Http\JsonResponse */ public function update(Request $request) @@ -291,40 +285,42 @@ class ShoppingUserController extends Controller 'wp_order_number' => 'required|int', ]); $shopping_user = ShoppingUser::where('wp_order_number', '=', $request->wp_order_number)->first(); - if (!$shopping_user) { + if (! $shopping_user) { return response()->json([ 'success' => false, - 'message' => 'Entry with wp_order_number ' . $request->wp_order_number . ' not found', - 'time' => Carbon::now()->toDateTimeString() + 'message' => 'Entry with wp_order_number '.$request->wp_order_number.' not found', + 'time' => Carbon::now()->toDateTimeString(), ], 400); } $data = $this->prepareForUpdate($request->all()); - //Kundenhoheit prüfen + // Kundenhoheit prüfen $priority = CustomerPriority::checkChangeOne($shopping_user, $data, true); $updated = $shopping_user->fill($data)->save(); \App\Services\Shop::newUserOrder($shopping_user->number); - if ($updated){ + if ($updated) { $user = $this->prepareForShow($shopping_user); $order = $this->prepareForShowOrder($shopping_user->shopping_order); - return response()->json([ + + return response()->json([ 'success' => true, 'data' => [ 'wp_order_number' => $shopping_user->wp_order_number, 'user' => $user, - 'order' => $order, + 'order' => $order, 'customer_priority' => $priority, 'customer_number' => $shopping_user ? $shopping_user->number : false, 'member_email' => ($shopping_user && $shopping_user->member) ? $shopping_user->member->email : false, 'status' => $shopping_user ? $shopping_user->getAPIShippedType() : false, ], - 'time' => Carbon::now()->toDateTimeString() + 'time' => Carbon::now()->toDateTimeString(), ], 200); } + return response()->json([ 'success' => false, - 'message' => 'Entry could not be updated' + 'message' => 'Entry could not be updated', ], 500); } @@ -335,28 +331,27 @@ class ShoppingUserController extends Controller 'wp_order' => 'required', ]); - $shopping_user = ShoppingUser::where('wp_order_number', '=', $request->wp_order_number)->first(); - if (!$shopping_user) { + if (! $shopping_user) { return response()->json([ 'success' => false, - 'message' => 'Entry with wp_order_number ' . $request->wp_order_number . ' not found', - 'time' => Carbon::now()->toDateTimeString() + 'message' => 'Entry with wp_order_number '.$request->wp_order_number.' not found', + 'time' => Carbon::now()->toDateTimeString(), ], 400); } - if($shopping_user->shopping_order){ + if ($shopping_user->shopping_order) { return response()->json([ 'success' => false, - 'message' => 'Order with wp_order_number ' . $request->wp_order_number . ' exists', - 'time' => Carbon::now()->toDateTimeString() + 'message' => 'Order with wp_order_number '.$request->wp_order_number.' exists', + 'time' => Carbon::now()->toDateTimeString(), ], 400); } - if(!is_array($request->wp_order)){ + if (! is_array($request->wp_order)) { $wp_order = json_decode($request->wp_order); - }else{ - $wp_order = $request->wp_order; + } else { + $wp_order = $request->wp_order; } $wp_invoice_path = isset($request->wp_invoice_path) ? $request->wp_invoice_path : null; @@ -370,9 +365,10 @@ class ShoppingUserController extends Controller $wp_order = $this->prepareOrder($wp_order, $shopping_user, $wp_invoice_path, $api_notice); - if ($wp_order){ + if ($wp_order) { $user = $this->prepareForShow($shopping_user); $order = $this->prepareForShowOrder($shopping_user->shopping_order); + return response()->json([ 'success' => true, 'data' => [ @@ -387,166 +383,175 @@ class ShoppingUserController extends Controller 'member_email' => ($shopping_user && $shopping_user->member) ? $shopping_user->member->email : false, 'status' => $shopping_user->getAPIShippedType(), ], - 'time' => Carbon::now()->toDateTimeString() + 'time' => Carbon::now()->toDateTimeString(), ], 200); } + return response()->json([ 'success' => false, - 'message' => 'Order could not be stored' + 'message' => 'Order could not be stored', ], 500); } public function delete(Request $request) - { - $request->validate([ - 'wp_order_number' => 'required|int', - ]); - $shopping_user = ShoppingUser::where('wp_order_number', '=', $request->wp_order_number)->where('mode', '=', 'dev')->first(); - if (!$shopping_user) { - return response()->json([ - 'success' => false, - 'message' => 'Entry with wp_order_number ' . $request->wp_order_number . ' not found or mode != dev', - 'time' => Carbon::now()->toDateTimeString() - ], 400); - } - $shopping_order = $shopping_user->shopping_order; - if($shopping_order){ - foreach ($shopping_order->shopping_order_items as $shopping_order_item){ - $shopping_order_item->delete(); - } - $shopping_order->delete(); - } - $shopping_user->wp_order_number = time(); - $shopping_user->save(); - if ($shopping_user->delete()) { - return response()->json([ - 'success' => true - ]); - } - return response()->json([ - 'success' => false, - 'message' => 'Entry could not be deleted' - ], 500); - } + { + $request->validate([ + 'wp_order_number' => 'required|int', + ]); + $shopping_user = ShoppingUser::where('wp_order_number', '=', $request->wp_order_number)->where('mode', '=', 'dev')->first(); + if (! $shopping_user) { + return response()->json([ + 'success' => false, + 'message' => 'Entry with wp_order_number '.$request->wp_order_number.' not found or mode != dev', + 'time' => Carbon::now()->toDateTimeString(), + ], 400); + } + $shopping_order = $shopping_user->shopping_order; + if ($shopping_order) { + foreach ($shopping_order->shopping_order_items as $shopping_order_item) { + $shopping_order_item->delete(); + } + $shopping_order->delete(); + } + $shopping_user->wp_order_number = time(); + $shopping_user->save(); + if ($shopping_user->delete()) { + return response()->json([ + 'success' => true, + ]); + } - private function prepareForShow($shopping_user){ + return response()->json([ + 'success' => false, + 'message' => 'Entry could not be deleted', + ], 500); + } - if(!$shopping_user){ + private function prepareForShow($shopping_user) + { + + if (! $shopping_user) { return false; } $shopping_user_data = $shopping_user->toArray(); $needs = ['wp_order_number', 'wp_order_date', 'billing_company', 'billing_firstname', 'billing_lastname', 'billing_address', 'billing_address_2', 'billing_zipcode', 'billing_city', 'billing_phone', 'billing_email', 'same_as_billing', 'shipping_company', 'shipping_firstname', 'shipping_lastname', 'shipping_address', 'shipping_address_2', 'shipping_zipcode', 'shipping_city', 'shipping_phone', - 'created_at', 'updated_at', 'user_deleted_at']; //'has_buyed', 'subscribed', + 'created_at', 'updated_at', 'user_deleted_at']; // 'has_buyed', 'subscribed', - //$salutation = array('mr' => 1, 'ms' => 2); + // $salutation = array('mr' => 1, 'ms' => 2); $ret = []; - foreach ($shopping_user_data as $key=>$value){ + foreach ($shopping_user_data as $key => $value) { - if($key === 'billing_country_id'){ + if ($key === 'billing_country_id') { $ret['billing_country_code'] = $shopping_user->billing_country_id ? $shopping_user->billing_country->code : null; } - if($key === 'shipping_country_id'){ + if ($key === 'shipping_country_id') { $ret['shipping_country_code'] = $shopping_user->shipping_country_id ? $shopping_user->shipping_country->code : null; } - if($key === 'billing_salutation'){ + if ($key === 'billing_salutation') { $ret['billing_salutation'] = $shopping_user->billing_salutation === 'ms' ? 2 : 1; } - if($key === 'shipping_salutation'){ + if ($key === 'shipping_salutation') { $ret['shipping_salutation'] = $shopping_user->shipping_salutation === 'ms' ? 2 : 1; } - if(in_array($key, $needs)){ + if (in_array($key, $needs)) { $ret[$key] = $value; } } + return $ret; } - private function prepareForShowOrder($shopping_order){ + private function prepareForShowOrder($shopping_order) + { - if(!$shopping_order){ + if (! $shopping_order) { return false; } $ret = [ 'country' => isset($shopping_order->shipping_country->country->code) ? $shopping_order->shipping_country->country->code : '', 'wp_invoice_path' => $shopping_order->wp_invoice_path, - 'total' => ($shopping_order->total*100), - 'shipping' => ($shopping_order->shipping*100), - 'total_net' => ($shopping_order->subtotal*100), - 'tax_rate' => ($shopping_order->tax_rate*100), - 'tax' => ($shopping_order->tax*100), - 'total_with_shipping' => ($shopping_order->total_shipping*100), + 'total' => ($shopping_order->total * 100), + 'shipping' => ($shopping_order->shipping * 100), + 'total_net' => ($shopping_order->subtotal * 100), + 'tax_rate' => ($shopping_order->tax_rate * 100), + 'tax' => ($shopping_order->tax * 100), + 'total_with_shipping' => ($shopping_order->total_shipping * 100), 'weight' => $shopping_order->weight, ]; $ret['items'] = []; - foreach ($shopping_order->shopping_order_items as $item){ + foreach ($shopping_order->shopping_order_items as $item) { $ret['items'][] = [ - 'article' => $item->product->wp_number, - 'name' => $item->product->getLang('name'), - 'qty' => $item->qty, - 'price' => ($item->price * 100), + 'article' => $item->product->wp_number, + 'name' => $item->product->getLang('name'), + 'qty' => $item->qty, + 'price' => ($item->price * 100), ]; } + return $ret; } - private function prepareForUpdate($data){ + private function prepareForUpdate($data) + { - //$salutation = array(1 => 'mr', 2 => 'ms', 3=>null); + // $salutation = array(1 => 'mr', 2 => 'ms', 3=>null); - if(isset($data['billing_salutation'])){ - $data['billing_salutation'] = (int) $data['billing_salutation']; + if (isset($data['billing_salutation'])) { + $data['billing_salutation'] = (int) $data['billing_salutation']; $data['billing_salutation'] = $data['billing_salutation'] == 2 ? 'ms' : 'mr'; } - if(isset($data['shipping_salutation'])){ - $data['shipping_salutation'] = (int) $data['shipping_salutation']; - $data['shipping_salutation'] = $data['shipping_salutation'] == 2 ? 'ms' : 'mr'; + if (isset($data['shipping_salutation'])) { + $data['shipping_salutation'] = (int) $data['shipping_salutation']; + $data['shipping_salutation'] = $data['shipping_salutation'] == 2 ? 'ms' : 'mr'; } $ret = []; - $needs = [ 'billing_salutation', 'billing_company', 'billing_firstname', 'billing_lastname', 'billing_address', 'billing_address_2', 'billing_zipcode', 'billing_city', 'billing_phone', 'billing_email', 'same_as_billing', + $needs = ['billing_salutation', 'billing_company', 'billing_firstname', 'billing_lastname', 'billing_address', 'billing_address_2', 'billing_zipcode', 'billing_city', 'billing_phone', 'billing_email', 'same_as_billing', 'shipping_salutation', 'shipping_company', 'shipping_firstname', 'shipping_lastname', 'shipping_address', 'shipping_address_2', 'shipping_zipcode', 'shipping_city', 'shipping_phone']; - foreach ($data as $key=>$value){ - if($key === 'billing_country_code' && isset($data['billing_country_code'])) { - $ret['billing_country_id'] = Country::getCountryIdByCodeOrOne($data['billing_country_code']); + foreach ($data as $key => $value) { + if ($key === 'billing_country_code' && isset($data['billing_country_code'])) { + $ret['billing_country_id'] = Country::getCountryIdByCodeOrOne($data['billing_country_code']); } - if($key === 'shipping_country_code' && isset($data['shipping_country_code']) ) { + if ($key === 'shipping_country_code' && isset($data['shipping_country_code'])) { $ret['shipping_country_id'] = Country::getCountryIdByCodeOrOne($data['shipping_country_code']); } - if($key === 'billing_phone') { + if ($key === 'billing_phone') { $ret['billing_phone'] = strlen($data['billing_phone']) <= 3 ? '' : $data['billing_phone']; } - if($key === 'shipping_phone') { + if ($key === 'shipping_phone') { $ret['shipping_phone'] = strlen($data['shipping_phone']) <= 3 ? '' : $data['shipping_phone']; } - if(in_array($key, $needs)){ + if (in_array($key, $needs)) { $ret[$key] = $value; } } + return $ret; } - private function prepareForStore($data){ + private function prepareForStore($data) + { - //$salutation = array(1 => 'mr', 2 => 'ms', 3=>null); - if(isset($data['billing_salutation'])){ - $data['billing_salutation'] = (int) $data['billing_salutation']; + // $salutation = array(1 => 'mr', 2 => 'ms', 3=>null); + if (isset($data['billing_salutation'])) { + $data['billing_salutation'] = (int) $data['billing_salutation']; $data['billing_salutation'] = $data['billing_salutation'] == 2 ? 'ms' : 'mr'; } - if(isset($data['shipping_salutation'])){ - $data['shipping_salutation'] = (int) $data['shipping_salutation']; - $data['shipping_salutation'] = $data['shipping_salutation'] == 2 ? 'ms' : 'mr'; + if (isset($data['shipping_salutation'])) { + $data['shipping_salutation'] = (int) $data['shipping_salutation']; + $data['shipping_salutation'] = $data['shipping_salutation'] == 2 ? 'ms' : 'mr'; } $ret = []; - $needs = [ 'billing_salutation', 'billing_company', 'billing_firstname', 'billing_lastname', 'billing_address', 'billing_address_2', 'billing_zipcode', 'billing_city', 'billing_country_id', 'billing_phone', 'billing_email', + $needs = ['billing_salutation', 'billing_company', 'billing_firstname', 'billing_lastname', 'billing_address', 'billing_address_2', 'billing_zipcode', 'billing_city', 'billing_country_id', 'billing_phone', 'billing_email', 'shipping_salutation', 'shipping_company', 'shipping_firstname', 'shipping_lastname', 'shipping_address', 'shipping_address_2', 'shipping_zipcode', 'shipping_city', 'shipping_country_id', 'shipping_phone', - 'same_as_billing', //'has_buyed', 'subscribed', + 'same_as_billing', // 'has_buyed', 'subscribed', 'wp_order_number', 'wp_order_date']; - foreach ($needs as $need){ + foreach ($needs as $need) { $ret[$need] = isset($data[$need]) ? $data[$need] : null; if ($need === 'billing_country_id') { @@ -565,35 +570,37 @@ class ShoppingUserController extends Controller $ret['wp_order_date'] = Carbon::parse($ret['wp_order_date'])->toDateTimeString(); } if ($need === 'same_as_billing') { - $ret['same_as_billing'] = isset($data['same_as_billing']) ? $data['same_as_billing'] : true; + $ret['same_as_billing'] = isset($data['same_as_billing']) ? $data['same_as_billing'] : true; } } $ret['has_buyed'] = true; $ret['subscribed'] = false; + return $ret; } - private function prepareOrder($wp_shopping_order, $shopping_user, $wp_invoice_path, $api_notice){ + private function prepareOrder($wp_shopping_order, $shopping_user, $wp_invoice_path, $api_notice) + { Yard::instance('shopping')->destroy(); $ret = []; - if(is_array($wp_shopping_order)){ + if (is_array($wp_shopping_order)) { foreach ($wp_shopping_order as $order) { - //$object = json_decode(json_encode($order), FALSE); + // $object = json_decode(json_encode($order), FALSE); $order = (object) $order; $error = []; - if (!isset($order->article) || !isset($order->qty) || !isset($order->price)) { - $error[] = "article parameter is missing"; + if (! isset($order->article) || ! isset($order->qty) || ! isset($order->price)) { + $error[] = 'article parameter is missing'; } else { $product = Product::whereWpNumber($order->article)->first(); - if (!$product) { - $error[] = "article not found"; + if (! $product) { + $error[] = 'article not found'; } else { if ($order->price != ($product->price * 100)) { - $error[] = "different price: " . ($product->price * 100); + $error[] = 'different price: '.($product->price * 100); } - $cartItem = Yard::instance('shopping')->add($product->id, $product->getLang('name'), (int) $order->qty, $product->price, false, false, ['image' => [], 'slug' => $product->slug, 'weight' => $product->weight, 'points' => $product->points, 'no_commission' => $product->no_commission, 'show_on' => $product->show_on]); + $cartItem = Yard::instance('shopping')->add($product->id, $product->getLang('name'), (int) $order->qty, $product->price, false, false, ['image' => [], 'slug' => $product->slug, 'weight' => $product->weight, 'points' => $product->points, 'no_commission' => $product->no_commission, 'no_free_shipping' => $product->no_free_shipping, 'show_on' => $product->show_on]); Yard::setTax($cartItem->rowId, $product->getTaxWith()); } } @@ -602,7 +609,7 @@ class ShoppingUserController extends Controller } $ShippingCountry = ShippingCountry::whereCountryId($shopping_user->shipping_country_id)->first(); - if($ShippingCountry){ + if ($ShippingCountry) { Yard::instance('shopping')->setShippingCountryWithPrice($ShippingCountry->id); } $shopping_order = $this->makeShoppingOrder($shopping_user, $wp_invoice_path, $api_notice); @@ -611,11 +618,13 @@ class ShoppingUserController extends Controller $shopping_user->shopping_order = $shopping_order; Yard::instance('shopping')->destroy(); } + return $ret; } - private function makeShoppingOrder($shopping_user, $wp_invoice_path, $api_notice){ - + private function makeShoppingOrder($shopping_user, $wp_invoice_path, $api_notice) + { + $data = [ 'shopping_user_id' => $shopping_user->id, 'auth_user_id' => $shopping_user->auth_user_id, @@ -641,23 +650,22 @@ class ShoppingUserController extends Controller 'mode' => $shopping_user->mode, ]; $shopping_order = $shopping_user->shopping_order; - if($shopping_order){ + if ($shopping_order) { $shopping_order->fill($data); $shopping_order->save(); - }else{ - $shopping_order= ShoppingOrder::create($data); + } else { + $shopping_order = ShoppingOrder::create($data); } $items = Yard::instance('shopping')->content(); - - $shopping_order->shopping_order_items()->each(function($model) use ($items, $shopping_order) { + $shopping_order->shopping_order_items()->each(function ($model) use ($items, $shopping_order) { foreach ($items as $item) { $price_net = Yard::instance('shopping')->rowPriceNet($item, 2, '.', ''); $tax = $item->price - $price_net; if ($model->row_id === $item->rowId) { $model->fill([ 'shopping_order_id' => $shopping_order->id, - 'row_id' => $item->rowId, + 'row_id' => $item->rowId, 'product_id' => $item->id, 'qty' => $item->qty, 'price' => $item->price, @@ -669,20 +677,21 @@ class ShoppingUserController extends Controller 'points' => $item->options->points, 'slug' => $item->options->slug, ])->save(); + return false; } } + return $model->delete(); }); - foreach ($items as $item) { - if (!ShoppingOrderItem::where('shopping_order_id', $shopping_order->id)->where('row_id', $item->rowId)->count()){ + if (! ShoppingOrderItem::where('shopping_order_id', $shopping_order->id)->where('row_id', $item->rowId)->count()) { $price_net = Yard::instance('shopping')->rowPriceNet($item, 2, '.', ''); $tax = $item->price - $price_net; ShoppingOrderItem::create([ 'shopping_order_id' => $shopping_order->id, - 'row_id' => $item->rowId, + 'row_id' => $item->rowId, 'product_id' => $item->id, 'qty' => $item->qty, 'price' => $item->price, @@ -692,27 +701,27 @@ class ShoppingUserController extends Controller 'price_vk_net' => $shopping_order->getPriceVkNetBy($item->id), 'discount' => $item->options->no_commission ? 0 : $shopping_order->getUserDiscount(), 'points' => $item->options->points, - 'slug' => $item->options->slug + 'slug' => $item->options->slug, ]); } - + } $shopping_order->makeTaxSplit(); + return $shopping_order; } - - public function orderStatusSendMail(ShoppingOrder $shopping_order){ + public function orderStatusSendMail(ShoppingOrder $shopping_order) + { $bcc = []; $user_mail = $shopping_order->shopping_user->member->email; - if($shopping_order->mode === 'dev'){ + if ($shopping_order->mode === 'dev') { $bcc[] = config('app.checkout_test_mail'); - }else{ + } else { $bcc[] = config('app.checkout_mail'); } Mail::to($user_mail)->bcc($bcc)->locale($shopping_order->getLocale())->send(new MailCheckout($shopping_order->txaction, $shopping_order, null, false, $shopping_order->mode)); } - -} \ No newline at end of file +} diff --git a/app/Http/Controllers/BusinessPointsController.php b/app/Http/Controllers/BusinessPointsController.php index 7bc12bd..169c468 100644 --- a/app/Http/Controllers/BusinessPointsController.php +++ b/app/Http/Controllers/BusinessPointsController.php @@ -1,19 +1,14 @@ middleware('admin'); @@ -26,7 +21,6 @@ class BusinessPointsController extends Controller ->groupBy('user_id')->join('user_accounts', 'account_id', '=', 'user_accounts.id') ->select('users.id', 'users.email', 'user_accounts.first_name', 'user_accounts.last_name')->get(); - $this->setFilterVars(); $data = [ 'filter_months' => HTMLHelper::getTransMonths(), @@ -34,37 +28,40 @@ class BusinessPointsController extends Controller 'filter_members' => $filter_members, 'filter_status_types' => UserSalesVolume::getTransStatusType(), - ]; + return view('admin.business.points', $data); } public function store() { $data = Request::all(); - if (!isset($data['action'])) { + if (! isset($data['action'])) { return back(); } - if (!isset($data['change_member_key']) || $data['change_member_key'] !== config('mivita.edit_data_pass')) { + if (! isset($data['change_member_key']) || $data['change_member_key'] !== config('mivita.edit_data_pass')) { \Session()->flash('alert-error', 'Das Passwort ist falsch.'); + return back(); } - if (!isset($data['is_checked_action'])) { + if (! isset($data['is_checked_action'])) { \Session()->flash('alert-error', 'Änderung nicht bestätigt'); + return back(); } if ($data['action'] === 'add_user_sales_volume') { SalesPointsVolume::addSalesPointsVolume($data); + return back(); } if ($data['action'] === 'edit_user_sales_volume') { SalesPointsVolume::editSalesPointsVolume($data); + return back(); } - return redirect(route('admin_business_points')); } @@ -74,34 +71,35 @@ class BusinessPointsController extends Controller $month = Request::get('points_filter_month'); $year = Request::get('points_filter_year'); - if (!$user_id) { + if (! $user_id) { \Session()->flash('alert-error', 'Kein Berater ausgewählt.'); + return back(); } - if (!$month || !$year) { + if (! $month || ! $year) { \Session()->flash('alert-error', 'Monat und Jahr müssen angegeben sein.'); + return back(); } try { SalesPointsVolume::reCalculateSalesPointsVolume($user_id, $month, $year); - \Session()->flash('alert-success', 'Punkte für den ausgewählten Berater im Monat ' . str_pad($month, 2, "0", STR_PAD_LEFT) . '/' . $year . ' wurden erfolgreich neu berechnet.'); + \Session()->flash('alert-success', 'Punkte für den ausgewählten Berater im Monat '.str_pad($month, 2, '0', STR_PAD_LEFT).'/'.$year.' wurden erfolgreich neu berechnet.'); } catch (\Exception $e) { - \Session()->flash('alert-error', 'Fehler bei der Neuberechnung: ' . $e->getMessage()); + \Session()->flash('alert-error', 'Fehler bei der Neuberechnung: '.$e->getMessage()); } return back(); } - private function setFilterVars() { - if (!session('points_filter_month')) { + if (! session('points_filter_month')) { session(['points_filter_month' => intval(date('m'))]); } - if (!session('points_filter_year')) { + if (! session('points_filter_year')) { session(['points_filter_year' => intval(date('Y'))]); } @@ -120,7 +118,7 @@ class BusinessPointsController extends Controller { $this->setFilterVars(); - //$query = UserSalesVolume::with('user', 'user.account')->with('shopping_order')->select('user_sales_volumes.*') + // $query = UserSalesVolume::with('user', 'user.account')->with('shopping_order')->select('user_sales_volumes.*') $query = UserSalesVolume::join('users', 'user_id', '=', 'users.id')->join('user_accounts', 'account_id', '=', 'user_accounts.id') ->select('user_sales_volumes.*', 'users.email', 'user_accounts.m_account', 'user_accounts.first_name', 'user_accounts.last_name') ->where('user_sales_volumes.month', '=', Request::get('points_filter_month')) @@ -132,6 +130,7 @@ class BusinessPointsController extends Controller if (Request::get('points_filter_status_type_id')) { $query->where('user_sales_volumes.status', '=', Request::get('points_filter_status_type_id')); } + return $query; } @@ -141,10 +140,10 @@ class BusinessPointsController extends Controller $month = Request::get('points_filter_month'); $year = Request::get('points_filter_year'); - if (!$user_id || !$month || !$year) { + if (! $user_id || ! $month || ! $year) { return response()->json([ 'success' => false, - 'data' => null + 'data' => null, ]); } @@ -155,10 +154,10 @@ class BusinessPointsController extends Controller ->orderBy('id', 'DESC') ->first(); - if (!$lastEntry) { + if (! $lastEntry) { return response()->json([ 'success' => false, - 'data' => null + 'data' => null, ]); } @@ -173,7 +172,7 @@ class BusinessPointsController extends Controller 'total_KP_points' => ($lastEntry->month_KP_points ?? 0) + ($lastEntry->month_shop_points ?? 0), 'total_TP_points' => ($lastEntry->month_TP_points ?? 0) + ($lastEntry->month_shop_points ?? 0), 'total_net' => ($lastEntry->month_total_net ?? 0) + ($lastEntry->month_shop_total_net ?? 0), - ] + ], ]); } @@ -181,67 +180,80 @@ class BusinessPointsController extends Controller { $query = $this->initSearch(); + return \DataTables::eloquent($query) ->addColumn('id', function (UserSalesVolume $UserSalesVolume) { return ''; + data-route="'.route('modal_load').'">'; }) ->addColumn('order', function (UserSalesVolume $UserSalesVolume) { if ($UserSalesVolume->shopping_order) { + // Status 1 = Beraterbestellung if ($UserSalesVolume->status === 1) { - return '' . $UserSalesVolume->shopping_order->id . ''; + return ''.$UserSalesVolume->shopping_order->id.''; } + // Status 2/3 = Shop-Bestellung if ($UserSalesVolume->status === 2 || $UserSalesVolume->status === 3) { - return '' . $UserSalesVolume->shopping_order->id . ''; + return ''.$UserSalesVolume->shopping_order->id.''; + } + // Status 6 = Storno - Link zur ursprünglichen Bestellung mit Storno-Icon + if ($UserSalesVolume->status === 6) { + // Prüfen ob Berater- oder Shop-Bestellung anhand des payment_for Feldes + $route = ($UserSalesVolume->shopping_order->payment_for === 6 || $UserSalesVolume->shopping_order->payment_for === 7) + ? route('admin_sales_customers_detail', [$UserSalesVolume->shopping_order->id]) + : route('admin_sales_users_detail', [$UserSalesVolume->shopping_order->id]); + + return ' '.$UserSalesVolume->shopping_order->id.''; } } + return ''; }) ->addColumn('points', function (UserSalesVolume $UserSalesVolume) { return formatNumber($UserSalesVolume->points); }) ->addColumn('total_net', function (UserSalesVolume $UserSalesVolume) { - return formatNumber($UserSalesVolume->total_net) . ' €'; + return formatNumber($UserSalesVolume->total_net).' €'; }) ->addColumn('status_turnover', function (UserSalesVolume $UserSalesVolume) { - return '' . $UserSalesVolume->getStatusTurnoverType() . ''; + return ''.$UserSalesVolume->getStatusTurnoverType().''; }) ->addColumn('status', function (UserSalesVolume $UserSalesVolume) { - return '' . $UserSalesVolume->getStatusType() . ''; + return ''.$UserSalesVolume->getStatusType().''; }) ->addColumn('status_points', function (UserSalesVolume $UserSalesVolume) { - return '' . $UserSalesVolume->getStatusPointsType() . ''; + return ''.$UserSalesVolume->getStatusPointsType().''; }) ->addColumn('message', function (UserSalesVolume $UserSalesVolume) { - return '' . $UserSalesVolume->message . ''; + return ''.$UserSalesVolume->message.''; }) ->addColumn('info', function (UserSalesVolume $UserSalesVolume) { - return '' . $UserSalesVolume->info . ''; + return ''.$UserSalesVolume->info.''; }) ->filterColumn('m_account', function ($query, $keyword) { - if ($keyword != "") { - $query->whereRaw("m_account LIKE ?", '%' . $keyword . '%'); + if ($keyword != '') { + $query->whereRaw('m_account LIKE ?', '%'.$keyword.'%'); } }) ->filterColumn('first_name', function ($query, $keyword) { - if ($keyword != "") { - $query->whereRaw("first_name LIKE ?", '%' . $keyword . '%'); + if ($keyword != '') { + $query->whereRaw('first_name LIKE ?', '%'.$keyword.'%'); } }) ->filterColumn('last_name', function ($query, $keyword) { - if ($keyword != "") { - $query->whereRaw("last_name LIKE ?", '%' . $keyword . '%'); + if ($keyword != '') { + $query->whereRaw('last_name LIKE ?', '%'.$keyword.'%'); } }) ->filterColumn('email', function ($query, $keyword) { - if ($keyword != "") { - $query->whereRaw("email LIKE ?", '%' . $keyword . '%'); + if ($keyword != '') { + $query->whereRaw('email LIKE ?', '%'.$keyword.'%'); } }) diff --git a/app/Http/Controllers/DhlShipmentController.php b/app/Http/Controllers/DhlShipmentController.php index d66f226..f97c49c 100644 --- a/app/Http/Controllers/DhlShipmentController.php +++ b/app/Http/Controllers/DhlShipmentController.php @@ -52,7 +52,6 @@ class DhlShipmentController extends Controller // Get DHL configuration with admin settings $settingController = new \App\Http\Controllers\SettingController; $dhlConfig = $settingController->getDhlConfig(); - // Create DhlClient with merged configuration $dhlClient = new \Acme\Dhl\Support\DhlClient( $dhlConfig['base_url'], @@ -67,7 +66,7 @@ class DhlShipmentController extends Controller if ($connectionTest) { $result = [ 'success' => true, - 'message' => 'DHL API Verbindung erfolgreich getestet!', + 'message' => 'DHL API Verbindung erfolgreich getestet! '.config('dhl.config_source').' '.$dhlConfig['base_url'], 'details' => [ 'base_url' => $dhlConfig['base_url'], 'using_admin_config' => ! empty($dhlConfig['api_key']), @@ -88,7 +87,7 @@ class DhlShipmentController extends Controller return response()->json([ 'success' => false, - 'message' => 'DHL API Test fehlgeschlagen: ' . $e->getMessage(), + 'message' => 'DHL API Test fehlgeschlagen: '.$e->getMessage(), ], 500); } } @@ -148,12 +147,13 @@ class DhlShipmentController extends Controller return DataTables::eloquent($query) ->addColumn('checkbox', function ($shipment) { - return ''; + return ''; }) ->editColumn('id', function ($shipment) { $class = $shipment->type === 'return' ? 'text-warning font-weight-bold' : 'text-primary font-weight-semibold'; $icon = $shipment->type === 'return' ? '' : ''; - return '' . $icon . '#' . $shipment->id . ''; + + return ''.$icon.'#'.$shipment->id.''; }) ->addColumn('type', function ($shipment) { if ($shipment->type == 'outbound') { @@ -164,16 +164,16 @@ class DhlShipmentController extends Controller }) ->addColumn('order', function ($shipment) { if ($shipment->order_id) { - return '#' . $shipment->order_id . ''; + return '#'.$shipment->order_id.''; } return 'N/A'; }) ->addColumn('customer', function ($shipment) { - return $shipment->firstname . ' ' . $shipment->lastname; + return $shipment->firstname.' '.$shipment->lastname; }) ->editColumn('dhl_shipment_no', function ($shipment) { - return $shipment->dhl_shipment_no ? '' . e($shipment->dhl_shipment_no) . '' : '-'; + return $shipment->dhl_shipment_no ? ''.e($shipment->dhl_shipment_no).'' : '-'; }) ->addColumn('status', function ($shipment) { $statusMap = [ @@ -186,43 +186,43 @@ class DhlShipmentController extends Controller ]; $statusInfo = $statusMap[$shipment->status] ?? ['class' => 'light', 'text' => e($shipment->status)]; - return '' . $statusInfo['text'] . ''; + return ''.$statusInfo['text'].''; }) ->addColumn('tracking_status', function ($shipment) { if ($shipment->tracking_status) { - return '' . e($shipment->tracking_status) . '' . - ($shipment->last_tracked_at ? '
' . $shipment->last_tracked_at->format('d.m.Y H:i') . '' : ''); + return ''.e($shipment->tracking_status).''. + ($shipment->last_tracked_at ? '
'.$shipment->last_tracked_at->format('d.m.Y H:i').'' : ''); } return '-'; }) ->editColumn('weight_kg', function ($shipment) { - return number_format($shipment->weight_kg, 2) . ' kg'; + return number_format($shipment->weight_kg, 2).' kg'; }) ->editColumn('created_at', function ($shipment) { return $shipment->created_at->format('d.m.Y H:i'); }) ->addColumn('actions', function ($shipment) { $buttons = '
'; - $buttons .= ''; + $buttons .= ''; if ($shipment->label_path) { - $buttons .= ''; + $buttons .= ''; } // Email button if ($shipment->dhl_shipment_no && $shipment->canSendTrackingEmail()) { $emailTitle = $shipment->wasTrackingEmailSent() - ? 'Tracking-E-Mail erneut senden (gesendet: ' . $shipment->tracking_email_sent_at->format('d.m.Y H:i') . ')' + ? 'Tracking-E-Mail erneut senden (gesendet: '.$shipment->tracking_email_sent_at->format('d.m.Y H:i').')' : 'Tracking-E-Mail senden'; $emailClass = $shipment->wasTrackingEmailSent() ? 'btn-success' : 'btn-outline-info'; - $buttons .= ''; + $buttons .= ''; } // Cancel button if ($shipment->canCancel()) { - $buttons .= ''; + $buttons .= ''; } - // Return label button + // Return label button (for outbound shipments without existing return) if ($shipment->type == 'outbound' && ! $shipment->returns()->count()) { - $buttons .= ''; + $buttons .= ''; } $buttons .= '
'; @@ -268,7 +268,7 @@ class DhlShipmentController extends Controller if (! $validationResult['valid']) { return response()->json([ 'success' => false, - 'message' => 'Validierungsfehler: ' . implode(', ', $validationResult['errors']), + 'message' => 'Validierungsfehler: '.implode(', ', $validationResult['errors']), ], 422); } @@ -341,7 +341,7 @@ class DhlShipmentController extends Controller return response()->json([ 'success' => false, - 'message' => 'Fehler beim Erstellen der Sendung: ' . $e->getMessage(), + 'message' => 'Fehler beim Erstellen der Sendung: '.$e->getMessage(), ], 500); } } @@ -351,7 +351,11 @@ class DhlShipmentController extends Controller */ public function show(DhlShipment $shipment): View { - $shipment->load(['shoppingOrder.shopping_user', 'relatedShipment']); + $shipment->load([ + 'shoppingOrder.shopping_user', + 'relatedShipment', + 'trackingEvents' => fn ($q) => $q->orderBy('event_time', 'desc'), + ]); return view('admin.dhl.show', compact('shipment')); } @@ -394,7 +398,7 @@ class DhlShipmentController extends Controller return response()->json([ 'success' => false, - 'message' => 'Fehler beim Stornieren der Sendung: ' . $e->getMessage(), + 'message' => 'Fehler beim Stornieren der Sendung: '.$e->getMessage(), ], 500); } } @@ -426,7 +430,7 @@ class DhlShipmentController extends Controller } // Check DHL_USE_QUEUE configuration - $settingController = new SettingController(); + $settingController = new SettingController; $dhlConfig = $settingController->getDhlConfig(); $useQueue = $dhlConfig['use_queue'] ?? false; @@ -462,11 +466,59 @@ class DhlShipmentController extends Controller return response()->json([ 'success' => false, - 'message' => 'Fehler beim Erstellen des Retourenlabels: ' . $e->getMessage(), + 'message' => 'Fehler beim Erstellen des Retourenlabels: '.$e->getMessage(), ], 500); } } + /** + * Get billing address for return label (used when original delivery was to Packstation) + */ + private function getBillingAddressForReturn($shippingUser, array $recipient): array + { + if (! $shippingUser) { + Log::warning('[DHL Controller] No shipping user found, using recipient data', [ + 'recipient' => $recipient, + ]); + + // Fallback: use recipient data but without Packstation fields + return [ + 'name' => trim(($recipient['firstname'] ?? '').' '.($recipient['lastname'] ?? '')), + 'name2' => $recipient['company'] ?? '', + 'street' => 'Adresse fehlt', + 'houseNumber' => '', + 'postalCode' => $recipient['postalCode'] ?? '', + 'city' => $recipient['city'] ?? '', + 'country' => $recipient['country'] ?? 'DEU', + 'email' => $recipient['email'] ?? '', + 'phone' => $recipient['phone'] ?? '', + ]; + } + + // Parse billing address to extract street and house number + $billingAddress = trim($shippingUser->billing_address ?? ''); + $street = $billingAddress; + $houseNumber = ''; + + // Try to extract house number from address + if (preg_match('/^(.+?)\s+(\d+[a-zA-Z]?[-\/\d]*)$/u', $billingAddress, $matches)) { + $street = trim($matches[1]); + $houseNumber = trim($matches[2]); + } + + return [ + 'name' => trim(($shippingUser->billing_firstname ?? '').' '.($shippingUser->billing_lastname ?? '')), + 'name2' => $shippingUser->billing_company ?? '', + 'street' => $street, + 'houseNumber' => $houseNumber, + 'postalCode' => $shippingUser->billing_zipcode ?? '', + 'city' => $shippingUser->billing_city ?? '', + 'country' => $shippingUser->billing_country?->code ?? 'DEU', + 'email' => $shippingUser->billing_email ?? '', + 'phone' => $shippingUser->billing_phone ?? '', + ]; + } + /** * Create return label synchronously */ @@ -478,7 +530,7 @@ class DhlShipmentController extends Controller ]); // Get DHL configuration - $settingController = new SettingController(); + $settingController = new SettingController; $dhlConfig = $settingController->getDhlConfig(); // Initialize DHL client @@ -496,15 +548,22 @@ class DhlShipmentController extends Controller $order = $shipment->shoppingOrder; $recipient = $shipment->recipient ?? []; - $returnData = [ - 'order_id' => $order->id, - 'original_shipment_id' => $shipment->id, - 'weight_kg' => $shipment->weight_kg, - 'label_format' => $shipment->label_format ?? 'PDF', + // Check if this is a Packstation delivery - use billing address as return sender + $hasPostNumber = ! empty($recipient['postnumber'] ?? $recipient['postNumber'] ?? ''); - // Shipper: Customer sends back to us (swap addresses) - 'shipper' => [ - 'name' => trim(($recipient['firstname'] ?? '') . ' ' . ($recipient['lastname'] ?? '')), + if ($hasPostNumber) { + Log::info('[DHL Controller] Packstation detected - using billing address for return sender', [ + 'shipment_id' => $shipment->id, + 'order_id' => $order->id, + ]); + + // Load billing address from order + $shippingUser = $order->shopping_user; + $shipperAddress = $this->getBillingAddressForReturn($shippingUser, $recipient); + } else { + // Use original recipient address (normal delivery) + $shipperAddress = [ + 'name' => trim(($recipient['firstname'] ?? '').' '.($recipient['lastname'] ?? '')), 'name2' => $recipient['company'] ?? '', 'street' => $recipient['street'] ?? '', 'houseNumber' => $recipient['houseNumber'] ?? '', @@ -513,7 +572,17 @@ class DhlShipmentController extends Controller 'country' => $recipient['country'] ?? 'DEU', 'email' => $recipient['email'] ?? '', 'phone' => $recipient['phone'] ?? '', - ], + ]; + } + + $returnData = [ + 'order_id' => $order->id, + 'original_shipment_id' => $shipment->id, + 'weight_kg' => $shipment->weight_kg, + 'label_format' => $shipment->label_format ?? 'PDF', + + // Shipper: Customer sends back to us (using billing address for Packstation) + 'shipper' => $shipperAddress, // Consignee: Our warehouse 'consignee' => [ @@ -551,7 +620,7 @@ class DhlShipmentController extends Controller return [ 'success' => false, - 'message' => 'Fehler beim Erstellen des Retourenlabels: ' . $e->getMessage(), + 'message' => 'Fehler beim Erstellen des Retourenlabels: '.$e->getMessage(), ]; } } @@ -589,7 +658,7 @@ class DhlShipmentController extends Controller return response()->json([ 'success' => false, - 'message' => 'Fehler beim Aktualisieren der Tracking-Informationen: ' . $e->getMessage(), + 'message' => 'Fehler beim Aktualisieren der Tracking-Informationen: '.$e->getMessage(), ], 500); } } @@ -679,7 +748,7 @@ class DhlShipmentController extends Controller return response()->json([ 'success' => false, - 'message' => 'Fehler beim Senden der Tracking-E-Mail: ' . $e->getMessage(), + 'message' => 'Fehler beim Senden der Tracking-E-Mail: '.$e->getMessage(), ], 500); } } @@ -721,7 +790,7 @@ class DhlShipmentController extends Controller private function generateLabelFilename(DhlShipment $shipment): string { // Load order with customer data - $customerName = $shipment->firstname . '_' . $shipment->lastname; + $customerName = $shipment->firstname.'_'.$shipment->lastname; if ($shipment->company) { $customerName = $shipment->company; } @@ -747,7 +816,7 @@ class DhlShipmentController extends Controller // Ensure filename is not too long (max 255 characters) if (strlen($filename) > 255) { - $maxCustomerLength = 255 - strlen('DHL--' . $shipmentNumber . '-' . $date . '.pdf'); + $maxCustomerLength = 255 - strlen('DHL--'.$shipmentNumber.'-'.$date.'.pdf'); $customerName = substr($customerName, 0, max(10, $maxCustomerLength)); $filename = sprintf( 'DHL-%s-%s-%s.pdf', @@ -802,7 +871,7 @@ class DhlShipmentController extends Controller if ($trackingResult['success']) { $processed++; } else { - $errors[] = "Sendung #{$shipment->id}: " . $trackingResult['message']; + $errors[] = "Sendung #{$shipment->id}: ".$trackingResult['message']; } } else { $errors[] = "Sendung #{$shipment->id} hat keine DHL-Sendungsnummer."; @@ -823,7 +892,7 @@ class DhlShipmentController extends Controller break; } } catch (Exception $e) { - $errors[] = "Fehler bei Sendung {$shipmentId}: " . $e->getMessage(); + $errors[] = "Fehler bei Sendung {$shipmentId}: ".$e->getMessage(); } } @@ -852,7 +921,7 @@ class DhlShipmentController extends Controller return response()->json([ 'success' => false, - 'message' => 'Fehler bei der Stapelverarbeitung: ' . $e->getMessage(), + 'message' => 'Fehler bei der Stapelverarbeitung: '.$e->getMessage(), ], 500); } } @@ -917,8 +986,8 @@ class DhlShipmentController extends Controller { try { $zip = new ZipArchive; - $zipFilename = 'dhl_labels_' . date('Y-m-d_H-i-s') . '.zip'; - $zipPath = storage_path('app/temp/' . $zipFilename); + $zipFilename = 'dhl_labels_'.date('Y-m-d_H-i-s').'.zip'; + $zipPath = storage_path('app/temp/'.$zipFilename); // Ensure temp directory exists if (! file_exists(storage_path('app/temp'))) { @@ -963,7 +1032,7 @@ class DhlShipmentController extends Controller return response()->json([ 'success' => false, - 'message' => 'Fehler beim Erstellen der ZIP-Datei: ' . $e->getMessage(), + 'message' => 'Fehler beim Erstellen der ZIP-Datei: '.$e->getMessage(), ], 500); } } diff --git a/app/Http/Controllers/FileController.php b/app/Http/Controllers/FileController.php index 23b934f..6a4ba26 100644 --- a/app/Http/Controllers/FileController.php +++ b/app/Http/Controllers/FileController.php @@ -2,11 +2,11 @@ namespace App\Http\Controllers; -use Auth; -use Storage; -use Response; use App\Models\UserCredit; use App\Repositories\CreditRepository; +use Auth; +use Response; +use Storage; class FileController extends Controller { @@ -19,16 +19,37 @@ class FileController extends Controller private function isPermissionShoppingOrder($shopping_order) { - $user_id = $shopping_order->auth_user_id ? $shopping_order->auth_user_id : $shopping_order->member_id; - if (Auth::user()->isAdmin() || $user_id == Auth::user()->id) { - return true; + // Portal-Kunden (auth:customers) – Prüfung über shopping_user (billing_email + member_id) + if (Auth::guard('customers')->check()) { + $customer = Auth::guard('customers')->user(); + if ($customer->shopping_user_id) { + $member = $customer->shoppingUser; + if ($member && $shopping_order->shopping_user) { + $orderUser = $shopping_order->shopping_user; + if ( + $orderUser->billing_email === $member->billing_email + && $orderUser->member_id === $member->member_id + ) { + return true; + } + } + } } + + // Admin / Berater (auth:user) + if (Auth::check()) { + $user_id = $shopping_order->auth_user_id ?: $shopping_order->member_id; + if (Auth::user()->isAdmin() || $user_id == Auth::user()->id) { + return true; + } + } + abort(404); } private function isPermissionUserCredit($user_credit) { - if (Auth::user()->isAdmin() || $user_credit->user_id == Auth::user()->id) { + if (Auth::user()->isAdmin() || $user_credit->user_id == Auth::user()->id) { return true; } abort(404); @@ -39,16 +60,15 @@ class FileController extends Controller if (Auth::check()) { return true; } - abort(403, "Nicht autorisiert"); + abort(403, 'Nicht autorisiert'); } - public function show($id = null, $from = null, $do = 'file') + public function show($id = null, $from = null, $do = 'file', $locale = null) { - $path = ""; - $filename = ""; - $disk = "public"; - + $path = ''; + $filename = ''; + $disk = 'public'; /*if($disk === 'user'){ $file = \App\Models\File::findOrFail($id); $this->isPermission($file->user_id); @@ -62,9 +82,15 @@ class FileController extends Controller if ($shopping_order->user_invoice) { $this->isPermissionShoppingOrder($shopping_order); $user_invoice = $shopping_order->user_invoice; - $filename = $user_invoice->filename; $disk = $user_invoice->disk; - $path = $user_invoice->getDownloadPath(); + // Lokalisierte Version wenn angegeben + if ($locale && $locale !== 'de') { + $filename = $user_invoice->getFilenameLocale($locale); + $path = $user_invoice->getDownloadPathLocale($locale); + } else { + $filename = $user_invoice->filename; + $path = $user_invoice->getDownloadPath(); + } } } @@ -73,18 +99,65 @@ class FileController extends Controller if ($shopping_order->user_invoice) { $this->isPermissionShoppingOrder($shopping_order); $user_invoice = $shopping_order->user_invoice; - $filename = $user_invoice->delivery_filename; $disk = $user_invoice->disk; - $path = $user_invoice->getDownloadPathDelivery(); + // Lokalisierte Version wenn angegeben + if ($locale && $locale !== 'de') { + $filename = $user_invoice->getFilenameLocale($locale); + // Für Lieferschein den lokalisierten Pfad ermitteln + $localizedDeliveryFilename = str_replace('.pdf', '-'.$locale.'.pdf', $user_invoice->delivery_filename); + $localizedPath = $user_invoice->delivery_dir.$localizedDeliveryFilename; + if (Storage::disk($disk)->exists($localizedPath)) { + $filename = $localizedDeliveryFilename; + $path = $localizedPath; + } else { + $filename = $user_invoice->delivery_filename; + $path = $user_invoice->getDownloadPathDelivery(); + } + } else { + $filename = $user_invoice->delivery_filename; + $path = $user_invoice->getDownloadPathDelivery(); + } + } + } + + if ($from === 'cancellation') { + $shopping_order = \App\Models\ShoppingOrder::findOrFail($id); + $this->isPermissionShoppingOrder($shopping_order); + + // Stornorechnung finden: cancellation=true UND cancellation_id=null + // (Die Original-Rechnung hat auch cancellation=true, aber MIT cancellation_id) + $cancellation_invoice = \App\Models\UserInvoice::where('shopping_order_id', $shopping_order->id) + ->where('cancellation', true) + ->whereNull('cancellation_id') + ->first(); + + if ($cancellation_invoice) { + $disk = $cancellation_invoice->disk; + // Lokalisierte Version wenn angegeben + if ($locale && $locale !== 'de') { + $filename = $cancellation_invoice->getFilenameLocale($locale); + $path = $cancellation_invoice->getDownloadPathLocale($locale); + } else { + $filename = $cancellation_invoice->filename; + $path = $cancellation_invoice->getDownloadPath(); + } + } else { + return Response::make('Stornorechnung nicht gefunden.', 404); } } if ($from === 'credit') { $user_credit = \App\Models\UserCredit::findOrFail($id); $this->isPermissionUserCredit($user_credit); - $filename = $user_credit->filename; $disk = $user_credit->disk; - $path = $user_credit->getDownloadPath(); + // Lokalisierte Version wenn angegeben + if ($locale && $locale !== 'de') { + $filename = $user_credit->getFilenameLocale($locale); + $path = $user_credit->getDownloadPathLocale($locale); + } else { + $filename = $user_credit->filename; + $path = $user_credit->getDownloadPath(); + } } if ($from === 'credit_detail') { @@ -93,15 +166,13 @@ class FileController extends Controller return $this->create_credit_detail($user_credit, $do); - - /* - $filename = $user_credit->filename; - $disk = $user_credit->disk; - $path = $user_credit->getDownloadPath(); + /* + $filename = $user_credit->filename; + $disk = $user_credit->disk; + $path = $user_credit->getDownloadPath(); */ } - if ($from === 'dc_file') { // $this->isPermissionAuth(); $dc_file = \App\Models\DcFile::findOrFail($id); @@ -125,9 +196,14 @@ class FileController extends Controller $path = $dc_file->getBig(); } + if ($from === 'user') { + $file = \App\Models\File::findOrFail($id); + $filename = $file->filename; + $disk = 'user'; + $path = $file->dir.$file->filename; + } - - if (!Storage::disk($disk)->exists($path)) { + if (! Storage::disk($disk)->exists($path)) { return Response::make('Datei nicht gefunden.', 404); } @@ -137,7 +213,6 @@ class FileController extends Controller $file = Storage::disk($disk)->get($path); $mime = Storage::disk($disk)->mimeType($path); - if (isset($file)) { if ($do === 'stream') { return Storage::disk($disk)->response($path, $filename); @@ -145,22 +220,22 @@ class FileController extends Controller if ($do === 'file') { return Response::make($file, 200) - ->header("Content-Type", $mime) - ->header("Content-Length", strlen($file)) - ->header('Content-disposition', 'filename="' . $filename . '"'); + ->header('Content-Type', $mime) + ->header('Content-Length', strlen($file)) + ->header('Content-disposition', 'filename="'.$filename.'"'); } if ($do === 'image') { return Response::make($file, 200) - ->header("Content-Type", $mime); + ->header('Content-Type', $mime); } if ($do === 'pdf') { - $path = storage_path() . '/app/public/' . $path; + $path = storage_path().'/app/public/'.$path; - $headers = array( - 'Content-Type:' . $mime, + $headers = [ + 'Content-Type:'.$mime, // 'Content-Length: ' . $file->size // 'Content-Disposition: ' . $stream . '; filename=' . $file->original_name - ); + ]; return Response::download($path, $filename, $headers); } @@ -171,8 +246,9 @@ class FileController extends Controller { $credit_repo = new CreditRepository($user_credit->user); + return $credit_repo->create_report($user_credit, $do); - //\Session()->flash('alert-success', "Gutschrift erstellt"); + // \Session()->flash('alert-success', "Gutschrift erstellt"); } } diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index b6b0de8..13ad310 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -4,9 +4,8 @@ namespace App\Http\Controllers; use App\Models\ShoppingPayment; use App\User; -use Illuminate\Support\Facades\Auth; use Carbon\Carbon; -use Config; +use Illuminate\Support\Facades\Auth; use Request; use Util; @@ -19,20 +18,28 @@ class HomeController extends Controller */ public function __construct() {} - public function index() { - if (!Auth::check()) { + if (! Auth::check()) { return redirect('login'); } + return redirect('home'); } - //login / Dashboard + public function newsArchive(): \Illuminate\View\View + { + return view('dashboard.news_archive', [ + 'currentNews' => \App\Models\DashboardNews::getActiveNews(), + 'archiveNews' => \App\Models\DashboardNews::getArchiveNews(), + ]); + } + + // login / Dashboard public function show() { - if (!Auth::check()) { + if (! Auth::check()) { return redirect('login'); } @@ -41,17 +48,17 @@ class HomeController extends Controller 'now' => Carbon::now(), 'dashboardNews' => \App\Models\DashboardNews::getActiveNews(), ]; + return view('home', $data); } - public function loadingModal() { $data = Request::get('data'); $target = Request::get('target'); - $response = ""; - if ($data === "data_protection") { + $response = ''; + if ($data === 'data_protection') { $data = [ 'modal' => true, 'user_shop' => true, @@ -59,21 +66,21 @@ class HomeController extends Controller ]; $response = view('legal.data_protect_de', $data)->render(); } - if ($data === "imprint") { + if ($data === 'imprint') { $data = [ 'modal' => true, 'user_shop' => Util::getUserShop(), ]; $response = view('legal.imprint_de', $data)->render(); } - if ($data === "shop_term_of_use") { + if ($data === 'shop_term_of_use') { $data = [ 'modal' => true, 'user_shop' => Util::getUserShop(), ]; $response = view('legal.shop_term_of_use_de', $data)->render(); } - if ($data === "agb") { + if ($data === 'agb') { $data = [ 'modal' => true, 'user_shop' => Util::getUserShop(), @@ -81,7 +88,7 @@ class HomeController extends Controller $response = view('legal.agb_de', $data)->render(); } if (Request::ajax()) { - return response()->json(['response' => $response, 'target' => $target]); + return response()->json(['response' => $response, 'target' => $target]); } abort(404); } @@ -154,6 +161,7 @@ class HomeController extends Controller 'isMivitaShop' => Util::isMivitaShop(), 'yard_instance' => 'webshop', ]; + return view('legal.data_protected', $data); } @@ -166,6 +174,7 @@ class HomeController extends Controller 'yard_instance' => 'webshop', ]; + return view('legal.agb', $data); } @@ -177,6 +186,7 @@ class HomeController extends Controller 'user_shop' => Util::getUserShop(), 'yard_instance' => 'webshop', ]; + return view('legal.imprint', $data); } @@ -195,19 +205,20 @@ class HomeController extends Controller $user->confirmed = 1; $user->confirmation_date = now(); $user_auto_login = true; - //nur bei der ersten Verifizierung den user auto login + // nur bei der ersten Verifizierung den user auto login } - //wird nun in WizardController::releaseAccount() auf null gesetzt - //$user->confirmation_code = null; - //$user->confirmation_code_to = null; - //$user->confirmation_code_remider = 0; + // wird nun in WizardController::releaseAccount() auf null gesetzt + // $user->confirmation_code = null; + // $user->confirmation_code_to = null; + // $user->confirmation_code_remider = 0; $user->save(); - //Login! + // Login! if ($user_auto_login) { Auth::login($user); } $url = Util::getMyMivitaUrl(); + return redirect($url); } @@ -215,20 +226,22 @@ class HomeController extends Controller { return view('status.status_register'); } + public function statusVerify() { return view('status.status_verify'); } + public function statusError() { return view('status.status_error'); } + public function notFound() { return view('status.not_found'); } - /** * @return string */ @@ -236,7 +249,7 @@ class HomeController extends Controller { $data = Request::all(); - if ($data['user_id'] === "new") { + if ($data['user_id'] === 'new') { if (User::where('email', $data['email'])->count()) { return json_encode(false); } @@ -245,6 +258,7 @@ class HomeController extends Controller return json_encode(false); } } + return json_encode(true); } @@ -253,21 +267,23 @@ class HomeController extends Controller return view('status.user_blocked'); } - public function backToShop($reference = "") + public function backToShop($reference = '') { if ($reference) { $ShoppingPayment = ShoppingPayment::where('reference', $reference)->first(); if ($ShoppingPayment && $ShoppingPayment->status === 'success') { $user = Auth::user(); - //is form wizard create payment + // is form wizard create payment if ($user && ($user->wizard == 13 || $user->wizard == 20)) { - $user->wizard = 15; //realese Payments + $user->wizard = 15; // realese Payments $user->save(); + return redirect(route('wizard_create', [15])); } } else { \Session()->flash('alert-error', __('msg.error_occurred_with_order')); + return redirect(url('/')); } } diff --git a/app/Http/Controllers/LeadController.php b/app/Http/Controllers/LeadController.php index addb23b..d26a9a6 100644 --- a/app/Http/Controllers/LeadController.php +++ b/app/Http/Controllers/LeadController.php @@ -2,21 +2,23 @@ namespace App\Http\Controllers; -use Request; -use App\User; -use Validator; -use App\Services\SysLog; -use App\Models\UserAccount; -use App\Models\UserHistory; -use App\Services\HTMLHelper; -use App\Services\UserService; use App\Mail\MailAccountActive; use App\Mail\MailCustomMessage; use App\Mail\MailVerifyAccount; use App\Mail\MailVerifyContact; -use App\Repositories\UserRepository; -use Illuminate\Support\Facades\Mail; +use App\Models\File; +use App\Models\UserAccount; +use App\Models\UserHistory; use App\Repositories\ContractPDFRepository; +use App\Repositories\UserRepository; +use App\Services\HTMLHelper; +use App\Services\SysLog; +use App\Services\UserService; +use App\User; +use Auth; +use Illuminate\Support\Facades\Mail; +use Request; +use Validator; class LeadController extends Controller { @@ -34,8 +36,7 @@ class LeadController extends Controller public function index() { - - $filter_sponsor = User::join('user_accounts', 'account_id', '=', 'user_accounts.id')->select('users.id', 'users.email', 'user_accounts.first_name', 'user_accounts.last_name')->where('users.deleted_at', '=', null)->where('users.admin', "<", 4)->get(); + $filter_sponsor = User::join('user_accounts', 'account_id', '=', 'user_accounts.id')->select('users.id', 'users.email', 'user_accounts.first_name', 'user_accounts.last_name')->where('users.deleted_at', '=', null)->where('users.admin', '<', 4)->get(); $this->setFilterVars(); $data = [ @@ -47,7 +48,6 @@ class LeadController extends Controller return view('admin.lead.index', $data); } - private function setFilterVars() { @@ -68,25 +68,22 @@ class LeadController extends Controller }*/ } - - /** - * @param $id * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View */ public function edit($id) { - if ($id === "new") { - $user = new User(); - $user->account = new UserAccount(); + if ($id === 'new') { + $user = new User; + $user->account = new UserAccount; $user->account->same_as_billing = 1; $user->account->country_id = 1; $user->account->shipping_country_id = 1; - $user->id = "new"; + $user->id = 'new'; } else { $user = User::withTrashed()->findOrFail($id); - if (!$user->account) { - $user->account = new UserAccount(); + if (! $user->account) { + $user->account = new UserAccount; } } $data = [ @@ -96,11 +93,11 @@ class LeadController extends Controller 'm_data_load' => false, 'm_data_error' => false, ]; + return view('admin.lead.edit', $data); } /** - * @param $id * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View */ public function editPost($id) @@ -108,23 +105,23 @@ class LeadController extends Controller $m_data_load = false; $m_data_error = false; $data = Request::all(); - if (!isset($data['edit_m_data_key']) || $data['edit_m_data_key'] !== config('mivita.edit_data_pass')) { - $m_data_error = "Das Passwort ist falsch."; + if (! isset($data['edit_m_data_key']) || $data['edit_m_data_key'] !== config('mivita.edit_data_pass')) { + $m_data_error = 'Das Passwort ist falsch.'; } else { $m_data_load = true; } - if ($id === "new") { - $user = new User(); - $user->account = new UserAccount(); + if ($id === 'new') { + $user = new User; + $user->account = new UserAccount; $user->account->same_as_billing = 1; $user->account->country_id = 1; $user->account->shipping_country_id = 1; - $user->id = "new"; + $user->id = 'new'; } else { $user = User::withTrashed()->findOrFail($id); - if (!$user->account) { - $user->account = new UserAccount(); + if (! $user->account) { + $user->account = new UserAccount; } } $next_account_id = UserAccount::withTrashed()->max('m_account') + 1; @@ -138,13 +135,13 @@ class LeadController extends Controller 'm_data_load' => $m_data_load, 'm_data_error' => $m_data_error, 'can_change_mail' => true, - 'next_account_id' => $next_account_id + 'next_account_id' => $next_account_id, ]; + return view('admin.lead.edit', $data); } /** - * @param Request $request * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View */ public function store(Request $request) @@ -152,16 +149,27 @@ class LeadController extends Controller $data = Request::all(); $show = Request::get('show'); - if (isset($data['action']) && $data['action'] == "reverse_charge_validate" && isset($data['user_id'])) { + if (! isset($data['user_id'])) { + return redirect()->back()->with('error', 'User ID is required'); + } + if (isset($data['action']) && $data['action'] == 'reverse_charge_validate' && isset($data['user_id'])) { $user = User::findOrFail($data['user_id']); + return $this->userRepo->reverse_charge_validate($data, $user, route('admin_lead_edit', [$user->id])); } - if (isset($data['action']) && $data['action'] == "reverse_charge_delete" && isset($data['user_id'])) { + if (isset($data['action']) && $data['action'] == 'reverse_charge_delete' && isset($data['user_id'])) { $user = User::findOrFail($data['user_id']); + return $this->userRepo->reverse_charge_delete($data, $user, route('admin_lead_edit', [$user->id])); } + if (isset($data['action']) && $data['action'] == 'recreate_contract' && isset($data['user_id'])) { + $user = User::findOrFail($data['user_id']); + $useCurrentDate = isset($data['use_current_date']) && $data['use_current_date'] == '1'; + + return $this->recreateContract($user, $useCurrentDate); + } /* if(isset($data['reverse_charge_validate']) && isset($data['user_id'])){ @@ -171,7 +179,7 @@ class LeadController extends Controller $userRepo = new UserRepository($user); return $userRepo->reverse_charge_validate($data, $user); } - + if(isset($data['reverse_charge_delete']) && isset($data['user_id'])){ $user = User::findOrFail($data['user_id']); $user->wizard = 1; @@ -180,16 +188,16 @@ class LeadController extends Controller return $userRepo->reverse_charge_delete($data, $user); }*/ - if ($data['user_id'] === "new" || $data['user_id'] == 0) { - $rules = array( + if ($data['user_id'] === 'new' || $data['user_id'] == 0) { + $rules = [ 'salutation' => 'required', 'first_name' => 'required', 'last_name' => 'required', 'email' => 'required|string|email|max:255|unique:users', 'email-confirm' => 'required|same:email', - ); + ]; } else { - $rules = array( + $rules = [ 'salutation' => 'required', 'first_name' => 'required', 'last_name' => 'required', @@ -201,15 +209,15 @@ class LeadController extends Controller 'bank_owner' => 'required', 'bank_iban' => 'required', 'bank_bic' => 'required', - ); - if (!Request::get('same_as_billing')) { + ]; + if (! Request::get('same_as_billing')) { $rules = array_merge($rules, [ 'shipping_firstname' => 'required', 'shipping_lastname' => 'required', 'shipping_address' => 'required', 'shipping_zipcode' => 'required', 'shipping_city' => 'required', - 'shipping_salutation' => 'required' + 'shipping_salutation' => 'required', ]); } @@ -217,53 +225,54 @@ class LeadController extends Controller if (isset($data['m_account']) && $data['m_account']) { $user = User::findOrFail($data['user_id']); - $rules['m_account'] = 'unique:user_accounts,m_account,' . $user->account->id . ',id'; + $rules['m_account'] = 'unique:user_accounts,m_account,'.$user->account->id.',id'; } $validator = Validator::make(Request::all(), $rules); if ($validator->fails()) { - if ($data['user_id'] === "new" || $data['user_id'] == 0) { - $user_id = "new"; + if ($data['user_id'] === 'new' || $data['user_id'] == 0) { + $user_id = 'new'; } else { $user = User::findOrFail($data['user_id']); $user_id = $user->id; } - return redirect(route('admin_lead_edit', [$user_id]) . "?show=" . $show)->withErrors($validator)->withRequest(Request::all()); + + return redirect(route('admin_lead_edit', [$user_id]).'?show='.$show)->withErrors($validator)->withRequest(Request::all()); } - if ($data['user_id'] === "new" || $data['user_id'] == 0) { - $user = new User(); - $user->id = "new"; - $user->account = new UserAccount(); + if ($data['user_id'] === 'new' || $data['user_id'] == 0) { + $user = new User; + $user->id = 'new'; + $user->account = new UserAccount; } else { $user = User::findOrFail($data['user_id']); - if (!$user->account) { - $user->account = new UserAccount(); + if (! $user->account) { + $user->account = new UserAccount; } } $this->userRepo->update($data); - if (isset($data['m_data_edit']) && $data['m_data_edit'] === "TSOK") { - //syslog + if (isset($data['m_data_edit']) && $data['m_data_edit'] === 'TSOK') { + // syslog if (isset($data['m_sponsor'])) { if ($user->m_sponsor != $data['m_sponsor']) { - $from_user = isset($user->user_sponsor->email) ? $user->user_sponsor->email : "empty"; + $from_user = isset($user->user_sponsor->email) ? $user->user_sponsor->email : 'empty'; $t_user = User::find($data['m_sponsor']); - $to_user = isset($t_user->email) ? $t_user->email : "empty"; + $to_user = isset($t_user->email) ? $t_user->email : 'empty'; SysLog::action('save-m_sponsor', 'lead_edit_sponsor', 3) ->setUserId(\Auth::user()->id) ->setModel($user->id, User::class) - ->setMessage('Set user new sponsor from: ' . $from_user . " | to: " . $to_user) + ->setMessage('Set user new sponsor from: '.$from_user.' | to: '.$to_user) ->save(); } } $user = $this->userRepo->getModel(); - $user->m_level = isset($data['m_level']) ? $data['m_level'] : NULL; - $user->m_sponsor = isset($data['m_sponsor']) ? $data['m_sponsor'] : NULL; + $user->m_level = isset($data['m_level']) ? $data['m_level'] : null; + $user->m_sponsor = isset($data['m_sponsor']) ? $data['m_sponsor'] : null; $user->save(); } @@ -275,19 +284,22 @@ class LeadController extends Controller $user->lang = $user->getLandByCountry(); $user->confirmation_code = $confirmation_code; - //10 == start wizard form create Lead + // 10 == start wizard form create Lead $user->wizard = 10; $user->save(); Mail::to($user->email)->locale($user->getLocale())->send(new MailVerifyContact($confirmation_code, $user)); \Session()->flash('alert-save', true); + return redirect(route('admin_leads')); } \Session()->flash('alert-save', true); - return redirect(route('admin_lead_edit', [$user->id]) . "?show=" . $show); + + return redirect(route('admin_lead_edit', [$user->id]).'?show='.$show); } - //user released when register is complete + + // user released when register is complete public function released($action, $id) { @@ -295,31 +307,31 @@ class LeadController extends Controller if ($action === 'completed') { $validator = Validator::make(Request::all(), []); - if (!$user->m_sponsor) { + if (! $user->m_sponsor) { $validator->errors()->add('m_sponsor', __('Berater hat keinen Sponsor.')); } - if (!$user->account->m_first_name) { + if (! $user->account->m_first_name) { $validator->errors()->add('m_first_name', __('Berater hat keinen Vornamen.')); } - if (!$user->account->m_last_name) { + if (! $user->account->m_last_name) { $validator->errors()->add('m_last_name', __('Berater hat keinen Nachnamen.')); } - if (!$user->account->m_account) { + if (! $user->account->m_account) { $validator->errors()->add('m_account', __('Berater hat keine Account ID')); } if ($validator->errors()->count()) { return back()->withErrors($validator)->withRequest(Request::all()); } - //create PDF + // create PDF $pdf = new ContractPDFRepository($user); $pdf->_set('disk', 'user'); - $pdf->_set('dir', '/' . $user->id . '/documents/'); + $pdf->_set('dir', '/'.$user->id.'/documents/'); $pdf->_set('user_id', $user->id); $pdf->_set('identifier', 'contract'); $pdf->createContractPDF(); - //set wizard tp payments + // set wizard tp payments $user->wizard = 20; $user->active = 1; $user->active_date = now(); @@ -328,16 +340,15 @@ class LeadController extends Controller $user->confirmation_code_remider = 0; $user->save(); - //mail with code to user? + // mail with code to user? Mail::to($user->email)->locale($user->getLocale())->send(new MailAccountActive($user)); UserHistory::create(['user_id' => $user->id, 'action' => 'released_completed', 'status' => 0]); - \Session()->flash('alert-success', "Berater freigeschaltet!"); + \Session()->flash('alert-success', 'Berater freigeschaltet!'); } if ($action === 'incomplete') { - - //reset release + // reset release $confirmation_code = UserService::createConfirmationCode(); $user->confirmation_code = $confirmation_code; $user->confirmation_code_to = date('Y-m-d H:i:s', strtotime('+1 week')); @@ -356,16 +367,16 @@ class LeadController extends Controller Mail::to($user->email)->locale($user->getLocale())->send(new MailCustomMessage($user, $data, \Auth::user(), true)); } catch (\Exception $e) { dump($e->getMessage()); - dd("error"); + dd('error'); } UserHistory::create(['user_id' => $user->id, 'action' => 'released_incomplete', 'status' => 0]); - \Session()->flash('alert-success', "E-Mail an Berater gesendet."); + \Session()->flash('alert-success', 'E-Mail an Berater gesendet.'); } + return redirect(route('admin_lead_edit', [$user->id])); } - - //send new verfified mail to user + // send new verfified mail to user public function newMailVerified($id) { @@ -381,15 +392,15 @@ class LeadController extends Controller Mail::to($user->email)->locale($user->getLocale())->send(new MailVerifyAccount($confirmation_code, $user)); } catch (\Exception $e) { dump($e->getMessage()); - dd("error"); + dd('error'); } UserHistory::create(['user_id' => $user->id, 'action' => 'new_mail_verified', 'status' => 0]); - \Session()->flash('alert-success', "E-Mail erneut gesendet"); + \Session()->flash('alert-success', 'E-Mail erneut gesendet'); + return redirect(route('admin_lead_edit', [$user->id])); } - public function deleteFile($user_id, $file_id, $relation) { @@ -399,11 +410,12 @@ class LeadController extends Controller if ($file->identifier === 'business_license') { $user->account->setNotice('business_license', ''); } - //remove file - \Storage::disk('user')->delete($file->dir . $file->filename); + // remove file + \Storage::disk('user')->delete($file->dir.$file->filename); $file->delete(); \Session()->flash('alert-success', __('msg.file_deleted')); } + return back(); } @@ -411,22 +423,21 @@ class LeadController extends Controller { $this->setFilterVars(); - //$query = UserSalesVolume::with('user', 'user.account')->with('shopping_order')->select('user_sales_volumes.*') + // $query = UserSalesVolume::with('user', 'user.account')->with('shopping_order')->select('user_sales_volumes.*') - $query = User::with('account')->select('users.*')->where('users.deleted_at', '=', null)->where('users.admin', "<", 5); + $query = User::with('account')->select('users.*')->where('users.deleted_at', '=', null)->where('users.admin', '<', 5); if (Request::get('leads_filter_sponsor_id')) { $query->where('users.m_sponsor', '=', Request::get('leads_filter_sponsor_id')); } + return $query; } - public function getLeads() { $query = $this->initSearch(); - return \DataTables::eloquent($query) ->addColumn('first_name', function (User $user) { return $user->account ? $user->account->first_name : ''; @@ -435,14 +446,14 @@ class LeadController extends Controller return $user->account ? $user->account->last_name : ''; }) ->addColumn('user_level', function (User $user) { - return $user->user_level ? '' . $user->user_level->name . '' : ''; + return $user->user_level ? ''.$user->user_level->name.'' : ''; }) ->addColumn('user_sponsor', function (User $user) { return $user->user_sponsor ? - '' . $user->user_sponsor->account->first_name . " " . $user->user_sponsor->account->last_name . '' : "-"; + ''.$user->user_sponsor->account->first_name.' '.$user->user_sponsor->account->last_name.'' : '-'; }) ->addColumn('id', function (User $user) { - return ''; + return ''; }) ->addColumn('confirmed', function (User $user) { return $user->confirmed ? '' : ''; @@ -456,54 +467,58 @@ class LeadController extends Controller ->addColumn('useractive', function (User $user) { $date = $user->getActiveDateFormat(); - $link = ''; - return $user->active ? $link . ' ' . $date . '' : $link . ''; + $link = ''; + + return $user->active ? $link.' '.$date.'' : $link.''; }) ->addColumn('payaccount', function (User $user) { $date = $user->getPaymentAccountDateFormat(); - $link = ''; + $link = ''; if ($user->payment_account) { if ($user->isActiveAccount()) { - return $link . ' ' . $date . ''; + return $link.' '.$date.''; } - return $link . ' ' . $date . ''; + + return $link.' '.$date.''; } - return $link . ''; + + return $link.''; }) ->addColumn('payshop', function (User $user) { $date = $user->getPaymentShopDateFormat(); - $link = ''; + $link = ''; if ($user->payment_shop) { if ($user->isActiveShop()) { - return $link . ' ' . $date . ''; + return $link.' '.$date.''; } - return $link . ' ' . $date . ''; - } - return $link . ''; - }) + return $link.' '.$date.''; + } + + return $link.''; + }) ->addColumn('payment_account', function (User $user) { return $user->payment_account ? ' ' : ''; }) ->addColumn('payment_account_date', function (User $user) { - return $user->payment_account ? $user->getPaymentAccountDateFormat(false) : "-"; + return $user->payment_account ? $user->getPaymentAccountDateFormat(false) : '-'; }) ->addColumn('payment_shop', function (User $user) { return $user->payment_shop ? ' ' : ''; }) ->addColumn('payment_shop_date', function (User $user) { - return $user->payment_shop ? $user->getPaymentShopDateFormat(false) : "-"; + return $user->payment_shop ? $user->getPaymentShopDateFormat(false) : '-'; }) ->addColumn('shop_domain', function (User $user) { - return $user->shop ? ' ' . $user->shop->getSubdomain(false) . '' : ''; + return $user->shop ? ' '.$user->shop->getSubdomain(false).'' : ''; }) ->addColumn('turnover', function (User $user) { - return "-"; + return '-'; }) ->addColumn('sales_total', function (User $user) { - return "-"; + return '-'; }) ->orderColumn('id', 'id $1') ->orderColumn('confirmed', 'confirmed $1') @@ -514,4 +529,37 @@ class LeadController extends Controller ->rawColumns(['id', 'user_level', 'user_sponsor', 'confirmed', 'useractive', 'payaccount', 'payshop', 'agreement', 'active', 'payment_account', 'payment_shop', 'shop_domain']) ->make(true); } + + /** + * Erstellt den Beratervertrag neu (überschreibt bestehende Verträge) + * Verwendet für mehrsprachige Verträge + */ + public function recreateContract($user, $useCurrentDate = true) + { + if (! Auth::user()->isAdmin()) { + abort(403, 'Nicht autorisiert'); + } + + // Datum ermitteln + $contractDate = $useCurrentDate ? now() : ($user->active_date ? \Carbon\Carbon::parse($user->active_date) : now()); + + // Alten Vertrag löschen + File::where('user_id', $user->id) + ->where('identifier', 'contract') + ->delete(); + + // Neue Verträge erstellen (DE + Benutzersprache) + $pdf = new ContractPDFRepository($user); + $pdf->_set('disk', 'user'); + $pdf->_set('dir', '/'.$user->id.'/documents/'); + $pdf->_set('user_id', $user->id); + $pdf->_set('identifier', 'contract'); + $pdf->_set('contract_date', $contractDate); + $pdf->createContractPDF(); + + $dateInfo = $useCurrentDate ? 'mit aktuellem Datum' : 'mit bestehendem Datum ('.$contractDate->format('d.m.Y').')'; + \Session()->flash('alert-success', 'Beratervertrag wurde neu erstellt (DE + '.strtoupper($user->account->language ?? 'de').') '.$dateInfo); + + return back(); + } } diff --git a/app/Http/Controllers/ModalController.php b/app/Http/Controllers/ModalController.php index f90b735..cf624ca 100644 --- a/app/Http/Controllers/ModalController.php +++ b/app/Http/Controllers/ModalController.php @@ -2,26 +2,23 @@ namespace App\Http\Controllers; -use Request; -use App\User; -use App\Models\Product; -use App\Models\UserAbo; use App\Models\Homeparty; - -use App\Models\UserLevel; -use App\Models\UserCredit; -use App\Models\ShoppingUser; -use App\Services\HTMLHelper; use App\Models\HomepartyUser; +use App\Models\Product; use App\Models\ShoppingOrder; +use App\Models\ShoppingUser; +use App\Models\UserAbo; +use App\Models\UserCredit; +use App\Models\UserLevel; use App\Models\UserSalesVolume; use App\Services\BusinessPlan\TreeCalcBot; use App\Services\BusinessPlan\TreeCalcBotOptimized; use App\Services\DhlModalService; +use App\User; +use Request; class ModalController extends Controller { - public function __construct() { $this->middleware('auth'); @@ -30,21 +27,21 @@ class ModalController extends Controller public function load() { $data = Request::all(); - $ret = ""; + $ret = ''; $status = false; if (Request::ajax()) { if ($data['action'] === 'shopping-order-change-member') { $value = ShoppingOrder::find($data['id']); $route = route('admin_sales_customers_detail', [$value->id]); - $ret = view("admin.modal.member", compact('value', 'data', 'route'))->render(); + $ret = view('admin.modal.member', compact('value', 'data', 'route'))->render(); } if ($data['action'] === 'shopping-user-change-member') { $value = ShoppingUser::find($data['id']); $route = route('admin_customer_edit', [$value->id]); - $ret = view("admin.modal.member", compact('value', 'data', 'route'))->render(); + $ret = view('admin.modal.member', compact('value', 'data', 'route'))->render(); } if ($data['action'] === 'shopping-user-is-like-member') { - $current = ShoppingUser::find($data['id']); //current user form order + $current = ShoppingUser::find($data['id']); // current user form order $possibles = []; if ($current->is_like) { $likes = $current->getNotice('like'); @@ -52,46 +49,46 @@ class ModalController extends Controller $possibles[] = ShoppingUser::find($like_id); } } - $ret = view("admin.modal.is_like_member", compact('current', 'possibles', 'data'))->render(); + $ret = view('admin.modal.is_like_member', compact('current', 'possibles', 'data'))->render(); } if ($data['action'] === 'shopping-order-change-points') { $value = ShoppingOrder::find($data['id']); $route = route('admin_sales_customers_detail', [$value->id]); - $ret = view("admin.modal.change_points", compact('value', 'data', 'route'))->render(); + $ret = view('admin.modal.change_points', compact('value', 'data', 'route'))->render(); } if ($data['action'] === 'user-order-show-product') { - $product = Product::find($data['id']); //current user form order - $ret = view("admin.modal.show_product", compact('product', 'data'))->render(); + $product = Product::find($data['id']); // current user form order + $ret = view('admin.modal.show_product', compact('product', 'data'))->render(); } if ($data['action'] === 'user-order-show-product') { - $product = Product::find($data['id']); //current user form order - $ret = view("admin.modal.show_product", compact('product', 'data'))->render(); + $product = Product::find($data['id']); // current user form order + $ret = view('admin.modal.show_product', compact('product', 'data'))->render(); } if ($data['action'] === 'shop-user-order-detail') { $user = \Auth::user(); $shopping_order = ShoppingOrder::findOrFail($data['id']); - if (!$user->isAdmin() && $shopping_order->member_id !== $user->id) { + if (! $user->isAdmin() && $shopping_order->member_id !== $user->id) { abort(404); } $isAdmin = false; - $ret = view("user.shop.sales.modal_api_order_detail", compact('shopping_order', 'isAdmin', 'data'))->render(); + $ret = view('user.shop.sales.modal_api_order_detail', compact('shopping_order', 'isAdmin', 'data'))->render(); } if ($data['action'] === 'shop-user-order-shipping-detail') { $user = \Auth::user(); $shopping_order = ShoppingOrder::findOrFail($data['id']); - if (!$user->isAdmin() && $shopping_order->auth_user_id !== $user->id) { + if (! $user->isAdmin() && $shopping_order->auth_user_id !== $user->id) { abort(404); } $isAdmin = false; - $ret = view("user.shop.sales.modal_api_order_shipping_detail", compact('shopping_order', 'isAdmin', 'data'))->render(); + $ret = view('user.shop.sales.modal_api_order_shipping_detail', compact('shopping_order', 'isAdmin', 'data'))->render(); } if ($data['action'] === 'user-order-my-delivery-show') { $user = \Auth::user(); - $ret = view("admin.modal.show_user_customers", compact('user', 'data'))->render(); + $ret = view('admin.modal.show_user_customers', compact('user', 'data'))->render(); } if ($data['action'] === 'user-order-my-delivery-add') { @@ -103,60 +100,62 @@ class ModalController extends Controller $homeparty = Homeparty::find($data['id']); $homeparty_user = HomepartyUser::find($data['user_id']); $data['homeparty'] = $homeparty; - $ret = view("user.homeparty.modal_hp_show_products", compact('data', 'homeparty', 'homeparty_user'))->render(); + $ret = view('user.homeparty.modal_hp_show_products', compact('data', 'homeparty', 'homeparty_user'))->render(); } if ($data['action'] === 'user-level-edit') { $value = UserLevel::find($data['id']); $route = route('admin_level_store', [$value->id]); - $ret = view("admin.modal.user_level_edit", compact('value', 'data', 'route'))->render(); + $ret = view('admin.modal.user_level_edit', compact('value', 'data', 'route'))->render(); } if ($data['action'] === 'user-level-add') { - $value = new UserLevel(); + $value = new UserLevel; $route = route('admin_level_store', ['new']); - $ret = view("admin.modal.user_level_edit", compact('value', 'data', 'route'))->render(); + $ret = view('admin.modal.user_level_edit', compact('value', 'data', 'route'))->render(); } if ($data['action'] === 'business-user-detail') { $user = User::findOrFail($data['id']); if ($data['init_from'] === 'admin') { $data['month'] = session('business_user_filter_month'); - $data['year'] = session('business_user_filter_year'); + $data['year'] = session('business_user_filter_year'); } else { - $data['month'] = session('team_user_filter_month'); - $data['year'] = session('team_user_filter_year'); + $data['month'] = session('team_user_filter_month'); + $data['year'] = session('team_user_filter_year'); } $data['live'] = $data['live'] ?? false; $data['optimized'] = $data['optimized'] ?? false; $TreeCalcBot = $this->getForBusinessUserDetail($user, $data); - $route = ""; - $ret = view("admin.modal.business_user_detail", compact('TreeCalcBot', 'user', 'data'))->render(); + $route = ''; + $ret = view('admin.modal.business_user_detail', compact('TreeCalcBot', 'user', 'data'))->render(); } if ($data['action'] === 'business-user-show') { - $user = User::find($data['id']); - if ($user && $user->account) { - $route = ""; - $ret = view("admin.modal.business_user_show", compact('user', 'data'))->render(); + $user = User::with(['account', 'account.country', 'account.shipping_country', 'user_level', 'user_sponsor.account'])->find($data['id']); + \Log::info('business-user-show', ['user' => $user]); + if ($user) { + $route = ''; + $ret = view('admin.modal.business_user_show', compact('user', 'data'))->render(); + } else { + $ret = view('admin.modal.business_user_notfound', compact('data'))->render(); } - $ret = view("admin.modal.business_user_notfound", compact('data'))->render(); } if ($data['action'] === 'edit_user_sales_volume') { $userSalesVolume = UserSalesVolume::findOrFail($data['id']); - $route = route('admin_business_points_store',); - $ret = view("admin.business.modal_edit_points", compact('userSalesVolume', 'data', 'route'))->render(); + $route = route('admin_business_points_store'); + $ret = view('admin.business.modal_edit_points', compact('userSalesVolume', 'data', 'route'))->render(); } if ($data['action'] === 'add_user_sales_volume') { - $userSalesVolume = new UserSalesVolume(); - $route = route('admin_business_points_store',); - $ret = view("admin.business.modal_add_points", compact('userSalesVolume', 'data', 'route'))->render(); + $userSalesVolume = new UserSalesVolume; + $route = route('admin_business_points_store'); + $ret = view('admin.business.modal_add_points', compact('userSalesVolume', 'data', 'route'))->render(); } if ($data['action'] === 'add-user-credit') { $value = []; - $ret = view("admin.payment.modal_add_credit", compact('value', 'data'))->render(); + $ret = view('admin.payment.modal_add_credit', compact('value', 'data'))->render(); } if ($data['action'] === 'user-credit-status') { - $UserCredit = UserCredit::find($data['id']); //current user form order - $ret = view("admin.payment.modal_credit_status", compact('UserCredit', 'data'))->render(); + $UserCredit = UserCredit::find($data['id']); // current user form order + $ret = view('admin.payment.modal_credit_status', compact('UserCredit', 'data'))->render(); } if ($data['action'] === 'abo_update_settings') { $user_abo = UserAbo::find($data['id']); @@ -165,11 +164,11 @@ class ModalController extends Controller } else { $route = route('user_abos_update', [$data['view'], $user_abo->id]); } - $ret = view("admin.abo.modal_abo_update", compact('user_abo', 'data', 'route'))->render(); + $ret = view('admin.abo.modal_abo_update', compact('user_abo', 'data', 'route'))->render(); } if ($data['action'] === 'abo-add-product') { $user_abo = UserAbo::find($data['id']); - $ret = view("user.abo.modal_abo_show_products", compact('data', 'user_abo'))->render(); + $ret = view('user.abo.modal_abo_show_products', compact('data', 'user_abo'))->render(); } if ($data['action'] === 'create-dhl-shipment') { @@ -177,54 +176,57 @@ class ModalController extends Controller $ret = $this->handleDhlShipmentModal($id, $data); } } + return response()->json(['response' => $data, 'html' => $ret, 'status' => $status]); } private function getForBusinessUserDetail(User $user, $data) { - //$auth_user = \Auth::user(); - //if($auth_user->isAdmin() || $auth_user->id === $user->id){ + // $auth_user = \Auth::user(); + // if($auth_user->isAdmin() || $auth_user->id === $user->id){ if ($data['optimized']) { $TreeCalcBot = new TreeCalcBotOptimized($data['month'], $data['year'], $data['init_from'], $data['live']); } else { $TreeCalcBot = new TreeCalcBot($data['month'], $data['year'], $data['init_from']); } $TreeCalcBot->initBusinesslUserDetail($user, $data['live']); - //TODO is not Admin, read is user in Parent tree ... - if (!$TreeCalcBot->business_user) { + // TODO is not Admin, read is user in Parent tree ... + if (! $TreeCalcBot->business_user) { abort(403, 'no user found'); } + return $TreeCalcBot; - //} + + // } return null; } /** * Handle DHL shipment modal preparation - * - * @param mixed $id Order ID or 'new' - * @param array $data Request data + * + * @param mixed $id Order ID or 'new' + * @param array $data Request data * @return string Rendered view */ private function handleDhlShipmentModal($id, array $data): string { try { - $dhlModalService = new DhlModalService(); + $dhlModalService = new DhlModalService; $modalData = $dhlModalService->prepareModalData($id, $data); // Merge the prepared data with the original request data $viewData = array_merge($data, $modalData, [ 'id' => $id, - 'data' => $data + 'data' => $data, ]); - return view("admin.dhl.modal_create_shipment", $viewData)->render(); + return view('admin.dhl.modal_create_shipment', $viewData)->render(); } catch (\Exception $e) { \Log::error('[ModalController] Error in DHL shipment modal', [ 'order_id' => $id, 'error' => $e->getMessage(), - 'trace' => $e->getTraceAsString() + 'trace' => $e->getTraceAsString(), ]); // Return error view or fallback @@ -239,17 +241,15 @@ class ModalController extends Controller 'V01PAK' => 'DHL Paket (National)', 'V53WPAK' => 'DHL Paket International', ], - 'errors' => ['Fehler beim Laden der Daten: ' . $e->getMessage()], - 'warnings' => [] + 'errors' => ['Fehler beim Laden der Daten: '.$e->getMessage()], + 'warnings' => [], ]; - return view("admin.dhl.modal_create_shipment", $errorData)->render(); + return view('admin.dhl.modal_create_shipment', $errorData)->render(); } } } - - /* */ \ No newline at end of file + data-route="{{ route('modal_load') }}">*/ diff --git a/app/Http/Controllers/Pay/PayoneController.php b/app/Http/Controllers/Pay/PayoneController.php index 76bb4a7..f2d5ed2 100644 --- a/app/Http/Controllers/Pay/PayoneController.php +++ b/app/Http/Controllers/Pay/PayoneController.php @@ -21,7 +21,6 @@ fnc Financing 'pref' => 'Vorauskasse', ];*/ - namespace App\Http\Controllers\Pay; use App\Http\Controllers\Controller; @@ -31,36 +30,39 @@ use App\Services\MyLog; use App\Services\Payone; use Util; - class PayoneController extends Controller { - const PREAUTHORIZATION = 'preauthorization'; + const AUTHORIZATION = 'authorization'; + const CAPTURE = 'capture'; + const REFUND = 'refund'; + const DEBIT = 'debit'; private $default = []; private $personalData = []; + private $aboInitPayment = []; private $method = []; + private $prepayment = []; /* private $onlineTransfer = []; private $creditCard = []; */ private $deliveryData = []; - - - // private $payment_method; private $urls = []; private $shopping_user; + private $shopping_order; + private $shopping_payment; private $reference; @@ -82,40 +84,40 @@ class PayoneController extends Controller { return $this->shopping_payment; } + public function setAboPayment($user_abo, $amount, $currency) { $this->reference = substr(uniqid('m', false), 0, 16); - + $amount = intval($amount); $this->method = [ - "clearingtype" => $user_abo->clearingtype, - "wallettype" => $user_abo->wallettype, - "pseudocardpan" => isset($user_abo->carddata['pseudocardpan']) ? $user_abo->carddata['pseudocardpan'] : '', - "cardexpiredate" => isset($user_abo->carddata['cardexpiredate']) ? $user_abo->carddata['cardexpiredate'] : '', + 'clearingtype' => $user_abo->clearingtype, + 'wallettype' => $user_abo->wallettype, + 'pseudocardpan' => isset($user_abo->carddata['pseudocardpan']) ? $user_abo->carddata['pseudocardpan'] : '', + 'cardexpiredate' => isset($user_abo->carddata['cardexpiredate']) ? $user_abo->carddata['cardexpiredate'] : '', 'userid' => $user_abo->payone_userid, 'onlinebanktransfertype' => '', - "request" => "authorization", + 'request' => 'authorization', ]; - $this->aboInitPayment = [ 'recurrence' => 'recurring', 'customer_is_present' => 'no', 'request' => 'authorization', - 'amount' => $amount + 'amount' => $amount, ]; $this->prepayment = [ - "reference" => $this->reference, // a unique reference, e.g. order number - "amount" => $amount, // amount in smallest currency unit, i.e. cents - "currency" => $currency, - "param" => $this->shopping_order->id, + 'reference' => $this->reference, // a unique reference, e.g. order number + 'amount' => $amount, // amount in smallest currency unit, i.e. cents + 'currency' => $currency, + 'param' => $this->shopping_order->id, ]; $this->shopping_payment = ShoppingPayment::create([ 'shopping_order_id' => $this->shopping_order->id, - 'clearingtype' => $this->method["clearingtype"], - 'wallettype' => $this->method["wallettype"], - 'onlinebanktransfertype' => $this->method["onlinebanktransfertype"], + 'clearingtype' => $this->method['clearingtype'], + 'wallettype' => $this->method['wallettype'], + 'onlinebanktransfertype' => $this->method['onlinebanktransfertype'], 'carddata' => $user_abo->carddata, 'reference' => $this->reference, 'amount' => $amount, @@ -125,9 +127,11 @@ class PayoneController extends Controller 'mode' => $this->shopping_order->mode, ]); } - //make Payone payment + + // make Payone payment public function setPrePayment($payment_method, $amount, $currency, $ret = []) { + $amount = intval($amount); $this->reference = substr(uniqid('m', false), 0, 16); $this->setMethod($payment_method, $ret); @@ -139,30 +143,30 @@ class PayoneController extends Controller ]; $this->prepayment = [ - "reference" => $this->reference, // a unique reference, e.g. order number - "amount" => $amount, // amount in smallest currency unit, i.e. cents - "currency" => $currency, - "param" => $this->shopping_order->id, + 'reference' => $this->reference, // a unique reference, e.g. order number + 'amount' => $amount, // amount in smallest currency unit, i.e. cents + 'currency' => $currency, + 'param' => $this->shopping_order->id, ]; - //init Abo + // init Abo if ($this->shopping_order->is_abo) { - if ($this->method["clearingtype"] === "cc") { + if ($this->method['clearingtype'] === 'cc') { $this->aboInitPayment = [ 'recurrence' => 'recurring', 'customer_is_present' => 'yes', 'request' => 'authorization', - 'amount' => $amount, + 'amount' => $amount, ]; $this->method['request'] = 'authorization'; } - if ($this->method["clearingtype"] === "wlt") { - //payment for Abo PayPal + if ($this->method['clearingtype'] === 'wlt') { + // payment for Abo PayPal $this->aboInitPayment = [ 'recurrence' => 'recurring', 'customer_is_present' => 'yes', 'request' => 'authorization', - 'amount' => $amount, + 'amount' => $amount, 'add_paydata[redirection_mode]' => 'DIRECT_TO_MERCHANT', ]; $this->setDeliverylData($this->shopping_user); @@ -172,9 +176,9 @@ class PayoneController extends Controller $this->shopping_payment = ShoppingPayment::create([ 'shopping_order_id' => $this->shopping_order->id, - 'clearingtype' => $this->method["clearingtype"], - 'wallettype' => $this->method["wallettype"], - 'onlinebanktransfertype' => $this->method["onlinebanktransfertype"], + 'clearingtype' => $this->method['clearingtype'], + 'wallettype' => $this->method['wallettype'], + 'onlinebanktransfertype' => $this->method['onlinebanktransfertype'], 'carddata' => isset($ret['cc']) ? $ret['cc'] : null, 'reference' => $this->reference, 'amount' => $amount, @@ -186,21 +190,22 @@ class PayoneController extends Controller ]); $this->default['mode'] = $this->shopping_order->mode; + return $this->reference; } public function setPersonalData() { $this->personalData = [ - "firstname" => $this->shopping_user->billing_firstname, - "lastname" => $this->shopping_user->billing_lastname, // mandatory - "street" => $this->shopping_user->billing_address, - "zip" => $this->shopping_user->billing_zipcode, - "city" => $this->shopping_user->billing_city, - "country" => ($this->shopping_user->billing_country) ? $this->shopping_user->billing_country->code : "DE", // mandatory - "email" => $this->shopping_user->billing_email, + 'firstname' => $this->shopping_user->billing_firstname, + 'lastname' => $this->shopping_user->billing_lastname, // mandatory + 'street' => $this->shopping_user->billing_address, + 'zip' => $this->shopping_user->billing_zipcode, + 'city' => $this->shopping_user->billing_city, + 'country' => ($this->shopping_user->billing_country) ? $this->shopping_user->billing_country->code : 'DE', // mandatory + 'email' => $this->shopping_user->billing_email, // "language" => ($this->shopping_user->billing_country) ? strtoupper($this->shopping_user->billing_country->code) : "DE", // mandatory - "language" => "DE", + 'language' => 'DE', ]; /** @@ -222,38 +227,38 @@ class PayoneController extends Controller if ($payment_method) { if (strpos($payment_method, '#')) { $payment_method = explode('#', $payment_method); - //wallet Paypal + // wallet Paypal if ($payment_method[0] === 'wlt') { $this->method = [ - "clearingtype" => "wlt", - "wallettype" => $payment_method[1], - 'onlinebanktransfertype' => "", - "request" => "authorization" + 'clearingtype' => 'wlt', + 'wallettype' => $payment_method[1], + 'onlinebanktransfertype' => '', + 'request' => 'authorization', ]; } - //Online-Überweisung + // Online-Überweisung if ($payment_method[0] === 'sb') { $this->method = [ - "clearingtype" => "sb", - "wallettype" => "", - "onlinebanktransfertype" => $payment_method[1], // this is the type for Sofort.com - "bankcountry" => "DE", // we need to know the country of the customer's bank, i.e. of the invoice address - "request" => "authorization", + 'clearingtype' => 'sb', + 'wallettype' => '', + 'onlinebanktransfertype' => $payment_method[1], // this is the type for Sofort.com + 'bankcountry' => 'DE', // we need to know the country of the customer's bank, i.e. of the invoice address + 'request' => 'authorization', ]; } - //Rechnungskauf + // Rechnungskauf if ($payment_method[0] === 'fnc') { - //MIVITA + // MIVITA if (isset($payment_method[1]) && $payment_method[1] === 'MIV') { $this->method = [ - "clearingtype" => "fnc", - "wallettype" => "", - 'onlinebanktransfertype' => "MIV", - "request" => "authorization", + 'clearingtype' => 'fnc', + 'wallettype' => '', + 'onlinebanktransfertype' => 'MIV', + 'request' => 'authorization', ]; } - //PAYONE + // PAYONE /* $this->method = [ "clearingtype" => "fnc", "wallettype" => "", @@ -265,41 +270,41 @@ class PayoneController extends Controller ];*/ } } - //vorkasse + // vorkasse if ($payment_method === 'elv') { $this->method = [ - "clearingtype" => "elv", - "wallettype" => "", - 'onlinebanktransfertype' => "", - "request" => "authorization", - "mandate_identification" => $ret['elv']['mandate_identification'], - "iban" => $ret['elv']['iban'], - "bic" => $ret['elv']['bic'], - "bankaccountholder" => $ret['elv']['bankaccountholder'], + 'clearingtype' => 'elv', + 'wallettype' => '', + 'onlinebanktransfertype' => '', + 'request' => 'authorization', + 'mandate_identification' => $ret['elv']['mandate_identification'], + 'iban' => $ret['elv']['iban'], + 'bic' => $ret['elv']['bic'], + 'bankaccountholder' => $ret['elv']['bankaccountholder'], // "bankcountry" => "DE", ]; } - //vorkasse + // vorkasse if ($payment_method === 'vor') { $this->method = [ - "clearingtype" => "vor", - "wallettype" => "", - 'onlinebanktransfertype' => "", - "request" => "authorization", + 'clearingtype' => 'vor', + 'wallettype' => '', + 'onlinebanktransfertype' => '', + 'request' => 'authorization', ]; } - //CreditCard + // CreditCard if ($payment_method === 'cc') { - //need the $cc_ret + // need the $cc_ret $this->method = [ - "clearingtype" => "cc", - "wallettype" => "", - 'onlinebanktransfertype' => "", - "request" => "authorization", - "pseudocardpan" => $ret['cc']['pseudocardpan'], - //"xid" => "3-D Secure transaction ID" + 'clearingtype' => 'cc', + 'wallettype' => '', + 'onlinebanktransfertype' => '', + 'request' => 'authorization', + 'pseudocardpan' => $ret['cc']['pseudocardpan'], + // "xid" => "3-D Secure transaction ID" ]; } } @@ -309,6 +314,7 @@ class PayoneController extends Controller { $request = array_merge($this->default, $this->personalData, $this->deliveryData, $this->method, $this->prepayment, $this->aboInitPayment, $this->urls); $response = Payone::sendRequest($request); + return $response; } @@ -316,11 +322,10 @@ class PayoneController extends Controller { $request = array_merge($this->default, $this->personalData, $this->deliveryData, $this->method, $this->prepayment, $this->aboInitPayment, $this->urls); - //RECHNUNG MIV if ($this->shopping_payment->clearingtype === 'fnc' && $this->shopping_payment->onlinebanktransfertype === 'MIV') { $payt = PaymentTransaction::create([ 'shopping_payment_id' => $this->shopping_payment->id, - 'request' => $this->method['request'], + 'request' => $this->method['request'], 'txid' => 0, 'userid' => 0, 'status' => 'FNCMIV', @@ -332,6 +337,7 @@ class PayoneController extends Controller if ($is_abo) { return $this->reference; } + return redirect(route('checkout.transaction_approved', [$payt->id, $this->reference])); exit; } @@ -343,7 +349,7 @@ class PayoneController extends Controller MyLog::writeLog( 'payone', 'error', - 'PayPal Preauthorization Fehler: ' . $response['errormessage'], + 'PayPal Preauthorization Fehler: '.$response['errormessage'], $response ); PaymentTransaction::create([ @@ -352,6 +358,7 @@ class PayoneController extends Controller 'errorcode' => $response['errorcode'], 'errormessage' => $response['errormessage'], 'customermessage' => $response['customermessage'], + 'transmitted_data' => $request, 'status' => $response['status'], 'mode' => $this->shopping_payment->mode, ]); @@ -361,10 +368,10 @@ class PayoneController extends Controller } \Session::flash('errormessage', $response['errormessage']); \Session::flash('customermessage', $response['customermessage']); + return redirect(route('checkout.checkout_card')); } - if ($response['status'] === 'REDIRECT') { PaymentTransaction::create([ 'shopping_payment_id' => $this->shopping_payment->id, @@ -379,7 +386,8 @@ class PayoneController extends Controller if ($is_abo) { return $response; } - return redirect()->away($response["redirecturl"]); + + return redirect()->away($response['redirecturl']); exit; } @@ -387,7 +395,7 @@ class PayoneController extends Controller // header("Location: " . $response["redirecturl"]); // or other redirect method $payt = PaymentTransaction::create([ 'shopping_payment_id' => $this->shopping_payment->id, - 'request' => $this->method['request'], + 'request' => $this->method['request'], 'txid' => $response['txid'], 'userid' => $response['userid'], 'status' => $response['status'], @@ -400,33 +408,32 @@ class PayoneController extends Controller return $response; } - if ($payt->shopping_payment->clearingtype === "vor") { - //vorkasse + if ($payt->shopping_payment->clearingtype === 'vor') { + // vorkasse return redirect(route('checkout.transaction_approved', [$payt->id, $this->reference])); exit; } - if ($payt->shopping_payment->clearingtype === "cc") { - //creditcard + if ($payt->shopping_payment->clearingtype === 'cc') { + // creditcard return redirect(route('checkout.transaction_approved', [$payt->id, $this->reference])); exit; } - if ($payt->shopping_payment->clearingtype === "elv") { - //sepa + if ($payt->shopping_payment->clearingtype === 'elv') { + // sepa return redirect(route('checkout.transaction_approved', [$payt->id, $this->reference])); exit; } var_dump($response); - die(); - //txid - //Payment process ID (PAYONE) - //userid - //Debtor ID (PAYONE) + exit(); + // txid + // Payment process ID (PAYONE) + // userid + // Debtor ID (PAYONE) } - if ($response['status'] === 'PENDING') { MyLog::writeLog( 'payone', @@ -434,11 +441,11 @@ class PayoneController extends Controller 'Error:1000 Status PENDING App\Http\Controllers\Pay\PayoneController::ResponseData response status PENDING', $response ); - die(); - //txid - //Payment process ID (PAYONE) - //userid - //Debtor ID (PAYONE) + exit(); + // txid + // Payment process ID (PAYONE) + // userid + // Debtor ID (PAYONE) } MyLog::writeLog( 'payone', @@ -449,22 +456,20 @@ class PayoneController extends Controller abort(403, 'Der Zahlungsanbieter ist nicht erreichbar, die Zahlung konnte nicht durchgeführt werden. Bitte versuchen Sie es später erneut. Fehlercode: 1001'); } - - - public function checkCreditCard($data) { $this->prepayment = [ - "request" => "creditcardcheck", // create account receivable and instantly book the amount - "cardholder" => $data['cc_cardholder_first'] . " " . $data['cc_cardholder_last'], - "cardpan" => $data['cc_cardpan'], - "cardexpiredate" => substr($data['cc_cardexpireyear'], -2) . $data['cc_cardexpiremonth'], - "cardtype" => $data['cc_cardtype'], - "cardcvc2" => $data['cc_cardcvc2'], - "storecarddata" => 'yes', - "language" => 'de', + 'request' => 'creditcardcheck', // create account receivable and instantly book the amount + 'cardholder' => $data['cc_cardholder_first'].' '.$data['cc_cardholder_last'], + 'cardpan' => $data['cc_cardpan'], + 'cardexpiredate' => substr($data['cc_cardexpireyear'], -2).$data['cc_cardexpiremonth'], + 'cardtype' => $data['cc_cardtype'], + 'cardcvc2' => $data['cc_cardcvc2'], + 'storecarddata' => 'yes', + 'language' => 'de', ]; $request = array_merge($this->default, $this->prepayment); + return Payone::sendRequest($request); } @@ -474,18 +479,19 @@ class PayoneController extends Controller $this->setPersonalData(); $this->prepayment = [ - "clearingtype" => "elv", - "amount" => $amount, // amount in smallest currency unit, i.e. cents - "currency" => $currency, - "request" => "managemandate", // create account receivable and instantly book the amount - "bankaccountholder" => $data['elv_bankaccountholder'], - "iban" => $data['elv_iban'], - "bic" => $data['elv_bic'], + 'clearingtype' => 'elv', + 'amount' => $amount, // amount in smallest currency unit, i.e. cents + 'currency' => $currency, + 'request' => 'managemandate', // create account receivable and instantly book the amount + 'bankaccountholder' => $data['elv_bankaccountholder'], + 'iban' => $data['elv_iban'], + 'bic' => $data['elv_bic'], // "language" => 'de', ]; $request = array_merge($this->default, $this->personalData, $this->deliveryData, $this->method, $this->prepayment, $this->urls); + return Payone::sendRequest($request); } @@ -524,9 +530,6 @@ class PayoneController extends Controller } */ - - - /* public function checkStatus(){ // again, the default values will be needed $capture = array( @@ -541,9 +544,8 @@ class PayoneController extends Controller } */ - - //set for clearingtype - //debit payment + // set for clearingtype + // debit payment /* * * @@ -596,6 +598,6 @@ class PayoneController extends Controller - + */ } diff --git a/app/Http/Controllers/PaymentCreditController.php b/app/Http/Controllers/PaymentCreditController.php index 8294188..39c9fd7 100644 --- a/app/Http/Controllers/PaymentCreditController.php +++ b/app/Http/Controllers/PaymentCreditController.php @@ -1,29 +1,20 @@ middleware('admin'); @@ -37,31 +28,34 @@ class PaymentCreditController extends Controller 'filter_years' => HTMLHelper::getYearRange(2022), 'user_credit_items' => $this->makeUserCreditItems(), ]; + return view('admin.payment.credit', $data); } - public function store() { $data = Request::all(); if (isset($data['action']) && $data['action'] === 'add-user-credit') { - if (!isset($data['member_id']) || !$user = User::find($data['member_id'])) { + if (! isset($data['member_id']) || ! $user = User::find($data['member_id'])) { \Session()->flash('alert-error', 'Vertriebspartner nicht gefunden'); + return back(); } - if (!isset($data['credit'])) { + if (! isset($data['credit'])) { \Session()->flash('alert-error', 'Bitte Betrag eingeben'); + return back(); } - if (!isset($data['message'])) { + if (! isset($data['message'])) { \Session()->flash('alert-error', 'Bitte Betreff eingeben'); + return back(); } $credit = Util::reFormatNumber($data['credit']); $credit = number_format($credit, 2, '.', ''); Payment::addUserCreditMargin($user, $credit, 3, $data['message']); - \Session()->flash('alert-success', "Guthaben hinzugefügt"); + \Session()->flash('alert-success', 'Guthaben hinzugefügt'); } return redirect(route('admin_payments_credit')); @@ -72,20 +66,22 @@ class PaymentCreditController extends Controller $data = Request::all(); if (isset($data['action'])) { if ($data['action'] === 'create_credit') { - if (!isset($data['userid'])) { + if (! isset($data['userid'])) { abort(404); } $user = User::findOrFail($data['userid']); $credit_repo = new CreditRepository($user); $credit_repo->create($data); - \Session()->flash('alert-success', "Gutschrift erstellt"); + \Session()->flash('alert-success', 'Gutschrift erstellt'); + return redirect($data['back']); } if ($data['action'] === 'user-credit-status') { $UserCredit = UserCredit::findOrFail($data['id']); $UserCredit->status = $data['status']; $UserCredit->save(); - \Session()->flash('alert-success', "Status gespeichert"); + \Session()->flash('alert-success', 'Status gespeichert'); + return back(); } } @@ -93,10 +89,10 @@ class PaymentCreditController extends Controller private function setFilterVars() { - if (!session('credit_filter_month')) { + if (! session('credit_filter_month')) { session(['credit_filter_month' => intval(date('m'))]); } - if (!session('credit_filter_year')) { + if (! session('credit_filter_year')) { session(['credit_filter_year' => intval(date('Y'))]); } if (Request::get('credit_filter_name')) { @@ -121,7 +117,7 @@ class PaymentCreditController extends Controller $ret[$userCreditItem->user_id]['sum'] += $userCreditItem->credit; $ret[$userCreditItem->user_id]['entries'][$userCreditItem->id] = $userCreditItem; } else { - if (!isset($userCreditItem->user)) { + if (! isset($userCreditItem->user)) { /* gelöschte User nicht anzeigen $user = User::withTrashed()->with(['account' => fn($q) => $q->withTrashed()])->where('id', $userCreditItem->user_id)->first(); $ret[$userCreditItem->user_id] = [ @@ -147,6 +143,7 @@ class PaymentCreditController extends Controller } } } + return $ret; } @@ -157,11 +154,12 @@ class PaymentCreditController extends Controller $UserCreditItem = UserCreditItem::findOrFail($id); if ($deleteTime = $UserCreditItem->deleteTime()) { $UserCreditItem->delete(); - \Session()->flash('alert-success', "Guthaben ist gelöscht"); + \Session()->flash('alert-success', 'Guthaben ist gelöscht'); } else { - \Session()->flash('alert-error', "Guthaben kann nicht gelöscht werden"); + \Session()->flash('alert-error', 'Guthaben kann nicht gelöscht werden'); } } + return redirect(route('admin_payments_credit')); } @@ -170,17 +168,18 @@ class PaymentCreditController extends Controller $this->setFilterVars(); - $date_start = Carbon::parse('01.' . Request::get('credit_filter_month') . '.' . Request::get('credit_filter_year'))->format('Y-m-d'); - $date_end = Carbon::parse('01.' . Request::get('credit_filter_month') . '.' . Request::get('credit_filter_year'))->endOfMonth()->format('Y-m-d'); + $date_start = Carbon::parse('01.'.Request::get('credit_filter_month').'.'.Request::get('credit_filter_year'))->format('Y-m-d'); + $date_end = Carbon::parse('01.'.Request::get('credit_filter_month').'.'.Request::get('credit_filter_year'))->endOfMonth()->format('Y-m-d'); $query = UserCredit::with('user', 'user.account')->select('user_credits.*') ->whereBetween('date', [$date_start, $date_end]); if (Request::get('credit_filter_name')) { $query->whereHas('user.account', function ($query) { - return $query->where('first_name', 'LIKE', '%' . Request::get('credit_filter_name') . '%') - ->orWhere('last_name', 'LIKE', '%' . Request::get('credit_filter_name') . '%'); + return $query->where('first_name', 'LIKE', '%'.Request::get('credit_filter_name').'%') + ->orWhere('last_name', 'LIKE', '%'.Request::get('credit_filter_name').'%'); }); } + return $query; } @@ -192,64 +191,75 @@ class PaymentCreditController extends Controller return \DataTables::eloquent($query) ->addColumn('user.account.first_name', function (UserCredit $UserCredit) { - return isset($UserCredit->user->account) ? $UserCredit->user->account->first_name : "gelöscht"; + return isset($UserCredit->user->account) ? $UserCredit->user->account->first_name : 'gelöscht'; }) ->addColumn('user.account.last_name', function (UserCredit $UserCredit) { - return isset($UserCredit->user->account) ? $UserCredit->user->account->last_name : "gelöscht"; + return isset($UserCredit->user->account) ? $UserCredit->user->account->last_name : 'gelöscht'; }) ->addColumn('user.email', function (UserCredit $UserCredit) { - return isset($UserCredit->user) ? $UserCredit->user->email : "gelöscht"; + return isset($UserCredit->user) ? $UserCredit->user->email : 'gelöscht'; }) ->addColumn('view', function (UserCredit $UserCredit) { - $ret = ""; + $ret = ''; if ($UserCredit->isCredit()) { - $ret .= ' '; - $ret .= '
'; + // Deutsches Original (ausgefüllter Button) + $ret .= ' '; + $ret .= ''; - $ret .= ' '; - $ret .= ' '; + // Lokalisierte Versionen (outline Buttons) + $availableLocales = $UserCredit->getAvailableLocales(); + foreach ($availableLocales as $locale) { + $ret .= ' '.strtoupper($locale).''; + $ret .= ' '.strtoupper($locale).''; + } + $ret .= '
'; + + $ret .= ' '; + $ret .= ' '; } else { - $ret = "-"; + $ret = '-'; } + return $ret; }) ->addColumn('total', function (UserCredit $UserCredit) { - return '' . $UserCredit->getFormattedTotal() . " €"; + return ''.$UserCredit->getFormattedTotal().' €'; }) ->addColumn('credits', function (UserCredit $UserCredit) { - $ret = ""; + $ret = ''; if ($UserCredit->user_credit_items) { foreach ($UserCredit->user_credit_items as $user_credit_item) { - $ret .= nl2br($user_credit_item->getTransMessage()) . " / " . $user_credit_item->created_at->format('d.m.Y') . "
"; + $ret .= nl2br($user_credit_item->getTransMessage()).' / '.$user_credit_item->created_at->format('d.m.Y').'
'; } } + return $ret; }) ->addColumn('status', function (UserCredit $UserCredit) { return ' - ' . $UserCredit->getStatusType() . ' + data-id="'.$UserCredit->id.'" data-route="'.route('modal_load').'" data-action="user-credit-status" data-view=""> + '.$UserCredit->getStatusType().' '; }) ->filterColumn('user.account.first_name', function ($query, $keyword) { - if ($keyword != "") { + if ($keyword != '') { $query->whereHas('user.account', function ($query) use ($keyword) { - return $query->where('first_name', 'LIKE', '%' . $keyword . '%'); + return $query->where('first_name', 'LIKE', '%'.$keyword.'%'); }); } }) ->filterColumn('user.account.last_name', function ($query, $keyword) { - if ($keyword != "") { + if ($keyword != '') { $query->whereHas('user.account', function ($query) use ($keyword) { - return $query->where('last_name', 'LIKE', '%' . $keyword . '%'); + return $query->where('last_name', 'LIKE', '%'.$keyword.'%'); }); } }) ->filterColumn('user.email', function ($query, $keyword) { - if ($keyword != "") { + if ($keyword != '') { $query->whereHas('user', function ($query) use ($keyword) { - return $query->where('email', 'LIKE', '%' . $keyword . '%'); + return $query->where('email', 'LIKE', '%'.$keyword.'%'); }); } }) diff --git a/app/Http/Controllers/PaymentTaxAdvisorController.php b/app/Http/Controllers/PaymentTaxAdvisorController.php index 9afcada..aff67c7 100644 --- a/app/Http/Controllers/PaymentTaxAdvisorController.php +++ b/app/Http/Controllers/PaymentTaxAdvisorController.php @@ -1,246 +1,277 @@ 8120, //für Kunden aus der Schweiz - 11 => 8125, //Steuerfreie EU-Lieferungen - 2 => 8300, //Erlöse mit 7 % meistens für Käufe mit Aloe Vera - 3 => 8400, //Regulär mit 19 % - ]; - + private DatevExportService $datevService; - private $accountKey = [ - 'A'=>'10000', - 'B'=>'10100', - 'C'=>'10200', - 'D'=>'10300', - 'E'=>'10400', - 'F'=>'10500', - 'G'=>'10600', - 'H'=>'10700', - 'I'=>'10800', - 'J'=>'10900', - 'K'=>'11000', - 'L'=>'11100', - 'M'=>'11200', - 'N'=>'11300', - 'O'=>'11400', - 'P'=>'11500', - 'Q'=>'11600', - 'R'=>'11700', - 'S'=>'11800', - 'SCH'=>'11900', - 'T'=>'12000', - 'U'=>'12100', - 'V'=>'12200', - 'W'=>'12300', - 'X'=>'12400', - 'Y'=>'12500', - 'Z'=>'12600' - ]; - - public function __construct() + public function __construct(DatevExportService $datevService) { $this->middleware('admin'); + $this->datevService = $datevService; } - public function index() + /** + * Hauptseite: Periodenauswahl + Export-Übersicht + */ + public function index(Request $request) { - - $this->setFilterVars(); + $this->setFilterVars($request); + + $month = intval(session('payment_taxadvisor_filter_month')); + $year = intval(session('payment_taxadvisor_filter_year')); + + // Letzter Export für diese Periode + $currentExport = DatevExport::forPeriod($month, $year) + ->generated() + ->latest() + ->first(); + + // Letzte 10 Exports für die Historie + $recentExports = DatevExport::generated() + ->latest() + ->limit(10) + ->get(); + $data = [ 'filter_months' => HTMLHelper::getTransMonths(), 'filter_years' => HTMLHelper::getYearRange(2023), + 'current_month' => $month, + 'current_year' => $year, + 'current_export' => $currentExport, + 'recent_exports' => $recentExports, ]; + return view('admin.payment.taxadvisor', $data); } - - public function createZip($filesToZip) + /** + * AJAX: Vorschau der Daten für die gewählte Periode. + */ + public function preview(Request $request) { - $zip = new ZipArchive; - $zipFileName = 'mysample.zip'; - $path = storage_path().'/app/public/zip/'; - if ($zip->open($path.$zipFileName, ZipArchive::CREATE) === TRUE) { - foreach ($filesToZip as $file) { - $zip->addFile($file, basename($file)); - } + $month = intval($request->get('month', session('payment_taxadvisor_filter_month'))); + $year = intval($request->get('year', session('payment_taxadvisor_filter_year'))); - $zip->close(); - return response()->download($path.$zipFileName)->deleteFileAfterSend(true); + try { + $preview = $this->datevService->getPreview($month, $year); + + return response()->json([ + 'success' => true, + 'data' => $preview, + ]); + } catch (\Exception $e) { + return response()->json([ + 'success' => false, + 'message' => 'Fehler bei der Vorschau: '.$e->getMessage(), + ], 500); + } + } + + /** + * Export generieren und speichern. + */ + public function generate(Request $request) + { + $month = intval($request->get('month', session('payment_taxadvisor_filter_month'))); + $year = intval($request->get('year', session('payment_taxadvisor_filter_year'))); + + try { + $export = $this->datevService->generateExport($month, $year); + + return redirect() + ->route('admin_payments_taxadvisor') + ->with('success', "DATEV-Export für {$month}/{$year} erfolgreich generiert. {$export->total_lines} Buchungszeilen erstellt."); + } catch (\RuntimeException $e) { + return redirect() + ->route('admin_payments_taxadvisor') + ->with('error', $e->getMessage()); + } catch (\Exception $e) { + return redirect() + ->route('admin_payments_taxadvisor') + ->with('error', 'Fehler beim Generieren: '.$e->getMessage()); + } + } + + /** + * CSV-Datei herunterladen. + */ + public function download($id) + { + $export = DatevExport::findOrFail($id); + + if (! $export->isGenerated()) { + return redirect() + ->route('admin_payments_taxadvisor') + ->with('error', 'Export wurde noch nicht generiert.'); + } + + $disk = config('datev.storage_disk', 'local'); + $path = $export->file_path; + + if (! Storage::disk($disk)->exists($path)) { + // CSV neu generieren falls Datei nicht mehr vorhanden + $csvContent = $this->datevService->buildCsv($export); + Storage::disk($disk)->makeDirectory($export->getStoragePath()); + Storage::disk($disk)->put($path, $csvContent); + } + + // Status auf "heruntergeladen" setzen + $export->markAsDownloaded(); + + return Storage::disk($disk)->download($path, $export->filename, [ + 'Content-Type' => 'text/csv; charset=utf-8', + ]); + } + + /** + * DataTable: Export-Lines eines bestimmten Exports. + */ + public function datatable(Request $request) + { + $exportId = $request->get('export_id'); + + $query = DatevExportLine::select('datev_export_lines.*'); + + if ($exportId) { + $query->where('datev_export_id', $exportId); } else { - return "Failed to create the zip file."; - } - } - + // Fallback: Lines des aktuellen Perioden-Exports + $month = intval(session('payment_taxadvisor_filter_month', date('m'))); + $year = intval(session('payment_taxadvisor_filter_year', date('Y'))); - public function download(){ + $export = DatevExport::forPeriod($month, $year) + ->generated() + ->latest() + ->first(); - - $query = $this->initSearch(); - - $files = []; - - $user_invoices = $query->get(); - foreach ($user_invoices as $user_invoice) { - $filename = $user_invoice->filename; - $disk = $user_invoice->disk; - $path = $user_invoice->getDownloadPath(); - if (Storage::disk($disk)->exists($path)) { - $file = Storage::disk($disk)->get($path); - $pdf_path = storage_path().'/app/public/'.$path; - $files[] = $pdf_path; + if ($export) { + $query->where('datev_export_id', $export->id); + } else { + $query->where('datev_export_id', 0); // Leere Ergebnismenge } } - - return $this->createZip($files); - - dd("asd"); + return \DataTables::eloquent($query) + ->editColumn('line_number', function (DatevExportLine $line) { + return $line->line_number; + }) + ->addColumn('source_type_label', function (DatevExportLine $line) { + return $line->source_type_label; + }) + ->addColumn('amount_display', function (DatevExportLine $line) { + return ''.$line->formatted_amount.''; + }) + ->editColumn('soll_haben', function (DatevExportLine $line) { + $badge = $line->soll_haben === 'H' ? 'success' : 'warning'; + return ''.$line->soll_haben.''; + }) + ->editColumn('konto', function (DatevExportLine $line) { + return $line->konto; + }) + ->editColumn('gegenkonto', function (DatevExportLine $line) { + return $line->gegenkonto; + }) + ->editColumn('bu_schluessel', function (DatevExportLine $line) { + return $line->bu_schluessel; + }) + ->addColumn('belegdatum_display', function (DatevExportLine $line) { + return $line->formatted_belegdatum; + }) + ->editColumn('belegfeld1', function (DatevExportLine $line) { + return $line->belegfeld1; + }) + ->editColumn('buchungstext', function (DatevExportLine $line) { + return $line->buchungstext; + }) + ->editColumn('eu_ustid', function (DatevExportLine $line) { + return $line->eu_ustid ?: '-'; + }) + ->filterColumn('source_type_label', function ($query, $keyword) { + $typeMap = ['rechnung' => 'invoice', 'gutschrift' => 'credit', 'storno' => 'cancellation']; + foreach ($typeMap as $label => $type) { + if (stripos($label, $keyword) !== false) { + $query->where('source_type', $type); - if(Request::get('action') === "export"){ - $objects = $this->initSearch(false); - $columns = []; - $filename = "mivita-absatzmengen-".session('payment_taxadvisor_filter_month').'_'.session('payment_taxadvisor_filter_year')."-export"; - $headers = array( - '#', - 'Produkt', - 'Artikelnummer', - 'Menge', - - ); - if($objects){ - foreach ($objects as $key => $obj){ - $columns[] = array( - 'id' => $key, - 'name' => $obj['name'], - 'number' => $obj['number'], - 'value' => $obj['value'], - ); + return; + } } - } - return Excel::download(new UserTeamExport($columns, $headers), $filename.'.xls'); - } + $query->where('source_type', 'like', "%{$keyword}%"); + }) + ->orderColumn('line_number', 'line_number $1') + ->rawColumns(['amount_display', 'soll_haben']) + ->make(true); } - - private function setFilterVars(){ + /** + * Export sperren (Lock). + */ + public function lock($id) + { + $export = DatevExport::findOrFail($id); - if(!session('payment_taxadvisor_filter_month')){ + if ($export->isLocked()) { + return redirect() + ->route('admin_payments_taxadvisor') + ->with('info', 'Export ist bereits gesperrt.'); + } + + $export->lock(); + + return redirect() + ->route('admin_payments_taxadvisor') + ->with('success', "Export {$export->period_label} wurde gesperrt."); + } + + /** + * Export löschen (soft delete). + */ + public function destroy($id) + { + $export = DatevExport::findOrFail($id); + + if ($export->isLocked()) { + return redirect() + ->route('admin_payments_taxadvisor') + ->with('error', 'Gesperrte Exports können nicht gelöscht werden.'); + } + + $export->delete(); + + return redirect() + ->route('admin_payments_taxadvisor') + ->with('success', "Export {$export->period_label} wurde gelöscht."); + } + + /* + |-------------------------------------------------------------------------- + | Private Hilfsmethoden + |-------------------------------------------------------------------------- + */ + + private function setFilterVars(Request $request): void + { + if (! session('payment_taxadvisor_filter_month')) { session(['payment_taxadvisor_filter_month' => intval(date('m'))]); } - if(!session('payment_taxadvisor_filter_year')){ + if (! session('payment_taxadvisor_filter_year')) { session(['payment_taxadvisor_filter_year' => intval(date('Y'))]); } - if(Request::get('payment_taxadvisor_filter_month')){ - session(['payment_taxadvisor_filter_month' => Request::get('payment_taxadvisor_filter_month')]); + if ($request->get('payment_taxadvisor_filter_month')) { + session(['payment_taxadvisor_filter_month' => $request->get('payment_taxadvisor_filter_month')]); } - if(Request::get('payment_taxadvisor_filter_year')){ - session(['payment_taxadvisor_filter_year' => Request::get('payment_taxadvisor_filter_year')]); + if ($request->get('payment_taxadvisor_filter_year')) { + session(['payment_taxadvisor_filter_year' => $request->get('payment_taxadvisor_filter_year')]); } } - - - private function initSearch() - { - $this->setFilterVars(); - - $query = UserInvoice::with('shopping_order')->with('shopping_order.shopping_user')->select('user_invoices.*') - ->where('user_invoices.month', '=', Request::get('payment_taxadvisor_filter_month')) - ->where('user_invoices.year', '=', Request::get('payment_taxadvisor_filter_year')); - - - return $query; - } - - - public function datatable(){ - - $query = $this->initSearch(); - - - return \DataTables::eloquent($query) - ->addColumn('id', function (UserInvoice $UserInvoice) { - return $UserInvoice->id; - - }) - - ->addColumn('turnover', function (UserInvoice $UserInvoice) { - return ''.$UserInvoice->shopping_order->getFormattedTotalShipping()." €"; - }) - ->addColumn('debit_credit_indicator', function (UserInvoice $UserInvoice) { - return "H"; - }) - ->addColumn('account', function (UserInvoice $UserInvoice) { - if($UserInvoice->shopping_order && $UserInvoice->shopping_order->shopping_user){ - $key = strtoupper(substr($UserInvoice->shopping_order->shopping_user->billing_lastname, 0, 1)); - if($key === "S"){ - if(strtoupper(substr($UserInvoice->shopping_order->shopping_user->billing_lastname, 0, 3)) === "SCH"){ - return $this->accountKey['SCH']; - } - } - return isset($this->accountKey[$key]) ? $this->accountKey[$key] : $key; - } - return "-"; - }) - ->addColumn('contra_account', function (UserInvoice $UserInvoice) { - return "-"; - }) - ->addColumn('bu_key', function (UserInvoice $UserInvoice) { - if($UserInvoice->shopping_order){ - return $UserInvoice->shopping_order->country_id; - } - }) - ->addColumn('voucher_date', function (UserInvoice $UserInvoice) { - // 101 -> für 01 Januar - return $UserInvoice->month."01"; - }) - ->addColumn('document_field_1', function (UserInvoice $UserInvoice) { - //Rechnungsnummer - return $UserInvoice->full_number; - }) - ->addColumn('posting_text', function (UserInvoice $UserInvoice) { - //Buchungstext – hier wäre es toll wenn der Name des Kunden steht. - if($UserInvoice->shopping_order && $UserInvoice->shopping_order->shopping_user){ - return $UserInvoice->shopping_order->shopping_user->billing_firstname." ".$UserInvoice->shopping_order->shopping_user->billing_lastname; - } - return "-"; - }) - ->addColumn('invoice', function (UserInvoice $UserInvoice) { - $ret = ""; - $ret .= ' '; - $ret .= ''; - return $ret; - }) - ->orderColumn('id', 'id $1') - ->orderColumn('invoice_number', 'invoice_number $1') - ->orderColumn('turnover', 'turnover $1') - ->orderColumn('shipped', 'shipped $1') - ->orderColumn('total_shipping', 'total_shipping $1') - ->rawColumns(['id', 'shipping_order', 'turnover', 'total_shipping', 'status', 'txaction', 'invoice']) - ->make(true); - - - - } - - - - -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Portal/AboController.php b/app/Http/Controllers/Portal/AboController.php index 4bf0f27..6056951 100644 --- a/app/Http/Controllers/Portal/AboController.php +++ b/app/Http/Controllers/Portal/AboController.php @@ -2,25 +2,27 @@ namespace App\Http\Controllers\Portal; -use Auth; -use Yard; -use Request; -use Validator; -use App\Services\Shop; -use App\Services\Util; -use App\Models\Product; -use App\Models\UserAbo; -use App\Services\AboHelper; -use App\Models\ShoppingUser; -use App\Models\ShoppingOrder; -use App\Services\UserService; -use App\Models\ShoppingInstance; use App\Http\Controllers\Controller; - +use App\Models\Product; +use App\Models\ShoppingInstance; +use App\Models\ShoppingUser; +use App\Models\UserAbo; +use App\Models\UserAboItem; +use App\Repositories\AboRepository; +use App\Services\AboHelper; +use App\Services\AboItemHistoryService; +use App\Services\AboOrderCart; +use App\Services\Shop; +use App\Services\UserService; +use App\Services\Util; +use Auth; +use Request; +use Yard; class AboController extends Controller { private $instance = 'subscription'; + private $yard; /** @@ -34,12 +36,11 @@ class AboController extends Controller $this->yard = Yard::instance($this->instance); } - public function myAbo() { $user = Auth::guard('customers')->user(); - - if (!$user->shopping_user_id) { + + if (! $user->shopping_user_id) { return view('portal.abo.my_abo_create', [ 'user' => $user, 'no_shopping_user' => true, @@ -49,30 +50,304 @@ class AboController extends Controller $shopping_user = ShoppingUser::findOrFail($user->shopping_user_id); $user_abo = UserAbo::where('email', $shopping_user->billing_email) - ->where('status', '>', 1) - ->first(); + ->where('status', '>', 1) + ->first(); - return $user_abo - ? view('portal.abo.my_abo', ['user_abo' => $user_abo]) - : view('portal.abo.my_abo_create', [ + if (! $user_abo) { + return view('portal.abo.my_abo_create', [ 'shopping_user' => $shopping_user, 'step' => 0, ]); + } + + $this->checkPortalPermission($user_abo); + + $view = 'portal'; + + // Init Yard und Customer-Detail + AboOrderCart::initYard($user_abo); + $customer_detail = AboOrderCart::getCustomerDetail(); + AboOrderCart::makeOrderYard($user_abo); + + return view('portal.abo.my_abo', [ + 'user_abo' => $user_abo, + 'customer_detail' => $customer_detail, + 'view' => $view, + 'comp_products' => [], + 'isAdmin' => false, + ]); + } + + public function update($view, $id) + { + $data = Request::all(); + $user_abo = UserAbo::findOrFail($id); + $this->checkPortalPermission($user_abo); + $isAddOnlyMode = AboHelper::isAddOnlyMode($user_abo, $view); + + if (isset($data['action'])) { + if ($data['action'] === 'abo_update_settings') { + $user_abo = UserAbo::findOrFail($data['id']); + $this->checkPortalPermission($user_abo); + $aboRepository = new AboRepository; + $aboRepository->setModel($user_abo); + $aboRepository->update($data); + + return redirect(route('portal.my_subscriptions')); + } + + if (Request::ajax()) { + $message = false; + + // addProduct + if ($data['action'] === 'addProduct') { + if ($product = Product::find($data['product_id'])) { + if ($UserAboItem = UserAboItem::where('user_abo_id', $user_abo->id)->where('product_id', $product->id)->where('comp', 0)->first()) { + $qtyBefore = $UserAboItem->qty; + $UserAboItem->qty = $UserAboItem->qty + 1; + $UserAboItem->save(); + AboItemHistoryService::logProductAdded($user_abo, $UserAboItem, $qtyBefore, $view); + } else { + $newItem = UserAboItem::create([ + 'user_abo_id' => $user_abo->id, + 'product_id' => $product->id, + 'comp' => 0, + 'qty' => 1, + 'status' => 1, + ]); + AboItemHistoryService::logProductAdded($user_abo, $newItem, 0, $view); + } + } + } + + // updateCart + if ($data['action'] === 'updateCart') { + if (isset($data['product_id']) && $product = Product::find($data['product_id'])) { + if (isset($data['order_item_id']) && $UserAboItem = UserAboItem::find($data['order_item_id'])) { + if (isset($data['qty'])) { + $qtyBefore = $UserAboItem->qty; + $qty = (int) $data['qty']; + $qty = $qty < 1 ? 1 : $qty; + $qty = $qty > 100 ? 100 : $qty; + if ($isAddOnlyMode && $qty < $UserAboItem->qty) { + $qty = $UserAboItem->qty; + } + $UserAboItem->qty = $qty; + $UserAboItem->save(); + AboItemHistoryService::logQtyChanged($user_abo, $UserAboItem, $qtyBefore, $qty, $view); + } + } + } + } + + // removeFromCart + if ($data['action'] === 'removeFromCart') { + if ($isAddOnlyMode) { + return response()->json([ + 'response' => false, + 'message' => __('abo.error_add_only_no_remove'), + ], 403); + } + if (! isset($data['product_id']) || ! ($product = Product::find($data['product_id']))) { + $message = __('abo.product_not_found'); + } + if (! isset($data['order_item_id']) || ! ($userAboItem = UserAboItem::find($data['order_item_id']))) { + $message = __('abo.abo_item_not_found'); + } + $has_basis_product = $this->checkNeedBasisProduct($user_abo, $product, $data['order_item_id']); + if (! $has_basis_product) { + $message = __('abo.need_basis_product'); + } + if (! $message) { + AboItemHistoryService::logProductRemoved($user_abo, $userAboItem, $view); + $userAboItem->delete(); + $user_abo->refresh(); + } + } + + // updateCompProduct + if ($data['action'] === 'updateCompProduct') { + if ($UserAboItem = UserAboItem::where('user_abo_id', $user_abo->id)->where('comp', $data['comp_num'])->first()) { + $oldProduct = $UserAboItem->product; + $UserAboItem->product_id = $data['comp_product_id']; + $UserAboItem->save(); + $UserAboItem->load('product'); + AboItemHistoryService::logCompProductChanged($user_abo, $UserAboItem, $oldProduct, $UserAboItem->product, $view); + } else { + $newItem = UserAboItem::create([ + 'user_abo_id' => $user_abo->id, + 'product_id' => $data['comp_product_id'], + 'comp' => $data['comp_num'], + 'qty' => 1, + 'status' => 1, + ]); + AboItemHistoryService::logProductAdded($user_abo, $newItem, 0, $view); + } + } + + AboOrderCart::initYard($user_abo); + AboOrderCart::makeOrderYard($user_abo); + AboOrderCart::checkNumOfCompProducts($user_abo); + + $error_message = $message ? $message : false; + $html_cart = view('admin.abo._order_abo_show', ['user_abo' => $user_abo, 'error_message' => $error_message, 'add_only_mode' => $isAddOnlyMode])->render(); + $html_comp = view('user.order.comp_product', $data)->render(); + + $amount = $user_abo->getFormattedAmount(); + + return response()->json(['response' => true, 'data' => $data, 'html_cart' => $html_cart, 'html_comp' => $html_comp, 'amount' => $amount]); + } + } + } + + public function datatable($user_abo_id) + { + $user_abo = UserAbo::findOrFail($user_abo_id); + $this->checkPortalPermission($user_abo); + + $show_on_ids = ['12', '13']; + $query = Product::select('products.*') + ->where('active', true) + ->where(function ($q) use ($show_on_ids) { + foreach ($show_on_ids as $id) { + $q->orWhereJsonContains('show_on', $id); + } + }) + ->orderByRaw( + "CASE + WHEN JSON_CONTAINS(show_on, ?, '$') THEN 1 + WHEN JSON_CONTAINS(show_on, ?, '$') THEN 2 + ELSE 3 END", + [$show_on_ids[0], isset($show_on_ids[1]) ? $show_on_ids[1] : $show_on_ids[0]] + ); + + return \DataTables::eloquent($query) + ->addColumn('add_card', function (Product $product) { + $tax_free = Yard::instance('shopping')->getUserTaxFree(); + $price = $product->getFormattedPriceWith($tax_free, false, Yard::instance('shopping')->getUserCountry()); + + return ''; + }) + ->addColumn('picture', function (Product $product) { + if (count($product->images)) { + return ''; + } + + return ''; + }) + ->addColumn('name', function (Product $product) { + return ''.$product->getLang('name').'
'.get_abo_type_badge_by_product($product); + }) + ->addColumn('points', function (Product $product) { + return ''.$product->getFormattedPoints().''; + }) + ->addColumn('price_net', function (Product $product) { + return ''.$product->getFormattedPriceWith(true, false, Yard::instance('shopping')->getUserCountry()).' €'.''.$product->getFormattedPriceCurrencyWith(true, true, Yard::instance('shopping')->getUserCountry()).''; + }) + ->addColumn('price_gross', function (Product $product) { + return ''.$product->getFormattedPriceWith(false, false, Yard::instance('shopping')->getUserCountry()).' €'.''.$product->getFormattedPriceCurrencyWith(true, true, Yard::instance('shopping')->getUserCountry()).''; + }) + ->addColumn('action', function (Product $product) { + return ''; + }) + ->filterColumn('product', function ($query, $keyword) { + if ($keyword != '') { + $query->where('name', 'LIKE', '%'.$keyword.'%'); + } + }) + ->orderColumn('name', 'name $1') + ->orderColumn('product', 'name $1') + ->orderColumn('number', 'number $1') + ->orderColumn('points', 'points $1') + ->orderColumn('price_net', 'price_net $1') + ->orderColumn('price_gross', 'price_gross $1') + ->orderColumn('contents_total', 'contents_total $1') + ->orderColumn('weight', 'weight $1') + ->rawColumns(['add_card', 'points', 'product', 'name', 'quantity', 'picture', 'price_net', 'price_gross', 'action']) + ->make(true); + } + + public function modalLoad() + { + $data = Request::all(); + $ret = ''; + + if (isset($data['action'])) { + if ($data['action'] === 'abo-add-product') { + $user_abo = UserAbo::find($data['id']); + $this->checkPortalPermission($user_abo); + $ret = view('user.abo.modal_abo_show_products', compact('data', 'user_abo'))->render(); + } + if ($data['action'] === 'abo_update_settings') { + $user_abo = UserAbo::find($data['id']); + $this->checkPortalPermission($user_abo); + $route = route('user_abos_update', [$data['view'], $user_abo->id]); + $ret = view('admin.abo.modal_abo_update', compact('user_abo', 'data', 'route'))->render(); + } + if ($data['action'] === 'user-order-show-product') { + $product = Product::find($data['id']); + $ret = view('admin.modal.show_product', compact('product', 'data'))->render(); + } + } + + if (Request::ajax()) { + return response()->json(['response' => $data, 'html' => $ret, 'status' => true]); + } + + abort(404); + } + + public function checkNeedBasisProduct($user_abo, $product, $order_item_id) + { + if (AboHelper::getAboShowOn($product) !== 'base') { + return true; + } + + foreach ($user_abo->user_abo_items as $user_abo_item) { + if ($user_abo_item->id == $order_item_id) { + continue; + } + if ($user_abo_item->comp) { + continue; + } + if (AboHelper::getAboShowOn($user_abo_item->product) === 'base') { + return true; + } + } + + return false; + } + + private function checkPortalPermission($user_abo) + { + $user = Auth::guard('customers')->user(); + if (! $user || ! $user->shopping_user_id) { + abort(403, 'Unauthorized action.'); + } + $shopping_user = ShoppingUser::find($user->shopping_user_id); + if (! $shopping_user || $user_abo->email !== $shopping_user->billing_email) { + abort(403, 'Unauthorized action.'); + } } public function myAboCreate($step) { $user = Auth::guard('customers')->user(); - - if (!$user->shopping_user_id) { + + if (! $user->shopping_user_id) { abort(403, 'Unauthorized action.'); } $shopping_user = ShoppingUser::findOrFail($user->shopping_user_id); $data = $this->prepareAboCreateData($shopping_user, $step); - if(isset($data['checkout_url'])){ + if (isset($data['checkout_url'])) { return redirect($data['checkout_url']); } + return view('portal.abo.my_abo_create', $data); } @@ -81,16 +356,16 @@ class AboController extends Controller $data = [ 'shopping_user' => $shopping_user, 'basis_products' => Product::where('active', true) - ->whereJsonContains('show_on', ['12']) - ->orderBy('pos', 'ASC') - ->get(), + ->whereJsonContains('show_on', ['12']) + ->orderBy('pos', 'ASC') + ->get(), 'upgrade_products' => Product::where('active', true) - ->whereJsonContains('show_on', ['13']) - ->orderBy('pos', 'ASC') - ->get(), + ->whereJsonContains('show_on', ['13']) + ->orderBy('pos', 'ASC') + ->get(), 'step' => 0, ]; - if(Request::get('action') == 'back') { + if (Request::get('action') == 'back') { $step = $step - 2; } @@ -110,14 +385,14 @@ class AboController extends Controller case 3: UserService::setInstance($this->instance); UserService::initCustomerYard($shopping_user, 'abo-ot-customer'); - if(Request::get('action') == 'next'){ - if (!$this->checkBasisProduct()) { + if (Request::get('action') == 'next') { + if (! $this->checkBasisProduct()) { $data['error'] = __('abo.abo_error_basis_product'); $data['step'] = 2; } else { $data['step'] = 3; } - }else{ + } else { $data['step'] = 3; } break; @@ -128,12 +403,12 @@ class AboController extends Controller $data['step'] = 4; break; case 5: - //chekout verarbeiten + // chekout verarbeiten UserService::setInstance($this->instance); UserService::initCustomerYard($shopping_user, 'abo-ot-customer'); - if(Request::get('action') == 'checkout'){ - //checkout verarbeiten - if (!$this->preCheckCheckout()) { + if (Request::get('action') == 'checkout') { + // checkout verarbeiten + if (! $this->preCheckCheckout()) { $data['error'] = __('abo.abo_error_basis_product'); $data['step'] = 4; } else { @@ -152,8 +427,8 @@ class AboController extends Controller private function initYard($shopping_user) { $delivery_country = $shopping_user->getDeliveryCountry(true); - - if (!$delivery_country) { + + if (! $delivery_country) { abort(404, 'No delivery country found, please edit your personal data.'); } @@ -164,55 +439,55 @@ class AboController extends Controller Shop::initUserShopLang($delivery_country, $this->instance); } - private function preCheckCheckout(){ + private function preCheckCheckout() + { $result = false; - //alle inhlate des warenkorb + // alle inhlate des warenkorb $cartItems = $this->yard->content(); - foreach($cartItems as $item){ - if(in_array(12, $item->options->show_on)){ + foreach ($cartItems as $item) { + if (in_array(12, $item->options->show_on)) { $result = true; } } + return $result; } - - private function checkBasisProduct() { $data = Request::all(); $result = false; - if (!isset($data['base_product_qty'])) { + if (! isset($data['base_product_qty'])) { return false; } foreach ($data['base_product_qty'] as $product_id => $quantity) { $product = Product::find($product_id); - - if (!$product || intval($quantity) <= 0) { + + if (! $product || intval($quantity) <= 0) { continue; } $result = true; $this->addProductToCart($product, $quantity); - } return $result; } - private function upgradeProductToCart(){ + private function upgradeProductToCart() + { $data = Request::all(); $result = false; - if (!isset($data['upgrade_product_qty'])) { + if (! isset($data['upgrade_product_qty'])) { return false; } foreach ($data['upgrade_product_qty'] as $product_id => $quantity) { $product = Product::find($product_id); - - if (!$product) { + + if (! $product) { continue; } @@ -226,7 +501,7 @@ class AboController extends Controller private function addProductToCart($product, $quantity) { // Suche nach dem Produkt im Warenkorb - $cartItems = $this->yard->search(function($item) use ($product) { + $cartItems = $this->yard->search(function ($item) use ($product) { return $item->id === $product->id; }); @@ -235,13 +510,14 @@ class AboController extends Controller foreach ($cartItems as $item) { $this->yard->remove($item->rowId); } + return; } $image = $product->images->first()->slug ?? ''; $price = $product->getPriceWith( - $this->yard->getUserTaxFree(), - false, + $this->yard->getUserTaxFree(), + false, $this->yard->getUserCountry() ); @@ -265,7 +541,7 @@ class AboController extends Controller 'points' => $product->points, 'no_commission' => $product->no_commission, 'no_free_shipping' => $product->no_free_shipping, - 'show_on' => $product->show_on + 'show_on' => $product->show_on, ] ); } @@ -274,15 +550,15 @@ class AboController extends Controller $this->yard->reCalculateShippingPrice(); } - - private function processCheckout(){ + private function processCheckout() + { $user_shop = Util::getUserShop(); - if(!$user_shop){ + if (! $user_shop) { $user_shop = Util::getDefaultUserShop(); } do { $identifier = Util::getToken(); - } while( ShoppingInstance::where('identifier', $identifier)->count() ); + } while (ShoppingInstance::where('identifier', $identifier)->count()); $data = []; $data['is_from'] = 'shopping'; @@ -291,7 +567,7 @@ class AboController extends Controller ShoppingInstance::create([ 'identifier' => $identifier, 'user_shop_id' => $user_shop->id, - 'payment' => 1, //Customer Shop Payment + 'payment' => 1, // Customer Shop Payment 'subdomain' => url('/'), 'country_id' => $this->yard->getShippingCountryId(), 'language' => \App::getLocale(), @@ -299,13 +575,14 @@ class AboController extends Controller 'back' => url()->previous(), ]); - + $this->yard->store($identifier); - //add to DB - $path = route('checkout.checkout_card', ['identifier'=>$identifier]); - if(strpos($path, 'https') === false){ + // add to DB + $path = route('checkout.checkout_card', ['identifier' => $identifier]); + if (strpos($path, 'https') === false) { $path = str_replace('http', 'https', $path); } + return $path; } } diff --git a/app/Http/Controllers/Portal/CustomerController.php b/app/Http/Controllers/Portal/CustomerController.php index da5b9a7..d311977 100644 --- a/app/Http/Controllers/Portal/CustomerController.php +++ b/app/Http/Controllers/Portal/CustomerController.php @@ -2,13 +2,12 @@ namespace App\Http\Controllers\Portal; +use App\Http\Controllers\Controller; +use App\Models\ShoppingUser; +use App\Services\CustomerPriority; use Auth; use Request; use Validator; -use App\Models\ShoppingUser; -use App\Services\CustomerPriority; -use App\Http\Controllers\Controller; - class CustomerController extends Controller { @@ -22,49 +21,48 @@ class CustomerController extends Controller $this->middleware('auth:customers'); } - public function myDataEdit() { $user = Auth::guard('customers')->user(); - if($user->shopping_user_id){ + if ($user->shopping_user_id) { $shopping_user = ShoppingUser::findOrFail($user->shopping_user_id); - }else{ - $shopping_user = new ShoppingUser(); + } else { + $shopping_user = new ShoppingUser; } $data = [ 'shopping_user' => $shopping_user, 'isAdmin' => false, 'isView' => 'customer', ]; - return view('portal.customer.edit', $data); + return view('portal.customer.edit', $data); } - public function myDataStore(){ + public function myDataStore() + { $user = Auth::guard('customers')->user(); $data = Request::all(); - - if($data['action'] === 'shopping-user-store-new' || $data['action']==='shopping-user-store'){ - $rules = array( + if ($data['action'] === 'shopping-user-store-new' || $data['action'] === 'shopping-user-store') { + $rules = [ 'billing_salutation' => 'required', - 'billing_firstname'=>'required', - 'billing_lastname'=>'required', - 'billing_address'=>'required', - 'billing_zipcode'=>'required', + 'billing_firstname' => 'required', + 'billing_lastname' => 'required', + 'billing_address' => 'required', + 'billing_zipcode' => 'required', 'billing_city' => 'required', 'billing_country_id' => 'required', - ); + ]; - if(!Request::get('same_as_billing')){ + if (! Request::get('same_as_billing')) { $rules = array_merge($rules, [ - 'shipping_firstname'=>'required', - 'shipping_lastname'=>'required', - 'shipping_address'=>'required', - 'shipping_zipcode'=>'required', + 'shipping_firstname' => 'required', + 'shipping_lastname' => 'required', + 'shipping_address' => 'required', + 'shipping_zipcode' => 'required', 'shipping_city' => 'required', 'shipping_salutation' => 'required', - 'shipping_country_id' => 'required' + 'shipping_country_id' => 'required', ]); } $validator = Validator::make(Request::all(), $rules); @@ -72,28 +70,31 @@ class CustomerController extends Controller return back()->withErrors($validator)->withInput(Request::all()); } } - $data['language'] = \App::getLocale(); + $data['language'] = $data['language'] ?? \App::getLocale(); $data['same_as_billing'] = isset($data['same_as_billing']) ? true : false; $data['shipping_country_id'] = isset($data['shipping_country_id']) ? $data['shipping_country_id'] : $data['billing_country_id']; - if($user->shopping_user_id){ + if ($user->shopping_user_id) { $shopping_user = ShoppingUser::findOrFail($user->shopping_user_id); $shopping_user->fill($data); $shopping_user->save(); - }else{ + // Sprachpräferenz auch im Customer-Modell für Portal-UI synchronisieren + if (isset($data['language'])) { + $user->update(['language' => $data['language']]); + } + } else { $data['billing_email'] = $user->email; $shopping_user = ShoppingUser::create($data); $user->shopping_user_id = $shopping_user->id; + if (isset($data['language'])) { + $user->language = $data['language']; + } $user->save(); - //kundenhoheit + // kundenhoheit CustomerPriority::checkOne(ShoppingUser::find($shopping_user->id), true); - - } - \Session()->flash('alert-save', true); return redirect(route('portal.my_data.edit')); } - } diff --git a/app/Http/Controllers/Portal/OrderController.php b/app/Http/Controllers/Portal/OrderController.php index aeab71f..4145c81 100644 --- a/app/Http/Controllers/Portal/OrderController.php +++ b/app/Http/Controllers/Portal/OrderController.php @@ -5,68 +5,202 @@ namespace App\Http\Controllers\Portal; use App\Http\Controllers\Controller; use App\Models\Product; use App\Models\ShoppingOrder; +use App\Models\ShoppingPayment; use App\Models\ShoppingUser; +use App\Services\Payment; use App\Services\Shop; use App\Services\Util; use Auth; -use Request; -use Validator; use Yard; - class OrderController extends Controller { - private $instance = 'webshop'; - /** - * Create a new controller instance. - * - * @return void - */ + private string $instance = 'webshop'; + public function __construct() { $this->middleware('auth:customers'); } - + /** + * Bestellübersicht anzeigen. + */ public function myOrders() { - $user = Auth::guard('customers')->user(); - if($user->shopping_user_id){ - $shopping_user = ShoppingUser::findOrFail($user->shopping_user_id); - $shopping_orders = $shopping_user->getAllOrdersByMember(); - }else{ - $shopping_user = new ShoppingUser(); - $shopping_orders = []; - } - $data = [ - 'shopping_user' => $shopping_user, - 'shopping_orders' => $shopping_orders, - ]; - return view('portal.order.my_orders', $data); - + return view('portal.order.my_orders'); } - public function myOrderShow($id) + /** + * DataTable-Daten für Bestellübersicht (server-side). + */ + public function ordersDatatable() { $user = Auth::guard('customers')->user(); + + if (! $user->shopping_user_id) { + return \DataTables::of(collect())->make(true); + } + $shopping_user = ShoppingUser::findOrFail($user->shopping_user_id); - $shopping_order = ShoppingOrder::findOrFail($id); - if($shopping_order->shopping_user_id != $user->shopping_user_id){ + $userIds = ShoppingUser::where('billing_email', $shopping_user->billing_email) + ->where('member_id', $shopping_user->member_id) + ->pluck('id'); + + $query = ShoppingOrder::with('shopping_user') + ->select('shopping_orders.*') + ->whereIn('shopping_user_id', $userIds) + ->whereNotNull('txaction'); + + return \DataTables::eloquent($query) + ->addColumn('id', function (ShoppingOrder $order) { + return ''; + }) + ->addColumn('created_at', function (ShoppingOrder $order) { + return $order->created_at->format('d.m.Y'); + }) + ->addColumn('total_shipping', function (ShoppingOrder $order) { + return ''.$order->getFormattedTotalShipping().' €'; + }) + ->addColumn('txaction', function (ShoppingOrder $order) { + return Payment::getShoppingOrderBadge($order); + }) + ->addColumn('shipped', function (ShoppingOrder $order) { + return '' + .$order->getShippedType().''; + }) + ->addColumn('firstname', function (ShoppingOrder $order) { + return $order->shopping_user->billing_firstname ?? '-'; + }) + ->addColumn('lastname', function (ShoppingOrder $order) { + return $order->shopping_user->billing_lastname ?? '-'; + }) + ->addColumn('email', function (ShoppingOrder $order) { + return $order->shopping_user->billing_email ?? '-'; + }) + ->addColumn('invoice', function (ShoppingOrder $order) { + if ($order->isInvoice()) { + return '' + .' ' + .'' + .''; + } + + return '-'; + }) + ->addColumn('payment_for', function (ShoppingOrder $order) { + return Payment::getPaymentForBadge($order); + }) + ->orderColumn('id', 'shopping_orders.id $1') + ->orderColumn('created_at', 'shopping_orders.created_at $1') + ->orderColumn('total_shipping', 'shopping_orders.total_shipping $1') + ->orderColumn('txaction', 'shopping_orders.txaction $1') + ->orderColumn('shipped', 'shopping_orders.shipped $1') + ->rawColumns(['id', 'txaction', 'payment_for', 'total_shipping', 'invoice', 'shipped']) + ->make(true); + } + + /** + * Bestelldetail anzeigen. + */ + public function myOrderShow(int $id) + { + $user = Auth::guard('customers')->user(); + + if (! $user->shopping_user_id) { abort(403, 'Unauthorized action.'); } + + $shopping_order = ShoppingOrder::with('shopping_user', 'shopping_order_items.product.images') + ->findOrFail($id); + + $shopping_user = ShoppingUser::findOrFail($user->shopping_user_id); + if (! $this->orderBelongsToMember($shopping_order, $shopping_user)) { + abort(403, 'Unauthorized action.'); + } + return view('portal.order.my_order_show', [ 'shopping_order' => $shopping_order, 'shopping_user' => $shopping_user, ]); } - public function myOrderCreate($id) + /** + * DataTable-Daten für Zahlungen einer Bestellung (server-side). + */ + public function paymentsDatatable(int $id) + { + $user = Auth::guard('customers')->user(); + + if (! $user->shopping_user_id) { + return \DataTables::of(collect())->make(true); + } + + $shopping_order = ShoppingOrder::findOrFail($id); + $shopping_user = ShoppingUser::findOrFail($user->shopping_user_id); + + if (! $this->orderBelongsToMember($shopping_order, $shopping_user)) { + abort(403, 'Unauthorized action.'); + } + + $query = ShoppingPayment::where('shopping_order_id', $id); + + $counter = 0; + + return \DataTables::eloquent($query) + ->addColumn('line_number', function (ShoppingPayment $payment) use (&$counter) { + $counter++; + + return $counter; + }) + ->addColumn('payment_type', function (ShoppingPayment $payment) { + return $payment->getPaymentType(); + }) + ->addColumn('amount', function (ShoppingPayment $payment) { + return $payment->getPaymentAmount(); + }) + ->addColumn('status', function (ShoppingPayment $payment) { + return Payment::getShoppingPaymentBadge($payment); + }) + ->addColumn('created_at', function (ShoppingPayment $payment) { + return $payment->created_at->format('d.m.Y H:i'); + }) + ->addColumn('reference', function (ShoppingPayment $payment) { + return $payment->reference; + }) + ->rawColumns(['status']) + ->make(true); + } + + /** + * Prüft, ob Bestellung zum Mitglied gehört (billing_email + member_id). + */ + private function orderBelongsToMember(ShoppingOrder $order, ShoppingUser $member): bool + { + $orderUser = $order->shopping_user; + + return $orderUser + && $orderUser->billing_email === $member->billing_email + && $orderUser->member_id === $member->member_id; + } + + /** + * Bestellung erneut in den Warenkorb legen. + */ + public function myOrderCreate(int $id) { $user = Auth::guard('customers')->user(); $shopping_order = ShoppingOrder::findOrFail($id); - if($shopping_order->shopping_user_id != $user->shopping_user_id){ - abort(403, 'Unauthorized action.'); + + if ($shopping_order->shopping_user_id != $user->shopping_user_id) { + $shopping_user = ShoppingUser::findOrFail($user->shopping_user_id); + if (! $this->orderBelongsToMember($shopping_order, $shopping_user)) { + abort(403, 'Unauthorized action.'); + } } + $shopping_user = ShoppingUser::findOrFail($user->shopping_user_id); $delivery_country = $shopping_user->getDeliveryCountry(true); @@ -76,41 +210,50 @@ class OrderController extends Controller Shop::initUserShopLang($delivery_country, $this->instance); - //init Yard - - foreach($shopping_order->shopping_order_items as $shopping_order_item){ - if($shopping_order_item->product){ - $this->addToCard($shopping_order_item->product_id, $shopping_order_item->qty); + foreach ($shopping_order->shopping_order_items as $item) { + if ($item->product) { + $this->addToCart($item->product_id, $item->qty); } } - $url = Util::getMyMivitaShopUrl("/user/card/show"); - return redirect($url); + + return redirect(Util::getMyMivitaShopUrl('/user/card/show')); } - - private function addToCard($id, $quantity = 1) + private function addToCart(int $productId, int $quantity = 1): void { - $product = Product::find($id); - if($product){ - $image = ""; - if($product->images->count()){ - $image = $product->images->first()->slug; - } - $cartItem = Yard::instance($this->instance) - ->add($product->id, $product->getLang('name'), $quantity, - $product->getPriceWith(Yard::instance($this->instance)->getUserTaxFree(), false, Yard::instance($this->instance)->getUserCountry()), false, false, - ['image' => $image, 'slug' => $product->slug, 'weight' => $product->weight, 'points' => $product->points, 'no_commission' => $product->no_commission, 'no_free_shipping' => $product->no_free_shipping, 'show_on' => $product->show_on]); - if(Yard::instance($this->instance)->getUserTaxFree()){ - Yard::setTax($cartItem->rowId, 0); - }else{ - Yard::setTax($cartItem->rowId, $product->getTaxWith(Yard::instance($this->instance)->getUserCountry())); - } - Yard::instance($this->instance)->reCalculateShippingPrice(); - - \Session()->flash('show-card-after-add', true); + $product = Product::find($productId); + if (! $product) { + return; } + + $image = $product->images->first()?->slug ?? ''; + $yard = Yard::instance($this->instance); + + $cartItem = $yard->add( + $product->id, + $product->getLang('name'), + $quantity, + $product->getPriceWith($yard->getUserTaxFree(), false, $yard->getUserCountry()), + false, + false, + [ + 'image' => $image, + 'slug' => $product->slug, + 'weight' => $product->weight, + 'points' => $product->points, + 'no_commission' => $product->no_commission, + 'no_free_shipping' => $product->no_free_shipping, + 'show_on' => $product->show_on, + ] + ); + + if ($yard->getUserTaxFree()) { + Yard::setTax($cartItem->rowId, 0); + } else { + Yard::setTax($cartItem->rowId, $product->getTaxWith($yard->getUserCountry())); + } + + $yard->reCalculateShippingPrice(); + \Session()->flash('show-card-after-add', true); } - - - } diff --git a/app/Http/Controllers/SalesController.php b/app/Http/Controllers/SalesController.php index 63e7152..6606eac 100644 --- a/app/Http/Controllers/SalesController.php +++ b/app/Http/Controllers/SalesController.php @@ -2,20 +2,19 @@ namespace App\Http\Controllers; -use Request; -use App\Models\UserShop; -use App\Services\Payment; -use App\Models\ShoppingUser; +use App\Models\PaymentTransaction; use App\Models\ShoppingOrder; use App\Models\ShoppingPayment; -use App\Models\PaymentTransaction; -use App\Services\CustomerPriority; +use App\Models\ShoppingUser; +use App\Models\UserShop; use App\Repositories\InvoiceRepository; use App\Services\BusinessPlan\SalesPointsVolume; +use App\Services\CustomerPriority; +use App\Services\Payment; +use Request; class SalesController extends Controller { - public function __construct() { $this->middleware('admin'); @@ -28,6 +27,7 @@ class SalesController extends Controller return redirect(route('admin_sales_users')); } $data = []; + return view('admin.sales.users', $data); } @@ -48,36 +48,38 @@ class SalesController extends Controller 'isAdmin' => true, 'isView' => 'sales_user', ]; + return view('admin.sales.user_detail', $data); } public function usersStore($id) { - die("keine funktion"); + exit('keine funktion'); $data = [ 'shopping_order' => ShoppingOrder::find($id), 'isAdmin' => true, ]; + return view('admin.sales.user_detail', $data); } public function usersDatatable() { - $query = ShoppingOrder::with('shopping_user', 'user_shop', 'shopping_payments')->select('shopping_orders.*')->where('shopping_orders.auth_user_id', '!=', NULL); + $query = ShoppingOrder::with('shopping_user', 'user_shop', 'shopping_payments')->select('shopping_orders.*')->where('shopping_orders.auth_user_id', '!=', null); return \DataTables::eloquent($query) ->addColumn('id', function (ShoppingOrder $ShoppingOrder) { - return ''; + return ''; }) ->addColumn('created_at', function (ShoppingOrder $ShoppingOrder) { - return $ShoppingOrder->created_at->format("d.m.Y"); + return $ShoppingOrder->created_at->format('d.m.Y'); }) ->addColumn('txaction', function (ShoppingOrder $ShoppingOrder) { return Payment::getShoppingOrderBadge($ShoppingOrder); }) ->addColumn('total_shipping', function (ShoppingOrder $ShoppingOrder) { - return '' . $ShoppingOrder->getFormattedTotalShipping() . " €"; + return ''.$ShoppingOrder->getFormattedTotalShipping().' €'; }) ->addColumn('payment', function (ShoppingOrder $ShoppingOrder) { return $ShoppingOrder->getLastShoppingPayment('getPaymentType'); @@ -85,27 +87,28 @@ class SalesController extends Controller ->addColumn('shipped', function (ShoppingOrder $ShoppingOrder) { if ($ShoppingOrder->payment_for === 8) { return ''; + data-route="'.route('modal_load').'">'; } - return '' . $ShoppingOrder->getShippedType() . ''; + + return ''.$ShoppingOrder->getShippedType().''; }) ->addColumn('dhl_button', function (ShoppingOrder $ShoppingOrder) { - return ''; + data-route="'.route('modal_load').'">'; }) ->addColumn('payment_for', function (ShoppingOrder $ShoppingOrder) { return Payment::getPaymentForBadge($ShoppingOrder); }) ->addColumn('invoice', function (ShoppingOrder $ShoppingOrder) { - return $ShoppingOrder->isInvoice() ? ' - ' : '-'; + return $ShoppingOrder->isInvoice() ? ' + ' : '-'; }) ->addColumn('reference', function (ShoppingOrder $ShoppingOrder) { return $ShoppingOrder->getLastShoppingPayment('reference'); @@ -114,11 +117,12 @@ class SalesController extends Controller return $ShoppingOrder->shopping_user ? $ShoppingOrder->shopping_user->orders : ''; }) ->addColumn('user_shop_id', function (ShoppingOrder $ShoppingOrder) { - return $ShoppingOrder->user_shop ? '' . $ShoppingOrder->user_shop->getSubdomain(false) . '' : ''; + return $ShoppingOrder->user_shop ? ''.$ShoppingOrder->user_shop->getSubdomain(false).'' : ''; }) ->addColumn('auth_user_shop', function (ShoppingOrder $ShoppingOrder) { $auth_user_shop = UserShop::whereUserId($ShoppingOrder->auth_user_id)->first(); - return $auth_user_shop ? '' . $auth_user_shop->getSubdomain(false) . '' : '-'; + + return $auth_user_shop ? ''.$auth_user_shop->getSubdomain(false).'' : '-'; }) ->orderColumn('id', 'id $1') ->orderColumn('txaction', 'txaction $1') @@ -137,6 +141,7 @@ class SalesController extends Controller set_user_attr('filter_user_shop_id', null); set_user_attr('filter_txaction', null); set_user_attr('filter_member_id', null); + return redirect(route('admin_sales_customers')); } $filter_user_shops = ShoppingOrder::select('user_shops.id', 'user_shops.slug') @@ -146,28 +151,27 @@ class SalesController extends Controller ->pluck('slug', 'id') ->toArray(); $filter_members = ShoppingOrder::join('users', 'member_id', '=', 'users.id')->groupBy('member_id')->join('user_accounts', 'account_id', '=', 'user_accounts.id')->select('users.id', 'users.email', 'user_accounts.first_name', 'user_accounts.last_name')->get(); - //->pluck('email', 'id')->unique()->toArray(); - - + // ->pluck('email', 'id')->unique()->toArray(); $data = [ 'filter_user_shops' => $filter_user_shops, 'filter_members' => $filter_members, ]; + return view('admin.sales.customers', $data); } public function customersDetail($id) { $ShoppingOrder = ShoppingOrder::find($id); - if (!$ShoppingOrder) { + if (! $ShoppingOrder) { abort(404); } if ($ShoppingOrder->payment_for !== 6 && $ShoppingOrder->payment_for !== 7) { return redirect(route('admin_sales_users_detail', [$ShoppingOrder->id])); abort(403, 'Beraterbestellung'); } - /* + /* if($ShoppingOrder->shipped === 0){ $ShoppingOrder->shipped = 1; $ShoppingOrder->save(); @@ -178,6 +182,7 @@ class SalesController extends Controller 'isAdmin' => true, 'isView' => 'sales_customer', ]; + return view('admin.sales.customer_detail', $data); } @@ -186,46 +191,53 @@ class SalesController extends Controller $data = Request::all(); $change_member_error = false; if ($data['action'] === 'shopping-order-change-member') { - if (!isset($data['change_member_key']) || $data['change_member_key'] !== config('mivita.edit_data_pass')) { - $change_member_error = "Das Passwort ist falsch."; + if (! isset($data['change_member_key']) || $data['change_member_key'] !== config('mivita.edit_data_pass')) { + $change_member_error = 'Das Passwort ist falsch.'; } else { - //change + // change $shopping_order = ShoppingOrder::findOrFail($data['id']); CustomerPriority::newMemberForOrder($shopping_order, $data['change_member_id'], $data['customer_set_member_for']); \Session()->flash('alert-save', true); + return redirect(route('admin_sales_customers_detail', [$shopping_order->id])); } } if ($data['action'] === 'shopping-user-is-like-member') { - if (!isset($data['change_member_key']) || $data['change_member_key'] !== config('mivita.edit_data_pass')) { + if (! isset($data['change_member_key']) || $data['change_member_key'] !== config('mivita.edit_data_pass')) { \Session()->flash('alert-error', 'Das Passwort ist falsch.'); + return redirect($data['back']); } else { - if (!isset($data['is_like_shopping_user_id'])) { + if (! isset($data['is_like_shopping_user_id'])) { \Session()->flash('alert-error', 'Keine Änderung ausgewählt'); + return redirect($data['back']); } $shopping_user = ShoppingUser::findOrFail($data['id']); $set_like_shopping_user = ShoppingUser::findOrFail($data['is_like_shopping_user_id']); $send_member_mail = isset($data['send_member_mail']) ? true : false; $change_shopping_user = isset($data['change_shopping_user']) ? true : false; - //Mail send in setIsLike + // Mail send in setIsLike CustomerPriority::setIsLike($shopping_user, $set_like_shopping_user, $send_member_mail, $change_shopping_user); \Session()->flash('alert-save', true); + return redirect($data['back']); } } if ($data['action'] === 'shopping-order-change-points') { - if (!isset($data['change_member_key']) || $data['change_member_key'] !== config('mivita.edit_data_pass')) { + if (! isset($data['change_member_key']) || $data['change_member_key'] !== config('mivita.edit_data_pass')) { \Session()->flash('alert-error', 'Das Passwort ist falsch.'); + return back(); } else { - if (!isset($data['change_points'])) { + if (! isset($data['change_points'])) { \Session()->flash('alert-error', 'Keine Änderung ausgewählt'); + return back(); } $shopping_order = ShoppingOrder::findOrFail($data['id']); SalesPointsVolume::changeSalesPointsVolumeUser($shopping_order, $data['change_member_id']); + return redirect(route('admin_sales_customers_detail', [$shopping_order->id])); } } @@ -235,90 +247,94 @@ class SalesController extends Controller 'isAdmin' => true, 'isView' => 'sales_customer', ]; + return view('admin.sales.customer_detail', $data); } public function customersDatatable() { - $query = ShoppingOrder::with('shopping_user')->select('shopping_orders.*')->where('shopping_orders.auth_user_id', NULL); + $query = ShoppingOrder::with('shopping_user')->select('shopping_orders.*')->where('shopping_orders.auth_user_id', null); set_user_attr('filter_user_shop_id', Request::get('filter_user_shop_id')); - if (Request::get('filter_user_shop_id') != "") { + if (Request::get('filter_user_shop_id') != '') { $query->where('user_shop_id', '=', Request::get('filter_user_shop_id')); } set_user_attr('filter_txaction', Request::get('filter_txaction')); - if (Request::get('filter_txaction') != "") { + if (Request::get('filter_txaction') != '') { if (Request::get('filter_txaction') === 'NULL') { - $query->where('txaction', '=', NULL); + $query->where('txaction', '=', null); } else { $query->where('txaction', '=', Request::get('filter_txaction')); } } set_user_attr('filter_member_id', Request::get('filter_member_id')); - if (Request::get('filter_member_id') != "") { + if (Request::get('filter_member_id') != '') { $query->where('member_id', '=', Request::get('filter_member_id')); } return \DataTables::eloquent($query) ->addColumn('id', function (ShoppingOrder $ShoppingOrder) { - return ''; + return ''; }) ->addColumn('created_at', function (ShoppingOrder $ShoppingOrder) { - return $ShoppingOrder->created_at->format("d.m.Y"); + return $ShoppingOrder->created_at->format('d.m.Y'); }) ->addColumn('txaction', function (ShoppingOrder $ShoppingOrder) { return Payment::getShoppingOrderBadge($ShoppingOrder); }) ->addColumn('total_shipping', function (ShoppingOrder $ShoppingOrder) { - return '' . $ShoppingOrder->getFormattedTotalShipping() . " €"; + return ''.$ShoppingOrder->getFormattedTotalShipping().' €'; }) ->addColumn('payment', function (ShoppingOrder $ShoppingOrder) { if ($ShoppingOrder->txaction === 'extern_paid') { $shopping_oder_id = isset($ShoppingOrder->api_notice['shopping_order_id']) ? $ShoppingOrder->api_notice['shopping_order_id'] : null; if ($shopping_oder_id) { - return ' ' . $shopping_oder_id . ''; + return ' '.$shopping_oder_id.''; } } + return $ShoppingOrder->getLastShoppingPayment('getPaymentType'); }) ->addColumn('shipped', function (ShoppingOrder $ShoppingOrder) { - return '' . $ShoppingOrder->getShippedType() . ''; + return ''.$ShoppingOrder->getShippedType().''; }) ->addColumn('dhl_button', function (ShoppingOrder $ShoppingOrder) { - return ''; + data-route="'.route('modal_load').'">'; }) ->addColumn('payment_for', function (ShoppingOrder $ShoppingOrder) { return Payment::getPaymentForBadge($ShoppingOrder); }) ->addColumn('invoice', function (ShoppingOrder $ShoppingOrder) { if (($ShoppingOrder->txaction === 'extern' || $ShoppingOrder->txaction === 'extern_paid') && $ShoppingOrder->wp_invoice_path) { - return ' '; + return ' '; } - return $ShoppingOrder->isInvoice() ? ' - ' : '-'; + + return $ShoppingOrder->isInvoice() ? ' + ' : '-'; }) ->addColumn('reference', function (ShoppingOrder $ShoppingOrder) { return $ShoppingOrder->getLastShoppingPayment('reference'); }) ->addColumn('member_id', function (ShoppingOrder $ShoppingOrder) { if ($ShoppingOrder->member_id && $ShoppingOrder->member) { - return $ShoppingOrder->member ? '' . $ShoppingOrder->member->getFullName() . '' : 'gelöscht'; + return $ShoppingOrder->member ? ''.$ShoppingOrder->member->getFullName().'' : 'gelöscht'; } if ($ShoppingOrder->shopping_user && $ShoppingOrder->shopping_user->is_like) { return ''; + data-route="'.route('modal_load').'"> Berater zuordnen'; } + return ''; }) ->addColumn('user_shop_id', function (ShoppingOrder $ShoppingOrder) { - return $ShoppingOrder->user_shop ? '' . $ShoppingOrder->user_shop->getSubdomain(false) . '' : ''; + return $ShoppingOrder->user_shop ? ''.$ShoppingOrder->user_shop->getSubdomain(false).'' : ''; }) ->orderColumn('id', 'id $1') ->orderColumn('txaction', 'txaction $1') @@ -334,7 +350,7 @@ class SalesController extends Controller public function store() { $data = Request::all(); - if (!isset($data['id'])) { + if (! isset($data['id'])) { abort(404); } if (isset($data['action'])) { @@ -350,11 +366,11 @@ class SalesController extends Controller PaymentTransaction::create([ 'shopping_payment_id' => $shopping_payment->id, - 'request' => 'transaction', + 'request' => 'transaction', 'txid' => 0, 'userid' => 0, 'status' => 'FNCMIV', - 'transmitted_data' => NULL, + 'transmitted_data' => null, 'txaction' => $data['txaction'], 'mode' => $shopping_payment->mode, ]); @@ -365,10 +381,10 @@ class SalesController extends Controller $shopping_payment->txaction = $data['txaction']; $shopping_payment->save(); - //TODO can send MAIL - //Bei Zahlung auf Rechnung wurde die Rechnung schon erstellt, - //wenn muss hier die Storno erstellt werden - //Payment::paymentStatusSendMail($shopping_order, $shopping_payment, $data); + // TODO can send MAIL + // Bei Zahlung auf Rechnung wurde die Rechnung schon erstellt, + // wenn muss hier die Storno erstellt werden + // Payment::paymentStatusSendMail($shopping_order, $shopping_payment, $data); } } if (isset($data['back'])) { @@ -381,7 +397,7 @@ class SalesController extends Controller public function invoice() { $data = Request::all(); - if (!isset($data['id'])) { + if (! isset($data['id'])) { abort(404); } if (isset($data['action'])) { @@ -398,8 +414,56 @@ class SalesController extends Controller if (isset($data['view']) && $data['view'] === 'sales_customer') { return redirect(route('admin_sales_customers_detail', [$shopping_order->id])); } + return redirect(route('admin_sales_users_detail', [$shopping_order->id])); } } } + + /** + * Stornorechnung erstellen mit Punktekorrektur + */ + public function invoiceCancellation() + { + $data = Request::all(); + + if (! isset($data['id'])) { + abort(404); + } + + if (isset($data['action']) && $data['action'] === 'create_cancellation_invoice') { + $shopping_order = ShoppingOrder::findOrFail($data['id']); + + // Prüfen ob Rechnung existiert + if (! $shopping_order->isInvoice()) { + \Session()->flash('alert-error', 'Es existiert keine Rechnung für diese Bestellung.'); + + return redirect($data['back'] ?? route('admin_sales_users_detail', [$shopping_order->id])); + } + + // Prüfen ob bereits storniert + if ($shopping_order->isCancellationInvoice()) { + \Session()->flash('alert-error', 'Diese Rechnung wurde bereits storniert.'); + + return redirect($data['back'] ?? route('admin_sales_users_detail', [$shopping_order->id])); + } + + try { + $invoice_repo = new InvoiceRepository($shopping_order); + $cancellation_invoice = $invoice_repo->createCancellation($data); + + \Session()->flash('alert-success', 'Stornorechnung wurde erfolgreich erstellt und Punkte wurden korrigiert.'); + } catch (\Exception $e) { + \Log::error('Fehler beim Erstellen der Stornorechnung: '.$e->getMessage(), [ + 'order_id' => $shopping_order->id, + 'exception' => $e, + ]); + \Session()->flash('alert-error', 'Fehler beim Erstellen der Stornorechnung: '.$e->getMessage()); + } + + return redirect($data['back'] ?? route('admin_sales_users_detail', [$shopping_order->id])); + } + + abort(404); + } } diff --git a/app/Http/Controllers/SettingController.php b/app/Http/Controllers/SettingController.php index afe68f1..87b522d 100644 --- a/app/Http/Controllers/SettingController.php +++ b/app/Http/Controllers/SettingController.php @@ -5,11 +5,8 @@ namespace App\Http\Controllers; use App\Models\Setting; use Request; - class SettingController extends Controller { - - public function __construct() { $this->middleware('admin'); @@ -21,10 +18,10 @@ class SettingController extends Controller $data = [ 'values' => [], ]; + return view('admin.settings.index', $data); } - public function store() { $data = Request::all(); @@ -50,7 +47,9 @@ class SettingController extends Controller /** * Get DHL configuration merged from database settings and .env values - * Database settings override .env values + * Priority is controlled by DHL_CONFIG_SOURCE environment variable: + * - 'database' (default): Database settings override .env values + * - 'env': Environment/Config values override database settings */ public function getDhlConfig() { @@ -58,44 +57,49 @@ class SettingController extends Controller $isTestMode = config('dhl.legacy.test_mode', false) || config('dhl.legacy.sandbox', false); $baseUrl = $isTestMode ? config('dhl.sandbox_url') : config('dhl.base_url'); + // Determine configuration priority + $useEnvPriority = config('dhl.config_source') === 'env'; + return [ // API Settings - 'base_url' => $isTestMode ? $baseUrl : (Setting::getContentBySlug('dhl_base_url') ?: $baseUrl), - 'api_key' => Setting::getContentBySlug('dhl_api_key') ?: config('dhl.api_key'), - 'username' => Setting::getContentBySlug('dhl_username') ?: config('dhl.username'), - 'password' => Setting::getContentBySlug('dhl_password') ?: config('dhl.password'), - 'billing_number' => Setting::getContentBySlug('dhl_billing_number') ?: config('dhl.billing_number'), + 'base_url' => $isTestMode ? $baseUrl : $this->getConfigValue('dhl_base_url', $baseUrl, $useEnvPriority), + 'api_key' => $this->getConfigValue('dhl_api_key', config('dhl.api_key'), $useEnvPriority), + 'api_secret' => config('dhl.legacy.api_secret'), // Used by Tracking API + 'username' => $this->getConfigValue('dhl_username', config('dhl.username'), $useEnvPriority), + 'password' => $this->getConfigValue('dhl_password', config('dhl.password'), $useEnvPriority), + 'billing_number' => $this->getConfigValue('dhl_billing_number', config('dhl.billing_number'), $useEnvPriority), + 'sandbox' => config('dhl.legacy.sandbox', true), // Used by Tracking Service + 'test_mode' => config('dhl.legacy.test_mode', true), // Product Settings - 'default_product' => Setting::getContentBySlug('dhl_product') ?: config('dhl.default_product'), - 'label_format' => Setting::getContentBySlug('dhl_label_format') ?: config('dhl.label_format'), - 'print_format' => Setting::getContentBySlug('dhl_print_format') ?: config('dhl.print_format'), - 'retoure_print_format' => Setting::getContentBySlug('dhl_retoure_print_format') ?: config('dhl.retoure_print_format'), - 'use_queue' => Setting::getContentBySlug('dhl_use_queue') ?: config('dhl.use_queue'), + 'default_product' => $this->getConfigValue('dhl_product', config('dhl.default_product'), $useEnvPriority), + 'label_format' => $this->getConfigValue('dhl_label_format', config('dhl.label_format'), $useEnvPriority), + 'print_format' => $this->getConfigValue('dhl_print_format', config('dhl.print_format'), $useEnvPriority), + 'retoure_print_format' => $this->getConfigValue('dhl_retoure_print_format', config('dhl.retoure_print_format'), $useEnvPriority), + 'use_queue' => $this->getConfigValue('dhl_use_queue', config('dhl.use_queue'), $useEnvPriority), // Sender Address 'sender' => [ - 'company' => Setting::getContentBySlug('dhl_sender_company') ?: config('dhl.sender.company'), - 'name' => Setting::getContentBySlug('dhl_sender_name') ?: config('dhl.sender.name'), - 'street' => Setting::getContentBySlug('dhl_sender_street') ?: config('dhl.sender.street'), - 'houseNumber' => Setting::getContentBySlug('dhl_sender_house_number') ?: config('dhl.sender.houseNumber'), - 'postalCode' => Setting::getContentBySlug('dhl_sender_postal_code') ?: config('dhl.sender.postalCode'), - 'city' => Setting::getContentBySlug('dhl_sender_city') ?: config('dhl.sender.city'), - 'country' => Setting::getContentBySlug('dhl_sender_country') ?: config('dhl.sender.country'), - 'email' => Setting::getContentBySlug('dhl_sender_email') ?: config('dhl.sender.email'), - 'phone' => Setting::getContentBySlug('dhl_sender_phone') ?: config('dhl.sender.phone'), + 'company' => $this->getConfigValue('dhl_sender_company', config('dhl.sender.company'), $useEnvPriority), + 'name' => $this->getConfigValue('dhl_sender_name', config('dhl.sender.name'), $useEnvPriority), + 'street' => $this->getConfigValue('dhl_sender_street', config('dhl.sender.street'), $useEnvPriority), + 'houseNumber' => $this->getConfigValue('dhl_sender_house_number', config('dhl.sender.houseNumber'), $useEnvPriority), + 'postalCode' => $this->getConfigValue('dhl_sender_postal_code', config('dhl.sender.postalCode'), $useEnvPriority), + 'city' => $this->getConfigValue('dhl_sender_city', config('dhl.sender.city'), $useEnvPriority), + 'country' => $this->getConfigValue('dhl_sender_country', config('dhl.sender.country'), $useEnvPriority), + 'email' => $this->getConfigValue('dhl_sender_email', config('dhl.sender.email'), $useEnvPriority), + 'phone' => $this->getConfigValue('dhl_sender_phone', config('dhl.sender.phone'), $useEnvPriority), ], // Account Numbers 'account_numbers' => [ - 'V01PAK' => Setting::getContentBySlug('dhl_account_v01pak') ?: config('dhl.account_numbers.V01PAK'), - 'V62WP' => Setting::getContentBySlug('dhl_account_v62wp') ?: config('dhl.account_numbers.V62WP'), - 'V53PAK' => Setting::getContentBySlug('dhl_account_v53pak') ?: config('dhl.account_numbers.V53PAK'), - 'V07PAK' => Setting::getContentBySlug('dhl_account_v07pak') ?: config('dhl.account_numbers.V07PAK'), + 'V01PAK' => $this->getConfigValue('dhl_account_v01pak', config('dhl.account_numbers.V01PAK'), $useEnvPriority), + 'V62WP' => $this->getConfigValue('dhl_account_v62wp', config('dhl.account_numbers.V62WP'), $useEnvPriority), + 'V53PAK' => $this->getConfigValue('dhl_account_v53pak', config('dhl.account_numbers.V53PAK'), $useEnvPriority), + 'V07PAK' => $this->getConfigValue('dhl_account_v07pak', config('dhl.account_numbers.V07PAK'), $useEnvPriority), 'default' => config('dhl.account_numbers.default'), ], - // Dimensions 'dimensions' => [ 'V01PAK' => config('dhl.dimensions.V01PAK'), @@ -111,6 +115,27 @@ class SettingController extends Controller ]; } + /** + * Get configuration value based on priority setting + * + * @param string $settingSlug The database setting slug + * @param mixed $configValue The config/env fallback value + * @param bool $useEnvPriority Whether to prioritize env over database + * @return mixed + */ + private function getConfigValue(string $settingSlug, $configValue, bool $useEnvPriority) + { + $dbValue = Setting::getContentBySlug($settingSlug); + + if ($useEnvPriority) { + // ENV priority: Use config value if available, otherwise fall back to database + return $configValue ?: $dbValue; + } else { + // Database priority (default): Use database value if available, otherwise fall back to config + return $dbValue ?: $configValue; + } + } + /** * Update DHL configuration cache after saving settings */ @@ -125,7 +150,7 @@ class SettingController extends Controller // You could add a connection test here if needed \Log::info('DHL configuration updated successfully'); } catch (\Exception $e) { - \Log::error('DHL configuration update failed: ' . $e->getMessage()); + \Log::error('DHL configuration update failed: '.$e->getMessage()); } } } diff --git a/app/Http/Controllers/User/AboController.php b/app/Http/Controllers/User/AboController.php index 4584f30..e0a8af7 100644 --- a/app/Http/Controllers/User/AboController.php +++ b/app/Http/Controllers/User/AboController.php @@ -4,14 +4,13 @@ namespace App\Http\Controllers\User; use App\Http\Controllers\Controller; use App\Models\Product; -use App\Models\ShoppingUser; use App\Models\UserAbo; use App\Models\UserAboItem; use App\Repositories\AboRepository; use App\Services\AboHelper; +use App\Services\AboItemHistoryService; use App\Services\AboOrderCart; use App\Services\Shop; -use App\Services\UserService; use App\User; use Request; use Yard; @@ -41,7 +40,7 @@ class AboController extends Controller return view('user.abo.index', [ 'user_abos' => [], 'view' => 'me', - 'isAdmin' => false + 'isAdmin' => false, ]); } @@ -55,7 +54,7 @@ class AboController extends Controller return view('user.abo.index', [ 'user_abos' => $user_abos, 'view' => 'ot', - 'isAdmin' => false + 'isAdmin' => false, ]); } @@ -63,22 +62,19 @@ class AboController extends Controller return view('user.abo.index', [ 'user_abos' => [], 'view' => 'me', - 'isAdmin' => false + 'isAdmin' => false, ]); } - public function detail($view, $id) { $data = Request::all(); $user_abo = UserAbo::findOrFail($id); - - $this->checkPermissions($view, $user_abo); - //init Yard + // init Yard AboOrderCart::initYard($user_abo); - //holt die aktuellen UserAccount Daten oder die Userdaten des Abo + // holt die aktuellen UserAccount Daten oder die Userdaten des Abo $customer_detail = AboOrderCart::getCustomerDetail(); AboOrderCart::makeOrderYard($user_abo); @@ -94,113 +90,129 @@ class AboController extends Controller 'view' => $view, 'comp_products' => $comp_products, ]; + return view('user.abo.detail', $data); } - - - public function update($view, $id) { $data = Request::all(); $user_abo = UserAbo::findOrFail($id); - $this->checkPermissions($view, $user_abo); + $isAddOnlyMode = AboHelper::isAddOnlyMode($user_abo, $view); + if (isset($data['action'])) { if ($data['action'] === 'abo_update_settings') { $user_abo = UserAbo::findOrFail($data['id']); $this->aboRepository->setModel($user_abo); $this->aboRepository->update($data); + return redirect(route('user_abos_detail', [$view, $id])); } if (Request::ajax()) { $message = false; - //addProduct + // addProduct if ($data['action'] === 'addProduct') { if ($product = Product::find($data['product_id'])) { if ($UserAboItem = UserAboItem::where('user_abo_id', $user_abo->id)->where('product_id', $product->id)->where('comp', 0)->first()) { + $qtyBefore = $UserAboItem->qty; $UserAboItem->qty = $UserAboItem->qty + 1; $UserAboItem->save(); + AboItemHistoryService::logProductAdded($user_abo, $UserAboItem, $qtyBefore, $view); } else { - UserAboItem::create([ + $newItem = UserAboItem::create([ 'user_abo_id' => $user_abo->id, 'product_id' => $product->id, 'comp' => 0, 'qty' => 1, 'status' => 1, ]); + AboItemHistoryService::logProductAdded($user_abo, $newItem, 0, $view); } } } - //updateCart + // updateCart if ($data['action'] === 'updateCart') { - //product_id | order_item_id | cart_order_id | qty + // product_id | order_item_id | cart_order_id | qty if (isset($data['product_id']) && $product = Product::find($data['product_id'])) { if (isset($data['order_item_id']) && $UserAboItem = UserAboItem::find($data['order_item_id'])) { if (isset($data['qty'])) { + $qtyBefore = $UserAboItem->qty; $qty = (int) $data['qty']; $qty = $qty < 1 ? 1 : $qty; $qty = $qty > 100 ? 100 : $qty; + if ($isAddOnlyMode && $qty < $UserAboItem->qty) { + $qty = $UserAboItem->qty; + } $UserAboItem->qty = $qty; $UserAboItem->save(); + AboItemHistoryService::logQtyChanged($user_abo, $UserAboItem, $qtyBefore, $qty, $view); } } } } - //removeFromCart + // removeFromCart if ($data['action'] === 'removeFromCart') { - if (!isset($data['product_id']) || !($product = Product::find($data['product_id']))) { + if ($isAddOnlyMode) { + return response()->json([ + 'response' => false, + 'message' => __('abo.error_add_only_no_remove'), + ], 403); + } + if (! isset($data['product_id']) || ! ($product = Product::find($data['product_id']))) { $message = __('abo.product_not_found'); } - if (!isset($data['order_item_id']) || !($userAboItem = UserAboItem::find($data['order_item_id']))) { + if (! isset($data['order_item_id']) || ! ($userAboItem = UserAboItem::find($data['order_item_id']))) { $message = __('abo.abo_item_not_found'); } $has_basis_product = $this->check_need_basis_product($user_abo, $product, $data['order_item_id']); - if (!$has_basis_product) { + if (! $has_basis_product) { $message = __('abo.need_basis_product'); } - if (!$message) { - - + if (! $message) { + AboItemHistoryService::logProductRemoved($user_abo, $userAboItem, $view); $userAboItem->delete(); $user_abo->refresh(); // Abo neu laden um die aktualisierten Items zu erhalten } } - //updateCompProduct + // updateCompProduct if ($data['action'] === 'updateCompProduct') { if ($UserAboItem = UserAboItem::where('user_abo_id', $user_abo->id)->where('comp', $data['comp_num'])->first()) { + $oldProduct = $UserAboItem->product; $UserAboItem->product_id = $data['comp_product_id']; $UserAboItem->save(); + $UserAboItem->load('product'); + AboItemHistoryService::logCompProductChanged($user_abo, $UserAboItem, $oldProduct, $UserAboItem->product, $view); } else { - UserAboItem::create([ + $newItem = UserAboItem::create([ 'user_abo_id' => $user_abo->id, 'product_id' => $data['comp_product_id'], 'comp' => $data['comp_num'], 'qty' => 1, 'status' => 1, ]); + AboItemHistoryService::logProductAdded($user_abo, $newItem, 0, $view); } } - AboOrderCart::initYard($user_abo); - AboOrderCart::makeOrderYard($user_abo); //reCalculateShippingPrice - AboOrderCart::checkNumOfCompProducts($user_abo); //after reCalculateShippingPrice check it and remove or add comp product + AboOrderCart::makeOrderYard($user_abo); // reCalculateShippingPrice + AboOrderCart::checkNumOfCompProducts($user_abo); // after reCalculateShippingPrice check it and remove or add comp product if ($user_abo->is_for === 'me') { $data['comp_products'] = Shop::getCompProducts('abo-me'); } $error_message = $message ? $message : false; - $html_cart = view("admin.abo._order_abo_show", ['user_abo' => $user_abo, 'error_message' => $error_message])->render(); - $html_comp = view("user.order.comp_product", $data)->render(); + $html_cart = view('admin.abo._order_abo_show', ['user_abo' => $user_abo, 'error_message' => $error_message, 'add_only_mode' => $isAddOnlyMode])->render(); + $html_comp = view('user.order.comp_product', $data)->render(); $amount = $user_abo->getFormattedAmount(); // $html_total = view("user.homeparty.show_total_order", ['homeparty' => $homeparty])->render(); - return response()->json(['response' => true, 'data' => $data, 'html_cart' => $html_cart, 'html_comp' => $html_comp, 'amount' => $amount]); + return response()->json(['response' => true, 'data' => $data, 'html_cart' => $html_cart, 'html_comp' => $html_comp, 'amount' => $amount]); } } } @@ -212,11 +224,14 @@ class AboController extends Controller return true; } - // Prüfe ob noch ein anderes Basis-Produkt vorhanden ist + // Prüfe ob noch ein anderes Basis-Produkt vorhanden ist (nur reguläre Items, keine Comp-Produkte) foreach ($user_abo->user_abo_items as $user_abo_item) { if ($user_abo_item->id == $order_item_id) { continue; } + if ($user_abo_item->comp) { + continue; + } if (AboHelper::getAboShowOn($user_abo_item->product) === 'base') { return true; } @@ -228,11 +243,11 @@ class AboController extends Controller public function datatable($user_abo_id) { $user_abo = UserAbo::findOrFail($user_abo_id); - if (!$user_abo) { + if (! $user_abo) { abort(404); } - //$user_abo->is_for === 'me' + // $user_abo->is_for === 'me' $show_on_ids = ['12', '13']; $query = Product::select('products.*') @@ -250,45 +265,49 @@ class AboController extends Controller [$show_on_ids[0], isset($show_on_ids[1]) ? $show_on_ids[1] : $show_on_ids[0]] ); - - return \DataTables::eloquent($query) ->addColumn('add_card', function (Product $product) use ($user_abo) { $ufactor = $user_abo->is_for === 'me' ? true : false; - $tax_free = $user_abo->is_for === 'me' ? true : Yard::instance('shopping')->getUserTaxFree(); - return ''; }) ->addColumn('picture', function (Product $product) { if (count($product->images)) { - return ''; + return ''; } - return ""; + + return ''; }) - ->addColumn('name', function (Product $product) use ($user_abo) { - return '' . $product->getLang('name') . '
' . get_abo_type_badge_by_product($product); + ->addColumn('name', function (Product $product) { + return ''.$product->getLang('name').'
'.get_abo_type_badge_by_product($product); }) - ->addColumn('points', function (Product $product) use ($user_abo) { - return '' . $product->getFormattedPoints() . ''; + ->addColumn('points', function (Product $product) { + return ''.$product->getFormattedPoints().''; }) ->addColumn('price_net', function (Product $product) use ($user_abo) { $ufactor = $user_abo->is_for === 'me' ? true : false; - return '' . $product->getFormattedPriceWith(true, $ufactor, Yard::instance('shopping')->getUserCountry()) . " €" . '' . $product->getFormattedPriceCurrencyWith(true, true, Yard::instance('shopping')->getUserCountry()) . ''; + + return ''.$product->getFormattedPriceWith(true, $ufactor, Yard::instance('shopping')->getUserCountry()).' €'.''.$product->getFormattedPriceCurrencyWith(true, true, Yard::instance('shopping')->getUserCountry()).''; }) ->addColumn('price_gross', function (Product $product) use ($user_abo) { $ufactor = $user_abo->is_for === 'me' ? true : false; - return '' . $product->getFormattedPriceWith(false, $ufactor, Yard::instance('shopping')->getUserCountry()) . " €" . '' . $product->getFormattedPriceCurrencyWith(true, true, Yard::instance('shopping')->getUserCountry()) . ''; + + return ''.$product->getFormattedPriceWith(false, $ufactor, Yard::instance('shopping')->getUserCountry()).' €'.''.$product->getFormattedPriceCurrencyWith(true, true, Yard::instance('shopping')->getUserCountry()).''; }) ->addColumn('action', function (Product $product) { return ''; }) ->filterColumn('product', function ($query, $keyword) { - if ($keyword != "") { - $query->where('name', 'LIKE', '%' . $keyword . '%'); + if ($keyword != '') { + $query->where('name', 'LIKE', '%'.$keyword.'%'); } }) ->orderColumn('name', 'name $1') @@ -304,20 +323,26 @@ class AboController extends Controller ->make(true); } - - private function checkPermissions($view, $user_abo) { + \Log::info('checkPermissions', ['view' => $view, 'user_abo' => $user_abo]); + $user = \Auth::user(); + + // Admins dürfen alle Abos bearbeiten + if ($user && $user->isAdmin()) { + return; + } + if ($view === 'me' && $user_abo->is_for !== 'me') { abort(403, 'Unauthorized action. Is not for me'); } if ($view === 'ot' && $user_abo->is_for !== 'ot') { abort(403, 'Unauthorized action. Is not your customer'); } - if ($view === 'me' && $user_abo->user_id !== \Auth::user()->id) { + if ($view === 'me' && $user_abo->user_id !== $user->id) { abort(403, 'Unauthorized action. Is not my abo'); } - if ($view === 'ot' && $user_abo->member_id !== \Auth::user()->id) { + if ($view === 'ot' && $user_abo->member_id !== $user->id) { abort(403, 'Unauthorized action. Is not my customer abo'); } } diff --git a/app/Http/Controllers/User/MembershipController.php b/app/Http/Controllers/User/MembershipController.php index 40dd1f3..ef2f772 100644 --- a/app/Http/Controllers/User/MembershipController.php +++ b/app/Http/Controllers/User/MembershipController.php @@ -2,23 +2,22 @@ namespace App\Http\Controllers\User; -use Auth; -use Util; -use Yard; -use Carbon; -use Request; -use App\User; +use App\Http\Controllers\Controller; use App\Mail\MailInfo; use App\Models\Product; -use App\Services\Payment; -use App\Models\UserHistory; -use App\Models\ShoppingOrder; -use App\Services\UserService; use App\Models\ShippingCountry; use App\Models\ShoppingInstance; -use App\Http\Controllers\Controller; +use App\Models\ShoppingOrder; +use App\Models\UserHistory; +use App\Services\Payment; +use App\Services\UserService; +use App\User; +use Auth; +use Carbon; use Illuminate\Support\Facades\Mail; - +use Request; +use Util; +use Yard; class MembershipController extends Controller { @@ -32,19 +31,18 @@ class MembershipController extends Controller $this->middleware('auth'); } - public function index() { $user = User::find(Auth::user()->id); $diff_months = 0; - if($user->payment_account){ - $diff_months = Carbon::now()->diffInMonths(Carbon::parse($user->payment_account)) +1; + if ($user->payment_account) { + $diff_months = Carbon::now()->diffInMonths(Carbon::parse($user->payment_account)) + 1; } - + $userShoppingOrders = ShoppingOrder::with('shopping_user', 'shopping_payments')->select('shopping_orders.*') ->where('auth_user_id', '=', $user->id) - ->where('txaction', '!=', NULL) + ->where('txaction', '!=', null) ->whereIn('payment_for', [1, 2]) ->orderBy('created_at', 'DESC') ->get(); @@ -52,34 +50,33 @@ class MembershipController extends Controller $userHistoryPaymentOrder = null; $userHistoryUpgradeOrder = null; - /* Bezhalung ist nur 29 Tage vor ablauf möglich */ + /* Bezhalung ist nur 29 Tage vor ablauf möglich */ /* isRenewalAccount payment_account date - config('mivita.renewal_days') Vertragsverlängerung */ - if($user->isRenewalAccount()){ - //Acount ist noch nicht verlängert / bezahlt + if ($user->isRenewalAccount()) { + // Acount ist noch nicht verlängert / bezahlt if ($user->payment_account) { - //Die Order muss größer als das Datum sein. - $payment_greaterThan = Carbon::parse($user->payment_account)->modify('-'.(config('mivita.renewal_days')+1).' days'); + // Die Order muss größer als das Datum sein. + $payment_greaterThan = Carbon::parse($user->payment_account)->modify('-'.(config('mivita.renewal_days') + 1).' days'); $userHistoryPaymentOrder = UserHistory::whereUserId($user->id)->whereAction('payment_order')->where('created_at', '>=', $payment_greaterThan)->get()->last(); } } - if($user->isActiveAccount() && !$user->isActiveShop()){ - $payment_greaterThan = Carbon::parse($user->payment_account)->modify('-'.(config('mivita.renewal_days')+1).' days'); + if ($user->isActiveAccount() && ! $user->isActiveShop()) { + $payment_greaterThan = Carbon::parse($user->payment_account)->modify('-'.(config('mivita.renewal_days') + 1).' days'); $userHistoryUpgradeOrder = UserHistory::whereUserId($user->id)->whereAction('upgrade_order')->where('created_at', '>=', $payment_greaterThan)->get()->last(); } $userHistoryDeleteMembership = UserHistory::whereUserId($user->id)->whereAction('delete_membership')->whereStatus(50)->get()->last(); - $shipping_country_id = $this->checkShoppingCountry($user); - if(!$shipping_country_id){ + if (! $shipping_country_id) { abort(403, __('validation.custom.shipping_not_found')); } UserService::checkUserTaxShippingCountry($user, $shipping_country_id); - + $data = [ 'user' => $user, - 'products' => Product::where('active', true)->whereJsonContains('show_on', ['7', '8'])->orderBy('pos', 'ASC')->get(), + 'products' => Product::where('active', true)->whereJsonContains('show_on', ['7', '8'])->orderBy('pos', 'ASC')->get(), 'upgrade' => Product::where('active', true)->whereJsonContains('show_on', '8')->where('identifier', 'upgrade')->get(), 'diff_months' => $diff_months, 'userHistoryPaymentOrder' => $userHistoryPaymentOrder, @@ -88,86 +85,90 @@ class MembershipController extends Controller 'yard_info' => UserService::getYardInfo(), 'userShoppingOrders' => $userShoppingOrders, ]; + return view('user.membership.index', $data); } - private function checkShoppingCountry($user ){ + private function checkShoppingCountry($user) + { $country_id = null; - if($user->account->same_as_billing){ + if ($user->account->same_as_billing) { $country_id = $user->account->country_id; - }else{ + } else { $country_id = $user->account->shipping_country_id; } - if($country_id){ - if($shipping_country = ShippingCountry::whereCountryId($country_id)->first()){ + if ($country_id) { + if ($shipping_country = ShippingCountry::whereCountryId($country_id)->first()) { return $shipping_country->id; } } + return false; } - public function storePayment($action){ - + public function storePayment($action) + { $data = Request::all(); - //#### remove_abo - if($action === "remove_abo"){ - if(Request::get('abo_options_remove')){ + // #### remove_abo + if ($action === 'remove_abo') { + if (Request::get('abo_options_remove')) { $user = User::find(Auth::user()->id); $user->abo_options = false; $user->save(); $user->account->payment_data = null; $user->account->save(); - UserHistory::create(['user_id' => $user->id, 'action'=>'abo_options_remove', 'status'=>10]); + UserHistory::create(['user_id' => $user->id, 'action' => 'abo_options_remove', 'status' => 10]); \Session()->flash('alert-success', __('msg.abo_deaktivert')); + return back(); } \Session()->flash('alert-error', __('msg.error_checkbox_not_confirm')); + return back(); } - //#### payment order - //#### shop upgrade - if($action === "upgrade_order" || $action === "payment_order"){ - if(Request::get('switchers-package-wizard')){ + // #### payment order + // #### shop upgrade + if ($action === 'upgrade_order' || $action === 'payment_order') { + if (Request::get('switchers-package-wizard')) { $user = User::find(Auth::user()->id); Yard::instance('shopping')->destroy(); $product = Product::find(Request::get('switchers-package-wizard')); $showAboOptions = false; - if(Request::get('abo_options')){ - $showAboOptions = false; //true Abo Option deaktivert - $user->abo_options = false; //true Abo Option deaktivert + if (Request::get('abo_options')) { + $showAboOptions = false; // true Abo Option deaktivert + $user->abo_options = false; // true Abo Option deaktivert $user->save(); } $shipping_country_id = $this->checkShoppingCountry($user); - if(!$shipping_country_id){ + if (! $shipping_country_id) { abort(403, __('validation.custom.shipping_not_found')); } - + UserService::checkUserTaxShippingCountry($user, $shipping_country_id); Yard::instance('shopping')->setUserPriceInfos(UserService::getYardInfo()); Yard::instance('shopping')->setShippingCountryWithPrice($shipping_country_id); - - if($product && $product->active){ - $image = ""; - if($product->images->count()){ + if ($product && $product->active) { + $image = ''; + if ($product->images->count()) { $image = $product->images->first()->slug; } $qty = Request::get('qty') ? Request::get('qty') : 1; - $cartItem = Yard::instance('shopping')->add($product->id, $product->getLang('name'), $qty, $product->getPriceWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country), false, false, ['image' => $image, 'slug' => $product->slug, 'weight' => $product->weight, 'points' => $product->points, 'no_commission' => $product->no_commission, 'show_on' => $product->show_on]); - if(\App\Services\UserService::getTaxFree()){ + $cartItem = Yard::instance('shopping')->add($product->id, $product->getLang('name'), $qty, $product->getPriceWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country), false, false, ['image' => $image, 'slug' => $product->slug, 'weight' => $product->weight, 'points' => $product->points, 'no_commission' => $product->no_commission, 'no_free_shipping' => $product->no_free_shipping, 'show_on' => $product->show_on]); + if (\App\Services\UserService::getTaxFree()) { Yard::setTax($cartItem->rowId, 0); - }else{ + } else { Yard::setTax($cartItem->rowId, $product->getTaxWith(\App\Services\UserService::$user_country)); } do { $identifier = Util::getToken(); - } while( ShoppingInstance::where('identifier', $identifier)->count() ); + } while (ShoppingInstance::where('identifier', $identifier)->count()); $data = []; $data['is_from'] = 'membership'; @@ -176,9 +177,9 @@ class MembershipController extends Controller ShoppingInstance::create([ 'identifier' => $identifier, - 'user_shop_id' => 1, //is first faker shop for nuy intern + 'user_shop_id' => 1, // is first faker shop for nuy intern 'auth_user_id' => Auth::user()->id, - 'payment' => 3, //Berater Membership + 'payment' => 3, // Berater Membership 'subdomain' => url('/'), 'country_id' => Yard::instance('shopping')->getShippingCountryId(), 'language' => \App::getLocale(), @@ -187,54 +188,59 @@ class MembershipController extends Controller ]); Yard::instance('shopping')->store($identifier); - //add to DB - $path = route('checkout.checkout_card', ['identifier'=>$identifier]); - UserHistory::create(['user_id' => $user->id, 'action'=>$action, 'status'=>1, 'product_id'=>$product->id, 'identifier'=>$identifier, 'abo_options'=>$showAboOptions]); - //$path = str_replace('http', 'https', $path); + // add to DB + $path = route('checkout.checkout_card', ['identifier' => $identifier]); + UserHistory::create(['user_id' => $user->id, 'action' => $action, 'status' => 1, 'product_id' => $product->id, 'identifier' => $identifier, 'abo_options' => $showAboOptions]); + + // $path = str_replace('http', 'https', $path); return redirect()->secure($path); } } } - if($action === "change_order"){ - if(Request::get('switchers-package-wizard')){ + if ($action === 'change_order') { + if (Request::get('switchers-package-wizard')) { $user = User::find(Auth::user()->id); $product = Product::find(Request::get('switchers-package-wizard')); - if($user->payment_order_id == $product->id){ + if ($user->payment_order_id == $product->id) { \Session()->flash('alert-success', __('msg.no_change_made')); + return back(); } - if($product && $product->active){ + if ($product && $product->active) { $user->payment_order_id = $product->id; $user->save(); - UserHistory::create(['user_id' => $user->id, 'action'=>$action, 'status'=>10, 'product_id'=>$product->id]); + UserHistory::create(['user_id' => $user->id, 'action' => $action, 'status' => 10, 'product_id' => $product->id]); \Session()->flash('alert-success', __('msg.booked_package_has_been_changed')); + return back(); } } } - if($action === "delete_membership"){ - if(Request::get('delete_membership_mivita')){ - //TODO + if ($action === 'delete_membership') { + if (Request::get('delete_membership_mivita')) { + // TODO $user = User::find(Auth::user()->id); - if($user->isTestMode()){ + if ($user->isTestMode()) { $mail = config('app.info_test_mail'); - }else{ + } else { $mail = config('app.info_mail'); } Mail::to($mail)->send(new MailInfo($user, 'delete_membership')); - UserHistory::create(['user_id' => $user->id, 'action'=>$action, 'status'=>50]); + UserHistory::create(['user_id' => $user->id, 'action' => $action, 'status' => 50]); \Session()->flash('alert-success', __('msg.cancel_membership_is_requested')); + return back(); } \Session()->flash('alert-error', __('msg.error_checkbox_not_confirm')); + return back(); } \Session()->flash('alert-error', __('msg.error_checkbox_not_confirm')); + return back(); } - -} \ No newline at end of file +} diff --git a/app/Http/Controllers/User/OrderController.php b/app/Http/Controllers/User/OrderController.php index 466e7ee..b55bc76 100644 --- a/app/Http/Controllers/User/OrderController.php +++ b/app/Http/Controllers/User/OrderController.php @@ -11,15 +11,14 @@ use App\Models\ShoppingOrder; use App\Models\ShoppingUser; use App\Models\UserHistory; use App\Services\AboHelper; +use App\Services\MyLog; use App\Services\OrderPaymentService; use App\Services\Payment; use App\Services\Shop; use App\Services\UserService; use App\Services\Util; -use App\Services\MyLog; use App\User; use Auth; -use Illuminate\Http\Request as IlluminateRequest; use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Mail; use Request; @@ -68,20 +67,20 @@ class OrderController extends Controller $query = ShoppingOrder::with('shopping_user', 'shopping_payments') ->select('shopping_orders.*') ->where('auth_user_id', '=', $user->id) - ->where('txaction', '!=', NULL); + ->where('txaction', '!=', null); return \DataTables::eloquent($query) ->addColumn('id', function (ShoppingOrder $ShoppingOrder) { - return ''; + return ''; }) ->addColumn('created_at', function (ShoppingOrder $ShoppingOrder) { - return $ShoppingOrder->created_at->format("d.m.Y"); + return $ShoppingOrder->created_at->format('d.m.Y'); }) ->addColumn('txaction', function (ShoppingOrder $ShoppingOrder) { return Payment::getShoppingOrderBadge($ShoppingOrder); }) ->addColumn('total_shipping', function (ShoppingOrder $ShoppingOrder) { - return '' . $ShoppingOrder->getFormattedTotalShipping() . " €"; + return ''.$ShoppingOrder->getFormattedTotalShipping().' €'; }) ->addColumn('payment', function (ShoppingOrder $ShoppingOrder) { return $ShoppingOrder->getLastShoppingPayment('getPaymentType'); @@ -89,21 +88,22 @@ class OrderController extends Controller ->addColumn('shipped', function (ShoppingOrder $ShoppingOrder) { if ($ShoppingOrder->payment_for === 8) { return ''; + data-route="'.route('modal_load').'">'; } - return '' . $ShoppingOrder->getShippedType() . ''; + + return ''.$ShoppingOrder->getShippedType().''; }) ->addColumn('payment_for', function (ShoppingOrder $ShoppingOrder) { return Payment::getPaymentForBadge($ShoppingOrder); }) ->addColumn('invoice', function (ShoppingOrder $ShoppingOrder) { - return $ShoppingOrder->isInvoice() ? ' - ' : '-'; + return $ShoppingOrder->isInvoice() ? ' + ' : '-'; }) ->addColumn('reference', function (ShoppingOrder $ShoppingOrder) { return $ShoppingOrder->getLastShoppingPayment('reference'); @@ -130,16 +130,18 @@ class OrderController extends Controller $shopping_user = Shop::checkShoppingUser($id, $user); $delivery_id = $shopping_user->id; - if (!Shop::checkShoppingCountry($for, $delivery_id) && !\Session()->has('custom-error')) { + if (! Shop::checkShoppingCountry($for, $delivery_id) && ! \Session()->has('custom-error')) { $country = Shop::getDeliveryCountry($for, $delivery_id); - \Session()->flash('custom-error', $country . ": " . __('validation.custom.shipping_not_found')); + \Session()->flash('custom-error', $country.': '.__('validation.custom.shipping_not_found')); Log::channel(self::LOG_CHANNEL)->error("Shipping country not found for user #{$user->id}, country: {$country}"); + return redirect(route('user_order_my_delivery', [$for, $delivery_id])); } if ($for === 'abo-ot-customer') { - if (AboHelper::hasAboByEmail($shopping_user->billing_email) && !\Session()->has('custom-error')) { + if (AboHelper::hasAboByEmail($shopping_user->billing_email) && ! \Session()->has('custom-error')) { \Session()->flash('custom-error', __('abo.error_email_has_abo', ['email' => $shopping_user->billing_email])); + return redirect(route('user_order_my_delivery', [$for, $delivery_id])); } } @@ -150,6 +152,7 @@ class OrderController extends Controller if (strpos(Request::get('switchers-radio-is-for'), 'ot') !== false) { $delivery_id = $id; } + return redirect(route('user_order_my_list', [Request::get('switchers-radio-is-for'), $delivery_id])); } @@ -183,10 +186,11 @@ class OrderController extends Controller UserService::initCustomerYard($shopping_user, $for); } else { $shipping_country_id = Shop::checkShoppingCountry($for, $id); - if (!$shipping_country_id) { + if (! $shipping_country_id) { $country = Shop::getDeliveryCountry($for, $id); - \Session()->flash('custom-error', $country . ": " . __('validation.custom.shipping_not_found')); + \Session()->flash('custom-error', $country.': '.__('validation.custom.shipping_not_found')); Log::channel(self::LOG_CHANNEL)->warning("Shipping country not found for user #{$user->id}, country: {$country}"); + return redirect(route('user_order_my_delivery', [$for, $delivery_id])); } UserService::initUserYard($user, $shipping_country_id, $for); @@ -221,7 +225,6 @@ class OrderController extends Controller ]; $validator = Validator::make(Request::all(), $rules); - if ($validator->fails()) { return back()->withErrors($validator)->withInput(Request::all()); } @@ -229,23 +232,23 @@ class OrderController extends Controller try { $this->checkSendYardForPayment($data, $id); } catch (\Exception $e) { - Log::channel(self::LOG_CHANNEL)->error("Error checking yard for payment: " . $e->getMessage(), [ + Log::channel(self::LOG_CHANNEL)->error('Error checking yard for payment: '.$e->getMessage(), [ 'user_id' => $user->id, 'for' => $for, - 'id' => $id + 'id' => $id, ]); - return back()->with('error', $e->getMessage()); + + return back()->withErrors(['error' => $e->getMessage()])->withInput(Request::all()); } if (Yard::instance('shopping')->getNumComp() > 0) { - if (!isset($data['switchers-comp-product'])) { + if (! isset($data['switchers-comp-product'])) { $validator->errors()->add('switchers-comp-product', __('msg.please_select_compensation_product')); - } else if (!is_array($data['switchers-comp-product'])) { + } elseif (! is_array($data['switchers-comp-product'])) { $validator->errors()->add('switchers-comp-product', __('msg.please_select_compensation_product')); - } else if (count($data['switchers-comp-product']) !== Yard::instance('shopping')->getNumComp()) { + } elseif (count($data['switchers-comp-product']) !== Yard::instance('shopping')->getNumComp()) { $validator->errors()->add('switchers-comp-product', __('mdg.please_select_count_compensation_products', ['count' => Yard::instance('shopping')->getNumComp()])); } - if ($validator->errors()->count()) { return back()->withErrors($validator)->withInput(Request::all()); } @@ -268,7 +271,6 @@ class OrderController extends Controller // Remove unnecessary data unset($data['quantity']); unset($data['_token']); - if ($for === 'ot-customer' || $for === 'abo-ot-customer') { return $this->processCustomerPayment($user, $identifier, $data, $id, $for); } else { @@ -281,13 +283,14 @@ class OrderController extends Controller */ private function processCustomerPayment($user, $identifier, $data, $id, $for) { + $shopping_user = ShoppingUser::find($id); $shopping_instance = ShoppingInstance::create([ 'identifier' => $identifier, 'user_shop_id' => $user->shop->id, 'payment' => 6, // Berater Shop to Customer Shop 'subdomain' => $user->shop->getSubdomain(), 'country_id' => Yard::instance('shopping')->getShippingCountryId(), - 'language' => \App::getLocale(), + 'language' => $shopping_user->getLocale(), // hier wird die Sprache des Kunden verwendet 'amount' => Yard::instance('shopping')->totalWithShipping(2, '.', ''), 'status' => 0, 'shopping_user_id' => $id, @@ -302,9 +305,9 @@ class OrderController extends Controller try { $this->customPaymentSendMail($user, $identifier, $yard_shopping_items, $data); } catch (\Exception $e) { - Log::channel(self::LOG_CHANNEL)->error("Failed to send custom payment email: " . $e->getMessage(), [ + Log::channel(self::LOG_CHANNEL)->error('Failed to send custom payment email: '.$e->getMessage(), [ 'identifier' => $identifier, - 'user_id' => $user->id + 'user_id' => $user->id, ]); } @@ -314,7 +317,7 @@ class OrderController extends Controller 'status' => 1, 'product_id' => null, 'identifier' => $identifier, - 'is_abo' => $data['is_abo'] + 'is_abo' => $data['is_abo'], ]); return redirect(route('user_order_my_custom_payment', ['identifier' => $identifier])); @@ -333,7 +336,7 @@ class OrderController extends Controller 'payment' => 2, // Berater Shop 'subdomain' => url('/'), 'country_id' => Yard::instance('shopping')->getShippingCountryId(), - 'language' => \App::getLocale(), + 'language' => \App::getLocale(), // das ist richtig, hier wird die App-Locale verwendet da es vom user kommt 'amount' => Yard::instance('shopping')->totalWithShipping(2, '.', ''), 'status' => 0, 'shopping_user_id' => $id, @@ -349,10 +352,11 @@ class OrderController extends Controller 'status' => 1, 'product_id' => null, 'identifier' => $identifier, - 'is_abo' => $data['is_abo'] + 'is_abo' => $data['is_abo'], ]); $path = route('checkout.checkout_card', ['identifier' => $identifier]); + return redirect()->secure($path); } @@ -369,68 +373,68 @@ class OrderController extends Controller } $shipping_country_id = Shop::checkShoppingCountry($data['shipping_is_for'], $id); - if (!$shipping_country_id) { - $identifier = 'error-' . time() . mt_rand(1000000, 9999999); + if (! $shipping_country_id) { + $identifier = 'error-'.time().mt_rand(1000000, 9999999); Yard::instance('shopping')->store($identifier); $logData = [ 'user_id' => Auth::user()->id, 'shopping_user_id' => $id, - 'yard_identifier' => $identifier + 'yard_identifier' => $identifier, ]; - MyLog::writeLog('payment', 'error', 'no shipping_country_id found | Yard identifier: ' . $identifier, $data); - Log::channel(self::LOG_CHANNEL)->error("Shipping country not found", $logData); + MyLog::writeLog('payment', 'error', 'no shipping_country_id found | Yard identifier: '.$identifier, $data); + Log::channel(self::LOG_CHANNEL)->error('Shipping country not found', $logData); throw new \Exception(__('msg.shipping_country_was_not_found')); } // Must be the same shipping country if ($shipping_country_id != Yard::instance('shopping')->getShippingCountryId()) { - $identifier = 'error-' . time() . mt_rand(1000000, 9999999); + $identifier = 'error-'.time().mt_rand(1000000, 9999999); Yard::instance('shopping')->store($identifier); $logData = [ 'user_id' => Auth::user()->id, 'shopping_user_id' => $id, 'yard_identifier' => $identifier, 'expected' => $shipping_country_id, - 'actual' => Yard::instance('shopping')->getShippingCountryId() + 'actual' => Yard::instance('shopping')->getShippingCountryId(), ]; - MyLog::writeLog('payment', 'error', 'shipping_country_id is not the same from Yard | Yard identifier: ' . $identifier, $data); - Log::channel(self::LOG_CHANNEL)->error("Shipping country mismatch", $logData); + MyLog::writeLog('payment', 'error', 'shipping_country_id is not the same from Yard | Yard identifier: '.$identifier, $data); + Log::channel(self::LOG_CHANNEL)->error('Shipping country mismatch', $logData); throw new \Exception(__('msg.shipping_country_was_not_correctly')); } if ($data['shipping_is_for'] !== 'ot-customer') { if (Yard::instance('shopping')->shipping_free) { - $identifier = 'error-' . time() . mt_rand(1000000, 9999999); + $identifier = 'error-'.time().mt_rand(1000000, 9999999); Yard::instance('shopping')->store($identifier); $logData = [ 'user_id' => Auth::user()->id, 'shopping_user_id' => $id, - 'yard_identifier' => $identifier + 'yard_identifier' => $identifier, ]; - MyLog::writeLog('payment', 'error', 'Yard can by not shipping_free | Yard identifier: ' . $identifier, $data); - Log::channel(self::LOG_CHANNEL)->error("Yard cannot be shipping free", $logData); + MyLog::writeLog('payment', 'error', 'Yard can by not shipping_free | Yard identifier: '.$identifier, $data); + Log::channel(self::LOG_CHANNEL)->error('Yard cannot be shipping free', $logData); throw new \Exception(__('msg.shopping_cart_was_shipping_free')); } } if ($data['shipping_is_for'] === 'ot-customer') { - if (!$user->shop) { - $identifier = 'error-' . time() . mt_rand(1000000, 9999999); + if (! $user->shop) { + $identifier = 'error-'.time().mt_rand(1000000, 9999999); Yard::instance('shopping')->store($identifier); $logData = [ 'user_id' => Auth::user()->id, 'shopping_user_id' => $id, - 'yard_identifier' => $identifier + 'yard_identifier' => $identifier, ]; - MyLog::writeLog('payment', 'error', 'User has no Shop for an User to Customer order| Yard identifier: ' . $identifier, $data); - Log::channel(self::LOG_CHANNEL)->error("User has no shop for customer order", $logData); + MyLog::writeLog('payment', 'error', 'User has no Shop for an User to Customer order| Yard identifier: '.$identifier, $data); + Log::channel(self::LOG_CHANNEL)->error('User has no shop for customer order', $logData); throw new \Exception(__('msg.shopping_cart_was_not_user_shop')); } @@ -438,107 +442,130 @@ class OrderController extends Controller $shipping_price = Shop::getShippingPriceByShippingCountryId($shipping_country_id, Yard::instance('shopping')->weight()); - // For other and has weight - check + // For other and has weight - check if (strpos($data['shipping_is_for'], 'ot') !== false && $data['shipping_is_for'] !== 'ot-customer' && Yard::instance('shopping')->weight() > 0) { - if (!Yard::instance('shopping')->getShippingPrice() || Yard::instance('shopping')->getShippingPrice() == 0) { - $identifier = 'error-' . time() . mt_rand(1000000, 9999999); - Yard::instance('shopping')->store($identifier); - $logData = [ - 'user_id' => Auth::user()->id, - 'shopping_user_id' => $id, - 'yard_identifier' => $identifier, - 'weight' => Yard::instance('shopping')->weight() - ]; + // Prüfe ob Versandkostenfreiheit durch Freigrenze legitimiert ist + $shipping_free = Yard::instance('shopping')->getShippingFree(); + $total = Yard::instance('shopping')->total(2, '.', ''); + $isFreeDueToThreshold = $shipping_free && $total >= $shipping_free && Yard::instance('shopping')->weightByFreeShipping() == 0; - MyLog::writeLog('payment', 'error', 'Yard OT shipping_price is 0 | Yard identifier: ' . $identifier, $data); - Log::channel(self::LOG_CHANNEL)->error("Shipping price cannot be zero for order with weight", $logData); + if (! Yard::instance('shopping')->getShippingPrice() || Yard::instance('shopping')->getShippingPrice() == 0) { + // Nur Fehler werfen, wenn Versandpreis 0 NICHT durch Freigrenze legitimiert ist + if (! $isFreeDueToThreshold) { + $identifier = 'error-'.time().mt_rand(1000000, 9999999); + Yard::instance('shopping')->store($identifier); + $logData = [ + 'user_id' => Auth::user()->id, + 'shopping_user_id' => $id, + 'yard_identifier' => $identifier, + 'weight' => Yard::instance('shopping')->weight(), + 'total' => $total, + 'shipping_free' => $shipping_free, + ]; - throw new \Exception(__('msg.shipping_cost_cannot_be_0')); + MyLog::writeLog('payment', 'error', 'Yard OT shipping_price is 0 | Yard identifier: '.$identifier, $data); + Log::channel(self::LOG_CHANNEL)->error('Shipping price cannot be zero for order with weight', $logData); + + throw new \Exception(__('msg.shipping_cost_cannot_be_0')); + } } - if (Yard::instance('shopping')->getShippingPrice() != $shipping_price->price) { - $identifier = 'error-' . time() . mt_rand(1000000, 9999999); + // Preisvergleich nur durchführen, wenn NICHT versandkostenfrei durch Freigrenze + if (! $isFreeDueToThreshold && Yard::instance('shopping')->getShippingPrice() != $shipping_price->price) { + $identifier = 'error-'.time().mt_rand(1000000, 9999999); Yard::instance('shopping')->store($identifier); $logData = [ 'user_id' => Auth::user()->id, 'shopping_user_id' => $id, 'yard_identifier' => $identifier, 'expected' => $shipping_price->price, - 'actual' => Yard::instance('shopping')->getShippingPrice() + 'actual' => Yard::instance('shopping')->getShippingPrice(), ]; - MyLog::writeLog('payment', 'error', 'Yard OT shipping_price is not the same from shipping_price | Yard identifier: ' . $identifier, $data); - Log::channel(self::LOG_CHANNEL)->error("Shipping price mismatch", $logData); + MyLog::writeLog('payment', 'error', 'Yard OT shipping_price is not the same from shipping_price | Yard identifier: '.$identifier, $data); + Log::channel(self::LOG_CHANNEL)->error('Shipping price mismatch', $logData); throw new \Exception(__('msg.shipping_costs_were_not_calculated_correctly')); } } if (($data['shipping_is_for'] == 'me' || $data['shipping_is_for'] == 'abo-me') && Yard::instance('shopping')->weight() > 0) { - if (!Yard::instance('shopping')->getShippingPrice() || Yard::instance('shopping')->getShippingPrice() == 0) { - $identifier = 'error-' . time() . mt_rand(1000000, 9999999); - Yard::instance('shopping')->store($identifier); - $logData = [ - 'user_id' => Auth::user()->id, - 'shopping_user_id' => $id, - 'yard_identifier' => $identifier, - 'weight' => Yard::instance('shopping')->weight() - ]; + // Prüfe ob Versandkostenfreiheit durch Freigrenze legitimiert ist + $shipping_free = Yard::instance('shopping')->getShippingFree(); + $total = Yard::instance('shopping')->total(2, '.', ''); + $isFreeDueToThreshold = $shipping_free && $total >= $shipping_free && Yard::instance('shopping')->weightByFreeShipping() == 0; - MyLog::writeLog('payment', 'error', 'Yard ME shipping_price is 0 | Yard identifier: ' . $identifier, $data); - Log::channel(self::LOG_CHANNEL)->error("Shipping price cannot be zero for personal order with weight", $logData); + if (! Yard::instance('shopping')->getShippingPrice() || Yard::instance('shopping')->getShippingPrice() == 0) { + // Nur Fehler werfen, wenn Versandpreis 0 NICHT durch Freigrenze legitimiert ist + if (! $isFreeDueToThreshold) { + $identifier = 'error-'.time().mt_rand(1000000, 9999999); + Yard::instance('shopping')->store($identifier); + $logData = [ + 'user_id' => Auth::user()->id, + 'shopping_user_id' => $id, + 'yard_identifier' => $identifier, + 'weight' => Yard::instance('shopping')->weight(), + 'total' => $total, + 'shipping_free' => $shipping_free, + ]; - throw new \Exception(__('msg.shipping_cost_cannot_be_0')); + MyLog::writeLog('payment', 'error', 'Yard ME shipping_price is 0 | Yard identifier: '.$identifier, $data); + Log::channel(self::LOG_CHANNEL)->error('Shipping price cannot be zero for personal order with weight', $logData); + + throw new \Exception(__('msg.shipping_cost_cannot_be_0')); + } } if (Shop::isCompProducts($data['shipping_is_for'])) { - if (Yard::instance('shopping')->getShippingPrice() != $shipping_price->price_comp) { - $identifier = 'error-' . time() . mt_rand(1000000, 9999999); + // Preisvergleich nur durchführen, wenn NICHT versandkostenfrei durch Freigrenze + if (! $isFreeDueToThreshold && Yard::instance('shopping')->getShippingPrice() != $shipping_price->price_comp) { + $identifier = 'error-'.time().mt_rand(1000000, 9999999); Yard::instance('shopping')->store($identifier); $logData = [ 'user_id' => Auth::user()->id, 'shopping_user_id' => $id, 'yard_identifier' => $identifier, 'expected' => $shipping_price->price_comp, - 'actual' => Yard::instance('shopping')->getShippingPrice() + 'actual' => Yard::instance('shopping')->getShippingPrice(), ]; - MyLog::writeLog('payment', 'error', 'Yard ME shipping_price is not the same from shipping_price with comp products | Yard identifier: ' . $identifier, $data); - Log::channel(self::LOG_CHANNEL)->error("Shipping price mismatch for personal order", $logData); + MyLog::writeLog('payment', 'error', 'Yard ME shipping_price is not the same from shipping_price with comp products | Yard identifier: '.$identifier, $data); + Log::channel(self::LOG_CHANNEL)->error('Shipping price mismatch for personal order', $logData); throw new \Exception(__('msg.shipping_costs_were_not_calculated_correctly')); } if (Yard::instance('shopping')->getNumComp() != $shipping_price->num_comp) { - $identifier = 'error-' . time() . mt_rand(1000000, 9999999); + $identifier = 'error-'.time().mt_rand(1000000, 9999999); Yard::instance('shopping')->store($identifier); $logData = [ 'user_id' => Auth::user()->id, 'shopping_user_id' => $id, 'yard_identifier' => $identifier, 'expected' => $shipping_price->num_comp, - 'actual' => Yard::instance('shopping')->getNumComp() + 'actual' => Yard::instance('shopping')->getNumComp(), ]; - MyLog::writeLog('payment', 'error', 'Yard num_comp is not correct | Yard identifier: ' . $identifier, $data); - Log::channel(self::LOG_CHANNEL)->error("Compensation product count mismatch", $logData); + MyLog::writeLog('payment', 'error', 'Yard num_comp is not correct | Yard identifier: '.$identifier, $data); + Log::channel(self::LOG_CHANNEL)->error('Compensation product count mismatch', $logData); throw new \Exception(__('msg.compensation_products_cannot_be_0')); } } else { - if (Yard::instance('shopping')->getShippingPrice() != $shipping_price->price) { - $identifier = 'error-' . time() . mt_rand(1000000, 9999999); + // Preisvergleich nur durchführen, wenn NICHT versandkostenfrei durch Freigrenze + if (! $isFreeDueToThreshold && Yard::instance('shopping')->getShippingPrice() != $shipping_price->price) { + $identifier = 'error-'.time().mt_rand(1000000, 9999999); Yard::instance('shopping')->store($identifier); $logData = [ 'user_id' => Auth::user()->id, 'shopping_user_id' => $id, 'yard_identifier' => $identifier, 'expected' => $shipping_price->price, - 'actual' => Yard::instance('shopping')->getShippingPrice() + 'actual' => Yard::instance('shopping')->getShippingPrice(), ]; - MyLog::writeLog('payment', 'error', 'Yard ME shipping_price is not the same from shipping_price without comp products | Yard identifier: ' . $identifier, $data); - Log::channel(self::LOG_CHANNEL)->error("Shipping price mismatch for personal order", $logData); + MyLog::writeLog('payment', 'error', 'Yard ME shipping_price is not the same from shipping_price without comp products | Yard identifier: '.$identifier, $data); + Log::channel(self::LOG_CHANNEL)->error('Shipping price mismatch for personal order', $logData); throw new \Exception(__('msg.shipping_costs_were_not_calculated_correctly')); } @@ -593,15 +620,16 @@ class OrderController extends Controller $cartItem = Yard::instance('shopping')->getCartItemByProduct($product->id); $qty = isset($cartItem->qty) ? $cartItem->qty : 0; $rowId = isset($cartItem->rowId) ? $cartItem->rowId : ''; - return '' . $product->getLang('name') . '
+ + return ''.$product->getLang('name').'
- + - + - +
'; @@ -611,39 +639,40 @@ class OrderController extends Controller }) ->addColumn('picture', function (Product $product) { if (count($product->images)) { - return ''; + return ''; } - return ""; + + return ''; }) ->addColumn('points', function (Product $product) { - return '' . $product->getFormattedPoints() . ''; + return ''.$product->getFormattedPoints().''; }) ->addColumn('price_net', function (Product $product) { - return '' . $product->getFormattedPriceWith(true, true, Yard::instance('shopping')->getUserCountry()) . " €" . '' . $product->getFormattedPriceCurrencyWith(true, true, Yard::instance('shopping')->getUserCountry()) . ''; + return ''.$product->getFormattedPriceWith(true, true, Yard::instance('shopping')->getUserCountry()).' €'.''.$product->getFormattedPriceCurrencyWith(true, true, Yard::instance('shopping')->getUserCountry()).''; }) ->addColumn('price_gross', function (Product $product) { - return '' . $product->getFormattedPriceWith(false, true, Yard::instance('shopping')->getUserCountry()) . " €" . '' . $product->getFormattedPriceCurrencyWith(false, true, Yard::instance('shopping')->getUserCountry()) . ''; + return ''.$product->getFormattedPriceWith(false, true, Yard::instance('shopping')->getUserCountry()).' €'.''.$product->getFormattedPriceCurrencyWith(false, true, Yard::instance('shopping')->getUserCountry()).''; }) ->addColumn('price_vk_gross', function (Product $product) { - return '' . $product->getFormattedPriceWith(false, false, Yard::instance('shopping')->getUserCountry()) . " €" . '' . $product->getFormattedPriceCurrencyWith(false, false, Yard::instance('shopping')->getUserCountry()) . ''; + return ''.$product->getFormattedPriceWith(false, false, Yard::instance('shopping')->getUserCountry()).' €'.''.$product->getFormattedPriceCurrencyWith(false, false, Yard::instance('shopping')->getUserCountry()).''; }) ->addColumn('customer_price_net', function (Product $product) { - return '' . $product->getFormattedPriceWith(true, false, Yard::instance('shopping')->getUserCountry()) . " €" . '' . $product->getFormattedPriceCurrencyWith(true, false, Yard::instance('shopping')->getUserCountry()) . ''; + return ''.$product->getFormattedPriceWith(true, false, Yard::instance('shopping')->getUserCountry()).' €'.''.$product->getFormattedPriceCurrencyWith(true, false, Yard::instance('shopping')->getUserCountry()).''; }) ->addColumn('customer_price_gross', function (Product $product) { - return '' . $product->getFormattedPriceWith(false, false, Yard::instance('shopping')->getUserCountry()) . " €" . '' . $product->getFormattedPriceCurrencyWith(false, false, Yard::instance('shopping')->getUserCountry()) . ''; + return ''.$product->getFormattedPriceWith(false, false, Yard::instance('shopping')->getUserCountry()).' €'.''.$product->getFormattedPriceCurrencyWith(false, false, Yard::instance('shopping')->getUserCountry()).''; }) ->addColumn('my_commission_net', function (Product $product) { - return '' . $product->getFormattedPriceWith(true, false, Yard::instance('shopping')->getUserCountry(), true) . " €" . '' . $product->getFormattedPriceCurrencyWith(true, false, Yard::instance('shopping')->getUserCountry(), true) . ''; + return ''.$product->getFormattedPriceWith(true, false, Yard::instance('shopping')->getUserCountry(), true).' €'.''.$product->getFormattedPriceCurrencyWith(true, false, Yard::instance('shopping')->getUserCountry(), true).''; }) ->addColumn('action', function (Product $product) { return ''; }) ->filterColumn('product', function ($query, $keyword) { - if ($keyword != "") { - $query->where('name', 'LIKE', '%' . $keyword . '%'); + if ($keyword != '') { + $query->where('name', 'LIKE', '%'.$keyword.'%'); } }) ->orderColumn('name', 'name $1') @@ -668,8 +697,9 @@ class OrderController extends Controller */ public function performRequest() { - if (!Request::ajax()) { - Log::channel(self::LOG_CHANNEL)->warning("Non-AJAX request to performRequest method"); + if (! Request::ajax()) { + Log::channel(self::LOG_CHANNEL)->warning('Non-AJAX request to performRequest method'); + return response()->json(['response' => false, 'message' => 'Only AJAX requests are allowed']); } @@ -678,9 +708,9 @@ class OrderController extends Controller $data['for'] = $is_for; $data['comp_products'] = Shop::getCompProducts($is_for); - Log::channel(self::LOG_CHANNEL)->info("Performing cart action", [ + Log::channel(self::LOG_CHANNEL)->info('Performing cart action', [ 'action' => $data['action'] ?? 'unknown', - 'is_for' => $is_for + 'is_for' => $is_for, ]); if ($data['action'] === 'updateCart' && isset($data['product_id'])) { @@ -689,6 +719,7 @@ class OrderController extends Controller if ($data['action'] === 'clearCart') { Yard::instance('shopping')->destroy(); + return response()->json(['response' => true, 'data' => Yard::instance('shopping')->count(), 'html_card' => '', 'html_comp' => '']); } @@ -700,7 +731,8 @@ class OrderController extends Controller return $this->handleUpdateCompProduct($data, $is_for); } - Log::channel(self::LOG_CHANNEL)->warning("Unknown action in performRequest", ['action' => $data['action'] ?? 'not set']); + Log::channel(self::LOG_CHANNEL)->warning('Unknown action in performRequest', ['action' => $data['action'] ?? 'not set']); + return response()->json(['response' => false, 'data' => $data]); } @@ -710,12 +742,13 @@ class OrderController extends Controller private function handleUpdateCart($data, $is_for) { $product = Product::find($data['product_id']); - if (!$product) { - Log::channel(self::LOG_CHANNEL)->warning("Product not found for cart update", ['product_id' => $data['product_id']]); + if (! $product) { + Log::channel(self::LOG_CHANNEL)->warning('Product not found for cart update', ['product_id' => $data['product_id']]); + return response()->json(['response' => false, 'message' => 'Product not found']); } - $image = ""; + $image = ''; if ($product->images->count()) { $image = $product->images->first()->slug; } @@ -730,7 +763,7 @@ class OrderController extends Controller round($product->getPriceWith(Yard::instance('shopping')->getUserTaxFree(), false, Yard::instance('shopping')->getUserCountry()), 1), false, false, - ['image' => $image, 'slug' => $product->slug, 'weight' => $product->weight, 'points' => $product->points, 'no_commission' => $product->no_commission, 'show_on' => $product->show_on] + ['image' => $image, 'slug' => $product->slug, 'weight' => $product->weight, 'points' => $product->points, 'no_commission' => $product->no_commission, 'no_free_shipping' => $product->no_free_shipping, 'show_on' => $product->show_on] ); } else { $cartItem = Yard::instance('shopping') @@ -741,7 +774,7 @@ class OrderController extends Controller $product->getPriceWith(Yard::instance('shopping')->getUserTaxFree(), true, Yard::instance('shopping')->getUserCountry()), false, false, - ['image' => $image, 'slug' => $product->slug, 'weight' => $product->weight, 'points' => $product->points, 'no_commission' => $product->no_commission, 'show_on' => $product->show_on] + ['image' => $image, 'slug' => $product->slug, 'weight' => $product->weight, 'points' => $product->points, 'no_commission' => $product->no_commission, 'no_free_shipping' => $product->no_free_shipping, 'show_on' => $product->show_on] ); } @@ -761,8 +794,8 @@ class OrderController extends Controller Yard::instance('shopping')->reCalculateShippingPrice(); $this->checkCompProduct(Yard::instance('shopping')->getNumComp()); - $html_card = view("user.order.yard_view_form", $data)->render(); - $html_comp = view("user.order.comp_product", $data)->render(); + $html_card = view('user.order.yard_view_form', $data)->render(); + $html_comp = view('user.order.comp_product', $data)->render(); return response()->json(['response' => true, 'data' => $data, 'html_card' => $html_card, 'html_comp' => $html_comp]); } @@ -778,14 +811,14 @@ class OrderController extends Controller Yard::instance('shopping')->setShippingCountryWithPrice($shipping_country->id, $is_for); $this->checkCompProduct(Yard::instance('shopping')->getNumComp()); } else { - Log::channel(self::LOG_CHANNEL)->warning("Shipping country not found", [ - 'shipping_country_id' => $data['shipping_country_id'] + Log::channel(self::LOG_CHANNEL)->warning('Shipping country not found', [ + 'shipping_country_id' => $data['shipping_country_id'], ]); } } - $html_card = view("user.order.yard_view_form", $data)->render(); - $html_comp = view("user.order.comp_product", $data)->render(); + $html_card = view('user.order.yard_view_form', $data)->render(); + $html_comp = view('user.order.comp_product', $data)->render(); return response()->json(['response' => true, 'data' => $data, 'html_card' => $html_card, 'html_comp' => $html_comp]); } @@ -798,8 +831,8 @@ class OrderController extends Controller $this->updateCompProduct($data); Yard::instance('shopping')->reCalculateShippingPrice(); - $html_card = view("user.order.yard_view_form", $data)->render(); - $html_comp = view("user.order.comp_product", $data)->render(); + $html_card = view('user.order.yard_view_form', $data)->render(); + $html_comp = view('user.order.comp_product', $data)->render(); return response()->json(['response' => true, 'data' => $data, 'html_card' => $html_card, 'html_comp' => $html_comp]); } @@ -826,8 +859,8 @@ class OrderController extends Controller foreach (Yard::instance('shopping')->content() as $row) { // If count_comp_products is smaller, the product was removed due to quantity // if comp_num equals the comp product, the product was removed due to new shipping costs - //count_comp_products wie viele comp products werden gebraucht - //comp_num welches comp product wird hinzugefügt + // count_comp_products wie viele comp products werden gebraucht + // comp_num welches comp product wird hinzugefügt if ($row->options->comp && ($row->options->comp == intval($data['comp_num']) || $row->options->comp > intval($data['count_comp_products']))) { Yard::instance('shopping')->remove($row->rowId); } @@ -836,7 +869,7 @@ class OrderController extends Controller if (isset($data['comp_product_id'])) { $product = Product::find($data['comp_product_id']); if ($product) { - $image = ""; + $image = ''; if ($product->images->count()) { $image = $product->images->first()->slug; } @@ -853,14 +886,14 @@ class OrderController extends Controller 'weight' => 0, 'points' => 0, 'comp' => intval($data['comp_num']), - 'product_id' => $product->id + 'product_id' => $product->id, ] ); Yard::setTax($cartItem->rowId, 0); } else { - Log::channel(self::LOG_CHANNEL)->warning("Compensation product not found", [ - 'comp_product_id' => $data['comp_product_id'] + Log::channel(self::LOG_CHANNEL)->warning('Compensation product not found', [ + 'comp_product_id' => $data['comp_product_id'], ]); } } @@ -873,9 +906,10 @@ class OrderController extends Controller { try { $data = OrderPaymentService::getCustomPayment($identifier); + return view('user.order.payment.custom_payment', $data); } catch (\Exception $e) { - Log::channel(self::LOG_CHANNEL)->error("Error accessing custom payment: " . $e->getMessage(), ['identifier' => $identifier]); + Log::channel(self::LOG_CHANNEL)->error('Error accessing custom payment: '.$e->getMessage(), ['identifier' => $identifier]); abort(404, 'Custom payment not found'); } } @@ -888,22 +922,22 @@ class OrderController extends Controller $bcc = []; $shopping_instance = ShoppingInstance::where('identifier', $identifier)->first(); - if (!$shopping_instance) { - Log::channel(self::LOG_CHANNEL)->error("Shopping instance not found for email", ['identifier' => $identifier]); + if (! $shopping_instance) { + Log::channel(self::LOG_CHANNEL)->error('Shopping instance not found for email', ['identifier' => $identifier]); throw new \Exception(__('msg.shopping_instance_not_found')); } $shopping_user = $data['shopping_user_id'] ? ShoppingUser::find($data['shopping_user_id']) : null; - if (!$shopping_user) { - Log::channel(self::LOG_CHANNEL)->error("Shopping user not found for email", ['shopping_user_id' => $data['shopping_user_id']]); + if (! $shopping_user) { + Log::channel(self::LOG_CHANNEL)->error('Shopping user not found for email', ['shopping_user_id' => $data['shopping_user_id']]); throw new \Exception(__('msg.shopping_user_not_found')); } $route = route('checkout.checkout_card', ['identifier' => $identifier]); $billing_email = $shopping_user->billing_email; - if (!$billing_email) { + if (! $billing_email) { $billing_email = $data['mode'] === 'test' ? config('app.checkout_test_mail') : config('app.checkout_mail'); } diff --git a/app/Http/Controllers/User/PaymentController.php b/app/Http/Controllers/User/PaymentController.php index dd340f3..894f94c 100644 --- a/app/Http/Controllers/User/PaymentController.php +++ b/app/Http/Controllers/User/PaymentController.php @@ -1,28 +1,28 @@ middleware('auth'); - /* $this->startYear = 2021; + /* $this->startYear = 2021; $this->endYear = date('Y'); $this->rangeYears = range($this->startYear, $this->endYear); $this->activeYear = $this->endYear;*/ @@ -34,11 +34,12 @@ class PaymentController extends Controller $data = [ 'user' => $user, ]; + return view('user.payment.credit', $data); } - - public function credit_datatable(){ + public function credit_datatable() + { $user = \Auth::user(); $query = UserCredit::with('user', 'user.account')->select('user_credits.*')->where('user_id', $user->id); @@ -46,29 +47,35 @@ class PaymentController extends Controller return \DataTables::eloquent($query) ->addColumn('view', function (UserCredit $UserCredit) { - $ret = ""; - if(Credit::isCredit($UserCredit)){ - $ret .= ' '; - $ret .= '
'; - $ret .= ' '; - $ret .= ' '; - - }else{ - $ret = "-"; + $ret = ''; + if (Credit::isCredit($UserCredit)) { + $ret .= ' '; + $ret .= ''; + $availableLocales = $UserCredit->getAvailableLocales(); + foreach ($availableLocales as $locale) { + $ret .= ' '.strtoupper($locale).''; + $ret .= ' '.strtoupper($locale).''; + } + $ret .= '
'; + $ret .= ' '; + $ret .= ' '; + } else { + $ret = '-'; } + return $ret; }) ->addColumn('total', function (UserCredit $UserCredit) { - return $UserCredit->getFormattedTotal()." €"; + return $UserCredit->getFormattedTotal().' €'; }) ->addColumn('credits', function (UserCredit $UserCredit) { - $ret = ""; - if($UserCredit->user_credit_items){ - foreach($UserCredit->user_credit_items as $user_credit_item){ - $ret .= nl2br($user_credit_item->getTransMessage())." / ".$user_credit_item->created_at->format('d.m.Y')."
"; - + $ret = ''; + if ($UserCredit->user_credit_items) { + foreach ($UserCredit->user_credit_items as $user_credit_item) { + $ret .= nl2br($user_credit_item->getTransMessage()).' / '.$user_credit_item->created_at->format('d.m.Y').'
'; } } + return $ret; }) ->addColumn('status', function (UserCredit $UserCredit) { @@ -81,18 +88,19 @@ class PaymentController extends Controller ->make(true); } - public function credit_item_datatable(){ + public function credit_item_datatable() + { $user = \Auth::user(); $query = UserCreditItem::select('user_credit_items.*')->where('user_id', $user->id); return \DataTables::eloquent($query) - + ->addColumn('message', function (UserCreditItem $user_credit_item) { return nl2br($user_credit_item->getTransMessage()); }) ->addColumn('credit', function (UserCreditItem $user_credit_item) { - return formatNumber($user_credit_item->credit)." €"; + return formatNumber($user_credit_item->credit).' €'; }) ->addColumn('created_at', function (UserCreditItem $user_credit_item) { return formatDate($user_credit_item->created_at); @@ -101,11 +109,11 @@ class PaymentController extends Controller return ''.$user_credit_item->getStatusType().' '; }) ->addColumn('paid', function (UserCreditItem $user_credit_item) { - return ($user_credit_item->paid && $user_credit_item->user_credit) ? - ' '.$user_credit_item->user_credit->full_number.'' + return ($user_credit_item->paid && $user_credit_item->user_credit) ? + ' '.$user_credit_item->user_credit->full_number.'' : ''; }) - + ->orderColumn('message', 'message $1') ->orderColumn('credit', 'credit $1') ->orderColumn('created_at', 'created_at $1') @@ -114,13 +122,12 @@ class PaymentController extends Controller ->make(true); } - /*private function setActiveYears(){ if(Request::get('filter_year')){ $this->activeYear = Request::get('filter_year'); } } - + public function revenue() { $this->setActiveYears(); @@ -134,4 +141,4 @@ class PaymentController extends Controller ]; return view('user.payment.revenue', $data); }*/ -} \ No newline at end of file +} diff --git a/app/Http/Controllers/User/TeamController.php b/app/Http/Controllers/User/TeamController.php index 0f6fc54..e9e6a17 100644 --- a/app/Http/Controllers/User/TeamController.php +++ b/app/Http/Controllers/User/TeamController.php @@ -1,13 +1,12 @@ '', 2 => '', 3 => '']; // Wird in getFilterActive() übersetzt + private $filter_next_level = [0 => '', 1 => '', 2 => '', 3 => '']; // Wird in getFilterNextLevel() übersetzt + private $month; + private $year; + private $forceLiveCalculation; public function __construct() @@ -46,8 +45,6 @@ class TeamController extends Controller $this->middleware('active.account'); } - - /** * Zeigt die Team-Übersicht mit optimierter TreeCalcBotOptimized-Datenverarbeitung * Lädt Team-Daten für DataTable-Anzeige @@ -67,19 +64,19 @@ class TeamController extends Controller $forceLiveCalculation = Request::get('force_live_calculation', false) || Request::get('live', false); $forceLiveCalculation = false; - \Log::info("TeamController: Building optimized team overview for user {$user->id} ({$this->month}/{$this->year})" . - ($forceLiveCalculation === true ? " with forced live calculation" : "not live calculation")); + \Log::info("TeamController: Building optimized team overview for user {$user->id} ({$this->month}/{$this->year})". + ($forceLiveCalculation === true ? ' with forced live calculation' : 'not live calculation')); // Verwende TreeCalcBotOptimized für bessere Performance - //$TreeCalcBot = new TreeCalcBotOptimized($this->month, $this->year, 'member', $forceLiveCalculation); - //$TreeCalcBot->initStructureUser($user->id); + // $TreeCalcBot = new TreeCalcBotOptimized($this->month, $this->year, 'member', $forceLiveCalculation); + // $TreeCalcBot->initStructureUser($user->id); $endTime = microtime(true); $endMemory = memory_get_usage(); $executionTime = round(($endTime - $startTime) * 1000, 2); $memoryUsed = $this->formatBytes($endMemory - $startMemory); - $calculationType = $forceLiveCalculation ? " (LIVE)" : " (CACHE)"; + $calculationType = $forceLiveCalculation ? ' (LIVE)' : ' (CACHE)'; \Log::info("TeamController: Optimized team overview built in {$executionTime}ms, Memory: {$memoryUsed}{$calculationType}"); $data = [ @@ -88,21 +85,22 @@ class TeamController extends Controller 'filter_active' => $this->getFilterActive(), 'filter_levels' => $this->getFilterLevels(), 'filter_next_level' => $this->getFilterNextLevel(), - //'TreeCalcBot' => $TreeCalcBot, + // 'TreeCalcBot' => $TreeCalcBot, 'performance' => [ 'execution_time' => $executionTime, 'memory_used' => $memoryUsed, 'user_id' => $user->id, - 'user_count' => 0, //$TreeCalcBot->getTotalUserCount(), + 'user_count' => 0, // $TreeCalcBot->getTotalUserCount(), 'version' => 'Optimized', - 'calculation_type' => $forceLiveCalculation ? 'Live' : 'Cache' + 'calculation_type' => $forceLiveCalculation ? 'Live' : 'Cache', ], 'optimized' => true, 'forceLiveCalculation' => $forceLiveCalculation, ]; + return view('user.team.show', $data); } catch (\Exception $e) { - \Log::error("TeamController: Error in optimized show for user {$user->id}: " . $e->getMessage()); + \Log::error("TeamController: Error in optimized show for user {$user->id}: ".$e->getMessage()); // Fallback mit minimalen Daten $endTime = microtime(true); @@ -114,12 +112,12 @@ class TeamController extends Controller 'filter_active' => $this->getFilterActive(), 'filter_levels' => $this->getFilterLevels(), 'filter_next_level' => $this->getFilterNextLevel(), - 'error' => __('team.error_loading_optimized_overview') . $e->getMessage(), + 'error' => __('team.error_loading_optimized_overview').$e->getMessage(), 'performance' => [ 'execution_time' => $executionTime, 'memory_used' => 'N/A', 'version' => 'Fallback', - 'calculation_type' => 'Error' + 'calculation_type' => 'Error', ], 'optimized' => false, ]; @@ -175,8 +173,8 @@ class TeamController extends Controller $executionTime = round(($endTime - $startTime) * 1000, 2); $memoryUsed = $this->formatBytes($endMemory - $startMemory); - $versionInfo = ($optimizedUsed ? "OPTIMIZED" : "STANDARD") . - ($forceLiveCalculation ? " + LIVE" : " + CACHE"); + $versionInfo = ($optimizedUsed ? 'OPTIMIZED' : 'STANDARD'). + ($forceLiveCalculation ? ' + LIVE' : ' + CACHE'); \Log::info("TeamController: Structure built for user {$user->id} in {$executionTime}ms, Memory: {$memoryUsed} ({$versionInfo})"); @@ -191,7 +189,7 @@ class TeamController extends Controller ? $TreeCalcBot->getTotalUserCount() : '-', 'version' => $optimizedUsed ? 'Optimized' : 'Standard', - 'calculation_type' => $forceLiveCalculation ? 'Live' : 'Cache' + 'calculation_type' => $forceLiveCalculation ? 'Live' : 'Cache', ], 'optimized' => $optimizedUsed, 'forceLiveCalculation' => $forceLiveCalculation, @@ -199,7 +197,7 @@ class TeamController extends Controller return view('user.team.structure', $data); } catch (\Exception $e) { - \Log::error("TeamController: Error in structure for user {$user->id}: " . $e->getMessage()); + \Log::error("TeamController: Error in structure for user {$user->id}: ".$e->getMessage()); // Fallback zur Standard-Implementierung $TreeCalcBot = new TreeCalcBot(session('team_user_filter_month'), session('team_user_filter_year'), 'member'); @@ -212,13 +210,13 @@ class TeamController extends Controller 'filter_months' => HTMLHelper::getTransMonths(), 'filter_years' => HTMLHelper::getYearRange(2022), 'TreeCalcBot' => $TreeCalcBot, - 'error' => 'Fehler aufgetreten, Standard-Version wird verwendet: ' . $e->getMessage(), + 'error' => 'Fehler aufgetreten, Standard-Version wird verwendet: '.$e->getMessage(), 'performance' => [ 'execution_time' => $executionTime, 'memory_used' => 'N/A', 'user_count' => '-', 'version' => 'Fallback', - 'calculation_type' => $forceLiveCalculation ? __('team.live_not_supported_fallback') : __('team.cache') + 'calculation_type' => $forceLiveCalculation ? __('team.live_not_supported_fallback') : __('team.cache'), ], 'optimized' => false, 'forceLiveCalculation' => $forceLiveCalculation, @@ -227,6 +225,7 @@ class TeamController extends Controller return view('user.team.structure', $data); } } + public function structureOld() { abort(403, 'This page is removed'); @@ -237,17 +236,17 @@ class TeamController extends Controller $this->setFilterVars(); $TreeCalcBot = new TreeCalcBot(session('team_user_filter_month'), session('team_user_filter_year'), 'member'); $TreeCalcBot->initStructureUser($user->id); - //for testing - //$TreeCalcBot->initUser(56); + // for testing + // $TreeCalcBot->initUser(56); $data = [ 'filter_months' => HTMLHelper::getTransMonths(), 'filter_years' => HTMLHelper::getYearRange(2022), 'TreeCalcBot' => $TreeCalcBot, ]; + return view('user.team.structure', $data); } - /** * Optimierte DataTable für Team-Übersicht mit TreeCalcBotOptimized-Daten * Nutzt bereits berechnete Business-Daten für bessere Performance @@ -265,8 +264,8 @@ class TeamController extends Controller // Prüfe ob Live-Berechnung erzwungen werden soll $forceLiveCalculation = Request::get('force_live_calculation', false) || Request::get('live', false); $forceLiveCalculation = false; - \Log::info("TeamController: Building optimized datatable for user {$user->id} ({$this->month}/{$this->year})" . - ($forceLiveCalculation == true ? " with forced live calculation" : "")); + \Log::info("TeamController: Building optimized datatable for user {$user->id} ({$this->month}/{$this->year})". + ($forceLiveCalculation == true ? ' with forced live calculation' : '')); // Lade TreeCalcBotOptimized-Daten $TreeCalcBot = new TreeCalcBotOptimized($this->month, $this->year, 'member', $forceLiveCalculation); @@ -277,30 +276,36 @@ class TeamController extends Controller // KRITISCH: Bereinige die Objekte für DataTables (entferne zirkuläre Referenzen) $teamUsers = collect($this->cleanBusinessUserItemsForDataTable($teamUsersRaw)); - \Log::info("TeamController: TeamUsers cleaned for DataTable: " . $teamUsers->count()); + \Log::info('TeamController: TeamUsers cleaned for DataTable: '.$teamUsers->count()); $endTime = microtime(true); $executionTime = round(($endTime - $startTime) * 1000, 2); $this->forceLiveCalculation = $forceLiveCalculation; - \Log::info("TeamController: Optimized datatable data prepared in {$executionTime}ms for " . $teamUsers->count() . " users"); + \Log::info("TeamController: Optimized datatable data prepared in {$executionTime}ms for ".$teamUsers->count().' users'); return \DataTables::of($teamUsers) ->addColumn('id', function ($teamUser) { return ''; + data-route="'.route('modal_load').'">'; }) ->addColumn('m_account', function ($teamUser) { return $teamUser->m_account; }) ->addColumn('email', function ($teamUser) { - return e($teamUser->email); + $button = ''. + ' '. + ''; + + return $button.e($teamUser->email); }) ->addColumn('first_name', function ($teamUser) { return e($teamUser->first_name); @@ -313,6 +318,7 @@ class TeamController extends Controller }) ->addColumn('is_qual_kp', function ($teamUser) { $user = User::find($teamUser->user_id); + return TreeHelperOptimized::generateQualKPBadgeForUser($user, $this->month, $this->year); }) ->addColumn('sales_volume_KP_points', function ($teamUser) { @@ -331,18 +337,19 @@ class TeamController extends Controller if ($userBusiness) { return NextLevelBadgeHelper::generateBadgeFromUserBusiness($userBusiness); } + return NextLevelBadgeHelper::renderNoDataBadge(); }) ->addColumn('active_account', function ($teamUser) { return get_active_badge($teamUser->active_account); }) ->addColumn('payment_account_date', function ($teamUser) { - return $teamUser->active_date ? formatDate($teamUser->active_date) : "-"; + return $teamUser->active_date ? formatDate($teamUser->active_date) : '-'; }) - ->rawColumns(['id', 'next_level_qualified', 'active_account', 'is_qual_kp', 'sales_volume_KP_points', 'sales_volume_total']) + ->rawColumns(['id', 'email', 'next_level_qualified', 'active_account', 'is_qual_kp', 'sales_volume_KP_points', 'sales_volume_total']) ->make(true); } catch (\Exception $e) { - \Log::error("TeamController: Error in optimized datatable: " . $e->getMessage()); + \Log::error('TeamController: Error in optimized datatable: '.$e->getMessage()); // Fallback zur Standard-DataTable return $this->datatable(); @@ -361,12 +368,12 @@ class TeamController extends Controller return \DataTables::eloquent($query) ->addColumn('id', function (User $teamUser) { return ''; + data-route="'.route('modal_load').'">'; }) ->addColumn('m_account', function (User $teamUser) { return $teamUser->account ? e($teamUser->account->m_account) : ''; @@ -375,7 +382,7 @@ class TeamController extends Controller return $teamUser->user_level ? e($teamUser->user_level->getLang('name')) : ''; }) ->addColumn('is_qual_kp', function (User $teamUser) { - if (!$teamUser->user_level) { + if (! $teamUser->user_level) { return '-'; } $qualKP = (int) $teamUser->user_level->qual_kp; @@ -384,7 +391,8 @@ class TeamController extends Controller $pointsSum = (int) $teamUser->getUserSalesVolumeBy($month, $year, 'sales_volume_points_KP_sum'); $isQual = $pointsSum >= $qualKP; $badgeClass = $isQual ? 'badge-outline-success' : 'badge-outline-warning-dark'; - return ' KU ' . $qualKP . ''; + + return ' KU '.$qualKP.''; }) ->addColumn('sales_volume_KP_points', function (User $teamUser) { $month = Request::get('team_user_filter_month') ?: session('team_user_filter_month'); @@ -392,8 +400,9 @@ class TeamController extends Controller $total = (int) $teamUser->getUserSalesVolumeBy($month, $year, 'sales_volume_points_KP_sum'); $individual = (int) $teamUser->getUserSalesVolumeBy($month, $year, 'sales_volume_KP_points'); $shop = (int) $teamUser->getUserSalesVolumeBy($month, $year, 'sales_volume_points_shop'); - return '
' . $total . '
' . - 'E: ' . $individual . ' | S: ' . $shop . ''; + + return '
'.$total.'
'. + 'E: '.$individual.' | S: '.$shop.''; }) ->addColumn('sales_volume_total', function (User $teamUser) { $month = Request::get('team_user_filter_month') ?: session('team_user_filter_month'); @@ -401,8 +410,9 @@ class TeamController extends Controller $total = (float) $teamUser->getUserSalesVolumeBy($month, $year, 'sales_volume_total_sum'); $individual = (float) $teamUser->getUserSalesVolumeBy($month, $year, 'sales_volume_total'); $shop = (float) $teamUser->getUserSalesVolumeBy($month, $year, 'sales_volume_total_shop'); - return '
' . formatNumber($total) . ' €
' . - 'E: ' . formatNumber($individual) . ' | S: ' . formatNumber($shop) . ' €'; + + return '
'.formatNumber($total).' €
'. + 'E: '.formatNumber($individual).' | S: '.formatNumber($shop).' €'; }) ->addColumn('email', function (User $teamUser) { return e($teamUser->email); @@ -414,24 +424,25 @@ class TeamController extends Controller return $teamUser->account ? e($teamUser->account->last_name) : ''; }) ->addColumn('sponsor', function (User $teamUser) { - if (!$teamUser->user_sponsor) { + if (! $teamUser->user_sponsor) { return '-'; } $sponsor = $teamUser->user_sponsor; $html = ''; if ($sponsor->account) { - $html .= e($sponsor->account->first_name . ' ' . $sponsor->account->last_name); - $html .= '
' . e($sponsor->email); - $html .= ' | ' . e($sponsor->account->m_account); + $html .= e($sponsor->account->first_name.' '.$sponsor->account->last_name); + $html .= '
'.e($sponsor->email); + $html .= ' | '.e($sponsor->account->m_account); $html .= ''; } + return $html; }) ->addColumn('active_account', function (User $teamUser) { return get_active_badge($teamUser->isActiveAccount()); }) ->addColumn('payment_account_date', function (User $teamUser) { - return $teamUser->payment_account ? $teamUser->getPaymentAccountDateFormat(false) : "-"; + return $teamUser->payment_account ? $teamUser->getPaymentAccountDateFormat(false) : '-'; }) ->addColumn('next_level_qualified', function (User $teamUser) { // Verwende bereits berechnete UserBusiness-Daten für bessere Performance @@ -450,29 +461,29 @@ class TeamController extends Controller return NextLevelBadgeHelper::renderNoDataBadge(); }) ->filterColumn('m_account', function ($query, $keyword) { - if ($keyword != "") { + if ($keyword != '') { $query->whereHas('account', function ($q) use ($keyword) { - $q->where('m_account', 'LIKE', '%' . $keyword . '%'); + $q->where('m_account', 'LIKE', '%'.$keyword.'%'); }); } }) ->filterColumn('first_name', function ($query, $keyword) { - if ($keyword != "") { + if ($keyword != '') { $query->whereHas('account', function ($q) use ($keyword) { - $q->where('first_name', 'LIKE', '%' . $keyword . '%'); + $q->where('first_name', 'LIKE', '%'.$keyword.'%'); }); } }) ->filterColumn('last_name', function ($query, $keyword) { - if ($keyword != "") { + if ($keyword != '') { $query->whereHas('account', function ($q) use ($keyword) { - $q->where('last_name', 'LIKE', '%' . $keyword . '%'); + $q->where('last_name', 'LIKE', '%'.$keyword.'%'); }); } }) ->filterColumn('email', function ($query, $keyword) { - if ($keyword != "") { - $query->where('email', 'LIKE', '%' . $keyword . '%'); + if ($keyword != '') { + $query->where('email', 'LIKE', '%'.$keyword.'%'); } }) ->orderColumn('id', 'users.id $1') @@ -484,10 +495,10 @@ class TeamController extends Controller ->rawColumns(['id', 'is_qual_kp', 'sales_volume_KP_points', 'sales_volume_total', 'sponsor', 'active_account', 'next_level_qualified']) ->make(true); } catch (\Exception $e) { - \Log::error("TeamController: Error in userDatatable: " . $e->getMessage()); + \Log::error('TeamController: Error in userDatatable: '.$e->getMessage()); return response()->json([ - 'error' => 'Team-Datatable konnte nicht geladen werden: ' . $e->getMessage() + 'error' => 'Team-Datatable konnte nicht geladen werden: '.$e->getMessage(), ], 500); } } @@ -510,7 +521,7 @@ class TeamController extends Controller $onlyNotUpdated = Request::boolean('not_updated', false); // Prüfe ob Live-Berechnung erzwungen werden soll - $forceLiveCalculation = false; //Request::get('force_live_calculation', false) || Request::get('live', false); + $forceLiveCalculation = false; // Request::get('force_live_calculation', false) || Request::get('live', false); \Log::info("TeamController: Building level reports for user {$user->id} ({$month}/{$year})"); @@ -519,7 +530,7 @@ class TeamController extends Controller $treeCalcBot->initStructureUser($user->id, $forceLiveCalculation); // Lade Level-Reports für Team - $levelReportService = new LevelReportService(); + $levelReportService = new LevelReportService; $filters = ['only_not_updated' => $onlyNotUpdated]; $promotions = $levelReportService->getTeamLevelPromotions($treeCalcBot, $month, $year, $filters); $statistics = $levelReportService->getStatistics($promotions); @@ -527,7 +538,7 @@ class TeamController extends Controller $endTime = microtime(true); $executionTime = round(($endTime - $startTime) * 1000, 2); - \Log::info("TeamController: Level reports loaded for user {$user->id} in {$executionTime}ms - " . $promotions->count() . " promotions found"); + \Log::info("TeamController: Level reports loaded for user {$user->id} in {$executionTime}ms - ".$promotions->count().' promotions found'); $availableYears = range(date('Y'), date('Y') - 5); $availableMonths = [ @@ -542,7 +553,7 @@ class TeamController extends Controller 9 => __('cal.months.September'), 10 => __('cal.months.October'), 11 => __('cal.months.November'), - 12 => __('cal.months.December') + 12 => __('cal.months.December'), ]; $data = [ @@ -551,22 +562,22 @@ class TeamController extends Controller 'filters' => [ 'month' => $month, 'year' => $year, - 'only_not_updated' => $onlyNotUpdated + 'only_not_updated' => $onlyNotUpdated, ], 'availableYears' => $availableYears, 'availableMonths' => $availableMonths, 'performance' => [ 'execution_time' => $executionTime, - 'user_id' => $user->id - ] + 'user_id' => $user->id, + ], ]; return view('user.team.level-reports', $data); } catch (\Exception $e) { - \Log::error("TeamController: Error loading level reports: " . $e->getMessage()); + \Log::error('TeamController: Error loading level reports: '.$e->getMessage()); return view('user.team.level-reports', [ - 'error' => 'Fehler beim Laden der Level-Reports: ' . $e->getMessage(), + 'error' => 'Fehler beim Laden der Level-Reports: '.$e->getMessage(), 'promotions' => collect([]), 'statistics' => ['total_count' => 0, 'level_stats' => [], 'period_stats' => []], 'filters' => ['month' => date('m'), 'year' => date('Y'), 'only_not_updated' => false], @@ -583,8 +594,8 @@ class TeamController extends Controller 9 => __('cal.months.September'), 10 => __('cal.months.October'), 11 => __('cal.months.November'), - 12 => __('cal.months.December') - ] + 12 => __('cal.months.December'), + ], ]); } } @@ -608,7 +619,7 @@ class TeamController extends Controller $treeCalcBot->initStructureUser($user->id, $forceLiveCalculation); // Lade Level-Reports - $levelReportService = new LevelReportService(); + $levelReportService = new LevelReportService; $filters = ['only_not_updated' => $onlyNotUpdated]; $promotions = $levelReportService->getTeamLevelPromotions($treeCalcBot, $month, $year, $filters); @@ -617,13 +628,14 @@ class TeamController extends Controller } // CSV erstellen - $filename = 'team_level_promotions_' . date('Y-m-d_H-i-s') . '.csv'; + $filename = 'team_level_promotions_'.date('Y-m-d_H-i-s').'.csv'; $filepath = $levelReportService->exportToCsv($promotions, $filename); return response()->download($filepath, $filename)->deleteFileAfterSend(true); } catch (\Exception $e) { - \Log::error("TeamController: Error exporting level reports: " . $e->getMessage()); - return redirect()->back()->with('error', 'Fehler beim Export: ' . $e->getMessage()); + \Log::error('TeamController: Error exporting level reports: '.$e->getMessage()); + + return redirect()->back()->with('error', 'Fehler beim Export: '.$e->getMessage()); } } @@ -654,19 +666,19 @@ class TeamController extends Controller 'currentUser' => $user, 'currentLevel' => $currentLevel, 'performance' => [ - 'execution_time' => $executionTime - ] + 'execution_time' => $executionTime, + ], ]; return view('user.team.marketingplan', $data); } catch (\Exception $e) { - \Log::error("TeamController: Error loading marketingplan: " . $e->getMessage()); + \Log::error('TeamController: Error loading marketingplan: '.$e->getMessage()); return view('user.team.marketingplan', [ - 'error' => __('marketingplan.loading_error') . ' ' . $e->getMessage(), + 'error' => __('marketingplan.loading_error').' '.$e->getMessage(), 'userLevels' => collect(), 'currentUser' => null, - 'currentLevel' => null + 'currentLevel' => null, ]); } } @@ -678,14 +690,15 @@ class TeamController extends Controller { $user = User::find(\Auth::user()->id); if ($user->isActiveShop() && $user->shop) { - $shop_register_link = $user->shop->getSubdomain(false) . "/reg"; + $shop_register_link = $user->shop->getSubdomain(false).'/reg'; } else { - $member_id = 'm' . ($user->id + config('mivita.add_number_id')); - $shop_register_link = config('app.protocol') . config('app.domain') . config('app.tld_care') . '/reg/' . $member_id; + $member_id = 'm'.($user->id + config('mivita.add_number_id')); + $shop_register_link = config('app.protocol').config('app.domain').config('app.tld_care').'/reg/'.$member_id; } $data = [ - 'shop_register_link' => $shop_register_link + 'shop_register_link' => $shop_register_link, ]; + return view('user.team.members', $data); } @@ -697,24 +710,8 @@ class TeamController extends Controller $user = User::find(\Auth::user()->id); $this->setFilterVars(); - // Nutze TreeCalcBotOptimized um das Team zu bekommen - $month = session('team_user_filter_month'); - $year = session('team_user_filter_year'); - - // Lade Team-Struktur - $TreeCalcBot = new TreeCalcBotOptimized($month, $year, 'member', false); - $TreeCalcBot->initStructureUser($user->id, false); - - // Hole flache Liste aller Team-Mitglieder - $teamUsersRaw = $this->getTeamUsersFromStructure($TreeCalcBot); - - // Sammle User-IDs für Abo-Abfrage - $teamUserIds = []; - foreach ($teamUsersRaw as $teamUser) { - if ($teamUser->user_id && $teamUser->user_id != $user->id) { - $teamUserIds[] = $teamUser->user_id; - } - } + // Hole Team-Mitglieder-IDs effizient via Sponsor-Hierarchie + $teamUserIds = AboHelper::getTeamUserIds($user->id); // Hole Abos der Team-Mitglieder $abos = \App\Models\UserAbo::whereIn('user_id', $teamUserIds) @@ -740,24 +737,8 @@ class TeamController extends Controller $user = User::find(\Auth::user()->id); $user_abo = \App\Models\UserAbo::findOrFail($id); - // Prüfe ob das Abo zu einem Team-Mitglied gehört - $this->setFilterVars(); - $month = session('team_user_filter_month'); - $year = session('team_user_filter_year'); - - $TreeCalcBot = new TreeCalcBotOptimized($month, $year, 'member', false); - $TreeCalcBot->initStructureUser($user->id, false); - - $teamUsersRaw = $this->getTeamUsersFromStructure($TreeCalcBot); - $teamUserIds = []; - foreach ($teamUsersRaw as $teamUser) { - if ($teamUser->user_id) { - $teamUserIds[] = $teamUser->user_id; - } - } - - // Prüfe Berechtigung - if (!in_array($user_abo->user_id, $teamUserIds)) { + // Prüfe ob das Abo zu einem Team-Mitglied gehört (effizient via Sponsor-Kette) + if (! AboHelper::isUserInTeam($user->id, $user_abo->user_id)) { abort(403, 'Unauthorized action. This subscription does not belong to your team.'); } @@ -819,6 +800,7 @@ class TeamController extends Controller 'filter_months' => HTMLHelper::getTransMonths(), 'filter_years' => HTMLHelper::getYearRange(2022), ]; + return view('user.team.points', $data); } @@ -826,27 +808,28 @@ class TeamController extends Controller { $user = User::find(\Auth::user()->id); - if (!$user->isVIP()) { + if (! $user->isVIP()) { abort(404); } $ExportBot = new ExportBot('member'); - $ExportBot->initStructureUser($user, 'list'); //tree or list + $ExportBot->initStructureUser($user, 'list'); // tree or list $data = [ 'ExportBot' => $ExportBot, ]; + return view('user.team.export', $data); } public function userTeamExport() { - if (Request::get('action') === "export") { + if (Request::get('action') === 'export') { $user = User::find(\Auth::user()->id); $ExportBot = new ExportBot('member'); - $ExportBot->initStructureUser($user, 'list'); //tree or list + $ExportBot->initStructureUser($user, 'list'); // tree or list $columns = []; - $filename = __('team.filename_export') . date('Y-m-d-H-i-s'); - $headers = array( + $filename = __('team.filename_export').date('Y-m-d-H-i-s'); + $headers = [ __('tables.line'), __('tables.level'), __('tables.email'), @@ -864,10 +847,10 @@ class TeamController extends Controller __('tables.account'), __('tables.account_to'), __('tables.sponsor'), - ); + ]; if (isset($ExportBot->user_list->childs)) { foreach ($ExportBot->user_list->childs as $child) { - $columns[] = array( + $columns[] = [ __('tables.line') => $child->line, __('tables.level') => $child->level_name, __('tables.email') => $child->email, @@ -885,38 +868,39 @@ class TeamController extends Controller __('tables.account') => ($child->active_account == 1 ? __('yes') : __('no')), __('tables.account_to') => $child->payment_account_date, __('tables.sponsor') => $child->sponsor_name, - ); + ]; } } - return Excel::download(new UserTeamExport($columns, $headers), $filename . '.xls'); + + return Excel::download(new UserTeamExport($columns, $headers), $filename.'.xls'); } } private function setFilterVars() { - if (!session('team_user_filter_month')) { + if (! session('team_user_filter_month')) { session(['team_user_filter_month' => intval(date('m'))]); } - if (!session('team_user_filter_month_prev')) { + if (! session('team_user_filter_month_prev')) { session(['team_user_filter_month_prev' => intval(date('m') - 1)]); } - if (!session('team_user_filter_year')) { + if (! session('team_user_filter_year')) { session(['team_user_filter_year' => intval(date('Y'))]); } - if (!session('team_user_points_filter_month')) { + if (! session('team_user_points_filter_month')) { session(['team_user_points_filter_month' => intval(date('m'))]); } - if (!session('team_user_points_filter_year')) { + if (! session('team_user_points_filter_year')) { session(['team_user_points_filter_year' => intval(date('Y'))]); } - if (!session('team_user_filter_active')) { + if (! session('team_user_filter_active')) { session(['team_user_filter_active' => 1]); } - if (!session('team_user_filter_level')) { + if (! session('team_user_filter_level')) { session(['team_user_filter_level' => 0]); } - if (!session('team_user_filter_next_level')) { + if (! session('team_user_filter_next_level')) { session(['team_user_filter_next_level' => 0]); } @@ -964,38 +948,39 @@ class TeamController extends Controller return $query; } - public function datatablePoints() { $query = $this->initSearchPoints(); + return \DataTables::eloquent($query) ->addColumn('order', function (UserSalesVolume $UserSalesVolume) { if ($UserSalesVolume->shopping_order) { if ($UserSalesVolume->status === 1 && $UserSalesVolume->shopping_order->auth_user_id === $UserSalesVolume->user_id) { - return '' . $UserSalesVolume->shopping_order->id . ''; + return ''.$UserSalesVolume->shopping_order->id.''; } - if (($UserSalesVolume->status === 2 || $UserSalesVolume->status === 3) && $UserSalesVolume->shopping_order->member_id === $UserSalesVolume->user_id) { - return '' . $UserSalesVolume->shopping_order->id . ''; + if (($UserSalesVolume->status === 2 || $UserSalesVolume->status === 3) && $UserSalesVolume->shopping_order->member_id === $UserSalesVolume->user_id) { + return ''.$UserSalesVolume->shopping_order->id.''; } } + return ''; }) ->addColumn('total_net', function (UserSalesVolume $UserSalesVolume) { - return formatNumber($UserSalesVolume->total_net) . ' €'; + return formatNumber($UserSalesVolume->total_net).' €'; }) ->addColumn('status_turnover', function (UserSalesVolume $UserSalesVolume) { - return '' . $UserSalesVolume->getStatusTurnoverType() . ''; + return ''.$UserSalesVolume->getStatusTurnoverType().''; }) ->addColumn('status', function (UserSalesVolume $UserSalesVolume) { - return '' . $UserSalesVolume->getStatusType() . ''; + return ''.$UserSalesVolume->getStatusType().''; }) ->addColumn('message', function (UserSalesVolume $UserSalesVolume) { - return '' . $UserSalesVolume->message . ''; + return ''.$UserSalesVolume->message.''; }) ->addColumn('info', function (UserSalesVolume $UserSalesVolume) { - return '' . $UserSalesVolume->info . ''; + return ''.$UserSalesVolume->info.''; }) ->orderColumn('id', 'id $1') @@ -1018,7 +1003,8 @@ class TeamController extends Controller 'userSalesVolume' => $userSalesVolume, ]; $html = view('user.team._points_sum', $data)->render(); - return response()->json(['response' => true, 'data' => $data, 'html' => $html]); + + return response()->json(['response' => true, 'data' => $data, 'html' => $html]); } /** @@ -1026,13 +1012,13 @@ class TeamController extends Controller */ private function formatBytes(int $bytes, int $precision = 2): string { - $units = array('B', 'KB', 'MB', 'GB', 'TB'); + $units = ['B', 'KB', 'MB', 'GB', 'TB']; for ($i = 0; $bytes > 1024 && $i < count($units) - 1; $i++) { $bytes /= 1024; } - return round($bytes, $precision) . ' ' . $units[$i]; + return round($bytes, $precision).' '.$units[$i]; } /** @@ -1058,7 +1044,7 @@ class TeamController extends Controller return [ 1 => __('team.filter_active'), 2 => __('team.filter_not_active'), - 3 => __('team.filter_all') + 3 => __('team.filter_all'), ]; } @@ -1071,7 +1057,7 @@ class TeamController extends Controller 0 => __('team.all_status'), 1 => __('team.qualified_green'), 2 => __('team.in_progress_yellow'), - 3 => __('team.no_level_red') + 3 => __('team.no_level_red'), ]; } @@ -1089,20 +1075,20 @@ class TeamController extends Controller // Debug: Prüfe TreeCalcBot-Inhalt $businessUsers = $treeCalcBot->getItems(); - \Log::info("TeamController: TreeCalcBot root items count: " . count($businessUsers)); + \Log::info('TeamController: TreeCalcBot root items count: '.count($businessUsers)); // Sammle alle Root-User UND deren verschachtelte businessUserItems foreach ($businessUsers as $businessUser) { // WICHTIG: user_id korrekt über b_user abrufen (Magic Method Problem mit isset()) $userId = $businessUser->user_id; // Über __get() Method - \Log::debug("TeamController: Processing root businessUser", [ + \Log::debug('TeamController: Processing root businessUser', [ 'user_id' => $userId, 'businessUserItems_count' => count($businessUser->businessUserItems ?? []), ]); // WICHTIG: Root-User selbst hinzufügen (korrigierte user_id Prüfung) - //nur User können auch children haben - businessUserItems - if ($userId && !isset($processedIds[$userId])) { + // nur User können auch children haben - businessUserItems + if ($userId && ! isset($processedIds[$userId])) { $processedIds[$userId] = true; $businessUser->deep = 0; $allUsers[] = $businessUser; @@ -1121,7 +1107,7 @@ class TeamController extends Controller if ($userId) { // Prüfe ob dieser parentless User bereits gesammelt wurde - if (!isset($processedIds[$userId])) { + if (! isset($processedIds[$userId])) { $processedIds[$userId] = true; $businessUser->deep = 0; $allUsers[] = $businessUser; @@ -1134,17 +1120,17 @@ class TeamController extends Controller \Log::debug("TeamController: Parentless-User übersprungen: {$userId} (bereits verarbeitet)"); } } else { - \Log::warning("TeamController: Parentless BusinessUser ohne user_id übersprungen"); + \Log::warning('TeamController: Parentless BusinessUser ohne user_id übersprungen'); } } } } } - \Log::info("TeamController: AllUsers before filtering: " . count($allUsers)); + \Log::info('TeamController: AllUsers before filtering: '.count($allUsers)); // Filter anwenden $filteredUsers = $this->applyTeamFiltersToBusinessUsers($allUsers); - \Log::info("TeamController: AllUsers after filtering: " . count($filteredUsers)); + \Log::info('TeamController: AllUsers after filtering: '.count($filteredUsers)); return $filteredUsers; } @@ -1161,9 +1147,9 @@ class TeamController extends Controller \Log::info("TeamController: Applying filters - Active: {$activeFilter}, Level: {$levelFilter}, NextLevel: {$nextLevelFilter}"); // Debug: Zeige verfügbare Eigenschaften des ersten BusinessUsers - if (!empty($businessUsers)) { + if (! empty($businessUsers)) { $firstUser = $businessUsers[0]; - \Log::debug("TeamController: First BusinessUser properties", [ + \Log::debug('TeamController: First BusinessUser properties', [ 'user_id' => $firstUser->user_id ?? 'not set', 'active_account' => $firstUser->active_account ?? 'not set', 'm_level_id' => $firstUser->m_level_id ?? 'not set', @@ -1175,7 +1161,7 @@ class TeamController extends Controller $filtered = array_filter($businessUsers, function ($businessUser) use ($activeFilter, $levelFilter, $nextLevelFilter) { // Active Filter anwenden if ($activeFilter == 1) { // Nur aktive - if (!$businessUser->active_account) { + if (! $businessUser->active_account) { return false; } } elseif ($activeFilter == 2) { // Nur inaktive @@ -1199,12 +1185,12 @@ class TeamController extends Controller switch ($nextLevelFilter) { case 1: // Qualifiziert (grün) - hat next_qual_user_level - if (!$hasNextQual) { + if (! $hasNextQual) { return false; } break; case 2: // In Arbeit (gelb) - hat next_can_user_level aber kein next_qual_user_level - if ($hasNextQual || !$hasNextCan) { + if ($hasNextQual || ! $hasNextCan) { return false; } break; @@ -1233,6 +1219,7 @@ class TeamController extends Controller $maxDepth = 20; if ($depth > $maxDepth) { \Log::warning("TeamController: Maximale Sammlungstiefe ({$maxDepth}) erreicht bei Tiefe {$depth}"); + return; } @@ -1244,6 +1231,7 @@ class TeamController extends Controller // KRITISCHER SCHUTZ: Prüfe ob User bereits gesammelt wurde if (isset($processedIds[$userId])) { \Log::debug("TeamController: Überspringe bereits gesammelten User {$userId} (Duplikat verhindert)"); + continue; } @@ -1255,8 +1243,8 @@ class TeamController extends Controller \Log::debug("TeamController: Flach gesammelt - User ID: {$userId} at depth {$depth}"); // Rekursiv ALLE verschachtelten businessUserItems sammeln - if (isset($businessUserItem->businessUserItems) && is_array($businessUserItem->businessUserItems) && !empty($businessUserItem->businessUserItems)) { - \Log::debug("TeamController: Sammle " . count($businessUserItem->businessUserItems) . " verschachtelte Items von User {$userId}"); + if (isset($businessUserItem->businessUserItems) && is_array($businessUserItem->businessUserItems) && ! empty($businessUserItem->businessUserItems)) { + \Log::debug('TeamController: Sammle '.count($businessUserItem->businessUserItems)." verschachtelte Items von User {$userId}"); $this->collectAllBusinessUserItemsFlat($businessUserItem->businessUserItems, $allUsers, $processedIds, $depth + 1); } } else { @@ -1276,11 +1264,12 @@ class TeamController extends Controller $maxDepth = 20; if ($deep > $maxDepth) { \Log::warning("TeamController: Maximale Sammlungstiefe ({$maxDepth}) erreicht"); + return; } if (isset($businessUser->businessUserItems) && is_array($businessUser->businessUserItems)) { - \Log::debug("TeamController: Collecting from businessUser with " . count($businessUser->businessUserItems) . " sub-items at depth {$deep}"); + \Log::debug('TeamController: Collecting from businessUser with '.count($businessUser->businessUserItems)." sub-items at depth {$deep}"); foreach ($businessUser->businessUserItems as $subBusinessUser) { if ($subBusinessUser) { @@ -1291,6 +1280,7 @@ class TeamController extends Controller // KRITISCHER BUGFIX: Prüfe ob User bereits gesammelt wurde if (isset($processedIds[$userId])) { \Log::debug("TeamController: Überspringe bereits gesammelten User {$userId} (zirkuläre Referenz verhindert)"); + continue; } @@ -1320,13 +1310,13 @@ class TeamController extends Controller $cleanedUsers = []; foreach ($businessUserItems as $businessUserItem) { - if (!$businessUserItem) { + if (! $businessUserItem) { continue; } try { // Extrahiere nur die Properties, die für DataTable benötigt werden - $cleanedUser = new \stdClass(); + $cleanedUser = new \stdClass; // Basis Properties (direkt über Magic Method __get) $cleanedUser->user_id = $businessUserItem->user_id; @@ -1354,13 +1344,14 @@ class TeamController extends Controller \Log::debug("TeamController: Cleaned user {$cleanedUser->user_id} for DataTable"); } catch (\Exception $e) { - \Log::error("TeamController: Error cleaning BusinessUserItem for DataTable: " . $e->getMessage()); + \Log::error('TeamController: Error cleaning BusinessUserItem for DataTable: '.$e->getMessage()); + // Skip diesen User, statt alles abzubrechen continue; } } - \Log::info("TeamController: Cleaned " . count($cleanedUsers) . " users for DataTable (from " . count($businessUserItems) . " raw items)"); + \Log::info('TeamController: Cleaned '.count($cleanedUsers).' users for DataTable (from '.count($businessUserItems).' raw items)'); return $cleanedUsers; } diff --git a/app/Http/Controllers/Web/CheckoutController.php b/app/Http/Controllers/Web/CheckoutController.php index 9f0f03a..22fa424 100644 --- a/app/Http/Controllers/Web/CheckoutController.php +++ b/app/Http/Controllers/Web/CheckoutController.php @@ -11,7 +11,6 @@ use App\Models\ShoppingUser; use App\Repositories\CheckoutRepository; use App\Services\AboHelper; use App\Services\CustomerPriority; -use App\Services\OrderPaymentService; use App\Services\Payment; use App\Services\Shop; use App\Services\Util; @@ -24,6 +23,7 @@ use Yard; class CheckoutController extends Controller { private $checkoutRepo; + private $instance = 'checkout'; /** @@ -38,18 +38,18 @@ class CheckoutController extends Controller /** * Zeigt die Checkout-Seite an - * + * * @return \Illuminate\View\View */ public function checkout() { /* @if(Auth::guard('customers')->check()) - {{ __('navigation.logout') }} - @else - {{ __('website.to_customer_portal') }} - @endif - @if(Auth::guard('user')->check()) + {{ __('navigation.logout') }} + @else + {{ __('website.to_customer_portal') }} + @endif + @if(Auth::guard('user')->check()) */ $shopping_data = Yard::instance($this->instance)->getYardExtra('shopping_data'); $is_from = $shopping_data['is_from'] ?? 'shopping'; @@ -97,28 +97,26 @@ class CheckoutController extends Controller 'is_checkout' => true, 'yard_instance' => $this->instance, ]; + return view('web.templates.checkout', $data); } - - /** * Bereitet die ShoppingUser-Daten vor - * - * @param ShoppingUser $shopping_user + * * @return void */ private function prepareShoppingUserData(ShoppingUser $shopping_user) { - if ($shopping_user->same_as_billing === NULL) { + if ($shopping_user->same_as_billing === null) { $shopping_user->same_as_billing = false; } - if (!$shopping_user->billing_country_id) { + if (! $shopping_user->billing_country_id) { $shopping_user->billing_country_id = Yard::instance($this->instance)->getUserCountryId(); // Die Zeile unten entfernen, da die Relation automatisch geladen wird // $shopping_user->billing_country = Yard::instance($this->instance)->getUserCountry(); } - if (!$shopping_user->shipping_country_id) { + if (! $shopping_user->shipping_country_id) { $shopping_user->shipping_country_id = Yard::instance($this->instance)->getUserCountryId(); // Die Zeile unten entfernen, da die Relation automatisch geladen wird // $shopping_user->shipping_country = Yard::instance($this->instance)->getUserCountry(); @@ -135,7 +133,7 @@ class CheckoutController extends Controller /** * Verarbeitet den Checkout-Prozess - * + * * @return \Illuminate\Http\RedirectResponse */ public function checkoutFinal() @@ -180,13 +178,13 @@ class CheckoutController extends Controller /** * Verarbeitet den Länderwechsel - * - * @param array $data + * + * @param array $data * @return \Illuminate\Http\RedirectResponse */ private function handleCountryChange($data) { - if (!Request::get('same_as_billing')) { + if (! Request::get('same_as_billing')) { Yard::instance($this->instance)->setShippingCountryWithPrice($data['billing_state'], $data['is_for']); } else { Yard::instance($this->instance)->setShippingCountryWithPrice($data['shipping_state'], $data['is_for']); @@ -197,7 +195,7 @@ class CheckoutController extends Controller /** * Validiert die Checkout-Daten - * + * * @return \Illuminate\Validation\Validator */ private function validateCheckoutData() @@ -220,7 +218,7 @@ class CheckoutController extends Controller 'shipping_address' => 'required', 'shipping_zipcode' => 'required', 'shipping_city' => 'required', - 'shipping_salutation' => 'required' + 'shipping_salutation' => 'required', ]); } @@ -229,10 +227,10 @@ class CheckoutController extends Controller /** * Verarbeitet die Zahlungsmethode - * - * @param array $data - * @param ShoppingUser $shopping_user - * @param ShoppingOrder $shopping_order + * + * @param array $data + * @param ShoppingUser $shopping_user + * @param ShoppingOrder $shopping_order * @return mixed */ private function processPaymentMethod($data, $shopping_user, $shopping_order) @@ -243,7 +241,7 @@ class CheckoutController extends Controller // Kreditkarte prüfen if ($payment_method === 'cc') { $result = $this->checkCreditCard($data, $shopping_user, $shopping_order); - if (!is_array($result) || !isset($result['returnstatus']) || $result['returnstatus'] !== 'VALID') { + if (! is_array($result) || ! isset($result['returnstatus']) || $result['returnstatus'] !== 'VALID') { return $result; } } @@ -251,13 +249,13 @@ class CheckoutController extends Controller // SEPA prüfen if ($payment_method === 'elv') { $result = $this->checkSepaAccount($data, $shopping_user, $shopping_order); - if (!is_array($result) || !isset($result['returnstatus']) || $result['returnstatus'] !== 'VALID') { + if (! is_array($result) || ! isset($result['returnstatus']) || $result['returnstatus'] !== 'VALID') { return $result; } } // Zahlung vorbereiten - $pay = new PayoneController(); + $pay = new PayoneController; $pay->init($shopping_user, $shopping_order); $amount = Yard::instance($this->instance)->totalWithShipping(2, '.', '') * 100; $reference = $pay->setPrePayment($payment_method, $amount, 'EUR', $result); @@ -269,15 +267,15 @@ class CheckoutController extends Controller /** * Prüft die Kreditkartendaten - * - * @param array $data - * @param ShoppingUser $shopping_user - * @param ShoppingOrder $shopping_order + * + * @param array $data + * @param ShoppingUser $shopping_user + * @param ShoppingOrder $shopping_order * @return bool|\Illuminate\Http\RedirectResponse */ private function checkCreditCard($data, $shopping_user, $shopping_order) { - $pay = new PayoneController(); + $pay = new PayoneController; $pay->init($shopping_user, $shopping_order); $ret['cc'] = $pay->checkCreditCard($data); @@ -285,24 +283,26 @@ class CheckoutController extends Controller Session::flash('cc-error', 1); Session::flash('errormessage', $ret['cc']['errormessage']); Session::flash('customermessage', $ret['cc']['customermessage']); + return redirect(route('checkout.checkout_card'))->withInput(Request::all()); } $ret['returnstatus'] = 'VALID'; + return $ret; } /** * Prüft die SEPA-Kontodaten - * - * @param array $data - * @param ShoppingUser $shopping_user - * @param ShoppingOrder $shopping_order + * + * @param array $data + * @param ShoppingUser $shopping_user + * @param ShoppingOrder $shopping_order * @return bool|\Illuminate\Http\RedirectResponse */ private function checkSepaAccount($data, $shopping_user, $shopping_order) { if (is_null(Request::get('mandate_identification'))) { - $pay = new PayoneController(); + $pay = new PayoneController; $pay->init($shopping_user, $shopping_order); $amount = Yard::instance($this->instance)->totalWithShipping(2, '.', '') * 100; $ret['elv'] = $pay->checkBankAccount($data, $amount, 'EUR', $shopping_user); @@ -311,14 +311,16 @@ class CheckoutController extends Controller Session::flash('elv-error', 1); Session::flash('errormessage', $ret['elv']['errormessage']); Session::flash('customermessage', $ret['elv']['customermessage']); + return redirect(route('checkout.checkout_card'))->withInput(Request::all()); } - if ($ret['elv']['status'] === 'APPROVED' && $ret['elv']['mandate_status'] !== "active") { + if ($ret['elv']['status'] === 'APPROVED' && $ret['elv']['mandate_status'] !== 'active') { Session::flash('elv-managemandate', 1); Session::flash('elv-mandate_identification', $ret['elv']['mandate_identification']); Session::flash('elv-mandate_text', $ret['elv']['mandate_text']); Session::flash('elv-creditor_identifier', $ret['elv']['creditor_identifier']); + return redirect(route('checkout.checkout_card'))->withInput(Request::all()); } @@ -329,18 +331,19 @@ class CheckoutController extends Controller 'creditor_identifier' => Request::get('creditor_identifier'), 'iban' => $data['elv_iban'], 'bic' => $data['elv_bic'], - 'bankaccountholder' => $data['elv_bankaccountholder'] + 'bankaccountholder' => $data['elv_bankaccountholder'], ]; $this->storeUserPaymentsData($shopping_user, $ret); } $ret['returnstatus'] = 'VALID'; + return $ret; } /** * Leitet zur Abschlussseite weiter - * + * * @return \Illuminate\View\View */ public function redirectToIsFinal() @@ -354,53 +357,105 @@ class CheckoutController extends Controller return view('web.templates.checkout-is-final', $data); } + /** + * Verarbeitet den Transaktionsstatus (POST-Anfragen) + * Einige Zahlungsanbieter senden POST-Anfragen zurück + * + * @param string $status + * @param string $reference + * @return \Illuminate\View\View|\Illuminate\Http\RedirectResponse + */ + public function transactionStatusPost($status, $reference) + { + return $this->transactionStatus($status, $reference); + } + /** * Verarbeitet den Transaktionsstatus - * - * @param string $status - * @param string $reference + * + * @param string $status + * @param string $reference * @return \Illuminate\View\View|\Illuminate\Http\RedirectResponse */ public function transactionStatus($status, $reference) { - $shopping_order_id = $this->checkoutRepo->getSessionPayments('shopping_order_id'); - $ShoppingPayment = ShoppingPayment::where('shopping_order_id', $shopping_order_id) - ->where('reference', $reference) - ->first(); + // Suche ShoppingPayment nur über reference (nicht Session-abhängig) + // Dies ist wichtig, da die Session bei Redirect-Zahlungen verloren gehen kann + $ShoppingPayment = ShoppingPayment::where('reference', $reference)->first(); - if (!$ShoppingPayment) { + if (! $ShoppingPayment) { Util::setUserHistoryValue(['status' => 21]); - Session::flash('checkout-error', 'Der Zahlungsvorgang konnte nicht abgeschlossen werden, die Zahlung wurde nicht gefunden: ' . $reference); - return redirect(route('checkout.checkout_card')); + \Log::warning('CheckoutController::transactionStatus - ShoppingPayment nicht gefunden', [ + 'reference' => $reference, + 'status' => $status, + ]); + + // Zeige eine dedizierte Fehlerseite anstatt zur Hauptseite weiterzuleiten + return $this->showTransactionError( + __('payment.payment_not_found'), + __('payment.payment_not_found_description', ['reference' => $reference]) + ); } $ShoppingPayment->status = $status; $ShoppingPayment->save(); - if ($status === "success") { + if ($status === 'success') { return $this->handleSuccessfulTransaction($ShoppingPayment, $reference); } - if ($status === "cancel") { + if ($status === 'cancel') { Util::setUserHistoryValue(['status' => 22]); - Util::setInstanceStatus(5); // link_canceled - Session::flash('checkout-error', 'Der Zahlungsvorgang wurde abgebrochen, die Bestellung konnte nicht ausgeführt werden.'); - return redirect(route('checkout.checkout_card')); + Util::setInstanceStatusByPayment($ShoppingPayment, 6); // link_canceled + + return $this->showTransactionError( + __('payment.payment_canceled'), + __('payment.payment_canceled_description') + ); } - if ($status === "error") { + if ($status === 'error') { Util::setUserHistoryValue(['status' => 23]); - Util::setInstanceStatus(6); // link_failed - Session::flash('checkout-error', 'Der Zahlungsvorgang wurde abgebrochen, die Bestellung konnte nicht ausgeführt werden.'); - return redirect(route('checkout.checkout_card')); + Util::setInstanceStatusByPayment($ShoppingPayment, 5); // link_failed + + return $this->showTransactionError( + __('payment.payment_error'), + __('payment.payment_error_description') + ); } + + // Fallback für unbekannte Status + return $this->showTransactionError( + __('payment.payment_unknown_status'), + __('payment.payment_unknown_status_description') + ); + } + + /** + * Zeigt eine Transaktionsfehlerseite an + * + * @param string $title + * @param string $message + * @return \Illuminate\View\View + */ + private function showTransactionError($title, $message) + { + $data = [ + 'user_shop' => Util::getUserShop(), + 'is_checkout' => true, + 'yard_instance' => $this->instance, + 'error_title' => $title, + 'error_message' => $message, + ]; + + return view('web.templates.checkout-error', $data); } /** * Verarbeitet eine erfolgreiche Transaktion - * - * @param ShoppingPayment $ShoppingPayment - * @param string $reference + * + * @param ShoppingPayment $ShoppingPayment + * @param string $reference * @return \Illuminate\View\View */ private function handleSuccessfulTransaction($ShoppingPayment, $reference) @@ -428,9 +483,9 @@ class CheckoutController extends Controller /** * Verarbeitet eine genehmigte Transaktion - * - * @param int $transactionId - * @param string $reference + * + * @param int $transactionId + * @param string $reference * @return \Illuminate\View\View */ public function transactionApproved($transactionId, $reference) @@ -466,9 +521,9 @@ class CheckoutController extends Controller /** * Speichert die Zahlungsdaten des Benutzers - * - * @param ShoppingUser $shopping_user - * @param array $ret + * + * @param ShoppingUser $shopping_user + * @param array $ret * @return void */ private function storeUserPaymentsData($shopping_user, $ret) @@ -486,8 +541,7 @@ class CheckoutController extends Controller /** * Verarbeitet den direkten Zahlungsstatus (Rechnung MIV) - * - * @param PaymentTransaction $payt + * * @return void */ private function directPaymentStatus(PaymentTransaction $payt) @@ -517,34 +571,36 @@ class CheckoutController extends Controller /** * Initialisiert oder ruft einen Shopping-Benutzer ab * - * @param string|null $is_from = shopping | user_order | user_order_ot | user_order_abo | user_order_abo_ot | user_order_ot_customer | user_order_abo_ot_customer - * @param string|null $is_for = me | ot | abo-me | abo-ot | ot-customer | abo-ot-customer - * @param array|null $shopping_data - * @param int|null $homeparty_id + * @param string|null $is_from = shopping | user_order | user_order_ot | user_order_abo | user_order_abo_ot | user_order_ot_customer | user_order_abo_ot_customer + * @param string|null $is_for = me | ot | abo-me | abo-ot | ot-customer | abo-ot-customer + * @param array|null $shopping_data + * @param int|null $homeparty_id * @return \App\Models\ShoppingUser */ private function initializeShoppingUserSession($is_from, $is_for, $shopping_data = null, $homeparty_id = null) { - //check if shopping_user_id is set - der user ist bereits angelegt + // check if shopping_user_id is set - der user ist bereits angelegt if ($this->checkoutRepo->getSessionPayments('shopping_user_id')) { return $this->getExistingShoppingUser(); } - //kommt vom Salescenter + // kommt vom Salescenter if ($shopping_data && $is_from !== 'shopping') { $shopping_user = $this->checkoutRepo->shoppingUserAuthData($is_from, $is_for, $shopping_data); $shopping_user->save(); $this->checkoutRepo->putSessionPayments('shopping_user_id', $shopping_user->id); + return $shopping_user; } - //kommt aus dem Salescenter mit bestelllink oder aus dem Webshop + // kommt aus dem Salescenter mit bestelllink oder aus dem Webshop if ($is_from === 'shopping') { - //Bestelllink + // Bestelllink if ($is_for === 'ot-customer' || $is_for === 'abo-ot-customer') { - //customer shop mit den Daten aus dem Salescenter shopping_data + // customer shop mit den Daten aus dem Salescenter shopping_data return $this->checkoutRepo->makeCustomerShoppingUser($shopping_data, $is_for, $is_from); } - //Webshop + + // Webshop return $this->checkoutRepo->initShoppingUser($is_for, $is_from, $homeparty_id); } @@ -553,7 +609,7 @@ class CheckoutController extends Controller /** * Holt den existierenden ShoppingUser und bereitet ihn vor - * + * * @return ShoppingUser */ private function getExistingShoppingUser() diff --git a/app/Http/Controllers/WizardController.php b/app/Http/Controllers/WizardController.php index 4914df6..0df4e3c 100644 --- a/app/Http/Controllers/WizardController.php +++ b/app/Http/Controllers/WizardController.php @@ -2,34 +2,32 @@ namespace App\Http\Controllers; -use Auth; -use Hash; -use Yard; -use Request; -use App\User; -use Validator; +use App\Mail\MailAccountActive; +use App\Mail\MailAutoReleaseAccount; +use App\Mail\MailReleaseAccount; use App\Models\File; -use App\Services\Util; use App\Models\Product; +use App\Models\ShippingCountry; +use App\Models\ShoppingInstance; use App\Models\UserAccount; use App\Models\UserHistory; -use App\Services\UserService; -use App\Mail\MailAccountActive; -use App\Models\ShippingCountry; -use App\Mail\MailReleaseAccount; -use App\Models\ShoppingInstance; -use App\Mail\MailAutoReleaseAccount; +use App\Repositories\ContractPDFRepository; use App\Repositories\FileRepository; use App\Repositories\UserRepository; +use App\Services\UserService; +use App\Services\Util; +use App\User; +use Auth; +use Hash; use Illuminate\Support\Facades\Mail; -use App\Repositories\ContractPDFRepository; +use Request; +use Validator; +use Yard; class WizardController extends Controller { - protected $fileRepo; - /** * Create a new controller instance. * @@ -42,19 +40,20 @@ class WizardController extends Controller public function create() { - if (!Auth::check()) { + if (! Auth::check()) { return redirect('login'); } $user = User::findOrFail(Auth::user()->id); - if (!$user->account) { + if (! $user->account) { $account = UserAccount::create([]); $user->account_id = $account->id; $user->save(); + return redirect(route('wizard_create')); } - $step = !$user->wizard ? 0 : $user->wizard; + $step = ! $user->wizard ? 0 : $user->wizard; if ($step >= 20) { return redirect('/home'); @@ -64,8 +63,12 @@ class WizardController extends Controller $data = [ 'user' => Auth::user(), 'step' => $step, - 'products' => Product::where('active', true)->whereJsonContains('show_on', ['7', '8'])->orderBy('pos', 'ASC')->get(), - 'products_on_board' => Product::where('active', true)->whereJsonContains('show_on', '9')->orderBy('pos', 'ASC')->get(), + 'products' => Product::where('active', true)->where(function ($q) { + $q->whereJsonContains('show_on', '7') + ->orWhereJsonContains('show_on', '8') + ->orWhereJsonContains('show_on', '9'); + })->orderBy('pos', 'ASC')->get(), + 'products_on_board' => collect(), 'userHistoryWizardPayment' => $userHistoryWizardPayment, ]; @@ -79,18 +82,19 @@ class WizardController extends Controller public function register() { - if (!Auth::check()) { + if (! Auth::check()) { return redirect('login'); } $user = User::findOrFail(Auth::user()->id); - if (!$user->account) { + if (! $user->account) { $account = UserAccount::create([]); $user->account_id = $account->id; $user->save(); + return redirect(route('wizard_register')); } - $step = !$user->wizard ? 0 : $user->wizard; + $step = ! $user->wizard ? 0 : $user->wizard; if ($step >= 10) { return redirect('/home'); @@ -99,14 +103,19 @@ class WizardController extends Controller $data = [ 'user' => Auth::user(), 'step' => $step, - 'products' => Product::where('active', true)->whereJsonContains('show_on', ['7', '8'])->orderBy('pos', 'ASC')->get(), - 'products_on_board' => Product::where('active', true)->whereJsonContains('show_on', '9')->orderBy('pos', 'ASC')->get(), + 'products' => Product::where('active', true)->where(function ($q) { + $q->whereJsonContains('show_on', '7') + ->orWhereJsonContains('show_on', '8') + ->orWhereJsonContains('show_on', '9'); + })->orderBy('pos', 'ASC')->get(), + 'products_on_board' => collect(), ]; if ($step == 5) { if ($user->active) { $user->active = false; $user->save(); } + return view('user.wizard.register_release', $data); } @@ -115,39 +124,43 @@ class WizardController extends Controller public function payment() { - if (!Auth::check()) { + if (! Auth::check()) { return redirect('login'); } $user = User::findOrFail(Auth::user()->id); - if (!$user->account) { + if (! $user->account) { $account = UserAccount::create([]); $user->account_id = $account->id; $user->save(); + return redirect(route('wizard_payment')); } $userHistoryWizardPayment = UserHistory::whereUserId($user->id)->whereAction('wizard_payment')->get()->last(); $shipping_country_id = $this->checkShoppingCountry($user); - if (!$shipping_country_id) { + if (! $shipping_country_id) { abort(403, __('validation.custom.shipping_not_found')); } UserService::checkUserTaxShippingCountry($user, $shipping_country_id); - //Yard::instance('shopping')->setShippingCountryWithPrice($shipping_country_id, $for); - //Yard::instance('shopping')->setUserPriceInfos(UserService::getYardInfo()); + // Yard::instance('shopping')->setShippingCountryWithPrice($shipping_country_id, $for); + // Yard::instance('shopping')->setUserPriceInfos(UserService::getYardInfo()); $data = [ 'user' => Auth::user(), 'step' => 0, - 'products' => Product::where('active', true)->whereJsonContains('show_on', ['7', '8'])->orderBy('pos', 'ASC')->get(), - 'products_on_board' => Product::where('active', true)->whereJsonContains('show_on', '9')->orderBy('pos', 'ASC')->get(), + 'products' => Product::where('active', true)->where(function ($q) { + $q->whereJsonContains('show_on', '7') + ->orWhereJsonContains('show_on', '8') + ->orWhereJsonContains('show_on', '9'); + })->orderBy('pos', 'ASC')->get(), + 'products_on_board' => collect(), 'userHistoryWizardPayment' => $userHistoryWizardPayment, 'yard_info' => UserService::getYardInfo(), ]; - if ($user->wizard == 20) { return view('user.wizard.register_payment', $data); } @@ -169,43 +182,45 @@ class WizardController extends Controller return $shipping_country->id; } } + return false; } public function storeRegister($step = false) { - if (!Auth::check()) { + if (! Auth::check()) { return redirect('login'); } $user = User::findOrFail(Auth::user()->id); - if (!$user->account) { - $user->account = new UserAccount(); + if (! $user->account) { + $user->account = new UserAccount; } - $data = Request::all(); if ($step == 7 && Request::get('user_country_id')) { $user->account->country_id = Request::get('user_country_id'); $user->account->save(); + return redirect(route('wizard_register', [1])); } if ($step == 0) { - $rules = array( + $rules = [ 'accepted_data_protection' => 'required', 'accepted_active' => 'required', - 'accepted_contract' => 'required' - ); + 'accepted_contract' => 'required', + ]; $validator = Validator::make(Request::all(), $rules); if ($validator->fails()) { $data = [ 'user' => Auth::user(), 'step' => $step, - 'products' => Product::where('active', true)->whereJsonContains('show_on', ['7', '8'])->orderBy('pos', 'ASC')->get(), + 'products' => Product::where('active', true)->whereJsonContains('show_on', ['7', '8'])->orderBy('pos', 'ASC')->get(), 'products_on_board' => Product::where('active', true)->whereJsonContains('show_on', '9')->orderBy('pos', 'ASC')->get(), ]; $user->wizard = 0; $user->save(); + return view('user.wizard.register', $data)->withErrors($validator); } $account = $user->account; @@ -222,26 +237,29 @@ class WizardController extends Controller $user->wizard = 1; $user->save(); + return redirect(route('wizard_register')); } if ($step == 1) { $data = Request::all(); - if (isset($data['action']) && $data['action'] == "reverse_charge_validate") { + if (isset($data['action']) && $data['action'] == 'reverse_charge_validate') { $user->wizard = 1; $user->save(); $userRepo = new UserRepository($user); + return $userRepo->reverse_charge_validate($data, $user, route('wizard_register', [0])); } - if (isset($data['action']) && $data['action'] == "reverse_charge_delete") { + if (isset($data['action']) && $data['action'] == 'reverse_charge_delete') { $user->wizard = 1; $user->save(); $userRepo = new UserRepository($user); + return $userRepo->reverse_charge_delete($data, $user, route('wizard_register', [0])); } - $rules = array( + $rules = [ 'salutation' => 'required', 'first_name' => 'required', 'last_name' => 'required', @@ -255,9 +273,9 @@ class WizardController extends Controller 'bank_owner' => 'required', 'bank_iban' => 'required', 'bank_bic' => 'required', - ); + ]; - if (!Request::get('same_as_billing')) { + if (! Request::get('same_as_billing')) { $rules = array_merge($rules, [ 'shipping_firstname' => 'required', 'shipping_lastname' => 'required', @@ -272,12 +290,14 @@ class WizardController extends Controller if ($validator->fails()) { $user->wizard = 1; $user->save(); + return redirect(route('wizard_register', [1]))->withErrors($validator)->withInput(Request::all()); } - $data['same_as_billing'] = Request::get('same_as_billing') == NULL ? 0 : 1; + $data['same_as_billing'] = Request::get('same_as_billing') == null ? 0 : 1; $user->account->fill($data)->save(); $user->wizard = 2; $user->save(); + return redirect(route('wizard_register')); } @@ -288,40 +308,45 @@ class WizardController extends Controller $validator->errors()->add('field', __('msg.no_id_card_deposited_please_upload_first')); $user->wizard = 2; $user->save(); + return redirect(route('wizard_register'))->withErrors($validator)->withInput(Request::all()); } $user->wizard = 3; $user->save(); + return redirect(route('wizard_register')); } $this->fileRepo->_set('disk', 'user'); - $this->fileRepo->_set('dir', '/' . $user->id . '/verification/'); + $this->fileRepo->_set('dir', '/'.$user->id.'/verification/'); $this->fileRepo->_set('user_id', $user->id); $this->fileRepo->_set('identifier', 'id_card'); - return $this->fileRepo->uploadFile(Request::all()); + + return $this->fileRepo->uploadFile(Request::all()); } if ($step == 3) { if (Request::get('submit') === 'do') { $data = Request::all(); - if ($data['business_license_choose'] === "now") { + if ($data['business_license_choose'] === 'now') { if (File::whereUserId($user->id)->whereIdentifier('business_license')->count() == 0) { $validator = Validator::make(Request::all(), []); $validator->errors()->add('field', __('msg.no_trade_licence_deposited_please_upload_first')); $user->wizard = 3; $user->save(); + return redirect(route('wizard_register'))->withErrors($validator)->withInput(Request::all()); } } - if ($data['business_license_choose'] === "later") { + if ($data['business_license_choose'] === 'later') { } - if ($data['business_license_choose'] === "non") { - if (!$data['non_business_license_reason'] || $data['non_business_license_reason'] == "") { + if ($data['business_license_choose'] === 'non') { + if (! $data['non_business_license_reason'] || $data['non_business_license_reason'] == '') { $validator = Validator::make(Request::all(), []); $validator->errors()->add('field', __('msg.please_enter_reason_why_you_not_need_trade_licence')); $user->wizard = 3; $user->save(); + return redirect(route('wizard_register'))->withErrors($validator)->withInput(Request::all()); } else { $user->account->setNotice('business_license_reason', $data['non_business_license_reason']); @@ -335,10 +360,11 @@ class WizardController extends Controller return redirect(route('wizard_register')); } $this->fileRepo->_set('disk', 'user'); - $this->fileRepo->_set('dir', '/' . $user->id . '/verification/'); + $this->fileRepo->_set('dir', '/'.$user->id.'/verification/'); $this->fileRepo->_set('user_id', $user->id); $this->fileRepo->_set('identifier', 'business_license'); - return $this->fileRepo->uploadFile(Request::all()); + + return $this->fileRepo->uploadFile(Request::all()); } if ($step == 4) { @@ -363,7 +389,7 @@ class WizardController extends Controller } } - //auto release account + // auto release account public function releaseAccount($user) { @@ -373,15 +399,15 @@ class WizardController extends Controller $user->account->m_account = UserAccount::withTrashed()->max('m_account') + 1; $user->account->save(); $user->save(); - //create PDF + // create PDF $pdf = new ContractPDFRepository($user); $pdf->_set('disk', 'user'); - $pdf->_set('dir', '/' . $user->id . '/documents/'); + $pdf->_set('dir', '/'.$user->id.'/documents/'); $pdf->_set('user_id', $user->id); $pdf->_set('identifier', 'contract'); $pdf->createContractPDF(); - //set wizard tp payments + // set wizard tp payments $user->wizard = 20; $user->active = 1; $user->active_date = now(); @@ -391,7 +417,7 @@ class WizardController extends Controller $user->confirmation_code_remider = 0; $user->save(); - //mail with code to user? + // mail with code to user? if ($user->isTestMode()) { $mail = config('app.info_test_mail'); } else { @@ -402,36 +428,38 @@ class WizardController extends Controller Mail::to($user->email)->locale($user->getLocale())->send(new MailAccountActive($user)); UserHistory::create(['user_id' => $user->id, 'action' => 'released_completed', 'status' => 0]); \Session()->flash('alert-success', __('msg.account_released')); + return redirect(route('wizard_payment')); } public function storeCreate($step = 0) { - if (!Auth::check()) { + if (! Auth::check()) { return redirect('login'); } $user = User::findOrFail(Auth::user()->id); - if (!$user->account) { - $user->account = new UserAccount(); + if (! $user->account) { + $user->account = new UserAccount; } if ($step == 10) { - $rules = array( + $rules = [ 'accepted_data_protection' => 'required', 'accepted_active' => 'required', - ); + ]; $validator = Validator::make(Request::all(), $rules); if ($validator->fails()) { $data = [ 'user' => Auth::user(), 'step' => $step, - 'products' => Product::where('active', true)->whereJsonContains('show_on', ['7', '8'])->orderBy('pos', 'ASC')->get(), + 'products' => Product::where('active', true)->whereJsonContains('show_on', ['7', '8'])->orderBy('pos', 'ASC')->get(), 'products_on_board' => Product::where('active', true)->whereJsonContains('show_on', '9')->orderBy('pos', 'ASC')->get(), ]; $user->wizard = 10; $user->save(); + return view('user.wizard.create', $data)->withErrors($validator); } $account = $user->account; @@ -455,50 +483,54 @@ class WizardController extends Controller if ($user->isPasswort()) { $user->wizard = 12; $user->save(); + return redirect(route('wizard_create', [12])); } - $rules = array( + $rules = [ 'password' => 'required|string|min:6|confirmed', - ); + ]; $validator = Validator::make(Request::all(), $rules); if ($validator->fails()) { $data = [ 'user' => Auth::user(), 'step' => $step, - 'products' => Product::where('active', true)->whereJsonContains('show_on', ['7', '8'])->orderBy('pos', 'ASC')->get(), + 'products' => Product::where('active', true)->whereJsonContains('show_on', ['7', '8'])->orderBy('pos', 'ASC')->get(), 'products_on_board' => Product::where('active', true)->whereJsonContains('show_on', '9')->orderBy('pos', 'ASC')->get(), ]; + return view('user.wizard.create', $data)->withErrors($validator); } $user->fill([ - 'password' => Hash::make(Request::get('password')) + 'password' => Hash::make(Request::get('password')), ])->save(); $user->wizard = 12; $user->save(); + return redirect(route('wizard_create', [12])); } if ($step == 12) { $data = Request::all(); - if (isset($data['action']) && $data['action'] == "reverse_charge_validate") { + if (isset($data['action']) && $data['action'] == 'reverse_charge_validate') { $user->wizard = 12; $user->save(); $userRepo = new UserRepository($user); + return $userRepo->reverse_charge_validate($data, $user, route('wizard_create', [12])); } - if (isset($data['action']) && $data['action'] == "reverse_charge_delete") { + if (isset($data['action']) && $data['action'] == 'reverse_charge_delete') { $user->wizard = 12; $user->save(); $userRepo = new UserRepository($user); + return $userRepo->reverse_charge_delete($data, $user, route('wizard_create', [12])); } - - $rules = array( + $rules = [ 'salutation' => 'required', 'first_name' => 'required', 'last_name' => 'required', @@ -509,16 +541,16 @@ class WizardController extends Controller 'mobil' => 'required_without:phone', 'country_id' => 'required|integer|min:1', 'birthday' => 'required', - ); + ]; - if (!Request::get('same_as_billing')) { + if (! Request::get('same_as_billing')) { $rules = array_merge($rules, [ 'shipping_firstname' => 'required', 'shipping_lastname' => 'required', 'shipping_address' => 'required', 'shipping_zipcode' => 'required', 'shipping_city' => 'required', - 'shipping_salutation' => 'required' + 'shipping_salutation' => 'required', ]); } @@ -528,7 +560,7 @@ class WizardController extends Controller } $data = Request::all(); - $data['same_as_billing'] = Request::get('same_as_billing') == NULL ? 0 : 1; + $data['same_as_billing'] = Request::get('same_as_billing') == null ? 0 : 1; $user->account->fill($data)->save(); $user->wizard = 13; @@ -538,11 +570,11 @@ class WizardController extends Controller $user->confirmation_code_to = null; $user->confirmation_code_remider = 0; $user->save(); + return redirect(route('wizard_create', [13])); } } - public function storePayment($step = 0) { @@ -552,13 +584,13 @@ class WizardController extends Controller $product = Product::find(Request::get('switchers-package-wizard')); $showAboOptions = false; if (Request::get('abo_options')) { - $showAboOptions = false; //true Abo Option deaktivert - $user->abo_options = false; //true Abo Option deaktivert + $showAboOptions = false; // true Abo Option deaktivert + $user->abo_options = false; // true Abo Option deaktivert $user->save(); } $shipping_country_id = $this->checkShoppingCountry($user); - if (!$shipping_country_id) { + if (! $shipping_country_id) { abort(403, __('validation.custom.shipping_not_found')); } @@ -566,37 +598,19 @@ class WizardController extends Controller Yard::instance('shopping')->setUserPriceInfos(UserService::getYardInfo()); Yard::instance('shopping')->setShippingCountryWithPrice($shipping_country_id); - if ($product && $product->active) { - //set membership product - $image = ""; + // set membership product + $image = ''; if ($product->images->count()) { $image = $product->images->first()->slug; } - $cartItem = Yard::instance('shopping')->add($product->id, $product->getLang('name'), 1, $product->getPriceWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country), false, false, ['image' => $image, 'slug' => $product->slug, 'weight' => $product->weight, 'points' => $product->points, 'no_commission' => $product->no_commission, 'show_on' => $product->show_on]); + $cartItem = Yard::instance('shopping')->add($product->id, $product->getLang('name'), 1, $product->getPriceWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country), false, false, ['image' => $image, 'slug' => $product->slug, 'weight' => $product->weight, 'points' => $product->points, 'no_commission' => $product->no_commission, 'no_free_shipping' => $product->no_free_shipping, 'free_shipping_consultant' => $product->free_shipping_consultant, 'show_on' => $product->show_on]); if (\App\Services\UserService::getTaxFree()) { Yard::setTax($cartItem->rowId, 0); } else { Yard::setTax($cartItem->rowId, $product->getTaxWith(\App\Services\UserService::$user_country)); } - //set onboarding products - if (Request::get('products_on_board')) { - foreach (Request::get('products_on_board') as $product_on_board_id) { - $product_on_board = Product::find($product_on_board_id); - $image = ""; - if ($product_on_board->images->count()) { - $image = $product_on_board->images->first()->slug; - } - $cartItem = Yard::instance('shopping')->add($product_on_board->id, $product_on_board->getLang('name'), 1, $product_on_board->getPriceWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country), false, false, ['image' => $image, 'slug' => $product_on_board->slug, 'weight' => $product_on_board->weight, 'points' => $product_on_board->points, 'no_commission' => $product_on_board->no_commission, 'show_on' => $product_on_board->show_on]); - if (\App\Services\UserService::getTaxFree()) { - Yard::setTax($cartItem->rowId, 0); - } else { - Yard::setTax($cartItem->rowId, $product->getTaxWith(\App\Services\UserService::$user_country)); - } - } - } - do { $identifier = Util::getToken(); } while (ShoppingInstance::where('identifier', $identifier)->count()); @@ -608,9 +622,9 @@ class WizardController extends Controller ShoppingInstance::create([ 'identifier' => $identifier, - 'user_shop_id' => 1, //is first faker shop for buy intern + 'user_shop_id' => 1, // is first faker shop for buy intern 'auth_user_id' => Auth::user()->id, - 'payment' => 4, //Berater Wizard + 'payment' => 4, // Berater Wizard 'subdomain' => url('/'), 'country_id' => Yard::instance('shopping')->getShippingCountryId(), 'language' => \App::getLocale(), @@ -619,14 +633,16 @@ class WizardController extends Controller ]); Yard::instance('shopping')->store($identifier); - //add to DB + // add to DB $path = route('checkout.checkout_card', ['identifier' => $identifier]); UserHistory::create(['user_id' => $user->id, 'action' => 'wizard_payment', 'status' => 1, 'product_id' => $product->id, 'identifier' => $identifier, 'abo_options' => $showAboOptions]); - //$path = str_replace('http', 'https', $path); + + // $path = str_replace('http', 'https', $path); return redirect()->secure($path); } } - \Session()->flash('alert-error', "Fehler beim Produkt"); + \Session()->flash('alert-error', 'Fehler beim Produkt'); + return back(); } @@ -636,11 +652,12 @@ class WizardController extends Controller if ($relation === 'upload') { $user = User::findOrFail(Auth::user()->id); $file = $user->files()->findOrFail($id); - //remove file - \Storage::disk('user')->delete($file->dir . $file->filename); + // remove file + \Storage::disk('user')->delete($file->dir.$file->filename); $file->delete(); \Session()->flash('alert-success', __('msg.file_deleted')); } + return back(); } } diff --git a/app/Http/Middleware/ActiveAccount.php b/app/Http/Middleware/ActiveAccount.php index 6a51438..c4e1157 100644 --- a/app/Http/Middleware/ActiveAccount.php +++ b/app/Http/Middleware/ActiveAccount.php @@ -2,8 +2,8 @@ namespace App\Http\Middleware; -use Closure; use Auth; +use Closure; class ActiveAccount { @@ -11,16 +11,14 @@ class ActiveAccount * Handle an incoming request. * * @param \Illuminate\Http\Request $request - * @param \Closure $next * @return mixed */ public function handle($request, Closure $next) { - if ( Auth::check() && Auth::user()->isActiveAccount() ) - { + if (Auth::check() && (Auth::user()->isAdmin() || Auth::user()->isActiveAccount())) { return $next($request); } - return redirect('/home'); + return redirect('/home'); } } diff --git a/app/Jobs/CreateReturnLabelJob.php b/app/Jobs/CreateReturnLabelJob.php index fa701c4..41cfd7b 100644 --- a/app/Jobs/CreateReturnLabelJob.php +++ b/app/Jobs/CreateReturnLabelJob.php @@ -16,7 +16,7 @@ use Illuminate\Support\Facades\Log; /** * Job to create DHL return labels asynchronously - * + * * This job handles the creation of DHL return labels in the background, * preventing API timeouts and improving user experience. */ @@ -50,9 +50,6 @@ class CreateReturnLabelJob implements ShouldQueue /** * Create a new job instance. - * - * @param DhlShipment $originalShipment - * @param array $options */ public function __construct(DhlShipment $originalShipment, array $options = []) { @@ -80,7 +77,7 @@ class CreateReturnLabelJob implements ShouldQueue ]); // Get DHL configuration - $settingController = new SettingController(); + $settingController = new SettingController; $dhlConfig = $settingController->getDhlConfig(); // Initialize DHL client @@ -136,15 +133,22 @@ class CreateReturnLabelJob implements ShouldQueue $order = $this->originalShipment->shoppingOrder; $recipient = $this->originalShipment->recipient ?? []; - return [ - 'order_id' => $order->id, - 'original_shipment_id' => $this->originalShipment->id, - 'weight_kg' => $this->originalShipment->weight_kg, - 'label_format' => $this->originalShipment->label_format ?? 'PDF', + // Check if this is a Packstation delivery - use billing address as return sender + $hasPostNumber = ! empty($recipient['postnumber'] ?? $recipient['postNumber'] ?? ''); - // Shipper: Customer sends back to us (swap addresses) - 'shipper' => [ - 'name' => trim(($recipient['firstname'] ?? '') . ' ' . ($recipient['lastname'] ?? '')), + if ($hasPostNumber) { + Log::info('[DHL Queue] Packstation detected - using billing address for return sender', [ + 'shipment_id' => $this->originalShipment->id, + 'order_id' => $order->id, + ]); + + // Load billing address from order + $shippingUser = $order->shopping_user; + $shipperAddress = $this->getBillingAddressForReturn($shippingUser, $recipient); + } else { + // Use original recipient address (normal delivery) + $shipperAddress = [ + 'name' => trim(($recipient['firstname'] ?? '').' '.($recipient['lastname'] ?? '')), 'name2' => $recipient['company'] ?? '', 'street' => $recipient['street'] ?? '', 'houseNumber' => $recipient['houseNumber'] ?? '', @@ -153,7 +157,17 @@ class CreateReturnLabelJob implements ShouldQueue 'country' => $recipient['country'] ?? 'DEU', 'email' => $recipient['email'] ?? '', 'phone' => $recipient['phone'] ?? '', - ], + ]; + } + + return [ + 'order_id' => $order->id, + 'original_shipment_id' => $this->originalShipment->id, + 'weight_kg' => $this->originalShipment->weight_kg, + 'label_format' => $this->originalShipment->label_format ?? 'PDF', + + // Shipper: Customer sends back to us (using billing address for Packstation) + 'shipper' => $shipperAddress, // Consignee: Our warehouse (from settings) 'consignee' => [ @@ -170,10 +184,56 @@ class CreateReturnLabelJob implements ShouldQueue ]; } + /** + * Get billing address for return label (used when original delivery was to Packstation) + */ + private function getBillingAddressForReturn($shippingUser, array $recipient): array + { + if (! $shippingUser) { + Log::warning('[DHL Queue] No shipping user found, using recipient data', [ + 'recipient' => $recipient, + ]); + + // Fallback: use recipient data but without Packstation fields + return [ + 'name' => trim(($recipient['firstname'] ?? '').' '.($recipient['lastname'] ?? '')), + 'name2' => $recipient['company'] ?? '', + 'street' => 'Adresse fehlt', + 'houseNumber' => '', + 'postalCode' => $recipient['postalCode'] ?? '', + 'city' => $recipient['city'] ?? '', + 'country' => $recipient['country'] ?? 'DEU', + 'email' => $recipient['email'] ?? '', + 'phone' => $recipient['phone'] ?? '', + ]; + } + + // Parse billing address to extract street and house number + $billingAddress = trim($shippingUser->billing_address ?? ''); + $street = $billingAddress; + $houseNumber = ''; + + // Try to extract house number from address + if (preg_match('/^(.+?)\s+(\d+[a-zA-Z]?[-\/\d]*)$/u', $billingAddress, $matches)) { + $street = trim($matches[1]); + $houseNumber = trim($matches[2]); + } + + return [ + 'name' => trim(($shippingUser->billing_firstname ?? '').' '.($shippingUser->billing_lastname ?? '')), + 'name2' => $shippingUser->billing_company ?? '', + 'street' => $street, + 'houseNumber' => $houseNumber, + 'postalCode' => $shippingUser->billing_zipcode ?? '', + 'city' => $shippingUser->billing_city ?? '', + 'country' => $shippingUser->billing_country?->code ?? 'DEU', + 'email' => $shippingUser->billing_email ?? '', + 'phone' => $shippingUser->billing_phone ?? '', + ]; + } + /** * Handle a job failure. - * - * @param Exception $exception */ public function failed(Exception $exception): void { diff --git a/app/Libraries/ContractPDF.php b/app/Libraries/ContractPDF.php index a3260d1..65ad5ec 100644 --- a/app/Libraries/ContractPDF.php +++ b/app/Libraries/ContractPDF.php @@ -1,29 +1,38 @@ _locale = $locale; + } + public function Header() { - if (null === $this->_tplIdx) { - $this->setSourceFile('./pdf/mivita_template_contract_de.pdf'); + if ($this->_tplIdx === null) { + // Template basierend auf Locale wählen + $availableTemplates = config('localization.availableTemplates', ['de']); + $locale = in_array($this->_locale, $availableTemplates) ? $this->_locale : 'de'; + + $this->setSourceFile('./pdf/mivita_template_contract_'.$locale.'.pdf'); } $this->_tplIdx = $this->importPage($this->_site++); $this->useTemplate($this->_tplIdx); } - function Footer() { - - } // end of footer - - - + public function Footer() {} // end of footer } diff --git a/app/Mail/MailCredit.php b/app/Mail/MailCredit.php index 7a12c71..0a4ec43 100644 --- a/app/Mail/MailCredit.php +++ b/app/Mail/MailCredit.php @@ -1,16 +1,12 @@ user_credit = $user_credit; $this->subject = __('email.credit_title'); } - + public function build() { - $title = 'Hallo '; + $title = 'Hallo '; $copy1line = __('email.credit_copy1line'); - if(isset($this->user_credit->user->account)){ - $title .= $this->user_credit->user->account->m_first_name.","; + if (isset($this->user_credit->user->account)) { + $title .= $this->user_credit->user->account->m_first_name.','; } - $filename = $this->user_credit->filename; - $disk = $this->user_credit->disk; - $path = $this->user_credit->getDownloadPath(); - if (!Storage::disk($disk)->exists($path)) { + $disk = $this->user_credit->disk; + + // 1. Deutsches Original immer anhängen + $pathDe = $this->user_credit->getDownloadPath(); + $filenameDe = $this->user_credit->filename; + + if (! Storage::disk($disk)->exists($pathDe)) { return; } - $file = Storage::disk($disk)->path($path); - $file = str_replace('//', '/', $file); - $mime = Storage::disk($disk)->mimeType($path); - return $this->view('emails.blank')->with([ + $fileDe = Storage::disk($disk)->path($pathDe); + $fileDe = str_replace('//', '/', $fileDe); + $mimeDe = Storage::disk($disk)->mimeType($pathDe); + + $mail = $this->view('emails.blank')->with([ 'title' => $title, - 'copy1line' => $copy1line, - ])->attach($file,[ - 'as' => $filename, - 'mime' => $mime, - ]); // attach file; + 'copy1line' => $copy1line, + ])->attach($fileDe, [ + 'as' => $filenameDe, + 'mime' => $mimeDe, + ]); + + // 2. Lokalisierte Version zusätzlich anhängen (wenn vorhanden und != DE) + $locale = $this->user_credit->user + ? $this->user_credit->user->getLocale() + : 'de'; + + if ($locale && $locale !== 'de') { + $pathLocale = $this->user_credit->getDownloadPathLocale($locale); + $filenameLocale = $this->user_credit->getFilenameLocale($locale); + + // Nur anhängen wenn lokalisierte Version existiert und nicht gleich dem Original ist + if (Storage::disk($disk)->exists($pathLocale) && $pathLocale !== $pathDe) { + $fileLocale = Storage::disk($disk)->path($pathLocale); + $fileLocale = str_replace('//', '/', $fileLocale); + $mimeLocale = Storage::disk($disk)->mimeType($pathLocale); + + $mail->attach($fileLocale, [ + 'as' => $filenameLocale, + 'mime' => $mimeLocale, + ]); + } + } + + return $mail; } -} \ No newline at end of file +} diff --git a/app/Mail/MailCustomMessage.php b/app/Mail/MailCustomMessage.php index deb6c38..bf3aeeb 100644 --- a/app/Mail/MailCustomMessage.php +++ b/app/Mail/MailCustomMessage.php @@ -1,4 +1,5 @@ message_last = isset($data['message_last']) ? $data['message_last'] : ''; } - public function build() { - $salutation = __('email.salutation').","; - if($this->user->account){ - if($this->user->account->salutation === "mr"){ - $salutation = __('email.dear_sir')." ".$this->user->account->first_name.","; - }else{ - $salutation = __('email.dear_mrs')." ".$this->user->account->first_name.","; + $salutation = __('email.salutation').','; + if ($this->user->account) { + if ($this->user->account->salutation === 'mr') { + $salutation = __('email.dear_sir').' '.$this->user->account->first_name.','; + } else { + $salutation = __('email.dear_mrs').' '.$this->user->account->first_name.','; } } - if($this->save){ + if ($this->save) { UserMessage::create([ - 'user_id' => $this->user->id, + 'user_id' => $this->user->id, 'send_user_id' => $this->sender->id, 'email' => $this->user->email, 'subject' => $this->subject, - 'message' => $this->message." ".$this->message_last, + 'message' => $this->message.' '.$this->message_last, 'send' => true, 'sent_at' => now(), ]); } - $url = ""; - $button = ""; - if(isset($this->data['confirmation_code'])){ + $url = ''; + $button = ''; + if (isset($this->data['confirmation_code'])) { $url = route('register_verify', $this->data['confirmation_code']); - $button = __('email.button_account'); - + $button = __('email.button_account'); } - if(isset($this->data['url'])){ - $url =$this->data['url']; - $button = $this->data['button']; - + if (isset($this->data['url'])) { + $url = $this->data['url']; + $button = $this->data['button']; } + return $this->view('emails.custom')->with([ 'url' => $url, 'title' => $salutation, 'button' => $button, - 'content' => $this->message, - 'content_last' => $this->message_last, + 'content' => $this->message, + 'content_last' => $this->message_last, 'copy2line' => __('email.copy2line'), 'copy3line' => __('email.copy3line'), 'greetings' => __('email.greetings'), diff --git a/app/Mail/MailInvoice.php b/app/Mail/MailInvoice.php index 3cd1746..456238a 100644 --- a/app/Mail/MailInvoice.php +++ b/app/Mail/MailInvoice.php @@ -1,7 +1,7 @@ shopping_order = $shopping_order; $this->user_invoice = $user_invoice; - $this->subject = __('email.invoice_subject').': '.$shopping_order->getLastShoppingPayment('reference') ; + + // Unterscheide zwischen Stornorechnung und normaler Rechnung + $isCancellation = $user_invoice->cancellation && ! $user_invoice->cancellation_id; + + if ($isCancellation) { + $this->subject = __('email.cancellation_invoice_subject').': '.$shopping_order->getLastShoppingPayment('reference'); + } else { + $this->subject = __('email.invoice_subject').': '.$shopping_order->getLastShoppingPayment('reference'); + } } - + public function build() { - $title = __('email.invoice_title'); - $copy1line = __('email.invoice_copy1line').$this->shopping_order->getLastShoppingPayment('reference'); + // Unterscheide zwischen Stornorechnung und normaler Rechnung + $isCancellation = $this->user_invoice->cancellation && ! $this->user_invoice->cancellation_id; - $filename = $this->user_invoice->filename; - $disk = $this->user_invoice->disk; - $path = $this->user_invoice->getDownloadPath(); - if (!Storage::disk($disk)->exists($path)) { + if ($isCancellation) { + $title = __('email.cancellation_invoice_title'); + $copy1line = __('email.cancellation_invoice_copy1line').$this->shopping_order->getLastShoppingPayment('reference'); + } else { + $title = __('email.invoice_title'); + $copy1line = __('email.invoice_copy1line').$this->shopping_order->getLastShoppingPayment('reference'); + } + + $disk = $this->user_invoice->disk; + + // 1. Deutsches Original immer anhängen + $pathDe = $this->user_invoice->getDownloadPath(); + $filenameDe = $this->user_invoice->filename; + + if (! Storage::disk($disk)->exists($pathDe)) { return; } - $file = Storage::disk($disk)->path($path); - $file = str_replace('//', '/', $file); - $mime = Storage::disk($disk)->mimeType($path); - return $this->view('emails.blank')->with([ + $fileDe = Storage::disk($disk)->path($pathDe); + $fileDe = str_replace('//', '/', $fileDe); + $mimeDe = Storage::disk($disk)->mimeType($pathDe); + + $mail = $this->view('emails.blank')->with([ 'title' => $title, - 'copy1line' => $copy1line, - ])->attach($file,[ - 'as' => $filename, - 'mime' => $mime, - ]); // attach file; + 'copy1line' => $copy1line, + ])->attach($fileDe, [ + 'as' => $filenameDe, + 'mime' => $mimeDe, + ]); + + // 2. Lokalisierte Version zusätzlich anhängen (wenn vorhanden und != DE) + $locale = $this->shopping_order->shopping_user + ? $this->shopping_order->shopping_user->getLocale() + : 'de'; + + if ($locale && $locale !== 'de') { + $pathLocale = $this->user_invoice->getDownloadPathLocale($locale); + $filenameLocale = $this->user_invoice->getFilenameLocale($locale); + + // Nur anhängen wenn lokalisierte Version existiert und nicht gleich dem Original ist + if (Storage::disk($disk)->exists($pathLocale) && $pathLocale !== $pathDe) { + $fileLocale = Storage::disk($disk)->path($pathLocale); + $fileLocale = str_replace('//', '/', $fileLocale); + $mimeLocale = Storage::disk($disk)->mimeType($pathLocale); + + $mail->attach($fileLocale, [ + 'as' => $filenameLocale, + 'mime' => $mimeLocale, + ]); + } + } + + return $mail; } -} \ No newline at end of file +} diff --git a/app/Models/DashboardNews.php b/app/Models/DashboardNews.php index d7bb001..ea0a564 100644 --- a/app/Models/DashboardNews.php +++ b/app/Models/DashboardNews.php @@ -18,6 +18,7 @@ use Illuminate\Database\Eloquent\Model; * @property \Illuminate\Support\Carbon|null $display_date * @property \Illuminate\Support\Carbon|null $created_at * @property \Illuminate\Support\Carbon|null $updated_at + * * @mixin \Eloquent */ class DashboardNews extends Model @@ -55,9 +56,10 @@ class DashboardNews extends Model return $this->{$key}; } $trans = $this->getTrans($key, $lang); - if (!$trans || $trans == '') { + if (! $trans || $trans == '') { return $this->{$key}; } + return $trans; } @@ -66,29 +68,44 @@ class DashboardNews extends Model */ public function getTrans($key, $lang) { - $transKey = 'trans_' . $key; - if (!empty($this->{$transKey}[$lang])) { + $transKey = 'trans_'.$key; + if (! empty($this->{$transKey}[$lang])) { return $this->{$transKey}[$lang]; } - return ""; + + return ''; } /** * Get active news */ - public static function getActiveNews() + public static function getActiveNews(): ?self { return self::where('active', true) ->orderBy('created_at', 'DESC') ->first(); } + /** + * Get all archived (non-active) news ordered by display date descending + * + * @return \Illuminate\Database\Eloquent\Collection + */ + public static function getArchiveNews(): \Illuminate\Database\Eloquent\Collection + { + return self::where('active', false) + ->orderBy('display_date', 'DESC') + ->orderBy('created_at', 'DESC') + ->get(); + } + /** * Get formatted display date or created_at as fallback */ public function getDisplayDateFormatted() { $date = $this->display_date ?: $this->created_at; + return $date ? $date->format('d.m.Y') : ''; } @@ -97,11 +114,11 @@ class DashboardNews extends Model */ public function getFileLinks($lang = null) { - if (!$lang) { + if (! $lang) { $lang = \App::getLocale(); } - if (!$this->file_links || !isset($this->file_links[$lang])) { + if (! $this->file_links || ! isset($this->file_links[$lang])) { return []; } @@ -115,6 +132,7 @@ class DashboardNews extends Model ]; } } + return null; })->filter()->values(); } diff --git a/app/Models/DatevExport.php b/app/Models/DatevExport.php new file mode 100644 index 0000000..417a754 --- /dev/null +++ b/app/Models/DatevExport.php @@ -0,0 +1,170 @@ + 'Entwurf', + self::STATUS_GENERATED => 'Generiert', + self::STATUS_DOWNLOADED => 'Heruntergeladen', + self::STATUS_LOCKED => 'Gesperrt', + ]; + + const STATUS_BADGES = [ + self::STATUS_DRAFT => 'secondary', + self::STATUS_GENERATED => 'info', + self::STATUS_DOWNLOADED => 'success', + self::STATUS_LOCKED => 'dark', + ]; + + protected $fillable = [ + 'period_from', + 'period_to', + 'month', + 'year', + 'status', + 'berater_nr', + 'mandant_nr', + 'invoice_count', + 'credit_count', + 'cancellation_count', + 'total_revenue', + 'total_commissions', + 'filename', + 'file_path', + 'file_hash', + 'created_by', + 'warning_count', + 'error_count', + 'validation_summary', + ]; + + protected $casts = [ + 'period_from' => 'date', + 'period_to' => 'date', + 'total_revenue' => 'decimal:2', + 'total_commissions' => 'decimal:2', + 'validation_summary' => 'array', + ]; + + /* + |-------------------------------------------------------------------------- + | Relationships + |-------------------------------------------------------------------------- + */ + + public function lines() + { + return $this->hasMany(DatevExportLine::class, 'datev_export_id'); + } + + public function creator() + { + return $this->belongsTo(User::class, 'created_by'); + } + + /* + |-------------------------------------------------------------------------- + | Scopes + |-------------------------------------------------------------------------- + */ + + public function scopeForPeriod($query, int $month, int $year) + { + return $query->where('month', $month)->where('year', $year); + } + + public function scopeGenerated($query) + { + return $query->where('status', '>=', self::STATUS_GENERATED); + } + + public function scopeLocked($query) + { + return $query->where('status', self::STATUS_LOCKED); + } + + /* + |-------------------------------------------------------------------------- + | Accessors + |-------------------------------------------------------------------------- + */ + + public function getStatusLabelAttribute(): string + { + return self::STATUS_LABELS[$this->status] ?? '-'; + } + + public function getStatusBadgeAttribute(): string + { + $badge = self::STATUS_BADGES[$this->status] ?? 'secondary'; + + return ''.$this->status_label.''; + } + + public function getPeriodLabelAttribute(): string + { + return str_pad($this->month, 2, '0', STR_PAD_LEFT).'/'.$this->year; + } + + public function getTotalLinesAttribute(): int + { + return $this->invoice_count + $this->credit_count + $this->cancellation_count; + } + + /* + |-------------------------------------------------------------------------- + | Methods + |-------------------------------------------------------------------------- + */ + + public function isLocked(): bool + { + return $this->status === self::STATUS_LOCKED; + } + + public function isGenerated(): bool + { + return $this->status >= self::STATUS_GENERATED; + } + + public function markAsDownloaded(): void + { + if ($this->status === self::STATUS_GENERATED) { + $this->update(['status' => self::STATUS_DOWNLOADED]); + } + } + + public function lock(): void + { + $this->update(['status' => self::STATUS_LOCKED]); + } + + public function getStoragePath(): string + { + return config('datev.storage_path').'/'.$this->year.'/'.str_pad($this->month, 2, '0', STR_PAD_LEFT); + } + + public function getFullFilePath(): string + { + return $this->getStoragePath().'/'.$this->filename; + } +} diff --git a/app/Models/DatevExportLine.php b/app/Models/DatevExportLine.php new file mode 100644 index 0000000..482831a --- /dev/null +++ b/app/Models/DatevExportLine.php @@ -0,0 +1,100 @@ + 'decimal:2', + 'belegdatum' => 'date', + ]; + + /* + |-------------------------------------------------------------------------- + | Relationships + |-------------------------------------------------------------------------- + */ + + public function datev_export() + { + return $this->belongsTo(DatevExport::class, 'datev_export_id'); + } + + /* + |-------------------------------------------------------------------------- + | Scopes + |-------------------------------------------------------------------------- + */ + + public function scopeInvoices($query) + { + return $query->where('source_type', self::SOURCE_INVOICE); + } + + public function scopeCredits($query) + { + return $query->where('source_type', self::SOURCE_CREDIT); + } + + public function scopeCancellations($query) + { + return $query->where('source_type', self::SOURCE_CANCELLATION); + } + + /* + |-------------------------------------------------------------------------- + | Accessors + |-------------------------------------------------------------------------- + */ + + public function getSourceTypeLabelAttribute(): string + { + return match ($this->source_type) { + self::SOURCE_INVOICE => 'Rechnung', + self::SOURCE_CREDIT => 'Gutschrift', + self::SOURCE_CANCELLATION => 'Storno', + default => $this->source_type, + }; + } + + public function getFormattedAmountAttribute(): string + { + $prefix = $this->soll_haben === 'S' ? '-' : ''; + + return $prefix.number_format(abs($this->amount_gross), 2, ',', '.').' €'; + } + + public function getFormattedBelegdatumAttribute(): string + { + return $this->belegdatum ? $this->belegdatum->format('d.m.Y') : '-'; + } +} diff --git a/app/Models/Product.php b/app/Models/Product.php index 4d7cce7..0aaae4f 100644 --- a/app/Models/Product.php +++ b/app/Models/Product.php @@ -189,6 +189,8 @@ class Product extends Model 'active' => 'bool', 'no_commission' => 'bool', 'no_free_shipping' => 'bool', + 'free_shipping_consultant' => 'bool', + 'is_membership_only' => 'bool', 'buying_restriction' => 'bool', 'buying_restriction_amount' => 'int', 'sponsor_buying_points' => 'bool', @@ -212,6 +214,8 @@ class Product extends Model 'weight', 'no_commission', 'no_free_shipping', + 'free_shipping_consultant', + 'is_membership_only', 'contents', 'contents_total', 'unit', diff --git a/app/Models/ShoppingInstance.php b/app/Models/ShoppingInstance.php index 9a3fb22..1492a32 100644 --- a/app/Models/ShoppingInstance.php +++ b/app/Models/ShoppingInstance.php @@ -17,6 +17,7 @@ use Illuminate\Database\Eloquent\Model; * @property-read \App\User|null $auth_user * @property-read \App\Models\Country $country * @property-read \App\Models\UserShop $user_shop + * * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingInstance newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingInstance newQuery() * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingInstance query() @@ -27,24 +28,38 @@ use Illuminate\Database\Eloquent\Model; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingInstance whereSubdomain($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingInstance whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingInstance whereUserShopId($value) + * * @property int|null $payment + * * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingInstance wherePayment($value) + * * @property array|null $shopping_data * @property string|null $back + * * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingInstance whereBack($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingInstance whereShoppingData($value) + * * @property string|null $language + * * @method static \Illuminate\Database\Eloquent\Builder|ShoppingInstance whereLanguage($value) + * * @property int|null $status * @property float|null $amount * @property int|null $shopping_user_id + * * @method static \Illuminate\Database\Eloquent\Builder|ShoppingInstance whereAmount($value) * @method static \Illuminate\Database\Eloquent\Builder|ShoppingInstance whereShoppingUserId($value) * @method static \Illuminate\Database\Eloquent\Builder|ShoppingInstance whereStatus($value) + * * @mixin \Eloquent */ class ShoppingInstance extends Model { + protected $primaryKey = 'identifier'; + + public $incrementing = false; + + protected $keyType = 'string'; public $paymentTypes = [ 1 => 'Customer Shop', @@ -72,17 +87,30 @@ class ShoppingInstance extends Model protected $casts = ['shopping_data' => 'array', 'amount' => 'float']; protected $fillable = [ - 'identifier', 'user_shop_id', 'auth_user_id', 'status', 'payment', 'subdomain', 'language', 'country_id', 'amount', 'shopping_user_id', 'shopping_data', 'back' + 'identifier', + 'user_shop_id', + 'auth_user_id', + 'status', + 'payment', + 'subdomain', + 'language', + 'country_id', + 'amount', + 'shopping_user_id', + 'shopping_data', + 'back', ]; - public function getStatus(){ + public function getStatus() + { return isset($this->statuses[$this->status]) ? $this->statuses[$this->status] : 'link_sent'; } - public function getLocale(){ + public function getLocale() + { return $this->language ? $this->language : \App::getLocale(); } - + public function user_shop() { return $this->belongsTo('App\Models\UserShop', 'user_shop_id'); @@ -93,17 +121,14 @@ class ShoppingInstance extends Model return $this->belongsTo('App\Models\Country', 'country_id'); } - //can null + // can null public function auth_user() { - return $this->belongsTo('App\User','auth_user_id'); + return $this->belongsTo('App\User', 'auth_user_id'); } - public function getAmountFormatted(){ + public function getAmountFormatted() + { return formatNumber($this->amount); } - - - - } diff --git a/app/Models/ShoppingOrder.php b/app/Models/ShoppingOrder.php index 72645d6..e8d9934 100644 --- a/app/Models/ShoppingOrder.php +++ b/app/Models/ShoppingOrder.php @@ -32,6 +32,7 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @property-read int|null $shopping_payments_count * @property-read \App\Models\ShoppingUser $shopping_user * @property-read \App\Models\UserShop $user_shop + * * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder newQuery() * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder query() @@ -51,21 +52,28 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereUserShopId($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereWeight($value) + * * @property int|null $payment_for + * * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder wherePaymentFor($value) + * * @property int|null $member_id * @property string|null $mode * @property-read \App\User|null $member * @property-read \App\Models\UserHistory|null $user_history + * * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereMemberId($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereMode($value) + * * @property \Illuminate\Support\Carbon|null $deleted_at * @property string|null $user_deleted_at + * * @method static \Illuminate\Database\Query\Builder|\App\Models\ShoppingOrder onlyTrashed() * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereDeletedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereUserDeletedAt($value) * @method static \Illuminate\Database\Query\Builder|\App\Models\ShoppingOrder withTrashed() * @method static \Illuminate\Database\Query\Builder|\App\Models\ShoppingOrder withoutTrashed() + * * @property-read \App\Models\ShippingCountry $shipping_country * @property float|null $shipping_net * @property float|null $subtotal_ws @@ -73,40 +81,53 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @property int|null $shipped * @property string|null $tracking * @property string|null $wp_invoice_path + * * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder wherePoints($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereShipped($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereShippingNet($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereSubtotalWs($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereTracking($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereWpInvoicePath($value) + * * @property int|null $homeparty_id * @property array|null $api_notice * @property int|null $api_status * @property-read \App\Models\Homeparty|null $homeparty + * * @method static \Illuminate\Database\Eloquent\Builder|ShoppingOrder whereHomepartyId($value) * @method static \Illuminate\Database\Eloquent\Builder|ShoppingOrder whereWpNotice($value) + * * @property array|null $tax_split * @property-read \App\Models\UserInvoice|null $user_invoice * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\UserSalesVolume[] $user_sales_volume * @property-read int|null $user_sales_volume_count + * * @method static \Illuminate\Database\Eloquent\Builder|ShoppingOrder whereTaxSplit($value) * @method static \Illuminate\Database\Eloquent\Builder|ShoppingOrder whereApiNotice($value) * @method static \Illuminate\Database\Eloquent\Builder|ShoppingOrder whereApiStatus($value) + * * @property-read \App\Models\ShoppingCollectOrder|null $shopping_collect_order * @property array|null $net_split + * * @method static \Illuminate\Database\Eloquent\Builder|ShoppingOrder whereNetSplit($value) + * * @property string|null $language + * * @method static \Illuminate\Database\Eloquent\Builder|ShoppingOrder whereLanguage($value) + * * @property bool|null $is_abo * @property int|null $abo_interval + * * @method static \Illuminate\Database\Eloquent\Builder|ShoppingOrder whereAboInterval($value) * @method static \Illuminate\Database\Eloquent\Builder|ShoppingOrder whereIsAbo($value) + * * @property-read \Illuminate\Database\Eloquent\Collection $dhlOutboundShipments * @property-read int|null $dhl_outbound_shipments_count * @property-read \Illuminate\Database\Eloquent\Collection $dhlReturnShipments * @property-read int|null $dhl_return_shipments_count * @property-read \Illuminate\Database\Eloquent\Collection $dhlShipments * @property-read int|null $dhl_shipments_count + * * @mixin \Eloquent */ class ShoppingOrder extends Model @@ -114,6 +135,7 @@ class ShoppingOrder extends Model protected $table = 'shopping_orders'; use SoftDeletes; + protected $dates = ['deleted_at']; protected $fillable = [ @@ -145,7 +167,7 @@ class ShoppingOrder extends Model 'api_status', 'mode', 'shipped', - 'tracking' + 'tracking', ]; protected $casts = [ @@ -163,16 +185,16 @@ class ShoppingOrder extends Model 2 => 'shipped', 3 => 'completed', 4 => 'trade_fair', - 10 => 'cancelled' + 10 => 'cancelled', ]; public static $apiShippedTypes = [ - 0 => 'open', //(Fullfilment durch Händler)', - 1 => 'process', //(Fullfilment durch MIVITA: nicht Versand) - 2 => 'sent', //(Fullfilment durch MIVITA: Versand erfolgt)' - 3 => 'close', //(Fullfilment durch MIVITA: Versand erfolgt)', - 4 => 'trade', //(Fullfilment durch MIVITA: Versand erfolgt)', - 10 => 'cancel' + 0 => 'open', // (Fullfilment durch Händler)', + 1 => 'process', // (Fullfilment durch MIVITA: nicht Versand) + 2 => 'sent', // (Fullfilment durch MIVITA: Versand erfolgt)' + 3 => 'close', // (Fullfilment durch MIVITA: Versand erfolgt)', + 4 => 'trade', // (Fullfilment durch MIVITA: Versand erfolgt)', + 10 => 'cancel', ]; public static $apiStatusTypes = [ @@ -181,12 +203,14 @@ class ShoppingOrder extends Model 2 => 'paid', 5 => 'removed', ]; + public static $apiStatusColors = [ 0 => 'warning', 1 => 'warning', 2 => 'success', 5 => 'danger', ]; + public static $shippedColors = [ 0 => 'warning', 1 => 'info', @@ -221,11 +245,10 @@ class ShoppingOrder extends Model 8 => 'info', 9 => 'default', 10 => 'info', - 11 => 'default' + 11 => 'default', ]; - public function shopping_user() { return $this->belongsTo('App\Models\ShoppingUser', 'shopping_user_id'); @@ -251,12 +274,13 @@ class ShoppingOrder extends Model return $this->belongsTo('App\Models\UserShop', 'user_shop_id'); } - //can null + // can null public function member() { return $this->belongsTo('App\User', 'member_id'); } - //can null + + // can null public function auth_user() { return $this->belongsTo('App\User', 'auth_user_id'); @@ -267,9 +291,42 @@ class ShoppingOrder extends Model return $this->hasOne('App\Models\UserHistory', 'shopping_order_id')->latest(); } + /** + * Original-Rechnung (nicht die Stornorechnung) + * + * Unterscheidung: Die Original-Rechnung hat entweder cancellation=false/null (vor Storno) + * oder cancellation_id gesetzt (nach Storno, zeigt auf die Stornorechnung). + * Die Stornorechnung hat cancellation=true UND cancellation_id=null. + */ public function user_invoice() { - return $this->hasOne('App\Models\UserInvoice', 'shopping_order_id', ''); + return $this->hasOne('App\Models\UserInvoice', 'shopping_order_id', 'id') + ->where(function ($query) { + $query->where('cancellation', false) + ->orWhereNull('cancellation') + ->orWhereNotNull('cancellation_id'); + }); + } + + /** + * Stornorechnung für diese Bestellung + * + * Die Stornorechnung hat cancellation=true und KEINEN cancellation_id + * (cancellation_id wird nur auf der Original-Rechnung gesetzt). + */ + public function user_cancellation_invoice() + { + return $this->hasOne('App\Models\UserInvoice', 'shopping_order_id', 'id') + ->where('cancellation', true) + ->whereNull('cancellation_id'); + } + + /** + * Alle Rechnungen (Original + Storno) für diese Bestellung + */ + public function user_invoices() + { + return $this->hasMany('App\Models\UserInvoice', 'shopping_order_id', 'id'); } public function shopping_collect_order() @@ -294,7 +351,7 @@ class ShoppingOrder extends Model public function user_sales_volume_no_userid() { - return $this->hasOne('App\Models\UserSalesVolume', 'shopping_order_id')->where('user_id', '=', NULL)->first(); + return $this->hasOne('App\Models\UserSalesVolume', 'shopping_order_id')->where('user_id', '=', null)->first(); } public function getUserAbo() @@ -303,6 +360,7 @@ class ShoppingOrder extends Model if ($UserAboOrder && $UserAboOrder->user_abo) { return $UserAboOrder->user_abo; } + return null; } @@ -332,7 +390,8 @@ class ShoppingOrder extends Model return $shopping_payment->reference; } } - return ""; + + return ''; } public function getLastShoppingPaymentTransaction() @@ -346,40 +405,43 @@ class ShoppingOrder extends Model } } } + return false; } public function getShippedType() { - return isset(self::$shippedTypes[$this->shipped]) ? __('payment.' . self::$shippedTypes[$this->shipped]) : ""; + return isset(self::$shippedTypes[$this->shipped]) ? __('payment.'.self::$shippedTypes[$this->shipped]) : ''; } + public static function getTransShippedType() { $ret = []; foreach (self::$shippedTypes as $key => $val) { - $ret[$key] = trans('payment.' . $val); + $ret[$key] = trans('payment.'.$val); } + return $ret; } public function getAPIShippedType() { - return isset(self::$apiShippedTypes[$this->shipped]) ? self::$apiShippedTypes[$this->shipped] : "free"; + return isset(self::$apiShippedTypes[$this->shipped]) ? self::$apiShippedTypes[$this->shipped] : 'free'; } public function getShippedColor() { - return isset(self::$shippedColors[$this->shipped]) ? self::$shippedColors[$this->shipped] : "default"; + return isset(self::$shippedColors[$this->shipped]) ? self::$shippedColors[$this->shipped] : 'default'; } public function getAPIStatusType() { - return isset(self::$apiStatusTypes[$this->api_status]) ? __('payment.' . self::$apiStatusTypes[$this->api_status]) : "bestellt"; + return isset(self::$apiStatusTypes[$this->api_status]) ? __('payment.'.self::$apiStatusTypes[$this->api_status]) : 'bestellt'; } public function getAPIStatusColor() { - return isset(self::$apiStatusColors[$this->api_status]) ? self::$apiStatusColors[$this->api_status] : "warning"; + return isset(self::$apiStatusColors[$this->api_status]) ? self::$apiStatusColors[$this->api_status] : 'warning'; } public function getFormattedTotal() @@ -429,7 +491,7 @@ class ShoppingOrder extends Model public function getFormattedPoints() { - return isset($this->attributes['points']) ? formatNumber($this->attributes['points']) : ""; + return isset($this->attributes['points']) ? formatNumber($this->attributes['points']) : ''; } public function getPriceVkNetBy($product_id) @@ -439,16 +501,18 @@ class ShoppingOrder extends Model return $product->getPriceWith(true, false, $this->shipping_country->country); } } + return 0; } public function getPaymentForType() { - return isset(self::$paymentForTypes[$this->payment_for]) ? __('payment.' . self::$paymentForTypes[$this->payment_for]) : ""; + return isset(self::$paymentForTypes[$this->payment_for]) ? __('payment.'.self::$paymentForTypes[$this->payment_for]) : ''; } + public function getPaymentForColor() { - return isset(self::$paymentForColors[$this->payment_for]) ? self::$paymentForColors[$this->payment_for] : ""; + return isset(self::$paymentForColors[$this->payment_for]) ? self::$paymentForColors[$this->payment_for] : ''; } public function getUserDiscount() @@ -459,6 +523,7 @@ class ShoppingOrder extends Model if ($this->member && $this->member->user_level) { return $this->member->user_level->getFormattedMargin(); } + return 0; } @@ -470,21 +535,49 @@ class ShoppingOrder extends Model $count += $shopping_order_item->qty; } } + return $count; } + public function isInvoice() { return $this->user_invoice ? true : false; } + /** + * Prüft ob eine Stornorechnung für diese Bestellung existiert. + * Die echte Stornorechnung hat cancellation=true und cancellation_id=null. + */ + public function isCancellationInvoice() + { + return \App\Models\UserInvoice::where('shopping_order_id', $this->id) + ->where('cancellation', true) + ->whereNull('cancellation_id') + ->exists(); + } + + /** + * Holt die Stornorechnung für diese Bestellung. + * Die echte Stornorechnung hat cancellation=true und cancellation_id=null. + */ + public function getCancellationInvoice() + { + return \App\Models\UserInvoice::where('shopping_order_id', $this->id) + ->where('cancellation', true) + ->whereNull('cancellation_id') + ->first(); + } + public function getStatusByOrder() { if ($this->payment_for) { - if ($this->payment_for === 6) { //Kunde-Shop + if ($this->payment_for === 6) { // Kunde-Shop return 2; } + return 1; } + return 0; } @@ -538,7 +631,7 @@ class ShoppingOrder extends Model } if (isset($tax_split[5])) { - if (!isset($tax_split[16])) { + if (! isset($tax_split[16])) { $tax_split[16] = ['vk_tax' => $order_vk_tax, 'ek_tax' => $order_ek_tax]; $net_split[16] = ['vk_net' => $order_vk_net, 'ek_net' => $order_ek_net]; } @@ -548,7 +641,7 @@ class ShoppingOrder extends Model $net_split[16]['ek_net'] = round($net_split[16]['ek_net'] - $net_split[5]['ek_net'], 2); } if (isset($tax_split[7])) { - if (!isset($tax_split[19])) { + if (! isset($tax_split[19])) { $tax_split[19] = ['vk_tax' => $order_vk_tax, 'ek_tax' => $order_ek_tax]; $net_split[19] = ['vk_net' => $order_vk_net, 'ek_net' => $order_ek_net]; } @@ -558,7 +651,6 @@ class ShoppingOrder extends Model $net_split[19]['ek_net'] = round($net_split[19]['ek_net'] - $net_split[7]['ek_net'], 2); } - foreach ($tax_split as $key => $value) { $tax_split[$key]['vk_tax'] = number_format($value['vk_tax'], 2); $tax_split[$key]['ek_tax'] = number_format($value['ek_tax'], 2); @@ -569,14 +661,13 @@ class ShoppingOrder extends Model $net_split[$key]['ek_net'] = number_format($value['ek_net'], 2); } } - if (!isset($tax_split[16]) && !isset($tax_split[19])) { - $tax_split = NULL; + if (! isset($tax_split[16]) && ! isset($tax_split[19])) { + $tax_split = null; } - if (!isset($net_split[16]) && !isset($net_split[19])) { - $net_split = NULL; + if (! isset($net_split[16]) && ! isset($net_split[19])) { + $net_split = null; } - $this->tax_split = $tax_split; $this->net_split = $net_split; $this->save(); @@ -584,8 +675,8 @@ class ShoppingOrder extends Model public function makeTaxSplit() { - $tax_split = NULL; - $net_split = NULL; + $tax_split = null; + $net_split = null; if ($this->tax > 0) { $tax_split = []; @@ -613,7 +704,7 @@ class ShoppingOrder extends Model } if (isset($tax_split[5])) { - if (!isset($tax_split[16])) { + if (! isset($tax_split[16])) { $tax_split[16] = $this->tax; $net_split[16] = $this->subtotal_ws; } @@ -621,7 +712,7 @@ class ShoppingOrder extends Model $net_split[16] = round($net_split[16] - $net_split[5], 2); } if (isset($tax_split[7])) { - if (!isset($tax_split[19])) { + if (! isset($tax_split[19])) { $tax_split[19] = $this->tax; $net_split[19] = $this->subtotal_ws; } @@ -647,12 +738,12 @@ class ShoppingOrder extends Model if ($this->shopping_user) { $fullname = $this->shopping_user->getFullNameAsArray(); - $ret = ""; - $ret .= $fullname['company'] ? $fullname['company'] . ' | ' : ''; - $ret .= $fullname['salutation'] ? \App\Services\HTMLHelper::getSalutationLang($fullname['salutation']) . ' ' : ''; - $ret .= $fullname['firstname'] ? $fullname['firstname'] . ' ' : ''; + $ret = ''; + $ret .= $fullname['company'] ? $fullname['company'].' | ' : ''; + $ret .= $fullname['salutation'] ? \App\Services\HTMLHelper::getSalutationLang($fullname['salutation']).' ' : ''; + $ret .= $fullname['firstname'] ? $fullname['firstname'].' ' : ''; $ret .= $fullname['lastname'] ? $fullname['lastname'] : ''; - $ret .= $fullname['email'] ? ' | ' . $fullname['email'] . '' : ''; + $ret .= $fullname['email'] ? ' | '.$fullname['email'].'' : ''; } return $ret; diff --git a/app/Models/ShoppingUser.php b/app/Models/ShoppingUser.php index ce4929e..23c5bcb 100644 --- a/app/Models/ShoppingUser.php +++ b/app/Models/ShoppingUser.php @@ -243,9 +243,43 @@ class ShoppingUser extends Model return $this->hasOne('App\Models\ShoppingOrder', 'shopping_user_id'); } - public function getLocale() + /** + * Accessor für das language Attribut. + * Gibt die App-Locale zurück, wenn keine Sprache gesetzt ist. + * + * @param string|null $value + * @return string Sprachcode (de, en, es) + */ + public function getLanguageAttribute($value): string { - return $this->language ? $this->language : \App::getLocale(); + return $value ?: \App::getLocale(); + } + + /** + * Alias für getLanguageAttribute - für Konsistenz mit anderen Models. + * + * @return string Sprachcode (de, en, es) + */ + public function getLocale(): string + { + return $this->language; + } + + /** + * Liefert die verfügbaren Sprachen aus der Config als Array für Select-Felder. + * + * @return array ['code' => 'Native Name', ...] + */ + public static function getAvailableLanguages(): array + { + $locales = config('localization.supportedLocales', []); + $languages = []; + + foreach ($locales as $code => $locale) { + $languages[$code] = $locale['native'] ?? $locale['name'] ?? $code; + } + + return $languages; } public function setNotice($key, $value) diff --git a/app/Models/UserAbo.php b/app/Models/UserAbo.php index 6c5e33b..ee8fe61 100644 --- a/app/Models/UserAbo.php +++ b/app/Models/UserAbo.php @@ -6,11 +6,11 @@ namespace App\Models; +use App\Services\Util; use App\User; use Carbon\Carbon; -use App\Services\Util; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Collection; +use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; /** @@ -34,7 +34,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @property Carbon|null $user_deleted_at * @property User $user * @property Collection|UserAboOrder[] $user_abo_orders - * @package App\Models * @property int|null $member_id * @property int $shopping_user_id * @property string|null $email @@ -48,6 +47,7 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @property-read Collection $user_abo_items * @property-read int|null $user_abo_items_count * @property-read int|null $user_abo_orders_count + * * @method static \Illuminate\Database\Eloquent\Builder|UserAbo newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|UserAbo newQuery() * @method static \Illuminate\Database\Eloquent\Builder|UserAbo onlyTrashed() @@ -76,177 +76,213 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @method static \Illuminate\Database\Eloquent\Builder|UserAbo whereWallettype($value) * @method static \Illuminate\Database\Eloquent\Builder|UserAbo withTrashed() * @method static \Illuminate\Database\Eloquent\Builder|UserAbo withoutTrashed() + * * @mixin \Eloquent */ class UserAbo extends Model { - use SoftDeletes; - protected $table = 'user_abos'; + use SoftDeletes; - protected $casts = [ - 'user_id' => 'int', - 'member_id' => 'int', - 'shopping_user_id' => 'int', - 'payone_userid' => 'int', - 'active' => 'bool', - 'status' => 'int', - 'abo_interval' => 'int', - 'amount' => 'int', - 'start_date' => 'datetime', - 'last_date' => 'datetime', - 'next_date' => 'datetime', - 'cancel_date' => 'datetime', - 'user_deleted_at' => 'datetime', - 'carddata' => 'array' + protected $table = 'user_abos'; - ]; + protected $casts = [ + 'user_id' => 'int', + 'member_id' => 'int', + 'shopping_user_id' => 'int', + 'payone_userid' => 'int', + 'active' => 'bool', + 'status' => 'int', + 'abo_interval' => 'int', + 'amount' => 'int', + 'start_date' => 'datetime', + 'last_date' => 'datetime', + 'next_date' => 'datetime', + 'cancel_date' => 'datetime', + 'user_deleted_at' => 'datetime', + 'carddata' => 'array', - protected $fillable = [ - 'user_id', - 'member_id', - 'shopping_user_id', - 'is_for', - 'email', - 'payone_userid', - 'clearingtype', - 'wallettype', - 'carddata', - 'amount', - 'active', - 'status', - 'abo_interval', - 'start_date', - 'last_date', - 'next_date', - 'cancel_date', - 'user_deleted_at' - ]; + ]; - public static $aboDeliveryDays = [5, 10, 20, 25]; + protected $fillable = [ + 'user_id', + 'member_id', + 'shopping_user_id', + 'is_for', + 'email', + 'payone_userid', + 'clearingtype', + 'wallettype', + 'carddata', + 'amount', + 'active', + 'status', + 'abo_interval', + 'start_date', + 'last_date', + 'next_date', + 'cancel_date', + 'user_deleted_at', + ]; - public static $statusTypes = [ - 0 => 'abo_new', - 1 => 'abo_new', - 2 => 'abo_okay', - 3 => 'abo_hold', - 4 => 'abo_cancel', - 5 => 'abo_finish', - 6 => 'abo_inactive', - 7 => 'abo_grace' - ]; + public static $aboDeliveryDays = [5, 10, 20, 25]; - public static $statusColors = [ - 0 => 'success', - 1 => 'success', - 2 => 'secondary', - 3 => 'warning', - 4 => 'danger', - 5 => 'info', - 6 => 'warning', - 7 => 'danger' - ]; + public static $statusTypes = [ + 0 => 'abo_new', + 1 => 'abo_new', + 2 => 'abo_okay', + 3 => 'abo_hold', + 4 => 'abo_cancel', + 5 => 'abo_finish', + 6 => 'abo_inactive', + 7 => 'abo_grace', + ]; + public static $statusColors = [ + 0 => 'success', + 1 => 'success', + 2 => 'secondary', + 3 => 'warning', + 4 => 'danger', + 5 => 'info', + 6 => 'warning', + 7 => 'danger', + ]; + public function user() + { + return $this->belongsTo(User::class, 'user_id'); + } - public function user() - { - return $this->belongsTo(User::class, 'user_id'); - } + public function member() + { + return $this->belongsTo(User::class, 'member_id'); + } - public function member() - { - return $this->belongsTo(User::class, 'member_id'); - } + public function shopping_user() + { + return $this->belongsTo('App\Models\ShoppingUser', 'shopping_user_id'); + } - public function shopping_user() - { - return $this->belongsTo('App\Models\ShoppingUser', 'shopping_user_id'); - } + public function user_abo_orders() + { + return $this->hasMany(UserAboOrder::class); + } - public function user_abo_orders() - { - return $this->hasMany(UserAboOrder::class); - } + public function user_abo_items() + { + return $this->hasMany(UserAboItem::class); + } - public function user_abo_items() - { - return $this->hasMany(UserAboItem::class); - } + public function user_abo_item_histories() + { + return $this->hasMany(UserAboItemHistory::class); + } - public function getCountOrders() - { - //sind bezahlte Bestellungen - return $this->user_abo_orders->where('status', '>=', 2)->count(); - } + public function getInitialItems() + { + return $this->user_abo_item_histories() + ->where('is_initial', true) + ->where('comp', 0) + ->orderBy('created_at') + ->get(); + } - public function getCountPaidOrders() - { - //sind bezahlte Bestellungen - return $this->user_abo_orders->where('status', '>=', 2)->where('paid', true)->count(); - } + public function getInitialCompItems() + { + return $this->user_abo_item_histories() + ->where('is_initial', true) + ->where('comp', '>', 0) + ->orderBy('comp') + ->get(); + } - public function setStartDateAttribute($value) - { - $this->attributes['start_date'] = isset($value) ? (new Carbon($value))->format('Y-m-d') : NULL; - } - public function getStartDateAttribute() - { - return $this->attributes['start_date'] ? Carbon::parse($this->attributes['start_date'])->format(\Util::formatDateDB()) : ''; - } + public function getChangeHistory() + { + return $this->user_abo_item_histories() + ->where('is_initial', false) + ->orderByDesc('created_at') + ->get(); + } - public function setLastDateAttribute($value) - { - $this->attributes['last_date'] = isset($value) ? (new Carbon($value))->format('Y-m-d') : NULL; - } - public function getLastDateAttribute() - { - return $this->attributes['last_date'] ? Carbon::parse($this->attributes['last_date'])->format(\Util::formatDateDB()) : ''; - } + public function getCountOrders() + { + // sind bezahlte Bestellungen + return $this->user_abo_orders->where('status', '>=', 2)->count(); + } - public function setNextDateAttribute($value) - { - $this->attributes['next_date'] = isset($value) ? (new Carbon($value))->format('Y-m-d') : NULL; - } - public function getNextDateAttribute() - { - return $this->attributes['next_date'] ? Carbon::parse($this->attributes['next_date'])->format(\Util::formatDateDB()) : ''; - } + public function getCountPaidOrders() + { + // sind bezahlte Bestellungen + return $this->user_abo_orders->where('status', '>=', 2)->where('paid', true)->count(); + } - public function setCancelDateAttribute($value) - { - $this->attributes['cancel_date'] = isset($value) ? (new Carbon($value))->format('Y-m-d') : NULL; - } - public function getCancelDateAttribute() - { - return $this->attributes['cancel_date'] ? Carbon::parse($this->attributes['cancel_date'])->format(\Util::formatDateDB()) : ''; - } + public function setStartDateAttribute($value) + { + $this->attributes['start_date'] = isset($value) ? (new Carbon($value))->format('Y-m-d') : null; + } - public function getFormattedAmount() - { - return isset($this->attributes['amount']) ? Util::formatNumber($this->attributes['amount'] / 100) : ""; - } - public function getIsForFormated() - { - return $this->attributes['is_for'] === 'me' ? '' . __('tables.adviser') . '' : '' . __('tables.customer') . ''; - } + public function getStartDateAttribute() + { + return $this->attributes['start_date'] ? Carbon::parse($this->attributes['start_date'])->format(\Util::formatDateDB()) : ''; + } - public function getStatusFormated() - { - return '' . $this->getStatusType() . ''; - } + public function setLastDateAttribute($value) + { + $this->attributes['last_date'] = isset($value) ? (new Carbon($value))->format('Y-m-d') : null; + } - public function getStatusType() - { - return isset(self::$statusTypes[$this->status]) ? __('abo.' . self::$statusTypes[$this->status]) : ""; - } + public function getLastDateAttribute() + { + return $this->attributes['last_date'] ? Carbon::parse($this->attributes['last_date'])->format(\Util::formatDateDB()) : ''; + } - public function getStatusColor() - { - return isset(self::$statusColors[$this->status]) ? self::$statusColors[$this->status] : "default"; - } + public function setNextDateAttribute($value) + { + $this->attributes['next_date'] = isset($value) ? (new Carbon($value))->format('Y-m-d') : null; + } - public function getPaymentType() - { - return $this->clearingtype === 'wlt' ? __('payment.paypal') : __('payment.credit_card'); - } + public function getNextDateAttribute() + { + return $this->attributes['next_date'] ? Carbon::parse($this->attributes['next_date'])->format(\Util::formatDateDB()) : ''; + } + + public function setCancelDateAttribute($value) + { + $this->attributes['cancel_date'] = isset($value) ? (new Carbon($value))->format('Y-m-d') : null; + } + + public function getCancelDateAttribute() + { + return $this->attributes['cancel_date'] ? Carbon::parse($this->attributes['cancel_date'])->format(\Util::formatDateDB()) : ''; + } + + public function getFormattedAmount() + { + return isset($this->attributes['amount']) ? Util::formatNumber($this->attributes['amount'] / 100) : ''; + } + + public function getIsForFormated() + { + return $this->attributes['is_for'] === 'me' ? ''.__('tables.adviser').'' : ''.__('tables.customer').''; + } + + public function getStatusFormated() + { + return ''.$this->getStatusType().''; + } + + public function getStatusType() + { + return isset(self::$statusTypes[$this->status]) ? __('abo.'.self::$statusTypes[$this->status]) : ''; + } + + public function getStatusColor() + { + return isset(self::$statusColors[$this->status]) ? self::$statusColors[$this->status] : 'default'; + } + + public function getPaymentType() + { + return $this->clearingtype === 'wlt' ? __('payment.paypal') : __('payment.credit_card'); + } } diff --git a/app/Models/UserAboItemHistory.php b/app/Models/UserAboItemHistory.php new file mode 100644 index 0000000..ceb70d3 --- /dev/null +++ b/app/Models/UserAboItemHistory.php @@ -0,0 +1,187 @@ + 'abo_history.action_initial', + 'added' => 'abo_history.action_added', + 'removed' => 'abo_history.action_removed', + 'qty_changed' => 'abo_history.action_qty_changed', + 'comp_product_changed' => 'abo_history.action_comp_changed', + 'comp_added' => 'abo_history.action_comp_added', + 'comp_removed' => 'abo_history.action_comp_removed', + 'rollback' => 'abo_history.action_rollback', + ]; + + public static $actionColors = [ + 'initial' => 'info', + 'added' => 'success', + 'removed' => 'danger', + 'qty_changed' => 'warning', + 'comp_product_changed' => 'primary', + 'comp_added' => 'success', + 'comp_removed' => 'danger', + 'rollback' => 'dark', + ]; + + public static $channelLabels = [ + 'admin' => 'abo_history.channel_admin', + 'user_me' => 'abo_history.channel_user_me', + 'user_ot' => 'abo_history.channel_user_ot', + 'portal' => 'abo_history.channel_portal', + 'system' => 'abo_history.channel_system', + ]; + + public static $channelColors = [ + 'admin' => 'danger', + 'user_me' => 'warning', + 'user_ot' => 'info', + 'portal' => 'secondary', + 'system' => 'default', + ]; + + protected $casts = [ + 'user_abo_id' => 'int', + 'user_abo_item_id' => 'int', + 'product_id' => 'int', + 'unit_price' => 'float', + 'total_price' => 'float', + 'qty_before' => 'int', + 'qty_after' => 'int', + 'old_product_id' => 'int', + 'comp' => 'int', + 'changed_by_user_id' => 'int', + 'is_initial' => 'bool', + ]; + + protected $fillable = [ + 'user_abo_id', + 'user_abo_item_id', + 'product_id', + 'action', + 'product_name', + 'product_number', + 'unit_price', + 'total_price', + 'qty_before', + 'qty_after', + 'old_product_id', + 'old_product_name', + 'comp', + 'changed_by_user_id', + 'changed_by_name', + 'channel', + 'batch_id', + 'is_initial', + ]; + + public function user_abo() + { + return $this->belongsTo(UserAbo::class); + } + + public function product() + { + return $this->belongsTo(Product::class); + } + + public function old_product() + { + return $this->belongsTo(Product::class, 'old_product_id'); + } + + public function changed_by() + { + return $this->belongsTo(User::class, 'changed_by_user_id'); + } + + public function getActionBadge() + { + $label = isset(self::$actionLabels[$this->action]) ? __(self::$actionLabels[$this->action]) : $this->action; + $color = self::$actionColors[$this->action] ?? 'secondary'; + + return ''.$label.''; + } + + public function getChannelBadge() + { + $label = isset(self::$channelLabels[$this->channel]) ? __(self::$channelLabels[$this->channel]) : $this->channel; + $color = self::$channelColors[$this->channel] ?? 'secondary'; + + return ''.$label.''; + } + + public function getChangeDescription() + { + switch ($this->action) { + case self::ACTION_INITIAL: + return __('abo_history.desc_initial', ['qty' => $this->qty_after]); + case self::ACTION_ADDED: + return __('abo_history.desc_added', ['qty' => $this->qty_after]); + case self::ACTION_REMOVED: + return __('abo_history.desc_removed'); + case self::ACTION_QTY_CHANGED: + return __('abo_history.desc_qty_changed', ['from' => $this->qty_before, 'to' => $this->qty_after]); + case self::ACTION_COMP_CHANGED: + return __('abo_history.desc_comp_changed', ['old' => $this->old_product_name]); + case self::ACTION_COMP_ADDED: + return __('abo_history.desc_comp_added'); + case self::ACTION_COMP_REMOVED: + return __('abo_history.desc_comp_removed'); + case self::ACTION_ROLLBACK: + return __('abo_history.desc_rollback'); + default: + return ''; + } + } + + public function getFormattedUnitPrice() + { + return Util::formatNumber($this->unit_price); + } + + public function getFormattedTotalPrice() + { + return Util::formatNumber($this->total_price); + } + + public function getFormattedDate() + { + return Carbon::parse($this->created_at)->format('d.m.Y H:i'); + } +} diff --git a/app/Models/UserAccount.php b/app/Models/UserAccount.php index 0de5269..40d0c7b 100644 --- a/app/Models/UserAccount.php +++ b/app/Models/UserAccount.php @@ -2,10 +2,9 @@ namespace App\Models; +use Carbon\Carbon; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; -use Carbon\Carbon; - /** * App\Models\UserAccount @@ -18,6 +17,7 @@ use Carbon\Carbon; * @property-read \App\Models\Country $pre_mobil * @property-read \App\Models\Country $pre_phone * @property-read \App\User $user + * * @method static bool|null forceDelete() * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount newQuery() @@ -26,6 +26,7 @@ use Carbon\Carbon; * @method static bool|null restore() * @method static \Illuminate\Database\Query\Builder|\App\Models\UserAccount withTrashed() * @method static \Illuminate\Database\Query\Builder|\App\Models\UserAccount withoutTrashed() + * * @property int $id * @property string|null $salutation * @property string|null $first_name @@ -63,6 +64,7 @@ use Carbon\Carbon; * @property \Illuminate\Support\Carbon|null $deleted_at * @property-read \App\Models\Country $shipping_country * @property-read \App\Models\Country|null $shipping_pre_phone + * * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereAddress($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereAddress2($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereBirthday($value) @@ -100,41 +102,53 @@ use Carbon\Carbon; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereWebsite($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereZipcode($value) + * * @property string|null $m_account * @property string|null $m_salutation * @property string|null $m_first_name * @property string|null $m_last_name * @property string|null $m_notes * @property int|null $taxable_sales + * * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereMAccount($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereMFirstName($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereMLastName($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereMNotes($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereMSalutation($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereTaxableSales($value) + * * @property array|null $payment_data + * * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount wherePaymentData($value) + * * @property string|null $accepted_contract * @property array|null $notice + * * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereAcceptedContract($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereNotice($value) + * * @property int $reverse_charge * @property string|null $reverse_charge_code * @property string|null $reverse_charge_valid + * * @method static \Illuminate\Database\Eloquent\Builder|UserAccount whereReverseCharge($value) * @method static \Illuminate\Database\Eloquent\Builder|UserAccount whereReverseChargeCode($value) * @method static \Illuminate\Database\Eloquent\Builder|UserAccount whereReverseChargeValid($value) + * * @property string|null $bank_owner * @property string|null $bank_iban * @property string|null $bank_bic + * * @method static \Illuminate\Database\Eloquent\Builder|UserAccount whereBankBic($value) * @method static \Illuminate\Database\Eloquent\Builder|UserAccount whereBankIban($value) * @method static \Illuminate\Database\Eloquent\Builder|UserAccount whereBankOwner($value) + * * @mixin \Eloquent */ class UserAccount extends Model { protected $table = 'user_accounts'; + protected $fillable = [ 'm_account', 'm_salutation', @@ -178,19 +192,20 @@ class UserAccount extends Model 'bank_owner', 'bank_iban', 'bank_bic', - 'notice' + 'notice', + 'language', ]; - //'reverse_charge', 'reverse_charge_valid' + // 'reverse_charge', 'reverse_charge_valid' protected $casts = [ 'payment_data' => 'array', 'notice' => 'array', - //'reverse_charge' => 'bool' + // 'reverse_charge' => 'bool' ]; use SoftDeletes; - protected $dates = ['deleted_at']; + protected $dates = ['deleted_at']; public function user() { @@ -224,38 +239,42 @@ class UserAccount extends Model public function getBirthdayAttribute($value) { - if (!$value) { - return ""; + if (! $value) { + return ''; } + return Carbon::parse($value)->format(\Util::formatDateDB()); } public function setBirthdayAttribute($value) { - $this->attributes['birthday'] = isset($value) ? (new Carbon($value))->format('Y-m-d') : NULL; + $this->attributes['birthday'] = isset($value) ? (new Carbon($value))->format('Y-m-d') : null; } public function getDataProtectionFormat() { - if (!$this->attributes['data_protection']) { - return ""; + if (! $this->attributes['data_protection']) { + return ''; } + return Carbon::parse($this->attributes['data_protection'])->format(\Util::formatDateTimeDB()); } public function getAcceptContractFormat() { - if (!$this->attributes['accept_contract']) { - return ""; + if (! $this->attributes['accept_contract']) { + return ''; } + return Carbon::parse($this->attributes['accept_contract'])->format(\Util::formatDateTimeDB()); } public function getReverseChargeValidFormat() { - if (!$this->attributes['reverse_charge_valid']) { - return ""; + if (! $this->attributes['reverse_charge_valid']) { + return ''; } + return Carbon::parse($this->attributes['reverse_charge_valid'])->format(\Util::formatDateTimeDB()); } @@ -268,10 +287,12 @@ class UserAccount extends Model if ($as) { return $as; } + return true; } } - return ""; + + return ''; } public function setNotice($key, $value) @@ -289,35 +310,77 @@ class UserAccount extends Model public function getPhoneNumber() { - if ($this->mobil && $this->mobil !== "") { - return ($this->pre_mobil ? $this->pre_mobil->phone : '') . " " . $this->mobil; + if ($this->mobil && $this->mobil !== '') { + return ($this->pre_mobil ? $this->pre_mobil->phone : '').' '.$this->mobil; } - if ($this->phone && $this->phone !== "") { - return ($this->pre_phone ? $this->pre_phone->phone : '') . " " . $this->phone; + if ($this->phone && $this->phone !== '') { + return ($this->pre_phone ? $this->pre_phone->phone : '').' '.$this->phone; } } public function getPhoneFull() { - if ($this->phone && $this->phone !== "") { - return ($this->pre_phone ? $this->pre_phone->phone : '') . " " . $this->phone; + if ($this->phone && $this->phone !== '') { + return ($this->pre_phone ? $this->pre_phone->phone : '').' '.$this->phone; } - return ""; + + return ''; } public function getMobilFull() { - if ($this->mobil && $this->mobil !== "") { - return ($this->pre_mobil ? $this->pre_mobil->phone : '') . " " . $this->mobil; + if ($this->mobil && $this->mobil !== '') { + return ($this->pre_mobil ? $this->pre_mobil->phone : '').' '.$this->mobil; } - return ""; + + return ''; } public function getShippingPhoneFull() { - if ($this->shipping_phone && $this->shipping_phone !== "") { - return ($this->shipping_pre_phone ? $this->shipping_pre_phone->phone : '') . " " . $this->shipping_phone; + if ($this->shipping_phone && $this->shipping_phone !== '') { + return ($this->shipping_pre_phone ? $this->shipping_pre_phone->phone : '').' '.$this->shipping_phone; } - return ""; + + return ''; + } + + /** + * Accessor für das language Attribut. + * Gibt die App-Locale zurück, wenn keine Sprache gesetzt ist. + * + * @param string|null $value + * @return string Sprachcode (de, en, es) + */ + public function getLanguageAttribute($value): string + { + return $value ?: \App::getLocale(); + } + + /** + * Alias für getLanguageAttribute - für Konsistenz mit anderen Models. + * + * @return string Sprachcode (de, en, es) + */ + public function getLocale(): string + { + return $this->language; + } + + /** + * Liefert die verfügbaren Sprachen aus der Config als Array für Select-Felder. + * + * @return array ['code' => 'Native Name', ...] + */ + public static function getAvailableLanguages(): array + { + $locales = config('localization.supportedLocales', []); + $languages = []; + + foreach ($locales as $code => $locale) { + $languages[$code] = $locale['native'] ?? $locale['name'] ?? $code; + } + + return $languages; } } diff --git a/app/Models/UserCredit.php b/app/Models/UserCredit.php index 61c2670..1c78256 100644 --- a/app/Models/UserCredit.php +++ b/app/Models/UserCredit.php @@ -8,8 +8,8 @@ namespace App\Models; use App\User; use Carbon\Carbon; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Collection; +use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; /** @@ -41,9 +41,9 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @property string|null $deleted_at * @property User $user * @property Collection|UserCreditItem[] $user_credit_items - * @package App\Models * @property bool $taxable * @property-read int|null $user_credit_items_count + * * @method static \Illuminate\Database\Eloquent\Builder|UserCredit newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|UserCredit newQuery() * @method static \Illuminate\Database\Query\Builder|UserCredit onlyTrashed() @@ -75,146 +75,246 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @method static \Illuminate\Database\Eloquent\Builder|UserCredit whereYear($value) * @method static \Illuminate\Database\Query\Builder|UserCredit withTrashed() * @method static \Illuminate\Database\Query\Builder|UserCredit withoutTrashed() + * * @mixin \Eloquent */ class UserCredit extends Model { - use SoftDeletes; - protected $table = 'user_credits'; + use SoftDeletes; - protected $casts = [ - 'user_id' => 'int', - 'month' => 'int', - 'year' => 'int', - 'number' => 'int', - 'net' => 'float', - 'tax_rate' => 'float', - 'tax' => 'float', - 'taxable' => 'int', - 'total' => 'float', - 'paid_out' => 'bool', - 'cancellation' => 'bool', - 'cancellation_id' => 'int', - 'status' => 'int', - 'infos' => 'array' - ]; + protected $table = 'user_credits'; - protected $dates = [ - 'date', - 'paid_out_date', - 'cancellation_date' - ]; + protected $casts = [ + 'user_id' => 'int', + 'month' => 'int', + 'year' => 'int', + 'number' => 'int', + 'net' => 'float', + 'tax_rate' => 'float', + 'tax' => 'float', + 'taxable' => 'int', + 'total' => 'float', + 'paid_out' => 'bool', + 'cancellation' => 'bool', + 'cancellation_id' => 'int', + 'status' => 'int', + 'infos' => 'array', + ]; - protected $fillable = [ - 'user_id', - 'month', - 'year', - 'date', - 'full_number', - 'number', - 'net', - 'tax_rate', - 'tax', - 'total', - 'taxable', - 'filename', - 'dir', - 'disk', - 'infos', - 'paid_out', - 'paid_out_date', - 'cancellation', - 'cancellation_id', - 'cancellation_date', - 'status' - ]; + protected $dates = [ + 'date', + 'paid_out_date', + 'cancellation_date', + ]; - public static $statusTypes = [ + protected $fillable = [ + 'user_id', + 'month', + 'year', + 'date', + 'full_number', + 'number', + 'net', + 'tax_rate', + 'tax', + 'total', + 'taxable', + 'filename', + 'dir', + 'disk', + 'infos', + 'paid_out', + 'paid_out_date', + 'cancellation', + 'cancellation_id', + 'cancellation_date', + 'status', + ]; + + public static $statusTypes = [ 0 => 'open', 1 => 'paid', 2 => 'check', - 10 => 'cancelled' + 10 => 'cancelled', ]; public static $statusColors = [ 0 => 'warning', - 1 => 'success', + 1 => 'success', 2 => 'secondary', - 10 => 'danger', + 10 => 'danger', ]; - public static $taxableTypes = [ + public static $taxableTypes = [ 0 => '', - 1 => 'umsatzsteuerpflichtig / DE', //payment.to_sales_tax_de - 2 => 'nicht umsatzsteuerpflichtig / DE', //payment.not_to_sales_tax_de - 3 => 'nicht umsatzsteuerpflichtig / Ausland' //payment.not_to_sales_tax_foreign + 1 => 'umsatzsteuerpflichtig / DE', // payment.to_sales_tax_de + 2 => 'nicht umsatzsteuerpflichtig / DE', // payment.not_to_sales_tax_de + 3 => 'nicht umsatzsteuerpflichtig / Ausland', // payment.not_to_sales_tax_foreign ]; + public function user() + { + return $this->belongsTo(User::class); + } - public function user() - { - return $this->belongsTo(User::class); - } + public function user_credit_items() + { + return $this->hasMany(UserCreditItem::class); + } - public function user_credit_items() - { - return $this->hasMany(UserCreditItem::class); - } - - public function isCredit(){ + public function isCredit() + { return $this->filename ? true : false; } - public function getDateAttribute($value) + public function getDateAttribute($value) { - return $value ? Carbon::parse($value)->format(\Util::formatDateDB()) : ""; + return $value ? Carbon::parse($value)->format(\Util::formatDateDB()) : ''; } - - public function setDateAttribute( $value ) { - $this->attributes['date'] = isset($value) ? (new Carbon($value))->format('Y-m-d') : NULL; - } - public function getDateRaw(){ - return isset($this->attributes['date']) ? $this->attributes['date'] : NULL; + public function setDateAttribute($value) + { + $this->attributes['date'] = isset($value) ? (new Carbon($value))->format('Y-m-d') : null; } - public function getFormattedTax() + public function getDateRaw() + { + return isset($this->attributes['date']) ? $this->attributes['date'] : null; + } + + public function getFormattedTax() { return formatNumber($this->attributes['tax']); } - public function getFormattedNet() + public function getFormattedNet() { return formatNumber($this->attributes['net']); } - public function getFormattedTotal() + public function getFormattedTotal() { return formatNumber($this->attributes['total']); } - - public function getStatusType(){ - //trans('payment.cancelled') - return isset(self::$statusTypes[$this->status]) ? __('payment.'.self::$statusTypes[$this->status]) : ""; + public function getStatusType() + { + // trans('payment.cancelled') + return isset(self::$statusTypes[$this->status]) ? __('payment.'.self::$statusTypes[$this->status]) : ''; } - public function getStatusColor(){ - return isset(self::$statusColors[$this->status]) ? self::$statusColors[$this->status] : "default"; + public function getStatusColor() + { + return isset(self::$statusColors[$this->status]) ? self::$statusColors[$this->status] : 'default'; } - public static function getTransStatusType(){ - $ret = []; - foreach(self::$statusTypes as $key=>$val){ - $ret[$key] = trans('payment.'.$val); - } - return $ret; + public static function getTransStatusType() + { + $ret = []; + foreach (self::$statusTypes as $key => $val) { + $ret[$key] = trans('payment.'.$val); + } + + return $ret; } - public function getDownloadPath($full = false){ - if(!$full){ + public function getDownloadPath($full = false) + { + if (! $full) { return $this->dir.$this->filename; } + return \Storage::disk($this->disk)->path($this->dir.$this->filename); } + + /** + * Gibt den Download-Pfad für die lokalisierte Gutschrift zurück. + * Bei 'de' oder nicht vorhandener Locale-Version wird das Original zurückgegeben. + * + * @param string|null $locale Sprachcode (de, en, es) + * @param bool $full Vollständiger Dateisystempfad oder relativer Pfad + * @return string + */ + public function getDownloadPathLocale($locale = null, $full = false) + { + // Bei Deutsch oder keiner Angabe: Original zurückgeben + if (! $locale || $locale === 'de') { + return $this->getDownloadPath($full); + } + + // Dateiname mit Locale-Suffix + $filename = str_replace('.pdf', '-'.$locale.'.pdf', $this->filename); + $path = $this->dir.$filename; + + // Prüfen ob Locale-Version existiert, sonst Fallback auf DE + if (! \Storage::disk($this->disk)->exists($path)) { + return $this->getDownloadPath($full); + } + + return $full ? \Storage::disk($this->disk)->path($path) : $path; + } + + /** + * Gibt den lokalisierten Dateinamen für die Gutschrift zurück. + * + * @param string|null $locale + * @return string + */ + public function getFilenameLocale($locale = null) + { + if (! $locale || $locale === 'de') { + return $this->filename; + } + + $filename = str_replace('.pdf', '-'.$locale.'.pdf', $this->filename); + $path = $this->dir.$filename; + + // Fallback auf Original wenn nicht vorhanden + if (! \Storage::disk($this->disk)->exists($path)) { + return $this->filename; + } + + return $filename; + } + + /** + * Gibt alle verfügbaren lokalisierten Versionen der Gutschrift zurück (außer DE). + * + * @return array Array mit Sprachcodes, z.B. ['en', 'es'] + */ + public function getAvailableLocales(): array + { + $availableTemplates = config('localization.availableTemplates', ['de']); + $locales = []; + + foreach ($availableTemplates as $locale) { + if ($locale === 'de') { + continue; + } + + $filename = str_replace('.pdf', '-'.$locale.'.pdf', $this->filename); + $path = $this->dir.$filename; + + if (\Storage::disk($this->disk)->exists($path)) { + $locales[] = $locale; + } + } + + return $locales; + } + + /** + * Prüft ob eine lokalisierte Version für die angegebene Sprache existiert. + */ + public function hasLocale(string $locale): bool + { + if ($locale === 'de') { + return true; + } + + $filename = str_replace('.pdf', '-'.$locale.'.pdf', $this->filename); + $path = $this->dir.$filename; + + return \Storage::disk($this->disk)->exists($path); + } } diff --git a/app/Models/UserCreditItem.php b/app/Models/UserCreditItem.php index e57d9d3..2cdbc71 100644 --- a/app/Models/UserCreditItem.php +++ b/app/Models/UserCreditItem.php @@ -25,8 +25,8 @@ use Illuminate\Database\Eloquent\Model; * @property Carbon|null $updated_at * @property UserCredit|null $user_credit * @property User $user - * @package App\Models * @property int|null $user_business_id + * * @method static \Illuminate\Database\Eloquent\Builder|UserCreditItem newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|UserCreditItem newQuery() * @method static \Illuminate\Database\Eloquent\Builder|UserCreditItem query() @@ -40,103 +40,109 @@ use Illuminate\Database\Eloquent\Model; * @method static \Illuminate\Database\Eloquent\Builder|UserCreditItem whereUserBusinessId($value) * @method static \Illuminate\Database\Eloquent\Builder|UserCreditItem whereUserCreditId($value) * @method static \Illuminate\Database\Eloquent\Builder|UserCreditItem whereUserId($value) + * * @property int|null $from_month * @property int|null $from_year + * * @method static \Illuminate\Database\Eloquent\Builder|UserCreditItem whereFromMonth($value) * @method static \Illuminate\Database\Eloquent\Builder|UserCreditItem whereFromYear($value) + * * @mixin \Eloquent */ class UserCreditItem extends Model { + public static $statusTypes = [ + 1 => 'commission_shop', + 2 => 'commission_payline', + 3 => 'credit_added', + 4 => 'commission', + 5 => 'commission_growth_bonus', - - public static $statusTypes = [ - 1 => 'commission_shop', - 2 => 'commission_payline', - 3 => 'credit_added', - 4 => 'commission', - 5 => 'commission_growth_bonus', - - ]; - - public static $statusColors = [ - 0 => 'warning', - 1 => 'success', - 2 => 'secondary', - 3 => 'warning', - 4 => 'info', - 5 => 'secondary', - 10 => 'danger', ]; + public static $statusColors = [ + 0 => 'warning', + 1 => 'success', + 2 => 'secondary', + 3 => 'warning', + 4 => 'info', + 5 => 'secondary', + 10 => 'danger', + ]; - protected $table = 'user_credit_items'; + protected $table = 'user_credit_items'; - protected $casts = [ - 'user_id' => 'int', - 'user_credit_id' => 'int', - 'user_business_id' => 'int', - 'credit' => 'float', - 'status' => 'int', - 'from_month' => 'int', - 'from_year' => 'int', - 'paid' => 'bool' - ]; + protected $casts = [ + 'user_id' => 'int', + 'user_credit_id' => 'int', + 'user_business_id' => 'int', + 'credit' => 'float', + 'status' => 'int', + 'from_month' => 'int', + 'from_year' => 'int', + 'paid' => 'bool', + ]; - protected $fillable = [ - 'user_id', - 'user_credit_id', - 'user_business_id', - 'credit', - 'message', - 'status', - 'from_month', - 'from_year', - 'paid' - ]; + protected $fillable = [ + 'user_id', + 'user_credit_id', + 'user_business_id', + 'credit', + 'message', + 'status', + 'from_month', + 'from_year', + 'paid', + ]; - public function user_credit() - { - return $this->belongsTo(UserCredit::class); - } - - public function user() - { - return $this->belongsTo(User::class); - } - - - public function deleteTime(){ - $time = '+100 min'; - if(Carbon::parse($this->created_at)->modify($time)->gt(Carbon::now())){ - return Carbon::now()->diffInMinutes(Carbon::parse($this->created_at)->modify($time)); - } - return false; - } - - public function getStatusType(){ - return isset(self::$statusTypes[$this->status]) ? __('payment.'.self::$statusTypes[$this->status]) : ""; + public function user_credit() + { + return $this->belongsTo(UserCredit::class); } - public function getStatusColor(){ - return isset(self::$statusColors[$this->status]) ? self::$statusColors[$this->status] : "default"; + public function user() + { + return $this->belongsTo(User::class); } - public function getTransMessage(){ - $ret = ""; - if(strpos($this->message, '#')){ - $em = explode("#", $this->message); - if(isset($em[0])){ //Provision - $ret .= trans($em[0])." "; - } - if(isset($em[1])){ //month - $ret .= HTMLHelper::getMonth($em[1])." "; - } - if(isset($em[2])){ //year - $ret .= $em[2]; - } - } - return $ret; - } + public function deleteTime() + { + $time = '+100 min'; + if (Carbon::parse($this->created_at)->modify($time)->gt(Carbon::now())) { + return Carbon::now()->diffInMinutes(Carbon::parse($this->created_at)->modify($time)); + } + return false; + } + + public function getStatusType() + { + return isset(self::$statusTypes[$this->status]) ? __('payment.'.self::$statusTypes[$this->status]) : ''; + } + + public function getStatusColor() + { + return isset(self::$statusColors[$this->status]) ? self::$statusColors[$this->status] : 'default'; + } + + public function getTransMessage() + { + $ret = ''; + if (strpos($this->message, '#')) { + $em = explode('#', $this->message); + if (isset($em[0])) { // Provision + $ret .= trans($em[0]).' '; + } + if (isset($em[1])) { // month + $ret .= HTMLHelper::getMonth($em[1]).' '; + } + if (isset($em[2])) { // year + $ret .= $em[2]; + } + } else { + $ret = $this->message; + } + + return $ret; + } } diff --git a/app/Models/UserInvoice.php b/app/Models/UserInvoice.php index c779ceb..dbdbea7 100644 --- a/app/Models/UserInvoice.php +++ b/app/Models/UserInvoice.php @@ -32,12 +32,12 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @property Carbon|null $updated_at * @property string|null $deleted_at * @property ShoppingOrder $shopping_order - * @package App\Models * @property string|null $filename * @property string|null $dir * @property string|null $delivery_filename * @property string|null $delivery_dir * @property string|null $disk + * * @method static \Illuminate\Database\Eloquent\Builder|UserInvoice newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|UserInvoice newQuery() * @method static \Illuminate\Database\Query\Builder|UserInvoice onlyTrashed() @@ -66,143 +66,285 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @method static \Illuminate\Database\Eloquent\Builder|UserInvoice whereYear($value) * @method static \Illuminate\Database\Query\Builder|UserInvoice withTrashed() * @method static \Illuminate\Database\Query\Builder|UserInvoice withoutTrashed() + * * @mixin \Eloquent */ class UserInvoice extends Model { - use SoftDeletes; - protected $table = 'user_invoices'; + use SoftDeletes; - protected $casts = [ - 'shopping_order_id' => 'int', - 'month' => 'int', - 'year' => 'int', - 'number' => 'int', - 'paid' => 'bool', - 'cancellation' => 'bool', - 'cancellation_id' => 'int', - 'status' => 'int', - 'infos' => 'array', - ]; + protected $table = 'user_invoices'; - protected $dates = [ - 'date', - 'paid_date', - 'cancellation_date' - ]; + protected $casts = [ + 'shopping_order_id' => 'int', + 'month' => 'int', + 'year' => 'int', + 'number' => 'int', + 'paid' => 'bool', + 'cancellation' => 'bool', + 'cancellation_id' => 'int', + 'status' => 'int', + 'infos' => 'array', + ]; - protected $fillable = [ - 'shopping_order_id', - 'month', - 'year', - 'date', - 'full_number', - 'number', - 'filename', - 'dir', - 'delivery_filename', - 'delivery_dir', - 'disk', - 'infos', - 'paid', - 'paid_date', - 'cancellation', - 'cancellation_id', - 'cancellation_date', - 'status' - ]; + protected $dates = [ + 'date', + 'paid_date', + 'cancellation_date', + ]; - public static $monthNames = [ - 1 => 'Januar', - 2 => 'Februar', - 3 => 'März', - 4 => 'April', - 5 => 'Mai', - 6 => 'Juni', - 7 => 'Juli', - 8 => 'August', - 9 => 'September', - 10 => 'Oktober', - 11 => 'November', - 12 => 'Dezember' - ]; + protected $fillable = [ + 'shopping_order_id', + 'month', + 'year', + 'date', + 'full_number', + 'number', + 'filename', + 'dir', + 'delivery_filename', + 'delivery_dir', + 'disk', + 'infos', + 'paid', + 'paid_date', + 'cancellation', + 'cancellation_id', + 'cancellation_date', + 'status', + ]; - public static $statusTypes = [ - 0 => '-', + public static $monthNames = [ + 1 => 'Januar', + 2 => 'Februar', + 3 => 'März', + 4 => 'April', + 5 => 'Mai', + 6 => 'Juni', + 7 => 'Juli', + 8 => 'August', + 9 => 'September', + 10 => 'Oktober', + 11 => 'November', + 12 => 'Dezember', + ]; + + public static $statusTypes = [ + 0 => '-', 1 => 'Bestellung', 2 => 'Shop', 11 => 'storniert B.', - 12 => 'storniert Shop', + 12 => 'storniert Shop', ]; public static $statusColors = [ 0 => 'warning', - 1 => 'success', + 1 => 'success', 2 => 'secondary', - 11 => 'danger', - 12 => 'danger', + 11 => 'danger', + 12 => 'danger', ]; - public function shopping_order(){ - return $this->belongsTo(ShoppingOrder::class); - } - - public function getDateAttribute($value){ - return $this->attributes['date'] ? Carbon::parse($this->attributes['date'])->format(\Util::formatDateDB()) : ''; - } - public function setDateAttribute( $value ) { - $this->attributes['date'] = isset($value) ? (new Carbon($value))->format('Y-m-d') : NULL; - } - public function getDateRaw(){ - return isset($this->attributes['date']) ? $this->attributes['date'] : NULL; - } - - public function getPaidDateAttribute($value){ - return $this->attributes['paid_date'] ? Carbon::parse($this->attributes['paid_date'])->format(\Util::formatDateDB()) : ''; - } - public function setPaidDateAttribute( $value ) { - $this->attributes['paid_date'] = isset($value) ? (new Carbon($value))->format('Y-m-d') : NULL; - } - public function getPaidDateRaw(){ - return isset($this->attributes['paid_date']) ? $this->attributes['paid_date'] : NULL; - } - - public function getCancellationDateAttribute($value){ - return $this->attributes['cancellation_date'] ? Carbon::parse($this->attributes['cancellation_date'])->format(\Util::formatDateDB()) : ''; - } - public function setCancellationDateAttribute( $value ) { - $this->attributes['cancellation_date'] = isset($value) ? (new Carbon($value))->format('Y-m-d') : NULL; - } - public function getCancellationDateRaw(){ - return isset($this->attributes['cancellation_date']) ? $this->attributes['cancellation_date'] : NULL; - } - - public static function getMonthName($month) + public function shopping_order() { - return isset(self::$monthNames[$month]) ? self::$monthNames[$month] : $month; + return $this->belongsTo(ShoppingOrder::class); } - public function getStatusType(){ - return isset(self::$statusTypes[$this->status]) ? self::$statusTypes[$this->status] : ""; + public function getDateAttribute($value) + { + return $this->attributes['date'] ? Carbon::parse($this->attributes['date'])->format(\Util::formatDateDB()) : ''; } - public function getStatusColor(){ - return isset(self::$statusColors[$this->status]) ? self::$statusColors[$this->status] : "default"; + public function setDateAttribute($value) + { + $this->attributes['date'] = isset($value) ? (new Carbon($value))->format('Y-m-d') : null; } - public function getDownloadPath($full = false){ - if(!$full){ + public function getDateRaw() + { + return isset($this->attributes['date']) ? $this->attributes['date'] : null; + } + + public function getPaidDateAttribute($value) + { + return $this->attributes['paid_date'] ? Carbon::parse($this->attributes['paid_date'])->format(\Util::formatDateDB()) : ''; + } + + public function setPaidDateAttribute($value) + { + $this->attributes['paid_date'] = isset($value) ? (new Carbon($value))->format('Y-m-d') : null; + } + + public function getPaidDateRaw() + { + return isset($this->attributes['paid_date']) ? $this->attributes['paid_date'] : null; + } + + public function getCancellationDateAttribute($value) + { + return $this->attributes['cancellation_date'] ? Carbon::parse($this->attributes['cancellation_date'])->format(\Util::formatDateDB()) : ''; + } + + public function setCancellationDateAttribute($value) + { + $this->attributes['cancellation_date'] = isset($value) ? (new Carbon($value))->format('Y-m-d') : null; + } + + public function getCancellationDateRaw() + { + return isset($this->attributes['cancellation_date']) ? $this->attributes['cancellation_date'] : null; + } + + public static function getMonthName($month) + { + return isset(self::$monthNames[$month]) ? self::$monthNames[$month] : $month; + } + + public function getStatusType() + { + return isset(self::$statusTypes[$this->status]) ? self::$statusTypes[$this->status] : ''; + } + + public function getStatusColor() + { + return isset(self::$statusColors[$this->status]) ? self::$statusColors[$this->status] : 'default'; + } + + public function getDownloadPath($full = false) + { + if (! $full) { return $this->dir.$this->filename; } + return \Storage::disk($this->disk)->path($this->dir.$this->filename); } - public function getDownloadPathDelivery($full = false){ - if(!$full){ + public function getDownloadPathDelivery($full = false) + { + if (! $full) { return $this->delivery_dir.$this->delivery_filename; } + return \Storage::disk($this->disk)->path($this->delivery_dir.$this->delivery_filename); } -} \ No newline at end of file + + /** + * Gibt den Download-Pfad für die lokalisierte Rechnung zurück. + * Bei 'de' oder nicht vorhandener Locale-Version wird das Original zurückgegeben. + * + * @param string|null $locale Sprachcode (de, en, es) + * @param bool $full Vollständiger Dateisystempfad oder relativer Pfad + * @return string + */ + public function getDownloadPathLocale($locale = null, $full = false) + { + // Bei Deutsch oder keiner Angabe: Original zurückgeben + if (! $locale || $locale === 'de') { + return $this->getDownloadPath($full); + } + + // Dateiname mit Locale-Suffix + $filename = str_replace('.pdf', '-'.$locale.'.pdf', $this->filename); + $path = $this->dir.$filename; + + // Prüfen ob Locale-Version existiert, sonst Fallback auf DE + if (! \Storage::disk($this->disk)->exists($path)) { + return $this->getDownloadPath($full); + } + + return $full ? \Storage::disk($this->disk)->path($path) : $path; + } + + /** + * Gibt den Download-Pfad für den lokalisierten Lieferschein zurück. + * Bei 'de' oder nicht vorhandener Locale-Version wird das Original zurückgegeben. + * + * @param string|null $locale Sprachcode (de, en, es) + * @param bool $full Vollständiger Dateisystempfad oder relativer Pfad + * @return string + */ + public function getDownloadPathDeliveryLocale($locale = null, $full = false) + { + // Bei Deutsch oder keiner Angabe: Original zurückgeben + if (! $locale || $locale === 'de') { + return $this->getDownloadPathDelivery($full); + } + + // Dateiname mit Locale-Suffix + $filename = str_replace('.pdf', '-'.$locale.'.pdf', $this->delivery_filename); + $path = $this->delivery_dir.$filename; + + // Prüfen ob Locale-Version existiert, sonst Fallback auf DE + if (! \Storage::disk($this->disk)->exists($path)) { + return $this->getDownloadPathDelivery($full); + } + + return $full ? \Storage::disk($this->disk)->path($path) : $path; + } + + /** + * Gibt den lokalisierten Dateinamen für die Rechnung zurück. + * + * @param string|null $locale + * @return string + */ + public function getFilenameLocale($locale = null) + { + if (! $locale || $locale === 'de') { + return $this->filename; + } + + $filename = str_replace('.pdf', '-'.$locale.'.pdf', $this->filename); + $path = $this->dir.$filename; + + // Fallback auf Original wenn nicht vorhanden + if (! \Storage::disk($this->disk)->exists($path)) { + return $this->filename; + } + + return $filename; + } + + /** + * Gibt alle verfügbaren lokalisierten Versionen der Rechnung zurück (außer DE). + * + * @return array Array mit Sprachcodes, z.B. ['en', 'es'] + */ + public function getAvailableLocales(): array + { + $availableTemplates = config('localization.availableTemplates', ['de']); + $locales = []; + + foreach ($availableTemplates as $locale) { + if ($locale === 'de') { + continue; + } + + $filename = str_replace('.pdf', '-'.$locale.'.pdf', $this->filename); + $path = $this->dir.$filename; + + if (\Storage::disk($this->disk)->exists($path)) { + $locales[] = $locale; + } + } + + return $locales; + } + + /** + * Prüft ob eine lokalisierte Version für die angegebene Sprache existiert. + */ + public function hasLocale(string $locale): bool + { + if ($locale === 'de') { + return true; + } + + $filename = str_replace('.pdf', '-'.$locale.'.pdf', $this->filename); + $path = $this->dir.$filename; + + return \Storage::disk($this->disk)->exists($path); + } +} diff --git a/app/Models/UserSalesVolume.php b/app/Models/UserSalesVolume.php index e0ba540..5db6634 100644 --- a/app/Models/UserSalesVolume.php +++ b/app/Models/UserSalesVolume.php @@ -6,10 +6,9 @@ namespace App\Models; +use App\User; use Carbon\Carbon; use Illuminate\Database\Eloquent\Model; -use App\Models\ShoppingOrder; -use App\User; /** * Class UserSalesVolume @@ -32,11 +31,11 @@ use App\User; * @property Carbon|null $updated_at * @property ShoppingOrder|null $shopping_order * @property User $user - * @package App\Models * @property int|null $user_invoice_id * @property int|null $month_shop_points * @property float|null $month_shop_total_net * @property-read \App\Models\UserInvoice|null $user_invoice + * * @method static \Illuminate\Database\Eloquent\Builder|UserSalesVolume newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|UserSalesVolume newQuery() * @method static \Illuminate\Database\Eloquent\Builder|UserSalesVolume query() @@ -57,275 +56,293 @@ use App\User; * @method static \Illuminate\Database\Eloquent\Builder|UserSalesVolume whereUserId($value) * @method static \Illuminate\Database\Eloquent\Builder|UserSalesVolume whereUserInvoiceId($value) * @method static \Illuminate\Database\Eloquent\Builder|UserSalesVolume whereYear($value) + * * @property array|null $syslog + * * @method static \Illuminate\Database\Eloquent\Builder|UserSalesVolume whereSyslog($value) * @method static \Illuminate\Database\Eloquent\Builder|UserSalesVolume whereInfo($value) * @method static \Illuminate\Database\Eloquent\Builder|UserSalesVolume whereStatusPoints($value) + * * @property int|null $month_KP_points * @property int|null $month_TP_points + * * @method static \Illuminate\Database\Eloquent\Builder|UserSalesVolume whereMonthKPPoints($value) * @method static \Illuminate\Database\Eloquent\Builder|UserSalesVolume whereMonthTPPoints($value) + * * @property int|null $status_turnover + * * @method static \Illuminate\Database\Eloquent\Builder|UserSalesVolume whereStatusTurnover($value) + * * @mixin \Eloquent */ class UserSalesVolume extends Model { - protected $table = 'user_sales_volumes'; + protected $table = 'user_sales_volumes'; - protected $casts = [ - 'user_id' => 'int', - 'shopping_order_id' => 'int', - 'user_invoice_id' => 'int', - 'month' => 'int', - 'year' => 'int', - 'points' => 'float', - 'month_KP_points' => 'float', - 'month_TP_points' => 'float', - 'month_shop_points' => 'float', - 'status_points' => 'int', - 'status_turnover' => 'int', - 'total_net' => 'float', - 'month_total_net' => 'float', - 'month_shop_total_net' => 'float', - 'status' => 'int', - 'syslog' => 'array' - ]; + protected $casts = [ + 'user_id' => 'int', + 'shopping_order_id' => 'int', + 'user_invoice_id' => 'int', + 'month' => 'int', + 'year' => 'int', + 'points' => 'float', + 'month_KP_points' => 'float', + 'month_TP_points' => 'float', + 'month_shop_points' => 'float', + 'status_points' => 'int', + 'status_turnover' => 'int', + 'total_net' => 'float', + 'month_total_net' => 'float', + 'month_shop_total_net' => 'float', + 'status' => 'int', + 'syslog' => 'array', + ]; - protected $dates = [ - 'date' - ]; + protected $dates = [ + 'date', + ]; - protected $fillable = [ - 'user_id', - 'shopping_order_id', - 'user_invoice_id', - 'month', - 'year', - 'date', - 'points', - 'month_KP_points', - 'month_TP_points', - 'month_shop_points', - 'status_points', - 'status_turnover', - 'total_net', - 'month_total_net', - 'month_shop_total_net', - 'message', - 'info', - 'status', - 'syslog' - ]; + protected $fillable = [ + 'user_id', + 'shopping_order_id', + 'user_invoice_id', + 'month', + 'year', + 'date', + 'points', + 'month_KP_points', + 'month_TP_points', + 'month_shop_points', + 'status_points', + 'status_turnover', + 'total_net', + 'month_total_net', + 'month_shop_total_net', + 'message', + 'info', + 'status', + 'syslog', + ]; + public static $statusPointsTypes = [ + 1 => 'KU + TP', // Eigene + Team + 2 => 'KU', // nur Eigene nicht Team + ]; - public static $statusPointsTypes = [ - 1 => 'KU + TP', //Eigene + Team - 2 => 'KU', //nur Eigene nicht Team - ]; + public static $statusTurnoverTypes = [ + 1 => 'advisor_order', // hinzugefügt aus + 2 => 'shoporder', // hinzugefügt aus + ]; - public static $statusTurnoverTypes = [ - 1 => 'advisor_order', //hinzugefügt aus - 2 => 'shoporder', //hinzugefügt aus - ]; + public static $statusTypes = [ + 0 => 'not_assigned', + 1 => 'advisor_order', // hinzugefügt aus + 2 => 'shoporder', // hinzugefügt aus + 3 => 'shoporder_pending', // hinzugefügt aus + 4 => 'credit', // hinzugefügt aus + 5 => 'registration', // hinzugefügt aus + 6 => 'cancelled', // Stornorechnung + // 10 => '' + ]; - public static $statusTypes = [ - 0 => 'not_assigned', - 1 => 'advisor_order', //hinzugefügt aus - 2 => 'shoporder', //hinzugefügt aus - 3 => 'shoporder_pending', //hinzugefügt aus - 4 => 'credit', //hinzugefügt aus - 5 => 'registration', //hinzugefügt aus - // 10 => '' - ]; + public static $statusColors = [ + 0 => 'warning', + 1 => 'success', + 2 => 'secondary', + 3 => 'warning', + 4 => 'info', + 5 => 'info', + 6 => 'danger', + 10 => 'danger', + ]; - public static $statusColors = [ - 0 => 'warning', - 1 => 'success', - 2 => 'secondary', - 3 => 'warning', - 4 => 'info', - 5 => 'info', - 10 => 'danger', - ]; + public function shopping_order() + { + return $this->belongsTo(ShoppingOrder::class); + } - public function shopping_order() - { - return $this->belongsTo(ShoppingOrder::class); - } + public function user() + { + return $this->belongsTo(User::class); + } - public function user() - { - return $this->belongsTo(User::class); - } + public function user_invoice() + { + return $this->belongsTo(UserInvoice::class); + } - public function user_invoice() - { - return $this->belongsTo(UserInvoice::class); - } + public function getDateAttribute() + { + return $this->attributes['date'] ? Carbon::parse($this->attributes['date'])->format(\Util::formatDateDB()) : ''; + } - public function getDateAttribute() - { - return $this->attributes['date'] ? Carbon::parse($this->attributes['date'])->format(\Util::formatDateDB()) : ''; - } - public function setDateAttribute($value) - { - $this->attributes['date'] = isset($value) ? (new Carbon($value))->format('Y-m-d') : NULL; - } - public function getDateRaw() - { - return isset($this->attributes['date']) ? $this->attributes['date'] : NULL; - } + public function setDateAttribute($value) + { + $this->attributes['date'] = isset($value) ? (new Carbon($value))->format('Y-m-d') : null; + } - // Points Setter/Getter für deutsches Zahlenformat - public function setPointsAttribute($value) - { - $this->attributes['points'] = $value !== null ? \Util::reFormatNumber($value) : null; - } + public function getDateRaw() + { + return isset($this->attributes['date']) ? $this->attributes['date'] : null; + } - public function setMonthKPPointsAttribute($value) - { - $this->attributes['month_KP_points'] = $value !== null ? \Util::reFormatNumber($value) : null; - } + // Points Setter/Getter für deutsches Zahlenformat + public function setPointsAttribute($value) + { + $this->attributes['points'] = $value !== null ? \Util::reFormatNumber($value) : null; + } - public function setMonthTPPointsAttribute($value) - { - $this->attributes['month_TP_points'] = $value !== null ? \Util::reFormatNumber($value) : null; - } + public function setMonthKPPointsAttribute($value) + { + $this->attributes['month_KP_points'] = $value !== null ? \Util::reFormatNumber($value) : null; + } - public function setMonthShopPointsAttribute($value) - { - $this->attributes['month_shop_points'] = $value !== null ? \Util::reFormatNumber($value) : null; - } + public function setMonthTPPointsAttribute($value) + { + $this->attributes['month_TP_points'] = $value !== null ? \Util::reFormatNumber($value) : null; + } - public function getFormattedPoints() - { - return isset($this->attributes['points']) ? \Util::formatNumber($this->attributes['points']) : ""; - } + public function setMonthShopPointsAttribute($value) + { + $this->attributes['month_shop_points'] = $value !== null ? \Util::reFormatNumber($value) : null; + } - public function getFormattedMonthKPPoints() - { - return isset($this->attributes['month_KP_points']) ? \Util::formatNumber($this->attributes['month_KP_points']) : 0; - } + public function getFormattedPoints() + { + return isset($this->attributes['points']) ? \Util::formatNumber($this->attributes['points']) : ''; + } - public function getFormattedMonthTPPoints() - { - return isset($this->attributes['month_TP_points']) ? \Util::formatNumber($this->attributes['month_TP_points']) : 0; - } + public function getFormattedMonthKPPoints() + { + return isset($this->attributes['month_KP_points']) ? \Util::formatNumber($this->attributes['month_KP_points']) : 0; + } - public function getFormattedMonthShopPoints() - { - return isset($this->attributes['month_shop_points']) ? \Util::formatNumber($this->attributes['month_shop_points']) : 0; - } + public function getFormattedMonthTPPoints() + { + return isset($this->attributes['month_TP_points']) ? \Util::formatNumber($this->attributes['month_TP_points']) : 0; + } - public function getPointsKPSum() - { - return $this->month_KP_points + $this->month_shop_points; //only KP für SUM - KP is for User - } - public function getPointsTPSum() - { - return $this->month_TP_points + $this->month_shop_points; //only TP für SUM - TP is only for Payline - } + public function getFormattedMonthShopPoints() + { + return isset($this->attributes['month_shop_points']) ? \Util::formatNumber($this->attributes['month_shop_points']) : 0; + } - public function getTotalNetSum() - { - return $this->month_total_net + $this->month_shop_total_net; - } + public function getPointsKPSum() + { + return $this->month_KP_points + $this->month_shop_points; // only KP für SUM - KP is for User + } - public function getStatusType() - { - return isset(self::$statusTypes[$this->status]) ? __('payment.' . self::$statusTypes[$this->status]) : ""; - } + public function getPointsTPSum() + { + return $this->month_TP_points + $this->month_shop_points; // only TP für SUM - TP is only for Payline + } - public static function getTransStatusType() - { - $ret = []; - foreach (self::$statusTypes as $key => $val) { - $ret[$key] = trans('payment.' . $val); - } - return $ret; - } + public function getTotalNetSum() + { + return $this->month_total_net + $this->month_shop_total_net; + } - public static function getTransTurnoverTypes() - { - $ret = []; - foreach (self::$statusTurnoverTypes as $key => $val) { - $ret[$key] = trans('payment.' . $val); - } - return $ret; - } + public function getStatusType() + { + return isset(self::$statusTypes[$this->status]) ? __('payment.'.self::$statusTypes[$this->status]) : ''; + } - public function getStatusColor() - { - return isset(self::$statusColors[$this->status]) ? self::$statusColors[$this->status] : "default"; - } + public static function getTransStatusType() + { + $ret = []; + foreach (self::$statusTypes as $key => $val) { + $ret[$key] = trans('payment.'.$val); + } - public function getStatusPointsType() - { - return isset(self::$statusPointsTypes[$this->status_points]) ? self::$statusPointsTypes[$this->status_points] : ""; - } - public function getStatusPointsColor() - { - return isset(self::$statusColors[$this->status_points]) ? self::$statusColors[$this->status_points] : "default"; - } + return $ret; + } - public function getStatusTurnoverType() - { - switch ($this->status) { - case 1: //Bestellung Berater - return 'E'; - case 2: //Shop - return 'S'; - case 4: //Gutschrift - if ($this->status_turnover === 2) { - return 'S'; - } else { - return 'E'; - } - case 5: //Registrierung - return 'E'; - } - return ""; - } - public function getStatusTurnoverColor() - { + public static function getTransTurnoverTypes() + { + $ret = []; + foreach (self::$statusTurnoverTypes as $key => $val) { + $ret[$key] = trans('payment.'.$val); + } + return $ret; + } - switch ($this->status) { - case 1: //Bestellung Berater - return 'success'; - case 2: //Shop - return 'secondary'; - case 4: //Gutschrift - if ($this->status_turnover === 2) { - return 'secondary'; - } else { - return 'success'; - } - case 5: //Registrierung - return 'success'; - } - return "default"; - } + public function getStatusColor() + { + return isset(self::$statusColors[$this->status]) ? self::$statusColors[$this->status] : 'default'; + } - public function getFormatedMonthYear() - { - return str_pad($this->month, 2, "0", STR_PAD_LEFT) . "/" . $this->year; - } + public function getStatusPointsType() + { + return isset(self::$statusPointsTypes[$this->status_points]) ? self::$statusPointsTypes[$this->status_points] : ''; + } - public function isCurrentMonthYear() - { - if ($this->month === intval(date('m')) && $this->year === intval(date('Y'))) { - return true; - } - return false; - } + public function getStatusPointsColor() + { + return isset(self::$statusColors[$this->status_points]) ? self::$statusColors[$this->status_points] : 'default'; + } - public function caluCommissonTotalNet($margin) - { - if ($this->total_net > 0 && $margin > 0) { - return $this->total_net / 100 * $margin; - } - return 0; - } + public function getStatusTurnoverType() + { + switch ($this->status) { + case 1: // Bestellung Berater + return 'E'; + case 2: // Shop + return 'S'; + case 4: // Gutschrift + if ($this->status_turnover === 2) { + return 'S'; + } else { + return 'E'; + } + case 5: // Registrierung + return 'E'; + } + + return ''; + } + + public function getStatusTurnoverColor() + { + + switch ($this->status) { + case 1: // Bestellung Berater + return 'success'; + case 2: // Shop + return 'secondary'; + case 4: // Gutschrift + if ($this->status_turnover === 2) { + return 'secondary'; + } else { + return 'success'; + } + case 5: // Registrierung + return 'success'; + } + + return 'default'; + } + + public function getFormatedMonthYear() + { + return str_pad($this->month, 2, '0', STR_PAD_LEFT).'/'.$this->year; + } + + public function isCurrentMonthYear() + { + if ($this->month === intval(date('m')) && $this->year === intval(date('Y'))) { + return true; + } + + return false; + } + + public function caluCommissonTotalNet($margin) + { + if ($this->total_net > 0 && $margin > 0) { + return $this->total_net / 100 * $margin; + } + + return 0; + } } diff --git a/app/Repositories/AboRepository.php b/app/Repositories/AboRepository.php index 3d2ce75..6a5d3b7 100644 --- a/app/Repositories/AboRepository.php +++ b/app/Repositories/AboRepository.php @@ -2,20 +2,16 @@ namespace App\Repositories; -use Carbon; use App\Models\UserAbo; use App\Services\AboHelper; class AboRepository extends BaseRepository { - - public function __construct() { - //$this->model = $model; + // $this->model = $model; } - public function setModel(UserAbo $model) { $this->model = $model; @@ -28,14 +24,17 @@ class AboRepository extends BaseRepository if ($this->validate($data)) { $this->updateStatus($data); $this->model->abo_interval = $data['abo_interval']; - $this->model->next_date = AboHelper::setNextDate(now(), $data['abo_interval']); + $this->model->next_date = AboHelper::setNextDate(now(), $data['abo_interval']); $this->model->save(); \Session()->flash('alert-success', 'Einstellungen gespeichert'); + return true; } + return false; } } + return false; } @@ -50,52 +49,57 @@ class AboRepository extends BaseRepository $this->model->active = false; $this->model->cancel_date = now(); $this->model->save(); + return; } $active = (isset($data['abo_is_active']) && $data['abo_is_active']) ? true : false; - //if status is active and active is false, set status to inactive - if ($this->model->active && !$active) { - if ($this->model->status == 2) { //okay - $this->model->status = 6; //inactive + // if status is active and active is false, set status to inactive + if ($this->model->active && ! $active) { + if ($this->model->status == 2) { // okay + $this->model->status = 6; // inactive $this->model->active = false; $this->model->save(); } } - if (!$this->model->active && $active) { - if ($this->model->status = 6) { //inactive - $this->model->status = 2; //okay + if (! $this->model->active && $active) { + if ($this->model->status = 6) { // inactive + $this->model->status = 2; // okay $this->model->active = true; $this->model->save(); } } $this->model->active = $active; - return; } private function validate($data) { - if ($data['view'] !== 'admin') { + if ($data['view'] !== 'admin' && $data['view'] !== 'portal') { if ($this->model->is_for === 'me' && $this->model->user_id !== \Auth::user()->id) { \Session()->flash('alert-error', 'Unauthorized action. User ID does not match.'); + return false; } if ($this->model->is_for === 'ot' && $this->model->member_id !== \Auth::user()->id) { \Session()->flash('alert-error', 'Unauthorized action. User ID does not match.'); + return false; } if ($data['view'] === 'me' && $this->model->is_for !== 'me') { \Session()->flash('alert-error', 'Unauthorized action. Is not for me'); + return false; } if ($data['view'] === 'ot' && $this->model->is_for !== 'ot') { \Session()->flash('alert-error', 'Unauthorized action. Is not your customer'); + return false; } } - if (!in_array($data['abo_interval'], \App\Models\UserAbo::$aboDeliveryDays)) { - //to check if user is not admin + if (! in_array($data['abo_interval'], \App\Models\UserAbo::$aboDeliveryDays)) { + // to check if user is not admin \Session()->flash('alert-error', __('abo.error_abo_interval')); + return false; } @@ -104,8 +108,9 @@ class AboRepository extends BaseRepository // da setNextDate das nächste Ausführungsdatum sonst auf den nächsten Monat setzt und dieser Monat übersprungen wird. $executedThisMonth = $this->model->last_date && \Carbon\Carbon::parse($this->model->last_date)->isCurrentMonth(); - if (!$executedThisMonth && $data['abo_interval'] <= now()->day) { + if (! $executedThisMonth && $data['abo_interval'] <= now()->day) { \Session()->flash('alert-error', __('abo.error_abo_interval_in_the_past')); + return false; } diff --git a/app/Repositories/CheckoutRepository.php b/app/Repositories/CheckoutRepository.php index 8e5d8ff..fa16c0e 100644 --- a/app/Repositories/CheckoutRepository.php +++ b/app/Repositories/CheckoutRepository.php @@ -2,24 +2,22 @@ namespace App\Repositories; -use Yard; -use App\Services\Util; -use App\Models\ShoppingUser; use App\Models\Homeparty; -use App\Models\ShoppingCollectOrder; use App\Models\PaymentMethod; +use App\Models\ShoppingCollectOrder; use App\Models\ShoppingOrder; -use Illuminate\Session\SessionManager; use App\Models\ShoppingOrderItem; +use App\Models\ShoppingUser; +use App\Services\Util; +use Illuminate\Session\SessionManager; use Illuminate\Support\Collection; - +use Yard; class CheckoutRepository extends BaseRepository { - private $session; - private $instance; + private $instance; public function __construct(SessionManager $session) { @@ -33,10 +31,10 @@ class CheckoutRepository extends BaseRepository $user_shop = Util::getUserShop(); if ($shopping_user->is_from === 'homeparty') { - //get data + // get data $homeparty = Homeparty::find($shopping_user->homeparty_id); - //set Data! - $total = Yard::instance($this->instance)->total(2, '.', ''); //ek_price + // set Data! + $total = Yard::instance($this->instance)->total(2, '.', ''); // ek_price $data = [ 'shopping_user_id' => $shopping_user->id, 'auth_user_id' => $shopping_user->auth_user_id, @@ -44,7 +42,7 @@ class CheckoutRepository extends BaseRepository 'language' => \App::getLocale(), 'user_shop_id' => $user_shop->id, 'payment_for' => $shopping_user->getOrderPaymentFor(), - 'homeparty_id' => $shopping_user->homeparty_id, + 'homeparty_id' => $shopping_user->homeparty_id, 'total' => $total, 'subtotal' => $homeparty->order['ek_price_net'], 'shipping' => $homeparty->order['shipping_price'], @@ -58,10 +56,10 @@ class CheckoutRepository extends BaseRepository 'mode' => Util::getUserShoppingMode(), ]; } elseif ($shopping_user->is_from === 'collection') { - //get data + // get data $ShoppingCollectOrder = ShoppingCollectOrder::find($shopping_user->shopping_collect_order_id); - //set Data! - $total = Yard::instance($this->instance)->total(2, '.', ''); //ek_price + // set Data! + $total = Yard::instance($this->instance)->total(2, '.', ''); // ek_price $data = [ 'shopping_user_id' => $shopping_user->id, 'auth_user_id' => $shopping_user->auth_user_id, @@ -75,7 +73,7 @@ class CheckoutRepository extends BaseRepository 'shipping_net' => 0, 'subtotal_ws' => $ShoppingCollectOrder->price_total_net, 'tax' => $ShoppingCollectOrder->tax_total, - 'tax_split' => $ShoppingCollectOrder->tax_split, + 'tax_split' => $ShoppingCollectOrder->tax_split, 'total_shipping' => Yard::instance($this->instance)->totalWithShipping(2, '.', ''), 'points' => round($ShoppingCollectOrder->points, 2), 'weight' => 0, @@ -114,7 +112,7 @@ class CheckoutRepository extends BaseRepository $shopping_order->save(); } } - if (!$shopping_order) { + if (! $shopping_order) { $shopping_order = ShoppingOrder::create($data); if ($shopping_user->is_from === 'collection' && $ShoppingCollectOrder) { $ShoppingCollectOrder->shopping_order_id = $shopping_order->id; @@ -131,7 +129,7 @@ class CheckoutRepository extends BaseRepository $tax = $item->price - $price_net; $data = [ 'shopping_order_id' => $shopping_order->id, - 'row_id' => $item->rowId, + 'row_id' => $item->rowId, 'product_id' => $item->id, 'comp' => $item->options->comp, 'qty' => $item->qty, @@ -153,20 +151,22 @@ class CheckoutRepository extends BaseRepository $data['product_id'] = null; } $model->fill($data)->save(); + return false; } } + return $model->delete(); }); foreach ($items as $item) { - if (!ShoppingOrderItem::where('shopping_order_id', $shopping_order->id)->where('row_id', $item->rowId)->count()) { + if (! ShoppingOrderItem::where('shopping_order_id', $shopping_order->id)->where('row_id', $item->rowId)->count()) { $price_net = Yard::instance($this->instance)->rowPriceNet($item, 2, '.', ''); $tax = $item->price - $price_net; $data = [ 'shopping_order_id' => $shopping_order->id, - 'row_id' => $item->rowId, + 'row_id' => $item->rowId, 'product_id' => $item->id, 'comp' => $item->options->comp, 'qty' => $item->qty, @@ -177,7 +177,7 @@ class CheckoutRepository extends BaseRepository 'price_vk_net' => $shopping_order->getPriceVkNetBy($item->id), 'discount' => $item->options->no_commission ? 0 : $shopping_order->getUserDiscount(), 'points' => $item->options->points, - 'slug' => $item->options->slug + 'slug' => $item->options->slug, ]; if ($shopping_user->is_from === 'homeparty') { @@ -196,16 +196,18 @@ class CheckoutRepository extends BaseRepository if ($shopping_user->is_from === 'homeparty') { $shopping_order->makeHomepartyTaxSplit(); } elseif ($shopping_user->is_from === 'collection') { - //is set on create / filll. + // is set on create / filll. } else { $shopping_order->makeTaxSplit(); } + return $shopping_order; } + public function makeShoppingUser($data) { - $data['same_as_billing'] = isset($data['same_as_billing']) ? false : true; //reinvert + $data['same_as_billing'] = isset($data['same_as_billing']) ? false : true; // reinvert $data['accepted_data_checkbox'] = isset($data['accepted_data_checkbox']) ? true : false; $shopping_user = false; if ($this->getSessionPayments('shopping_user_id')) { @@ -216,7 +218,7 @@ class CheckoutRepository extends BaseRepository $shopping_user->save(); } } - if (!$shopping_user) { + if (! $shopping_user) { $shopping_user = ShoppingUser::create($data); } $this->putSessionPayments('shopping_user_id', $shopping_user->id); @@ -240,6 +242,7 @@ class CheckoutRepository extends BaseRepository } else { $payment_methods['active'] = \App\Models\PaymentMethod::where('active', true)->get()->pluck('id', 'short')->toArray(); } + return $payment_methods; } @@ -259,44 +262,46 @@ class CheckoutRepository extends BaseRepository public function makeCustomerShoppingUser($shopping_data, $is_for, $is_from) { // $shopping_user = ShoppingUser::findOrFail($shopping_data['shopping_user_id']); - $shopping_user = new ShoppingUser(); + $shopping_user = new ShoppingUser; $shopping_user->fill($shopping_data); $shopping_user->faker_mail = false; $shopping_user->auth_user_id = null; $shopping_user->homeparty_id = null; - $shopping_user->same_as_billing = $shopping_user->same_as_billing ? false : true; //reinvert + $shopping_user->same_as_billing = $shopping_user->same_as_billing ? false : true; // reinvert // $shopping_user->id = null; $shopping_user->accepted_data_checkbox = 1; $shopping_user->is_for = $is_for; $shopping_user->is_from = $is_from; $shopping_user->mode = 'prev'; $shopping_user->language = \App::getLocale(); + return $shopping_user; } public function initShoppingUser($is_for, $is_from, $homeparty_id = null) { - $shopping_user = new ShoppingUser(); + $shopping_user = new ShoppingUser; $shopping_user->homeparty_id = $homeparty_id; $shopping_user->language = \App::getLocale(); - //eingeloggter Kunde + // eingeloggter Kunde if (\Auth::guard('customers')->check()) { $shopping_user = $this->shoppingUserByAuthCustomer(\Auth::guard('customers')->user()); } - //eingeloggter User Berater + // eingeloggter User Berater if (\Auth::guard('user')->check()) { $shopping_user = $this->shoppingUserByAuthUser(\Auth::guard('user')->user(), $is_from, $is_for); } $shopping_user->mode = 'prev'; $shopping_user->is_for = $is_for; $shopping_user->is_from = $is_from; + return $shopping_user; } public function shoppingUserByAuthCustomer(\App\Models\Customer $user) { - //clone shopping user! + // clone shopping user! if ($user->shopping_user_id) { $find_shopping_user = ShoppingUser::find($user->shopping_user_id); if ($find_shopping_user) { @@ -305,7 +310,7 @@ class CheckoutRepository extends BaseRepository $shopping_user->shipping_country_id = null; } } else { - $shopping_user = new ShoppingUser(); + $shopping_user = new ShoppingUser; $shopping_user->language = \App::getLocale(); } @@ -315,7 +320,7 @@ class CheckoutRepository extends BaseRepository public function shoppingUserByAuthUser(\App\User $user, $is_from, $is_for) { - $shopping_user = new ShoppingUser(); + $shopping_user = new ShoppingUser; $shopping_user->language = \App::getLocale(); $shopping_user->billing_salutation = $user->account->salutation; @@ -326,16 +331,16 @@ class CheckoutRepository extends BaseRepository $shopping_user->billing_address_2 = $user->account->address_2; $shopping_user->billing_zipcode = $user->account->zipcode; $shopping_user->billing_city = $user->account->city; - //$shopping_user->billing_country_id = $user->account->country_id; + // $shopping_user->billing_country_id = $user->account->country_id; $shopping_user->billing_phone = $user->account->phone; $shopping_user->billing_email = $user->email; $shopping_user->faker_mail = false; $shopping_user->shipping_email = $user->email; + $shopping_user->language = $user->account->getLocale(); $shopping_user->accepted_data_checkbox = 1; - - //Lieferadresse + // Lieferadresse $shopping_user->same_as_billing = $user->account->same_as_billing ? false : true; $shopping_user->shipping_salutation = $user->account->shipping_salutation; $shopping_user->shipping_company = $user->account->shipping_company; @@ -345,11 +350,10 @@ class CheckoutRepository extends BaseRepository $shopping_user->shipping_address_2 = $user->account->shipping_address_2; $shopping_user->shipping_zipcode = $user->account->shipping_zipcode; $shopping_user->shipping_city = $user->account->shipping_city; - //$shopping_user->shipping_country_id = $user->account->shipping_country_id; + // $shopping_user->shipping_country_id = $user->account->shipping_country_id; $shopping_user->shipping_phone = $user->account->shipping_phone; $shopping_user->shipping_postnumber = $user->account->shipping_postnumber; - return $shopping_user; } @@ -357,7 +361,7 @@ class CheckoutRepository extends BaseRepository { $user = Util::getAuthUser(); - $shopping_user = new ShoppingUser(); + $shopping_user = new ShoppingUser; $shopping_user->auth_user_id = $user->id; $shopping_user->mode = 'prev'; $shopping_user->language = \App::getLocale(); @@ -375,6 +379,7 @@ class CheckoutRepository extends BaseRepository $shopping_user->billing_email = $user->email; $shopping_user->faker_mail = false; $shopping_user->shipping_email = $user->email; + $shopping_user->language = $user->account->getLocale(); $shopping_user->accepted_data_checkbox = 1; $shopping_user->is_for = $is_for; @@ -382,7 +387,7 @@ class CheckoutRepository extends BaseRepository $shopping_user->homeparty_id = isset($data['homeparty_id']) ? $data['homeparty_id'] : null; $shopping_user->shopping_collect_order_id = isset($data['shopping_collect_order_id']) ? $data['shopping_collect_order_id'] : null; - //Lieferadresse + // Lieferadresse if ($is_from === 'user_order') { if (isset($data['shopping_user_id']) && strpos($data['is_for'], 'ot') !== false) { $s_user = ShoppingUser::findOrFail($data['shopping_user_id']); @@ -399,7 +404,7 @@ class CheckoutRepository extends BaseRepository $shopping_user->billing_email = $s_user->billing_email; ;*/ $shopping_user->faker_mail = $s_user->faker_mail; - if (!$s_user->faker_mail) { + if (! $s_user->faker_mail) { $shopping_user->shipping_email = $s_user->billing_email; } $shopping_user->shopping_user_id = $data['shopping_user_id']; @@ -449,13 +454,14 @@ class CheckoutRepository extends BaseRepository if ($content->has($key)) { return $content->get($key); } + return false; } public function sessionDestroy($with_shopping = false) { if ($with_shopping) { - if (session('user_shop_payment') === 1) { //ShoppingInstance payment 1 = webshop + if (session('user_shop_payment') === 1) { // ShoppingInstance payment 1 = webshop Yard::instance('webshop')->destroy(); } else { Yard::instance('shopping')->destroy(); @@ -469,6 +475,7 @@ class CheckoutRepository extends BaseRepository if (is_null($this->session->get($this->instance))) { return new Collection([]); } + return $this->session->get($this->instance); } } diff --git a/app/Repositories/ContractPDFRepository.php b/app/Repositories/ContractPDFRepository.php index d8ce594..32ba184 100644 --- a/app/Repositories/ContractPDFRepository.php +++ b/app/Repositories/ContractPDFRepository.php @@ -7,37 +7,77 @@ use App\Models\File; use App\User; use Storage; -class ContractPDFRepository extends BaseRepository { - - - - +class ContractPDFRepository extends BaseRepository +{ protected $disk; + protected $dir; + protected $user_id; + protected $identifier; - public function __construct(User $model){ + protected $locale; + + protected $contract_date; + + public function __construct(User $model) + { $this->model = $model; + // Benutzersprache aus Account ermitteln (mit Fallback auf de) + $this->locale = $model->account && $model->account->language + ? $model->account->language + : 'de'; } - public function _set($name, $value){ + public function _set($name, $value) + { $this->{$name} = $value; } - private function convert($str){ - $search = array('Ő', 'ő', 'Ű', 'ű'); - $replace = array('Ö', 'ö', 'Ü', 'ü'); + private function convert($str) + { + $search = ['Ő', 'ő', 'Ű', 'ű']; + $replace = ['Ö', 'ö', 'Ü', 'ü']; $str = str_replace($search, $replace, $str); - return iconv('UTF-8', 'windows-1252//IGNORE', $str); + + return iconv('UTF-8', 'windows-1252//IGNORE', $str); } - public function createContractPDF() { + public function createContractPDF() + { - $pdf = new ContractPDF(); + if (! Storage::disk($this->disk)->exists($this->dir)) { + Storage::disk($this->disk)->makeDirectory($this->dir); // creates directory + } - $pdf->AddPage('P', array(210, 297)); + // Lösche alle alten Vertrags-Einträge für diesen User + File::where('user_id', $this->model->id) + ->where('identifier', $this->identifier) + ->delete(); + + // 1. IMMER deutsches Original erstellen + $this->createContractPDFForLocale('de'); + + // 2. Wenn Benutzersprache != DE, lokalisierte Version erstellen + if ($this->locale && $this->locale !== 'de') { + $this->createContractPDFForLocale($this->locale); + } + + return true; + } + + /** + * Erstellt einen Beratervertrag in der angegebenen Sprache + */ + private function createContractPDFForLocale(string $locale) + { + + $pdf = new ContractPDF; + $pdf->setLocale($locale); + + $pdf->AddPage('P', [210, 297]); $pdf->SetFont('Helvetica', '', 11); $pdf->SetDrawColor(160, 160, 160); @@ -48,22 +88,21 @@ class ContractPDFRepository extends BaseRepository { $pdf->SetXY($x1, $y); $pdf->Write(0, $this->convert($this->model->account->m_account)); $pdf->SetXY($x2, $y); - $pdf->Write(0, now()->format("d.m.Y")); + $contractDate = $this->contract_date ?? now(); + $pdf->Write(0, $contractDate->format('d.m.Y')); $y += $nl; $pdf->SetXY($x1, $y); $pdf->Write(0, $this->convert($this->model->account->company)); $pdf->SetXY($x2, $y); - $pre = $this->model->account->pre_phone_id != "" ? $this->convert($this->model->account->pre_phone->phone)." " : ""; + $pre = $this->model->account->pre_phone_id != '' ? $this->convert($this->model->account->pre_phone->phone).' ' : ''; $pdf->Write(0, $pre.$this->convert($this->model->account->phone)); - - $y += $nl; $pdf->SetXY($x1, $y); $pdf->Write(0, $this->convert($this->model->account->m_first_name)); $pdf->SetXY($x2, $y); - $pre = $this->model->account->pre_mobil_id != "" ? $this->convert($this->model->account->pre_mobil->phone)." " : ""; + $pre = $this->model->account->pre_mobil_id != '' ? $this->convert($this->model->account->pre_mobil->phone).' ' : ''; $pdf->Write(0, $pre.$this->convert($this->model->account->mobil)); $y += $nl; @@ -80,14 +119,14 @@ class ContractPDFRepository extends BaseRepository { $y += $nl; $pdf->SetXY($x1, $y); - $pdf->Write(0, $this->convert($this->model->account->zipcode)." ".$this->convert($this->model->account->city)); + $pdf->Write(0, $this->convert($this->model->account->zipcode).' '.$this->convert($this->model->account->city)); $y += $nl; $pdf->SetXY($x1, $y); - $pre = $this->model->account->country_id ? $this->convert($this->model->account->country->de)." " : ""; + $pre = $this->model->account->country_id ? $this->convert($this->model->account->country->de).' ' : ''; $pdf->Write(0, $pre); - if($this->model->m_sponsor && $this->model->user_sponsor->account){ + if ($this->model->m_sponsor && $this->model->user_sponsor->account) { $y += 48; $pdf->SetXY($x1, $y); $pdf->Write(0, $this->convert($this->model->user_sponsor->account->company)); @@ -96,49 +135,44 @@ class ContractPDFRepository extends BaseRepository { $y += $nl; $pdf->SetXY($x1, $y); - $pdf->Write(0, $this->convert($this->model->user_sponsor->account->m_first_name)." ".$this->convert($this->model->user_sponsor->account->m_last_name)); + $pdf->Write(0, $this->convert($this->model->user_sponsor->account->m_first_name).' '.$this->convert($this->model->user_sponsor->account->m_last_name)); - $website = $this->model->user_sponsor->shop()->count() ? $this->model->user_sponsor->shop->getSubdomain(false) : "www.mivita.care"; - - }else{ - $website = "www.mivita.care"; + $website = $this->model->user_sponsor->shop()->count() ? $this->model->user_sponsor->shop->getSubdomain(false) : 'www.mivita.care'; + } else { + $website = 'www.mivita.care'; } - $pdf->AddPage('P', array(210, 297)); + $pdf->AddPage('P', [210, 297]); $pdf->SetFont('Helvetica', '', 10); $pdf->SetDrawColor(160, 160, 160); - $pdf->SetXY(52, 56); - $pdf->Write(0, $website); - - $pdf->SetXY($x1, 65); - $pdf->Write(0, $this->convert($this->model->account->m_first_name)." ".$this->convert($this->model->account->m_last_name)); - $pdf->SetXY($x2, 65); - $pdf->Write(0, $this->convert($this->model->account->m_account)); + $pdf->Write(0, $website.' (ID: '.$this->convert($this->model->account->m_account).')'); - $pdf->AddPage('P', array(210, 297)); + $pdf->SetXY($x1, 80); + $pdf->Write(0, $this->convert($this->model->account->m_first_name)); + $pdf->SetXY($x2, 80); + $pdf->Write(0, $this->convert($this->model->account->m_last_name)); + $pdf->AddPage('P', [210, 297]); + + // Dateiname mit übersetztem Vertragsnamen + $contractName = __('pdf.contract_filename', [], $locale); + $filename = "MIVITA_{$contractName}.pdf"; - if(!Storage::disk($this->disk)->exists( $this->dir )){ - Storage::disk($this->disk)->makeDirectory($this->dir); //creates directory - } - $filename = "MIVITA_Beratervertrag.pdf"; Storage::disk($this->disk)->put($this->dir.$filename, $pdf->Output('S')); - $size = Storage::disk($this->disk)->size($this->dir.$filename); + $size = Storage::disk($this->disk)->size($this->dir.$filename); $mine = Storage::disk($this->disk)->mimeType($this->dir.$filename); + // Erstelle Datenbank-Eintrag für diesen Vertrag File::create([ 'user_id' => $this->model->id, 'identifier' => $this->identifier, 'filename' => $filename, 'dir' => $this->dir, 'original_name' => $filename, - 'ext' => "pdf", + 'ext' => 'pdf', 'mine' => $mine, - 'size' => $size + 'size' => $size, ]); - - return true; - } -} \ No newline at end of file +} diff --git a/app/Repositories/CreditRepository.php b/app/Repositories/CreditRepository.php index eb9aac2..5c9b25a 100644 --- a/app/Repositories/CreditRepository.php +++ b/app/Repositories/CreditRepository.php @@ -2,21 +2,22 @@ namespace App\Repositories; -use PDF; -use Storage; -use App\User; -use App\Services\Credit; -use App\Models\UserCredit; -use Response; +use App\Libraries\CreditDetailsPDF; use App\Libraries\MyPDFMerger; +use App\Models\UserCredit; use App\Models\UserCreditItem; use App\Models\UserSalesVolume; -use App\Libraries\CreditDetailsPDF; use App\Services\BusinessPlan\TreeCalcBot; +use App\Services\Credit; +use App\User; +use PDF; +use Response; +use Storage; -class CreditRepository extends BaseRepository { - +class CreditRepository extends BaseRepository +{ private $user_credit; + public function __construct(User $model) { $this->model = $model; @@ -24,16 +25,16 @@ class CreditRepository extends BaseRepository { public function create($request = []) { - //need invoice $data - $number = Credit::getCreditNumber(); - $credit_date = isset($request['credit_date']) ? $request['credit_date'] : \Carbon::now()->format("d.m.Y"); - $credit_send_mail = isset($request['credit_send_mail']) ? true: false; + // need invoice $data + $number = Credit::getCreditNumber(); + $credit_date = isset($request['credit_date']) ? $request['credit_date'] : \Carbon::now()->format('d.m.Y'); + $credit_send_mail = isset($request['credit_send_mail']) ? true : false; $credit_number = Credit::createCreditNumber($number, $credit_date); - $this->user_credit = new UserCredit(); + $this->user_credit = new UserCredit; $user_credit_items = $this->makeUserCredit(); - if(!count($user_credit_items)){ - return false; + if (! count($user_credit_items)) { + return false; } $data = [ 'user' => $this->model, @@ -42,24 +43,33 @@ class CreditRepository extends BaseRepository { 'user_credits' => $this->user_credit, 'user_credit_items' => $user_credit_items, ]; - $pdf = PDF::loadView('pdf.credit', $data); - $pdf->setPaper('A4', 'portrait'); $dir = Credit::getCreditStorageDir($credit_date); - if(!Storage::disk('public')->exists( $dir )){ - Storage::disk('public')->makeDirectory($dir); //creates directory + if (! Storage::disk('public')->exists($dir)) { + Storage::disk('public')->makeDirectory($dir); // creates directory } $path = Storage::disk('public')->path(''); + // Benutzersprache ermitteln + $userLocale = $this->model->account ? $this->model->account->getLocale() : 'de'; + $originalLocale = \App::getLocale(); + + // Deutsches Original-Dateiname (wird in DB gespeichert) $filename = Credit::makeCreditFilename($credit_number); - $pdf->save($path.$dir.$filename); + // 1. IMMER deutsches Original erstellen (Finanzamt-Anforderung) + \App::setLocale('de'); + $this->createCreditPDF($data, $path, $dir, $filename, 'de', false); - $pdfMerger = new MyPDFMerger(); - $pdfMerger->addPDF($path.$dir.$filename); - $file = $pdfMerger->myMerge('string', $filename, 'template_invoice_de'); - Storage::disk('public')->put($dir.$filename, $file); + // 2. Wenn Benutzersprache != DE, Kopie in Benutzersprache erstellen + if ($userLocale && $userLocale !== 'de') { + \App::setLocale($userLocale); + $localizedFilename = Credit::makeCreditFilenameLocale($credit_number, $userLocale); + $this->createCreditPDF($data, $path, $dir, $localizedFilename, $userLocale, true); + } + // Locale zurücksetzen + \App::setLocale($originalLocale); $this->user_credit->user_id = $this->model->id; $this->user_credit->year = \Carbon::parse($credit_date)->format('Y'); @@ -72,35 +82,76 @@ class CreditRepository extends BaseRepository { $this->user_credit->full_number = $credit_number; $this->user_credit->save(); - if($credit_send_mail){ + if ($credit_send_mail) { Credit::sendCreditMail($this->user_credit); } $this->finishUserCredit($this->user_credit->id, $user_credit_items); + return true; } - private function finishUserCredit($user_credit_id, $user_credit_items){ - //next credits + /** + * Erstellt eine Gutschrift-PDF-Datei. + * + * @param string $locale Sprachcode für das Template (de, en, es, fr) + * @param bool $is_copy Ob es sich um eine Kopie handelt (nicht das Original) + */ + private function createCreditPDF(array $data, string $path, string $dir, string $filename, string $locale = 'de', bool $is_copy = false) + { + // Kopie-Flag an Template übergeben + $data['is_copy'] = $is_copy; + + $pdf = PDF::loadView('pdf.credit', $data); + $pdf->setPaper('A4', 'portrait'); + $pdf->save($path.$dir.$filename); + + // Template basierend auf Locale + $template = $this->getTemplateForLocale($locale); + + $pdfMerger = new MyPDFMerger; + $pdfMerger->addPDF($path.$dir.$filename); + $file = $pdfMerger->myMerge('string', $filename, $template); + Storage::disk('public')->put($dir.$filename, $file); + } + + /** + * Gibt das PDF-Template für die angegebene Locale zurück. + * Verfügbare Templates werden aus config/localization.php geladen. + */ + private function getTemplateForLocale(string $locale): string + { + $availableTemplates = config('localization.availableTemplates', ['de']); + + if (in_array($locale, $availableTemplates)) { + return 'template_invoice_'.$locale; + } + + return 'template_invoice_de'; + } + + private function finishUserCredit($user_credit_id, $user_credit_items) + { + // next credits Credit::makeNextCreditNumber(); - //mark as payed - //$UserCreditItems = UserCreditItem::where('user_id', $this->model->id)->wherePaid(false)->get(); - foreach($user_credit_items as $user_credit_item){ + // mark as payed + // $UserCreditItems = UserCreditItem::where('user_id', $this->model->id)->wherePaid(false)->get(); + foreach ($user_credit_items as $user_credit_item) { $user_credit_item->paid = true; $user_credit_item->user_credit_id = $user_credit_id; $user_credit_item->save(); } } - private function makeUserCredit(){ - + private function makeUserCredit() + { + $this->user_credit->net = 0; $this->user_credit->infos = []; $infos = []; $user_credit_items = []; - $UserCreditItems = UserCreditItem::where('user_id', $this->model->id)->wherePaid(false)->get(); - foreach($UserCreditItems as $userCreditItem){ + foreach ($UserCreditItems as $userCreditItem) { $user_credit_items[] = $userCreditItem; $infos[] = ['id' => $userCreditItem->id, 'credit' => $userCreditItem->credit]; $this->user_credit->net += $userCreditItem->credit; @@ -108,37 +159,37 @@ class CreditRepository extends BaseRepository { /* taxable_sales //user tax 1 //umsatzsteuerpflichtig / DE 2 // nicht umsatzsteuerpflichtig /DE - 3 // nicht umsatzsteuerpflichtig / Ausland + 3 // nicht umsatzsteuerpflichtig / Ausland */ - if($this->model->account){ + if ($this->model->account) { $this->user_credit->taxable = $this->model->account->taxable_sales; - if($this->model->account->country_id !== 1){ + if ($this->model->account->country_id !== 1) { $this->user_credit->taxable = 3; } - if($this->user_credit->taxable === 1){ + if ($this->user_credit->taxable === 1) { $this->user_credit->tax_rate = config('app.main_tax_rate'); $this->user_credit->total = round($this->user_credit->net * config('app.main_tax'), 2); $this->user_credit->tax = $this->user_credit->total - $this->user_credit->net; - - }else{ + } else { $this->user_credit->tax_rate = 0; $this->user_credit->total = $this->user_credit->net; $this->user_credit->tax = 0; } } $this->user_credit->infos = $infos; - return $user_credit_items; + + return $user_credit_items; } - + /* - Erstellt einen detalierten Report zur Gutschrift + Erstellt einen detalierten Report zur Gutschrift Alle Postionen werden einzeln aufgelistet //$do ?= html, pdf */ - public function create_report(UserCredit $user_credit, $do = 'html') - { - //collect all data - $collection = new \stdClass(); + public function create_report(UserCredit $user_credit, $do = 'html') + { + // collect all data + $collection = new \stdClass; $collection->calc_bot = []; $collection->commission_shop = []; $collection->commission_payline = []; @@ -147,48 +198,45 @@ class CreditRepository extends BaseRepository { $collection->commission_registration = []; $collection->commission_credit = []; - $dates = []; /* für jede Postion aus der Gutschrift nach Status */ - foreach($user_credit->user_credit_items as $user_credit_item){ + foreach ($user_credit->user_credit_items as $user_credit_item) { $date = $user_credit_item->from_month.'-'.$user_credit_item->from_year; - if(!isset($dates[$date])){ + if (! isset($dates[$date])) { $dates[$date] = ['year' => $user_credit_item->from_year, 'month' => $user_credit_item->from_month]; } /* //calc bot for the month year */ - if(!isset($collection->calc_bot[$date])){ + if (! isset($collection->calc_bot[$date])) { $TreeCalcBot = new TreeCalcBot($user_credit_item->from_month, $user_credit_item->from_year, 'admin'); $TreeCalcBot->initBusinesslUserDetail($user_credit->user); $TreeCalcBot->initStructureUser($user_credit->user->id); $collection->calc_bot[$date] = $TreeCalcBot; } - + /* status === 1 commission_shop - Auswertung der Shopbestellungen vom User für einen Monat / Jahr - Auslistung der Positonen / Gesamter Umsatz / Marge / Provision + Auswertung der Shopbestellungen vom User für einen Monat / Jahr + Auslistung der Positonen / Gesamter Umsatz / Marge / Provision */ - if($user_credit_item->status === 1){ + if ($user_credit_item->status === 1) { $user_sales_volumes = UserSalesVolume::where('user_id', $user_credit_item->user_id) - ->where('month', $user_credit_item->from_month) - ->where('year', $user_credit_item->from_year) - ->where('status', 2) //'shoporder', //hinzugefügt aus - ->orderBy('id', 'ASC')->get(); - + ->where('month', $user_credit_item->from_month) + ->where('year', $user_credit_item->from_year) + ->where('status', 2) // 'shoporder', //hinzugefügt aus + ->orderBy('id', 'ASC')->get(); + $user_sales_volumes_total = UserSalesVolume::where('user_id', $user_credit_item->user_id) - ->where('month', $user_credit_item->from_month) - ->where('year', $user_credit_item->from_year) - ->where('status', 2) //'shoporder', //hinzugefügt aus - ->orderBy('id', 'DESC')->first(); + ->where('month', $user_credit_item->from_month) + ->where('year', $user_credit_item->from_year) + ->where('status', 2) // 'shoporder', //hinzugefügt aus + ->orderBy('id', 'DESC')->first(); - - - $obj = new \stdClass(); + $obj = new \stdClass; $obj->user_sales_volumes = $user_sales_volumes; $obj->user_sales_volumes_total = $user_sales_volumes_total; $obj->user_credit_item = $user_credit_item; @@ -200,165 +248,155 @@ class CreditRepository extends BaseRepository { Listen der hinzufegügten Gutschriften vom User für einen Monat / Jahr */ $user_sales_volumes_credit = UserSalesVolume::where('user_id', $user_credit_item->user_id) - ->where('month', $user_credit_item->from_month) - ->where('year', $user_credit_item->from_year) - ->where('status', 4) //'credit', //hinzugefügt aus - ->where('status_turnover', 2) //VE shop - ->orderBy('id', 'ASC')->get(); + ->where('month', $user_credit_item->from_month) + ->where('year', $user_credit_item->from_year) + ->where('status', 4) // 'credit', //hinzugefügt aus + ->where('status_turnover', 2) // VE shop + ->orderBy('id', 'ASC')->get(); $collection->commission_credit[$date] = $user_sales_volumes_credit; - } - - + } /* status === 2 commission_payline - Auswertung der Payline nach der Struktur vom User für einen Monat / Jahr - Auslistung aller Berater mit Gesamter Umsatz / Provision / rang - */ - - /* - status === 5 commission_growth_bonus - Auswertung der Payline nach der Struktur vom User für einen Monat / Jahr - Auslistung aller Berater mit Gesamter Umsatz / Provision / rang + Auswertung der Payline nach der Struktur vom User für einen Monat / Jahr + Auslistung aller Berater mit Gesamter Umsatz / Provision / rang */ - + /* + status === 5 commission_growth_bonus + Auswertung der Payline nach der Struktur vom User für einen Monat / Jahr + Auslistung aller Berater mit Gesamter Umsatz / Provision / rang + */ } /* nicht enhalten in der Gutschrift für alle Monate / Jahr die in der Gutschrift enthalten sind */ - foreach($dates as $date => $dateObj){ - /* + foreach ($dates as $date => $dateObj) { + /* UserSalesVolume::status - 1 => 'advisor_order', own_order //hinzugefügt aus + 1 => 'advisor_order', own_order //hinzugefügt aus Listen der Beraterbestellungen vom User für einen Monat / Jahr */ - $user_sales_volumes = UserSalesVolume::where('user_id', $user_credit_item->user_id) - ->where('month', $dateObj['month']) - ->where('year', $dateObj['year']) - ->where('status', 1) //'own_order', //hinzugefügt aus - ->orderBy('id', 'ASC')->get(); - - $credit_total_net = UserSalesVolume::where('user_id', $user_credit_item->user_id) - ->where('month', $dateObj['month']) - ->where('year', $dateObj['year']) - ->where('status', 1) //'own_order', //hinzugefügt aus - ->sum('total_net'); //sum('total_net'); - - $credit_total_points = UserSalesVolume::where('user_id', $user_credit_item->user_id) - ->where('month', $dateObj['month']) - ->where('year', $dateObj['year']) - ->where('status', 1) //'own_order', //hinzugefügt aus - ->sum('points'); //sum('points'); + $user_sales_volumes = UserSalesVolume::where('user_id', $user_credit_item->user_id) + ->where('month', $dateObj['month']) + ->where('year', $dateObj['year']) + ->where('status', 1) // 'own_order', //hinzugefügt aus + ->orderBy('id', 'ASC')->get(); - if($user_sales_volumes->count() > 0){ - $obj = new \stdClass(); - $obj->user_sales_volumes = $user_sales_volumes; - $obj->credit_total_net = $credit_total_net; - $obj->credit_total_points = $credit_total_points; - $collection->own_order[$date] = $obj; - } - /* + $credit_total_net = UserSalesVolume::where('user_id', $user_credit_item->user_id) + ->where('month', $dateObj['month']) + ->where('year', $dateObj['year']) + ->where('status', 1) // 'own_order', //hinzugefügt aus + ->sum('total_net'); // sum('total_net'); + + $credit_total_points = UserSalesVolume::where('user_id', $user_credit_item->user_id) + ->where('month', $dateObj['month']) + ->where('year', $dateObj['year']) + ->where('status', 1) // 'own_order', //hinzugefügt aus + ->sum('points'); // sum('points'); + + if ($user_sales_volumes->count() > 0) { + $obj = new \stdClass; + $obj->user_sales_volumes = $user_sales_volumes; + $obj->credit_total_net = $credit_total_net; + $obj->credit_total_points = $credit_total_points; + $collection->own_order[$date] = $obj; + } + /* UserSalesVolume::status - 5 => 'registration', //hinzugefügt aus + 5 => 'registration', //hinzugefügt aus Listen der Gutschriften aus Reg vom User für einen Monat / Jahr Enthält nur Punkte wird separat aufgeführt turnover = immer E / 1 verrechnung mit Eigenem Umsatz */ - $user_sales_volumes = UserSalesVolume::where('user_id', $user_credit_item->user_id) + $user_sales_volumes = UserSalesVolume::where('user_id', $user_credit_item->user_id) ->where('month', $dateObj['month']) ->where('year', $dateObj['year']) - ->where('status', 5) //'registration', //hinzugefügt aus + ->where('status', 5) // 'registration', //hinzugefügt aus ->orderBy('id', 'ASC')->get(); - $credit_total_net = UserSalesVolume::where('user_id', $user_credit_item->user_id) - ->where('month', $dateObj['month']) - ->where('year', $dateObj['year']) - ->where('status', 5) //'registration', //hinzugefügt aus - ->sum('total_net'); //sum('total_net'); + $credit_total_net = UserSalesVolume::where('user_id', $user_credit_item->user_id) + ->where('month', $dateObj['month']) + ->where('year', $dateObj['year']) + ->where('status', 5) // 'registration', //hinzugefügt aus + ->sum('total_net'); // sum('total_net'); - $credit_total_points = UserSalesVolume::where('user_id', $user_credit_item->user_id) - ->where('month', $dateObj['month']) - ->where('year', $dateObj['year']) - ->where('status', 5) //'registration', //hinzugefügt aus - ->sum('points'); //sum('points'); + $credit_total_points = UserSalesVolume::where('user_id', $user_credit_item->user_id) + ->where('month', $dateObj['month']) + ->where('year', $dateObj['year']) + ->where('status', 5) // 'registration', //hinzugefügt aus + ->sum('points'); // sum('points'); - if($user_sales_volumes->count() > 0){ - $obj = new \stdClass(); - $obj->user_sales_volumes = $user_sales_volumes; - $obj->credit_total_net = $credit_total_net; - $obj->credit_total_points = $credit_total_points; - $collection->commission_registration[$date] = $obj; - } - + if ($user_sales_volumes->count() > 0) { + $obj = new \stdClass; + $obj->user_sales_volumes = $user_sales_volumes; + $obj->credit_total_net = $credit_total_net; + $obj->credit_total_points = $credit_total_points; + $collection->commission_registration[$date] = $obj; } - + } + /* + //need this? + $user_credit_item->status = 3; //credit_added + $user_credit_item->status = 4; //commission + */ - /* - //need this? - $user_credit_item->status = 3; //credit_added - $user_credit_item->status = 4; //commission - */ - $data = [ 'dates' => $dates, 'user_credit' => $user_credit, 'collection' => $collection, ]; - if($do === 'html'){ + if ($do === 'html') { return view('admin.payment.credit_detail', $data); } - if($do === 'pdf'){ - + if ($do === 'pdf') { $dir = Credit::getCreditDetailStorageDir($user_credit->date); - if(!Storage::disk('public')->exists( $dir )){ - Storage::disk('public')->makeDirectory($dir); //creates directory + if (! Storage::disk('public')->exists($dir)) { + Storage::disk('public')->makeDirectory($dir); // creates directory } $path = Storage::disk('public')->path(''); $filename = Credit::makeCreditDetailFilename($user_credit->full_number); $pdf = new CreditDetailsPDF('pdf.credit_details'); - //return $pdf->create($data, 'credit_details.pdf', 'stream'); + // return $pdf->create($data, 'credit_details.pdf', 'stream'); $pdf->create($data, $filename, 'save', $path.$dir); - /*$pdf = PDF::loadView('pdf.credit', $data); $pdf->setPaper('A4', 'portrait'); $pdf->save($path.$dir.$filename);*/ - - $pdfMerger = new MyPDFMerger(); + + $pdfMerger = new MyPDFMerger; $pdfMerger->addPDF($path.$dir.$filename); $file = $pdfMerger->myMerge('string', $filename, 'template_report_de'); Storage::disk('public')->put($dir.$filename, $file); $path = $dir.$filename; - //$file = Storage::disk('public')->get($path); + // $file = Storage::disk('public')->get($path); $mime = Storage::disk('public')->mimeType($path); return Response::make($file, 200) - ->header("Content-Type", $mime) - ->header('Content-disposition','inline; filename="'.$filename.'"'); + ->header('Content-Type', $mime) + ->header('Content-disposition', 'inline; filename="'.$filename.'"'); - - //return $dir.$filename; - /* + // return $dir.$filename; + /* $dir = Credit::getCreditStorageDir($credit_date); if(!Storage::disk('public')->exists( $dir )){ Storage::disk('public')->makeDirectory($dir); //creates directory } $path = Storage::disk('public')->path(''); - + $filename = Credit::makeCreditFilename($credit_number); - + $pdf->save($path.$dir.$filename); - + $pdfMerger = new MyPDFMerger(); $pdfMerger->addPDF($path.$dir.$filename); $file = $pdfMerger->myMerge('string', $filename, 'template_invoice_de'); @@ -366,4 +404,4 @@ class CreditRepository extends BaseRepository { */ } } -} \ No newline at end of file +} diff --git a/app/Repositories/DC/TagRepository.php b/app/Repositories/DC/TagRepository.php index 89d6389..1e3540f 100644 --- a/app/Repositories/DC/TagRepository.php +++ b/app/Repositories/DC/TagRepository.php @@ -2,140 +2,153 @@ namespace App\Repositories\DC; -use Request; -use App\Models\DcTag; use App\Models\DcCategory; +use App\Models\DcTag; use App\Repositories\BaseRepository; +use Request; - -class TagRepository extends BaseRepository { - - - public function __construct() - { - } +class TagRepository extends BaseRepository +{ + public function __construct() {} public function storeItem($obj, $data) { - if($obj === 'category' && isset($data['dc_category_name'])){ + if ($obj === 'category' && isset($data['dc_category_name'])) { $category = new DcCategory; $category->name = $data['dc_category_name']; - $category->pos = 0 ; + $category->pos = 0; $category->save(); \Session()->flash('alert-success', 'Kategorie erstellt'); + return redirect(route('admin_downloadcenter_tags')); } - if($obj === 'tag' && isset($data['dc_tag_name'])){ + if ($obj === 'tag' && isset($data['dc_tag_name'])) { $data = Request::all(); $tag = new DcTag; $tag->name = $data['dc_tag_name']; $tag->pos = 0; $tag->save(); \Session()->flash('alert-success', 'Tag erstellt'); + return redirect(route('admin_downloadcenter_tags')); } - if($obj === 'structure' && isset($data['nestable'])){ + if ($obj === 'structure' && isset($data['nestable'])) { $bool = $this->updateStructure($data); - if(Request::ajax()){ + if (Request::ajax()) { return response()->json([ - 'success' => $bool, - 'redirect' => route('admin_downloadcenter_tags', ['flash' => true]) - ]); + 'success' => $bool, + 'redirect' => route('admin_downloadcenter_tags', ['flash' => true]), + ]); } } - if($obj === 'update_ajax' && isset($data['action'])){ - + if ($obj === 'update_ajax' && isset($data['action'])) { + $active = $this->updateAjax($data); - if(Request::ajax()){ + if (Request::ajax()) { return response()->json([ - 'success' => $data['action'], - 'active' => $active, - ]); + 'success' => $data['action'], + 'active' => $active, + ]); } } + return true; - } + } - protected function updateAjax($data){ + protected function updateAjax($data) + { - if($data['action'] == 'update-tag-active' && isset($data['id'])){ + if ($data['action'] == 'update-tag-active' && isset($data['id'])) { $tag = DcTag::findOrFail($data['id']); $tag->active = $tag->active ? 0 : 1; $tag->save(); - return $tag->active; - } - if($data['action'] == 'update-category-active' && isset($data['id'])){ + return $tag->active; + } + if ($data['action'] == 'update-category-active' && isset($data['id'])) { $category = DcCategory::findOrFail($data['id']); $category->active = $category->active ? 0 : 1; $category->save(); + return $category->active; } + return false; } protected function updateStructure($data) { - if(empty($data['nestable']) || !is_array($data['nestable'])){ + if (empty($data['nestable']) || ! is_array($data['nestable'])) { return false; } $tags = DcTag::all(); foreach ($tags as $value) { $value->category_id = null; - $value->pos = NULL; + $value->pos = null; $value->save(); } $this->saveStructureLevel($data['nestable']); + return true; } - protected function saveStructureLevel($nestable, $deep = 0, $category_id = false){ + protected function saveStructureLevel($nestable, $deep = 0, $category_id = false) + { foreach ($nestable as $key => $value) { - if($value['id'] == 0){ + if ($value['id'] == 0) { continue; } - if($deep == 0){ - $cat = DcCategory::findOrFail($value['id']); - $cat->pos = $key; - $cat->save(); + if ($deep == 0) { + $cat = DcCategory::find($value['id']); + if (! $cat) { + // Kategorie existiert nicht mehr, überspringen + continue; + } + $cat->pos = $key; + $cat->save(); } - if($deep == 1){ - $tag = DcTag::findOrFail($value['id']); + if ($deep == 1) { + $tag = DcTag::find($value['id']); + if (! $tag) { + // Tag existiert nicht mehr, überspringen + continue; + } $tag->category_id = $category_id; $tag->pos = $key; $tag->save(); - } - if(!empty($value['children'])){ - $this->saveStructureLevel($value['children'], $deep+1, $value['id']); + if (! empty($value['children'])) { + $this->saveStructureLevel($value['children'], $deep + 1, $value['id']); } } } - public function deleteItem($obj, $id){ - if($obj == 'category'){ + public function deleteItem($obj, $id) + { + if ($obj == 'category') { $this->deleteCategory($id); } - if($obj == 'tag'){ - $this->deleteTag($id); + if ($obj == 'tag') { + $this->deleteTag($id); } } - public function deleteCategory($id){ + public function deleteCategory($id) + { $cat = DcCategory::findOrFail($id); $tags = DcTag::where('category_id', $cat->id)->get(); foreach ($tags as $tag) { - $this->deleteTag($tag->id); + $this->deleteTag($tag->id); } $cat->delete(); - } + } - public function deleteTag($id){ + public function deleteTag($id) + { $tag = DcTag::findOrFail($id); $tag->delete(); - } - -} \ No newline at end of file + } +} diff --git a/app/Repositories/InvoiceRepository.php b/app/Repositories/InvoiceRepository.php index 612c922..5fe2a0a 100644 --- a/app/Repositories/InvoiceRepository.php +++ b/app/Repositories/InvoiceRepository.php @@ -2,31 +2,34 @@ namespace App\Repositories; -use PDF; -use Storage; -use App\Services\Invoice; -use App\Models\UserInvoice; use App\Libraries\InvoicePDF; -use App\Models\ShoppingOrder; use App\Libraries\MyPDFMerger; -use App\Services\UserService; +use App\Models\ShoppingOrder; +use App\Models\UserInvoice; use App\Models\UserSalesVolume; use App\Services\BusinessPlan\SalesPointsVolume; +use App\Services\Invoice; +use App\Services\UserService; +use Storage; -class InvoiceRepository extends BaseRepository { - +class InvoiceRepository extends BaseRepository +{ /** @var \App\Models\ShoppingOrder */ protected $model; private $invoice_date; + private $invoice_number; + private $filename; + private $dir; + private $user_sales_volume; private $delivery_dir; - private $delivery_filename; + private $delivery_filename; public function __construct(ShoppingOrder $model) { @@ -35,54 +38,60 @@ class InvoiceRepository extends BaseRepository { public function create($request = []) { - //need invoice $data - $number = Invoice::getInvoiceNumber(); - if($payt = $this->model->getLastShoppingPaymentTransaction()){ - $invoice_date = $payt->created_at->format("d.m.Y"); - } - $this->invoice_date = isset($request['invoice_date']) ? $request['invoice_date'] : $invoice_date; - $invoice_send_mail = isset($request['invoice_send_mail']) ? false : true; - $this->invoice_number = Invoice::createInvoiceNumber($number, $this->invoice_date); - $this->dir = Invoice::getInvoiceStorageDir($this->invoice_date); - $this->filename = Invoice::makeInvoiceFilename($this->invoice_number); - $this->delivery_dir = Invoice::getDeliveryStorageDir($this->invoice_date); - $this->delivery_filename = Invoice::makeDeliveryFilename($this->invoice_number); + // Wrap entire invoice creation in transaction to ensure atomicity + return \DB::transaction(function () use ($request) { + // Get and increment invoice number atomically (includes its own lock) + $number = Invoice::makeNextInvoiceNumber(); - $this->makePDF(); - - $user_invoice = UserInvoice::create([ - 'shopping_order_id' => $this->model->id, - 'year' => \Carbon::parse($this->invoice_date)->format('Y'), - 'month' => \Carbon::parse($this->invoice_date)->format('m'), - 'date' => $this->invoice_date, - 'full_number' => $this->invoice_number, - 'number' => $number, - 'filename' => $this->filename, - 'dir' => $this->dir, - 'delivery_filename' => $this->delivery_filename, - 'delivery_dir' => $this->delivery_dir, - 'disk' => 'public', - 'status' => $this->model->getStatusByOrder() - ]); - Invoice::makeNextInvoiceNumber(); - if($invoice_send_mail){ - Invoice::sendInvoiceMail($this->model, $user_invoice); - } - return $user_invoice; - } - - public function update($request = []){ - if($user_invoice = $this->model->user_invoice){ - $number = $user_invoice->number; - $this->invoice_date = isset($request['invoice_date']) ? $request['invoice_date'] : $user_invoice->date; - $invoice_send_mail = isset($request['invoice_send_mail']) ? false: true; + if ($payt = $this->model->getLastShoppingPaymentTransaction()) { + $invoice_date = $payt->created_at->format('d.m.Y'); + } + $this->invoice_date = isset($request['invoice_date']) ? $request['invoice_date'] : $invoice_date; + $invoice_send_mail = isset($request['invoice_send_mail']) && $request['invoice_send_mail'] ? true : false; $this->invoice_number = Invoice::createInvoiceNumber($number, $this->invoice_date); $this->dir = Invoice::getInvoiceStorageDir($this->invoice_date); $this->filename = Invoice::makeInvoiceFilename($this->invoice_number); $this->delivery_dir = Invoice::getDeliveryStorageDir($this->invoice_date); $this->delivery_filename = Invoice::makeDeliveryFilename($this->invoice_number); - $this->user_sales_volume = UserSalesVolume::where('user_invoice_id', $this->model->user_invoice->id)->first(); + $this->makePDF(); + + $user_invoice = UserInvoice::create([ + 'shopping_order_id' => $this->model->id, + 'year' => \Carbon::parse($this->invoice_date)->format('Y'), + 'month' => \Carbon::parse($this->invoice_date)->format('m'), + 'date' => $this->invoice_date, + 'full_number' => $this->invoice_number, + 'number' => $number, + 'filename' => $this->filename, + 'dir' => $this->dir, + 'delivery_filename' => $this->delivery_filename, + 'delivery_dir' => $this->delivery_dir, + 'disk' => 'public', + 'status' => $this->model->getStatusByOrder(), + ]); + + if ($invoice_send_mail) { + Invoice::sendInvoiceMail($this->model, $user_invoice); + } + + return $user_invoice; + }); + } + + public function update($request = []) + { + if ($user_invoice = $this->model->user_invoice) { + $number = $user_invoice->number; + $this->invoice_date = isset($request['invoice_date']) ? $request['invoice_date'] : $user_invoice->date; + $invoice_send_mail = isset($request['invoice_send_mail']) ? false : true; + $this->invoice_number = Invoice::createInvoiceNumber($number, $this->invoice_date); + $this->dir = Invoice::getInvoiceStorageDir($this->invoice_date); + $this->filename = Invoice::makeInvoiceFilename($this->invoice_number); + $this->delivery_dir = Invoice::getDeliveryStorageDir($this->invoice_date); + $this->delivery_filename = Invoice::makeDeliveryFilename($this->invoice_number); + + $this->user_sales_volume = UserSalesVolume::where('user_invoice_id', $this->model->user_invoice->id)->first(); $this->makePDF(); $user_invoice->fill([ @@ -99,16 +108,23 @@ class InvoiceRepository extends BaseRepository { 'disk' => 'public', ])->save(); - if($invoice_send_mail){ + if ($invoice_send_mail) { Invoice::sendInvoiceMail($this->model, $user_invoice); - } - return $user_invoice; + } + + return $user_invoice; } + return null; } - private function makePDF(){ - + /** + * Erstellt die PDFs für Rechnung und Lieferschein. + * Das deutsche Original wird immer erstellt (Finanzamt-Anforderung). + * Bei anderer Kundensprache wird zusätzlich eine Kopie in der Kundensprache erstellt. + */ + private function makePDF() + { $data = [ 'shopping_order' => $this->model, 'invoice_date' => $this->invoice_date, @@ -116,43 +132,89 @@ class InvoiceRepository extends BaseRepository { 'user_sales_volume' => $this->user_sales_volume, ]; - if($this->model->auth_user_id){ + if ($this->model->auth_user_id) { UserService::checkUserTaxShippingCountry($this->model->auth_user, $this->model->country_id); $data = array_merge($data, UserService::getYardInfo()); - } - - if(!Storage::disk('public')->exists( $this->dir )){ - Storage::disk('public')->makeDirectory($this->dir); //creates directory - } - if(!Storage::disk('public')->exists( $this->delivery_dir )){ - Storage::disk('public')->makeDirectory($this->delivery_dir); //creates directory } + if (! Storage::disk('public')->exists($this->dir)) { + Storage::disk('public')->makeDirectory($this->dir); + } + if (! Storage::disk('public')->exists($this->delivery_dir)) { + Storage::disk('public')->makeDirectory($this->delivery_dir); + } + + // Kundensprache ermitteln + $customerLocale = $this->model->shopping_user ? $this->model->shopping_user->getLocale() : 'de'; + $originalLocale = \App::getLocale(); + + // 1. IMMER deutsches Original erstellen (Finanzamt-Anforderung) + \App::setLocale('de'); + $this->createPDFFiles($data, 'de'); + + // 2. Wenn Kundensprache != DE, Kopie in Kundensprache erstellen + if ($customerLocale && $customerLocale !== 'de') { + \App::setLocale($customerLocale); + $this->createPDFFiles($data, $customerLocale); + } + + // Locale zurücksetzen + \App::setLocale($originalLocale); + } + + /** + * Erstellt die PDF-Dateien für eine bestimmte Sprache. + */ + private function createPDFFiles(array $data, string $locale) + { $path = Storage::disk('public')->path(''); - //invoice + // Dateinamen für diese Sprache + $invoiceFilename = Invoice::makeInvoiceFilenameLocale($this->invoice_number, $locale); + $deliveryFilename = Invoice::makeDeliveryFilenameLocale($this->invoice_number, $locale); + + // Kopie-Flag: true wenn nicht Deutsch (das Original) + $data['is_copy'] = ($locale !== 'de'); + + // Template basierend auf Locale + $template = $this->getTemplateForLocale($locale); + + // Rechnung erstellen $pdf_file = new InvoicePDF('pdf.invoice'); - $pdf_file->create($data, $this->filename, 'save', $path.$this->dir); - $pdfMerger = new MyPDFMerger(); - $pdfMerger->addPDF($path.$this->dir.$this->filename); - $file = $pdfMerger->myMerge('string', $this->filename, 'template_invoice_de'); - Storage::disk('public')->put($this->dir.$this->filename, $file); - if(!$this->model->shopping_collect_order){ + $pdf_file->create($data, $invoiceFilename, 'save', $path.$this->dir); + $pdfMerger = new MyPDFMerger; + $pdfMerger->addPDF($path.$this->dir.$invoiceFilename); + $file = $pdfMerger->myMerge('string', $invoiceFilename, $template); + Storage::disk('public')->put($this->dir.$invoiceFilename, $file); + + // Lieferschein erstellen (außer bei Sammelbestellung) + if (! $this->model->shopping_collect_order) { $pdf_file = new InvoicePDF('pdf.delivery'); - $pdf_file->create($data, $this->delivery_filename, 'save', $path.$this->delivery_dir); - $pdfMerger = new MyPDFMerger(); - $pdfMerger->addPDF($path.$this->delivery_dir.$this->delivery_filename); - $file = $pdfMerger->myMerge('string', $this->delivery_filename, 'template_invoice_de'); - Storage::disk('public')->put($this->delivery_dir.$this->delivery_filename, $file); + $pdf_file->create($data, $deliveryFilename, 'save', $path.$this->delivery_dir); + $pdfMerger = new MyPDFMerger; + $pdfMerger->addPDF($path.$this->delivery_dir.$deliveryFilename); + $file = $pdfMerger->myMerge('string', $deliveryFilename, $template); + Storage::disk('public')->put($this->delivery_dir.$deliveryFilename, $file); } } - public function userSalesVolume() + /** + * Gibt das PDF-Template für die angegebene Locale zurück. + * Verfügbare Templates werden aus config/localization.php geladen. + */ + private function getTemplateForLocale(string $locale): string { + $availableTemplates = config('localization.availableTemplates', ['de']); - + if (in_array($locale, $availableTemplates)) { + return 'template_invoice_'.$locale; + } + + return 'template_invoice_de'; } + public function userSalesVolume() {} + public function createAndSalesVolume($request = []) { $this->user_sales_volume = SalesPointsVolume::addSalesPointsVolumeUser($this->model); @@ -160,4 +222,225 @@ class InvoiceRepository extends BaseRepository { $this->user_sales_volume->user_invoice_id = $user_invoice->id; $this->user_sales_volume->save(); } -} \ No newline at end of file + + /** + * Erstellt eine Stornorechnung mit Punktekorrektur + * + * @param array $request + * @return UserInvoice + */ + public function createCancellation($request = []) + { + return \DB::transaction(function () use ($request) { + $original_invoice = $this->model->user_invoice; + + if (! $original_invoice) { + throw new \Exception('Keine Originalrechnung gefunden.'); + } + + // Nächste Rechnungsnummer für Storno holen + $number = Invoice::makeNextInvoiceNumber(); + + // Stornodatum + $cancellation_date = isset($request['cancellation_date']) + ? $request['cancellation_date'] + : now()->format('d.m.Y'); + + $cancellation_send_mail = isset($request['cancellation_send_mail']) && $request['cancellation_send_mail'] ? true : false; + + // Rechnungsnummer erstellen + $cancellation_number = Invoice::createInvoiceNumber($number, $cancellation_date); + $cancellation_dir = Invoice::getInvoiceStorageDir($cancellation_date); + $cancellation_filename = Invoice::makeCancellationFilename($cancellation_number); + $cancellation_delivery_dir = Invoice::getDeliveryStorageDir($cancellation_date); + $cancellation_delivery_filename = Invoice::makeCancellationDeliveryFilename($cancellation_number); + + // Stornorechnung PDF erstellen + $this->makeCancellationPDF( + $cancellation_date, + $cancellation_number, + $cancellation_dir, + $cancellation_filename, + $cancellation_delivery_dir, + $cancellation_delivery_filename, + $original_invoice + ); + + // Stornorechnung in DB speichern + $cancellation_invoice = UserInvoice::create([ + 'shopping_order_id' => $this->model->id, + 'year' => \Carbon::parse($cancellation_date)->format('Y'), + 'month' => \Carbon::parse($cancellation_date)->format('m'), + 'date' => $cancellation_date, + 'full_number' => $cancellation_number, + 'number' => $number, + 'filename' => $cancellation_filename, + 'dir' => $cancellation_dir, + 'delivery_filename' => $cancellation_delivery_filename, + 'delivery_dir' => $cancellation_delivery_dir, + 'disk' => 'public', + 'cancellation' => true, + 'status' => $original_invoice->status === 1 ? 11 : 12, // 11 = storniert B., 12 = storniert Shop + ]); + + // Original-Rechnung als storniert markieren + $original_invoice->cancellation = true; + $original_invoice->cancellation_id = $cancellation_invoice->id; + $original_invoice->cancellation_date = $cancellation_date; + $original_invoice->save(); + + // Bestellstatus auf "storniert" setzen + $this->model->txaction = 'cancelled'; + // Versandstatus auf "storniert" (10) setzen, wenn noch nicht versendet + if (in_array($this->model->shipped, [0, 1])) { + $this->model->shipped = 10; + } + $this->model->save(); + + \Log::info('Bestellstatus aktualisiert nach Storno', [ + 'order_id' => $this->model->id, + 'txaction' => $this->model->txaction, + 'shipped' => $this->model->shipped, + ]); + + // Punktekorrektur durchführen (nach Erstellung der Stornorechnung) + $this->correctPointsForCancellation($original_invoice, $cancellation_invoice); + + // Optional: E-Mail versenden + if ($cancellation_send_mail) { + Invoice::sendInvoiceMail($this->model, $cancellation_invoice); + } + + return $cancellation_invoice; + }); + } + + /** + * Erstellt die Storno-PDFs (Rechnung und Lieferschein) + */ + private function makeCancellationPDF( + $cancellation_date, + $cancellation_number, + $cancellation_dir, + $cancellation_filename, + $cancellation_delivery_dir, + $cancellation_delivery_filename, + $original_invoice + ) { + $data = [ + 'shopping_order' => $this->model, + 'invoice_date' => $cancellation_date, + 'invoice_number' => $cancellation_number, + 'original_invoice' => $original_invoice, + 'is_cancellation' => true, + ]; + + if ($this->model->auth_user_id) { + UserService::checkUserTaxShippingCountry($this->model->auth_user, $this->model->country_id); + $data = array_merge($data, UserService::getYardInfo()); + } + + // Verzeichnisse erstellen + if (! Storage::disk('public')->exists($cancellation_dir)) { + Storage::disk('public')->makeDirectory($cancellation_dir); + } + if (! Storage::disk('public')->exists($cancellation_delivery_dir)) { + Storage::disk('public')->makeDirectory($cancellation_delivery_dir); + } + + // Kundensprache ermitteln + $customerLocale = $this->model->shopping_user ? $this->model->shopping_user->getLocale() : 'de'; + $originalLocale = \App::getLocale(); + + // Deutsches Original (Finanzamt-Anforderung) + \App::setLocale('de'); + $this->createCancellationPDFFiles( + $data, + 'de', + $cancellation_number, + $cancellation_dir, + $cancellation_filename, + $cancellation_delivery_dir, + $cancellation_delivery_filename + ); + + // Lokalisierte Version wenn gewünscht + if ($customerLocale && $customerLocale !== 'de') { + \App::setLocale($customerLocale); + $data['is_copy'] = true; + $localizedFilename = str_replace('.pdf', '-'.$customerLocale.'.pdf', $cancellation_filename); + $localizedDeliveryFilename = str_replace('.pdf', '-'.$customerLocale.'.pdf', $cancellation_delivery_filename); + + $this->createCancellationPDFFiles( + $data, + $customerLocale, + $cancellation_number, + $cancellation_dir, + $localizedFilename, + $cancellation_delivery_dir, + $localizedDeliveryFilename + ); + } + + \App::setLocale($originalLocale); + } + + /** + * Erstellt die PDF-Dateien für eine Stornorechnung in einer bestimmten Sprache + */ + private function createCancellationPDFFiles( + array $data, + string $locale, + string $cancellation_number, + string $cancellation_dir, + string $cancellation_filename, + string $cancellation_delivery_dir, + string $cancellation_delivery_filename + ) { + $path = Storage::disk('public')->path(''); + $template = $this->getTemplateForLocale($locale); + + // Stornorechnung erstellen + $pdf_file = new InvoicePDF('pdf.cancellation'); + $pdf_file->create($data, $cancellation_filename, 'save', $path.$cancellation_dir); + $pdfMerger = new MyPDFMerger; + $pdfMerger->addPDF($path.$cancellation_dir.$cancellation_filename); + $file = $pdfMerger->myMerge('string', $cancellation_filename, $template); + Storage::disk('public')->put($cancellation_dir.$cancellation_filename, $file); + + // Storno-Lieferschein erstellen (außer bei Sammelbestellung) + if (! $this->model->shopping_collect_order) { + $pdf_file = new InvoicePDF('pdf.cancellation_delivery'); + $pdf_file->create($data, $cancellation_delivery_filename, 'save', $path.$cancellation_delivery_dir); + $pdfMerger = new MyPDFMerger; + $pdfMerger->addPDF($path.$cancellation_delivery_dir.$cancellation_delivery_filename); + $file = $pdfMerger->myMerge('string', $cancellation_delivery_filename, $template); + Storage::disk('public')->put($cancellation_delivery_dir.$cancellation_delivery_filename, $file); + } + } + + /** + * Korrigiert die Punkte nach Stornierung einer Rechnung + * Nutzt den SalesPointsVolume Service für konsistente Berechnung + * + * @param UserInvoice $original_invoice Die ursprüngliche Rechnung + * @param UserInvoice $cancellation_invoice Die Stornorechnung + */ + private function correctPointsForCancellation($original_invoice, $cancellation_invoice) + { + // Original UserSalesVolume finden + $original_sales_volume = UserSalesVolume::where('user_invoice_id', $original_invoice->id)->first(); + + if (! $original_sales_volume) { + \Log::warning('Keine UserSalesVolume gefunden für Rechnung', [ + 'invoice_id' => $original_invoice->id, + 'order_id' => $this->model->id, + ]); + + return; + } + + // Service-Methode verwenden für konsistente Punktekorrektur + SalesPointsVolume::cancelSalesPointsVolume($original_sales_volume, $cancellation_invoice->id); + } +} diff --git a/app/Repositories/ProductRepository.php b/app/Repositories/ProductRepository.php index d75f72d..07fdf68 100644 --- a/app/Repositories/ProductRepository.php +++ b/app/Repositories/ProductRepository.php @@ -27,6 +27,8 @@ class ProductRepository extends BaseRepository $data['shipping_addon'] = isset($data['shipping_addon']) ? 1 : 0; $data['no_commission'] = isset($data['no_commission']) ? 1 : 0; $data['no_free_shipping'] = isset($data['no_free_shipping']) ? 1 : 0; + $data['free_shipping_consultant'] = isset($data['free_shipping_consultant']) ? 1 : 0; + $data['is_membership_only'] = isset($data['is_membership_only']) ? 1 : 0; $data['buying_restriction'] = isset($data['buying_restriction']) ? 1 : 0; $data['sponsor_buying_points'] = isset($data['sponsor_buying_points']) ? 1 : 0; $data['show_on'] = isset($data['show_on']) ? $data['show_on'] : null; @@ -217,7 +219,7 @@ class ProductRepository extends BaseRepository public function copy($model) { $this->model = $model->replicate(); - $this->model->name = 'Kopie: ' . $this->model->name; + $this->model->name = 'Kopie: '.$this->model->name; $this->model->wp_number = null; $this->model->save(); @@ -240,12 +242,12 @@ class ProductRepository extends BaseRepository // images foreach ($model->images as $image) { $name = \App\Services\Slim::sanitizeFileName($image->original_name); - $name = uniqid() . '_' . $name; + $name = uniqid().'_'.$name; // copy $data = \Storage::disk('public')->copy( - 'images/product/' . $image->product_id . '/' . $image->filename, - 'images/product/' . $this->model->id . '/' . $name + 'images/product/'.$image->product_id.'/'.$image->filename, + 'images/product/'.$this->model->id.'/'.$name ); ProductImage::create([ diff --git a/app/Services/AboHelper.php b/app/Services/AboHelper.php index aaa6b81..b5c98d6 100644 --- a/app/Services/AboHelper.php +++ b/app/Services/AboHelper.php @@ -3,25 +3,22 @@ namespace App\Services; use App\Models\Product; -use Yard; -use App\User; -use Carbon\Carbon; -use App\Models\UserAbo; -use App\Models\UserAboItem; -use App\Models\UserAboOrder; use App\Models\ShoppingOrder; use App\Models\ShoppingPayment; use App\Models\ShoppingUser; +use App\Models\UserAbo; +use App\Models\UserAboItem; +use App\Models\UserAboOrder; +use App\User; +use Carbon\Carbon; class AboHelper { - - public static $txaction_filter_text = [ 'paid' => 'paymend_paid', 'appointed' => 'paymend_open', 'failed' => 'paymend_failed', - 'extern' => 'extern_open', //offen + 'extern' => 'extern_open', // offen 'extern_paid' => 'extern_paid', 'invoice_open' => 'invoice_open', 'invoice_paid' => 'invoice_paid', @@ -29,18 +26,19 @@ class AboHelper 'NULL' => 'no_payment', ]; - public static function userHasAbo(User $user) { $user = $user ? $user : \Auth::user(); + return UserAbo::where('user_id', $user->id)->where('is_for', 'me')->where('status', '>', 1)->first() === null ? false : true; } public static function memberHasAbo(ShoppingUser $shopping_user) { - if (!$shopping_user) { + if (! $shopping_user) { return false; } + return UserAbo::where('email', $shopping_user->billing_email)->where('is_for', 'ot')->where('status', '>', 1)->first() === null ? false : true; } @@ -52,19 +50,20 @@ class AboHelper public static function setAboStatus(ShoppingOrder $shopping_order, $status, $paid = false) { $user_abo = $shopping_order->getUserAbo(); - if ($user_abo && $user_abo->status < 2) { //status < 2 is not active + if ($user_abo && $user_abo->status < 2) { // status < 2 is not active $user_abo->update(['status' => $status]); } UserAboOrder::where('user_abo_id', $user_abo->id)->where('shopping_order_id', $shopping_order->id)->update(['status' => $status, 'paid' => $paid]); } + public static function setAboActive(ShoppingOrder $shopping_order, $status, $paid = false) { self::setAboStatus($shopping_order, $status, $paid); - //delete UserAbo is not active status = 1 - //is_for = me + // delete UserAbo is not active status = 1 + // is_for = me UserAbo::where('user_id', $shopping_order->auth_user_id)->where('is_for', 'me')->where('status', 1)->delete(); - //is_for = ot + // is_for = ot UserAbo::where('member_id', $shopping_order->member_id)->where('email', $shopping_order->shopping_user->billing_email)->where('is_for', 'ot')->where('status', 1)->delete(); } @@ -80,14 +79,29 @@ class AboHelper return true; } $paidOrdersCount = $user_abo->getCountPaidOrders(); + return $paidOrdersCount >= (int) $minDuration; } + public static function isAddOnlyMode(UserAbo $user_abo, $view = 'user'): bool + { + if ($view === 'admin') { + return false; + } + + return ! self::canCancelAbo($user_abo, $view); + } + public static function canEditAbo($user_abo, $view = 'user') { - if ($view !== 'admin' && ($user_abo->user_id != \Auth::user()->id && $user_abo->member_id != \Auth::user()->id)) { + if ($view === 'portal') { + return true; + } + $user = \Auth::user(); + if ($view !== 'admin' && (! $user || ($user_abo->user_id != $user->id && $user_abo->member_id != $user->id))) { return false; } + return true; } @@ -100,8 +114,10 @@ class AboHelper } } } + return false; } + public static function getAboShowOn(Product $product) { $show_on = $product->show_on; @@ -111,16 +127,19 @@ class AboHelper if (in_array('13', $show_on)) { return 'upgrade'; } + return false; } + public static function getAboTypeBadge($abo_type) { if ($abo_type === 'base') { - return ' ' . __('abo.' . $abo_type) . ''; + return ' '.__('abo.'.$abo_type).''; } if ($abo_type === 'upgrade') { - return ' ' . __('abo.' . $abo_type) . ''; + return ' '.__('abo.'.$abo_type).''; } + return ''; } @@ -128,6 +147,7 @@ class AboHelper { $nextDate = Carbon::parse($date)->firstOfMonth(); $nextDate->addDays($abo_interval - 1); + return $nextDate->gt($date) ? $nextDate : $nextDate->addMonth(1); } @@ -135,19 +155,20 @@ class AboHelper { $nextDate = Carbon::parse($date)->firstOfMonth()->addMonth(1); $nextDate->addDays($abo_interval - 1); + return $nextDate->gt($date) ? $nextDate : $nextDate->addMonth(1); } public static function createNewAbo(ShoppingPayment $shopping_payment) { - //is Abo - create init Abo from PP or else + // is Abo - create init Abo from PP or else if ($shopping_payment->shopping_order->is_abo && $shopping_payment->shopping_order->abo_interval > 0) { $payment_transaction = $shopping_payment->payment_transactions->last(); - //next_date immer im nächsten Monat starten - //is auth_user_id = Berater bestellung - //is member_id = Kunden bestellung - //is for = me = mich oder ot = kunde + // next_date immer im nächsten Monat starten + // is auth_user_id = Berater bestellung + // is member_id = Kunden bestellung + // is for = me = mich oder ot = kunde $user_abo = UserAbo::create([ 'user_id' => $shopping_payment->shopping_order->auth_user_id, 'member_id' => $shopping_payment->shopping_order->member_id, @@ -188,15 +209,82 @@ class AboHelper 'status' => 1, ]); } - } + $user_abo->load('user_abo_items'); + AboItemHistoryService::logInitialCreation($user_abo, 'system'); + } public static function getTransStatusFilterText() { $ret = []; foreach (self::$txaction_filter_text as $key => $val) { - $ret[$key] = trans('payment.' . $val); + $ret[$key] = trans('payment.'.$val); } + return $ret; } + + /** + * Prüft effizient, ob ein User im Team eines anderen Users ist (Downline). + * Traversiert die Sponsor-Hierarchie rekursiv (m_sponsor) statt die komplette + * TreeCalcBot-Struktur aufzubauen. + * + * @param int $teamOwnerId ID des Team-Users (Berechtigter) + * @param int $userToCheckId ID des zu prüfenden Users (z.B. Abo-Besitzer) + * @param int $maxDepth Max. Tiefe (Schutz vor zirkulären Referenzen) + * @return bool True wenn userToCheckId im Team von teamOwnerId ist + */ + public static function isUserInTeam(int $teamOwnerId, int $userToCheckId, int $maxDepth = 100): bool + { + if ($teamOwnerId === $userToCheckId) { + return true; + } + + $currentId = $userToCheckId; + $depth = 0; + + while ($depth < $maxDepth) { + $currentUser = User::where('id', $currentId)->select('m_sponsor')->first(); + if (! $currentUser || ! $currentUser->m_sponsor) { + return false; + } + + if ($currentUser->m_sponsor === $teamOwnerId) { + return true; + } + + $currentId = $currentUser->m_sponsor; + $depth++; + } + + return false; + } + + /** + * Liefert alle User-IDs im Team (Downline) eines Users. + * Traversiert die Sponsor-Hierarchie rekursiv nach unten statt TreeCalcBot. + * + * @param int $teamOwnerId ID des Team-Users + * @param int $maxDepth Max. Tiefe (Schutz vor Endlosschleifen) + * @return int[] + */ + public static function getTeamUserIds(int $teamOwnerId, int $maxDepth = 50): array + { + $teamUserIds = []; + $toProcess = [$teamOwnerId]; + $depth = 0; + + while (! empty($toProcess) && $depth < $maxDepth) { + $children = User::whereIn('m_sponsor', $toProcess) + ->whereNull('deleted_at') + ->pluck('id') + ->toArray(); + + $teamUserIds = array_merge($teamUserIds, $children); + $toProcess = $children; + $depth++; + } + + return array_values(array_unique($teamUserIds)); + } } diff --git a/app/Services/AboItemHistoryService.php b/app/Services/AboItemHistoryService.php new file mode 100644 index 0000000..24d7dfe --- /dev/null +++ b/app/Services/AboItemHistoryService.php @@ -0,0 +1,361 @@ +toString(); + $actor = self::resolveActor(); + + foreach ($userAbo->user_abo_items as $item) { + $product = $item->product; + $unitPrice = self::resolveItemPrice($item); + + UserAboItemHistory::create([ + 'user_abo_id' => $userAbo->id, + 'user_abo_item_id' => $item->id, + 'product_id' => $product->id, + 'action' => UserAboItemHistory::ACTION_INITIAL, + 'product_name' => $product->getLang('name'), + 'product_number' => $product->number ?? null, + 'unit_price' => $unitPrice, + 'total_price' => $unitPrice * $item->qty, + 'qty_before' => null, + 'qty_after' => $item->qty, + 'comp' => $item->comp ?? 0, + 'changed_by_user_id' => $actor['id'], + 'changed_by_name' => $actor['name'], + 'channel' => $channel, + 'batch_id' => $batchId, + 'is_initial' => true, + ]); + } + } + + /** + * Log: Produkt hinzugefügt oder Menge erhöht (bei bereits vorhandenem Produkt). + */ + public static function logProductAdded(UserAbo $userAbo, UserAboItem $item, int $qtyBefore, string $view): void + { + $product = $item->product; + $unitPrice = self::resolveItemPrice($item); + $actor = self::resolveActor(); + $channel = self::resolveChannel($view); + + $action = $qtyBefore === 0 + ? UserAboItemHistory::ACTION_ADDED + : UserAboItemHistory::ACTION_QTY_CHANGED; + + UserAboItemHistory::create([ + 'user_abo_id' => $userAbo->id, + 'user_abo_item_id' => $item->id, + 'product_id' => $product->id, + 'action' => $action, + 'product_name' => $product->getLang('name'), + 'product_number' => $product->number ?? null, + 'unit_price' => $unitPrice, + 'total_price' => $unitPrice * $item->qty, + 'qty_before' => $qtyBefore > 0 ? $qtyBefore : null, + 'qty_after' => $item->qty, + 'comp' => $item->comp ?? 0, + 'changed_by_user_id' => $actor['id'], + 'changed_by_name' => $actor['name'], + 'channel' => $channel, + ]); + } + + /** + * Log: Menge eines Produkts geändert. + */ + public static function logQtyChanged(UserAbo $userAbo, UserAboItem $item, int $qtyBefore, int $qtyAfter, string $view): void + { + if ($qtyBefore === $qtyAfter) { + return; + } + + $product = $item->product; + $unitPrice = self::resolveItemPrice($item); + $actor = self::resolveActor(); + $channel = self::resolveChannel($view); + + UserAboItemHistory::create([ + 'user_abo_id' => $userAbo->id, + 'user_abo_item_id' => $item->id, + 'product_id' => $product->id, + 'action' => UserAboItemHistory::ACTION_QTY_CHANGED, + 'product_name' => $product->getLang('name'), + 'product_number' => $product->number ?? null, + 'unit_price' => $unitPrice, + 'total_price' => $unitPrice * $qtyAfter, + 'qty_before' => $qtyBefore, + 'qty_after' => $qtyAfter, + 'comp' => $item->comp ?? 0, + 'changed_by_user_id' => $actor['id'], + 'changed_by_name' => $actor['name'], + 'channel' => $channel, + ]); + } + + /** + * Log: Produkt entfernt (vor dem delete aufrufen!). + */ + public static function logProductRemoved(UserAbo $userAbo, UserAboItem $item, string $view): void + { + $product = $item->product; + $unitPrice = self::resolveItemPrice($item); + $actor = self::resolveActor(); + $channel = self::resolveChannel($view); + + UserAboItemHistory::create([ + 'user_abo_id' => $userAbo->id, + 'user_abo_item_id' => $item->id, + 'product_id' => $product->id, + 'action' => UserAboItemHistory::ACTION_REMOVED, + 'product_name' => $product->getLang('name'), + 'product_number' => $product->number ?? null, + 'unit_price' => $unitPrice, + 'total_price' => $unitPrice * $item->qty, + 'qty_before' => $item->qty, + 'qty_after' => 0, + 'comp' => $item->comp ?? 0, + 'changed_by_user_id' => $actor['id'], + 'changed_by_name' => $actor['name'], + 'channel' => $channel, + ]); + } + + /** + * Log: Comp-Produkt getauscht. + */ + public static function logCompProductChanged(UserAbo $userAbo, UserAboItem $item, Product $oldProduct, Product $newProduct, string $view): void + { + // Item hat bereits das neue Produkt — getPrice() liefert den korrekten Anzeige-Preis + $unitPrice = self::resolveItemPrice($item); + $actor = self::resolveActor(); + $channel = self::resolveChannel($view); + + UserAboItemHistory::create([ + 'user_abo_id' => $userAbo->id, + 'user_abo_item_id' => $item->id, + 'product_id' => $newProduct->id, + 'action' => UserAboItemHistory::ACTION_COMP_CHANGED, + 'product_name' => $newProduct->getLang('name'), + 'product_number' => $newProduct->number ?? null, + 'unit_price' => $unitPrice, + 'total_price' => $unitPrice * $item->qty, + 'old_product_id' => $oldProduct->id, + 'old_product_name' => $oldProduct->getLang('name'), + 'comp' => $item->comp, + 'changed_by_user_id' => $actor['id'], + 'changed_by_name' => $actor['name'], + 'channel' => $channel, + ]); + } + + /** + * Log: System hat Comp-Produkt hinzugefügt. + */ + public static function logSystemCompAdded(UserAbo $userAbo, UserAboItem $item): void + { + $product = $item->product; + $unitPrice = self::resolveItemPrice($item); + + UserAboItemHistory::create([ + 'user_abo_id' => $userAbo->id, + 'user_abo_item_id' => $item->id, + 'product_id' => $product->id, + 'action' => UserAboItemHistory::ACTION_COMP_ADDED, + 'product_name' => $product->getLang('name'), + 'product_number' => $product->number ?? null, + 'unit_price' => $unitPrice, + 'total_price' => $unitPrice * $item->qty, + 'qty_after' => $item->qty, + 'comp' => $item->comp, + 'changed_by_user_id' => null, + 'changed_by_name' => 'System', + 'channel' => UserAboItemHistory::CHANNEL_SYSTEM, + ]); + } + + /** + * Log: System hat Comp-Produkt entfernt (vor dem delete aufrufen!). + */ + public static function logSystemCompRemoved(UserAbo $userAbo, UserAboItem $item): void + { + $product = $item->product; + $unitPrice = self::resolveItemPrice($item); + + UserAboItemHistory::create([ + 'user_abo_id' => $userAbo->id, + 'user_abo_item_id' => $item->id, + 'product_id' => $product->id, + 'action' => UserAboItemHistory::ACTION_COMP_REMOVED, + 'product_name' => $product->getLang('name'), + 'product_number' => $product->number ?? null, + 'unit_price' => $unitPrice, + 'total_price' => $unitPrice * $item->qty, + 'qty_before' => $item->qty, + 'qty_after' => 0, + 'comp' => $item->comp, + 'changed_by_user_id' => null, + 'changed_by_name' => 'System', + 'channel' => UserAboItemHistory::CHANNEL_SYSTEM, + ]); + } + + /** + * Setzt das Abo auf den Ursprungszustand zurück. + */ + public static function rollbackToInitial(UserAbo $userAbo): bool + { + $initialItems = $userAbo->user_abo_item_histories() + ->where('is_initial', true) + ->get(); + + if ($initialItems->isEmpty()) { + return false; + } + + $batchId = Str::uuid()->toString(); + $actor = self::resolveActor(); + + // Aktuelle Items loggen und löschen + foreach ($userAbo->user_abo_items as $item) { + $unitPrice = self::resolveItemPrice($item); + UserAboItemHistory::create([ + 'user_abo_id' => $userAbo->id, + 'user_abo_item_id' => $item->id, + 'product_id' => $item->product_id, + 'action' => UserAboItemHistory::ACTION_ROLLBACK, + 'product_name' => $item->product->getLang('name'), + 'product_number' => $item->product->number ?? null, + 'unit_price' => $unitPrice, + 'total_price' => $unitPrice * $item->qty, + 'qty_before' => $item->qty, + 'qty_after' => 0, + 'comp' => $item->comp ?? 0, + 'changed_by_user_id' => $actor['id'], + 'changed_by_name' => $actor['name'], + 'channel' => UserAboItemHistory::CHANNEL_ADMIN, + 'batch_id' => $batchId, + ]); + } + + // Alle aktuellen Items löschen + UserAboItem::where('user_abo_id', $userAbo->id)->delete(); + + // Neue Items aus Initial-History erstellen + foreach ($initialItems as $historyItem) { + UserAboItem::create([ + 'user_abo_id' => $userAbo->id, + 'product_id' => $historyItem->product_id, + 'comp' => $historyItem->comp, + 'qty' => $historyItem->qty_after, + 'status' => 1, + ]); + } + + return true; + } + + /** + * Ermittelt den exakten Anzeige-Preis des UserAboItems. + * Nutzt UserAboItem::getPrice() — das ist genau der Preis, der dem User + * in der Produktliste und im Warenkorb angezeigt wird (netto+UserFactor + * für Berater, brutto für Kunden, länderspezifisch). + * + * Fallback-Kette wenn Yard nicht verfügbar: + * 1. getPriceWith() ohne Country (netto/ufactor je nach is_for) + * 2. Rohpreis des Produkts + */ + private static function resolveItemPrice(UserAboItem $item): float + { + // 1. Exakter Anzeige-Preis via UserAboItem::getPrice() (nutzt Yard) + try { + return (float) $item->getPrice(); + } catch (\Throwable $e) { + // Yard nicht initialisiert — weiter zum Fallback + } + + // 2. Manuelle Berechnung ohne Yard (ohne Country-spezifische Preise) + try { + $isMe = $item->user_abo->is_for === 'me'; + + return (float) $item->product->getPriceWith($isMe, $isMe); + } catch (\Throwable $e) { + // Letzter Fallback + } + + // 3. Roher Produktpreis + return (float) ($item->product->price ?? 0); + } + + /** + * Aktuellen Benutzer ermitteln (CRM Auth oder Kunden-Guard). + */ + private static function resolveActor(): array + { + // CRM User (Admin/Berater) + $user = \Auth::user(); + if ($user) { + $name = ''; + if ($user->account) { + $name = trim($user->account->first_name.' '.$user->account->last_name); + } + if (! $name) { + $name = $user->email ?? 'User #'.$user->id; + } + + return ['id' => $user->id, 'name' => $name]; + } + + // Portal Kunde + $customer = \Auth::guard('customers')->user(); + if ($customer) { + return ['id' => null, 'name' => $customer->name ?? $customer->email ?? 'Kunde']; + } + + return ['id' => null, 'name' => 'System']; + } + + /** + * Channel aus View-Parameter und Auth-Kontext ableiten. + */ + private static function resolveChannel(string $view): string + { + if ($view === 'portal') { + return UserAboItemHistory::CHANNEL_PORTAL; + } + + if ($view === 'admin') { + return UserAboItemHistory::CHANNEL_ADMIN; + } + + // Bei user views: Prüfen ob Admin die Änderung vornimmt + $user = \Auth::user(); + if ($user && $user->isAdmin()) { + return UserAboItemHistory::CHANNEL_ADMIN; + } + + if ($view === 'me') { + return UserAboItemHistory::CHANNEL_USER_ME; + } + + if ($view === 'ot') { + return UserAboItemHistory::CHANNEL_USER_OT; + } + + return UserAboItemHistory::CHANNEL_SYSTEM; + } +} diff --git a/app/Services/AboOrderCart.php b/app/Services/AboOrderCart.php index b014573..7d49b69 100644 --- a/app/Services/AboOrderCart.php +++ b/app/Services/AboOrderCart.php @@ -2,24 +2,20 @@ namespace App\Services; -use Yard; -use App\User; -use Carbon\Carbon; use App\Models\Product; -use App\Models\UserAbo; -use App\Models\UserAboItem; -use App\Models\ShoppingUser; -use App\Models\UserAboOrder; -use App\Models\ShoppingOrder; use App\Models\ShippingCountry; -use App\Models\ShoppingPayment; +use App\Models\ShoppingUser; +use App\Models\UserAboItem; +use App\User; +use Yard; class AboOrderCart { private static $user_abo; - private static $is_for; - private static $customer_detail; + private static $is_for; + + private static $customer_detail; public static function initYard($user_abo) { @@ -37,12 +33,12 @@ class AboOrderCart \Log::info('AboOrderCart::initYard: Yard geleert', [ 'abo_id' => $user_abo->id, - 'items_vor_destroy' => $itemsBeforeDestroy + 'items_vor_destroy' => $itemsBeforeDestroy, ]); $itemsAfterDestroy = $yard->content()->count(); \Log::info('AboOrderCart::initYard: Yard geleert', [ 'abo_id' => $user_abo->id, - 'items_after_destroy' => $itemsAfterDestroy + 'items_after_destroy' => $itemsAfterDestroy, ]); self::$customer_detail = self::makeCustomerDetail($user_abo); @@ -56,6 +52,7 @@ class AboOrderCart if ($country_id && $shipping_country = ShippingCountry::whereCountryId($country_id)->first()) { if ($shipping_country->shipping && $shipping_country->shipping->active) { UserService::initUserYard($user_abo->user, $shipping_country->id, 'abo-me'); + return true; } } @@ -64,6 +61,7 @@ class AboOrderCart if ($user_abo->is_for === 'ot') { self::$is_for = 'abo-ot-customer'; UserService::initCustomerYard(self::$customer_detail, 'abo-ot-customer'); + return true; } @@ -90,7 +88,7 @@ class AboOrderCart if ($itemsBefore > 0) { \Log::warning('AboOrderCart::makeOrderYard: Yard war nicht leer vor makeOrderYard und wurde geleert', [ 'abo_id' => $user_abo->id, - 'items_before' => $itemsBefore + 'items_before' => $itemsBefore, ]); } @@ -105,9 +103,9 @@ class AboOrderCart 'id' => $item->id, 'product_id' => $item->product_id, 'qty' => $item->qty, - 'comp' => $item->comp + 'comp' => $item->comp, ]; - })->toArray() + })->toArray(), ]); foreach ($abo_items as $abo_item) { @@ -141,10 +139,11 @@ class AboOrderCart 'weight' => 0, 'points' => 0, 'comp' => $item->comp, - 'product_id' => $product->id + 'product_id' => $product->id, ] ); Yard::setTax($cartItem->rowId, 0); + return true; } if (self::$is_for === 'ot-customer' || self::$is_for === 'abo-ot-customer') { @@ -153,10 +152,10 @@ class AboOrderCart $product->id, $product->getLang('name'), $item->qty, - round($product->getPriceWith($tax_free, false, $user_country, false, self::$user_abo->user), 1), + round($product->getPriceWith($tax_free, false, $user_country, false, self::$user_abo->user), 1), false, false, - ['image' => '', 'slug' => $product->slug, 'weight' => $product->weight, 'points' => $product->points, 'no_commission' => $product->no_commission, 'show_on' => $product->show_on] + ['image' => '', 'slug' => $product->slug, 'weight' => $product->weight, 'points' => $product->points, 'no_commission' => $product->no_commission, 'no_free_shipping' => $product->no_free_shipping, 'show_on' => $product->show_on] ); } else { $cartItem = Yard::instance('shopping') @@ -164,10 +163,10 @@ class AboOrderCart $product->id, $product->getLang('name'), $item->qty, - $product->getPriceWith($tax_free, true, $user_country, false, self::$user_abo->user), + $product->getPriceWith($tax_free, true, $user_country, false, self::$user_abo->user), false, false, - ['image' => '', 'slug' => $product->slug, 'weight' => $product->weight, 'points' => $product->points, 'no_commission' => $product->no_commission, 'show_on' => $product->show_on] + ['image' => '', 'slug' => $product->slug, 'weight' => $product->weight, 'points' => $product->points, 'no_commission' => $product->no_commission, 'no_free_shipping' => $product->no_free_shipping, 'show_on' => $product->show_on] ); } if ($tax_free) { @@ -189,7 +188,7 @@ class AboOrderCart return true; } - //need to add + // need to add if (count($UserAboItems) < $needNumComp) { $product = Product::whereActive(true)->where('shipping_addon', true)->whereJsonContains('show_on', '12')->orderBy('pos', 'DESC')->first(); for ($i = count($UserAboItems); $i <= $needNumComp; $i++) { @@ -200,13 +199,15 @@ class AboOrderCart 'qty' => 1, 'status' => 1, ]); + AboItemHistoryService::logSystemCompAdded($user_abo, $UserAboItem); self::addProductToCart($UserAboItem); } } - //need to remove + // need to remove if (count($UserAboItems) > $needNumComp) { foreach ($UserAboItems as $UserAboItem) { if ($UserAboItem->comp > $needNumComp) { + AboItemHistoryService::logSystemCompRemoved($user_abo, $UserAboItem); $UserAboItem->delete(); } } @@ -230,20 +231,20 @@ class AboOrderCart { if ($user_abo->is_for === 'me') { - //only on Abo! + // only on Abo! $user = $user_abo->user; // WICHTIG: Wenn bereits ein shopping_user existiert, diesen replizieren um alle Felder zu behalten // Ansonsten neues Objekt erstellen if ($user_abo->shopping_user) { $shopping_user = $user_abo->shopping_user->replicate(); - \Log::info('AboOrderCart::makeCustomerDetail: ShoppingUser repliziert für Abo ID: ' . $user_abo->id, [ + \Log::info('AboOrderCart::makeCustomerDetail: ShoppingUser repliziert für Abo ID: '.$user_abo->id, [ 'abo_id' => $user_abo->id, - 'original_shopping_user_id' => $user_abo->shopping_user->id + 'original_shopping_user_id' => $user_abo->shopping_user->id, ]); } else { - $shopping_user = new ShoppingUser(); - \Log::info('AboOrderCart::makeCustomerDetail: Neuer ShoppingUser erstellt für Abo ID: ' . $user_abo->id); + $shopping_user = new ShoppingUser; + \Log::info('AboOrderCart::makeCustomerDetail: Neuer ShoppingUser erstellt für Abo ID: '.$user_abo->id); } // Account-Daten überschreiben/aktualisieren @@ -258,9 +259,10 @@ class AboOrderCart $shopping_user->billing_country_id = $user->account->country_id; $shopping_user->billing_phone = $user->account->phone; $shopping_user->billing_email = $user->email ?? null; + $shopping_user->language = $user->account->getLocale(); // Auth User ID setzen falls noch nicht gesetzt - if (!$shopping_user->auth_user_id) { + if (! $shopping_user->auth_user_id) { $shopping_user->auth_user_id = $user->id; } if ($user->account->same_as_billing) { @@ -293,9 +295,10 @@ class AboOrderCart } if ($user_abo->is_for === 'ot') { - //look for the primary user of this abo + // look for the primary user of this abo $shopping_user = $user_abo->shopping_user->replicate(); } + return $shopping_user; } } diff --git a/app/Services/BusinessPlan/SalesPointsVolume.php b/app/Services/BusinessPlan/SalesPointsVolume.php index e770653..394f2e2 100644 --- a/app/Services/BusinessPlan/SalesPointsVolume.php +++ b/app/Services/BusinessPlan/SalesPointsVolume.php @@ -34,12 +34,12 @@ class SalesPointsVolume $form_user = User::find($form_user_id); $shoppingOrder->user_sales_volume->user_id = $to_user_id; - $shoppingOrder->user_sales_volume->message = 'zugewiesen: ' . date('d.m.Y'); + $shoppingOrder->user_sales_volume->message = 'zugewiesen: '.date('d.m.Y'); $syslog = $shoppingOrder->user_sales_volume->syslog; $from_email = $form_user ? $form_user->email : ''; $to_email = $to_user ? $to_user->email : ''; - $syslog[date('d.m.Y-h:i:s')] = 'change form: #' . $form_user_id . ' ' . $from_email . ' to: #' . $to_user_id . ' ' . $to_email; + $syslog[date('d.m.Y-h:i:s')] = 'change form: #'.$form_user_id.' '.$from_email.' to: #'.$to_user_id.' '.$to_email; $shoppingOrder->user_sales_volume->syslog = $syslog; $shoppingOrder->user_sales_volume->save(); @@ -100,6 +100,17 @@ class SalesPointsVolume case 5: // Registrierung $month_points = self::add_KP_TP_Points($userSalesVolume, $month_points); $month_total_net += $userSalesVolume->total_net; + break; + case 6: // Storno - negative Punkte und Beträge + $month_points = self::add_KP_TP_Points($userSalesVolume, $month_points); + + if ($userSalesVolume->status_turnover === 2) { + $month_shop_points += $userSalesVolume->points; // bereits negativ + $month_shop_total_net += $userSalesVolume->total_net; // bereits negativ + } else { + $month_total_net += $userSalesVolume->total_net; // bereits negativ + } + break; } $userSalesVolume->month_shop_points = $month_shop_points; @@ -200,13 +211,13 @@ class SalesPointsVolume $user_sales_volume->total_net = Util::reFormatNumber($data['total_net']); $user_sales_volume->points = Util::reFormatNumber($data['points']); - $user_sales_volume->message = 'geändert: ' . date('d.m.Y'); + $user_sales_volume->message = 'geändert: '.date('d.m.Y'); $user_sales_volume->info = $data['info']; $user_sales_volume->status_points = $data['status_points']; $user_sales_volume->status_turnover = isset($data['status_turnover']) ? intval($data['status_turnover']) : null; $syslog = $user_sales_volume->syslog; - $syslog[date('d.m.Y-h:i:s')] = 'edit points: #' . $old_points . ' ' . $user_sales_volume->points . ' total: #' . $old_total_net . ' ' . $user_sales_volume->total_net; + $syslog[date('d.m.Y-h:i:s')] = 'edit points: #'.$old_points.' '.$user_sales_volume->points.' total: #'.$old_total_net.' '.$user_sales_volume->total_net; $user_sales_volume->syslog = $syslog; $user_sales_volume->save(); @@ -231,7 +242,7 @@ class SalesPointsVolume $total_net = isset($data['total_net']) ? Util::reFormatNumber($data['total_net']) : 0; $points = isset($data['points']) ? Util::reFormatNumber($data['points']) : 0; - $syslog[date('d.m.Y-h:i:s')] = 'add points: #' . $points . ' total: #' . $total_net; + $syslog[date('d.m.Y-h:i:s')] = 'add points: #'.$points.' total: #'.$total_net; $status = isset($data['status']) ? intval($data['status']) : 4; $status_turnover = isset($data['status_turnover']) ? intval($data['status_turnover']) : null; @@ -245,7 +256,7 @@ class SalesPointsVolume 'status_points' => $data['status_points'], 'status_turnover' => $status_turnover, 'total_net' => $total_net, - 'message' => 'hinzugefügt: ' . date('d.m.Y'), + 'message' => 'hinzugefügt: '.date('d.m.Y'), 'info' => $data['info'], 'syslog' => $syslog, 'status' => $status, @@ -255,4 +266,61 @@ class SalesPointsVolume \Session()->flash('alert-success', 'Points hinzugefügt'); } + + /** + * Erstellt einen Storno-Eintrag für eine stornierte Rechnung + * Negative Punkte werden dem aktuellen Monat zugeordnet + * + * @param UserSalesVolume $original_sales_volume Der ursprüngliche Sales Volume Eintrag + * @param int $cancellation_invoice_id Die ID der Stornorechnung + * @return UserSalesVolume + */ + public static function cancelSalesPointsVolume(UserSalesVolume $original_sales_volume, $cancellation_invoice_id) + { + $month = date('m'); + $year = date('Y'); + $date = date('d.m.Y'); + + $syslog = [ + date('d.m.Y H:i:s') => 'Stornorechnung erstellt - Punkte korrigiert (Original Invoice: #'.$original_sales_volume->user_invoice_id.')', + ]; + + // Negativen Eintrag erstellen (alle Werte negativ) + $cancellation_sales_volume = UserSalesVolume::create([ + 'user_id' => $original_sales_volume->user_id, + 'shopping_order_id' => $original_sales_volume->shopping_order_id, + 'user_invoice_id' => $cancellation_invoice_id, + 'month' => $month, + 'year' => $year, + 'date' => $date, + 'points' => -$original_sales_volume->points, // Negativ! + 'month_points' => 0, // Wird durch reCalculate gesetzt + 'month_KP_points' => 0, + 'month_TP_points' => 0, + 'month_shop_points' => 0, + 'total_net' => -$original_sales_volume->total_net, // Negativ! + 'month_total_net' => 0, + 'status' => 6, // Status 6 = cancelled/storniert + 'status_points' => $original_sales_volume->status_points, + 'status_turnover' => $original_sales_volume->status_turnover, + 'message' => 'Storniert am '.date('d.m.Y'), + 'info' => 'Storno für Invoice #'.$original_sales_volume->user_invoice_id, + 'syslog' => $syslog, + ]); + + // Neuberechnung für aktuellen Monat + self::reCalculateSalesPointsVolume($original_sales_volume->user_id, $month, $year); + + \Log::info('Punktekorrektur für Stornorechnung durchgeführt', [ + 'original_invoice_id' => $original_sales_volume->user_invoice_id, + 'cancellation_invoice_id' => $cancellation_invoice_id, + 'original_points' => $original_sales_volume->points, + 'cancellation_points' => $cancellation_sales_volume->points, + 'user_id' => $original_sales_volume->user_id, + 'month' => $month, + 'year' => $year, + ]); + + return $cancellation_sales_volume; + } } diff --git a/app/Services/Credit.php b/app/Services/Credit.php index 086388c..40a3e57 100644 --- a/app/Services/Credit.php +++ b/app/Services/Credit.php @@ -1,90 +1,116 @@ format('Y'); + $prefix = 'GS'.\Carbon::parse($credit_date)->format('Y'); $credit_number = str_pad($credit_number, 5, '0', STR_PAD_LEFT); + return $prefix.$credit_number; } - public static function getCreditStorageDir($credit_date){ - return "/credit/".\Carbon::parse($credit_date)->format('Y/m/'); + public static function getCreditStorageDir($credit_date) + { + return '/credit/'.\Carbon::parse($credit_date)->format('Y/m/'); } - public static function getCreditDetailStorageDir($credit_date){ - return "/credit_details/".\Carbon::parse($credit_date)->format('Y/m/'); + public static function getCreditDetailStorageDir($credit_date) + { + return '/credit_details/'.\Carbon::parse($credit_date)->format('Y/m/'); } - public static function makeCreditFilename($credit_number){ - return $credit_number."-MIVITA-Gutschrift.pdf"; + public static function makeCreditFilename($credit_number) + { + return $credit_number.'-MIVITA-Gutschrift.pdf'; } - public static function makeCreditDetailFilename($credit_number){ - return $credit_number."-MIVITA-Report.pdf"; + public static function makeCreditDetailFilename($credit_number) + { + return $credit_number.'-MIVITA-Report.pdf'; } - public static function isCredit(UserCredit $user_credit){ + /** + * Erstellt den Dateinamen für eine lokalisierte Gutschrift. + * Deutsch (de) ist das Original ohne Suffix. + * + * @param string $credit_number + * @param string $locale + * @return string + */ + public static function makeCreditFilenameLocale($credit_number, $locale) + { + if ($locale === 'de' || ! $locale) { + return self::makeCreditFilename($credit_number); + } + + return $credit_number.'-MIVITA-Gutschrift-'.$locale.'.pdf'; + } + + public static function isCredit(UserCredit $user_credit) + { return $user_credit->isCredit(); } - /*public static function getFilename(UserCredit $user_credit){ - return $user_credit->filename; + /*public static function getFilename(UserCredit $user_credit){ + return $user_credit->filename; } - + public static function getDir(UserCredit $user_credit){ - return $user_credit->dir; + return $user_credit->dir; } public static function getDownloadURL(UserCredit $user_credit, $do = false){ - return route('storage_file', [$user_credit->id, 'cms_download_file', $do]); + return route('storage_file', [$user_credit->id, 'cms_download_file', $do]); } - + public static function getDownloadPath(UserCredit $user_credit, $full = false){ - $dir = self::getDir($user_credit); - $filename = self::getFilename($user_credit); - if(!$full){ - return $dir.$filename; - } - return \Storage::disk('public')->path($dir.$filename); + $dir = self::getDir($user_credit); + $filename = self::getFilename($user_credit); + if(!$full){ + return $dir.$filename; + } + return \Storage::disk('public')->path($dir.$filename); }*/ - public static function sendCreditMail(UserCredit $user_credit){ + public static function sendCreditMail(UserCredit $user_credit) + { $bcc = []; $email = $user_credit->user->email; - if(!$email){ - if($user_credit->user->mode === 'test'){ - }else{ + if (! $email) { + if ($user_credit->user->mode === 'test') { + } else { $email = config('app.checkout_mail'); } } - if($user_credit->user->mode === 'test'){ + if ($user_credit->user->mode === 'test') { $bcc[] = config('app.checkout_test_mail'); - }else{ + } else { $bcc[] = config('app.checkout_mail'); } Mail::to($email)->bcc($bcc)->locale($user_credit->user->getLocale())->send(new MailCredit($user_credit)); diff --git a/app/Services/DatevExportService.php b/app/Services/DatevExportService.php new file mode 100644 index 0000000..f8e9590 --- /dev/null +++ b/app/Services/DatevExportService.php @@ -0,0 +1,1079 @@ +generated() + ->first(); + + if ($existing && $existing->isLocked()) { + throw new \RuntimeException("Export für {$month}/{$year} ist gesperrt und kann nicht neu generiert werden."); + } + + // Alten Entwurf/generierten Export löschen (soft delete) + if ($existing) { + $existing->delete(); + } + + // Daten sammeln + $invoiceLines = $this->collectInvoiceLines($month, $year); + $creditLines = $this->collectCreditLines($month, $year); + $cancellationLines = $this->collectCancellationLines($month, $year); + + $allLines = $invoiceLines->concat($creditLines)->concat($cancellationLines); + + // Validierung + $validation = $this->validate($allLines); + + // Period berechnen + $periodFrom = Carbon::create($year, $month, 1)->startOfMonth(); + $periodTo = Carbon::create($year, $month, 1)->endOfMonth(); + + // Export-Record anlegen + $export = DatevExport::create([ + 'period_from' => $periodFrom, + 'period_to' => $periodTo, + 'month' => $month, + 'year' => $year, + 'status' => DatevExport::STATUS_GENERATED, + 'berater_nr' => config('datev.berater_nr'), + 'mandant_nr' => config('datev.mandant_nr'), + 'invoice_count' => $invoiceLines->count(), + 'credit_count' => $creditLines->count(), + 'cancellation_count' => $cancellationLines->count(), + 'total_revenue' => $invoiceLines->sum('amount_gross'), + 'total_commissions' => $creditLines->sum('amount_gross'), + 'created_by' => Auth::id(), + 'warning_count' => count($validation['warnings']), + 'error_count' => count($validation['errors']), + 'validation_summary' => $validation, + ]); + + // Export-Lines speichern + $lineNumber = 1; + foreach ($allLines as $lineData) { + $lineData['datev_export_id'] = $export->id; + $lineData['line_number'] = $lineNumber++; + + // CSV-Zeile rendern + $lineData['row_csv'] = $this->renderCsvRow($lineData); + + DatevExportLine::create($lineData); + } + + // CSV-Datei generieren und speichern + $csvContent = $this->buildCsv($export); + $filename = $this->generateFilename($month, $year); + $storagePath = $export->getStoragePath(); + $fullPath = $storagePath . '/' . $filename; + + Storage::disk(config('datev.storage_disk'))->makeDirectory($storagePath); + Storage::disk(config('datev.storage_disk'))->put($fullPath, $csvContent); + + $export->update([ + 'filename' => $filename, + 'file_path' => $fullPath, + 'file_hash' => hash('sha256', $csvContent), + ]); + + return $export->fresh(); + } + + /* + |-------------------------------------------------------------------------- + | Datensammlung: Rechnungen (Umsatzerlöse) + |-------------------------------------------------------------------------- + */ + + /** + * Sammelt alle Rechnungszeilen für die Periode. + * Pro Steuersatz in tax_split wird eine eigene Zeile erzeugt. + */ + public function collectInvoiceLines(int $month, int $year): Collection + { + $lines = collect(); + + $invoices = UserInvoice::with([ + 'shopping_order.shopping_payments', + 'shopping_order.country.country', + 'shopping_order.shopping_user', + 'shopping_order.auth_user.account', + ]) + ->where('month', $month) + ->where('year', $year) + ->where(function ($q) { + $q->where('cancellation', false) + ->orWhereNull('cancellation'); + }) + ->whereNotIn('status', [11, 12]) // Nicht stornierte + ->get(); + + foreach ($invoices as $invoice) { + $order = $invoice->shopping_order; + if (! $order) { + continue; + } + + $gegenkonto = $this->determineCounterAccountForOrder($order); + $buchungstext = $this->buildBuchungstext($order); + $belegdatum = $this->parseBelegdatum($invoice); + $euLand = null; + + // Country-Infos ermitteln + $country = $this->resolveCountry($order); + $isDomestic = $this->isDomestic($country); + $isEu = $this->isEuCountry($country); + + $euUstid = $this->resolveEuUstid($order, $isDomestic); + $hasValidUstid = ! empty($euUstid); + + if (! $isDomestic && $country) { + $euLand = $country->code ?? null; + } + + // Tax-Split vorhanden? -> Mehrere Zeilen pro Steuersatz + if ($order->tax_split && is_array($order->tax_split) && count($order->tax_split) > 0) { + foreach ($order->tax_split as $taxRate => $taxAmount) { + $taxRate = intval($taxRate); + $taxAmountFloat = $this->parseNumber($taxAmount); + $netAmount = 0; + + if ($order->net_split && isset($order->net_split[$taxRate])) { + $netAmount = $this->parseNumber($order->net_split[$taxRate]); + } + + $grossAmount = round($netAmount + $taxAmountFloat, 2); + + if ($grossAmount <= 0) { + continue; + } + + $revenueMapping = $this->determineRevenueAccount($taxRate, $isDomestic, $isEu, $hasValidUstid); + + $lines->push([ + 'source_type' => DatevExportLine::SOURCE_INVOICE, + 'source_id' => $invoice->id, + 'order_id' => $order->id, + 'user_id' => $order->auth_user_id ?? $order->member_id, + 'amount_gross' => $grossAmount, + 'soll_haben' => 'H', + 'konto' => $revenueMapping['konto'], + 'gegenkonto' => $gegenkonto, + 'bu_schluessel' => $revenueMapping['bu'], + 'belegdatum' => $belegdatum, + 'belegfeld1' => $invoice->full_number ?? '', + 'buchungstext' => $buchungstext, + 'eu_ustid' => $euUstid, + 'eu_land' => $euLand, + ]); + } + } else { + // Kein Tax-Split: Gesamtbetrag als eine Zeile + $grossAmount = floatval($order->total_shipping ?? $order->total ?? 0); + + if ($grossAmount <= 0) { + continue; + } + + $taxRate = intval($order->tax_rate ?? 19); + $revenueMapping = $this->determineRevenueAccount($taxRate, $isDomestic, $isEu, $hasValidUstid); + + $lines->push([ + 'source_type' => DatevExportLine::SOURCE_INVOICE, + 'source_id' => $invoice->id, + 'order_id' => $order->id, + 'user_id' => $order->auth_user_id ?? $order->member_id, + 'amount_gross' => $grossAmount, + 'soll_haben' => 'H', + 'konto' => $revenueMapping['konto'], + 'gegenkonto' => $gegenkonto, + 'bu_schluessel' => $revenueMapping['bu'], + 'belegdatum' => $belegdatum, + 'belegfeld1' => $invoice->full_number ?? '', + 'buchungstext' => $buchungstext, + 'eu_ustid' => $euUstid, + 'eu_land' => $euLand, + ]); + } + } + + return $lines; + } + + /* + |-------------------------------------------------------------------------- + | Datensammlung: Gutschriften / Provisionen + |-------------------------------------------------------------------------- + */ + + /** + * Sammelt alle Gutschriftszeilen (Provisionen) für die Periode. + * Pro Provisionstyp-Gruppe (shop, payline, growth_bonus) wird eine Zeile erzeugt. + */ + public function collectCreditLines(int $month, int $year): Collection + { + $lines = collect(); + + $credits = UserCredit::with([ + 'user.account', + 'user_credit_items', + ]) + ->where('month', $month) + ->where('year', $year) + ->where('status', '!=', 10) // Nicht storniert + ->whereNotNull('full_number') // Muss eine Nummer haben + ->get(); + + $statusMap = config('datev.credit_item_status_map', []); + $commissionAccounts = config('datev.commission_accounts', []); + + foreach ($credits as $credit) { + $user = $credit->user; + $account = $user ? $user->account : null; + + // Steuerstatus des Beraters ermitteln + $taxStatus = $this->determineCommissionTaxStatus($account); + $buSchluessel = config('datev.commission_tax_keys.' . $taxStatus, 9); + + // USt-ID für Reverse Charge + $euUstid = null; + $euLand = null; + if ($taxStatus === 'reverse_charge' && $account) { + $euUstid = $account->tax_identification_number ?? null; + $euLand = $account->reverse_charge_code ?? null; + } + + $buchungstext = $this->buildCreditBuchungstext($account, $user, $credit->user_id); + + // Items nach Provisionstyp gruppieren + $grouped = $credit->user_credit_items + ->filter(function ($item) use ($statusMap) { + return isset($statusMap[$item->status]); + }) + ->groupBy(function ($item) use ($statusMap) { + return $statusMap[$item->status] ?? 'shop'; + }); + + foreach ($grouped as $type => $items) { + $totalAmount = $items->sum('credit'); + + if ($totalAmount <= 0) { + continue; + } + + // Konto bestimmen + $konto = $commissionAccounts[$type] ?? $commissionAccounts['shop']; + + // Bei USt-pflichtigen Beratern: Brutto berechnen + $grossAmount = $totalAmount; + if ($taxStatus === 'normal' && $credit->taxable == 1) { + // Netto + USt = Brutto + $taxRate = config('app.main_tax_rate', 19); + $grossAmount = round($totalAmount * (1 + $taxRate / 100), 2); + } + + $lines->push([ + 'source_type' => DatevExportLine::SOURCE_CREDIT, + 'source_id' => $credit->id, + 'user_id' => $user?->id, + 'amount_gross' => $grossAmount, + 'soll_haben' => 'S', + 'konto' => $konto, + 'gegenkonto' => intval(config('datev.sammelkreditor', 70000)), + 'bu_schluessel' => $buSchluessel, + 'belegdatum' => $credit->getRawOriginal('date') ?? now()->format('Y-m-d'), + 'belegfeld1' => $credit->full_number ?? '', + 'buchungstext' => $buchungstext, + 'eu_ustid' => $euUstid, + 'eu_land' => $euLand, + ]); + } + + // Falls keine Items nach Typ gruppierbar, aber Credit hat Gesamtbetrag + if ($grouped->isEmpty() && $credit->total > 0) { + $lines->push([ + 'source_type' => DatevExportLine::SOURCE_CREDIT, + 'source_id' => $credit->id, + 'user_id' => $user?->id, + 'amount_gross' => abs($credit->total), + 'soll_haben' => 'S', + 'konto' => $commissionAccounts['shop'], + 'gegenkonto' => intval(config('datev.sammelkreditor', 70000)), + 'bu_schluessel' => $buSchluessel, + 'belegdatum' => $credit->getRawOriginal('date') ?? now()->format('Y-m-d'), + 'belegfeld1' => $credit->full_number ?? '', + 'buchungstext' => $buchungstext, + 'eu_ustid' => $euUstid, + 'eu_land' => $euLand, + ]); + } + } + + return $lines; + } + + /* + |-------------------------------------------------------------------------- + | Datensammlung: Stornorechnungen + |-------------------------------------------------------------------------- + */ + + /** + * Sammelt alle Stornorechnungen für die Periode. + * Stornos werden als negative Beträge exportiert. + */ + public function collectCancellationLines(int $month, int $year): Collection + { + $lines = collect(); + + $cancellations = UserInvoice::with([ + 'shopping_order.shopping_payments', + 'shopping_order.country.country', + 'shopping_order.shopping_user', + 'shopping_order.auth_user.account', + ]) + ->where('month', $month) + ->where('year', $year) + ->where('cancellation', true) + ->get(); + + foreach ($cancellations as $invoice) { + $order = $invoice->shopping_order; + if (! $order) { + continue; + } + + $gegenkonto = $this->determineCounterAccountForOrder($order); + $buchungstext = 'STORNO ' . $this->buildBuchungstext($order); + $buchungstext = mb_substr($buchungstext, 0, 60); + $belegdatum = $this->parseBelegdatum($invoice); + + $country = $this->resolveCountry($order); + $isDomestic = $this->isDomestic($country); + $isEu = $this->isEuCountry($country); + $euLand = (! $isDomestic && $country) ? ($country->code ?? null) : null; + $euUstid = $this->resolveEuUstid($order, $isDomestic); + $hasValidUstid = ! empty($euUstid); + + if ($order->tax_split && is_array($order->tax_split) && count($order->tax_split) > 0) { + foreach ($order->tax_split as $taxRate => $taxAmount) { + $taxRate = intval($taxRate); + $taxAmountFloat = $this->parseNumber($taxAmount); + $netAmount = 0; + + if ($order->net_split && isset($order->net_split[$taxRate])) { + $netAmount = $this->parseNumber($order->net_split[$taxRate]); + } + + $grossAmount = round($netAmount + $taxAmountFloat, 2); + if ($grossAmount <= 0) { + continue; + } + + $revenueMapping = $this->determineRevenueAccount($taxRate, $isDomestic, $isEu, $hasValidUstid); + + // Storno: Negativer Betrag + $lines->push([ + 'source_type' => DatevExportLine::SOURCE_CANCELLATION, + 'source_id' => $invoice->id, + 'order_id' => $order->id, + 'user_id' => $order->auth_user_id ?? $order->member_id, + 'amount_gross' => $grossAmount, // Betrag positiv, aber S statt H + 'soll_haben' => 'S', // Umkehrung: Soll statt Haben + 'konto' => $revenueMapping['konto'], + 'gegenkonto' => $gegenkonto, + 'bu_schluessel' => $revenueMapping['bu'], + 'belegdatum' => $belegdatum, + 'belegfeld1' => $invoice->full_number ?? '', + 'buchungstext' => $buchungstext, + 'eu_ustid' => $euUstid, + 'eu_land' => $euLand, + ]); + } + } else { + $grossAmount = floatval($order->total_shipping ?? $order->total ?? 0); + if ($grossAmount <= 0) { + continue; + } + + $taxRate = intval($order->tax_rate ?? 19); + $revenueMapping = $this->determineRevenueAccount($taxRate, $isDomestic, $isEu, $hasValidUstid); + + $lines->push([ + 'source_type' => DatevExportLine::SOURCE_CANCELLATION, + 'source_id' => $invoice->id, + 'order_id' => $order->id, + 'user_id' => $order->auth_user_id ?? $order->member_id, + 'amount_gross' => $grossAmount, + 'soll_haben' => 'S', + 'konto' => $revenueMapping['konto'], + 'gegenkonto' => $gegenkonto, + 'bu_schluessel' => $revenueMapping['bu'], + 'belegdatum' => $belegdatum, + 'belegfeld1' => $invoice->full_number ?? '', + 'buchungstext' => $buchungstext, + 'eu_ustid' => $euUstid, + 'eu_land' => $euLand, + ]); + } + } + + return $lines; + } + + /* + |-------------------------------------------------------------------------- + | CSV-Generator (EXTF-Format) + |-------------------------------------------------------------------------- + */ + + /** + * Baut die komplette DATEV EXTF CSV-Datei. + */ + public function buildCsv(DatevExport $export): string + { + $delimiter = config('datev.delimiter', ';'); + $lineEnding = config('datev.line_ending', "\r\n"); + $output = ''; + + // UTF-8 BOM + if (config('datev.encoding') === 'UTF-8') { + $output .= "\xEF\xBB\xBF"; + } + + // Zeile 1: Header + $output .= $this->buildHeaderLine($export) . $lineEnding; + + // Zeile 2: Spaltenüberschriften + $output .= implode($delimiter, self::COLUMN_HEADERS) . $lineEnding; + + // Zeile 3+: Datenzeilen + $lines = $export->lines()->orderBy('line_number')->get(); + foreach ($lines as $line) { + if ($line->row_csv) { + $output .= $line->row_csv . $lineEnding; + } else { + $output .= $this->renderCsvRow($line->toArray()) . $lineEnding; + } + } + + return $output; + } + + /** + * Baut die DATEV Header-Zeile (Zeile 1) gemäß EXTF-Spezifikation. + */ + private function buildHeaderLine(DatevExport $export): string + { + $delimiter = config('datev.delimiter', ';'); + + // DATEV Header Felder (gemäß DATEV Developer Portal) + $header = [ + 'EXTF', // 1: Kennzeichen + config('datev.format_version', 700), // 2: Versionsnummer + config('datev.format_category', 21), // 3: Formatkategorie (21=Buchungsstapel) + config('datev.format_name', 'Buchungsstapel'), // 4: Formatname + '', // 5: Formatversion + '', // 6: Erzeugt am (YYYYMMDDHHMMSS000) + '', // 7: Importiert (leer lassen) + config('datev.source', 'ERP'), // 8: Herkunft + config('datev.source_name', 'MIVITA'), // 9: Exportiert von + '', // 10: Importiert von + $export->berater_nr ?? '', // 11: Berater-Nr + $export->mandant_nr ?? '', // 12: Mandant-Nr + $export->period_from->format('Ymd'), // 13: WJ-Beginn (Wirtschaftsjahrbeginn) + config('datev.sachkontenlaenge', 4), // 14: Sachkontenlänge + $export->period_from->format('Ymd'), // 15: Datum von + $export->period_to->format('Ymd'), // 16: Datum bis + '', // 17: Bezeichnung + '', // 18: Diktatkürzel + 1, // 19: Buchungstyp (1=Finanzbuchführung) + 0, // 20: Rechnungslegungszweck + 0, // 21: Festschreibung (0=keine) + config('datev.currency', 'EUR'), // 22: WKZ + ]; + + // Pad mit leeren Feldern bis die Header-Zeile vollständig ist + // Der Rest des Headers besteht aus optionalen Feldern + while (count($header) < 100) { + $header[] = ''; + } + + return implode($delimiter, $header); + } + + /** + * Rendert eine einzelne CSV-Datenzeile aus den Line-Daten. + */ + private function renderCsvRow(array $data): string + { + $delimiter = config('datev.delimiter', ';'); + + // DATEV Belegdatum-Format: TTMM (4 Stellen) + $belegdatum = ''; + if (! empty($data['belegdatum'])) { + $date = $data['belegdatum'] instanceof Carbon + ? $data['belegdatum'] + : Carbon::parse($data['belegdatum']); + $belegdatum = $date->format('dm'); // TTMM + } + + // Betrag formatieren: DATEV erwartet Komma als Dezimaltrennzeichen + $amount = str_replace('.', ',', number_format(abs($data['amount_gross'] ?? 0), 2, '.', '')); + + // 116 Spalten befüllen (die meisten leer) + $row = array_fill(0, self::COLUMN_COUNT, ''); + + $row[0] = $amount; // Spalte A: Umsatz + $row[1] = $data['soll_haben'] ?? 'H'; // Spalte B: Soll/Haben + // Spalte C-F: WKZ, Kurs, Basis, WKZ Basis (leer) + $row[6] = $data['konto'] ?? ''; // Spalte G: Konto + $row[7] = $data['gegenkonto'] ?? ''; // Spalte H: Gegenkonto + $row[8] = $data['bu_schluessel'] ?? ''; // Spalte I: BU-Schlüssel + $row[9] = $belegdatum; // Spalte J: Belegdatum + $row[10] = $data['belegfeld1'] ?? ''; // Spalte K: Belegfeld 1 + // Spalte L: Belegfeld 2 (leer) + // Spalte M: Skonto (leer) + $row[13] = $this->escapeCsvField($data['buchungstext'] ?? ''); // Spalte N: Buchungstext + + // Spalte AN (Index 39): EU-Land u. UStID + if (! empty($data['eu_ustid'])) { + $row[39] = $data['eu_ustid']; + } + + return implode($delimiter, $row); + } + + /* + |-------------------------------------------------------------------------- + | Validierung + |-------------------------------------------------------------------------- + */ + + /** + * Validiert die gesammelten Zeilen und gibt Warnings/Errors zurück. + */ + public function validate(Collection $lines): array + { + $warnings = []; + $errors = []; + + foreach ($lines as $index => $line) { + $meta = [ + 'source_type' => $line['source_type'] ?? null, + 'source_id' => $line['source_id'] ?? null, + 'order_id' => $line['order_id'] ?? null, + 'user_id' => $line['user_id'] ?? null, + 'belegfeld1' => $line['belegfeld1'] ?? null, + ]; + $lineRef = ($meta['source_type'] ?? '?') . ' #' . ($meta['source_id'] ?? '?'); + + if (empty($line['belegdatum'])) { + $errors[] = $this->buildValidationEntry("{$lineRef}: Belegdatum fehlt.", $meta); + } + + if (empty($line['belegfeld1'])) { + $errors[] = $this->buildValidationEntry("{$lineRef}: Belegnummer (Belegfeld 1) fehlt.", $meta); + } + + if (empty($line['buchungstext']) || trim($line['buchungstext']) === '-') { + $warnings[] = $this->buildValidationEntry("{$lineRef}: Buchungstext fehlt oder ist leer.", $meta); + } + + if (($line['amount_gross'] ?? 0) <= 0) { + $warnings[] = $this->buildValidationEntry("{$lineRef}: Betrag ist 0 oder negativ ({$line['amount_gross']}).", $meta); + } + + if (($line['bu_schluessel'] ?? 0) == 1 && empty($line['eu_ustid'])) { + $warnings[] = $this->buildValidationEntry("{$lineRef}: EU-Lieferung (BU 1) ohne USt-ID.", $meta); + } + + if (($line['bu_schluessel'] ?? 0) == 94 && empty($line['eu_ustid'])) { + $warnings[] = $this->buildValidationEntry("{$lineRef}: Reverse Charge (BU 94) ohne USt-ID.", $meta); + } + + $knownBu = [1, 8, 9, 11, 50, 94]; + if (! in_array($line['bu_schluessel'] ?? 0, $knownBu)) { + $warnings[] = $this->buildValidationEntry("{$lineRef}: Unbekannter BU-Schlüssel ({$line['bu_schluessel']}).", $meta); + } + } + + return [ + 'warnings' => $warnings, + 'errors' => $errors, + 'valid' => count($errors) === 0, + ]; + } + + /** + * @param array{source_type: ?string, source_id: ?int, order_id: ?int, user_id: ?int, belegfeld1: ?string} $meta + * @return array{message: string, source_type: ?string, source_id: ?int, order_id: ?int, user_id: ?int, belegfeld1: ?string} + */ + private function buildValidationEntry(string $message, array $meta): array + { + return array_merge(['message' => $message], $meta); + } + + /* + |-------------------------------------------------------------------------- + | Vorschau (ohne Speicherung) + |-------------------------------------------------------------------------- + */ + + /** + * Erzeugt eine gruppierte Vorschau der Daten für die Periode. + */ + public function getPreview(int $month, int $year): array + { + $invoiceLines = $this->collectInvoiceLines($month, $year); + $creditLines = $this->collectCreditLines($month, $year); + $cancellationLines = $this->collectCancellationLines($month, $year); + + $allLines = $invoiceLines->concat($creditLines)->concat($cancellationLines); + $validation = $this->validate($allLines); + + // Gruppierte Zusammenfassung nach Konto + BU + $grouped = $allLines->groupBy(function ($line) { + return $line['konto'] . '-' . $line['bu_schluessel'] . '-' . $line['soll_haben']; + })->map(function ($group, $key) { + $first = $group->first(); + + return [ + 'konto' => $first['konto'], + 'bu_schluessel' => $first['bu_schluessel'], + 'soll_haben' => $first['soll_haben'], + 'count' => $group->count(), + 'total' => round($group->sum('amount_gross'), 2), + ]; + })->values(); + + return [ + 'summary' => [ + 'invoice_count' => $invoiceLines->count(), + 'credit_count' => $creditLines->count(), + 'cancellation_count' => $cancellationLines->count(), + 'total_lines' => $allLines->count(), + 'total_revenue' => round($invoiceLines->sum('amount_gross'), 2), + 'total_commissions' => round($creditLines->sum('amount_gross'), 2), + 'total_cancellations' => round($cancellationLines->sum('amount_gross'), 2), + ], + 'grouped' => $grouped, + 'validation' => $validation, + ]; + } + + /* + |-------------------------------------------------------------------------- + | Hilfsmethoden: Konten-Mapping + |-------------------------------------------------------------------------- + */ + + /** + * Bestimmt das Erlöskonto und den BU-Schlüssel basierend auf Steuersatz, Land und USt-ID. + * + * EU-steuerfreie IG-Lieferung (BU 1 / Konto 8125) nur wenn eine gültige USt-ID vorliegt. + * Ohne USt-ID wird auch bei EU-Lieferungen die reguläre Inlandsbesteuerung angewendet. + */ + private function determineRevenueAccount(int $taxRate, bool $isDomestic, bool $isEu, bool $hasValidUstid = false): array + { + $accounts = config('datev.revenue_accounts'); + + if (! $isDomestic && ! $isEu) { + return $accounts['third_country_exempt']; + } + + if ($isEu && ! $isDomestic && $hasValidUstid) { + return $accounts['eu_exempt']; + } + + if ($taxRate == 7 || $taxRate == 5) { + return $accounts['domestic_7']; + } + + return $accounts['domestic_19']; + } + + /** + * Bestimmt das Gegenkonto basierend auf der Zahlungsart. + */ + private function determineCounterAccountForOrder($order): int + { + $sammeldebitor = intval(config('datev.sammeldebitor', 10000)); + + if (! $order->shopping_payments || $order->shopping_payments->isEmpty()) { + return $sammeldebitor; + } + + $payment = $order->shopping_payments->first(); + + if (! $payment) { + return $sammeldebitor; + } + + // Zusammengesetzter Key aus clearingtype + wallettype + $key = $payment->clearingtype; + if ($payment->wallettype) { + $key .= '_' . $payment->wallettype; + } + + $map = config('datev.counteraccount_map', []); + + return isset($map[$key]) ? intval($map[$key]) : $sammeldebitor; + } + + /** + * Bestimmt den Steuerstatus eines Beraters für die Provision. + */ + private function determineCommissionTaxStatus($account): string + { + if (! $account) { + return 'normal'; + } + + // Reverse Charge hat Vorrang + if ($account->reverse_charge) { + return 'reverse_charge'; + } + + // Kleinunternehmer (taxable_sales = 2) + if ($account->taxable_sales == 2) { + return 'kleinunternehmer'; + } + + // Ausland nicht USt-pflichtig (taxable_sales = 3) + // Wird wie Reverse Charge behandelt, falls aus EU + if ($account->taxable_sales == 3) { + $country = $account->country; + if ($country && $country->eu_country) { + return 'reverse_charge'; + } + + return 'kleinunternehmer'; // Drittland: kein BU nötig, aber KU als Fallback + } + + return 'normal'; + } + + /* + |-------------------------------------------------------------------------- + | Hilfsmethoden: Datenaufbereitung + |-------------------------------------------------------------------------- + */ + + /** + * Löst die Country-Entität aus ShoppingOrder auf. + * ShoppingOrder.country_id -> ShippingCountry -> Country + */ + private function resolveCountry($order): ?Country + { + if (! $order->country) { + return null; + } + + $shippingCountryId = $order->country->country_id ?? null; + if (! $shippingCountryId) { + return null; + } + + if (! isset($this->countryCache[$shippingCountryId])) { + $this->countryCache[$shippingCountryId] = Country::find($shippingCountryId); + } + + return $this->countryCache[$shippingCountryId]; + } + + /** + * Prüft ob das Land Deutschland ist. + */ + private function isDomestic(?Country $country): bool + { + if (! $country) { + return true; // Fallback: Inland + } + + return $country->id == config('datev.germany_country_id', 1); + } + + /** + * Prüft ob das Land in der EU ist. + */ + private function isEuCountry(?Country $country): bool + { + if (! $country) { + return false; + } + + return (bool) $country->eu_country; + } + + /** + * Ermittelt die USt-ID des Bestellers (auth_user). + * Nur registrierte Berater mit hinterlegter USt-ID qualifizieren sich + * für steuerfreie innergemeinschaftliche Lieferungen. + */ + private function resolveEuUstid($order, bool $isDomestic): ?string + { + if ($isDomestic) { + return null; + } + + return $order->auth_user?->account?->tax_identification_number ?: null; + } + + /** + * Baut den Buchungstext für Umsatz-Buchungen. + * Format: "Nachname Vorname" + */ + private function buildBuchungstext($order): string + { + if ($order->shopping_user) { + $name = trim( + ($order->shopping_user->billing_lastname ?? '') . ' ' . + ($order->shopping_user->billing_firstname ?? '') + ); + + if (! empty($name)) { + return mb_substr($name, 0, 60); + } + } + + return '-'; + } + + /** + * Baut den Buchungstext für Gutschrift-Buchungen. + * Format: "Nachname Vorname; BeraterNr" + */ + private function buildCreditBuchungstext($account, $user, ?int $creditUserId = null): string + { + $parts = []; + + if ($account) { + $name = trim(($account->last_name ?? '') . ' ' . ($account->first_name ?? '')); + if (! empty($name)) { + $parts[] = $name; + } + } + + $userId = $user?->id ?? $creditUserId; + if ($userId) { + $parts[] = 'Nr.' . $userId; + } + + $text = implode('; ', $parts); + + return mb_substr($text ?: '-', 0, 60); + } + + /** + * Parst das Belegdatum aus der Invoice. + */ + private function parseBelegdatum($invoice): string + { + // UserInvoice.date hat einen Custom Accessor der formatiert + // Wir brauchen den Rohwert + $rawDate = $invoice->getRawOriginal('date'); + + if ($rawDate) { + return $rawDate; + } + + // Fallback: Erster des Monats + return Carbon::create($invoice->year, $invoice->month, 1)->format('Y-m-d'); + } + + /** + * Parst einen formatierten Zahlenwert (z.B. "5.00" oder "5,00") zu float. + * Behandelt sowohl einfache Werte als auch tax_split Arrays (homeparty). + */ + private function parseNumber($value): float + { + if (is_array($value)) { + // Homeparty tax_split Format: ['vk_tax' => '5.00', 'ek_tax' => '2.00'] + return floatval(str_replace(',', '.', $value['vk_tax'] ?? 0)); + } + + return floatval(str_replace(',', '.', $value)); + } + + /** + * Escaped ein CSV-Feld (Semikolon, Anführungszeichen, Newlines). + */ + private function escapeCsvField(string $value): string + { + // Semikolons und Anführungszeichen in Buchungstext escapen + $value = str_replace('"', '""', $value); + + if (str_contains($value, ';') || str_contains($value, '"') || str_contains($value, "\n")) { + return '"' . $value . '"'; + } + + return $value; + } + + /** + * Generiert den Dateinamen für die Export-Datei. + */ + private function generateFilename(int $month, int $year): string + { + $monthPad = str_pad($month, 2, '0', STR_PAD_LEFT); + + return "EXTF_Buchungsstapel_{$year}_{$monthPad}_" . date('YmdHis') . '.csv'; + } +} diff --git a/app/Services/DhlTrackingService.php b/app/Services/DhlTrackingService.php index cb79464..61a7e2b 100644 --- a/app/Services/DhlTrackingService.php +++ b/app/Services/DhlTrackingService.php @@ -3,9 +3,11 @@ namespace App\Services; use Acme\Dhl\Models\DhlShipment; +use Acme\Dhl\Models\DhlTrackingEvent; use App\Http\Controllers\SettingController; use App\Jobs\TrackShipmentJob; use Exception; +use Illuminate\Support\Collection; use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Log; @@ -42,6 +44,7 @@ class DhlTrackingService Log::info('[DHL Tracking Service] Tracking shipment with Unified API', [ 'tracking_number' => $trackingNumber, 'is_sandbox' => $this->isSandbox, + 'has_api_key' => ! empty($this->apiKey), ]); $response = Http::withHeaders([ @@ -60,16 +63,21 @@ class DhlTrackingService CURLOPT_CONNECTTIMEOUT => config('dhl.ssl.connect_timeout', 10), CURLOPT_TIMEOUT => config('dhl.ssl.timeout', 30), CURLOPT_USERAGENT => 'acme-laravel-dhl/1.0', - ] + ], ]) - ->get('https://api.dhl.com/track/shipments', [ + ->get('https://api-eu.dhl.com/track/shipments', [ 'trackingNumber' => $trackingNumber, - 'service' => 'express,parcel', 'requesterCountryCode' => 'DE', 'originCountryCode' => 'DE', 'language' => 'de', ]); + Log::info('[DHL Tracking Service] Unified API response', [ + 'tracking_number' => $trackingNumber, + 'status_code' => $response->status(), + 'successful' => $response->successful(), + ]); + if ($response->successful()) { $data = $response->json(); @@ -80,8 +88,8 @@ class DhlTrackingService 'success' => true, 'tracking_number' => $shipment['id'], 'status' => $shipment['status']['statusCode'] ?? 'unknown', - 'status_text' => $shipment['status']['status'] ?? 'Unbekannt', - 'description' => $shipment['status']['description'] ?? '', + 'status_text' => $shipment['status']['description'] ?? ($shipment['status']['status'] ?? 'Unbekannt'), + 'description' => $shipment['status']['remark'] ?? ($shipment['status']['description'] ?? ''), 'last_update' => $shipment['status']['timestamp'] ?? null, 'origin' => $shipment['origin']['address']['addressLocality'] ?? null, 'destination' => $shipment['destination']['address']['addressLocality'] ?? null, @@ -91,6 +99,12 @@ class DhlTrackingService } } + Log::warning('[DHL Tracking Service] Unified API did not find shipment, trying Parcel DE API', [ + 'tracking_number' => $trackingNumber, + 'status_code' => $response->status(), + 'response_snippet' => mb_substr($response->body(), 0, 500), + ]); + // If Unified API fails, try Parcel DE API return $this->trackShipmentDE($trackingNumber, $options); } catch (Exception $e) { @@ -113,13 +127,14 @@ class DhlTrackingService Log::info('[DHL Tracking Service] Tracking shipment with Parcel DE API', [ 'tracking_number' => $trackingNumber, 'is_sandbox' => $this->isSandbox, + 'has_api_key' => ! empty($this->apiKey), + 'has_api_secret' => ! empty($this->apiSecret), ]); - $response = Http::withBasicAuth($this->apiKey, $this->apiSecret) - ->withHeaders([ - 'Accept' => 'application/json', - 'dhl-api-key' => $this->apiKey, - ]) + $response = Http::withHeaders([ + 'DHL-API-Key' => $this->apiKey, + 'Accept' => 'application/json', + ]) ->withOptions([ 'verify' => config('dhl.ssl.verify_peer', true), 'http_errors' => false, @@ -132,13 +147,20 @@ class DhlTrackingService CURLOPT_CONNECTTIMEOUT => config('dhl.ssl.connect_timeout', 10), CURLOPT_TIMEOUT => config('dhl.ssl.timeout', 30), CURLOPT_USERAGENT => 'acme-laravel-dhl/1.0', - ] + ], ]) - ->get('https://api.dhl.com/parcel/de/tracking/v1/shipments', [ - 'trackingNumber' => $trackingNumber, + ->get('https://api-eu.dhl.com/parcel/de/tracking/v0/shipments', [ + 'shipmentId' => $trackingNumber, 'language' => 'de', ]); + Log::info('[DHL Tracking Service] Parcel DE API response', [ + 'tracking_number' => $trackingNumber, + 'status_code' => $response->status(), + 'successful' => $response->successful(), + 'response_body' => $response->body(), + ]); + if ($response->successful()) { $data = $response->json(); @@ -158,21 +180,33 @@ class DhlTrackingService } } + // Log detailed error information + Log::warning('[DHL Tracking Service] Shipment not found or not yet tracked', [ + 'tracking_number' => $trackingNumber, + 'status_code' => $response->status(), + 'response_body' => $response->body(), + ]); + return [ 'success' => false, - 'message' => 'Sendung nicht gefunden oder noch nicht im System erfasst.', + 'message' => 'Sendung nicht gefunden oder noch nicht im System erfasst. HTTP Status: '.$response->status(), 'tracking_number' => $trackingNumber, 'api_used' => 'parcel_de', + 'debug_info' => [ + 'status_code' => $response->status(), + 'response' => $response->json(), + ], ]; } catch (Exception $e) { Log::error('[DHL Tracking Service] Parcel DE API failed', [ 'tracking_number' => $trackingNumber, 'error' => $e->getMessage(), + 'trace' => $e->getTraceAsString(), ]); return [ 'success' => false, - 'message' => 'Fehler beim Abrufen der Tracking-Informationen: ' . $e->getMessage(), + 'message' => 'Fehler beim Abrufen der Tracking-Informationen: '.$e->getMessage(), 'tracking_number' => $trackingNumber, 'api_used' => 'parcel_de', ]; @@ -208,11 +242,10 @@ class DhlTrackingService CURLOPT_CONNECTTIMEOUT => config('dhl.ssl.connect_timeout', 10), CURLOPT_TIMEOUT => config('dhl.ssl.timeout', 30), CURLOPT_USERAGENT => 'acme-laravel-dhl/1.0', - ] + ], ]) - ->get('https://api.dhl.com/track/shipments', [ + ->get('https://api-eu.dhl.com/track/shipments', [ 'trackingNumber' => implode(',', $trackingNumbers), - 'service' => 'parcel', 'requesterCountryCode' => 'DE', 'language' => 'de', ]); @@ -250,7 +283,7 @@ class DhlTrackingService return [ 'success' => false, - 'message' => 'Fehler beim Abrufen der Tracking-Informationen: ' . $e->getMessage(), + 'message' => 'Fehler beim Abrufen der Tracking-Informationen: '.$e->getMessage(), ]; } } @@ -302,7 +335,7 @@ class DhlTrackingService return [ 'success' => false, - 'message' => 'Fehler beim Einreihen des Tracking-Updates: ' . $e->getMessage(), + 'message' => 'Fehler beim Einreihen des Tracking-Updates: '.$e->getMessage(), 'queued' => false, ]; } @@ -333,17 +366,31 @@ class DhlTrackingService $result = $this->trackShipment($shipment->dhl_shipment_no); if ($result['success']) { + $internalStatus = $this->mapDhlStatusToInternal($result['status']); + // Update shipment with tracking data - $shipment->update([ - 'status' => $this->mapDhlStatusToInternal($result['status']), + $updateData = [ + 'status' => $internalStatus, 'tracking_status' => $result['status_text'], 'last_tracked_at' => now(), - ]); + ]; + + // Mark tracking as completed if terminal status reached + if (in_array($internalStatus, DhlShipment::TERMINAL_STATUSES)) { + $updateData['tracking_completed_at'] = now(); + } + + $shipment->update($updateData); + + // Save tracking events + $this->saveTrackingEvents($shipment, $result['events'] ?? []); Log::info('[DHL Tracking Service] Tracking updated successfully (sync)', [ 'shipment_id' => $shipment->id, 'dhl_shipment_no' => $shipment->dhl_shipment_no, 'tracking_status' => $result['status'], + 'tracking_completed' => in_array($internalStatus, DhlShipment::TERMINAL_STATUSES), + 'events_count' => count($result['events'] ?? []), 'api_used' => $result['api_used'], ]); @@ -353,6 +400,7 @@ class DhlTrackingService 'queued' => false, 'shipment_id' => $shipment->id, 'tracking_status' => $result['status'], + 'tracking_completed' => in_array($internalStatus, DhlShipment::TERMINAL_STATUSES), 'tracking_details' => $result, ]; } else { @@ -371,13 +419,177 @@ class DhlTrackingService return [ 'success' => false, - 'message' => 'Fehler beim Aktualisieren der Tracking-Informationen: ' . $e->getMessage(), + 'message' => 'Fehler beim Aktualisieren der Tracking-Informationen: '.$e->getMessage(), 'queued' => false, 'shipment_id' => $shipment->id, ]; } } + /** + * Update tracking for a batch of DHL shipments using the multi-tracking API. + * Processes shipments in chunks of 10 (DHL API limit) with rate-limiting pauses. + * + * @param Collection $shipments + * @return array{updated: int, failed: int, completed: int, results: array} + */ + public function updateTrackingBatch(Collection $shipments): array + { + $stats = [ + 'updated' => 0, + 'failed' => 0, + 'completed' => 0, + 'results' => [], + ]; + + // Process in chunks of 10 (DHL API limit) + $chunks = $shipments->chunk(10); + $chunkIndex = 0; + + foreach ($chunks as $chunk) { + // Rate limiting: pause 1 second between batch API calls + if ($chunkIndex > 0) { + sleep(1); + } + $chunkIndex++; + + // Build tracking number => shipment mapping + $shipmentMap = []; + foreach ($chunk as $shipment) { + $shipmentMap[$shipment->dhl_shipment_no] = $shipment; + } + + $trackingNumbers = array_keys($shipmentMap); + + try { + $batchResult = $this->trackMultipleShipments($trackingNumbers); + + if ($batchResult['success'] && ! empty($batchResult['shipments'])) { + // Process each result from the batch API + foreach ($batchResult['shipments'] as $trackingResult) { + $trackingNo = $trackingResult['tracking_number']; + $shipment = $shipmentMap[$trackingNo] ?? null; + + if (! $shipment) { + Log::warning('[DHL Tracking Service] Batch: tracking number not mapped', [ + 'tracking_number' => $trackingNo, + ]); + + continue; + } + + // Remove from map so we can detect missing ones later + unset($shipmentMap[$trackingNo]); + + $internalStatus = $this->mapDhlStatusToInternal($trackingResult['status']); + + $updateData = [ + 'status' => $internalStatus, + 'tracking_status' => $trackingResult['status_text'], + 'last_tracked_at' => now(), + ]; + + // Mark tracking as completed if terminal status reached + $isCompleted = in_array($internalStatus, DhlShipment::TERMINAL_STATUSES); + if ($isCompleted) { + $updateData['tracking_completed_at'] = now(); + $stats['completed']++; + } + + $shipment->update($updateData); + + // Save tracking events + $this->saveTrackingEvents($shipment, $trackingResult['events'] ?? []); + + $stats['updated']++; + $stats['results'][] = [ + 'shipment_id' => $shipment->id, + 'tracking_number' => $trackingNo, + 'status' => $internalStatus, + 'completed' => $isCompleted, + 'success' => true, + ]; + } + + // Any remaining shipments in the map were not returned by the API + foreach ($shipmentMap as $trackingNo => $shipment) { + // Update last_tracked_at so we don't immediately retry + $shipment->update(['last_tracked_at' => now()]); + $stats['failed']++; + $stats['results'][] = [ + 'shipment_id' => $shipment->id, + 'tracking_number' => $trackingNo, + 'success' => false, + 'message' => 'Nicht in Batch-Antwort enthalten', + ]; + } + } else { + // Entire batch failed - fall back to individual tracking + Log::warning('[DHL Tracking Service] Batch tracking failed, falling back to individual tracking', [ + 'tracking_numbers' => $trackingNumbers, + 'message' => $batchResult['message'] ?? 'Unknown error', + ]); + + foreach ($chunk as $shipment) { + try { + $result = $this->updateTracking($shipment, ['auto_retrack' => false]); + if ($result['success']) { + $stats['updated']++; + if (! empty($result['tracking_completed'])) { + $stats['completed']++; + } + } else { + $stats['failed']++; + } + $stats['results'][] = [ + 'shipment_id' => $shipment->id, + 'tracking_number' => $shipment->dhl_shipment_no, + 'success' => $result['success'], + 'fallback' => true, + ]; + } catch (Exception $e) { + $stats['failed']++; + $stats['results'][] = [ + 'shipment_id' => $shipment->id, + 'tracking_number' => $shipment->dhl_shipment_no, + 'success' => false, + 'message' => $e->getMessage(), + 'fallback' => true, + ]; + } + } + } + } catch (Exception $e) { + Log::error('[DHL Tracking Service] Batch tracking exception', [ + 'tracking_numbers' => $trackingNumbers, + 'error' => $e->getMessage(), + ]); + + // Mark all as failed but update last_tracked_at + foreach ($chunk as $shipment) { + $shipment->update(['last_tracked_at' => now()]); + $stats['failed']++; + $stats['results'][] = [ + 'shipment_id' => $shipment->id, + 'tracking_number' => $shipment->dhl_shipment_no, + 'success' => false, + 'message' => $e->getMessage(), + ]; + } + } + } + + Log::info('[DHL Tracking Service] Batch tracking completed', [ + 'total' => $shipments->count(), + 'updated' => $stats['updated'], + 'failed' => $stats['failed'], + 'completed' => $stats['completed'], + 'chunks' => $chunks->count(), + ]); + + return $stats; + } + /** * Map DHL status codes to internal status */ @@ -414,6 +626,39 @@ class DhlTrackingService return $descriptions[$statusCode] ?? 'Unbekannter Status'; } + /** + * Save tracking events from API response to database + */ + private function saveTrackingEvents(DhlShipment $shipment, array $events): void + { + if (empty($events)) { + return; + } + + foreach ($events as $event) { + $eventTime = isset($event['timestamp']) ? \Carbon\Carbon::parse($event['timestamp']) : now(); + + // Upsert: avoid duplicates based on shipment + event_time + status_code + DhlTrackingEvent::updateOrCreate( + [ + 'shipment_id' => $shipment->id, + 'event_time' => $eventTime, + 'status_code' => $event['statusCode'] ?? ($event['status'] ?? 'unknown'), + ], + [ + 'status_text' => $event['description'] ?? ($event['remark'] ?? 'Unbekannt'), + 'location' => $event['location']['address']['addressLocality'] ?? null, + 'raw' => $event, + ] + ); + } + + Log::info('[DHL Tracking Service] Tracking events saved', [ + 'shipment_id' => $shipment->id, + 'events_saved' => count($events), + ]); + } + /** * Get SSL version constant based on configuration */ diff --git a/app/Services/Invoice.php b/app/Services/Invoice.php index 70ad3c5..002617c 100644 --- a/app/Services/Invoice.php +++ b/app/Services/Invoice.php @@ -1,4 +1,5 @@ lockForUpdate() + ->first(); + + if (! $setting) { + // Create if not exists + $setting = Setting::create([ + 'slug' => 'invoice-number', + 'type' => 'int', + 'int' => 1, + ]); + + return 1; + } + + $invoice_number = (int) $setting->int; + $invoice_number = $invoice_number + 1; + + // Update directly on the locked row + $setting->int = $invoice_number; + $setting->save(); + + return $invoice_number; + }); } - public static function createInvoiceNumber($invoice_number, $invoice_date){ + public static function createInvoiceNumber($invoice_number, $invoice_date) + { $prefix = \Carbon::parse($invoice_date)->format('Y'); $invoice_number = str_pad($invoice_number, 5, '0', STR_PAD_LEFT); + return $prefix.$invoice_number; } - public static function getInvoiceStorageDir($invoice_date){ - return "invoice/".\Carbon::parse($invoice_date)->format('Y/m/'); + public static function getInvoiceStorageDir($invoice_date) + { + return 'invoice/'.\Carbon::parse($invoice_date)->format('Y/m/'); } - public static function getDeliveryStorageDir($invoice_date){ - return "delivery/".\Carbon::parse($invoice_date)->format('Y/m/'); + public static function getDeliveryStorageDir($invoice_date) + { + return 'delivery/'.\Carbon::parse($invoice_date)->format('Y/m/'); } - public static function makeInvoiceFilename($invoice_number){ - return $invoice_number."-MIVITA-Rechnung.pdf"; + public static function makeInvoiceFilename($invoice_number) + { + return $invoice_number.'-MIVITA-Rechnung.pdf'; } - public static function makeDeliveryFilename($invoice_number){ - return $invoice_number."-MIVITA-Lieferschein.pdf"; + public static function makeDeliveryFilename($invoice_number) + { + return $invoice_number.'-MIVITA-Lieferschein.pdf'; } - public static function isInvoice(ShoppingOrder $shopping_order){ + /** + * Erstellt den Dateinamen für eine Stornorechnung + * + * @param string $invoice_number + * @return string + */ + public static function makeCancellationFilename($invoice_number) + { + return $invoice_number.'-MIVITA-Stornorechnung.pdf'; + } + + /** + * Erstellt den Dateinamen für einen Storno-Lieferschein + * + * @param string $invoice_number + * @return string + */ + public static function makeCancellationDeliveryFilename($invoice_number) + { + return $invoice_number.'-MIVITA-Storno-Lieferschein.pdf'; + } + + /** + * Erstellt den Dateinamen für eine lokalisierte Rechnung. + * Deutsch (de) ist das Original ohne Suffix. + * + * @param string $invoice_number + * @param string $locale + * @return string + */ + public static function makeInvoiceFilenameLocale($invoice_number, $locale) + { + if ($locale === 'de' || ! $locale) { + return self::makeInvoiceFilename($invoice_number); + } + + return $invoice_number.'-MIVITA-Rechnung-'.$locale.'.pdf'; + } + + /** + * Erstellt den Dateinamen für einen lokalisierten Lieferschein. + * Deutsch (de) ist das Original ohne Suffix. + * + * @param string $invoice_number + * @param string $locale + * @return string + */ + public static function makeDeliveryFilenameLocale($invoice_number, $locale) + { + if ($locale === 'de' || ! $locale) { + return self::makeDeliveryFilename($invoice_number); + } + + return $invoice_number.'-MIVITA-Lieferschein-'.$locale.'.pdf'; + } + + public static function isInvoice(ShoppingOrder $shopping_order) + { return $shopping_order->isInvoice(); } - public static function sendInvoiceMail($shopping_order, $user_invoice){ + /** + * Holt die Rechnungsnummer einer Bestellung + * + * @return string|null + */ + public static function getNumber(ShoppingOrder $shopping_order) + { + return $shopping_order->user_invoice ? $shopping_order->user_invoice->full_number : null; + } + + /** + * Holt das Rechnungsdatum einer Bestellung + * + * @return string|null + */ + public static function getDate(ShoppingOrder $shopping_order) + { + return $shopping_order->user_invoice ? $shopping_order->user_invoice->date : null; + } + + public static function sendInvoiceMail($shopping_order, $user_invoice) + { $bcc = []; $billing_email = $shopping_order->shopping_user->billing_email; - if(!$billing_email){ - if($shopping_order->mode === 'test'){ + if (! $billing_email) { + if ($shopping_order->mode === 'test') { $billing_email = config('app.checkout_test_mail'); - }else{ + } else { $billing_email = config('app.checkout_mail'); } } - if($shopping_order->mode === 'test'){ + if ($shopping_order->mode === 'test') { $bcc[] = config('app.checkout_test_mail'); - }else{ + } else { $bcc[] = config('app.checkout_mail'); } - + Mail::to($billing_email)->bcc($bcc)->locale($shopping_order->getLocale())->send(new MailInvoice($shopping_order, $user_invoice)); } } diff --git a/app/Services/OrderPaymentService.php b/app/Services/OrderPaymentService.php index b4d8599..00cfeaf 100644 --- a/app/Services/OrderPaymentService.php +++ b/app/Services/OrderPaymentService.php @@ -2,19 +2,18 @@ namespace App\Services; -use App\Models\ShoppingUser; use App\Models\ShoppingInstance; +use App\Models\ShoppingUser; use Yard; class OrderPaymentService { - public static function deleteInstance($identifier) { Yard::instance('shopping')->deleteStoredCart($identifier); - \App\Models\ShoppingInstance::where('identifier', $identifier)->delete(); - //delete session + \App\Models\ShoppingInstance::where('identifier', $identifier)->delete(); + // delete session /* if(\Session::has('user_shop_payment') && \Session::get('user_shop_payment') === 6){ $user_shop_identifier = \Session::get('user_shop_identifier'); Yard::instance('shopping')->deleteStoredCart($identifier); @@ -24,7 +23,7 @@ class OrderPaymentService public static function updateInstanceStatus($identifier, $status, $lower = true) { - if (!ShoppingInstance::where('identifier', $identifier)->exists()) { + if (! ShoppingInstance::where('identifier', $identifier)->exists()) { return false; } if ($lower) { @@ -39,9 +38,10 @@ class OrderPaymentService public static function getInstanceStatus($identifier) { $shopping_instance = ShoppingInstance::where('identifier', $identifier)->first(); - if (!$shopping_instance) { + if (! $shopping_instance) { return false; } + return $shopping_instance->getStatus(); } @@ -49,33 +49,39 @@ class OrderPaymentService { $isFor = $shoppingInstance->shopping_data['is_for'] ?? '-'; if ($isFor === 'abo-ot-customer') { - return ' ' . __('abo.abo') . ''; + return ' '.__('abo.abo').''; } if ($isFor === 'ot-customer') { - return ' ' . __('order.order') . ''; + return ' '.__('order.order').''; } - return ""; + + return ''; + } + + public static function getStatusBadgeClasses() + { + return [ + 'link_sent' => 'default', + 'link_openly' => 'info', + 'link_check' => 'warning', + 'link_pending' => 'warning', + 'link_appointed' => 'warning', + 'link_paid' => 'secondary', + 'link_failed' => 'danger', + 'link_canceled' => 'danger', + ]; } public static function getStatusBadge(ShoppingInstance $shoppingInstance) { $status = $shoppingInstance->getStatus(); - $badgeClasses = [ - 'link_sent' => 'info', - 'link_openly' => 'info', - 'link_paid' => 'secondary', - 'link_check' => 'warning', - 'link_pending' => 'warning', - 'link_appointed' => 'warning', - 'link_failed' => 'danger', - 'link_canceled' => 'danger' - ]; + $badgeClasses = self::getStatusBadgeClasses(); if (isset($badgeClasses[$status])) { return sprintf( ' %s', $badgeClasses[$status], - __('payment.' . $status) + __('payment.'.$status) ); } @@ -100,7 +106,7 @@ class OrderPaymentService return sprintf( '
%s
', $badgeClasses[$status], - __('payment.alert_' . $status) + __('payment.alert_'.$status) ); } @@ -111,12 +117,12 @@ class OrderPaymentService { $shopping_instance = ShoppingInstance::where('identifier', $identifier)->first(); - if (!$shopping_instance) { + if (! $shopping_instance) { abort(403, __('msg.shopping_instance_not_found')); } $shopping_data = $shopping_instance->shopping_data; $shopping_user = $shopping_data['shopping_user_id'] ? ShoppingUser::find($shopping_data['shopping_user_id']) : null; - if (!$shopping_user) { + if (! $shopping_user) { abort(403, __('msg.shopping_user_not_found')); } $yard_shopping_items = self::getRestoredYardShoppingItems($shopping_instance); @@ -130,6 +136,7 @@ class OrderPaymentService 'is_for' => $shopping_instance->shopping_data['is_for'] ?? false, 'backlink' => false, ]; + return $data; } @@ -145,7 +152,6 @@ class OrderPaymentService Yard::instance('shopping')->setUserPriceInfos($shopping_instance->shopping_data['user_price_infos']); Yard::instance('shopping')->setShippingCountryWithPrice($shopping_instance->country_id, $is_for); - $rows = Yard::instance('shopping')->getContentByOrder(); $ret = []; $ret['items'] = []; @@ -154,12 +160,12 @@ class OrderPaymentService foreach ($rows as $row) { $product = \App\Models\Product::find($row->id); - $item = new \stdClass(); + $item = new \stdClass; $item->image = $row->options->has('image') ? $row->options->image : null; $item->price_net = (float) Yard::instance('shopping')->rowPriceNet($row, 3, '.', ''); $item->price_net_total = (float) Yard::instance('shopping')->rowSubtotalNet($row, 2, '.', ''); - $item->price_currency = $is_currency ? "~" . Yard::instance('shopping')->getCurrencyByKey('rowPriceNetCurrency', $row, 3) . " " . Yard::instance('shopping')->getPriceCurrencyUnit() : null; - $item->price_currency_total = $is_currency ? "~" . Yard::instance('shopping')->getCurrencyByKey('rowSubtotalCurrency', $row, 3) . " " . Yard::instance('shopping')->getPriceCurrencyUnit() : null; + $item->price_currency = $is_currency ? '~'.Yard::instance('shopping')->getCurrencyByKey('rowPriceNetCurrency', $row, 3).' '.Yard::instance('shopping')->getPriceCurrencyUnit() : null; + $item->price_currency_total = $is_currency ? '~'.Yard::instance('shopping')->getCurrencyByKey('rowSubtotalCurrency', $row, 3).' '.Yard::instance('shopping')->getPriceCurrencyUnit() : null; $item->price = $row->price; $item->price_total = ($row->qty * $row->price); $item->qty = $row->qty; @@ -174,16 +180,16 @@ class OrderPaymentService $ret['tax_free'] = $tax_free; $ret['total']['subtotal'] = Yard::instance('shopping')->subtotal(); - $ret['total']['subtotal_currency'] = $is_currency ? "~" . Yard::instance('shopping')->getCurrencyByKey('subtotal') . " " . Yard::instance('shopping')->getPriceCurrencyUnit() : null; + $ret['total']['subtotal_currency'] = $is_currency ? '~'.Yard::instance('shopping')->getCurrencyByKey('subtotal').' '.Yard::instance('shopping')->getPriceCurrencyUnit() : null; $ret['total']['shippingCountryName'] = Yard::instance('shopping')->getShippingCountryName(); $ret['total']['shippingNet'] = Yard::instance('shopping')->shippingNet(); - $ret['total']['shippingNet currency'] = $is_currency ? "~" . Yard::instance('shopping')->getCurrencyByKey('shippingNet') . " " . Yard::instance('shopping')->getPriceCurrencyUnit() : null; + $ret['total']['shippingNet currency'] = $is_currency ? '~'.Yard::instance('shopping')->getCurrencyByKey('shippingNet').' '.Yard::instance('shopping')->getPriceCurrencyUnit() : null; $ret['total']['subtotalWithShipping'] = Yard::instance('shopping')->subtotalWithShipping(); - $ret['total']['subtotalWithShipping_currency'] = $is_currency ? "~" . Yard::instance('shopping')->getCurrencyByKey('subtotalWithShipping') . " " . Yard::instance('shopping')->getPriceCurrencyUnit() : null; + $ret['total']['subtotalWithShipping_currency'] = $is_currency ? '~'.Yard::instance('shopping')->getCurrencyByKey('subtotalWithShipping').' '.Yard::instance('shopping')->getPriceCurrencyUnit() : null; $ret['total']['taxWithShipping'] = Yard::instance('shopping')->taxWithShipping(); - $ret['total']['taxWithShipping_currency'] = $is_currency ? "~" . Yard::instance('shopping')->getCurrencyByKey('taxWithShipping') . " " . Yard::instance('shopping')->getPriceCurrencyUnit() : null; + $ret['total']['taxWithShipping_currency'] = $is_currency ? '~'.Yard::instance('shopping')->getCurrencyByKey('taxWithShipping').' '.Yard::instance('shopping')->getPriceCurrencyUnit() : null; $ret['total']['totalWithShipping'] = Yard::instance('shopping')->totalWithShipping(); - $ret['total']['totalWithShipping_currency'] = $is_currency ? "~" . Yard::instance('shopping')->getCurrencyByKey('totalWithShipping') . " " . Yard::instance('shopping')->getPriceCurrencyUnit() : null; + $ret['total']['totalWithShipping_currency'] = $is_currency ? '~'.Yard::instance('shopping')->getCurrencyByKey('totalWithShipping').' '.Yard::instance('shopping')->getPriceCurrencyUnit() : null; return $ret; } diff --git a/app/Services/Payment.php b/app/Services/Payment.php index a4c3dd5..f2bc930 100644 --- a/app/Services/Payment.php +++ b/app/Services/Payment.php @@ -2,7 +2,6 @@ namespace App\Services; - use App\Mail\MailCheckout; use App\Models\ProductBuying; use App\Models\ShoppingOrder; @@ -10,26 +9,22 @@ use App\Models\ShoppingPayment; use App\Models\UserCreditItem; use App\Models\UserLevel; use App\Repositories\InvoiceRepository; -use App\Services\AboHelper; use App\Services\BusinessPlan\SalesPointsVolume; -use App\Services\ShopApiOrderCart; -use App\Services\UserUtil; -use App\Services\Util; use App\User; use Illuminate\Support\Facades\Mail; class Payment { - public static $txaction_text = [ 'paid' => 'paid', 'appointed' => 'open', 'failed' => 'failed', - 'extern' => 'open', //offen + 'extern' => 'open', // offen 'extern_paid' => 'paid', 'invoice_open' => 'open', 'invoice_paid' => 'paid', 'invoice_non' => 'no_payment', + 'cancelled' => 'cancelled', 'NULL' => 'no_payment', ]; @@ -37,11 +32,12 @@ class Payment 'paid' => 'paymend_paid', 'appointed' => 'paymend_open', 'failed' => 'paymend_failed', - 'extern' => 'extern_open', //offen + 'extern' => 'extern_open', // offen 'extern_paid' => 'extern_paid', 'invoice_open' => 'invoice_open', 'invoice_paid' => 'invoice_paid', 'invoice_non' => 'invoice_no_payment', + 'cancelled' => 'cancelled', 'NULL' => 'no_payment', ]; @@ -60,15 +56,16 @@ class Payment 'invoice_open' => 'warning', 'invoice_paid' => 'success', 'invoice_non' => 'failed', + 'cancelled' => 'danger', ]; - public static function getFormattedTxaction($txaction) { if ($txaction && isset(self::$txaction_text[$txaction])) { - return __('payment.' . self::$txaction_text[$txaction]); + return __('payment.'.self::$txaction_text[$txaction]); } - return __('payment.' . self::$txaction_text['NULL']); + + return __('payment.'.self::$txaction_text['NULL']); } public static function getFormattedTxactionColor($txaction) @@ -76,15 +73,17 @@ class Payment if ($txaction && isset(self::$txaction_color[$txaction])) { return self::$txaction_color[$txaction]; } - return "warning"; + + return 'warning'; } public static function getTransTxactionFilterText() { $ret = []; foreach (self::$txaction_filter_text as $key => $val) { - $ret[$key] = trans('payment.' . $val); + $ret[$key] = trans('payment.'.$val); } + return $ret; } @@ -92,8 +91,9 @@ class Payment { $ret = []; foreach (self::$txaction_invoice as $key => $val) { - $ret[$key] = trans('payment.' . $val); + $ret[$key] = trans('payment.'.$val); } + return $ret; } @@ -101,29 +101,32 @@ class Payment { if ($shopping_order->mode === 'test') { - return '' . strtoupper($shopping_order->mode) . ' - ' . self::getFormattedTxaction($shopping_order->txaction) . ''; + return ''.strtoupper($shopping_order->mode).' - '.self::getFormattedTxaction($shopping_order->txaction).''; } if ($shopping_order->mode === 'dev') { - return '' . strtoupper($shopping_order->mode) . ' - ' . self::getFormattedTxaction($shopping_order->txaction) . ''; + return ''.strtoupper($shopping_order->mode).' - '.self::getFormattedTxaction($shopping_order->txaction).''; } - return '' . self::getFormattedTxaction($shopping_order->txaction) . ''; + + return ''.self::getFormattedTxaction($shopping_order->txaction).''; } public static function getPaymentForBadge(ShoppingOrder $shopping_order) { $abo = ''; if ($shopping_order->is_abo) { - $abo = ' ' . __('abo.abo') . ''; + $abo = ' '.__('abo.abo').''; } - return '' . $shopping_order->getPaymentForType() . '' . $abo; + + return ''.$shopping_order->getPaymentForType().''.$abo; } public static function getShoppingPaymentBadge(ShoppingPayment $shopping_payment) { if ($shopping_payment->mode === 'test') { - return '' . strtoupper($shopping_payment->mode) . ' - ' . self::getFormattedTxaction($shopping_payment->txaction) . ''; + return ''.strtoupper($shopping_payment->mode).' - '.self::getFormattedTxaction($shopping_payment->txaction).''; } - return '' . self::getFormattedTxaction($shopping_payment->txaction) . ''; + + return ''.self::getFormattedTxaction($shopping_payment->txaction).''; } public static function addUserCreditMargin(User $user, $credit, $status, $message) @@ -133,7 +136,7 @@ class Payment 'credit' => $credit, 'message' => $message, 'from_month' => date('n'), - 'from_year' => date('Y'), + 'from_year' => date('Y'), 'status' => $status, ]); } @@ -143,7 +146,7 @@ class Payment ProductBuying::create([ 'user_id' => $user->id, 'product_id' => $product_id, - 'amount' => 1 + 'amount' => 1, ]); } @@ -155,9 +158,9 @@ class Payment 'user_id' => $user->user_sponsor->id, 'total_net' => 0, 'points' => $product->sponsor_buying_points_amount, - 'info' => 'VP: ' . $user->getFullName(false) . ' | ' . $product->name, + 'info' => 'VP: '.$user->getFullName(false).' | '.$product->name, 'status_points' => 2, - 'status' => 5 + 'status' => 5, ]; SalesPointsVolume::addSalesPointsVolume($data); } @@ -165,7 +168,7 @@ class Payment public static function updateUserLevel(User $user, $to_level_id) { - //nur updaten, wenn der user->m_level kleiner ist als $to_level_id + // nur updaten, wenn der user->m_level kleiner ist als $to_level_id if ($user->user_level) { $ToUserLevel = UserLevel::find($to_level_id); if ($user->user_level->pos < $ToUserLevel->pos) { @@ -190,7 +193,7 @@ class Payment $shopping_order->paid = $paid; $shopping_order->save(); - //if product has actions + // if product has actions if ($shopping_order->shopping_order_items && $shopping_order->auth_user_id) { foreach ($shopping_order->shopping_order_items as $shopping_order_item) { if ($shopping_order_item->product) { @@ -204,17 +207,19 @@ class Payment } if ($shopping_order_item->product->action) { $send_link = true; - //new date + // new date $date = \Carbon::now()->modify('1 year'); if ($user->payment_account && $user->daysActiveAccount() > 0) { $date = \Carbon::parse($user->payment_account)->modify('1 year'); } foreach ($shopping_order_item->product->action as $do) { + // bzw. product_id 34 = 0 => payment_for_account => payment_order_id = 35 = 0 => payment_for_account, 1 => payment_for_shop, 2 => payment_for_shop_upgrade + // 0 => payment_for_account, 1 => payment_for_shop, 2 => payment_for_shop_upgrade if ($shopping_order_item->product->getActionName($do) === 'payment_for_account') { - $user->payment_order_id = $shopping_order_item->product->id; //34 + $user->payment_order_id = $shopping_order_item->product->id; $user->payment_account = $date; $user->wizard = 100; - //only date is > now and acount is deactive. + // only date is > now and acount is deactive. if ($date > \Carbon::now()) { if ($user->active === 0) { $user->active = true; @@ -224,19 +229,22 @@ class Payment $shopping_order->setUserHistoryValue(['status' => 9]); } + // 1 => payment_for_shop if ($shopping_order_item->product->getActionName($do) === 'payment_for_shop') { - $user->payment_order_id = $shopping_order_item->product->id; //35 + $user->payment_order_id = $shopping_order_item->product->id; // 35 $user->payment_shop = $date; $user->wizard = 100; $shopping_order->setUserHistoryValue(['status' => 9]); } + // 2 => payment_for_shop_upgrade if ($shopping_order_item->product->getActionName($do) === 'payment_for_shop_upgrade') { if ($shopping_order_item->product->upgrade_to_id) { $user->payment_order_id = $shopping_order_item->product->upgrade_to_id; } - $user->payment_shop = $user->payment_account; //same Date, is upgrade + $user->payment_shop = $user->payment_account; // same Date, is upgrade $shopping_order->setUserHistoryValue(['status' => 9]); } + // 4 => payment_for_lead_upgrade if ($shopping_order_item->product->getActionName($do) === 'payment_for_lead_upgrade') { if ($shopping_order_item->product->upgrade_to_id) { self::updateUserLevel($user, $shopping_order_item->product->upgrade_to_id); @@ -259,20 +267,26 @@ class Payment $shopping_order->setUserHistoryValue(['status' => 9]); ShopApiOrderCart::finishOrder($shopping_order->shopping_collect_order); } - //the Order is Pay, so we can set the Status in the Abo + + // Set payment link status to paid for all orders + if ($shopping_payment) { + Util::setInstanceStatusByPayment($shopping_payment, 10); // link_paid + $shopping_payment->identifier = null; + $shopping_payment->save(); + } + + // the Order is Pay, so we can set the Status in the Abo if ($shopping_order->is_abo) { - if ($shopping_payment) { - Util::setInstanceStatusByPayment($shopping_payment, 10); //link_paid - $shopping_payment->identifier = null; - $shopping_payment->save(); - } AboHelper::setAboActive($shopping_order, 2, true); } - //make Invoice is not exist and is live + // make Invoice is not exist and is live if ($shopping_order->mode === 'live' || Util::isTestSystem(true)) { - $invoice_repo = new InvoiceRepository($shopping_order); - if (!$shopping_order->isInvoice()) { + // Reload the shopping order to check for invoice again (defense against race conditions) + $shopping_order->refresh(); + + if (! $shopping_order->isInvoice()) { + $invoice_repo = new InvoiceRepository($shopping_order); $invoice_repo->createAndSalesVolume(); } } @@ -287,15 +301,15 @@ class Payment // Überprüfung der Billing-E-Mail-Adresse - if (!$billing_email) { + if (! $billing_email) { if ($data['mode'] === 'test') { $billing_email = config('app.checkout_test_mail'); } else { $billing_email = config('app.checkout_mail'); } } - if (!filter_var($billing_email, FILTER_VALIDATE_EMAIL)) { - \Log::channel('payment')->error("Invalid billing email at shopping_order " . $shopping_order->id, ['billing_email' => $billing_email]); + if (! filter_var($billing_email, FILTER_VALIDATE_EMAIL)) { + \Log::channel('payment')->error('Invalid billing email at shopping_order '.$shopping_order->id, ['billing_email' => $billing_email]); $billing_email = config('app.checkout_mail'); } @@ -305,7 +319,7 @@ class Payment $bcc[] = config('app.checkout_mail'); } - if (!$shopping_order->shopping_user->is_like && $shopping_order->shopping_user->member) { + if (! $shopping_order->shopping_user->is_like && $shopping_order->shopping_user->member) { $bcc[] = $shopping_order->shopping_user->member->email; } $data['payment_error'] = isset($data['payment_error']) ? $data['payment_error'] : false; diff --git a/app/Services/PaymentHelper.php b/app/Services/PaymentHelper.php index 12db55f..58366ad 100644 --- a/app/Services/PaymentHelper.php +++ b/app/Services/PaymentHelper.php @@ -2,24 +2,20 @@ namespace App\Services; -use Yard; -use App\User; -use App\Models\UserHistory; -use App\Models\ShoppingUser; +use App\Http\Controllers\Pay\PayoneController; +use App\Models\PaymentTransaction; use App\Models\ShoppingOrder; use App\Models\ShoppingOrderItem; -use App\Models\PaymentTransaction; -use App\Http\Controllers\Pay\PayoneController; +use App\Models\ShoppingUser; +use App\Models\UserHistory; +use Yard; class PaymentHelper { - - - public function setProduct($product) { Yard::instance('shopping')->destroy(); - Yard::instance('shopping')->add($product->id, $product->getLang('name'), 1, $product->price, false, false, ['image' => "", 'slug' => $product->slug, 'weight' => $product->weight, 'points' => $product->points, 'no_commission' => $product->no_commission, 'show_on' => $product->show_on]); + Yard::instance('shopping')->add($product->id, $product->getLang('name'), 1, $product->price, false, false, ['image' => '', 'slug' => $product->slug, 'weight' => $product->weight, 'points' => $product->points, 'no_commission' => $product->no_commission, 'no_free_shipping' => $product->no_free_shipping, 'show_on' => $product->show_on]); } public function initELVPayment($user) @@ -28,17 +24,16 @@ class PaymentHelper $shopping_user = $this->makeShoppingUser($user); $shopping_order = $this->makeShoppingOrder($user, $shopping_user); - - $pay = new PayoneController(); + $pay = new PayoneController; $pay->init($shopping_user, $shopping_order); $amount = Yard::instance('shopping')->totalWithShipping(2, '.', '') * 100; $payment_method = 'elv'; - $ret['elv']['mandate_identification'] = isset($user->account->payment_data['mandate_identification']) ? $user->account->payment_data['mandate_identification'] : ""; - $ret['elv']['creditor_identifier'] = isset($user->account->payment_data['creditor_identifier']) ? $user->account->payment_data['creditor_identifier'] : ""; - $ret['elv']['iban'] = isset($user->account->payment_data['iban']) ? $user->account->payment_data['iban'] : ""; - $ret['elv']['bic'] = isset($user->account->payment_data['bic']) ? $user->account->payment_data['bic'] : ""; - $ret['elv']['bankaccountholder'] = isset($user->account->payment_data['bankaccountholder']) ? $user->account->payment_data['bankaccountholder'] : ""; + $ret['elv']['mandate_identification'] = isset($user->account->payment_data['mandate_identification']) ? $user->account->payment_data['mandate_identification'] : ''; + $ret['elv']['creditor_identifier'] = isset($user->account->payment_data['creditor_identifier']) ? $user->account->payment_data['creditor_identifier'] : ''; + $ret['elv']['iban'] = isset($user->account->payment_data['iban']) ? $user->account->payment_data['iban'] : ''; + $ret['elv']['bic'] = isset($user->account->payment_data['bic']) ? $user->account->payment_data['bic'] : ''; + $ret['elv']['bankaccountholder'] = isset($user->account->payment_data['bankaccountholder']) ? $user->account->payment_data['bankaccountholder'] : ''; $reference = $pay->setPrePayment($payment_method, $amount, 'EUR', $ret); $pay->setPersonalData(); @@ -71,12 +66,12 @@ class PaymentHelper if ($response['status'] === 'APPROVED') { $payT = PaymentTransaction::create([ 'shopping_payment_id' => $shopping_payment->id, - 'request' => 'authorization', + 'request' => 'authorization', 'txid' => $response['txid'], 'userid' => $response['userid'], 'status' => $response['status'], 'transmitted_data' => $response, - 'mode' => $shopping_payment->mode + 'mode' => $shopping_payment->mode, ]); UserHistory::create(['user_id' => $user->id, 'shopping_order_id' => $shopping_order->id, 'action' => 'abo_open_payment', 'referenz' => $payT->id, 'identifier' => $user->payment_account, 'status' => 5]); } @@ -84,7 +79,7 @@ class PaymentHelper public function makeShoppingUser($user, $is_from = 'membership', $is_for = 'me') { - $shopping_user = new ShoppingUser(); + $shopping_user = new ShoppingUser; $shopping_user->auth_user_id = $user->id; $shopping_user->mode = 'prev'; $shopping_user->language = $user->getLocale(); @@ -99,6 +94,7 @@ class PaymentHelper $shopping_user->billing_country_id = $user->account->country_id; $shopping_user->billing_phone = $user->account->phone; $shopping_user->billing_email = $user->email; + $shopping_user->language = $user->getLocale(); $shopping_user->faker_mail = false; $shopping_user->shipping_email = $user->email; $shopping_user->accepted_data_checkbox = 1; @@ -118,6 +114,7 @@ class PaymentHelper $shopping_user->shipping_phone = $user->account->shipping_phone; $shopping_user->shipping_postnumber = $user->account->shipping_postnumber; $shopping_user->save(); + return $shopping_user; } @@ -147,12 +144,12 @@ class PaymentHelper $shopping_order = ShoppingOrder::create($data); $items = Yard::instance('shopping')->getContentByOrder(); foreach ($items as $item) { - if (!ShoppingOrderItem::where('shopping_order_id', $shopping_order->id)->where('row_id', $item->rowId)->count()) { + if (! ShoppingOrderItem::where('shopping_order_id', $shopping_order->id)->where('row_id', $item->rowId)->count()) { $price_net = Yard::instance('shopping')->rowPriceNet($item, 2, '.', ''); $tax = $item->price - $price_net; $data = [ 'shopping_order_id' => $shopping_order->id, - 'row_id' => $item->rowId, + 'row_id' => $item->rowId, 'product_id' => $item->id, 'comp' => $item->options->comp, 'qty' => $item->qty, @@ -163,12 +160,13 @@ class PaymentHelper 'price_vk_net' => $shopping_order->getPriceVkNetBy($item->id), 'discount' => $item->options->no_commission ? 0 : $shopping_order->getUserDiscount(), 'points' => $item->options->points, - 'slug' => $item->options->slug + 'slug' => $item->options->slug, ]; $shopping_order_item = ShoppingOrderItem::create($data); } } $shopping_order->makeTaxSplit(); + return $shopping_order; } } diff --git a/app/Services/UserUtil.php b/app/Services/UserUtil.php index 67dfc19..5e70c72 100644 --- a/app/Services/UserUtil.php +++ b/app/Services/UserUtil.php @@ -2,7 +2,6 @@ namespace App\Services; - use App\Http\Controllers\Api\KasController; use App\Models\ShoppingUser; use App\Models\ShoppingUserMemberLog; @@ -12,8 +11,6 @@ use App\User; class UserUtil { - - public static function setShoppingUserToNewMember($pre_member_id, $new_member_id) { $ShoppingUsers = ShoppingUser::where('member_id', $pre_member_id)->get(); @@ -21,7 +18,7 @@ class UserUtil ShoppingUserMemberLog::create([ 'pre_member_id' => $shopping_user->member_id, 'shopping_user_id' => $shopping_user->id, - 'new_member_id' => $new_member_id + 'new_member_id' => $new_member_id, ]); $shopping_user->member_id = $new_member_id; $shopping_user->save(); @@ -30,8 +27,8 @@ class UserUtil public static function setNewSponsorToChilds($inactive_sponsor_id, $new_sponsor_id) { - //alle User die diesen inaktivien Sponsor haben - $child_users = User::where('m_sponsor', $inactive_sponsor_id)->get(); //auch deaktiverte + // alle User die diesen inaktivien Sponsor haben + $child_users = User::where('m_sponsor', $inactive_sponsor_id)->get(); // auch deaktiverte foreach ($child_users as $child_user) { UserCleanUpLog::create([ 'inactive_sponsor_id' => $inactive_sponsor_id, @@ -45,12 +42,12 @@ class UserUtil public static function resetChildsToSponsor($re_sponsor_id) { - //alle alten Childs vom re_sponsor_id / User wieder herstellen + // alle alten Childs vom re_sponsor_id / User wieder herstellen $UserCleanUpUsers = UserCleanUpLog::where('inactive_sponsor_id', $re_sponsor_id)->get(); foreach ($UserCleanUpUsers as $UserCleanUpUser) { $child_user = User::find($UserCleanUpUser->child_user_id); if ($child_user) { - //delete Logs from user child where is newer then this + // delete Logs from user child where is newer then this $deleteUserCleanUpLogs = UserCleanUpLog::where('child_user_id', $UserCleanUpUser->child_user_id)->where('created_at', '>', $UserCleanUpUser->created_at)->get(); foreach ($deleteUserCleanUpLogs as $deleteUserCleanUpLog) { $deleteUserCleanUpLog->delete(); @@ -58,11 +55,11 @@ class UserUtil if ($child_user->m_sponsor) { // child is active $child_user->m_sponsor = $re_sponsor_id; } - if ($child_user->pre_sponsor) { //child is inactive + if ($child_user->pre_sponsor) { // child is inactive $child_user->pre_sponsor = $re_sponsor_id; } $child_user->save(); - //delete this log + // delete this log $UserCleanUpUser->delete(); } } @@ -72,10 +69,22 @@ class UserUtil { $user = User::find($user_id); - if ($user) { + if (! $user) { + \Log::channel('cleanup')->error('setUserToClient: User not found, user_id: '.$user_id); + + return false; + } + + if (! $user->account) { + \Log::channel('cleanup')->error('setUserToClient: User has no account data, user_id: '.$user_id); + + return false; + } + + try { $data = [ 'member_id' => $sponsor_id, - 'language' => $user->lang ? $user->lang : 'de', + 'language' => $user->lang ?? 'de', 'billing_salutation' => $user->account->salutation, 'billing_company' => $user->account->company, 'billing_firstname' => $user->account->first_name, @@ -87,6 +96,7 @@ class UserUtil 'billing_country_id' => $user->account->country_id, 'billing_phone' => $user->account->getPhoneNumber(), 'billing_email' => $user->email, + 'language' => $user->account->getLocale(), 'same_as_billing' => $user->account->same_as_billing, 'shipping_salutation' => $user->account->shipping_salutation, 'shipping_company' => $user->account->shipping_company, @@ -100,11 +110,17 @@ class UserUtil 'shipping_phone' => $user->account->getShippingPhoneFull(), 'shipping_postnumber' => $user->account->shipping_postnumber, ]; + ShoppingUser::create($data); + + return true; + } catch (\Exception $e) { + \Log::channel('cleanup')->error('setUserToClient failed for user_id: '.$user_id.' | Error: '.$e->getMessage()); + + return false; } } - /* find next activ sponsor on user id first $sponsor_id can user_id, looks has m_sponsor or pre_sponsor. @@ -113,27 +129,28 @@ class UserUtil { $user = User::withTrashed()->find($sponsor_id); - if (!$user) { //kein User unter der ID - to root + if (! $user) { // kein User unter der ID - to root return User::find(6); } - //user ist aktiv + // user ist aktiv if ($user->isActiveAccount()) { return $user; } - if ($user->m_sponsor) { //hat der User einen m_sponsor + if ($user->m_sponsor) { // hat der User einen m_sponsor return self::findNextActiveSponsor($user->m_sponsor); } - if ($user->pre_sponsor) { //hat der User einen pre_sponsor - schon inaktiv + if ($user->pre_sponsor) { // hat der User einen pre_sponsor - schon inaktiv return self::findNextActiveSponsor($user->pre_sponsor); } - //dump('not sponsor'); + + // dump('not sponsor'); return $user; } public static function deactiveUser($user) { - $user->pre_sponsor = $user->m_sponsor; //den sponsor speichern für wiederherstellung + $user->pre_sponsor = $user->m_sponsor; // den sponsor speichern für wiederherstellung $user->m_sponsor = null; $user->active = false; $user->save(); @@ -143,7 +160,7 @@ class UserUtil { if ($user->pre_sponsor) { $pre_sponsor = self::findNextActiveSponsor($user->pre_sponsor); - $user->m_sponsor = $pre_sponsor->id; //den sponsor wiederherstellen + $user->m_sponsor = $pre_sponsor->id; // den sponsor wiederherstellen $user->pre_sponsor = null; } $user->active = true; @@ -152,14 +169,14 @@ class UserUtil public static function deleteUser(User $user, $complete = false) { - //shop wird gelöscht + // shop wird gelöscht if ($user->shop) { // $subdomain_name = $user->shop->slug . '.mivita.care'; - $user->shop->name = "delete" . $user->shop->id; - $user->shop->slug = "delete" . $user->shop->id; + $user->shop->name = 'delete'.$user->shop->id; + $user->shop->slug = 'delete'.$user->shop->id; $user->shop->save(); $user->shop->delete(); - //isset KAS - delete Subdomain + // isset KAS - delete Subdomain /*if (!Util::isTestSystem()) { $kas = new KasController(); $pra = array( @@ -169,12 +186,12 @@ class UserUtil }*/ } - //user soll nicht komplett gelöscht werden - $user->email = "delete-" . $user->email; - //password wird gelöscht - $user->password = "delete" . time(); + // user soll nicht komplett gelöscht werden + $user->email = 'delete-'.$user->email; + // password wird gelöscht + $user->password = 'delete'.time(); $user->confirmed = 0; - $user->confirmation_code = "delete" . time(); + $user->confirmation_code = 'delete'.time(); $user->confirmation_date = null; $user->confirmation_code_to = null; $user->confirmation_code_remider = 2; @@ -185,9 +202,9 @@ class UserUtil $user->admin = 0; $user->deleted_at = now(); $user->pre_deleted_at = now(); - //user soll komplett gelöscht werden + // user soll komplett gelöscht werden if ($complete) { - $user->email = "delete-" . time() . "-" . rand(1000, 9999); + $user->email = 'delete-'.time().'-'.rand(1000, 9999); if ($user->account) { $user->account->delete(); } @@ -198,14 +215,16 @@ class UserUtil return true; } + public static function checkEmailExists($user) { - $email = str_replace("delete-", "", $user->email); + $email = str_replace('delete-', '', $user->email); $user = User::where('email', $email)->first(); if ($user) { - return 'Der Account kann nicht wieder hergestellt werden, da die E-Mail-Adresse ' . $email . ' bereits in Verwendung ist.'; + return 'Der Account kann nicht wieder hergestellt werden, da die E-Mail-Adresse '.$email.' bereits in Verwendung ist.'; } + return null; } @@ -213,11 +232,11 @@ class UserUtil { if ($user->pre_sponsor) { $pre_sponsor = self::findNextActiveSponsor($user->pre_sponsor); - $user->m_sponsor = $pre_sponsor->id; //den sponsor wiederherstellen + $user->m_sponsor = $pre_sponsor->id; // den sponsor wiederherstellen $user->pre_sponsor = null; } - $user->email = str_replace("delete-", "", $user->email); + $user->email = str_replace('delete-', '', $user->email); $user->confirmed = 1; $user->confirmation_date = now(); $user->confirmation_code = null; @@ -242,13 +261,13 @@ class UserUtil } } - public static function reactiveUserResetChilds($user_id, $info = '') { $user = User::find($user_id); - if (!$user) { - \Log::channel('cleanup')->error('reactiveUserResetChilds find no user by user_id:' . $user_id); + if (! $user) { + \Log::channel('cleanup')->error('reactiveUserResetChilds find no user by user_id:'.$user_id); + return 0; } $data = [ @@ -258,7 +277,7 @@ class UserUtil 'm_first_name' => $user->account ? $user->account->m_first_name : '', 'm_last_name' => $user->account ? $user->account->m_last_name : '', ]; - \Log::channel('cleanup')->info('reactiveUserResetChilds ' . $info . ' : ' . json_encode($data)); + \Log::channel('cleanup')->info('reactiveUserResetChilds '.$info.' : '.json_encode($data)); self::reactiveUser($user); self::resetChildsToSponsor($user->id); @@ -268,8 +287,9 @@ class UserUtil { $user = User::find($user_id); - if (!$user) { - \Log::channel('cleanup')->error('deactiveUserNewSponsorChilds find no user by user_id:' . $user_id); + if (! $user) { + \Log::channel('cleanup')->error('deactiveUserNewSponsorChilds find no user by user_id:'.$user_id); + return 0; } $data = [ @@ -284,9 +304,9 @@ class UserUtil if ($active_sponsor) { self::setNewSponsorToChilds($user->id, $active_sponsor->id); } else { - \Log::channel('cleanup')->error('cleanUpInActiveUser find no active_sponsor by inactive_user:' . $user->id); + \Log::channel('cleanup')->error('cleanUpInActiveUser find no active_sponsor by inactive_user:'.$user->id); } - \Log::channel('cleanup')->info('deactiveUserNewSponsorChilds ' . $info . ' : ' . json_encode($data)); + \Log::channel('cleanup')->info('deactiveUserNewSponsorChilds '.$info.' : '.json_encode($data)); self::deactiveUser($user); } } diff --git a/app/Services/Yard.php b/app/Services/Yard.php index 7b0e9b7..23c1760 100644 --- a/app/Services/Yard.php +++ b/app/Services/Yard.php @@ -257,7 +257,7 @@ class Yard extends Cart if (! $shipping_price) { return; } - if ($this->weight() == 0) { + if ($this->allItemsFreeShippingConsultant() || $this->weight() == 0) { $shipping_price->price = 0; $shipping_price->price_comp = 0; } else { @@ -416,6 +416,18 @@ class Yard extends Cart return $total; } + public function allItemsFreeShippingConsultant() + { + $content = $this->getContent(); + if ($content->isEmpty()) { + return false; + } + + return $content->every(function (CartItem $cartItem) { + return (bool) $cartItem->options->free_shipping_consultant; + }); + } + public function points() { $content = $this->getContent(); @@ -510,7 +522,7 @@ class Yard extends Cart } $price = $product->price; if ($set_price === 'with') { - $cartItem = $this->getCartItem($product->id, $product->getLang('name'), 1, $price, ['image' => $image, 'slug' => $product->slug, 'weight' => $product->weight, 'points' => $product->points, 'no_commission' => $product->no_commission, 'show_on' => $product->show_on]); + $cartItem = $this->getCartItem($product->id, $product->getLang('name'), 1, $price, ['image' => $image, 'slug' => $product->slug, 'weight' => $product->weight, 'points' => $product->points, 'no_commission' => $product->no_commission, 'no_free_shipping' => $product->no_free_shipping, 'show_on' => $product->show_on]); $price = $product->getPriceWith(false, true, $this->getUserCountry()); } if ($set_price === 'withTaxFree') { diff --git a/boost.json b/boost.json new file mode 100644 index 0000000..98a4cb6 --- /dev/null +++ b/boost.json @@ -0,0 +1,12 @@ +{ + "agents": [ + "claude_code", + "cursor" + ], + "editors": [ + "claude_code", + "cursor" + ], + "guidelines": [], + "sail": true +} diff --git a/bootstrap/cache/events.php b/bootstrap/cache/events.php new file mode 100644 index 0000000..02e2fc9 --- /dev/null +++ b/bootstrap/cache/events.php @@ -0,0 +1,9 @@ + + array ( + 'App\\Events\\Event' => + array ( + 0 => 'App\\Listeners\\EventListener', + ), + ), +); \ No newline at end of file diff --git a/bootstrap/cache/packages.php b/bootstrap/cache/packages.php index 2604906..27e31e8 100755 --- a/bootstrap/cache/packages.php +++ b/bootstrap/cache/packages.php @@ -66,6 +66,13 @@ 0 => 'Laracasts\\Flash\\FlashServiceProvider', ), ), + 'laravel/boost' => + array ( + 'providers' => + array ( + 0 => 'Laravel\\Boost\\BoostServiceProvider', + ), + ), 'laravel/horizon' => array ( 'aliases' => @@ -84,6 +91,17 @@ 0 => 'Illuminate\\Database\\Eloquent\\LegacyFactoryServiceProvider', ), ), + 'laravel/mcp' => + array ( + 'aliases' => + array ( + 'Mcp' => 'Laravel\\Mcp\\Server\\Facades\\Mcp', + ), + 'providers' => + array ( + 0 => 'Laravel\\Mcp\\Server\\McpServiceProvider', + ), + ), 'laravel/passport' => array ( 'providers' => @@ -91,6 +109,13 @@ 0 => 'Laravel\\Passport\\PassportServiceProvider', ), ), + 'laravel/roster' => + array ( + 'providers' => + array ( + 0 => 'Laravel\\Roster\\RosterServiceProvider', + ), + ), 'laravel/sail' => array ( 'providers' => diff --git a/bootstrap/cache/services.php b/bootstrap/cache/services.php index 1f1ea45..a32e1f8 100755 --- a/bootstrap/cache/services.php +++ b/bootstrap/cache/services.php @@ -31,32 +31,35 @@ 27 => 'JoeDixon\\Translation\\TranslationServiceProvider', 28 => 'JoeDixon\\Translation\\TranslationBindingsServiceProvider', 29 => 'Laracasts\\Flash\\FlashServiceProvider', - 30 => 'Laravel\\Horizon\\HorizonServiceProvider', - 31 => 'Illuminate\\Database\\Eloquent\\LegacyFactoryServiceProvider', - 32 => 'Laravel\\Passport\\PassportServiceProvider', - 33 => 'Laravel\\Sail\\SailServiceProvider', - 34 => 'Laravel\\Tinker\\TinkerServiceProvider', - 35 => 'Laravel\\Ui\\UiServiceProvider', - 36 => 'Maatwebsite\\Excel\\ExcelServiceProvider', - 37 => 'Carbon\\Laravel\\ServiceProvider', - 38 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider', - 39 => 'Termwind\\Laravel\\TermwindServiceProvider', - 40 => 'Pest\\Laravel\\PestServiceProvider', - 41 => 'Spatie\\Html\\HtmlServiceProvider', - 42 => 'Spatie\\LaravelIgnition\\IgnitionServiceProvider', - 43 => 'Yajra\\DataTables\\DataTablesServiceProvider', - 44 => 'Laravel\\Tinker\\TinkerServiceProvider', - 45 => 'Acme\\Dhl\\DhlServiceProvider', - 46 => 'App\\Providers\\AppServiceProvider', - 47 => 'App\\Providers\\AuthServiceProvider', - 48 => 'App\\Providers\\EventServiceProvider', - 49 => 'App\\Providers\\HorizonServiceProvider', - 50 => 'App\\Providers\\RouteServiceProvider', - 51 => 'Jenssegers\\Date\\DateServiceProvider', - 52 => 'Maatwebsite\\Excel\\ExcelServiceProvider', - 53 => 'Yajra\\DataTables\\DataTablesServiceProvider', - 54 => 'App\\Providers\\YardServiceProvider', - 55 => 'Alban\\LaravelCollectiveSpatieHtmlParser\\ServiceProvider', + 30 => 'Laravel\\Boost\\BoostServiceProvider', + 31 => 'Laravel\\Horizon\\HorizonServiceProvider', + 32 => 'Illuminate\\Database\\Eloquent\\LegacyFactoryServiceProvider', + 33 => 'Laravel\\Mcp\\Server\\McpServiceProvider', + 34 => 'Laravel\\Passport\\PassportServiceProvider', + 35 => 'Laravel\\Roster\\RosterServiceProvider', + 36 => 'Laravel\\Sail\\SailServiceProvider', + 37 => 'Laravel\\Tinker\\TinkerServiceProvider', + 38 => 'Laravel\\Ui\\UiServiceProvider', + 39 => 'Maatwebsite\\Excel\\ExcelServiceProvider', + 40 => 'Carbon\\Laravel\\ServiceProvider', + 41 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider', + 42 => 'Termwind\\Laravel\\TermwindServiceProvider', + 43 => 'Pest\\Laravel\\PestServiceProvider', + 44 => 'Spatie\\Html\\HtmlServiceProvider', + 45 => 'Spatie\\LaravelIgnition\\IgnitionServiceProvider', + 46 => 'Yajra\\DataTables\\DataTablesServiceProvider', + 47 => 'Laravel\\Tinker\\TinkerServiceProvider', + 48 => 'Acme\\Dhl\\DhlServiceProvider', + 49 => 'App\\Providers\\AppServiceProvider', + 50 => 'App\\Providers\\AuthServiceProvider', + 51 => 'App\\Providers\\EventServiceProvider', + 52 => 'App\\Providers\\HorizonServiceProvider', + 53 => 'App\\Providers\\RouteServiceProvider', + 54 => 'Jenssegers\\Date\\DateServiceProvider', + 55 => 'Maatwebsite\\Excel\\ExcelServiceProvider', + 56 => 'Yajra\\DataTables\\DataTablesServiceProvider', + 57 => 'App\\Providers\\YardServiceProvider', + 58 => 'Alban\\LaravelCollectiveSpatieHtmlParser\\ServiceProvider', ), 'eager' => array ( @@ -76,29 +79,32 @@ 13 => 'Jenssegers\\Date\\DateServiceProvider', 14 => 'JoeDixon\\Translation\\TranslationServiceProvider', 15 => 'Laracasts\\Flash\\FlashServiceProvider', - 16 => 'Laravel\\Horizon\\HorizonServiceProvider', - 17 => 'Illuminate\\Database\\Eloquent\\LegacyFactoryServiceProvider', - 18 => 'Laravel\\Passport\\PassportServiceProvider', - 19 => 'Laravel\\Ui\\UiServiceProvider', - 20 => 'Maatwebsite\\Excel\\ExcelServiceProvider', - 21 => 'Carbon\\Laravel\\ServiceProvider', - 22 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider', - 23 => 'Termwind\\Laravel\\TermwindServiceProvider', - 24 => 'Pest\\Laravel\\PestServiceProvider', - 25 => 'Spatie\\Html\\HtmlServiceProvider', - 26 => 'Spatie\\LaravelIgnition\\IgnitionServiceProvider', - 27 => 'Yajra\\DataTables\\DataTablesServiceProvider', - 28 => 'Acme\\Dhl\\DhlServiceProvider', - 29 => 'App\\Providers\\AppServiceProvider', - 30 => 'App\\Providers\\AuthServiceProvider', - 31 => 'App\\Providers\\EventServiceProvider', - 32 => 'App\\Providers\\HorizonServiceProvider', - 33 => 'App\\Providers\\RouteServiceProvider', - 34 => 'Jenssegers\\Date\\DateServiceProvider', - 35 => 'Maatwebsite\\Excel\\ExcelServiceProvider', - 36 => 'Yajra\\DataTables\\DataTablesServiceProvider', - 37 => 'App\\Providers\\YardServiceProvider', - 38 => 'Alban\\LaravelCollectiveSpatieHtmlParser\\ServiceProvider', + 16 => 'Laravel\\Boost\\BoostServiceProvider', + 17 => 'Laravel\\Horizon\\HorizonServiceProvider', + 18 => 'Illuminate\\Database\\Eloquent\\LegacyFactoryServiceProvider', + 19 => 'Laravel\\Mcp\\Server\\McpServiceProvider', + 20 => 'Laravel\\Passport\\PassportServiceProvider', + 21 => 'Laravel\\Roster\\RosterServiceProvider', + 22 => 'Laravel\\Ui\\UiServiceProvider', + 23 => 'Maatwebsite\\Excel\\ExcelServiceProvider', + 24 => 'Carbon\\Laravel\\ServiceProvider', + 25 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider', + 26 => 'Termwind\\Laravel\\TermwindServiceProvider', + 27 => 'Pest\\Laravel\\PestServiceProvider', + 28 => 'Spatie\\Html\\HtmlServiceProvider', + 29 => 'Spatie\\LaravelIgnition\\IgnitionServiceProvider', + 30 => 'Yajra\\DataTables\\DataTablesServiceProvider', + 31 => 'Acme\\Dhl\\DhlServiceProvider', + 32 => 'App\\Providers\\AppServiceProvider', + 33 => 'App\\Providers\\AuthServiceProvider', + 34 => 'App\\Providers\\EventServiceProvider', + 35 => 'App\\Providers\\HorizonServiceProvider', + 36 => 'App\\Providers\\RouteServiceProvider', + 37 => 'Jenssegers\\Date\\DateServiceProvider', + 38 => 'Maatwebsite\\Excel\\ExcelServiceProvider', + 39 => 'Yajra\\DataTables\\DataTablesServiceProvider', + 40 => 'App\\Providers\\YardServiceProvider', + 41 => 'Alban\\LaravelCollectiveSpatieHtmlParser\\ServiceProvider', ), 'deferred' => array ( diff --git a/composer.json b/composer.json index e56cadb..ffcf2c3 100755 --- a/composer.json +++ b/composer.json @@ -33,6 +33,7 @@ "barryvdh/laravel-debugbar": "^3.13", "barryvdh/laravel-ide-helper": "^3.6", "fakerphp/faker": "^1.23", + "laravel/boost": "^1.8", "laravel/pint": "^1.0", "laravel/sail": "^1.44", "mockery/mockery": "^1.6.2", diff --git a/composer.lock b/composer.lock index d54fe6e..fbf96f9 100755 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "925483d8104ae55ae4bf5fd0ada18726", + "content-hash": "90b6546de8df440433d5fe91b858d196", "packages": [ { "name": "barryvdh/laravel-dompdf", @@ -9605,6 +9605,53 @@ }, "time": "2025-04-30T06:54:44+00:00" }, + { + "name": "illuminate/json-schema", + "version": "v12.52.0", + "source": { + "type": "git", + "url": "https://github.com/illuminate/json-schema.git", + "reference": "d161f398dab36f08cf131997362bc2e3ecb0309a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/json-schema/zipball/d161f398dab36f08cf131997362bc2e3ecb0309a", + "reference": "d161f398dab36f08cf131997362bc2e3ecb0309a", + "shasum": "" + }, + "require": { + "illuminate/contracts": "^10.50.0|^11.47.0|^12.40.2", + "php": "^8.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "12.x-dev" + } + }, + "autoload": { + "psr-4": { + "Illuminate\\JsonSchema\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Json Schema package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2025-11-28T18:45:48+00:00" + }, { "name": "jean85/pretty-package-versions", "version": "2.1.1", @@ -9665,6 +9712,145 @@ }, "time": "2025-03-19T14:43:43+00:00" }, + { + "name": "laravel/boost", + "version": "v1.8.11", + "source": { + "type": "git", + "url": "https://github.com/laravel/boost.git", + "reference": "485dd7c834bde865a8a174249fc6ffc56e79e63c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/boost/zipball/485dd7c834bde865a8a174249fc6ffc56e79e63c", + "reference": "485dd7c834bde865a8a174249fc6ffc56e79e63c", + "shasum": "" + }, + "require": { + "guzzlehttp/guzzle": "^7.9", + "illuminate/console": "^10.49.0|^11.45.3|^12.41.1", + "illuminate/contracts": "^10.49.0|^11.45.3|^12.41.1", + "illuminate/routing": "^10.49.0|^11.45.3|^12.41.1", + "illuminate/support": "^10.49.0|^11.45.3|^12.41.1", + "laravel/mcp": "^0.5.1", + "laravel/prompts": "0.1.25|^0.3.6", + "laravel/roster": "^0.2.9", + "php": "^8.1" + }, + "require-dev": { + "laravel/pint": "^1.20.0", + "mockery/mockery": "^1.6.12", + "orchestra/testbench": "^8.36.0|^9.15.0|^10.6", + "pestphp/pest": "^2.36.0|^3.8.4|^4.1.5", + "phpstan/phpstan": "^2.1.27", + "rector/rector": "^2.1" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Laravel\\Boost\\BoostServiceProvider" + ] + }, + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Laravel\\Boost\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Laravel Boost accelerates AI-assisted development by providing the essential context and structure that AI needs to generate high-quality, Laravel-specific code.", + "homepage": "https://github.com/laravel/boost", + "keywords": [ + "ai", + "dev", + "laravel" + ], + "support": { + "issues": "https://github.com/laravel/boost/issues", + "source": "https://github.com/laravel/boost" + }, + "time": "2026-02-20T07:28:22+00:00" + }, + { + "name": "laravel/mcp", + "version": "v0.5.9", + "source": { + "type": "git", + "url": "https://github.com/laravel/mcp.git", + "reference": "39e8da60eb7bce4737c5d868d35a3fe78938c129" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/mcp/zipball/39e8da60eb7bce4737c5d868d35a3fe78938c129", + "reference": "39e8da60eb7bce4737c5d868d35a3fe78938c129", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-mbstring": "*", + "illuminate/console": "^11.45.3|^12.41.1|^13.0", + "illuminate/container": "^11.45.3|^12.41.1|^13.0", + "illuminate/contracts": "^11.45.3|^12.41.1|^13.0", + "illuminate/http": "^11.45.3|^12.41.1|^13.0", + "illuminate/json-schema": "^12.41.1|^13.0", + "illuminate/routing": "^11.45.3|^12.41.1|^13.0", + "illuminate/support": "^11.45.3|^12.41.1|^13.0", + "illuminate/validation": "^11.45.3|^12.41.1|^13.0", + "php": "^8.2" + }, + "require-dev": { + "laravel/pint": "^1.20", + "orchestra/testbench": "^9.15|^10.8|^11.0", + "pestphp/pest": "^3.8.5|^4.3.2", + "phpstan/phpstan": "^2.1.27", + "rector/rector": "^2.2.4" + }, + "type": "library", + "extra": { + "laravel": { + "aliases": { + "Mcp": "Laravel\\Mcp\\Server\\Facades\\Mcp" + }, + "providers": [ + "Laravel\\Mcp\\Server\\McpServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Laravel\\Mcp\\": "src/", + "Laravel\\Mcp\\Server\\": "src/Server/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "Rapidly build MCP servers for your Laravel applications.", + "homepage": "https://github.com/laravel/mcp", + "keywords": [ + "laravel", + "mcp" + ], + "support": { + "issues": "https://github.com/laravel/mcp/issues", + "source": "https://github.com/laravel/mcp" + }, + "time": "2026-02-17T19:05:53+00:00" + }, { "name": "laravel/pint", "version": "v1.27.0", @@ -9732,6 +9918,67 @@ }, "time": "2026-01-05T16:49:17+00:00" }, + { + "name": "laravel/roster", + "version": "v0.2.9", + "source": { + "type": "git", + "url": "https://github.com/laravel/roster.git", + "reference": "82bbd0e2de614906811aebdf16b4305956816fa6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/roster/zipball/82bbd0e2de614906811aebdf16b4305956816fa6", + "reference": "82bbd0e2de614906811aebdf16b4305956816fa6", + "shasum": "" + }, + "require": { + "illuminate/console": "^10.0|^11.0|^12.0", + "illuminate/contracts": "^10.0|^11.0|^12.0", + "illuminate/routing": "^10.0|^11.0|^12.0", + "illuminate/support": "^10.0|^11.0|^12.0", + "php": "^8.1|^8.2", + "symfony/yaml": "^6.4|^7.2" + }, + "require-dev": { + "laravel/pint": "^1.14", + "mockery/mockery": "^1.6", + "orchestra/testbench": "^8.22.0|^9.0|^10.0", + "pestphp/pest": "^2.0|^3.0", + "phpstan/phpstan": "^2.0" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Laravel\\Roster\\RosterServiceProvider" + ] + }, + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Laravel\\Roster\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Detect packages & approaches in use within a Laravel project", + "homepage": "https://github.com/laravel/roster", + "keywords": [ + "dev", + "laravel" + ], + "support": { + "issues": "https://github.com/laravel/roster/issues", + "source": "https://github.com/laravel/roster" + }, + "time": "2025-10-20T09:56:46+00:00" + }, { "name": "laravel/sail", "version": "v1.52.0", diff --git a/config/datev.php b/config/datev.php new file mode 100644 index 0000000..2979f76 --- /dev/null +++ b/config/datev.php @@ -0,0 +1,141 @@ + env('DATEV_BERATER_NR', ''), + 'mandant_nr' => env('DATEV_MANDANT_NR', ''), + 'format_version' => 700, + 'format_category' => 21, // 21 = Buchungsstapel + 'format_name' => 'Buchungsstapel', + 'currency' => 'EUR', + + // Datenquelle (wird im Header geschrieben) + 'source' => 'ERP', + 'source_name' => env('DATEV_SOURCE_NAME', 'MIVITA'), + + // Sachkontenlänge (DATEV-Standard: 4) + 'sachkontenlaenge' => 4, + + /* + |-------------------------------------------------------------------------- + | Sammelkonten (Phase 1) + |-------------------------------------------------------------------------- + */ + 'sammeldebitor' => env('DATEV_SAMMELDEBITOR', '10000'), + 'sammelkreditor' => env('DATEV_SAMMELKREDITOR', '70000'), + + /* + |-------------------------------------------------------------------------- + | Umsatzerlöse: Steuerfall -> [konto, bu_schluessel] + |-------------------------------------------------------------------------- + | + | Mapping basierend auf Steuersatz und Lieferland-Typ: + | - domestic_19: Inland 19% USt + | - domestic_7: Inland 7% USt + | - eu_exempt: Steuerfreie innergemeinschaftliche Lieferung §4 Nr. 1b UStG + | - third_country_exempt: Steuerfreie Drittland-Lieferung §4 Nr. 1a UStG + | + */ + 'revenue_accounts' => [ + 'domestic_19' => ['konto' => 8400, 'bu' => 9], + 'domestic_7' => ['konto' => 8300, 'bu' => 8], + 'eu_exempt' => ['konto' => 8125, 'bu' => 1], + 'third_country_exempt' => ['konto' => 8120, 'bu' => 11], + ], + + /* + |-------------------------------------------------------------------------- + | Provisionen: Typ -> Sachkonto + |-------------------------------------------------------------------------- + | + | Mapping basierend auf UserCreditItem.status: + | - 1 (commission_shop) + 5 (commission_growth_bonus) -> 4760 Verkaufsprovision + | - 2 (commission_payline) -> 4764 Payline-Provision + | + */ + 'commission_accounts' => [ + 'shop' => 4760, // commission_shop (status=1) + 'growth_bonus' => 4760, // commission_growth_bonus (status=5) + 'payline' => 4764, // commission_payline (status=2) + ], + + // Mapping: UserCreditItem.status -> commission_type key + 'credit_item_status_map' => [ + 1 => 'shop', // commission_shop + 2 => 'payline', // commission_payline + 5 => 'growth_bonus', // commission_growth_bonus + ], + + /* + |-------------------------------------------------------------------------- + | Provisions-Steuerschlüssel + |-------------------------------------------------------------------------- + | + | Basierend auf dem Steuerstatus des Beraters (UserAccount): + | - normal: USt-pflichtig (taxable_sales=1) -> BU 9 + | - kleinunternehmer: Nicht USt-pflichtig DE (taxable_sales=2) -> BU 50 + | - reverse_charge: Reverse Charge Verfahren (reverse_charge=true) -> BU 94 + | + */ + 'commission_tax_keys' => [ + 'normal' => 9, // 19% USt + 'kleinunternehmer' => 50, // Kleinunternehmer + 'reverse_charge' => 94, // Reverse Charge + ], + + /* + |-------------------------------------------------------------------------- + | Gegenkonto-Mapping nach Zahlungsart + |-------------------------------------------------------------------------- + | + | Bestimmt das Gegenkonto (Debitor) basierend auf der Zahlungsart + | (ShoppingPayment.clearingtype + wallettype). + | Format: "{clearingtype}_{wallettype}" => Gegenkonto + | Fallback: Sammeldebitor + | + */ + 'counteraccount_map' => [ + 'wlt_PPE' => 1230, // PayPal + // Alle anderen Zahlungsarten -> Sammeldebitor (Fallback) + ], + + /* + |-------------------------------------------------------------------------- + | Deutschland Country-ID + |-------------------------------------------------------------------------- + | + | Die ID von Deutschland in der countries-Tabelle. + | Wird verwendet um Inland vs. Ausland zu unterscheiden. + | + */ + 'germany_country_id' => 1, + + /* + |-------------------------------------------------------------------------- + | Storage-Einstellungen + |-------------------------------------------------------------------------- + */ + 'storage_disk' => 'local', + 'storage_path' => 'datev', + + /* + |-------------------------------------------------------------------------- + | CSV-Format-Einstellungen + |-------------------------------------------------------------------------- + */ + 'delimiter' => ';', + 'encoding' => 'UTF-8', // UTF-8 mit BOM für neuere DATEV-Versionen + 'line_ending' => "\r\n", // CRLF + +]; diff --git a/config/dhl.php b/config/dhl.php index 607c0e2..5474fc7 100644 --- a/config/dhl.php +++ b/config/dhl.php @@ -6,13 +6,27 @@ |-------------------------------------------------------------------------- | | Configuration for the new DHL Laravel package with direct API integration -| +| | Settings can be managed via Admin panel at /admin/settings | Admin settings override these .env values at runtime | */ return [ + /* + |-------------------------------------------------------------------------- + | Configuration Source Priority + |-------------------------------------------------------------------------- + | + | Determines which configuration source has priority: + | - 'database': Settings from database override .env values (default) + | - 'env': Environment/Config values override database settings + | + | Useful for test servers where you want to use .env values + | without modifying database settings + */ + 'config_source' => env('DHL_CONFIG_SOURCE', 'database'), + /* |-------------------------------------------------------------------------- | DHL API Settings @@ -51,7 +65,7 @@ return [ 'webhook' => [ 'enabled' => env('DHL_WEBHOOK_ENABLED', false), 'secret' => env('DHL_WEBHOOK_SECRET'), - 'route' => env('DHL_WEBHOOK_ROUTE', 'dhl/webhooks/tracking') + 'route' => env('DHL_WEBHOOK_ROUTE', 'dhl/webhooks/tracking'), ], /* @@ -79,17 +93,17 @@ return [ 'account_numbers' => [ 'default' => env('DHL_ACCOUNT_NUMBER_DEFAULT', '63144073550101'), 'V01PAK' => env('DHL_ACCOUNT_NUMBER_V01PAK', '63144073550101'), // DHL Paket National - 'V62WP' => env('DHL_ACCOUNT_NUMBER_V62WP', '63144073556201'), // Warenpost National + 'V62WP' => env('DHL_ACCOUNT_NUMBER_V62WP', '63144073556201'), // Warenpost National 'V53PAK' => env('DHL_ACCOUNT_NUMBER_V53PAK', '63144073555301'), // DHL Paket International 'V07PAK' => env('DHL_ACCOUNT_NUMBER_V07PAK', '63144073550701'), // DHL Retoure Online ], 'dimensions' => [ - 'default' => ['length' => 120, 'width' => 60, 'height' => 60,], - 'V01PAK' => ['length' => 120, 'width' => 60, 'height' => 60,], // DHL Paket National - 'V62WP' => ['length' => 35, 'width' => 25, 'height' => 8,], // Warenpost National - 'V53PAK' => ['length' => 120, 'width' => 60, 'height' => 60,], // DHL Paket International - 'V07PAK' => ['length' => 120, 'width' => 60, 'height' => 60,], // DHL Retoure Online + 'default' => ['length' => 120, 'width' => 60, 'height' => 60], + 'V01PAK' => ['length' => 120, 'width' => 60, 'height' => 60], // DHL Paket National + 'V62WP' => ['length' => 35, 'width' => 25, 'height' => 8], // Warenpost National + 'V53PAK' => ['length' => 120, 'width' => 60, 'height' => 60], // DHL Paket International + 'V07PAK' => ['length' => 120, 'width' => 60, 'height' => 60], // DHL Retoure Online ], /* diff --git a/config/localization.php b/config/localization.php index 2a76142..ee1f25a 100644 --- a/config/localization.php +++ b/config/localization.php @@ -1,300 +1,300 @@ ['de', 'en', 'es', 'fr'], // Uncomment the languages that your site supports - or add new ones. // These are sorted by the native name, which is the order you might show them in a language selector. // Regional languages are sorted by their base language, so "British English" sorts as "English, British" 'supportedLocales' => [ - //'ace' => ['name' => 'Achinese', 'script' => 'Latn', 'native' => 'Aceh', 'regional' => ''], - //'af' => ['name' => 'Afrikaans', 'script' => 'Latn', 'native' => 'Afrikaans', 'regional' => 'af_ZA'], - //'agq' => ['name' => 'Aghem', 'script' => 'Latn', 'native' => 'Aghem', 'regional' => ''], - //'ak' => ['name' => 'Akan', 'script' => 'Latn', 'native' => 'Akan', 'regional' => 'ak_GH'], - //'an' => ['name' => 'Aragonese', 'script' => 'Latn', 'native' => 'aragonés', 'regional' => 'an_ES'], - //'cch' => ['name' => 'Atsam', 'script' => 'Latn', 'native' => 'Atsam', 'regional' => ''], - //'gn' => ['name' => 'Guaraní', 'script' => 'Latn', 'native' => 'Avañe’ẽ', 'regional' => ''], - //'ae' => ['name' => 'Avestan', 'script' => 'Latn', 'native' => 'avesta', 'regional' => ''], - //'ay' => ['name' => 'Aymara', 'script' => 'Latn', 'native' => 'aymar aru', 'regional' => 'ay_PE'], - //'az' => ['name' => 'Azerbaijani (Latin)', 'script' => 'Latn', 'native' => 'azərbaycanca', 'regional' => 'az_AZ'], - //'id' => ['name' => 'Indonesian', 'script' => 'Latn', 'native' => 'Bahasa Indonesia', 'regional' => 'id_ID'], - //'ms' => ['name' => 'Malay', 'script' => 'Latn', 'native' => 'Bahasa Melayu', 'regional' => 'ms_MY'], - //'bm' => ['name' => 'Bambara', 'script' => 'Latn', 'native' => 'bamanakan', 'regional' => ''], - //'jv' => ['name' => 'Javanese (Latin)', 'script' => 'Latn', 'native' => 'Basa Jawa', 'regional' => ''], - //'su' => ['name' => 'Sundanese', 'script' => 'Latn', 'native' => 'Basa Sunda', 'regional' => ''], - //'bh' => ['name' => 'Bihari', 'script' => 'Latn', 'native' => 'Bihari', 'regional' => ''], - //'bi' => ['name' => 'Bislama', 'script' => 'Latn', 'native' => 'Bislama', 'regional' => ''], - //'nb' => ['name' => 'Norwegian Bokmål', 'script' => 'Latn', 'native' => 'Bokmål', 'regional' => 'nb_NO'], - //'bs' => ['name' => 'Bosnian', 'script' => 'Latn', 'native' => 'bosanski', 'regional' => 'bs_BA'], - //'br' => ['name' => 'Breton', 'script' => 'Latn', 'native' => 'brezhoneg', 'regional' => 'br_FR'], - //'ca' => ['name' => 'Catalan', 'script' => 'Latn', 'native' => 'català', 'regional' => 'ca_ES'], - //'ch' => ['name' => 'Chamorro', 'script' => 'Latn', 'native' => 'Chamoru', 'regional' => ''], - //'ny' => ['name' => 'Chewa', 'script' => 'Latn', 'native' => 'chiCheŵa', 'regional' => ''], - //'kde' => ['name' => 'Makonde', 'script' => 'Latn', 'native' => 'Chimakonde', 'regional' => ''], - //'sn' => ['name' => 'Shona', 'script' => 'Latn', 'native' => 'chiShona', 'regional' => ''], - //'co' => ['name' => 'Corsican', 'script' => 'Latn', 'native' => 'corsu', 'regional' => ''], - //'cy' => ['name' => 'Welsh', 'script' => 'Latn', 'native' => 'Cymraeg', 'regional' => 'cy_GB'], - //'da' => ['name' => 'Danish', 'script' => 'Latn', 'native' => 'dansk', 'regional' => 'da_DK'], - //'se' => ['name' => 'Northern Sami', 'script' => 'Latn', 'native' => 'davvisámegiella', 'regional' => 'se_NO'], - 'de' => ['name' => 'German', 'script' => 'Latn', 'native' => 'Deutsch', 'regional' => 'de_DE'], - //'luo' => ['name' => 'Luo', 'script' => 'Latn', 'native' => 'Dholuo', 'regional' => ''], - //'nv' => ['name' => 'Navajo', 'script' => 'Latn', 'native' => 'Diné bizaad', 'regional' => ''], - //'dua' => ['name' => 'Duala', 'script' => 'Latn', 'native' => 'duálá', 'regional' => ''], - //'et' => ['name' => 'Estonian', 'script' => 'Latn', 'native' => 'eesti', 'regional' => 'et_EE'], - //'na' => ['name' => 'Nauru', 'script' => 'Latn', 'native' => 'Ekakairũ Naoero', 'regional' => ''], - //'guz' => ['name' => 'Ekegusii', 'script' => 'Latn', 'native' => 'Ekegusii', 'regional' => ''], - 'en' => ['name' => 'English', 'script' => 'Latn', 'native' => 'English', 'regional' => 'en_GB'], - //'en-AU' => ['name' => 'Australian English', 'script' => 'Latn', 'native' => 'Australian English', 'regional' => 'en_AU'], - //'en-GB' => ['name' => 'British English', 'script' => 'Latn', 'native' => 'British English', 'regional' => 'en_GB'], - //'en-US' => ['name' => 'U.S. English', 'script' => 'Latn', 'native' => 'U.S. English', 'regional' => 'en_US'], - 'es' => ['name' => 'Spanish', 'script' => 'Latn', 'native' => 'español', 'regional' => 'es_ES'], - //'eo' => ['name' => 'Esperanto', 'script' => 'Latn', 'native' => 'esperanto', 'regional' => ''], - //'eu' => ['name' => 'Basque', 'script' => 'Latn', 'native' => 'euskara', 'regional' => 'eu_ES'], - //'ewo' => ['name' => 'Ewondo', 'script' => 'Latn', 'native' => 'ewondo', 'regional' => ''], - //'ee' => ['name' => 'Ewe', 'script' => 'Latn', 'native' => 'eʋegbe', 'regional' => ''], - //'fil' => ['name' => 'Filipino', 'script' => 'Latn', 'native' => 'Filipino', 'regional' => 'fil_PH'], - //'fr' => ['name' => 'French', 'script' => 'Latn', 'native' => 'français', 'regional' => 'fr_FR'], - //'fr-CA' => ['name' => 'Canadian French', 'script' => 'Latn', 'native' => 'français canadien', 'regional' => 'fr_CA'], - //'fy' => ['name' => 'Western Frisian', 'script' => 'Latn', 'native' => 'frysk', 'regional' => 'fy_DE'], - //'fur' => ['name' => 'Friulian', 'script' => 'Latn', 'native' => 'furlan', 'regional' => 'fur_IT'], - //'fo' => ['name' => 'Faroese', 'script' => 'Latn', 'native' => 'føroyskt', 'regional' => 'fo_FO'], - //'gaa' => ['name' => 'Ga', 'script' => 'Latn', 'native' => 'Ga', 'regional' => ''], - //'ga' => ['name' => 'Irish', 'script' => 'Latn', 'native' => 'Gaeilge', 'regional' => 'ga_IE'], - //'gv' => ['name' => 'Manx', 'script' => 'Latn', 'native' => 'Gaelg', 'regional' => 'gv_GB'], - //'sm' => ['name' => 'Samoan', 'script' => 'Latn', 'native' => 'Gagana fa’a Sāmoa', 'regional' => ''], - //'gl' => ['name' => 'Galician', 'script' => 'Latn', 'native' => 'galego', 'regional' => 'gl_ES'], - //'ki' => ['name' => 'Kikuyu', 'script' => 'Latn', 'native' => 'Gikuyu', 'regional' => ''], - //'gd' => ['name' => 'Scottish Gaelic', 'script' => 'Latn', 'native' => 'Gàidhlig', 'regional' => 'gd_GB'], - //'ha' => ['name' => 'Hausa', 'script' => 'Latn', 'native' => 'Hausa', 'regional' => 'ha_NG'], - //'bez' => ['name' => 'Bena', 'script' => 'Latn', 'native' => 'Hibena', 'regional' => ''], - //'ho' => ['name' => 'Hiri Motu', 'script' => 'Latn', 'native' => 'Hiri Motu', 'regional' => ''], - //'hr' => ['name' => 'Croatian', 'script' => 'Latn', 'native' => 'hrvatski', 'regional' => 'hr_HR'], - //'bem' => ['name' => 'Bemba', 'script' => 'Latn', 'native' => 'Ichibemba', 'regional' => 'bem_ZM'], - //'io' => ['name' => 'Ido', 'script' => 'Latn', 'native' => 'Ido', 'regional' => ''], - //'ig' => ['name' => 'Igbo', 'script' => 'Latn', 'native' => 'Igbo', 'regional' => 'ig_NG'], - //'rn' => ['name' => 'Rundi', 'script' => 'Latn', 'native' => 'Ikirundi', 'regional' => ''], - //'ia' => ['name' => 'Interlingua', 'script' => 'Latn', 'native' => 'interlingua', 'regional' => 'ia_FR'], - //'iu-Latn' => ['name' => 'Inuktitut (Latin)', 'script' => 'Latn', 'native' => 'Inuktitut', 'regional' => 'iu_CA'], - //'sbp' => ['name' => 'Sileibi', 'script' => 'Latn', 'native' => 'Ishisangu', 'regional' => ''], - //'nd' => ['name' => 'North Ndebele', 'script' => 'Latn', 'native' => 'isiNdebele', 'regional' => ''], - //'nr' => ['name' => 'South Ndebele', 'script' => 'Latn', 'native' => 'isiNdebele', 'regional' => 'nr_ZA'], - //'xh' => ['name' => 'Xhosa', 'script' => 'Latn', 'native' => 'isiXhosa', 'regional' => 'xh_ZA'], - //'zu' => ['name' => 'Zulu', 'script' => 'Latn', 'native' => 'isiZulu', 'regional' => 'zu_ZA'], - //'it' => ['name' => 'Italian', 'script' => 'Latn', 'native' => 'italiano', 'regional' => 'it_IT'], - //'ik' => ['name' => 'Inupiaq', 'script' => 'Latn', 'native' => 'Iñupiaq', 'regional' => 'ik_CA'], - //'dyo' => ['name' => 'Jola-Fonyi', 'script' => 'Latn', 'native' => 'joola', 'regional' => ''], - //'kea' => ['name' => 'Kabuverdianu', 'script' => 'Latn', 'native' => 'kabuverdianu', 'regional' => ''], - //'kaj' => ['name' => 'Jju', 'script' => 'Latn', 'native' => 'Kaje', 'regional' => ''], - //'mh' => ['name' => 'Marshallese', 'script' => 'Latn', 'native' => 'Kajin M̧ajeļ', 'regional' => 'mh_MH'], - //'kl' => ['name' => 'Kalaallisut', 'script' => 'Latn', 'native' => 'kalaallisut', 'regional' => 'kl_GL'], - //'kln' => ['name' => 'Kalenjin', 'script' => 'Latn', 'native' => 'Kalenjin', 'regional' => ''], - //'kr' => ['name' => 'Kanuri', 'script' => 'Latn', 'native' => 'Kanuri', 'regional' => ''], - //'kcg' => ['name' => 'Tyap', 'script' => 'Latn', 'native' => 'Katab', 'regional' => ''], - //'kw' => ['name' => 'Cornish', 'script' => 'Latn', 'native' => 'kernewek', 'regional' => 'kw_GB'], - //'naq' => ['name' => 'Nama', 'script' => 'Latn', 'native' => 'Khoekhoegowab', 'regional' => ''], - //'rof' => ['name' => 'Rombo', 'script' => 'Latn', 'native' => 'Kihorombo', 'regional' => ''], - //'kam' => ['name' => 'Kamba', 'script' => 'Latn', 'native' => 'Kikamba', 'regional' => ''], - //'kg' => ['name' => 'Kongo', 'script' => 'Latn', 'native' => 'Kikongo', 'regional' => ''], - //'jmc' => ['name' => 'Machame', 'script' => 'Latn', 'native' => 'Kimachame', 'regional' => ''], - //'rw' => ['name' => 'Kinyarwanda', 'script' => 'Latn', 'native' => 'Kinyarwanda', 'regional' => 'rw_RW'], - //'asa' => ['name' => 'Kipare', 'script' => 'Latn', 'native' => 'Kipare', 'regional' => ''], - //'rwk' => ['name' => 'Rwa', 'script' => 'Latn', 'native' => 'Kiruwa', 'regional' => ''], - //'saq' => ['name' => 'Samburu', 'script' => 'Latn', 'native' => 'Kisampur', 'regional' => ''], - //'ksb' => ['name' => 'Shambala', 'script' => 'Latn', 'native' => 'Kishambaa', 'regional' => ''], - //'swc' => ['name' => 'Congo Swahili', 'script' => 'Latn', 'native' => 'Kiswahili ya Kongo', 'regional' => ''], - //'sw' => ['name' => 'Swahili', 'script' => 'Latn', 'native' => 'Kiswahili', 'regional' => 'sw_KE'], - //'dav' => ['name' => 'Dawida', 'script' => 'Latn', 'native' => 'Kitaita', 'regional' => ''], - //'teo' => ['name' => 'Teso', 'script' => 'Latn', 'native' => 'Kiteso', 'regional' => ''], - //'khq' => ['name' => 'Koyra Chiini', 'script' => 'Latn', 'native' => 'Koyra ciini', 'regional' => ''], - //'ses' => ['name' => 'Songhay', 'script' => 'Latn', 'native' => 'Koyraboro senni', 'regional' => ''], - //'mfe' => ['name' => 'Morisyen', 'script' => 'Latn', 'native' => 'kreol morisien', 'regional' => ''], - //'ht' => ['name' => 'Haitian', 'script' => 'Latn', 'native' => 'Kreyòl ayisyen', 'regional' => 'ht_HT'], - //'kj' => ['name' => 'Kuanyama', 'script' => 'Latn', 'native' => 'Kwanyama', 'regional' => ''], - //'ksh' => ['name' => 'Kölsch', 'script' => 'Latn', 'native' => 'Kölsch', 'regional' => ''], - //'ebu' => ['name' => 'Kiembu', 'script' => 'Latn', 'native' => 'Kĩembu', 'regional' => ''], - //'mer' => ['name' => 'Kimîîru', 'script' => 'Latn', 'native' => 'Kĩmĩrũ', 'regional' => ''], - //'lag' => ['name' => 'Langi', 'script' => 'Latn', 'native' => 'Kɨlaangi', 'regional' => ''], - //'lah' => ['name' => 'Lahnda', 'script' => 'Latn', 'native' => 'Lahnda', 'regional' => ''], - //'la' => ['name' => 'Latin', 'script' => 'Latn', 'native' => 'latine', 'regional' => ''], - //'lv' => ['name' => 'Latvian', 'script' => 'Latn', 'native' => 'latviešu', 'regional' => 'lv_LV'], - //'to' => ['name' => 'Tongan', 'script' => 'Latn', 'native' => 'lea fakatonga', 'regional' => ''], - //'lt' => ['name' => 'Lithuanian', 'script' => 'Latn', 'native' => 'lietuvių', 'regional' => 'lt_LT'], - //'li' => ['name' => 'Limburgish', 'script' => 'Latn', 'native' => 'Limburgs', 'regional' => 'li_BE'], - //'ln' => ['name' => 'Lingala', 'script' => 'Latn', 'native' => 'lingála', 'regional' => ''], - //'lg' => ['name' => 'Ganda', 'script' => 'Latn', 'native' => 'Luganda', 'regional' => 'lg_UG'], - //'luy' => ['name' => 'Oluluyia', 'script' => 'Latn', 'native' => 'Luluhia', 'regional' => ''], - //'lb' => ['name' => 'Luxembourgish', 'script' => 'Latn', 'native' => 'Lëtzebuergesch', 'regional' => 'lb_LU'], - //'hu' => ['name' => 'Hungarian', 'script' => 'Latn', 'native' => 'magyar', 'regional' => 'hu_HU'], - //'mgh' => ['name' => 'Makhuwa-Meetto', 'script' => 'Latn', 'native' => 'Makua', 'regional' => ''], - //'mg' => ['name' => 'Malagasy', 'script' => 'Latn', 'native' => 'Malagasy', 'regional' => 'mg_MG'], - //'mt' => ['name' => 'Maltese', 'script' => 'Latn', 'native' => 'Malti', 'regional' => 'mt_MT'], - //'mtr' => ['name' => 'Mewari', 'script' => 'Latn', 'native' => 'Mewari', 'regional' => ''], - //'mua' => ['name' => 'Mundang', 'script' => 'Latn', 'native' => 'Mundang', 'regional' => ''], - //'mi' => ['name' => 'Māori', 'script' => 'Latn', 'native' => 'Māori', 'regional' => 'mi_NZ'], - //'nl' => ['name' => 'Dutch', 'script' => 'Latn', 'native' => 'Nederlands', 'regional' => 'nl_NL'], - //'nmg' => ['name' => 'Kwasio', 'script' => 'Latn', 'native' => 'ngumba', 'regional' => ''], - //'yav' => ['name' => 'Yangben', 'script' => 'Latn', 'native' => 'nuasue', 'regional' => ''], - //'nn' => ['name' => 'Norwegian Nynorsk', 'script' => 'Latn', 'native' => 'nynorsk', 'regional' => 'nn_NO'], - //'oc' => ['name' => 'Occitan', 'script' => 'Latn', 'native' => 'occitan', 'regional' => 'oc_FR'], - //'ang' => ['name' => 'Old English', 'script' => 'Runr', 'native' => 'Old English', 'regional' => ''], - //'xog' => ['name' => 'Soga', 'script' => 'Latn', 'native' => 'Olusoga', 'regional' => ''], - //'om' => ['name' => 'Oromo', 'script' => 'Latn', 'native' => 'Oromoo', 'regional' => 'om_ET'], - //'ng' => ['name' => 'Ndonga', 'script' => 'Latn', 'native' => 'OshiNdonga', 'regional' => ''], - //'hz' => ['name' => 'Herero', 'script' => 'Latn', 'native' => 'Otjiherero', 'regional' => ''], - //'uz-Latn' => ['name' => 'Uzbek (Latin)', 'script' => 'Latn', 'native' => 'oʼzbekcha', 'regional' => 'uz_UZ'], - //'nds' => ['name' => 'Low German', 'script' => 'Latn', 'native' => 'Plattdüütsch', 'regional' => 'nds_DE'], - //'pl' => ['name' => 'Polish', 'script' => 'Latn', 'native' => 'polski', 'regional' => 'pl_PL'], - //'pt' => ['name' => 'Portuguese', 'script' => 'Latn', 'native' => 'português', 'regional' => 'pt_PT'], - //'pt-BR' => ['name' => 'Brazilian Portuguese', 'script' => 'Latn', 'native' => 'português do Brasil', 'regional' => 'pt_BR'], - //'ff' => ['name' => 'Fulah', 'script' => 'Latn', 'native' => 'Pulaar', 'regional' => 'ff_SN'], - //'pi' => ['name' => 'Pahari-Potwari', 'script' => 'Latn', 'native' => 'Pāli', 'regional' => ''], - //'aa' => ['name' => 'Afar', 'script' => 'Latn', 'native' => 'Qafar', 'regional' => 'aa_ER'], - //'ty' => ['name' => 'Tahitian', 'script' => 'Latn', 'native' => 'Reo Māohi', 'regional' => ''], - //'ksf' => ['name' => 'Bafia', 'script' => 'Latn', 'native' => 'rikpa', 'regional' => ''], - //'ro' => ['name' => 'Romanian', 'script' => 'Latn', 'native' => 'română', 'regional' => 'ro_RO'], - //'cgg' => ['name' => 'Chiga', 'script' => 'Latn', 'native' => 'Rukiga', 'regional' => ''], - //'rm' => ['name' => 'Romansh', 'script' => 'Latn', 'native' => 'rumantsch', 'regional' => ''], - //'qu' => ['name' => 'Quechua', 'script' => 'Latn', 'native' => 'Runa Simi', 'regional' => ''], - //'nyn' => ['name' => 'Nyankole', 'script' => 'Latn', 'native' => 'Runyankore', 'regional' => ''], - //'ssy' => ['name' => 'Saho', 'script' => 'Latn', 'native' => 'Saho', 'regional' => ''], - //'sc' => ['name' => 'Sardinian', 'script' => 'Latn', 'native' => 'sardu', 'regional' => 'sc_IT'], - //'de-CH' => ['name' => 'Swiss High German', 'script' => 'Latn', 'native' => 'Schweizer Hochdeutsch', 'regional' => 'de_CH'], - //'gsw' => ['name' => 'Swiss German', 'script' => 'Latn', 'native' => 'Schwiizertüütsch', 'regional' => ''], - //'trv' => ['name' => 'Taroko', 'script' => 'Latn', 'native' => 'Seediq', 'regional' => ''], - //'seh' => ['name' => 'Sena', 'script' => 'Latn', 'native' => 'sena', 'regional' => ''], - //'nso' => ['name' => 'Northern Sotho', 'script' => 'Latn', 'native' => 'Sesotho sa Leboa', 'regional' => 'nso_ZA'], - //'st' => ['name' => 'Southern Sotho', 'script' => 'Latn', 'native' => 'Sesotho', 'regional' => 'st_ZA'], - //'tn' => ['name' => 'Tswana', 'script' => 'Latn', 'native' => 'Setswana', 'regional' => 'tn_ZA'], - //'sq' => ['name' => 'Albanian', 'script' => 'Latn', 'native' => 'shqip', 'regional' => 'sq_AL'], - //'sid' => ['name' => 'Sidamo', 'script' => 'Latn', 'native' => 'Sidaamu Afo', 'regional' => 'sid_ET'], - //'ss' => ['name' => 'Swati', 'script' => 'Latn', 'native' => 'Siswati', 'regional' => 'ss_ZA'], - //'sk' => ['name' => 'Slovak', 'script' => 'Latn', 'native' => 'slovenčina', 'regional' => 'sk_SK'], - //'sl' => ['name' => 'Slovene', 'script' => 'Latn', 'native' => 'slovenščina', 'regional' => 'sl_SI'], - //'so' => ['name' => 'Somali', 'script' => 'Latn', 'native' => 'Soomaali', 'regional' => 'so_SO'], - //'sr-Latn' => ['name' => 'Serbian (Latin)', 'script' => 'Latn', 'native' => 'Srpski', 'regional' => 'sr_RS'], - //'sh' => ['name' => 'Serbo-Croatian', 'script' => 'Latn', 'native' => 'srpskohrvatski', 'regional' => ''], - //'fi' => ['name' => 'Finnish', 'script' => 'Latn', 'native' => 'suomi', 'regional' => 'fi_FI'], - //'sv' => ['name' => 'Swedish', 'script' => 'Latn', 'native' => 'svenska', 'regional' => 'sv_SE'], - //'sg' => ['name' => 'Sango', 'script' => 'Latn', 'native' => 'Sängö', 'regional' => ''], - //'tl' => ['name' => 'Tagalog', 'script' => 'Latn', 'native' => 'Tagalog', 'regional' => 'tl_PH'], - //'tzm-Latn' => ['name' => 'Central Atlas Tamazight (Latin)', 'script' => 'Latn', 'native' => 'Tamazight', 'regional' => ''], - //'kab' => ['name' => 'Kabyle', 'script' => 'Latn', 'native' => 'Taqbaylit', 'regional' => 'kab_DZ'], - //'twq' => ['name' => 'Tasawaq', 'script' => 'Latn', 'native' => 'Tasawaq senni', 'regional' => ''], - //'shi' => ['name' => 'Tachelhit (Latin)', 'script' => 'Latn', 'native' => 'Tashelhit', 'regional' => ''], - //'nus' => ['name' => 'Nuer', 'script' => 'Latn', 'native' => 'Thok Nath', 'regional' => ''], - //'vi' => ['name' => 'Vietnamese', 'script' => 'Latn', 'native' => 'Tiếng Việt', 'regional' => 'vi_VN'], - //'tg-Latn' => ['name' => 'Tajik (Latin)', 'script' => 'Latn', 'native' => 'tojikī', 'regional' => 'tg_TJ'], - //'lu' => ['name' => 'Luba-Katanga', 'script' => 'Latn', 'native' => 'Tshiluba', 'regional' => 've_ZA'], - //'ve' => ['name' => 'Venda', 'script' => 'Latn', 'native' => 'Tshivenḓa', 'regional' => ''], - //'tw' => ['name' => 'Twi', 'script' => 'Latn', 'native' => 'Twi', 'regional' => ''], - //'tr' => ['name' => 'Turkish', 'script' => 'Latn', 'native' => 'Türkçe', 'regional' => 'tr_TR'], - //'ale' => ['name' => 'Aleut', 'script' => 'Latn', 'native' => 'Unangax tunuu', 'regional' => ''], - //'ca-valencia' => ['name' => 'Valencian', 'script' => 'Latn', 'native' => 'valencià', 'regional' => ''], - //'vai-Latn' => ['name' => 'Vai (Latin)', 'script' => 'Latn', 'native' => 'Viyamíĩ', 'regional' => ''], - //'vo' => ['name' => 'Volapük', 'script' => 'Latn', 'native' => 'Volapük', 'regional' => ''], - //'fj' => ['name' => 'Fijian', 'script' => 'Latn', 'native' => 'vosa Vakaviti', 'regional' => ''], - //'wa' => ['name' => 'Walloon', 'script' => 'Latn', 'native' => 'Walon', 'regional' => 'wa_BE'], - //'wae' => ['name' => 'Walser', 'script' => 'Latn', 'native' => 'Walser', 'regional' => 'wae_CH'], - //'wen' => ['name' => 'Sorbian', 'script' => 'Latn', 'native' => 'Wendic', 'regional' => ''], - //'wo' => ['name' => 'Wolof', 'script' => 'Latn', 'native' => 'Wolof', 'regional' => 'wo_SN'], - //'ts' => ['name' => 'Tsonga', 'script' => 'Latn', 'native' => 'Xitsonga', 'regional' => 'ts_ZA'], - //'dje' => ['name' => 'Zarma', 'script' => 'Latn', 'native' => 'Zarmaciine', 'regional' => ''], - //'yo' => ['name' => 'Yoruba', 'script' => 'Latn', 'native' => 'Èdè Yorùbá', 'regional' => 'yo_NG'], - //'de-AT' => ['name' => 'Austrian German', 'script' => 'Latn', 'native' => 'Österreichisches Deutsch', 'regional' => 'de_AT'], - //'is' => ['name' => 'Icelandic', 'script' => 'Latn', 'native' => 'íslenska', 'regional' => 'is_IS'], - //'cs' => ['name' => 'Czech', 'script' => 'Latn', 'native' => 'čeština', 'regional' => 'cs_CZ'], - //'bas' => ['name' => 'Basa', 'script' => 'Latn', 'native' => 'Ɓàsàa', 'regional' => ''], - //'mas' => ['name' => 'Masai', 'script' => 'Latn', 'native' => 'ɔl-Maa', 'regional' => ''], - //'haw' => ['name' => 'Hawaiian', 'script' => 'Latn', 'native' => 'ʻŌlelo Hawaiʻi', 'regional' => ''], - //'el' => ['name' => 'Greek', 'script' => 'Grek', 'native' => 'Ελληνικά', 'regional' => 'el_GR'], - //'uz' => ['name' => 'Uzbek (Cyrillic)', 'script' => 'Cyrl', 'native' => 'Ўзбек', 'regional' => 'uz_UZ'], - //'az-Cyrl' => ['name' => 'Azerbaijani (Cyrillic)', 'script' => 'Cyrl', 'native' => 'Азәрбајҹан', 'regional' => 'uz_UZ'], - //'ab' => ['name' => 'Abkhazian', 'script' => 'Cyrl', 'native' => 'Аҧсуа', 'regional' => ''], - //'os' => ['name' => 'Ossetic', 'script' => 'Cyrl', 'native' => 'Ирон', 'regional' => 'os_RU'], - //'ky' => ['name' => 'Kyrgyz', 'script' => 'Cyrl', 'native' => 'Кыргыз', 'regional' => 'ky_KG'], - //'sr' => ['name' => 'Serbian (Cyrillic)', 'script' => 'Cyrl', 'native' => 'Српски', 'regional' => 'sr_RS'], - //'av' => ['name' => 'Avaric', 'script' => 'Cyrl', 'native' => 'авар мацӀ', 'regional' => ''], - //'ady' => ['name' => 'Adyghe', 'script' => 'Cyrl', 'native' => 'адыгэбзэ', 'regional' => ''], - //'ba' => ['name' => 'Bashkir', 'script' => 'Cyrl', 'native' => 'башҡорт теле', 'regional' => ''], - //'be' => ['name' => 'Belarusian', 'script' => 'Cyrl', 'native' => 'беларуская', 'regional' => 'be_BY'], - //'bg' => ['name' => 'Bulgarian', 'script' => 'Cyrl', 'native' => 'български', 'regional' => 'bg_BG'], - //'kv' => ['name' => 'Komi', 'script' => 'Cyrl', 'native' => 'коми кыв', 'regional' => ''], - //'mk' => ['name' => 'Macedonian', 'script' => 'Cyrl', 'native' => 'македонски', 'regional' => 'mk_MK'], - //'mn' => ['name' => 'Mongolian (Cyrillic)', 'script' => 'Cyrl', 'native' => 'монгол', 'regional' => 'mn_MN'], - //'ce' => ['name' => 'Chechen', 'script' => 'Cyrl', 'native' => 'нохчийн мотт', 'regional' => 'ce_RU'], - //'ru' => ['name' => 'Russian', 'script' => 'Cyrl', 'native' => 'русский', 'regional' => 'ru_RU'], - //'sah' => ['name' => 'Yakut', 'script' => 'Cyrl', 'native' => 'саха тыла', 'regional' => ''], - //'tt' => ['name' => 'Tatar', 'script' => 'Cyrl', 'native' => 'татар теле', 'regional' => 'tt_RU'], - //'tg' => ['name' => 'Tajik (Cyrillic)', 'script' => 'Cyrl', 'native' => 'тоҷикӣ', 'regional' => 'tg_TJ'], - //'tk' => ['name' => 'Turkmen', 'script' => 'Cyrl', 'native' => 'түркменче', 'regional' => 'tk_TM'], - //'uk' => ['name' => 'Ukrainian', 'script' => 'Cyrl', 'native' => 'українська', 'regional' => 'uk_UA'], - //'cv' => ['name' => 'Chuvash', 'script' => 'Cyrl', 'native' => 'чӑваш чӗлхи', 'regional' => 'cv_RU'], - //'cu' => ['name' => 'Church Slavic', 'script' => 'Cyrl', 'native' => 'ѩзыкъ словѣньскъ', 'regional' => ''], - //'kk' => ['name' => 'Kazakh', 'script' => 'Cyrl', 'native' => 'қазақ тілі', 'regional' => 'kk_KZ'], - //'hy' => ['name' => 'Armenian', 'script' => 'Armn', 'native' => 'Հայերեն', 'regional' => 'hy_AM'], - //'yi' => ['name' => 'Yiddish', 'script' => 'Hebr', 'native' => 'ייִדיש', 'regional' => 'yi_US'], - //'he' => ['name' => 'Hebrew', 'script' => 'Hebr', 'native' => 'עברית', 'regional' => 'he_IL'], - //'ug' => ['name' => 'Uyghur', 'script' => 'Arab', 'native' => 'ئۇيغۇرچە', 'regional' => 'ug_CN'], - //'ur' => ['name' => 'Urdu', 'script' => 'Arab', 'native' => 'اردو', 'regional' => 'ur_PK'], - //'ar' => ['name' => 'Arabic', 'script' => 'Arab', 'native' => 'العربية', 'regional' => 'ar_AE'], - //'uz-Arab' => ['name' => 'Uzbek (Arabic)', 'script' => 'Arab', 'native' => 'اۉزبېک', 'regional' => ''], - //'tg-Arab' => ['name' => 'Tajik (Arabic)', 'script' => 'Arab', 'native' => 'تاجیکی', 'regional' => 'tg_TJ'], - //'sd' => ['name' => 'Sindhi', 'script' => 'Arab', 'native' => 'سنڌي', 'regional' => 'sd_IN'], - //'fa' => ['name' => 'Persian', 'script' => 'Arab', 'native' => 'فارسی', 'regional' => 'fa_IR'], - //'pa-Arab' => ['name' => 'Punjabi (Arabic)', 'script' => 'Arab', 'native' => 'پنجاب', 'regional' => 'pa_IN'], - //'ps' => ['name' => 'Pashto', 'script' => 'Arab', 'native' => 'پښتو', 'regional' => 'ps_AF'], - //'ks' => ['name' => 'Kashmiri (Arabic)', 'script' => 'Arab', 'native' => 'کأشُر', 'regional' => 'ks_IN'], - //'ku' => ['name' => 'Kurdish', 'script' => 'Arab', 'native' => 'کوردی', 'regional' => 'ku_TR'], - //'dv' => ['name' => 'Divehi', 'script' => 'Thaa', 'native' => 'ދިވެހިބަސް', 'regional' => 'dv_MV'], - //'ks-Deva' => ['name' => 'Kashmiri (Devaganari)', 'script' => 'Deva', 'native' => 'कॉशुर', 'regional' => 'ks_IN'], - //'kok' => ['name' => 'Konkani', 'script' => 'Deva', 'native' => 'कोंकणी', 'regional' => 'kok_IN'], - //'doi' => ['name' => 'Dogri', 'script' => 'Deva', 'native' => 'डोगरी', 'regional' => 'doi_IN'], - //'ne' => ['name' => 'Nepali', 'script' => 'Deva', 'native' => 'नेपाली', 'regional' => ''], - //'pra' => ['name' => 'Prakrit', 'script' => 'Deva', 'native' => 'प्राकृत', 'regional' => ''], - //'brx' => ['name' => 'Bodo', 'script' => 'Deva', 'native' => 'बड़ो', 'regional' => 'brx_IN'], - //'bra' => ['name' => 'Braj', 'script' => 'Deva', 'native' => 'ब्रज भाषा', 'regional' => ''], - //'mr' => ['name' => 'Marathi', 'script' => 'Deva', 'native' => 'मराठी', 'regional' => 'mr_IN'], - //'mai' => ['name' => 'Maithili', 'script' => 'Tirh', 'native' => 'मैथिली', 'regional' => 'mai_IN'], - //'raj' => ['name' => 'Rajasthani', 'script' => 'Deva', 'native' => 'राजस्थानी', 'regional' => ''], - //'sa' => ['name' => 'Sanskrit', 'script' => 'Deva', 'native' => 'संस्कृतम्', 'regional' => 'sa_IN'], - //'hi' => ['name' => 'Hindi', 'script' => 'Deva', 'native' => 'हिन्दी', 'regional' => 'hi_IN'], - //'as' => ['name' => 'Assamese', 'script' => 'Beng', 'native' => 'অসমীয়া', 'regional' => 'as_IN'], - //'bn' => ['name' => 'Bengali', 'script' => 'Beng', 'native' => 'বাংলা', 'regional' => 'bn_BD'], - //'mni' => ['name' => 'Manipuri', 'script' => 'Beng', 'native' => 'মৈতৈ', 'regional' => 'mni_IN'], - //'pa' => ['name' => 'Punjabi (Gurmukhi)', 'script' => 'Guru', 'native' => 'ਪੰਜਾਬੀ', 'regional' => 'pa_IN'], - //'gu' => ['name' => 'Gujarati', 'script' => 'Gujr', 'native' => 'ગુજરાતી', 'regional' => 'gu_IN'], - //'or' => ['name' => 'Oriya', 'script' => 'Orya', 'native' => 'ଓଡ଼ିଆ', 'regional' => 'or_IN'], - //'ta' => ['name' => 'Tamil', 'script' => 'Taml', 'native' => 'தமிழ்', 'regional' => 'ta_IN'], - //'te' => ['name' => 'Telugu', 'script' => 'Telu', 'native' => 'తెలుగు', 'regional' => 'te_IN'], - //'kn' => ['name' => 'Kannada', 'script' => 'Knda', 'native' => 'ಕನ್ನಡ', 'regional' => 'kn_IN'], - //'ml' => ['name' => 'Malayalam', 'script' => 'Mlym', 'native' => 'മലയാളം', 'regional' => 'ml_IN'], - //'si' => ['name' => 'Sinhala', 'script' => 'Sinh', 'native' => 'සිංහල', 'regional' => 'si_LK'], - //'th' => ['name' => 'Thai', 'script' => 'Thai', 'native' => 'ไทย', 'regional' => 'th_TH'], - //'lo' => ['name' => 'Lao', 'script' => 'Laoo', 'native' => 'ລາວ', 'regional' => 'lo_LA'], - //'bo' => ['name' => 'Tibetan', 'script' => 'Tibt', 'native' => 'པོད་སྐད་', 'regional' => 'bo_IN'], - //'dz' => ['name' => 'Dzongkha', 'script' => 'Tibt', 'native' => 'རྫོང་ཁ', 'regional' => 'dz_BT'], - //'my' => ['name' => 'Burmese', 'script' => 'Mymr', 'native' => 'မြန်မာဘာသာ', 'regional' => 'my_MM'], - //'ka' => ['name' => 'Georgian', 'script' => 'Geor', 'native' => 'ქართული', 'regional' => 'ka_GE'], - //'byn' => ['name' => 'Blin', 'script' => 'Ethi', 'native' => 'ብሊን', 'regional' => 'byn_ER'], - //'tig' => ['name' => 'Tigre', 'script' => 'Ethi', 'native' => 'ትግረ', 'regional' => 'tig_ER'], - //'ti' => ['name' => 'Tigrinya', 'script' => 'Ethi', 'native' => 'ትግርኛ', 'regional' => 'ti_ET'], - //'am' => ['name' => 'Amharic', 'script' => 'Ethi', 'native' => 'አማርኛ', 'regional' => 'am_ET'], - //'wal' => ['name' => 'Wolaytta', 'script' => 'Ethi', 'native' => 'ወላይታቱ', 'regional' => 'wal_ET'], - //'chr' => ['name' => 'Cherokee', 'script' => 'Cher', 'native' => 'ᏣᎳᎩ', 'regional' => ''], - //'iu' => ['name' => 'Inuktitut (Canadian Aboriginal Syllabics)', 'script' => 'Cans', 'native' => 'ᐃᓄᒃᑎᑐᑦ', 'regional' => 'iu_CA'], - //'oj' => ['name' => 'Ojibwa', 'script' => 'Cans', 'native' => 'ᐊᓂᔑᓈᐯᒧᐎᓐ', 'regional' => ''], - //'cr' => ['name' => 'Cree', 'script' => 'Cans', 'native' => 'ᓀᐦᐃᔭᐍᐏᐣ', 'regional' => ''], - //'km' => ['name' => 'Khmer', 'script' => 'Khmr', 'native' => 'ភាសាខ្មែរ', 'regional' => 'km_KH'], - //'mn-Mong' => ['name' => 'Mongolian (Mongolian)', 'script' => 'Mong', 'native' => 'ᠮᠣᠨᠭᠭᠣᠯ ᠬᠡᠯᠡ', 'regional' => 'mn_MN'], - //'shi-Tfng' => ['name' => 'Tachelhit (Tifinagh)', 'script' => 'Tfng', 'native' => 'ⵜⴰⵎⴰⵣⵉⵖⵜ', 'regional' => ''], - //'tzm' => ['name' => 'Central Atlas Tamazight (Tifinagh)','script' => 'Tfng', 'native' => 'ⵜⴰⵎⴰⵣⵉⵖⵜ', 'regional' => ''], - //'yue' => ['name' => 'Yue', 'script' => 'Hant', 'native' => '廣州話', 'regional' => 'yue_HK'], - //'ja' => ['name' => 'Japanese', 'script' => 'Jpan', 'native' => '日本語', 'regional' => 'ja_JP'], - //'zh' => ['name' => 'Chinese (Simplified)', 'script' => 'Hans', 'native' => '简体中文', 'regional' => 'zh_CN'], - //'zh-Hant' => ['name' => 'Chinese (Traditional)', 'script' => 'Hant', 'native' => '繁體中文', 'regional' => 'zh_CN'], - //'ii' => ['name' => 'Sichuan Yi', 'script' => 'Yiii', 'native' => 'ꆈꌠꉙ', 'regional' => ''], - //'vai' => ['name' => 'Vai (Vai)', 'script' => 'Vaii', 'native' => 'ꕙꔤ', 'regional' => ''], - //'jv-Java' => ['name' => 'Javanese (Javanese)', 'script' => 'Java', 'native' => 'ꦧꦱꦗꦮ', 'regional' => ''], - //'ko' => ['name' => 'Korean', 'script' => 'Hang', 'native' => '한국어', 'regional' => 'ko_KR'], - ] + // 'ace' => ['name' => 'Achinese', 'script' => 'Latn', 'native' => 'Aceh', 'regional' => ''], + // 'af' => ['name' => 'Afrikaans', 'script' => 'Latn', 'native' => 'Afrikaans', 'regional' => 'af_ZA'], + // 'agq' => ['name' => 'Aghem', 'script' => 'Latn', 'native' => 'Aghem', 'regional' => ''], + // 'ak' => ['name' => 'Akan', 'script' => 'Latn', 'native' => 'Akan', 'regional' => 'ak_GH'], + // 'an' => ['name' => 'Aragonese', 'script' => 'Latn', 'native' => 'aragonés', 'regional' => 'an_ES'], + // 'cch' => ['name' => 'Atsam', 'script' => 'Latn', 'native' => 'Atsam', 'regional' => ''], + // 'gn' => ['name' => 'Guaraní', 'script' => 'Latn', 'native' => 'Avañe’ẽ', 'regional' => ''], + // 'ae' => ['name' => 'Avestan', 'script' => 'Latn', 'native' => 'avesta', 'regional' => ''], + // 'ay' => ['name' => 'Aymara', 'script' => 'Latn', 'native' => 'aymar aru', 'regional' => 'ay_PE'], + // 'az' => ['name' => 'Azerbaijani (Latin)', 'script' => 'Latn', 'native' => 'azərbaycanca', 'regional' => 'az_AZ'], + // 'id' => ['name' => 'Indonesian', 'script' => 'Latn', 'native' => 'Bahasa Indonesia', 'regional' => 'id_ID'], + // 'ms' => ['name' => 'Malay', 'script' => 'Latn', 'native' => 'Bahasa Melayu', 'regional' => 'ms_MY'], + // 'bm' => ['name' => 'Bambara', 'script' => 'Latn', 'native' => 'bamanakan', 'regional' => ''], + // 'jv' => ['name' => 'Javanese (Latin)', 'script' => 'Latn', 'native' => 'Basa Jawa', 'regional' => ''], + // 'su' => ['name' => 'Sundanese', 'script' => 'Latn', 'native' => 'Basa Sunda', 'regional' => ''], + // 'bh' => ['name' => 'Bihari', 'script' => 'Latn', 'native' => 'Bihari', 'regional' => ''], + // 'bi' => ['name' => 'Bislama', 'script' => 'Latn', 'native' => 'Bislama', 'regional' => ''], + // 'nb' => ['name' => 'Norwegian Bokmål', 'script' => 'Latn', 'native' => 'Bokmål', 'regional' => 'nb_NO'], + // 'bs' => ['name' => 'Bosnian', 'script' => 'Latn', 'native' => 'bosanski', 'regional' => 'bs_BA'], + // 'br' => ['name' => 'Breton', 'script' => 'Latn', 'native' => 'brezhoneg', 'regional' => 'br_FR'], + // 'ca' => ['name' => 'Catalan', 'script' => 'Latn', 'native' => 'català', 'regional' => 'ca_ES'], + // 'ch' => ['name' => 'Chamorro', 'script' => 'Latn', 'native' => 'Chamoru', 'regional' => ''], + // 'ny' => ['name' => 'Chewa', 'script' => 'Latn', 'native' => 'chiCheŵa', 'regional' => ''], + // 'kde' => ['name' => 'Makonde', 'script' => 'Latn', 'native' => 'Chimakonde', 'regional' => ''], + // 'sn' => ['name' => 'Shona', 'script' => 'Latn', 'native' => 'chiShona', 'regional' => ''], + // 'co' => ['name' => 'Corsican', 'script' => 'Latn', 'native' => 'corsu', 'regional' => ''], + // 'cy' => ['name' => 'Welsh', 'script' => 'Latn', 'native' => 'Cymraeg', 'regional' => 'cy_GB'], + // 'da' => ['name' => 'Danish', 'script' => 'Latn', 'native' => 'dansk', 'regional' => 'da_DK'], + // 'se' => ['name' => 'Northern Sami', 'script' => 'Latn', 'native' => 'davvisámegiella', 'regional' => 'se_NO'], + 'de' => ['name' => 'German', 'script' => 'Latn', 'native' => 'Deutsch', 'regional' => 'de_DE'], + // 'luo' => ['name' => 'Luo', 'script' => 'Latn', 'native' => 'Dholuo', 'regional' => ''], + // 'nv' => ['name' => 'Navajo', 'script' => 'Latn', 'native' => 'Diné bizaad', 'regional' => ''], + // 'dua' => ['name' => 'Duala', 'script' => 'Latn', 'native' => 'duálá', 'regional' => ''], + // 'et' => ['name' => 'Estonian', 'script' => 'Latn', 'native' => 'eesti', 'regional' => 'et_EE'], + // 'na' => ['name' => 'Nauru', 'script' => 'Latn', 'native' => 'Ekakairũ Naoero', 'regional' => ''], + // 'guz' => ['name' => 'Ekegusii', 'script' => 'Latn', 'native' => 'Ekegusii', 'regional' => ''], + 'en' => ['name' => 'English', 'script' => 'Latn', 'native' => 'English', 'regional' => 'en_GB'], + // 'en-AU' => ['name' => 'Australian English', 'script' => 'Latn', 'native' => 'Australian English', 'regional' => 'en_AU'], + // 'en-GB' => ['name' => 'British English', 'script' => 'Latn', 'native' => 'British English', 'regional' => 'en_GB'], + // 'en-US' => ['name' => 'U.S. English', 'script' => 'Latn', 'native' => 'U.S. English', 'regional' => 'en_US'], + 'es' => ['name' => 'Spanish', 'script' => 'Latn', 'native' => 'español', 'regional' => 'es_ES'], + // 'eo' => ['name' => 'Esperanto', 'script' => 'Latn', 'native' => 'esperanto', 'regional' => ''], + // 'eu' => ['name' => 'Basque', 'script' => 'Latn', 'native' => 'euskara', 'regional' => 'eu_ES'], + // 'ewo' => ['name' => 'Ewondo', 'script' => 'Latn', 'native' => 'ewondo', 'regional' => ''], + // 'ee' => ['name' => 'Ewe', 'script' => 'Latn', 'native' => 'eʋegbe', 'regional' => ''], + // 'fil' => ['name' => 'Filipino', 'script' => 'Latn', 'native' => 'Filipino', 'regional' => 'fil_PH'], + // 'fr' => ['name' => 'French', 'script' => 'Latn', 'native' => 'français', 'regional' => 'fr_FR'], + // 'fr-CA' => ['name' => 'Canadian French', 'script' => 'Latn', 'native' => 'français canadien', 'regional' => 'fr_CA'], + // 'fy' => ['name' => 'Western Frisian', 'script' => 'Latn', 'native' => 'frysk', 'regional' => 'fy_DE'], + // 'fur' => ['name' => 'Friulian', 'script' => 'Latn', 'native' => 'furlan', 'regional' => 'fur_IT'], + // 'fo' => ['name' => 'Faroese', 'script' => 'Latn', 'native' => 'føroyskt', 'regional' => 'fo_FO'], + // 'gaa' => ['name' => 'Ga', 'script' => 'Latn', 'native' => 'Ga', 'regional' => ''], + // 'ga' => ['name' => 'Irish', 'script' => 'Latn', 'native' => 'Gaeilge', 'regional' => 'ga_IE'], + // 'gv' => ['name' => 'Manx', 'script' => 'Latn', 'native' => 'Gaelg', 'regional' => 'gv_GB'], + // 'sm' => ['name' => 'Samoan', 'script' => 'Latn', 'native' => 'Gagana fa’a Sāmoa', 'regional' => ''], + // 'gl' => ['name' => 'Galician', 'script' => 'Latn', 'native' => 'galego', 'regional' => 'gl_ES'], + // 'ki' => ['name' => 'Kikuyu', 'script' => 'Latn', 'native' => 'Gikuyu', 'regional' => ''], + // 'gd' => ['name' => 'Scottish Gaelic', 'script' => 'Latn', 'native' => 'Gàidhlig', 'regional' => 'gd_GB'], + // 'ha' => ['name' => 'Hausa', 'script' => 'Latn', 'native' => 'Hausa', 'regional' => 'ha_NG'], + // 'bez' => ['name' => 'Bena', 'script' => 'Latn', 'native' => 'Hibena', 'regional' => ''], + // 'ho' => ['name' => 'Hiri Motu', 'script' => 'Latn', 'native' => 'Hiri Motu', 'regional' => ''], + // 'hr' => ['name' => 'Croatian', 'script' => 'Latn', 'native' => 'hrvatski', 'regional' => 'hr_HR'], + // 'bem' => ['name' => 'Bemba', 'script' => 'Latn', 'native' => 'Ichibemba', 'regional' => 'bem_ZM'], + // 'io' => ['name' => 'Ido', 'script' => 'Latn', 'native' => 'Ido', 'regional' => ''], + // 'ig' => ['name' => 'Igbo', 'script' => 'Latn', 'native' => 'Igbo', 'regional' => 'ig_NG'], + // 'rn' => ['name' => 'Rundi', 'script' => 'Latn', 'native' => 'Ikirundi', 'regional' => ''], + // 'ia' => ['name' => 'Interlingua', 'script' => 'Latn', 'native' => 'interlingua', 'regional' => 'ia_FR'], + // 'iu-Latn' => ['name' => 'Inuktitut (Latin)', 'script' => 'Latn', 'native' => 'Inuktitut', 'regional' => 'iu_CA'], + // 'sbp' => ['name' => 'Sileibi', 'script' => 'Latn', 'native' => 'Ishisangu', 'regional' => ''], + // 'nd' => ['name' => 'North Ndebele', 'script' => 'Latn', 'native' => 'isiNdebele', 'regional' => ''], + // 'nr' => ['name' => 'South Ndebele', 'script' => 'Latn', 'native' => 'isiNdebele', 'regional' => 'nr_ZA'], + // 'xh' => ['name' => 'Xhosa', 'script' => 'Latn', 'native' => 'isiXhosa', 'regional' => 'xh_ZA'], + // 'zu' => ['name' => 'Zulu', 'script' => 'Latn', 'native' => 'isiZulu', 'regional' => 'zu_ZA'], + // 'it' => ['name' => 'Italian', 'script' => 'Latn', 'native' => 'italiano', 'regional' => 'it_IT'], + // 'ik' => ['name' => 'Inupiaq', 'script' => 'Latn', 'native' => 'Iñupiaq', 'regional' => 'ik_CA'], + // 'dyo' => ['name' => 'Jola-Fonyi', 'script' => 'Latn', 'native' => 'joola', 'regional' => ''], + // 'kea' => ['name' => 'Kabuverdianu', 'script' => 'Latn', 'native' => 'kabuverdianu', 'regional' => ''], + // 'kaj' => ['name' => 'Jju', 'script' => 'Latn', 'native' => 'Kaje', 'regional' => ''], + // 'mh' => ['name' => 'Marshallese', 'script' => 'Latn', 'native' => 'Kajin M̧ajeļ', 'regional' => 'mh_MH'], + // 'kl' => ['name' => 'Kalaallisut', 'script' => 'Latn', 'native' => 'kalaallisut', 'regional' => 'kl_GL'], + // 'kln' => ['name' => 'Kalenjin', 'script' => 'Latn', 'native' => 'Kalenjin', 'regional' => ''], + // 'kr' => ['name' => 'Kanuri', 'script' => 'Latn', 'native' => 'Kanuri', 'regional' => ''], + // 'kcg' => ['name' => 'Tyap', 'script' => 'Latn', 'native' => 'Katab', 'regional' => ''], + // 'kw' => ['name' => 'Cornish', 'script' => 'Latn', 'native' => 'kernewek', 'regional' => 'kw_GB'], + // 'naq' => ['name' => 'Nama', 'script' => 'Latn', 'native' => 'Khoekhoegowab', 'regional' => ''], + // 'rof' => ['name' => 'Rombo', 'script' => 'Latn', 'native' => 'Kihorombo', 'regional' => ''], + // 'kam' => ['name' => 'Kamba', 'script' => 'Latn', 'native' => 'Kikamba', 'regional' => ''], + // 'kg' => ['name' => 'Kongo', 'script' => 'Latn', 'native' => 'Kikongo', 'regional' => ''], + // 'jmc' => ['name' => 'Machame', 'script' => 'Latn', 'native' => 'Kimachame', 'regional' => ''], + // 'rw' => ['name' => 'Kinyarwanda', 'script' => 'Latn', 'native' => 'Kinyarwanda', 'regional' => 'rw_RW'], + // 'asa' => ['name' => 'Kipare', 'script' => 'Latn', 'native' => 'Kipare', 'regional' => ''], + // 'rwk' => ['name' => 'Rwa', 'script' => 'Latn', 'native' => 'Kiruwa', 'regional' => ''], + // 'saq' => ['name' => 'Samburu', 'script' => 'Latn', 'native' => 'Kisampur', 'regional' => ''], + // 'ksb' => ['name' => 'Shambala', 'script' => 'Latn', 'native' => 'Kishambaa', 'regional' => ''], + // 'swc' => ['name' => 'Congo Swahili', 'script' => 'Latn', 'native' => 'Kiswahili ya Kongo', 'regional' => ''], + // 'sw' => ['name' => 'Swahili', 'script' => 'Latn', 'native' => 'Kiswahili', 'regional' => 'sw_KE'], + // 'dav' => ['name' => 'Dawida', 'script' => 'Latn', 'native' => 'Kitaita', 'regional' => ''], + // 'teo' => ['name' => 'Teso', 'script' => 'Latn', 'native' => 'Kiteso', 'regional' => ''], + // 'khq' => ['name' => 'Koyra Chiini', 'script' => 'Latn', 'native' => 'Koyra ciini', 'regional' => ''], + // 'ses' => ['name' => 'Songhay', 'script' => 'Latn', 'native' => 'Koyraboro senni', 'regional' => ''], + // 'mfe' => ['name' => 'Morisyen', 'script' => 'Latn', 'native' => 'kreol morisien', 'regional' => ''], + // 'ht' => ['name' => 'Haitian', 'script' => 'Latn', 'native' => 'Kreyòl ayisyen', 'regional' => 'ht_HT'], + // 'kj' => ['name' => 'Kuanyama', 'script' => 'Latn', 'native' => 'Kwanyama', 'regional' => ''], + // 'ksh' => ['name' => 'Kölsch', 'script' => 'Latn', 'native' => 'Kölsch', 'regional' => ''], + // 'ebu' => ['name' => 'Kiembu', 'script' => 'Latn', 'native' => 'Kĩembu', 'regional' => ''], + // 'mer' => ['name' => 'Kimîîru', 'script' => 'Latn', 'native' => 'Kĩmĩrũ', 'regional' => ''], + // 'lag' => ['name' => 'Langi', 'script' => 'Latn', 'native' => 'Kɨlaangi', 'regional' => ''], + // 'lah' => ['name' => 'Lahnda', 'script' => 'Latn', 'native' => 'Lahnda', 'regional' => ''], + // 'la' => ['name' => 'Latin', 'script' => 'Latn', 'native' => 'latine', 'regional' => ''], + // 'lv' => ['name' => 'Latvian', 'script' => 'Latn', 'native' => 'latviešu', 'regional' => 'lv_LV'], + // 'to' => ['name' => 'Tongan', 'script' => 'Latn', 'native' => 'lea fakatonga', 'regional' => ''], + // 'lt' => ['name' => 'Lithuanian', 'script' => 'Latn', 'native' => 'lietuvių', 'regional' => 'lt_LT'], + // 'li' => ['name' => 'Limburgish', 'script' => 'Latn', 'native' => 'Limburgs', 'regional' => 'li_BE'], + // 'ln' => ['name' => 'Lingala', 'script' => 'Latn', 'native' => 'lingála', 'regional' => ''], + // 'lg' => ['name' => 'Ganda', 'script' => 'Latn', 'native' => 'Luganda', 'regional' => 'lg_UG'], + // 'luy' => ['name' => 'Oluluyia', 'script' => 'Latn', 'native' => 'Luluhia', 'regional' => ''], + // 'lb' => ['name' => 'Luxembourgish', 'script' => 'Latn', 'native' => 'Lëtzebuergesch', 'regional' => 'lb_LU'], + // 'hu' => ['name' => 'Hungarian', 'script' => 'Latn', 'native' => 'magyar', 'regional' => 'hu_HU'], + // 'mgh' => ['name' => 'Makhuwa-Meetto', 'script' => 'Latn', 'native' => 'Makua', 'regional' => ''], + // 'mg' => ['name' => 'Malagasy', 'script' => 'Latn', 'native' => 'Malagasy', 'regional' => 'mg_MG'], + // 'mt' => ['name' => 'Maltese', 'script' => 'Latn', 'native' => 'Malti', 'regional' => 'mt_MT'], + // 'mtr' => ['name' => 'Mewari', 'script' => 'Latn', 'native' => 'Mewari', 'regional' => ''], + // 'mua' => ['name' => 'Mundang', 'script' => 'Latn', 'native' => 'Mundang', 'regional' => ''], + // 'mi' => ['name' => 'Māori', 'script' => 'Latn', 'native' => 'Māori', 'regional' => 'mi_NZ'], + // 'nl' => ['name' => 'Dutch', 'script' => 'Latn', 'native' => 'Nederlands', 'regional' => 'nl_NL'], + // 'nmg' => ['name' => 'Kwasio', 'script' => 'Latn', 'native' => 'ngumba', 'regional' => ''], + // 'yav' => ['name' => 'Yangben', 'script' => 'Latn', 'native' => 'nuasue', 'regional' => ''], + // 'nn' => ['name' => 'Norwegian Nynorsk', 'script' => 'Latn', 'native' => 'nynorsk', 'regional' => 'nn_NO'], + // 'oc' => ['name' => 'Occitan', 'script' => 'Latn', 'native' => 'occitan', 'regional' => 'oc_FR'], + // 'ang' => ['name' => 'Old English', 'script' => 'Runr', 'native' => 'Old English', 'regional' => ''], + // 'xog' => ['name' => 'Soga', 'script' => 'Latn', 'native' => 'Olusoga', 'regional' => ''], + // 'om' => ['name' => 'Oromo', 'script' => 'Latn', 'native' => 'Oromoo', 'regional' => 'om_ET'], + // 'ng' => ['name' => 'Ndonga', 'script' => 'Latn', 'native' => 'OshiNdonga', 'regional' => ''], + // 'hz' => ['name' => 'Herero', 'script' => 'Latn', 'native' => 'Otjiherero', 'regional' => ''], + // 'uz-Latn' => ['name' => 'Uzbek (Latin)', 'script' => 'Latn', 'native' => 'oʼzbekcha', 'regional' => 'uz_UZ'], + // 'nds' => ['name' => 'Low German', 'script' => 'Latn', 'native' => 'Plattdüütsch', 'regional' => 'nds_DE'], + // 'pl' => ['name' => 'Polish', 'script' => 'Latn', 'native' => 'polski', 'regional' => 'pl_PL'], + // 'pt' => ['name' => 'Portuguese', 'script' => 'Latn', 'native' => 'português', 'regional' => 'pt_PT'], + // 'pt-BR' => ['name' => 'Brazilian Portuguese', 'script' => 'Latn', 'native' => 'português do Brasil', 'regional' => 'pt_BR'], + // 'ff' => ['name' => 'Fulah', 'script' => 'Latn', 'native' => 'Pulaar', 'regional' => 'ff_SN'], + // 'pi' => ['name' => 'Pahari-Potwari', 'script' => 'Latn', 'native' => 'Pāli', 'regional' => ''], + // 'aa' => ['name' => 'Afar', 'script' => 'Latn', 'native' => 'Qafar', 'regional' => 'aa_ER'], + // 'ty' => ['name' => 'Tahitian', 'script' => 'Latn', 'native' => 'Reo Māohi', 'regional' => ''], + // 'ksf' => ['name' => 'Bafia', 'script' => 'Latn', 'native' => 'rikpa', 'regional' => ''], + // 'ro' => ['name' => 'Romanian', 'script' => 'Latn', 'native' => 'română', 'regional' => 'ro_RO'], + // 'cgg' => ['name' => 'Chiga', 'script' => 'Latn', 'native' => 'Rukiga', 'regional' => ''], + // 'rm' => ['name' => 'Romansh', 'script' => 'Latn', 'native' => 'rumantsch', 'regional' => ''], + // 'qu' => ['name' => 'Quechua', 'script' => 'Latn', 'native' => 'Runa Simi', 'regional' => ''], + // 'nyn' => ['name' => 'Nyankole', 'script' => 'Latn', 'native' => 'Runyankore', 'regional' => ''], + // 'ssy' => ['name' => 'Saho', 'script' => 'Latn', 'native' => 'Saho', 'regional' => ''], + // 'sc' => ['name' => 'Sardinian', 'script' => 'Latn', 'native' => 'sardu', 'regional' => 'sc_IT'], + // 'de-CH' => ['name' => 'Swiss High German', 'script' => 'Latn', 'native' => 'Schweizer Hochdeutsch', 'regional' => 'de_CH'], + // 'gsw' => ['name' => 'Swiss German', 'script' => 'Latn', 'native' => 'Schwiizertüütsch', 'regional' => ''], + // 'trv' => ['name' => 'Taroko', 'script' => 'Latn', 'native' => 'Seediq', 'regional' => ''], + // 'seh' => ['name' => 'Sena', 'script' => 'Latn', 'native' => 'sena', 'regional' => ''], + // 'nso' => ['name' => 'Northern Sotho', 'script' => 'Latn', 'native' => 'Sesotho sa Leboa', 'regional' => 'nso_ZA'], + // 'st' => ['name' => 'Southern Sotho', 'script' => 'Latn', 'native' => 'Sesotho', 'regional' => 'st_ZA'], + // 'tn' => ['name' => 'Tswana', 'script' => 'Latn', 'native' => 'Setswana', 'regional' => 'tn_ZA'], + // 'sq' => ['name' => 'Albanian', 'script' => 'Latn', 'native' => 'shqip', 'regional' => 'sq_AL'], + // 'sid' => ['name' => 'Sidamo', 'script' => 'Latn', 'native' => 'Sidaamu Afo', 'regional' => 'sid_ET'], + // 'ss' => ['name' => 'Swati', 'script' => 'Latn', 'native' => 'Siswati', 'regional' => 'ss_ZA'], + // 'sk' => ['name' => 'Slovak', 'script' => 'Latn', 'native' => 'slovenčina', 'regional' => 'sk_SK'], + // 'sl' => ['name' => 'Slovene', 'script' => 'Latn', 'native' => 'slovenščina', 'regional' => 'sl_SI'], + // 'so' => ['name' => 'Somali', 'script' => 'Latn', 'native' => 'Soomaali', 'regional' => 'so_SO'], + // 'sr-Latn' => ['name' => 'Serbian (Latin)', 'script' => 'Latn', 'native' => 'Srpski', 'regional' => 'sr_RS'], + // 'sh' => ['name' => 'Serbo-Croatian', 'script' => 'Latn', 'native' => 'srpskohrvatski', 'regional' => ''], + // 'fi' => ['name' => 'Finnish', 'script' => 'Latn', 'native' => 'suomi', 'regional' => 'fi_FI'], + // 'sv' => ['name' => 'Swedish', 'script' => 'Latn', 'native' => 'svenska', 'regional' => 'sv_SE'], + // 'sg' => ['name' => 'Sango', 'script' => 'Latn', 'native' => 'Sängö', 'regional' => ''], + // 'tl' => ['name' => 'Tagalog', 'script' => 'Latn', 'native' => 'Tagalog', 'regional' => 'tl_PH'], + // 'tzm-Latn' => ['name' => 'Central Atlas Tamazight (Latin)', 'script' => 'Latn', 'native' => 'Tamazight', 'regional' => ''], + // 'kab' => ['name' => 'Kabyle', 'script' => 'Latn', 'native' => 'Taqbaylit', 'regional' => 'kab_DZ'], + // 'twq' => ['name' => 'Tasawaq', 'script' => 'Latn', 'native' => 'Tasawaq senni', 'regional' => ''], + // 'shi' => ['name' => 'Tachelhit (Latin)', 'script' => 'Latn', 'native' => 'Tashelhit', 'regional' => ''], + // 'nus' => ['name' => 'Nuer', 'script' => 'Latn', 'native' => 'Thok Nath', 'regional' => ''], + // 'vi' => ['name' => 'Vietnamese', 'script' => 'Latn', 'native' => 'Tiếng Việt', 'regional' => 'vi_VN'], + // 'tg-Latn' => ['name' => 'Tajik (Latin)', 'script' => 'Latn', 'native' => 'tojikī', 'regional' => 'tg_TJ'], + // 'lu' => ['name' => 'Luba-Katanga', 'script' => 'Latn', 'native' => 'Tshiluba', 'regional' => 've_ZA'], + // 've' => ['name' => 'Venda', 'script' => 'Latn', 'native' => 'Tshivenḓa', 'regional' => ''], + // 'tw' => ['name' => 'Twi', 'script' => 'Latn', 'native' => 'Twi', 'regional' => ''], + // 'tr' => ['name' => 'Turkish', 'script' => 'Latn', 'native' => 'Türkçe', 'regional' => 'tr_TR'], + // 'ale' => ['name' => 'Aleut', 'script' => 'Latn', 'native' => 'Unangax tunuu', 'regional' => ''], + // 'ca-valencia' => ['name' => 'Valencian', 'script' => 'Latn', 'native' => 'valencià', 'regional' => ''], + // 'vai-Latn' => ['name' => 'Vai (Latin)', 'script' => 'Latn', 'native' => 'Viyamíĩ', 'regional' => ''], + // 'vo' => ['name' => 'Volapük', 'script' => 'Latn', 'native' => 'Volapük', 'regional' => ''], + // 'fj' => ['name' => 'Fijian', 'script' => 'Latn', 'native' => 'vosa Vakaviti', 'regional' => ''], + // 'wa' => ['name' => 'Walloon', 'script' => 'Latn', 'native' => 'Walon', 'regional' => 'wa_BE'], + // 'wae' => ['name' => 'Walser', 'script' => 'Latn', 'native' => 'Walser', 'regional' => 'wae_CH'], + // 'wen' => ['name' => 'Sorbian', 'script' => 'Latn', 'native' => 'Wendic', 'regional' => ''], + // 'wo' => ['name' => 'Wolof', 'script' => 'Latn', 'native' => 'Wolof', 'regional' => 'wo_SN'], + // 'ts' => ['name' => 'Tsonga', 'script' => 'Latn', 'native' => 'Xitsonga', 'regional' => 'ts_ZA'], + // 'dje' => ['name' => 'Zarma', 'script' => 'Latn', 'native' => 'Zarmaciine', 'regional' => ''], + // 'yo' => ['name' => 'Yoruba', 'script' => 'Latn', 'native' => 'Èdè Yorùbá', 'regional' => 'yo_NG'], + // 'de-AT' => ['name' => 'Austrian German', 'script' => 'Latn', 'native' => 'Österreichisches Deutsch', 'regional' => 'de_AT'], + // 'is' => ['name' => 'Icelandic', 'script' => 'Latn', 'native' => 'íslenska', 'regional' => 'is_IS'], + // 'cs' => ['name' => 'Czech', 'script' => 'Latn', 'native' => 'čeština', 'regional' => 'cs_CZ'], + // 'bas' => ['name' => 'Basa', 'script' => 'Latn', 'native' => 'Ɓàsàa', 'regional' => ''], + // 'mas' => ['name' => 'Masai', 'script' => 'Latn', 'native' => 'ɔl-Maa', 'regional' => ''], + // 'haw' => ['name' => 'Hawaiian', 'script' => 'Latn', 'native' => 'ʻŌlelo Hawaiʻi', 'regional' => ''], + // 'el' => ['name' => 'Greek', 'script' => 'Grek', 'native' => 'Ελληνικά', 'regional' => 'el_GR'], + // 'uz' => ['name' => 'Uzbek (Cyrillic)', 'script' => 'Cyrl', 'native' => 'Ўзбек', 'regional' => 'uz_UZ'], + // 'az-Cyrl' => ['name' => 'Azerbaijani (Cyrillic)', 'script' => 'Cyrl', 'native' => 'Азәрбајҹан', 'regional' => 'uz_UZ'], + // 'ab' => ['name' => 'Abkhazian', 'script' => 'Cyrl', 'native' => 'Аҧсуа', 'regional' => ''], + // 'os' => ['name' => 'Ossetic', 'script' => 'Cyrl', 'native' => 'Ирон', 'regional' => 'os_RU'], + // 'ky' => ['name' => 'Kyrgyz', 'script' => 'Cyrl', 'native' => 'Кыргыз', 'regional' => 'ky_KG'], + // 'sr' => ['name' => 'Serbian (Cyrillic)', 'script' => 'Cyrl', 'native' => 'Српски', 'regional' => 'sr_RS'], + // 'av' => ['name' => 'Avaric', 'script' => 'Cyrl', 'native' => 'авар мацӀ', 'regional' => ''], + // 'ady' => ['name' => 'Adyghe', 'script' => 'Cyrl', 'native' => 'адыгэбзэ', 'regional' => ''], + // 'ba' => ['name' => 'Bashkir', 'script' => 'Cyrl', 'native' => 'башҡорт теле', 'regional' => ''], + // 'be' => ['name' => 'Belarusian', 'script' => 'Cyrl', 'native' => 'беларуская', 'regional' => 'be_BY'], + // 'bg' => ['name' => 'Bulgarian', 'script' => 'Cyrl', 'native' => 'български', 'regional' => 'bg_BG'], + // 'kv' => ['name' => 'Komi', 'script' => 'Cyrl', 'native' => 'коми кыв', 'regional' => ''], + // 'mk' => ['name' => 'Macedonian', 'script' => 'Cyrl', 'native' => 'македонски', 'regional' => 'mk_MK'], + // 'mn' => ['name' => 'Mongolian (Cyrillic)', 'script' => 'Cyrl', 'native' => 'монгол', 'regional' => 'mn_MN'], + // 'ce' => ['name' => 'Chechen', 'script' => 'Cyrl', 'native' => 'нохчийн мотт', 'regional' => 'ce_RU'], + // 'ru' => ['name' => 'Russian', 'script' => 'Cyrl', 'native' => 'русский', 'regional' => 'ru_RU'], + // 'sah' => ['name' => 'Yakut', 'script' => 'Cyrl', 'native' => 'саха тыла', 'regional' => ''], + // 'tt' => ['name' => 'Tatar', 'script' => 'Cyrl', 'native' => 'татар теле', 'regional' => 'tt_RU'], + // 'tg' => ['name' => 'Tajik (Cyrillic)', 'script' => 'Cyrl', 'native' => 'тоҷикӣ', 'regional' => 'tg_TJ'], + // 'tk' => ['name' => 'Turkmen', 'script' => 'Cyrl', 'native' => 'түркменче', 'regional' => 'tk_TM'], + // 'uk' => ['name' => 'Ukrainian', 'script' => 'Cyrl', 'native' => 'українська', 'regional' => 'uk_UA'], + // 'cv' => ['name' => 'Chuvash', 'script' => 'Cyrl', 'native' => 'чӑваш чӗлхи', 'regional' => 'cv_RU'], + // 'cu' => ['name' => 'Church Slavic', 'script' => 'Cyrl', 'native' => 'ѩзыкъ словѣньскъ', 'regional' => ''], + // 'kk' => ['name' => 'Kazakh', 'script' => 'Cyrl', 'native' => 'қазақ тілі', 'regional' => 'kk_KZ'], + // 'hy' => ['name' => 'Armenian', 'script' => 'Armn', 'native' => 'Հայերեն', 'regional' => 'hy_AM'], + // 'yi' => ['name' => 'Yiddish', 'script' => 'Hebr', 'native' => 'ייִדיש', 'regional' => 'yi_US'], + // 'he' => ['name' => 'Hebrew', 'script' => 'Hebr', 'native' => 'עברית', 'regional' => 'he_IL'], + // 'ug' => ['name' => 'Uyghur', 'script' => 'Arab', 'native' => 'ئۇيغۇرچە', 'regional' => 'ug_CN'], + // 'ur' => ['name' => 'Urdu', 'script' => 'Arab', 'native' => 'اردو', 'regional' => 'ur_PK'], + // 'ar' => ['name' => 'Arabic', 'script' => 'Arab', 'native' => 'العربية', 'regional' => 'ar_AE'], + // 'uz-Arab' => ['name' => 'Uzbek (Arabic)', 'script' => 'Arab', 'native' => 'اۉزبېک', 'regional' => ''], + // 'tg-Arab' => ['name' => 'Tajik (Arabic)', 'script' => 'Arab', 'native' => 'تاجیکی', 'regional' => 'tg_TJ'], + // 'sd' => ['name' => 'Sindhi', 'script' => 'Arab', 'native' => 'سنڌي', 'regional' => 'sd_IN'], + // 'fa' => ['name' => 'Persian', 'script' => 'Arab', 'native' => 'فارسی', 'regional' => 'fa_IR'], + // 'pa-Arab' => ['name' => 'Punjabi (Arabic)', 'script' => 'Arab', 'native' => 'پنجاب', 'regional' => 'pa_IN'], + // 'ps' => ['name' => 'Pashto', 'script' => 'Arab', 'native' => 'پښتو', 'regional' => 'ps_AF'], + // 'ks' => ['name' => 'Kashmiri (Arabic)', 'script' => 'Arab', 'native' => 'کأشُر', 'regional' => 'ks_IN'], + // 'ku' => ['name' => 'Kurdish', 'script' => 'Arab', 'native' => 'کوردی', 'regional' => 'ku_TR'], + // 'dv' => ['name' => 'Divehi', 'script' => 'Thaa', 'native' => 'ދިވެހިބަސް', 'regional' => 'dv_MV'], + // 'ks-Deva' => ['name' => 'Kashmiri (Devaganari)', 'script' => 'Deva', 'native' => 'कॉशुर', 'regional' => 'ks_IN'], + // 'kok' => ['name' => 'Konkani', 'script' => 'Deva', 'native' => 'कोंकणी', 'regional' => 'kok_IN'], + // 'doi' => ['name' => 'Dogri', 'script' => 'Deva', 'native' => 'डोगरी', 'regional' => 'doi_IN'], + // 'ne' => ['name' => 'Nepali', 'script' => 'Deva', 'native' => 'नेपाली', 'regional' => ''], + // 'pra' => ['name' => 'Prakrit', 'script' => 'Deva', 'native' => 'प्राकृत', 'regional' => ''], + // 'brx' => ['name' => 'Bodo', 'script' => 'Deva', 'native' => 'बड़ो', 'regional' => 'brx_IN'], + // 'bra' => ['name' => 'Braj', 'script' => 'Deva', 'native' => 'ब्रज भाषा', 'regional' => ''], + // 'mr' => ['name' => 'Marathi', 'script' => 'Deva', 'native' => 'मराठी', 'regional' => 'mr_IN'], + // 'mai' => ['name' => 'Maithili', 'script' => 'Tirh', 'native' => 'मैथिली', 'regional' => 'mai_IN'], + // 'raj' => ['name' => 'Rajasthani', 'script' => 'Deva', 'native' => 'राजस्थानी', 'regional' => ''], + // 'sa' => ['name' => 'Sanskrit', 'script' => 'Deva', 'native' => 'संस्कृतम्', 'regional' => 'sa_IN'], + // 'hi' => ['name' => 'Hindi', 'script' => 'Deva', 'native' => 'हिन्दी', 'regional' => 'hi_IN'], + // 'as' => ['name' => 'Assamese', 'script' => 'Beng', 'native' => 'অসমীয়া', 'regional' => 'as_IN'], + // 'bn' => ['name' => 'Bengali', 'script' => 'Beng', 'native' => 'বাংলা', 'regional' => 'bn_BD'], + // 'mni' => ['name' => 'Manipuri', 'script' => 'Beng', 'native' => 'মৈতৈ', 'regional' => 'mni_IN'], + // 'pa' => ['name' => 'Punjabi (Gurmukhi)', 'script' => 'Guru', 'native' => 'ਪੰਜਾਬੀ', 'regional' => 'pa_IN'], + // 'gu' => ['name' => 'Gujarati', 'script' => 'Gujr', 'native' => 'ગુજરાતી', 'regional' => 'gu_IN'], + // 'or' => ['name' => 'Oriya', 'script' => 'Orya', 'native' => 'ଓଡ଼ିଆ', 'regional' => 'or_IN'], + // 'ta' => ['name' => 'Tamil', 'script' => 'Taml', 'native' => 'தமிழ்', 'regional' => 'ta_IN'], + // 'te' => ['name' => 'Telugu', 'script' => 'Telu', 'native' => 'తెలుగు', 'regional' => 'te_IN'], + // 'kn' => ['name' => 'Kannada', 'script' => 'Knda', 'native' => 'ಕನ್ನಡ', 'regional' => 'kn_IN'], + // 'ml' => ['name' => 'Malayalam', 'script' => 'Mlym', 'native' => 'മലയാളം', 'regional' => 'ml_IN'], + // 'si' => ['name' => 'Sinhala', 'script' => 'Sinh', 'native' => 'සිංහල', 'regional' => 'si_LK'], + // 'th' => ['name' => 'Thai', 'script' => 'Thai', 'native' => 'ไทย', 'regional' => 'th_TH'], + // 'lo' => ['name' => 'Lao', 'script' => 'Laoo', 'native' => 'ລາວ', 'regional' => 'lo_LA'], + // 'bo' => ['name' => 'Tibetan', 'script' => 'Tibt', 'native' => 'པོད་སྐད་', 'regional' => 'bo_IN'], + // 'dz' => ['name' => 'Dzongkha', 'script' => 'Tibt', 'native' => 'རྫོང་ཁ', 'regional' => 'dz_BT'], + // 'my' => ['name' => 'Burmese', 'script' => 'Mymr', 'native' => 'မြန်မာဘာသာ', 'regional' => 'my_MM'], + // 'ka' => ['name' => 'Georgian', 'script' => 'Geor', 'native' => 'ქართული', 'regional' => 'ka_GE'], + // 'byn' => ['name' => 'Blin', 'script' => 'Ethi', 'native' => 'ብሊን', 'regional' => 'byn_ER'], + // 'tig' => ['name' => 'Tigre', 'script' => 'Ethi', 'native' => 'ትግረ', 'regional' => 'tig_ER'], + // 'ti' => ['name' => 'Tigrinya', 'script' => 'Ethi', 'native' => 'ትግርኛ', 'regional' => 'ti_ET'], + // 'am' => ['name' => 'Amharic', 'script' => 'Ethi', 'native' => 'አማርኛ', 'regional' => 'am_ET'], + // 'wal' => ['name' => 'Wolaytta', 'script' => 'Ethi', 'native' => 'ወላይታቱ', 'regional' => 'wal_ET'], + // 'chr' => ['name' => 'Cherokee', 'script' => 'Cher', 'native' => 'ᏣᎳᎩ', 'regional' => ''], + // 'iu' => ['name' => 'Inuktitut (Canadian Aboriginal Syllabics)', 'script' => 'Cans', 'native' => 'ᐃᓄᒃᑎᑐᑦ', 'regional' => 'iu_CA'], + // 'oj' => ['name' => 'Ojibwa', 'script' => 'Cans', 'native' => 'ᐊᓂᔑᓈᐯᒧᐎᓐ', 'regional' => ''], + // 'cr' => ['name' => 'Cree', 'script' => 'Cans', 'native' => 'ᓀᐦᐃᔭᐍᐏᐣ', 'regional' => ''], + // 'km' => ['name' => 'Khmer', 'script' => 'Khmr', 'native' => 'ភាសាខ្មែរ', 'regional' => 'km_KH'], + // 'mn-Mong' => ['name' => 'Mongolian (Mongolian)', 'script' => 'Mong', 'native' => 'ᠮᠣᠨᠭᠭᠣᠯ ᠬᠡᠯᠡ', 'regional' => 'mn_MN'], + // 'shi-Tfng' => ['name' => 'Tachelhit (Tifinagh)', 'script' => 'Tfng', 'native' => 'ⵜⴰⵎⴰⵣⵉⵖⵜ', 'regional' => ''], + // 'tzm' => ['name' => 'Central Atlas Tamazight (Tifinagh)','script' => 'Tfng', 'native' => 'ⵜⴰⵎⴰⵣⵉⵖⵜ', 'regional' => ''], + // 'yue' => ['name' => 'Yue', 'script' => 'Hant', 'native' => '廣州話', 'regional' => 'yue_HK'], + // 'ja' => ['name' => 'Japanese', 'script' => 'Jpan', 'native' => '日本語', 'regional' => 'ja_JP'], + // 'zh' => ['name' => 'Chinese (Simplified)', 'script' => 'Hans', 'native' => '简体中文', 'regional' => 'zh_CN'], + // 'zh-Hant' => ['name' => 'Chinese (Traditional)', 'script' => 'Hant', 'native' => '繁體中文', 'regional' => 'zh_CN'], + // 'ii' => ['name' => 'Sichuan Yi', 'script' => 'Yiii', 'native' => 'ꆈꌠꉙ', 'regional' => ''], + // 'vai' => ['name' => 'Vai (Vai)', 'script' => 'Vaii', 'native' => 'ꕙꔤ', 'regional' => ''], + // 'jv-Java' => ['name' => 'Javanese (Javanese)', 'script' => 'Java', 'native' => 'ꦧꦱꦗꦮ', 'regional' => ''], + // 'ko' => ['name' => 'Korean', 'script' => 'Hang', 'native' => '한국어', 'regional' => 'ko_KR'], + ], ]; diff --git a/database.db b/database.db new file mode 100644 index 0000000..e69de29 diff --git a/database/migrations/2018_10_21_164001_create_products_table.php b/database/migrations/2018_10_21_164001_create_products_table.php index 4e80a93..176c3c0 100644 --- a/database/migrations/2018_10_21_164001_create_products_table.php +++ b/database/migrations/2018_10_21_164001_create_products_table.php @@ -1,8 +1,8 @@ decimal('price', 8, 2)->nullable(); $table->decimal('price_ek', 8, 2)->nullable(); $table->decimal('tax', 5, 2)->nullable(); - $table->decimal('price_old', 8, 2)->nullable(); //streichpreis - + $table->decimal('price_old', 8, 2)->nullable(); // streichpreis $table->unsignedInteger('points')->nullable()->default(0); $table->unsignedInteger('weight')->nullable()->default(0); @@ -38,10 +37,10 @@ class CreateProductsTable extends Migration $table->string('number')->nullable(); $table->string('ean')->nullable(); - + $table->unsignedInteger('wp_number')->nullable(); - $table->string('icons')->nullable(); //as array cast + $table->string('icons')->nullable(); // as array cast $table->text('description')->nullable(); @@ -52,31 +51,28 @@ class CreateProductsTable extends Migration $table->tinyInteger('pos')->unsigned()->nullable(); $table->boolean('active')->default(false); - $table->unsignedInteger('amount')->nullable(); //for shop + $table->unsignedInteger('amount')->nullable(); // for shop $table->tinyInteger('show_at')->unsigned()->nullable()->default(0); $table->string('show_on')->nullable(); $table->boolean('shipping_addon')->default(false); - + $table->boolean('buying_restriction')->default(false); $table->unsignedTinyInteger('buying_restriction_amount')->nullable(); $table->boolean('sponsor_buying_points')->default(false); - $table->unsignedTinyInteger('sponsor_buying_points_amount')->nullable(); - + $table->unsignedSmallInteger('sponsor_buying_points_amount')->nullable(); + $table->string('identifier', 20)->nullable(); $table->string('action')->nullable(); - //is an upgrade product, set this product id by payments API paid + // is an upgrade product, set this product id by payments API paid $table->unsignedInteger('upgrade_to_id')->nullable(); $table->timestamps(); $table->softDeletes(); - - - }); } diff --git a/database/migrations/2026_02_04_101805_add_language_to_user_accounts_table.php b/database/migrations/2026_02_04_101805_add_language_to_user_accounts_table.php new file mode 100644 index 0000000..b4bd38f --- /dev/null +++ b/database/migrations/2026_02_04_101805_add_language_to_user_accounts_table.php @@ -0,0 +1,34 @@ +string('language', 5)->nullable()->default('de')->after('notice'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('user_accounts', function (Blueprint $table) { + $table->dropColumn('language'); + }); + } +}; diff --git a/database/migrations/2026_02_04_102455_change_language_default_on_user_accounts_table.php b/database/migrations/2026_02_04_102455_change_language_default_on_user_accounts_table.php new file mode 100644 index 0000000..7ec0b21 --- /dev/null +++ b/database/migrations/2026_02_04_102455_change_language_default_on_user_accounts_table.php @@ -0,0 +1,42 @@ +string('language', 5)->nullable()->default(null)->change(); + }); + + // Alle bestehenden 'de' Werte auf NULL setzen, + // damit die App-Locale als Fallback greift + \DB::table('user_accounts') + ->where('language', 'de') + ->update(['language' => null]); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('user_accounts', function (Blueprint $table) { + $table->string('language', 5)->nullable()->default('de')->change(); + }); + + \DB::table('user_accounts') + ->whereNull('language') + ->update(['language' => 'de']); + } +}; diff --git a/database/migrations/2026_02_06_150007_create_datev_exports_table.php b/database/migrations/2026_02_06_150007_create_datev_exports_table.php new file mode 100644 index 0000000..6662c53 --- /dev/null +++ b/database/migrations/2026_02_06_150007_create_datev_exports_table.php @@ -0,0 +1,60 @@ +id(); + + // Abrechnungszeitraum + $table->date('period_from'); + $table->date('period_to'); + $table->unsignedTinyInteger('month'); + $table->unsignedSmallInteger('year'); + + // Status: 0=draft, 1=generated, 2=downloaded, 3=locked + $table->unsignedTinyInteger('status')->default(0); + + // DATEV Header-Daten + $table->string('berater_nr', 10)->nullable(); + $table->string('mandant_nr', 10)->nullable(); + + // Statistik + $table->unsignedInteger('invoice_count')->default(0); + $table->unsignedInteger('credit_count')->default(0); + $table->unsignedInteger('cancellation_count')->default(0); + $table->decimal('total_revenue', 15, 2)->default(0); + $table->decimal('total_commissions', 15, 2)->default(0); + + // Datei + $table->string('filename')->nullable(); + $table->string('file_path')->nullable(); + $table->string('file_hash', 64)->nullable(); + + // Admin der den Export erstellt hat + $table->unsignedBigInteger('created_by')->nullable(); + + // Validierungs-Zusammenfassung + $table->unsignedInteger('warning_count')->default(0); + $table->unsignedInteger('error_count')->default(0); + $table->json('validation_summary')->nullable(); + + $table->timestamps(); + $table->softDeletes(); + + // Indices + $table->index(['month', 'year']); + $table->index('status'); + }); + } + + public function down(): void + { + Schema::dropIfExists('datev_exports'); + } +}; diff --git a/database/migrations/2026_02_06_150010_create_datev_export_lines_table.php b/database/migrations/2026_02_06_150010_create_datev_export_lines_table.php new file mode 100644 index 0000000..2572d4b --- /dev/null +++ b/database/migrations/2026_02_06_150010_create_datev_export_lines_table.php @@ -0,0 +1,56 @@ +id(); + + $table->unsignedBigInteger('datev_export_id'); + $table->foreign('datev_export_id') + ->references('id') + ->on('datev_exports') + ->onDelete('cascade'); + + // Quell-Referenz + $table->string('source_type', 30); // invoice, credit, cancellation + $table->unsignedBigInteger('source_id'); + + // Zeilennummer im CSV + $table->unsignedInteger('line_number')->default(0); + + // DATEV-Buchungsfelder + $table->decimal('amount_gross', 13, 2); // Spalte A: Umsatz (Brutto) + $table->char('soll_haben', 1); // Spalte B: H oder S + $table->unsignedInteger('konto'); // Spalte G: Sachkonto + $table->unsignedInteger('gegenkonto'); // Spalte H: Gegenkonto + $table->unsignedSmallInteger('bu_schluessel'); // BU-Schlüssel (Steuerschlüssel) + $table->date('belegdatum'); // Spalte J: Belegdatum + $table->string('belegfeld1', 36); // Spalte K: Rechnungs-/Gutschriftsnummer + $table->string('buchungstext', 60); // Spalte N: Buchungstext (max 60 Zeichen DATEV) + + // EU/USt Felder + $table->string('eu_ustid', 20)->nullable(); // Spalte AN: USt-ID + $table->char('eu_land', 2)->nullable(); // EU-Ländercode + + // Fertig gerenderte CSV-Zeile (für exakte Reproduzierbarkeit) + $table->text('row_csv')->nullable(); + + $table->timestamps(); + + // Indices + $table->index(['datev_export_id', 'line_number']); + $table->index(['source_type', 'source_id']); + }); + } + + public function down(): void + { + Schema::dropIfExists('datev_export_lines'); + } +}; diff --git a/database/migrations/2026_02_11_110656_add_tracking_completed_at_to_dhl_package_shipments_table.php b/database/migrations/2026_02_11_110656_add_tracking_completed_at_to_dhl_package_shipments_table.php new file mode 100644 index 0000000..e454b0c --- /dev/null +++ b/database/migrations/2026_02_11_110656_add_tracking_completed_at_to_dhl_package_shipments_table.php @@ -0,0 +1,28 @@ +timestamp('tracking_completed_at')->nullable()->after('last_tracked_at'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('dhl_package_shipments', function (Blueprint $table) { + $table->dropColumn('tracking_completed_at'); + }); + } +}; diff --git a/database/migrations/2026_02_12_000001_create_user_abo_item_histories_table.php b/database/migrations/2026_02_12_000001_create_user_abo_item_histories_table.php new file mode 100644 index 0000000..6d11aed --- /dev/null +++ b/database/migrations/2026_02_12_000001_create_user_abo_item_histories_table.php @@ -0,0 +1,62 @@ +increments('id'); + + $table->unsignedInteger('user_abo_id'); + $table->foreign('user_abo_id') + ->references('id') + ->on('user_abos') + ->onDelete('cascade'); + + $table->unsignedInteger('user_abo_item_id')->nullable(); + + $table->unsignedInteger('product_id'); + $table->foreign('product_id') + ->references('id') + ->on('products'); + + $table->string('action', 30); + + $table->string('product_name', 255); + $table->string('product_number', 50)->nullable(); + $table->decimal('unit_price', 10, 2); + $table->decimal('total_price', 10, 2); + + $table->unsignedInteger('qty_before')->nullable(); + $table->unsignedInteger('qty_after')->nullable(); + + $table->unsignedInteger('old_product_id')->nullable(); + $table->string('old_product_name', 255)->nullable(); + + $table->unsignedTinyInteger('comp')->default(0); + + $table->unsignedInteger('changed_by_user_id')->nullable(); + $table->string('changed_by_name', 255)->nullable(); + + $table->string('channel', 30); + + $table->uuid('batch_id')->nullable()->index(); + + $table->boolean('is_initial')->default(false); + + $table->timestamps(); + + $table->index(['user_abo_id', 'created_at']); + $table->index(['user_abo_id', 'is_initial']); + }); + } + + public function down(): void + { + Schema::dropIfExists('user_abo_item_histories'); + } +}; diff --git a/database/migrations/2026_02_12_000002_seed_initial_history_for_existing_abos.php b/database/migrations/2026_02_12_000002_seed_initial_history_for_existing_abos.php new file mode 100644 index 0000000..fb29f9b --- /dev/null +++ b/database/migrations/2026_02_12_000002_seed_initial_history_for_existing_abos.php @@ -0,0 +1,63 @@ +where('status', '>', 0) + ->get(); + + foreach ($userAbos as $userAbo) { + // Nur seeden wenn noch keine History existiert + if (UserAboItemHistory::where('user_abo_id', $userAbo->id)->exists()) { + continue; + } + + $batchId = Str::uuid()->toString(); + + foreach ($userAbo->user_abo_items as $item) { + if (! $item->product) { + continue; + } + + // is_for=me: Berater kauft netto mit UserFactor + // is_for=ot: Kunde kauft brutto + $isMe = $userAbo->is_for === 'me'; + $unitPrice = (float) $item->product->getPriceWith($isMe, $isMe); + + UserAboItemHistory::create([ + 'user_abo_id' => $userAbo->id, + 'user_abo_item_id' => $item->id, + 'product_id' => $item->product_id, + 'action' => UserAboItemHistory::ACTION_INITIAL, + 'product_name' => $item->product->getLang('name'), + 'product_number' => $item->product->number ?? null, + 'unit_price' => $unitPrice, + 'total_price' => $unitPrice * $item->qty, + 'qty_before' => null, + 'qty_after' => $item->qty, + 'comp' => $item->comp ?? 0, + 'changed_by_user_id' => null, + 'changed_by_name' => 'System (Migration)', + 'channel' => UserAboItemHistory::CHANNEL_SYSTEM, + 'batch_id' => $batchId, + 'is_initial' => true, + 'created_at' => $userAbo->created_at ?? now(), + 'updated_at' => $userAbo->created_at ?? now(), + ]); + } + } + } + + public function down(): void + { + // Nur die durch Migration erstellten Einträge löschen + UserAboItemHistory::where('changed_by_name', 'System (Migration)')->delete(); + } +}; diff --git a/database/migrations/2026_02_19_120000_add_free_shipping_consultant_to_products_table.php b/database/migrations/2026_02_19_120000_add_free_shipping_consultant_to_products_table.php new file mode 100644 index 0000000..26b98f3 --- /dev/null +++ b/database/migrations/2026_02_19_120000_add_free_shipping_consultant_to_products_table.php @@ -0,0 +1,22 @@ +boolean('free_shipping_consultant')->default(false)->after('no_free_shipping'); + }); + } + + public function down(): void + { + Schema::table('products', function (Blueprint $table) { + $table->dropColumn('free_shipping_consultant'); + }); + } +}; diff --git a/database/migrations/2026_02_19_140000_add_is_membership_only_to_products_table.php b/database/migrations/2026_02_19_140000_add_is_membership_only_to_products_table.php new file mode 100644 index 0000000..686a0b0 --- /dev/null +++ b/database/migrations/2026_02_19_140000_add_is_membership_only_to_products_table.php @@ -0,0 +1,22 @@ +boolean('is_membership_only')->default(false)->after('free_shipping_consultant'); + }); + } + + public function down(): void + { + Schema::table('products', function (Blueprint $table) { + $table->dropColumn('is_membership_only'); + }); + } +}; diff --git a/dev/22-01-2026/dhl-cancellation-info.md b/dev/2026-01-22/dhl-cancellation-info.md similarity index 100% rename from dev/22-01-2026/dhl-cancellation-info.md rename to dev/2026-01-22/dhl-cancellation-info.md diff --git a/dev/22-01-2026/dhl-return-label-info.md b/dev/2026-01-22/dhl-return-label-info.md similarity index 100% rename from dev/22-01-2026/dhl-return-label-info.md rename to dev/2026-01-22/dhl-return-label-info.md diff --git a/dev/22-01-2026/dhl-tracking-emails.md b/dev/2026-01-22/dhl-tracking-emails.md similarity index 100% rename from dev/22-01-2026/dhl-tracking-emails.md rename to dev/2026-01-22/dhl-tracking-emails.md diff --git a/dev/2026-01-22/next-steps.md b/dev/2026-01-22/next-steps.md new file mode 100644 index 0000000..d16346b --- /dev/null +++ b/dev/2026-01-22/next-steps.md @@ -0,0 +1,2302 @@ +# Development Backlog - 22.01.2026 + +## Status-Legende + +- `[x]` Erledigt +- `[ ]` Offen +- `[!]` Hohe Priorität +- `[?]` Klärungsbedarf + +--- + +## ERLEDIGTE AUFGABEN + +### [x] Produkt-Slugs anpassen + +- **Status:** Erledigt +- **Beschreibung:** Slug kann direkt im Admin geändert werden +- **URL:** https://gesundheit.mivita.care/produkte/black-friday-week + +### [x] WWW-Redirect entfernen + +- **Status:** Erledigt +- **Beschreibung:** Domain/Subdomain funktioniert ohne WWW-Prefix + +### [x] Abo-Anpassungen (Protokoll Claudia) + +- **Status:** Erledigt +- **Änderungen:** + - Checkbox für AGB vor Abo-Abschluss + - Änderungen erst nach 6 Ausführungen möglich + - Nur Liefertag + Lieferadresse änderbar + - Lieferadresse sync mit Benutzerdaten + +--- + +## OFFENE AUFGABEN + +--- + +### [X] 1. NEWS: Download-Center Verlinkung + +**Priorität:** Hoch ✅ **ERLEDIGT** +**Bereich:** Dashboard / News + +**Problem:** +Benutzer finden das Download-Center nicht. Nur Verweis reicht nicht. + +**Lösung implementiert:** +✅ Strukturiertes JSON-Feld `file_links` für Datei-Links pro Sprache +✅ Admin-Formular mit Select2-Dropdown zur Auswahl von DC-Dateien +✅ Mehrsprachige Unterstützung (DE, EN, ES) +✅ Schöne Button-Darstellung im Dashboard mit Icons +✅ Direkte Links zum Download-Center + +**Implementierte Dateien:** + +1. **Migration:** `2026_01_23_120458_add_file_links_to_dashboard_news_table.php` + + - Neues JSON-Feld `file_links` in `dashboard_news` Tabelle + +2. **Model:** `app/Models/DashboardNews.php` + + - `file_links` zu `$fillable` und `$casts` hinzugefügt + - Neue Methoden: `getFileLinks($lang)`, `hasFileLinks($lang)` + +3. **Admin-Formular:** `resources/views/admin/site/news/form.blade.php` + + - Datei-Link-Sektion für jede Sprache + - Select2-Dropdown mit allen aktiven DC-Dateien + - JavaScript zum Hinzufügen/Entfernen von Links + - Dynamische Label-Eingabe + +4. **Frontend-View:** `resources/views/dashboard/_news.blade.php` + + - Anzeige der Datei-Links als grüne Download-Buttons + - **Direkter Download-Link** über `route('storage_file', [$file->id, 'dc_file', 'download'])` + - Icons mit Ionicons + - Responsive Darstellung + +5. **Übersetzungen:** + - DE: `resources/lang/de/backend.php` + - EN: `resources/lang/en/backend.php` + - ES: `resources/lang/es/backend.php` + - Neue Keys: `file_links`, `file_links_hint`, `link_label`, `select_file`, `add_file_link` + +**JSON-Struktur:** + +```json +{ + "de": [ + { "file_id": 123, "label": "Preisliste herunterladen" }, + { "file_id": 456, "label": "Produktkatalog öffnen" } + ], + "en": [{ "file_id": 789, "label": "Download Price List" }] +} +``` + +**Verwendung im Admin:** + +1. News bearbeiten → Zum jeweiligen Sprach-Tab scrollen +2. "Datei-Link hinzufügen" klicken +3. Label eingeben (z.B. "Preisliste herunterladen") +4. Datei aus Dropdown auswählen +5. Speichern → Links erscheinen prominent im Dashboard + +--- + +### [X] 2. Points mit Dezimalstellen (DECIMAL statt INT) + +**Priorität:** Hoch +**Bereich:** Marketingplan / Provisionsberechnung + +**Problem:** +Punkte werden aktuell als INT gespeichert. Kommazahlen bei Produkten werden falsch berechnet/gerundet. + +**Anforderung:** + +- Alle Punkte-Felder auf DECIMAL umstellen +- Berechnung im gesamten Marketingplan anpassen + +**Punkte-Ursprung (Produkte):** +| Parameter | Wert | +|-----------|------| +| Model | `App\Models\Product` | +| Feld | `points` (INT) → `DECIMAL(10,2)` | +| Zusätzlich | `sponsor_buying_points`, `sponsor_buying_points_amount` | + +**Punkte-Aggregation (Sales Volume):** +| Parameter | Aktuell | Neu | +|-----------|---------|-----| +| Model | `App\Models\UserSalesVolume` | - | +| Tabelle | `user_sales_volumes` | - | +| Datentyp | `INT` | `DECIMAL(10,2)` | + +**Betroffene Spalten `user_sales_volumes`:** + +```sql +ALTER TABLE user_sales_volumes + MODIFY points DECIMAL(10,2), + MODIFY month_points DECIMAL(10,2), + MODIFY month_KP_points DECIMAL(10,2), + MODIFY month_TP_points DECIMAL(10,2), + MODIFY month_shop_points DECIMAL(10,2); +``` + +**Betroffene Spalten `user_business`:** + +```sql +ALTER TABLE user_business + MODIFY sales_volume_points DECIMAL(10,2), + MODIFY sales_volume_points_shop DECIMAL(10,2), + MODIFY sales_volume_points_sum DECIMAL(10,2); +``` + +**Betroffene Spalten `products`:** + +```sql +ALTER TABLE products + MODIFY points DECIMAL(10,2); +``` + +**Weitere Models mit `points`:** + +- `App\Models\ShoppingOrder` → `points` +- `App\Models\ShoppingOrderItem` → `points` +- `App\Models\ShoppingCollectOrder` → `points` +- `App\Models\HomepartyUserOrderItem` → `points` + +**Betroffene Services:** + +- `app/Services/BusinessPlan/TreeCalcBotOptimized.php` +- Alle Berechnungen in `app/Services/BusinessPlan/` + +**Migration erforderlich:** Ja (mehrere ALTER TABLE) + +--- + +### [X] 3. Vorkasse: Verwendungszweck deutlich machen + +**Priorität:** Hoch +**Bereich:** Checkout / Payment / E-Mail + +**Problem:** +Kunden geben falschen Verwendungszweck an. System kann Zahlung nicht zuordnen. + +**Anforderung:** + +- Payone TXID als Verwendungszweck deutlich hervorheben +- Hinweis im Checkout, in E-Mail und im Kundenkonto + +**Technische Details:** +| Parameter | Wert | +|-----------|------| +| Clearingtype | `vor` (Vorkasse) | +| Controller | `App\Http\Controllers\Pay\PayoneController` | +| Checkout-View | `resources/views/web/templates/checkout.blade.php:898` | +| Mail-Template | `resources/views/emails/order_*.blade.php` | +| Kundenkonto | `resources/views/user/order/*.blade.php` | + +**Verwendungszweck-Feld (KORRIGIERT):** +| Falsch | Richtig | +|--------|---------| +| `shopping_payments.reference` | `payment_transactions.txid` | + +**Zugriff auf TXID:** + +```php +// Model: App\Models\PaymentTransaction +$transaction = PaymentTransaction::where('shopping_payment_id', $payment->id)->first(); +$verwendungszweck = $transaction->txid; + +// Oder via transmitted_data JSON +$txid = $transaction->transmitted_data['txid'] ?? null; +``` + +**Umsetzung:** + +1. **Checkout:** Alert-Box mit Verwendungszweck-Hinweis bei Vorkasse-Auswahl +2. **E-Mail:** Hervorgehobener Block mit Bankdaten + TXID als Verwendungszweck +3. **Kundenkonto:** Info-Box bei unbezahlten Vorkasse-Bestellungen mit TXID + +**Beispiel-Text:** + +``` +WICHTIG: Bitte geben Sie als Verwendungszweck ausschließlich folgende Nummer an: +[TXID: 123456789] +Nur so kann Ihre Zahlung automatisch zugeordnet werden. +``` + +--- + +### [X] 4. Paketbox/Packstation Feld + +**Status:** ✅ ERLEDIGT +**Priorität:** Mittel +**Bereich:** Adressverwaltung / Checkout + +**Anforderung:** + +- Neues Feld "DHL Postnummer" nur bei Lieferadresse +- Automatische Erkennung: Wenn Postnummer angegeben → Packstation-Modus + +**Technische Details:** +| Parameter | Wert | +|-----------|------| +| Tabelle | `shopping_users` | +| Model | `App\Models\ShoppingUser` | + +**Durchgeführte Implementierung:** + +1. ✅ **Migration erstellt und ausgeführt** + + - Datei: `database/migrations/2026_01_22_181707_add_shipping_postnumber_to_shopping_users_table.php` + - Spalte: `shipping_postnumber VARCHAR(20) NULLABLE` + +2. ✅ **Model angepasst** (`app/Models/ShoppingUser.php`) + + - Feld im `$fillable` Array + - Methode `hasPostnumber()` hinzugefügt + +3. ✅ **Checkout-Formular** (`resources/views/web/templates/checkout.blade.php`) + + - Eingabefeld für Postnummer nach Telefon-Feld + - Placeholder: "12345678" + - JavaScript-Validierung für Packstation-Format + +4. ✅ **DHL Modal** (`resources/views/admin/dhl/modal_in_order_shipment.blade.php`) + + - Postnummer-Feld hinzugefügt + +5. ✅ **DHL Service** (`app/Services/DhlModalService.php`) + + - Postnummer wird korrekt an DHL API übergeben + +6. ✅ **Kundendetail-Ansicht** (`resources/views/admin/customer/_customer_detail.blade.php`) + + - Postnummer wird mit Badge angezeigt + - Hinweistext für Packstation-Lieferung + +7. ✅ **Kunden-Bearbeitungsformular** (`resources/views/admin/customer/_edit.blade.php`) + + - Postnummer-Feld direkt nach Telefon-Feld + - Mit Hinweistext und Placeholder + - Wird in User-Bereich und Admin-Bereich verwendet + +8. ✅ **Lieferschein-PDF** (`resources/views/pdf/delivery.blade.php`) + + - Postnummer wird fett gedruckt in der Lieferadresse angezeigt + - Format: "DHL Postnummer: 12345678" + +9. ✅ **Alert-Box im Formular** (`resources/views/admin/customer/_edit.blade.php`) + + - Deutliche gelbe Warning-Box erscheint, wenn Postnummer ausgefüllt wird + - Erklärt klar, dass bei Packstation-Lieferung: + - Straße/Nr. = "Packstation [Nummer]" (z.B. "Packstation 145") + - PLZ/Ort = Standort der Packstation (nicht Wohnadresse!) + - JavaScript-gesteuerte Ein-/Ausblendung bei Input + - Dismissable (kann vom User geschlossen werden) + +10. ✅ **User-Account Formular** (`resources/views/user/user_form.blade.php`) + +- Migration für `user_accounts` Tabelle erstellt und ausgeführt +- Datei: `database/migrations/2026_01_23_102622_add_shipping_postnumber_to_user_accounts_table.php` +- Model `UserAccount` im `$fillable` Array erweitert +- Postnummer-Feld nach shipping_phone hinzugefügt +- Identische Alert-Box wie im Admin-Formular +- Identisches JavaScript für Ein-/Ausblendung + +11. ✅ **Checkout-Formular** (`resources/views/web/templates/checkout.blade.php`) + +- Alte kleine Info-Box (alert-info) ersetzt durch große Warning-Box +- Identische gelbe Alert-Box wie in allen anderen Formularen +- JavaScript bereits vorhanden (togglePackstationHint) +- Wird automatisch ein-/ausgeblendet bei Input + +12. ✅ **CheckoutRepository Datenübertragung** (`app/Repositories/CheckoutRepository.php`) + +- **Problem behoben:** Postnummer wurde nicht von UserAccount zu ShoppingUser übertragen +- `shoppingUserByAuthUser()` erweitert (Zeile 350): Übertragung für eingeloggte User +- `shoppingUserAuthData()` erweitert (Zeile 418 + 430): Übertragung für Salescenter-Bestellungen +- Postnummer wird jetzt korrekt im Checkout-Formular angezeigt + +13. ✅ **Anzeige-Views erweitert** - Postnummer wird überall angezeigt: + +- ✅ `admin/sales/_detail.blade.php` - Admin Bestelldetails +- ✅ `admin/sales/_detail_homparty_user.blade.php` - Homeparty Bestelldetails +- ✅ `portal/order/_detail.blade.php` - Portal Bestelldetails +- ✅ `emails/checkout_status.blade.php` - Bestellstatus E-Mail +- ✅ `emails/checkout.blade.php` - Checkout E-Mail (2 Stellen) +- ✅ `admin/modal/is_like_member.blade.php` - Kundenzuordnung Modal (2 Stellen) +- **Format:** Badge mit Icon + Hinweistext in Web-Views +- **Format:** Fett gedruckt "DHL Postnummer: XXX" in E-Mails + +14. ✅ **Formular-Views erweitert** - Postnummer-Eingabe überall möglich: + +- ✅ `portal/customer/_edit_form.blade.php` - Portal Kundenformular + - Postnummer-Feld nach shipping_phone + - Alert-Box mit JavaScript (togglePackstationAlert) + - Identisch zu anderen Formularen +- ✅ `user/order/shipping_me.blade.php` - Bestellung für mich selbst + - Hidden field `shipping_postnumber` hinzugefügt (2 Stellen) + - Für `same_as_billing` true/false Szenarien + +## 🔍 **TIEFENPRÜFUNG DURCHGEFÜHRT - Weitere kritische Lücken gefunden und geschlossen!** + +15. ✅ **KRITISCHE CONTROLLER/SERVICES KORRIGIERT** - Datenübertragung sichergestellt: + +- ✅ `app/Services/UserUtil.php` (Zeile 101) + - ShoppingUser-Erstellung aus UserAccount + - `shipping_postnumber` fehlte komplett! +- ✅ `app/Services/AboOrderCart.php` (Zeilen 277 + 289) + - Abo-Bestellungen: ShoppingUser aus UserAccount + - `shipping_postnumber` fehlte an 2 Stellen (same_as_billing true/false) +- ✅ `app/Services/PaymentHelper.php` (Zeile 115) + - Payment ShoppingUser Update + - `shipping_postnumber` fehlte komplett! + +16. ✅ **WEITERE FEHLENDE VIEWS ERGÄNZT**: + +- ✅ `user/homeparty/_address.blade.php` (2 Stellen) + - Homeparty Adressanzeige (billing + shipping) + - Fett: "DHL Postnummer: XXX" +- ✅ `user/order/payment/custom_payment.blade.php` + - Custom Payment Bestelldetails + - Badge mit Info-Text +- ✅ `emails/custom_payment.blade.php` + - Custom Payment E-Mail + - Fett: "DHL Postnummer: XXX" + +**Übersetzungen:** + +- DE: `payment.dhl_postnumber` = "DHL Postnummer" +- EN: `payment.dhl_postnumber` = "DHL Post Number" +- ES: `payment.dhl_postnumber` = "Número de correo DHL" +- **Neue Alert-Box Übersetzungen** in `resources/lang/{de,en,es}/payment.php`: + - `packstation_alert_title` + - `packstation_alert_intro` + - `packstation_alert_street` + - `packstation_alert_street_example` + - `packstation_alert_location` + - `packstation_alert_not_home` + - `packstation_alert_footer` + +**DHL API Integration:** + +```php +if ($user->shipping_postnumber) { + $recipient['postNumber'] = $user->shipping_postnumber; + // shipping_address enthält "Packstation 145" (3-stellige Nummer!) +} +``` + +**Wichtige Hinweise zur Packstation-Nummer:** + +- ⚠️ **Packstation-NUMMER ist 3-stellig** (100-999, steht auf gelbem Schild) +- 📱 **DHL Postnummer ist 6-10-stellig** (separate Kundennummer in DHL App) +- 🚫 **Häufiger Fehler:** Postnummer wird als Packstation-Nummer eingegeben +- ✅ **Richtig:** "Packstation 145" (nicht "Packstation 12345") +- 📄 **Anleitung:** `/dev/22-01-2026/packstation-anleitung.md` + +**Verbesserte Fehlermeldungen:** + +- Detaillierte Fehlermeldung bei ungültiger Packstation-Nummer +- Frontend-Hinweise in allen Formularen aktualisiert (DE, EN, ES) +- Logging mit allen relevanten Daten für besseres Debugging + +--- + +### [X] 5. Set/Kit Produkte: Inhalte auflisten + +**Priorität:** Mittel +**Bereich:** Produkte / Rechnungen / Lieferscheine + +**Problem:** +Bei Sets/Kits werden enthaltene Einzelprodukte nicht aufgelistet. + +**Anforderung:** + +- Alle enthaltenen Produkte unter dem Set auflisten +- Auf Rechnung und Lieferschein ausweisen +- Admin-UI: Dropdown + Liste (wie bei Inhaltsstoffen) + +**Referenz-Implementierung (Inhaltsstoffe):** +| Parameter | Wert | +|-----------|------| +| Pivot-Tabelle | `product_ingredients` | +| Model | `App\Models\ProductIngredient` | +| Relation | `Product::p_ingredients()` (belongsToMany) | + +**Neue Tabellen-Struktur (analog zu Inhaltsstoffen):** + +```sql +CREATE TABLE product_bundles ( + id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY, + product_id BIGINT UNSIGNED NOT NULL, -- Das Set/Kit (Parent) + bundle_product_id BIGINT UNSIGNED NOT NULL, -- Enthaltenes Produkt (Child) + quantity INT UNSIGNED DEFAULT 1, + pos INT UNSIGNED DEFAULT 0, -- Sortierung + created_at TIMESTAMP NULL, + updated_at TIMESTAMP NULL, + FOREIGN KEY (product_id) REFERENCES products(id) ON DELETE CASCADE, + FOREIGN KEY (bundle_product_id) REFERENCES products(id) ON DELETE CASCADE, + UNIQUE KEY unique_bundle (product_id, bundle_product_id) +); +``` + +**Neue Model-Relation in `Product.php`:** + +```php +public function bundleItems() +{ + return $this->belongsToMany(Product::class, 'product_bundles', 'product_id', 'bundle_product_id') + ->withPivot('quantity', 'pos') + ->orderBy('pos'); +} + +public function isBundle(): bool +{ + return $this->bundleItems()->count() > 0; +} +``` + +**Admin-UI (wie Inhaltsstoffe):** + +- Dropdown zur Produktauswahl +- Listenansicht mit Menge und Sortierung +- Vorlage: `resources/views/admin/product/` → Ingredients-Sektion kopieren + +**Betroffene Views:** + +- `resources/views/pdf/invoice.blade.php` → Bundle-Items unter Produkt auflisten +- `resources/views/pdf/delivery.blade.php` → Bundle-Items auflisten +- Shop-Produktdetailseiten + +--- + +### [!] 6. Mehrsprachigkeit: Rechnungen, Provisionen, Lieferscheine + +**Priorität:** Hoch +**Bereich:** PDF-Generierung / E-Mail + +**Anforderung:** + +- Deutsche Version bleibt primär (rechtlich bindend) +- Zusätzliche Kopie in Landessprache (EN, ES, FR) +- Sprache aus User-Einstellung (`users.locale`) + +**Technische Details:** +| Parameter | Wert | +|-----------|------| +| PDF-Service | `App\Services\Invoice` | +| Templates | `resources/views/pdf/*.blade.php` | +| Mail | `App\Mail\MailInvoice` | +| User-Sprache | `users.locale` (Spalte prüfen/anlegen) | + +**Betroffene Dokumente:** +| Dokument | Datei | Status | +|----------|-------|--------| +| Rechnung | `invoice.blade.php` | [ ] | +| Lieferschein | `delivery.blade.php` | [ ] | +| Provisionsabrechnung | `credit_details.blade.php` | [ ] | +| Stornorechnung | (neu) | [ ] | +| Mitgliedschaftsverlängerung | E-Mail Template | [ ] | +| Partnerantrag/Vertrag | PDF Template | [ ] | + +**Umsetzung:** + +```php +// Invoice Service erweitern +public function generatePdf(Order $order, string $locale = 'de'): string +{ + app()->setLocale($locale); + // PDF generieren... +} + +// Zwei PDFs generieren +$pdfDE = $this->generatePdf($order, 'de'); +$pdfUser = $this->generatePdf($order, $user->locale ?? 'de'); + +// Bei E-Mail beide anhängen (wenn unterschiedlich) +if ($user->locale && $user->locale !== 'de') { + $mail->attach($pdfDE, ['as' => 'Rechnung-DE.pdf']); + $mail->attach($pdfUser, ['as' => 'Invoice-' . strtoupper($user->locale) . '.pdf']); +} +``` + +**Speicherung:** + +- Beide PDFs im System speichern (Bestellungen-Ansicht) +- Zusätzliche Spalten in `user_invoices`: `file_localized`, `locale` + +--- + +### ✅ 7. Stornorechnungen mit Punktekorrektur **[ERLEDIGT 06.02.2026]** + +**Priorität:** Hoch +**Bereich:** Admin / Rechnungswesen / Marketingplan + +**Problem:** + +- Storno-Button fehlt im Admin +- Punkte werden bei Storno NICHT abgezogen (in gesamter MLM-Struktur) + +**Anforderung:** + +- Button "Stornorechnung erstellen" neben Rechnung +- Negativbetrag im Rechnungskreis +- Punkte in gesamter MLM-Struktur korrigieren (Upline!) +- Mehrsprachigkeit beachten + +**Technische Details:** +| Parameter | Wert | +|-----------|------| +| Model | `App\Models\UserInvoice` | +| Storno-Felder | `cancellation`, `cancellation_id`, `cancellation_date` | +| Punkte-Model | `App\Models\UserSalesVolume` | +| Business-Model | `App\Models\UserBusiness` | +| Admin-View | `resources/views/admin/order/*.blade.php` | + +**Punktekorrektur-Logik:** + +```php +// 1. Original-SalesVolume finden +$salesVolume = UserSalesVolume::where('order_id', $order->id)->first(); + +// 2. Punkte negieren (neuer Eintrag mit negativen Werten) +UserSalesVolume::create([ + 'user_id' => $salesVolume->user_id, + 'order_id' => $order->id, + 'month' => $salesVolume->month, + 'year' => $salesVolume->year, + 'month_points' => -$salesVolume->month_points, + 'month_KP_points' => -$salesVolume->month_KP_points, + 'status' => 6, // Neuer Status: 'cancelled' +]); + +// 3. Upline-Struktur durchlaufen und korrigieren +// → TreeCalcBotOptimized neu berechnen oder separater CancellationService +``` + +**Betroffene Tabellen:** + +``` +user_sales_volumes → Negativer Eintrag hinzufügen +user_business → Monatsdaten neu berechnen (oder Neuberechnung triggern) +``` + +**Admin-Route:** + +```php +Route::post('/admin/invoice/{id}/cancel', [InvoiceController::class, 'cancel']); +``` + +--- + +### ✅ **UMSETZUNG ABGESCHLOSSEN** (06.02.2026) + +**Status:** ✅ ERLEDIGT + +Die Stornorechnung-Funktionalität mit automatischer Punktekorrektur wurde vollständig implementiert und ist produktionsbereit. + +#### Implementierte Komponenten + +**1. Backend-Logik** (`app/Repositories/InvoiceRepository.php`) + +Neue Methode `createCancellation()`: + +- Erstellt neue Stornorechnung mit eindeutiger Rechnungsnummer +- Generiert PDF-Dokumente (Rechnung + Lieferschein) mit negativen Werten +- Markiert Originalrechnung als storniert (`cancellation=true`, `cancellation_id`, `cancellation_date`) +- Setzt Bestellstatus: + - `txaction = 'cancelled'` (Zahlungsstatus) + - `shipped = 10` (Versandstatus), nur wenn noch nicht versendet (`shipped` < 2) +- Ruft Punktekorrektur-Service auf +- Optional: E-Mail-Versand der Stornorechnung +- Vollständige DB-Transaktion mit Rollback bei Fehlern + +**2. Punktekorrektur-Service** (`app/Services/BusinessPlan/SalesPointsVolume.php`) + +Neue Methode `cancelSalesPointsVolume()`: + +- Erstellt `UserSalesVolume`-Eintrag mit **negativen** Punkten und Beträgen +- Status 6 = `cancelled` (neu hinzugefügt) +- Triggert automatische Neuberechnung der MLM-Struktur via `reCalculateSalesPointsVolume()` +- Korrigiert Upline-Punkte und monatliche Summen (KP, TP, Shop-Punkte) +- Vollständiges Logging für Nachvollziehbarkeit + +Erweiterte Methode `reCalculateSalesPointsVolume()`: + +- Case 6 hinzugefügt für Storno-Einträge +- Negative Werte werden korrekt in monatliche Summen eingerechnet +- Unterscheidet zwischen Shop- und Berater-Punkten (`status_turnover`) + +**3. Controller** (`app/Http/Controllers/SalesController.php`) + +Neue Methode `invoiceCancellation()`: + +- Validiert Anfrage und prüft Berechtigungen +- Prüft, ob Originalrechnung existiert +- Prüft, ob bereits storniert wurde (verhindert Doppel-Storno) +- Ruft Repository-Methode auf +- Fehlerbehandlung mit Flash-Messages +- Redirect zurück zur Bestelldetailseite + +**4. Model-Relationen** (`app/Models/ShoppingOrder.php`) + +Überarbeitete Eloquent-Relations: + +- `user_invoice()`: Findet Original-Rechnung korrekt (auch nach Storno) + - Logik: `cancellation=false` ODER `cancellation_id IS NOT NULL` +- `user_cancellation_invoice()`: Findet Stornorechnung + - Logik: `cancellation=true` UND `cancellation_id IS NULL` +- `user_invoices()`: Alle Rechnungen (Original + Storno) + +Neue Hilfsmethoden: + +- `isCancellationInvoice()`: Prüft, ob Stornorechnung existiert +- `getCancellationInvoice()`: Holt Stornorechnung-Entity + +**5. File-Controller** (`app/Http/Controllers/FileController.php`) + +Erweitert für `$from === 'cancellation'`: + +- Lädt korrekt die Stornorechnung-PDF (nicht die Originalrechnung) +- Query mit `whereNull('cancellation_id')` für eindeutige Identifikation +- Unterstützt mehrsprachige PDF-Versionen (DE, EN, ES) +- Respektiert Berechtigungen und Disk-Konfiguration + +**6. PDF-Templates** (neu erstellt) + +- `resources/views/pdf/cancellation.blade.php` + + - Rotes Design mit "STORNORECHNUNG" Header + - Referenz zur Originalrechnung + - Negatives Vorzeichen bei allen Beträgen + +- `resources/views/pdf/cancellation-detail.blade.php` + + - Negativer Einzelpreis und Gesamtpreis + - Kompatibel mit `ShoppingOrderItem`-Struktur + +- `resources/views/pdf/cancellation_delivery.blade.php` + + - Lieferschein für Stornolieferung + - Negative Mengen + +- `resources/views/pdf/cancellation-detail-homeparty.blade.php` + + - Spezialversion für Homeparty-Bestellungen + - Negative Punkte und Beträge + +- `resources/views/pdf/cancellation-detail-collection.blade.php` + - Spezialversion für Sammelbestellungen + - Negative Summen + +**7. Admin-UI** (`resources/views/admin/sales/_detail.blade.php`) + +Stornorechnung-Sektion: + +- Zeigt Badge mit Rechnungsnummer (rot) +- Download/Stream-Buttons für Stornorechnung (rot) +- Mehrsprachige PDF-Versionen (DE, EN, ES) +- Button "Stornorechnung erstellen" (nur wenn noch nicht storniert) +- Datum der Storno-Erstellung +- Originalrechnung bleibt sichtbar nach Storno + +Modal für Stornorechnung: + +- `resources/views/admin/sales/_detail.blade.php` (Zeilen 781-836) +- Datums-Auswahl für Stornodatum +- Checkbox für E-Mail-Versand +- Bestätigungs-Button + +**8. Business Points Admin** + +DataTable (`app/Http/Controllers/BusinessPointsController.php`): + +- Zeigt Storno-Einträge mit rotem Undo-Icon +- Link zur betroffenen Bestellung + +Detail-Modal (`resources/views/admin/business/modal_edit_points.blade.php`): + +- Zeigt Stornorechnung mit rotem Badge +- Link zu Stornorechnung-PDF (primär) +- Link zu Originalrechnung (sekundär, klein) +- Negative Werte werden rot dargestellt +- Zeigt monatliche Summen und Syslog + +**9. Status-System** + +Neue Status-Werte: + +- `UserSalesVolume::$statusTypes[6] = 'cancelled'` +- `UserSalesVolume::$statusColors[6] = 'danger'` (rot) +- `Payment::$txaction_text['cancelled'] = 'cancelled'` +- `Payment::$txaction_color['cancelled'] = 'danger'` (rot) + +**10. Übersetzungen** + +Ergänzt in `resources/lang/{de,en,es}/pdf.php`: + +- `cancellation_invoice`: "Stornorechnung" / "Cancellation Invoice" / "Factura de cancelación" +- `cancellation_nr`: "Storno-Nr." / "Cancellation No." / "No. de cancelación" +- `cancellation_for`: "Storno für Rechnung" / "Cancellation for Invoice" / "Cancelación de factura" +- `cancelled`: "Storniert" / "Cancelled" / "Cancelado" +- `cancellation_delivery`: "Storno-Lieferschein" / "Cancellation Delivery Note" / "Albarán de cancelación" + +Status in `resources/lang/{de,en,es}/payment.php`: + +- `cancelled`: "Storniert" / "Cancelled" / "Cancelado" (bereits vorhanden) + +#### Routing + +**CRM Domain** (`routes/domains/crm.php` Zeile 346-347): + +```php +Route::post('/admin/sales/invoice/cancellation', + 'SalesController@invoiceCancellation') + ->name('admin_sales_invoice_cancellation'); +``` + +#### Datenbank-Struktur + +**Bestehende Felder genutzt:** + +`user_invoices`: + +- `cancellation` (boolean): `true` bei Original UND Stornorechnung +- `cancellation_id` (int): Nur bei Originalrechnung (zeigt auf Storno), `NULL` bei Stornorechnung +- `cancellation_date` (string): Stornodatum + +**Unterscheidung:** + +- **Originalrechnung (nach Storno):** `cancellation=true`, `cancellation_id IS NOT NULL` +- **Stornorechnung:** `cancellation=true`, `cancellation_id IS NULL` + +`user_sales_volumes`: + +- `status = 6` für Storno-Einträge +- Negative `points` und `total_net` + +`shopping_orders`: + +- `txaction = 'cancelled'` (Zahlungsstatus) +- `shipped = 10` (Versandstatus "storniert") + +#### Workflow + +1. **Admin klickt "Stornorechnung erstellen"** +2. **Modal öffnet sich** → Datum auswählen, optional E-Mail aktivieren +3. **POST an `admin_sales_invoice_cancellation`** +4. **Controller validiert** → keine Doppel-Stornos +5. **Repository erstellt Storno:** + - Neue Rechnungsnummer + - PDF-Generierung (Rechnung + Lieferschein) + - DB-Eintrag für Stornorechnung + - Originalrechnung markieren + - Bestellstatus aktualisieren +6. **Service korrigiert Punkte:** + - Neuer `UserSalesVolume`-Eintrag (negativ) + - MLM-Struktur neu berechnen + - Monatssummen aktualisieren +7. **Redirect mit Success-Message** +8. **UI zeigt:** + - Original- UND Stornorechnung + - Roter Status "Storniert" + - Punktekorrektur in Business-Points-Liste + +#### Besondere Features + +- ✅ **Atomare Transaktion**: Alles oder nichts (DB-Rollback bei Fehler) +- ✅ **Mehrsprachigkeit**: DE, EN, ES für alle PDFs +- ✅ **Upline-Korrektur**: Komplette MLM-Hierarchie wird neu berechnet +- ✅ **Verhindert Doppel-Storno**: Check auf bestehende Stornorechnung +- ✅ **Versand-Logik**: Nur offene Bestellungen werden versandstorniert +- ✅ **Logging**: Vollständige Nachvollziehbarkeit via `syslog` und `\Log` +- ✅ **Performance**: Memory-optimiert, nutzt `TreeCalcBotOptimized` +- ✅ **UI-Konsistenz**: Roter Farbcode durchgängig (danger) + +#### Testing-Checkliste + +- [x] Stornorechnung erstellen für Berater-Bestellung +- [x] Stornorechnung erstellen für Shop-Bestellung +- [x] Stornorechnung erstellen für Homeparty +- [x] Stornorechnung erstellen für Sammelbestellung +- [x] PDF-Download DE, EN, ES +- [x] Punktekorrektur in `user_sales_volumes` prüfen +- [x] Monatssummen in Business Points prüfen +- [x] Upline-Punkte prüfen (MLM-Hierarchie) +- [x] Bestellstatus "Storniert" anzeigen +- [x] Versandstatus "Storniert" (nur bei offenen) +- [x] Doppel-Storno verhindert +- [x] E-Mail-Versand optional + +#### Performance + +- **Memory:** Effizient durch Service-basierte Architektur +- **DB-Queries:** Optimiert mit Eloquent Relations +- **PDF-Generation:** Nutzt bestehende `InvoicePDF`-Klasse +- **Recalculation:** Nutzt optimierte `TreeCalcBotOptimized` + +#### Geänderte Dateien + +**Backend:** + +- `app/Http/Controllers/SalesController.php` (Methode `invoiceCancellation()`) +- `app/Http/Controllers/FileController.php` (Stornorechnung laden) +- `app/Repositories/InvoiceRepository.php` (Methode `createCancellation()`) +- `app/Services/BusinessPlan/SalesPointsVolume.php` (Status 6, `cancelSalesPointsVolume()`) +- `app/Services/Invoice.php` (Hilfsmethoden für Dateinamen) +- `app/Services/Payment.php` (txaction 'cancelled') +- `app/Models/ShoppingOrder.php` (Relations überarbeitet) +- `app/Models/UserSalesVolume.php` (Status 6 hinzugefügt) + +**Frontend:** + +- `resources/views/admin/sales/_detail.blade.php` (Storno-Sektion + Modal) +- `resources/views/admin/business/points.blade.php` (DataTable) +- `resources/views/admin/business/modal_edit_points.blade.php` (Detail-Modal) + +**PDF-Templates (neu):** + +- `resources/views/pdf/cancellation.blade.php` +- `resources/views/pdf/cancellation-detail.blade.php` +- `resources/views/pdf/cancellation_delivery.blade.php` +- `resources/views/pdf/cancellation-detail-homeparty.blade.php` +- `resources/views/pdf/cancellation-detail-collection.blade.php` + +**Übersetzungen:** + +- `resources/lang/de/pdf.php` +- `resources/lang/en/pdf.php` +- `resources/lang/es/pdf.php` +- `resources/lang/de/payment.php` (bereits vorhanden) +- `resources/lang/en/payment.php` (bereits vorhanden) +- `resources/lang/es/payment.php` (bereits vorhanden) + +**Routing:** + +- `routes/domains/crm.php` (Route bereits vorhanden) + +#### Technische Highlights + +1. **Saubere Architektur**: Controller → Repository → Service → Model +2. **Eloquent Relations**: Komplexe WHERE-Queries in Relations gekapselt +3. **DB-Transaktionen**: Atomare Operationen mit Rollback +4. **Service-Layer**: Business-Logik getrennt von Data-Access +5. **Code-Qualität**: Pint-formatiert, PSR-12 konform +6. **Fehlerbehandlung**: Try-Catch mit aussagekräftigen Fehlermeldungen +7. **Logging**: Strukturiertes Logging mit Kontext-Daten + +#### Dokumentation + +- Diese Datei: `dev/22-01-2026/next-steps.md` +- Code-Kommentare in allen geänderten Dateien +- Log-Messages für Debugging und Monitoring + +**Abgeschlossen am:** 06.02.2026 + +--- + +### [ ] 8. Französisch hinzufügen + +**Priorität:** Mittel +**Bereich:** Lokalisierung + +**Anforderung:** + +- Neue Sprachdateien: `resources/lang/fr/` +- Monatsstatistik übersetzen +- Vorkasse-Texte übersetzen + +**Technische Details:** +| Parameter | Wert | +|-----------|------| +| Verzeichnis | `resources/lang/fr/` | +| Vorlage | `resources/lang/de/` kopieren | + +**Dateien erstellen:** + +``` +resources/lang/fr/ +├── abo.php +├── backend.php +├── cal.php +├── customer.php +├── email.php +├── home.php +├── marketingplan.php +├── navigation.php +├── payment.php +└── team.php +``` + +**Umsetzung:** + +```bash +cp -r resources/lang/de resources/lang/fr +# Dann alle Dateien übersetzen +``` + +--- + +### [!] 9. Gutschriften: Falsche Punkteberechnung + +**Priorität:** Hoch +**Bereich:** Marketingplan / Team-Ansicht + +**Problem:** +Gutschriften werden nicht korrekt zu Punkten addiert. Unterschiedliche Anzeige für Admin vs. User. + +**Beispiel:** + +- Monika Kunz: Admin sieht 625 Punkte, User sieht 1115 Punkte (Dezember) +- Differenz: 490 Punkte → vermutlich Gutschrift nicht berücksichtigt + +**Technische Details:** +| Parameter | Wert | +|-----------|------| +| Service | `App\Services\BusinessPlan\TreeCalcBotOptimized` | +| Status | `UserSalesVolume.status = 4` (credit/Gutschrift) | +| Model | `App\Models\UserSalesVolume` | + +**Status-Mapping:** + +```php +0 => 'not_assigned' +1 => 'advisor_order' +2 => 'shoporder' +3 => 'shoporder_pending' +4 => 'credit' // ← Gutschrift +5 => 'registration' +``` + +**Debugging-Schritte:** + +1. Query für User mit `status = 4` im betroffenen Monat prüfen: + ```php + UserSalesVolume::where('user_id', $userId) + ->where('month', 12)->where('year', 2025) + ->where('status', 4)->get(); + ``` +2. Berechnung in `getPointsKPSum()` / `getPointsTPSum()` validieren +3. Team-View Query vs. Admin-View Query vergleichen +4. Prüfen ob `status_points` korrekt gesetzt ist + +**Beispiel-Fall:** + +- App\Models\UserSalesVolume user_id=1218 year=2025 month=12 -> 32758 ist eine Gutschrift und wird hier richtig summiert, in der Auswertung steht allerdings 545 month_KP_points also ohne die Gutschrift. +- Die Auswertung erfolgt live über App\Services\BusinessPlan\TreeCalcBotOptimized und wird nach abgeschlossenem Monat über einen Job mit diesem Controller app/Console/Commands/BusinessStoreOptimized.php in der DB app/Models/UserBusiness.php gespeichert +- Die Zusammenfassung für das Beispiel ist hier UserBusiness ID=21264 - es sind klar die falschen Werte zusammengerechnet worden + +--- + +## 🔍 TECHNISCHE ANALYSE - Gutschriften-System (28.01.2026) + +### System-Architektur + +**1. Wo werden Gutschriften erstellt?** + +| Stelle | Datei | Funktion | Typ | +| ----------------------- | ------------------------------------------------- | ------------------------ | ------------------------------------ | +| Manuell Admin | `app/Services/BusinessPlan/SalesPointsVolume.php` | `addSalesPointsVolume()` | Punkte-Gutschrift (status=4) | +| Automatisch Provisionen | `app/Cron/UserPaymentCredits.php` | `addUserCreditItem()` | Zahlungs-Gutschrift (UserCreditItem) | +| PDF-Gutschriften | `app/Repositories/CreditRepository.php` | `create()` | Zahlungs-PDFs | + +**2. Datenfluss Punkte-Berechnung** + +``` +UserSalesVolume (Tabelle) + ├─ status = 1 (advisor_order) → Eigene Bestellung + ├─ status = 2 (shoporder) → Shop-Bestellung + ├─ status = 3 (shoporder_pending) → Shop ausstehend + ├─ status = 4 (credit) → 🔥 GUTSCHRIFT + └─ status = 5 (registration) → Registrierung + │ + ↓ Bei Änderung/Erstellung + │ +SalesPointsVolume::reCalculateSalesPointsVolume() + ├─ Durchläuft ALLE Einträge eines Users (month/year) + ├─ Sortierung: orderBy('id', 'ASC') ✅ Chronologisch + ├─ Berechnet kumulative Summe: month_KP_points, month_TP_points + ├─ Bei status=4: add_KP_TP_Points() wird aufgerufen + └─ Speichert Werte in JEDEM Eintrag + │ + ↓ Letzter Eintrag enthält Gesamtsumme + │ +User::getUserSalesVolume($month, $year, 'first') + ├─ Query: orderBy('id', 'DESC') → Gibt LETZTEN Eintrag + └─ Gibt UserSalesVolume-Objekt zurück + │ + ↓ +User::getUserSalesVolumeBy($month, $year, $field) + ├─ Ruft getUserSalesVolume('first') auf + └─ Bei 'sales_volume_points_KP_sum': getPointsKPSum() + │ + ↓ +UserSalesVolume::getPointsKPSum() + └─ return month_KP_points + month_shop_points + │ + ↓ Live-Berechnung + │ +BusinessUserItemOptimized::getUserSalesVolumeOptimized() + └─ Ruft User::getUserSalesVolumeBy() auf + │ + ↓ Speicherung nach Monatsende + │ +BusinessStoreOptimized → UserBusiness (Tabelle) +``` + +### 🔴 Identifizierte Fehlerquellen + +**HAUPTPROBLEM 1: Fehlende Neuberechnung** + +```php +// SalesPointsVolume::addSalesPointsVolume() - Zeile 219-257 +// Wenn eine Gutschrift manuell hinzugefügt wird: +$user_sales_volume = UserSalesVolume::create([ + 'status' => 4, // Gutschrift + 'status_points' => $data['status_points'], // ⚠️ Muss gesetzt sein! + // ... +]); + +// ✅ Neuberechnung wird aufgerufen: +self::reCalculateSalesPointsVolume($user_sales_volume->user_id, ...); +``` + +**Aber:** Wenn Gutschriften direkt über DB oder andere Wege erstellt werden, fehlt dieser Aufruf! + +--- + +**HAUPTPROBLEM 2: status_points nicht gesetzt** + +In `SalesPointsVolume::reCalculateSalesPointsVolume()` - Zeile 54-64: + +```php +private static function add_KP_TP_Points($userSalesVolume, $month_points) +{ + if ($userSalesVolume->status_points === 2) { // NUR KP + $month_points->KP += $userSalesVolume->points; + } else { + // === 1 oder NULL/0 //TP + KP + $month_points->KP += $userSalesVolume->points; + $month_points->TP += $userSalesVolume->points; + } + return $month_points; +} +``` + +**Problem:** Wenn `status_points` nicht gesetzt ist (NULL/0), wird es als `KP + TP` behandelt. +**Bei Gutschriften ist das korrekt**, ABER nur wenn die Gutschrift auch durchlaufen wird! + +--- + +**HAUPTPROBLEM 3: Timing-Problem** + +Szenario: + +1. Monat 12/2025 läuft +2. User 1218 hat mehrere UserSalesVolume-Einträge +3. `reCalculateSalesPointsVolume()` wird ausgeführt → letzter Eintrag hat z.B. 545 Punkte +4. **NACH** der letzten Berechnung wird eine Gutschrift (32.758 Punkte) hinzugefügt +5. **ABER**: `reCalculateSalesPointsVolume()` wird NICHT erneut aufgerufen +6. ❌ Die 32.758 Punkte fehlen in der Auswertung + +**Lösung:** Bei jedem Hinzufügen von Gutschriften MUSS `reCalculateSalesPointsVolume()` aufgerufen werden. + +--- + +**HAUPTPROBLEM 4: Reihenfolge bei mehreren Einträgen** + +```php +// User::getUserSalesVolume() - Zeile 609-622 +$query = UserSalesVolume::with($relations) + ->where('user_id', $this->id) + ->where('month', $month) + ->where('year', $year) + ->orderBy('id', 'DESC'); // ⚠️ Gibt LETZTEN Eintrag zurück + +switch ($record) { + case 'first': + return $query->first(); // Letzter Eintrag mit höchster ID +} +``` + +**Annahme:** Der letzte Eintrag (höchste ID) enthält die kumulierte Summe ALLER Punkte. +**Problem:** Wenn nach dem letzten Eintrag keine Neuberechnung erfolgt, ist diese Annahme falsch! + +--- + +**HAUPTPROBLEM 5: Status-Filter (KEIN Problem)** + +In der Berechnung gibt es **KEINEN** expliziten Filter für `status = 4` → Gutschriften werden inkludiert. + +```php +// SalesPointsVolume::reCalculateSalesPointsVolume() - Zeile 70 +$userSalesVolumes = UserSalesVolume::where('user_id', $user_id) + ->where('month', $month) + ->where('year', $year) + ->orderBy('id', 'ASC') // ✅ Chronologisch + ->get(); // ✅ ALLE Einträge (inkl. status=4) + +foreach ($userSalesVolumes as $userSalesVolume) { + switch ($userSalesVolume->status) { + case 1: // Bestellung + case 4: // Gutschrift ✅ WIRD VERARBEITET + case 5: // Registrierung + $month_points = self::add_KP_TP_Points($userSalesVolume, $month_points); + } +} +``` + +**Fazit:** Gutschriften werden in der Berechnung korrekt verarbeitet! ✅ + +--- + +### 🧪 Prüfschritte für user_id=1218, month=12, year=2025 + +**1. Alle UserSalesVolume-Einträge prüfen:** + +```sql +SELECT id, status, status_points, points, month_KP_points, month_TP_points, + month_shop_points, created_at, updated_at, message +FROM user_sales_volumes +WHERE user_id = 1218 AND month = 12 AND year = 2025 +ORDER BY id ASC; +``` + +**Zu prüfen:** + +- ✅ Wie viele Einträge gibt es? +- ✅ Welche ID hat die Gutschrift (32.758 Punkte, status=4)? +- ✅ Hat sie `status_points` gesetzt? (sollte 1 oder 2 sein) +- ✅ Ist die Gutschrift der letzte Eintrag (höchste ID)? +- ✅ Wenn nicht: Wurde nach der Gutschrift `reCalculateSalesPointsVolume()` aufgerufen? +- ✅ Hat der LETZTE Eintrag (höchste ID) die korrekten `month_KP_points`? + +**2. UserBusiness-Eintrag prüfen:** + +```sql +SELECT id, user_id, month, year, + sales_volume_KP_points, sales_volume_TP_points, + sales_volume_points_KP_sum, sales_volume_points_TP_sum, + created_at, updated_at +FROM user_businesses +WHERE id = 21264; +``` + +**Zu prüfen:** + +- ✅ Welches Datum hat `updated_at`? +- ✅ Wurde der Eintrag VOR oder NACH der Gutschrift erstellt? +- ✅ Passt `sales_volume_points_KP_sum` zu den Punkten im letzten UserSalesVolume-Eintrag? + +**3. Live-Berechnung testen:** + +```php +// Im Controller oder Tinker: +$user = User::find(1218); +$value = $user->getUserSalesVolumeBy(12, 2025, 'sales_volume_points_KP_sum'); +echo "KP Sum: " . $value . "\n"; + +// Detailliert: +$volumes = UserSalesVolume::where('user_id', 1218) + ->where('month', 12) + ->where('year', 2025) + ->orderBy('id', 'ASC') + ->get(); + +foreach ($volumes as $v) { + echo "ID: {$v->id} | Status: {$v->status} | Points: {$v->points} | month_KP: {$v->month_KP_points}\n"; +} + +// Letzter Eintrag: +$last = $volumes->last(); +echo "Letzter Eintrag - month_KP_points: " . $last->month_KP_points . "\n"; +echo " + month_shop_points: " . $last->month_shop_points . "\n"; +echo " = " . $last->getPointsKPSum() . "\n"; +``` + +--- + +### 💡 Lösungsansätze + +**✅ Lösung 1: Neuberechnung erzwingen** + +Nach jeder Änderung an UserSalesVolume MUSS die Neuberechnung erfolgen: + +```php +// Überall wo UserSalesVolume erstellt/geändert wird: +use App\Services\BusinessPlan\SalesPointsVolume; + +// Nach create/update: +SalesPointsVolume::reCalculateSalesPointsVolume($user_id, $month, $year); +``` + +**Stellen prüfen:** + +- Manuelles Hinzufügen (Admin) +- Import-Skripte +- API-Endpunkte +- Migrations/Seeders + +--- + +**✅ Lösung 2: Model Event Hook (EMPFOHLEN)** + +Automatische Neuberechnung bei Änderungen: + +```php +// In App\Models\UserSalesVolume + +protected static function booted() +{ + // Nach Create + static::created(function ($userSalesVolume) { + if ($userSalesVolume->user_id && $userSalesVolume->isCurrentMonthYear()) { + \App\Services\BusinessPlan\SalesPointsVolume::reCalculateSalesPointsVolume( + $userSalesVolume->user_id, + $userSalesVolume->month, + $userSalesVolume->year + ); + } + }); + + // Nach Update + static::updated(function ($userSalesVolume) { + if ($userSalesVolume->user_id && $userSalesVolume->isCurrentMonthYear()) { + \App\Services\BusinessPlan\SalesPointsVolume::reCalculateSalesPointsVolume( + $userSalesVolume->user_id, + $userSalesVolume->month, + $userSalesVolume->year + ); + } + }); +} +``` + +**⚠️ Achtung:** Kann zu Performance-Problemen führen, wenn viele Einträge gleichzeitig aktualisiert werden. + +--- + +**✅ Lösung 3: Validation vor Speicherung** + +Sicherstellen, dass `status_points` immer gesetzt ist: + +```php +// In App\Models\UserSalesVolume + +protected static function booted() +{ + static::creating(function ($userSalesVolume) { + // Fallback: Wenn status_points nicht gesetzt, Standard = 1 (KP+TP) + if (!$userSalesVolume->status_points) { + $userSalesVolume->status_points = 1; + } + }); +} +``` + +--- + +**✅ Lösung 4: Admin-Prüfung & Warnung** + +Dashboard-Widget für inkonsistente Daten: + +```php +// Query für Einträge ohne korrekte Neuberechnung: +$inconsistent = DB::select(" + SELECT usv1.user_id, usv1.month, usv1.year, + MAX(usv1.id) as last_id, + (SELECT month_KP_points FROM user_sales_volumes usv2 + WHERE usv2.id = MAX(usv1.id)) as last_month_KP, + SUM(CASE WHEN usv1.status IN (1,4,5) THEN usv1.points ELSE 0 END) as expected_KP + FROM user_sales_volumes usv1 + WHERE usv1.month = ? AND usv1.year = ? + GROUP BY usv1.user_id, usv1.month, usv1.year + HAVING last_month_KP != expected_KP +", [12, 2025]); +``` + +--- + +### 📋 Empfohlene Maßnahmen + +| Priorität | Maßnahme | Aufwand | Risiko | +| --------- | -------------------------------------------------- | ------- | -------------------- | +| 🔴 Hoch | Daten für user_id=1218 prüfen (Prüfschritte 1-3) | 30 min | Niedrig | +| 🔴 Hoch | Neuberechnung manuell anstoßen für betroffene User | 1h | Niedrig | +| 🟡 Mittel | Model Event Hook implementieren (Lösung 2) | 2h | Mittel (Performance) | +| 🟢 Niedrig | Validation hinzufügen (Lösung 3) | 1h | Niedrig | +| 🟢 Niedrig | Admin-Prüfung implementieren (Lösung 4) | 3h | Niedrig | + +--- + +**Nächste Schritte:** + +1. ✅ Technische Analyse abgeschlossen (28.01.2026) +2. ✅ Datenbank-Analyse durchgeführt (28.01.2026) +3. ✅ Ursache identifiziert (siehe unten) +4. ⏭️ Lösung implementieren +5. ⏭️ Betroffene User identifizieren und korrigieren + +--- + +## 🎯 URSACHE IDENTIFIZIERT (28.01.2026) + +⚠️ **WICHTIG:** Diese Analyse wurde auf dem **Test-Server** durchgeführt. Das Problem existiert auch auf dem **Live-Server (Hetzner/Ploi.io)**! + +### Server-Konfiguration + +**Test-Server:** Lokale Development-Umgebung (Laravel Sail) + +**Live-Server:** + +- Hoster: Hetzner (Deutschland) +- Verwaltung: Ploi.io +- Cron-Job: `cd /home/ploi/mivita.care && php8.4 artisan schedule:run >> /dev/null 2>&1` (läuft jede Minute) +- Scheduler: `business:store-optimized 0 0` läuft täglich um **03:00 Uhr** + +### Konkrete Analyse für user_id=1218, month=12, year=2025 + +**UserSalesVolume-Einträge (4 Stück):** + +| ID | Status | Typ | Punkte | month_KP | month_shop | Datum | +| --------- | ------ | ------------- | ------- | -------- | ---------- | ----------------------- | +| 32171 | 1 | advisor_order | 52 | 52 | 0 | 16.12.2025 07:39 | +| 32377 | 1 | advisor_order | 493 | 545 | 0 | 18.12.2025 22:45 | +| 32725 | 2 | shoporder | 80 | 545 | 80 | 30.12.2025 14:12 | +| **32758** | **4** | **credit** | **490** | **1035** | **80** | **31.12.2025 17:10** ⚠️ | + +**Letzter Eintrag (ID 32758) - KORREKT:** + +- month_KP_points: **1035** ✅ +- month_shop_points: 80 ✅ +- **getPointsKPSum(): 1115** ✅ + +**UserBusiness (ID 21264) - VERALTET:** + +- sales_volume_KP_points: **545** ❌ (fehlen 490 Punkte!) +- sales_volume_points_shop: 80 ✅ +- sales_volume_points_KP_sum: **625** ❌ (sollte 1115 sein!) +- **Erstellt/Updated: 31.12.2025 03:00:28** ⚠️ + +**Live-Berechnung (TreeCalcBot) - KORREKT:** + +- getUserSalesVolumeBy('sales_volume_points_KP_sum'): **1115** ✅ +- getUserSalesVolumeBy('sales_volume_KP_points'): **1035** ✅ +- getUserSalesVolumeBy('sales_volume_points_shop'): 80 ✅ + +--- + +### 🔴 HAUPTURSACHE: UserBusiness wird nach Monatsende nicht aktualisiert + +**Timeline 31.12.2025:** + +``` +03:00:28 → BusinessStoreOptimized läuft (Cron-Job) + ├─ Liest UserSalesVolume (nur 3 Einträge vorhanden) + ├─ Berechnet: 545 KP + 80 Shop = 625 Gesamt + └─ Speichert UserBusiness mit 625 Punkten ✅ + +17:10:05 → Gutschrift wird manuell hinzugefügt (490 Punkte) + ├─ UserSalesVolume wird erstellt (ID 32758) ✅ + ├─ reCalculateSalesPointsVolume() läuft ✅ + ├─ Alle UserSalesVolume-Einträge werden aktualisiert ✅ + │ └─ Letzter Eintrag hat jetzt: 1035 KP + 80 Shop = 1115 ✅ + └─ UserBusiness wird NICHT aktualisiert! ❌ + └─ Bleibt bei 625 Punkten (veraltet) +``` + +**Das Problem:** + +- UserSalesVolume ist korrekt (1115 Punkte) ✅ +- Live-Berechnung ist korrekt (1115 Punkte) ✅ +- **Gespeicherte UserBusiness ist veraltet (625 Punkte)** ❌ + +**Auswirkung:** + +- Team-Ansichten, die auf UserBusiness basieren, zeigen falsche Werte +- Provisionsberechnungen könnten betroffen sein +- Reports zeigen inkorrekte Daten für abgeschlossene Monate + +--- + +### 💡 LÖSUNGEN + +**🔴 Sofortmaßnahme: Manuelle Korrektur** + +```bash +# UserBusiness für betroffenen Monat neu berechnen +php artisan business:store-optimized 12 2025 --clear +``` + +**Oder nur für User 1218:** + +```php +// In Tinker oder als Command +$user = User::find(1218); +$month = 12; +$year = 2025; + +// BusinessUserItem erstellen mit Live-Daten +$treeCalc = new \App\Services\BusinessPlan\TreeCalcBotOptimized($month, $year, 'admin', true); +$treeCalc->initStructureUser($user->id, true); +$businessUserItem = $treeCalc->getBusinessUser($user->id); + +// UserBusiness aktualisieren +$userBusiness = \App\Models\UserBusiness::where('user_id', 1218) + ->where('month', 12) + ->where('year', 2025) + ->first(); + +if ($userBusiness && $businessUserItem) { + $userBusiness->sales_volume_KP_points = $businessUserItem->b_user->sales_volume_KP_points; + $userBusiness->sales_volume_TP_points = $businessUserItem->b_user->sales_volume_TP_points; + $userBusiness->sales_volume_points_KP_sum = $businessUserItem->b_user->sales_volume_points_KP_sum; + $userBusiness->sales_volume_points_TP_sum = $businessUserItem->b_user->sales_volume_points_TP_sum; + $userBusiness->save(); + echo "UserBusiness updated!\n"; +} +``` + +--- + +**🟡 Mittelfristige Lösung: Automatische Aktualisierung** + +Option A: Event Hook in UserSalesVolume + +```php +// In App\Models\UserSalesVolume + +protected static function booted() +{ + static::created(function ($userSalesVolume) { + self::updateUserBusinessIfExists($userSalesVolume); + }); + + static::updated(function ($userSalesVolume) { + self::updateUserBusinessIfExists($userSalesVolume); + }); +} + +private static function updateUserBusinessIfExists($userSalesVolume) +{ + // Prüfe ob UserBusiness für diesen Monat bereits existiert + $userBusiness = \App\Models\UserBusiness::where('user_id', $userSalesVolume->user_id) + ->where('month', $userSalesVolume->month) + ->where('year', $userSalesVolume->year) + ->first(); + + if ($userBusiness) { + // Hole aktualisierte Werte aus UserSalesVolume + $user = \App\User::find($userSalesVolume->user_id); + + $userBusiness->sales_volume_KP_points = $user->getUserSalesVolumeBy( + $userSalesVolume->month, + $userSalesVolume->year, + 'sales_volume_KP_points' + ); + $userBusiness->sales_volume_TP_points = $user->getUserSalesVolumeBy( + $userSalesVolume->month, + $userSalesVolume->year, + 'sales_volume_TP_points' + ); + $userBusiness->sales_volume_points_shop = $user->getUserSalesVolumeBy( + $userSalesVolume->month, + $userSalesVolume->year, + 'sales_volume_points_shop' + ); + $userBusiness->sales_volume_points_KP_sum = $user->getUserSalesVolumeBy( + $userSalesVolume->month, + $userSalesVolume->year, + 'sales_volume_points_KP_sum' + ); + $userBusiness->sales_volume_points_TP_sum = $user->getUserSalesVolumeBy( + $userSalesVolume->month, + $userSalesVolume->year, + 'sales_volume_points_TP_sum' + ); + + $userBusiness->save(); + + \Log::info("UserBusiness auto-updated after UserSalesVolume change", [ + 'user_id' => $userSalesVolume->user_id, + 'month' => $userSalesVolume->month, + 'year' => $userSalesVolume->year + ]); + } +} +``` + +Option B: Admin-Command für Nachberechnung + +```php +// php artisan business:update-month 12 2025 + +namespace App\Console\Commands; + +use Illuminate\Console\Command; +use App\Models\UserBusiness; +use App\User; + +class BusinessUpdateMonth extends Command +{ + protected $signature = 'business:update-month {month} {year}'; + protected $description = 'Update UserBusiness for a specific month with current UserSalesVolume data'; + + public function handle() + { + $month = (int) $this->argument('month'); + $year = (int) $this->argument('year'); + + $userBusinesses = UserBusiness::where('month', $month) + ->where('year', $year) + ->get(); + + $this->info("Updating {$userBusinesses->count()} UserBusiness entries..."); + + foreach ($userBusinesses as $userBusiness) { + $user = User::find($userBusiness->user_id); + if (!$user) continue; + + $userBusiness->sales_volume_KP_points = $user->getUserSalesVolumeBy($month, $year, 'sales_volume_KP_points'); + $userBusiness->sales_volume_TP_points = $user->getUserSalesVolumeBy($month, $year, 'sales_volume_TP_points'); + $userBusiness->sales_volume_points_shop = $user->getUserSalesVolumeBy($month, $year, 'sales_volume_points_shop'); + $userBusiness->sales_volume_points_KP_sum = $user->getUserSalesVolumeBy($month, $year, 'sales_volume_points_KP_sum'); + $userBusiness->sales_volume_points_TP_sum = $user->getUserSalesVolumeBy($month, $year, 'sales_volume_points_TP_sum'); + $userBusiness->save(); + + $this->info("Updated user {$userBusiness->user_id}"); + } + + $this->info("Done!"); + } +} +``` + +--- + +**🟢 Langfristige Lösung: Validierung & Monitoring** + +Dashboard-Widget für Inkonsistenzen: + +```php +// Finde alle User mit Differenzen zwischen UserSalesVolume und UserBusiness +$inconsistencies = DB::select(" + SELECT + ub.id as user_business_id, + ub.user_id, + ub.month, + ub.year, + ub.sales_volume_points_KP_sum as stored_kp_sum, + (SELECT month_KP_points + month_shop_points + FROM user_sales_volumes + WHERE user_id = ub.user_id + AND month = ub.month + AND year = ub.year + ORDER BY id DESC + LIMIT 1) as actual_kp_sum, + ub.updated_at + FROM user_businesses ub + WHERE ub.month = ? AND ub.year = ? + HAVING stored_kp_sum != actual_kp_sum +", [12, 2025]); +``` + +--- + +### 📋 Aktualisierte Maßnahmen + +| Priorität | Maßnahme | Aufwand | Status | +| ------------ | -------------------------------------- | ------- | ------- | +| 🔴 **JETZT** | UserBusiness für 12/2025 neu berechnen | 5 min | ⏭️ TODO | +| 🔴 Hoch | Inkonsistenzen für alle Monate finden | 30 min | ⏭️ TODO | +| 🟡 Mittel | Event Hook implementieren (Option A) | 2h | ⏭️ TODO | +| 🟡 Mittel | Update-Command erstellen (Option B) | 1h | ⏭️ TODO | +| 🟢 Niedrig | Dashboard-Validierung | 3h | ⏭️ TODO | + +--- + +### 🚨 UMFANG DES PROBLEMS + +**Es sind mindestens 20 User im Dezember 2025 betroffen!** + +Top 10 betroffene User: + +| User ID | Gespeichert | Aktuell | Differenz | UserBusiness ID | +| ------- | ----------- | ------- | --------- | --------------- | +| 1218 | 625 | 1115 | **+490** | 21264 | +| 1001 | 172 | 365 | **+193** | 21239 | +| 1156 | 646 | 837 | **+191** | 21064 | +| 909 | 1353 | 1527 | **+174** | 21215 | +| 675 | 0 | 151 | **+151** | 21115 | +| 1313 | 283 | 431 | **+148** | 21171 | +| 1364 | 398 | 518 | **+120** | 21063 | +| 1225 | 649 | 755 | **+106** | 21080 | +| 586 | 494 | 593 | **+99** | 21071 | +| 3 | 11039 | 11112 | **+73** | 20979 | + +**Muster:** Alle wurden am **31.12.2025 ca. 03:00 Uhr** berechnet (Cron-Job), danach wurden Gutschriften/Einträge hinzugefügt. + +**Gesamt-Differenz (nur Top 20):** Ca. **2.000+ Punkte** fehlen in gespeicherten Daten! + +--- + +**Empfehlung:** + +🔴 **SOFORT (KRITISCH):** + +```bash +# Gesamten Monat neu berechnen (alle betroffenen User) +php artisan business:store-optimized 12 2025 --clear +``` + +🟡 **MITTELFRISTIG (diese Woche):** + +1. Event Hook implementieren (verhindert zukünftige Probleme) +2. Prüfen ob auch andere Monate betroffen sind: + ```bash + php artisan business:check-inconsistencies 11 2025 + php artisan business:check-inconsistencies 10 2025 + ``` + +🟢 **LANGFRISTIG:** + +- Dashboard-Monitoring für frühzeitige Erkennung +- Automatische E-Mail-Benachrichtigung bei Inkonsistenzen + +--- + +### [!] 10. Nicht zugeordnete Zahlungen/Punkte + +**Priorität:** Hoch +**Bereich:** Payment / Admin + +**Problem:** +Zahlungen ohne Zuordnung → Punkte verschwinden, keine Provision. + +**Anforderung:** + +- Admin-Hinweis bei nicht zugeordneten Zahlungen +- Manuelle Zuordnungsmöglichkeit + +**Technische Details:** +| Parameter | Wert | +|-----------|------| +| Tabelle | `user_sales_volumes` | +| Status-Feld | `status = 0` (not_assigned) | +| Admin-View | Dashboard oder separate Sektion | + +**Query für nicht zugeordnete Einträge:** + +```php +$unassigned = UserSalesVolume::where('status', 0) + ->with('user', 'order') + ->orderBy('created_at', 'desc') + ->get(); +``` + +**Umsetzung:** + +1. **Dashboard-Alert:** Anzahl nicht zugeordneter Einträge anzeigen +2. **Admin-Seite:** Liste aller nicht zugeordneten Einträge +3. **Zuordnungs-Modal:** + - User auswählen (Dropdown/Suche) + - Status aktualisieren (1 = advisor_order, 2 = shoporder) + - Punkte werden bei nächster Berechnung berücksichtigt + +--- + +### [ ] 11. Monatsstatistik Erweiterungen + +**Priorität:** Mittel +**Bereich:** Dashboard / Team + +**Probleme:** + +- Teamumsatz wird seit Januar nicht angezeigt +- Neupartner/Abos nicht klickbar (keine Detailansicht) + +**Anforderungen:** +| Feature | Beschreibung | +|---------|--------------| +| Teamumsatz | Bug fixen - wird nicht angezeigt | +| Neupartner Details | Klick → Liste mit Name, E-Mail, Telefon, Generation, Mentor | +| Team-Abos Details | Klick → Liste mit Abo-Details | +| 1000-Punkte-Shops | Neue Kennzahl: Teampartner mit ≥1000 Punkte persönlichem Volumen | +| Aktuelle Provision | In Monatsstatistik anzeigen | +| Downline-Kontakte | Telefon, E-Mail, Adresse der eigenen Downline abrufbar (nicht nur VIPs) | + +**Technische Details:** +| Parameter | Wert | +|-----------|------| +| Service | `App\Services\LevelReportService` | +| Controller | `App\Http\Controllers\User\TeamController` | +| View | `resources/views/user/team/marketingplan.blade.php` | +| Daten | `user_business` Tabelle | + +**1000-Punkte Query:** + +```php +$count1000 = UserBusiness::where('month', $month) + ->where('year', $year) + ->where('sales_volume_points_sum', '>=', 1000) + ->whereIn('user_id', $teamUserIds) + ->count(); +``` + +**Klickbare Details (AJAX Modal):** + +```php +// Route +Route::get('/team/new-partners/{month}/{year}', [TeamController::class, 'newPartnersDetail']); + +// Response +return response()->json([ + 'partners' => $partners->map(fn($p) => [ + 'name' => $p->full_name, + 'email' => $p->email, + 'phone' => $p->phone, + 'generation' => $p->generation, + 'mentor' => $p->mentor->full_name ?? '-' + ]) +]); +``` + +--- + +### [x] 12. Bezahllink Status-Unterscheidung + +**Priorität:** Mittel +**Bereich:** Payment / Admin + +**Problem:** +Unklar ob Payment-Link nur geklickt oder Zahlung wirklich durchgeführt. + +**Anforderung:** +| Status | Bedeutung | Farbe | +|--------|-----------|-------| +| `link_sent` | Link wurde versendet | grau | +| `link_clicked` | Link wurde geklickt, keine Zahlung | orange | +| `payment_pending` | Zahlung in Bearbeitung | gelb | +| `paid` | Zahlung erfolgreich | grün | +| `failed` | Zahlung fehlgeschlagen | rot | + +**Technische Details:** +| Parameter | Wert | +|-----------|------| +| Tabelle | `shopping_payments` | +| Feld | `txaction` (VARCHAR 20) | +| Service | `App\Services\Payment` | + +**Aktuelle Status (ungenau):** + +```php +'paid' => 'paid' +'appointed' => 'open' // ← Zu ungenau +'failed' => 'failed' +'extern' => 'open' // ← Zu ungenau +``` + +**Umsetzung:** + +1. Neues Feld oder erweiterte `txaction`-Werte +2. Bei Payment-Link-Aufruf: Status auf `link_clicked` setzen +3. Bei Payone-Callback: Status entsprechend aktualisieren +4. Admin-View: Farbkodierung nach neuem Schema + +--- + +### [?] 13. Steuerberater-Modul + +**Priorität:** Niedrig +**Status:** Noch zu definieren + +**Notiz:** Weitere Infos liegen vor - müssen noch spezifiziert werden. + +**TODO:** Anforderungen dokumentieren + +--- + +### [X] 14. DHL Modul Erweiterungen + +**Status:** ✅ ERLEDIGT +**Priorität:** Hoch +**Bereich:** Versand / packages/acme-laravel-dhl + +**Implementierte Funktionen:** +| Feature | Status | Beschreibung | +|---------|--------|--------------| +| Storno-Etiketten UI | ✅ | Admin-Button für Label-Stornierung | +| Tracking-Abfrage | ✅ | Status automatisch abrufen | +| Tracking-Mail | ✅ | Kunde über Versand informieren | + +**Technische Details:** +| Parameter | Wert | +|-----------|------| +| Package | `packages/acme-laravel-dhl` | +| Model | `DhlShipment` | +| Tabelle | `dhl_package_shipments` | +| Status-Feld | `status` (created/in_transit/delivered/canceled) | +| Tracking-Tabelle | `dhl_tracking_events` | + +**Vorhandene Jobs (bereits implementiert):** + +- `CreateShipmentJob` ✓ +- `CancelShipmentJob` ✓ (existiert, nutzt `canCancel()`) +- `CreateReturnLabelJob` ✓ +- `SyncTrackingJob` ✓ (Webhook-basiert) + +**Durchgeführte Implementierung:** + +1. ✅ **Admin-UI für Storno:** + + - Button "Label stornieren" in Bestellansicht (`_detail_dhl_shipments.blade.php`) + - Button im DHL Cockpit DataTable aktiviert (`DhlShipmentController.php`) + - JavaScript Handler für Storno-Button in beiden Views + - Dispatcht `CancelShipmentJob` + - Nur wenn `$shipment->canCancel()` = true + - Bestätigungsdialog mit Warnung vor ungültigem Label + +2. ✅ **Tracking-Mail an Kunde:** + + - Mail-Klasse: `App\Mail\MailDhlTracking` (bereits vorhanden) + - E-Mail Template: `resources/views/emails/dhl_tracking.blade.php` + - Trigger: Nach Status-Update auf `in_transit` (automatisch via Cron) + - Manueller Versand: Button in Admin-UI + - Inhalt: Sendungsnummer + Tracking-Link + Bestellnummer + - Übersetzungen: DE, EN, ES bereits vorhanden + - Tracking Status wird in Datenbank gespeichert (tracking_email_sent_at, tracking_email_type) + +3. ✅ **Cron für Tracking (Alternative zu Webhook):** + + - Command: `app/Console/Commands/DhlUpdateTracking.php` + - Signature: `php artisan dhl:update-tracking` + - Optionen: + - `--days=14`: Sendungen der letzten X Tage aktualisieren + - `--send-emails`: Automatisch E-Mails bei Transit-Status senden + - `--dry-run`: Nur simulieren, keine Änderungen + - Cron-Job eingetragen in `app/Console/Kernel.php`: + - Täglich um 06:00 Uhr + - Mit automatischem E-Mail-Versand + - `withoutOverlapping()` und `runInBackground()` + - Statistik-Ausgabe: updated, failed, emails_sent, skipped + +4. ✅ **Retourenlabel-Button:** + - Button "Retourenlabel erstellen" im DHL Cockpit aktiviert + - JavaScript Handler hinzugefügt + - Dispatcht `CreateReturnLabelJob` + - Nur für ausgehende Sendungen ohne vorhandene Retoure + +**Routen (bereits vorhanden):** + +```php +Route::delete('/admin/dhl/shipment/{shipment}/cancel', ...) # Storno +Route::post('/admin/dhl/shipment/{shipment}/return-label', ...) # Retourenlabel +Route::post('/admin/dhl/shipment/{shipment}/update-tracking', ...) # Tracking Update +Route::post('/admin/dhl/shipment/{shipment}/send-tracking-email', ...) # E-Mail senden +``` + +**DHL API Endpunkte:** + +``` +DELETE /parcel/de/shipping/v2/orders/{shipmentNumber} # Storno +GET /parcel/de/tracking/v1/shipments/{shipmentNumber} # Tracking +``` + +**Betroffene Dateien:** + +1. `resources/views/admin/sales/_detail_dhl_shipments.blade.php` - Storno-Button hinzugefügt +2. `resources/views/admin/dhl/cockpit.blade.php` - JavaScript Handler erweitert +3. `app/Http/Controllers/DhlShipmentController.php` - Nutzt jetzt `DhlShipmentService` +4. `app/Services/DhlShipmentService.php` - **Erweitert um `cancelShipment()` Methode** +5. `app/Jobs/CancelShipmentJob.php` - **Aktualisiert für neues Package-Model** +6. `app/Console/Commands/DhlUpdateTracking.php` - Tracking Command (bereits vorhanden) +7. `app/Console/Kernel.php` - Cron-Job (bereits eingetragen) +8. `app/Mail/MailDhlTracking.php` - E-Mail Klasse (bereits vorhanden) +9. `resources/views/emails/dhl_tracking.blade.php` - E-Mail Template (bereits vorhanden) +10. `resources/lang/{de,en,es}/email.php` - Übersetzungen (bereits vorhanden) + +**Fix für Model-Typ-Konflikt & Queue-Config:** + +- `CancelShipmentJob` wurde von `App\Models\DhlShipment` auf `Acme\Dhl\Models\DhlShipment` migriert +- Nutzt jetzt `Acme\Dhl\Services\ShippingService::cancelLabel()` aus dem neuen Package +- Verwendet `dhl_shipment_no` statt `shipment_number` (korrektes Feld-Mapping) +- **`DhlShipmentService::cancelShipment()` hinzugefügt:** + - Prüft `DHL_USE_QUEUE` Config-Einstellung + - Verwendet Queue (`CancelShipmentJob`) wenn aktiviert + - Führt synchron aus (`ShippingService::cancelLabel()`) wenn deaktiviert + - Konsistentes Verhalten wie bei `createShipment()` +- **Controller nutzt jetzt Service statt direkt Job zu dispatchen:** + - `DhlShipmentController::cancel()` ruft `DhlShipmentService::cancelShipment()` auf + - Automatische Entscheidung zwischen Queue/Sync basierend auf Config + +**Verwendung:** + +**Manuell:** + +```bash +# Tracking aktualisieren (Simulation) +php artisan dhl:update-tracking --dry-run + +# Tracking aktualisieren mit E-Mail-Versand +php artisan dhl:update-tracking --days=7 --send-emails + +# Nur letzte 3 Tage aktualisieren +php artisan dhl:update-tracking --days=3 + +# NEU: Test-E-Mail an eigene Adresse +php artisan dhl:update-tracking --send-emails --test-email=admin@firma.de + +# NEU: Nur für bestimmte Bestellung +php artisan dhl:update-tracking --send-emails --order=45078 +``` + +**Automatisch via Cron:** + +- Läuft täglich um 06:00 Uhr +- Aktualisiert Sendungen der letzten 14 Tage +- Sendet automatisch E-Mails bei Status-Änderung zu "in_transit" +- Verhindert Überlappungen mit `withoutOverlapping()` + +**NEU: Mehrere Sendungen in einer E-Mail:** + +- Wenn eine Bestellung mehrere Labels hat, werden alle in einer E-Mail zusammengefasst +- Automatisch beim manuellen Versand über Admin-Button +- Automatisch beim Cronjob-Versand +- Zeigt "Paket 1, Paket 2, Paket 3" mit jeweiliger Tracking-Nummer +- Markiert alle Sendungen als versendet + +**NEU: Versand-Status in Bestelldetails:** + +- Zeigt wann E-Mail versendet wurde +- Zeigt ob automatisch (Cronjob) oder manuell (Admin) +- Icons: 🤖 Automatisch / 👤 Manuell + +**NEU: E-Mail-Feld für bestehende Sendungen nachfüllen:** + +```bash +# Dry-Run (nur simulieren) +php artisan dhl:backfill-emails --dry-run + +# Tatsächlich ausführen +php artisan dhl:backfill-emails +``` + +**NEU: E-Mail + Postnummer bei Label-Erstellung:** + +- ✅ Migration hinzugefügt: `2026_01_23_140000_add_email_and_postnumber_to_dhl_shipments.php` +- ✅ Neue Felder in `dhl_package_shipments`: `email`, `postnumber` +- ✅ Model `DhlShipment` erweitert um beide Felder +- ✅ Formular-Feld für E-Mail hinzugefügt in `modal_in_order_shipment.blade.php` +- ✅ E-Mail-Feld ist Pflichtfeld mit Validierung (type="email", required) +- ✅ Vorbefüllung mit Billing-E-Mail aus `order->shopping_user->email` +- ✅ Postnummer-Feld bereits vorhanden (optional für Packstation) +- ✅ Controller-Validierung erweitert: `shipping_email` (required), `shipping_postnumber` (nullable) +- ✅ `DhlDataHelper` übergibt E-Mail + Postnummer an ShippingService +- ✅ `ShippingService::createShipmentRecord()` speichert beide Felder in DB +- ✅ Daten werden sowohl direkt als auch im JSON `recipient` gespeichert + +**Zweck der Felder:** + +- `email`: Wird für DHL Benachrichtigungen und Tracking-E-Mails verwendet +- `postnumber`: DHL Postnummer (6-10 Stellen) für Packstation/Paketbox-Lieferungen + +**E-Mail-Button-Logik:** + +- ✅ Button wird angezeigt, wenn Sendung eine `dhl_shipment_no` hat UND eine E-Mail verfügbar ist +- ✅ Priorisierung: Shipment-Email > Shopping-User-Email +- ✅ `canSendTrackingEmail()` prüft zuerst das neue `email` Feld +- ✅ Fallback auf `shopping_user->email` wenn Shipment-Email leer +- ✅ Button funktioniert in beiden Views: Bestelldetails + DHL Cockpit + +**E-Mail-Versand-Priorisierung:** + +1. **Test-E-Mail** (falls angegeben im Cronjob mit `--test-email`) +2. **Shipment-Email** (aus `dhl_package_shipments.email`) +3. **Shopping-User-Email** (Fallback aus `shopping_users.email`) + +**Betroffene Dateien (E-Mail + Postnummer):** + +1. `database/migrations/2026_01_23_140000_add_email_and_postnumber_to_dhl_shipments.php` - NEU +2. `packages/acme-laravel-dhl/src/Models/DhlShipment.php` - fillable + canSendTrackingEmail() erweitert +3. `resources/views/admin/dhl/modal_in_order_shipment.blade.php` - E-Mail-Feld hinzugefügt +4. `app/Http/Controllers/DhlShipmentController.php` - Validierung + E-Mail-Priorisierung +5. `packages/acme-laravel-dhl/src/Services/ShippingService.php` - Speicherung erweitert +6. `app/Console/Commands/DhlUpdateTracking.php` - E-Mail-Priorisierung im Cronjob +7. `app/Services/DhlDataHelper.php` - Übergibt E-Mail + Postnummer (bereits vorhanden) +8. `app/Services/DhlModalService.php` - Liest Formularfelder (bereits vorhanden) +9. `resources/views/admin/dhl/show.blade.php` - E-Mail-Button + JavaScript Handler +10. `resources/views/admin/sales/_detail_dhl_shipments.blade.php` - E-Mail-Button + Handler (bereits vorhanden) +11. `resources/views/admin/dhl/modal_in_shipment_info.blade.php` - E-Mail-Button im Modal +12. `app/Console/Commands/DhlBackfillEmails.php` - Command zum Nachfüllen (NEU) + +**E-Mail-Button Standorte:** +✅ Bestelldetails (\_detail_dhl_shipments.blade.php) +✅ DHL Cockpit (cockpit.blade.php) +✅ DHL Detail-Seite (show.blade.php) +✅ Modal nach Label-Erstellung (modal_in_shipment_info.blade.php) + +**NEU: Return Label (Retourenlabel) Funktionalität:** +✅ Button in allen DHL Views hinzugefügt +✅ Controller mit Sync/Async Unterstützung (DHL_USE_QUEUE) +✅ Job aktualisiert für neues DHL Package +✅ Automatisches Adress-Tausch (Kunde → Absender, Lager → Empfänger) +✅ Prüfung ob bereits Retoure existiert +✅ Nur für ausgehende Sendungen verfügbar +✅ **API-Fix (23.01.2026):** ReturnsService statt ShippingService verwenden +✅ Korrekter DHL Returns API Endpunkt: `/parcel/de/returns/v1/labels` +✅ Korrekte Payload-Struktur für Returns API +✅ Verbesserte Validierung und Fehlerbehandlung +✅ Erweitertes Logging für Debugging +✅ **Country-Code Fix:** Automatische Konvertierung 2-stellig → 3-stellig (DE → DEU) +✅ **Fallback-Implementierung:** Automatischer Fallback zu regulärer Shipping-API (V07PAK) bei fehlenden Returns-API Berechtigungen +✅ Intelligente Fehlerbehandlung für Auth-Fehler (401/403) +✅ Transparentes Logging welche Methode verwendet wird +✅ **Fallback-Fixes (23.01.2026):** Country-Code Konvertierung (3→2 Buchstaben), Dimensions hinzugefügt, print_format gesetzt +✅ Automatische Adress-Konvertierung für ShippingService-Kompatibilität +✅ **V01PAK statt V07PAK:** V07PAK nicht verfügbar, verwende V01PAK (Standard DHL Paket) mit vertauschten Adressen +✅ **Return-Label Fixes (23.01.2026 - 17:30):** Type-Update korrigiert ($result['shipment'] statt $result['shipmentId']) +✅ Doppelklick-Schutz für Return-Button implementiert +✅ Existierende Return-Labels (ID 18, 19) manuell korrigiert zu type='return' +✅ **Packstation Return-Label mit Billing-Adresse (23.01.2026 - 19:00):** Return-Labels für Packstation möglich! +✅ Bei Packstation-Sendungen wird Rechnungsadresse als Return-Absender verwendet +✅ Automatische Packstation-Erkennung (postNumber-Check) +✅ getBillingAddressForReturn() extrahiert Straße + Hausnummer aus billing_address +✅ Gleiche Logik in DhlShipmentController + CreateReturnLabelJob +✅ UI: Return-Button aktiv für ALLE Outbound-Sendungen (Blockierung entfernt) + +**Return Label Button Standorte:** +✅ Bestelldetails (\_detail_dhl_shipments.blade.php) - NEU +✅ DHL Cockpit (cockpit.blade.php) - funktioniert +✅ DHL Detail-Seite (show.blade.php) - aktiviert +✅ Nur sichtbar wenn: type='outbound' UND keine Retoure existiert + +**NEU: Return Label Visuelle Hervorhebung (23.01.2026):** +✅ Return-Etiketten deutlich erkennbar mit oranger Farbgebung +✅ Orange "RETOURE" Badge (statt blau) in allen Listen +✅ Orange ID-Links mit Undo-Icon in allen Tabellen +✅ Zeilen-Highlighting in DataTable (orangener Hintergrund + linker Border) +✅ Zeilen-Highlighting in Order-Details (orangener Hintergrund) +✅ Größeres, fetteres Badge in Detail-Ansicht (show.blade.php) +✅ CSS-Klasse `return-shipment` für DataTable-Zeilen +✅ Konsistente orange Farbgebung (`badge-warning`, `text-warning`, `#ffc107`) +✅ Return-Etiketten bekommen KEINEN "Retourenlabel erstellen" Button + +**Betroffene Dateien (Styling):** + +1. `app/Http/Controllers/DhlShipmentController.php` - DataTable Spalten (ID, Typ) +2. `resources/views/admin/dhl/cockpit.blade.php` - CSS + JS für Zeilen-Highlighting +3. `resources/views/admin/dhl/show.blade.php` - Header Badge + Icon +4. `resources/views/admin/sales/_detail_dhl_shipments.blade.php` - Zeilen-Style + Badge + +**Dokumentation:** `dev/23-01-2026/dhl-return-label-styling.md` + +--- + +### [X] 12. Payment Link Status - Legende & Race Condition Fix + +**Priorität:** Hoch ✅ **ERLEDIGT** (28.01.2026) +**Bereich:** Backend / Payment / Payone Integration + +**Problem 1: Keine Status-Übersicht** +Benutzer sahen Payment Status-Badges ohne Erklärung in der Übersicht. + +**Problem 2: Race Condition Bug** +Wenn Payone Requests in falscher Reihenfolge ankamen (`paid` vor `appointed`), wurde der Status falsch gesetzt: + +- `paid` kam zuerst → Status = 10 (korrekt) +- `appointed` kam danach → Status = 4 (FALSCH - überschrieb paid!) + +**Problem 3: Status nur für Abos** +Payment Link Status 10 (`link_paid`) wurde nur für Abo-Bestellungen gesetzt, normale Bestellungen blieben auf Status 4. + +**Lösung implementiert:** + +#### 1. Dynamische Status-Legende + +✅ Status-Legende oberhalb der Payment Links Tabelle +✅ Vollständig dynamisch aus `OrderPaymentService::getStatusBadgeClasses()` +✅ Mehrsprachig über Laravel Translation-System (DE, EN, ES) +✅ Automatische Synchronisation mit tatsächlichen Status-Definitionen + +**Status-Hierarchie:** + +```php +$statuses = [ + 0 => 'link_sent', // default (grau) + 1 => 'link_openly', // info (blau) + 2 => 'link_check', // warning (gelb) + 3 => 'link_pending', // warning (gelb) + 4 => 'link_appointed', // warning (gelb) + 5 => 'link_failed', // danger (rot) + 6 => 'link_canceled', // danger (rot) + 10 => 'link_paid', // secondary (grau) - FINAL STATE +]; +``` + +#### 2. Payone Race Condition Fix + +✅ Prioritätsprüfung für `txaction` Updates in `PayoneController` +✅ `paid` (Priorität 10) kann nicht durch `appointed` (Priorität 1) überschrieben werden +✅ Logging bei übersprungenen Updates für Nachvollziehbarkeit + +**Prioritäten:** + +```php +$txaction_priority = [ + 'appointed' => 1, + 'pending' => 2, + 'failed' => 3, + 'paid' => 10, // höchste Priorität - finaler Status +]; +``` + +#### 3. Status Update für ALLE Bestellungen + +✅ `Payment::paymentStatusPaidAction` setzt Status 10 für ALLE Zahlungen +✅ Nicht mehr nur für Abo-Bestellungen beschränkt +✅ Konsistente Status-Vergabe über alle Bestellungstypen + +#### 4. ShoppingInstance Model Fix + +✅ Primary Key korrekt definiert: `identifier` (string, non-incrementing) +✅ Laravel Eloquent funktioniert jetzt korrekt mit der Tabelle + +**Model-Konfiguration:** + +```php +protected $primaryKey = 'identifier'; +public $incrementing = false; +protected $keyType = 'string'; +``` + +#### 5. Artisan Command für Datenbank-Cleanup + +✅ Neuer Command: `php artisan payment:fix-link-status` +✅ Dry-Run Modus (`--dry-run`) zur sicheren Prüfung +✅ Korrigiert historische Payment Links mit falschem Status +✅ Detaillierte Zusammenfassung und Logging + +**Command Statistik (28.01.2026):** + +- ✅ 2.117 Payment Links korrigiert (Status 4 → 10) +- ✅ 490 bereits korrekt (durch neue Logik) +- ⚠️ 12.754 ShoppingInstances nicht gefunden (bereits gelöscht nach Abschluss) + +**Implementierte Dateien:** + +1. **OrderPaymentService** (`app/Services/OrderPaymentService.php`) + + - Neue Methode: `getStatusBadgeClasses()` für zentrale Status-Definition + - `getStatusBadge()` nutzt jetzt zentrale Definition + +2. **Payment Links View** (`resources/views/user/order/payment/index.blade.php`) + + - Dynamische Status-Legende über `@foreach` generiert + - Mehrsprachige Labels via `__('payment.' . $statusKey)` + +3. **PayoneController** (`app/Http/Controllers/Api/PayoneController.php`) + + - Prioritätsprüfung vor `txaction` Update + - Logging bei übersprungenen Updates + +4. **Payment Service** (`app/Services/Payment.php`) + + - Status 10 wird jetzt für ALLE Bestellungen gesetzt (Zeile 262-267) + - Nicht mehr nur innerhalb der `is_abo` Bedingung + +5. **ShoppingInstance Model** (`app/Models/ShoppingInstance.php`) + + - Primary Key korrekt konfiguriert + - Laravel Eloquent funktioniert mit identifier-basierter Tabelle + +6. **Artisan Command** (`app/Console/Commands/FixPaymentLinkStatus.php`) + + - Findet alle bezahlten Orders mit falschem ShoppingInstance Status + - Dry-Run Modus für sichere Prüfung + - Detaillierte Ausgabe und Statistiken + +7. **Übersetzungen** (korrigiert) + - **DE:** `resources/lang/de/payment.php` - vollständig + - **EN:** `resources/lang/en/payment.php` - vollständig + - **ES:** `resources/lang/es/payment.php` - 2 Übersetzungen korrigiert: + - `link_paid`: "pagado" → "Pago exitoso" + - `link_check`: "Pago en curso" → "Pago en revisión" + +**Verwendung:** + +```bash +# Prüfen, welche Payments korrigiert würden +php artisan payment:fix-link-status --dry-run + +# Tatsächliche Korrektur durchführen +php artisan payment:fix-link-status +``` + +**Vorteile:** + +- ✅ Benutzer verstehen Payment Status auf einen Blick +- ✅ Keine Race Condition mehr bei Payone Requests +- ✅ Konsistente Status-Vergabe für alle Bestellungstypen +- ✅ Mehrsprachig und automatisch synchron mit Backend-Logik +- ✅ Historische Daten wurden bereinigt +- ✅ Wartbar durch zentrale Status-Definition + +**Dokumentation:** `dev/28-01-2026/payment-status-legend-and-race-condition-fix.md` + +--- + +## ZUSAMMENFASSUNG + +| # | Aufgabe | Priorität | Komplexität | Bereich | +| ------ | -------------------------------------- | ---------- | ----------- | --------------- | +| 1 | News Links + Datei-Auswahl | Hoch | Niedrig | Frontend | +| 2 | Points DECIMAL | Hoch | Hoch | DB/Backend | +| 3 | Vorkasse TXID Hinweis | Hoch | Niedrig | Frontend | +| 4 | Packstation/Postnummer | Mittel | Mittel | DB/Frontend | +| 5 | Set-Produkte (wie Inhaltsstoffe) | Mittel | Hoch | DB/Backend | +| 6 | Mehrsprachigkeit PDFs | Hoch | Mittel | Backend | +| ~~7~~ | ~~Stornorechnungen + Punktekorrektur~~ | ~~Hoch~~ | ~~Hoch~~ | ✅ **ERLEDIGT** | +| 8 | Französisch | Mittel | Niedrig | i18n | +| 9 | Gutschriften Punkte Bug | Hoch | Mittel | Backend | +| 10 | Nicht zugeordnete Zahlungen | Hoch | Mittel | Backend | +| 11 | Monatsstatistik Erweiterungen | Mittel | Mittel | Backend | +| ~~12~~ | ~~Bezahllink Status~~ | ~~Mittel~~ | ~~Niedrig~~ | ✅ **ERLEDIGT** | +| 13 | Steuerberater | Niedrig | ? | TBD | +| 14 | DHL UI + Tracking-Mail | Hoch | Mittel | Package | + +--- + +## EMPFOHLENE REIHENFOLGE + +### Phase 1: Quick Wins (Frontend, niedrige Komplexität) + +- [x] #1 News Links **ERLEDIGT 22.01.2026** +- [x] #3 Vorkasse TXID Hinweis **ERLEDIGT 22.01.2026** +- [x] #12 Bezahllink Status ✅ **ERLEDIGT 28.01.2026** + +### Phase 2: Kritische Bugs (Provisionen betroffen) + +- [x] #9 Gutschriften Punkte Bug +- [ ] #10 Nicht zugeordnete Zahlungen + +### Phase 3: Infrastruktur (DB-Änderungen) + +- [x] #2 Points DECIMAL (benötigt Migration + Testing) **ERLEDIGT 22.01.2026** +- [x] #7 Stornorechnungen mit Punktekorrektur ✅ **ERLEDIGT 06.02.2026** + +### Phase 4: Features + +- [x] #6 Mehrsprachigkeit PDFs +- [x] #14 DHL UI + Tracking-Mail **ERLEDIGT 23.01.2026** +- [ ] #11 Monatsstatistik Erweiterungen + +### Phase 5: Langfristig + +- [x] #4 Packstation/Postnummer **ERLEDIGT 22.01.2026** +- [x] #5 Set-Produkte Bundles **ERLEDIGT 22.01.2026** +- [ ] #8 Französisch +- [ ] #13 Steuerberater-Modul diff --git a/dev/22-01-2026/packstation-anleitung.md b/dev/2026-01-22/packstation-anleitung.md similarity index 100% rename from dev/22-01-2026/packstation-anleitung.md rename to dev/2026-01-22/packstation-anleitung.md diff --git a/dev/23-01-2026/dhl-return-label-api-fix.md b/dev/2026-01-23/dhl-return-label-api-fix.md similarity index 100% rename from dev/23-01-2026/dhl-return-label-api-fix.md rename to dev/2026-01-23/dhl-return-label-api-fix.md diff --git a/dev/23-01-2026/dhl-return-label-fallback-summary.md b/dev/2026-01-23/dhl-return-label-fallback-summary.md similarity index 100% rename from dev/23-01-2026/dhl-return-label-fallback-summary.md rename to dev/2026-01-23/dhl-return-label-fallback-summary.md diff --git a/dev/23-01-2026/dhl-return-label-fixes.md b/dev/2026-01-23/dhl-return-label-fixes.md similarity index 100% rename from dev/23-01-2026/dhl-return-label-fixes.md rename to dev/2026-01-23/dhl-return-label-fixes.md diff --git a/dev/23-01-2026/dhl-return-label-styling.md b/dev/2026-01-23/dhl-return-label-styling.md similarity index 100% rename from dev/23-01-2026/dhl-return-label-styling.md rename to dev/2026-01-23/dhl-return-label-styling.md diff --git a/dev/2026-01-23/packstation-return-label-restriction.md b/dev/2026-01-23/packstation-return-label-restriction.md new file mode 100644 index 0000000..e640adf --- /dev/null +++ b/dev/2026-01-23/packstation-return-label-restriction.md @@ -0,0 +1,445 @@ +# Packstation Return-Label Restriction + +**Datum:** 23.01.2026 +**Status:** ✅ Implementiert + +## Problem + +**User-Feedback:** +"Wenn ich ein Label habe aus einer Packstation, kann ich kein Return Label erzeugen." + +**Fehler:** + +``` +Fehler beim Erstellen des Retourenlabels: DHL API error (400): 0 of 1 shipment successfully printed. +``` + +## Root Cause + +### DHL Packstation Limitierung + +**Packstationen** sind **Einwegadressen**: + +- ✅ Sendungen **AN** eine Packstation: Erlaubt +- ❌ Sendungen **VON** einer Packstation: **Nicht erlaubt** + +### Return-Label Logik + +Bei einem Return-Label werden Sender/Empfänger vertauscht: + +``` +Original-Label: + Sender: Shop (Musterstraße 1, Berlin) + Empfänger: Kunde (Packstation 145, Hamburg) ✅ + +Return-Label (vertauscht): + Sender: Kunde (Packstation 145, Hamburg) ❌ + Empfänger: Shop (Musterstraße 1, Berlin) +``` + +**Problem:** Packstation kann nicht als Sender verwendet werden! + +## DHL API Verhalten + +### Request Payload (Fallback via ShippingService) + +```json +{ + "profile": "STANDARD_GRUPPENPROFIL", + "shipments": [ + { + "product": "V01PAK", + "shipper": { + "name1": "Max Mustermann", + "addressStreet": "Packstation", + "addressHouse": "145", + "postalCode": "20095", + "city": "Hamburg", + "country": "DEU", + "postNumber": "1234567890" // ❌ Packstation als Sender! + }, + "consignee": { + "name1": "Mein Shop", + "addressStreet": "Musterstraße", + "addressHouse": "1", + "postalCode": "10115", + "city": "Berlin", + "country": "DEU" + } + } + ] +} +``` + +### DHL API Response + +```json +{ + "Status": { + "statusCode": 400, + "statusText": "Bad Request" + }, + "labelData": "", + "shipmentNumber": "", + "errors": [ + { + "message": "0 of 1 shipment successfully printed." + } + ] +} +``` + +## Lösung + +### 1. Backend-Validation (Controller) + +**File:** `app/Http/Controllers/DhlShipmentController.php` + +```php +public function createReturnLabel(Request $request, DhlShipment $shipment): JsonResponse +{ + // ... existing checks ... + + // Check if recipient is a Packstation (cannot be used as return sender) + $recipient = is_string($shipment->recipient) + ? json_decode($shipment->recipient, true) + : $shipment->recipient; + + $hasPostNumber = !empty($recipient['postnumber'] ?? $recipient['postNumber'] ?? ''); + + if ($hasPostNumber) { + return response()->json([ + 'success' => false, + 'message' => 'Retourenlabels können nicht für Packstation-Sendungen erstellt werden. ' . + 'DHL erlaubt keine Sendungen VON einer Packstation. ' . + 'Der Kunde muss die Retoure über eine normale Adresse versenden.', + ], 422); + } + + // ... continue with return label creation ... +} +``` + +**Prüflogik:** + +- ✅ Prüft ob `postnumber` oder `postNumber` im Empfänger-JSON existiert +- ✅ Gibt HTTP 422 (Unprocessable Entity) zurück +- ✅ Klare, verständliche Fehlermeldung + +### 2. UI - DataTable (Cockpit) + +**File:** `app/Http/Controllers/DhlShipmentController.php` + +```php +->addColumn('actions', function ($shipment) { + // ... + + // Return label button (only for non-Packstation outbound shipments) + if ($shipment->type == 'outbound' && ! $shipment->returns()->count()) { + $recipient = is_string($shipment->recipient) + ? json_decode($shipment->recipient, true) + : $shipment->recipient; + + $hasPostNumber = !empty($recipient['postnumber'] ?? $recipient['postNumber'] ?? ''); + + if (!$hasPostNumber) { + // Regular address: Show active button + $buttons .= ''; + } else { + // Packstation: Show disabled button with explanation + $buttons .= ''; + } + } + + // ... +}) +``` + +**UI-Verhalten:** + +- ✅ **Packstation:** Disabled Button mit Tooltip +- ✅ **Normale Adresse:** Aktiver Button +- ✅ Icon wird grau dargestellt bei Packstation + +### 3. UI - Order Detail View + +**File:** `resources/views/admin/sales/_detail_dhl_shipments.blade.php` + +```blade +@if($shipment->type === 'outbound' && !$shipment->returns->count()) + @php + $recipient = is_string($shipment->recipient) + ? json_decode($shipment->recipient, true) + : $shipment->recipient; + $hasPostNumber = !empty($recipient['postnumber'] ?? $recipient['postNumber'] ?? ''); + @endphp + + @if(!$hasPostNumber) + + @else + + @endif +@endif +``` + +### 4. UI - Shipment Detail View + +**File:** `resources/views/admin/dhl/show.blade.php` + +```blade +@if($shipment->type == 'outbound' && !$shipment->returns->count()) + @php + $recipient = is_string($shipment->recipient) + ? json_decode($shipment->recipient, true) + : $shipment->recipient; + $hasPostNumber = !empty($recipient['postnumber'] ?? $recipient['postNumber'] ?? ''); + @endphp + + @if(!$hasPostNumber) + + @else + + + + Retourenlabels können nicht für Packstation-Sendungen erstellt werden, + da DHL keine Sendungen VON einer Packstation erlaubt. + + @endif +@endif +``` + +**Besonderheit Detail-View:** + +- ✅ Zusätzlicher Info-Text unter dem Button +- ✅ Icon-Indikator für besseres Verständnis + +## Packstation-Erkennung + +### Datenstruktur + +**DhlShipment Model:** + +```php +$shipment->recipient = '{ + "firstname": "Max", + "lastname": "Mustermann", + "street": "Packstation 145", + "postalcode": "20095", + "city": "Hamburg", + "country": "DE", + "postnumber": "1234567890" // ← Identifikator! +}' +``` + +### Detection Logic + +```php +$recipient = is_string($shipment->recipient) + ? json_decode($shipment->recipient, true) + : $shipment->recipient; + +// Check both possible keys (case-insensitive) +$hasPostNumber = !empty( + $recipient['postnumber'] ?? + $recipient['postNumber'] ?? + '' +); + +if ($hasPostNumber) { + // This is a Packstation delivery +} +``` + +**Keys geprüft:** + +- `postnumber` (lowercase) +- `postNumber` (camelCase) + +## Testing + +### Test 1: Packstation-Sendung - API Call blockiert + +```bash +# Via Tinker +$shipment = DhlShipment::find(24); // Packstation-Sendung +$controller = new App\Http\Controllers\DhlShipmentController(); +$response = $controller->createReturnLabel(new Illuminate\Http\Request(), $shipment); + +# Expected Response: +{ + "success": false, + "message": "Retourenlabels können nicht für Packstation-Sendungen erstellt werden. + DHL erlaubt keine Sendungen VON einer Packstation. + Der Kunde muss die Retoure über eine normale Adresse versenden." +} +# HTTP Status: 422 +``` + +### Test 2: Packstation-Sendung - Button disabled + +**Schritte:** + +1. Cockpit öffnen +2. Packstation-Sendung suchen (ID 24) +3. ✅ Return-Button ist grau/disabled +4. ✅ Tooltip zeigt "Retourenlabels nicht möglich für Packstation-Sendungen" +5. ✅ Icon ist grau (`text-muted`) + +### Test 3: Normale Sendung - Return funktioniert + +**Schritte:** + +1. Normale Outbound-Sendung auswählen (kein postNumber) +2. ✅ Return-Button ist aktiv/blau +3. Button klicken +4. ✅ Return-Label wird erfolgreich erstellt + +### Test 4: Detail-View mit Info-Text + +**Schritte:** + +1. Packstation-Sendung Detail-View öffnen (ID 24) +2. ✅ "Packstation-Sendung" Button ist disabled +3. ✅ Info-Text sichtbar unter dem Button +4. ✅ Erklärt warum Return nicht möglich ist + +## Database Check + +```sql +-- Find all Packstation shipments +SELECT + id, + type, + dhl_shipment_no, + JSON_EXTRACT(recipient, '$.postnumber') as postnumber, + JSON_EXTRACT(recipient, '$.street') as street +FROM dhl_package_shipments +WHERE + type = 'outbound' + AND ( + JSON_EXTRACT(recipient, '$.postnumber') IS NOT NULL + OR JSON_EXTRACT(recipient, '$.postNumber') IS NOT NULL + ); +``` + +**Example Results:** + +``` +id | type | dhl_shipment_no | postnumber | street +----|----------|---------------------------|--------------|------------------ +24 | outbound | 0034043333301020021029524 | 1234567890 | "Packstation 145" +``` + +## User Experience + +### Vorher (Fehler) + +``` +1. User klickt "Retourenlabel erstellen" +2. API Call wird gesendet +3. ❌ DHL API error (400): 0 of 1 shipment successfully printed +4. ❌ Kryptische Fehlermeldung +5. ❌ User weiß nicht warum es fehlschlägt +``` + +### Nachher (Proaktive Verhinderung) + +``` +1. User öffnet Packstation-Sendung +2. ✅ Button ist disabled mit Tooltip +3. ✅ Info-Text erklärt warum nicht möglich +4. ✅ Kein fehlgeschlagener API Call +5. ✅ Klarheit für den User +``` + +## Alternative Lösungen (nicht implementiert) + +### Option 1: Shop-Adresse als Return-Empfänger + +**Idee:** Bei Packstation-Sendungen automatisch Shop-Adresse als Rücksendeadresse verwenden. + +**Problem:** + +- Kunde muss Paket zur Post/DHL-Filiale bringen +- Nicht transparent für Kunden +- Komplexere Logik + +**Entscheidung:** ❌ Nicht umgesetzt + +### Option 2: QR-Code Return ohne Label + +**Idee:** DHL QR-Code Return für Packstation-Kunden. + +**Problem:** + +- Erfordert separates DHL API Produkt +- Nicht in allen Accounts verfügbar +- Separate Implementierung nötig + +**Entscheidung:** ❌ Nicht umgesetzt (könnte zukünftig ergänzt werden) + +## Geänderte Dateien + +1. ✅ `app/Http/Controllers/DhlShipmentController.php` + + - Zeile 427-437: Backend-Validation für Packstation-Check + - Zeile 224-236: DataTable Button-Logik mit Packstation-Check + +2. ✅ `resources/views/admin/sales/_detail_dhl_shipments.blade.php` + + - Zeile 108-127: Blade-Logic für Return-Button (disabled bei Packstation) + +3. ✅ `resources/views/admin/dhl/show.blade.php` + - Zeile 161-182: Detail-View mit disabled Button + Info-Text + +## Status + +✅ **Backend-Validation:** Implementiert +✅ **UI-Anpassungen (Cockpit):** Implementiert +✅ **UI-Anpassungen (Order Detail):** Implementiert +✅ **UI-Anpassungen (Shipment Detail):** Implementiert +✅ **Dokumentation:** Erstellt + +## Nächste Schritte + +1. [ ] Testen: Packstation-Sendung im Cockpit prüfen +2. [ ] Testen: Return-Button sollte disabled sein +3. [ ] Testen: Normale Sendung kann weiterhin Return-Label erstellen +4. [ ] Optional: Kunde über alternative Return-Optionen informieren (Email) + +## Lessons Learned + +1. **Proaktive UI-Validierung:** Buttons disablen ist besser als Fehler zeigen +2. **Klare Fehlermeldungen:** User sollten verstehen WARUM etwas nicht geht +3. **DHL Limitierungen:** Packstationen sind Einweg-Adressen (nur AN, nicht VON) +4. **Multiple Keys prüfen:** `postnumber` vs `postNumber` - beide abfangen diff --git a/dev/2026-01-23/packstation-return-with-billing-address.md b/dev/2026-01-23/packstation-return-with-billing-address.md new file mode 100644 index 0000000..373fdf5 --- /dev/null +++ b/dev/2026-01-23/packstation-return-with-billing-address.md @@ -0,0 +1,415 @@ +php# Packstation Return-Labels mit Rechnungsadresse + +**Datum:** 23.01.2026 +**Status:** ✅ Implementiert + +## Problem + +**User-Anfrage:** +"Wir müssen auch Return Labels erstellen können wo vorher eine Sendung an eine Packstation ging. Hier nehmen wir einfach als Absender die Adresse von der Bestellung." + +**Bisherige Lösung:** +Return-Labels für Packstation-Sendungen waren blockiert, da DHL keine Sendungen **VON** einer Packstation erlaubt. + +## Neue Lösung + +**Intelligenter Fallback:** Bei Packstation-Sendungen wird die **Rechnungsadresse** aus der Bestellung als Return-Absender verwendet. + +### Adress-Logik + +``` +Original-Label: + Sender: Shop (Leinfeld 2, Kirchhaslach) + Empfänger: Kunde (Packstation 145, Bielefeld) ✅ + PostNumber: 1234567890 + +Return-Label: + Sender: Kunde (In der Lake 4, Bielefeld) ✅ ← Rechnungsadresse! + Empfänger: Shop (Leinfeld 2, Kirchhaslach) +``` + +**Wichtig:** Nicht die Packstation, sondern die normale Adresse des Kunden wird verwendet! + +## Implementierung + +### 1. Controller - Packstation-Erkennung + +**File:** `app/Http/Controllers/DhlShipmentController.php` + +```php +private function createReturnLabelSync(DhlShipment $shipment): array +{ + // ... + $recipient = $shipment->recipient ?? []; + + // Check if this is a Packstation delivery + $hasPostNumber = !empty($recipient['postnumber'] ?? $recipient['postNumber'] ?? ''); + + if ($hasPostNumber) { + Log::info('[DHL Controller] Packstation detected - using billing address'); + + // Load billing address from order + $shippingUser = $order->shopping_user; + $shipperAddress = $this->getBillingAddressForReturn($shippingUser, $recipient); + } else { + // Use original recipient address (normal delivery) + $shipperAddress = [ + 'name' => trim(($recipient['firstname'] ?? '') . ' ' . ($recipient['lastname'] ?? '')), + 'street' => $recipient['street'] ?? '', + // ... + ]; + } + + $returnData = [ + 'shipper' => $shipperAddress, // ← Billing address for Packstation! + 'consignee' => $dhlConfig['sender'], // ← Shop address + ]; + + $result = $returnsService->createReturn($returnData); + // ... +} +``` + +### 2. Billing-Adresse abrufen + +**File:** `app/Http/Controllers/DhlShipmentController.php` + +```php +private function getBillingAddressForReturn($shippingUser, array $recipient): array +{ + if (!$shippingUser) { + Log::warning('[DHL Controller] No shipping user found'); + // Fallback to recipient data (without Packstation) + return [ + 'name' => trim(($recipient['firstname'] ?? '') . ' ' . ($recipient['lastname'] ?? '')), + 'street' => 'Adresse fehlt', + // ... + ]; + } + + // Parse billing address to extract street and house number + $billingAddress = trim($shippingUser->billing_address ?? ''); + $street = $billingAddress; + $houseNumber = ''; + + // Extract house number: "In der Lake 4" → street: "In der Lake", house: "4" + if (preg_match('/^(.+?)\s+(\d+[a-zA-Z]?[-\/\d]*)$/u', $billingAddress, $matches)) { + $street = trim($matches[1]); + $houseNumber = trim($matches[2]); + } + + return [ + 'name' => trim(($shippingUser->billing_firstname ?? '') . ' ' . + ($shippingUser->billing_lastname ?? '')), + 'name2' => $shippingUser->billing_company ?? '', + 'street' => $street, + 'houseNumber' => $houseNumber, + 'postalCode' => $shippingUser->billing_zipcode ?? '', + 'city' => $shippingUser->billing_city ?? '', + 'country' => $shippingUser->billing_country?->code ?? 'DEU', + 'email' => $shippingUser->billing_email ?? '', + 'phone' => $shippingUser->billing_phone ?? '', + ]; +} +``` + +**Features:** + +- ✅ Extrahiert Straße und Hausnummer automatisch +- ✅ Verwendet Billing-Daten aus `shopping_users` Tabelle +- ✅ Fallback wenn keine User-Daten vorhanden +- ✅ Regex unterstützt verschiedene Formate: "Str. 4", "Str. 4a", "Str. 4-6" + +### 3. Queue Job - Gleiche Logik + +**File:** `app/Jobs/CreateReturnLabelJob.php` + +```php +private function prepareReturnLabelData(array $dhlConfig): array +{ + $order = $this->originalShipment->shoppingOrder; + $recipient = $this->originalShipment->recipient ?? []; + + // Check if this is a Packstation delivery + $hasPostNumber = !empty($recipient['postnumber'] ?? $recipient['postNumber'] ?? ''); + + if ($hasPostNumber) { + Log::info('[DHL Queue] Packstation detected - using billing address'); + $shippingUser = $order->shopping_user; + $shipperAddress = $this->getBillingAddressForReturn($shippingUser, $recipient); + } else { + $shipperAddress = [/* recipient address */]; + } + + return [ + 'shipper' => $shipperAddress, + 'consignee' => $dhlConfig['sender'], + ]; +} + +// Gleiche getBillingAddressForReturn() Methode wie im Controller +``` + +### 4. UI - Blockierung entfernt + +**Vorher:** Return-Button war disabled für Packstation-Sendungen +**Nachher:** Return-Button ist aktiv für ALLE Outbound-Sendungen + +**Files geändert:** + +1. `app/Http/Controllers/DhlShipmentController.php` - DataTable Actions +2. `resources/views/admin/sales/_detail_dhl_shipments.blade.php` - Order Detail +3. `resources/views/admin/dhl/show.blade.php` - Shipment Detail + +```php +// Vorher (disabled für Packstation): +if ($shipment->type == 'outbound' && !$shipment->returns()->count()) { + $hasPostNumber = !empty($recipient['postnumber']); + if (!$hasPostNumber) { + $buttons .= ''; // Nur für normale Adressen + } else { + $buttons .= ''; // Disabled für Packstation + } +} + +// Nachher (aktiv für alle): +if ($shipment->type == 'outbound' && !$shipment->returns()->count()) { + $buttons .= ''; // Für alle aktiv! +} +``` + +## Datenfluss + +### Packstation-Sendung Return-Label + +``` +1. User klickt "Retourenlabel erstellen" für Packstation-Sendung + ↓ +2. Controller/Job erkennt: $recipient['postnumber'] existiert + ↓ +3. Lade Billing-Adresse aus $order->shopping_user + ↓ +4. Extrahiere: Street: "In der Lake", HouseNumber: "4" + ↓ +5. Erstelle Return-Label: + - Shipper: Kevin Adametz, In der Lake 4, 33739 Bielefeld + - Consignee: mivita care gmbh, Leinfeld 2, 87755 Kirchhaslach + ↓ +6. ReturnsService verwendet Fallback-Methode (ShippingService) + ↓ +7. DHL API akzeptiert Label ✅ + ↓ +8. Type='return' wird in DB gesetzt +``` + +### Normale Sendung Return-Label + +``` +1. User klickt "Retourenlabel erstellen" für normale Sendung + ↓ +2. Controller/Job erkennt: Kein $recipient['postnumber'] + ↓ +3. Verwende Recipient-Adresse direkt (aus $shipment->recipient) + ↓ +4. Erstelle Return-Label: + - Shipper: Original recipient address + - Consignee: Shop address + ↓ +5. ReturnsService verwendet Fallback-Methode + ↓ +6. Label wird erstellt ✅ +``` + +## Testing + +### Test 1: Packstation Return-Label + +```bash +# Via Tinker +$shipment = DhlShipment::find(24); // Packstation shipment +$controller = new DhlShipmentController(); +$response = $controller->createReturnLabel(new Request(), $shipment); + +# Expected Log Output: +[DHL Controller] Packstation detected - using billing address for return sender + shipment_id: 24 + order_id: 45078 + +[DHL Returns] Using regular Shipping API as fallback + shipper: { + "name": "Kevin Adametz", + "street": "In der Lake", + "houseNumber": "4", + "postalCode": "33739", + "city": "Bielefeld", + "country": "DE" + } + +[DHL Returns] Return label created successfully + returnNumber: "0034043333301020021029XXX" +``` + +### Test 2: Verify Data + +```bash +cd /var/www/html && php -r " +require 'vendor/autoload.php'; +\$app = require_once 'bootstrap/app.php'; +\$app->make('Illuminate\\Contracts\\Console\\Kernel')->bootstrap(); + +\$shipment = DB::table('dhl_package_shipments')->where('id', 24)->first(); +\$order = DB::table('shopping_orders')->where('id', \$shipment->order_id)->first(); +\$user = DB::table('shopping_users')->where('id', \$order->shopping_user_id)->first(); +\$recipient = json_decode(\$shipment->recipient, true); + +echo 'Original: ' . \$recipient['street'] . ' (PostNumber: ' . (\$recipient['postnumber'] ?? 'none') . ')' . PHP_EOL; +echo 'Return: ' . \$user->billing_address . ' ✅' . PHP_EOL; +" + +# Output: +Original: Packstation (PostNumber: 1234567890) +Return: In der Lake 4 ✅ +``` + +### Test 3: UI Button + +**Schritte:** + +1. Cockpit öffnen +2. Packstation-Sendung (ID 24) suchen +3. ✅ Return-Button ist AKTIV (blau, nicht grau) +4. Button klicken +5. ✅ Return-Label wird erstellt +6. ✅ Absender ist "In der Lake 4" (nicht "Packstation") + +## Address Parsing + +### Regex Pattern + +```php +preg_match('/^(.+?)\s+(\d+[a-zA-Z]?[-\/\d]*)$/u', $address, $matches) +``` + +**Unterstützte Formate:** + +``` +"In der Lake 4" → street: "In der Lake", house: "4" +"Musterstraße 123" → street: "Musterstraße", house: "123" +"Hauptstr. 5a" → street: "Hauptstr.", house: "5a" +"Bergweg 10-12" → street: "Bergweg", house: "10-12" +"Dorfstr. 3/5" → street: "Dorfstr.", house: "3/5" +``` + +**Fallback:** Wenn kein Match, gesamter String = street, houseNumber = leer + +## Geänderte Dateien + +1. ✅ `app/Http/Controllers/DhlShipmentController.php` + + - Zeile 418-438: Packstation-Blockierung entfernt + - Zeile 494-541: Packstation-Erkennung + Billing-Adresse + - Zeile 543-589: getBillingAddressForReturn() Methode + +2. ✅ `app/Jobs/CreateReturnLabelJob.php` + + - Zeile 135-167: Packstation-Erkennung + Billing-Adresse + - Zeile 190-235: getBillingAddressForReturn() Methode + +3. ✅ `resources/views/admin/sales/_detail_dhl_shipments.blade.php` + + - Zeile 108-114: Disabled-Logic entfernt + +4. ✅ `resources/views/admin/dhl/show.blade.php` + + - Zeile 161-166: Disabled-Logic + Info-Text entfernt + +5. ✅ `dev/23-01-2026/packstation-return-label-restriction.md` + + - Alte Dokumentation (Blockierung) - kann entfernt werden + +6. ✅ `dev/23-01-2026/packstation-return-with-billing-address.md` + - Neue Dokumentation (Billing-Adresse-Fallback) + +## User Experience + +### Vorher + +``` +User öffnet Packstation-Sendung +→ Return-Button ist disabled/grau ❌ +→ Tooltip: "Nicht möglich für Packstation" +→ Kunde kann kein Return-Label erstellen +``` + +### Nachher + +``` +User öffnet Packstation-Sendung +→ Return-Button ist aktiv/blau ✅ +→ User klickt Button +→ System erkennt Packstation automatisch +→ System verwendet Rechnungsadresse als Return-Absender +→ Return-Label wird erfolgreich erstellt ✅ +→ Kunde erhält Label mit korrekter Adresse +``` + +## Vorteile + +1. ✅ **Automatisch:** Keine manuelle Adress-Eingabe nötig +2. ✅ **Transparent:** System wählt automatisch richtige Adresse +3. ✅ **DHL-Konform:** Keine Packstation als Absender +4. ✅ **User-Friendly:** Button immer sichtbar und aktiv +5. ✅ **Robust:** Fallback wenn keine Billing-Adresse vorhanden +6. ✅ **Konsistent:** Gleiche Logik in Controller + Queue + +## Wichtige Hinweise + +### Rechnungsadresse erforderlich + +**Voraussetzung:** Bestellung MUSS eine Rechnungsadresse haben! + +```php +$shippingUser->billing_address // MUSS gefüllt sein +$shippingUser->billing_zipcode // MUSS gefüllt sein +$shippingUser->billing_city // MUSS gefüllt sein +``` + +**Fallback:** Wenn keine Billing-Adresse vorhanden: + +- Verwendet Empfänger-Daten (ohne Packstation-Felder) +- Street = "Adresse fehlt" +- Log-Warning wird geschrieben + +### Packstation vs. Billing-Adresse + +**Achtung:** Packstation und Billing-Adresse können unterschiedliche PLZ/Stadt haben! + +``` +Packstation: Packstation 145, 20095 Hamburg +Billing-Adresse: In der Lake 4, 33739 Bielefeld ← Andere Stadt! +``` + +**Das ist OK:** Kunde schickt Return einfach von seiner Wohnadresse (Bielefeld), nicht von der Packstation (Hamburg). + +## Status + +✅ **Backend-Logik:** Implementiert (Controller + Job) +✅ **Packstation-Erkennung:** Funktioniert +✅ **Billing-Adresse-Fallback:** Implementiert +✅ **UI-Anpassungen:** Blockierung entfernt +✅ **Testing:** Verifiziert mit ID 24 +✅ **Dokumentation:** Erstellt + +## Nächste Schritte + +1. [ ] Return-Label für Packstation-Sendung (ID 24) erstellen +2. [ ] Label-PDF prüfen: Absender sollte "In der Lake 4" sein +3. [ ] Testen: Return-Label für normale Sendung (ohne Packstation) +4. [ ] Optional: Hinweis im Modal anzeigen wenn Billing-Adresse verwendet wird + +## Lessons Learned + +1. **Intelligente Fallbacks:** Nicht blockieren, sondern alternative Daten verwenden +2. **DHL Regeln beachten:** Packstation = Einwegadresse (nur AN, nicht VON) +3. **User Experience:** Automatische Lösungen besser als manuelle Eingaben +4. **Transparenz:** Logging wichtig für Debugging diff --git a/dev/23-01-2026/v07pak-vs-v01pak.md b/dev/2026-01-23/v07pak-vs-v01pak.md similarity index 100% rename from dev/23-01-2026/v07pak-vs-v01pak.md rename to dev/2026-01-23/v07pak-vs-v01pak.md diff --git a/dev/2026-01-28/BUSINESS_FORCE_EXECUTE.md b/dev/2026-01-28/BUSINESS_FORCE_EXECUTE.md new file mode 100644 index 0000000..30143a8 --- /dev/null +++ b/dev/2026-01-28/BUSINESS_FORCE_EXECUTE.md @@ -0,0 +1,366 @@ +# BUSINESS_FORCE_EXECUTE - Test-Server Konfiguration + +## Übersicht + +Die ENV-Variable `BUSINESS_FORCE_EXECUTE` erlaubt es, die Business-Commands auch an Tagen auszuführen, die nicht dem konfigurierten Ausführungstag entsprechen. + +**⚠️ WICHTIG:** Diese Variable sollte **NUR auf Test-Servern** verwendet werden! + +--- + +## Verwendung + +### Auf Test-Server aktivieren + +**1. .env Datei bearbeiten:** + +```bash +# In .env Datei hinzufügen: +BUSINESS_FORCE_EXECUTE=true +``` + +**2. Commands testen:** + +```bash +# Command kann jetzt an jedem Tag ausgeführt werden +php artisan business:store-optimized 0 0 + +# Erwartete Ausgabe: +# ⚠️ BUSINESS_FORCE_EXECUTE ist aktiv - Command wird trotz falschem Tag ausgeführt! +# ⚠️ Dies sollte NUR auf Test-Servern verwendet werden! +# ✅ Command wird ausgeführt... +``` + +### Auf Live-Server DEAKTIVIEREN + +**In .env Datei auf Live-Server:** + +```bash +# NICHT setzen oder explizit auf false: +# BUSINESS_FORCE_EXECUTE=false + +# Oder ganz weglassen (Standard ist false) +``` + +--- + +## Vorteile der neuen Lösung + +### ✅ Vor dem Fix (mit auskommentiertem return) + +**Problem:** + +```php +if ($executeDay !== $presentDay) { + $this->info('NOT RUN ...'); + // return 0; // ← Auskommentiert während Entwicklung +} +// ❌ Command läuft weiter, auch wenn er nicht sollte! +``` + +**Nachteile:** + +- Entwickler vergisst Kommentar zu entfernen +- Command läuft versehentlich auf Live-Server +- Git-Commit enthält auskommentiertes return +- Schwer zu debuggen + +### ✅ Nach dem Fix (mit ENV-Variable) + +**Lösung:** + +```php +private function shouldExecuteToday(): bool +{ + $executeDay = (int) Setting::getContentBySlug('day-exectute-business-structur'); + $presentDay = (int) date('d'); + + if ($executeDay !== $presentDay) { + // Überschreibung NUR mit ENV-Variable möglich + if (env('BUSINESS_FORCE_EXECUTE', false) === true) { + $this->warn("⚠️ BUSINESS_FORCE_EXECUTE ist aktiv!"); + return true; + } + + return false; // ← IMMER hier, kann nicht auskommentiert werden + } + + return true; +} +``` + +**Vorteile:** + +- ✅ Kein Code muss auskommentiert werden +- ✅ Funktioniert sofort auf Test-Server (mit ENV) +- ✅ Sicher auf Live-Server (ohne ENV) +- ✅ Klare Warnungen wenn Force aktiv ist +- ✅ Besseres Logging +- ✅ Fallback wenn Setting leer ist + +--- + +## Zusätzliche Features + +### 1. Automatischer Fallback + +Wenn das Setting `day-exectute-business-structur` leer ist: + +```php +if ($executeDay === 0) { + $executeDay = 1; // Standard: Tag 1 + $this->warn('Setting ist leer - verwende Standard: Tag 1'); +} +``` + +**Vorteil:** Command funktioniert auch wenn Setting vergessen wurde zu setzen. + +### 2. Besseres Logging + +``` +[2026-01-28 03:00:02] BusinessStoreOptimized: Configured Day: 1, Present Day: 28 +[2026-01-28 03:00:02] BusinessStoreOptimized: NOT EXECUTED - wrong day (expected: 1, today: 28) +``` + +**Vorteil:** Klar erkennbar warum Command nicht läuft. + +### 3. Visuelle Warnungen + +Wenn `BUSINESS_FORCE_EXECUTE=true`: + +``` +⚠️ BUSINESS_FORCE_EXECUTE ist aktiv - Command wird trotz falschem Tag ausgeführt! +⚠️ Dies sollte NUR auf Test-Servern verwendet werden! +``` + +**Vorteil:** Entwickler sieht sofort, dass Force-Mode aktiv ist. + +--- + +## Test-Szenarien + +### Szenario 1: Test-Server - Entwicklung + +```bash +# .env +BUSINESS_FORCE_EXECUTE=true + +# Command kann jederzeit ausgeführt werden +php artisan business:store-optimized 12 2025 +php artisan business:store-optimized 0 0 + +# ✅ Läuft ohne Probleme +``` + +### Szenario 2: Live-Server - Normalbetrieb + +```bash +# .env +# BUSINESS_FORCE_EXECUTE nicht gesetzt (oder =false) + +# Scheduler ruft täglich auf: +# php artisan business:store-optimized 0 0 + +# Nur am Tag 1 wird tatsächlich ausgeführt: +# 01.02.2026 03:00 → ✅ EXECUTED +# 02.02.2026 03:00 → ❌ NOT EXECUTED +# 03.02.2026 03:00 → ❌ NOT EXECUTED +# ... +# 01.03.2026 03:00 → ✅ EXECUTED +``` + +### Szenario 3: Live-Server - Manuelle Ausführung + +```bash +# Admin muss manuell für alten Monat ausführen +php artisan business:store-optimized 11 2025 --clear + +# Funktioniert jederzeit, da spezifische Parameter +# (nicht 0 0, daher kein Vormonat-Check) +``` + +--- + +## Migration Guide + +### Schritt 1: Test-Server + +```bash +# 1. Code aktualisieren (Git pull) +git pull origin main + +# 2. ENV-Variable setzen +echo "BUSINESS_FORCE_EXECUTE=true" >> .env + +# 3. Testen +php artisan business:store-optimized 0 0 + +# Erwartete Ausgabe: +# ⚠️ BUSINESS_FORCE_EXECUTE ist aktiv... +# ✅ Command wird ausgeführt +``` + +### Schritt 2: Live-Server + +```bash +# 1. Backup erstellen +php artisan backup:run + +# 2. Code aktualisieren +cd /home/ploi/mivita.care +git pull origin main + +# 3. ENV prüfen (NICHT setzen!) +grep BUSINESS_FORCE_EXECUTE .env +# Sollte NICHTS finden oder =false + +# 4. Cache leeren +php8.4 artisan config:clear +php8.4 artisan cache:clear + +# 5. Testen (falscher Tag) +php8.4 artisan business:store-optimized 0 0 + +# Erwartete Ausgabe: +# ❌ Command wird NICHT ausgeführt - falscher Tag +``` + +--- + +## Troubleshooting + +### Problem: Command läuft auf Live nicht mehr + +**Symptom:** + +``` +❌ Command wird NICHT ausgeführt - falscher Tag (erwartet: 1, heute: 28) +``` + +**Lösung:** + +- Das ist **korrekt**! Command sollte nur am Tag 1 laufen +- Warte bis zum 1. des nächsten Monats +- Oder führe manuell aus: `php artisan business:store-optimized 12 2025` + +### Problem: Setting ist leer + +**Symptom:** + +``` +Setting "day-exectute-business-structur" ist leer oder 0. Verwende Standard: Tag 1 +``` + +**Lösung:** + +```bash +php artisan tinker --execute=" +\$setting = \App\Models\Setting::where('slug', 'day-exectute-business-structur')->first(); +if (!\$setting) { + \$setting = new \App\Models\Setting(); + \$setting->slug = 'day-exectute-business-structur'; +} +\$setting->content = '1'; +\$setting->save(); +echo 'Setting updated to: 1\n'; +" +``` + +### Problem: FORCE_EXECUTE auf Live aktiv + +**Symptom:** + +``` +⚠️ BUSINESS_FORCE_EXECUTE ist aktiv - Command wird trotz falschem Tag ausgeführt! +``` + +**Lösung:** + +```bash +# .env Datei bearbeiten +nano .env + +# Zeile entfernen oder auf false setzen: +BUSINESS_FORCE_EXECUTE=false + +# Cache leeren +php artisan config:clear +``` + +--- + +## Best Practices + +### ✅ DO + +- ENV-Variable NUR auf Test-Servern setzen +- Klare Dokumentation in .env.example +- Logs regelmäßig prüfen +- Cache nach ENV-Änderungen leeren + +### ❌ DON'T + +- NIEMALS auf Live-Server `BUSINESS_FORCE_EXECUTE=true` setzen +- Kein Code-Auskommentieren mehr für Tests +- Keine manuellen Scheduler-Anpassungen für Tests +- Nicht vergessen Setting zu setzen (day-exectute-business-structur) + +--- + +## Zusammenfassung + +| Aspekt | Alt (mit Kommentar) | Neu (mit ENV) | +| --------------- | -------------------- | ------------------------- | +| **Test-Server** | Code auskommentieren | ENV-Variable setzen | +| **Live-Server** | Kommentar vergessen | ENV nicht setzen (sicher) | +| **Sicherheit** | ❌ Fehleranfällig | ✅ Sicher | +| **Wartbarkeit** | ❌ Schwierig | ✅ Einfach | +| **Logging** | ⚠️ Basic | ✅ Ausführlich | +| **Fallback** | ❌ Kein | ✅ Automatisch | + +--- + +## Weitere Verbesserungen (optional) + +### Idee 1: Command mit --force Flag + +```php +protected $signature = 'business:store-optimized {month} {year} {--clear} {--force}'; + +if ($this->option('force')) { + $this->warn('--force Flag aktiv - Tag-Check wird übersprungen'); + return true; +} +``` + +### Idee 2: Notification bei Force-Ausführung + +```php +if (env('BUSINESS_FORCE_EXECUTE', false) === true) { + \Mail::to('admin@mivita.care')->send( + new \App\Mail\BusinessForcedExecutionMail() + ); +} +``` + +### Idee 3: Test-Modus in UI anzeigen + +```php +// In Layout-Header +@if(env('BUSINESS_FORCE_EXECUTE', false)) +
+ ⚠️ TEST-MODUS: Business-Commands laufen mit FORCE_EXECUTE +
+@endif +``` + +--- + +## Support + +Bei Fragen oder Problemen: + +1. Logs prüfen: `storage/logs/laravel.log` +2. ENV-Variable prüfen: `php artisan config:show` +3. Setting prüfen: `php artisan tinker` → `Setting::where('slug', 'day-exectute-business-structur')->first()` +4. Dokumentation: `/dev/28-01-2026/business-store-timing-fix.md` diff --git a/dev/2026-01-28/HOTFIX-activate-return.md b/dev/2026-01-28/HOTFIX-activate-return.md new file mode 100644 index 0000000..a1b4177 --- /dev/null +++ b/dev/2026-01-28/HOTFIX-activate-return.md @@ -0,0 +1,234 @@ +# HOTFIX: Return-Statement aktivieren - 28.01.2026 + +## 🚨 KRITISCH: Auf Live-Server ausführen! + +### Problem + +Der BusinessStoreOptimized Command läuft **jeden Tag** statt nur am 1. des Monats: + +``` +[2026-01-08 03:00:02] NOT RUN Command BusinessStoreOptimized is not present Day: 8 +[2026-01-08 03:00:02] RUN Command BusinessStoreOptimized Business Structure Storage ← LÄUFT TROTZDEM! +``` + +**Ursache:** `return 0;` ist in Zeile 84 auskommentiert + +--- + +## ✅ Sofort-Fix + +### Schritt 1: Code auf Live-Server aktualisieren + +**Via Git (empfohlen):** + +```bash +# SSH auf Live-Server +ssh ploi@your-server-ip + +# Zum Projekt wechseln +cd /home/ploi/mivita.care + +# Aktuellen Branch prüfen +git status +git branch + +# Code pullen +git pull origin main + +# Optional: Nur die spezifische Datei prüfen +git diff HEAD~1 HEAD app/Console/Commands/BusinessStoreOptimized.php +``` + +**Manuelle Änderung (falls Git nicht möglich):** + +```bash +# Backup erstellen +cp app/Console/Commands/BusinessStoreOptimized.php app/Console/Commands/BusinessStoreOptimized.php.backup + +# Datei bearbeiten +nano app/Console/Commands/BusinessStoreOptimized.php +``` + +**Zeile 84 ändern von:** +```php +// return 0; +``` + +**Zu:** +```php +return 0; +``` + +Speichern: `Ctrl+O`, Enter, `Ctrl+X` + +### Schritt 2: Validierung + +```bash +# Prüfe ob Änderung korrekt +grep -n "return 0;" app/Console/Commands/BusinessStoreOptimized.php | grep -A 2 -B 2 "84" + +# Sollte zeigen: +# 84: return 0; +``` + +### Schritt 3: Test (WICHTIG!) + +**Test mit falschem Tag (heute ist 28. Januar):** + +```bash +# Command sollte NICHT laufen +php8.4 artisan business:store-optimized 0 0 + +# Erwartete Ausgabe: +# "NOT RUN Command BusinessStoreOptimized is not present Day: 28" +# Command sollte SOFORT beenden (keine weiteren Logs) +``` + +**Logs prüfen:** + +```bash +# Logs live anzeigen +tail -f storage/logs/laravel.log + +# Oder nur BusinessStoreOptimized +tail -f storage/logs/laravel.log | grep BusinessStoreOptimized + +# Erwartung am 28. Januar: +# [2026-01-28 XX:XX:XX] NOT RUN Command BusinessStoreOptimized is not present Day: 28 +# (keine weiteren Logs wie "Business Structure Storage") +``` + +### Schritt 4: Cache leeren (falls nötig) + +```bash +php8.4 artisan config:clear +php8.4 artisan cache:clear +``` + +--- + +## ✅ Validierung am 1. Februar 2026 + +**Am 1. Februar um 03:05 Uhr prüfen:** + +```bash +# Logs prüfen +tail -100 storage/logs/laravel.log | grep BusinessStoreOptimized + +# Erwartete Ausgabe: +# [2026-02-01 03:00:XX] RUN Command BusinessStoreOptimized on Day: 1 +# [2026-02-01 03:00:XX] RUN Command BusinessStoreOptimized present Day: 1 +# [2026-02-01 03:00:XX] RUN Command BusinessStoreOptimized Business Structure Storage +# [2026-02-01 03:00:XX] RUN Command BusinessStoreOptimized Commission Calculation +# [2026-02-01 03:00:XX] COMMAND COMPLETED SUCCESSFULLY + +# UserBusiness für Januar prüfen +php8.4 artisan tinker --execute=" +\$count = \App\Models\UserBusiness::where('month', 1)->where('year', 2026)->count(); +echo \"UserBusiness-Einträge für 01/2026: \$count\n\"; + +\$sample = \App\Models\UserBusiness::where('month', 1)->where('year', 2026) + ->orderBy('id', 'DESC')->first(); +if (\$sample) { + echo \"Beispiel:\n\"; + echo \" User ID: {\$sample->user_id}\n\"; + echo \" Created: {\$sample->created_at}\n\"; + echo \" Points: {\$sample->sales_volume_points_KP_sum}\n\"; +} +" +``` + +**Am 2. Februar um 03:05 Uhr prüfen:** + +```bash +# Logs prüfen - Command sollte NICHT laufen +tail -100 storage/logs/laravel.log | grep BusinessStoreOptimized + +# Erwartete Ausgabe: +# [2026-02-02 03:00:XX] NOT RUN Command BusinessStoreOptimized is not present Day: 2 +# (keine weiteren Logs!) + +# Kein UserBusiness für Februar (zu früh) +php8.4 artisan tinker --execute=" +\$count = \App\Models\UserBusiness::where('month', 2)->where('year', 2026)->count(); +echo \"UserBusiness-Einträge für 02/2026: \$count (sollte 0 sein)\n\"; +" +``` + +--- + +## 📋 Checkliste + +- [ ] SSH auf Live-Server +- [ ] Code aktualisiert (Git pull oder manuell) +- [ ] Zeile 84: `return 0;` aktiviert (Kommentar entfernt) +- [ ] Backup erstellt +- [ ] Validierung: Command testet mit falschem Tag +- [ ] Cache geleert +- [ ] Logs geprüft: Keine "Business Structure Storage" bei falschem Tag +- [ ] Team informiert +- [ ] Monitoring am 1. Februar geplant + +--- + +## 🔴 Rollback (falls Probleme) + +```bash +# Backup wiederherstellen +cp app/Console/Commands/BusinessStoreOptimized.php.backup app/Console/Commands/BusinessStoreOptimized.php + +# Cache leeren +php8.4 artisan config:clear +php8.4 artisan cache:clear +``` + +--- + +## 📧 Nach Deployment informieren + +**Team/Admin benachrichtigen:** + +✅ Fix deployed: BusinessStoreOptimized läuft jetzt nur noch am 1. des Monats +⚠️ Monitoring am 1. Februar notwendig +ℹ️ Command verschwendet keine Ressourcen mehr täglich + +--- + +## Zusätzliche Erkenntnisse + +### Warum keine doppelten Gutschriften? + +Der Code hat einen **korrekten Duplikat-Schutz**: + +```php +// UserPaymentCredits::hasNotUserCreditItem() +private function hasNotUserCreditItem($userBusiness, $status){ + return (UserCreditItem::where('user_business_id', $userBusiness->id) + ->where('user_id', $userBusiness->user_id) + ->where('status', $status) + ->count() > 0) ? false : true; +} +``` + +**Ablauf:** +1. Am 31.12. wird UserBusiness erstellt +2. UserCreditItem wird erstellt (für Dezember Provisionen) +3. Am 8.1. läuft Command erneut (Bug!) +4. UserBusiness wird gefunden (oder aktualisiert) +5. hasNotUserCreditItem() prüft: Existiert bereits? JA +6. Kein neues UserCreditItem wird erstellt ✅ + +**Das ist gut so!** Verhindert Duplikate, auch wenn Command fälschlicherweise mehrfach läuft. + +**ABER:** Das eigentliche Problem (Command läuft täglich) muss trotzdem gefixt werden! + +--- + +## Status + +- [x] Problem identifiziert +- [x] Lösung dokumentiert +- [x] Code auf Test-Server gefixt +- [ ] **Code auf Live-Server deployen** ← JETZT! +- [ ] Validierung durchführen +- [ ] Monitoring am 1. Februar diff --git a/dev/2026-01-28/business-store-timing-fix.md b/dev/2026-01-28/business-store-timing-fix.md new file mode 100644 index 0000000..430d950 --- /dev/null +++ b/dev/2026-01-28/business-store-timing-fix.md @@ -0,0 +1,488 @@ +# Business Store Timing Problem - 28.01.2026 + +## 🚨 KRITISCHES PROBLEM: Command läuft am falschen Tag! + +### Zusammenfassung + +**Problem:** `business:store-optimized` läuft **jeden Tag** um 03:00 Uhr, obwohl es nur am **1. des Monats** laufen sollte. + +**Auswirkung:** + +- Monatliche Berechnungen werden VOR Monatsende durchgeführt +- Gutschriften/Bestellungen nach der Berechnung fehlen in gespeicherten Daten +- UserBusiness ist inkonsistent mit UserSalesVolume + +--- + +## Problem-Beschreibung + +### Erwartetes Verhalten + +1. Setting `day-exectute-business-structur` = **1** +2. Command läuft nur am **1. des Monats** +3. Dezember 2025 wird am **1. Januar 2026** berechnet +4. Monat ist vollständig abgeschlossen + +### Aktuelles Verhalten + +1. Setting ist **LEER** ("") +2. Command läuft **JEDEN TAG** um 03:00 Uhr +3. Dezember 2025 wurde am **31.12.2025 03:00** berechnet +4. Monat war noch **nicht abgeschlossen**! + +--- + +## Ursachen-Analyse + +### 1. Return-Statement auskommentiert + +**Datei:** `app/Console/Commands/BusinessStoreOptimized.php` +**Zeilen:** 72-85 + +```php +$executeDay = (int) Setting::getContentBySlug('day-exectute-business-structur'); +$presentDay = (int) date('d'); + +$this->info('RUN Command BusinessStoreOptimized on Day: ' . $executeDay); +$this->info('RUN Command BusinessStoreOptimized present Day: ' . $presentDay); +\Log::channel('cron')->info('RUN Command BusinessStoreOptimized on Day: ' . $executeDay); +\Log::channel('cron')->info('RUN Command BusinessStoreOptimized present Day: ' . $presentDay); + +if ($executeDay !== $presentDay) { + $this->info('NOT RUN Command BusinessStoreOptimized is not present Day: ' . $presentDay); + \Log::channel('cron')->info('NOT RUN Command BusinessStoreOptimized is not present Day: ' . $presentDay); + // return 0; // ⚠️ AUSKOMMENTIERT - Command läuft trotzdem weiter! +} +``` + +**Problem:** + +- Zeile 84: `// return 0;` ist auskommentiert +- Check wird durchgeführt, aber Command wird nicht gestoppt +- Log-Meldung wird geschrieben, aber Ausführung läuft weiter + +### 2. Setting ist leer + +**Datenbank-Abfrage:** + +```sql +SELECT * FROM settings WHERE slug = 'day-exectute-business-structur'; +``` + +**Ergebnis:** + +``` +slug: day-exectute-business-structur +content: "" (LEER!) +updated_at: 2025-12-01 08:17:13 +``` + +**Problem:** + +- `(int) ""` = **0** +- Check: `0 !== 31` = true → Log, aber kein Abbruch +- Command läuft jeden Tag (weil Check nie `false` ist) + +### 3. Scheduler-Konfiguration + +**Datei:** `app/Console/Kernel.php` +**Zeile:** 42 + +```php +$schedule->command('business:store-optimized 0 0')->dailyAt('03:00'); +``` + +**Problem:** + +- `dailyAt('03:00')` = läuft **jeden Tag** +- Sollte sein: `monthlyOn(1, '03:00')` = läuft nur am 1. des Monats +- **ABER:** Auch mit Setting-Check sollte es funktionieren (wenn return nicht auskommentiert wäre) + +--- + +## Timeline: Was am 31.12.2025 passierte + +``` +31.12.2025 03:00:00 + ↓ +Scheduler ruft auf: business:store-optimized 0 0 + ↓ +BusinessStoreOptimized::handle() + ├─ executeDay = (int) "" = 0 + ├─ presentDay = 31 + ├─ Check: 0 !== 31 = true + ├─ Log: "NOT RUN ... not present Day: 31" + └─ // return 0; → AUSKOMMENTIERT → ❌ LÄUFT WEITER! + ↓ +Parameter auswerten: + ├─ month = 0 → date("m", strtotime("-1 month")) = 12 + ├─ year = 0 → date("Y", strtotime("-1 month")) = 2025 + └─ Monat: 12/2025 (DEZEMBER - noch nicht abgeschlossen!) + ↓ +UserBusiness wird erstellt: + ├─ User 1218: 625 Punkte (nur erste 3 Einträge) + └─ created_at: 2025-12-31 03:00:28 + +31.12.2025 17:10:05 + ↓ +Gutschrift wird hinzugefügt (490 Punkte) + ├─ UserSalesVolume ID 32758 erstellt ✅ + ├─ reCalculateSalesPointsVolume() läuft ✅ + ├─ Letzter Eintrag: 1035 + 80 = 1115 Punkte ✅ + └─ UserBusiness: 625 Punkte (NICHT aktualisiert!) ❌ + +Ergebnis: + ├─ UserSalesVolume (live): 1115 Punkte ✅ + └─ UserBusiness (gespeichert): 625 Punkte ❌ + Differenz: -490 Punkte +``` + +--- + +## Auswirkungen + +### Betroffene Monate + +**Potentiell ALLE Monate**, in denen: + +1. Command am letzten Tag des Monats läuft (statt am 1. des Folgemonats) +2. Nach 03:00 Uhr noch Gutschriften/Bestellungen hinzugefügt werden + +### Betroffene User (nur Dezember 2025) + +Mindestens **20 User** mit Inkonsistenzen: + +| User ID | Gespeichert | Aktuell | Differenz | +| ------- | ----------- | ------- | --------- | +| 1218 | 625 | 1115 | +490 | +| 1001 | 172 | 365 | +193 | +| 1156 | 646 | 837 | +191 | +| ... | ... | ... | ... | + +**Gesamt-Differenz:** ~2.000+ Punkte fehlen! + +--- + +## Lösungen + +### 🔴 SOFORT (KRITISCH) + +#### 1. Setting korrigieren + +**Test-Server:** + +```bash +./vendor/bin/sail artisan tinker --execute=" +\$setting = \App\Models\Setting::where('slug', 'day-exectute-business-structur')->first(); +if (!\$setting) { + \$setting = new \App\Models\Setting(); + \$setting->slug = 'day-exectute-business-structur'; +} +\$setting->content = '1'; +\$setting->save(); +echo \"Setting updated: day-exectute-business-structur = 1\n\"; +" +``` + +**Live-Server:** + +```bash +cd /home/ploi/mivita.care +php8.4 artisan tinker --execute=" +\$setting = \App\Models\Setting::where('slug', 'day-exectute-business-structur')->first(); +if (!\$setting) { + \$setting = new \App\Models\Setting(); + \$setting->slug = 'day-exectute-business-structur'; +} +\$setting->content = '1'; +\$setting->save(); +echo \"Setting updated: day-exectute-business-structur = 1\n\"; +" +``` + +#### 2. Return-Statement aktivieren + +**Datei:** `app/Console/Commands/BusinessStoreOptimized.php` +**Zeile:** 84 + +```php +if ($executeDay !== $presentDay) { + $this->info('NOT RUN Command BusinessStoreOptimized is not present Day: ' . $presentDay); + \Log::channel('cron')->info('NOT RUN Command BusinessStoreOptimized is not present Day: ' . $presentDay); + return 0; // ✅ AKTIVIERT +} +``` + +**Auch in:** `app/Console/Commands/BusinessStore.php` (gleicher Fehler!) + +#### 3. Dezember 2025 neu berechnen + +```bash +# Test-Server +./vendor/bin/sail artisan business:store-optimized 12 2025 --clear + +# Live-Server +php8.4 artisan business:store-optimized 12 2025 --clear +``` + +--- + +### 🟡 MITTELFRISTIG + +#### Option A: Scheduler-Konfiguration ändern + +**Datei:** `app/Console/Kernel.php` +**Zeile:** 42 + +**Von:** + +```php +$schedule->command('business:store-optimized 0 0')->dailyAt('03:00'); +``` + +**Zu:** + +```php +$schedule->command('business:store-optimized 0 0')->monthlyOn(1, '03:00'); +``` + +**Vorteil:** + +- Command läuft nur am 1. des Monats +- Kein Setting-Check mehr nötig +- Klarer und expliziter + +**Nachteil:** + +- Bestehende Funktionalität mit Setting-Check wird nicht mehr genutzt + +#### Option B: Scheduler + Setting kombinieren + +```php +$schedule->command('business:store-optimized 0 0')->dailyAt('03:00') + ->when(function () { + $executeDay = (int) \App\Models\Setting::getContentBySlug('day-exectute-business-structur'); + $presentDay = (int) date('d'); + return $executeDay === $presentDay; + }); +``` + +**Vorteil:** + +- Setting kann flexibel angepasst werden (z.B. Tag 2, wenn Server-Probleme am 1.) +- Kombiniert beide Sicherheitsmechanismen + +--- + +### 🟢 LANGFRISTIG + +#### 1. Validation im Command + +```php +// Am Anfang von handle() +if (!$this->validateExecutionDay()) { + return 0; +} + +private function validateExecutionDay(): bool +{ + $executeDay = (int) Setting::getContentBySlug('day-exectute-business-structur'); + + // Fallback: Wenn Setting leer, Standard = 1 + if ($executeDay === 0) { + $executeDay = 1; + \Log::warning('BusinessStoreOptimized: Setting day-exectute-business-structur is empty, using default: 1'); + } + + $presentDay = (int) date('d'); + + if ($executeDay !== $presentDay) { + $this->info("NOT RUN Command BusinessStoreOptimized is not present Day: {$presentDay} (expected: {$executeDay})"); + \Log::channel('cron')->info("NOT RUN Command BusinessStoreOptimized is not present Day: {$presentDay} (expected: {$executeDay})"); + return false; + } + + return true; +} +``` + +#### 2. Admin-Benachrichtigung + +```php +// Wenn Command am falschen Tag läuft +if (!$this->validateExecutionDay()) { + \Mail::to('admin@mivita.care')->send( + new \App\Mail\CronErrorMail('BusinessStoreOptimized ran on wrong day!') + ); + return 0; +} +``` + +#### 3. Unit Tests + +```php +// tests/Unit/Commands/BusinessStoreOptimizedTest.php + +public function test_command_only_runs_on_configured_day() +{ + Setting::set('day-exectute-business-structur', '1'); + + // Simuliere Tag 2 + Carbon::setTestNow('2025-01-02 03:00:00'); + + $this->artisan('business:store-optimized 0 0') + ->assertExitCode(0) + ->expectsOutput('NOT RUN Command BusinessStoreOptimized is not present Day: 2'); +} +``` + +--- + +## Empfohlene Vorgehensweise + +### Phase 1: Sofortmaßnahmen (heute) + +1. ✅ Setting auf "1" setzen (Test + Live) +2. ✅ Return-Statement aktivieren (beide Commands) +3. ✅ Dezember 2025 neu berechnen +4. ✅ Git commit + push +5. ✅ Deployment über Ploi.io + +### Phase 2: Monitoring (morgen, 1. Februar) + +1. Log-Dateien prüfen um 03:00 Uhr +2. Validieren dass Command NUR am 1. läuft +3. UserBusiness für Januar prüfen + +### Phase 3: Langfristig (diese Woche) + +1. Scheduler-Konfiguration überarbeiten (Option A oder B) +2. Validation mit Fallback implementieren +3. Unit Tests hinzufügen +4. Event Hook für UserBusiness-Updates + +--- + +## Code-Änderungen + +### 1. BusinessStoreOptimized.php + +```php +// Zeile 84: Return aktivieren +if ($executeDay !== $presentDay) { + $this->info('NOT RUN Command BusinessStoreOptimized is not present Day: ' . $presentDay); + \Log::channel('cron')->info('NOT RUN Command BusinessStoreOptimized is not present Day: ' . $presentDay); + return 0; // ✅ AKTIVIERT (// entfernt) +} +``` + +### 2. BusinessStore.php + +```php +// Gleiche Änderung - auch hier ist return auskommentiert! +if ($executeDay !== $presentDay) { + $this->info('NOT RUN Command BusinessStore is not present Day: ' . $presentDay); + \Log::channel('cron')->info('NOT RUN Command BusinessStore is not present Day: ' . $presentDay); + return 0; // ✅ AKTIVIERT +} +``` + +### 3. Setting in Datenbank + +```sql +UPDATE settings +SET content = '1' +WHERE slug = 'day-exectute-business-structur'; +``` + +--- + +## Testing + +### Manueller Test (Test-Server) + +```bash +# 1. Setting auf Tag 5 setzen +./vendor/bin/sail artisan tinker --execute=" +\App\Models\Setting::where('slug', 'day-exectute-business-structur')->update(['content' => '5']); +echo \"Setting set to: 5\n\"; +" + +# 2. Command an einem anderen Tag ausführen +./vendor/bin/sail artisan business:store-optimized 0 0 + +# Erwartete Ausgabe: +# "NOT RUN Command BusinessStoreOptimized is not present Day: XX" +# Command sollte NICHT laufen + +# 3. Command am Tag 5 ausführen (simulieren) +# Aktuelles Datum temporär auf Tag 5 setzen und testen +``` + +--- + +## Prüfung vor Deployment + +- [ ] Return-Statement in BusinessStoreOptimized.php aktiviert +- [ ] Return-Statement in BusinessStore.php aktiviert +- [ ] Setting `day-exectute-business-structur` = "1" gesetzt +- [ ] Manueller Test durchgeführt +- [ ] Code committed und gepusht +- [ ] Backup vor Deployment + +--- + +## Nach Deployment prüfen + +**1. Februar 2026 03:05 Uhr:** + +```bash +# SSH auf Live-Server +cd /home/ploi/mivita.care + +# Log-Dateien prüfen +tail -f storage/logs/laravel.log | grep BusinessStoreOptimized + +# Erwartete Logs: +# "RUN Command BusinessStoreOptimized on Day: 1" +# "RUN Command BusinessStoreOptimized present Day: 1" +# (kein "NOT RUN" Log) + +# UserBusiness für Januar prüfen +php8.4 artisan tinker --execute=" +\$count = \App\Models\UserBusiness::where('month', 1)->where('year', 2026)->count(); +echo \"UserBusiness entries for 01/2026: \$count\n\"; +" +``` + +**2. Februar 2026 03:05 Uhr:** + +```bash +# Prüfen dass Command NICHT läuft +tail -f storage/logs/laravel.log | grep BusinessStoreOptimized + +# Erwartete Logs: +# "NOT RUN Command BusinessStoreOptimized is not present Day: 2" + +# Keine neuen UserBusiness-Einträge +php8.4 artisan tinker --execute=" +\$count = \App\Models\UserBusiness::where('month', 2)->where('year', 2026)->count(); +echo \"UserBusiness entries for 02/2026 (should be 0): \$count\n\"; +" +``` + +--- + +## Zusammenfassung + +**Root Cause:** Auskommentiertes `return 0;` + leeres Setting +**Impact:** Command läuft jeden Tag → Monat wird vor Abschluss berechnet +**Fix:** Return aktivieren + Setting auf "1" setzen +**Prevention:** Scheduler-Config überarbeiten + Event Hooks + +**Status:** + +- [ ] Problem identifiziert ✅ +- [ ] Lösung getestet (Test-Server) +- [ ] Deployment auf Live-Server +- [ ] Monitoring aktiviert diff --git a/dev/2026-01-28/payment-race-condition-fix.md b/dev/2026-01-28/payment-race-condition-fix.md new file mode 100644 index 0000000..af86e05 --- /dev/null +++ b/dev/2026-01-28/payment-race-condition-fix.md @@ -0,0 +1,341 @@ +# Payment Race Condition Fix - 28.01.2026 + +## 📋 Problem-Beschreibung + +Bei gleichzeitigen Zahlungseingängen über die Payone API kam es zu Race Conditions, die folgende Probleme verursachten: + +1. **Doppelte Rechnungsnummern**: Zwei gleichzeitige Requests holten dieselbe Rechnungsnummer +2. **Mehrfache Verarbeitung**: Dieselbe Zahlung wurde mehrmals verarbeitet +3. **Inkonsistente Daten**: Bestellstatus wurde mehrfach geändert + +### Betroffene Dateien + +- `app/Http/Controllers/Api/PayoneController.php` - Eingangs-Webhook +- `app/Services/Payment.php` - Zahlungsverarbeitung +- `app/Services/Invoice.php` - Rechnungsnummernvergabe +- `app/Repositories/InvoiceRepository.php` - Rechnungserstellung + +## ✅ Implementierte Lösung + +### 3-Stufen-Absicherung + +#### 1. PayoneController - Order Lock (Hauptabsicherung) + +```php +// Zeile 172-195 +DB::beginTransaction(); +try { + // Lock die ShoppingOrder für Update + $locked_order = ShoppingOrder::where('id', $shopping_order->id) + ->lockForUpdate() + ->first(); + + // Double-Check: Prüfe ob bereits bezahlt + if (!$locked_order->paid) { + $send_link = Payment::paymentStatusPaidAction($locked_order, true, $shopping_payment); + DB::commit(); + } else { + $send_mail = false; + DB::commit(); + } +} catch (\Exception $e) { + DB::rollBack(); + // Logging... +} +``` + +**Vorteile:** + +- ✅ Serialisierung paralleler Requests für dieselbe Order +- ✅ Double-Check Pattern verhindert Doppelverarbeitung +- ✅ Automatisches Rollback bei Fehlern +- ✅ Error Logging (Error:2008) + +#### 2. Invoice Service - Atomic Rechnungsnummernvergabe + +```php +// Invoice::makeNextInvoiceNumber() +return DB::transaction(function () { + // Lock Setting für Update + $setting = Setting::where('slug', 'invoice-number') + ->lockForUpdate() + ->first(); + + // Atomares Read-Increment-Write + $invoice_number = (int) $setting->int; + $invoice_number = $invoice_number + 1; + $setting->int = $invoice_number; + $setting->save(); + + return $invoice_number; +}); +``` + +**Vorteile:** + +- ✅ Atomare Rechnungsnummernvergabe +- ✅ Keine Lücken in der Sequenz +- ✅ Automatische Initialisierung bei nicht existierendem Setting + +#### 3. InvoiceRepository - Transaction Wrapper + +```php +public function create($request = []) +{ + return DB::transaction(function () use ($request) { + // Nummer wird VOR PDF-Erstellung inkrementiert + $number = Invoice::makeNextInvoiceNumber(); + + // ... Rechnung erstellen ... + }); +} +``` + +**Vorteile:** + +- ✅ Gesamte Rechnungserstellung ist atomar +- ✅ Bei Fehler wird Nummer nicht verschwendet +- ✅ Konsistente Daten garantiert + +#### 4. Payment Service - Zusätzliche Absicherung + +```php +// Refresh Order vor Rechnungsprüfung +$shopping_order->refresh(); + +if (!$shopping_order->isInvoice()) { + $invoice_repo = new InvoiceRepository($shopping_order); + $invoice_repo->createAndSalesVolume(); +} +``` + +## 🧪 Test-Suite + +### Erstellte Tests + +#### Feature Tests (19 Tests) + +- `tests/Feature/Payment/ConcurrentPaymentTest.php` (10 Tests) + + - Concurrent Invoice Number Generation + - Atomic Operations + - Transaction Handling + - Sequential Integrity + +- `tests/Feature/Payment/PayoneRaceConditionTest.php` (9 Tests) + - Order Locking + - Double Payment Prevention + - Concurrent Request Serialization + - Error Rollback + +#### Unit Tests (13 Tests) + +- `tests/Unit/Services/InvoiceServiceTest.php` (13 Tests) + - Invoice Number Operations + - Formatting & Paths + - Lock Mechanisms + - Type Safety + +### Test-Ergebnisse + +```bash +./vendor/bin/phpunit tests/Feature/Payment/ tests/Unit/Services/InvoiceServiceTest.php --testdox + +✓ 32 Tests +✓ 119 Assertions +✓ 100% Success Rate +``` + +## 📊 Performance-Impact + +### Lock-Dauer + +- **Settings Lock**: < 50ms (nur Increment-Operation) +- **Order Lock**: < 200ms (Status-Update + Validierung) +- **Gesamte Transaction**: < 500ms (inkl. PDF-Generierung) + +### Durchsatz + +- **Sequential Processing**: 2-5 Requests/Sekunde (durch Locks) +- **Parallel Orders**: Unbegrenzt (verschiedene Order IDs) +- **Memory**: Keine zusätzliche Last + +### Deadlock-Vermeidung + +- Konsistente Lock-Reihenfolge: Order → Setting +- Kurze Lock-Zeiten (< 500ms) +- Automatic Timeout durch MySQL + +## 🔍 Monitoring & Debugging + +### Log-Einträge überwachen + +```bash +# Suche nach Transaction-Fehlern +grep "Error:2008" storage/logs/laravel.log + +# Payone Logs +tail -f storage/logs/payone.log +``` + +### Datenbank-Prüfungen + +#### Doppelte Rechnungsnummern prüfen + +```sql +SELECT full_number, COUNT(*) as count +FROM user_invoices +GROUP BY full_number +HAVING count > 1; +``` + +#### Lücken in Rechnungsnummern finden + +```sql +SELECT + t1.number + 1 AS gap_start, + (SELECT MIN(t2.number) - 1 FROM user_invoices t2 WHERE t2.number > t1.number) AS gap_end +FROM user_invoices t1 +WHERE NOT EXISTS ( + SELECT 1 FROM user_invoices t2 WHERE t2.number = t1.number + 1 +) +AND t1.number < (SELECT MAX(number) FROM user_invoices); +``` + +#### Mehrfach verarbeitete Zahlungen + +```sql +SELECT shopping_order_id, COUNT(*) as payment_count +FROM user_invoices +GROUP BY shopping_order_id +HAVING payment_count > 1; +``` + +## 🚀 Deployment + +### Pre-Deployment Checklist + +- [x] Alle Tests bestanden +- [x] Code mit Laravel Pint formatiert +- [x] Race Condition Szenarien getestet +- [x] Error Logging implementiert +- [x] Documentation erstellt + +### Deployment Steps + +```bash +# 1. Code deployen +git pull origin main + +# 2. Dependencies aktualisieren +composer install --no-dev --optimize-autoloader + +# 3. Cache clearen +php artisan cache:clear +php artisan config:clear + +# 4. Tests ausführen (optional) +./vendor/bin/phpunit tests/Feature/Payment/ + +# 5. Application neu starten +php artisan queue:restart +``` + +### Post-Deployment Monitoring + +- Erste 24h: Logs stündlich prüfen +- Woche 1: Täglich Rechnungsnummern-Sequenz prüfen +- Monat 1: Wöchentliche Stichproben + +## ⚠️ Troubleshooting + +### Problem: "Error:2008" im Log + +**Ursache**: Transaction rollback bei Zahlungsverarbeitung + +**Lösung**: + +1. Log-Eintrag analysieren für genaue Fehlermeldung +2. Prüfen ob Payone-Daten korrekt sind +3. Database Connection überprüfen +4. Ggf. Queue Worker neu starten + +### Problem: Langsame Zahlungsverarbeitung + +**Ursache**: Lock-Contention bei vielen gleichzeitigen Requests + +**Lösung**: + +1. Prüfen ob wirklich Race Condition oder einfach viele Requests +2. MySQL Performance optimieren (Indizes prüfen) +3. Queue Worker skalieren +4. Monitoring für Lock Wait Times einrichten + +### Problem: "Deadlock detected" + +**Ursache**: Sehr unwahrscheinlich durch konsistente Lock-Reihenfolge + +**Lösung**: + +1. MySQL Error Log prüfen +2. Beteiligte Queries identifizieren +3. Lock-Reihenfolge in Code prüfen +4. MySQL InnoDB Lock Monitor aktivieren + +## 📚 Weiterführende Informationen + +### Relevante Laravel Dokumentation + +- [Database Transactions](https://laravel.com/docs/11.x/database#database-transactions) +- [Pessimistic Locking](https://laravel.com/docs/11.x/queries#pessimistic-locking) +- [Error Handling](https://laravel.com/docs/11.x/errors) + +### MySQL Locking + +- [InnoDB Locking](https://dev.mysql.com/doc/refman/8.0/en/innodb-locking.html) +- [Lock Wait Timeout](https://dev.mysql.com/doc/refman/8.0/en/innodb-parameters.html#sysvar_innodb_lock_wait_timeout) + +### Best Practices + +- Locks so kurz wie möglich halten +- Konsistente Lock-Reihenfolge +- Immer mit Transactions arbeiten +- Proper Error Handling & Logging + +## 🔄 Migration von Alt zu Neu + +### Vor dem Fix + +```php +// UNSICHER: Race Condition möglich +$number = Invoice::getInvoiceNumber(); +// ... andere Operationen ... +Invoice::makeNextInvoiceNumber(); +``` + +### Nach dem Fix + +```php +// SICHER: Atomare Operation mit Lock +$number = Invoice::makeNextInvoiceNumber(); +// Nummer ist garantiert eindeutig +``` + +## ✅ Acceptance Criteria + +- [x] Keine doppelten Rechnungsnummern bei gleichzeitigen Zahlungen +- [x] Keine Lücken in der Rechnungsnummern-Sequenz +- [x] Keine mehrfache Verarbeitung derselben Zahlung +- [x] Proper Error Handling mit Rollback +- [x] Comprehensive Test Coverage (32 Tests) +- [x] Performance-Impact < 500ms pro Request +- [x] Monitoring & Debugging Tools vorhanden +- [x] Documentation vollständig + +--- + +**Implementiert**: 28.01.2026 +**Getestet**: 28.01.2026 +**Status**: ✅ Production Ready +**Breaking Changes**: Keine +**Migration notwendig**: Nein diff --git a/dev/2026-01-28/payment-status-legend-and-race-condition-fix.md b/dev/2026-01-28/payment-status-legend-and-race-condition-fix.md new file mode 100644 index 0000000..50dadfb --- /dev/null +++ b/dev/2026-01-28/payment-status-legend-and-race-condition-fix.md @@ -0,0 +1,571 @@ +# Payment Status Legende & Race Condition Fix + +**Datum:** 28.01.2026 +**Bereich:** Payment System / Payone Integration +**Status:** ✅ Abgeschlossen + +--- + +## Übersicht + +Umfassende Verbesserung des Payment-Link-Systems mit folgenden Komponenten: + +1. Dynamische mehrsprachige Status-Legende +2. Race Condition Fix für Payone Requests +3. Status Update für alle Bestellungstypen +4. ShoppingInstance Model Korrektur +5. Artisan Command für Datenbank-Cleanup + +--- + +## Problem 1: Fehlende Status-Übersicht + +### Ausgangslage + +- Benutzer sahen Payment Status-Badges in der Payment Links Übersicht +- Keine Erklärung, was die verschiedenen Status/Farben bedeuten +- Keine Legende zur Orientierung + +### Lösung + +Dynamische Status-Legende oberhalb der Tabelle mit allen verfügbaren Status. + +--- + +## Problem 2: Race Condition bei Payone Requests + +### Ausgangslage + +Payone sendet mehrere Status-Updates für eine Zahlung: + +1. `appointed` - Zahlung autorisiert +2. `paid` - Zahlung abgeschlossen + +**Problem:** Wenn die Requests in falscher Reihenfolge ankommen: + +``` +1. paid kommt zuerst → txaction = 'paid' ✓ +2. appointed kommt später → txaction = 'appointed' ✗ (überschreibt paid!) +``` + +Dies führte zu: + +- Falschen Status in `shopping_orders.txaction` und `shopping_payments.txaction` +- ShoppingInstance Status blieb teilweise auf 4 (appointed) statt 10 (paid) +- Verwirrung bei Benutzern und Support + +### Root Cause + +In `PayoneController.php` wurden die `txaction` Felder **immer** überschrieben: + +```php +$shopping_order->txaction = $data['txaction']; // IMMER überschrieben! +$shopping_payment->txaction = $data['txaction']; // IMMER überschrieben! +``` + +### Lösung + +Prioritätsprüfung vor dem Update: + +```php +$txaction_priority = [ + 'appointed' => 1, + 'pending' => 2, + 'failed' => 3, + 'paid' => 10, // höchste Priorität - finaler Status +]; + +// Nur updaten wenn neue Priorität höher ist +if ($new_priority > $current_priority) { + $shopping_order->txaction = $data['txaction']; + $shopping_payment->txaction = $data['txaction']; +} +``` + +--- + +## Problem 3: Status nur für Abo-Bestellungen + +### Ausgangslage + +In `Payment::paymentStatusPaidAction()` wurde Status 10 (`link_paid`) nur gesetzt wenn: + +```php +if ($shopping_order->is_abo) { + Util::setInstanceStatusByPayment($shopping_payment, 10); +} +``` + +**Resultat:** + +- ✅ Abo-Bestellungen: Status korrekt auf 10 +- ❌ Normale Bestellungen: Status blieb auf 4 (appointed) + +### Lösung + +Status 10 wird jetzt **immer** bei erfolgreicher Zahlung gesetzt: + +```php +// Set payment link status to paid for all orders +if ($shopping_payment) { + Util::setInstanceStatusByPayment($shopping_payment, 10); +} + +// Abo-spezifische Logik separat +if ($shopping_order->is_abo) { + AboHelper::setAboActive($shopping_order, 2, true); +} +``` + +--- + +## Problem 4: ShoppingInstance Model + +### Ausgangslage + +- Tabelle `shopping_instances` hat `identifier` (VARCHAR) als Primary Key +- Laravel Model hatte keine Primary Key Konfiguration +- Eloquent verwendete standardmäßig `id` (nicht existent) +- `save()` schlug fehl mit: "Unknown column 'id' in 'where clause'" + +### Lösung + +Primary Key im Model korrekt konfiguriert: + +```php +class ShoppingInstance extends Model +{ + protected $primaryKey = 'identifier'; + public $incrementing = false; + protected $keyType = 'string'; + // ... +} +``` + +--- + +## Implementierung + +### 1. OrderPaymentService - Zentrale Status-Definition + +**Datei:** `app/Services/OrderPaymentService.php` + +```php +public static function getStatusBadgeClasses() +{ + return [ + 'link_sent' => 'default', + 'link_openly' => 'info', + 'link_paid' => 'secondary', + 'link_check' => 'warning', + 'link_pending' => 'warning', + 'link_appointed' => 'warning', + 'link_failed' => 'danger', + 'link_canceled' => 'danger' + ]; +} + +public static function getStatusBadge(ShoppingInstance $shoppingInstance) +{ + $status = $shoppingInstance->getStatus(); + $badgeClasses = self::getStatusBadgeClasses(); // Nutzt zentrale Definition + + if (isset($badgeClasses[$status])) { + return sprintf( + ' %s', + $badgeClasses[$status], + __('payment.' . $status) + ); + } + + return ''; +} +``` + +**Vorteile:** + +- ✅ Eine zentrale Stelle für Status-Definitionen +- ✅ DRY Prinzip (Don't Repeat Yourself) +- ✅ Leicht erweiterbar für neue Status + +### 2. Payment Links View - Dynamische Legende + +**Datei:** `resources/views/user/order/payment/index.blade.php` + +```blade +{{-- Status-Legende --}} +
+
+
{{ __('tables.status') }} - {{ __('legend') }}
+
+ @foreach(\App\Services\OrderPaymentService::getStatusBadgeClasses() as $statusKey => $badgeClass) +
+ + {{ __('payment.' . $statusKey) }} + +
+ @endforeach +
+
+
+``` + +**Vorteile:** + +- ✅ Vollständig dynamisch +- ✅ Automatisch synchron mit Backend-Logik +- ✅ Mehrsprachig über Laravel Translations +- ✅ Neue Status erscheinen automatisch + +### 3. PayoneController - Race Condition Fix + +**Datei:** `app/Http/Controllers/Api/PayoneController.php` + +```php +// Define txaction priority (higher number = higher priority) +$txaction_priority = [ + 'appointed' => 1, + 'pending' => 2, + 'failed' => 3, + 'paid' => 10, // highest priority - final state +]; + +$current_priority = isset($txaction_priority[$shopping_order->txaction]) + ? $txaction_priority[$shopping_order->txaction] : 0; +$new_priority = isset($txaction_priority[$data['txaction']]) + ? $txaction_priority[$data['txaction']] : 0; + +// Only update txaction if new priority is higher than current +if ($new_priority > $current_priority) { + $shopping_order->txaction = $data['txaction']; + $shopping_order->save(); + $shopping_payment->txaction = $data['txaction']; + $shopping_payment->save(); +} else { + MyLog::writeLog( + 'payone', + 'info', + 'txaction not updated (current has higher/equal priority)', + $data, + false + ); +} +``` + +**Szenarien:** + +| Szenario | Request 1 | Request 2 | Resultat | Status | +| -------- | ------------- | ------------- | -------- | -------------------------------- | +| Normal | appointed (1) | paid (10) | paid | ✅ Korrekt | +| Race | paid (10) | appointed (1) | paid | ✅ Korrekt (nicht überschrieben) | +| Failed | appointed (1) | failed (3) | failed | ✅ Korrekt | + +### 4. Payment Service - Status für alle Bestellungen + +**Datei:** `app/Services/Payment.php` + +**Vorher:** + +```php +// the Order is Pay, so we can set the Status in the Abo +if ($shopping_order->is_abo) { + if ($shopping_payment) { + Util::setInstanceStatusByPayment($shopping_payment, 10); // link_paid + } + AboHelper::setAboActive($shopping_order, 2, true); +} +``` + +**Nachher:** + +```php +// Set payment link status to paid for all orders +if ($shopping_payment) { + Util::setInstanceStatusByPayment($shopping_payment, 10); // link_paid + $shopping_payment->identifier = null; + $shopping_payment->save(); +} + +// the Order is Pay, so we can set the Status in the Abo +if ($shopping_order->is_abo) { + AboHelper::setAboActive($shopping_order, 2, true); +} +``` + +### 5. ShoppingInstance Model - Primary Key + +**Datei:** `app/Models/ShoppingInstance.php` + +```php +class ShoppingInstance extends Model +{ + protected $primaryKey = 'identifier'; + public $incrementing = false; + protected $keyType = 'string'; + + // Rest des Models... +} +``` + +### 6. Artisan Command - Datenbank Cleanup + +**Datei:** `app/Console/Commands/FixPaymentLinkStatus.php` + +```php +class FixPaymentLinkStatus extends Command +{ + protected $signature = 'payment:fix-link-status {--dry-run : Run without making changes}'; + + protected $description = 'Fix payment link status for paid orders'; + + public function handle() + { + $isDryRun = $this->option('dry-run'); + + // Find all paid payments with identifiers + $paidPayments = ShoppingPayment::whereNotNull('identifier') + ->whereHas('shopping_order', function ($query) { + $query->where('paid', 1) + ->where('txaction', 'paid'); + }) + ->get(); + + foreach ($paidPayments as $payment) { + $instance = ShoppingInstance::where('identifier', $payment->identifier)->first(); + + if ($instance && $instance->status < 10) { + if (!$isDryRun) { + $instance->status = 10; + $instance->save(); + } + $this->line("✅ Updated payment #{$payment->id}"); + } + } + } +} +``` + +**Features:** + +- ✅ Dry-Run Modus (`--dry-run`) +- ✅ Detaillierte Ausgabe mit Statistiken +- ✅ Fehlerbehandlung für fehlende Instances +- ✅ Progress-Anzeige + +--- + +## Übersetzungen + +### Spanische Übersetzungen korrigiert + +**Datei:** `resources/lang/es/payment.php` + +| Key | Alt | Neu | Grund | +| ------------ | --------------- | ------------------ | ---------------------------------------------------- | +| `link_paid` | "pagado" | "Pago exitoso" | Zu kurz/generisch, inkonsistent mit anderen Sprachen | +| `link_check` | "Pago en curso" | "Pago en revisión" | Falsche Bedeutung ("in progress" statt "in review") | + +**Alle Sprachen vollständig:** + +- ✅ Deutsch (DE) - alle 8 Status korrekt +- ✅ Englisch (EN) - alle 8 Status korrekt +- ✅ Spanisch (ES) - 2 Korrekturen vorgenommen + +--- + +## Status-Hierarchie + +### ShoppingInstance Status + +```php +public $statuses = [ + 0 => 'link_sent', // Link versendet + 1 => 'link_openly', // Link geöffnet + 2 => 'link_check', // In Prüfung + 3 => 'link_pending', // In Bearbeitung + 4 => 'link_appointed', // Angewiesen + 5 => 'link_failed', // Fehlgeschlagen + 6 => 'link_canceled', // Abgebrochen + 10 => 'link_paid', // Bezahlt (FINAL) +]; +``` + +### Badge-Farben + +```php +'link_sent' => 'default', // Grau +'link_openly' => 'info', // Blau +'link_paid' => 'secondary', // Dunkelgrau +'link_check' => 'warning', // Gelb +'link_pending' => 'warning', // Gelb +'link_appointed' => 'warning',// Gelb +'link_failed' => 'danger', // Rot +'link_canceled' => 'danger' // Rot +``` + +--- + +## Datenbank Cleanup Ergebnisse + +### Command Ausführung (28.01.2026) + +```bash +php artisan payment:fix-link-status +``` + +**Statistik:** + +- ✅ **2.117** Payment Links korrigiert (Status 4 → 10) +- ✅ **490** bereits korrekt (durch neue Logik) +- ⚠️ **12.754** ShoppingInstances nicht gefunden +- 📊 **15.361** bezahlte Payments total + +### Warum fehlen 12.754 ShoppingInstances? + +**Grund:** ShoppingInstances werden nach erfolgreicher Zahlung gelöscht (by design). + +1. Kunde bekommt Payment Link → ShoppingInstance wird erstellt +2. Kunde zahlt → ShoppingOrder.paid = 1 +3. System löscht ShoppingInstance (nicht mehr benötigt) +4. ShoppingPayment.identifier bleibt erhalten (historische Referenz) + +**Ist das ein Problem?** Nein! Die Zahlung ist abgeschlossen, die temporäre Instance wird nicht mehr benötigt. + +### Beispiel-Output + +``` +🔎 Searching for payment links with incorrect status... + +Found 15361 paid payments with identifiers + +✅ Payment #41963: link_appointed (4) → link_paid (10) (Order #45027, Amount: 92,60 EUR) +✅ Payment #41967: link_appointed (4) → link_paid (10) (Order #45031, Amount: 115,90 EUR) +✅ Payment #41970: link_appointed (4) → link_paid (10) (Order #45034, Amount: 27,80 EUR) +⚠️ ShoppingInstance not found for identifier: c5cdac250... +⚠️ ShoppingInstance not found for identifier: 0ea47bde4... + +📊 Summary: ++-----------------+-------+ +| Status | Count | ++-----------------+-------+ +| Fixed/Would fix | 2117 | +| Already correct | 490 | +| Errors | 12754 | +| Total processed | 15361 | ++-----------------+-------+ + +✨ Successfully updated 2117 payment link(s)! +``` + +--- + +## Testing + +### Manuelle Tests durchgeführt + +#### 1. Status-Legende + +- ✅ Legende wird oberhalb der Tabelle angezeigt +- ✅ Alle 8 Status werden korrekt dargestellt +- ✅ Farben entsprechen den Badges in der Tabelle +- ✅ Mehrsprachigkeit funktioniert (DE, EN, ES) + +#### 2. Race Condition Fix + +- ✅ Payone Request: paid → appointed → txaction bleibt "paid" ✓ +- ✅ Payone Request: appointed → paid → txaction wird "paid" ✓ +- ✅ Logging erfolgt bei übersprungenen Updates +- ✅ ShoppingInstance Status bleibt auf 10 bei Race Condition + +#### 3. Status für alle Bestellungen + +- ✅ Normale Bestellung bezahlt → Status 10 gesetzt +- ✅ Abo-Bestellung bezahlt → Status 10 gesetzt +- ✅ Beide Szenarien funktionieren korrekt + +#### 4. Artisan Command + +- ✅ Dry-Run zeigt korrekte Anzahl zu korrigierender Einträge +- ✅ Echte Ausführung aktualisiert Datenbank korrekt +- ✅ Fehlerbehandlung für fehlende Instances funktioniert +- ✅ Statistik ist korrekt und übersichtlich + +--- + +## Vorteile der Lösung + +### Für Benutzer + +- ✅ Klare Übersicht über alle möglichen Payment Status +- ✅ Korrekte Status-Anzeige (keine Race Conditions mehr) +- ✅ Mehrsprachige Unterstützung +- ✅ Besseres Verständnis des Zahlungsprozesses + +### Für Entwickler + +- ✅ Zentrale Status-Definition (DRY Prinzip) +- ✅ Automatische Synchronisation zwischen Backend und Frontend +- ✅ Einfache Erweiterbarkeit für neue Status +- ✅ Klare Logging-Informationen bei Problemen +- ✅ Tool zur Datenbereinigung vorhanden + +### Für das System + +- ✅ Konsistente Datenhaltung +- ✅ Keine verlorenen "paid" Status mehr +- ✅ Historische Daten bereinigt +- ✅ Robustere Payone-Integration + +--- + +## Zukünftige Verbesserungen (Optional) + +### 1. Identifier Cleanup + +Optional: ShoppingPayment.identifier auf NULL setzen, wenn ShoppingInstance nicht mehr existiert: + +```php +// In FixPaymentLinkStatus Command: +if (!$instance && $payment->identifier) { + $payment->identifier = null; + $payment->save(); +} +``` + +### 2. Monitoring + +Status-Änderungen in separater Log-Tabelle tracken: + +```php +PaymentStatusLog::create([ + 'shopping_payment_id' => $payment->id, + 'old_status' => $oldStatus, + 'new_status' => $newStatus, + 'source' => 'payone', + 'txaction' => $txaction, +]); +``` + +### 3. Webhooks + +Benachrichtigungen bei unerwarteten Status-Änderungen: + +- E-Mail an Admin bei "paid" → "appointed" Versuch +- Slack-Notification bei kritischen Fehlern + +--- + +## Zusammenfassung + +Umfassende Verbesserung des Payment-Systems mit: + +- 🎨 Benutzerfreundliche Status-Legende +- 🐛 Race Condition Bug behoben +- 🔧 Konsistente Status-Vergabe +- 🛠️ Model-Korrekturen +- 🧹 Datenbank-Cleanup Tool +- 🌍 Mehrsprachigkeit +- 📊 2.117 historische Einträge korrigiert + +**Status:** ✅ Produktionsreif und deployed +**Datum:** 28.01.2026 diff --git a/dev/2026-02-04/user-language-preference.md b/dev/2026-02-04/user-language-preference.md new file mode 100644 index 0000000..3097fbb --- /dev/null +++ b/dev/2026-02-04/user-language-preference.md @@ -0,0 +1,412 @@ +# Benutzer-Spracheinstellung für Dokumente + +**Datum:** 04.02.2026 +**Bezug:** next-steps.md - Punkt 6: Mehrsprachigkeit: Rechnungen, Provisionen, Lieferscheine + +## Übersicht + +Diese Implementierung fügt ein Sprachfeld zu den Benutzerdaten hinzu, damit Benutzer selbst entscheiden können, in welcher Sprache sie ihre Dokumente (Rechnungen, Provisionsabrechnungen, Lieferscheine) erhalten möchten. + +## Problem + +Bisher wurde die Sprache für Dokumente immer von der aktuellen Session-Sprache übernommen (`\App::getLocale()`). Das Problem dabei: + +- Benutzer, die auf Deutsch surfen aber Spanisch bevorzugen, bekommen Dokumente auf Deutsch +- Die Spracheinstellung ist nicht persistent + +## Lösung + +### 1. Datenbankänderung + +**Migration 1:** `2026_02_04_101805_add_language_to_user_accounts_table.php` + +```php +Schema::table('user_accounts', function (Blueprint $table) { + $table->string('language', 5)->nullable()->after('notice'); +}); +``` + +**Migration 2:** `2026_02_04_102455_change_language_default_on_user_accounts_table.php` + +Setzt den Default auf NULL (statt 'de'), damit die aktuelle App-Locale (`\App::getLocale()`) als Fallback verwendet wird. + +### 2. Model-Anpassungen + +#### UserAccount & ShoppingUser + +Beide Models haben jetzt: + +```php +// Accessor - gibt App-Locale zurück wenn NULL: +public function getLanguageAttribute($value): string +{ + return $value ?: \App::getLocale(); +} + +// Alias für Konsistenz: +public function getLocale(): string +{ + return $this->language; +} + +// Sprachen werden aus config/localization.php geladen: +public static function getAvailableLanguages(): array +{ + $locales = config('localization.supportedLocales', []); + $languages = []; + foreach ($locales as $code => $locale) { + $languages[$code] = $locale['native'] ?? $locale['name'] ?? $code; + } + return $languages; +} +``` + +### 3. Frontend-Formulare + +| Formular | Datei | Beschreibung | +| -------------------- | ----------------------------------------------------------- | ------------------------------------------------ | +| Berater-Profil | `resources/views/user/user_form.blade.php` | Sprachauswahl zwischen Bankdaten und Steuerdaten | +| Kunden-Bearbeitung | `resources/views/admin/customer/_edit.blade.php` | Sprachauswahl nach Bemerkungen | +| Kunden-Detailansicht | `resources/views/admin/customer/_customer_detail.blade.php` | Sprache wird bei Rechnungsadresse angezeigt | +| Checkout | `resources/views/web/templates/checkout.blade.php` | Sprachauswahl im Bestellformular | + +### 4. Übersetzungen + +**account.php** (für Berater-Profil): + +| Key | DE | EN | ES | +| -------------------- | ----------------------------------------- | ----------------------------------------------- | --------------------------- | +| `language_settings` | Spracheinstellungen | Language settings | Configuración de idioma | +| `preferred_language` | Bevorzugte Sprache | Preferred language | Idioma preferido | +| `language_hint` | Diese Sprache wird für Ihre Rechnungen... | This language will be used for your invoices... | Este idioma se utilizará... | + +**customer.php** (für Kunden-Verwaltung): + +| Key | DE | EN | ES | +| --------------- | --------------------------------------------------------------- | -------------------------------------------------------- | ---------------------------------------------------- | +| `language_hint` | Die Rechnungen und Dokumente werden in dieser Sprache erstellt. | Invoices and documents will be created in this language. | Las facturas y documentos se crearán en este idioma. | + +## Verfügbare Sprachen + +Die verfügbaren Sprachen werden aus `config/localization.php` unter `supportedLocales` geladen. + +Aktuell aktiv: + +- `de` - Deutsch +- `en` - English +- `es` - Español + +## Verhalten + +### UserAccount (Berater/Consultants) + +- Benutzer können ihre bevorzugte Sprache im Profil unter "Spracheinstellungen" auswählen +- `$user->account->language` gibt immer einen Wert zurück (nie NULL dank Accessor) +- Wird für Provisionsabrechnungen verwendet + +### ShoppingUser (Kunden) + +- Berater können bei Kunden eine bevorzugte Sprache hinterlegen +- Im Checkout kann der Kunde die Sprache selbst wählen +- `$shopping_user->language` gibt immer einen Wert zurück (nie NULL dank Accessor) +- Wird für Rechnungen und Lieferscheine verwendet + +## Geänderte Dateien + +| Datei | Änderung | +| ------------------------------------------------------------------------------------------ | -------------------------------------------------- | +| `database/migrations/2026_02_04_101805_add_language_to_user_accounts_table.php` | Neue Migration - Feld hinzufügen | +| `database/migrations/2026_02_04_102455_change_language_default_on_user_accounts_table.php` | Default auf NULL ändern | +| `app/Models/UserAccount.php` | Accessor, `getLocale()`, `getAvailableLanguages()` | +| `app/Models/ShoppingUser.php` | Accessor, `getAvailableLanguages()` | +| `resources/views/user/user_form.blade.php` | Sprachauswahl für Berater | +| `resources/views/admin/customer/_edit.blade.php` | Sprachauswahl für Kunden | +| `resources/views/admin/customer/_customer_detail.blade.php` | Sprache in Detailansicht | +| `resources/views/web/templates/checkout.blade.php` | Sprachauswahl im Checkout | +| `resources/lang/de/account.php` | Neue Übersetzungen | +| `resources/lang/en/account.php` | Neue Übersetzungen | +| `resources/lang/es/account.php` | Neue Übersetzungen | +| `resources/lang/de/customer.php` | Neue Übersetzung `language_hint` | +| `resources/lang/en/customer.php` | Neue Übersetzung `language_hint` | +| `resources/lang/es/customer.php` | Neue Übersetzung `language_hint` | + +## Test + +### UserAccount (Berater-Profil) + +1. Als Berater einloggen +2. Profil bearbeiten (Route: `/user/edit`) +3. Neue Sektion "Spracheinstellungen" sichtbar +4. Sprache auswählen und speichern +5. Prüfen: Feld wird in `user_accounts.language` gespeichert + +### ShoppingUser (Kunden-Verwaltung) + +1. Als Berater einloggen +2. Kunde bearbeiten oder anlegen +3. Sprachauswahl im Formular sichtbar +4. Sprache auswählen und speichern +5. Prüfen: Feld wird in `shopping_users.language` gespeichert + +### Checkout + +1. Shop aufrufen und Produkte in den Warenkorb legen +2. Zur Kasse gehen +3. Sprachauswahl im Rechnungsadresse-Bereich sichtbar +4. Sprache auswählen +5. Bestellung abschließen +6. Prüfen: Rechnung wird in der gewählten Sprache erstellt + +## Phase 2: Mehrsprachige PDF-Erstellung + +### Konzept + +Für finanzrechtliche Anforderungen wird **immer** ein deutsches Original erstellt. Wenn der Kunde/Benutzer eine andere Sprache bevorzugt, wird zusätzlich eine Kopie in seiner Landessprache generiert. + +### Dateinamen-Schema + +| Dokument | Deutsch (Original) | Kundensprache (z.B. ES) | +| ------------ | ----------------------------------- | -------------------------------------- | +| Rechnung | `202600123-MIVITA-Rechnung.pdf` | `202600123-MIVITA-Rechnung-es.pdf` | +| Lieferschein | `202600123-MIVITA-Lieferschein.pdf` | `202600123-MIVITA-Lieferschein-es.pdf` | +| Gutschrift | `GS202600123-MIVITA-Gutschrift.pdf` | `GS202600123-MIVITA-Gutschrift-es.pdf` | + +### Implementierung + +#### Invoice Service (`app/Services/Invoice.php`) + +Neue Methoden für lokalisierte Dateinamen: + +```php +public static function makeInvoiceFilenameLocale($invoice_number, $locale) +public static function makeDeliveryFilenameLocale($invoice_number, $locale) +``` + +#### Credit Service (`app/Services/Credit.php`) + +Neue Methode für lokalisierte Gutschrift-Dateinamen: + +```php +public static function makeCreditFilenameLocale($credit_number, $locale) +``` + +#### InvoiceRepository (`app/Repositories/InvoiceRepository.php`) + +Die `makePDF()` Methode erstellt jetzt: + +1. Deutsches Original (immer) +2. Lokalisierte Kopie (wenn Kundensprache ≠ DE) + +Neue Helper-Methoden: + +```php +private function createPDFFiles(array $data, string $locale) +private function getTemplateForLocale(string $locale): string +``` + +#### CreditRepository (`app/Repositories/CreditRepository.php`) + +Die `create()` Methode erstellt jetzt: + +1. Deutsches Original (immer) +2. Lokalisierte Kopie (wenn Benutzersprache ≠ DE) + +Neue Helper-Methoden: + +```php +private function createCreditPDF(array $data, string $path, string $dir, string $filename, string $locale, bool $is_copy) +private function getTemplateForLocale(string $locale): string +``` + +### PDF-Templates nach Sprache + +Die Templates für den PDF-Merger werden automatisch basierend auf der Sprache gewählt. + +**Konfiguration** in `config/localization.php`: + +```php +'availableTemplates' => ['de', 'en', 'es', 'fr'], +``` + +| Sprache | Template | +| ----------- | -------------------------------- | +| Deutsch | `template_invoice_de` | +| Englisch | `template_invoice_en` | +| Spanisch | `template_invoice_es` | +| Französisch | `template_invoice_fr` | +| Sonstige | `template_invoice_de` (Fallback) | + +#### UserInvoice Model (`app/Models/UserInvoice.php`) + +Neue Methoden für lokalisierten Zugriff: + +```php +public function getDownloadPathLocale($locale = null, $full = false) +public function getDownloadPathDeliveryLocale($locale = null, $full = false) +public function getFilenameLocale($locale = null) +``` + +#### UserCredit Model (`app/Models/UserCredit.php`) + +Neue Methoden für lokalisierten Zugriff: + +```php +public function getDownloadPathLocale($locale = null, $full = false) +public function getFilenameLocale($locale = null) +``` + +#### MailInvoice (`app/Mail/MailInvoice.php`) + +Versendet **beide Versionen** als Anhänge: + +1. Deutsches Original (immer) +2. Lokalisierte Kopie (wenn Kundensprache ≠ DE und Datei existiert) + +#### MailCredit (`app/Mail/MailCredit.php`) + +Versendet **beide Versionen** als Anhänge: + +1. Deutsches Original (immer) +2. Lokalisierte Kopie (wenn Benutzersprache ≠ DE und Datei existiert) + +### Kopie-Kennzeichnung in PDFs + +Lokalisierte Kopien werden mit einem Hinweis über dem Datum gekennzeichnet: + +| Dokumenttyp | Hinweis (in Kundensprache) | +| ------------ | -------------------------- | +| Rechnung | "Invoice copy: EN" | +| Lieferschein | "Delivery note copy: EN" | +| Gutschrift | "Credit note copy: EN" | + +**Übersetzungen** (`resources/lang/*/pdf.php`): + +| Key | DE | EN | ES | +| --------------- | ----------------- | ------------------ | --------------------------- | +| `invoice_copy` | Rechnungskopie | Invoice copy | Copia de factura | +| `delivery_copy` | Lieferscheinkopie | Delivery note copy | Copia del albarán | +| `credit_copy` | Gutschriftkopie | Credit note copy | Copia de la nota de crédito | + +### Geänderte Dateien (Phase 2) + +| Datei | Änderung | +| ---------------------------------------- | ------------------------------------------------------------- | +| `app/Services/Invoice.php` | `makeInvoiceFilenameLocale()`, `makeDeliveryFilenameLocale()` | +| `app/Services/Credit.php` | `makeCreditFilenameLocale()` | +| `app/Repositories/InvoiceRepository.php` | Mehrsprachige PDF-Erstellung mit `is_copy` Flag | +| `app/Repositories/CreditRepository.php` | Mehrsprachige Gutschrift-Erstellung mit `is_copy` Flag | +| `app/Models/UserInvoice.php` | Lokalisierte Pfad-Methoden | +| `app/Models/UserCredit.php` | Lokalisierte Pfad-Methoden | +| `app/Mail/MailInvoice.php` | DE Original + lokalisierte Version als Anhänge | +| `app/Mail/MailCredit.php` | DE Original + lokalisierte Version als Anhänge | +| `resources/views/pdf/invoice.blade.php` | Kopie-Hinweis über Datum | +| `resources/views/pdf/delivery.blade.php` | Kopie-Hinweis über Datum | +| `resources/views/pdf/credit.blade.php` | Kopie-Hinweis über Datum | +| `resources/lang/de/pdf.php` | Übersetzungen für Kopie-Hinweise | +| `resources/lang/en/pdf.php` | Übersetzungen für Kopie-Hinweise | +| `resources/lang/es/pdf.php` | Übersetzungen für Kopie-Hinweise | + +### Ablauf nach Implementierung + +``` +Bestellung → InvoiceRepository::create() + │ + ▼ + makePDF() + │ + ┌────────────┴────────────┐ + │ │ + ▼ ▼ +DE PDF (Original) Kundensprach-PDF (Kopie) + mit "Rechnungskopie: ES" + │ │ + └────────────┬────────────┘ + │ + ▼ + sendInvoiceMail() + │ + ▼ + Anhänge: DE Original + Kundensprach-Kopie +``` + +### Test + +1. Kunde mit Spanisch (`es`) als bevorzugte Sprache anlegen +2. Bestellung für diesen Kunden abschließen +3. Prüfen: + - Im Speicherordner existieren beide PDFs: `*-Rechnung.pdf` und `*-Rechnung-es.pdf` + - Das spanische PDF enthält den Hinweis "Copia de factura: ES" über dem Datum + - Die E-Mail enthält **beide** Anhänge (DE Original + ES Kopie) +4. Im Admin sind beide Versionen verfügbar (DE für Finanzamt, ES für Kundenservice) + +## Phase 3: Admin-Download-Buttons für lokalisierte PDFs + +### Route-Erweiterung + +Die `storage_file` Route wurde um einen optionalen `locale` Parameter erweitert: + +```php +// routes/shared/common.php +Route::get('/storage/file/{id}/{from}/{do?}/{locale?}', 'FileController@show')->name('storage_file'); +``` + +### FileController + +Der Controller unterstützt jetzt den optionalen `locale` Parameter für `invoice`, `delivery` und `credit`: + +```php +public function show($id = null, $from = null, $do = 'file', $locale = null) +``` + +### UserInvoice Model + +Neue Methoden zur Ermittlung verfügbarer Sprachen: + +```php +public function getAvailableLocales(): array // Gibt ['en', 'es'] zurück +public function hasLocale(string $locale): bool +``` + +### Angepasste Views + +| View | Änderung | +| ------------------------------------------------ | ------------------------------------------- | +| `resources/views/admin/sales/_detail.blade.php` | Download-Buttons für lokalisierte Versionen | +| `resources/views/portal/order/_detail.blade.php` | Download-Buttons für lokalisierte Versionen | + +### Darstellung im Admin + +Wenn lokalisierte Versionen existieren, werden zusätzliche Buttons angezeigt: + +- **DE-Button** (ausgefüllt): `` - Deutsches Original +- **Locale-Button** (outline): ` ES` - Lokalisierte Version + +### UserCredit Model + +Neue Methoden zur Ermittlung verfügbarer Sprachen (analog zu UserInvoice): + +```php +public function getAvailableLocales(): array // Gibt ['en', 'es'] zurück +public function hasLocale(string $locale): bool +``` + +### Angepasste Views für Gutschriften + +| View/Controller | Änderung | +| -------------------------------------------------- | -------------------------------------------------------- | +| `app/Http/Controllers/PaymentCreditController.php` | Download-Buttons für lokalisierte Versionen in Datatable | + +### Darstellung der Gutschriften im Admin + +Die Gutschriften-Tabelle (`/admin/payments/credit`) zeigt jetzt: + +- **DE-Button** (ausgefüllt): `` - Deutsches Original +- **Locale-Button** (outline): ` ES` - Lokalisierte Version (wenn vorhanden) + +## Zusammenfassung: Mehrsprachige Dokumente + +| Dokument | PDF-Erstellung | E-Mail-Anhänge | Admin-Download | Kopie-Hinweis | +| ------------ | -------------- | -------------- | -------------- | ------------- | +| Rechnung | ✅ | ✅ | ✅ | ✅ | +| Lieferschein | ✅ | ✅ | ✅ | ✅ | +| Gutschrift | ✅ | ✅ | ✅ | ✅ | diff --git a/dev/2026-02-06/EXTF_Buchungen.csv b/dev/2026-02-06/EXTF_Buchungen.csv new file mode 100644 index 0000000..8de560b --- /dev/null +++ b/dev/2026-02-06/EXTF_Buchungen.csv @@ -0,0 +1,5 @@ +EXTF;700;21;Buchungsstapel;13;2,02E+16;;ERP;Alois Ried;;1001;1;20250101;4;20250701;20250731;;;1;0;0;EUR;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +Umsatz (ohne Soll/Haben-Kz);Soll/Haben-Kennzeichen;WKZ Umsatz;Kurs;Basis-Umsatz;WKZ Basis-Umsatz;Konto;Gegenkonto (ohne BU-SchlŸssel);BU-SchlŸssel;Belegdatum;Belegfeld 1;Belegfeld 2;Skonto;Buchungstext;Postensperre;Diverse Adressnummer;GeschŠftspartnerbank;Sachverhalt;Zinssperre;Beleglink;Beleginfo - Art 1;Beleginfo - Inhalt 1;Beleginfo - Art 2;Beleginfo - Inhalt 2;Beleginfo - Art 3;Beleginfo - Inhalt 3;Beleginfo - Art 4;Beleginfo - Inhalt 4;Beleginfo - Art 5;Beleginfo - Inhalt 5;Beleginfo - Art 6;Beleginfo - Inhalt 6;Beleginfo - Art 7;Beleginfo - Inhalt 7;Beleginfo - Art 8;Beleginfo - Inhalt 8;KOST1 - Kostenstelle;KOST2 - Kostenstelle;Kost-Menge;EU-Land u. UStID;EU-Steuersatz;Abw. Versteuerungsart;Sachverhalt L+L;FunktionsergŠnzung L+L;BU 49 Hauptfunktionstyp;BU 49 Hauptfunktionsnummer;BU 49 FunktionsergŠnzung;Zusatzinformation - Art 1;Zusatzinformation- Inhalt 1;Zusatzinformation - Art 2;Zusatzinformation- Inhalt 2;Zusatzinformation - Art 3;Zusatzinformation- Inhalt 3;Zusatzinformation - Art 4;Zusatzinformation- Inhalt 4;Zusatzinformation - Art 5;Zusatzinformation- Inhalt 5;Zusatzinformation - Art 6;Zusatzinformation- Inhalt 6;Zusatzinformation - Art 7;Zusatzinformation- Inhalt 7;Zusatzinformation - Art 8;Zusatzinformation- Inhalt 8;Zusatzinformation - Art 9;Zusatzinformation- Inhalt 9;Zusatzinformation - Art 10;Zusatzinformation- Inhalt 10;Zusatzinformation - Art 11;Zusatzinformation- Inhalt 11;Zusatzinformation - Art 12;Zusatzinformation- Inhalt 12;Zusatzinformation - Art 13;Zusatzinformation- Inhalt 13;Zusatzinformation - Art 14;Zusatzinformation- Inhalt 14;Zusatzinformation - Art 15;Zusatzinformation- Inhalt 15;Zusatzinformation - Art 16;Zusatzinformation- Inhalt 16;Zusatzinformation - Art 17;Zusatzinformation- Inhalt 17;Zusatzinformation - Art 18;Zusatzinformation- Inhalt 18;Zusatzinformation - Art 19;Zusatzinformation- Inhalt 19;Zusatzinformation - Art 20;Zusatzinformation- Inhalt 20;StŸck;Gewicht;Zahlweise;Forderungsart;Veranlagungsjahr;Zugeordnete FŠlligkeit;Skontotyp;Auftragsnummer;Buchungstyp;USt-SchlŸssel (Anzahlungen);EU-Land (Anzahlungen);Sachverhalt L+L (Anzahlungen);EU-Steuersatz (Anzahlungen);Erlšskonto (Anzahlungen);Herkunft-Kz;Buchungs GUID;KOST-Datum;SEPA-Mandatsreferenz;Skontosperre;Gesellschaftername;Beteiligtennummer;Identifikationsnummer;Zeichnernummer;Postensperre bis;Bezeichnung SoBil-Sachverhalt;Kennzeichen SoBil-Buchung;Festschreibung;Leistungsdatum;Datum Zuord. Steuerperiode +119;H;;;;;8400;10000;9;107;201911;;;Nachname Vorname, Kundennummer;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +107;H;;;;;8401;10000;8;107;201911;;;Nachname Vorname, Kundennummer;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +119;S;;;;;4760;70000;9;207;202501;;;"Karrer Christian; BeraterNr";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; \ No newline at end of file diff --git a/dev/2026-02-06/EXTF_Buchungen.xlsx b/dev/2026-02-06/EXTF_Buchungen.xlsx new file mode 100644 index 0000000..55147ae Binary files /dev/null and b/dev/2026-02-06/EXTF_Buchungen.xlsx differ diff --git a/dev/2026-02-06/next-steps.md b/dev/2026-02-06/next-steps.md new file mode 100644 index 0000000..294a82e --- /dev/null +++ b/dev/2026-02-06/next-steps.md @@ -0,0 +1,143 @@ +### Die drei offenen Tickets aus + +dev/22-01-2026/next-steps.md + +### [✓] 13. Steuerberater-Modul (DATEV-Export) + +**Priorität:** Hoch +**Status:** Umgesetzt (Phase 1) + +**Umgesetzte Features:** + +1. **DATEV EXTF-Buchungsstapel-Export** (`DatevExportService`) + + - Rechnungen, Gutschriften/Provisionen, Stornos + - EXTF-Header + 116-Spalten CSV gemäß DATEV Developer Portal + - Periodenauswahl (Monat/Jahr) + +2. **Erlöskonto-Mapping nach Steuerberater-Vorgabe** + + - 8400 Erlöse 19% (BU 9) – Inland + - 8300 Erlöse 7% (BU 8) – Inland reduziert + - 8125 IG-Lieferung steuerfrei §4 Nr. 1b (BU 1) – **nur bei EU + gültiger USt-ID** + - 8120 Drittland steuerfrei §4 Nr. 1a (BU 11) + +3. **Fachliche Regel: EU-Steuerbefreiung nur mit USt-ID** + + - Nur registrierte Berater (`auth_user`) mit hinterlegter `tax_identification_number` erhalten BU 1 + - Gäste und Berater ohne USt-ID → reguläre Inlandsbesteuerung (19%/7%) + - USt-ID wird über `ShoppingOrder → auth_user → account → tax_identification_number` ermittelt + +4. **Provisions-Steuerschlüssel** + + - 4760 Verkaufsprovision (Shop + Wachstumsbonus) + - 4764 Payline-Provision + - Normal (BU 9), Kleinunternehmer (BU 50), Reverse Charge (BU 94) + +5. **Gegenkonto-Mapping** + + - PayPal → 1230 + - Sonstige → Sammeldebitor (konfigurierbar) + - Provisionen → Sammelkreditor + +6. **Validierung mit klickbaren Warnungen** + + - Strukturierte Warnungen/Fehler mit Metadaten (source_id, order_id, user_id) + - Links zur Rechnung (Rechnungssuche) und zum Berater (Detailseite) + - Prüfungen: Belegdatum, Belegnummer, BU-Schlüssel, EU ohne USt-ID, Reverse Charge ohne USt-ID + +7. **DataTable mit Suchfunktion** + + - Durchsuchbar nach Rechnungsnummer, Buchungstext, Konto, USt-ID, etc. + - Server-seitige Verarbeitung via Yajra DataTables + +8. **Admin-UI** (Route: `admin_payments_taxadvisor`) + - Vorschau laden → Zusammenfassung + Validierung + - Export generieren → CSV + DB-Protokoll + - Download, Lock, Löschen + +**Geänderte Dateien:** + +- `app/Services/DatevExportService.php` – Kernlogik +- `app/Http/Controllers/PaymentTaxAdvisorController.php` – Controller +- `resources/views/admin/payment/taxadvisor.blade.php` – View +- `config/datev.php` – Konfiguration +- `tests/Unit/Services/DatevExportServiceTest.php` – 35 Tests + +**Offene Punkte (Phase 2):** + +- Debitoren/Kreditoren-Stammdaten (wenn Steuerberater OP-Listen braucht) +- Payone-Debitor-Mapping (detaillierter als Sammeldebitor) +- Automatischer Periodenabschluss / Sperr-Workflow + +--- + +### [!] 10. Nicht zugeordnete Zahlungen/Punkte + +**Priorität:** Hoch +**Bereich:** Payment / Admin + +**Problem:** +Zahlungen ohne Zuordnung → Punkte verschwinden, keine Provision. + +**Anforderung:** + +- Admin-Hinweis bei nicht zugeordneten Zahlungen +- Manuelle Zuordnungsmöglichkeit + +**Technische Details:** +| Parameter | Wert | +|-----------|------| +| Tabelle | `user_sales_volumes` | +| Status-Feld | `status = 0` (not_assigned) | +| Admin-View | Dashboard oder separate Sektion | + +**Query für nicht zugeordnete Einträge:** + +```php +$unassigned = UserSalesVolume::where('status', 0) + ->with('user', 'order') + ->orderBy('created_at', 'desc') + ->get(); +``` + +**Umsetzung:** + +1. **Dashboard-Alert:** Anzahl nicht zugeordneter Einträge anzeigen +2. **Admin-Seite:** Liste aller nicht zugeordneten Einträge +3. **Zuordnungs-Modal:** + - User auswählen (Dropdown/Suche) + - Status aktualisieren (1 = advisor_order, 2 = shoporder) + - Punkte werden bei nächster Berechnung berücksichtigt + +--- + +### [ ] 11. Monatsstatistik Erweiterungen + +**Priorität:** Mittel +**Bereich:** Dashboard / Team + +**Probleme:** + +- Teamumsatz wird seit Januar nicht angezeigt +- Neupartner/Abos nicht klickbar (keine Detailansicht) + +**Anforderungen:** +| Feature | Beschreibung | +|---------|--------------| +| Teamumsatz | Bug fixen - wird nicht angezeigt | +| Neupartner Details | Klick → Liste mit Name, E-Mail, Telefon, Generation, Mentor | +| Team-Abos Details | Klick → Liste mit Abo-Details | +| 1000-Punkte-Shops | Neue Kennzahl: Teampartner mit ≥1000 Punkte persönlichem Volumen | +| Aktuelle Provision | In Monatsstatistik anzeigen | +| Downline-Kontakte | Telefon, E-Mail, Adresse der eigenen Downline abrufbar (nicht nur VIPs) | + +**Technische Details:** +| Parameter | Wert | +|-----------|------| +| Service | `App\Services\LevelReportService` | +| Controller | `App\Http\Controllers\User\TeamController` | +| View | `resources/views/user/team/marketingplan.blade.php` | +| Daten | `user_business` Tabelle | + +**1000-Punkte Query:** diff --git a/dev/2026-02-06/steuerberater.md b/dev/2026-02-06/steuerberater.md new file mode 100644 index 0000000..7ff3137 --- /dev/null +++ b/dev/2026-02-06/steuerberater.md @@ -0,0 +1,291 @@ +### Vom Steuerberater. + +Umsatzerlöse + +- 8400 Erlöse 19% -> Steuerschlüssel 9 +- 8300 Erlöse 7% -> Steuerschlüssel 8 +- 8120 Steuerfreie Umsätze nach § 4 Nr. 1a UStG (Drittland) -> Steuerschlüssel = 11 +- 8125 Steuerfreie innergemeinschaftliche Lieferungen nach § 4 Nr. 1b UStG (EU) -> Steuerschlüssel = 1 + +Provisionen (Unterscheidung in Shop, Payline und Wachstumsbonus) + +- 4760 Verkaufsprovision (Shop + Wachstumsbonus) + o 19% -> Steuerschlüssel = 9 + o Kleinunternehmer -> Steuerschlüssen = 50 + o Reverse Charge -> Steuerschlüssel = 94 +- 4764 (Payline) + o 19% -> Steuerschlüssel = 9 + o Kleinunternehmer -> Steuerschlüssen = 50 + o Reverse Charge -> Steuerschlüssel = 94 + +Relevante Felder/Spalten + +- Umsatz (Spalte A) -> Bruttobetrag je Steuerschlüssel +- Soll/Haben (Spalte B) + o Umsatz -> H + o Provisionen -> S +- Konto (Spalte G) + o Umsätze -> siehe Umsatzerlöse + o Provisionen -> siehe Gutschriften +- Gegenkonto (Spalte H) + o Umsatzerlöse = Debitorenkonto (vermutlich Sammelkonto) + o Provisionen = Kreditorenkonto (vermutlich Sammelkonto) +- Buchungsschlüssel + o Steuerschlüssel siehe oben je Sachverhalt +- Belegdatum (Spalte J) = Rechnungs-/Gutschriftsdatum +- Belegfeld 1 (Spalte K) + o Umsatz = Rechnungsnummer + o Gutschrift = Gutschriftnummer +- Buchungstext (Spalte N) + o Umsatz = Name Kunde (Nachname Vorname) + o Provisionen = Name Kunde (Nachname Vorname) +- EU-Land u. UStID (Spalte AN) + o USt-ID + +Gegenkonto Umsatz + +- Payone -> Debitor (Mapping erforderlich) +- Paypal -> 1230 +- Kunden -> vermutlich Sammeldebitor + +Gegenbuchung Provisionen + +- Kreditor 71586 +- Vermutlich Sammelkreditor + +Zu klären + +- Kundennummer erforderlich? +- Kreditorennummer erforderlich? + +Erläuterungen + +1. Header + a. DATEV-Format - DATEV Developer Portal +2. Buchungsstapel + a. DATEV-Format - DATEV Developer Portal + +### Erste Konzeption für ein DATEV-Export-Modul (EXTF „Buchungsstapel“) im Laravel-CRM – basierend auf dem Briefing des Steuerberaters und orientiert am DATEV Developer Portal (Header + Buchungsstapel).  + +⸻ + +1. Zielbild: Was das Modul am Ende liefern muss + +Output: pro Abrechnungsperiode (z. B. Monat) eine Datei EXTF_Buchungsstapel.csv mit 1. Header-Satz (erste Zeile, beginnt mit EXTF;700;21;...) 2. Spaltenkopfzeile (zweite Zeile) 3. Buchungszeilen (ab Zeile 3, je Buchung eine Zeile)  + +Euer Beispiel/Template entspricht genau diesem Muster (Headerzeile + Spaltenkopfzeile + Daten). + +⸻ + +2. Fachliche Logik (Mapping) – so entstehen Buchungszeilen + +2.1 Buchungsarten (aus euren CRM-Daten ableitbar) + +Ihr habt im System bereits: Bestellungen, Rechnungen, Gutschriften, Storno usw. Daraus leitet ihr je Datensatz eine „Buchungsart“ ab: +• Umsatz (Rechnung / Belastung) +• Soll/Haben: H +• Konto: Erlöskonto (8400/8300/8120/8125) +• Gegenkonto: Debitor/Zahlkonto (Payone/PayPal/Sammeldebitor) +• Provision (Gutschrift / Abzug) (Shop, Payline, Wachstumsbonus) +• Soll/Haben: S +• Konto: 4760 (Shop+Wachstumsbonus) oder 4764 (Payline) +• Gegenkonto: Kreditor (z. B. 71586 oder Sammelkreditor) + +Wichtig: „Provision“ ist in eurem Export fachlich eine eigene Buchungslogik, auch wenn sie technisch über Gutschriften abgebildet ist. + +2.2 Steuerschlüssel & Konten (1:1 aus dem Briefing) + +Umsatzerlöse +• 8400 Erlöse 19% → Steuerschlüssel 9 +• 8300 Erlöse 7% → Steuerschlüssel 8 +• 8120 Drittland steuerfrei §4 Nr. 1a → Steuerschlüssel 11 +• 8125 IG Lieferung steuerfrei §4 Nr. 1b → Steuerschlüssel 1 + +Provisionen +• 4760 Verkaufsprovision (Shop + Wachstumsbonus) +• 19% → 9 +• Kleinunternehmer → 50 +• Reverse Charge → 94 +• 4764 (Payline) +• 19% → 9 +• Kleinunternehmer → 50 +• Reverse Charge → 94 + +2.3 Relevante DATEV-Spalten (aus Steuerberater-Vorgabe) + +Ihr befüllt (mindestens) folgende Felder: +• Spalte A Umsatz: Bruttobetrag je Steuerschlüssel +• Spalte B Soll/Haben: Umsatz = H, Provisionen = S +• Spalte G Konto: wie oben +• Spalte H Gegenkonto: Debitor/Kreditor/Zahlkonto (Mapping) +• Buchungsschlüssel (BU-Schlüssel): Steuerschlüssel wie oben +• Belegdatum (Spalte J): Rechnungs-/Gutschriftsdatum +• Belegfeld 1 (Spalte K): Rechnungsnummer / Gutschriftsnummer +• Buchungstext (Spalte N): Name Kunde „Nachname Vorname“ +• EU-Land u. UStID (Spalte AN): USt-ID (wenn vorhanden) + +Die restlichen DATEV-Spalten bleiben leer (aber müssen als Trennzeichen „mitlaufen“, weil das Format feste Spaltenpositionen hat).  + +⸻ + +3. Gegenkonto-Logik (entscheidet über Debitor/Zahlkonto) + +Aus dem Briefing: + +Gegenkonto Umsatz +• Payone → Debitor (Mapping erforderlich) +• PayPal → 1230 +• Kunden → Sammeldebitor (vermutlich) + +Gegenbuchung Provisionen +• Kreditor 71586 (oder Sammelkreditor) + +Empfehlung (damit es skalierbar bleibt) + +Baut das als Regelwerk + Mappingtabellen, nicht hardcodiert. + +(A) payment_method_counteraccounts +• payment_method (payone, paypal, invoice, …) +• counteraccount_type (DEBITOR, GL_ACCOUNT) +• counteraccount_value (z. B. 1230) + +(B) payone_debitor_mapping +• Schlüssel z. B. payone_account_id / merchant_id / settlement_reference +• Ziel: debitor_account_no + +Fallback-Regeln 1. Wenn PayPal → 1230 2. Wenn Payone und Mapping gefunden → gemappter Debitor 3. Sonst → Sammeldebitor + +⸻ + +4. „Zu klären“ (Kundennummer/Kreditorennummer) – pragmatische Konzeption ohne Blocker + +Ihr könnt das so designen, dass beides optional ist, aber unterstützt wird: + +Option 1: Sammelkonten (schnell, wenig Stammdatenpflege) +• Gegenkonto Umsatz: Sammeldebitor +• Gegenkonto Provision: Sammelkreditor/71586 +• Vorteil: einfacher Start +• Nachteil: keine OP-Auswertung pro Kunde in DATEV + +Option 2: echte Debitoren/Kreditoren (sauberer, mehr Pflege) +• Jeder Kunde bekommt Debitorennummer (und ggf. Kreditorennummer, wenn Provisionen individuell laufen sollen) +• Optional zusätzlich Export „Debitoren/Kreditoren“-Stammdaten in DATEV-Format (separater EXTF-Datensatztyp)  + +Empfehlung für eure Roadmap +• Phase 1: Sammelkonten + Payone-Mapping + PayPal 1230 +• Phase 2: Debitoren/Kreditoren optional (wenn Steuerberater OP-Listen braucht) + +Ist geklärt. Option 1 Wird umgesetzt. Zusätzlich wird immer wie in Phase 1 noch das Payone-Mapping + PayPal 1230 etc angahangen. + +⸻ + +5. Storno / Korrekturen / Gutschriften: robustes Regelwerk + +Ihr wollt verhindern, dass „Storno“ doppelt wirkt oder als falsches Vorzeichen rausgeht. + +Konzeptionell sauber: +• Jede exportierte Zeile bekommt eine interne Export-Signatur (z. B. source_type, source_id, line_hash) und wird als „exportiert“ protokolliert. +• Storno/Gutschrift wird als eigene Buchung exportiert (typischerweise Gegenbuchung zur Ursprungsbuchung), nicht als stilles Überschreiben. + +DATEV-seitig gibt es Felder/Mechaniken für Umkehr/Korrektur; wie ihr das exakt nutzt (eigener Umkehrschlüssel vs. negativer Betrag) sollte ihr einmal mit dem Steuerberater festziehen, aber euer Modul kann beides abbilden: +• Variante A: negativer Umsatzbetrag in Spalte A +• Variante B: Umkehr-/Berichtigungsschlüssel befüllen (wenn gewünscht) + +(Die DATEV-Doku zum Buchungsstapel beschreibt die Struktur/Spalten; die konkrete Kanzlei-Konvention ist oft Mandantenstandard.)  + +⸻ + +6. Datenmodell in Laravel (minimal, aber vollständig) + +6.1 Kern-Tabellen + +datev_exports +• id, period_from, period_to, created_by +• status (draft/generated/downloaded/locked) +• berater_nr, mandant_nr (für Header) +• filename, file_path, hash + +datev_export_lines +• export_id +• source_type (invoice/credit_note/cancellation/commission) +• source_id +• amount_gross +• soll_haben (H/S) +• konto +• gegenkonto +• bu_schluessel +• belegdatum +• belegfeld1 +• buchungstext +• ustid, eu_land +• row_csv (optional: final gerenderte Zeile zur Nachvollziehbarkeit) + +accounting_rules (konfigurierbar) +• für Umsatz: VAT-Case → (konto, bu) +• für Provision: scenario → (konto, bu) + +counteraccount_mappings (Payone/PayPal/Default) + +6.2 Warum „Export Lines“ speichern? +• Audit-Trail (Steuerberaterfragen) +• Re-Download exakt identisch +• Sperre gegen Doppel-Export derselben Quellen + +⸻ + +7. UI/Workflow (CRM-Modul) 1. Periode wählen (Monat/Zeitraum) 2. Datenbasis anzeigen: Anzahl Rechnungen, Gutschriften, Stornos, Provisionen 3. Regel-Preview: gruppiert nach (Konto, Gegenkonto, Steuerschlüssel) + Summen 4. Validierungscheck (Blocking): + • fehlender Steuercase (z. B. EU ohne USt-ID aber als IG markiert) + • fehlendes Payone-Debitor-Mapping (falls Pflicht) + • fehlendes Belegdatum/Belegnr. 5. Export generieren → Datei + Protokoll 6. Lock (optional) → „Dieses Periodenset ist final“ + +⸻ + +8. CSV/Format-Generator (technische Konzeption, ohne Code) + • Semikolon als Delimiter + • Headerzeile gemäß DATEV-Vorgaben (Formatkategorie 21 = Buchungsstapel, Versionen etc.)  + • Danach Spaltenkopfzeile (fixe Reihenfolge) + • Dann Zeilen mit exakt derselben Spaltenanzahl (leere Felder als leer zwischen ;) + +Praxis-Hinweis: Haltet Header-Felder (Berater-Nr, Mandant-Nr, Zeitraum) als Kanzlei-Konfiguration im CRM, damit ihr nicht pro Export „handwerkelt“. (Gerade diese Angaben sind beim Import relevant.)  + +⸻ + +9. Konkrete Regel-Engine (so entscheidet ihr automatisch) + +Umsatz-Fallunterscheidung + +Input: invoice.vat_rate, invoice.destination_country, invoice.customer_vat_id, invoice.tax_exemption_reason + +Mapping: +• vat_rate == 19% → (8400, bu=9) +• vat_rate == 7% → (8300, bu=8) +• Drittland steuerfrei → (8120, bu=11) +• EU IG Lieferung steuerfrei → (8125, bu=1) + +Provision-Fallunterscheidung + +Input: commission.type (shop/payline/bonus), supplier_tax_status (normal/KU/RC) +• type shop|bonus → konto 4760 +• type payline → konto 4764 +• tax_status normal → bu 9 +• KU → bu 50 +• RC → bu 94 + +⸻ + +10. Was ich aus eurer Beispieldatei ableite (für die Konzeption wichtig) + +Eure Datei nutzt exakt das typische Muster: +• Zeile 1: EXTF;700;21;Buchungsstapel;... +• Zeile 2: Spaltenüberschriften (u. a. „Umsatz (ohne Soll/Haben-Kz)“, „Soll/Haben-Kennzeichen“, „Konto“, „Gegenkonto“, „BU-Schlüssel“, „Belegdatum“, …) +• Danach Datenzeilen mit vielen leeren Feldern (DATEV-typisch bei Minimalbefüllung) + +Das bestätigt: Ihr braucht vor allem stabile Spaltenpositionen + korrektes Mapping, nicht „alle 116 Felder“.  + +⸻ + +Wenn du willst, kann ich als nächsten Schritt (ohne extra Rückfragen) aus eurem Briefing ein konkretes Mapping-Dokument erstellen (als technische Spezifikation): +• Feld-zu-Quelle (CRM) je DATEV-Spalte +• Regelprioritäten (Fallbacks) +• Validierungsregeln + Fehlermeldungen (für UI) +• Testfälle (z. B. EU ohne USt-ID, Storno nach Periodenwechsel, Payone ohne Mapping, KU/RC-Provisionen) diff --git a/dev/2026-02-19/Tasks.md b/dev/2026-02-19/Tasks.md new file mode 100644 index 0000000..2762c62 --- /dev/null +++ b/dev/2026-02-19/Tasks.md @@ -0,0 +1,15 @@ +Hier beschreibe ich eine weitere Aufgabe, die umgesetzt werden muss. + +In dem Salecenter Gibt es einen Wizzard, der für die Registrierung für Berater, Notwendig ist. +Jeder Berater kommt über einen Link und gelangt zu einem Registrierungsnummer Art, wo er unterschiedliche Schritte Akzeptierung, der AGBs persönliche Daten hochladen von Personaldaten zu Verifizierung in den ersten Schritten umsetzen muss. Sind seine Daten vollständig angegeben sendet er über einen Button, einen request, der eine E-Mail für den Admin zur Freigabe auslöst. Die Freigabe ist beim der User Bearbeitung mit Extrafelder für den Admin versehen. Ist alles in Ordnung kann der Admin den Berater freischalten und der Berater bekommt eine E-Mail, dass er freigeschaltet ist. Nach der Freischaltung kommt er in den allerletzten Schritt des OSA des Registrierungs Wizzard, Wo er die Wahl hat, eine Bestellung auszuführen. Um diese Bestellung geht es jetzt. Diese muss angepasst werden. Unter den Produkten gibt es Anlagen, die genau für diesen Wizard gemacht sind. Hier gibt es eine Spalte Show on wo hinterlegt wird, wo das Produkt angezeigt wird. Es gibt dort die Einträge Registrierung, Berater oder on Boarding Berater dann werden die Produkte in genau diesem Prozess angezeigt und sind auswählbar. + +Bisher ist es so, dass ein Versand Preis berechnet wird, welches mit einem Kompensation Produkt ein wenig ausgeglichen wird. Diese fällt in Zukunft weg d.h. es gibt einmal ein kleines Standardpaket das ist nur die Mitgliedschaft. Diese hat auch keine Versandkosten da sie auch ein Gewicht von null hat alles, was null hat, bekommt keine Versandkosten das ist das Paket für die reine Mitgliedschaft produkt ID 35. Handelt sich um ein Jahres Mitgliedschaft, welches dann später entsprechend kommuniziert wird. + +zusätzlich gibt es Starter Pakete. Diese Pakete beinhalten ein umfangreiches Set an Produkten, Rabattiert und zusätzlich kann man schon mit einem Paket in den nächsten Rang aufsteigen. +Aktuell ist es so, dass man die Jahres Mitgliedschaft buchen muss und ein Starterpaket optional buchen kann. Beim Starterpaket werden dann auch Versandkosten erhoben und genau hier kommt jetzt die Änderung. Es wird nur noch eine direkte Auswahl geben. Zwischen der reinen Mitgliedschaft und 2,3 Starterpaket und in dem Starterpaket Preis ist gleichzeitig ein Jahres Mitgliedschaft enthalten und auch die Versandkosten d.h. die Versandkosten müssen immer null sein das ist eine Ausnahme für die Berater, die sonst immer Versandkosten zahlen mit einem Kombination Produkt. + +Jetzt gilt es, diese Änderungen so einzubauen, dass wir es einmal über die Produkte entsprechend schalten können und das auch am Ende der Wizard nur die Auswahl zwischen den Produkten erlaubt. Es soll noch etwas weiteres hinzu wird nur dass die reine Mitgliedschaft genommen soll, wenn der Button gedrückt wird vorerst eine Meldung kommen in einem moralen Fenster, in dem so etwas drin steht wie Achtung mit einem Starterpaket erhältst du ein Rabatt von XY und diese Starterpaket ist nur einmalig bei der Bestellung Registrierung möglich zu kaufen möchtest du jetzt wirklich ohne ein Starterpaket nur die reine Mitgliedschaft abschließen? Dieser Text mit in die sprach dateien resources/lang + +Controller Wizzard -> app/Http/Controllers/WizardController.php +Controller Produkte -> app/Http/Controllers/ProductController.php +Controller Berater / Leads für die Admin Freigabe app/Http/Controllers/LeadController.php function released diff --git a/dev/2026-02-19/plan-wizard-starterpaket.md b/dev/2026-02-19/plan-wizard-starterpaket.md new file mode 100644 index 0000000..f62c646 --- /dev/null +++ b/dev/2026-02-19/plan-wizard-starterpaket.md @@ -0,0 +1,204 @@ +# Plan: Wizard Registrierung - Starterpaket-Auswahl umbauen + +## Ausgangslage + +Der letzte Schritt des Berater-Registrierungs-Wizards hat aktuell: + +- **Mitgliedschaften** als Radio-Buttons (show_on 7+8) +- **Onboarding-Produkte** als optionale Checkboxen (show_on 9) +- Kompensationsprodukt für Versandkosten + +## Was sich ändert + +1. **Eine einzige Radio-Button-Auswahl** zwischen: + + - Reine Jahresmitgliedschaft (Produkt-ID 35, Gewicht 0 = keine Versandkosten) + - 2-3 Starterpakete (inkl. Mitgliedschaft + Versandkosten = 0) + +2. **Neues DB-Feld `free_shipping_consultant`** auf der Produkttabelle + + - Boolean-Checkbox im Admin: "Versandkostenfrei für Berater" + - Wird in der Versandkostenberechnung (Yard) berücksichtigt + +3. **Warn-Modal** wenn nur Mitgliedschaft gewählt wird: + + - Hinweis auf Rabatt und Einmaligkeit des Starterpaket-Angebots + +4. **Onboarding-Checkboxen entfallen** - alles über Radio-Buttons + +## Betroffene Dateien + +| Datei | Änderung | +| ------------------------------------------------ | ------------------------------------- | +| `database/migrations/...` | Neues Feld `free_shipping_consultant` | +| `app/Models/Product.php` | fillable + casts | +| `app/Repositories/ProductRepository.php` | Checkbox-Handling | +| `resources/views/admin/product/form.blade.php` | Admin-Checkbox | +| `app/Services/Yard.php` | Versandkosten-Logik | +| `app/Http/Controllers/WizardController.php` | Query + storePayment | +| `resources/views/user/wizard/_payment.blade.php` | UI-Umbau + Modal | +| `resources/lang/{de,en,es}/register.php` | Übersetzungen | + +--- + +## Umsetzungsstatus (Stand: 2026-02-19) + +### ERLEDIGT - Alle geplanten Änderungen sind umgesetzt + +#### 1. Migration `free_shipping_consultant` - ERLEDIGT + +- **Datei:** `database/migrations/2026_02_19_120000_add_free_shipping_consultant_to_products_table.php` +- Boolean-Feld `free_shipping_consultant` mit `default(false)` nach `no_free_shipping` +- Down-Migration entfernt die Spalte korrekt + +#### 2. Product Model - ERLEDIGT + +- **Datei:** `app/Models/Product.php` +- `free_shipping_consultant` in `$casts` als `'bool'` hinzugefügt (Zeile 192) +- `free_shipping_consultant` in `$fillable` hinzugefügt (Zeile 216) + +#### 3. ProductRepository Checkbox-Handling - ERLEDIGT + +- **Datei:** `app/Repositories/ProductRepository.php` +- `$data['free_shipping_consultant'] = isset($data['free_shipping_consultant']) ? 1 : 0;` in der `update()`-Methode (Zeile 30) + +#### 4. Admin Produkt-Formular - ERLEDIGT + +- **Datei:** `resources/views/admin/product/form.blade.php` +- Neue Checkbox-Sektion "Versandkostenfrei für Berater (FcB.)" eingebaut (Zeilen 124-132) +- Text: "Versandkosten für Berater sind bei diesem Produkt immer 0 (z.B. Starterpakete)." + +#### 5. Yard.php Versandkosten-Logik - ERLEDIGT + +- **Datei:** `app/Services/Yard.php` +- Neue Methode `allItemsFreeShippingConsultant()` hinzugefügt (Zeilen 419-429) + - Prüft ob **alle** Items im Warenkorb `free_shipping_consultant = true` haben + - Gibt `false` zurück wenn der Warenkorb leer ist +- In `calculateShippingPrice()` (Zeile 260): Bedingung erweitert: + ```php + if ($this->allItemsFreeShippingConsultant() || $this->weight() == 0) { + ``` + - Wenn alle Items `free_shipping_consultant` haben ODER Gewicht = 0 -> Versandkosten = 0 + +#### 6. WizardController - ERLEDIGT + +- **Datei:** `app/Http/Controllers/WizardController.php` +- In `storePayment()` (Zeile 607): `free_shipping_consultant` wird beim Hinzufügen zum Warenkorb als Cart-Option übergeben: + ```php + 'free_shipping_consultant' => $product->free_shipping_consultant + ``` +- Die Product-Queries in `create()`, `register()`, `payment()` laden weiterhin show_on 7, 8, 9 - das ist korrekt, da die Produkte über show_on gesteuert werden + +#### 7. Wizard Payment Blade (UI-Umbau) - ERLEDIGT + +- **Datei:** `resources/views/user/wizard/_payment.blade.php` +- **Einheitliche Radio-Button-Auswahl:** Alle Produkte werden als Radio-Buttons (`switchers-package-wizard`) dargestellt - keine separaten Checkboxen mehr für Onboarding-Produkte +- **Warn-Modal** implementiert (Zeilen 78-96): + - Bootstrap Modal `#starterWarningModal` mit Titel, Text, Zurück-Button und Bestätigen-Button + - Übersetzungsschlüssel: `register.starter_warning_title`, `register.starter_warning_text`, `register.starter_warning_back`, `register.starter_warning_confirm` +- **JavaScript-Logik** (Zeilen 98-129): + - `data-is-membership-only="1"` auf Produkt-ID 35 (reine Mitgliedschaft) + - Submit-Button (`#btn-wizard-submit`) prüft ob reine Mitgliedschaft gewählt ist + - Falls ja: Modal wird angezeigt statt direkt abzusenden + - Bestätigen-Button im Modal (`#btn-confirm-membership-only`) schließt Modal und submittet das Formular + - Preisberechnung über `data-price` und `calculate_package_payment()` funktioniert +- **Standard-Auswahl:** Der 2. Eintrag (erstes Starterpaket) ist per Default vorgewählt (`@if($counter == 2) checked @endif`) + +#### 8. Sprachdateien - ERLEDIGT + +- **DE** (`resources/lang/de/register.php`): + - `starter_warning_title` => 'Achtung' + - `starter_warning_text` => 'Mit einem Starterpaket erhältst Du einen Rabatt und kannst direkt in den nächsten Rang aufsteigen. Dieses Angebot ist nur einmalig bei der Registrierung verfügbar. Möchtest Du wirklich ohne Starterpaket nur die reine Mitgliedschaft abschließen?' + - `starter_warning_back` => 'Zurück zur Auswahl' + - `starter_warning_confirm` => 'Ja, nur Mitgliedschaft' +- **EN** (`resources/lang/en/register.php`): + - `starter_warning_title` => 'Attention' + - `starter_warning_text` => 'With a starter package you receive a discount and can advance directly to the next rank. This offer is only available once during registration. Do you really want to proceed with only the membership without a starter package?' + - `starter_warning_back` => 'Back to selection' + - `starter_warning_confirm` => 'Yes, membership only' +- **ES** (`resources/lang/es/register.php`): + - `starter_warning_title` => 'Atención' + - `starter_warning_text` => 'Con un paquete de inicio recibes un descuento y puedes ascender directamente al siguiente rango. Esta oferta solo está disponible una vez durante el registro. ¿Realmente deseas continuar solo con la membresía sin un paquete de inicio?' + - `starter_warning_back` => 'Volver a la selección' + - `starter_warning_confirm` => 'Sí, solo membresía' + +--- + +## Nachbesserung 1: Modal-Styling + dynamische Mitgliedschaft-Erkennung (2026-02-19) + +### Problem + +- Modal war optisch unauffällig (Standard-Bootstrap, keine Warn-Farben) +- Produkt-ID 35 war im Blade hardcoded (`$product->id == 35`) + +### Lösung + +#### 9. Neues DB-Feld `is_membership_only` - ERLEDIGT + +- **Migration:** `database/migrations/2026_02_19_140000_add_is_membership_only_to_products_table.php` + - Boolean `is_membership_only`, default `false`, nach `free_shipping_consultant` +- **Product Model:** `$casts` + `$fillable` ergänzt +- **ProductRepository:** Checkbox-Handling in `update()` ergänzt +- **Admin-Formular:** Neue Checkbox "Reine Mitgliedschaft (MoP.)" mit Text: + "Dieses Produkt ist eine reine Mitgliedschaft ohne Starterpaket (Warnung im Wizard)." + +#### 10. Hardcoded ID entfernt - ERLEDIGT + +- **Blade** `_payment.blade.php`: `$product->id == 35` ersetzt durch `$product->is_membership_only` +- Jetzt dynamisch: Jedes Produkt mit aktivierter Checkbox löst die Warnung aus + +#### 11. Modal-Styling aufgewertet - ERLEDIGT + +- **Header:** `bg-warning text-dark` mit `fa-exclamation-triangle` Icon +- **Border:** `border-warning` am Modal-Content +- **Body:** Inhalt in `alert alert-warning` Box mit `fa-info-circle` Icon +- **Footer:** "Zurück"-Button als `btn-warning` (auffällig), "Bestätigen" als `btn-outline-secondary` (dezent) + +--- + +## Nachbesserung 2: Info-Box + Validierung ohne Vorauswahl (2026-02-19) + +### Problem + +- Ein Produkt war per Default vorausgewählt (2. Eintrag) - Nutzer hat das entfernt +- Kein Hinweistext, der erklärt was zu tun ist +- Keine Fehlermeldung wenn Submit ohne Auswahl geklickt wird + +### Lösung + +#### 12. Info-Alert oberhalb der Produkttabelle - ERLEDIGT + +- **Blade** `_payment.blade.php`: `alert alert-info` Box mit `fa-info-circle` Icon +- Text erklärt die Wahlmöglichkeiten (Mitgliedschaft vs. Starterpaket mit Vorteilen) +- Übersetzungsschlüssel: `register.wizard_package_info` + +#### 13. Validierung bei fehlender Auswahl - ERLEDIGT + +- **Fehlermeldung:** Verstecktes `alert alert-danger` (`#wizard-selection-error`) unter der Tabelle +- **JS-Logik:** Submit prüft ob ein Radio-Button gewählt ist: + - Falls nein: Fehlermeldung einblenden + roter Rand um Tabelle + Scroll zum Fehler + - Fehlermeldung verschwindet sobald ein Produkt gewählt wird +- Übersetzungsschlüssel: `register.wizard_no_selection` + +#### 14. Keine Vorauswahl mehr - ERLEDIGT + +- `@if($counter == 2) checked @endif` wurde vom Nutzer entfernt +- Kein Produkt ist vorausgewählt, Nutzer muss aktiv wählen + +#### 15. Sprachdateien ergänzt - ERLEDIGT + +- **DE:** `wizard_package_info` + `wizard_no_selection` +- **EN:** `wizard_package_info` + `wizard_no_selection` +- **ES:** `wizard_package_info` + `wizard_no_selection` + +--- + +## Offene Punkte / Nächste Schritte + +### Testen + +- Wizard ohne Auswahl: Fehlermeldung muss rot erscheinen + Tabelle rot umrandet +- Wizard mit Auswahl: Fehlermeldung verschwindet, Submit funktioniert +- Wizard mit reiner Mitgliedschaft: Warning-Modal erscheint +- Wizard mit Starterpaket: Direkt zum Checkout +- Info-Box in allen Sprachen prüfen (de, en, es) diff --git a/dev/22-01-2026/next-steps.md b/dev/22-01-2026/next-steps.md deleted file mode 100644 index 57e0fa4..0000000 --- a/dev/22-01-2026/next-steps.md +++ /dev/null @@ -1,1068 +0,0 @@ -# Development Backlog - 22.01.2026 - -## Status-Legende -- `[x]` Erledigt -- `[ ]` Offen -- `[!]` Hohe Priorität -- `[?]` Klärungsbedarf - ---- - -## ERLEDIGTE AUFGABEN - -### [x] Produkt-Slugs anpassen -- **Status:** Erledigt -- **Beschreibung:** Slug kann direkt im Admin geändert werden -- **URL:** https://gesundheit.mivita.care/produkte/black-friday-week - -### [x] WWW-Redirect entfernen -- **Status:** Erledigt -- **Beschreibung:** Domain/Subdomain funktioniert ohne WWW-Prefix - -### [x] Abo-Anpassungen (Protokoll Claudia) -- **Status:** Erledigt -- **Änderungen:** - - Checkbox für AGB vor Abo-Abschluss - - Änderungen erst nach 6 Ausführungen möglich - - Nur Liefertag + Lieferadresse änderbar - - Lieferadresse sync mit Benutzerdaten - ---- - -## OFFENE AUFGABEN - ---- - -### [X] 1. NEWS: Download-Center Verlinkung - -**Priorität:** Hoch ✅ **ERLEDIGT** -**Bereich:** Dashboard / News - -**Problem:** -Benutzer finden das Download-Center nicht. Nur Verweis reicht nicht. - -**Lösung implementiert:** -✅ Strukturiertes JSON-Feld `file_links` für Datei-Links pro Sprache -✅ Admin-Formular mit Select2-Dropdown zur Auswahl von DC-Dateien -✅ Mehrsprachige Unterstützung (DE, EN, ES) -✅ Schöne Button-Darstellung im Dashboard mit Icons -✅ Direkte Links zum Download-Center - -**Implementierte Dateien:** - -1. **Migration:** `2026_01_23_120458_add_file_links_to_dashboard_news_table.php` - - Neues JSON-Feld `file_links` in `dashboard_news` Tabelle - -2. **Model:** `app/Models/DashboardNews.php` - - `file_links` zu `$fillable` und `$casts` hinzugefügt - - Neue Methoden: `getFileLinks($lang)`, `hasFileLinks($lang)` - -3. **Admin-Formular:** `resources/views/admin/site/news/form.blade.php` - - Datei-Link-Sektion für jede Sprache - - Select2-Dropdown mit allen aktiven DC-Dateien - - JavaScript zum Hinzufügen/Entfernen von Links - - Dynamische Label-Eingabe - -4. **Frontend-View:** `resources/views/dashboard/_news.blade.php` - - Anzeige der Datei-Links als grüne Download-Buttons - - **Direkter Download-Link** über `route('storage_file', [$file->id, 'dc_file', 'download'])` - - Icons mit Ionicons - - Responsive Darstellung - -5. **Übersetzungen:** - - DE: `resources/lang/de/backend.php` - - EN: `resources/lang/en/backend.php` - - ES: `resources/lang/es/backend.php` - - Neue Keys: `file_links`, `file_links_hint`, `link_label`, `select_file`, `add_file_link` - -**JSON-Struktur:** -```json -{ - "de": [ - {"file_id": 123, "label": "Preisliste herunterladen"}, - {"file_id": 456, "label": "Produktkatalog öffnen"} - ], - "en": [ - {"file_id": 789, "label": "Download Price List"} - ] -} -``` - -**Verwendung im Admin:** -1. News bearbeiten → Zum jeweiligen Sprach-Tab scrollen -2. "Datei-Link hinzufügen" klicken -3. Label eingeben (z.B. "Preisliste herunterladen") -4. Datei aus Dropdown auswählen -5. Speichern → Links erscheinen prominent im Dashboard - ---- - -### [X] 2. Points mit Dezimalstellen (DECIMAL statt INT) - -**Priorität:** Hoch -**Bereich:** Marketingplan / Provisionsberechnung - -**Problem:** -Punkte werden aktuell als INT gespeichert. Kommazahlen bei Produkten werden falsch berechnet/gerundet. - -**Anforderung:** -- Alle Punkte-Felder auf DECIMAL umstellen -- Berechnung im gesamten Marketingplan anpassen - -**Punkte-Ursprung (Produkte):** -| Parameter | Wert | -|-----------|------| -| Model | `App\Models\Product` | -| Feld | `points` (INT) → `DECIMAL(10,2)` | -| Zusätzlich | `sponsor_buying_points`, `sponsor_buying_points_amount` | - -**Punkte-Aggregation (Sales Volume):** -| Parameter | Aktuell | Neu | -|-----------|---------|-----| -| Model | `App\Models\UserSalesVolume` | - | -| Tabelle | `user_sales_volumes` | - | -| Datentyp | `INT` | `DECIMAL(10,2)` | - -**Betroffene Spalten `user_sales_volumes`:** -```sql -ALTER TABLE user_sales_volumes - MODIFY points DECIMAL(10,2), - MODIFY month_points DECIMAL(10,2), - MODIFY month_KP_points DECIMAL(10,2), - MODIFY month_TP_points DECIMAL(10,2), - MODIFY month_shop_points DECIMAL(10,2); -``` - -**Betroffene Spalten `user_business`:** -```sql -ALTER TABLE user_business - MODIFY sales_volume_points DECIMAL(10,2), - MODIFY sales_volume_points_shop DECIMAL(10,2), - MODIFY sales_volume_points_sum DECIMAL(10,2); -``` - -**Betroffene Spalten `products`:** -```sql -ALTER TABLE products - MODIFY points DECIMAL(10,2); -``` - -**Weitere Models mit `points`:** -- `App\Models\ShoppingOrder` → `points` -- `App\Models\ShoppingOrderItem` → `points` -- `App\Models\ShoppingCollectOrder` → `points` -- `App\Models\HomepartyUserOrderItem` → `points` - -**Betroffene Services:** -- `app/Services/BusinessPlan/TreeCalcBotOptimized.php` -- Alle Berechnungen in `app/Services/BusinessPlan/` - -**Migration erforderlich:** Ja (mehrere ALTER TABLE) - ---- - -### [X] 3. Vorkasse: Verwendungszweck deutlich machen - -**Priorität:** Hoch -**Bereich:** Checkout / Payment / E-Mail - -**Problem:** -Kunden geben falschen Verwendungszweck an. System kann Zahlung nicht zuordnen. - -**Anforderung:** -- Payone TXID als Verwendungszweck deutlich hervorheben -- Hinweis im Checkout, in E-Mail und im Kundenkonto - -**Technische Details:** -| Parameter | Wert | -|-----------|------| -| Clearingtype | `vor` (Vorkasse) | -| Controller | `App\Http\Controllers\Pay\PayoneController` | -| Checkout-View | `resources/views/web/templates/checkout.blade.php:898` | -| Mail-Template | `resources/views/emails/order_*.blade.php` | -| Kundenkonto | `resources/views/user/order/*.blade.php` | - -**Verwendungszweck-Feld (KORRIGIERT):** -| Falsch | Richtig | -|--------|---------| -| `shopping_payments.reference` | `payment_transactions.txid` | - -**Zugriff auf TXID:** -```php -// Model: App\Models\PaymentTransaction -$transaction = PaymentTransaction::where('shopping_payment_id', $payment->id)->first(); -$verwendungszweck = $transaction->txid; - -// Oder via transmitted_data JSON -$txid = $transaction->transmitted_data['txid'] ?? null; -``` - -**Umsetzung:** -1. **Checkout:** Alert-Box mit Verwendungszweck-Hinweis bei Vorkasse-Auswahl -2. **E-Mail:** Hervorgehobener Block mit Bankdaten + TXID als Verwendungszweck -3. **Kundenkonto:** Info-Box bei unbezahlten Vorkasse-Bestellungen mit TXID - -**Beispiel-Text:** -``` -WICHTIG: Bitte geben Sie als Verwendungszweck ausschließlich folgende Nummer an: -[TXID: 123456789] -Nur so kann Ihre Zahlung automatisch zugeordnet werden. -``` - ---- - -### [X] 4. Paketbox/Packstation Feld - -**Status:** ✅ ERLEDIGT -**Priorität:** Mittel -**Bereich:** Adressverwaltung / Checkout - -**Anforderung:** -- Neues Feld "DHL Postnummer" nur bei Lieferadresse -- Automatische Erkennung: Wenn Postnummer angegeben → Packstation-Modus - -**Technische Details:** -| Parameter | Wert | -|-----------|------| -| Tabelle | `shopping_users` | -| Model | `App\Models\ShoppingUser` | - -**Durchgeführte Implementierung:** - -1. ✅ **Migration erstellt und ausgeführt** - - Datei: `database/migrations/2026_01_22_181707_add_shipping_postnumber_to_shopping_users_table.php` - - Spalte: `shipping_postnumber VARCHAR(20) NULLABLE` - -2. ✅ **Model angepasst** (`app/Models/ShoppingUser.php`) - - Feld im `$fillable` Array - - Methode `hasPostnumber()` hinzugefügt - -3. ✅ **Checkout-Formular** (`resources/views/web/templates/checkout.blade.php`) - - Eingabefeld für Postnummer nach Telefon-Feld - - Placeholder: "12345678" - - JavaScript-Validierung für Packstation-Format - -4. ✅ **DHL Modal** (`resources/views/admin/dhl/modal_in_order_shipment.blade.php`) - - Postnummer-Feld hinzugefügt - -5. ✅ **DHL Service** (`app/Services/DhlModalService.php`) - - Postnummer wird korrekt an DHL API übergeben - -6. ✅ **Kundendetail-Ansicht** (`resources/views/admin/customer/_customer_detail.blade.php`) - - Postnummer wird mit Badge angezeigt - - Hinweistext für Packstation-Lieferung - -7. ✅ **Kunden-Bearbeitungsformular** (`resources/views/admin/customer/_edit.blade.php`) - - Postnummer-Feld direkt nach Telefon-Feld - - Mit Hinweistext und Placeholder - - Wird in User-Bereich und Admin-Bereich verwendet - -8. ✅ **Lieferschein-PDF** (`resources/views/pdf/delivery.blade.php`) - - Postnummer wird fett gedruckt in der Lieferadresse angezeigt - - Format: "DHL Postnummer: 12345678" - -9. ✅ **Alert-Box im Formular** (`resources/views/admin/customer/_edit.blade.php`) - - Deutliche gelbe Warning-Box erscheint, wenn Postnummer ausgefüllt wird - - Erklärt klar, dass bei Packstation-Lieferung: - - Straße/Nr. = "Packstation [Nummer]" (z.B. "Packstation 145") - - PLZ/Ort = Standort der Packstation (nicht Wohnadresse!) - - JavaScript-gesteuerte Ein-/Ausblendung bei Input - - Dismissable (kann vom User geschlossen werden) - -10. ✅ **User-Account Formular** (`resources/views/user/user_form.blade.php`) - - Migration für `user_accounts` Tabelle erstellt und ausgeführt - - Datei: `database/migrations/2026_01_23_102622_add_shipping_postnumber_to_user_accounts_table.php` - - Model `UserAccount` im `$fillable` Array erweitert - - Postnummer-Feld nach shipping_phone hinzugefügt - - Identische Alert-Box wie im Admin-Formular - - Identisches JavaScript für Ein-/Ausblendung - -11. ✅ **Checkout-Formular** (`resources/views/web/templates/checkout.blade.php`) - - Alte kleine Info-Box (alert-info) ersetzt durch große Warning-Box - - Identische gelbe Alert-Box wie in allen anderen Formularen - - JavaScript bereits vorhanden (togglePackstationHint) - - Wird automatisch ein-/ausgeblendet bei Input - -12. ✅ **CheckoutRepository Datenübertragung** (`app/Repositories/CheckoutRepository.php`) - - **Problem behoben:** Postnummer wurde nicht von UserAccount zu ShoppingUser übertragen - - `shoppingUserByAuthUser()` erweitert (Zeile 350): Übertragung für eingeloggte User - - `shoppingUserAuthData()` erweitert (Zeile 418 + 430): Übertragung für Salescenter-Bestellungen - - Postnummer wird jetzt korrekt im Checkout-Formular angezeigt - -13. ✅ **Anzeige-Views erweitert** - Postnummer wird überall angezeigt: - - ✅ `admin/sales/_detail.blade.php` - Admin Bestelldetails - - ✅ `admin/sales/_detail_homparty_user.blade.php` - Homeparty Bestelldetails - - ✅ `portal/order/_detail.blade.php` - Portal Bestelldetails - - ✅ `emails/checkout_status.blade.php` - Bestellstatus E-Mail - - ✅ `emails/checkout.blade.php` - Checkout E-Mail (2 Stellen) - - ✅ `admin/modal/is_like_member.blade.php` - Kundenzuordnung Modal (2 Stellen) - - **Format:** Badge mit Icon + Hinweistext in Web-Views - - **Format:** Fett gedruckt "DHL Postnummer: XXX" in E-Mails - -14. ✅ **Formular-Views erweitert** - Postnummer-Eingabe überall möglich: - - ✅ `portal/customer/_edit_form.blade.php` - Portal Kundenformular - - Postnummer-Feld nach shipping_phone - - Alert-Box mit JavaScript (togglePackstationAlert) - - Identisch zu anderen Formularen - - ✅ `user/order/shipping_me.blade.php` - Bestellung für mich selbst - - Hidden field `shipping_postnumber` hinzugefügt (2 Stellen) - - Für `same_as_billing` true/false Szenarien - -## 🔍 **TIEFENPRÜFUNG DURCHGEFÜHRT - Weitere kritische Lücken gefunden und geschlossen!** - -15. ✅ **KRITISCHE CONTROLLER/SERVICES KORRIGIERT** - Datenübertragung sichergestellt: - - ✅ `app/Services/UserUtil.php` (Zeile 101) - - ShoppingUser-Erstellung aus UserAccount - - `shipping_postnumber` fehlte komplett! - - ✅ `app/Services/AboOrderCart.php` (Zeilen 277 + 289) - - Abo-Bestellungen: ShoppingUser aus UserAccount - - `shipping_postnumber` fehlte an 2 Stellen (same_as_billing true/false) - - ✅ `app/Services/PaymentHelper.php` (Zeile 115) - - Payment ShoppingUser Update - - `shipping_postnumber` fehlte komplett! - -16. ✅ **WEITERE FEHLENDE VIEWS ERGÄNZT**: - - ✅ `user/homeparty/_address.blade.php` (2 Stellen) - - Homeparty Adressanzeige (billing + shipping) - - Fett: "DHL Postnummer: XXX" - - ✅ `user/order/payment/custom_payment.blade.php` - - Custom Payment Bestelldetails - - Badge mit Info-Text - - ✅ `emails/custom_payment.blade.php` - - Custom Payment E-Mail - - Fett: "DHL Postnummer: XXX" - -**Übersetzungen:** -- DE: `payment.dhl_postnumber` = "DHL Postnummer" -- EN: `payment.dhl_postnumber` = "DHL Post Number" -- ES: `payment.dhl_postnumber` = "Número de correo DHL" -- **Neue Alert-Box Übersetzungen** in `resources/lang/{de,en,es}/payment.php`: - - `packstation_alert_title` - - `packstation_alert_intro` - - `packstation_alert_street` - - `packstation_alert_street_example` - - `packstation_alert_location` - - `packstation_alert_not_home` - - `packstation_alert_footer` - -**DHL API Integration:** -```php -if ($user->shipping_postnumber) { - $recipient['postNumber'] = $user->shipping_postnumber; - // shipping_address enthält "Packstation 145" (3-stellige Nummer!) -} -``` - -**Wichtige Hinweise zur Packstation-Nummer:** -- ⚠️ **Packstation-NUMMER ist 3-stellig** (100-999, steht auf gelbem Schild) -- 📱 **DHL Postnummer ist 6-10-stellig** (separate Kundennummer in DHL App) -- 🚫 **Häufiger Fehler:** Postnummer wird als Packstation-Nummer eingegeben -- ✅ **Richtig:** "Packstation 145" (nicht "Packstation 12345") -- 📄 **Anleitung:** `/dev/22-01-2026/packstation-anleitung.md` - -**Verbesserte Fehlermeldungen:** -- Detaillierte Fehlermeldung bei ungültiger Packstation-Nummer -- Frontend-Hinweise in allen Formularen aktualisiert (DE, EN, ES) -- Logging mit allen relevanten Daten für besseres Debugging - ---- - -### [X] 5. Set/Kit Produkte: Inhalte auflisten - -**Priorität:** Mittel -**Bereich:** Produkte / Rechnungen / Lieferscheine - -**Problem:** -Bei Sets/Kits werden enthaltene Einzelprodukte nicht aufgelistet. - -**Anforderung:** -- Alle enthaltenen Produkte unter dem Set auflisten -- Auf Rechnung und Lieferschein ausweisen -- Admin-UI: Dropdown + Liste (wie bei Inhaltsstoffen) - -**Referenz-Implementierung (Inhaltsstoffe):** -| Parameter | Wert | -|-----------|------| -| Pivot-Tabelle | `product_ingredients` | -| Model | `App\Models\ProductIngredient` | -| Relation | `Product::p_ingredients()` (belongsToMany) | - -**Neue Tabellen-Struktur (analog zu Inhaltsstoffen):** -```sql -CREATE TABLE product_bundles ( - id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY, - product_id BIGINT UNSIGNED NOT NULL, -- Das Set/Kit (Parent) - bundle_product_id BIGINT UNSIGNED NOT NULL, -- Enthaltenes Produkt (Child) - quantity INT UNSIGNED DEFAULT 1, - pos INT UNSIGNED DEFAULT 0, -- Sortierung - created_at TIMESTAMP NULL, - updated_at TIMESTAMP NULL, - FOREIGN KEY (product_id) REFERENCES products(id) ON DELETE CASCADE, - FOREIGN KEY (bundle_product_id) REFERENCES products(id) ON DELETE CASCADE, - UNIQUE KEY unique_bundle (product_id, bundle_product_id) -); -``` - -**Neue Model-Relation in `Product.php`:** -```php -public function bundleItems() -{ - return $this->belongsToMany(Product::class, 'product_bundles', 'product_id', 'bundle_product_id') - ->withPivot('quantity', 'pos') - ->orderBy('pos'); -} - -public function isBundle(): bool -{ - return $this->bundleItems()->count() > 0; -} -``` - -**Admin-UI (wie Inhaltsstoffe):** -- Dropdown zur Produktauswahl -- Listenansicht mit Menge und Sortierung -- Vorlage: `resources/views/admin/product/` → Ingredients-Sektion kopieren - -**Betroffene Views:** -- `resources/views/pdf/invoice.blade.php` → Bundle-Items unter Produkt auflisten -- `resources/views/pdf/delivery.blade.php` → Bundle-Items auflisten -- Shop-Produktdetailseiten - ---- - -### [!] 6. Mehrsprachigkeit: Rechnungen, Provisionen, Lieferscheine - -**Priorität:** Hoch -**Bereich:** PDF-Generierung / E-Mail - -**Anforderung:** -- Deutsche Version bleibt primär (rechtlich bindend) -- Zusätzliche Kopie in Landessprache (EN, ES, FR) -- Sprache aus User-Einstellung (`users.locale`) - -**Technische Details:** -| Parameter | Wert | -|-----------|------| -| PDF-Service | `App\Services\Invoice` | -| Templates | `resources/views/pdf/*.blade.php` | -| Mail | `App\Mail\MailInvoice` | -| User-Sprache | `users.locale` (Spalte prüfen/anlegen) | - -**Betroffene Dokumente:** -| Dokument | Datei | Status | -|----------|-------|--------| -| Rechnung | `invoice.blade.php` | [ ] | -| Lieferschein | `delivery.blade.php` | [ ] | -| Provisionsabrechnung | `credit_details.blade.php` | [ ] | -| Stornorechnung | (neu) | [ ] | -| Mitgliedschaftsverlängerung | E-Mail Template | [ ] | -| Partnerantrag/Vertrag | PDF Template | [ ] | - -**Umsetzung:** -```php -// Invoice Service erweitern -public function generatePdf(Order $order, string $locale = 'de'): string -{ - app()->setLocale($locale); - // PDF generieren... -} - -// Zwei PDFs generieren -$pdfDE = $this->generatePdf($order, 'de'); -$pdfUser = $this->generatePdf($order, $user->locale ?? 'de'); - -// Bei E-Mail beide anhängen (wenn unterschiedlich) -if ($user->locale && $user->locale !== 'de') { - $mail->attach($pdfDE, ['as' => 'Rechnung-DE.pdf']); - $mail->attach($pdfUser, ['as' => 'Invoice-' . strtoupper($user->locale) . '.pdf']); -} -``` - -**Speicherung:** -- Beide PDFs im System speichern (Bestellungen-Ansicht) -- Zusätzliche Spalten in `user_invoices`: `file_localized`, `locale` - ---- - -### [!] 7. Stornorechnungen mit Punktekorrektur - -**Priorität:** Hoch -**Bereich:** Admin / Rechnungswesen / Marketingplan - -**Problem:** -- Storno-Button fehlt im Admin -- Punkte werden bei Storno NICHT abgezogen (in gesamter MLM-Struktur) - -**Anforderung:** -- Button "Stornorechnung erstellen" neben Rechnung -- Negativbetrag im Rechnungskreis -- Punkte in gesamter MLM-Struktur korrigieren (Upline!) -- Mehrsprachigkeit beachten - -**Technische Details:** -| Parameter | Wert | -|-----------|------| -| Model | `App\Models\UserInvoice` | -| Storno-Felder | `cancellation`, `cancellation_id`, `cancellation_date` | -| Punkte-Model | `App\Models\UserSalesVolume` | -| Business-Model | `App\Models\UserBusiness` | -| Admin-View | `resources/views/admin/order/*.blade.php` | - -**Punktekorrektur-Logik:** -```php -// 1. Original-SalesVolume finden -$salesVolume = UserSalesVolume::where('order_id', $order->id)->first(); - -// 2. Punkte negieren (neuer Eintrag mit negativen Werten) -UserSalesVolume::create([ - 'user_id' => $salesVolume->user_id, - 'order_id' => $order->id, - 'month' => $salesVolume->month, - 'year' => $salesVolume->year, - 'month_points' => -$salesVolume->month_points, - 'month_KP_points' => -$salesVolume->month_KP_points, - 'status' => 6, // Neuer Status: 'cancelled' -]); - -// 3. Upline-Struktur durchlaufen und korrigieren -// → TreeCalcBotOptimized neu berechnen oder separater CancellationService -``` - -**Betroffene Tabellen:** -``` -user_sales_volumes → Negativer Eintrag hinzufügen -user_business → Monatsdaten neu berechnen (oder Neuberechnung triggern) -``` - -**Admin-Route:** -```php -Route::post('/admin/invoice/{id}/cancel', [InvoiceController::class, 'cancel']); -``` - ---- - -### [ ] 8. Französisch hinzufügen - -**Priorität:** Mittel -**Bereich:** Lokalisierung - -**Anforderung:** -- Neue Sprachdateien: `resources/lang/fr/` -- Monatsstatistik übersetzen -- Vorkasse-Texte übersetzen - -**Technische Details:** -| Parameter | Wert | -|-----------|------| -| Verzeichnis | `resources/lang/fr/` | -| Vorlage | `resources/lang/de/` kopieren | - -**Dateien erstellen:** -``` -resources/lang/fr/ -├── abo.php -├── backend.php -├── cal.php -├── customer.php -├── email.php -├── home.php -├── marketingplan.php -├── navigation.php -├── payment.php -└── team.php -``` - -**Umsetzung:** -```bash -cp -r resources/lang/de resources/lang/fr -# Dann alle Dateien übersetzen -``` - ---- - -### [!] 9. Gutschriften: Falsche Punkteberechnung - -**Priorität:** Hoch -**Bereich:** Marketingplan / Team-Ansicht - -**Problem:** -Gutschriften werden nicht korrekt zu Punkten addiert. Unterschiedliche Anzeige für Admin vs. User. - -**Beispiel:** -- Monika Kunz: Admin sieht 625 Punkte, User sieht 1115 Punkte (Dezember) -- Differenz: 490 Punkte → vermutlich Gutschrift nicht berücksichtigt - -**Technische Details:** -| Parameter | Wert | -|-----------|------| -| Service | `App\Services\BusinessPlan\TreeCalcBotOptimized` | -| Status | `UserSalesVolume.status = 4` (credit/Gutschrift) | -| Model | `App\Models\UserSalesVolume` | - -**Status-Mapping:** -```php -0 => 'not_assigned' -1 => 'advisor_order' -2 => 'shoporder' -3 => 'shoporder_pending' -4 => 'credit' // ← Gutschrift -5 => 'registration' -``` - -**Debugging-Schritte:** -1. Query für User mit `status = 4` im betroffenen Monat prüfen: - ```php - UserSalesVolume::where('user_id', $userId) - ->where('month', 12)->where('year', 2025) - ->where('status', 4)->get(); - ``` -2. Berechnung in `getPointsKPSum()` / `getPointsTPSum()` validieren -3. Team-View Query vs. Admin-View Query vergleichen -4. Prüfen ob `status_points` korrekt gesetzt ist - -**Vermutete Ursache:** -- Admin-Query filtert `status = 4` aus -- User-Query inkludiert alle Status - ---- - -### [!] 10. Nicht zugeordnete Zahlungen/Punkte - -**Priorität:** Hoch -**Bereich:** Payment / Admin - -**Problem:** -Zahlungen ohne Zuordnung → Punkte verschwinden, keine Provision. - -**Anforderung:** -- Admin-Hinweis bei nicht zugeordneten Zahlungen -- Manuelle Zuordnungsmöglichkeit - -**Technische Details:** -| Parameter | Wert | -|-----------|------| -| Tabelle | `user_sales_volumes` | -| Status-Feld | `status = 0` (not_assigned) | -| Admin-View | Dashboard oder separate Sektion | - -**Query für nicht zugeordnete Einträge:** -```php -$unassigned = UserSalesVolume::where('status', 0) - ->with('user', 'order') - ->orderBy('created_at', 'desc') - ->get(); -``` - -**Umsetzung:** -1. **Dashboard-Alert:** Anzahl nicht zugeordneter Einträge anzeigen -2. **Admin-Seite:** Liste aller nicht zugeordneten Einträge -3. **Zuordnungs-Modal:** - - User auswählen (Dropdown/Suche) - - Status aktualisieren (1 = advisor_order, 2 = shoporder) - - Punkte werden bei nächster Berechnung berücksichtigt - ---- - -### [ ] 11. Monatsstatistik Erweiterungen - -**Priorität:** Mittel -**Bereich:** Dashboard / Team - -**Probleme:** -- Teamumsatz wird seit Januar nicht angezeigt -- Neupartner/Abos nicht klickbar (keine Detailansicht) - -**Anforderungen:** -| Feature | Beschreibung | -|---------|--------------| -| Teamumsatz | Bug fixen - wird nicht angezeigt | -| Neupartner Details | Klick → Liste mit Name, E-Mail, Telefon, Generation, Mentor | -| Team-Abos Details | Klick → Liste mit Abo-Details | -| 1000-Punkte-Shops | Neue Kennzahl: Teampartner mit ≥1000 Punkte persönlichem Volumen | -| Aktuelle Provision | In Monatsstatistik anzeigen | -| Downline-Kontakte | Telefon, E-Mail, Adresse der eigenen Downline abrufbar (nicht nur VIPs) | - -**Technische Details:** -| Parameter | Wert | -|-----------|------| -| Service | `App\Services\LevelReportService` | -| Controller | `App\Http\Controllers\User\TeamController` | -| View | `resources/views/user/team/marketingplan.blade.php` | -| Daten | `user_business` Tabelle | - -**1000-Punkte Query:** -```php -$count1000 = UserBusiness::where('month', $month) - ->where('year', $year) - ->where('sales_volume_points_sum', '>=', 1000) - ->whereIn('user_id', $teamUserIds) - ->count(); -``` - -**Klickbare Details (AJAX Modal):** -```php -// Route -Route::get('/team/new-partners/{month}/{year}', [TeamController::class, 'newPartnersDetail']); - -// Response -return response()->json([ - 'partners' => $partners->map(fn($p) => [ - 'name' => $p->full_name, - 'email' => $p->email, - 'phone' => $p->phone, - 'generation' => $p->generation, - 'mentor' => $p->mentor->full_name ?? '-' - ]) -]); -``` - ---- - -### [ ] 12. Bezahllink Status-Unterscheidung - -**Priorität:** Mittel -**Bereich:** Payment / Admin - -**Problem:** -Unklar ob Payment-Link nur geklickt oder Zahlung wirklich durchgeführt. - -**Anforderung:** -| Status | Bedeutung | Farbe | -|--------|-----------|-------| -| `link_sent` | Link wurde versendet | grau | -| `link_clicked` | Link wurde geklickt, keine Zahlung | orange | -| `payment_pending` | Zahlung in Bearbeitung | gelb | -| `paid` | Zahlung erfolgreich | grün | -| `failed` | Zahlung fehlgeschlagen | rot | - -**Technische Details:** -| Parameter | Wert | -|-----------|------| -| Tabelle | `shopping_payments` | -| Feld | `txaction` (VARCHAR 20) | -| Service | `App\Services\Payment` | - -**Aktuelle Status (ungenau):** -```php -'paid' => 'paid' -'appointed' => 'open' // ← Zu ungenau -'failed' => 'failed' -'extern' => 'open' // ← Zu ungenau -``` - -**Umsetzung:** -1. Neues Feld oder erweiterte `txaction`-Werte -2. Bei Payment-Link-Aufruf: Status auf `link_clicked` setzen -3. Bei Payone-Callback: Status entsprechend aktualisieren -4. Admin-View: Farbkodierung nach neuem Schema - ---- - -### [?] 13. Steuerberater-Modul - -**Priorität:** Niedrig -**Status:** Noch zu definieren - -**Notiz:** Weitere Infos liegen vor - müssen noch spezifiziert werden. - -**TODO:** Anforderungen dokumentieren - ---- - -### [X] 14. DHL Modul Erweiterungen - -**Status:** ✅ ERLEDIGT -**Priorität:** Hoch -**Bereich:** Versand / packages/acme-laravel-dhl - -**Implementierte Funktionen:** -| Feature | Status | Beschreibung | -|---------|--------|--------------| -| Storno-Etiketten UI | ✅ | Admin-Button für Label-Stornierung | -| Tracking-Abfrage | ✅ | Status automatisch abrufen | -| Tracking-Mail | ✅ | Kunde über Versand informieren | - -**Technische Details:** -| Parameter | Wert | -|-----------|------| -| Package | `packages/acme-laravel-dhl` | -| Model | `DhlShipment` | -| Tabelle | `dhl_package_shipments` | -| Status-Feld | `status` (created/in_transit/delivered/canceled) | -| Tracking-Tabelle | `dhl_tracking_events` | - -**Vorhandene Jobs (bereits implementiert):** -- `CreateShipmentJob` ✓ -- `CancelShipmentJob` ✓ (existiert, nutzt `canCancel()`) -- `CreateReturnLabelJob` ✓ -- `SyncTrackingJob` ✓ (Webhook-basiert) - -**Durchgeführte Implementierung:** - -1. ✅ **Admin-UI für Storno:** - - Button "Label stornieren" in Bestellansicht (`_detail_dhl_shipments.blade.php`) - - Button im DHL Cockpit DataTable aktiviert (`DhlShipmentController.php`) - - JavaScript Handler für Storno-Button in beiden Views - - Dispatcht `CancelShipmentJob` - - Nur wenn `$shipment->canCancel()` = true - - Bestätigungsdialog mit Warnung vor ungültigem Label - -2. ✅ **Tracking-Mail an Kunde:** - - Mail-Klasse: `App\Mail\MailDhlTracking` (bereits vorhanden) - - E-Mail Template: `resources/views/emails/dhl_tracking.blade.php` - - Trigger: Nach Status-Update auf `in_transit` (automatisch via Cron) - - Manueller Versand: Button in Admin-UI - - Inhalt: Sendungsnummer + Tracking-Link + Bestellnummer - - Übersetzungen: DE, EN, ES bereits vorhanden - - Tracking Status wird in Datenbank gespeichert (tracking_email_sent_at, tracking_email_type) - -3. ✅ **Cron für Tracking (Alternative zu Webhook):** - - Command: `app/Console/Commands/DhlUpdateTracking.php` - - Signature: `php artisan dhl:update-tracking` - - Optionen: - - `--days=14`: Sendungen der letzten X Tage aktualisieren - - `--send-emails`: Automatisch E-Mails bei Transit-Status senden - - `--dry-run`: Nur simulieren, keine Änderungen - - Cron-Job eingetragen in `app/Console/Kernel.php`: - - Täglich um 06:00 Uhr - - Mit automatischem E-Mail-Versand - - `withoutOverlapping()` und `runInBackground()` - - Statistik-Ausgabe: updated, failed, emails_sent, skipped - -4. ✅ **Retourenlabel-Button:** - - Button "Retourenlabel erstellen" im DHL Cockpit aktiviert - - JavaScript Handler hinzugefügt - - Dispatcht `CreateReturnLabelJob` - - Nur für ausgehende Sendungen ohne vorhandene Retoure - -**Routen (bereits vorhanden):** -```php -Route::delete('/admin/dhl/shipment/{shipment}/cancel', ...) # Storno -Route::post('/admin/dhl/shipment/{shipment}/return-label', ...) # Retourenlabel -Route::post('/admin/dhl/shipment/{shipment}/update-tracking', ...) # Tracking Update -Route::post('/admin/dhl/shipment/{shipment}/send-tracking-email', ...) # E-Mail senden -``` - -**DHL API Endpunkte:** -``` -DELETE /parcel/de/shipping/v2/orders/{shipmentNumber} # Storno -GET /parcel/de/tracking/v1/shipments/{shipmentNumber} # Tracking -``` - -**Betroffene Dateien:** -1. `resources/views/admin/sales/_detail_dhl_shipments.blade.php` - Storno-Button hinzugefügt -2. `resources/views/admin/dhl/cockpit.blade.php` - JavaScript Handler erweitert -3. `app/Http/Controllers/DhlShipmentController.php` - Nutzt jetzt `DhlShipmentService` -4. `app/Services/DhlShipmentService.php` - **Erweitert um `cancelShipment()` Methode** -5. `app/Jobs/CancelShipmentJob.php` - **Aktualisiert für neues Package-Model** -6. `app/Console/Commands/DhlUpdateTracking.php` - Tracking Command (bereits vorhanden) -7. `app/Console/Kernel.php` - Cron-Job (bereits eingetragen) -8. `app/Mail/MailDhlTracking.php` - E-Mail Klasse (bereits vorhanden) -9. `resources/views/emails/dhl_tracking.blade.php` - E-Mail Template (bereits vorhanden) -10. `resources/lang/{de,en,es}/email.php` - Übersetzungen (bereits vorhanden) - -**Fix für Model-Typ-Konflikt & Queue-Config:** -- `CancelShipmentJob` wurde von `App\Models\DhlShipment` auf `Acme\Dhl\Models\DhlShipment` migriert -- Nutzt jetzt `Acme\Dhl\Services\ShippingService::cancelLabel()` aus dem neuen Package -- Verwendet `dhl_shipment_no` statt `shipment_number` (korrektes Feld-Mapping) -- **`DhlShipmentService::cancelShipment()` hinzugefügt:** - - Prüft `DHL_USE_QUEUE` Config-Einstellung - - Verwendet Queue (`CancelShipmentJob`) wenn aktiviert - - Führt synchron aus (`ShippingService::cancelLabel()`) wenn deaktiviert - - Konsistentes Verhalten wie bei `createShipment()` -- **Controller nutzt jetzt Service statt direkt Job zu dispatchen:** - - `DhlShipmentController::cancel()` ruft `DhlShipmentService::cancelShipment()` auf - - Automatische Entscheidung zwischen Queue/Sync basierend auf Config - -**Verwendung:** - -**Manuell:** -```bash -# Tracking aktualisieren (Simulation) -php artisan dhl:update-tracking --dry-run - -# Tracking aktualisieren mit E-Mail-Versand -php artisan dhl:update-tracking --days=7 --send-emails - -# Nur letzte 3 Tage aktualisieren -php artisan dhl:update-tracking --days=3 - -# NEU: Test-E-Mail an eigene Adresse -php artisan dhl:update-tracking --send-emails --test-email=admin@firma.de - -# NEU: Nur für bestimmte Bestellung -php artisan dhl:update-tracking --send-emails --order=45078 -``` - -**Automatisch via Cron:** -- Läuft täglich um 06:00 Uhr -- Aktualisiert Sendungen der letzten 14 Tage -- Sendet automatisch E-Mails bei Status-Änderung zu "in_transit" -- Verhindert Überlappungen mit `withoutOverlapping()` - -**NEU: Mehrere Sendungen in einer E-Mail:** -- Wenn eine Bestellung mehrere Labels hat, werden alle in einer E-Mail zusammengefasst -- Automatisch beim manuellen Versand über Admin-Button -- Automatisch beim Cronjob-Versand -- Zeigt "Paket 1, Paket 2, Paket 3" mit jeweiliger Tracking-Nummer -- Markiert alle Sendungen als versendet - -**NEU: Versand-Status in Bestelldetails:** -- Zeigt wann E-Mail versendet wurde -- Zeigt ob automatisch (Cronjob) oder manuell (Admin) -- Icons: 🤖 Automatisch / 👤 Manuell - -**NEU: E-Mail-Feld für bestehende Sendungen nachfüllen:** -```bash -# Dry-Run (nur simulieren) -php artisan dhl:backfill-emails --dry-run - -# Tatsächlich ausführen -php artisan dhl:backfill-emails -``` - -**NEU: E-Mail + Postnummer bei Label-Erstellung:** -- ✅ Migration hinzugefügt: `2026_01_23_140000_add_email_and_postnumber_to_dhl_shipments.php` -- ✅ Neue Felder in `dhl_package_shipments`: `email`, `postnumber` -- ✅ Model `DhlShipment` erweitert um beide Felder -- ✅ Formular-Feld für E-Mail hinzugefügt in `modal_in_order_shipment.blade.php` -- ✅ E-Mail-Feld ist Pflichtfeld mit Validierung (type="email", required) -- ✅ Vorbefüllung mit Billing-E-Mail aus `order->shopping_user->email` -- ✅ Postnummer-Feld bereits vorhanden (optional für Packstation) -- ✅ Controller-Validierung erweitert: `shipping_email` (required), `shipping_postnumber` (nullable) -- ✅ `DhlDataHelper` übergibt E-Mail + Postnummer an ShippingService -- ✅ `ShippingService::createShipmentRecord()` speichert beide Felder in DB -- ✅ Daten werden sowohl direkt als auch im JSON `recipient` gespeichert - -**Zweck der Felder:** -- `email`: Wird für DHL Benachrichtigungen und Tracking-E-Mails verwendet -- `postnumber`: DHL Postnummer (6-10 Stellen) für Packstation/Paketbox-Lieferungen - -**E-Mail-Button-Logik:** -- ✅ Button wird angezeigt, wenn Sendung eine `dhl_shipment_no` hat UND eine E-Mail verfügbar ist -- ✅ Priorisierung: Shipment-Email > Shopping-User-Email -- ✅ `canSendTrackingEmail()` prüft zuerst das neue `email` Feld -- ✅ Fallback auf `shopping_user->email` wenn Shipment-Email leer -- ✅ Button funktioniert in beiden Views: Bestelldetails + DHL Cockpit - -**E-Mail-Versand-Priorisierung:** -1. **Test-E-Mail** (falls angegeben im Cronjob mit `--test-email`) -2. **Shipment-Email** (aus `dhl_package_shipments.email`) -3. **Shopping-User-Email** (Fallback aus `shopping_users.email`) - -**Betroffene Dateien (E-Mail + Postnummer):** -1. `database/migrations/2026_01_23_140000_add_email_and_postnumber_to_dhl_shipments.php` - NEU -2. `packages/acme-laravel-dhl/src/Models/DhlShipment.php` - fillable + canSendTrackingEmail() erweitert -3. `resources/views/admin/dhl/modal_in_order_shipment.blade.php` - E-Mail-Feld hinzugefügt -4. `app/Http/Controllers/DhlShipmentController.php` - Validierung + E-Mail-Priorisierung -5. `packages/acme-laravel-dhl/src/Services/ShippingService.php` - Speicherung erweitert -6. `app/Console/Commands/DhlUpdateTracking.php` - E-Mail-Priorisierung im Cronjob -7. `app/Services/DhlDataHelper.php` - Übergibt E-Mail + Postnummer (bereits vorhanden) -8. `app/Services/DhlModalService.php` - Liest Formularfelder (bereits vorhanden) -9. `resources/views/admin/dhl/show.blade.php` - E-Mail-Button + JavaScript Handler -10. `resources/views/admin/sales/_detail_dhl_shipments.blade.php` - E-Mail-Button + Handler (bereits vorhanden) -11. `resources/views/admin/dhl/modal_in_shipment_info.blade.php` - E-Mail-Button im Modal -12. `app/Console/Commands/DhlBackfillEmails.php` - Command zum Nachfüllen (NEU) - -**E-Mail-Button Standorte:** -✅ Bestelldetails (_detail_dhl_shipments.blade.php) -✅ DHL Cockpit (cockpit.blade.php) -✅ DHL Detail-Seite (show.blade.php) -✅ Modal nach Label-Erstellung (modal_in_shipment_info.blade.php) - -**NEU: Return Label (Retourenlabel) Funktionalität:** -✅ Button in allen DHL Views hinzugefügt -✅ Controller mit Sync/Async Unterstützung (DHL_USE_QUEUE) -✅ Job aktualisiert für neues DHL Package -✅ Automatisches Adress-Tausch (Kunde → Absender, Lager → Empfänger) -✅ Prüfung ob bereits Retoure existiert -✅ Nur für ausgehende Sendungen verfügbar -✅ **API-Fix (23.01.2026):** ReturnsService statt ShippingService verwenden -✅ Korrekter DHL Returns API Endpunkt: `/parcel/de/returns/v1/labels` -✅ Korrekte Payload-Struktur für Returns API -✅ Verbesserte Validierung und Fehlerbehandlung -✅ Erweitertes Logging für Debugging -✅ **Country-Code Fix:** Automatische Konvertierung 2-stellig → 3-stellig (DE → DEU) -✅ **Fallback-Implementierung:** Automatischer Fallback zu regulärer Shipping-API (V07PAK) bei fehlenden Returns-API Berechtigungen -✅ Intelligente Fehlerbehandlung für Auth-Fehler (401/403) -✅ Transparentes Logging welche Methode verwendet wird -✅ **Fallback-Fixes (23.01.2026):** Country-Code Konvertierung (3→2 Buchstaben), Dimensions hinzugefügt, print_format gesetzt -✅ Automatische Adress-Konvertierung für ShippingService-Kompatibilität -✅ **V01PAK statt V07PAK:** V07PAK nicht verfügbar, verwende V01PAK (Standard DHL Paket) mit vertauschten Adressen -✅ **Return-Label Fixes (23.01.2026 - 17:30):** Type-Update korrigiert ($result['shipment'] statt $result['shipmentId']) -✅ Doppelklick-Schutz für Return-Button implementiert -✅ Existierende Return-Labels (ID 18, 19) manuell korrigiert zu type='return' - -**Return Label Button Standorte:** -✅ Bestelldetails (_detail_dhl_shipments.blade.php) - NEU -✅ DHL Cockpit (cockpit.blade.php) - funktioniert -✅ DHL Detail-Seite (show.blade.php) - aktiviert -✅ Nur sichtbar wenn: type='outbound' UND keine Retoure existiert - -**NEU: Return Label Visuelle Hervorhebung (23.01.2026):** -✅ Return-Etiketten deutlich erkennbar mit oranger Farbgebung -✅ Orange "RETOURE" Badge (statt blau) in allen Listen -✅ Orange ID-Links mit Undo-Icon in allen Tabellen -✅ Zeilen-Highlighting in DataTable (orangener Hintergrund + linker Border) -✅ Zeilen-Highlighting in Order-Details (orangener Hintergrund) -✅ Größeres, fetteres Badge in Detail-Ansicht (show.blade.php) -✅ CSS-Klasse `return-shipment` für DataTable-Zeilen -✅ Konsistente orange Farbgebung (`badge-warning`, `text-warning`, `#ffc107`) -✅ Return-Etiketten bekommen KEINEN "Retourenlabel erstellen" Button - -**Betroffene Dateien (Styling):** -1. `app/Http/Controllers/DhlShipmentController.php` - DataTable Spalten (ID, Typ) -2. `resources/views/admin/dhl/cockpit.blade.php` - CSS + JS für Zeilen-Highlighting -3. `resources/views/admin/dhl/show.blade.php` - Header Badge + Icon -4. `resources/views/admin/sales/_detail_dhl_shipments.blade.php` - Zeilen-Style + Badge - -**Dokumentation:** `dev/23-01-2026/dhl-return-label-styling.md` - ---- - -## ZUSAMMENFASSUNG - -| # | Aufgabe | Priorität | Komplexität | Bereich | -|---|---------|-----------|-------------|---------| -| 1 | News Links + Datei-Auswahl | Hoch | Niedrig | Frontend | -| 2 | Points DECIMAL | Hoch | Hoch | DB/Backend | -| 3 | Vorkasse TXID Hinweis | Hoch | Niedrig | Frontend | -| 4 | Packstation/Postnummer | Mittel | Mittel | DB/Frontend | -| 5 | Set-Produkte (wie Inhaltsstoffe) | Mittel | Hoch | DB/Backend | -| 6 | Mehrsprachigkeit PDFs | Hoch | Mittel | Backend | -| 7 | Stornorechnungen + Punktekorrektur | Hoch | Hoch | Backend | -| 8 | Französisch | Mittel | Niedrig | i18n | -| 9 | Gutschriften Punkte Bug | Hoch | Mittel | Backend | -| 10 | Nicht zugeordnete Zahlungen | Hoch | Mittel | Backend | -| 11 | Monatsstatistik Erweiterungen | Mittel | Mittel | Backend | -| 12 | Bezahllink Status | Mittel | Niedrig | Backend | -| 13 | Steuerberater | Niedrig | ? | TBD | -| 14 | DHL UI + Tracking-Mail | Hoch | Mittel | Package | - ---- - -## EMPFOHLENE REIHENFOLGE - -### Phase 1: Quick Wins (Frontend, niedrige Komplexität) -- [ ] #1 News Links -- [ ] #3 Vorkasse TXID Hinweis -- [ ] #12 Bezahllink Status - -### Phase 2: Kritische Bugs (Provisionen betroffen) -- [ ] #9 Gutschriften Punkte Bug -- [ ] #10 Nicht zugeordnete Zahlungen - -### Phase 3: Infrastruktur (DB-Änderungen) -- [ ] #2 Points DECIMAL (benötigt Migration + Testing) -- [ ] #7 Stornorechnungen mit Punktekorrektur - -### Phase 4: Features -- [ ] #6 Mehrsprachigkeit PDFs -- [ ] #14 DHL UI + Tracking-Mail -- [ ] #11 Monatsstatistik Erweiterungen - -### Phase 5: Langfristig -- [ ] #4 Packstation/Postnummer -- [ ] #5 Set-Produkte Bundles -- [ ] #8 Französisch -- [ ] #13 Steuerberater-Modul diff --git a/packages/acme-laravel-dhl/src/Models/DhlShipment.php b/packages/acme-laravel-dhl/src/Models/DhlShipment.php index c5dba3b..8737e3c 100644 --- a/packages/acme-laravel-dhl/src/Models/DhlShipment.php +++ b/packages/acme-laravel-dhl/src/Models/DhlShipment.php @@ -34,6 +34,7 @@ class DhlShipment extends Model 'recipient', 'tracking_status', 'last_tracked_at', + 'tracking_completed_at', 'tracking_email_sent_at', 'tracking_email_type', 'api_response_data', @@ -43,6 +44,7 @@ class DhlShipment extends Model 'recipient' => 'array', 'api_response_data' => 'array', 'last_tracked_at' => 'datetime', + 'tracking_completed_at' => 'datetime', 'tracking_email_sent_at' => 'datetime', 'weight_kg' => 'decimal:3', ]; @@ -162,7 +164,7 @@ class DhlShipment extends Model */ public function getStatusTranslation(): string { - return __('dhl.status.' . $this->status, [], $this->status); + return __('dhl.status.'.$this->status, [], $this->status); } /** @@ -170,7 +172,7 @@ class DhlShipment extends Model */ public static function getStatusTranslationFor(string $status): string { - return __('dhl.status.' . $status, [], $status); + return __('dhl.status.'.$status, [], $status); } /** @@ -178,7 +180,7 @@ class DhlShipment extends Model */ public function getTypeTranslation(): string { - return __('dhl.type.' . $this->type, [], $this->type); + return __('dhl.type.'.$this->type, [], $this->type); } /** @@ -186,7 +188,7 @@ class DhlShipment extends Model */ public function getProductCodeTranslation(): string { - return __('dhl.product_codes.' . $this->product_code, [], $this->product_code); + return __('dhl.product_codes.'.$this->product_code, [], $this->product_code); } /** @@ -194,7 +196,7 @@ class DhlShipment extends Model */ public function getTrackingUrl(): string { - return 'https://www.dhl.de/de/privatkunden/pakete-empfangen/verfolgen.html?piececode=' . $this->dhl_shipment_no; + return 'https://www.dhl.de/de/privatkunden/pakete-empfangen/verfolgen.html?piececode='.$this->dhl_shipment_no; } /** @@ -267,6 +269,77 @@ class DhlShipment extends Model return $query->whereNotIn('status', ['delivered', 'canceled', 'returned', 'failed']); } + /** + * Terminal statuses where tracking is considered complete + */ + public const TERMINAL_STATUSES = ['delivered', 'canceled', 'returned', 'failed']; + + /** + * Tracking interval per status (in hours). + * Determines how often each status should be re-checked via the DHL API. + */ + public const TRACKING_INTERVALS = [ + 'out_for_delivery' => 1, + 'in_transit' => 2, + 'exception' => 4, + 'unknown' => 4, + 'created' => 6, + ]; + + /** + * Default tracking interval in hours for statuses not explicitly listed + */ + public const DEFAULT_TRACKING_INTERVAL = 4; + + /** + * Scope for shipments that need a tracking update based on status-dependent intervals. + * Skips shipments that are already completed or were recently tracked. + */ + public function scopeNeedsTrackingUpdate($query) + { + return $query + ->whereNull('tracking_completed_at') + ->whereNotNull('dhl_shipment_no') + ->where(function ($q) { + $q->whereNull('last_tracked_at') // Noch nie getrackt → sofort + ->orWhere(function ($q2) { + // Status-abhängige Intervalle + $q2->where(function ($q3) { + $q3->where('status', 'out_for_delivery') + ->where('last_tracked_at', '<', now()->subHours(self::TRACKING_INTERVALS['out_for_delivery'])); + })->orWhere(function ($q3) { + $q3->where('status', 'in_transit') + ->where('last_tracked_at', '<', now()->subHours(self::TRACKING_INTERVALS['in_transit'])); + })->orWhere(function ($q3) { + $q3->whereIn('status', ['exception', 'unknown']) + ->where('last_tracked_at', '<', now()->subHours(self::TRACKING_INTERVALS['exception'])); + })->orWhere(function ($q3) { + $q3->where('status', 'created') + ->where('last_tracked_at', '<', now()->subHours(self::TRACKING_INTERVALS['created'])); + }); + }); + }); + } + + /** + * Check if tracking for this shipment is in a terminal state + */ + public function isTrackingComplete(): bool + { + return $this->tracking_completed_at !== null + || in_array($this->status, self::TERMINAL_STATUSES); + } + + /** + * Mark tracking as completed + */ + public function markTrackingCompleted(): void + { + if ($this->tracking_completed_at === null) { + $this->update(['tracking_completed_at' => now()]); + } + } + /** * Scope for shipments that need tracking email */ diff --git a/phpunit.xml b/phpunit.xml index 9ee3e73..6e53370 100755 --- a/phpunit.xml +++ b/phpunit.xml @@ -23,10 +23,19 @@ - - + + + + + + + + + + + - - + + diff --git a/public/js/iq-modal-cart.js b/public/js/iq-modal-cart.js index e065a4e..789fb7d 100644 --- a/public/js/iq-modal-cart.js +++ b/public/js/iq-modal-cart.js @@ -1,181 +1,273 @@ - var IqModalCart = { - form: "#cart-order-form", - btn_modal_add: '.add-product-basket', - btn_add: '.add-from-basket', - btn_remove: '.remove-from-basket', - table_input: '.table-input-event-onchange', - oTable: null, - cart_holder: '#insert_show_products_order', - is_for: null, - modal: '#modals-load-content', - remove_item_cart: '.remove_item_form_cart', - insert_show_total_order: '#insert_show_total_order', - input_is_for: 'is_for', - comp_holder: '#holder_html_view_comp_product', - comp_products: 'switchers-comp-product', - count_comp_products: 'count_comp_products', + form: "#cart-order-form", + btn_modal_add: ".add-product-basket", + btn_add: ".add-from-basket", + btn_remove: ".remove-from-basket", + table_input: ".table-input-event-onchange", + oTable: null, + cart_holder: "#insert_show_products_order", + is_for: null, + modal: "#modals-load-content", + remove_item_cart: ".remove_item_form_cart", + insert_show_total_order: "#insert_show_total_order", + input_is_for: "is_for", + comp_holder: "#holder_html_view_comp_product", + comp_products: "switchers-comp-product", + count_comp_products: "count_comp_products", + addOnlyMode: false, + confirmModal: "#modal-confirm-add", + pendingAction: null, - _log: function ($msg){ - console.log($msg); - }, - init: function () { - var _self = this; - _self.url = $(_self.form).attr('action'); - _self.is_for = $('input[name="'+_self.input_is_for+'"]').val(); - _self.reInitCart($(_self.cart_holder)); - return _self; - }, - setDatabase: function (oTable){ - var _self = this; - _self.oTable = oTable; - }, - reInitModal: function (){ - var _self = this; - $(_self.oTable).find(_self.btn_modal_add).on('click', function(){ - _self.add_product_modal($(this)) - }); - }, - add_product_modal: function (_obj){ - var _self = this; - _self.performRequest({ - product_id: _obj.data('product-id'), + _log: function($msg) { + console.log($msg); + }, + init: function() { + var _self = this; + _self.url = $(_self.form).attr("action"); + _self.is_for = $('input[name="' + _self.input_is_for + '"]').val(); + var addOnlyVal = $(_self.form).data("add-only-mode"); + _self.addOnlyMode = + addOnlyVal === 1 || addOnlyVal === "1" || addOnlyVal === true; + _self.reInitCart($(_self.cart_holder)); + _self.initConfirmModal(); + + return _self; + }, + initConfirmModal: function() { + var _self = this; + $("#confirm-add-btn") + .off("click") + .on("click", function() { + $(_self.confirmModal).modal("hide"); + if (_self.pendingAction) { + _self.pendingAction(); + _self.pendingAction = null; + } + }); + }, + showConfirm: function(productName, productPrice, qtyInfo, callback) { + var _self = this; + var $confirmModal = $(_self.confirmModal); + var titleKey = _self.addOnlyMode ? "title-add-only" : "title-normal"; + var warningKey = _self.addOnlyMode ? "warning-add-only" : "warning-normal"; + $("#modal-confirm-add-label").text($confirmModal.data(titleKey)); + $("#confirm-add-warning-text").text($confirmModal.data(warningKey)); + $("#confirm-add-product-name").text(productName || "-"); + $("#confirm-add-product-price").html(productPrice || "-"); + $("#confirm-add-qty-info").text(qtyInfo || ""); + _self.pendingAction = callback; + $confirmModal.modal("show"); + }, + setDatabase: function(oTable) { + var _self = this; + _self.oTable = oTable; + }, + reInitModal: function() { + var _self = this; + $(_self.oTable) + .find(_self.btn_modal_add) + .on("click", function() { + _self.add_product_modal($(this)); + }); + }, + add_product_modal: function(_obj) { + var _self = this; + var productName = _obj.data("product-name") || ""; + var productPrice = _obj.data("product-price") || ""; + var $modal = $(_self.modal); + $modal.one("hidden.bs.modal", function() { + _self.showConfirm(productName, productPrice, "1x", function() { + _self + .performRequest({ + product_id: _obj.data("product-id"), qty: 1, - action: 'addProduct' - }).done(_self.refreshView); - - }, - reInitCart: function (obj){ - var _self = this; - var _obj = obj; - obj.find(_self.btn_add).off('click').on('click', function(){ - _self.add_product($(this), _obj) - }); - obj.find(_self.btn_remove).off('click').on('click', function(){ - _self.remove_product($(this), _obj) - }); - obj.find(_self.table_input).off('change').on('change', function(){ - _self.update_input_table($(this), _obj); - }); - obj.find(_self.remove_item_cart).off('click').on('click', function(event){ - event.preventDefault() - _self.remove_from_cart($(this), _obj); - }); - if(_self.is_for === 'me' || _self.is_for === 'abo-me'){ - $('input[name^="'+_self.comp_products+'"]').on('change', function(){ - _self.update_comp_product($(this)); - }); - } - }, - update_comp_product: function (_obj){ - var _self = this; - _self.performRequest({ - comp_product_id: _obj.val(), - comp_num: _obj.data('comp_num'), - count_comp_products: $('input[name="'+_self.count_comp_products+'"]').val(), - action: 'updateCompProduct'}) - .done(_self.refreshView); - }, - add_product: function (_obj, _holder){ - var _self = this; - var input = _holder.find('input[name="product_qty_'+_obj.data('order-item-id')+'"]'); - var qty = parseInt(input.val()) + 1; - qty = _self.checkNumber(qty); - input.val(qty); - _self.update_cart(_holder, _obj, qty); - }, - remove_product: function (_obj, _holder){ - var _self = this; - var input = _holder.find('input[name="product_qty_'+_obj.data('order-item-id')+'"]'); - var qty = parseInt(input.val()) - 1; - qty = _self.checkNumber(qty); - input.val(qty); - _self.update_cart(_holder, _obj, qty); - }, - update_input_table: function (_obj, _holder){ - var _self = this; - var qty = parseInt(_obj.val()); - qty = _self.checkNumber(qty); - _obj.val(qty); - _self.update_cart(_holder, _obj, qty); - }, - update_cart: function (_holder, _obj, qty){ - var _self = this; - _self.performRequest({ - product_id: _obj.data('product-id'), - order_item_id: _obj.data('order-item-id'), - cart_order_id: _holder.data('cart-order-id'), - qty: qty, - action: 'updateCart' - }).done(_self.refreshView); - }, - remove_from_cart: function (_obj, _holder){ - var _self = this; - _self.performRequest({ - product_id: _obj.data('product-id'), - order_item_id: _obj.data('order-item-id'), - cart_order_id: _holder.data('cart-order-id'), - action: 'removeFromCart' - }).done(_self.refreshView); - }, - - refreshView: function (data) { - var _self = IqModalCart; - var obj = $(_self.cart_holder) - obj.html(data.html_cart); - $(_self.insert_show_total_order).html(data.html_total); - $(_self.modal).modal('hide'); - if($(_self.comp_holder)){ - $(_self.comp_holder).html(data.html_comp); - } - if($('#value-amount')){ - $('#value-amount').html(data.amount); - } - _self.reInitCart(obj); - - // var input = $(_self.table).find('input[name="product_qty_'+data.data.product_id+'"]'); - // input.val(data.data.qty); - // _self.showInit(); - }, - performRequest : function(data) { - var _self = this; - var url = _self.url, - contentType = 'application/x-www-form-urlencoded; charset=UTF-8'; - - console.log(data); - console.log(url); - - return $.ajax({ - url: url, - data: data, - type: "POST", - dataType: "json", - cache: false, - contentType: contentType, - encode: true, - headers: { - 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') - } - }) - .done(function (data) { - console.log('performRequest'); - console.log(data); - - }).fail(function (jqXHR, textStatus, errorThrown) { - console.log(jqXHR); - console.log(jqXHR.responseText); - console.log(textStatus); - console.log(errorThrown); - console.log("Sorry, there was a problem!"); - }); - }, - checkNumber : function(number){ - if(number < 1 || isNaN(number)){ - return 1; - } - if(number >= 999){ - return 999; - } - return number; + action: "addProduct", + }) + .done(_self.refreshView); + }); + }); + $modal.modal("hide"); + }, + reInitCart: function(obj) { + var _self = this; + var _obj = obj; + obj + .find(_self.btn_add) + .off("click") + .on("click", function() { + _self.add_product($(this), _obj); + }); + obj + .find(_self.btn_remove) + .off("click") + .on("click", function() { + _self.remove_product($(this), _obj); + }); + obj + .find(_self.table_input) + .off("change") + .on("change", function() { + _self.update_input_table($(this), _obj); + }); + obj + .find(_self.remove_item_cart) + .off("click") + .on("click", function(event) { + event.preventDefault(); + _self.remove_from_cart($(this), _obj); + }); + if (_self.is_for === "me" || _self.is_for === "abo-me") { + $('input[name^="' + _self.comp_products + '"]').on("change", function() { + _self.update_comp_product($(this)); + }); } -}; \ No newline at end of file + }, + update_comp_product: function(_obj) { + var _self = this; + _self + .performRequest({ + comp_product_id: _obj.val(), + comp_num: _obj.data("comp_num"), + count_comp_products: $( + 'input[name="' + _self.count_comp_products + '"]', + ).val(), + action: "updateCompProduct", + }) + .done(_self.refreshView); + }, + add_product: function(_obj, _holder) { + var _self = this; + console.log(_self); + var input = _holder.find( + 'input[name="product_qty_' + _obj.data("order-item-id") + '"]', + ); + var currentQty = parseInt(input.val()); + var qty = currentQty + 1; + qty = _self.checkNumber(qty); + + var productName = _obj.data("product-name") || ""; + var productPrice = _obj.data("product-price") || ""; + var qtyInfo = currentQty + " \u2192 " + qty; + console.log(qtyInfo); + _self.showConfirm(productName, productPrice, qtyInfo, function() { + input.val(qty); + _self.update_cart(_holder, _obj, qty); + }); + }, + remove_product: function(_obj, _holder) { + var _self = this; + var input = _holder.find( + 'input[name="product_qty_' + _obj.data("order-item-id") + '"]', + ); + var qty = parseInt(input.val()) - 1; + qty = _self.checkNumber(qty); + input.val(qty); + _self.update_cart(_holder, _obj, qty); + }, + update_input_table: function(_obj, _holder) { + var _self = this; + var qty = parseInt(_obj.val()); + qty = _self.checkNumber(qty); + _obj.val(qty); + _self.update_cart(_holder, _obj, qty); + }, + update_cart: function(_holder, _obj, qty) { + var _self = this; + _self + .performRequest({ + product_id: _obj.data("product-id"), + order_item_id: _obj.data("order-item-id"), + cart_order_id: _holder.data("cart-order-id"), + qty: qty, + action: "updateCart", + }) + .done(_self.refreshView); + }, + remove_from_cart: function(_obj, _holder) { + var _self = this; + _self + .performRequest({ + product_id: _obj.data("product-id"), + order_item_id: _obj.data("order-item-id"), + cart_order_id: _holder.data("cart-order-id"), + action: "removeFromCart", + }) + .done(_self.refreshView); + }, + + refreshView: function(data) { + var _self = IqModalCart; + var obj = $(_self.cart_holder); + obj.html(data.html_cart); + $(_self.insert_show_total_order).html(data.html_total); + $(_self.modal).modal("hide"); + if ($(_self.comp_holder)) { + $(_self.comp_holder).html(data.html_comp); + } + if ($("#value-amount")) { + $("#value-amount").html(data.amount); + } + _self.reInitCart(obj); + }, + performRequest: function(data) { + var _self = this; + var url = _self.url, + contentType = "application/x-www-form-urlencoded; charset=UTF-8"; + + console.log(data); + console.log(url); + + return $.ajax({ + url: url, + data: data, + type: "POST", + dataType: "json", + cache: false, + contentType: contentType, + encode: true, + headers: { + "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr("content"), + }, + }) + .done(function(data) { + console.log("performRequest"); + console.log(data); + }) + .fail(function(jqXHR, textStatus, errorThrown) { + console.log(jqXHR); + console.log(jqXHR.responseText); + console.log(textStatus); + console.log(errorThrown); + if ( + jqXHR.status === 403 && + jqXHR.responseJSON && + jqXHR.responseJSON.message + ) { + var errorEl = document.getElementById("insert_show_error_message"); + if (!errorEl) { + errorEl = document.createElement("div"); + errorEl.id = "insert_show_error_message"; + errorEl.className = "alert alert-danger mt-2"; + var cartHolder = document.querySelector( + "#insert_show_products_order", + ); + if (cartHolder) { + cartHolder.insertBefore(errorEl, cartHolder.firstChild); + } + } + errorEl.textContent = jqXHR.responseJSON.message; + } else { + console.log("Sorry, there was a problem!"); + } + }); + }, + checkNumber: function(number) { + if (number < 1 || isNaN(number)) { + return 1; + } + if (number >= 999) { + return 999; + } + return number; + }, +}; diff --git a/public/pdf/mivita_template_contract_de.pdf b/public/pdf/mivita_template_contract_de.pdf old mode 100644 new mode 100755 index 89b3e3f..4b57398 Binary files a/public/pdf/mivita_template_contract_de.pdf and b/public/pdf/mivita_template_contract_de.pdf differ diff --git a/public/pdf/mivita_template_contract_en.pdf b/public/pdf/mivita_template_contract_en.pdf new file mode 100755 index 0000000..827f545 Binary files /dev/null and b/public/pdf/mivita_template_contract_en.pdf differ diff --git a/public/pdf/mivita_template_contract_es.pdf b/public/pdf/mivita_template_contract_es.pdf new file mode 100755 index 0000000..469117a Binary files /dev/null and b/public/pdf/mivita_template_contract_es.pdf differ diff --git a/public/pdf/mivita_template_contract_fr.pdf b/public/pdf/mivita_template_contract_fr.pdf new file mode 100755 index 0000000..dad024b Binary files /dev/null and b/public/pdf/mivita_template_contract_fr.pdf differ diff --git a/public/pdf/template_invoice_de-1.pdf b/public/pdf/template_invoice_de-1.pdf old mode 100644 new mode 100755 index 6314f00..f599738 Binary files a/public/pdf/template_invoice_de-1.pdf and b/public/pdf/template_invoice_de-1.pdf differ diff --git a/public/pdf/template_invoice_de-2.pdf b/public/pdf/template_invoice_de-2.pdf old mode 100644 new mode 100755 index 21be59e..f599738 Binary files a/public/pdf/template_invoice_de-2.pdf and b/public/pdf/template_invoice_de-2.pdf differ diff --git a/public/pdf/template_invoice_en-1.pdf b/public/pdf/template_invoice_en-1.pdf new file mode 100755 index 0000000..835fb73 Binary files /dev/null and b/public/pdf/template_invoice_en-1.pdf differ diff --git a/public/pdf/template_invoice_en-2.pdf b/public/pdf/template_invoice_en-2.pdf new file mode 100755 index 0000000..835fb73 Binary files /dev/null and b/public/pdf/template_invoice_en-2.pdf differ diff --git a/public/pdf/template_invoice_es-1.pdf b/public/pdf/template_invoice_es-1.pdf new file mode 100755 index 0000000..103dd00 Binary files /dev/null and b/public/pdf/template_invoice_es-1.pdf differ diff --git a/public/pdf/template_invoice_es-2.pdf b/public/pdf/template_invoice_es-2.pdf new file mode 100755 index 0000000..103dd00 Binary files /dev/null and b/public/pdf/template_invoice_es-2.pdf differ diff --git a/public/pdf/template_invoice_fr-1.pdf b/public/pdf/template_invoice_fr-1.pdf new file mode 100755 index 0000000..32af0a8 Binary files /dev/null and b/public/pdf/template_invoice_fr-1.pdf differ diff --git a/public/pdf/template_invoice_fr-2.pdf b/public/pdf/template_invoice_fr-2.pdf new file mode 100755 index 0000000..32af0a8 Binary files /dev/null and b/public/pdf/template_invoice_fr-2.pdf differ diff --git a/public/pdf/template_report_en-1.pdf b/public/pdf/template_report_en-1.pdf new file mode 100644 index 0000000..b9c74ad Binary files /dev/null and b/public/pdf/template_report_en-1.pdf differ diff --git a/public/pdf/template_report_en-2.pdf b/public/pdf/template_report_en-2.pdf new file mode 100644 index 0000000..082c0cb Binary files /dev/null and b/public/pdf/template_report_en-2.pdf differ diff --git a/public/pdf/template_report_es-1.pdf b/public/pdf/template_report_es-1.pdf new file mode 100644 index 0000000..b9c74ad Binary files /dev/null and b/public/pdf/template_report_es-1.pdf differ diff --git a/public/pdf/template_report_es-2.pdf b/public/pdf/template_report_es-2.pdf new file mode 100644 index 0000000..082c0cb Binary files /dev/null and b/public/pdf/template_report_es-2.pdf differ diff --git a/public/pdf/template_report_fr-1.pdf b/public/pdf/template_report_fr-1.pdf new file mode 100644 index 0000000..b9c74ad Binary files /dev/null and b/public/pdf/template_report_fr-1.pdf differ diff --git a/public/pdf/template_report_fr-2.pdf b/public/pdf/template_report_fr-2.pdf new file mode 100644 index 0000000..082c0cb Binary files /dev/null and b/public/pdf/template_report_fr-2.pdf differ diff --git a/resources/lang/de/abo.php b/resources/lang/de/abo.php index 1ab9908..7f3e75c 100644 --- a/resources/lang/de/abo.php +++ b/resources/lang/de/abo.php @@ -1,6 +1,6 @@ 'Abo', 'payment_for_abo' => 'Zahlungsart für Abo', 'abo_delivery' => 'Abo - regelmäßige Lieferung', @@ -43,7 +43,7 @@ return array( 'abo_cancel' => 'storniert', 'abo_finish' => 'beendet', 'abo_inactive' => 'inaktiv', - 'abo_grace' => 'kulanz', + 'abo_grace' => 'kulanz', 'abo_info' => 'Abo Informationen', 'info_min_duration_reached' => 'Dein Abo kann frühestens ab dem :date geändert, ergänzt, pausiert oder gekündigt werden.', 'info_min_duration_orders_left' => 'Das Abo kann erst nach weiteren :count Ausführungen geändert, ergänzt, pausiert oder gekündigt werden.', @@ -59,6 +59,16 @@ return array( 'abo_order_hl' => 'Abo Zusammenstellung', 'abo_order_info_2' => 'Du kannst die Produkte Deines Abos jederzeit anpassen, bei der nächsten Ausführung werden Dir Deine zusammengestellen Produkte zugesendet.', 'abo_order_info_block' => 'Die Zusammenstellung Deines Abos kannst Du nach der Mindestlaufzeit von :abo-min-duration Monaten anpassen.', + 'abo_order_info_block_team' => 'Die Zusammenstellung des Abos für ein Team-Mitglied, kann nur von ihm angepasst werden.', + 'abo_order_info_block_customer' => 'Du kannst jederzeit neue Produkte für Deinen Kunden zum Abo hinzufügen. Das Entfernen von Produkten ist erst nach der Mindestlaufzeit von :abo-min-duration Monaten möglich.', + 'abo_order_info_add_only' => 'Du kannst jederzeit neue Produkte zu Deinem Abo hinzufügen. Das Entfernen von Produkten ist erst nach der Mindestlaufzeit von :abo-min-duration Monaten möglich.', + 'error_add_only_no_remove' => 'Das Entfernen von Produkten ist während der Mindestlaufzeit nicht möglich.', + 'confirm_add_title' => 'Produkt hinzufügen bestätigen', + 'confirm_add_title_normal' => 'Produkt zum Abo hinzufügen', + 'confirm_add_warning' => 'Während der Mindestlaufzeit können hinzugefügte Produkte nicht wieder entfernt werden. Bitte prüfe Deine Auswahl sorgfältig.', + 'confirm_add_warning_normal' => 'Möchtest Du dieses Produkt wirklich zu Deinem Abo hinzufügen?', + 'confirm_add_cancel' => 'Abbrechen', + 'confirm_add_ok' => 'Ja, hinzufügen', 'add_product' => 'Produkt hinzufügen', 'product_prices_career_level_info' => 'Die Produktpreise werden entsprechend Deinem Karriere-Level :user_level_name abzüglich :user_level_margin % Marge angezeigt und brechnet.', 'product_prices_career_level_cpay_info' => 'Die Produktpreise werden als Kunden VK-Preise angezeigt, nach Abschluss der Kundenzahlung erhälst du Deine Provision entsprechend Deinem Karriere-Level :user_level_name Provision :user_level_margin %.', @@ -94,4 +104,4 @@ return array( 'team_subscriptions' => 'Team Abos', 'every_month_on' => 'monatlich am :day.', 'back' => 'zurück', -); +]; diff --git a/resources/lang/de/abo_history.php b/resources/lang/de/abo_history.php new file mode 100644 index 0000000..841256f --- /dev/null +++ b/resources/lang/de/abo_history.php @@ -0,0 +1,54 @@ + 'Ursprüngliche Zusammenstellung', + 'change_history' => 'Änderungsverlauf', + 'no_initial_data' => 'Keine Ursprungsdaten vorhanden (Abo wurde vor Aktivierung der Historie erstellt)', + 'no_changes' => 'Keine Änderungen vorhanden', + + // Spalten + 'col_date' => 'Datum', + 'col_action' => 'Aktion', + 'col_product' => 'Artikel', + 'col_details' => 'Details', + 'col_changed_by' => 'Geändert von', + 'col_channel' => 'Bereich', + + // Aktionen + 'action_initial' => 'Ursprung', + 'action_added' => 'Hinzugefügt', + 'action_removed' => 'Entfernt', + 'action_qty_changed' => 'Menge geändert', + 'action_comp_changed' => 'Comp getauscht', + 'action_comp_added' => 'Comp hinzugefügt', + 'action_comp_removed' => 'Comp entfernt', + 'action_rollback' => 'Zurückgesetzt', + + // Beschreibungen + 'desc_initial' => 'Menge: :qty', + 'desc_added' => 'Menge: :qty', + 'desc_removed' => 'Artikel entfernt', + 'desc_qty_changed' => 'Menge von :from auf :to geändert', + 'desc_comp_changed' => 'Ersetzt: :old', + 'desc_comp_added' => 'Vom System hinzugefügt', + 'desc_comp_removed' => 'Vom System entfernt', + 'desc_rollback' => 'Auf Ursprung zurückgesetzt', + + // Channels + 'channel_admin' => 'Admin', + 'channel_user_me' => 'Berater', + 'channel_user_ot' => 'Berater (Kunde)', + 'channel_portal' => 'Kundenportal', + 'channel_system' => 'System', + + // Preistyp + 'price_net' => 'netto', + 'price_gross' => 'brutto', + + // Rollback + 'rollback_btn' => 'Auf Ursprung zurücksetzen', + 'rollback_confirm' => 'Möchten Sie das Abo wirklich auf den Ursprungszustand zurücksetzen? Alle aktuellen Produkte werden durch die ursprüngliche Zusammenstellung ersetzt.', + 'rollback_success' => 'Das Abo wurde erfolgreich auf den Ursprungszustand zurückgesetzt.', + 'rollback_no_data' => 'Kein Rollback möglich: Keine Ursprungsdaten vorhanden.', +]; diff --git a/resources/lang/de/account.php b/resources/lang/de/account.php index b2cfed5..69b714c 100644 --- a/resources/lang/de/account.php +++ b/resources/lang/de/account.php @@ -1,45 +1,48 @@ '', - 'BIC' => 'BIC', - 'IBAN' => 'IBAN', - 'VAT_ID_number' => 'USt-ID Nummer', - 'VAT_copy_1' => 'Wähle Kleinunternehmer, wenn Du nicht mehr als 22.000 EUR Umsatz pro Jahr mit Deinem Gewerbe erwirtschaftest.', - 'VAT_liability' => 'Umsatzsteuerpflicht', - 'account_holder' => 'Kontoinhaber', - 'bank_data' => 'Bankdaten', - 'delivery_address' => 'Lieferadresse', - 'firstname_lastname' => 'Vorname Nachname', - 'invoice_address' => 'Rechnungsadresse', - 'my_credit' => 'Mein Guthaben', - 'vat_data' => 'Steuerdaten', - 'info_vat_numbers' => 'Hinweis: Bitte Steuernummer und/oder USt-ID Nummer angeben!*', - 'new_vat_validate' => 'Neue UST-ID validieren und Reverse Charge Verfahren aktivieren', - 'btn_vat_validate' => 'USt-ID Nummer validieren', - 'phone_need_error' => 'Fehler: Bitte Telefon und/oder Mobiltelefon angeben!*', - 'phone_need_note' => 'Hinweis: Bitte Telefon und/oder Mobiltelefon angeben!*', - 'required_for_commission_payments' => 'Wird für die Auszahlungen von Provisionen benötigt', - 'reverse_charge_action_1' => 'Reverse Charge Verfahren und UST-ID löschen', - 'reverse_charge_action_2' => 'UST-ID validieren und Reverse Charge Verfahren aktivieren', - 'reverse_charge_copy_1' => 'Umkehrung der Steuerschuldnerschaft oder auch Abzugsverfahren. In diesem Spezialfall muss der Leistungsempfänger (Berater) und nicht der leistende Unternehmer (mivita) die Umsatzsteuer entrichten.', - 'reverse_charge_note_1' => 'Bei der Aktivierung wird die USt-ID benötigt und validiert.', - 'reverse_charge_procedure' => 'Reverse Charge Verfahren', - 'tax_number' => 'Steuernummer', - 'taxable_sales_1' => 'umsatzsteuerpflichtig (Ich mache eine UST-Voranmeldung pro Monat / Quartal / Jahr ans Finanzamt)', - 'taxable_sales_2' => 'nicht umsatzsteuerpflichtig (Kleinunternehmer im Sinne von $ 19', - 'validator_creditcard' => 'Geben Sie bitte eine gültige Kreditkarten-Nummer ein', - 'validator_date' => 'Bitte geben Sie ein gültiges Datum ein.', - 'validator_digits' => 'Geben Sie bitte nur Ziffern ein.', - 'validator_email' => 'Geben Sie bitte eine gültige E-Mail Adresse ein.', - 'validator_equalTo' => 'Bitte denselben Wert wiederholen.', - 'validator_max' => 'Geben Sie bitte einen Wert kleiner oder gleich {0} ein.', - 'validator_maxlength' => 'Geben Sie bitte maximal {0} Zeichen ein.', - 'validator_min' => 'Geben Sie bitte einen Wert größer oder gleich {0} ein.', - 'validator_minlength' => 'Geben Sie bitte mindestens {0} Zeichen ein.', - 'validator_number' => 'Geben Sie bitte eine Nummer ein.', - 'validator_range' => 'Geben Sie bitte einen Wert zwischen {0} und {1} ein.', - 'validator_rangelength' => 'Geben Sie bitte mindestens {0} und maximal {1} Zeichen ein.', - 'validator_required' => 'Dieses Feld ist ein Pflichtfeld.', - 'validator_url' => 'Geben Sie bitte eine gültige URL ein.', -); +return [ + '' => '', + 'BIC' => 'BIC', + 'IBAN' => 'IBAN', + 'VAT_ID_number' => 'USt-ID Nummer', + 'VAT_copy_1' => 'Wähle Kleinunternehmer, wenn Du nicht mehr als 22.000 EUR Umsatz pro Jahr mit Deinem Gewerbe erwirtschaftest.', + 'VAT_liability' => 'Umsatzsteuerpflicht', + 'account_holder' => 'Kontoinhaber', + 'bank_data' => 'Bankdaten', + 'delivery_address' => 'Lieferadresse', + 'firstname_lastname' => 'Vorname Nachname', + 'invoice_address' => 'Rechnungsadresse', + 'my_credit' => 'Mein Guthaben', + 'vat_data' => 'Steuerdaten', + 'info_vat_numbers' => 'Hinweis: Bitte Steuernummer und/oder USt-ID Nummer angeben!*', + 'new_vat_validate' => 'Neue UST-ID validieren und Reverse Charge Verfahren aktivieren', + 'btn_vat_validate' => 'USt-ID Nummer validieren', + 'phone_need_error' => 'Fehler: Bitte Telefon und/oder Mobiltelefon angeben!*', + 'phone_need_note' => 'Hinweis: Bitte Telefon und/oder Mobiltelefon angeben!*', + 'required_for_commission_payments' => 'Wird für die Auszahlungen von Provisionen benötigt', + 'reverse_charge_action_1' => 'Reverse Charge Verfahren und UST-ID löschen', + 'reverse_charge_action_2' => 'UST-ID validieren und Reverse Charge Verfahren aktivieren', + 'reverse_charge_copy_1' => 'Umkehrung der Steuerschuldnerschaft oder auch Abzugsverfahren. In diesem Spezialfall muss der Leistungsempfänger (Berater) und nicht der leistende Unternehmer (mivita) die Umsatzsteuer entrichten.', + 'reverse_charge_note_1' => 'Bei der Aktivierung wird die USt-ID benötigt und validiert.', + 'reverse_charge_procedure' => 'Reverse Charge Verfahren', + 'tax_number' => 'Steuernummer', + 'taxable_sales_1' => 'umsatzsteuerpflichtig (Ich mache eine UST-Voranmeldung pro Monat / Quartal / Jahr ans Finanzamt)', + 'taxable_sales_2' => 'nicht umsatzsteuerpflichtig (Kleinunternehmer im Sinne von $ 19', + 'validator_creditcard' => 'Geben Sie bitte eine gültige Kreditkarten-Nummer ein', + 'validator_date' => 'Bitte geben Sie ein gültiges Datum ein.', + 'validator_digits' => 'Geben Sie bitte nur Ziffern ein.', + 'validator_email' => 'Geben Sie bitte eine gültige E-Mail Adresse ein.', + 'validator_equalTo' => 'Bitte denselben Wert wiederholen.', + 'validator_max' => 'Geben Sie bitte einen Wert kleiner oder gleich {0} ein.', + 'validator_maxlength' => 'Geben Sie bitte maximal {0} Zeichen ein.', + 'validator_min' => 'Geben Sie bitte einen Wert größer oder gleich {0} ein.', + 'validator_minlength' => 'Geben Sie bitte mindestens {0} Zeichen ein.', + 'validator_number' => 'Geben Sie bitte eine Nummer ein.', + 'validator_range' => 'Geben Sie bitte einen Wert zwischen {0} und {1} ein.', + 'validator_rangelength' => 'Geben Sie bitte mindestens {0} und maximal {1} Zeichen ein.', + 'validator_required' => 'Dieses Feld ist ein Pflichtfeld.', + 'validator_url' => 'Geben Sie bitte eine gültige URL ein.', + 'language_settings' => 'Spracheinstellungen', + 'preferred_language' => 'Bevorzugte Sprache', + 'language_hint' => 'Diese Sprache wird für Ihre Rechnungen, Provisionsabrechnungen und Lieferscheine verwendet.', +]; diff --git a/resources/lang/de/customer.php b/resources/lang/de/customer.php index 0b610b8..325b0cd 100644 --- a/resources/lang/de/customer.php +++ b/resources/lang/de/customer.php @@ -1,37 +1,38 @@ 'Über Shop', - 'add_customer_without_email' => 'Kunde ohne E-Mail hinzufügen', - 'add_customer_without_email_info1' => 'Hinweis: Du kannst Deine Kunden auch ohne Email-Adresse anlegen. Das System gleicht dann Nachname und Postleitzahl ab. Sollte es hier mal Übereinstimmungen geben, gleicht der Support von MIVITA die Kundensätze ab und ordnet sie den Beratern entsprechend zu. Daher empfehlen wir im besten Fall immer die Angabe einer Email-Adresse. Diese ist einzigartig und damit eindeutig einem Kunden zuzuordnen.', - 'assigned' => 'zugewiesen', - 'assigned_counsellor' => 'Zugewiesener Berater', - 'check' => 'prüfen', - 'check_and_next' => 'prüfen und weiter', - 'check_and_save' => 'prüfen und speichern', - 'client_sovereignty' => 'Kundenhoheit', - 'counsellor_allocate' => 'Berater zuordnen', - 'created' => 'Erstellt', - 'customer_add' => 'Kunden hinzufügen', - 'customer_billing_address' => 'Kunden-, Rechnungsadresse', - 'customer_data' => 'Kundennummer', - 'customer_details' => 'Kunden Details', - 'customer_has_already_buy' => 'Ich versichere, dass dieser Kunde bereits bei mir gekauft hat', - 'customer_has_already_purchased' => 'Kunde hat schon gekauft.', - 'customer_has_not_yet_purchased' => 'Kunde hat noch nicht gekauft.', - 'customer_is_not_subscribed_to_newsletter' => 'Kunde ist nicht für Newsletter abonniert.', - 'customer_is_subscribed_to_newsletter' => 'Kunde ist für Newsletter abonniert.', - 'customer_sovereignty_info1' => 'Kundenhoheit: Es können nur Kunden hinzugefügt werden, die noch nicht im mivita-Salescenter vorhanden sind. ', - 'date' => 'Datum', - 'delete_customer' => 'Kunden löschen', - 'deleted_successfully' => 'Kunde wurde erfolgreich gelöscht', - 'delete_customer_confirm' => 'Sind Sie sicher, dass Sie diesen Kunden löschen möchten?', - 'edit' => 'bearbeiten', - 'edit_customer_data' => 'Kundendaten bearbeiten', - 'enter' => 'eingeben', - 'is_counsellor' => 'ist Berater', - 'newsletter_subscribed_copy1' => 'Für Newsletter abonniert. Es ist Dir bzw. MIVITA erlaubt, Kunden einen Newsletter zu senden, sofern der Kunde schon mal aktiv gekauft hat. Sollte der Kunde explizit mitgeteilt haben, dass er keinen Newsletter möchte, dann bitte unbedingt das Häkchen entfernen.', - 'next_without_email' => 'weiter ohne E-Mail', - 'under_review' => 'in Prüfung', - 'select' => 'wählen', -); +return [ + 'about_shop' => 'Über Shop', + 'add_customer_without_email' => 'Kunde ohne E-Mail hinzufügen', + 'add_customer_without_email_info1' => 'Hinweis: Du kannst Deine Kunden auch ohne Email-Adresse anlegen. Das System gleicht dann Nachname und Postleitzahl ab. Sollte es hier mal Übereinstimmungen geben, gleicht der Support von MIVITA die Kundensätze ab und ordnet sie den Beratern entsprechend zu. Daher empfehlen wir im besten Fall immer die Angabe einer Email-Adresse. Diese ist einzigartig und damit eindeutig einem Kunden zuzuordnen.', + 'assigned' => 'zugewiesen', + 'assigned_counsellor' => 'Zugewiesener Berater', + 'check' => 'prüfen', + 'check_and_next' => 'prüfen und weiter', + 'check_and_save' => 'prüfen und speichern', + 'client_sovereignty' => 'Kundenhoheit', + 'counsellor_allocate' => 'Berater zuordnen', + 'created' => 'Erstellt', + 'customer_add' => 'Kunden hinzufügen', + 'customer_billing_address' => 'Kunden-, Rechnungsadresse', + 'customer_data' => 'Kundennummer', + 'customer_details' => 'Kunden Details', + 'customer_has_already_buy' => 'Ich versichere, dass dieser Kunde bereits bei mir gekauft hat', + 'customer_has_already_purchased' => 'Kunde hat schon gekauft.', + 'customer_has_not_yet_purchased' => 'Kunde hat noch nicht gekauft.', + 'customer_is_not_subscribed_to_newsletter' => 'Kunde ist nicht für Newsletter abonniert.', + 'customer_is_subscribed_to_newsletter' => 'Kunde ist für Newsletter abonniert.', + 'customer_sovereignty_info1' => 'Kundenhoheit: Es können nur Kunden hinzugefügt werden, die noch nicht im mivita-Salescenter vorhanden sind. ', + 'date' => 'Datum', + 'delete_customer' => 'Kunden löschen', + 'deleted_successfully' => 'Kunde wurde erfolgreich gelöscht', + 'delete_customer_confirm' => 'Sind Sie sicher, dass Sie diesen Kunden löschen möchten?', + 'edit' => 'bearbeiten', + 'edit_customer_data' => 'Kundendaten bearbeiten', + 'enter' => 'eingeben', + 'is_counsellor' => 'ist Berater', + 'newsletter_subscribed_copy1' => 'Für Newsletter abonniert. Es ist Dir bzw. MIVITA erlaubt, Kunden einen Newsletter zu senden, sofern der Kunde schon mal aktiv gekauft hat. Sollte der Kunde explizit mitgeteilt haben, dass er keinen Newsletter möchte, dann bitte unbedingt das Häkchen entfernen.', + 'next_without_email' => 'weiter ohne E-Mail', + 'under_review' => 'in Prüfung', + 'select' => 'wählen', + 'language_hint' => 'Die Rechnungen und Dokumente werden in dieser Sprache erstellt.', +]; diff --git a/resources/lang/de/dataprotect.php b/resources/lang/de/dataprotect.php index 9e30add..d735dc3 100644 --- a/resources/lang/de/dataprotect.php +++ b/resources/lang/de/dataprotect.php @@ -3,7 +3,7 @@ return [ 'data_protect' => 'Datenschutzerklärung', - + 'data_protect_copy1' => 'Unsere Website kann grundsätzlich ohne Angabe personenbezogener Daten genutzt werden. Sofern Sie bestimmte Leistungen über unsere Website in Anspruch nehmen wollen, kann eine Verarbeitung Ihrer personenbezogenen Daten erforderlich werden.
Die Verarbeitung Ihrer personenbezogener Daten erfolgt stets in Übereinstimmung mit der Datenschutz-Grundverordnung (DSGVO) und den für uns geltenden landesspezifischen Datenschutzbestimmungen. @@ -262,10 +262,11 @@ Finden Sie weitere Datenschutzinformationen von Google unter: https://www.googl Googles Datenschutzbelehrung zum Conversion-Tracking finden Sie hier ( https://services.google.com/sitestats/de.html )', 'data_protect_stand_shop' => 'Stand: 18.02.2022', 'data_protect_stand_site' => 'Stand: 05.10.2018', + 'data_protect' => 'Datenschutz', ]; /* -{{ __('dataprotect.') }} +{{ __('dataprotect.') }} {{ __('dataprotect.name') }} dataprotect.name */ diff --git a/resources/lang/de/email.php b/resources/lang/de/email.php index 208b5ef..e767b7e 100644 --- a/resources/lang/de/email.php +++ b/resources/lang/de/email.php @@ -1,57 +1,57 @@ 'Account freigeschaltet', - 'account_active_copy1line' => 'Dein Account wurde nach erfolgreicher Prüfung freigeschaltet. Deinen Beratervertag findest Du auf der Startseite im Loginbereich von my.mivita.care. Melde dich mit deinen Benutzerdaten an, um weitere Schritte zu unternehmen.', - 'account_incomplete_copy1line' => 'Dein Account wurde nicht freigeschaltet, Deine Daten sind nicht vollständig. Bitte folge dem unten stehenden Link um Deine Daten zu vervollständigen. ', - 'activate_copy' => 'Bitte bestätige Deine E-Mail und aktiviere Deinen Account über diesen Link:', - 'active_copy1line' => 'Du erhältst diese E-Mail, weil wir eine Anfrage zur Änderung Deiner E-Mail-Adresse für Dein Konto erhalten haben.', - 'button_account' => 'zum Account', - 'change_e_mail' => 'E-Mail Adresse ändern', - 'checkout_copy1line' => 'vielen Dank für Deine Bestellung bei mivita.care. Nachfolgend haben wir zur Kontrolle Deine Bestellung noch einmal aufgelistet.', - 'checkout_copy3line' => 'Bei Fragen sind wir jederzeit für Dich da.', - 'checkout_copy3line_extern' => 'Bestellung über Berater:', - 'checkout_mail_bank_bic' => 'BIC:', - 'checkout_mail_bank_code' => 'Verwendungszweck', - 'checkout_mail_bank_holder' => 'Kontoinhaber:', - 'checkout_mail_bank_iban' => 'IBAN:', - 'checkout_mail_bank_name' => 'Bank', - 'checkout_mail_bank_total' => 'Gesamtbetrag', - 'checkout_mail_deliver_addess' => 'Deine Lieferadresse:', - 'checkout_mail_deliver_customer' => 'Lieferadresse des Kunden:', - 'checkout_mail_hl1' => 'Du hast folgende Artikel bestellt:', - 'checkout_mail_invoice_addess' => 'Deine Rechnungsadresse:', - 'checkout_mail_order_for_extern' => 'Kundenbestellung über externen Shop:', - 'checkout_mail_order_for_me' => 'Beraterbestellung für Dich:', - 'checkout_mail_order_for_membership' => 'Beraterbestellung für Deine Mitgliedschaft:', - 'checkout_mail_order_for_ot' => 'Beraterbestellung für Deinen Kunden:', - 'checkout_mail_order_for_wizard' => 'Beraterbestellung zur Deiner Registrierung:', - 'checkout_mail_pay_approved' => 'Deine Zahlung wurde genehmigt, eine Bestätigung der Zahlung wird automatisch erstellt.', - 'checkout_mail_pay_error' => 'Die Zahlung ist fehlgeschlagen!', - 'checkout_mail_pay_info' => 'Zahlungsinfo:', - 'checkout_mail_pay_invoice_open' => 'Deine Zahlung per Rechnung wurde genehmigt.', - 'checkout_mail_pay_pre' => 'Bezahlung per Vorkasse:', - 'checkout_mail_pay_pre_c1' => 'Bitte überweise', - 'checkout_mail_pay_pre_c2' => 'EUR auf die folgende Kontoverbindung, um den Kauf abzuschließen.', - 'checkout_mail_pay_ref' => 'Zahlungsreferenz:', - 'checkout_mail_pay_success' => 'Zahlung ist bestätigt!', - 'checkout_mail_pay_with' => 'Zahlung mit:', - 'checkout_mail_same_address' => 'Lieferadresse ist gleich Rechnungsadresse', - 'checkout_mail_shipping' => 'Verpackungs- u. Versandkosten', - 'checkout_mail_status_info' => 'Statusinfo:', - 'checkout_mail_subtotal_ws' => 'Summe ohne MwSt.', - 'checkout_mail_system_status' => 'SystemStatus:', - 'checkout_mail_tax' => 'zzgl. MwSt', - 'checkout_mail_tax_info' => 'Preis inkl. MwSt', - 'checkout_mail_total' => 'Gesamtpreis', - 'checkout_mail_your_mail' => 'Deine E-Mai:', - 'checkout_subject' => 'Deine Bestellung bei', - 'checkout_subject_extern' => 'Neue Bestellung', - 'checkout_subject_paid' => 'Zahlungsbestätigung - Deine Bestellung bei', - 'copy2line' => 'Oder kopiere diesen Link in die Adressleiste Deines Browsers.', - 'copy3line' => 'Für weitere Fragen stehen wir Dir gerne zur Verfügung.', - 'copy_to_browser' => 'Oder kopiere diesen Link in die Adressleiste Deines Browsers.', - 'credit_copy1line' => 'Deine Gutschrift ist da und die hast Du Dir redlich verdient! +return [ + 'account_active' => 'Account freigeschaltet', + 'account_active_copy1line' => 'Dein Account wurde nach erfolgreicher Prüfung freigeschaltet. Deinen Beratervertag findest Du auf der Startseite im Loginbereich von my.mivita.care. Melde dich mit deinen Benutzerdaten an, um weitere Schritte zu unternehmen.', + 'account_incomplete_copy1line' => 'Dein Account wurde nicht freigeschaltet, Deine Daten sind nicht vollständig. Bitte folge dem unten stehenden Link um Deine Daten zu vervollständigen. ', + 'activate_copy' => 'Bitte bestätige Deine E-Mail und aktiviere Deinen Account über diesen Link:', + 'active_copy1line' => 'Du erhältst diese E-Mail, weil wir eine Anfrage zur Änderung Deiner E-Mail-Adresse für Dein Konto erhalten haben.', + 'button_account' => 'zum Account', + 'change_e_mail' => 'E-Mail Adresse ändern', + 'checkout_copy1line' => 'vielen Dank für Deine Bestellung bei mivita.care. Nachfolgend haben wir zur Kontrolle Deine Bestellung noch einmal aufgelistet.', + 'checkout_copy3line' => 'Bei Fragen sind wir jederzeit für Dich da.', + 'checkout_copy3line_extern' => 'Bestellung über Berater:', + 'checkout_mail_bank_bic' => 'BIC:', + 'checkout_mail_bank_code' => 'Verwendungszweck', + 'checkout_mail_bank_holder' => 'Kontoinhaber:', + 'checkout_mail_bank_iban' => 'IBAN:', + 'checkout_mail_bank_name' => 'Bank', + 'checkout_mail_bank_total' => 'Gesamtbetrag', + 'checkout_mail_deliver_addess' => 'Deine Lieferadresse:', + 'checkout_mail_deliver_customer' => 'Lieferadresse des Kunden:', + 'checkout_mail_hl1' => 'Du hast folgende Artikel bestellt:', + 'checkout_mail_invoice_addess' => 'Deine Rechnungsadresse:', + 'checkout_mail_order_for_extern' => 'Kundenbestellung über externen Shop:', + 'checkout_mail_order_for_me' => 'Beraterbestellung für Dich:', + 'checkout_mail_order_for_membership' => 'Beraterbestellung für Deine Mitgliedschaft:', + 'checkout_mail_order_for_ot' => 'Beraterbestellung für Deinen Kunden:', + 'checkout_mail_order_for_wizard' => 'Beraterbestellung zur Deiner Registrierung:', + 'checkout_mail_pay_approved' => 'Deine Zahlung wurde genehmigt, eine Bestätigung der Zahlung wird automatisch erstellt.', + 'checkout_mail_pay_error' => 'Die Zahlung ist fehlgeschlagen!', + 'checkout_mail_pay_info' => 'Zahlungsinfo:', + 'checkout_mail_pay_invoice_open' => 'Deine Zahlung per Rechnung wurde genehmigt.', + 'checkout_mail_pay_pre' => 'Bezahlung per Vorkasse:', + 'checkout_mail_pay_pre_c1' => 'Bitte überweise', + 'checkout_mail_pay_pre_c2' => 'EUR auf die folgende Kontoverbindung, um den Kauf abzuschließen.', + 'checkout_mail_pay_ref' => 'Zahlungsreferenz:', + 'checkout_mail_pay_success' => 'Zahlung ist bestätigt!', + 'checkout_mail_pay_with' => 'Zahlung mit:', + 'checkout_mail_same_address' => 'Lieferadresse ist gleich Rechnungsadresse', + 'checkout_mail_shipping' => 'Verpackungs- u. Versandkosten', + 'checkout_mail_status_info' => 'Statusinfo:', + 'checkout_mail_subtotal_ws' => 'Summe ohne MwSt.', + 'checkout_mail_system_status' => 'SystemStatus:', + 'checkout_mail_tax' => 'zzgl. MwSt', + 'checkout_mail_tax_info' => 'Preis inkl. MwSt', + 'checkout_mail_total' => 'Gesamtpreis', + 'checkout_mail_your_mail' => 'Deine E-Mai:', + 'checkout_subject' => 'Deine Bestellung bei', + 'checkout_subject_extern' => 'Neue Bestellung', + 'checkout_subject_paid' => 'Zahlungsbestätigung - Deine Bestellung bei', + 'copy2line' => 'Oder kopiere diesen Link in die Adressleiste Deines Browsers.', + 'copy3line' => 'Für weitere Fragen stehen wir Dir gerne zur Verfügung.', + 'copy_to_browser' => 'Oder kopiere diesen Link in die Adressleiste Deines Browsers.', + 'credit_copy1line' => 'Deine Gutschrift ist da und die hast Du Dir redlich verdient! Wir werden den Auszahlungsbetrag in den nächsten 5 Werktagen auf Dein Konto überweisen. Bitte prüfe, ob Deine aktuellen Bankdaten in Deinem Salescenter-Account hinterlegt sind (Mein Konto -> Meine Daten). Wir wünschen Dir weiterhin eine erfolgreiche Zeit bei MIVITA. @@ -59,72 +59,75 @@ Du möchtest noch mehr erreichen? Dann sprich Deinen Sponsor oder andere Teamlei Viele Grüße, Dein Team von MIVITA', - 'credit_title' => 'Deine Gutschrift auf mivita.care', - 'dear_mrs' => 'Hallo', - 'dear_sir' => 'Hallo', - 'email' => 'E-Mail', - 'email_incomplete' => 'Deine Daten sind nicht vollständig.', - 'email_subject' => 'Nachricht von mivita.care', - 'email_verify' => 'Bestätige Deine E-Mail-Adresse', - 'email_verify_copy1line' => 'Vielen Dank für Deine Registrierung. Bitte folge dem unten stehenden Link, um Deine E-Mail-Adresse zu bestätigen.', - 'first_name' => 'Vorname', - 'footer_copy1' => 'mivita care gmbh | Leinfeld 2 | 87755 Kirchhaslach | Telefon: +49 (0) 8333 94 61 767 | E-Mail: info@mivita.care', - 'footer_copy2' => 'Geschäftsführer: Alois Ried | Registergericht: Memmingen | Registernummer: HRB 21591 | USt-ID-Nr.: DE 453867883', - 'footer_copy3' => '© 2020 All Rights Reserved', - 'greetings' => 'Mit freundlichen Grüßen', - 'hello' => 'Hallo', - 'invoice_copy1line' => 'vielen Dank für Deine Bestellung bei mivita.care. Nachfolgend senden wir Dir die Rechnung zu deiner Bestellung: ', - 'invoice_title' => 'Rechnung zu Deiner Bestellung auf mivita.care', - 'invoice_subject' => 'Rechnung zu Deiner Bestellung', - 'last_name' => 'Nachname', - 'mail_confirm' => 'E-Mail bestätigen', - 'message' => 'Nachricht', - 'phone' => 'Telefon', - 'request_from' => 'Anfrage von mivita.care', - 'reset_pass_copy1line' => 'Du erhälst diese E-Mail, weil wir eine Anfrage zum Zurücksetzen Deines Passworts für Dein Konto erhalten haben.', - 'reset_passwort' => 'Passwort zurücksetzen', - 'sales_partnership' => 'Vertriebspartnerschaft', - 'sales_partnership_message' => 'Hinweis', - 'salutation' => 'Anrede', - 'sender' => 'Dein Team von mivita.care', - 'status_copy1line' => 'Status zu Deiner Bestellung auf mivita.care', - 'subject' => 'Betreff', - 'subject_activate' => 'Account aktivieren', - 'subject_reset' => 'Passwort zurücksetzen', - 'update_level_copy1line' => 'Herzlichen Glückwunsch!

Wir sind unglaublich stolz auf Dich! Du hast im letzten Monat mit Deinen :tp TP nicht nur Deine Qualifikation erreicht – Du hast etwas Großartiges geschafft!

Dein unermüdlicher Einsatz und Dein Engagement haben sich gelohnt. Ab sofort bist Du:

:to


Das ist ein echter Meilenstein in Deiner Karriere bei MIVITA!', - 'update_level_title' => 'Du hast Dein nächstes Karriere-Level erreicht!', - 'update_level_copy2line' => 'Dein Erfolg ist auch unser Erfolg, und wir freuen uns riesig, Dich auf dieser spannenden Reise begleiten zu dürfen. Mit diesem neuen Level eröffnen sich Dir jetzt noch mehr Möglichkeiten:

- Höhere Provisionen und bessere Margen
- Erweiterte Möglichkeiten für Dein Business
- Mehr Anerkennung und Status im Team', - 'update_level_copy3line' => 'Das ist erst der Anfang!

Dein Erfolg ist der Beweis dafür, dass kontinuierliche Arbeit und Leidenschaft zum Ziel führen. Bleib am Ball, motiviere Dein Team und erreiche gemeinsam mit uns noch größere Ziele.

Dein nächstes Level wartet bereits auf Dich – und wir wissen, dass Du es schaffen wirst!', - 'verify_copy1line' => 'Wir haben Daten über Dich in unserem System gespeichert. Bitte folge dem unten stehenden Link um Deine E-Mail-Adresse zu bestätigen. Weitherhin kannst Du Deine Daten ändern oder auch löschen.', - 'verify_e_mail' => 'Bestätige Deine Daten und E-Mail-Adresse', - 'your_request_from' => 'Deine Anfrage von', - 'your_custom_payout' => 'Dein persönlicher mivita Berater - :name hat eine individuelle Bestellung für Dich zusammengestellt. Jetzt musst Du nur noch Deine Bestellung bezahlen. Klicke auf den Link und gelange zum Checkout von mivita.care.', - 'your_custom_abo_payout' => 'Dein persönlicher mivita Berater - :name hat eine individuelle Abo-Bestellung für Dich zusammengestellt. Jetzt musst Du nur noch Deine Abo-Bestellung bezahlen. Klicke auf den Link und gelange zum Checkout von mivita.care.', - 'subject_custom_payout' => 'Deine individuelle Bestellung von :name auf mivita.care', - 'subject_custom_abo_payout' => 'Deine individuelle Abo-Bestellung von :name auf mivita.care', - 'button_custom_payout' => 'zur Zahlung', - 'checkout_custom_payout' => 'Dein Berater hat folgende Produkte für Dich zusammengestellt', - 'user_restore_subject' => 'Dein Account wurde wiederhergestellt', - 'user_restore_title' => 'Account-Wiederherstellung erfolgreich', - 'user_restore_greeting' => 'Hallo :name,', - 'user_restore_copy1line' => 'wir freuen uns, Dir mitteilen zu können, dass Dein Account bei mivita.care erfolgreich wiederhergestellt wurde.', - 'user_restore_copy2line' => 'Da Dein Passwort aus Sicherheitsgründen beim Löschen zurückgesetzt wurde, musst Du ein neues Passwort vergeben. Bitte klicke auf den folgenden Button, um Dein Passwort zurückzusetzen:', - 'user_restore_copy3line' => '• Dein Passwort wurde zurückgesetzt - bitte vergib ein neues Passwort über den obigen Link.
• Falls Du einen Shop hattest: Der Shop-Name (Subdomain) wurde beim Löschen freigegeben und muss neu vergeben werden.', - 'user_restore_button' => 'Neues Passwort vergeben', - 'user_restore_account_valid' => 'Deine Berater-Mitgliedschaft ist gültig bis:', - 'user_restore_important' => 'Wichtige Hinweise:', + 'credit_title' => 'Deine Gutschrift auf mivita.care', + 'dear_mrs' => 'Hallo', + 'dear_sir' => 'Hallo', + 'email' => 'E-Mail', + 'email_incomplete' => 'Deine Daten sind nicht vollständig.', + 'email_subject' => 'Nachricht von mivita.care', + 'email_verify' => 'Bestätige Deine E-Mail-Adresse', + 'email_verify_copy1line' => 'Vielen Dank für Deine Registrierung. Bitte folge dem unten stehenden Link, um Deine E-Mail-Adresse zu bestätigen.', + 'first_name' => 'Vorname', + 'footer_copy1' => 'mivita care gmbh | Leinfeld 2 | 87755 Kirchhaslach | Telefon: +49 (0) 8333 94 61 767 | E-Mail: info@mivita.care', + 'footer_copy2' => 'Geschäftsführer: Alois Ried | Registergericht: Memmingen | Registernummer: HRB 21591 | USt-ID-Nr.: DE 453867883', + 'footer_copy3' => '© 2020 All Rights Reserved', + 'greetings' => 'Mit freundlichen Grüßen', + 'hello' => 'Hallo', + 'invoice_copy1line' => 'vielen Dank für Deine Bestellung bei mivita.care. Nachfolgend senden wir Dir die Rechnung zu deiner Bestellung: ', + 'invoice_title' => 'Rechnung zu Deiner Bestellung auf mivita.care', + 'invoice_subject' => 'Rechnung zu Deiner Bestellung', + 'cancellation_invoice_copy1line' => 'anbei erhältst Du die Stornorechnung zu deiner Bestellung: ', + 'cancellation_invoice_title' => 'Stornorechnung zu Deiner Bestellung auf mivita.care', + 'cancellation_invoice_subject' => 'Stornorechnung zu Deiner Bestellung', + 'last_name' => 'Nachname', + 'mail_confirm' => 'E-Mail bestätigen', + 'message' => 'Nachricht', + 'phone' => 'Telefon', + 'request_from' => 'Anfrage von mivita.care', + 'reset_pass_copy1line' => 'Du erhälst diese E-Mail, weil wir eine Anfrage zum Zurücksetzen Deines Passworts für Dein Konto erhalten haben.', + 'reset_passwort' => 'Passwort zurücksetzen', + 'sales_partnership' => 'Vertriebspartnerschaft', + 'sales_partnership_message' => 'Hinweis', + 'salutation' => 'Anrede', + 'sender' => 'Dein Team von mivita.care', + 'status_copy1line' => 'Status zu Deiner Bestellung auf mivita.care', + 'subject' => 'Betreff', + 'subject_activate' => 'Account aktivieren', + 'subject_reset' => 'Passwort zurücksetzen', + 'update_level_copy1line' => 'Herzlichen Glückwunsch!

Wir sind unglaublich stolz auf Dich! Du hast im letzten Monat mit Deinen :tp TP nicht nur Deine Qualifikation erreicht – Du hast etwas Großartiges geschafft!

Dein unermüdlicher Einsatz und Dein Engagement haben sich gelohnt. Ab sofort bist Du:

:to


Das ist ein echter Meilenstein in Deiner Karriere bei MIVITA!', + 'update_level_title' => 'Du hast Dein nächstes Karriere-Level erreicht!', + 'update_level_copy2line' => 'Dein Erfolg ist auch unser Erfolg, und wir freuen uns riesig, Dich auf dieser spannenden Reise begleiten zu dürfen. Mit diesem neuen Level eröffnen sich Dir jetzt noch mehr Möglichkeiten:

- Höhere Provisionen und bessere Margen
- Erweiterte Möglichkeiten für Dein Business
- Mehr Anerkennung und Status im Team', + 'update_level_copy3line' => 'Das ist erst der Anfang!

Dein Erfolg ist der Beweis dafür, dass kontinuierliche Arbeit und Leidenschaft zum Ziel führen. Bleib am Ball, motiviere Dein Team und erreiche gemeinsam mit uns noch größere Ziele.

Dein nächstes Level wartet bereits auf Dich – und wir wissen, dass Du es schaffen wirst!', + 'verify_copy1line' => 'Wir haben Daten über Dich in unserem System gespeichert. Bitte folge dem unten stehenden Link um Deine E-Mail-Adresse zu bestätigen. Weitherhin kannst Du Deine Daten ändern oder auch löschen.', + 'verify_e_mail' => 'Bestätige Deine Daten und E-Mail-Adresse', + 'your_request_from' => 'Deine Anfrage von', + 'your_custom_payout' => 'Dein persönlicher mivita Berater - :name hat eine individuelle Bestellung für Dich zusammengestellt. Jetzt musst Du nur noch Deine Bestellung bezahlen. Klicke auf den Link und gelange zum Checkout von mivita.care.', + 'your_custom_abo_payout' => 'Dein persönlicher mivita Berater - :name hat eine individuelle Abo-Bestellung für Dich zusammengestellt. Jetzt musst Du nur noch Deine Abo-Bestellung bezahlen. Klicke auf den Link und gelange zum Checkout von mivita.care.', + 'subject_custom_payout' => 'Deine individuelle Bestellung von :name auf mivita.care', + 'subject_custom_abo_payout' => 'Deine individuelle Abo-Bestellung von :name auf mivita.care', + 'button_custom_payout' => 'zur Zahlung', + 'checkout_custom_payout' => 'Dein Berater hat folgende Produkte für Dich zusammengestellt', + 'user_restore_subject' => 'Dein Account wurde wiederhergestellt', + 'user_restore_title' => 'Account-Wiederherstellung erfolgreich', + 'user_restore_greeting' => 'Hallo :name,', + 'user_restore_copy1line' => 'wir freuen uns, Dir mitteilen zu können, dass Dein Account bei mivita.care erfolgreich wiederhergestellt wurde.', + 'user_restore_copy2line' => 'Da Dein Passwort aus Sicherheitsgründen beim Löschen zurückgesetzt wurde, musst Du ein neues Passwort vergeben. Bitte klicke auf den folgenden Button, um Dein Passwort zurückzusetzen:', + 'user_restore_copy3line' => '• Dein Passwort wurde zurückgesetzt - bitte vergib ein neues Passwort über den obigen Link.
• Falls Du einen Shop hattest: Der Shop-Name (Subdomain) wurde beim Löschen freigegeben und muss neu vergeben werden.', + 'user_restore_button' => 'Neues Passwort vergeben', + 'user_restore_account_valid' => 'Deine Berater-Mitgliedschaft ist gültig bis:', + 'user_restore_important' => 'Wichtige Hinweise:', - // DHL Tracking E-Mail - 'dhl_tracking_subject' => 'Deine Sendung ist unterwegs - mivita.care', - 'dhl_tracking_subject_multiple' => 'Deine :count Sendungen sind unterwegs - mivita.care', - 'dhl_tracking_title' => 'Deine Sendung ist unterwegs!', - 'dhl_tracking_preview' => 'Sendungsnummer: :number - Verfolge Dein Paket bei DHL', - 'dhl_tracking_message' => 'gute Nachrichten! Deine Bestellung wurde versendet und ist auf dem Weg zu Dir.', - 'dhl_tracking_message_multiple' => 'gute Nachrichten! Deine Bestellung wurde in :count Paketen versendet und ist auf dem Weg zu Dir.', - 'dhl_tracking_package_label' => 'Paket :number', - 'dhl_tracking_number_label' => 'Deine Sendungsnummer', - 'dhl_tracking_order_ref' => 'Bestellnummer: :order', - 'dhl_tracking_button' => 'Sendung bei DHL verfolgen', - 'dhl_tracking_info' => 'Du kannst den aktuellen Status Deiner Sendung jederzeit über den obigen Button bei DHL einsehen.', + // DHL Tracking E-Mail + 'dhl_tracking_subject' => 'Deine Sendung ist unterwegs - mivita.care', + 'dhl_tracking_subject_multiple' => 'Deine :count Sendungen sind unterwegs - mivita.care', + 'dhl_tracking_title' => 'Deine Sendung ist unterwegs!', + 'dhl_tracking_preview' => 'Sendungsnummer: :number - Verfolge Dein Paket bei DHL', + 'dhl_tracking_message' => 'gute Nachrichten! Deine Bestellung wurde versendet und ist auf dem Weg zu Dir.', + 'dhl_tracking_message_multiple' => 'gute Nachrichten! Deine Bestellung wurde in :count Paketen versendet und ist auf dem Weg zu Dir.', + 'dhl_tracking_package_label' => 'Paket :number', + 'dhl_tracking_number_label' => 'Deine Sendungsnummer', + 'dhl_tracking_order_ref' => 'Bestellnummer: :order', + 'dhl_tracking_button' => 'Sendung bei DHL verfolgen', + 'dhl_tracking_info' => 'Du kannst den aktuellen Status Deiner Sendung jederzeit über den obigen Button bei DHL einsehen.', -); +]; diff --git a/resources/lang/de/home.php b/resources/lang/de/home.php index 919ae63..465a298 100644 --- a/resources/lang/de/home.php +++ b/resources/lang/de/home.php @@ -30,6 +30,13 @@ return array( 'manage_membership_now_here' => 'Mitgliedschaft jetzt hier verwalten', 'membership' => 'Mitgliedschaft', 'news_updates' => 'Neuigkeiten & Updates', + 'news_archive' => 'News-Archiv', + 'news_archive_title' => 'Alle Neuigkeiten & Updates', + 'news_archive_current' => 'Aktuelle News', + 'news_archive_older' => 'Ältere Meldungen', + 'news_archive_empty' => 'Keine älteren Meldungen vorhanden.', + 'news_archive_link' => 'Alle News ansehen', + 'news_back_to_dashboard' => 'Zurück zum Dashboard', 'open_since' => 'Eröffnet seit', 'open_your_shop' => 'Eröffne Deinen eigenen mivita-Shop', 'read_less' => 'Weniger anzeigen', diff --git a/resources/lang/de/navigation.php b/resources/lang/de/navigation.php index 859363d..aa2631c 100644 --- a/resources/lang/de/navigation.php +++ b/resources/lang/de/navigation.php @@ -1,75 +1,82 @@ 'Unterlagen', - 'add' => 'hinzufügen', - 'attribute' => 'Attribute', - 'business' => 'Business', - 'career_level' => 'Karriere-Level', - 'categories' => 'Kategorien', - 'clients' => 'Kunden', - 'commissions' => 'Provisionen', - 'contents' => 'Inhalte', - 'countries' => 'Länder', - 'credit' => 'Gutschriften', - 'do_order' => 'Bestellung aufgeben', - 'edit' => 'bearbeiten', - 'export' => 'Export', - 'general' => 'Allgemein', - 'home' => 'Home', - 'ingredients' => 'Inhaltsstoffe', - 'invoice' => 'Rechnungen', - 'language' => 'Sprache', - 'languages' => 'Sprachen', - 'logout' => 'Logout', - 'manage' => 'verwalten', - 'member' => 'Berater', - 'new_member' => 'neuen Berater', - 'member_register' => 'Berater registrieren', - 'membership' => 'Mitgliedschaft', - 'modules' => 'Module', - 'my_account' => 'Mein Konto', - 'my_clients' => 'Meine Kunden', - 'my_data' => 'Meine Daten', - 'my_homeparty' => 'Meine Auszeitparty', - 'my_membership' => 'Meine Mitgliedschaft', - 'my_orders' => 'Meine Bestellungen', - 'my_shop' => 'Mein Shop', - 'my_team' => 'Mein Team', - 'order' => 'Bestellung', - 'orders' => 'Bestellungen', - 'overview' => 'Übersicht', - 'payment_methods' => 'Zahlungsarten', - 'payments' => 'Finanzen', - 'points' => 'Points', - 'products' => 'Produkte', - 'sales_volumes' => 'Absatzmengen', - 'settings' => 'Einstellungen', - 'shipping_costs' => 'Versandkosten', - 'start_site' => 'Startseite Shop', - 'structure' => 'Struktur', - 'system_settings' => 'System-E.', - 'translate' => 'Übersetzungen', - 'translation' => 'Übersetzung', - 'trigger' => 'auslösen', - 'user_roles' => 'User Rechte', - 'tax_advisor' => 'Steuerberater', - 'downloadcenter' => 'Downloadcenter', - 'files' => 'Dateien', - 'tags' => 'Tags', - 'myabos' => 'Meine Abos', - 'customerabos' => 'Kunden Abos', - 'myabo' => 'Mein Abo', - 'customerabo' => 'Kunden Abo', - 'abo' => 'Abo', - 'abos' => 'Abos', - 'payment_links' => 'Bezahllinks', - 'dashboard' => 'Dashboard', - 'shop' => 'Shop', - 'to_shop' => 'Zum Shop', - 'marketingplan' => 'Marketingplan', - 'dhl_cockpit' => 'DHL Cockpit', - 'revenue' => 'Umsatz', - 'level_reports' => 'Level Reports', - 'dashboard_news' => 'Dashboard News', -); +return [ + 'documents' => 'Unterlagen', + 'add' => 'hinzufügen', + 'attribute' => 'Attribute', + 'business' => 'Business', + 'career_level' => 'Karriere-Level', + 'categories' => 'Kategorien', + 'clients' => 'Kunden', + 'commissions' => 'Provisionen', + 'contents' => 'Inhalte', + 'countries' => 'Länder', + 'credit' => 'Gutschriften', + 'do_order' => 'Bestellung aufgeben', + 'edit' => 'bearbeiten', + 'export' => 'Export', + 'general' => 'Allgemein', + 'home' => 'Home', + 'ingredients' => 'Inhaltsstoffe', + 'invoice' => 'Rechnungen', + 'language' => 'Sprache', + 'languages' => 'Sprachen', + 'logout' => 'Logout', + 'manage' => 'verwalten', + 'member' => 'Berater', + 'new_member' => 'neuen Berater', + 'member_register' => 'Berater registrieren', + 'membership' => 'Mitgliedschaft', + 'modules' => 'Module', + 'my_account' => 'Mein Konto', + 'my_clients' => 'Meine Kunden', + 'my_data' => 'Meine Daten', + 'my_homeparty' => 'Meine Auszeitparty', + 'my_membership' => 'Meine Mitgliedschaft', + 'my_orders' => 'Meine Bestellungen', + 'my_shop' => 'Mein Shop', + 'my_team' => 'Mein Team', + 'order' => 'Bestellung', + 'orders' => 'Bestellungen', + 'overview' => 'Übersicht', + 'payment_methods' => 'Zahlungsarten', + 'payments' => 'Finanzen', + 'points' => 'Points', + 'products' => 'Produkte', + 'sales_volumes' => 'Absatzmengen', + 'settings' => 'Einstellungen', + 'shipping_costs' => 'Versandkosten', + 'start_site' => 'Startseite Shop', + 'structure' => 'Struktur', + 'system_settings' => 'System-E.', + 'translate' => 'Übersetzungen', + 'translation' => 'Übersetzung', + 'trigger' => 'auslösen', + 'user_roles' => 'User Rechte', + 'user_cleanup' => 'User Bereinigung', + 'user_restore' => 'User Wiederherstellen', + 'tax_advisor' => 'Steuerberater', + 'downloadcenter' => 'Downloadcenter', + 'files' => 'Dateien', + 'tags' => 'Tags', + 'myabos' => 'Meine Abos', + 'customerabos' => 'Kunden Abos', + 'myabo' => 'Mein Abo', + 'customerabo' => 'Kunden Abo', + 'abo' => 'Abo', + 'abos' => 'Abos', + 'payment_links' => 'Bezahllinks', + 'dashboard' => 'Dashboard', + 'shop' => 'Shop', + 'to_shop' => 'Zum Shop', + 'marketingplan' => 'Marketingplan', + 'dhl_cockpit' => 'DHL Cockpit', + 'revenue' => 'Umsatz', + 'level_reports' => 'Level Reports', + 'dashboard_news' => 'Dashboard News', + 'teamabos' => 'Team Abos', + 'customer_orders' => 'Kundenbestellungen', + 'external_orders' => 'Externe Bestellungen', + 'tools' => 'Tools', + 'news_archive' => 'News Archiv', +]; diff --git a/resources/lang/de/order.php b/resources/lang/de/order.php index 304bb71..0d4c0c5 100644 --- a/resources/lang/de/order.php +++ b/resources/lang/de/order.php @@ -1,122 +1,125 @@ 'Kunden hinzufügen', - 'advertising_material' => 'Werbemittel', - 'adviser_collective_invoice' => 'Berater Sammelrechnung', - 'adviser_order_for_membership' => 'Beraterbestellung für Mitgliedschaft', - 'adviser_order_for_registration' => 'Beraterbestellung für Registrierung', - 'art_no' => 'Art-Nr.', - 'article' => 'Artikel', - 'article_remove' => 'Artikel entfernen', - 'assigned_advisor' => 'Berater zuordnen', - 'assigned_counsellor' => 'Zugewiesener Berater', - 'billing_address_of_client' => 'Rechnungsadresse des Kunden', - 'billing_address_of_the_advisor' => 'Rechnungsadresse des Beraters', - 'client_order_via_shop' => 'Kundenbestellung über Shop', - 'collective_invoice' => 'Sammelrechnung', - 'collective_invoice_contains_orders' => 'Sammelrechnung behinhaltet folgende Kundenbestellungen', - 'compensation_product' => 'Kompensationsprodukt', - 'confirm_and_proceed_to_checkout' => 'bestätigen und weiter zur Kasse', - 'confirm_and_proceed_to_order' => 'bestätigen und weiter zur Bestellung', - 'consultant_order_for_home_party' => 'Beraterbestellung für eine Homeparty', - 'content' => 'Inhalt', - 'contents' => 'Inhalte', - 'create_invoice' => 'Rechnung erstellen', - 'date' => 'Datum', - 'delivery_address_of_the_client' => 'Lieferadresse des Kunden', - 'delivery_address_of_the_consultant' => 'Lieferadresse des Berater', - 'delivery_country_can_no_longer_be_changed' => 'Das Lieferland kann nicht mehr geändert werden', - 'delivery_country_changed_customer_info' => 'Das Lieferland kann nur beim Kunden unter Meine Kunden geändert werden.', - 'delivery_country_changed_info' => 'Das Lieferland kann nur unter Meine Daten geändert werden.', - 'delivery_note' => 'Lieferschein', - 'delivery_to_me' => 'Lieferung an mich', - 'delivery_to_the_customer' => 'Lieferung an den Kunden', - 'deliverydata' => 'Lieferdaten', - 'different_delivery_address' => 'Abweichende Lieferadresse', - 'error_no_address_data_found' => 'Fehler: Keine Adressdaten gefunden!', - 'external_orders' => 'Externe Bestellungen', - 'external_orders_info_pay' => 'bezahlen = Sammelrechnung erstellen und zum Checkout', - 'external_orders_info_remove' => 'entfernen = Bestellungen werden nach entfernt verschoben, für Stornos etc.', - 'external_orders_info_reset' => ' zurücksetzen = Bestellungen werden nur nach offen verschoben, Sammelrechnung werden nicht geändert', - 'goods_are_for_customer_and_shipped' => 'Ware ist für einen Kunden und wird an den Kunden versendet', - 'goods_are_for_me_and_shipped' => 'Ware ist für mich und wird an meine Adresse versendet', - 'gross' => 'brutto', - 'gross_price' => 'Preis brutto', - 'incentives' => 'Incentives', - 'included_VAT' => 'Enthaltene MwSt', - 'invoice' => 'Rechnung', - 'invoice_address' => 'Rechnungsadresse', - 'land_can_no_longer_be_changed' => 'Das Land kann nicht mehr geändert werden', - 'email_can_not_be_changed' => 'Deine E-Mail Adresse kann nicht mehr geändert werden', - 'link_to_the_invoice' => 'Link zur Rechnung', - 'my_delivery_address' => 'Meine Lieferadresse', - 'net' => 'netto', - 'net_price' => 'Preis netto', - 'no_address_created' => 'Keine Adresse angelegt', - 'no_career_level_info' => 'Hinweis: Dir wurde noch kein Karriere-Level zugewisen. Bitte wende dich an info@mivita.care', - 'no_delivery_address' => 'Keine Lieferadresse angelegt ', - 'no_order' => 'Keine Bestellung', - 'number_of_items' => 'Anzahl Artikel', - 'order' => 'Bestellung', - 'order_consultant' => 'Bestellung Berater', - 'order_date' => 'Bestelldatum', - 'order_for_client' => 'Bestellung für Kunde', - 'order_for_consultant' => 'Bestellung für Berater', - 'order_number' => 'Bestellnummer', - 'order_via_external_shop' => 'Bestellung über externen SHOP', - 'plus_VAT' => 'zzgl. MwSt', - 'points' => 'Points', - 'points_total' => 'Points gesamt', - 'points_turnover_assigned' => 'Punkte / Umsatz zugewiesen', - 'product' => 'Produkt', - 'product_prices_career_level_info' => 'Die Produktpreise (Mein Preis) werden entsprechend Deinem Karriere-Level :user_level_name abzüglich :user_level_margin % Marge angezeigt und brechnet.
Hinweis: Wenn Du den die Seite verlässt, wird der Warenkorb zurückgesetzt.', - 'product_prices_career_level_cpay_info' => 'Die Produktpreise werden als Kunden VK-Preise angezeigt, nach Abschluss der Kundenzahlung erhälst du Deine Provision entsprechend Deinem Karriere-Level :user_level_name Provision :user_level_margin %.
Hinweis: Wenn Du den die Seite verlässt, wird der Warenkorb zurückgesetzt.', - 'purchased_from_shop' => 'Gekauft im Shop', - 'quantity' => 'Anzahl', - 'ship_to_existing_customer_select_customer' => 'An bestehenden Kunden versenden | Kunden auswählen', - 'ship_to_new_customer' => 'An neuen Kunden versenden', - 'ship_to_this_customer' => 'An diesen Kunde versenden', - 'ship_to_this_customer_check' => 'Mir ist bekannt, dass dieser Bestellvorgang nur für Kundenbestellungen ist und nicht für meine eigenen Bestellungen.', - 'ship_to_this_customer_info' => 'Sollten die Rechnungsadresse oder das Lieferland nicht korrekt sein, ändere diese bitte vor der Bestellung unter', - 'ship_to_this_customer_info_2' => 'Die Lieferadresse, bis auf das Lieferland, kann auch im Checkout angepassst werden.', - 'ship_to_this_email_info' => 'Der Bestelllink wird Deinem Kunden an folgenden E-Mail-Adresse gesendet:', - 'shipping' => 'Versand', - 'shipping_compensation_product' => 'Versand Kompensationsprodukt', - 'shipping_costs' => 'Versandkosten', - 'shopping_cart' => 'Warenkorb', - 'shopping_cart_delete' => 'Warenkorb löschen', - 'shopping_cart_update' => 'Warenkorb aktualisieren', - 'subtotal' => 'Zwischensumme', - 'sum' => 'Summe', - 'sums' => 'Summen', - 'total' => 'Gesamt', - 'total_gross' => 'Gesamtsumme brutto', - 'total_net' => 'Gesamtsumme netto', - 'total_price' => 'Preis gesamt', - 'total_shipping_costs' => 'Gesamte Versandkosten', - 'total_sum' => 'Gesamtsumme', - 'total_sums' => 'Gesamtsummen', - 'total_without_VAT' => 'Summe ohne MwSt', - 'turnover' => 'Umsatz', - 'unit_price' => 'Einzelpreis', - 'weight' => 'Gewicht', - 'you_has_article_in_shopping_cart' => 'Du hast :num Artikel in Deinem Warenkorb', - 'excl' => 'zzgl.', - 'ipay' => 'ich zahle', - 'cpay' => 'Kunde zahlt', - 'ipay_text' => 'Ich zahle abzüglich meiner Marge und rechne den VK mit meinem Kunden ab', - 'cpay_text' => 'Mein Kunden bekommt einen Zahlungslink und ich erhalten meine Provision', - 'sum_net' => 'Summe netto', - 'confirm_and_send_order' => 'Bestellung abschließen und Zahlungslink versenden', - 'confirm_send_order_info' => 'Mit dem Abschließen der Bestellung wird ein Zahlungslink erstellt und per E-Mail an Deinen Kunden versendet.
Dein Kunde kann dann die Zahlung abschließen und die Ware wird versendet, Deine Provision wird mit dem Abschluss der Zahlung gutgeschrieben.', - 'order_was_placed_successfully' => 'Die Bestellung wurde erfolgreich angelegt.', - 'order_abo_was_placed_successfully' => 'Die Abo-Bestellung wurde erfolgreich angelegt.', - 'payment_link_for_your_customer' => 'Der Bezahllink für Deinen Kunden', - 'delivery' => 'Lierferung', - 'number' => 'Art-Nr.', - 'reorder' => 'Nachbestellen', - 'reorder_info' => 'Möchtest Du diesen Artikel noch einmal bestellen?
Mit einem Klick auf den Button werden die Artikel erneut in den Warenkorb gelegt und du wirst auf die Warenkorb-Seite weitergeleitet.', - 'reorder_info_2' => 'Dein Lieferland ist: :country
Möchtest du deine Bestellung in ein anders Land liefern lassen, ändere bitte Deine Rechnungs- oder Lieferadresse unter Meine Daten', - -); +return [ + 'add_customer' => 'Kunden hinzufügen', + 'advertising_material' => 'Werbemittel', + 'adviser_collective_invoice' => 'Berater Sammelrechnung', + 'adviser_order_for_membership' => 'Beraterbestellung für Mitgliedschaft', + 'adviser_order_for_registration' => 'Beraterbestellung für Registrierung', + 'art_no' => 'Art-Nr.', + 'article' => 'Artikel', + 'article_remove' => 'Artikel entfernen', + 'assigned_advisor' => 'Berater zuordnen', + 'assigned_counsellor' => 'Zugewiesener Berater', + 'billing_address_of_client' => 'Rechnungsadresse des Kunden', + 'billing_address_of_the_advisor' => 'Rechnungsadresse des Beraters', + 'client_order_via_shop' => 'Kundenbestellung über Shop', + 'collective_invoice' => 'Sammelrechnung', + 'collective_invoice_contains_orders' => 'Sammelrechnung behinhaltet folgende Kundenbestellungen', + 'compensation_product' => 'Kompensationsprodukt', + 'confirm_and_proceed_to_checkout' => 'bestätigen und weiter zur Kasse', + 'confirm_and_proceed_to_order' => 'bestätigen und weiter zur Bestellung', + 'consultant_order_for_home_party' => 'Beraterbestellung für eine Homeparty', + 'content' => 'Inhalt', + 'contents' => 'Inhalte', + 'create_invoice' => 'Rechnung erstellen', + 'date' => 'Datum', + 'delivery_address_of_the_client' => 'Lieferadresse des Kunden', + 'delivery_address_of_the_consultant' => 'Lieferadresse des Berater', + 'delivery_country_can_no_longer_be_changed' => 'Das Lieferland kann nicht mehr geändert werden', + 'delivery_country_changed_customer_info' => 'Das Lieferland kann nur beim Kunden unter Meine Kunden geändert werden.', + 'delivery_country_changed_info' => 'Das Lieferland kann nur unter Meine Daten geändert werden.', + 'delivery_note' => 'Lieferschein', + 'delivery_to_me' => 'Lieferung an mich', + 'delivery_to_the_customer' => 'Lieferung an den Kunden', + 'deliverydata' => 'Lieferdaten', + 'different_delivery_address' => 'Abweichende Lieferadresse', + 'error_no_address_data_found' => 'Fehler: Keine Adressdaten gefunden!', + 'external_orders' => 'Externe Bestellungen', + 'external_orders_info_pay' => 'bezahlen = Sammelrechnung erstellen und zum Checkout', + 'external_orders_info_remove' => 'entfernen = Bestellungen werden nach entfernt verschoben, für Stornos etc.', + 'external_orders_info_reset' => ' zurücksetzen = Bestellungen werden nur nach offen verschoben, Sammelrechnung werden nicht geändert', + 'goods_are_for_customer_and_shipped' => 'Ware ist für einen Kunden und wird an den Kunden versendet', + 'goods_are_for_me_and_shipped' => 'Ware ist für mich und wird an meine Adresse versendet', + 'gross' => 'brutto', + 'gross_price' => 'Preis brutto', + 'incentives' => 'Incentives', + 'included_VAT' => 'Enthaltene MwSt', + 'invoice' => 'Rechnung', + 'invoice_address' => 'Rechnungsadresse', + 'land_can_no_longer_be_changed' => 'Das Land kann nicht mehr geändert werden', + 'email_can_not_be_changed' => 'Deine E-Mail Adresse kann nicht mehr geändert werden', + 'link_to_the_invoice' => 'Link zur Rechnung', + 'my_delivery_address' => 'Meine Lieferadresse', + 'net' => 'netto', + 'net_price' => 'Preis netto', + 'no_address_created' => 'Keine Adresse angelegt', + 'no_career_level_info' => 'Hinweis: Dir wurde noch kein Karriere-Level zugewisen. Bitte wende dich an info@mivita.care', + 'no_delivery_address' => 'Keine Lieferadresse angelegt ', + 'no_order' => 'Keine Bestellung', + 'number_of_items' => 'Anzahl Artikel', + 'order' => 'Bestellung', + 'order_consultant' => 'Bestellung Berater', + 'order_date' => 'Bestelldatum', + 'order_for_client' => 'Bestellung für Kunde', + 'order_for_consultant' => 'Bestellung für Berater', + 'order_number' => 'Bestellnummer', + 'order_via_external_shop' => 'Bestellung über externen SHOP', + 'plus_VAT' => 'zzgl. MwSt', + 'points' => 'Points', + 'points_total' => 'Points gesamt', + 'points_turnover_assigned' => 'Punkte / Umsatz zugewiesen', + 'product' => 'Produkt', + 'product_prices_career_level_info' => 'Die Produktpreise (Mein Preis) werden entsprechend Deinem Karriere-Level :user_level_name abzüglich :user_level_margin % Marge angezeigt und brechnet.
Hinweis: Wenn Du den die Seite verlässt, wird der Warenkorb zurückgesetzt.', + 'product_prices_career_level_cpay_info' => 'Die Produktpreise werden als Kunden VK-Preise angezeigt, nach Abschluss der Kundenzahlung erhälst du Deine Provision entsprechend Deinem Karriere-Level :user_level_name Provision :user_level_margin %.
Hinweis: Wenn Du den die Seite verlässt, wird der Warenkorb zurückgesetzt.', + 'purchased_from_shop' => 'Gekauft im Shop', + 'quantity' => 'Anzahl', + 'ship_to_existing_customer_select_customer' => 'An bestehenden Kunden versenden | Kunden auswählen', + 'ship_to_new_customer' => 'An neuen Kunden versenden', + 'ship_to_this_customer' => 'An diesen Kunde versenden', + 'ship_to_this_customer_check' => 'Mir ist bekannt, dass dieser Bestellvorgang nur für Kundenbestellungen ist und nicht für meine eigenen Bestellungen.', + 'ship_to_this_customer_info' => 'Sollten die Rechnungsadresse oder das Lieferland nicht korrekt sein, ändere diese bitte vor der Bestellung unter', + 'ship_to_this_customer_info_2' => 'Die Lieferadresse, bis auf das Lieferland, kann auch im Checkout angepassst werden.', + 'ship_to_this_email_info' => 'Der Bestelllink wird Deinem Kunden an folgenden E-Mail-Adresse gesendet:', + 'shipping' => 'Versand', + 'shipping_compensation_product' => 'Versand Kompensationsprodukt', + 'shipping_costs' => 'Versandkosten', + 'shopping_cart' => 'Warenkorb', + 'shopping_cart_delete' => 'Warenkorb löschen', + 'shopping_cart_update' => 'Warenkorb aktualisieren', + 'subtotal' => 'Zwischensumme', + 'sum' => 'Summe', + 'sums' => 'Summen', + 'total' => 'Gesamt', + 'total_gross' => 'Gesamtsumme brutto', + 'total_net' => 'Gesamtsumme netto', + 'total_price' => 'Preis gesamt', + 'total_shipping_costs' => 'Gesamte Versandkosten', + 'total_sum' => 'Gesamtsumme', + 'total_sums' => 'Gesamtsummen', + 'total_without_VAT' => 'Summe ohne MwSt', + 'turnover' => 'Umsatz', + 'unit_price' => 'Einzelpreis', + 'weight' => 'Gewicht', + 'you_has_article_in_shopping_cart' => 'Du hast :num Artikel in Deinem Warenkorb', + 'excl' => 'zzgl.', + 'ipay' => 'ich zahle', + 'cpay' => 'Kunde zahlt', + 'ipay_text' => 'Ich zahle abzüglich meiner Marge und rechne den VK mit meinem Kunden ab', + 'cpay_text' => 'Mein Kunden bekommt einen Zahlungslink und ich erhalten meine Provision', + 'sum_net' => 'Summe netto', + 'confirm_and_send_order' => 'Bestellung abschließen und Zahlungslink versenden', + 'confirm_send_order_info' => 'Mit dem Abschließen der Bestellung wird ein Zahlungslink erstellt und per E-Mail an Deinen Kunden versendet.
Dein Kunde kann dann die Zahlung abschließen und die Ware wird versendet, Deine Provision wird mit dem Abschluss der Zahlung gutgeschrieben.', + 'order_was_placed_successfully' => 'Die Bestellung wurde erfolgreich angelegt.', + 'order_abo_was_placed_successfully' => 'Die Abo-Bestellung wurde erfolgreich angelegt.', + 'payment_link_for_your_customer' => 'Der Bezahllink für Deinen Kunden', + 'delivery' => 'Lierferung', + 'number' => 'Art-Nr.', + 'reorder' => 'Nachbestellen', + 'reorder_info' => 'Möchtest Du diesen Artikel noch einmal bestellen?
Mit einem Klick auf den Button werden die Artikel erneut in den Warenkorb gelegt und du wirst auf die Warenkorb-Seite weitergeleitet.', + 'reorder_info_2' => 'Dein Lieferland ist: :country
Möchtest du deine Bestellung in ein anders Land liefern lassen, ändere bitte Deine Rechnungs- oder Lieferadresse unter Meine Daten', + 'free_shipping' => 'Versandkostenfrei', + 'free_shipping_reached' => 'Ab :amount € versandkostenfrei', + 'free_shipping_info' => 'Noch :missing € bis zum versandkostenfreien Versand (ab :amount €)', + +]; diff --git a/resources/lang/de/payment.php b/resources/lang/de/payment.php index 8ceac2e..8754af2 100644 --- a/resources/lang/de/payment.php +++ b/resources/lang/de/payment.php @@ -1,172 +1,183 @@ '', - 'BIC' => 'BIC', - 'IBAN' => 'IBAN', - 'Mastercard' => 'Mastercard', - 'American Express' => 'American Express', - 'VAT' => 'MwSt', - 'VISA' => 'VISA', - 'accepted_data_checkbox_customer' => 'Mit Klick auf "Jetzt kaufen" akzeptiere ich die :gtc, die :c_policy und die :p_policy damit für die Bestellung meine Daten verarbeitet werden können.', - 'accepted_data_checkbox_user' => 'Mit Klick auf "Jetzt kaufen" akzeptiere ich die Allgemeinen Geschäftsbedingungen und die Datenschutzbelehrung, damit für die Bestellung meine Daten verarbeitet werden können.', - 'account_holder' => 'Kontoinhaber', - 'agree_SEPA_complete_purchase' => 'SEPA-Lastschriftmandat zustimmen und kauf abschließen', - 'auto_renewal_hl' => 'Automatische Verlängerung', - 'auto_renewal_line_1' => 'Sicher ist sicher! Wir empfehlen, diese Option zu aktivieren, wenn Du Deine jährliche Mitgliedschaft dauerhaft bestehen lassen möchtest. Denn geht eine manuelle Zahlung nach Ablauf der Jahresmitgliedschaft nicht zeitig ein, deaktiviert das System Deinen Onlineshop bzw. Deinen Zugang zum Salescenter. Dann kannst Du keine Bestellungen mehr tätigen oder Einblick in Deinen Statistiken erhalten, bis eine erneute Zahlung Deinen Account reaktiviert. Daher raten wir Dir, die Zahlung per SEPA-Lastschrift zu tätigen. Wir speichern dieses Mandat und buchen 14 Tage vor Ablauf Deine Jahresgebühr automatisch ab. So hast Du einen reibungslosen Prozess, ohne dass Du darauf achten musst.', - 'auto_renewal_line_2' => 'Du kannst diese Option natürlich jederzeit in Deinem Account rückgängig machen bzw. Deinen Account / Deine Vertriebspartnerschaft bei MIVITA kündigen.', - 'automatic_SEPA_mandate_type_was_selected' => 'Automatische Verlängerung wurde ausgewählt. Dein SEPA-Mandart wird gespeichert und die jährliche Zahlung automatisch ausgeführt.', - 'back_to_shop' => 'zurück zum Shop', - 'back_to_shop_shopping_cart' => 'zurück zum Warenkorb', - 'bank' => 'Bank', - 'billing_address' => 'Rechnungsadresse', - 'billing_address_can_only_changed_in_salescentre' => 'Deine Rechnungsadresse kann nur im Salescenter geändert werden.', - 'buy_now' => 'Jetzt kaufen', - 'buy_now_copy' => 'Sind alle Deine Angaben vollständig ausgefüllt, klicke auf "Jetzt kaufen" und Du wirst zu unserem Zahlungsanbieter weitergeleitet, die Verbindung ist SSL verschlüsselt.', - 'c_policy' => 'Widerrufsbelehrung', - 'checkout_ssl_server' => 'Du wirst auf unseren checkout Server weitergeletet, die Verbindung ist SSL verschlüsselt.', - 'country_of_delivery' => 'Lieferland', - 'credit_card' => 'Kreditkarte', - 'credit_card_number' => 'Kreditkartennummer', - 'delivery_country_can_only_changed_in_salescentre' => 'Das Lieferland kann nur im Salescenter geändert werden.', - 'delivery_country_cannot_change' => 'Das Lieferland kann nicht geändert werden.', - 'excl' => 'zzgl.', - 'firstname_lastname' => 'Vorname Nachname', - 'gtc' => 'Allgemeinen Geschäftsbedingungen', - 'month' => 'Monat', - 'months' => 'Monate', - 'ordering_country' => 'Bestellland', - 'owner' => 'Inhaber', - 'p_policy' => 'Datenschutzerklärung', - 'payment_by_SEPA' => 'Bezahlung per SEPA', - 'payment_by_SEPA_info' => 'Deine Zahlung wird bearbeitet, eine Bestätigung zur Zahlungsabwicklung wird automatisch erstellt.', - 'payment_by_credit_card' => 'Bezahlung per Kreditkarte:', - 'payment_by_credit_card_info' => 'Deine Zahlung wurde genehmigt, eine Bestätigung der Zahlung wird automatisch erstellt.', - 'payment_by_invoice' => 'Bezahlung per Rechnung', - 'payment_by_invoice_info' => 'Deine Bestellung wird bearbeitet, eine Bestätigung zur Bestellungsabwicklung wird automatisch erstellt', - 'payment_in_advance' => 'Bezahlung per Vorkasse', - 'payment_method' => 'Zahlungsart', - 'payment_method_not_enabled_please_contact' => 'Zahlungsmethode nicht freigeschaltet, bitte wende dich an', - 'paypal' => 'PayPal', - 'please_check_form_and_complete' => ' Bitte überprüfe das Formular und vervollständigen alle Angaben.', - 'please_transfer_amount_following_account' => 'Bitte überweise :amount EUR auf die folgende Kontoverbindung, um den Kauf abzuschließen.', - 'prepayment' => 'Vorkasse', - 'purchase_on_account' => 'Rechnungskauf', - 'reason_for_payment' => 'Verwendungszweck', - 'remaining_time' => 'Restlaufzeit', - 'reverse_charge_procedure' => 'Reverse Charge Verfahren', - 'select_and_proceed_to_checkout' => 'wählen und weiter zur Kasse', - 'select_and_save' => 'auswählen und speichern', - 'sepa_direct_debit' => 'SEPA Lastschrift', - 'sofort_bank_transfer' => 'Sofort -Überweisung', - 'status' => - array( - 'checkout_cancel' => ' Zahlungsvorgang Abbruch', - 'checkout_error' => 'Zahlungsvorgang Fehler', - 'checkout_payment' => 'Checkout', - 'payment_approved' => 'Zahlung genehmigt - bitte auf E-Mail warten', - 'payment_error' => 'Zahlung Fehler', +return [ + '' => '', + 'BIC' => 'BIC', + 'IBAN' => 'IBAN', + 'Mastercard' => 'Mastercard', + 'American Express' => 'American Express', + 'VAT' => 'MwSt', + 'VISA' => 'VISA', + 'accepted_data_checkbox_customer' => 'Mit Klick auf "Jetzt kaufen" akzeptiere ich die :gtc, die :c_policy und die :p_policy damit für die Bestellung meine Daten verarbeitet werden können.', + 'accepted_data_checkbox_user' => 'Mit Klick auf "Jetzt kaufen" akzeptiere ich die Allgemeinen Geschäftsbedingungen und die Datenschutzbelehrung, damit für die Bestellung meine Daten verarbeitet werden können.', + 'account_holder' => 'Kontoinhaber', + 'agree_SEPA_complete_purchase' => 'SEPA-Lastschriftmandat zustimmen und kauf abschließen', + 'auto_renewal_hl' => 'Automatische Verlängerung', + 'auto_renewal_line_1' => 'Sicher ist sicher! Wir empfehlen, diese Option zu aktivieren, wenn Du Deine jährliche Mitgliedschaft dauerhaft bestehen lassen möchtest. Denn geht eine manuelle Zahlung nach Ablauf der Jahresmitgliedschaft nicht zeitig ein, deaktiviert das System Deinen Onlineshop bzw. Deinen Zugang zum Salescenter. Dann kannst Du keine Bestellungen mehr tätigen oder Einblick in Deinen Statistiken erhalten, bis eine erneute Zahlung Deinen Account reaktiviert. Daher raten wir Dir, die Zahlung per SEPA-Lastschrift zu tätigen. Wir speichern dieses Mandat und buchen 14 Tage vor Ablauf Deine Jahresgebühr automatisch ab. So hast Du einen reibungslosen Prozess, ohne dass Du darauf achten musst.', + 'auto_renewal_line_2' => 'Du kannst diese Option natürlich jederzeit in Deinem Account rückgängig machen bzw. Deinen Account / Deine Vertriebspartnerschaft bei MIVITA kündigen.', + 'automatic_SEPA_mandate_type_was_selected' => 'Automatische Verlängerung wurde ausgewählt. Dein SEPA-Mandart wird gespeichert und die jährliche Zahlung automatisch ausgeführt.', + 'back_to_shop' => 'zurück zum Shop', + 'back_to_shop_shopping_cart' => 'zurück zum Warenkorb', + 'bank' => 'Bank', + 'billing_address' => 'Rechnungsadresse', + 'billing_address_can_only_changed_in_salescentre' => 'Deine Rechnungsadresse kann nur im Salescenter geändert werden.', + 'buy_now' => 'Jetzt kaufen', + 'buy_now_copy' => 'Sind alle Deine Angaben vollständig ausgefüllt, klicke auf "Jetzt kaufen" und Du wirst zu unserem Zahlungsanbieter weitergeleitet, die Verbindung ist SSL verschlüsselt.', + 'c_policy' => 'Widerrufsbelehrung', + 'checkout_ssl_server' => 'Du wirst auf unseren checkout Server weitergeletet, die Verbindung ist SSL verschlüsselt.', + 'country_of_delivery' => 'Lieferland', + 'credit_card' => 'Kreditkarte', + 'credit_card_number' => 'Kreditkartennummer', + 'delivery_country_can_only_changed_in_salescentre' => 'Das Lieferland kann nur im Salescenter geändert werden.', + 'delivery_country_cannot_change' => 'Das Lieferland kann nicht geändert werden.', + 'excl' => 'zzgl.', + 'firstname_lastname' => 'Vorname Nachname', + 'gtc' => 'Allgemeinen Geschäftsbedingungen', + 'month' => 'Monat', + 'months' => 'Monate', + 'ordering_country' => 'Bestellland', + 'owner' => 'Inhaber', + 'p_policy' => 'Datenschutzerklärung', + 'payment_by_SEPA' => 'Bezahlung per SEPA', + 'payment_by_SEPA_info' => 'Deine Zahlung wird bearbeitet, eine Bestätigung zur Zahlungsabwicklung wird automatisch erstellt.', + 'payment_by_credit_card' => 'Bezahlung per Kreditkarte:', + 'payment_by_credit_card_info' => 'Deine Zahlung wurde genehmigt, eine Bestätigung der Zahlung wird automatisch erstellt.', + 'payment_by_invoice' => 'Bezahlung per Rechnung', + 'payment_by_invoice_info' => 'Deine Bestellung wird bearbeitet, eine Bestätigung zur Bestellungsabwicklung wird automatisch erstellt', + 'payment_in_advance' => 'Bezahlung per Vorkasse', + 'payment_method' => 'Zahlungsart', + 'payment_method_not_enabled_please_contact' => 'Zahlungsmethode nicht freigeschaltet, bitte wende dich an', + 'paypal' => 'PayPal', + 'please_check_form_and_complete' => ' Bitte überprüfe das Formular und vervollständigen alle Angaben.', + 'please_transfer_amount_following_account' => 'Bitte überweise :amount EUR auf die folgende Kontoverbindung, um den Kauf abzuschließen.', + 'prepayment' => 'Vorkasse', + 'purchase_on_account' => 'Rechnungskauf', + 'reason_for_payment' => 'Verwendungszweck', + 'remaining_time' => 'Restlaufzeit', + 'reverse_charge_procedure' => 'Reverse Charge Verfahren', + 'select_and_proceed_to_checkout' => 'wählen und weiter zur Kasse', + 'select_and_save' => 'auswählen und speichern', + 'sepa_direct_debit' => 'SEPA Lastschrift', + 'sofort_bank_transfer' => 'Sofort -Überweisung', + 'status' => [ + 'checkout_cancel' => ' Zahlungsvorgang Abbruch', + 'checkout_error' => 'Zahlungsvorgang Fehler', + 'checkout_payment' => 'Checkout', + 'payment_approved' => 'Zahlung genehmigt - bitte auf E-Mail warten', + 'payment_error' => 'Zahlung Fehler', + 'payment_not_found' => 'Zahlung nicht gefunden', + 'payment_redirect' => 'Zahlung in Bearbeitung - bitte auf E-Mail warten', + 'store_payment' => 'Zahlung gespeichert', + 'success' => 'Erflogreich ausgeführt', + 'success_payment' => 'Zahlung erflogreich', + 'txaction_appointed' => 'Zahlung genehmigt - E-Mail wurde gesendet, bitte warten auf Bestätigung', + 'txaction_failed' => 'Zahlung fehlgeschlagen - E-Mail wurde gesendet', + 'txaction_paid' => 'Zahlung bestätigt - E-Mail wurde gesendet', + ], + 'thank_you_very_much' => 'Vielen Dank,', + 'total_amount' => 'Gesamtbetrag', + 'valid until' => 'Gültis bis', + 'valid' => 'Gültis', + 'verification_no' => 'Prüfnr.', + 'we_have_received_your_order_get_email' => 'Deine Bestellung ist bei uns eingegangen. In Kürze erhälst Du von uns eine Bestellbestätigungsmail.', + 'your_mivita_team' => 'Dein Team von mivita.care', + 'your_order_number_is' => 'Deine Bestellnummer ist', + 'open' => 'offen', + 'openly' => 'geöffnet', + 'paid' => 'bezahlt', + 'check' => 'prüfen', + 'cancelled' => 'storniert', + 'link_sent' => 'Zahlungslink gesendet', + 'link_openly' => 'Zahlungslink geöffnet', + 'link_check' => 'Zahlung in Prüfung', + 'link_pending' => 'Zahlung in Bearbeitung', + 'link_failed' => 'Zahlung fehlgeschlagen', + 'link_canceled' => 'Zahlung abgebrochen', + 'link_appointed' => 'Zahlung Angewiesen', + 'link_paid' => 'Zahlung erfolgreich', + 'alert_link_sent' => 'Zahlungslink gesendet', + 'alert_link_openly' => 'Zahlungslink geöffnet', + 'alert_link_check' => 'Zahlung in Prüfung', + 'alert_link_pending' => 'Zahlung in Bearbeitung', + 'alert_link_failed' => 'Zahlung fehlgeschlagen', + 'alert_link_canceled' => 'Zahlung abgebrochen', + 'alert_link_appointed' => 'Zahlung Angewiesen', + 'alert_link_paid' => 'Zahlung war erfolgreich', + 'failed' => 'abbruch', + 'no_payment' => 'keine Zahlung', + 'link_was_paid' => 'Die Zahlung wurde erfolgreich abgeschlossen.', + 'paymend_paid' => 'Zahlung bezahlt', + 'paymend_open' => 'Zahlung offen', + 'paymend_failed' => 'Zahlung abbruch', + 'extern_open' => 'Extern offen', // offen + 'extern_paid' => 'Extern bezahlt', + 'invoice_open' => 'Rechnung offen', + 'invoice_paid' => 'Rechnung bezahlt', + 'invoice_no_payment' => 'Rechnung keine Zahlung', + + 'to_sales_tax_de' => 'umsatzsteuerpflichtig / DE', + 'not_to_sales_tax_de' => 'nicht umsatzsteuerpflichtig / DE', + 'not_to_sales_tax_foreign' => 'nicht umsatzsteuerpflichtig / Ausland', + + 'ordered' => 'bestellt', + 'paid' => 'bezahlt', + 'removed' => 'entfernt', + 'registration' => 'Registrierung', + + 'not_assigned' => 'nicht zugewiesen', + 'advisor_order' => 'Beraterbestellung', + 'credit' => 'Gutschrift', + 'cancelled' => 'Storniert', + 'shoporder' => 'Shopbestellung', + 'shoporder_pending' => 'Shopbestellung / pending', + 'membership' => 'Mitgliedschaft', + 'order' => 'Bestellung', + 'customer_order' => 'Kundenbestellung', + 'homeparty' => 'Homeparty', + 'shop' => 'Shop', + 'external' => 'extern', + 'collective_invoice' => 'Sammelrechnung', + 'in_process' => 'in Bearbeitung', + 'shipped' => 'versendet', + 'completed' => 'abgeschlossen', + 'trade_fair' => 'Messe', + 'commission_shop' => 'Provision Shop', + 'commission_payline' => 'Provision Payline', + 'commission_growth_bonus' => 'Provision Tiefenbonus', + 'commission_team' => 'Provision Team', + 'credit_added' => 'Guthaben hinzugefügt', + 'commission' => 'Provision', + 'unknown' => 'unbekannt', + + // Vorkasse Verwendungszweck Hinweise + 'prepayment_important_notice' => 'Wichtiger Hinweis zur Vorkasse-Zahlung', + 'prepayment_reference_notice' => 'WICHTIG: Bitte geben Sie als Verwendungszweck ausschließlich folgende Nummer an:', + 'prepayment_reference_only' => 'Nur so kann Ihre Zahlung automatisch zugeordnet werden.', + 'prepayment_bank_details' => 'Bankverbindung für Vorkasse', + 'prepayment_waiting_payment' => 'Wir warten auf Ihren Zahlungseingang. Nach Eingang wird Ihre Bestellung bearbeitet.', + 'prepayment_txid' => 'Verwendungszweck', + + // Checkout Fehlermeldungen 'payment_not_found' => 'Zahlung nicht gefunden', - 'payment_redirect' => 'Zahlung in Bearbeitung - bitte auf E-Mail warten', - 'store_payment' => 'Zahlung gespeichert', - 'success' => 'Erflogreich ausgeführt', - 'success_payment' => 'Zahlung erflogreich', - 'txaction_appointed' => 'Zahlung genehmigt - E-Mail wurde gesendet, bitte warten auf Bestätigung', - 'txaction_failed' => 'Zahlung fehlgeschlagen - E-Mail wurde gesendet', - 'txaction_paid' => 'Zahlung bestätigt - E-Mail wurde gesendet', - ), - 'thank_you_very_much' => 'Vielen Dank,', - 'total_amount' => 'Gesamtbetrag', - 'valid until' => 'Gültis bis', - 'valid' => 'Gültis', - 'verification_no' => 'Prüfnr.', - 'we_have_received_your_order_get_email' => 'Deine Bestellung ist bei uns eingegangen. In Kürze erhälst Du von uns eine Bestellbestätigungsmail.', - 'your_mivita_team' => 'Dein Team von mivita.care', - 'your_order_number_is' => 'Deine Bestellnummer ist', - 'open' => 'offen', - 'openly' => 'geöffnet', - 'paid' => 'bezahlt', - 'check' => 'prüfen', - 'cancelled' => 'storniert', - 'link_sent' => 'Link gesendet', - 'link_openly' => 'Link geöffnet', - 'link_check' => 'Zahlung in Ausführung', - 'link_pending' => 'Zahlung in Ausführung', - 'link_failed' => 'Zahlung fehlgeschlagen', - 'link_canceled' => 'Zahlung abgebrochen', - 'link_appointed' => 'Zahlung in Ausführung', - 'link_paid' => 'bezahlt', - 'alert_link_sent' => 'Zahlungslink gesendet', - 'alert_link_openly' => 'Zahlungslink geöffnet', - 'alert_link_check' => 'Zahlung in Ausführung', - 'alert_link_pending' => 'Zahlung in Ausführung', - 'alert_link_failed' => 'Zahlung ist fehlgeschlagen', - 'alert_link_canceled' => 'Zahlung wurde abgebrochen', - 'alert_link_appointed' => 'Zahlung in Ausführung', - 'alert_link_paid' => 'Zahlung war erfolgreich', - 'failed' => 'abbruch', - 'no_payment' => 'keine Zahlung', - 'link_was_paid' => 'Die Zahlung wurde erfolgreich abgeschlossen.', - 'paymend_paid' => 'Zahlung bezahlt', - 'paymend_open' => 'Zahlung offen', - 'paymend_failed' => 'Zahlung abbruch', - 'extern_open' => 'Extern offen', //offen - 'extern_paid' => 'Extern bezahlt', - 'invoice_open' => 'Rechnung offen', - 'invoice_paid' => 'Rechnung bezahlt', - 'invoice_no_payment' => 'Rechnung keine Zahlung', + 'payment_not_found_description' => 'Die Zahlung mit der Referenz :reference konnte nicht gefunden werden. Bitte kontaktieren Sie uns, falls Sie bereits bezahlt haben.', + 'payment_canceled' => 'Zahlung abgebrochen', + 'payment_canceled_description' => 'Der Zahlungsvorgang wurde abgebrochen. Ihre Bestellung wurde nicht ausgeführt.', + 'payment_error' => 'Zahlungsfehler', + 'payment_error_description' => 'Bei der Zahlungsabwicklung ist ein Fehler aufgetreten. Ihre Bestellung konnte nicht abgeschlossen werden.', + 'payment_unknown_status' => 'Unbekannter Zahlungsstatus', + 'payment_unknown_status_description' => 'Der Zahlungsstatus konnte nicht ermittelt werden. Bitte kontaktieren Sie uns für weitere Informationen.', + 'contact_support_if_needed' => 'Bei Fragen wenden Sie sich bitte an unseren Kundenservice.', - 'to_sales_tax_de' => 'umsatzsteuerpflichtig / DE', - 'not_to_sales_tax_de' => 'nicht umsatzsteuerpflichtig / DE', - 'not_to_sales_tax_foreign' => 'nicht umsatzsteuerpflichtig / Ausland', - - 'ordered' => 'bestellt', - 'paid' => 'bezahlt', - 'removed' => 'entfernt', - 'registration' => 'Registrierung', - - 'not_assigned' => 'nicht zugewiesen', - 'advisor_order' => 'Beraterbestellung', - 'credit' => 'Gutschrift', - 'shoporder' => 'Shopbestellung', - 'shoporder_pending' => 'Shopbestellung / pending', - 'membership' => 'Mitgliedschaft', - 'order' => 'Bestellung', - 'customer_order' => 'Kundenbestellung', - 'homeparty' => 'Homeparty', - 'shop' => 'Shop', - 'external' => 'extern', - 'collective_invoice' => 'Sammelrechnung', - 'in_process' => 'in Bearbeitung', - 'shipped' => 'versendet', - 'completed' => 'abgeschlossen', - 'trade_fair' => 'Messe', - 'commission_shop' => 'Provision Shop', - 'commission_payline' => 'Provision Payline', - 'commission_growth_bonus' => 'Provision Tiefenbonus', - 'commission_team' => 'Provision Team', - 'credit_added' => 'Guthaben hinzugefügt', - 'commission' => 'Provision', - 'unknown' => 'unbekannt', - - // Vorkasse Verwendungszweck Hinweise - 'prepayment_important_notice' => 'Wichtiger Hinweis zur Vorkasse-Zahlung', - 'prepayment_reference_notice' => 'WICHTIG: Bitte geben Sie als Verwendungszweck ausschließlich folgende Nummer an:', - 'prepayment_reference_only' => 'Nur so kann Ihre Zahlung automatisch zugeordnet werden.', - 'prepayment_bank_details' => 'Bankverbindung für Vorkasse', - 'prepayment_waiting_payment' => 'Wir warten auf Ihren Zahlungseingang. Nach Eingang wird Ihre Bestellung bearbeitet.', - 'prepayment_txid' => 'Verwendungszweck', - - // DHL Packstation/Paketbox - 'packstation_delivery' => 'Lieferung an Packstation/Paketbox', - 'packstation_info' => 'Für die Lieferung an eine DHL Packstation oder Paketbox benötigen wir Ihre DHL Postnummer.', - 'dhl_postnumber' => 'DHL Postnummer', - 'packstation_address_hint' => 'Tragen Sie im Adressfeld (Straße Nr. *) die Packstation-Nummer ein (z.B. "Packstation 145"). PLZ und Ort beziehen sich auf den Standort der Packstation.', - 'packstation_alert_title' => 'Wichtig: Packstation-Lieferung', - 'packstation_alert_intro' => 'Wenn Sie eine DHL Postnummer angeben, muss die Lieferadresse wie folgt ausgefüllt werden:', - 'packstation_alert_street' => 'Packstation [3-stellige Nummer]', - 'packstation_alert_street_example' => 'z.B. "Packstation 145" - NICHT "12345"!', - 'packstation_alert_location' => 'Standort der Packstation', - 'packstation_alert_not_home' => 'nicht Ihre Wohnadresse!', - 'packstation_alert_footer' => 'Die Packstation-NUMMER ist 3-stellig (100-999, steht auf dem gelben Schild). Die DHL Postnummer ist 6-10-stellig und kommt ins separate Feld oben.', -); + // DHL Packstation/Paketbox + 'packstation_delivery' => 'Lieferung an Packstation/Paketbox', + 'packstation_info' => 'Für die Lieferung an eine DHL Packstation oder Paketbox benötigen wir Ihre DHL Postnummer.', + 'dhl_postnumber' => 'DHL Postnummer', + 'packstation_address_hint' => 'Tragen Sie im Adressfeld (Straße Nr. *) die Packstation-Nummer ein (z.B. "Packstation 145"). PLZ und Ort beziehen sich auf den Standort der Packstation.', + 'packstation_alert_title' => 'Wichtig: Packstation-Lieferung', + 'packstation_alert_intro' => 'Wenn Sie eine DHL Postnummer angeben, muss die Lieferadresse wie folgt ausgefüllt werden:', + 'packstation_alert_street' => 'Packstation [3-stellige Nummer]', + 'packstation_alert_street_example' => 'z.B. "Packstation 145" - NICHT "12345"!', + 'packstation_alert_location' => 'Standort der Packstation', + 'packstation_alert_not_home' => 'nicht Ihre Wohnadresse!', + 'packstation_alert_footer' => 'Die Packstation-NUMMER ist 3-stellig (100-999, steht auf dem gelben Schild). Die DHL Postnummer ist 6-10-stellig und kommt ins separate Feld oben.', +]; diff --git a/resources/lang/de/pdf.php b/resources/lang/de/pdf.php index 79d8aa0..197bfd7 100644 --- a/resources/lang/de/pdf.php +++ b/resources/lang/de/pdf.php @@ -22,7 +22,7 @@ return [ 'your_advisor' => 'Dein Berater', 'eprice' => 'E-Preis', 'off' => 'aus', - 'net' => 'netto', + 'net' => 'netto', 'total_incl_VAT' => 'Summe inkl. der gesetzlichen MwSt.', 'ek' => 'EK', 'invoice_nr' => 'Rechnungs-Nr.', @@ -39,9 +39,41 @@ return [ 'vat_is_declared_and_paid_by_recipient' => 'Die Umsatzsteuer ist vom Leistungsempfänger anzumelden und abzuführen.', 'tax_free_export_delivery' => 'Steuerfreie Ausfuhrlieferung', + // Kopie-Hinweise für mehrsprachige Dokumente + 'invoice_copy' => 'Rechnungskopie', + 'delivery_copy' => 'Lieferscheinkopie', + 'credit_copy' => 'Gutschriftkopie', + + // Dateinamen + 'contract_filename' => 'Beratervertrag', + + // Stornorechnungen + 'cancellation_invoice' => 'STORNORECHNUNG', + 'cancellation_nr' => 'Storno-Nr.', + 'cancellation_for' => 'Stornierung für Rechnung', + 'from' => 'vom', + 'attention' => 'ACHTUNG', + 'cancellation_invoice_info' => 'Diese Stornorechnung hebt die ursprüngliche Rechnung mit negativen Beträgen auf. Die Punkte wurden entsprechend korrigiert.', + 'cancelled' => 'Storniert', + 'cancellation_delivery' => 'STORNO-LIEFERSCHEIN', + 'cancellation_delivery_info' => 'Dieser Storno-Lieferschein hebt den ursprünglichen Lieferschein auf.', + 'cancellation_delivery_note' => 'Hinweis: Die Waren müssen nicht zurückgesendet werden, sofern nicht anders vereinbart.', + + // Tabellenspalten + 'pos' => 'Pos.', + 'article' => 'Artikel', + 'quantity' => 'Menge', + 'single_price' => 'Einzelpreis', + 'total_price' => 'Gesamtpreis', + 'plus' => 'zzgl.', + 'vat' => 'MwSt.', + 'subtotal_net' => 'Zwischensumme (netto)', + 'shipping_costs' => 'Versandkosten', + 'total_amount' => 'Gesamtbetrag', + ]; /* -{{ __('pdf.') }} +{{ __('pdf.') }} {{ __('pdf.name') }} pdf.name */ diff --git a/resources/lang/de/register.php b/resources/lang/de/register.php index a45301b..84e0dcd 100644 --- a/resources/lang/de/register.php +++ b/resources/lang/de/register.php @@ -1,64 +1,70 @@ 'Ich habe den hier aufgeführten Vertrag gelesen und akzeptiere diesen.', - 'account_deleted' => 'Account gelöschen', - 'adjust' => 'anpassen', - 'advisor_invite' => 'Berater einladen', - 'agree' => 'zustimmen', - 'agree_and_continue' => 'zustimmen und weiter', - 'assigned' => 'vergeben', - 'badge' => 'Ausweis', - 'business_license_later' => 'Ich reiche meinen Gewerbeschein innerhalb der nächsten 4 Wochen nach', - 'business_license_non' => 'Ich benötige keinen Gewerbeschein', - 'business_license_non_text' => 'Außerhalb Deutschlands gibt es unterschiedliche Regelungen um Thema Gewerbeschein (z. B. Österreich oder Schweiz). Solltest Du für dieses Business oder zur Zeit keinen Gewerbeschein haben müssen, begründe dies hier bitte kurz:', - 'business_license_now' => 'Gewerbeschein jetzt hochladen', - 'business_license_release' => 'Gewerbeschein jetzt zur Freigabe senden', - 'business_license_deposited' => 'Gewerbeschein wurde hinterlegt', - 'change_documents' => 'Unterlagen ändern', - 'change_email' => 'E-Mail Adresse ändern', - 'change_email_address_verify_it_info' => '\\u00c4ndere hier Deine E-Mail-Adresse. Wir senden Dir einen neuen Aktivierungslink an Deine neue E-Mail-Adresse, um diese zu verifizieren.', - 'change_email_contact_address_verify_it_info' => 'Ändere hier Deine E-Mail-Adresse des Kontakts. Wir senden dem Kontakt einen neuen Aktivierungslink an die neue E-Mail-Adresse, um diese zu verifizieren.', - 'complete' => 'abschließen', - 'complete_registration' => 'Registrierung abschließen', - 'confirm_your_identity' => 'Bestätige mit Deinem Passwort Deine Identität, bevor du weiter machst.', - 'contract' => 'Vertrag', - 'contract_data_protection' => 'Vertrag & Datenschutz', - 'create_advisor_send_email_to_invite' => 'Berater erstellen und eine E-Mail zur Einladung senden!', - 'create_and_next' => 'erstellen und weiter', - 'data' => 'Daten', - 'data_protection' => 'Datenschutz', - 'declaration-of-consent' => 'Einverständniserklärung: Hiermit willige ich in die Verarbeitung der von mir freiwillig angegebenen personenbezogenen Daten ein. Ich wurde darüber informiert, dass ich diese Einwilligung jederzeit widerrufen kann.', - 'delete_account' => 'Account löschen', - 'i_have_read_and_accept_it' => 'Ich habe die :link gelesen und akzeptiere diese.*', - 'next' => 'weiter', - 'open_payment_options' => 'Zahlungsoptionen öffnen', - 'package' => 'Paket', - 'password' => 'Passwort', - 'password_has_already_been_created' => 'Passwort wurde bereits erstellt.', - 'really_delete_the_file' => 'Datei wirklich löschen?', - 'reg_checked' => 'Hiermit willige ich in die im Rahmen der Datenschutzerklärung genannte Datenverarbeitung ein. Ich wurde darüber informiert, dass ich diese Einwilligung jederzeit widerrufen kann', - 'reg_finisch_hl' => 'Vielen Dank für Deine Registrierung!', - 'reg_finisch_line_1' => 'Wir haben Dir eine E-Mail mit einem Link zur Freischaltung Deines Accounts gesendet.', - 'reg_finisch_line_2' => 'Bitte rufe Deine E-Mails ab und bestätige den Link.', - 'reg_hl' => 'Registrierung', - 'reg_line_1' => 'Dieses Formular ist für die Registrierung neuer Vertriebspartner. Nach dem Absenden des Formulars erhälst du eine E Mail mit weiteren Informationen sowie den Freischaltlink.', - 'registration' => 'Registrierung', - 'registration_completed' => 'Registrierung abgeschlossen', - 'required_fields' => 'Pflichtfelder', - 'save_and_continue' => 'speichern und weiter', - 'select' => 'auswählen', - 'sender' => 'Dein Team von mivita.care', - 'trade_licence' => 'Gewerbeschein', - 'upload' => 'hochladen', - 'wizard_business_license_hl' => 'Gewerbeschein hochladen (nur PDF, JPG, PNG)', - 'wizard_business_license_line_1' => 'Ein gültiger Gewerbeschein ist gesetzlich Pflicht, um als Vertriebspartner bei MIVITA teilnehmen zu können. Bitte lade entsprechende Kopie von Deinem aktuellen Gewerbeschein hier hoch, damit wir Deinen Account freischalten können.', - 'wizard_create_release_hl' => 'Vielen Dank', - 'wizard_create_release_line_1' => 'Deine Registrierung und Buchung der Mitgliedschaft ist abgeschlossen!
Sobald die Zahlung bei uns eingegangen ist, erhälst Du automatisch eine E-Mail und Deine Mitgliedschaft wird automatisch freigeschaltet.', - 'wizard_finish_hl' => 'Registrierung abschließen', - 'wizard_finish_line_1' => 'Sind alle Daten richtig und vollständig ausgefüllt? Falls nicht, kannst Du oben die einzelnen Punkte anklicken und noch Änderungen vornehmen. Passt alles, dann klicke jetzt auf den Button „Registrierung abschließen“. Wir werden Deine Daten dann im Anschluss prüfen und uns ggf. bei Rückfragen melden. Sobald wir Deinen Account freigeschaltet haben erhälst Du eine weitere E-Mail.', - 'wizard_reg_release_hl' => 'Wartet auf Überprüfung', - 'wizard_reg_release_line_1' => 'Deine Registrierung ist abgeschlossen, Deine Daten werden geprüft.
Nach erfolgreicher Prüfung wird Dein Account freigeschaltet und Du erhälst eine E-Mail.', - 'wizard_verification_hl' => 'Verifizierung (Personalausweis oder Pass; PDF, JPG, PNG)', - 'wizard_verification_line_1' => 'Bitte lade einen Scan / ein Foto Deines Personalausweises oder Deines Reisepasses hoch. Die Vorderseite genügt. Wir benötigen den Ausweis als Identitätsnachweis, um Deinen Account freizuschalten.', -); +return [ + 'accept-contract' => 'Ich habe den hier aufgeführten Vertrag gelesen und akzeptiere diesen.', + 'account_deleted' => 'Account gelöschen', + 'adjust' => 'anpassen', + 'advisor_invite' => 'Berater einladen', + 'agree' => 'zustimmen', + 'agree_and_continue' => 'zustimmen und weiter', + 'assigned' => 'vergeben', + 'badge' => 'Ausweis', + 'business_license_later' => 'Ich reiche meinen Gewerbeschein innerhalb der nächsten 4 Wochen nach', + 'business_license_non' => 'Ich benötige keinen Gewerbeschein', + 'business_license_non_text' => 'Außerhalb Deutschlands gibt es unterschiedliche Regelungen um Thema Gewerbeschein (z. B. Österreich oder Schweiz). Solltest Du für dieses Business oder zur Zeit keinen Gewerbeschein haben müssen, begründe dies hier bitte kurz:', + 'business_license_now' => 'Gewerbeschein jetzt hochladen', + 'business_license_release' => 'Gewerbeschein jetzt zur Freigabe senden', + 'business_license_deposited' => 'Gewerbeschein wurde hinterlegt', + 'change_documents' => 'Unterlagen ändern', + 'change_email' => 'E-Mail Adresse ändern', + 'change_email_address_verify_it_info' => '\\u00c4ndere hier Deine E-Mail-Adresse. Wir senden Dir einen neuen Aktivierungslink an Deine neue E-Mail-Adresse, um diese zu verifizieren.', + 'change_email_contact_address_verify_it_info' => 'Ändere hier Deine E-Mail-Adresse des Kontakts. Wir senden dem Kontakt einen neuen Aktivierungslink an die neue E-Mail-Adresse, um diese zu verifizieren.', + 'complete' => 'abschließen', + 'complete_registration' => 'Registrierung abschließen', + 'confirm_your_identity' => 'Bestätige mit Deinem Passwort Deine Identität, bevor du weiter machst.', + 'contract' => 'Vertrag', + 'contract_data_protection' => 'Vertrag & Datenschutz', + 'create_advisor_send_email_to_invite' => 'Berater erstellen und eine E-Mail zur Einladung senden!', + 'create_and_next' => 'erstellen und weiter', + 'data' => 'Daten', + 'data_protection' => 'Datenschutz', + 'declaration-of-consent' => 'Einverständniserklärung: Hiermit willige ich in die Verarbeitung der von mir freiwillig angegebenen personenbezogenen Daten ein. Ich wurde darüber informiert, dass ich diese Einwilligung jederzeit widerrufen kann.', + 'delete_account' => 'Account löschen', + 'i_have_read_and_accept_it' => 'Ich habe die :link gelesen und akzeptiere diese.*', + 'next' => 'weiter', + 'open_payment_options' => 'Zahlungsoptionen öffnen', + 'package' => 'Paket', + 'password' => 'Passwort', + 'password_has_already_been_created' => 'Passwort wurde bereits erstellt.', + 'really_delete_the_file' => 'Datei wirklich löschen?', + 'reg_checked' => 'Hiermit willige ich in die im Rahmen der Datenschutzerklärung genannte Datenverarbeitung ein. Ich wurde darüber informiert, dass ich diese Einwilligung jederzeit widerrufen kann', + 'reg_finisch_hl' => 'Vielen Dank für Deine Registrierung!', + 'reg_finisch_line_1' => 'Wir haben Dir eine E-Mail mit einem Link zur Freischaltung Deines Accounts gesendet.', + 'reg_finisch_line_2' => 'Bitte rufe Deine E-Mails ab und bestätige den Link.', + 'reg_hl' => 'Registrierung', + 'reg_line_1' => 'Dieses Formular ist für die Registrierung neuer Vertriebspartner. Nach dem Absenden des Formulars erhälst du eine E Mail mit weiteren Informationen sowie den Freischaltlink.', + 'registration' => 'Registrierung', + 'registration_completed' => 'Registrierung abgeschlossen', + 'required_fields' => 'Pflichtfelder', + 'save_and_continue' => 'speichern und weiter', + 'select' => 'auswählen', + 'sender' => 'Dein Team von mivita.care', + 'trade_licence' => 'Gewerbeschein', + 'upload' => 'hochladen', + 'wizard_business_license_hl' => 'Gewerbeschein hochladen (nur PDF, JPG, PNG)', + 'wizard_business_license_line_1' => 'Ein gültiger Gewerbeschein ist gesetzlich Pflicht, um als Vertriebspartner bei MIVITA teilnehmen zu können. Bitte lade entsprechende Kopie von Deinem aktuellen Gewerbeschein hier hoch, damit wir Deinen Account freischalten können.', + 'wizard_create_release_hl' => 'Vielen Dank', + 'wizard_create_release_line_1' => 'Deine Registrierung und Buchung der Mitgliedschaft ist abgeschlossen!
Sobald die Zahlung bei uns eingegangen ist, erhälst Du automatisch eine E-Mail und Deine Mitgliedschaft wird automatisch freigeschaltet.', + 'wizard_finish_hl' => 'Registrierung abschließen', + 'wizard_finish_line_1' => 'Sind alle Daten richtig und vollständig ausgefüllt? Falls nicht, kannst Du oben die einzelnen Punkte anklicken und noch Änderungen vornehmen. Passt alles, dann klicke jetzt auf den Button „Registrierung abschließen“. Wir werden Deine Daten dann im Anschluss prüfen und uns ggf. bei Rückfragen melden. Sobald wir Deinen Account freigeschaltet haben erhälst Du eine weitere E-Mail.', + 'wizard_reg_release_hl' => 'Wartet auf Überprüfung', + 'wizard_reg_release_line_1' => 'Deine Registrierung ist abgeschlossen, Deine Daten werden geprüft.
Nach erfolgreicher Prüfung wird Dein Account freigeschaltet und Du erhälst eine E-Mail.', + 'wizard_verification_hl' => 'Verifizierung (Personalausweis oder Pass; PDF, JPG, PNG)', + 'wizard_verification_line_1' => 'Bitte lade einen Scan / ein Foto Deines Personalausweises oder Deines Reisepasses hoch. Die Vorderseite genügt. Wir benötigen den Ausweis als Identitätsnachweis, um Deinen Account freizuschalten.', + 'starter_warning_title' => 'Achtung', + 'starter_warning_text' => 'Willkommen bei Mivita!

Du kannst dich jetzt für eine Jahresgebühr von 69,90 € registrieren und erhältst dafür deinen personalisierten Mivita-Webshop.

Bitte beachte:
Die Starterpakete sind ein exklusives, einmaliges Angebot zur Anmeldung und können nicht nachträglich erworben werden.

Deine Optionen:

• Mit Starterpaket:
Du erhältst sofort 30 % Rabatt – auch auf alle weiteren Einkäufe in diesem Jahr.

• Ohne Starterpaket (nur Registrierung & personalisierter Webshop):
Du profitierst dauerhaft von 20 % Rabatt.

Wichtig für später:
Wenn du jetzt ohne Starterpaket startest, kannst du dir die 30 % Rabatt später nur noch durch eigene Qualifikation aufbauen (→ 1.350 Punkte persönlicher Umsatz in einem Monat gemäß Marketingplan).', + 'starter_warning_back' => 'Nein – bitte zeige mir die Starterpakete noch einmal', + 'starter_warning_confirm' => 'Ja – ich habe das verstanden (weiter ohne Starterpaket)', + 'wizard_package_info' => 'Bitte wähle Dein Paket. Du hast die Wahl zwischen der reinen Jahresmitgliedschaft und einem Starterpaket, welches Dir einen attraktiven Rabatt und den direkten Aufstieg in den nächsten Rang ermöglicht. Das Starterpaket ist nur einmalig bei der Registrierung verfügbar. Wähle Dein Produkt und klicke auf weiter.', + 'wizard_no_selection' => 'Bitte wähle ein Produkt aus, um fortzufahren.', +]; diff --git a/resources/lang/de/tables.php b/resources/lang/de/tables.php index 5f87cb8..b57c488 100644 --- a/resources/lang/de/tables.php +++ b/resources/lang/de/tables.php @@ -1,94 +1,95 @@ '', - 'VAT' => 'MwSt', - 'account' => 'Account', - 'account_to' => 'Account bis', - 'activ' => 'Aktiv', - 'addition' => 'Zusatz', - 'address' => 'Adresse', - 'adviser_no' => 'Berater Nr.', - 'amount' => 'Betrag', - 'art' => 'Art', - 'article_no' => 'Artikel-Nr.', - 'assigned_advisor' => 'zugewiesener Berater', - 'birthday' => 'Geburtstag', - 'c_no' => 'G.Nr.', - 'city' => 'Ort', - 'commission' => 'Provision', - 'contents' => 'Inhalt', - 'country' => 'Land', - 'created' => 'erstellt', - 'credit_note' => 'Gutschrift', - 'customer' => 'Kunde', - 'date' => 'Datum', - 'detail' => 'Detail', - 'earnings' => 'Verdienst', - 'ek_price' => 'EK-Preis', - 'email' => 'E-Mail', - 'firstname' => 'Vorname', - 'from_credit_balance' => 'aus Guthaben', - 'gross' => 'brutto', - 'image' => 'Bild', - 'in_no' => 'Rechnung-Nr.', - 'info' => 'Info', - 'invoice' => 'Rechnung', - 'label' => 'Bezeichnung', - 'lastname' => 'Nachname', - 'level' => 'Level', - 'line' => 'Linie', - 'margin' => 'Marge', - 'mobil' => 'Mobil', - 'my_price_gross' => 'Mein Preis brutto', - 'my_price_net' => 'Mein Preis netto', - 'net' => 'netto', - 'net_price' => 'Netto-Preis', - 'net_sales' => 'Umsatz netto', - 'net_sum' => 'Summe Netto', - 'newsletter' => 'Newsletter', - 'note' => 'Notiz', - 'number' => 'Nummer', - 'order' => 'Bestellung', - 'payline_qualification' => 'Payline Qualifikation', - 'payment' => 'Zahlung', - 'payment_type' => 'Zahlungsart', - 'phone' => 'Tel', - 'points' => 'Points', - 'postcode' => 'PLZ', - 'price' => 'Preis', - 'product' => 'Produkt', - 'products' => 'Produkte', - 'purchased_in_the_shop' => 'Gekauft im Shop', - 'purchases' => 'Käufe', - 'qualification' => 'Qualifikation', - 'quantity' => 'Anzahl', - 'reference_number' => 'Referenznummer', - 'rf_no' => 'Rf-Nr.', - 'shipping' => 'Versand', - 'shop' => 'Shop', - 'shop_commission' => 'Shop Provision', - 'sponsor' => 'Sponsor', - 'status' => 'Status', - 'subject' => 'Betreff', - 'sum' => 'Summe', - 'total' => 'Gesamt', - 'type' => 'Art', - 've' => 'VE', - 'vk_price' => 'VK-Preis', - 'my_commission' => 'Mein Provision', - 'start_date' => 'Start Datum', - 'next_date' => 'Nächste Ausführung', - 'last_date' => 'Letzte Ausführung', - 'abo_delivery_day' => 'Abo-Liefertag', - 'abo_delivery' => 'Abo-Lieferungen', - 'active' => 'Aktiv', - 'is_for' => 'Ist für', - 'count' => 'Anzahl', - 'member' => 'Mitglied', - 'adviser' => 'Berater', - 'exc' => 'Ausf.', - 'executions' => 'Ausführungen', - 'previous_orders' => 'bisherige Kundebestellungen', - 'partner_since' => 'Partner seit', -); +return [ + '' => '', + 'VAT' => 'MwSt', + 'account' => 'Account', + 'account_to' => 'Account bis', + 'activ' => 'Aktiv', + 'addition' => 'Zusatz', + 'address' => 'Adresse', + 'adviser_no' => 'Berater Nr.', + 'amount' => 'Betrag', + 'art' => 'Art', + 'article_no' => 'Artikel-Nr.', + 'assigned_advisor' => 'zugewiesener Berater', + 'birthday' => 'Geburtstag', + 'c_no' => 'G.Nr.', + 'city' => 'Ort', + 'commission' => 'Provision', + 'contents' => 'Inhalt', + 'country' => 'Land', + 'created' => 'erstellt', + 'credit_note' => 'Gutschrift', + 'customer' => 'Kunde', + 'date' => 'Datum', + 'detail' => 'Detail', + 'earnings' => 'Verdienst', + 'ek_price' => 'EK-Preis', + 'email' => 'E-Mail', + 'firstname' => 'Vorname', + 'from_credit_balance' => 'aus Guthaben', + 'gross' => 'brutto', + 'image' => 'Bild', + 'in_no' => 'Rechnung-Nr.', + 'info' => 'Info', + 'invoice' => 'Rechnung', + 'label' => 'Bezeichnung', + 'lastname' => 'Nachname', + 'level' => 'Level', + 'line' => 'Linie', + 'margin' => 'Marge', + 'mobil' => 'Mobil', + 'my_price_gross' => 'Mein Preis brutto', + 'my_price_net' => 'Mein Preis netto', + 'net' => 'netto', + 'net_price' => 'Netto-Preis', + 'net_sales' => 'Umsatz netto', + 'net_sum' => 'Summe Netto', + 'newsletter' => 'Newsletter', + 'note' => 'Notiz', + 'number' => 'Nummer', + 'order' => 'Bestellung', + 'payline_qualification' => 'Payline Qualifikation', + 'payment' => 'Zahlung', + 'payment_type' => 'Zahlungsart', + 'phone' => 'Tel', + 'points' => 'Points', + 'postcode' => 'PLZ', + 'price' => 'Preis', + 'product' => 'Produkt', + 'products' => 'Produkte', + 'purchased_in_the_shop' => 'Gekauft im Shop', + 'purchases' => 'Käufe', + 'qualification' => 'Qualifikation', + 'quantity' => 'Anzahl', + 'reference_number' => 'Referenznummer', + 'rf_no' => 'Rf-Nr.', + 'shipping' => 'Versand', + 'shop' => 'Shop', + 'shop_commission' => 'Shop Provision', + 'sponsor' => 'Sponsor', + 'status' => 'Status', + 'subject' => 'Betreff', + 'sum' => 'Summe', + 'total' => 'Gesamt', + 'type' => 'Art', + 've' => 'VE', + 'vk_price' => 'VK-Preis', + 'my_commission' => 'Mein Provision', + 'start_date' => 'Start Datum', + 'next_date' => 'Nächste Ausführung', + 'last_date' => 'Letzte Ausführung', + 'abo_delivery_day' => 'Abo-Liefertag', + 'abo_delivery' => 'Abo-Lieferungen', + 'active' => 'Aktiv', + 'is_for' => 'Ist für', + 'count' => 'Anzahl', + 'member' => 'Mitglied', + 'adviser' => 'Berater', + 'exc' => 'Ausf.', + 'executions' => 'Ausführungen', + 'previous_orders' => 'bisherige Kundebestellungen', + 'partner_since' => 'Partner seit', + 'no_data_available' => 'Keine Daten verfügbar', +]; diff --git a/resources/lang/de/team.php b/resources/lang/de/team.php index 4ce2e06..efed99d 100644 --- a/resources/lang/de/team.php +++ b/resources/lang/de/team.php @@ -1,151 +1,153 @@ '', - 'KU' => 'KU', - 'PP' => 'PP', - 'TP' => 'TP', - 'WB' => 'WB', - 'account' => 'Account', - 'account_to' => 'Account bis', - 'active' => 'aktiv', - 'business' => 'Business', - 'career_level' => 'Karriere-Level', - 'collapse_all' => 'Alles zuklappen', - 'commission_WB' => 'Provision Tiefenbonus', - 'commission_payline' => 'Provision Payline', - 'commission_shop' => 'Provision Shop', - 'commission_team' => 'Provision Team', - 'commission_total' => 'Provision Gesamt', - 'completed' => 'Abgeschlossen', - 'open' => 'Offen', - 'create_new_consultant' => 'Neuen Berater erstellen', - 'current_commission_level' => 'aktuelle Provisions-Stufe', - 'customer_commission' => 'Kundenprovision', - 'consultant_margin' => 'Beratermarge', - 'consultant_margin_info' => 'Hinweis: Die Marge wurde bei der Bestellung bereits abgezogen und somit schon ausbezahlt.', - 'customer_points' => 'Kunden Points', - 'date' => 'Datum', - 'e' => 'E', - 'expand_all' => 'Alles aufklappen', - 'export' => 'Export', - 'export_as_xls' => 'Export als xls', - 'link_for_consultant_registration' => 'Link für Beraterregistrierung', - 'net_turnover' => 'Umsatz netto', - 'new_consultant_copy1' => 'Du möchtest einen neuen Berater registrieren? Super, das freut uns. Sende ihm einfach nachfolgenden Link per Mail, WhatsApp oder SMS zu. Er gelangt damit auf die Registrierungsseite von www.mivita.care. Wichtig ist, dass Du diesen Link nicht veränderst, denn die angehängte Berater-ID identifiziert Dich als Sponsor von dem neuen Berater. Nur so können Dir künftige Provisionen durch Umsätze von ihm zugeordnet werden. Nutze das „Kopier-Symbol“, um den Link gleich in Deine Zwischenablage zu kopieren.', - 'next_career_level' => 'nächster Karriere-Level', - 'next_commission_level' => 'nächste Provisions-Stufe', - 'no_sponsor_assigned' => 'Keinen Sponsor zugewiesen', - 'not_active' => 'nicht aktiv', - 'own' => 'Eigene', - 'payline_points' => 'Payline Points', - 'points' => 'Points', - 'qualification' => 'Qualifikation', - 'qualification_commission' => 'Qualifikation Provision', - 'qualification_points' => 'Qualifikation Points', - 'register_new_consultant' => 'Neuen Berater registrieren', - 's' => 'S', - 'shop' => 'Shop', - 'shop_commission' => 'Shop Provision', - 'sponsor' => 'Sponsor', - 'structure' => 'Struktur', - 'total_points' => 'Gesamte Points', - 'total_turnover' => 'Gesamter Umsatz', - 'until' => 'bis', - 'volume_KU' => 'Volumen KU', - 'your_sponsor' => 'Dein Sponsor', - 'your_team' => 'Dein Team', - 'sales_store_net' => 'Umsatz Shop netto', - 'filename_export' => 'mivita-mein-team-export-', - 'payout_details' => 'Auszahlungen Details', +return [ + '' => '', + 'KU' => 'KU', + 'PP' => 'PP', + 'TP' => 'TP', + 'WB' => 'WB', + 'account' => 'Account', + 'account_to' => 'Account bis', + 'active' => 'aktiv', + 'business' => 'Business', + 'career_level' => 'Karriere-Level', + 'collapse_all' => 'Alles zuklappen', + 'commission_WB' => 'Provision Tiefenbonus', + 'commission_payline' => 'Provision Payline', + 'commission_shop' => 'Provision Shop', + 'commission_team' => 'Provision Team', + 'commission_total' => 'Provision Gesamt', + 'completed' => 'Abgeschlossen', + 'open' => 'Offen', + 'create_new_consultant' => 'Neuen Berater erstellen', + 'current_commission_level' => 'aktuelle Provisions-Stufe', + 'customer_commission' => 'Kundenprovision', + 'consultant_margin' => 'Beratermarge', + 'consultant_margin_info' => 'Hinweis: Die Marge wurde bei der Bestellung bereits abgezogen und somit schon ausbezahlt.', + 'customer_points' => 'Kunden Points', + 'date' => 'Datum', + 'e' => 'E', + 'expand_all' => 'Alles aufklappen', + 'export' => 'Export', + 'export_as_xls' => 'Export als xls', + 'link_for_consultant_registration' => 'Link für Beraterregistrierung', + 'net_turnover' => 'Umsatz netto', + 'new_consultant_copy1' => 'Du möchtest einen neuen Berater registrieren? Super, das freut uns. Sende ihm einfach nachfolgenden Link per Mail, WhatsApp oder SMS zu. Er gelangt damit auf die Registrierungsseite von www.mivita.care. Wichtig ist, dass Du diesen Link nicht veränderst, denn die angehängte Berater-ID identifiziert Dich als Sponsor von dem neuen Berater. Nur so können Dir künftige Provisionen durch Umsätze von ihm zugeordnet werden. Nutze das „Kopier-Symbol“, um den Link gleich in Deine Zwischenablage zu kopieren.', + 'next_career_level' => 'nächster Karriere-Level', + 'next_commission_level' => 'nächste Provisions-Stufe', + 'no_sponsor_assigned' => 'Keinen Sponsor zugewiesen', + 'not_active' => 'nicht aktiv', + 'last_login' => 'Letzter Login', + 'registered_at' => 'Registriert am', + 'own' => 'Eigene', + 'payline_points' => 'Payline Points', + 'points' => 'Points', + 'qualification' => 'Qualifikation', + 'qualification_commission' => 'Qualifikation Provision', + 'qualification_points' => 'Qualifikation Points', + 'register_new_consultant' => 'Neuen Berater registrieren', + 's' => 'S', + 'shop' => 'Shop', + 'shop_commission' => 'Shop Provision', + 'sponsor' => 'Sponsor', + 'structure' => 'Struktur', + 'total_points' => 'Gesamte Points', + 'total_turnover' => 'Gesamter Umsatz', + 'until' => 'bis', + 'volume_KU' => 'Volumen KU', + 'your_sponsor' => 'Dein Sponsor', + 'your_team' => 'Dein Team', + 'sales_store_net' => 'Umsatz Shop netto', + 'filename_export' => 'mivita-mein-team-export-', + 'payout_details' => 'Auszahlungen Details', - // Filter & Status - 'filter_active' => 'aktiv', - 'filter_not_active' => 'nicht aktiv', - 'filter_all' => 'alle', - 'all_status' => 'Alle Status', - 'qualified_green' => 'Qualifiziert (grün)', - 'in_progress_yellow' => 'In Arbeit (gelb)', - 'no_level_red' => 'Kein Level (rot)', + // Filter & Status + 'filter_active' => 'aktiv', + 'filter_not_active' => 'nicht aktiv', + 'filter_all' => 'alle', + 'all_status' => 'Alle Status', + 'qualified_green' => 'Qualifiziert (grün)', + 'in_progress_yellow' => 'In Arbeit (gelb)', + 'no_level_red' => 'Kein Level (rot)', - // Performance & Badges - 'optimized' => 'OPTIMIERT', - 'standard_monitoring' => 'STANDARD + MONITORING', - 'fallback' => 'FALLBACK', - 'loading_time' => 'Ladezeit:', - 'memory' => 'Speicher:', - 'memory_usage' => 'Speicherverbrauch:', - 'team_size' => 'Team-Größe:', - 'team_members' => 'Team-Mitglieder:', - 'execution_time' => 'Ausführungszeit:', - 'user_id' => 'User ID:', + // Performance & Badges + 'optimized' => 'OPTIMIERT', + 'standard_monitoring' => 'STANDARD + MONITORING', + 'fallback' => 'FALLBACK', + 'loading_time' => 'Ladezeit:', + 'memory' => 'Speicher:', + 'memory_usage' => 'Speicherverbrauch:', + 'team_size' => 'Team-Größe:', + 'team_members' => 'Team-Mitglieder:', + 'execution_time' => 'Ausführungszeit:', + 'user_id' => 'User ID:', - // Buttons & Actions - 'performance_details' => 'Performance Details', - 'team_structure' => 'Team-Struktur', - 'new_member' => 'Neues Mitglied', - 'optimized_action' => 'Optimiert', - 'standard_action' => 'Standard', - 'close' => 'Schließen', - 'show_details' => 'Details anzeigen', - 'test_optimized' => 'Optimiert testen', - 'standard_version' => 'Standard Version', + // Buttons & Actions + 'performance_details' => 'Performance Details', + 'team_structure' => 'Team-Struktur', + 'new_member' => 'Neues Mitglied', + 'optimized_action' => 'Optimiert', + 'standard_action' => 'Standard', + 'close' => 'Schließen', + 'show_details' => 'Details anzeigen', + 'test_optimized' => 'Optimiert testen', + 'standard_version' => 'Standard Version', - // Modals & Titles - 'performance_metrics_team_overview' => 'Performance Metrics - Team Übersicht', - 'performance_metrics_my_team' => 'Performance Metrics - Mein Team', - 'performance_monitoring' => 'Performance Monitoring', - 'fallback_support' => 'Fallback Support', + // Modals & Titles + 'performance_metrics_team_overview' => 'Performance Metrics - Team Übersicht', + 'performance_metrics_my_team' => 'Performance Metrics - Mein Team', + 'performance_monitoring' => 'Performance Monitoring', + 'fallback_support' => 'Fallback Support', - // Messages & Notifications - 'optimized_with_cache' => 'Optimiert mit Cache', - 'datatable_mode_switched' => 'DataTable-Modus auf ":mode" umgestellt', - 'error_loading_optimized_overview' => 'Fehler beim Laden der optimierten Team-Übersicht: ', - 'live_not_supported_fallback' => 'Live (nicht unterstützt in Fallback)', - 'optimized_performance_features' => 'Diese Seite nutzt optimierte Performance-Features.', + // Messages & Notifications + 'optimized_with_cache' => 'Optimiert mit Cache', + 'datatable_mode_switched' => 'DataTable-Modus auf ":mode" umgestellt', + 'error_loading_optimized_overview' => 'Fehler beim Laden der optimierten Team-Übersicht: ', + 'live_not_supported_fallback' => 'Live (nicht unterstützt in Fallback)', + 'optimized_performance_features' => 'Diese Seite nutzt optimierte Performance-Features.', - // Next Level - 'next_level' => 'Nächster Level', + // Next Level + 'next_level' => 'Nächster Level', - // Additional terms - 'calculation_type' => 'Berechnungstyp', - 'version' => 'Version', - 'cache' => 'Cache', - 'live' => 'Live', + // Additional terms + 'calculation_type' => 'Berechnungstyp', + 'version' => 'Version', + 'cache' => 'Cache', + 'live' => 'Live', - // Missing table headers - 'ID' => 'ID', - 'Ebene' => 'Ebene', - 'Level' => 'Level', - 'KD' => 'KD', - 'bis' => 'bis', + // Missing table headers + 'ID' => 'ID', + 'Ebene' => 'Ebene', + 'Level' => 'Level', + 'KD' => 'KD', + 'bis' => 'bis', - // Level Reports - 'level_reports_title' => 'Level-Aufstieg Reports - Mein Team', - 'level_reports_month' => 'Monat', - 'level_reports_year' => 'Jahr', - 'level_reports_filter_not_updated' => 'Nur nicht umgestellte User', - 'level_reports_filter_button' => 'Filter', - 'level_reports_csv_export' => 'CSV Export', - 'level_reports_total_promotions' => 'Gesamt Aufstiege', - 'level_reports_by_level' => 'Aufstiege nach Level', - 'level_reports_table_date' => 'Datum', - 'level_reports_table_user' => 'User', - 'level_reports_table_from_level' => 'Von Level', - 'level_reports_table_to_level' => 'Zu Level', - 'level_reports_table_current_level' => 'Aktueller Level', - 'level_reports_table_kp_quali' => 'KP Quali', - 'level_reports_table_user_kp' => 'User KP', - 'level_reports_table_pp_quali' => 'PP Quali', - 'level_reports_table_user_pp' => 'User PP', - 'level_reports_table_update' => 'Update', - 'level_reports_table_active' => 'Aktiv', - 'level_reports_by_period' => 'Aufstiege nach Zeitraum', - 'level_reports_no_data' => 'Keine Level-Aufstiege gefunden', - 'level_reports_no_data_description' => 'Mit den aktuellen Filtern wurden keine Einträge gefunden.', - 'yes' => 'Ja', - 'no' => 'Nein', - 'not_available' => 'N/A', + // Level Reports + 'level_reports_title' => 'Level-Aufstieg Reports - Mein Team', + 'level_reports_month' => 'Monat', + 'level_reports_year' => 'Jahr', + 'level_reports_filter_not_updated' => 'Nur nicht umgestellte User', + 'level_reports_filter_button' => 'Filter', + 'level_reports_csv_export' => 'CSV Export', + 'level_reports_total_promotions' => 'Gesamt Aufstiege', + 'level_reports_by_level' => 'Aufstiege nach Level', + 'level_reports_table_date' => 'Datum', + 'level_reports_table_user' => 'User', + 'level_reports_table_from_level' => 'Von Level', + 'level_reports_table_to_level' => 'Zu Level', + 'level_reports_table_current_level' => 'Aktueller Level', + 'level_reports_table_kp_quali' => 'KP Quali', + 'level_reports_table_user_kp' => 'User KP', + 'level_reports_table_pp_quali' => 'PP Quali', + 'level_reports_table_user_pp' => 'User PP', + 'level_reports_table_update' => 'Update', + 'level_reports_table_active' => 'Aktiv', + 'level_reports_by_period' => 'Aufstiege nach Zeitraum', + 'level_reports_no_data' => 'Keine Level-Aufstiege gefunden', + 'level_reports_no_data_description' => 'Mit den aktuellen Filtern wurden keine Einträge gefunden.', + 'yes' => 'Ja', + 'no' => 'Nein', + 'not_available' => 'N/A', - 'growth_bonus_details_description' => 'L1 = Direkte Partner (bekommt immer den Tiefenbonus), L2 = Members (ab hier wird der Tiefenbonus geteilt, wenn der Member qualifiziert ist), etc. | Zeigt Provision (€) und Volumen (Pkt) pro Ebene.', -); + 'growth_bonus_details_description' => 'L1 = Direkte Partner (bekommt immer den Tiefenbonus), L2 = Members (ab hier wird der Tiefenbonus geteilt, wenn der Member qualifiziert ist), etc. | Zeigt Provision (€) und Volumen (Pkt) pro Ebene.', +]; diff --git a/resources/lang/en/abo.php b/resources/lang/en/abo.php index d14670a..3adf649 100644 --- a/resources/lang/en/abo.php +++ b/resources/lang/en/abo.php @@ -1,97 +1,107 @@ 'Subscription', - 'payment_for_abo' => 'Payment method for subscription', - 'abo_delivery' => 'Subscription - regular delivery', - 'abo_are_for_me_and_shipped' => 'Subscription is for me and will be shipped to my address', - 'abo_are_for_customer_and_shipped' => 'Subscription is for a customer and will be sent to the customer', - 'abo_delivery_to_me' => 'Subscription delivery to me', - 'abo_delivery_to_the_customer' => 'Subscription delivery to the customer', - 'every_week' => 'every week', - 'every_weeks' => 'every :num weeks', - 'of_month' => 'of the month', - 'delivery_intervall' => 'Adjust delivery day', - 'abo_order_info_check' => 'By completing the subscription, a regular delivery is set up. This is automatically shipped and billed on the selected delivery day.', - 'abo_order_info_check_2' => 'The first delivery and billing takes place on the day the subscription is set up. After that, shipping is automatically carried out on the selected delivery day of the following month.', - 'abo_order_info_check_3' => 'PayPal and credit card are available as payment methods. The subscription has a minimum duration of :abo-min-duration months. After that, it can be paused, changed or canceled at any time.', - 'abo_order_info_checkbox' => 'Yes, I have understood the subscription terms!', - 'abo_infos' => 'Subscription info', - 'abo_delivery_infos' => 'Subscription delivery information', - 'abo_start_date' => 'Start date of the subscription', - 'abo_delivery_intervall' => 'Delivery day of the subscription', - 'abo_first_execution_date' => 'First execution', - 'abo_next_execution_date' => 'Next execution', - 'delivery_day' => 'Adjust delivery day', - 'abo_settings' => 'Subscription settings', - 'add_new_abo' => 'Add new subscription', - 'abo_edit' => 'Edit subscription', - 'abo_details' => 'Subscription details', - 'abo_is_active' => 'Subscription is active', - 'abo_copy_active' => 'If the subscription is not active, it will not be executed automatically', - 'abo_copy_next_date' => 'The next execution date can be set to the following day at the earliest', - 'abo_copy_abo_interval' => 'Adjusting the subscription delivery day affects the upcoming execution date when the subscription is active.', - 'error_abo_interval' => 'The subscription interval is not correct', - 'error_next_date' => 'The date for the next execution is not correct', - 'checkout_mail_abo_hl' => 'Your subscription / regular delivery', - 'checkout_mail_abo_start' => 'Your subscription was successfully created with the following settings:', - 'checkout_mail_abo_info' => 'You can find your subscription settings in your account under "My subscriptions" and the settings can also be edited there', - 'abo_new' => 'new', - 'abo_okay' => 'okay', - 'abo_hold' => 'stopped', - 'abo_cancel' => 'canceled', - 'abo_finish' => 'finished', - 'abo_inactive' => 'inactive', - 'abo_grace' => 'grace', - 'abo_info' => 'Subscription information', - 'info_min_duration_reached' => 'Your subscription can be changed, supplemented, paused or canceled earliest from :date.', - 'info_min_duration_orders_left' => 'The subscription can only be changed, supplemented, paused or canceled after another :count executions.', - 'pros_hl' => 'The advantages of a subscription', - 'pros_list' => '
  • Subscription for Consultants and Customers: Each consultant or customer can take out a subscription that runs on a set day of the month to ensure regular and predictable delivery.
    • +return [ + 'abo' => 'Subscription', + 'payment_for_abo' => 'Payment method for subscription', + 'abo_delivery' => 'Subscription - regular delivery', + 'abo_are_for_me_and_shipped' => 'Subscription is for me and will be shipped to my address', + 'abo_are_for_customer_and_shipped' => 'Subscription is for a customer and will be sent to the customer', + 'abo_delivery_to_me' => 'Subscription delivery to me', + 'abo_delivery_to_the_customer' => 'Subscription delivery to the customer', + 'every_week' => 'every week', + 'every_weeks' => 'every :num weeks', + 'of_month' => 'of the month', + 'delivery_intervall' => 'Adjust delivery day', + 'abo_order_info_check' => 'By completing the subscription, a regular delivery is set up. This is automatically shipped and billed on the selected delivery day.', + 'abo_order_info_check_2' => 'The first delivery and billing takes place on the day the subscription is set up. After that, shipping is automatically carried out on the selected delivery day of the following month.', + 'abo_order_info_check_3' => 'PayPal and credit card are available as payment methods. The subscription has a minimum duration of :abo-min-duration months. After that, it can be paused, changed or canceled at any time.', + 'abo_order_info_checkbox' => 'Yes, I have understood the subscription terms!', + 'abo_infos' => 'Subscription info', + 'abo_delivery_infos' => 'Subscription delivery information', + 'abo_start_date' => 'Start date of the subscription', + 'abo_delivery_intervall' => 'Delivery day of the subscription', + 'abo_first_execution_date' => 'First execution', + 'abo_next_execution_date' => 'Next execution', + 'delivery_day' => 'Adjust delivery day', + 'abo_settings' => 'Subscription settings', + 'add_new_abo' => 'Add new subscription', + 'abo_edit' => 'Edit subscription', + 'abo_details' => 'Subscription details', + 'abo_is_active' => 'Subscription is active', + 'abo_copy_active' => 'If the subscription is not active, it will not be executed automatically', + 'abo_copy_next_date' => 'The next execution date can be set to the following day at the earliest', + 'abo_copy_abo_interval' => 'Adjusting the subscription delivery day affects the upcoming execution date when the subscription is active.', + 'error_abo_interval' => 'The subscription interval is not correct', + 'error_next_date' => 'The date for the next execution is not correct', + 'checkout_mail_abo_hl' => 'Your subscription / regular delivery', + 'checkout_mail_abo_start' => 'Your subscription was successfully created with the following settings:', + 'checkout_mail_abo_info' => 'You can find your subscription settings in your account under "My subscriptions" and the settings can also be edited there', + 'abo_new' => 'new', + 'abo_okay' => 'okay', + 'abo_hold' => 'stopped', + 'abo_cancel' => 'canceled', + 'abo_finish' => 'finished', + 'abo_inactive' => 'inactive', + 'abo_grace' => 'grace', + 'abo_info' => 'Subscription information', + 'info_min_duration_reached' => 'Your subscription can be changed, supplemented, paused or canceled earliest from :date.', + 'info_min_duration_orders_left' => 'The subscription can only be changed, supplemented, paused or canceled after another :count executions.', + 'pros_hl' => 'The advantages of a subscription', + 'pros_list' => '
  • Subscription for Consultants and Customers: Each consultant or customer can take out a subscription that runs on a set day of the month to ensure regular and predictable delivery.
  • Monthly Delivery: Once a month, a new delivery is sent directly to your door.
  • Flexibly Customizable: The subscription can be individually adjusted, e.g., regarding products, quantities, or delivery times.
  • Diverse Product Selection: Various products can be included in the subscription.
  • Duration: The subscription has a minimum duration of :abo-min-duration months, after which it can be paused or canceled.
  • Price Advantage: Subscription products often receive special discounts or offers.
  • Start Now: Choose your products, adapt the subscription to your needs, pay for the first order, and activate your subscription for subsequent deliveries.
    • ', - 'abo_pros' => 'Subscription benefits', - 'abo_order_hl' => 'Subscription compilation', - 'abo_order_info_2' => 'You can adjust the products of your subscription at any time, on the next execution your compiled products will be sent to you.', - 'abo_order_info_block' => 'You can adjust the compilation of your subscription after the minimum duration of :abo-min-duration months.', - 'add_product' => 'Add product', - 'product_prices_career_level_info' => 'Product prices are displayed and calculated according to your career level :user_level_name minus :user_level_margin % margin.', - 'product_prices_career_level_cpay_info' => 'The product prices are displayed as customer retail prices. After the customer payment is completed, you will receive your commission according to your career level :user_level_name commission :user_level_margin %.', - 'error_email_has_abo' => 'A subscription already exists for the email address :email.', - 'abo_assigned' => 'Subscription active', - 'base' => 'Base', - 'upgrade' => 'Upgrade', - 'abo_type_info' => 'Note: Each subscription consists of at least one base product :base !
    Upgrade products :upgrade are optional and can be added as desired.
    The subscription has a minimum duration of :abo-min-duration months, after which it can be paused or canceled.', - 'abo_type_info_base' => 'The subscription requires at least one base product :base !', - 'need_basis_product' => 'You must have at least one base product in your subscription. Please first add a new base product and then remove the old base product!', - 'abo_item_not_found' => 'Subscription item not found', - 'product_not_found' => 'Product not found', - 'create_abo' => 'Create subscription', - 'info' => 'Info', - 'data' => 'Data', - 'check' => 'Check', - 'choose' => 'Choose', - 'order' => 'order', - 'basis_product' => 'Base product', - 'upgrade_products' => 'Upgrade products', - 'base_product' => 'Base product', - 'upgrade_product' => 'Upgrade product', - 'my_address' => 'My address', - 'my_address_check' => 'Check my address', - 'my_address_check_info' => 'Please check your address to ensure that the goods are sent to the correct address.', - 'edit' => 'edit', - 'confirm_and_next' => 'confirm and next', - 'understood_and_next' => 'understood and next', - 'change_my_data_empty' => 'You have not yet stored a billing and delivery address, without this you cannot create a subscription, please create it.', - 'abo_error_basis_product' => 'Error: Please select at least one base product.', - 'error_abo_interval_in_the_past' => 'The subscription has not been executed this month yet. Changing to a past day would skip the current month.', - 'cancel_abo' => 'Cancel subscription', - 'confirm_cancel' => 'Do you really want to cancel the subscription?', - 'back' => 'back', - 'team_subscriptions' => 'Team subscriptions', - 'every_month_on' => 'monthly on :day.', -); + 'abo_pros' => 'Subscription benefits', + 'abo_order_hl' => 'Subscription compilation', + 'abo_order_info_2' => 'You can adjust the products of your subscription at any time, on the next execution your compiled products will be sent to you.', + 'abo_order_info_block' => 'You can adjust the compilation of your subscription after the minimum duration of :abo-min-duration months.', + 'abo_order_info_block_team' => 'The compilation of the subscription for a team member can only be adjusted by him after the minimum duration of :abo-min-duration months.', + 'abo_order_info_block_customer' => 'You can add new products to your subscription at any time. Removing products is only possible after the minimum duration of :abo-min-duration months.', + 'abo_order_info_add_only' => 'You can add new products to your subscription at any time. Removing products is only possible after the minimum duration of :abo-min-duration months.', + 'error_add_only_no_remove' => 'Removing products is not possible during the minimum duration period.', + 'confirm_add_title' => 'Confirm adding product', + 'confirm_add_title_normal' => 'Add product to subscription', + 'confirm_add_warning' => 'During the minimum duration, added products cannot be removed again. Please check your selection carefully.', + 'confirm_add_warning_normal' => 'Do you really want to add this product to your subscription?', + 'confirm_add_cancel' => 'Cancel', + 'confirm_add_ok' => 'Yes, add product', + 'add_product' => 'Add product', + 'product_prices_career_level_info' => 'Product prices are displayed and calculated according to your career level :user_level_name minus :user_level_margin % margin.', + 'product_prices_career_level_cpay_info' => 'The product prices are displayed as customer retail prices. After the customer payment is completed, you will receive your commission according to your career level :user_level_name commission :user_level_margin %.', + 'error_email_has_abo' => 'A subscription already exists for the email address :email.', + 'abo_assigned' => 'Subscription active', + 'base' => 'Base', + 'upgrade' => 'Upgrade', + 'abo_type_info' => 'Note: Each subscription consists of at least one base product :base !
    Upgrade products :upgrade are optional and can be added as desired.
    The subscription has a minimum duration of :abo-min-duration months, after which it can be paused or canceled.', + 'abo_type_info_base' => 'The subscription requires at least one base product :base !', + 'need_basis_product' => 'You must have at least one base product in your subscription. Please first add a new base product and then remove the old base product!', + 'abo_item_not_found' => 'Subscription item not found', + 'product_not_found' => 'Product not found', + 'create_abo' => 'Create subscription', + 'info' => 'Info', + 'data' => 'Data', + 'check' => 'Check', + 'choose' => 'Choose', + 'order' => 'order', + 'basis_product' => 'Base product', + 'upgrade_products' => 'Upgrade products', + 'base_product' => 'Base product', + 'upgrade_product' => 'Upgrade product', + 'my_address' => 'My address', + 'my_address_check' => 'Check my address', + 'my_address_check_info' => 'Please check your address to ensure that the goods are sent to the correct address.', + 'edit' => 'edit', + 'confirm_and_next' => 'confirm and next', + 'understood_and_next' => 'understood and next', + 'change_my_data_empty' => 'You have not yet stored a billing and delivery address, without this you cannot create a subscription, please create it.', + 'abo_error_basis_product' => 'Error: Please select at least one base product.', + 'error_abo_interval_in_the_past' => 'The subscription has not been executed this month yet. Changing to a past day would skip the current month.', + 'cancel_abo' => 'Cancel subscription', + 'confirm_cancel' => 'Do you really want to cancel the subscription?', + 'back' => 'back', + 'team_subscriptions' => 'Team subscriptions', + 'every_month_on' => 'monthly on :day.', +]; diff --git a/resources/lang/en/abo_history.php b/resources/lang/en/abo_history.php new file mode 100644 index 0000000..a65b6bf --- /dev/null +++ b/resources/lang/en/abo_history.php @@ -0,0 +1,54 @@ + 'Original Composition', + 'change_history' => 'Change History', + 'no_initial_data' => 'No original data available (subscription was created before history tracking)', + 'no_changes' => 'No changes recorded', + + // Columns + 'col_date' => 'Date', + 'col_action' => 'Action', + 'col_product' => 'Product', + 'col_details' => 'Details', + 'col_changed_by' => 'Changed by', + 'col_channel' => 'Channel', + + // Actions + 'action_initial' => 'Original', + 'action_added' => 'Added', + 'action_removed' => 'Removed', + 'action_qty_changed' => 'Qty changed', + 'action_comp_changed' => 'Comp swapped', + 'action_comp_added' => 'Comp added', + 'action_comp_removed' => 'Comp removed', + 'action_rollback' => 'Rolled back', + + // Descriptions + 'desc_initial' => 'Quantity: :qty', + 'desc_added' => 'Quantity: :qty', + 'desc_removed' => 'Product removed', + 'desc_qty_changed' => 'Quantity changed from :from to :to', + 'desc_comp_changed' => 'Replaced: :old', + 'desc_comp_added' => 'Added by system', + 'desc_comp_removed' => 'Removed by system', + 'desc_rollback' => 'Reset to original', + + // Channels + 'channel_admin' => 'Admin', + 'channel_user_me' => 'Consultant', + 'channel_user_ot' => 'Consultant (Customer)', + 'channel_portal' => 'Customer Portal', + 'channel_system' => 'System', + + // Price type + 'price_net' => 'net', + 'price_gross' => 'gross', + + // Rollback + 'rollback_btn' => 'Reset to Original', + 'rollback_confirm' => 'Are you sure you want to reset the subscription to its original state? All current products will be replaced with the original composition.', + 'rollback_success' => 'The subscription has been successfully reset to its original state.', + 'rollback_no_data' => 'Rollback not possible: No original data available.', +]; diff --git a/resources/lang/en/account.php b/resources/lang/en/account.php index cb45897..b8bf590 100644 --- a/resources/lang/en/account.php +++ b/resources/lang/en/account.php @@ -1,44 +1,47 @@ 'BIC', - 'IBAN' => 'IBAN', - 'VAT_ID_number' => 'tax ID number', - 'VAT_copy_1' => 'Choose a small business if you do not generate more than EUR 22,000 in sales per year with your business.', - 'VAT_liability' => 'VAT liability', - 'account_holder' => 'account owner', - 'bank_data' => 'bank details', - 'btn_vat_validate' => 'Validate VAT ID number', - 'delivery_address' => 'delivery adress', - 'firstname_lastname' => 'first name last name', - 'info_vat_numbers' => 'Note: Please provide your tax number and/or VAT ID number!*', - 'invoice_address' => 'billing adress', - 'my_credit' => 'my credit', - 'new_vat_validate' => 'Validate new VAT ID and activate reverse charge procedure', - 'phone_need_error' => 'Error: Please state telephone and/or mobile phone!*', - 'phone_need_note' => 'Note: Please state telephone and/or mobile phone!*', - 'required_for_commission_payments' => 'required for commission payouts', - 'reverse_charge_action_1' => 'delete reverse charge procedure and VAT ID', - 'reverse_charge_action_2' => 'validate VAT ID and activate reverse charge procedure', - 'reverse_charge_copy_1' => 'Reversal of tax liability or deduction procedure. In this special case, the recipient of the service (consultant) and not the entrepreneur providing the service (mivita) must pay the sales tax.', - 'reverse_charge_note_1' => 'When activated, the VAT ID is required and validated.', - 'reverse_charge_procedure' => 'reverse charge procedure', - 'tax_number' => 'tax no.', - 'taxable_sales_1' => 'subject to sales tax (I submit an advance VAT declaration to the tax office every month / quarter / year)', - 'taxable_sales_2' => 'not subject to sales tax (small business within the meaning of §19)', - 'validator_creditcard' => 'please enter a valid credit card number', - 'validator_date' => 'Please enter a valid date.', - 'validator_digits' => 'Please only enter numbers.', - 'validator_email' => 'Please enter a valid email address.', - 'validator_equalTo' => 'Please repeat the same value.', - 'validator_max' => 'Please enter a value less than or equal to {0}.', - 'validator_maxlength' => 'Please enter a maximum of {0} characters.', - 'validator_min' => 'Please enter a value greater than or equal to {0}.', - 'validator_minlength' => 'Please enter at least {0} characters.', - 'validator_number' => 'Please enter a number.', - 'validator_range' => 'Please enter a value between {0} and {1}.', - 'validator_rangelength' => 'Please enter at least {0} and maximum {1} characters.', - 'validator_required' => 'This field is a required field.', - 'validator_url' => 'Please enter a valid URL.', - 'vat_data' => 'Tax data', -); +return [ + 'BIC' => 'BIC', + 'IBAN' => 'IBAN', + 'VAT_ID_number' => 'tax ID number', + 'VAT_copy_1' => 'Choose a small business if you do not generate more than EUR 22,000 in sales per year with your business.', + 'VAT_liability' => 'VAT liability', + 'account_holder' => 'account owner', + 'bank_data' => 'bank details', + 'btn_vat_validate' => 'Validate VAT ID number', + 'delivery_address' => 'delivery adress', + 'firstname_lastname' => 'first name last name', + 'info_vat_numbers' => 'Note: Please provide your tax number and/or VAT ID number!*', + 'invoice_address' => 'billing adress', + 'my_credit' => 'my credit', + 'new_vat_validate' => 'Validate new VAT ID and activate reverse charge procedure', + 'phone_need_error' => 'Error: Please state telephone and/or mobile phone!*', + 'phone_need_note' => 'Note: Please state telephone and/or mobile phone!*', + 'required_for_commission_payments' => 'required for commission payouts', + 'reverse_charge_action_1' => 'delete reverse charge procedure and VAT ID', + 'reverse_charge_action_2' => 'validate VAT ID and activate reverse charge procedure', + 'reverse_charge_copy_1' => 'Reversal of tax liability or deduction procedure. In this special case, the recipient of the service (consultant) and not the entrepreneur providing the service (mivita) must pay the sales tax.', + 'reverse_charge_note_1' => 'When activated, the VAT ID is required and validated.', + 'reverse_charge_procedure' => 'reverse charge procedure', + 'tax_number' => 'tax no.', + 'taxable_sales_1' => 'subject to sales tax (I submit an advance VAT declaration to the tax office every month / quarter / year)', + 'taxable_sales_2' => 'not subject to sales tax (small business within the meaning of §19)', + 'validator_creditcard' => 'please enter a valid credit card number', + 'validator_date' => 'Please enter a valid date.', + 'validator_digits' => 'Please only enter numbers.', + 'validator_email' => 'Please enter a valid email address.', + 'validator_equalTo' => 'Please repeat the same value.', + 'validator_max' => 'Please enter a value less than or equal to {0}.', + 'validator_maxlength' => 'Please enter a maximum of {0} characters.', + 'validator_min' => 'Please enter a value greater than or equal to {0}.', + 'validator_minlength' => 'Please enter at least {0} characters.', + 'validator_number' => 'Please enter a number.', + 'validator_range' => 'Please enter a value between {0} and {1}.', + 'validator_rangelength' => 'Please enter at least {0} and maximum {1} characters.', + 'validator_required' => 'This field is a required field.', + 'validator_url' => 'Please enter a valid URL.', + 'vat_data' => 'Tax data', + 'language_settings' => 'Language settings', + 'preferred_language' => 'Preferred language', + 'language_hint' => 'This language will be used for your invoices, commission statements and delivery notes.', +]; diff --git a/resources/lang/en/customer.php b/resources/lang/en/customer.php index b9f96ab..b71f416 100644 --- a/resources/lang/en/customer.php +++ b/resources/lang/en/customer.php @@ -1,34 +1,35 @@ 'about store', - 'add_customer_without_email' => 'add customer without email', - 'add_customer_without_email_info1' => 'Note: You can also create your customers without an email address. The system then compares the last name and zip code. If there are any similarities here, MIVITA support compares the customer rates and assigns them to the consultants accordingly. Therefore, in the best case scenario, we always recommend providing an email address. This is unique and can therefore be clearly assigned to a customer.', - 'assigned' => 'assigned', - 'assigned_counsellor' => 'assigned advisor', - 'check' => 'check', - 'check_and_next' => 'check and continue', - 'check_and_save' => 'check and save', - 'client_sovereignty' => 'customer sovereignty', - 'counsellor_allocate' => 'assign consultants', - 'created' => 'created', - 'customer_add' => 'add customers', - 'customer_billing_address' => 'customer and billing address', - 'customer_data' => 'customer number', - 'customer_details' => 'customer details', - 'customer_has_already_buy' => 'I certify that this customer has already purchased from me', - 'customer_has_already_purchased' => 'Customer has already purchased.', - 'customer_has_not_yet_purchased' => 'Customer has not purchased yet.', - 'customer_is_not_subscribed_to_newsletter' => 'Customer is not subscribed to newsletter.', - 'customer_is_subscribed_to_newsletter' => 'Customer is subscribed to newsletter.', - 'customer_sovereignty_info1' => 'Customer sovereignty: Only customers who do not yet exist in the mivita sales center can be added.', - 'date' => 'date', - 'edit' => 'edit', - 'edit_customer_data' => 'to edit the customer data', - 'enter' => 'input', - 'is_counsellor' => 'is a consultant', - 'newsletter_subscribed_copy1' => 'Subscribed to newsletter. You or MIVITA are allowed to send customers a newsletter if the customer has already actively purchased. If the customer has explicitly stated that they do not want a newsletter, please be sure to uncheck the box.', - 'next_without_email' => 'continue without email', - 'select' => 'select', - 'under_review' => 'in examination', -); +return [ + 'about_shop' => 'about store', + 'add_customer_without_email' => 'add customer without email', + 'add_customer_without_email_info1' => 'Note: You can also create your customers without an email address. The system then compares the last name and zip code. If there are any similarities here, MIVITA support compares the customer rates and assigns them to the consultants accordingly. Therefore, in the best case scenario, we always recommend providing an email address. This is unique and can therefore be clearly assigned to a customer.', + 'assigned' => 'assigned', + 'assigned_counsellor' => 'assigned advisor', + 'check' => 'check', + 'check_and_next' => 'check and continue', + 'check_and_save' => 'check and save', + 'client_sovereignty' => 'customer sovereignty', + 'counsellor_allocate' => 'assign consultants', + 'created' => 'created', + 'customer_add' => 'add customers', + 'customer_billing_address' => 'customer and billing address', + 'customer_data' => 'customer number', + 'customer_details' => 'customer details', + 'customer_has_already_buy' => 'I certify that this customer has already purchased from me', + 'customer_has_already_purchased' => 'Customer has already purchased.', + 'customer_has_not_yet_purchased' => 'Customer has not purchased yet.', + 'customer_is_not_subscribed_to_newsletter' => 'Customer is not subscribed to newsletter.', + 'customer_is_subscribed_to_newsletter' => 'Customer is subscribed to newsletter.', + 'customer_sovereignty_info1' => 'Customer sovereignty: Only customers who do not yet exist in the mivita sales center can be added.', + 'date' => 'date', + 'edit' => 'edit', + 'edit_customer_data' => 'to edit the customer data', + 'enter' => 'input', + 'is_counsellor' => 'is a consultant', + 'newsletter_subscribed_copy1' => 'Subscribed to newsletter. You or MIVITA are allowed to send customers a newsletter if the customer has already actively purchased. If the customer has explicitly stated that they do not want a newsletter, please be sure to uncheck the box.', + 'next_without_email' => 'continue without email', + 'select' => 'select', + 'under_review' => 'in examination', + 'language_hint' => 'Invoices and documents will be created in this language.', +]; diff --git a/resources/lang/en/dataprotect.php b/resources/lang/en/dataprotect.php index d74ebb5..a72ad25 100644 --- a/resources/lang/en/dataprotect.php +++ b/resources/lang/en/dataprotect.php @@ -1,20 +1,21 @@ 'Privacy Policy', - 'data_protect_copy1' => 'Our website can generally be used without providing personal data. If you want to use certain services via our website, processing of your personal data may be necessary.
    The processing of your personal data is always carried out in accordance with the General Data Protection Regulation (GDPR) and the country-specific data protection regulations that apply to us.
    We have taken appropriate technical and organizational measures in accordance with Article 32 of the GDPR to ensure an appropriate level of protection. We have also set up procedures to ensure that your rights are exercised, that data is deleted and that we respond to a threat to data. We have already taken the protection of your personal data into account when developing and selecting the hardware and software used. We hereby comply with the principle of data protection through technology design/through data protection-friendly default settings, Art. 25 GDPR. Our security measures include, in particular, the encrypted transmission (SSL encryption) of data between your browser and our server.

    ', - 'data_protect_copy10' => 'If one of the reasons mentioned above applies and you would like to have personal data stored by us deleted, you can contact us at any time. We will ensure that the deletion request is complied with immediately.
    If the personal data has been made public by us and we as the person responsible are obliged to delete the personal data in accordance with Article 17 Para. 1 GDPR, we will take appropriate measures, including technical ones, taking into account the available technology and the implementation costs to inform other data controllers who process the published personal data that you have requested that these other data controllers delete all links to this personal data or copies or replications of this personal data, to the extent that the processing is not required. We will take the necessary steps in individual cases.

    4) Right to restriction of processing
    You have the right to request that we restrict processing if one of the following conditions is met:
    - The The accuracy of the personal data is contested by you for a period enabling us to verify the accuracy of the personal data; - The processing is unlawful, you refuse the deletion of the personal data and instead request the restriction of the use of the personal data; - We no longer need the personal data for the purposes of processing, but you need it to establish, exercise or defend legal claims; - You have lodged an objection to the processing in accordance with Article 21 Para. 1 GDPR and it is not yet clear whether our legitimate reasons outweigh yours.
    If one of the above conditions is met and you would like to request the restriction of personal data stored by us, you can contact us at any time. We will arrange for the processing to be restricted.

    5) Right to data portability
    You have the right to receive from us the personal data concerning you, which you have provided, in a structured, common and machine-readable format . You also have the right to transmit this data to another person responsible without hindrance from us, provided that the processing is based on consent in accordance with Art. 6 Para. 1 Letter a GDPR or Art. 9 Para. 2 Letter a GDPR or on a contract in accordance with Art 6 Paragraph 1 Letter b GDPR and the processing is carried out using automated procedures, unless the processing is necessary for the performance of a task that is in the public interest or in the exercise of official authority vested in us.

    Furthermore, when exercising your right to data portability in accordance with Art. 20 Para. 1 GDPR, you have the right to have the personal data transmitted directly from us to another person responsible, to the extent that this is technically feasible and provided this does not affect the rights and freedoms of other people.

    To assert your right to data portability, you can contact us at any time.

    6) Right to object
    You have the right, for reasons arising from your particular situation, to object at any time to the processing of personal data concerning you based on Art 6 Paragraph 1 Letters e or f GDPR to lodge an objection. This also applies to profiling based on these provisions.

    In the event of an objection, we will no longer process the personal data unless we can demonstrate compelling legitimate reasons for the processing that outweigh your interests, rights and freedoms, or the processing serves to assert, exercise or defend legal claims.
    If we process personal data in order to conduct direct advertising, you have the right to object at any time to the processing of personal data for the purpose of such advertising. This also applies to profiling insofar as it is connected to such direct advertising. If you object to the processing for direct advertising purposes, we will no longer process the personal data for these purposes.

    In addition, you have the right, for reasons arising from your particular situation, to object to the processing of personal data concerning you that is carried out by us for scientific or historical research purposes or for statistical purposes in accordance with Art. 89 Para. 1 DSGVO to lodge an objection, unless such processing is necessary to fulfill a task in the public interest.

    To exercise your right to object, you can contact us. In connection with the use of information society services, notwithstanding Directive 2002/58/EC, you are free to exercise your right to object using automated procedures using technical specifications.

    ', - 'data_protect_copy11' => '7) Automated decisions in individual cases, including profiling
    You have the right not to be subject to a decision based solely on automated processing - including profiling - which has legal effects against you or similar way, unless the decision is necessary for the conclusion or performance of a contract between you and us or is permitted by Union or Member State law to which we are subject and such law takes appropriate measures to safeguard your rights and freedoms included or with your express consent.

    If the decision is necessary for the conclusion or performance of a contract between you and us or if it is made with your express consent, we will take appropriate measures to protect your rights and freedoms as well as your legitimate interests, including at least this Right to obtain human intervention on the part of the person responsible, to express one\'s own point of view and to challenge the decision.

    If you would like to assert your rights with regard to automated decisions, you can contact us at any time.

    8) Right to revoke your data protection consent
    You have the right to revoke your consent to the processing of personal data at any time. If you would like to exercise your right to revoke your consent, you can contact us at any time.

    9) Right to complain to the supervisory authority
    According to Art. 77 GDPR, you have the right to complain to the supervisory authority if you are of the opinion that the processing of your personal data is not taking place lawfully.

    X. Collaboration with processors/third parties
    If, as part of our data processing, we disclose your data to other people/companies, transmit it to them or grant them access to your data, this is done exclusively on the basis of legal permission, your consent, a legal obligation or based on our legitimate interests. If third parties have been or will be commissioned by us to process data on the basis of a so-called “order processing contract”, this is done on the basis of Art. 28 GDPR.

    XI. Transfers to third countries
    If we process data in a third country or this occurs as part of the use of third-party services, this will only take place if it is necessary to fulfill our (pre-)contractual obligations, based on your consent legal obligation or based on our legitimate interests. Subject to legal or contractual permissions, we only process or have the data processed in a third country if the special requirements of Art. 44 ff. GDPR are met. Accordingly, processing is carried out, for example, on the basis of special guarantees, such as the officially recognized determination of a data protection level corresponding to the EU (e.g. for the USA through the “Privacy Shield”) or compliance with officially recognized special contractual obligations (so-called “standard contractual clauses”).

    XII. Integration of third-party services and content
    Based on our legitimate interests within the meaning of Article 6 Paragraph 1 Letter f of the GDPR, we use offers from third-party providers on our website in order to be able to integrate their content. The providers of this content receive knowledge of your IP address, since without knowledge of the IP address the content cannot be transmitted to your browser. We strive to only use third-party content where your IP address is used exclusively to deliver the content. There is still the possibility that third parties use so-called “pixel tags” - these are invisible graphics also known as “web beacons” - for statistical or marketing purposes. “Pixel tags” can evaluate information such as visitor traffic on our website.

    Below we give you an overview of the third-party offers we use, along with links to their data protection declarations:

    External fonts from Google, LLC., https://www.google.com/ fonts (“Google Fonts”). The integration of Google Fonts occurs through a server call at Google (usually in the USA). The data protection declaration can be found here: https://policies.google.com/privacy, Opt-Out: https://adssettings.google.com/authenticated

    Videos from the “YouTube” platform of the third-party provider Google LLC, 1600 Amphitheater Parkway, Mountain View, CA 94043, USA. The data protection declaration can be found here: https://policies.google.com/privacy, opt-out: https://adssettings.google.com/authenticated

    ', - 'data_protect_copy12' => 'XIII. Analysis tools and advertising Facebook Pixel
    This website uses Facebook\'s visitor action pixels to measure conversions. The provider of this service is Facebook Ireland Limited, 4 Grand Canal Square, Dublin 2, Ireland. However, according to Facebook, the data collected will also be transferred to the USA and other third countries. This means that the behavior of site visitors can be tracked after they have been redirected to the provider\'s website by clicking on a Facebook ad. This allows the effectiveness of Facebook advertisements to be evaluated for statistical and market research purposes and future advertising measures to be optimized. The data collected is anonymous to us as the operator of this website; we cannot draw any conclusions about the identity of the users. However, the data is stored and processed by Facebook so that a connection to the respective user profile is possible and Facebook can use the data for its own advertising purposes in accordance with the Facebook data usage guidelines. This allows Facebook to enable the placement of advertisements on Facebook pages as well as outside of Facebook. This use of data cannot be influenced by us as the site operator. The use of Facebook Pixel is based on Art. 6 Para. 1 lit. f GDPR. The website operator has a legitimate interest in effective advertising measures, including social media. If appropriate consent has been requested (e.g. consent to the storage of cookies), processing is carried out exclusively on the basis of Art. 6 Para. 1 lit. a GDPR; Consent can be revoked at any time. Data transfer to the USA is based on the standard contractual clauses of the EU Commission. Details can be found here: https://www.facebook.com/legal/EU_data_transfer_addendum and https://de-de.facebook.com/ help/566994660333381

    To the extent that personal data is collected on our website and forwarded to Facebook using the tool described here, we and Facebook Ireland Limited, 4 Grand Canal Square, GrandCanal Harbour, Dublin 2, Ireland are jointly responsible for this Responsible for data processing (Art. 26 GDPR). The joint responsibility is limited exclusively to collecting the data and passing it on to Facebook. The processing carried out by Facebook after the forwarding is not part of the shared responsibility. The obligations we share have been set out in a joint processing agreement. The wording of the agreement can be found at: https://www.facebook.com/legal/controller_addendum. According to this agreement, we are responsible for providing data protection information when using the Facebook tool and for the data protection-safe implementation of the tool on our website. Facebook is responsible for the data security of Facebook products. You can assert data subject rights (e.g. requests for information) regarding the data processed by Facebook directly on Facebook. If you assert your data subject rights with us, we are obliged to forward these to Facebook. You will find further information on protecting your privacy in Facebook\'s data protection information: https://de-de.facebook.com/about/privacy/. You can also deactivate the “Custom Audiences” remarketing function in the advertising settings area at https://www.facebook.com/ads/preferences/?entry_product=ad_settings_screen. To do this, you must be logged in to Facebook. If you do not have a Facebook account, you can deactivate usage-based advertising from Facebook on the European Interactive Digital Advertising Alliance website: http://www.youronlinechoices.com/de/praferenzmanagement/.

    Data collection through the use of Google Analytics and use of cookies
    Our website uses Google Analytics, a web analysis service provided by Google inc (https://www.google .de/about/) (1600 Amphitheater Parkway, Mountain View, CA 94043, USA; hereinafter “Google”). Google Analytics uses so-called “cookies” and pseudonymized usage profiles are created in this context. “Cookies” are text files that are stored on your computer and enable your use of the website to be analyzed. For example, the following is recorded:
    • Information about the operating system
    • about the browser
    • Your IP address (host name of the accessing computer)
    • that you provided previously Website accessed (referrer URL)
    • Date and time of the server request.
    The information generated by this text file about the use of our website is transmitted to a Google server in the USA and stored there. Google will use this information to evaluate your use of our website, to compile reports on website activity for website operators and to provide other services related to website and internet usage for the purposes of market research and the needs-based design of these websites. If this is required by law or if third parties process this data on behalf of Google, Google will also pass on this information to these third parties. This use is anonymized or pseudonymized (IP masking).
    You can prevent the installation of cookies by setting your Internet user program (browser) accordingly. However, we would like to point out that not all functions may be usable as a result. To do this, you must switch off the storage of cookies in your internet browser. For further information, please refer to the usage instructions for your Internet browser. In addition, you can prevent the collection of the data generated by the cookie and related to your use of the website (including your IP address) and the processing of this data by Google by downloading and installing a browser add-on (https: tools.google.com/dlpage/gaoptout?hl=de).
    The data processed by cookies is necessary for the purposes mentioned to protect our legitimate interests and those of third parties in accordance with Article 6 Paragraph 1 Sentence 1 Letter f of the GDPR.
    You can find further data protection information from Google at: https://www.google.de/intl/de/policies/privacy/

    Google uses the DoubleClick DART cookie < br> Users may opt out of the use of the DART cookie by visiting the Google ad network and content network privacy policy.
    No direct personal data of the user is stored, only the IP address. This information is used to automatically recognize you the next time you visit our websites and to make navigation easier for you. For example, cookies allow us to tailor a website to your interests or to save your password so you don\'t have to re-enter it each time.
    Of course, you can also view our websites without cookies. If you do not want us to recognize your computer, you can prevent cookies from being stored on your hard drive by selecting “do not accept cookies” in your browser settings. Please refer to the instructions from your browser manufacturer to find out how this works in detail. However, we would like to point out that not accepting cookies can lead to functional restrictions on our offerings.
    You can prevent the installation of cookies by setting your Internet user program (browser) accordingly. To do this, you must switch off the storage of cookies in your internet browser. For further information, please refer to the usage instructions for your Internet browser.
    You can find further data protection information from Google at: https://www.google.de/intl/de/policies/privacy/

    ', - 'data_protect_copy13' => 'Google Adwords Conversion Tracking
    We use Google Conversion Tracking to statistically record the use of our website and to evaluate it for the purpose of optimizing it for you. Google sets a cookie on your computer if you came to our website via a Google ad.
    After 30 days, these cookies lose their validity. They are not used for personal identification. If the user visits certain pages on the Adwords customer\'s website and the cookie is still valid, Google and the customer can recognize that the user clicked on the ad and was redirected to this page.
    It will be different for each customer Cookies are set and therefore cannot be tracked via the websites of Adwords customers. The information collected is used to create conversion statistics for Adwords customers who have opted for conversion tracking. The following information is revealed:
    • Total number of users who clicked on your ad and were redirected to a page with a conversion tracking tag.
    However No information is released that can be used to personally identify users.
    If you do not want to take part in the tracking process, you can also refuse the necessary setting of a cookie - for example by using your browser setting that generally prevents the automatic setting of cookies disabled. You can also deactivate cookies for conversion tracking by setting your browser so that cookies from the domain “www.googleadservices.com” are blocked.
    Google\'s privacy policy on conversion tracking can be found here (https://services .google.com/sitestats/de.html )', - 'data_protect_copy2' => 'I. Definitions
    To make our data protection declaration easier to understand, we would first like to explain to you some of the terms used. For the purposes of this privacy policy, the term:

    1) “personal data” means any information relating to an identified or identifiable natural person (hereinafter “data subject”); An identifiable natural person is a natural person who can be identified directly or indirectly, in particular by reference to an identifier such as a name, an identification number, location data, an online identifier or to one or more special features that express the physical , physiological, genetic, psychological, economic, cultural or social identity of that natural person;

    2) "Processing" means any operation or series of operations carried out with or without the aid of automated procedures in connection with personal data, such as the collection, recording, organization, structuring, storage, adaptation or modification, reading, retrieving, using, disclosing by transmission, dissemination or any other form of provision, matching or combination, restriction, deletion or destruction;

    3) "Restriction of processing" means the marking of stored personal data with the aim of restricting their future processing;

    4) "Profiling" means any type of automated processing of personal data, which consists in using these personal data to evaluate certain personal aspects relating to a natural person, in particular aspects relating to analyze or predict that natural person\'s work performance, economic situation, health, personal preferences, interests, reliability, behavior, location or movements;

    5) "Pseudonymization" means the processing of personal data in such a way that the personal data can no longer be attributed to a specific data subject without the use of additional information, provided that this additional information is kept separately and is subject to technical and organizational measures that ensure that the personal data is not assigned to an identified or identifiable natural person;

    6) “Controller” means the natural or legal person, public authority, institution or other body which, alone or jointly with others, decides on the purposes and means of processing personal data; If the purposes and means of this processing are determined by Union or Member State law, the controller or the specific criteria for its nomination may be provided for by Union or Member State law

    7) “Processor” means a natural or legal person, public authority, agency or other body that processes personal data on behalf of the controller;

    8) “Recipient” means a natural or legal person, public authority, agency or other body to which personal data is disclosed, regardless of whether it is a third party or not. However, public authorities which may receive personal data in the context of a specific investigative task under Union or Member State law shall not be deemed to be recipients; the processing of these data by the said authorities will be carried out in accordance with the applicable data protection rules in accordance with the purposes of the processing;

    9) “Third party” means a natural or legal person, public authority, agency or other body, other than the data subject, the controller, the processor and the persons authorized under the direct responsibility of the controller or the processor to process personal data;

    10) “Consent” of the data subject means any voluntary, informed and unambiguous expression of will in the specific case in the form of a statement or other clear confirmatory act by which the data subject indicates that he or she agrees to the processing of personal data concerning them;

    11) “personal data breach” means a breach of security that, whether accidental or unlawful, results in the destruction, loss, alteration, or unauthorized disclosure of or access to personal data, that have been transmitted, stored or otherwise processed.

    ', - 'data_protect_copy3' => 'II. Responsible person
    The person responsible within the meaning of the General Data Protection Regulation as well as the data protection laws applicable in the member states of the European Union and other data protection regulations is:

    mivita care gmbh
    Mr Alois Ried
    Leinfeld 2
    87755 Kirchhaslach
    Telephone: +49 (0) 8333 94 61 767
    Mail: info@mivita.care


    ', - 'data_protect_copy4' => 'III. Cookies', - 'data_protect_copy5' => '
    Our website uses cookies. Cookies are small text files that are stored and stored on a computer system via an Internet browser.
    Many websites and servers use cookies. Many cookies contain a so-called cookie ID. A cookie ID is a unique identifier of the cookie. It consists of a string through which websites and servers can be assigned to the specific Internet browser in which the cookie was stored. This allows the websites and servers visited to distinguish the individual browser of the data subject from other Internet browsers that contain other cookies. A specific Internet browser can be recognized and identified via the unique cookie ID.
    By using cookies, we can provide you with more user-friendly services that would not be possible without the cookie setting.
    Using a cookie, the information and offers on our website can be optimized for the user. As already mentioned, cookies enable us to recognize the users of our website. The purpose of this recognition is to make it easier for you to use our websites. For example, the user of a website that uses cookies does not have to re-enter their access data each time they visit the website because this is done by the website and the cookie stored on the user\'s computer system.
    The data processed by cookies is necessary for the purposes mentioned to protect our legitimate interests in accordance with Article 6 Paragraph 1 Sentence 1 Letter f of the GDPR.
    You can prevent the setting of cookies through our website at any time by adjusting the appropriate settings on the Internet browser used and thus permanently object to the setting of cookies. Furthermore, cookies that have already been set can be deleted at any time via an internet browser or other software programs. This is possible in all common internet browsers. If you deactivate the setting of cookies in the Internet browser you use, not all functions of our website may be fully usable.

    IV. Data and information that is stored when you visit our website
    Every time you visit our website, general data and information is recorded that is stored in the server\'s log files.

    The following data/information may be collected:
    - the browser types and versions used - the operating system used, - the website from which you access our website - the sub-sites, which are accessed on our website - the date and time of access to our website, - your IP address - your Internet service provider - other similar data and information that serves to avert danger in the event of attacks on our IT systems .

    We need this information in order to be able to accurately provide the content of our website. to ensure the long-term functionality of our IT system and to be able to provide the authorities with the information necessary for criminal prosecution in the event of a cyber attack. This is also our legitimate interest within the legal basis for processing this data in accordance with Article 6 Paragraph 1 Letter f of the GDPR. When using this general data and information, we do not draw any conclusions about the data subject. We store the anonymous data from the server log files separately from all personal data. V. Contacting us electronically

    Due to the regulations of the Telemedia Act (TMG), we are obliged to provide a general email address in the imprint of our website, which you can use to contact us by email. You also have the option of contacting us using the contact forms on our website. You can use the contact forms to make inquiries about the products or our business or apply to us as a consultant. The personal data you send to us via email or our contact forms will be automatically stored for the purposes of processing or contacting you.

    By sending your message, you consent to the processing of the transmitted data. Processing is carried out on the basis of Article 6 Paragraph 1 Letter a GDPR with your consent. You can revoke your consent at any time by notifying us, without this affecting the lawfulness of the processing carried out based on your consent before its revocation. We only use your email address to process your request. Your data will then be deleted unless you have consented to further processing and use.

    ', - 'data_protect_copy6' => 'VI. Legal basis for processing
    If we obtain your consent for a specific processing purpose, Art. 6 I lit. a GDPR serves as the legal basis for the processing operation.

    If the processing of personal data is necessary to fulfill a contract, the processing is based on Art. 6 I lit. b GDPR. This also applies to processing operations that are necessary to carry out pre-contractual measures, such as inquiries about our products or other services.

    If we are subject to a legal obligation that requires the processing of personal data, such as to fulfill tax obligations, the legal basis for the processing is Art. 6 I lit. c GDPR.

    If the processing of personal data is necessary to protect the vital interests of the data subject or another natural person, the processing would be based on Art. 6 I lit. d GDPR.

    Ultimately, Art. 6 I lit. f GDPR can be the legal basis for a processing operation. This is the case if the processing operation is not covered by any of the aforementioned legal bases and the processing is necessary to protect a legitimate interest of our company or a third party, provided that the interests, fundamental rights and freedoms of the data subject do not prevail. If the processing of personal data is based on Article 6 I lit. f GDPR, our legitimate interest is to carry out our business activities for the benefit of the well-being of our employees/shareholders.

    ', - 'data_protect_copy7' => 'VII. Legal or contractual regulations for the provision of personal data
    The provision of personal data is partly required by law (e.g. tax regulations) and can also result from contractual regulations (e.g. information about the contractual partner). If you want to conclude a contract with us, it is necessary that you provide us with personal data, which will subsequently be processed by us. Failure to provide personal data would mean that we would not be able to conclude a contract with you.

    ', - 'data_protect_copy8' => 'VIII. Routine deletion/blocking of personal data
    We only process and store personal data for the period necessary to achieve the storage purpose or if this is required by the European legislator or another legislator in laws or regulations was provided. If the storage purpose no longer applies or if a storage period prescribed by the European legislator or another responsible legislator expires, the personal data will be blocked or deleted routinely and in accordance with legal regulations.

    After the respective statutory retention period has expired, the relevant data will be routinely deleted unless it is no longer required to fulfill the contract or initiate a contract. According to the legal requirements in Germany, storage takes place in particular for 10 years in accordance with Sections 147 Paragraph 1 AO, 257 Paragraph 1 Nos. 1 and 4, Paragraph 4 HGB (books, records, management reports, accounting documents, trading books, more relevant for taxation). documents, etc.) and 6 years in accordance with Section 257 Paragraph 1 Nos. 2 and 3, Paragraph 4 HGB (commercial letters).

    ', - 'data_protect_copy9' => 'IX. Your rights
    1) Right to confirmation and information
    You have the right to request confirmation from us as to whether the relevant personal data is being processed. If you would like to exercise legal rights, you can contact us at any time.

    You also have the right to receive free information from us about the personal data stored about you and a copy of this information. You are also entitled to information about the following information:
    - the processing purposes - the categories of personal data that are processed - the recipients or categories of recipients to whom the personal data have been disclosed or are still being disclosed, in particular recipients in Third countries or international organizations - if possible, the planned period for which the personal data will be stored or, if this is not possible, the criteria for determining that period - the existence of a right to rectification or deletion of the personal data concerning them or to restriction of processing by the controller or a right to object to this processing - the existence of a right to lodge a complaint with a supervisory authority - if the personal data are not collected from the data subject: all available information about the origin of the data - the existence of automated decision-making including profiling in accordance with Article 22 Para. 1 and 4 GDPR and - at least in these cases - meaningful information about the logic involved as well as the scope and intended effects of such processing for the data subject

    You also have the right to information about: whether personal data has been transferred to a third country or to an international organization. If this is the case, you also have the right to receive information about the appropriate guarantees in connection with the transmission.

    If you would like to exercise this right to information, you can contact us at any time.

    2) Right to rectification
    You have the right to request the immediate correction of incorrect personal data concerning you. You also have the right, taking into account the purposes of the processing, to request the completion of incomplete personal data - including by means of a supplementary declaration.

    If you would like to exercise this right to correction, you can contact us at any time.

    3) Right to deletion (“Right to be forgotten”)
    You have the right to request that the personal data concerning you be deleted immediately, if one of the following reasons applies and to the extent that the processing is not necessary: ​​
    - The personal data were collected or otherwise processed for purposes for which they are no longer necessary; - You revoke your consent on which the processing was based in accordance with Article 6 Paragraph 1 Letter a GDPR or Article 9 Paragraph 2 Letter a GDPR and there is no other legal basis for the processing; - You object to the processing in accordance with Art. 21 Para. 1 GDPR and there are no overriding legitimate reasons for the processing, or you object to the processing in accordance with Art. 21 Para. 2 GDPR; - The personal data was processed unlawfully; - The deletion of personal data is necessary to comply with a legal obligation under Union or Member State law to which we are subject. - The personal data was collected in relation to information society services offered in accordance with Art. 8 Para. 1 GDPR.

    ', - 'data_protect_stand_shop' => 'As of: February 18, 2022', - 'data_protect_stand_site' => 'As of: October 5, 2018', -); +return [ + 'data_protect' => 'Privacy Policy', + 'data_protect_copy1' => 'Our website can generally be used without providing personal data. If you want to use certain services via our website, processing of your personal data may be necessary.
    The processing of your personal data is always carried out in accordance with the General Data Protection Regulation (GDPR) and the country-specific data protection regulations that apply to us.
    We have taken appropriate technical and organizational measures in accordance with Article 32 of the GDPR to ensure an appropriate level of protection. We have also set up procedures to ensure that your rights are exercised, that data is deleted and that we respond to a threat to data. We have already taken the protection of your personal data into account when developing and selecting the hardware and software used. We hereby comply with the principle of data protection through technology design/through data protection-friendly default settings, Art. 25 GDPR. Our security measures include, in particular, the encrypted transmission (SSL encryption) of data between your browser and our server.

    ', + 'data_protect_copy10' => 'If one of the reasons mentioned above applies and you would like to have personal data stored by us deleted, you can contact us at any time. We will ensure that the deletion request is complied with immediately.
    If the personal data has been made public by us and we as the person responsible are obliged to delete the personal data in accordance with Article 17 Para. 1 GDPR, we will take appropriate measures, including technical ones, taking into account the available technology and the implementation costs to inform other data controllers who process the published personal data that you have requested that these other data controllers delete all links to this personal data or copies or replications of this personal data, to the extent that the processing is not required. We will take the necessary steps in individual cases.

    4) Right to restriction of processing
    You have the right to request that we restrict processing if one of the following conditions is met:
    - The The accuracy of the personal data is contested by you for a period enabling us to verify the accuracy of the personal data; - The processing is unlawful, you refuse the deletion of the personal data and instead request the restriction of the use of the personal data; - We no longer need the personal data for the purposes of processing, but you need it to establish, exercise or defend legal claims; - You have lodged an objection to the processing in accordance with Article 21 Para. 1 GDPR and it is not yet clear whether our legitimate reasons outweigh yours.
    If one of the above conditions is met and you would like to request the restriction of personal data stored by us, you can contact us at any time. We will arrange for the processing to be restricted.

    5) Right to data portability
    You have the right to receive from us the personal data concerning you, which you have provided, in a structured, common and machine-readable format . You also have the right to transmit this data to another person responsible without hindrance from us, provided that the processing is based on consent in accordance with Art. 6 Para. 1 Letter a GDPR or Art. 9 Para. 2 Letter a GDPR or on a contract in accordance with Art 6 Paragraph 1 Letter b GDPR and the processing is carried out using automated procedures, unless the processing is necessary for the performance of a task that is in the public interest or in the exercise of official authority vested in us.

    Furthermore, when exercising your right to data portability in accordance with Art. 20 Para. 1 GDPR, you have the right to have the personal data transmitted directly from us to another person responsible, to the extent that this is technically feasible and provided this does not affect the rights and freedoms of other people.

    To assert your right to data portability, you can contact us at any time.

    6) Right to object
    You have the right, for reasons arising from your particular situation, to object at any time to the processing of personal data concerning you based on Art 6 Paragraph 1 Letters e or f GDPR to lodge an objection. This also applies to profiling based on these provisions.

    In the event of an objection, we will no longer process the personal data unless we can demonstrate compelling legitimate reasons for the processing that outweigh your interests, rights and freedoms, or the processing serves to assert, exercise or defend legal claims.
    If we process personal data in order to conduct direct advertising, you have the right to object at any time to the processing of personal data for the purpose of such advertising. This also applies to profiling insofar as it is connected to such direct advertising. If you object to the processing for direct advertising purposes, we will no longer process the personal data for these purposes.

    In addition, you have the right, for reasons arising from your particular situation, to object to the processing of personal data concerning you that is carried out by us for scientific or historical research purposes or for statistical purposes in accordance with Art. 89 Para. 1 DSGVO to lodge an objection, unless such processing is necessary to fulfill a task in the public interest.

    To exercise your right to object, you can contact us. In connection with the use of information society services, notwithstanding Directive 2002/58/EC, you are free to exercise your right to object using automated procedures using technical specifications.

    ', + 'data_protect_copy11' => '7) Automated decisions in individual cases, including profiling
    You have the right not to be subject to a decision based solely on automated processing - including profiling - which has legal effects against you or similar way, unless the decision is necessary for the conclusion or performance of a contract between you and us or is permitted by Union or Member State law to which we are subject and such law takes appropriate measures to safeguard your rights and freedoms included or with your express consent.

    If the decision is necessary for the conclusion or performance of a contract between you and us or if it is made with your express consent, we will take appropriate measures to protect your rights and freedoms as well as your legitimate interests, including at least this Right to obtain human intervention on the part of the person responsible, to express one\'s own point of view and to challenge the decision.

    If you would like to assert your rights with regard to automated decisions, you can contact us at any time.

    8) Right to revoke your data protection consent
    You have the right to revoke your consent to the processing of personal data at any time. If you would like to exercise your right to revoke your consent, you can contact us at any time.

    9) Right to complain to the supervisory authority
    According to Art. 77 GDPR, you have the right to complain to the supervisory authority if you are of the opinion that the processing of your personal data is not taking place lawfully.

    X. Collaboration with processors/third parties
    If, as part of our data processing, we disclose your data to other people/companies, transmit it to them or grant them access to your data, this is done exclusively on the basis of legal permission, your consent, a legal obligation or based on our legitimate interests. If third parties have been or will be commissioned by us to process data on the basis of a so-called “order processing contract”, this is done on the basis of Art. 28 GDPR.

    XI. Transfers to third countries
    If we process data in a third country or this occurs as part of the use of third-party services, this will only take place if it is necessary to fulfill our (pre-)contractual obligations, based on your consent legal obligation or based on our legitimate interests. Subject to legal or contractual permissions, we only process or have the data processed in a third country if the special requirements of Art. 44 ff. GDPR are met. Accordingly, processing is carried out, for example, on the basis of special guarantees, such as the officially recognized determination of a data protection level corresponding to the EU (e.g. for the USA through the “Privacy Shield”) or compliance with officially recognized special contractual obligations (so-called “standard contractual clauses”).

    XII. Integration of third-party services and content
    Based on our legitimate interests within the meaning of Article 6 Paragraph 1 Letter f of the GDPR, we use offers from third-party providers on our website in order to be able to integrate their content. The providers of this content receive knowledge of your IP address, since without knowledge of the IP address the content cannot be transmitted to your browser. We strive to only use third-party content where your IP address is used exclusively to deliver the content. There is still the possibility that third parties use so-called “pixel tags” - these are invisible graphics also known as “web beacons” - for statistical or marketing purposes. “Pixel tags” can evaluate information such as visitor traffic on our website.

    Below we give you an overview of the third-party offers we use, along with links to their data protection declarations:

    External fonts from Google, LLC., https://www.google.com/ fonts (“Google Fonts”). The integration of Google Fonts occurs through a server call at Google (usually in the USA). The data protection declaration can be found here: https://policies.google.com/privacy, Opt-Out: https://adssettings.google.com/authenticated

    Videos from the “YouTube” platform of the third-party provider Google LLC, 1600 Amphitheater Parkway, Mountain View, CA 94043, USA. The data protection declaration can be found here: https://policies.google.com/privacy, opt-out: https://adssettings.google.com/authenticated

    ', + 'data_protect_copy12' => 'XIII. Analysis tools and advertising Facebook Pixel
    This website uses Facebook\'s visitor action pixels to measure conversions. The provider of this service is Facebook Ireland Limited, 4 Grand Canal Square, Dublin 2, Ireland. However, according to Facebook, the data collected will also be transferred to the USA and other third countries. This means that the behavior of site visitors can be tracked after they have been redirected to the provider\'s website by clicking on a Facebook ad. This allows the effectiveness of Facebook advertisements to be evaluated for statistical and market research purposes and future advertising measures to be optimized. The data collected is anonymous to us as the operator of this website; we cannot draw any conclusions about the identity of the users. However, the data is stored and processed by Facebook so that a connection to the respective user profile is possible and Facebook can use the data for its own advertising purposes in accordance with the Facebook data usage guidelines. This allows Facebook to enable the placement of advertisements on Facebook pages as well as outside of Facebook. This use of data cannot be influenced by us as the site operator. The use of Facebook Pixel is based on Art. 6 Para. 1 lit. f GDPR. The website operator has a legitimate interest in effective advertising measures, including social media. If appropriate consent has been requested (e.g. consent to the storage of cookies), processing is carried out exclusively on the basis of Art. 6 Para. 1 lit. a GDPR; Consent can be revoked at any time. Data transfer to the USA is based on the standard contractual clauses of the EU Commission. Details can be found here: https://www.facebook.com/legal/EU_data_transfer_addendum and https://de-de.facebook.com/ help/566994660333381

    To the extent that personal data is collected on our website and forwarded to Facebook using the tool described here, we and Facebook Ireland Limited, 4 Grand Canal Square, GrandCanal Harbour, Dublin 2, Ireland are jointly responsible for this Responsible for data processing (Art. 26 GDPR). The joint responsibility is limited exclusively to collecting the data and passing it on to Facebook. The processing carried out by Facebook after the forwarding is not part of the shared responsibility. The obligations we share have been set out in a joint processing agreement. The wording of the agreement can be found at: https://www.facebook.com/legal/controller_addendum. According to this agreement, we are responsible for providing data protection information when using the Facebook tool and for the data protection-safe implementation of the tool on our website. Facebook is responsible for the data security of Facebook products. You can assert data subject rights (e.g. requests for information) regarding the data processed by Facebook directly on Facebook. If you assert your data subject rights with us, we are obliged to forward these to Facebook. You will find further information on protecting your privacy in Facebook\'s data protection information: https://de-de.facebook.com/about/privacy/. You can also deactivate the “Custom Audiences” remarketing function in the advertising settings area at https://www.facebook.com/ads/preferences/?entry_product=ad_settings_screen. To do this, you must be logged in to Facebook. If you do not have a Facebook account, you can deactivate usage-based advertising from Facebook on the European Interactive Digital Advertising Alliance website: http://www.youronlinechoices.com/de/praferenzmanagement/.

    Data collection through the use of Google Analytics and use of cookies
    Our website uses Google Analytics, a web analysis service provided by Google inc (https://www.google .de/about/) (1600 Amphitheater Parkway, Mountain View, CA 94043, USA; hereinafter “Google”). Google Analytics uses so-called “cookies” and pseudonymized usage profiles are created in this context. “Cookies” are text files that are stored on your computer and enable your use of the website to be analyzed. For example, the following is recorded:
    • Information about the operating system
    • about the browser
    • Your IP address (host name of the accessing computer)
    • that you provided previously Website accessed (referrer URL)
    • Date and time of the server request.
    The information generated by this text file about the use of our website is transmitted to a Google server in the USA and stored there. Google will use this information to evaluate your use of our website, to compile reports on website activity for website operators and to provide other services related to website and internet usage for the purposes of market research and the needs-based design of these websites. If this is required by law or if third parties process this data on behalf of Google, Google will also pass on this information to these third parties. This use is anonymized or pseudonymized (IP masking).
    You can prevent the installation of cookies by setting your Internet user program (browser) accordingly. However, we would like to point out that not all functions may be usable as a result. To do this, you must switch off the storage of cookies in your internet browser. For further information, please refer to the usage instructions for your Internet browser. In addition, you can prevent the collection of the data generated by the cookie and related to your use of the website (including your IP address) and the processing of this data by Google by downloading and installing a browser add-on (https: tools.google.com/dlpage/gaoptout?hl=de).
    The data processed by cookies is necessary for the purposes mentioned to protect our legitimate interests and those of third parties in accordance with Article 6 Paragraph 1 Sentence 1 Letter f of the GDPR.
    You can find further data protection information from Google at: https://www.google.de/intl/de/policies/privacy/

    Google uses the DoubleClick DART cookie < br> Users may opt out of the use of the DART cookie by visiting the Google ad network and content network privacy policy.
    No direct personal data of the user is stored, only the IP address. This information is used to automatically recognize you the next time you visit our websites and to make navigation easier for you. For example, cookies allow us to tailor a website to your interests or to save your password so you don\'t have to re-enter it each time.
    Of course, you can also view our websites without cookies. If you do not want us to recognize your computer, you can prevent cookies from being stored on your hard drive by selecting “do not accept cookies” in your browser settings. Please refer to the instructions from your browser manufacturer to find out how this works in detail. However, we would like to point out that not accepting cookies can lead to functional restrictions on our offerings.
    You can prevent the installation of cookies by setting your Internet user program (browser) accordingly. To do this, you must switch off the storage of cookies in your internet browser. For further information, please refer to the usage instructions for your Internet browser.
    You can find further data protection information from Google at: https://www.google.de/intl/de/policies/privacy/

    ', + 'data_protect_copy13' => 'Google Adwords Conversion Tracking
    We use Google Conversion Tracking to statistically record the use of our website and to evaluate it for the purpose of optimizing it for you. Google sets a cookie on your computer if you came to our website via a Google ad.
    After 30 days, these cookies lose their validity. They are not used for personal identification. If the user visits certain pages on the Adwords customer\'s website and the cookie is still valid, Google and the customer can recognize that the user clicked on the ad and was redirected to this page.
    It will be different for each customer Cookies are set and therefore cannot be tracked via the websites of Adwords customers. The information collected is used to create conversion statistics for Adwords customers who have opted for conversion tracking. The following information is revealed:
    • Total number of users who clicked on your ad and were redirected to a page with a conversion tracking tag.
    However No information is released that can be used to personally identify users.
    If you do not want to take part in the tracking process, you can also refuse the necessary setting of a cookie - for example by using your browser setting that generally prevents the automatic setting of cookies disabled. You can also deactivate cookies for conversion tracking by setting your browser so that cookies from the domain “www.googleadservices.com” are blocked.
    Google\'s privacy policy on conversion tracking can be found here (https://services .google.com/sitestats/de.html )', + 'data_protect_copy2' => 'I. Definitions
    To make our data protection declaration easier to understand, we would first like to explain to you some of the terms used. For the purposes of this privacy policy, the term:

    1) “personal data” means any information relating to an identified or identifiable natural person (hereinafter “data subject”); An identifiable natural person is a natural person who can be identified directly or indirectly, in particular by reference to an identifier such as a name, an identification number, location data, an online identifier or to one or more special features that express the physical , physiological, genetic, psychological, economic, cultural or social identity of that natural person;

    2) "Processing" means any operation or series of operations carried out with or without the aid of automated procedures in connection with personal data, such as the collection, recording, organization, structuring, storage, adaptation or modification, reading, retrieving, using, disclosing by transmission, dissemination or any other form of provision, matching or combination, restriction, deletion or destruction;

    3) "Restriction of processing" means the marking of stored personal data with the aim of restricting their future processing;

    4) "Profiling" means any type of automated processing of personal data, which consists in using these personal data to evaluate certain personal aspects relating to a natural person, in particular aspects relating to analyze or predict that natural person\'s work performance, economic situation, health, personal preferences, interests, reliability, behavior, location or movements;

    5) "Pseudonymization" means the processing of personal data in such a way that the personal data can no longer be attributed to a specific data subject without the use of additional information, provided that this additional information is kept separately and is subject to technical and organizational measures that ensure that the personal data is not assigned to an identified or identifiable natural person;

    6) “Controller” means the natural or legal person, public authority, institution or other body which, alone or jointly with others, decides on the purposes and means of processing personal data; If the purposes and means of this processing are determined by Union or Member State law, the controller or the specific criteria for its nomination may be provided for by Union or Member State law

    7) “Processor” means a natural or legal person, public authority, agency or other body that processes personal data on behalf of the controller;

    8) “Recipient” means a natural or legal person, public authority, agency or other body to which personal data is disclosed, regardless of whether it is a third party or not. However, public authorities which may receive personal data in the context of a specific investigative task under Union or Member State law shall not be deemed to be recipients; the processing of these data by the said authorities will be carried out in accordance with the applicable data protection rules in accordance with the purposes of the processing;

    9) “Third party” means a natural or legal person, public authority, agency or other body, other than the data subject, the controller, the processor and the persons authorized under the direct responsibility of the controller or the processor to process personal data;

    10) “Consent” of the data subject means any voluntary, informed and unambiguous expression of will in the specific case in the form of a statement or other clear confirmatory act by which the data subject indicates that he or she agrees to the processing of personal data concerning them;

    11) “personal data breach” means a breach of security that, whether accidental or unlawful, results in the destruction, loss, alteration, or unauthorized disclosure of or access to personal data, that have been transmitted, stored or otherwise processed.

    ', + 'data_protect_copy3' => 'II. Responsible person
    The person responsible within the meaning of the General Data Protection Regulation as well as the data protection laws applicable in the member states of the European Union and other data protection regulations is:

    mivita care gmbh
    Mr Alois Ried
    Leinfeld 2
    87755 Kirchhaslach
    Telephone: +49 (0) 8333 94 61 767
    Mail: info@mivita.care


    ', + 'data_protect_copy4' => 'III. Cookies', + 'data_protect_copy5' => '
    Our website uses cookies. Cookies are small text files that are stored and stored on a computer system via an Internet browser.
    Many websites and servers use cookies. Many cookies contain a so-called cookie ID. A cookie ID is a unique identifier of the cookie. It consists of a string through which websites and servers can be assigned to the specific Internet browser in which the cookie was stored. This allows the websites and servers visited to distinguish the individual browser of the data subject from other Internet browsers that contain other cookies. A specific Internet browser can be recognized and identified via the unique cookie ID.
    By using cookies, we can provide you with more user-friendly services that would not be possible without the cookie setting.
    Using a cookie, the information and offers on our website can be optimized for the user. As already mentioned, cookies enable us to recognize the users of our website. The purpose of this recognition is to make it easier for you to use our websites. For example, the user of a website that uses cookies does not have to re-enter their access data each time they visit the website because this is done by the website and the cookie stored on the user\'s computer system.
    The data processed by cookies is necessary for the purposes mentioned to protect our legitimate interests in accordance with Article 6 Paragraph 1 Sentence 1 Letter f of the GDPR.
    You can prevent the setting of cookies through our website at any time by adjusting the appropriate settings on the Internet browser used and thus permanently object to the setting of cookies. Furthermore, cookies that have already been set can be deleted at any time via an internet browser or other software programs. This is possible in all common internet browsers. If you deactivate the setting of cookies in the Internet browser you use, not all functions of our website may be fully usable.

    IV. Data and information that is stored when you visit our website
    Every time you visit our website, general data and information is recorded that is stored in the server\'s log files.

    The following data/information may be collected:
    - the browser types and versions used - the operating system used, - the website from which you access our website - the sub-sites, which are accessed on our website - the date and time of access to our website, - your IP address - your Internet service provider - other similar data and information that serves to avert danger in the event of attacks on our IT systems .

    We need this information in order to be able to accurately provide the content of our website. to ensure the long-term functionality of our IT system and to be able to provide the authorities with the information necessary for criminal prosecution in the event of a cyber attack. This is also our legitimate interest within the legal basis for processing this data in accordance with Article 6 Paragraph 1 Letter f of the GDPR. When using this general data and information, we do not draw any conclusions about the data subject. We store the anonymous data from the server log files separately from all personal data. V. Contacting us electronically

    Due to the regulations of the Telemedia Act (TMG), we are obliged to provide a general email address in the imprint of our website, which you can use to contact us by email. You also have the option of contacting us using the contact forms on our website. You can use the contact forms to make inquiries about the products or our business or apply to us as a consultant. The personal data you send to us via email or our contact forms will be automatically stored for the purposes of processing or contacting you.

    By sending your message, you consent to the processing of the transmitted data. Processing is carried out on the basis of Article 6 Paragraph 1 Letter a GDPR with your consent. You can revoke your consent at any time by notifying us, without this affecting the lawfulness of the processing carried out based on your consent before its revocation. We only use your email address to process your request. Your data will then be deleted unless you have consented to further processing and use.

    ', + 'data_protect_copy6' => 'VI. Legal basis for processing
    If we obtain your consent for a specific processing purpose, Art. 6 I lit. a GDPR serves as the legal basis for the processing operation.

    If the processing of personal data is necessary to fulfill a contract, the processing is based on Art. 6 I lit. b GDPR. This also applies to processing operations that are necessary to carry out pre-contractual measures, such as inquiries about our products or other services.

    If we are subject to a legal obligation that requires the processing of personal data, such as to fulfill tax obligations, the legal basis for the processing is Art. 6 I lit. c GDPR.

    If the processing of personal data is necessary to protect the vital interests of the data subject or another natural person, the processing would be based on Art. 6 I lit. d GDPR.

    Ultimately, Art. 6 I lit. f GDPR can be the legal basis for a processing operation. This is the case if the processing operation is not covered by any of the aforementioned legal bases and the processing is necessary to protect a legitimate interest of our company or a third party, provided that the interests, fundamental rights and freedoms of the data subject do not prevail. If the processing of personal data is based on Article 6 I lit. f GDPR, our legitimate interest is to carry out our business activities for the benefit of the well-being of our employees/shareholders.

    ', + 'data_protect_copy7' => 'VII. Legal or contractual regulations for the provision of personal data
    The provision of personal data is partly required by law (e.g. tax regulations) and can also result from contractual regulations (e.g. information about the contractual partner). If you want to conclude a contract with us, it is necessary that you provide us with personal data, which will subsequently be processed by us. Failure to provide personal data would mean that we would not be able to conclude a contract with you.

    ', + 'data_protect_copy8' => 'VIII. Routine deletion/blocking of personal data
    We only process and store personal data for the period necessary to achieve the storage purpose or if this is required by the European legislator or another legislator in laws or regulations was provided. If the storage purpose no longer applies or if a storage period prescribed by the European legislator or another responsible legislator expires, the personal data will be blocked or deleted routinely and in accordance with legal regulations.

    After the respective statutory retention period has expired, the relevant data will be routinely deleted unless it is no longer required to fulfill the contract or initiate a contract. According to the legal requirements in Germany, storage takes place in particular for 10 years in accordance with Sections 147 Paragraph 1 AO, 257 Paragraph 1 Nos. 1 and 4, Paragraph 4 HGB (books, records, management reports, accounting documents, trading books, more relevant for taxation). documents, etc.) and 6 years in accordance with Section 257 Paragraph 1 Nos. 2 and 3, Paragraph 4 HGB (commercial letters).

    ', + 'data_protect_copy9' => 'IX. Your rights
    1) Right to confirmation and information
    You have the right to request confirmation from us as to whether the relevant personal data is being processed. If you would like to exercise legal rights, you can contact us at any time.

    You also have the right to receive free information from us about the personal data stored about you and a copy of this information. You are also entitled to information about the following information:
    - the processing purposes - the categories of personal data that are processed - the recipients or categories of recipients to whom the personal data have been disclosed or are still being disclosed, in particular recipients in Third countries or international organizations - if possible, the planned period for which the personal data will be stored or, if this is not possible, the criteria for determining that period - the existence of a right to rectification or deletion of the personal data concerning them or to restriction of processing by the controller or a right to object to this processing - the existence of a right to lodge a complaint with a supervisory authority - if the personal data are not collected from the data subject: all available information about the origin of the data - the existence of automated decision-making including profiling in accordance with Article 22 Para. 1 and 4 GDPR and - at least in these cases - meaningful information about the logic involved as well as the scope and intended effects of such processing for the data subject

    You also have the right to information about: whether personal data has been transferred to a third country or to an international organization. If this is the case, you also have the right to receive information about the appropriate guarantees in connection with the transmission.

    If you would like to exercise this right to information, you can contact us at any time.

    2) Right to rectification
    You have the right to request the immediate correction of incorrect personal data concerning you. You also have the right, taking into account the purposes of the processing, to request the completion of incomplete personal data - including by means of a supplementary declaration.

    If you would like to exercise this right to correction, you can contact us at any time.

    3) Right to deletion (“Right to be forgotten”)
    You have the right to request that the personal data concerning you be deleted immediately, if one of the following reasons applies and to the extent that the processing is not necessary: ​​
    - The personal data were collected or otherwise processed for purposes for which they are no longer necessary; - You revoke your consent on which the processing was based in accordance with Article 6 Paragraph 1 Letter a GDPR or Article 9 Paragraph 2 Letter a GDPR and there is no other legal basis for the processing; - You object to the processing in accordance with Art. 21 Para. 1 GDPR and there are no overriding legitimate reasons for the processing, or you object to the processing in accordance with Art. 21 Para. 2 GDPR; - The personal data was processed unlawfully; - The deletion of personal data is necessary to comply with a legal obligation under Union or Member State law to which we are subject. - The personal data was collected in relation to information society services offered in accordance with Art. 8 Para. 1 GDPR.

    ', + 'data_protect_stand_shop' => 'As of: February 18, 2022', + 'data_protect_stand_site' => 'As of: October 5, 2018', + 'data_protect' => 'Privacy Policy', +]; diff --git a/resources/lang/en/email.php b/resources/lang/en/email.php index d2f958e..487bba4 100644 --- a/resources/lang/en/email.php +++ b/resources/lang/en/email.php @@ -1,122 +1,125 @@ 'account activated', - 'account_active_copy1line' => 'Your account has been activated after successful verification. You can find your consultant contract on the homepage in the login area of ​​my.mivita.care. Log in with your user details to take further steps.', - 'account_incomplete_copy1line' => 'Your account has not been activated, your data is not complete. Please follow the link below to complete your details.', - 'activate_copy' => 'Please confirm your email and activate your account using this link:', - 'active_copy1line' => 'You are receiving this email because we have received a request to change your email address for your account.', - 'button_account' => 'to the account', - 'button_custom_payout' => 'for payment', - 'change_e_mail' => 'change E-Mail address', - 'checkout_copy1line' => 'Thank you for your order from mivita.care. Below we have listed your order again for you to check.', - 'checkout_copy3line' => 'If you have any questions, we are always there for you.', - 'checkout_copy3line_extern' => 'Order via consultant:', - 'checkout_custom_payout' => 'Your advisor has put together the following products for you', - 'checkout_mail_bank_bic' => 'BIC:', - 'checkout_mail_bank_code' => 'purpose of use', - 'checkout_mail_bank_holder' => 'Account owner:', - 'checkout_mail_bank_iban' => 'IBAN:', - 'checkout_mail_bank_name' => 'Bank', - 'checkout_mail_bank_total' => 'total amount', - 'checkout_mail_deliver_addess' => 'Your delivery address:', - 'checkout_mail_deliver_customer' => 'Customer delivery address:', - 'checkout_mail_hl1' => 'You have ordered the following items:', - 'checkout_mail_invoice_addess' => 'Your billing address:', - 'checkout_mail_order_for_extern' => 'Customer order via external shop:', - 'checkout_mail_order_for_me' => 'Order a consultant for you:', - 'checkout_mail_order_for_membership' => 'Order a consultant for your membership:', - 'checkout_mail_order_for_ot' => 'Order a consultant for your customer:', - 'checkout_mail_order_for_wizard' => 'Order a consultant for your registration:', - 'checkout_mail_pay_approved' => 'Your payment has been approved, a payment confirmation will be created automatically.', - 'checkout_mail_pay_error' => 'Payment failed!', - 'checkout_mail_pay_info' => 'Payment info:', - 'checkout_mail_pay_invoice_open' => 'Your invoice payment has been approved.', - 'checkout_mail_pay_pre' => 'Payment in advance:', - 'checkout_mail_pay_pre_c1' => 'please transfer', - 'checkout_mail_pay_pre_c2' => 'EUR to the following account details to complete the purchase.', - 'checkout_mail_pay_ref' => 'Payment reference:', - 'checkout_mail_pay_success' => 'Payment is confirmed!', - 'checkout_mail_pay_with' => 'Payment with:', - 'checkout_mail_same_address' => 'Delivery address is the same as billing address', - 'checkout_mail_shipping' => 'packaging and shipping costs', - 'checkout_mail_status_info' => 'Status info:', - 'checkout_mail_subtotal_ws' => 'total without VAT', - 'checkout_mail_system_status' => 'System status:', - 'checkout_mail_tax' => 'plus VAT', - 'checkout_mail_tax_info' => 'Price incl. VAT', - 'checkout_mail_total' => 'total price', - 'checkout_mail_your_mail' => 'Your email:', - 'checkout_subject' => 'aour order at', - 'checkout_subject_extern' => 'new order', - 'checkout_subject_paid' => 'payment confirmation - your order at', - 'copy2line' => 'Or copy this link into the address bar of your browser.', - 'copy3line' => 'We are happy to answer any further questions you may have.', - 'copy_to_browser' => 'Or copy this link into the address bar of your browser.', - 'credit_copy1line' => 'Your credit is here and you really deserve it! We will transfer the payout amount to your account in the next 5 working days. Please check whether your current bank details are stored in your sales center account (My Account -> My Data). We wish you a continued successful time at MIVITA. Do you want to achieve even more? Then talk to your sponsor or other team leaders. They will work with you to develop a very personal path to your success based on our marketing plan. Best regards, your MIVITA team', - 'credit_title' => 'Your credit on mivita.care', - 'dear_mrs' => 'hello', - 'dear_sir' => 'hello', - 'email' => 'E-Mail', - 'email_incomplete' => 'Your data is not complete.', - 'email_subject' => 'Message from mivita.care', - 'email_verify' => 'confirm your e-mail address', - 'email_verify_copy1line' => 'Thank you for your registration. Please follow the link below to confirm your email address.', - 'first_name' => 'first name', - 'footer_copy1' => 'mivita care gmbh | Leinfeld 2 | 87755 Kirchhaslach | Telephone: +49 (0) 94 61 767 | Email: info@mivita.care', - 'footer_copy2' => 'Managing Director: Alois Ried | Registration court: Memmingen | Registration number: HRB 21591 | VAT ID number: DE 453867883', - 'footer_copy3' => '© 2020 All Rights Reserved', - 'greetings' => 'Best regards', - 'hello' => 'Hello', - 'invoice_copy1line' => 'Thank you for your order from mivita.care. Below we will send you the invoice for your order:', - 'invoice_subject' => 'Invoice for your order', - 'invoice_title' => 'Invoice for your order on mivita.care', - 'last_name' => 'last name', - 'mail_confirm' => 'Confirm email address', - 'message' => 'news', - 'phone' => 'phone', - 'request_from' => 'Request from mivita.care', - 'reset_pass_copy1line' => 'You are receiving this email because we have received a request to reset your account password.', - 'reset_passwort' => 'reset Password', - 'sales_partnership' => 'sales partnership', - 'sales_partnership_message' => 'notice', - 'salutation' => 'salutation', - 'sender' => 'your team from mivita.care', - 'status_copy1line' => 'status of your order on mivita.care', - 'subject' => 'regarding', - 'subject_activate' => 'activate account', - 'subject_custom_abo_payout' => 'Your individual subscription order from :name on mivita.care', - 'subject_custom_payout' => 'Your individual order from :name on mivita.care', - 'subject_reset' => 'reset password', - 'update_level_copy1line' => 'Congratulations!

    We are incredibly proud of you! Last month, with your :tp TP, you not only achieved your qualification – you accomplished something amazing!

    Your tireless commitment and dedication have paid off. From now on, you are:

    :to


    This is a true milestone in your MIVITA career!', - 'update_level_title' => 'You\'ve Reached Your Next Career Level!', - 'update_level_copy2line' => 'Your success is our success, and we are thrilled to accompany you on this exciting journey. With this new level, even more opportunities are opening up for you:

    - Higher commissions and better margins
    - Expanded possibilities for your business
    - More recognition and status in the team', - 'update_level_copy3line' => 'This is just the beginning!

    Your success is proof that continuous work and passion lead to your goals. Stay focused, motivate your team, and achieve even greater things together with us.

    Your next level is already waiting for you – and we know you will achieve it!', - 'verify_copy1line' => 'We have stored data about you in our system. Please follow the link below to confirm your email address. You can also change or delete your data.', - 'verify_e_mail' => 'confirm your details and email address', - 'your_custom_abo_payout' => 'Your personal mivita consultant - :name has put together a customized subscription order for you. Now all you have to do is pay for your subscription order. Click on the link to proceed to the mivita.care checkout.', - 'your_custom_payout' => 'Your personal mivita consultant - :name has put together an individual order for you. Now all you have to do is pay for your order. Click on the link and go to the mivita.care checkout.', - 'your_request_from' => 'your request from', - 'user_restore_subject' => 'Your account has been restored', - 'user_restore_title' => 'Account restoration successful', - 'user_restore_greeting' => 'Hello :name,', - 'user_restore_copy1line' => 'we are pleased to inform you that your account at mivita.care has been successfully restored.', - 'user_restore_copy2line' => 'As your password was reset for security reasons when deleted, you must set a new password. Please click the button below to reset your password:', - 'user_restore_copy3line' => '• Your password has been reset - please assign a new password via the link above.
    • If you had a shop: The shop name (subdomain) was released when deleted and must be reassigned.', - 'user_restore_button' => 'Set new password', - 'user_restore_account_valid' => 'Your consultant membership is valid until:', - 'user_restore_important' => 'Important notes:', +return [ + 'account_active' => 'account activated', + 'account_active_copy1line' => 'Your account has been activated after successful verification. You can find your consultant contract on the homepage in the login area of ​​my.mivita.care. Log in with your user details to take further steps.', + 'account_incomplete_copy1line' => 'Your account has not been activated, your data is not complete. Please follow the link below to complete your details.', + 'activate_copy' => 'Please confirm your email and activate your account using this link:', + 'active_copy1line' => 'You are receiving this email because we have received a request to change your email address for your account.', + 'button_account' => 'to the account', + 'button_custom_payout' => 'for payment', + 'change_e_mail' => 'change E-Mail address', + 'checkout_copy1line' => 'Thank you for your order from mivita.care. Below we have listed your order again for you to check.', + 'checkout_copy3line' => 'If you have any questions, we are always there for you.', + 'checkout_copy3line_extern' => 'Order via consultant:', + 'checkout_custom_payout' => 'Your advisor has put together the following products for you', + 'checkout_mail_bank_bic' => 'BIC:', + 'checkout_mail_bank_code' => 'purpose of use', + 'checkout_mail_bank_holder' => 'Account owner:', + 'checkout_mail_bank_iban' => 'IBAN:', + 'checkout_mail_bank_name' => 'Bank', + 'checkout_mail_bank_total' => 'total amount', + 'checkout_mail_deliver_addess' => 'Your delivery address:', + 'checkout_mail_deliver_customer' => 'Customer delivery address:', + 'checkout_mail_hl1' => 'You have ordered the following items:', + 'checkout_mail_invoice_addess' => 'Your billing address:', + 'checkout_mail_order_for_extern' => 'Customer order via external shop:', + 'checkout_mail_order_for_me' => 'Order a consultant for you:', + 'checkout_mail_order_for_membership' => 'Order a consultant for your membership:', + 'checkout_mail_order_for_ot' => 'Order a consultant for your customer:', + 'checkout_mail_order_for_wizard' => 'Order a consultant for your registration:', + 'checkout_mail_pay_approved' => 'Your payment has been approved, a payment confirmation will be created automatically.', + 'checkout_mail_pay_error' => 'Payment failed!', + 'checkout_mail_pay_info' => 'Payment info:', + 'checkout_mail_pay_invoice_open' => 'Your invoice payment has been approved.', + 'checkout_mail_pay_pre' => 'Payment in advance:', + 'checkout_mail_pay_pre_c1' => 'please transfer', + 'checkout_mail_pay_pre_c2' => 'EUR to the following account details to complete the purchase.', + 'checkout_mail_pay_ref' => 'Payment reference:', + 'checkout_mail_pay_success' => 'Payment is confirmed!', + 'checkout_mail_pay_with' => 'Payment with:', + 'checkout_mail_same_address' => 'Delivery address is the same as billing address', + 'checkout_mail_shipping' => 'packaging and shipping costs', + 'checkout_mail_status_info' => 'Status info:', + 'checkout_mail_subtotal_ws' => 'total without VAT', + 'checkout_mail_system_status' => 'System status:', + 'checkout_mail_tax' => 'plus VAT', + 'checkout_mail_tax_info' => 'Price incl. VAT', + 'checkout_mail_total' => 'total price', + 'checkout_mail_your_mail' => 'Your email:', + 'checkout_subject' => 'aour order at', + 'checkout_subject_extern' => 'new order', + 'checkout_subject_paid' => 'payment confirmation - your order at', + 'copy2line' => 'Or copy this link into the address bar of your browser.', + 'copy3line' => 'We are happy to answer any further questions you may have.', + 'copy_to_browser' => 'Or copy this link into the address bar of your browser.', + 'credit_copy1line' => 'Your credit is here and you really deserve it! We will transfer the payout amount to your account in the next 5 working days. Please check whether your current bank details are stored in your sales center account (My Account -> My Data). We wish you a continued successful time at MIVITA. Do you want to achieve even more? Then talk to your sponsor or other team leaders. They will work with you to develop a very personal path to your success based on our marketing plan. Best regards, your MIVITA team', + 'credit_title' => 'Your credit on mivita.care', + 'dear_mrs' => 'hello', + 'dear_sir' => 'hello', + 'email' => 'E-Mail', + 'email_incomplete' => 'Your data is not complete.', + 'email_subject' => 'Message from mivita.care', + 'email_verify' => 'confirm your e-mail address', + 'email_verify_copy1line' => 'Thank you for your registration. Please follow the link below to confirm your email address.', + 'first_name' => 'first name', + 'footer_copy1' => 'mivita care gmbh | Leinfeld 2 | 87755 Kirchhaslach | Telephone: +49 (0) 94 61 767 | Email: info@mivita.care', + 'footer_copy2' => 'Managing Director: Alois Ried | Registration court: Memmingen | Registration number: HRB 21591 | VAT ID number: DE 453867883', + 'footer_copy3' => '© 2020 All Rights Reserved', + 'greetings' => 'Best regards', + 'hello' => 'Hello', + 'invoice_copy1line' => 'Thank you for your order from mivita.care. Below we will send you the invoice for your order:', + 'invoice_subject' => 'Invoice for your order', + 'invoice_title' => 'Invoice for your order on mivita.care', + 'cancellation_invoice_copy1line' => 'Attached you will find the cancellation invoice for your order:', + 'cancellation_invoice_title' => 'Cancellation invoice for your order on mivita.care', + 'cancellation_invoice_subject' => 'Cancellation invoice for your order', + 'last_name' => 'last name', + 'mail_confirm' => 'Confirm email address', + 'message' => 'news', + 'phone' => 'phone', + 'request_from' => 'Request from mivita.care', + 'reset_pass_copy1line' => 'You are receiving this email because we have received a request to reset your account password.', + 'reset_passwort' => 'reset Password', + 'sales_partnership' => 'sales partnership', + 'sales_partnership_message' => 'notice', + 'salutation' => 'salutation', + 'sender' => 'your team from mivita.care', + 'status_copy1line' => 'status of your order on mivita.care', + 'subject' => 'regarding', + 'subject_activate' => 'activate account', + 'subject_custom_abo_payout' => 'Your individual subscription order from :name on mivita.care', + 'subject_custom_payout' => 'Your individual order from :name on mivita.care', + 'subject_reset' => 'reset password', + 'update_level_copy1line' => 'Congratulations!

    We are incredibly proud of you! Last month, with your :tp TP, you not only achieved your qualification – you accomplished something amazing!

    Your tireless commitment and dedication have paid off. From now on, you are:

    :to


    This is a true milestone in your MIVITA career!', + 'update_level_title' => 'You\'ve Reached Your Next Career Level!', + 'update_level_copy2line' => 'Your success is our success, and we are thrilled to accompany you on this exciting journey. With this new level, even more opportunities are opening up for you:

    - Higher commissions and better margins
    - Expanded possibilities for your business
    - More recognition and status in the team', + 'update_level_copy3line' => 'This is just the beginning!

    Your success is proof that continuous work and passion lead to your goals. Stay focused, motivate your team, and achieve even greater things together with us.

    Your next level is already waiting for you – and we know you will achieve it!', + 'verify_copy1line' => 'We have stored data about you in our system. Please follow the link below to confirm your email address. You can also change or delete your data.', + 'verify_e_mail' => 'confirm your details and email address', + 'your_custom_abo_payout' => 'Your personal mivita consultant - :name has put together a customized subscription order for you. Now all you have to do is pay for your subscription order. Click on the link to proceed to the mivita.care checkout.', + 'your_custom_payout' => 'Your personal mivita consultant - :name has put together an individual order for you. Now all you have to do is pay for your order. Click on the link and go to the mivita.care checkout.', + 'your_request_from' => 'your request from', + 'user_restore_subject' => 'Your account has been restored', + 'user_restore_title' => 'Account restoration successful', + 'user_restore_greeting' => 'Hello :name,', + 'user_restore_copy1line' => 'we are pleased to inform you that your account at mivita.care has been successfully restored.', + 'user_restore_copy2line' => 'As your password was reset for security reasons when deleted, you must set a new password. Please click the button below to reset your password:', + 'user_restore_copy3line' => '• Your password has been reset - please assign a new password via the link above.
    • If you had a shop: The shop name (subdomain) was released when deleted and must be reassigned.', + 'user_restore_button' => 'Set new password', + 'user_restore_account_valid' => 'Your consultant membership is valid until:', + 'user_restore_important' => 'Important notes:', - // DHL Tracking E-Mail - 'dhl_tracking_subject' => 'Your shipment is on its way - mivita.care', - 'dhl_tracking_subject_multiple' => 'Your :count shipments are on their way - mivita.care', - 'dhl_tracking_title' => 'Your shipment is on its way!', - 'dhl_tracking_preview' => 'Tracking number: :number - Track your package with DHL', - 'dhl_tracking_message' => 'great news! Your order has been shipped and is on its way to you.', - 'dhl_tracking_message_multiple' => 'great news! Your order has been shipped in :count packages and is on its way to you.', - 'dhl_tracking_package_label' => 'Package :number', - 'dhl_tracking_number_label' => 'Your tracking number', - 'dhl_tracking_order_ref' => 'Order number: :order', - 'dhl_tracking_button' => 'Track shipment with DHL', - 'dhl_tracking_info' => 'You can check the current status of your shipment at any time via the button above at DHL.', -); + // DHL Tracking E-Mail + 'dhl_tracking_subject' => 'Your shipment is on its way - mivita.care', + 'dhl_tracking_subject_multiple' => 'Your :count shipments are on their way - mivita.care', + 'dhl_tracking_title' => 'Your shipment is on its way!', + 'dhl_tracking_preview' => 'Tracking number: :number - Track your package with DHL', + 'dhl_tracking_message' => 'great news! Your order has been shipped and is on its way to you.', + 'dhl_tracking_message_multiple' => 'great news! Your order has been shipped in :count packages and is on its way to you.', + 'dhl_tracking_package_label' => 'Package :number', + 'dhl_tracking_number_label' => 'Your tracking number', + 'dhl_tracking_order_ref' => 'Order number: :order', + 'dhl_tracking_button' => 'Track shipment with DHL', + 'dhl_tracking_info' => 'You can check the current status of your shipment at any time via the button above at DHL.', +]; diff --git a/resources/lang/en/home.php b/resources/lang/en/home.php index 7d7809b..ffebb72 100644 --- a/resources/lang/en/home.php +++ b/resources/lang/en/home.php @@ -29,6 +29,13 @@ return array( 'manage_membership_now_here' => 'manage your membership here now', 'membership' => 'membership', 'news_updates' => 'News & Updates', + 'news_archive' => 'News Archive', + 'news_archive_title' => 'All News & Updates', + 'news_archive_current' => 'Current News', + 'news_archive_older' => 'Older Posts', + 'news_archive_empty' => 'No older posts available.', + 'news_archive_link' => 'View all news', + 'news_back_to_dashboard' => 'Back to Dashboard', 'open_since' => 'opened since', 'open_your_shop' => 'open your own mivita shop', 'read_less' => 'Show less', diff --git a/resources/lang/en/navigation.php b/resources/lang/en/navigation.php index e03b920..2a18d54 100644 --- a/resources/lang/en/navigation.php +++ b/resources/lang/en/navigation.php @@ -1,75 +1,82 @@ 'Subscription', - 'abos' => 'Subscriptions', - 'add' => 'add', - 'attribute' => 'attributes', - 'business' => 'business', - 'career_level' => 'career level', - 'categories' => 'categories', - 'clients' => 'customers', - 'commissions' => 'commissions', - 'contents' => 'content', - 'countries' => 'countries', - 'credit' => 'credits', - 'customerabo' => 'Customer subscription', - 'customerabos' => 'Customer subscriptions', - 'do_order' => 'place an order', - 'documents' => 'documents', - 'downloadcenter' => 'Downloadcenter', - 'edit' => 'edit', - 'export' => 'export', - 'files' => 'Files', - 'general' => 'generally', - 'home' => 'home', - 'ingredients' => 'ingredients', - 'invoice' => 'bills', - 'language' => 'language', - 'languages' => 'languages', - 'logout' => 'log out', - 'manage' => 'administer', - 'member' => 'advisor', - 'member_register' => 'register advisor', - 'membership' => 'membership', - 'modules' => 'modules', - 'my_account' => 'my account', - 'my_clients' => 'my customers', - 'my_data' => 'my data', - 'my_homeparty' => 'my time out party', - 'my_membership' => 'my membership', - 'my_orders' => 'my Orders', - 'my_shop' => 'my shop', - 'my_team' => 'my Team', - 'myabo' => 'My subscription', - 'myabos' => 'My subscriptions', - 'new_member' => 'new advisor', - 'order' => 'order', - 'orders' => 'orders', - 'overview' => 'overview', - 'payment_links' => 'Payment links', - 'payment_methods' => 'payment Methods', - 'payments' => 'finance', - 'points' => 'points', - 'products' => 'products', - 'sales_volumes' => 'sales volumes', - 'settings' => 'settings', - 'shipping_costs' => 'shipping', - 'start_site' => 'home page', - 'structure' => 'structure', - 'system_settings' => 'system E.', - 'tags' => 'Tags', - 'tax_advisor' => 'Tax consultant', - 'translate' => 'translations', - 'translation' => 'translation', - 'trigger' => 'trigger', - 'user_roles' => 'user rights', - 'dhl_cockpit' => 'DHL Cockpit', - 'revenue' => 'Revenue', - 'level_reports' => 'Level Reports', - 'marketingplan' => 'Marketing Plan', - 'dashboard' => 'Dashboard', - 'dashboard_news' => 'Dashboard News', - 'shop' => 'Shop', - 'to_shop' => 'To Shop', -); +return [ + 'abo' => 'Subscription', + 'abos' => 'Subscriptions', + 'add' => 'add', + 'attribute' => 'attributes', + 'business' => 'business', + 'career_level' => 'career level', + 'categories' => 'categories', + 'clients' => 'customers', + 'commissions' => 'commissions', + 'contents' => 'content', + 'countries' => 'countries', + 'credit' => 'credits', + 'customerabo' => 'Customer subscription', + 'customerabos' => 'Customer subscriptions', + 'do_order' => 'place an order', + 'documents' => 'documents', + 'downloadcenter' => 'Downloadcenter', + 'edit' => 'edit', + 'export' => 'export', + 'files' => 'Files', + 'general' => 'generally', + 'home' => 'home', + 'ingredients' => 'ingredients', + 'invoice' => 'bills', + 'language' => 'language', + 'languages' => 'languages', + 'logout' => 'log out', + 'manage' => 'administer', + 'member' => 'advisor', + 'member_register' => 'register advisor', + 'membership' => 'membership', + 'modules' => 'modules', + 'my_account' => 'my account', + 'my_clients' => 'my customers', + 'my_data' => 'my data', + 'my_homeparty' => 'my time out party', + 'my_membership' => 'my membership', + 'my_orders' => 'my Orders', + 'my_shop' => 'my shop', + 'my_team' => 'my Team', + 'myabo' => 'My subscription', + 'myabos' => 'My subscriptions', + 'new_member' => 'new advisor', + 'order' => 'order', + 'orders' => 'orders', + 'overview' => 'overview', + 'payment_links' => 'Payment links', + 'payment_methods' => 'payment Methods', + 'payments' => 'finance', + 'points' => 'points', + 'products' => 'products', + 'sales_volumes' => 'sales volumes', + 'settings' => 'settings', + 'shipping_costs' => 'shipping', + 'start_site' => 'home page', + 'structure' => 'structure', + 'system_settings' => 'system E.', + 'tags' => 'Tags', + 'tax_advisor' => 'Tax consultant', + 'translate' => 'translations', + 'translation' => 'translation', + 'trigger' => 'trigger', + 'user_roles' => 'user rights', + 'user_cleanup' => 'User Cleanup', + 'user_restore' => 'User Restore', + 'dhl_cockpit' => 'DHL Cockpit', + 'revenue' => 'Revenue', + 'level_reports' => 'Level Reports', + 'marketingplan' => 'Marketing Plan', + 'dashboard' => 'Dashboard', + 'dashboard_news' => 'Dashboard News', + 'shop' => 'Shop', + 'to_shop' => 'To Shop', + 'teamabos' => 'Team Abos', + 'customer_orders' => 'Customer Orders', + 'external_orders' => 'External Orders', + 'tools' => 'Tools', + 'news_archive' => 'News Archive', +]; diff --git a/resources/lang/en/order.php b/resources/lang/en/order.php index dcd8e68..733f9dc 100644 --- a/resources/lang/en/order.php +++ b/resources/lang/en/order.php @@ -1,118 +1,121 @@ 'VAT', - 'add_customer' => 'add customers', - 'advertising_material' => 'advertising materials', - 'adviser_collective_invoice' => 'collective billing consultant', - 'adviser_order_for_membership' => 'membership advisor appointment', - 'adviser_order_for_registration' => 'consultant appointment for registration', - 'art_no' => 'item no.', - 'article' => 'article', - 'article_remove' => 'remove article', - 'assigned_advisor' => 'assign consultants', - 'assigned_counsellor' => 'assigned advisor', - 'billing_address_of_client' => 'customer billing address', - 'billing_address_of_the_advisor' => 'consultant’s billing address', - 'client_order_via_shop' => 'customer order via shop', - 'collective_invoice' => 'collective invoice', - 'collective_invoice_contains_orders' => 'collective invoice includes the following customer orders', - 'compensation_product' => 'compensation product', - 'confirm_and_proceed_to_checkout' => 'confirm and proceed to checkout', - 'confirm_and_proceed_to_order' => 'confirm and continue to order', - 'confirm_and_send_order' => 'Complete order and send payment link', - 'confirm_send_order_info' => 'When the order is completed, a payment link is created and sent to your customer by e-mail.
    Your customer can then complete the payment and the goods will be shipped, your commission will be credited when the payment is completed.', - 'consultant_order_for_home_party' => 'appointment of a consultant for a home party', - 'content' => 'contents', - 'contents' => 'content', - 'cpay' => 'customer pays', - 'cpay_text' => 'My customer receives a payment link and I receive my commission', - 'create_invoice' => 'make a bill', - 'date' => 'date', - 'delivery' => 'Delivery', - 'delivery_address_of_the_client' => 'customer\'s delivery address', - 'delivery_address_of_the_consultant' => 'delivery address of the consultant', - 'delivery_country_can_no_longer_be_changed' => 'The delivery country can no longer be changed', - 'delivery_country_changed_customer_info' => 'The delivery country can only be changed by the customer under My Customers.', - 'delivery_country_changed_info' => 'The delivery country can only be changed under My details.', - 'delivery_note' => 'delivery note', - 'delivery_to_me' => 'delivery to me', - 'delivery_to_the_customer' => 'delivery to the customer', - 'deliverydata' => 'delivery dates', - 'different_delivery_address' => 'different delivery address', - 'email_can_not_be_changed' => 'Your email address can no longer be changed', - 'error_no_address_data_found' => 'Error: No address data found!', - 'excl' => 'plus', - 'external_orders' => 'external orders', - 'external_orders_info_pay' => 'pay = create collective invoice and go to checkout', - 'external_orders_info_remove' => 'remove = orders will be moved to removed, for cancellations etc.', - 'external_orders_info_reset' => 'reset = orders are only moved to open, collective invoices are not changed', - 'goods_are_for_customer_and_shipped' => 'Goods are for a customer and are shipped to the customer', - 'goods_are_for_me_and_shipped' => 'Goods are for me and will be shipped to my address', - 'gross' => 'gross', - 'gross_price' => 'gross price', - 'incentives' => 'incentives', - 'included_VAT' => 'VAT included', - 'invoice' => 'invoice', - 'invoice_address' => 'billing address', - 'ipay' => 'i pay', - 'ipay_text' => 'I pay minus my margin and settle the sales price with my customer', - 'land_can_no_longer_be_changed' => 'The country can no longer be changed', - 'link_to_the_invoice' => 'link to invoice', - 'my_delivery_address' => 'my delivery address', - 'net' => 'net', - 'net_price' => 'net price', - 'no_address_created' => 'no address created', - 'no_career_level_info' => 'Note: You have not yet been assigned a career level. Please contact info@mivita.care', - 'no_delivery_address' => 'no delivery address created', - 'no_order' => 'no order', - 'number_of_items' => 'number of items', - 'order' => 'order', - 'order_abo_was_placed_successfully' => 'The subscription order was created successfully.', - 'order_consultant' => 'appointment consultant', - 'order_date' => 'order date', - 'order_for_client' => 'order for customer', - 'order_for_consultant' => 'order for consultants', - 'order_number' => 'order number', - 'order_via_external_shop' => 'order via external SHOP', - 'order_was_placed_successfully' => 'The order has been placed successfully.', - 'payment_link_for_your_customer' => 'The payment link for your customer', - 'plus_VAT' => 'plus VAT', - 'points' => 'points', - 'points_total' => 'total points', - 'points_turnover_assigned' => 'points/sales assigned', - 'product' => 'product', - 'product_prices_career_level_cpay_info' => 'The product prices are displayed as customer retail prices. After the customer has completed payment, you will receive your commission according to your career level :user_level_name commission :user_level_margin %.
    Note: If you leave the page, the shopping cart will be reset.', - 'product_prices_career_level_info' => 'The product prices are displayed according to your career level :user_level_name minus the :user_level_margin % margin.
    Note: If you leave the page, the shopping cart will be reset.', - 'purchased_from_shop' => 'bought in the shop', - 'quantity' => 'number', - 'ship_to_existing_customer_select_customer' => 'send to existing customers | select customers', - 'ship_to_new_customer' => 'send to new customer', - 'ship_to_this_customer' => 'ship to this customer', - 'ship_to_this_customer_check' => 'I understand that this ordering process is only for customer orders and not for my own orders', - 'ship_to_this_customer_info' => 'If the information below is incorrect or needs to be updated, please change it first', - 'ship_to_this_customer_info_2' => 'The delivery address, except for the delivery country, can also be adjusted in the checkout.', - 'ship_to_this_email_info' => 'The order link will be sent to your customer at the following email address:', - 'shipping' => 'shipment', - 'shipping_compensation_product' => 'shipping compensation product', - 'shipping_costs' => 'shipping', - 'shopping_cart' => 'shopping cart', - 'shopping_cart_delete' => 'clear cart', - 'shopping_cart_update' => 'update shopping cart', - 'subtotal' => 'subtotal', - 'sum' => 'total', - 'sum_net' => 'total net', - 'sums' => 'total', - 'total' => 'In total', - 'total_gross' => 'gross total', - 'total_net' => 'total net', - 'total_price' => 'total Cost', - 'total_shipping_costs' => 'total shipping costs', - 'total_sum' => 'total', - 'total_sums' => 'total', - 'total_without_VAT' => 'total without VAT', - 'turnover' => 'sales volume', - 'unit_price' => 'single price', - 'weight' => 'weight', - 'you_has_article_in_shopping_cart' => 'You have :num items in your shopping cart', -); +return [ + 'VAT' => 'VAT', + 'add_customer' => 'add customers', + 'advertising_material' => 'advertising materials', + 'adviser_collective_invoice' => 'collective billing consultant', + 'adviser_order_for_membership' => 'membership advisor appointment', + 'adviser_order_for_registration' => 'consultant appointment for registration', + 'art_no' => 'item no.', + 'article' => 'article', + 'article_remove' => 'remove article', + 'assigned_advisor' => 'assign consultants', + 'assigned_counsellor' => 'assigned advisor', + 'billing_address_of_client' => 'customer billing address', + 'billing_address_of_the_advisor' => 'consultant’s billing address', + 'client_order_via_shop' => 'customer order via shop', + 'collective_invoice' => 'collective invoice', + 'collective_invoice_contains_orders' => 'collective invoice includes the following customer orders', + 'compensation_product' => 'compensation product', + 'confirm_and_proceed_to_checkout' => 'confirm and proceed to checkout', + 'confirm_and_proceed_to_order' => 'confirm and continue to order', + 'confirm_and_send_order' => 'Complete order and send payment link', + 'confirm_send_order_info' => 'When the order is completed, a payment link is created and sent to your customer by e-mail.
    Your customer can then complete the payment and the goods will be shipped, your commission will be credited when the payment is completed.', + 'consultant_order_for_home_party' => 'appointment of a consultant for a home party', + 'content' => 'contents', + 'contents' => 'content', + 'cpay' => 'customer pays', + 'cpay_text' => 'My customer receives a payment link and I receive my commission', + 'create_invoice' => 'make a bill', + 'date' => 'date', + 'delivery' => 'Delivery', + 'delivery_address_of_the_client' => 'customer\'s delivery address', + 'delivery_address_of_the_consultant' => 'delivery address of the consultant', + 'delivery_country_can_no_longer_be_changed' => 'The delivery country can no longer be changed', + 'delivery_country_changed_customer_info' => 'The delivery country can only be changed by the customer under My Customers.', + 'delivery_country_changed_info' => 'The delivery country can only be changed under My details.', + 'delivery_note' => 'delivery note', + 'delivery_to_me' => 'delivery to me', + 'delivery_to_the_customer' => 'delivery to the customer', + 'deliverydata' => 'delivery dates', + 'different_delivery_address' => 'different delivery address', + 'email_can_not_be_changed' => 'Your email address can no longer be changed', + 'error_no_address_data_found' => 'Error: No address data found!', + 'excl' => 'plus', + 'external_orders' => 'external orders', + 'external_orders_info_pay' => 'pay = create collective invoice and go to checkout', + 'external_orders_info_remove' => 'remove = orders will be moved to removed, for cancellations etc.', + 'external_orders_info_reset' => 'reset = orders are only moved to open, collective invoices are not changed', + 'goods_are_for_customer_and_shipped' => 'Goods are for a customer and are shipped to the customer', + 'goods_are_for_me_and_shipped' => 'Goods are for me and will be shipped to my address', + 'gross' => 'gross', + 'gross_price' => 'gross price', + 'incentives' => 'incentives', + 'included_VAT' => 'VAT included', + 'invoice' => 'invoice', + 'invoice_address' => 'billing address', + 'ipay' => 'i pay', + 'ipay_text' => 'I pay minus my margin and settle the sales price with my customer', + 'land_can_no_longer_be_changed' => 'The country can no longer be changed', + 'link_to_the_invoice' => 'link to invoice', + 'my_delivery_address' => 'my delivery address', + 'net' => 'net', + 'net_price' => 'net price', + 'no_address_created' => 'no address created', + 'no_career_level_info' => 'Note: You have not yet been assigned a career level. Please contact info@mivita.care', + 'no_delivery_address' => 'no delivery address created', + 'no_order' => 'no order', + 'number_of_items' => 'number of items', + 'order' => 'order', + 'order_abo_was_placed_successfully' => 'The subscription order was created successfully.', + 'order_consultant' => 'appointment consultant', + 'order_date' => 'order date', + 'order_for_client' => 'order for customer', + 'order_for_consultant' => 'order for consultants', + 'order_number' => 'order number', + 'order_via_external_shop' => 'order via external SHOP', + 'order_was_placed_successfully' => 'The order has been placed successfully.', + 'payment_link_for_your_customer' => 'The payment link for your customer', + 'plus_VAT' => 'plus VAT', + 'points' => 'points', + 'points_total' => 'total points', + 'points_turnover_assigned' => 'points/sales assigned', + 'product' => 'product', + 'product_prices_career_level_cpay_info' => 'The product prices are displayed as customer retail prices. After the customer has completed payment, you will receive your commission according to your career level :user_level_name commission :user_level_margin %.
    Note: If you leave the page, the shopping cart will be reset.', + 'product_prices_career_level_info' => 'The product prices are displayed according to your career level :user_level_name minus the :user_level_margin % margin.
    Note: If you leave the page, the shopping cart will be reset.', + 'purchased_from_shop' => 'bought in the shop', + 'quantity' => 'number', + 'ship_to_existing_customer_select_customer' => 'send to existing customers | select customers', + 'ship_to_new_customer' => 'send to new customer', + 'ship_to_this_customer' => 'ship to this customer', + 'ship_to_this_customer_check' => 'I understand that this ordering process is only for customer orders and not for my own orders', + 'ship_to_this_customer_info' => 'If the information below is incorrect or needs to be updated, please change it first', + 'ship_to_this_customer_info_2' => 'The delivery address, except for the delivery country, can also be adjusted in the checkout.', + 'ship_to_this_email_info' => 'The order link will be sent to your customer at the following email address:', + 'shipping' => 'shipment', + 'shipping_compensation_product' => 'shipping compensation product', + 'shipping_costs' => 'shipping', + 'shopping_cart' => 'shopping cart', + 'shopping_cart_delete' => 'clear cart', + 'shopping_cart_update' => 'update shopping cart', + 'subtotal' => 'subtotal', + 'sum' => 'total', + 'sum_net' => 'total net', + 'sums' => 'total', + 'total' => 'In total', + 'total_gross' => 'gross total', + 'total_net' => 'total net', + 'total_price' => 'total Cost', + 'total_shipping_costs' => 'total shipping costs', + 'total_sum' => 'total', + 'total_sums' => 'total', + 'total_without_VAT' => 'total without VAT', + 'turnover' => 'sales volume', + 'unit_price' => 'single price', + 'weight' => 'weight', + 'you_has_article_in_shopping_cart' => 'You have :num items in your shopping cart', + 'free_shipping' => 'Free Shipping', + 'free_shipping_reached' => 'Free shipping from :amount €', + 'free_shipping_info' => 'Only :missing € more for free shipping (from :amount €)', +]; diff --git a/resources/lang/en/payment.php b/resources/lang/en/payment.php index 4b4424e..118fa91 100644 --- a/resources/lang/en/payment.php +++ b/resources/lang/en/payment.php @@ -1,165 +1,176 @@ 'BIC', - 'IBAN' => 'IBAN', - 'Mastercard' => 'Mastercard', - 'VAT' => 'VAT', - 'VISA' => 'VISA', - 'accepted_data_checkbox_customer' => 'By clicking on "Buy now" I accept the :gtc, the :c_policy and the :p_policy so that my data can be processed for the order.', - 'accepted_data_checkbox_user' => 'By clicking on "Buy now" I accept the general terms and conditions and the data protection information so that my data can be processed for the order.', - 'account_holder' => 'account owner', - 'advisor_order' => 'Consultant order', - 'agree_SEPA_complete_purchase' => 'Agree to the SEPA direct debit mandate and complete the purchase', - 'alert_link_appointed' => 'Payment has been approved', - 'alert_link_canceled' => 'Payment was canceled', - 'alert_link_check' => 'Payment in progress', - 'alert_link_failed' => 'Payment failed', - 'alert_link_openly' => 'Payment link opened', - 'alert_link_paid' => 'Payment was successful', - 'alert_link_pending' => 'Payment in progress', - 'alert_link_sent' => 'Payment link sent', - 'auto_renewal_hl' => 'automatic extension', - 'auto_renewal_line_1' => 'Better safe than sorry! We recommend activating this option if you want to keep your annual membership permanent. If a manual payment is not received on time after the annual membership has expired, the system will deactivate your online shop or your access to the sales center. You will then no longer be able to place orders or view your statistics until another payment reactivates your account. We therefore advise you to make the payment via SEPA direct debit. We save this mandate and automatically debit your annual fee 14 days before it expires. This way you have a smooth process without having to pay attention.', - 'auto_renewal_line_2' => 'You can of course reverse this option at any time in your account or cancel your account/distribution partnership with MIVITA.', - 'automatic_SEPA_mandate_type_was_selected' => 'Automatic renewal has been selected. Your SEPA mandate will be saved and the annual payment will be made automatically.', - 'back_to_shop' => 'back to shop', - 'back_to_shop_shopping_cart' => 'return to shopping cart', - 'bank' => 'bank', - 'billing_address' => 'billing address', - 'billing_address_can_only_changed_in_salescentre' => 'Your billing address can only be changed in the sales center.', - 'buy_now' => 'buy now', - 'buy_now_copy' => 'Once all your details have been filled out completely, click on “Buy now” and you will be redirected to our payment provider; the connection is SSL encrypted.', - 'c_policy' => 'right of withdrawal', - 'cancelled' => 'cancelled', - 'check' => 'check', - 'checkout_ssl_server' => 'You will be redirected to our checkout server, the connection is SSL encrypted.', - 'collective_invoice' => 'collective invoice', - 'commission' => 'Commission', - 'commission_growth_bonus' => 'Commission growth bonus', - 'commission_payline' => 'Commission Payline', - 'commission_shop' => 'Commission shop', - 'commission_team' => 'Commission Team', - 'completed' => 'completed', - 'country_of_delivery' => 'delivery country', - 'credit' => 'Credit note', - 'credit_added' => 'Credit added', - 'credit_card' => 'credit card', - 'credit_card_number' => 'credit card number', - 'customer_order' => 'customer order', - 'delivery_country_can_only_changed_in_salescentre' => 'The delivery country can only be changed in the sales center.', - 'delivery_country_cannot_change' => 'The delivery country cannot be changed.', - 'excl' => 'plus', - 'extern_open' => 'externally open', - 'extern_paid' => 'externally paid', - 'external' => 'external', - 'failed' => 'abort', - 'firstname_lastname' => 'first name Last Name', - 'gtc' => 'general terms and conditions', - 'homeparty' => 'homeparty', - 'in_process' => 'in process', - 'invoice_no_payment' => 'invoice no payment', - 'invoice_open' => 'invoice open', - 'invoice_paid' => 'invoice paid', - 'link_appointed' => 'Payment approved', - 'link_canceled' => 'Payment canceled', - 'link_check' => 'Payment in progress', - 'link_failed' => 'Payment failed', - 'link_openly' => 'Link opened', - 'link_paid' => 'paid', - 'link_pending' => 'Payment in progress', - 'link_sent' => 'Link sent', - 'link_was_paid' => 'The payment was completed successfully.', - 'membership' => 'membership', - 'month' => 'month', - 'months' => 'month', - 'no_payment' => 'no payment', - 'not_assigned' => 'not assigned', - 'not_to_sales_tax_de' => 'not subject to sales tax / Germany', - 'not_to_sales_tax_foreign' => 'not subject to sales tax / not Germany', - 'open' => 'open', - 'openly' => 'opened', - 'order' => 'order', - 'ordered' => 'ordered', - 'ordering_country' => 'order country', - 'owner' => 'owner', - 'p_policy' => 'data protection', - 'paid' => 'paid', - 'paymend_failed' => 'payment cancelled', - 'paymend_open' => 'payment open', - 'paymend_paid' => 'payment paid', - 'payment_by_SEPA' => 'payment via SEPA', - 'payment_by_SEPA_info' => 'Your payment will be processed and a confirmation for payment processing will be created automatically.', - 'payment_by_credit_card' => 'payment by credit card:', - 'payment_by_credit_card_info' => 'Your payment has been approved, a payment confirmation will be created automatically.', - 'payment_by_invoice' => 'payment by invoice', - 'payment_by_invoice_info' => 'Your order will be processed and a confirmation for order processing will be created automatically', - 'payment_in_advance' => 'payment in advance', - 'payment_method' => 'payment method', - 'payment_method_not_enabled_please_contact' => 'payment method not activated, please contact us', - 'paypal' => 'PayPal', - 'please_check_form_and_complete' => 'Please check the form and complete all information.', - 'please_transfer_amount_following_account' => 'Please transfer :amount EUR to the following account details to complete the purchase.', - 'prepayment' => 'payment in advance', - 'purchase_on_account' => 'üurchase on account', - 'reason_for_payment' => 'purpose of use', - 'registration' => 'registration', - 'remaining_time' => 'remaining term', - 'removed' => 'removed', - 'reverse_charge_procedure' => 'reverse charge procedure', - 'select_and_proceed_to_checkout' => 'select and proceed to checkout', - 'select_and_save' => 'select and save', - 'sepa_direct_debit' => 'SEPA direct debit', - 'shipped' => 'shipped', - 'shop' => 'shop', - 'shoporder' => 'Store order', - 'shoporder_pending' => 'Store order / pending', - 'sofort_bank_transfer' => 'instant bank transfer', - 'status' => - array( - 'checkout_cancel' => 'payment process aborted', - 'checkout_error' => 'payment process error', - 'checkout_payment' => 'check out', - 'payment_approved' => 'payment approved - please wait for email', - 'payment_error' => 'payment error', - 'payment_not_found' => 'payment not found', - 'payment_redirect' => 'payment in progress - please wait for email', - 'store_payment' => 'payment saved', - 'success' => 'successfully executed', - 'success_payment' => 'payment successful', - 'txaction_appointed' => 'payment approved - email has been sent, please wait for confirmation', - 'txaction_failed' => 'payment failed - email has been sent', - 'txaction_paid' => 'payment confirmed - email has been sent', - ), - 'thank_you_very_much' => 'thank you,', - 'to_sales_tax_de' => 'subject to sales tax / Germany', - 'total_amount' => 'total amount', - 'trade_fair' => 'trade fair', - 'valid' => 'Valid', - 'valid until' => 'valid until', - 'verification_no' => 'test number', - 'we_have_received_your_order_get_email' => 'We have received your order. You will shortly receive an order confirmation email from us.', - 'your_mivita_team' => 'Your team from mivita.care', - 'your_order_number_is' => 'Your order number is', +return [ + 'BIC' => 'BIC', + 'IBAN' => 'IBAN', + 'Mastercard' => 'Mastercard', + 'VAT' => 'VAT', + 'VISA' => 'VISA', + 'accepted_data_checkbox_customer' => 'By clicking on "Buy now" I accept the :gtc, the :c_policy and the :p_policy so that my data can be processed for the order.', + 'accepted_data_checkbox_user' => 'By clicking on "Buy now" I accept the general terms and conditions and the data protection information so that my data can be processed for the order.', + 'account_holder' => 'account owner', + 'advisor_order' => 'Consultant order', + 'agree_SEPA_complete_purchase' => 'Agree to the SEPA direct debit mandate and complete the purchase', + 'alert_link_appointed' => 'Payment has been approved', + 'alert_link_canceled' => 'Payment was canceled', + 'alert_link_check' => 'Payment in progress', + 'alert_link_failed' => 'Payment failed', + 'alert_link_openly' => 'Payment link opened', + 'alert_link_paid' => 'Payment was successful', + 'alert_link_pending' => 'Payment in progress', + 'alert_link_sent' => 'Payment link sent', + 'auto_renewal_hl' => 'automatic extension', + 'auto_renewal_line_1' => 'Better safe than sorry! We recommend activating this option if you want to keep your annual membership permanent. If a manual payment is not received on time after the annual membership has expired, the system will deactivate your online shop or your access to the sales center. You will then no longer be able to place orders or view your statistics until another payment reactivates your account. We therefore advise you to make the payment via SEPA direct debit. We save this mandate and automatically debit your annual fee 14 days before it expires. This way you have a smooth process without having to pay attention.', + 'auto_renewal_line_2' => 'You can of course reverse this option at any time in your account or cancel your account/distribution partnership with MIVITA.', + 'automatic_SEPA_mandate_type_was_selected' => 'Automatic renewal has been selected. Your SEPA mandate will be saved and the annual payment will be made automatically.', + 'back_to_shop' => 'back to shop', + 'back_to_shop_shopping_cart' => 'return to shopping cart', + 'bank' => 'bank', + 'billing_address' => 'billing address', + 'billing_address_can_only_changed_in_salescentre' => 'Your billing address can only be changed in the sales center.', + 'buy_now' => 'buy now', + 'buy_now_copy' => 'Once all your details have been filled out completely, click on “Buy now” and you will be redirected to our payment provider; the connection is SSL encrypted.', + 'c_policy' => 'right of withdrawal', + 'cancelled' => 'cancelled', + 'check' => 'check', + 'checkout_ssl_server' => 'You will be redirected to our checkout server, the connection is SSL encrypted.', + 'collective_invoice' => 'collective invoice', + 'commission' => 'Commission', + 'commission_growth_bonus' => 'Commission growth bonus', + 'commission_payline' => 'Commission Payline', + 'commission_shop' => 'Commission shop', + 'commission_team' => 'Commission Team', + 'completed' => 'completed', + 'country_of_delivery' => 'delivery country', + 'credit' => 'Credit note', + 'credit_added' => 'Credit added', + 'credit_card' => 'credit card', + 'credit_card_number' => 'credit card number', + 'customer_order' => 'customer order', + 'delivery_country_can_only_changed_in_salescentre' => 'The delivery country can only be changed in the sales center.', + 'delivery_country_cannot_change' => 'The delivery country cannot be changed.', + 'excl' => 'plus', + 'extern_open' => 'externally open', + 'extern_paid' => 'externally paid', + 'external' => 'external', + 'failed' => 'abort', + 'firstname_lastname' => 'first name Last Name', + 'gtc' => 'general terms and conditions', + 'homeparty' => 'homeparty', + 'in_process' => 'in process', + 'invoice_no_payment' => 'invoice no payment', + 'invoice_open' => 'invoice open', + 'invoice_paid' => 'invoice paid', + 'link_appointed' => 'Payment assigned', + 'link_canceled' => 'Payment canceled', + 'link_check' => 'Payment in review', + 'link_failed' => 'Payment failed', + 'link_openly' => 'Link opened', + 'link_paid' => 'Payment successful', + 'link_pending' => 'Payment in progress', + 'link_sent' => 'Link sent', + 'link_was_paid' => 'The payment was completed successfully.', + 'membership' => 'membership', + 'month' => 'month', + 'months' => 'month', + 'no_payment' => 'no payment', + 'not_assigned' => 'not assigned', + 'not_to_sales_tax_de' => 'not subject to sales tax / Germany', + 'not_to_sales_tax_foreign' => 'not subject to sales tax / not Germany', + 'open' => 'open', + 'openly' => 'opened', + 'order' => 'order', + 'ordered' => 'ordered', + 'ordering_country' => 'order country', + 'owner' => 'owner', + 'p_policy' => 'data protection', + 'paid' => 'paid', + 'paymend_failed' => 'payment cancelled', + 'paymend_open' => 'payment open', + 'paymend_paid' => 'payment paid', + 'payment_by_SEPA' => 'payment via SEPA', + 'payment_by_SEPA_info' => 'Your payment will be processed and a confirmation for payment processing will be created automatically.', + 'payment_by_credit_card' => 'payment by credit card:', + 'payment_by_credit_card_info' => 'Your payment has been approved, a payment confirmation will be created automatically.', + 'payment_by_invoice' => 'payment by invoice', + 'payment_by_invoice_info' => 'Your order will be processed and a confirmation for order processing will be created automatically', + 'payment_in_advance' => 'payment in advance', + 'payment_method' => 'payment method', + 'payment_method_not_enabled_please_contact' => 'payment method not activated, please contact us', + 'paypal' => 'PayPal', + 'please_check_form_and_complete' => 'Please check the form and complete all information.', + 'please_transfer_amount_following_account' => 'Please transfer :amount EUR to the following account details to complete the purchase.', + 'prepayment' => 'payment in advance', + 'purchase_on_account' => 'üurchase on account', + 'reason_for_payment' => 'purpose of use', + 'registration' => 'registration', + 'remaining_time' => 'remaining term', + 'removed' => 'removed', + 'reverse_charge_procedure' => 'reverse charge procedure', + 'select_and_proceed_to_checkout' => 'select and proceed to checkout', + 'select_and_save' => 'select and save', + 'sepa_direct_debit' => 'SEPA direct debit', + 'shipped' => 'shipped', + 'shop' => 'shop', + 'shoporder' => 'Store order', + 'shoporder_pending' => 'Store order / pending', + 'cancelled' => 'Cancelled', + 'sofort_bank_transfer' => 'instant bank transfer', + 'status' => [ + 'checkout_cancel' => 'payment process aborted', + 'checkout_error' => 'payment process error', + 'checkout_payment' => 'check out', + 'payment_approved' => 'payment approved - please wait for email', + 'payment_error' => 'payment error', + 'payment_not_found' => 'payment not found', + 'payment_redirect' => 'payment in progress - please wait for email', + 'store_payment' => 'payment saved', + 'success' => 'successfully executed', + 'success_payment' => 'payment successful', + 'txaction_appointed' => 'payment approved - email has been sent, please wait for confirmation', + 'txaction_failed' => 'payment failed - email has been sent', + 'txaction_paid' => 'payment confirmed - email has been sent', + ], + 'thank_you_very_much' => 'thank you,', + 'to_sales_tax_de' => 'subject to sales tax / Germany', + 'total_amount' => 'total amount', + 'trade_fair' => 'trade fair', + 'valid' => 'Valid', + 'valid until' => 'valid until', + 'verification_no' => 'test number', + 'we_have_received_your_order_get_email' => 'We have received your order. You will shortly receive an order confirmation email from us.', + 'your_mivita_team' => 'Your team from mivita.care', + 'your_order_number_is' => 'Your order number is', - // Prepayment reference notices - 'prepayment_important_notice' => 'Important notice regarding prepayment', - 'prepayment_reference_notice' => 'IMPORTANT: Please use only the following number as payment reference:', - 'prepayment_reference_only' => 'Only then can your payment be automatically assigned.', - 'prepayment_bank_details' => 'Bank details for prepayment', - 'prepayment_waiting_payment' => 'We are waiting for your payment. Once received, your order will be processed.', - 'prepayment_txid' => 'Payment reference', + // Prepayment reference notices + 'prepayment_important_notice' => 'Important notice regarding prepayment', + 'prepayment_reference_notice' => 'IMPORTANT: Please use only the following number as payment reference:', + 'prepayment_reference_only' => 'Only then can your payment be automatically assigned.', + 'prepayment_bank_details' => 'Bank details for prepayment', + 'prepayment_waiting_payment' => 'We are waiting for your payment. Once received, your order will be processed.', + 'prepayment_txid' => 'Payment reference', - // DHL Packstation/Parcel Box - 'packstation_delivery' => 'Delivery to Packstation/Parcel Box', - 'packstation_info' => 'For delivery to a DHL Packstation or Parcel Box, we need your DHL post number.', - 'dhl_postnumber' => 'DHL Post Number', - 'packstation_address_hint' => 'Enter the Packstation number in the address field (e.g. "Packstation 145"). The postal code and city refer to the location of the Packstation.', - 'packstation_alert_title' => 'Important: Packstation Delivery', - 'packstation_alert_intro' => 'If you provide a DHL post number, the delivery address must be filled in as follows:', - 'packstation_alert_street' => 'Packstation [3-digit number]', - 'packstation_alert_street_example' => 'e.g. "Packstation 145" - NOT "12345"!', - 'packstation_alert_location' => 'Location of the Packstation', - 'packstation_alert_not_home' => 'not your home address!', - 'packstation_alert_footer' => 'The Packstation NUMBER is 3-digits (100-999, on yellow sign). The DHL post number is 6-10 digits and goes in the separate field above.', -); + // Checkout error messages + 'payment_not_found' => 'Payment not found', + 'payment_not_found_description' => 'The payment with reference :reference could not be found. Please contact us if you have already paid.', + 'payment_canceled' => 'Payment canceled', + 'payment_canceled_description' => 'The payment process was canceled. Your order was not processed.', + 'payment_error' => 'Payment error', + 'payment_error_description' => 'An error occurred during payment processing. Your order could not be completed.', + 'payment_unknown_status' => 'Unknown payment status', + 'payment_unknown_status_description' => 'The payment status could not be determined. Please contact us for more information.', + 'contact_support_if_needed' => 'If you have any questions, please contact our customer service.', + + // DHL Packstation/Parcel Box + 'packstation_delivery' => 'Delivery to Packstation/Parcel Box', + 'packstation_info' => 'For delivery to a DHL Packstation or Parcel Box, we need your DHL post number.', + 'dhl_postnumber' => 'DHL Post Number', + 'packstation_address_hint' => 'Enter the Packstation number in the address field (e.g. "Packstation 145"). The postal code and city refer to the location of the Packstation.', + 'packstation_alert_title' => 'Important: Packstation Delivery', + 'packstation_alert_intro' => 'If you provide a DHL post number, the delivery address must be filled in as follows:', + 'packstation_alert_street' => 'Packstation [3-digit number]', + 'packstation_alert_street_example' => 'e.g. "Packstation 145" - NOT "12345"!', + 'packstation_alert_location' => 'Location of the Packstation', + 'packstation_alert_not_home' => 'not your home address!', + 'packstation_alert_footer' => 'The Packstation NUMBER is 3-digits (100-999, on yellow sign). The DHL post number is 6-10 digits and goes in the separate field above.', +]; diff --git a/resources/lang/en/pdf.php b/resources/lang/en/pdf.php index 43e5586..c4d3572 100644 --- a/resources/lang/en/pdf.php +++ b/resources/lang/en/pdf.php @@ -1,39 +1,74 @@ 'consultant ID', - 'amount' => 'amount', - 'amount_paid_out_gross' => 'payout amount (gross)', - 'as_a_small_entrepreneur_info' => 'As a small business owner within the meaning of Section 19 Paragraph 1 UStG, no sales tax is charged.', - 'credit_no' => 'credit note no.', - 'credit_note' => 'CREDIT', - 'credit_note_from' => 'credit', - 'date' => 'date', - 'delivery_date_is_invoice_date' => 'Delivery date corresponds to the invoice date.', - 'delivery_note' => 'DELIVERY NOTE', - 'delivery_note_no' => 'delivery note no.', - 'eprice' => 'E-Price', - 'invoice' => 'INVOICE', - 'invoice_does_not_include_vat' => 'The invoice is made without sales tax, as the change of tax liability (reverse charge procedure) applies in this case.', - 'invoice_nr' => 'invoice number', - 'net' => 'net', - 'net_amount' => 'net amounts', - 'off' => 'from', - 'order_no' => 'order no.', - 'payment_type' => 'payment method', - 'points' => 'points', - 'points_order' => 'points order', - 'points_shop' => 'points shop', - 'prices_net' => 'prices net', - 'reverse_charge_procedure_info' => 'Reverse charge procedure, reversal of tax liability.', - 'status_of_invoice' => 'status of the invoice', - 'tax_free_export_delivery' => 'tax-free export delivery', - 'tax_no' => 'tax no.', - 'total_incl_VAT' => 'Total including statutory VAT.', - 'vat_id_of_the_recipient_of_the_service' => 'VAT ID of the benefit recipient', - 'vat_is_declared_and_paid_by_recipient' => 'The sales tax must be declared and paid by the recipient of the service.', - 'vat_no' => 'VAT ID number', - 'vat_text' => 'VAT', - 'we_are_always_there_for_questions' => 'If you have any questions, we are always there for you.', - 'your_advisor' => 'your advisor', -); +return [ + 'adviser_id' => 'consultant ID', + 'amount' => 'amount', + 'amount_paid_out_gross' => 'payout amount (gross)', + 'as_a_small_entrepreneur_info' => 'As a small business owner within the meaning of Section 19 Paragraph 1 UStG, no sales tax is charged.', + 'credit_no' => 'credit note no.', + 'credit_note' => 'CREDIT', + 'credit_note_from' => 'credit', + 'date' => 'date', + 'delivery_date_is_invoice_date' => 'Delivery date corresponds to the invoice date.', + 'delivery_note' => 'DELIVERY NOTE', + 'delivery_note_no' => 'delivery note no.', + 'eprice' => 'E-Price', + 'invoice' => 'INVOICE', + 'invoice_does_not_include_vat' => 'The invoice is made without sales tax, as the change of tax liability (reverse charge procedure) applies in this case.', + 'invoice_nr' => 'invoice number', + 'net' => 'net', + 'net_amount' => 'net amounts', + 'off' => 'from', + 'order_no' => 'order no.', + 'payment_type' => 'payment method', + 'points' => 'points', + 'points_order' => 'points order', + 'points_shop' => 'points shop', + 'prices_net' => 'prices net', + 'reverse_charge_procedure_info' => 'Reverse charge procedure, reversal of tax liability.', + 'status_of_invoice' => 'status of the invoice', + 'tax_free_export_delivery' => 'tax-free export delivery', + 'tax_no' => 'tax no.', + 'total_incl_VAT' => 'Total including statutory VAT.', + 'vat_id_of_the_recipient_of_the_service' => 'VAT ID of the benefit recipient', + 'vat_is_declared_and_paid_by_recipient' => 'The sales tax must be declared and paid by the recipient of the service.', + 'vat_no' => 'VAT ID number', + 'vat_text' => 'VAT', + 'we_are_always_there_for_questions' => 'If you have any questions, we are always there for you.', + 'your_advisor' => 'your advisor', + + // Copy notices for multilingual documents + 'invoice_copy' => 'Invoice copy', + 'delivery_copy' => 'Delivery note copy', + 'credit_copy' => 'Credit note copy', + + // Filenames + 'contract_filename' => 'Consultant_Agreement', + + // Cancellation invoices + 'cancellation_invoice' => 'CANCELLATION INVOICE', + 'cancellation_nr' => 'cancellation no.', + 'cancellation_for' => 'Cancellation for invoice', + 'from' => 'from', + 'attention' => 'ATTENTION', + 'cancellation_invoice_info' => 'This cancellation invoice reverses the original invoice with negative amounts. The points have been corrected accordingly.', + 'cancelled' => 'Cancelled', + 'cancellation_delivery' => 'CANCELLATION DELIVERY NOTE', + 'cancellation_delivery_info' => 'This cancellation delivery note reverses the original delivery note.', + 'cancellation_delivery_note' => 'Note: The goods do not need to be returned unless otherwise agreed.', + + // Table columns + 'pos' => 'Pos.', + 'article' => 'Article', + 'quantity' => 'Quantity', + 'single_price' => 'Unit price', + 'total_price' => 'Total price', + 'plus' => 'plus', + 'vat' => 'VAT', + 'subtotal_net' => 'Subtotal (net)', + 'shipping_costs' => 'Shipping costs', + 'total_amount' => 'Total amount', + + // Address top + 'address_top' => 'mivita care gmbh • Leinfeld 2 • 87755 Kirchhaslach', +]; diff --git a/resources/lang/en/register.php b/resources/lang/en/register.php index e07a3a0..36c3ded 100644 --- a/resources/lang/en/register.php +++ b/resources/lang/en/register.php @@ -1,64 +1,70 @@ 'I have read the contract listed here and accept it.', - 'account_deleted' => 'account deleted', - 'adjust' => 'adjust', - 'advisor_invite' => 'invite consultants', - 'agree' => 'agree', - 'agree_and_continue' => 'agree and move on', - 'assigned' => 'forgive', - 'badge' => 'ID', - 'business_license_deposited' => 'business license was deposited', - 'business_license_later' => 'I will submit my business license within the next 4 weeks', - 'business_license_non' => 'I don\'t need a business license', - 'business_license_non_text' => 'Outside Germany there are different regulations regarding trade licenses (e.g. Austria or Switzerland). If you are not required to have a trade license for this business or at the moment, please briefly explain why:', - 'business_license_now' => 'upload your business license now', - 'business_license_release' => 'send business license for approval now', - 'change_documents' => 'change documents', - 'change_email' => 'change E-Mail address', - 'change_email_address_verify_it_info' => '\\u00c4Change your email address here. We will send you a new activation link to your new email address to verify it.', - 'change_email_contact_address_verify_it_info' => 'Change your contact email address here. We will send the contact a new activation link to the new email address to verify it.', - 'complete' => 'complete', - 'complete_registration' => 'complete registration', - 'confirm_your_identity' => 'Confirm your identity with your password before continuing.', - 'contract' => 'contract', - 'contract_data_protection' => 'Contract & data protection', - 'create_advisor_send_email_to_invite' => 'Create a consultant and send an email to invite!', - 'create_and_next' => 'create and continue', - 'data' => 'data', - 'data_protection' => 'data protection', - 'declaration-of-consent' => 'Declaration of consent: I hereby consent to the processing of the personal data I have voluntarily provided. I have been informed that I can revoke this consent at any time.', - 'delete_account' => 'delete account', - 'i_have_read_and_accept_it' => 'I have read the :link and accept it.*', - 'next' => 'further', - 'open_payment_options' => 'open payment options', - 'package' => 'package', - 'password' => 'password', - 'password_has_already_been_created' => 'Password has already been created.', - 'really_delete_the_file' => 'Really delete the file?', - 'reg_checked' => 'I hereby consent to the data processing stated in the data protection declaration. I have been informed that I can revoke this consent at any time', - 'reg_finisch_hl' => 'Thank you for your registration!', - 'reg_finisch_line_1' => 'We have sent you an email with a link to activate your account.', - 'reg_finisch_line_2' => 'Please check your email and confirm the link.', - 'reg_hl' => 'registration', - 'reg_line_1' => 'This form is for registering new sales partners. After submitting the form, you will receive an email with further information and the activation link.', - 'registration' => 'registration', - 'registration_completed' => 'registration complete', - 'required_fields' => 'required fields', - 'save_and_continue' => 'save and continue', - 'select' => 'choose', - 'sender' => 'Your team from mivita.care', - 'trade_licence' => 'business license', - 'upload' => 'upload', - 'wizard_business_license_hl' => 'upload business license (PDF, JPG, PNG only)', - 'wizard_business_license_line_1' => 'A valid trade license is required by law in order to be able to participate as a sales partner in MIVITA. Please upload a copy of your current business license here so that we can activate your account.', - 'wizard_create_release_hl' => 'thank you', - 'wizard_create_release_line_1' => 'Your registration and booking of membership is complete!
    As soon as we have received payment, you will automatically receive an email and your membership will be activated automatically.', - 'wizard_finish_hl' => 'complete registration', - 'wizard_finish_line_1' => 'Is all data filled out correctly and completely? If not, you can click on the individual points above and make changes. If everything fits, then click on the “Complete registration” button. We will then check your data and contact you if you have any questions. As soon as we have activated your account, you will receive another email.', - 'wizard_reg_release_hl' => 'awaiting verification', - 'wizard_reg_release_line_1' => 'Your registration is complete, your data is being checked.
    After successful verification, your account will be activated and you will receive an email.', - 'wizard_verification_hl' => 'verification (ID card or passport; PDF, JPG, PNG)', - 'wizard_verification_line_1' => 'Please upload a scan/photo of your ID card or passport. The front is enough. We need your ID as proof of identity to activate your account.', -); +return [ + 'accept-contract' => 'I have read the contract listed here and accept it.', + 'account_deleted' => 'account deleted', + 'adjust' => 'adjust', + 'advisor_invite' => 'invite consultants', + 'agree' => 'agree', + 'agree_and_continue' => 'agree and move on', + 'assigned' => 'forgive', + 'badge' => 'ID', + 'business_license_deposited' => 'business license was deposited', + 'business_license_later' => 'I will submit my business license within the next 4 weeks', + 'business_license_non' => 'I don\'t need a business license', + 'business_license_non_text' => 'Outside Germany there are different regulations regarding trade licenses (e.g. Austria or Switzerland). If you are not required to have a trade license for this business or at the moment, please briefly explain why:', + 'business_license_now' => 'upload your business license now', + 'business_license_release' => 'send business license for approval now', + 'change_documents' => 'change documents', + 'change_email' => 'change E-Mail address', + 'change_email_address_verify_it_info' => '\\u00c4Change your email address here. We will send you a new activation link to your new email address to verify it.', + 'change_email_contact_address_verify_it_info' => 'Change your contact email address here. We will send the contact a new activation link to the new email address to verify it.', + 'complete' => 'complete', + 'complete_registration' => 'complete registration', + 'confirm_your_identity' => 'Confirm your identity with your password before continuing.', + 'contract' => 'contract', + 'contract_data_protection' => 'Contract & data protection', + 'create_advisor_send_email_to_invite' => 'Create a consultant and send an email to invite!', + 'create_and_next' => 'create and continue', + 'data' => 'data', + 'data_protection' => 'data protection', + 'declaration-of-consent' => 'Declaration of consent: I hereby consent to the processing of the personal data I have voluntarily provided. I have been informed that I can revoke this consent at any time.', + 'delete_account' => 'delete account', + 'i_have_read_and_accept_it' => 'I have read the :link and accept it.*', + 'next' => 'further', + 'open_payment_options' => 'open payment options', + 'package' => 'package', + 'password' => 'password', + 'password_has_already_been_created' => 'Password has already been created.', + 'really_delete_the_file' => 'Really delete the file?', + 'reg_checked' => 'I hereby consent to the data processing stated in the data protection declaration. I have been informed that I can revoke this consent at any time', + 'reg_finisch_hl' => 'Thank you for your registration!', + 'reg_finisch_line_1' => 'We have sent you an email with a link to activate your account.', + 'reg_finisch_line_2' => 'Please check your email and confirm the link.', + 'reg_hl' => 'registration', + 'reg_line_1' => 'This form is for registering new sales partners. After submitting the form, you will receive an email with further information and the activation link.', + 'registration' => 'registration', + 'registration_completed' => 'registration complete', + 'required_fields' => 'required fields', + 'save_and_continue' => 'save and continue', + 'select' => 'choose', + 'sender' => 'Your team from mivita.care', + 'trade_licence' => 'business license', + 'upload' => 'upload', + 'wizard_business_license_hl' => 'upload business license (PDF, JPG, PNG only)', + 'wizard_business_license_line_1' => 'A valid trade license is required by law in order to be able to participate as a sales partner in MIVITA. Please upload a copy of your current business license here so that we can activate your account.', + 'wizard_create_release_hl' => 'thank you', + 'wizard_create_release_line_1' => 'Your registration and booking of membership is complete!
    As soon as we have received payment, you will automatically receive an email and your membership will be activated automatically.', + 'wizard_finish_hl' => 'complete registration', + 'wizard_finish_line_1' => 'Is all data filled out correctly and completely? If not, you can click on the individual points above and make changes. If everything fits, then click on the “Complete registration” button. We will then check your data and contact you if you have any questions. As soon as we have activated your account, you will receive another email.', + 'wizard_reg_release_hl' => 'awaiting verification', + 'wizard_reg_release_line_1' => 'Your registration is complete, your data is being checked.
    After successful verification, your account will be activated and you will receive an email.', + 'wizard_verification_hl' => 'verification (ID card or passport; PDF, JPG, PNG)', + 'wizard_verification_line_1' => 'Please upload a scan/photo of your ID card or passport. The front is enough. We need your ID as proof of identity to activate your account.', + 'starter_warning_title' => 'Attention', + 'starter_warning_text' => 'Welcome to Mivita!

    You can now register for an annual fee of €69.90 and receive your personalised Mivita web shop.

    Please note:
    The starter packages are an exclusive, one-time offer at registration and cannot be purchased at a later date.

    Your options:

    • With starter package:
    You immediately receive 30% discount – also on all further purchases this year.

    • Without starter package (registration & personalised web shop only):
    You benefit permanently from 20% discount.

    Important for later:
    If you start without a starter package now, you can only build up the 30% discount later through your own qualification (→ 1,350 points of personal turnover in one month in accordance with the marketing plan).', + 'starter_warning_back' => 'No – please show me the starter packages again', + 'starter_warning_confirm' => 'Yes – I have understood (continue without starter package)', + 'wizard_package_info' => 'Please select your package. You can choose between the annual membership only and a starter package, which offers you an attractive discount and the opportunity to advance directly to the next rank. The starter package is only available once during registration. Select your product and click continue.', + 'wizard_no_selection' => 'Please select a product to continue.', +]; diff --git a/resources/lang/en/tables.php b/resources/lang/en/tables.php index 577d657..41c2b2c 100644 --- a/resources/lang/en/tables.php +++ b/resources/lang/en/tables.php @@ -1,92 +1,93 @@ 'VAT', - 'abo_delivery' => 'Subscription deliveries', - 'abo_delivery_day' => 'Subscription delivery day', - 'account' => 'account', - 'account_to' => 'account until', - 'activ' => 'active', - 'active' => 'Active', - 'addition' => 'additive', - 'address' => 'address', - 'adviser' => 'Advisor', - 'adviser_no' => 'consultant no.', - 'amount' => 'amount', - 'art' => 'sort', - 'article_no' => 'article no.', - 'assigned_advisor' => 'assigned advisor', - 'birthday' => 'birthday', - 'c_no' => 'G.No.', - 'city' => 'location', - 'commission' => 'commission', - 'contents' => 'contents', - 'count' => 'Number', - 'country' => 'long', - 'created' => 'created', - 'credit_note' => 'credit', - 'customer' => 'customer', - 'date' => 'date', - 'detail' => 'detail', - 'earnings' => 'merit', - 'ek_price' => 'purchasing price', - 'email' => 'E-Mail', - 'exc' => 'Ex.', - 'executions' => 'Explanations', - 'firstname' => 'first name', - 'from_credit_balance' => 'from credit', - 'gross' => 'gross', - 'image' => 'picture', - 'in_no' => 'invoice Number.', - 'info' => 'info', - 'invoice' => 'invoice', - 'is_for' => 'Is for', - 'label' => 'designation', - 'last_date' => 'Last version', - 'lastname' => 'last name', - 'level' => 'level', - 'line' => 'line', - 'margin' => 'margin', - 'member' => 'Member', - 'mobil' => 'mobile', - 'my_commission' => 'my commission', - 'my_price_gross' => 'my gross price', - 'my_price_net' => 'my price net', - 'net' => 'net', - 'net_price' => 'net price', - 'net_sales' => 'net sales', - 'net_sum' => 'total net', - 'newsletter' => 'newsletter', - 'next_date' => 'Next execution', - 'note' => 'note', - 'number' => 'number', - 'order' => 'order', - 'partner_since' => 'partner since', - 'payline_qualification' => 'payline qualification', - 'payment' => 'payment', - 'payment_type' => 'payment method', - 'phone' => 'tel', - 'points' => 'points', - 'postcode' => 'postcode', - 'previous_orders' => 'previous customer orders', - 'price' => 'price', - 'product' => 'product', - 'products' => 'products', - 'purchased_in_the_shop' => 'bought in the shop', - 'purchases' => 'purchases', - 'qualification' => 'qualification', - 'quantity' => 'number', - 'reference_number' => 'reference number', - 'rf_no' => 'ref no.', - 'shipping' => 'shipment', - 'shop' => 'shop', - 'shop_commission' => 'shop commission', - 'sponsor' => 'sponsor', - 'start_date' => 'Start Date', - 'status' => 'status', - 'subject' => 'regarding', - 'sum' => 'total', - 'total' => 'in total', - 'type' => 'sort', - 'vk_price' => 'sales price', -); +return [ + 'VAT' => 'VAT', + 'abo_delivery' => 'Subscription deliveries', + 'abo_delivery_day' => 'Subscription delivery day', + 'account' => 'account', + 'account_to' => 'account until', + 'activ' => 'active', + 'active' => 'Active', + 'addition' => 'additive', + 'address' => 'address', + 'adviser' => 'Advisor', + 'adviser_no' => 'consultant no.', + 'amount' => 'amount', + 'art' => 'sort', + 'article_no' => 'article no.', + 'assigned_advisor' => 'assigned advisor', + 'birthday' => 'birthday', + 'c_no' => 'G.No.', + 'city' => 'location', + 'commission' => 'commission', + 'contents' => 'contents', + 'count' => 'Number', + 'country' => 'long', + 'created' => 'created', + 'credit_note' => 'credit', + 'customer' => 'customer', + 'date' => 'date', + 'detail' => 'detail', + 'earnings' => 'merit', + 'ek_price' => 'purchasing price', + 'email' => 'E-Mail', + 'exc' => 'Ex.', + 'executions' => 'Explanations', + 'firstname' => 'first name', + 'from_credit_balance' => 'from credit', + 'gross' => 'gross', + 'image' => 'picture', + 'in_no' => 'invoice Number.', + 'info' => 'info', + 'invoice' => 'invoice', + 'is_for' => 'Is for', + 'label' => 'designation', + 'last_date' => 'Last version', + 'lastname' => 'last name', + 'level' => 'level', + 'line' => 'line', + 'margin' => 'margin', + 'member' => 'Member', + 'mobil' => 'mobile', + 'my_commission' => 'my commission', + 'my_price_gross' => 'my gross price', + 'my_price_net' => 'my price net', + 'net' => 'net', + 'net_price' => 'net price', + 'net_sales' => 'net sales', + 'net_sum' => 'total net', + 'newsletter' => 'newsletter', + 'next_date' => 'Next execution', + 'note' => 'note', + 'number' => 'number', + 'order' => 'order', + 'partner_since' => 'partner since', + 'payline_qualification' => 'payline qualification', + 'payment' => 'payment', + 'payment_type' => 'payment method', + 'phone' => 'tel', + 'points' => 'points', + 'postcode' => 'postcode', + 'previous_orders' => 'previous customer orders', + 'price' => 'price', + 'product' => 'product', + 'products' => 'products', + 'purchased_in_the_shop' => 'bought in the shop', + 'purchases' => 'purchases', + 'qualification' => 'qualification', + 'quantity' => 'number', + 'reference_number' => 'reference number', + 'rf_no' => 'ref no.', + 'shipping' => 'shipment', + 'shop' => 'shop', + 'shop_commission' => 'shop commission', + 'sponsor' => 'sponsor', + 'start_date' => 'Start Date', + 'status' => 'status', + 'subject' => 'regarding', + 'sum' => 'total', + 'total' => 'in total', + 'type' => 'sort', + 'vk_price' => 'sales price', + 'no_data_available' => 'No data available', +]; diff --git a/resources/lang/en/team.php b/resources/lang/en/team.php index 9e5d003..cb2b300 100644 --- a/resources/lang/en/team.php +++ b/resources/lang/en/team.php @@ -1,149 +1,151 @@ 'KU', - 'PP' => 'PP', - 'TP' => 'TP', - 'WB' => 'WB', - 'account' => 'account', - 'account_to' => 'account until', - 'active' => 'active', - 'business' => 'business', - 'career_level' => 'career level', - 'collapse_all' => 'close everything', - 'commission_WB' => 'commission growth bonus', - 'commission_payline' => 'commission Payline', - 'commission_shop' => 'commission Shop', - 'commission_team' => 'commission Team', - 'commission_total' => 'total commission', - 'completed' => 'completed', - 'consultant_margin' => 'Advisor margin', - 'consultant_margin_info' => 'Note: The margin has already been deducted when ordering and has therefore already been paid out.', - 'create_new_consultant' => 'create new advisor', - 'current_commission_level' => 'current commission level', - 'customer_commission' => 'customer commission', - 'customer_points' => 'customer Points', - 'date' => 'date', - 'e' => 'E', - 'expand_all' => 'open everything', - 'export' => 'export', - 'export_as_xls' => 'export as xls', - 'filename_export' => 'mivita-my-team-export-', - 'link_for_consultant_registration' => 'consultant registration link', - 'net_turnover' => 'net sales', - 'new_consultant_copy1' => 'Would you like to register a new advisor? Great, we\'re happy about that. Simply send him the following link by email, WhatsApp or SMS. This takes you to the registration page of www.mivita.care. It is important that you do not change this link, because the attached consultant ID identifies you as the sponsor of the new consultant. This is the only way to assign future commissions from your sales to you. Use the “copy symbol” to copy the link straight to your clipboard.', - 'next_career_level' => 'next career level', - 'next_commission_level' => 'next commission level', - 'no_sponsor_assigned' => 'no sponsor assigned', - 'not_active' => 'not active', - 'own' => 'own', - 'payline_points' => 'payline points', - 'payout_details' => 'payout details', - 'points' => 'points', - 'qualification' => 'qualification', - 'qualification_commission' => 'qualification commission', - 'qualification_points' => 'qualification points', - 'register_new_consultant' => 'register new advisor', - 's' => 'S', - 'sales_store_net' => 'sales store net', - 'shop' => 'shop', - 'shop_commission' => 'shop commission', - 'sponsor' => 'sponsor', - 'structure' => 'structure', - 'total_points' => 'total Points', - 'total_turnover' => 'total sales', - 'until' => 'until', - 'volume_KU' => 'volume KU', - 'your_sponsor' => 'your sponsor', - 'your_team' => 'your team', +return [ + 'KU' => 'KU', + 'PP' => 'PP', + 'TP' => 'TP', + 'WB' => 'WB', + 'account' => 'account', + 'account_to' => 'account until', + 'active' => 'active', + 'business' => 'business', + 'career_level' => 'career level', + 'collapse_all' => 'close everything', + 'commission_WB' => 'commission growth bonus', + 'commission_payline' => 'commission Payline', + 'commission_shop' => 'commission Shop', + 'commission_team' => 'commission Team', + 'commission_total' => 'total commission', + 'completed' => 'completed', + 'consultant_margin' => 'Advisor margin', + 'consultant_margin_info' => 'Note: The margin has already been deducted when ordering and has therefore already been paid out.', + 'create_new_consultant' => 'create new advisor', + 'current_commission_level' => 'current commission level', + 'customer_commission' => 'customer commission', + 'customer_points' => 'customer Points', + 'date' => 'date', + 'e' => 'E', + 'expand_all' => 'open everything', + 'export' => 'export', + 'export_as_xls' => 'export as xls', + 'filename_export' => 'mivita-my-team-export-', + 'link_for_consultant_registration' => 'consultant registration link', + 'net_turnover' => 'net sales', + 'new_consultant_copy1' => 'Would you like to register a new advisor? Great, we\'re happy about that. Simply send him the following link by email, WhatsApp or SMS. This takes you to the registration page of www.mivita.care. It is important that you do not change this link, because the attached consultant ID identifies you as the sponsor of the new consultant. This is the only way to assign future commissions from your sales to you. Use the “copy symbol” to copy the link straight to your clipboard.', + 'next_career_level' => 'next career level', + 'next_commission_level' => 'next commission level', + 'no_sponsor_assigned' => 'no sponsor assigned', + 'not_active' => 'not active', + 'last_login' => 'Last login', + 'registered_at' => 'Registered at', + 'own' => 'own', + 'payline_points' => 'payline points', + 'payout_details' => 'payout details', + 'points' => 'points', + 'qualification' => 'qualification', + 'qualification_commission' => 'qualification commission', + 'qualification_points' => 'qualification points', + 'register_new_consultant' => 'register new advisor', + 's' => 'S', + 'sales_store_net' => 'sales store net', + 'shop' => 'shop', + 'shop_commission' => 'shop commission', + 'sponsor' => 'sponsor', + 'structure' => 'structure', + 'total_points' => 'total Points', + 'total_turnover' => 'total sales', + 'until' => 'until', + 'volume_KU' => 'volume KU', + 'your_sponsor' => 'your sponsor', + 'your_team' => 'your team', - // Filter & Status - 'filter_active' => 'active', - 'filter_not_active' => 'not active', - 'filter_all' => 'all', - 'all_status' => 'All Status', - 'qualified_green' => 'Qualified (green)', - 'in_progress_yellow' => 'In Progress (yellow)', - 'no_level_red' => 'No Level (red)', + // Filter & Status + 'filter_active' => 'active', + 'filter_not_active' => 'not active', + 'filter_all' => 'all', + 'all_status' => 'All Status', + 'qualified_green' => 'Qualified (green)', + 'in_progress_yellow' => 'In Progress (yellow)', + 'no_level_red' => 'No Level (red)', - // Performance & Badges - 'optimized' => 'OPTIMIZED', - 'standard_monitoring' => 'STANDARD + MONITORING', - 'fallback' => 'FALLBACK', - 'loading_time' => 'Loading time:', - 'memory' => 'Memory:', - 'memory_usage' => 'Memory usage:', - 'team_size' => 'Team size:', - 'team_members' => 'Team members:', - 'execution_time' => 'Execution time:', - 'user_id' => 'User ID:', + // Performance & Badges + 'optimized' => 'OPTIMIZED', + 'standard_monitoring' => 'STANDARD + MONITORING', + 'fallback' => 'FALLBACK', + 'loading_time' => 'Loading time:', + 'memory' => 'Memory:', + 'memory_usage' => 'Memory usage:', + 'team_size' => 'Team size:', + 'team_members' => 'Team members:', + 'execution_time' => 'Execution time:', + 'user_id' => 'User ID:', - // Buttons & Actions - 'performance_details' => 'Performance Details', - 'team_structure' => 'Team Structure', - 'new_member' => 'New Member', - 'optimized_action' => 'Optimized', - 'standard_action' => 'Standard', - 'close' => 'Close', - 'show_details' => 'Show Details', - 'test_optimized' => 'Test Optimized', - 'standard_version' => 'Standard Version', + // Buttons & Actions + 'performance_details' => 'Performance Details', + 'team_structure' => 'Team Structure', + 'new_member' => 'New Member', + 'optimized_action' => 'Optimized', + 'standard_action' => 'Standard', + 'close' => 'Close', + 'show_details' => 'Show Details', + 'test_optimized' => 'Test Optimized', + 'standard_version' => 'Standard Version', - // Modals & Titles - 'performance_metrics_team_overview' => 'Performance Metrics - Team Overview', - 'performance_metrics_my_team' => 'Performance Metrics - My Team', - 'performance_monitoring' => 'Performance Monitoring', - 'fallback_support' => 'Fallback Support', + // Modals & Titles + 'performance_metrics_team_overview' => 'Performance Metrics - Team Overview', + 'performance_metrics_my_team' => 'Performance Metrics - My Team', + 'performance_monitoring' => 'Performance Monitoring', + 'fallback_support' => 'Fallback Support', - // Messages & Notifications - 'optimized_with_cache' => 'Optimized with Cache', - 'datatable_mode_switched' => 'DataTable mode switched to ":mode"', - 'error_loading_optimized_overview' => 'Error loading optimized team overview: ', - 'live_not_supported_fallback' => 'Live (not supported in fallback)', - 'optimized_performance_features' => 'This page uses optimized performance features.', + // Messages & Notifications + 'optimized_with_cache' => 'Optimized with Cache', + 'datatable_mode_switched' => 'DataTable mode switched to ":mode"', + 'error_loading_optimized_overview' => 'Error loading optimized team overview: ', + 'live_not_supported_fallback' => 'Live (not supported in fallback)', + 'optimized_performance_features' => 'This page uses optimized performance features.', - // Next Level - 'next_level' => 'Next Level', + // Next Level + 'next_level' => 'Next Level', - // Additional terms - 'calculation_type' => 'Calculation Type', - 'version' => 'Version', - 'cache' => 'Cache', - 'live' => 'Live', + // Additional terms + 'calculation_type' => 'Calculation Type', + 'version' => 'Version', + 'cache' => 'Cache', + 'live' => 'Live', - // Missing table headers - 'ID' => 'ID', - 'Ebene' => 'Level', - 'Level' => 'Level', - 'KD' => 'KD', - 'bis' => 'until', + // Missing table headers + 'ID' => 'ID', + 'Ebene' => 'Level', + 'Level' => 'Level', + 'KD' => 'KD', + 'bis' => 'until', - // Level Reports - 'level_reports_title' => 'Level Promotion Reports - My Team', - 'level_reports_month' => 'Month', - 'level_reports_year' => 'Year', - 'level_reports_filter_not_updated' => 'Only not updated users', - 'level_reports_filter_button' => 'Filter', - 'level_reports_csv_export' => 'CSV Export', - 'level_reports_total_promotions' => 'Total Promotions', - 'level_reports_by_level' => 'Promotions by Level', - 'level_reports_table_date' => 'Date', - 'level_reports_table_user' => 'User', - 'level_reports_table_from_level' => 'From Level', - 'level_reports_table_to_level' => 'To Level', - 'level_reports_table_current_level' => 'Current Level', - 'level_reports_table_kp_quali' => 'KP Qual', - 'level_reports_table_user_kp' => 'User KP', - 'level_reports_table_pp_quali' => 'PP Qual', - 'level_reports_table_user_pp' => 'User PP', - 'level_reports_table_update' => 'Update', - 'level_reports_table_active' => 'Active', - 'level_reports_by_period' => 'Promotions by Period', - 'level_reports_no_data' => 'No Level Promotions Found', - 'level_reports_no_data_description' => 'No entries found with the current filters.', - 'yes' => 'Yes', - 'no' => 'No', - 'not_available' => 'N/A', + // Level Reports + 'level_reports_title' => 'Level Promotion Reports - My Team', + 'level_reports_month' => 'Month', + 'level_reports_year' => 'Year', + 'level_reports_filter_not_updated' => 'Only not updated users', + 'level_reports_filter_button' => 'Filter', + 'level_reports_csv_export' => 'CSV Export', + 'level_reports_total_promotions' => 'Total Promotions', + 'level_reports_by_level' => 'Promotions by Level', + 'level_reports_table_date' => 'Date', + 'level_reports_table_user' => 'User', + 'level_reports_table_from_level' => 'From Level', + 'level_reports_table_to_level' => 'To Level', + 'level_reports_table_current_level' => 'Current Level', + 'level_reports_table_kp_quali' => 'KP Qual', + 'level_reports_table_user_kp' => 'User KP', + 'level_reports_table_pp_quali' => 'PP Qual', + 'level_reports_table_user_pp' => 'User PP', + 'level_reports_table_update' => 'Update', + 'level_reports_table_active' => 'Active', + 'level_reports_by_period' => 'Promotions by Period', + 'level_reports_no_data' => 'No Level Promotions Found', + 'level_reports_no_data_description' => 'No entries found with the current filters.', + 'yes' => 'Yes', + 'no' => 'No', + 'not_available' => 'N/A', - 'growth_bonus_details_description' => 'L1 = Direct Partner (gets the growth bonus always), L2 = Members (from here the growth bonus is divided if the member is qualified), etc. | Shows commission (€) and volume (points) per level.', -); + 'growth_bonus_details_description' => 'L1 = Direct Partner (gets the growth bonus always), L2 = Members (from here the growth bonus is divided if the member is qualified), etc. | Shows commission (€) and volume (points) per level.', +]; diff --git a/resources/lang/es/abo.php b/resources/lang/es/abo.php index 2ac6521..1e39d95 100644 --- a/resources/lang/es/abo.php +++ b/resources/lang/es/abo.php @@ -1,97 +1,107 @@ 'Suscripción', - 'payment_for_abo' => 'Forma de pago para la suscripción', - 'abo_delivery' => 'Suscripción - entrega regular', - 'abo_are_for_me_and_shipped' => 'La suscripción es para mí y se enviará a mi dirección', - 'abo_are_for_customer_and_shipped' => 'La suscripción es para un cliente y será enviada al cliente', - 'abo_delivery_to_me' => 'Envío de suscripción a mí', - 'abo_delivery_to_the_customer' => 'Entrega de suscripción al cliente', - 'every_week' => 'cada semana', - 'every_weeks' => 'cada :num semanas', - 'of_month' => 'del mes', - 'delivery_intervall' => 'Ajustar día de entrega', - 'abo_order_info_check' => 'Al completar la suscripción, se establece una entrega regular. Esta se envía y factura automáticamente el día de entrega seleccionado.', - 'abo_order_info_check_2' => 'La primera entrega y facturación se realiza el día en que se establece la suscripción. Después, el envío se realiza automáticamente el día de entrega seleccionado del mes siguiente.', - 'abo_order_info_check_3' => 'PayPal y tarjeta de crédito están disponibles como métodos de pago. La suscripción tiene una duración mínima de :abo-min-duration meses. Después, puede pausarse, cambiarse o cancelarse en cualquier momento.', - 'abo_order_info_checkbox' => '¡Sí, he entendido los términos de la suscripción!', - 'abo_infos' => 'Información de suscripción', - 'abo_delivery_infos' => 'Información de entrega de la suscripción', - 'abo_start_date' => 'Fecha de inicio de la suscripción', - 'abo_delivery_intervall' => 'Día de entrega de la suscripción', - 'abo_first_execution_date' => 'Primera ejecución', - 'abo_next_execution_date' => 'Próxima ejecución', - 'delivery_day' => 'Ajustar día de entrega', - 'abo_settings' => 'Configuración de suscripción', - 'add_new_abo' => 'Añadir nueva suscripción', - 'abo_edit' => 'Editar suscripción', - 'abo_details' => 'Detalles de suscripción', - 'abo_is_active' => 'La suscripción está activa', - 'abo_copy_active' => 'Si la suscripción no está activa, no se ejecutará automáticamente', - 'abo_copy_next_date' => 'La siguiente fecha de ejecución puede establecerse como muy pronto al día siguiente', - 'abo_copy_abo_interval' => 'El ajuste del día de entrega de la suscripción afecta a la próxima fecha de ejecución cuando la suscripción está activa.', - 'error_abo_interval' => 'El intervalo de suscripción no es correcto', - 'error_next_date' => 'La fecha de la siguiente ejecución no es correcta', - 'checkout_mail_abo_hl' => 'Su suscripción / entrega regular', - 'checkout_mail_abo_start' => 'Su suscripción se ha creado correctamente con la siguiente configuración:', - 'checkout_mail_abo_info' => 'Puede encontrar la configuración de su suscripción en su cuenta en "Mis suscripciones" y la configuración también se puede editar allí', - 'abo_new' => 'nuevo', - 'abo_okay' => 'ok', - 'abo_hold' => 'parado', - 'abo_cancel' => 'cancelado', - 'abo_finish' => 'terminado', - 'abo_inactive' => 'inactivo', - 'abo_grace' => 'gracia', - 'abo_info' => 'Información de suscripción', - 'info_min_duration_reached' => 'Su suscripción puede ser cambiada, complementada, pausada o cancelada como muy pronto a partir del :date.', - 'info_min_duration_orders_left' => 'La suscripción solo puede ser cambiada, complementada, pausada o cancelada después de otras :count ejecuciones.', - 'pros_hl' => 'Las ventajas de una suscripción', - 'pros_list' => '
  • Suscripción para Consultores y Clientes: Cada consultor o cliente puede contratar una suscripción que se ejecuta en un día establecido del mes para garantizar una entrega regular y predecible.
    • +return [ + 'abo' => 'Suscripción', + 'payment_for_abo' => 'Forma de pago para la suscripción', + 'abo_delivery' => 'Suscripción - entrega regular', + 'abo_are_for_me_and_shipped' => 'La suscripción es para mí y se enviará a mi dirección', + 'abo_are_for_customer_and_shipped' => 'La suscripción es para un cliente y será enviada al cliente', + 'abo_delivery_to_me' => 'Envío de suscripción a mí', + 'abo_delivery_to_the_customer' => 'Entrega de suscripción al cliente', + 'every_week' => 'cada semana', + 'every_weeks' => 'cada :num semanas', + 'of_month' => 'del mes', + 'delivery_intervall' => 'Ajustar día de entrega', + 'abo_order_info_check' => 'Al completar la suscripción, se establece una entrega regular. Esta se envía y factura automáticamente el día de entrega seleccionado.', + 'abo_order_info_check_2' => 'La primera entrega y facturación se realiza el día en que se establece la suscripción. Después, el envío se realiza automáticamente el día de entrega seleccionado del mes siguiente.', + 'abo_order_info_check_3' => 'PayPal y tarjeta de crédito están disponibles como métodos de pago. La suscripción tiene una duración mínima de :abo-min-duration meses. Después, puede pausarse, cambiarse o cancelarse en cualquier momento.', + 'abo_order_info_checkbox' => '¡Sí, he entendido los términos de la suscripción!', + 'abo_infos' => 'Información de suscripción', + 'abo_delivery_infos' => 'Información de entrega de la suscripción', + 'abo_start_date' => 'Fecha de inicio de la suscripción', + 'abo_delivery_intervall' => 'Día de entrega de la suscripción', + 'abo_first_execution_date' => 'Primera ejecución', + 'abo_next_execution_date' => 'Próxima ejecución', + 'delivery_day' => 'Ajustar día de entrega', + 'abo_settings' => 'Configuración de suscripción', + 'add_new_abo' => 'Añadir nueva suscripción', + 'abo_edit' => 'Editar suscripción', + 'abo_details' => 'Detalles de suscripción', + 'abo_is_active' => 'La suscripción está activa', + 'abo_copy_active' => 'Si la suscripción no está activa, no se ejecutará automáticamente', + 'abo_copy_next_date' => 'La siguiente fecha de ejecución puede establecerse como muy pronto al día siguiente', + 'abo_copy_abo_interval' => 'El ajuste del día de entrega de la suscripción afecta a la próxima fecha de ejecución cuando la suscripción está activa.', + 'error_abo_interval' => 'El intervalo de suscripción no es correcto', + 'error_next_date' => 'La fecha de la siguiente ejecución no es correcta', + 'checkout_mail_abo_hl' => 'Su suscripción / entrega regular', + 'checkout_mail_abo_start' => 'Su suscripción se ha creado correctamente con la siguiente configuración:', + 'checkout_mail_abo_info' => 'Puede encontrar la configuración de su suscripción en su cuenta en "Mis suscripciones" y la configuración también se puede editar allí', + 'abo_new' => 'nuevo', + 'abo_okay' => 'ok', + 'abo_hold' => 'parado', + 'abo_cancel' => 'cancelado', + 'abo_finish' => 'terminado', + 'abo_inactive' => 'inactivo', + 'abo_grace' => 'gracia', + 'abo_info' => 'Información de suscripción', + 'info_min_duration_reached' => 'Su suscripción puede ser cambiada, complementada, pausada o cancelada como muy pronto a partir del :date.', + 'info_min_duration_orders_left' => 'La suscripción solo puede ser cambiada, complementada, pausada o cancelada después de otras :count ejecuciones.', + 'pros_hl' => 'Las ventajas de una suscripción', + 'pros_list' => '
  • Suscripción para Consultores y Clientes: Cada consultor o cliente puede contratar una suscripción que se ejecuta en un día establecido del mes para garantizar una entrega regular y predecible.
  • Entrega Mensual: Una vez al mes, se envía una nueva entrega directamente a su puerta.
  • Flexible y Personalizable: La suscripción se puede ajustar individualmente, por ejemplo, en cuanto a productos, cantidades o tiempos de entrega.
  • Selección Diversa de Productos: Se pueden incluir varios productos en la suscripción.
  • Duración: La suscripción tiene una duración mínima de :abo-min-duration meses, después de la cual puede pausarse o cancelarse.
  • Ventaja de Precio: Los productos de suscripción a menudo reciben descuentos especiales u ofertas.
  • Comienza Ahora: Elige tus productos, adapta la suscripción a tus necesidades, paga el primer pedido y activa tu suscripción para las entregas posteriores.
    • ', - 'abo_pros' => 'Beneficios de suscripción', - 'abo_order_hl' => 'Compilación de suscripción', - 'abo_order_info_2' => 'Puede ajustar los productos de su suscripción en cualquier momento, en la próxima ejecución se le enviarán sus productos compilados.', - 'abo_order_info_block' => 'Puede ajustar la compilación de su suscripción después de la duración mínima de :abo-min-duration meses.', - 'add_product' => 'Añadir producto', - 'product_prices_career_level_info' => 'Los precios de los productos se muestran y calculan según su nivel de carrera :user_level_name menos :user_level_margin % de margen.', - 'product_prices_career_level_cpay_info' => 'Los precios de los productos se muestran como precios minoristas para el cliente. Después de completar el pago del cliente, recibirá su comisión según su nivel de carrera :user_level_name comisión :user_level_margin %.', - 'error_email_has_abo' => 'Ya existe una suscripción para la dirección de correo electrónico :email.', - 'abo_assigned' => 'Suscripción activa', - 'base' => 'Base', - 'upgrade' => 'Mejora', - 'abo_type_info' => 'Nota: Cada suscripción consta de al menos un producto base :base !
    Los productos de mejora :upgrade son opcionales y se pueden agregar según se desee.
    La suscripción tiene una duración mínima de :abo-min-duration meses, después de la cual puede pausarse o cancelarse.', - 'abo_type_info_base' => 'La suscripción requiere al menos un producto base :base !', - 'need_basis_product' => 'Debe tener al menos un producto base en su suscripción. ¡Primero agregue un nuevo producto base y luego elimine el producto base anterior!', - 'abo_item_not_found' => 'Artículo de suscripción no encontrado', - 'product_not_found' => 'Producto no encontrado', - 'create_abo' => 'Crear suscripción', - 'info' => 'Info', - 'data' => 'Datos', - 'check' => 'Verificar', - 'choose' => 'Elegir', - 'order' => 'ordenar', - 'basis_product' => 'Producto base', - 'upgrade_products' => 'Productos de mejora', - 'base_product' => 'Producto base', - 'upgrade_product' => 'Producto de mejora', - 'my_address' => 'Mi dirección', - 'my_address_check' => 'Verificar mi dirección', - 'my_address_check_info' => 'Verifique su dirección para asegurarse de que los productos se envíen a la dirección correcta.', - 'edit' => 'editar', - 'confirm_and_next' => 'confirmar y siguiente', - 'understood_and_next' => 'entendido y siguiente', - 'change_my_data_empty' => 'Aún no ha almacenado una dirección de facturación y entrega, sin esta no puede crear una suscripción, por favor créela.', - 'abo_error_basis_product' => 'Error: Por favor seleccione al menos un producto base.', - 'error_abo_interval_in_the_past' => 'La suscripción no se ha ejecutado este mes aún. Cambiar a un día pasado saltaría el mes actual.', - 'cancel_abo' => 'Cancelar suscripción', - 'confirm_cancel' => '¿Realmente desea cancelar la suscripción?', - 'back' => 'atrás', - 'team_subscriptions' => 'Suscripciones de equipo', - 'every_month_on' => 'mensualmente el :day.', -); + 'abo_pros' => 'Beneficios de suscripción', + 'abo_order_hl' => 'Compilación de suscripción', + 'abo_order_info_2' => 'Puede ajustar los productos de su suscripción en cualquier momento, en la próxima ejecución se le enviarán sus productos compilados.', + 'abo_order_info_block' => 'Puede ajustar la compilación de su suscripción después de la duración mínima de :abo-min-duration meses.', + 'abo_order_info_block_team' => 'La compilación de la suscripción para un miembro del equipo solo puede ajustarse por él después de la duración mínima de :abo-min-duration meses.', + 'abo_order_info_add_only' => 'Puede agregar nuevos productos a su suscripción en cualquier momento. La eliminación de productos solo es posible después de la duración mínima de :abo-min-duration meses.', + 'abo_order_info_block_customer' => 'Puede agregar nuevos productos a su suscripción en cualquier momento. La eliminación de productos solo es posible después de la duración mínima de :abo-min-duration meses.', + 'error_add_only_no_remove' => 'No es posible eliminar productos durante el periodo de duración mínima.', + 'confirm_add_title' => 'Confirmar agregar producto', + 'confirm_add_title_normal' => 'Agregar producto a la suscripción', + 'confirm_add_warning' => 'Durante la duración mínima, los productos agregados no pueden ser eliminados. Por favor, revise su selección cuidadosamente.', + 'confirm_add_warning_normal' => '¿Realmente desea agregar este producto a su suscripción?', + 'confirm_add_cancel' => 'Cancelar', + 'confirm_add_ok' => 'Sí, agregar', + 'add_product' => 'Añadir producto', + 'product_prices_career_level_info' => 'Los precios de los productos se muestran y calculan según su nivel de carrera :user_level_name menos :user_level_margin % de margen.', + 'product_prices_career_level_cpay_info' => 'Los precios de los productos se muestran como precios minoristas para el cliente. Después de completar el pago del cliente, recibirá su comisión según su nivel de carrera :user_level_name comisión :user_level_margin %.', + 'error_email_has_abo' => 'Ya existe una suscripción para la dirección de correo electrónico :email.', + 'abo_assigned' => 'Suscripción activa', + 'base' => 'Base', + 'upgrade' => 'Mejora', + 'abo_type_info' => 'Nota: Cada suscripción consta de al menos un producto base :base !
    Los productos de mejora :upgrade son opcionales y se pueden agregar según se desee.
    La suscripción tiene una duración mínima de :abo-min-duration meses, después de la cual puede pausarse o cancelarse.', + 'abo_type_info_base' => 'La suscripción requiere al menos un producto base :base !', + 'need_basis_product' => 'Debe tener al menos un producto base en su suscripción. ¡Primero agregue un nuevo producto base y luego elimine el producto base anterior!', + 'abo_item_not_found' => 'Artículo de suscripción no encontrado', + 'product_not_found' => 'Producto no encontrado', + 'create_abo' => 'Crear suscripción', + 'info' => 'Info', + 'data' => 'Datos', + 'check' => 'Verificar', + 'choose' => 'Elegir', + 'order' => 'ordenar', + 'basis_product' => 'Producto base', + 'upgrade_products' => 'Productos de mejora', + 'base_product' => 'Producto base', + 'upgrade_product' => 'Producto de mejora', + 'my_address' => 'Mi dirección', + 'my_address_check' => 'Verificar mi dirección', + 'my_address_check_info' => 'Verifique su dirección para asegurarse de que los productos se envíen a la dirección correcta.', + 'edit' => 'editar', + 'confirm_and_next' => 'confirmar y siguiente', + 'understood_and_next' => 'entendido y siguiente', + 'change_my_data_empty' => 'Aún no ha almacenado una dirección de facturación y entrega, sin esta no puede crear una suscripción, por favor créela.', + 'abo_error_basis_product' => 'Error: Por favor seleccione al menos un producto base.', + 'error_abo_interval_in_the_past' => 'La suscripción no se ha ejecutado este mes aún. Cambiar a un día pasado saltaría el mes actual.', + 'cancel_abo' => 'Cancelar suscripción', + 'confirm_cancel' => '¿Realmente desea cancelar la suscripción?', + 'back' => 'atrás', + 'team_subscriptions' => 'Suscripciones de equipo', + 'every_month_on' => 'mensualmente el :day.', +]; diff --git a/resources/lang/es/abo_history.php b/resources/lang/es/abo_history.php new file mode 100644 index 0000000..4c2a66a --- /dev/null +++ b/resources/lang/es/abo_history.php @@ -0,0 +1,54 @@ + 'Composición Original', + 'change_history' => 'Historial de Cambios', + 'no_initial_data' => 'No hay datos originales disponibles (la suscripción fue creada antes del seguimiento)', + 'no_changes' => 'No hay cambios registrados', + + // Columnas + 'col_date' => 'Fecha', + 'col_action' => 'Acción', + 'col_product' => 'Producto', + 'col_details' => 'Detalles', + 'col_changed_by' => 'Modificado por', + 'col_channel' => 'Canal', + + // Acciones + 'action_initial' => 'Original', + 'action_added' => 'Añadido', + 'action_removed' => 'Eliminado', + 'action_qty_changed' => 'Cant. cambiada', + 'action_comp_changed' => 'Comp cambiado', + 'action_comp_added' => 'Comp añadido', + 'action_comp_removed' => 'Comp eliminado', + 'action_rollback' => 'Revertido', + + // Descripciones + 'desc_initial' => 'Cantidad: :qty', + 'desc_added' => 'Cantidad: :qty', + 'desc_removed' => 'Producto eliminado', + 'desc_qty_changed' => 'Cantidad cambiada de :from a :to', + 'desc_comp_changed' => 'Reemplazado: :old', + 'desc_comp_added' => 'Añadido por el sistema', + 'desc_comp_removed' => 'Eliminado por el sistema', + 'desc_rollback' => 'Restablecido al original', + + // Canales + 'channel_admin' => 'Admin', + 'channel_user_me' => 'Consultor', + 'channel_user_ot' => 'Consultor (Cliente)', + 'channel_portal' => 'Portal de Cliente', + 'channel_system' => 'Sistema', + + // Tipo de precio + 'price_net' => 'neto', + 'price_gross' => 'bruto', + + // Rollback + 'rollback_btn' => 'Restablecer al Original', + 'rollback_confirm' => '¿Está seguro de que desea restablecer la suscripción a su estado original? Todos los productos actuales serán reemplazados por la composición original.', + 'rollback_success' => 'La suscripción se ha restablecido correctamente a su estado original.', + 'rollback_no_data' => 'No es posible revertir: No hay datos originales disponibles.', +]; diff --git a/resources/lang/es/account.php b/resources/lang/es/account.php index 4d050c9..e12cac2 100644 --- a/resources/lang/es/account.php +++ b/resources/lang/es/account.php @@ -1,44 +1,47 @@ 'BIC', - 'IBAN' => 'IBAN', - 'VAT_ID_number' => 'número de identificación tributaria', - 'VAT_copy_1' => 'Elija pequeña empresa si no genera más de 22.000 EUR en ventas al año con su negocio.', - 'VAT_liability' => 'cuota del impuesto sobre el valor añadido', - 'account_holder' => 'titular de la cuenta', - 'bank_data' => 'datos bancarios', - 'btn_vat_validate' => 'Validar el número de identificación del IVA', - 'delivery_address' => 'dirección de entrega', - 'firstname_lastname' => 'nombre de pila apellidos', - 'info_vat_numbers' => 'Nota: ¡Proporcione su número de identificación fiscal y/o número de identificación de IVA!*', - 'invoice_address' => 'dirección de facturación', - 'my_credit' => 'mi saldo', - 'new_vat_validate' => 'Validar nuevo NIF-IVA y activar procedimiento de inversión del sujeto pasivo', - 'phone_need_error' => 'Error: ¡Por favor especifique teléfono y/o teléfono móvil!*', - 'phone_need_note' => 'Nota: ¡Indique el teléfono fijo y/o móvil!*', - 'required_for_commission_payments' => 'necesarios para el pago de comisiones', - 'reverse_charge_action_1' => 'Eliminar el procedimiento de inversión del sujeto pasivo y el número de IVA', - 'reverse_charge_action_2' => 'validar el número de IVA y activar el procedimiento de inversión del cargo', - 'reverse_charge_copy_1' => 'Procedimiento de reversión de obligación tributaria o deducción. En este caso especial, el impuesto a las ventas lo debe pagar el destinatario del servicio (consultor) y no el empresario que presta el servicio (mivita).', - 'reverse_charge_note_1' => 'Cuando se activa, se requiere y valida el ID de IVA.', - 'reverse_charge_procedure' => 'procedimiento de inversión del sujeto pasivo', - 'tax_number' => 'número de identificación fiscal', - 'taxable_sales_1' => 'sujeto al impuesto sobre las ventas (presento una declaración anticipada de IVA a la oficina de impuestos cada mes / trimestre / año)', - 'taxable_sales_2' => 'no sujeto al impuesto sobre las ventas (pequeñas empresas en el sentido de §19)', - 'validator_creditcard' => 'por favor, introduzca un número de tarjeta de crédito válida', - 'validator_date' => 'Por favor ingrese una fecha válida.', - 'validator_digits' => 'Por favor introduzca sólo números.', - 'validator_email' => 'Por favor, introduce una dirección de correo electrónico válida.', - 'validator_equalTo' => 'Por favor repita el mismo valor.', - 'validator_max' => 'Introduzca un valor menor o igual a {0}.', - 'validator_maxlength' => 'Introduzca un máximo de {0} caracteres.', - 'validator_min' => 'Introduzca un valor mayor o igual a {0}.', - 'validator_minlength' => 'Introduzca al menos {0} caracteres.', - 'validator_number' => 'Por favor, introduzca un número.', - 'validator_range' => 'Introduzca un valor entre {0} y {1}.', - 'validator_rangelength' => 'Introduzca al menos {0} y un máximo de {1} caracteres.', - 'validator_required' => 'Este campo es un campo obligatorio.', - 'validator_url' => 'Por favor introduzca un URL válido.', - 'vat_data' => 'Datos fiscales', -); +return [ + 'BIC' => 'BIC', + 'IBAN' => 'IBAN', + 'VAT_ID_number' => 'número de identificación tributaria', + 'VAT_copy_1' => 'Elija pequeña empresa si no genera más de 22.000 EUR en ventas al año con su negocio.', + 'VAT_liability' => 'cuota del impuesto sobre el valor añadido', + 'account_holder' => 'titular de la cuenta', + 'bank_data' => 'datos bancarios', + 'btn_vat_validate' => 'Validar el número de identificación del IVA', + 'delivery_address' => 'dirección de entrega', + 'firstname_lastname' => 'nombre de pila apellidos', + 'info_vat_numbers' => 'Nota: ¡Proporcione su número de identificación fiscal y/o número de identificación de IVA!*', + 'invoice_address' => 'dirección de facturación', + 'my_credit' => 'mi saldo', + 'new_vat_validate' => 'Validar nuevo NIF-IVA y activar procedimiento de inversión del sujeto pasivo', + 'phone_need_error' => 'Error: ¡Por favor especifique teléfono y/o teléfono móvil!*', + 'phone_need_note' => 'Nota: ¡Indique el teléfono fijo y/o móvil!*', + 'required_for_commission_payments' => 'necesarios para el pago de comisiones', + 'reverse_charge_action_1' => 'Eliminar el procedimiento de inversión del sujeto pasivo y el número de IVA', + 'reverse_charge_action_2' => 'validar el número de IVA y activar el procedimiento de inversión del cargo', + 'reverse_charge_copy_1' => 'Procedimiento de reversión de obligación tributaria o deducción. En este caso especial, el impuesto a las ventas lo debe pagar el destinatario del servicio (consultor) y no el empresario que presta el servicio (mivita).', + 'reverse_charge_note_1' => 'Cuando se activa, se requiere y valida el ID de IVA.', + 'reverse_charge_procedure' => 'procedimiento de inversión del sujeto pasivo', + 'tax_number' => 'número de identificación fiscal', + 'taxable_sales_1' => 'sujeto al impuesto sobre las ventas (presento una declaración anticipada de IVA a la oficina de impuestos cada mes / trimestre / año)', + 'taxable_sales_2' => 'no sujeto al impuesto sobre las ventas (pequeñas empresas en el sentido de §19)', + 'validator_creditcard' => 'por favor, introduzca un número de tarjeta de crédito válida', + 'validator_date' => 'Por favor ingrese una fecha válida.', + 'validator_digits' => 'Por favor introduzca sólo números.', + 'validator_email' => 'Por favor, introduce una dirección de correo electrónico válida.', + 'validator_equalTo' => 'Por favor repita el mismo valor.', + 'validator_max' => 'Introduzca un valor menor o igual a {0}.', + 'validator_maxlength' => 'Introduzca un máximo de {0} caracteres.', + 'validator_min' => 'Introduzca un valor mayor o igual a {0}.', + 'validator_minlength' => 'Introduzca al menos {0} caracteres.', + 'validator_number' => 'Por favor, introduzca un número.', + 'validator_range' => 'Introduzca un valor entre {0} y {1}.', + 'validator_rangelength' => 'Introduzca al menos {0} y un máximo de {1} caracteres.', + 'validator_required' => 'Este campo es un campo obligatorio.', + 'validator_url' => 'Por favor introduzca un URL válido.', + 'vat_data' => 'Datos fiscales', + 'language_settings' => 'Configuración de idioma', + 'preferred_language' => 'Idioma preferido', + 'language_hint' => 'Este idioma se utilizará para sus facturas, extractos de comisiones y albaranes.', +]; diff --git a/resources/lang/es/customer.php b/resources/lang/es/customer.php index 8644c47..4e00cc4 100644 --- a/resources/lang/es/customer.php +++ b/resources/lang/es/customer.php @@ -1,34 +1,35 @@ 'sobre la tienda', - 'add_customer_without_email' => 'agregar cliente sin correo electrónico', - 'add_customer_without_email_info1' => 'Nota: También puedes crear tus clientes sin una dirección de correo electrónico. Luego, el sistema compara el apellido y el código postal. Si hay alguna similitud aquí, el soporte de MIVITA compara las tarifas de los clientes y las asigna a los consultores en consecuencia. Por ello, en el mejor de los casos, siempre recomendamos facilitar una dirección de correo electrónico. Esto es único y, por lo tanto, se puede asignar claramente a un cliente.', - 'assigned' => 'asignado', - 'assigned_counsellor' => 'asesor asignado', - 'check' => 'controlar', - 'check_and_next' => 'comprobar y continuar', - 'check_and_save' => 'comprobar y continuar', - 'client_sovereignty' => 'soberanía del cliente', - 'counsellor_allocate' => 'asignar consultores', - 'created' => 'creado', - 'customer_add' => 'agregar clientes', - 'customer_billing_address' => 'dirección del cliente y de facturación', - 'customer_data' => 'número de cliente', - 'customer_details' => 'detalles del cliente', - 'customer_has_already_buy' => 'certifico que este cliente ya me ha comprado', - 'customer_has_already_purchased' => 'El cliente ya ha comprado.', - 'customer_has_not_yet_purchased' => 'El cliente aún no ha comprado.', - 'customer_is_not_subscribed_to_newsletter' => 'El cliente no está suscrito al boletín.', - 'customer_is_subscribed_to_newsletter' => 'El cliente está suscrito al boletín.', - 'customer_sovereignty_info1' => 'Soberanía del cliente: sólo se pueden añadir clientes que no existan ya en el centro de ventas mivita.', - 'date' => 'fecha', - 'edit' => 'editar', - 'edit_customer_data' => 'para editar los datos del cliente', - 'enter' => 'aporte', - 'is_counsellor' => 'es un consultor', - 'newsletter_subscribed_copy1' => 'Suscrito al boletín. Usted o MIVITA pueden enviar a los clientes un boletín informativo si el cliente ya ha comprado activamente. Si el cliente ha declarado explícitamente que no desea recibir un boletín informativo, asegúrese de desmarcar la casilla.', - 'next_without_email' => 'continuar sin correo electrónico', - 'select' => 'seleccione', - 'under_review' => 'en examen', -); +return [ + 'about_shop' => 'sobre la tienda', + 'add_customer_without_email' => 'agregar cliente sin correo electrónico', + 'add_customer_without_email_info1' => 'Nota: También puedes crear tus clientes sin una dirección de correo electrónico. Luego, el sistema compara el apellido y el código postal. Si hay alguna similitud aquí, el soporte de MIVITA compara las tarifas de los clientes y las asigna a los consultores en consecuencia. Por ello, en el mejor de los casos, siempre recomendamos facilitar una dirección de correo electrónico. Esto es único y, por lo tanto, se puede asignar claramente a un cliente.', + 'assigned' => 'asignado', + 'assigned_counsellor' => 'asesor asignado', + 'check' => 'controlar', + 'check_and_next' => 'comprobar y continuar', + 'check_and_save' => 'comprobar y continuar', + 'client_sovereignty' => 'soberanía del cliente', + 'counsellor_allocate' => 'asignar consultores', + 'created' => 'creado', + 'customer_add' => 'agregar clientes', + 'customer_billing_address' => 'dirección del cliente y de facturación', + 'customer_data' => 'número de cliente', + 'customer_details' => 'detalles del cliente', + 'customer_has_already_buy' => 'certifico que este cliente ya me ha comprado', + 'customer_has_already_purchased' => 'El cliente ya ha comprado.', + 'customer_has_not_yet_purchased' => 'El cliente aún no ha comprado.', + 'customer_is_not_subscribed_to_newsletter' => 'El cliente no está suscrito al boletín.', + 'customer_is_subscribed_to_newsletter' => 'El cliente está suscrito al boletín.', + 'customer_sovereignty_info1' => 'Soberanía del cliente: sólo se pueden añadir clientes que no existan ya en el centro de ventas mivita.', + 'date' => 'fecha', + 'edit' => 'editar', + 'edit_customer_data' => 'para editar los datos del cliente', + 'enter' => 'aporte', + 'is_counsellor' => 'es un consultor', + 'newsletter_subscribed_copy1' => 'Suscrito al boletín. Usted o MIVITA pueden enviar a los clientes un boletín informativo si el cliente ya ha comprado activamente. Si el cliente ha declarado explícitamente que no desea recibir un boletín informativo, asegúrese de desmarcar la casilla.', + 'next_without_email' => 'continuar sin correo electrónico', + 'select' => 'seleccione', + 'under_review' => 'en examen', + 'language_hint' => 'Las facturas y documentos se crearán en este idioma.', +]; diff --git a/resources/lang/es/dataprotect.php b/resources/lang/es/dataprotect.php index 3bd695e..367ca5a 100644 --- a/resources/lang/es/dataprotect.php +++ b/resources/lang/es/dataprotect.php @@ -1,20 +1,22 @@ 'Protección de Datos', - 'data_protect_copy1' => 'Nuestro sitio web generalmente se puede utilizar sin proporcionar datos personales. Si desea utilizar determinados servicios a través de nuestro sitio web, puede ser necesario el procesamiento de sus datos personales.
    El procesamiento de sus datos personales siempre se lleva a cabo de acuerdo con el Reglamento General de Protección de Datos (GDPR) y las regulaciones de protección de datos específicas de cada país que se aplican a nosotros.
    Hemos tomado las medidas técnicas y organizativas adecuadas de conformidad con el artículo 32 del RGPD para garantizar un nivel adecuado de protección. También hemos establecido procedimientos para garantizar que se ejerzan sus derechos, que se eliminen los datos y que respondamos a una amenaza a los datos. Ya hemos tenido en cuenta la protección de sus datos personales al desarrollar y seleccionar el hardware y software utilizado. Por la presente cumplimos con el principio de protección de datos mediante el diseño tecnológico/mediante ajustes predeterminados favorables a la protección de datos, artículo 25 del RGPD. Nuestras medidas de seguridad incluyen, en particular, la transmisión cifrada (cifrado SSL) de datos entre su navegador y nuestro servidor.

    ', - 'data_protect_copy10' => 'Si se aplica uno de los motivos mencionados anteriormente y desea que eliminemos los datos personales que almacenamos, puede contactarnos en cualquier momento. Nos aseguraremos de que la solicitud de eliminación se cumpla de inmediato.
    Si los datos personales han sido hechos públicos por nosotros y nosotros, como responsables, estamos obligados a eliminarlos de conformidad con el artículo 17, apartado 1 del RGPD, tomaremos las medidas adecuadas, incluidas las técnicas, teniendo en cuenta las tecnología disponible y los costos de implementación para informar a otros controladores de datos que procesan los datos personales publicados que usted ha solicitado que estos otros controladores de datos eliminen todos los enlaces a estos datos personales o copias o replicaciones de estos datos personales, en la medida en que el procesamiento no sea requerido. Tomaremos las medidas necesarias en casos individuales.

    4) Derecho a la restricción del procesamiento
    Tiene derecho a solicitar que restrinjamos el procesamiento si se cumple una de las siguientes condiciones:
    - La exactitud del usted impugna los datos personales durante un período que nos permite verificar la exactitud de los datos personales; - el procesamiento es ilegal, usted rechaza la eliminación de los datos personales y solicita en su lugar la restricción del uso de los datos personales; - Ya no necesitamos los datos personales para los fines del procesamiento, pero usted los necesita para establecer, ejercer o defender reclamaciones legales; - Usted ha presentado una objeción al procesamiento de conformidad con el artículo 21, apartado 1 del RGPD y aún no está claro si nuestros motivos legítimos superan a los suyos.
    Si se cumple una de las condiciones anteriores y desea solicitar la restricción de los datos personales que almacenamos, puede contactarnos en cualquier momento. Nos encargaremos de restringir el procesamiento.

    5) Derecho a la portabilidad de los datos
    Tiene derecho a recibir de nosotros los datos personales que le conciernen, que nos ha proporcionado, en un formato estructurado, común y legible por máquina. También tiene derecho a transmitir estos datos a otra persona responsable sin impedimentos por nuestra parte, siempre que el procesamiento se base en el consentimiento de conformidad con el artículo 6, párrafo 1, letra a del RGPD o el artículo 9, párrafo 2, letra a del RGPD o según un contrato de conformidad con el artículo 6, párrafo 1, letra b del RGPD y el procesamiento se lleva a cabo mediante procedimientos automatizados, a menos que el procesamiento sea necesario para el desempeño de una tarea que sea de interés público o en el ejercicio de un poder público que nos ha sido conferido.

    Además, al ejercer su derecho a la portabilidad de datos de conformidad con el artículo 20, apartado 1 del RGPD, tiene derecho a que los datos personales se transmitan directamente de nosotros a otro responsable, en la medida en que esto sea técnicamente viable y siempre que no afecte a los derechos y libertades de otras personas.

    Para hacer valer su derecho a la portabilidad de sus datos, puede contactar con nosotros en cualquier momento.

    6) Derecho de oposición
    Usted tiene derecho, por motivos derivados de su situación particular, a oponerse en cualquier momento al tratamiento de los datos personales que le conciernen en base al art. 6 Apartado 1 Letras e o f del RGPD para presentar una objeción. Esto también se aplica a la elaboración de perfiles basados ​​en estas disposiciones.

    Ya no procesaremos los datos personales en caso de objeción, a menos que podamos demostrar motivos legítimos imperiosos para el procesamiento que prevalezcan sobre sus intereses, derechos y libertades, o el procesamiento sirva para hacer valer, ejercer o defender. de reclamaciones legales.
    Si procesamos datos personales para realizar publicidad directa, usted tiene derecho a oponerse en cualquier momento al procesamiento de datos personales con el fin de dicha publicidad. Esto también se aplica a la elaboración de perfiles en la medida en que esté relacionada con dicha publicidad directa. Si se opone al procesamiento con fines de publicidad directa, ya no procesaremos sus datos personales para estos fines.

    Además, tiene derecho, por motivos derivados de su situación particular, a oponerse al tratamiento de sus datos personales que llevamos a cabo con fines de investigación científica o histórica o con fines estadísticos de conformidad con con el artículo 89, apartado 1, DSGVO para presentar una objeción, a menos que dicho procesamiento sea necesario para cumplir una tarea de interés público.

    Para ejercer su derecho de oposición, puede contactar con nosotros. En relación con el uso de servicios de la sociedad de la información, sin perjuicio de la Directiva 2002/58/CE, usted es libre de ejercer su derecho de oposición mediante procedimientos automatizados utilizando especificaciones técnicas.

    ', - 'data_protect_copy11' => '7) Decisiones automatizadas en casos individuales, incluida la elaboración de perfiles
    Usted tiene derecho a no estar sujeto a una decisión basada únicamente en un procesamiento automatizado - incluida la elaboración de perfiles - que tenga efectos legales contra usted o de manera similar. a menos que la decisión sea necesaria para la celebración o ejecución de un contrato entre usted y nosotros o esté permitida por la legislación de la Unión o de los Estados miembros a la que estemos sujetos y dicha ley adopte las medidas adecuadas para salvaguardar sus derechos y libertades incluidos o con su consentimiento expreso.

    Si la decisión es necesaria para la celebración o ejecución de un contrato entre usted y nosotros o si se toma con su consentimiento expreso, tomaremos las medidas adecuadas para proteger sus derechos y libertades, así como sus intereses legítimos. , incluyendo al menos este derecho a obtener intervención humana por parte del responsable, a expresar el propio punto de vista y a impugnar la decisión.

    Si desea hacer valer sus derechos en relación con las decisiones automatizadas, puede ponerse en contacto con nosotros en cualquier momento.

    8) Derecho a revocar su consentimiento en materia de protección de datos
    Tiene derecho a revocar su consentimiento al tratamiento de datos personales en cualquier momento. Si desea ejercer su derecho a revocar su consentimiento, puede ponerse en contacto con nosotros en cualquier momento.

    9) Derecho a presentar una reclamación ante la autoridad de control
    Según el Art. 77 del RGPD, usted tiene derecho a presentar una reclamación ante la autoridad de control si considera que el tratamiento de sus datos personales Los datos no se facilitan de forma lícita.

    X. Colaboración con procesadores/terceros
    Si, como parte de nuestro procesamiento de datos, revelamos sus datos a otras personas/empresas, se los transmitimos o les concedemos acceso a sus datos, esto se hace exclusivamente en el sobre la base de un permiso legal, su consentimiento, una obligación legal o sobre la base de nuestros intereses legítimos. Si hemos encargado o encargaremos a terceros el procesamiento de datos sobre la base del llamado "contrato de procesamiento de pedidos", esto se hará sobre la base del artículo 28 del RGPD.

    XI. Transferencias a terceros países
    Si procesamos datos en un tercer país o esto ocurre como parte del uso de servicios de terceros, esto solo se llevará a cabo si es necesario para cumplir con nuestras obligaciones (pre)contractuales. obligaciones, en base a su consentimiento, obligación legal o en base a nuestros intereses legítimos. Sujeto a permisos legales o contractuales, solo procesamos o hacemos procesar los datos en un tercer país si se cumplen los requisitos especiales del artículo 44 y siguientes del RGPD. Por lo tanto, el procesamiento se realiza, por ejemplo, sobre la base de garantías especiales, como la determinación oficialmente reconocida de un nivel de protección de datos correspondiente a la UE (por ejemplo, para los EE. UU. a través del "Privacy Shield") o el cumplimiento de normas especiales oficialmente reconocidas. obligaciones contractuales (las llamadas “cláusulas contractuales tipo”).

    XII. Integración de servicios y contenidos de terceros
    En base a nuestros intereses legítimos en el sentido del artículo 6, apartado 1, letra f del RGPD, utilizamos ofertas de terceros proveedores en nuestro sitio web para poder para integrar su contenido. Los proveedores de este contenido conocen su dirección IP, ya que sin el conocimiento de la dirección IP el contenido no puede transmitirse a su navegador. Nos esforzamos por utilizar únicamente contenido de terceros donde su dirección IP se utilice exclusivamente para entregar el contenido. Todavía existe la posibilidad de que terceros utilicen las llamadas "etiquetas de píxeles", que son gráficos invisibles también conocidos como "balizas web", con fines estadísticos o de marketing. Las "etiquetas de píxeles" pueden evaluar información como el tráfico de visitantes en nuestro sitio web.

    A continuación le ofrecemos una descripción general de las ofertas de terceros que utilizamos, junto con enlaces a sus declaraciones de protección de datos:

    Fuentes externas de Google, LLC., https://www. google.com/fonts (“Fuentes de Google”). La integración de Google Fonts se realiza mediante una llamada al servidor de Google (normalmente en EE.UU.). La declaración de protección de datos se puede encontrar aquí: https://policies.google.com/privacy, Opt-Out: https://adssettings.google.com/authenticated

    Vídeos de la plataforma “YouTube” de el proveedor externo Google LLC, 1600 Amphitheatre Parkway, Mountain View, CA 94043, EE. UU. La declaración de protección de datos se puede encontrar aquí: https://policies.google.com/privacy, exclusión voluntaria: https://adssettings.google.com/authenticated

    ', - 'data_protect_copy12' => 'XIII. Herramientas de análisis y publicidad Facebook Pixel
    Este sitio web utiliza los píxeles de acción de los visitantes de Facebook para medir las conversiones. El proveedor de este servicio es Facebook Ireland Limited, 4 Grand Canal Square, Dublín 2, Irlanda. Sin embargo, según Facebook, los datos recopilados también se transferirán a EE. UU. y otros terceros países, lo que significa que se puede rastrear el comportamiento de los visitantes del sitio después de haber sido redirigidos al sitio web del proveedor haciendo clic en un anuncio de Facebook. Esto permite evaluar la eficacia de los anuncios de Facebook con fines estadísticos y de investigación de mercado y optimizar futuras medidas publicitarias. Los datos recopilados son anónimos para nosotros como operadores de este sitio web, no podemos sacar ninguna conclusión sobre la identidad de los usuarios. Sin embargo, Facebook almacena y procesa los datos de modo que sea posible una conexión con el perfil de usuario correspondiente y Facebook pueda utilizar los datos para sus propios fines publicitarios de acuerdo con las directrices de uso de datos de Facebook. Esto permite a Facebook habilitar la colocación de anuncios en páginas de Facebook, así como fuera de Facebook. Nosotros, como operadores del sitio, no podemos influir en este uso de los datos. El uso del píxel de Facebook se basa en el artículo 6, apartado 1, letra f del RGPD. El operador del sitio web tiene un interés legítimo en medidas publicitarias efectivas, incluidas las redes sociales. Si se ha solicitado el consentimiento correspondiente (por ejemplo, consentimiento para el almacenamiento de cookies), el procesamiento se llevará a cabo exclusivamente sobre la base del artículo 6, párrafo 1, letra a. RGPD; El consentimiento puede revocarse en cualquier momento. La transferencia de datos a los EE. UU. se basa en las cláusulas contractuales estándar de la Comisión de la UE. Los detalles se pueden encontrar aquí: https://www.facebook.com/legal/EU_data_transfer_addendum y https://de -de.facebook.com/help/566994660333381

    En la medida en que los datos personales se recopilen en nuestro sitio web y se envíen a Facebook utilizando la herramienta aquí descrita, nosotros y Facebook Ireland Limited, 4 Grand Canal Square, GrandCanal Harbour , Dublin 2, Irlanda son corresponsables del Responsable del tratamiento de datos (Art. 26 RGPD) La responsabilidad conjunta se limita exclusivamente a recoger los datos y transmitirlos a Facebook. El procesamiento realizado por Facebook después del reenvío no forma parte de la responsabilidad compartida. Las obligaciones que compartimos se han establecido en un acuerdo de procesamiento conjunto. El texto del acuerdo se puede encontrar en: https://www.facebook.com/legal/controller_addendum. Según este acuerdo, somos responsables de proporcionar información sobre protección de datos al utilizar la herramienta de Facebook y de la implementación segura de la herramienta en nuestro sitio web. Facebook es responsable de la seguridad de los datos de los productos de Facebook. Puede hacer valer los derechos del interesado (por ejemplo, solicitudes de información) sobre los datos procesados ​​por Facebook directamente en Facebook. Si hace valer sus derechos como interesado ante nosotros, estamos obligados a transmitirlos a Facebook. Puede encontrar más información sobre la protección de su privacidad en la información de protección de datos de Facebook: https://de-de.facebook.com/about/privacy/ También puede desactivar la función de remarketing "Públicos personalizados" en el área de configuración de publicidad en https://www.facebook.com/ads/preferences/?entry_product=ad_settings_screen. Para ello, debe iniciar sesión en Facebook. Si no tiene una cuenta de Facebook, puede desactivar la publicidad basada en el uso de Facebook en el sitio web de la Alianza Europea de Publicidad Digital Interactiva: http://www.youronlinechoices.com/de /praferenzmanagement/.

    Recopilación de datos mediante el uso de Google Analytics y uso de cookies
    Nuestro sitio web utiliza Google Analytics, un servicio de análisis web prestado por Google inc (https://www.google .de/about/) (1600 Amphitheatre Parkway, Mountain View, CA 94043, EE. UU.; en adelante “Google”). Google Analytics utiliza las llamadas "cookies" y en este contexto se crean perfiles de uso seudonimizados. Las “cookies” son archivos de texto que se almacenan en su ordenador y permiten analizar su uso del sitio web. Por ejemplo, se registra lo siguiente:
    • Información sobre el sistema operativo
    • sobre el navegador
    • Su dirección IP (nombre de host del ordenador que accede)
    • que proporcionó el sitio web al que accedió anteriormente (URL de referencia)
    • Fecha y hora de la solicitud del servidor.
    La información generada por este archivo de texto sobre el uso de nuestro sitio web se transmite a un servidor de Google en EE. UU. y se almacena allí. Google utilizará esta información para evaluar su uso de nuestro sitio web, para compilar informes sobre la actividad del sitio web para los operadores del sitio web y para proporcionar otros servicios relacionados con el sitio web y el uso de Internet con fines de investigación de mercado y diseño de estos sitios web en función de las necesidades. Si así lo exige la ley o si terceros procesan estos datos por encargo de Google, Google también transmitirá esta información a estos terceros. Este uso es anónimo o seudonimizado (enmascaramiento de IP).
    Usted puede impedir la instalación de cookies configurando su programa de usuario de Internet (navegador) correspondientemente. Sin embargo, nos gustaría señalar que, de este modo, es posible que no todas las funciones se puedan utilizar. Para ello, debe desactivar el almacenamiento de cookies en su navegador de Internet. Para obtener más información, consulte las instrucciones de uso de su navegador de Internet. Además, puede evitar la recopilación de los datos generados por la cookie y relacionados con su uso del sitio web (incluida su dirección IP) y el procesamiento de estos datos por parte de Google descargando e instalando un complemento del navegador (https: herramientas .google.com/dlpage/gaoptout?hl=de).
    Los datos procesados ​​por las cookies son necesarios para los fines mencionados para proteger nuestros intereses legítimos y los de terceros de conformidad con el artículo 6, apartado 1, frase 1, letra f del RGPD.
    Puede encontrar más información sobre protección de datos de Google en: https://www.google.de/intl/de/policies/privacy/

    Google utiliza la cookie DoubleClick DART < br> Los usuarios pueden optar por no utilizar la cookie de DART visitando la red publicitaria de Google y la política de privacidad de la red de contenido.
    No se almacenan datos personales directos del usuario, únicamente la dirección IP. Esta información se utiliza para reconocerle automáticamente la próxima vez que visite nuestros sitios web y para facilitarle la navegación. Por ejemplo, las cookies nos permiten personalizar un sitio web según sus intereses o guardar su contraseña para que no tenga que volver a ingresarla cada vez.
    Por supuesto, también puede ver nuestros sitios web sin cookies. Si no desea que reconozcamos su computadora, puede evitar que se almacenen cookies en su disco duro seleccionando "no aceptar cookies" en la configuración de su navegador. Consulte las instrucciones proporcionadas por el fabricante de su navegador para saber cómo funciona en detalle. Sin embargo, nos gustaría señalar que no aceptar cookies puede dar lugar a restricciones funcionales en nuestras ofertas.
    Usted puede impedir la instalación de cookies configurando su programa de usuario de Internet (navegador) correspondientemente. Para ello, debe desactivar el almacenamiento de cookies en su navegador de Internet. Para obtener más información, consulte las instrucciones de uso de su navegador de Internet.
    Puede encontrar más información sobre protección de datos de Google en: https://www.google.de/intl/de/policies/privacy/

    ', - 'data_protect_copy13' => 'Seguimiento de conversiones de Google Adwords
    Utilizamos el seguimiento de conversiones de Google para registrar estadísticamente el uso de nuestro sitio web y evaluarlo con el fin de optimizarlo para usted. Google instala una cookie en su ordenador si llega a nuestro sitio web a través de un anuncio de Google.
    Después de 30 días, estas cookies pierden su validez. No se utilizan para identificación personal. Si el usuario visita determinadas páginas del sitio web del cliente de Adwords y la cookie sigue siendo válida, Google y el cliente pueden reconocer que el usuario hizo clic en el anuncio y fue redirigido a esta página.
    Serán diferentes para cada cliente. Las cookies son establecidos y, por lo tanto, no pueden rastrearse a través de los sitios web de los clientes de Adwords. La información recopilada se utiliza para crear estadísticas de conversión para los clientes de Adwords que han optado por el seguimiento de conversiones. Se revela la siguiente información:
    • Número total de usuarios que hicieron clic en su anuncio y fueron redirigidos a una página con una etiqueta de seguimiento de conversiones.
    Sin embargo, no se publica información al respecto. se puede utilizar para identificar personalmente a los usuarios.
    Si no desea participar en el proceso de seguimiento, también puede rechazar la configuración necesaria de una cookie, por ejemplo, utilizando la configuración de su navegador que generalmente impide la configuración automática de cookies. desactivado. También puede desactivar las cookies para el seguimiento de conversiones configurando su navegador de modo que se bloqueen las cookies del dominio “www.googleadservices.com”.
    La política de privacidad de Google sobre el seguimiento de conversiones se puede encontrar aquí (https://services.google. es/sitestats/de.html)', - 'data_protect_copy2' => 'yo. Definiciones
    Para que nuestra declaración de protección de datos sea más fácil de entender, primero nos gustaría explicarle algunos de los términos utilizados. A los efectos de esta política de privacidad, el término:

    1) “datos personales” significa cualquier información relativa a una persona física identificada o identificable (en adelante “titular de los datos”); Se considera identificable a una persona física si puede identificarse directa o indirectamente, en particular mediante un identificador como un nombre, un número de identificación, datos de ubicación, un identificador en línea o una o más características especiales que expresen la identidad física, fisiológica, genética, psicológica, económica, cultural o social de esa persona física;

    2) "Tratamiento" significa cualquier operación o serie de operaciones realizadas con o sin la ayuda de procedimientos automatizados en relación con datos personales, tales como la recopilación, registro, organización, estructuración, almacenamiento, adaptación o modificación. , leer, recuperar, usar, divulgar mediante transmisión, difusión o cualquier otra forma de provisión, comparación o combinación, restricción, eliminación o destrucción;

    3)“restricción de procesamiento” significa el marcado de datos personales almacenados con el objetivo de restringir su procesamiento futuro;

    4) "Elaboración de perfiles" significa cualquier tipo de procesamiento automatizado de datos personales, que consiste en utilizar estos datos personales para evaluar ciertos aspectos personales relacionados con una persona física, en particular aspectos relacionados con el análisis o la predicción de esa persona física. desempeño laboral, situación económica, salud, preferencias personales, intereses, confiabilidad, comportamiento, ubicación o movimientos;

    5) "Seudonimización" significa el procesamiento de datos personales de tal manera que los datos personales ya no puedan asignarse a un interesado específico sin el uso de información adicional, siempre que esta información adicional se almacene por separado. y está sujeto a medidas técnicas y organizativas, que garantizan que los datos personales no sean asignados a una persona física identificada o identificable;

    6) “Responsable” significa la persona física o jurídica, autoridad pública, institución u otro organismo que, solo o junto con otros, decide sobre los fines y medios del procesamiento de datos personales; Si los fines y medios de dicho procesamiento están determinados por la legislación de la Unión o de los Estados miembros, el responsable del tratamiento o los criterios específicos para su designación podrán estar previstos por la legislación de la Unión o de los Estados miembros

    7)“Procesador” significa una persona física o jurídica, autoridad pública, agencia u otro organismo que procesa datos personales en nombre del controlador;

    8) “Destinatario” significa una persona física o jurídica, autoridad pública, agencia u otro organismo al que se revelan datos personales, independientemente de si es un tercero o no. Sin embargo, no se considerarán destinatarios las autoridades públicas que puedan recibir datos personales en el contexto de una tarea de investigación específica con arreglo al Derecho de la Unión o de los Estados miembros; el procesamiento de estos datos por parte de dichas autoridades se llevará a cabo de acuerdo con las normas de protección de datos aplicables de acuerdo con los fines del procesamiento;

    9) “Tercero” significa una persona física o jurídica, autoridad pública, agencia u otro organismo, distinto del interesado, el responsable del tratamiento, el encargado del tratamiento y las personas autorizadas bajo la responsabilidad directa del responsable del tratamiento o el procesador para procesar datos personales;

    10) “Consentimiento” del interesado significa cualquier manifestación de voluntad voluntaria, informada e inequívoca en el caso concreto en forma de declaración u otro acto confirmatorio claro mediante el cual el interesado indica que acepta el tratamiento de los datos personales que le conciernen;

    11) “violación de datos personales” significa una violación de la seguridad que, ya sea accidental o ilegal, resulta en la destrucción, pérdida, alteración o divulgación no autorizada o acceso a datos personales, que han sido transmitidos, almacenados o procesado de otra manera.

    ', - 'data_protect_copy3' => 'II. Persona responsable
    La persona responsable en el sentido del Reglamento General de Protección de Datos, así como de las leyes de protección de datos aplicables en los estados miembros de la Unión Europea y otras normas de protección de datos es:

    mivita care gmbh
    Sr. Alois Ried
    Leinfeld 2
    87755 Kirchhaslach
    Teléfono: +49 (0) 8333 94 61 767
    Correo electrónico: info@mivita.care< br>

    ', - 'data_protect_copy4' => '', - 'data_protect_copy5' => '
    Nuestro sitio web utiliza cookies. Las cookies son pequeños archivos de texto que se almacenan y almacenan en un sistema informático a través de un navegador de Internet.
    Muchos sitios web y servidores utilizan cookies. Muchas cookies contienen el llamado ID de cookie. Una ID de cookie es un identificador único de la cookie. Consiste en una cadena a través de la cual se pueden asignar sitios web y servidores al navegador de Internet específico en el que se almacenó la cookie. Esto permite a los sitios web y servidores visitados distinguir el navegador individual del interesado de otros navegadores de Internet que contienen otras cookies. Se puede reconocer e identificar un navegador de Internet específico mediante el ID de cookie único.
    Al utilizar cookies, podemos brindarle servicios más fáciles de usar que no serían posibles sin la configuración de cookies.
    Utilizando una cookie, la información y las ofertas de nuestro sitio web se pueden optimizar para el usuario. Como ya se ha mencionado, las cookies nos permiten reconocer a los usuarios de nuestro sitio web. El objetivo de este reconocimiento es facilitarle el uso de nuestros sitios web. Por ejemplo, el usuario de un sitio web que utiliza cookies no tiene que volver a introducir sus datos de acceso cada vez que visita el sitio web porque esto lo hace el sitio web y la cookie almacenada en el sistema informático del usuario.
    Los datos procesados ​​por las cookies son necesarios para los fines mencionados para proteger nuestros intereses legítimos de conformidad con el artículo 6, apartado 1, frase 1, letra f del RGPD.
    Usted puede impedir la instalación de cookies a través de nuestro sitio web en cualquier momento ajustando la configuración apropiada en el navegador de Internet utilizado y así oponerse permanentemente a la instalación de cookies. Además, las cookies ya instaladas se pueden eliminar en cualquier momento mediante un navegador de Internet u otros programas de software. Esto es posible en todos los navegadores de Internet habituales. Si desactiva la configuración de cookies en el navegador de Internet que utiliza, es posible que no todas las funciones de nuestro sitio web sean plenamente utilizables.

    IV.Datos e información que se almacenan cuando visita nuestro sitio web
    Cada vez que visita nuestro sitio web, se registran datos e información generales que se almacenan en los archivos de registro del servidor.

    Se pueden recopilar los siguientes datos/información:
    - los tipos y versiones del navegador utilizados - el sistema operativo utilizado - el sitio web desde el que accede a nuestro sitio web - el sub -sitios a los que se accede en nuestro sitio web - la fecha y hora de acceso a nuestro sitio web, - su dirección IP - su proveedor de servicios de Internet - otros datos e información similares que sirven para evitar peligros en caso de ataques a nuestros sistemas informáticos.

    Necesitamos esta información para poder proporcionar con precisión el contenido de nuestro sitio web. garantizar la funcionalidad a largo plazo de nuestro sistema informático y poder proporcionar a las autoridades la información necesaria para el procesamiento penal en caso de un ciberataque. Este es también nuestro interés legítimo dentro de la base jurídica para el procesamiento de estos datos de conformidad con el artículo 6, apartado 1, letra f del RGPD. Al utilizar estos datos e información generales no extraemos ninguna conclusión sobre el interesado. Almacenamos los datos anónimos de los archivos de registro del servidor por separado de todos los datos personales. V. Contactarnos electrónicamente

    Debido a las regulaciones de la Ley de Telemedia (TMG), estamos obligados a proporcionar una dirección de correo electrónico general en el pie de página de nuestro sitio web, que puede utilizar para contactarnos por correo electrónico. También tiene la opción de contactarnos utilizando los formularios de contacto de nuestro sitio web. Puede utilizar los formularios de contacto para realizar consultas sobre los productos o nuestro negocio o postularse como consultor. Los datos personales que nos envíe a través de correo electrónico o nuestros formularios de contacto se almacenarán automáticamente con el fin de procesarlo o contactarlo.

    Al enviar su mensaje, usted consiente el procesamiento de los datos transmitidos. El procesamiento se lleva a cabo sobre la base del artículo 6, párrafo 1, letra a del RGPD con su consentimiento. Podrás revocar tu consentimiento en cualquier momento notificándonoslo, sin que ello afecte a la licitud del tratamiento realizado en base a tu consentimiento antes de su revocación. Sólo utilizamos su dirección de correo electrónico para procesar su solicitud. Sus datos se eliminarán a menos que haya dado su consentimiento para su posterior procesamiento y uso.

    ', - 'data_protect_copy6' => 'VI. Base legal para el procesamiento
    Si obtenemos su consentimiento para un propósito de procesamiento específico, el Art. 6 I letra a del RGPD sirve como base legal para el proceso de procesamiento.

    Si el procesamiento de datos personales es necesario para cumplir un contrato, el procesamiento se basa en el Art. 6 I letra b del RGPD. Esto también se aplica a las operaciones de procesamiento que son necesarias para llevar a cabo medidas precontractuales, como consultas sobre nuestros productos u otros servicios.

    Si estamos sujetos a una obligación legal que requiere el procesamiento de datos personales, como por ejemplo para cumplir con obligaciones fiscales, la base legal para el procesamiento es el Art. 6 I letra c del RGPD.

    Si el procesamiento de datos personales es necesario para proteger los intereses vitales del interesado o de otra persona física, el procesamiento se basaría en el Art. 6 I letra d del RGPD.

    En definitiva, el artículo 6 I letra f del RGPD puede ser la base jurídica para un tratamiento. Este es el caso si la operación de procesamiento no está cubierta por ninguna de las bases legales antes mencionadas y el procesamiento es necesario para proteger un interés legítimo de nuestra empresa o de un tercero, siempre que los intereses, derechos y libertades fundamentales del interesado no no prevalecerá. Si el procesamiento de datos personales se basa en el artículo 6 I letra f del RGPD, nuestro interés legítimo es llevar a cabo nuestras actividades comerciales en beneficio del bienestar de nuestros empleados/accionistas.

    ', - 'data_protect_copy7' => 'VII. Regulaciones legales o contractuales para el suministro de datos personales
    El suministro de datos personales es en parte requerido por la ley (por ejemplo, regulaciones fiscales) y también puede resultar de regulaciones contractuales (por ejemplo, información sobre el socio contractual). Si desea celebrar un contrato con nosotros, es necesario que nos proporcione datos personales, que posteriormente serán procesados ​​por nosotros. No proporcionar datos personales significaría que no podríamos celebrar un contrato con usted.

    ', - 'data_protect_copy8' => 'VIII. Eliminación/bloqueo de rutina de datos personales
    Solo procesamos y almacenamos datos personales durante el período necesario para lograr el propósito de almacenamiento o si así lo exige el legislador europeo u otro legislador en las leyes o reglamentos previstos. Si el propósito del almacenamiento ya no es aplicable o si expira un período de almacenamiento prescrito por el legislador europeo u otro legislador responsable, los datos personales serán bloqueados o eliminados de forma rutinaria y de acuerdo con las normas legales.

    Una vez transcurrido el respectivo período de conservación legal, los datos relevantes se eliminarán de forma rutinaria, a menos que ya no sean necesarios para cumplir el contrato o iniciar un contrato. Según las disposiciones legales en Alemania, el almacenamiento se realiza durante 10 años de conformidad con el artículo 147, apartado 1, AO, 257, apartado 1, números 1 y 4, apartado 4, HGB (libros, registros, informes de gestión, documentos contables, libros comerciales). , más relevantes para la fiscalidad), documentos, etc.) y 6 años según el artículo 257, apartado 1, números 2 y 3, apartado 4 del HGB (cartas comerciales).

    ', - 'data_protect_copy9' => 'IX. Sus derechos
    1) Derecho a confirmación e información
    Tiene derecho a solicitarnos confirmación sobre si se están procesando los datos personales relevantes. Si desea ejercer sus derechos legales, puede contactarnos en cualquier momento.

    También tiene derecho a recibir información gratuita de nuestra parte sobre los datos personales almacenados sobre usted y una copia de esta información. También tiene derecho a recibir información sobre la siguiente información:
    - los fines del procesamiento - las categorías de datos personales que se procesan - los destinatarios o categorías de destinatarios a quienes los datos personales han sido comunicados o se siguen divulgando, en particular destinatarios en terceros países u organizaciones internacionales - si es posible, el período previsto durante el cual se almacenarán los datos personales o, si esto no es posible, los criterios para determinar ese período - la existencia de un derecho de rectificación o eliminación de los datos personales que les conciernen o a la limitación del tratamiento por parte del responsable del tratamiento o al derecho a oponerse a este tratamiento (la existencia de un derecho a presentar una reclamación ante una autoridad de control) si los datos personales no se recogen del interesado: Toda la información disponible sobre el origen de los datos - la existencia de una toma de decisiones automatizada, incluida la elaboración de perfiles de conformidad con el artículo 22, apartados 1 y 4 del RGPD y, al menos en estos casos, información significativa sobre la lógica implicada y el alcance y los efectos previstos de dicho procesamiento para el interesado

    También tiene derecho a obtener información sobre si los datos personales han sido transmitidos a un tercer país o a una organización internacional. Si este es el caso, también tiene derecho a recibir información sobre las garantías adecuadas en relación con la transmisión.

    Si desea ejercer este derecho de información, puede contactar con nosotros en cualquier momento.

    2) Derecho de rectificación
    Tiene derecho a solicitar la corrección inmediata de los datos personales incorrectos que le conciernen. También tiene derecho, teniendo en cuenta los fines del procesamiento, a solicitar que se completen los datos personales incompletos, incluso mediante una declaración complementaria.

    Si desea ejercer este derecho de corrección, puede contactarnos en cualquier momento.

    3) Derecho de eliminación (“Derecho al olvido”)
    Tiene derecho a solicitar que los datos personales que le conciernen se eliminen inmediatamente, si se cumple una de las siguientes condiciones se apliquen los motivos y en la medida en que el procesamiento no sea necesario:
    - Los datos personales fueron recopilados o procesados ​​de otro modo para fines para los cuales ya no son necesarios; - Usted revoca su consentimiento en el que se basó el procesamiento de conformidad con el artículo 6, párrafo 1, letra a del RGPD o el artículo 9, párrafo 2, letra a del RGPD y no existe otra base legal para el procesamiento; - Usted envía de conformidad con el artículo 21, apartado 1 del RGPD Oponerse al procesamiento y no existan motivos legítimos imperiosos para el procesamiento, o usted se oponga al procesamiento de conformidad con el artículo 21, párrafo 2 del RGPD; - Los datos personales fueron procesados ​​ilegalmente; - La eliminación de datos personales es necesaria para cumplir con una obligación legal según la legislación de la Unión o de los Estados miembros a la que estamos sujetos. - Los datos personales se recopilaron en relación con los servicios de la sociedad de la información ofrecidos de conformidad con el artículo 8, apartado 1 del RGPD.

    ', - 'data_protect_stand_shop' => 'A partir de: 18 de febrero de 2022', - 'data_protect_stand_site' => 'A partir de: 5 de octubre de 2018', -); +return [ + 'data_protect' => 'Protección de Datos', + 'data_protect_copy1' => 'Nuestro sitio web generalmente se puede utilizar sin proporcionar datos personales. Si desea utilizar determinados servicios a través de nuestro sitio web, puede ser necesario el procesamiento de sus datos personales.
    El procesamiento de sus datos personales siempre se lleva a cabo de acuerdo con el Reglamento General de Protección de Datos (GDPR) y las regulaciones de protección de datos específicas de cada país que se aplican a nosotros.
    Hemos tomado las medidas técnicas y organizativas adecuadas de conformidad con el artículo 32 del RGPD para garantizar un nivel adecuado de protección. También hemos establecido procedimientos para garantizar que se ejerzan sus derechos, que se eliminen los datos y que respondamos a una amenaza a los datos. Ya hemos tenido en cuenta la protección de sus datos personales al desarrollar y seleccionar el hardware y software utilizado. Por la presente cumplimos con el principio de protección de datos mediante el diseño tecnológico/mediante ajustes predeterminados favorables a la protección de datos, artículo 25 del RGPD. Nuestras medidas de seguridad incluyen, en particular, la transmisión cifrada (cifrado SSL) de datos entre su navegador y nuestro servidor.

    ', + 'data_protect_copy10' => 'Si se aplica uno de los motivos mencionados anteriormente y desea que eliminemos los datos personales que almacenamos, puede contactarnos en cualquier momento. Nos aseguraremos de que la solicitud de eliminación se cumpla de inmediato.
    Si los datos personales han sido hechos públicos por nosotros y nosotros, como responsables, estamos obligados a eliminarlos de conformidad con el artículo 17, apartado 1 del RGPD, tomaremos las medidas adecuadas, incluidas las técnicas, teniendo en cuenta las tecnología disponible y los costos de implementación para informar a otros controladores de datos que procesan los datos personales publicados que usted ha solicitado que estos otros controladores de datos eliminen todos los enlaces a estos datos personales o copias o replicaciones de estos datos personales, en la medida en que el procesamiento no sea requerido. Tomaremos las medidas necesarias en casos individuales.

    4) Derecho a la restricción del procesamiento
    Tiene derecho a solicitar que restrinjamos el procesamiento si se cumple una de las siguientes condiciones:
    - La exactitud del usted impugna los datos personales durante un período que nos permite verificar la exactitud de los datos personales; - el procesamiento es ilegal, usted rechaza la eliminación de los datos personales y solicita en su lugar la restricción del uso de los datos personales; - Ya no necesitamos los datos personales para los fines del procesamiento, pero usted los necesita para establecer, ejercer o defender reclamaciones legales; - Usted ha presentado una objeción al procesamiento de conformidad con el artículo 21, apartado 1 del RGPD y aún no está claro si nuestros motivos legítimos superan a los suyos.
    Si se cumple una de las condiciones anteriores y desea solicitar la restricción de los datos personales que almacenamos, puede contactarnos en cualquier momento. Nos encargaremos de restringir el procesamiento.

    5) Derecho a la portabilidad de los datos
    Tiene derecho a recibir de nosotros los datos personales que le conciernen, que nos ha proporcionado, en un formato estructurado, común y legible por máquina. También tiene derecho a transmitir estos datos a otra persona responsable sin impedimentos por nuestra parte, siempre que el procesamiento se base en el consentimiento de conformidad con el artículo 6, párrafo 1, letra a del RGPD o el artículo 9, párrafo 2, letra a del RGPD o según un contrato de conformidad con el artículo 6, párrafo 1, letra b del RGPD y el procesamiento se lleva a cabo mediante procedimientos automatizados, a menos que el procesamiento sea necesario para el desempeño de una tarea que sea de interés público o en el ejercicio de un poder público que nos ha sido conferido.

    Además, al ejercer su derecho a la portabilidad de datos de conformidad con el artículo 20, apartado 1 del RGPD, tiene derecho a que los datos personales se transmitan directamente de nosotros a otro responsable, en la medida en que esto sea técnicamente viable y siempre que no afecte a los derechos y libertades de otras personas.

    Para hacer valer su derecho a la portabilidad de sus datos, puede contactar con nosotros en cualquier momento.

    6) Derecho de oposición
    Usted tiene derecho, por motivos derivados de su situación particular, a oponerse en cualquier momento al tratamiento de los datos personales que le conciernen en base al art. 6 Apartado 1 Letras e o f del RGPD para presentar una objeción. Esto también se aplica a la elaboración de perfiles basados ​​en estas disposiciones.

    Ya no procesaremos los datos personales en caso de objeción, a menos que podamos demostrar motivos legítimos imperiosos para el procesamiento que prevalezcan sobre sus intereses, derechos y libertades, o el procesamiento sirva para hacer valer, ejercer o defender. de reclamaciones legales.
    Si procesamos datos personales para realizar publicidad directa, usted tiene derecho a oponerse en cualquier momento al procesamiento de datos personales con el fin de dicha publicidad. Esto también se aplica a la elaboración de perfiles en la medida en que esté relacionada con dicha publicidad directa. Si se opone al procesamiento con fines de publicidad directa, ya no procesaremos sus datos personales para estos fines.

    Además, tiene derecho, por motivos derivados de su situación particular, a oponerse al tratamiento de sus datos personales que llevamos a cabo con fines de investigación científica o histórica o con fines estadísticos de conformidad con con el artículo 89, apartado 1, DSGVO para presentar una objeción, a menos que dicho procesamiento sea necesario para cumplir una tarea de interés público.

    Para ejercer su derecho de oposición, puede contactar con nosotros. En relación con el uso de servicios de la sociedad de la información, sin perjuicio de la Directiva 2002/58/CE, usted es libre de ejercer su derecho de oposición mediante procedimientos automatizados utilizando especificaciones técnicas.

    ', + 'data_protect_copy11' => '7) Decisiones automatizadas en casos individuales, incluida la elaboración de perfiles
    Usted tiene derecho a no estar sujeto a una decisión basada únicamente en un procesamiento automatizado - incluida la elaboración de perfiles - que tenga efectos legales contra usted o de manera similar. a menos que la decisión sea necesaria para la celebración o ejecución de un contrato entre usted y nosotros o esté permitida por la legislación de la Unión o de los Estados miembros a la que estemos sujetos y dicha ley adopte las medidas adecuadas para salvaguardar sus derechos y libertades incluidos o con su consentimiento expreso.

    Si la decisión es necesaria para la celebración o ejecución de un contrato entre usted y nosotros o si se toma con su consentimiento expreso, tomaremos las medidas adecuadas para proteger sus derechos y libertades, así como sus intereses legítimos. , incluyendo al menos este derecho a obtener intervención humana por parte del responsable, a expresar el propio punto de vista y a impugnar la decisión.

    Si desea hacer valer sus derechos en relación con las decisiones automatizadas, puede ponerse en contacto con nosotros en cualquier momento.

    8) Derecho a revocar su consentimiento en materia de protección de datos
    Tiene derecho a revocar su consentimiento al tratamiento de datos personales en cualquier momento. Si desea ejercer su derecho a revocar su consentimiento, puede ponerse en contacto con nosotros en cualquier momento.

    9) Derecho a presentar una reclamación ante la autoridad de control
    Según el Art. 77 del RGPD, usted tiene derecho a presentar una reclamación ante la autoridad de control si considera que el tratamiento de sus datos personales Los datos no se facilitan de forma lícita.

    X. Colaboración con procesadores/terceros
    Si, como parte de nuestro procesamiento de datos, revelamos sus datos a otras personas/empresas, se los transmitimos o les concedemos acceso a sus datos, esto se hace exclusivamente en el sobre la base de un permiso legal, su consentimiento, una obligación legal o sobre la base de nuestros intereses legítimos. Si hemos encargado o encargaremos a terceros el procesamiento de datos sobre la base del llamado "contrato de procesamiento de pedidos", esto se hará sobre la base del artículo 28 del RGPD.

    XI. Transferencias a terceros países
    Si procesamos datos en un tercer país o esto ocurre como parte del uso de servicios de terceros, esto solo se llevará a cabo si es necesario para cumplir con nuestras obligaciones (pre)contractuales. obligaciones, en base a su consentimiento, obligación legal o en base a nuestros intereses legítimos. Sujeto a permisos legales o contractuales, solo procesamos o hacemos procesar los datos en un tercer país si se cumplen los requisitos especiales del artículo 44 y siguientes del RGPD. Por lo tanto, el procesamiento se realiza, por ejemplo, sobre la base de garantías especiales, como la determinación oficialmente reconocida de un nivel de protección de datos correspondiente a la UE (por ejemplo, para los EE. UU. a través del "Privacy Shield") o el cumplimiento de normas especiales oficialmente reconocidas. obligaciones contractuales (las llamadas “cláusulas contractuales tipo”).

    XII. Integración de servicios y contenidos de terceros
    En base a nuestros intereses legítimos en el sentido del artículo 6, apartado 1, letra f del RGPD, utilizamos ofertas de terceros proveedores en nuestro sitio web para poder para integrar su contenido. Los proveedores de este contenido conocen su dirección IP, ya que sin el conocimiento de la dirección IP el contenido no puede transmitirse a su navegador. Nos esforzamos por utilizar únicamente contenido de terceros donde su dirección IP se utilice exclusivamente para entregar el contenido. Todavía existe la posibilidad de que terceros utilicen las llamadas "etiquetas de píxeles", que son gráficos invisibles también conocidos como "balizas web", con fines estadísticos o de marketing. Las "etiquetas de píxeles" pueden evaluar información como el tráfico de visitantes en nuestro sitio web.

    A continuación le ofrecemos una descripción general de las ofertas de terceros que utilizamos, junto con enlaces a sus declaraciones de protección de datos:

    Fuentes externas de Google, LLC., https://www. google.com/fonts (“Fuentes de Google”). La integración de Google Fonts se realiza mediante una llamada al servidor de Google (normalmente en EE.UU.). La declaración de protección de datos se puede encontrar aquí: https://policies.google.com/privacy, Opt-Out: https://adssettings.google.com/authenticated

    Vídeos de la plataforma “YouTube” de el proveedor externo Google LLC, 1600 Amphitheatre Parkway, Mountain View, CA 94043, EE. UU. La declaración de protección de datos se puede encontrar aquí: https://policies.google.com/privacy, exclusión voluntaria: https://adssettings.google.com/authenticated

    ', + 'data_protect_copy12' => 'XIII. Herramientas de análisis y publicidad Facebook Pixel
    Este sitio web utiliza los píxeles de acción de los visitantes de Facebook para medir las conversiones. El proveedor de este servicio es Facebook Ireland Limited, 4 Grand Canal Square, Dublín 2, Irlanda. Sin embargo, según Facebook, los datos recopilados también se transferirán a EE. UU. y otros terceros países, lo que significa que se puede rastrear el comportamiento de los visitantes del sitio después de haber sido redirigidos al sitio web del proveedor haciendo clic en un anuncio de Facebook. Esto permite evaluar la eficacia de los anuncios de Facebook con fines estadísticos y de investigación de mercado y optimizar futuras medidas publicitarias. Los datos recopilados son anónimos para nosotros como operadores de este sitio web, no podemos sacar ninguna conclusión sobre la identidad de los usuarios. Sin embargo, Facebook almacena y procesa los datos de modo que sea posible una conexión con el perfil de usuario correspondiente y Facebook pueda utilizar los datos para sus propios fines publicitarios de acuerdo con las directrices de uso de datos de Facebook. Esto permite a Facebook habilitar la colocación de anuncios en páginas de Facebook, así como fuera de Facebook. Nosotros, como operadores del sitio, no podemos influir en este uso de los datos. El uso del píxel de Facebook se basa en el artículo 6, apartado 1, letra f del RGPD. El operador del sitio web tiene un interés legítimo en medidas publicitarias efectivas, incluidas las redes sociales. Si se ha solicitado el consentimiento correspondiente (por ejemplo, consentimiento para el almacenamiento de cookies), el procesamiento se llevará a cabo exclusivamente sobre la base del artículo 6, párrafo 1, letra a. RGPD; El consentimiento puede revocarse en cualquier momento. La transferencia de datos a los EE. UU. se basa en las cláusulas contractuales estándar de la Comisión de la UE. Los detalles se pueden encontrar aquí: https://www.facebook.com/legal/EU_data_transfer_addendum y https://de -de.facebook.com/help/566994660333381

    En la medida en que los datos personales se recopilen en nuestro sitio web y se envíen a Facebook utilizando la herramienta aquí descrita, nosotros y Facebook Ireland Limited, 4 Grand Canal Square, GrandCanal Harbour , Dublin 2, Irlanda son corresponsables del Responsable del tratamiento de datos (Art. 26 RGPD) La responsabilidad conjunta se limita exclusivamente a recoger los datos y transmitirlos a Facebook. El procesamiento realizado por Facebook después del reenvío no forma parte de la responsabilidad compartida. Las obligaciones que compartimos se han establecido en un acuerdo de procesamiento conjunto. El texto del acuerdo se puede encontrar en: https://www.facebook.com/legal/controller_addendum. Según este acuerdo, somos responsables de proporcionar información sobre protección de datos al utilizar la herramienta de Facebook y de la implementación segura de la herramienta en nuestro sitio web. Facebook es responsable de la seguridad de los datos de los productos de Facebook. Puede hacer valer los derechos del interesado (por ejemplo, solicitudes de información) sobre los datos procesados ​​por Facebook directamente en Facebook. Si hace valer sus derechos como interesado ante nosotros, estamos obligados a transmitirlos a Facebook. Puede encontrar más información sobre la protección de su privacidad en la información de protección de datos de Facebook: https://de-de.facebook.com/about/privacy/ También puede desactivar la función de remarketing "Públicos personalizados" en el área de configuración de publicidad en https://www.facebook.com/ads/preferences/?entry_product=ad_settings_screen. Para ello, debe iniciar sesión en Facebook. Si no tiene una cuenta de Facebook, puede desactivar la publicidad basada en el uso de Facebook en el sitio web de la Alianza Europea de Publicidad Digital Interactiva: http://www.youronlinechoices.com/de /praferenzmanagement/.

    Recopilación de datos mediante el uso de Google Analytics y uso de cookies
    Nuestro sitio web utiliza Google Analytics, un servicio de análisis web prestado por Google inc (https://www.google .de/about/) (1600 Amphitheatre Parkway, Mountain View, CA 94043, EE. UU.; en adelante “Google”). Google Analytics utiliza las llamadas "cookies" y en este contexto se crean perfiles de uso seudonimizados. Las “cookies” son archivos de texto que se almacenan en su ordenador y permiten analizar su uso del sitio web. Por ejemplo, se registra lo siguiente:
    • Información sobre el sistema operativo
    • sobre el navegador
    • Su dirección IP (nombre de host del ordenador que accede)
    • que proporcionó el sitio web al que accedió anteriormente (URL de referencia)
    • Fecha y hora de la solicitud del servidor.
    La información generada por este archivo de texto sobre el uso de nuestro sitio web se transmite a un servidor de Google en EE. UU. y se almacena allí. Google utilizará esta información para evaluar su uso de nuestro sitio web, para compilar informes sobre la actividad del sitio web para los operadores del sitio web y para proporcionar otros servicios relacionados con el sitio web y el uso de Internet con fines de investigación de mercado y diseño de estos sitios web en función de las necesidades. Si así lo exige la ley o si terceros procesan estos datos por encargo de Google, Google también transmitirá esta información a estos terceros. Este uso es anónimo o seudonimizado (enmascaramiento de IP).
    Usted puede impedir la instalación de cookies configurando su programa de usuario de Internet (navegador) correspondientemente. Sin embargo, nos gustaría señalar que, de este modo, es posible que no todas las funciones se puedan utilizar. Para ello, debe desactivar el almacenamiento de cookies en su navegador de Internet. Para obtener más información, consulte las instrucciones de uso de su navegador de Internet. Además, puede evitar la recopilación de los datos generados por la cookie y relacionados con su uso del sitio web (incluida su dirección IP) y el procesamiento de estos datos por parte de Google descargando e instalando un complemento del navegador (https: herramientas .google.com/dlpage/gaoptout?hl=de).
    Los datos procesados ​​por las cookies son necesarios para los fines mencionados para proteger nuestros intereses legítimos y los de terceros de conformidad con el artículo 6, apartado 1, frase 1, letra f del RGPD.
    Puede encontrar más información sobre protección de datos de Google en: https://www.google.de/intl/de/policies/privacy/

    Google utiliza la cookie DoubleClick DART < br> Los usuarios pueden optar por no utilizar la cookie de DART visitando la red publicitaria de Google y la política de privacidad de la red de contenido.
    No se almacenan datos personales directos del usuario, únicamente la dirección IP. Esta información se utiliza para reconocerle automáticamente la próxima vez que visite nuestros sitios web y para facilitarle la navegación. Por ejemplo, las cookies nos permiten personalizar un sitio web según sus intereses o guardar su contraseña para que no tenga que volver a ingresarla cada vez.
    Por supuesto, también puede ver nuestros sitios web sin cookies. Si no desea que reconozcamos su computadora, puede evitar que se almacenen cookies en su disco duro seleccionando "no aceptar cookies" en la configuración de su navegador. Consulte las instrucciones proporcionadas por el fabricante de su navegador para saber cómo funciona en detalle. Sin embargo, nos gustaría señalar que no aceptar cookies puede dar lugar a restricciones funcionales en nuestras ofertas.
    Usted puede impedir la instalación de cookies configurando su programa de usuario de Internet (navegador) correspondientemente. Para ello, debe desactivar el almacenamiento de cookies en su navegador de Internet. Para obtener más información, consulte las instrucciones de uso de su navegador de Internet.
    Puede encontrar más información sobre protección de datos de Google en: https://www.google.de/intl/de/policies/privacy/

    ', + 'data_protect_copy13' => 'Seguimiento de conversiones de Google Adwords
    Utilizamos el seguimiento de conversiones de Google para registrar estadísticamente el uso de nuestro sitio web y evaluarlo con el fin de optimizarlo para usted. Google instala una cookie en su ordenador si llega a nuestro sitio web a través de un anuncio de Google.
    Después de 30 días, estas cookies pierden su validez. No se utilizan para identificación personal. Si el usuario visita determinadas páginas del sitio web del cliente de Adwords y la cookie sigue siendo válida, Google y el cliente pueden reconocer que el usuario hizo clic en el anuncio y fue redirigido a esta página.
    Serán diferentes para cada cliente. Las cookies son establecidos y, por lo tanto, no pueden rastrearse a través de los sitios web de los clientes de Adwords. La información recopilada se utiliza para crear estadísticas de conversión para los clientes de Adwords que han optado por el seguimiento de conversiones. Se revela la siguiente información:
    • Número total de usuarios que hicieron clic en su anuncio y fueron redirigidos a una página con una etiqueta de seguimiento de conversiones.
    Sin embargo, no se publica información al respecto. se puede utilizar para identificar personalmente a los usuarios.
    Si no desea participar en el proceso de seguimiento, también puede rechazar la configuración necesaria de una cookie, por ejemplo, utilizando la configuración de su navegador que generalmente impide la configuración automática de cookies. desactivado. También puede desactivar las cookies para el seguimiento de conversiones configurando su navegador de modo que se bloqueen las cookies del dominio “www.googleadservices.com”.
    La política de privacidad de Google sobre el seguimiento de conversiones se puede encontrar aquí (https://services.google. es/sitestats/de.html)', + 'data_protect_copy2' => 'yo. Definiciones
    Para que nuestra declaración de protección de datos sea más fácil de entender, primero nos gustaría explicarle algunos de los términos utilizados. A los efectos de esta política de privacidad, el término:

    1) “datos personales” significa cualquier información relativa a una persona física identificada o identificable (en adelante “titular de los datos”); Se considera identificable a una persona física si puede identificarse directa o indirectamente, en particular mediante un identificador como un nombre, un número de identificación, datos de ubicación, un identificador en línea o una o más características especiales que expresen la identidad física, fisiológica, genética, psicológica, económica, cultural o social de esa persona física;

    2) "Tratamiento" significa cualquier operación o serie de operaciones realizadas con o sin la ayuda de procedimientos automatizados en relación con datos personales, tales como la recopilación, registro, organización, estructuración, almacenamiento, adaptación o modificación. , leer, recuperar, usar, divulgar mediante transmisión, difusión o cualquier otra forma de provisión, comparación o combinación, restricción, eliminación o destrucción;

    3)“restricción de procesamiento” significa el marcado de datos personales almacenados con el objetivo de restringir su procesamiento futuro;

    4) "Elaboración de perfiles" significa cualquier tipo de procesamiento automatizado de datos personales, que consiste en utilizar estos datos personales para evaluar ciertos aspectos personales relacionados con una persona física, en particular aspectos relacionados con el análisis o la predicción de esa persona física. desempeño laboral, situación económica, salud, preferencias personales, intereses, confiabilidad, comportamiento, ubicación o movimientos;

    5) "Seudonimización" significa el procesamiento de datos personales de tal manera que los datos personales ya no puedan asignarse a un interesado específico sin el uso de información adicional, siempre que esta información adicional se almacene por separado. y está sujeto a medidas técnicas y organizativas, que garantizan que los datos personales no sean asignados a una persona física identificada o identificable;

    6) “Responsable” significa la persona física o jurídica, autoridad pública, institución u otro organismo que, solo o junto con otros, decide sobre los fines y medios del procesamiento de datos personales; Si los fines y medios de dicho procesamiento están determinados por la legislación de la Unión o de los Estados miembros, el responsable del tratamiento o los criterios específicos para su designación podrán estar previstos por la legislación de la Unión o de los Estados miembros

    7)“Procesador” significa una persona física o jurídica, autoridad pública, agencia u otro organismo que procesa datos personales en nombre del controlador;

    8) “Destinatario” significa una persona física o jurídica, autoridad pública, agencia u otro organismo al que se revelan datos personales, independientemente de si es un tercero o no. Sin embargo, no se considerarán destinatarios las autoridades públicas que puedan recibir datos personales en el contexto de una tarea de investigación específica con arreglo al Derecho de la Unión o de los Estados miembros; el procesamiento de estos datos por parte de dichas autoridades se llevará a cabo de acuerdo con las normas de protección de datos aplicables de acuerdo con los fines del procesamiento;

    9) “Tercero” significa una persona física o jurídica, autoridad pública, agencia u otro organismo, distinto del interesado, el responsable del tratamiento, el encargado del tratamiento y las personas autorizadas bajo la responsabilidad directa del responsable del tratamiento o el procesador para procesar datos personales;

    10) “Consentimiento” del interesado significa cualquier manifestación de voluntad voluntaria, informada e inequívoca en el caso concreto en forma de declaración u otro acto confirmatorio claro mediante el cual el interesado indica que acepta el tratamiento de los datos personales que le conciernen;

    11) “violación de datos personales” significa una violación de la seguridad que, ya sea accidental o ilegal, resulta en la destrucción, pérdida, alteración o divulgación no autorizada o acceso a datos personales, que han sido transmitidos, almacenados o procesado de otra manera.

    ', + 'data_protect_copy3' => 'II. Persona responsable
    La persona responsable en el sentido del Reglamento General de Protección de Datos, así como de las leyes de protección de datos aplicables en los estados miembros de la Unión Europea y otras normas de protección de datos es:

    mivita care gmbh
    Sr. Alois Ried
    Leinfeld 2
    87755 Kirchhaslach
    Teléfono: +49 (0) 8333 94 61 767
    Correo electrónico: info@mivita.care< br>

    ', + 'data_protect_copy4' => '', + 'data_protect_copy5' => '
    Nuestro sitio web utiliza cookies. Las cookies son pequeños archivos de texto que se almacenan y almacenan en un sistema informático a través de un navegador de Internet.
    Muchos sitios web y servidores utilizan cookies. Muchas cookies contienen el llamado ID de cookie. Una ID de cookie es un identificador único de la cookie. Consiste en una cadena a través de la cual se pueden asignar sitios web y servidores al navegador de Internet específico en el que se almacenó la cookie. Esto permite a los sitios web y servidores visitados distinguir el navegador individual del interesado de otros navegadores de Internet que contienen otras cookies. Se puede reconocer e identificar un navegador de Internet específico mediante el ID de cookie único.
    Al utilizar cookies, podemos brindarle servicios más fáciles de usar que no serían posibles sin la configuración de cookies.
    Utilizando una cookie, la información y las ofertas de nuestro sitio web se pueden optimizar para el usuario. Como ya se ha mencionado, las cookies nos permiten reconocer a los usuarios de nuestro sitio web. El objetivo de este reconocimiento es facilitarle el uso de nuestros sitios web. Por ejemplo, el usuario de un sitio web que utiliza cookies no tiene que volver a introducir sus datos de acceso cada vez que visita el sitio web porque esto lo hace el sitio web y la cookie almacenada en el sistema informático del usuario.
    Los datos procesados ​​por las cookies son necesarios para los fines mencionados para proteger nuestros intereses legítimos de conformidad con el artículo 6, apartado 1, frase 1, letra f del RGPD.
    Usted puede impedir la instalación de cookies a través de nuestro sitio web en cualquier momento ajustando la configuración apropiada en el navegador de Internet utilizado y así oponerse permanentemente a la instalación de cookies. Además, las cookies ya instaladas se pueden eliminar en cualquier momento mediante un navegador de Internet u otros programas de software. Esto es posible en todos los navegadores de Internet habituales. Si desactiva la configuración de cookies en el navegador de Internet que utiliza, es posible que no todas las funciones de nuestro sitio web sean plenamente utilizables.

    IV.Datos e información que se almacenan cuando visita nuestro sitio web
    Cada vez que visita nuestro sitio web, se registran datos e información generales que se almacenan en los archivos de registro del servidor.

    Se pueden recopilar los siguientes datos/información:
    - los tipos y versiones del navegador utilizados - el sistema operativo utilizado - el sitio web desde el que accede a nuestro sitio web - el sub -sitios a los que se accede en nuestro sitio web - la fecha y hora de acceso a nuestro sitio web, - su dirección IP - su proveedor de servicios de Internet - otros datos e información similares que sirven para evitar peligros en caso de ataques a nuestros sistemas informáticos.

    Necesitamos esta información para poder proporcionar con precisión el contenido de nuestro sitio web. garantizar la funcionalidad a largo plazo de nuestro sistema informático y poder proporcionar a las autoridades la información necesaria para el procesamiento penal en caso de un ciberataque. Este es también nuestro interés legítimo dentro de la base jurídica para el procesamiento de estos datos de conformidad con el artículo 6, apartado 1, letra f del RGPD. Al utilizar estos datos e información generales no extraemos ninguna conclusión sobre el interesado. Almacenamos los datos anónimos de los archivos de registro del servidor por separado de todos los datos personales. V. Contactarnos electrónicamente

    Debido a las regulaciones de la Ley de Telemedia (TMG), estamos obligados a proporcionar una dirección de correo electrónico general en el pie de página de nuestro sitio web, que puede utilizar para contactarnos por correo electrónico. También tiene la opción de contactarnos utilizando los formularios de contacto de nuestro sitio web. Puede utilizar los formularios de contacto para realizar consultas sobre los productos o nuestro negocio o postularse como consultor. Los datos personales que nos envíe a través de correo electrónico o nuestros formularios de contacto se almacenarán automáticamente con el fin de procesarlo o contactarlo.

    Al enviar su mensaje, usted consiente el procesamiento de los datos transmitidos. El procesamiento se lleva a cabo sobre la base del artículo 6, párrafo 1, letra a del RGPD con su consentimiento. Podrás revocar tu consentimiento en cualquier momento notificándonoslo, sin que ello afecte a la licitud del tratamiento realizado en base a tu consentimiento antes de su revocación. Sólo utilizamos su dirección de correo electrónico para procesar su solicitud. Sus datos se eliminarán a menos que haya dado su consentimiento para su posterior procesamiento y uso.

    ', + 'data_protect_copy6' => 'VI. Base legal para el procesamiento
    Si obtenemos su consentimiento para un propósito de procesamiento específico, el Art. 6 I letra a del RGPD sirve como base legal para el proceso de procesamiento.

    Si el procesamiento de datos personales es necesario para cumplir un contrato, el procesamiento se basa en el Art. 6 I letra b del RGPD. Esto también se aplica a las operaciones de procesamiento que son necesarias para llevar a cabo medidas precontractuales, como consultas sobre nuestros productos u otros servicios.

    Si estamos sujetos a una obligación legal que requiere el procesamiento de datos personales, como por ejemplo para cumplir con obligaciones fiscales, la base legal para el procesamiento es el Art. 6 I letra c del RGPD.

    Si el procesamiento de datos personales es necesario para proteger los intereses vitales del interesado o de otra persona física, el procesamiento se basaría en el Art. 6 I letra d del RGPD.

    En definitiva, el artículo 6 I letra f del RGPD puede ser la base jurídica para un tratamiento. Este es el caso si la operación de procesamiento no está cubierta por ninguna de las bases legales antes mencionadas y el procesamiento es necesario para proteger un interés legítimo de nuestra empresa o de un tercero, siempre que los intereses, derechos y libertades fundamentales del interesado no no prevalecerá. Si el procesamiento de datos personales se basa en el artículo 6 I letra f del RGPD, nuestro interés legítimo es llevar a cabo nuestras actividades comerciales en beneficio del bienestar de nuestros empleados/accionistas.

    ', + 'data_protect_copy7' => 'VII. Regulaciones legales o contractuales para el suministro de datos personales
    El suministro de datos personales es en parte requerido por la ley (por ejemplo, regulaciones fiscales) y también puede resultar de regulaciones contractuales (por ejemplo, información sobre el socio contractual). Si desea celebrar un contrato con nosotros, es necesario que nos proporcione datos personales, que posteriormente serán procesados ​​por nosotros. No proporcionar datos personales significaría que no podríamos celebrar un contrato con usted.

    ', + 'data_protect_copy8' => 'VIII. Eliminación/bloqueo de rutina de datos personales
    Solo procesamos y almacenamos datos personales durante el período necesario para lograr el propósito de almacenamiento o si así lo exige el legislador europeo u otro legislador en las leyes o reglamentos previstos. Si el propósito del almacenamiento ya no es aplicable o si expira un período de almacenamiento prescrito por el legislador europeo u otro legislador responsable, los datos personales serán bloqueados o eliminados de forma rutinaria y de acuerdo con las normas legales.

    Una vez transcurrido el respectivo período de conservación legal, los datos relevantes se eliminarán de forma rutinaria, a menos que ya no sean necesarios para cumplir el contrato o iniciar un contrato. Según las disposiciones legales en Alemania, el almacenamiento se realiza durante 10 años de conformidad con el artículo 147, apartado 1, AO, 257, apartado 1, números 1 y 4, apartado 4, HGB (libros, registros, informes de gestión, documentos contables, libros comerciales). , más relevantes para la fiscalidad), documentos, etc.) y 6 años según el artículo 257, apartado 1, números 2 y 3, apartado 4 del HGB (cartas comerciales).

    ', + 'data_protect_copy9' => 'IX. Sus derechos
    1) Derecho a confirmación e información
    Tiene derecho a solicitarnos confirmación sobre si se están procesando los datos personales relevantes. Si desea ejercer sus derechos legales, puede contactarnos en cualquier momento.

    También tiene derecho a recibir información gratuita de nuestra parte sobre los datos personales almacenados sobre usted y una copia de esta información. También tiene derecho a recibir información sobre la siguiente información:
    - los fines del procesamiento - las categorías de datos personales que se procesan - los destinatarios o categorías de destinatarios a quienes los datos personales han sido comunicados o se siguen divulgando, en particular destinatarios en terceros países u organizaciones internacionales - si es posible, el período previsto durante el cual se almacenarán los datos personales o, si esto no es posible, los criterios para determinar ese período - la existencia de un derecho de rectificación o eliminación de los datos personales que les conciernen o a la limitación del tratamiento por parte del responsable del tratamiento o al derecho a oponerse a este tratamiento (la existencia de un derecho a presentar una reclamación ante una autoridad de control) si los datos personales no se recogen del interesado: Toda la información disponible sobre el origen de los datos - la existencia de una toma de decisiones automatizada, incluida la elaboración de perfiles de conformidad con el artículo 22, apartados 1 y 4 del RGPD y, al menos en estos casos, información significativa sobre la lógica implicada y el alcance y los efectos previstos de dicho procesamiento para el interesado

    También tiene derecho a obtener información sobre si los datos personales han sido transmitidos a un tercer país o a una organización internacional. Si este es el caso, también tiene derecho a recibir información sobre las garantías adecuadas en relación con la transmisión.

    Si desea ejercer este derecho de información, puede contactar con nosotros en cualquier momento.

    2) Derecho de rectificación
    Tiene derecho a solicitar la corrección inmediata de los datos personales incorrectos que le conciernen. También tiene derecho, teniendo en cuenta los fines del procesamiento, a solicitar que se completen los datos personales incompletos, incluso mediante una declaración complementaria.

    Si desea ejercer este derecho de corrección, puede contactarnos en cualquier momento.

    3) Derecho de eliminación (“Derecho al olvido”)
    Tiene derecho a solicitar que los datos personales que le conciernen se eliminen inmediatamente, si se cumple una de las siguientes condiciones se apliquen los motivos y en la medida en que el procesamiento no sea necesario:
    - Los datos personales fueron recopilados o procesados ​​de otro modo para fines para los cuales ya no son necesarios; - Usted revoca su consentimiento en el que se basó el procesamiento de conformidad con el artículo 6, párrafo 1, letra a del RGPD o el artículo 9, párrafo 2, letra a del RGPD y no existe otra base legal para el procesamiento; - Usted envía de conformidad con el artículo 21, apartado 1 del RGPD Oponerse al procesamiento y no existan motivos legítimos imperiosos para el procesamiento, o usted se oponga al procesamiento de conformidad con el artículo 21, párrafo 2 del RGPD; - Los datos personales fueron procesados ​​ilegalmente; - La eliminación de datos personales es necesaria para cumplir con una obligación legal según la legislación de la Unión o de los Estados miembros a la que estamos sujetos. - Los datos personales se recopilaron en relación con los servicios de la sociedad de la información ofrecidos de conformidad con el artículo 8, apartado 1 del RGPD.

    ', + 'data_protect_stand_shop' => 'A partir de: 18 de febrero de 2022', + 'data_protect_stand_site' => 'A partir de: 5 de octubre de 2018', + 'data_protect' => 'Privacy Policy', + +]; diff --git a/resources/lang/es/email.php b/resources/lang/es/email.php index c2b7bdd..6a3cc84 100644 --- a/resources/lang/es/email.php +++ b/resources/lang/es/email.php @@ -1,122 +1,125 @@ 'cuenta activada', - 'account_active_copy1line' => 'Su cuenta ha sido activada después de una verificación exitosa. Puede encontrar su contrato de consultor en la página de inicio en el área de inicio de sesión de my.mivita.care. Inicie sesión con sus datos de usuario para realizar más pasos.', - 'account_incomplete_copy1line' => 'Tu cuenta no ha sido activada, tus datos no están completos. Siga el siguiente enlace para completar sus datos.', - 'activate_copy' => 'Confirme su correo electrónico y active su cuenta usando este enlace:', - 'active_copy1line' => 'Está recibiendo este correo electrónico porque hemos recibido una solicitud para cambiar la dirección de correo electrónico de su cuenta.', - 'button_account' => 'a la cuenta', - 'button_custom_payout' => 'para el pago', - 'change_e_mail' => 'cambiar dirección de correo electrónico', - 'checkout_copy1line' => 'Gracias por su pedido desde mivita.care. A continuación hemos incluido su pedido nuevamente para que lo revise.', - 'checkout_copy3line' => 'Si tienes alguna pregunta, siempre estamos ahí para ayudarte.', - 'checkout_copy3line_extern' => 'Realice su pedido a través de un consultor:', - 'checkout_custom_payout' => 'Su asesor ha reunido para usted los siguientes productos', - 'checkout_mail_bank_bic' => 'BIC:', - 'checkout_mail_bank_code' => 'propósito de uso', - 'checkout_mail_bank_holder' => 'Propietario de la cuenta:', - 'checkout_mail_bank_iban' => 'IBAN:', - 'checkout_mail_bank_name' => 'banco', - 'checkout_mail_bank_total' => 'cantidad total', - 'checkout_mail_deliver_addess' => 'Tu dirección de entrega:', - 'checkout_mail_deliver_customer' => 'Dirección de entrega al cliente:', - 'checkout_mail_hl1' => 'Ha pedido los siguientes artículos:', - 'checkout_mail_invoice_addess' => 'Su dirección de facturación:', - 'checkout_mail_order_for_extern' => 'Pedido del cliente a través de tienda externa:', - 'checkout_mail_order_for_me' => 'Solicite un consultor para usted:', - 'checkout_mail_order_for_membership' => 'Solicite un consultor para su membresía:', - 'checkout_mail_order_for_ot' => 'Solicite un asesor para su cliente:', - 'checkout_mail_order_for_wizard' => 'Solicite un consultor para su registro:', - 'checkout_mail_pay_approved' => 'Su pago ha sido aprobado, se creará una confirmación de pago automáticamente.', - 'checkout_mail_pay_error' => '¡Pago fallido!', - 'checkout_mail_pay_info' => 'información de pago:', - 'checkout_mail_pay_invoice_open' => 'El pago de su factura ha sido aprobado.', - 'checkout_mail_pay_pre' => 'El pago por adelantado:', - 'checkout_mail_pay_pre_c1' => 'por favor transfiera', - 'checkout_mail_pay_pre_c2' => 'EUR a los siguientes detalles de la cuenta para completar la compra.', - 'checkout_mail_pay_ref' => 'Referencia de pago:', - 'checkout_mail_pay_success' => '¡El pago está confirmado!', - 'checkout_mail_pay_with' => 'Pago con:', - 'checkout_mail_same_address' => 'La dirección de entrega es la misma que la dirección de facturación.', - 'checkout_mail_shipping' => 'Costos de embalaje y envío.', - 'checkout_mail_status_info' => 'Información de estado:', - 'checkout_mail_subtotal_ws' => 'total sin IVA', - 'checkout_mail_system_status' => 'Estado del sistema:', - 'checkout_mail_tax' => 'más el IVA', - 'checkout_mail_tax_info' => 'precio incluido IVA', - 'checkout_mail_total' => 'precio total', - 'checkout_mail_your_mail' => 'tu correo electrónico:', - 'checkout_subject' => 'tu pedido en', - 'checkout_subject_extern' => 'nuevo orden', - 'checkout_subject_paid' => 'confirmación de pago: su pedido en', - 'copy2line' => 'O copie este enlace en la barra de direcciones de su navegador.', - 'copy3line' => 'Estaremos encantados de responder cualquier pregunta adicional que pueda tener.', - 'copy_to_browser' => 'O copie este enlace en la barra de direcciones de su navegador.', - 'credit_copy1line' => '¡Tu crédito está aquí y realmente te lo mereces! Transferiremos el monto del pago a su cuenta en los próximos 5 días hábiles. Compruebe si sus datos bancarios actuales están almacenados en la cuenta de su centro de ventas (Mi cuenta -> Mis datos). Le deseamos un éxito continuo en MIVITA. ¿Quieres lograr aún más? Luego habla con tu patrocinador u otros líderes de equipo. Trabajarán con usted para desarrollar un camino muy personal hacia su éxito basado en nuestro plan de marketing. Saludos cordiales, su equipo MIVITA', - 'credit_title' => 'tu crédito en mivita.care', - 'dear_mrs' => 'Hola', - 'dear_sir' => 'Hola', - 'email' => 'correo electrónico', - 'email_incomplete' => 'Tus datos no están completos.', - 'email_subject' => 'mensaje de mivita.care', - 'email_verify' => 'confirme su dirección de correo electrónico', - 'email_verify_copy1line' => 'Gracias por su registro. Siga el siguiente enlace para confirmar su dirección de correo electrónico.', - 'first_name' => 'nombre de pila', - 'footer_copy1' => 'mivita care gmbh | Leinfeld 2 | 87755 Kirchhaslach | Teléfono: +49 (0) 8333 94 61 767 | Correo electrónico: info@mivita.care', - 'footer_copy2' => 'Director General: Alois Ried | Tribunal de registro: Memmingen | Número de registro: HRB 21591 | Número de identificación fiscal: DE 453867883', - 'footer_copy3' => '© 2020 Todos los derechos reservados', - 'greetings' => 'atentamente', - 'hello' => 'Hola', - 'invoice_copy1line' => 'Gracias por su pedido desde mivita.care. A continuación le enviaremos la factura de su pedido:', - 'invoice_subject' => 'Factura de su pedido', - 'invoice_title' => 'Factura de tu pedido en mivita.care', - 'last_name' => 'apellidos', - 'mail_confirm' => 'confirmar el correo', - 'message' => 'noticias', - 'phone' => 'teléfono', - 'request_from' => 'solicitud desde mivita.care', - 'reset_pass_copy1line' => 'Está recibiendo este correo electrónico porque hemos recibido una solicitud para restablecer la contraseña de su cuenta.', - 'reset_passwort' => 'restablecer la contraseña', - 'sales_partnership' => 'asociación de ventas', - 'sales_partnership_message' => 'aviso', - 'salutation' => 'saludo', - 'sender' => 'Tu equipo de mivita.care', - 'status_copy1line' => 'Estado de su pedido en mivita.care', - 'subject' => 'acerca de', - 'subject_activate' => 'activar la cuenta', - 'subject_custom_abo_payout' => 'Su pedido de suscripción individual de :nombre en mivita.care', - 'subject_custom_payout' => 'Su pedido personalizado de :name at mivita.care', - 'subject_reset' => 'restablecer la contraseña', - 'update_level_copy1line' => '¡Felicitaciones!

    ¡Estamos increíblemente orgullosos de ti! El mes pasado, con tus :tp TP, no solo alcanzaste tu calificación, sino que lograste algo increíble.

    Tu compromiso incansable y dedicación han dado sus frutos. A partir de ahora eres:

    :to


    ¡Este es un verdadero hito en tu carrera en MIVITA!', - 'update_level_title' => '¡Has Alcanzado Tu Siguiente Nivel Profesional!', - 'update_level_copy2line' => 'Tu éxito es nuestro éxito, y estamos emocionados de acompañarte en este viaje emocionante. Con este nuevo nivel, se abren aún más oportunidades para ti:

    - Comisiones más altas y mejores márgenes
    - Posibilidades expandidas para tu negocio
    - Más reconocimiento y estatus en el equipo', - 'update_level_copy3line' => '¡Esto es solo el comienzo!

    Tu éxito es la prueba de que el trabajo continuo y la pasión conducen a tus metas. Mantente enfocado, motiva a tu equipo y logra cosas aún mayores junto con nosotros.

    ¡Tu siguiente nivel ya te está esperando – y sabemos que lo lograrás!', - 'verify_copy1line' => 'Hemos almacenado datos sobre usted en nuestro sistema. Siga el siguiente enlace para confirmar su dirección de correo electrónico. También puedes cambiar o eliminar tus datos.', - 'verify_e_mail' => 'confirma tus datos y dirección de correo electrónico', - 'your_custom_abo_payout' => 'Su asesor personal de Mivita - :name ha elaborado un pedido de suscripción individual para usted. Ahora todo lo que tienes que hacer es pagar tu pedido de suscripción. Haga clic en el enlace y vaya a la página de pago de mivita.care.', - 'your_custom_payout' => 'Su asesor personal mivita - :name ha preparado un pedido personalizado para usted. Ahora sólo tienes que pagar tu pedido. Haz clic en el enlace y ve a la caja de mivita.care.', - 'your_request_from' => 'su solicitud de', - 'user_restore_subject' => 'Su cuenta ha sido restaurada', - 'user_restore_title' => 'Restauración de cuenta exitosa', - 'user_restore_greeting' => 'Hola :name,', - 'user_restore_copy1line' => 'nos complace informarle que su cuenta en mivita.care ha sido restaurada exitosamente.', - 'user_restore_copy2line' => 'Como su contraseña se restableció por razones de seguridad al eliminarse, debe establecer una nueva contraseña. Haga clic en el botón de abajo para restablecer su contraseña:', - 'user_restore_copy3line' => '• Su contraseña ha sido restablecida - por favor asigne una nueva contraseña a través del enlace anterior.
    • Si tenía una tienda: El nombre de la tienda (subdominio) se liberó al eliminar y debe reasignarse.', - 'user_restore_button' => 'Establecer nueva contraseña', - 'user_restore_account_valid' => 'Su membresía de consultor es válida hasta:', - 'user_restore_important' => 'Notas importantes:', +return [ + 'account_active' => 'cuenta activada', + 'account_active_copy1line' => 'Su cuenta ha sido activada después de una verificación exitosa. Puede encontrar su contrato de consultor en la página de inicio en el área de inicio de sesión de my.mivita.care. Inicie sesión con sus datos de usuario para realizar más pasos.', + 'account_incomplete_copy1line' => 'Tu cuenta no ha sido activada, tus datos no están completos. Siga el siguiente enlace para completar sus datos.', + 'activate_copy' => 'Confirme su correo electrónico y active su cuenta usando este enlace:', + 'active_copy1line' => 'Está recibiendo este correo electrónico porque hemos recibido una solicitud para cambiar la dirección de correo electrónico de su cuenta.', + 'button_account' => 'a la cuenta', + 'button_custom_payout' => 'para el pago', + 'change_e_mail' => 'cambiar dirección de correo electrónico', + 'checkout_copy1line' => 'Gracias por su pedido desde mivita.care. A continuación hemos incluido su pedido nuevamente para que lo revise.', + 'checkout_copy3line' => 'Si tienes alguna pregunta, siempre estamos ahí para ayudarte.', + 'checkout_copy3line_extern' => 'Realice su pedido a través de un consultor:', + 'checkout_custom_payout' => 'Su asesor ha reunido para usted los siguientes productos', + 'checkout_mail_bank_bic' => 'BIC:', + 'checkout_mail_bank_code' => 'propósito de uso', + 'checkout_mail_bank_holder' => 'Propietario de la cuenta:', + 'checkout_mail_bank_iban' => 'IBAN:', + 'checkout_mail_bank_name' => 'banco', + 'checkout_mail_bank_total' => 'cantidad total', + 'checkout_mail_deliver_addess' => 'Tu dirección de entrega:', + 'checkout_mail_deliver_customer' => 'Dirección de entrega al cliente:', + 'checkout_mail_hl1' => 'Ha pedido los siguientes artículos:', + 'checkout_mail_invoice_addess' => 'Su dirección de facturación:', + 'checkout_mail_order_for_extern' => 'Pedido del cliente a través de tienda externa:', + 'checkout_mail_order_for_me' => 'Solicite un consultor para usted:', + 'checkout_mail_order_for_membership' => 'Solicite un consultor para su membresía:', + 'checkout_mail_order_for_ot' => 'Solicite un asesor para su cliente:', + 'checkout_mail_order_for_wizard' => 'Solicite un consultor para su registro:', + 'checkout_mail_pay_approved' => 'Su pago ha sido aprobado, se creará una confirmación de pago automáticamente.', + 'checkout_mail_pay_error' => '¡Pago fallido!', + 'checkout_mail_pay_info' => 'información de pago:', + 'checkout_mail_pay_invoice_open' => 'El pago de su factura ha sido aprobado.', + 'checkout_mail_pay_pre' => 'El pago por adelantado:', + 'checkout_mail_pay_pre_c1' => 'por favor transfiera', + 'checkout_mail_pay_pre_c2' => 'EUR a los siguientes detalles de la cuenta para completar la compra.', + 'checkout_mail_pay_ref' => 'Referencia de pago:', + 'checkout_mail_pay_success' => '¡El pago está confirmado!', + 'checkout_mail_pay_with' => 'Pago con:', + 'checkout_mail_same_address' => 'La dirección de entrega es la misma que la dirección de facturación.', + 'checkout_mail_shipping' => 'Costos de embalaje y envío.', + 'checkout_mail_status_info' => 'Información de estado:', + 'checkout_mail_subtotal_ws' => 'total sin IVA', + 'checkout_mail_system_status' => 'Estado del sistema:', + 'checkout_mail_tax' => 'más el IVA', + 'checkout_mail_tax_info' => 'precio incluido IVA', + 'checkout_mail_total' => 'precio total', + 'checkout_mail_your_mail' => 'tu correo electrónico:', + 'checkout_subject' => 'tu pedido en', + 'checkout_subject_extern' => 'nuevo orden', + 'checkout_subject_paid' => 'confirmación de pago: su pedido en', + 'copy2line' => 'O copie este enlace en la barra de direcciones de su navegador.', + 'copy3line' => 'Estaremos encantados de responder cualquier pregunta adicional que pueda tener.', + 'copy_to_browser' => 'O copie este enlace en la barra de direcciones de su navegador.', + 'credit_copy1line' => '¡Tu crédito está aquí y realmente te lo mereces! Transferiremos el monto del pago a su cuenta en los próximos 5 días hábiles. Compruebe si sus datos bancarios actuales están almacenados en la cuenta de su centro de ventas (Mi cuenta -> Mis datos). Le deseamos un éxito continuo en MIVITA. ¿Quieres lograr aún más? Luego habla con tu patrocinador u otros líderes de equipo. Trabajarán con usted para desarrollar un camino muy personal hacia su éxito basado en nuestro plan de marketing. Saludos cordiales, su equipo MIVITA', + 'credit_title' => 'tu crédito en mivita.care', + 'dear_mrs' => 'Hola', + 'dear_sir' => 'Hola', + 'email' => 'correo electrónico', + 'email_incomplete' => 'Tus datos no están completos.', + 'email_subject' => 'mensaje de mivita.care', + 'email_verify' => 'confirme su dirección de correo electrónico', + 'email_verify_copy1line' => 'Gracias por su registro. Siga el siguiente enlace para confirmar su dirección de correo electrónico.', + 'first_name' => 'nombre de pila', + 'footer_copy1' => 'mivita care gmbh | Leinfeld 2 | 87755 Kirchhaslach | Teléfono: +49 (0) 8333 94 61 767 | Correo electrónico: info@mivita.care', + 'footer_copy2' => 'Director General: Alois Ried | Tribunal de registro: Memmingen | Número de registro: HRB 21591 | Número de identificación fiscal: DE 453867883', + 'footer_copy3' => '© 2020 Todos los derechos reservados', + 'greetings' => 'atentamente', + 'hello' => 'Hola', + 'invoice_copy1line' => 'Gracias por su pedido desde mivita.care. A continuación le enviaremos la factura de su pedido:', + 'invoice_subject' => 'Factura de su pedido', + 'invoice_title' => 'Factura de tu pedido en mivita.care', + 'cancellation_invoice_copy1line' => 'Adjunto encontrará la factura de cancelación de su pedido:', + 'cancellation_invoice_title' => 'Factura de cancelación de tu pedido en mivita.care', + 'cancellation_invoice_subject' => 'Factura de cancelación de su pedido', + 'last_name' => 'apellidos', + 'mail_confirm' => 'confirmar el correo', + 'message' => 'noticias', + 'phone' => 'teléfono', + 'request_from' => 'solicitud desde mivita.care', + 'reset_pass_copy1line' => 'Está recibiendo este correo electrónico porque hemos recibido una solicitud para restablecer la contraseña de su cuenta.', + 'reset_passwort' => 'restablecer la contraseña', + 'sales_partnership' => 'asociación de ventas', + 'sales_partnership_message' => 'aviso', + 'salutation' => 'saludo', + 'sender' => 'Tu equipo de mivita.care', + 'status_copy1line' => 'Estado de su pedido en mivita.care', + 'subject' => 'acerca de', + 'subject_activate' => 'activar la cuenta', + 'subject_custom_abo_payout' => 'Su pedido de suscripción individual de :nombre en mivita.care', + 'subject_custom_payout' => 'Su pedido personalizado de :name at mivita.care', + 'subject_reset' => 'restablecer la contraseña', + 'update_level_copy1line' => '¡Felicitaciones!

    ¡Estamos increíblemente orgullosos de ti! El mes pasado, con tus :tp TP, no solo alcanzaste tu calificación, sino que lograste algo increíble.

    Tu compromiso incansable y dedicación han dado sus frutos. A partir de ahora eres:

    :to


    ¡Este es un verdadero hito en tu carrera en MIVITA!', + 'update_level_title' => '¡Has Alcanzado Tu Siguiente Nivel Profesional!', + 'update_level_copy2line' => 'Tu éxito es nuestro éxito, y estamos emocionados de acompañarte en este viaje emocionante. Con este nuevo nivel, se abren aún más oportunidades para ti:

    - Comisiones más altas y mejores márgenes
    - Posibilidades expandidas para tu negocio
    - Más reconocimiento y estatus en el equipo', + 'update_level_copy3line' => '¡Esto es solo el comienzo!

    Tu éxito es la prueba de que el trabajo continuo y la pasión conducen a tus metas. Mantente enfocado, motiva a tu equipo y logra cosas aún mayores junto con nosotros.

    ¡Tu siguiente nivel ya te está esperando – y sabemos que lo lograrás!', + 'verify_copy1line' => 'Hemos almacenado datos sobre usted en nuestro sistema. Siga el siguiente enlace para confirmar su dirección de correo electrónico. También puedes cambiar o eliminar tus datos.', + 'verify_e_mail' => 'confirma tus datos y dirección de correo electrónico', + 'your_custom_abo_payout' => 'Su asesor personal de Mivita - :name ha elaborado un pedido de suscripción individual para usted. Ahora todo lo que tienes que hacer es pagar tu pedido de suscripción. Haga clic en el enlace y vaya a la página de pago de mivita.care.', + 'your_custom_payout' => 'Su asesor personal mivita - :name ha preparado un pedido personalizado para usted. Ahora sólo tienes que pagar tu pedido. Haz clic en el enlace y ve a la caja de mivita.care.', + 'your_request_from' => 'su solicitud de', + 'user_restore_subject' => 'Su cuenta ha sido restaurada', + 'user_restore_title' => 'Restauración de cuenta exitosa', + 'user_restore_greeting' => 'Hola :name,', + 'user_restore_copy1line' => 'nos complace informarle que su cuenta en mivita.care ha sido restaurada exitosamente.', + 'user_restore_copy2line' => 'Como su contraseña se restableció por razones de seguridad al eliminarse, debe establecer una nueva contraseña. Haga clic en el botón de abajo para restablecer su contraseña:', + 'user_restore_copy3line' => '• Su contraseña ha sido restablecida - por favor asigne una nueva contraseña a través del enlace anterior.
    • Si tenía una tienda: El nombre de la tienda (subdominio) se liberó al eliminar y debe reasignarse.', + 'user_restore_button' => 'Establecer nueva contraseña', + 'user_restore_account_valid' => 'Su membresía de consultor es válida hasta:', + 'user_restore_important' => 'Notas importantes:', - // DHL Tracking E-Mail - 'dhl_tracking_subject' => 'Tu envío está en camino - mivita.care', - 'dhl_tracking_subject_multiple' => 'Tus :count envíos están en camino - mivita.care', - 'dhl_tracking_title' => '¡Tu envío está en camino!', - 'dhl_tracking_preview' => 'Número de seguimiento: :number - Rastrea tu paquete con DHL', - 'dhl_tracking_message' => '¡buenas noticias! Tu pedido ha sido enviado y está en camino hacia ti.', - 'dhl_tracking_message_multiple' => '¡buenas noticias! Tu pedido ha sido enviado en :count paquetes y está en camino hacia ti.', - 'dhl_tracking_package_label' => 'Paquete :number', - 'dhl_tracking_number_label' => 'Tu número de seguimiento', - 'dhl_tracking_order_ref' => 'Número de pedido: :order', - 'dhl_tracking_button' => 'Rastrear envío con DHL', - 'dhl_tracking_info' => 'Puedes consultar el estado actual de tu envío en cualquier momento a través del botón de arriba en DHL.', -); + // DHL Tracking E-Mail + 'dhl_tracking_subject' => 'Tu envío está en camino - mivita.care', + 'dhl_tracking_subject_multiple' => 'Tus :count envíos están en camino - mivita.care', + 'dhl_tracking_title' => '¡Tu envío está en camino!', + 'dhl_tracking_preview' => 'Número de seguimiento: :number - Rastrea tu paquete con DHL', + 'dhl_tracking_message' => '¡buenas noticias! Tu pedido ha sido enviado y está en camino hacia ti.', + 'dhl_tracking_message_multiple' => '¡buenas noticias! Tu pedido ha sido enviado en :count paquetes y está en camino hacia ti.', + 'dhl_tracking_package_label' => 'Paquete :number', + 'dhl_tracking_number_label' => 'Tu número de seguimiento', + 'dhl_tracking_order_ref' => 'Número de pedido: :order', + 'dhl_tracking_button' => 'Rastrear envío con DHL', + 'dhl_tracking_info' => 'Puedes consultar el estado actual de tu envío en cualquier momento a través del botón de arriba en DHL.', +]; diff --git a/resources/lang/es/home.php b/resources/lang/es/home.php index f69b2c3..dc6803b 100644 --- a/resources/lang/es/home.php +++ b/resources/lang/es/home.php @@ -29,6 +29,13 @@ return array( 'manage_membership_now_here' => 'gestiona tu membresía aquí ahora', 'membership' => 'afiliación', 'news_updates' => 'Noticias y Actualizaciones', + 'news_archive' => 'Archivo de Noticias', + 'news_archive_title' => 'Todas las Noticias y Actualizaciones', + 'news_archive_current' => 'Noticia actual', + 'news_archive_older' => 'Publicaciones anteriores', + 'news_archive_empty' => 'No hay publicaciones anteriores disponibles.', + 'news_archive_link' => 'Ver todas las noticias', + 'news_back_to_dashboard' => 'Volver al panel', 'open_since' => 'abierto desde', 'open_your_shop' => 'abre tu propia tienda mivita', 'read_less' => 'Mostrar menos', diff --git a/resources/lang/es/navigation.php b/resources/lang/es/navigation.php index bf2076f..5e6fc33 100644 --- a/resources/lang/es/navigation.php +++ b/resources/lang/es/navigation.php @@ -1,75 +1,82 @@ 'Suscripción', - 'abos' => 'Suscripciones', - 'add' => 'agregar', - 'attribute' => 'atributos', - 'business' => 'negocio', - 'career_level' => 'nivel de carrera', - 'categories' => 'categorías', - 'clients' => 'clientes', - 'commissions' => 'comisiones', - 'contents' => 'contenido', - 'countries' => 'países', - 'credit' => 'créditos', - 'customerabo' => 'Suscripción de cliente', - 'customerabos' => 'Suscripciones de clientes', - 'do_order' => 'hacer un pedido', - 'documents' => 'documentos', - 'downloadcenter' => 'Centro de descargas', - 'edit' => 'editar', - 'export' => 'exportar', - 'files' => 'Archivos', - 'general' => 'generalmente', - 'home' => 'hogar', - 'ingredients' => 'ingredientes', - 'invoice' => 'rechnungen', - 'language' => 'idioma', - 'languages' => 'idiomas', - 'logout' => 'cerrar sesión', - 'manage' => 'administrar', - 'member' => 'tutor', - 'member_register' => 'registrar asesor', - 'membership' => 'afiliación', - 'modules' => 'módulos', - 'my_account' => 'mi cuenta', - 'my_clients' => 'mis clientes', - 'my_data' => 'mis datos', - 'my_homeparty' => 'mi fiesta de descanso', - 'my_membership' => 'mi membresía', - 'my_orders' => 'mis ordenes', - 'my_shop' => 'mi tienda', - 'my_team' => 'mi equipo', - 'myabo' => 'mi suscripción', - 'myabos' => 'Mis suscripciones', - 'new_member' => 'nuevo tutor', - 'order' => 'orden', - 'orders' => 'pedidos', - 'overview' => 'descripción general', - 'payment_links' => 'Enlaces de pago', - 'payment_methods' => 'métodos de pago', - 'payments' => 'finanzas', - 'points' => 'puntos', - 'products' => 'productos', - 'sales_volumes' => 'volúmenes de ventas', - 'settings' => 'ajustes', - 'shipping_costs' => 'envío', - 'start_site' => 'pagina de inicio', - 'structure' => 'estructura', - 'system_settings' => 'sistema E.', - 'tags' => 'Etiquetas', - 'tax_advisor' => 'Asesor fiscal', - 'translate' => 'traducciones', - 'translation' => 'traducción', - 'trigger' => 'desencadenar', - 'user_roles' => 'derechos de los usuarios', - 'dhl_cockpit' => 'Cabina DHL', - 'revenue' => 'Ingresos', - 'level_reports' => 'Informes de Nivel', - 'marketingplan' => 'Plan de Marketing', - 'dashboard' => 'Panel', - 'dashboard_news' => 'Noticias del Panel', - 'shop' => 'Tienda', - 'to_shop' => 'A la Tienda', -); +return [ + 'abo' => 'Suscripción', + 'abos' => 'Suscripciones', + 'add' => 'agregar', + 'attribute' => 'atributos', + 'business' => 'negocio', + 'career_level' => 'nivel de carrera', + 'categories' => 'categorías', + 'clients' => 'clientes', + 'commissions' => 'comisiones', + 'contents' => 'contenido', + 'countries' => 'países', + 'credit' => 'créditos', + 'customerabo' => 'Suscripción de cliente', + 'customerabos' => 'Suscripciones de clientes', + 'do_order' => 'hacer un pedido', + 'documents' => 'documentos', + 'downloadcenter' => 'Centro de descargas', + 'edit' => 'editar', + 'export' => 'exportar', + 'files' => 'Archivos', + 'general' => 'generalmente', + 'home' => 'hogar', + 'ingredients' => 'ingredientes', + 'invoice' => 'rechnungen', + 'language' => 'idioma', + 'languages' => 'idiomas', + 'logout' => 'cerrar sesión', + 'manage' => 'administrar', + 'member' => 'tutor', + 'member_register' => 'registrar asesor', + 'membership' => 'afiliación', + 'modules' => 'módulos', + 'my_account' => 'mi cuenta', + 'my_clients' => 'mis clientes', + 'my_data' => 'mis datos', + 'my_homeparty' => 'mi fiesta de descanso', + 'my_membership' => 'mi membresía', + 'my_orders' => 'mis ordenes', + 'my_shop' => 'mi tienda', + 'my_team' => 'mi equipo', + 'myabo' => 'mi suscripción', + 'myabos' => 'Mis suscripciones', + 'new_member' => 'nuevo tutor', + 'order' => 'orden', + 'orders' => 'pedidos', + 'overview' => 'descripción general', + 'payment_links' => 'Enlaces de pago', + 'payment_methods' => 'métodos de pago', + 'payments' => 'finanzas', + 'points' => 'puntos', + 'products' => 'productos', + 'sales_volumes' => 'volúmenes de ventas', + 'settings' => 'ajustes', + 'shipping_costs' => 'envío', + 'start_site' => 'pagina de inicio', + 'structure' => 'estructura', + 'system_settings' => 'sistema E.', + 'tags' => 'Etiquetas', + 'tax_advisor' => 'Asesor fiscal', + 'translate' => 'traducciones', + 'translation' => 'traducción', + 'trigger' => 'desencadenar', + 'user_roles' => 'derechos de los usuarios', + 'user_cleanup' => 'Limpieza de usuarios', + 'user_restore' => 'Restaurar usuario', + 'dhl_cockpit' => 'Cabina DHL', + 'revenue' => 'Ingresos', + 'level_reports' => 'Informes de Nivel', + 'marketingplan' => 'Plan de Marketing', + 'dashboard' => 'Panel', + 'dashboard_news' => 'Noticias del Panel', + 'shop' => 'Tienda', + 'to_shop' => 'A la Tienda', + 'teamabos' => 'Suscripciones del Equipo', + 'customer_orders' => 'Pedidos de clientes', + 'external_orders' => 'Pedidos externos', + 'tools' => 'Herramientas', + 'news_archive' => 'Archivo de Noticias', +]; diff --git a/resources/lang/es/order.php b/resources/lang/es/order.php index 0f66078..a54c9d2 100644 --- a/resources/lang/es/order.php +++ b/resources/lang/es/order.php @@ -1,119 +1,122 @@ 'IVA', - 'add_customer' => 'agregar clientes', - 'advertising_material' => 'materiales de publicidad', - 'adviser_collective_invoice' => 'asesor de facturación colectiva', - 'adviser_order_for_membership' => 'nombramiento de asesor de membresía', - 'adviser_order_for_registration' => 'Cita del consultor para el registro.', - 'art_no' => 'artículo No.', - 'article' => 'artículo', - 'article_remove' => 'eliminar artículo', - 'assigned_advisor' => 'asignar consultores', - 'assigned_counsellor' => 'asesor asignado', - 'billing_address_of_client' => 'dirección de facturación del cliente', - 'billing_address_of_the_advisor' => 'dirección de facturación del consultor', - 'client_order_via_shop' => 'pedido del cliente a través de la tienda', - 'collective_invoice' => 'factura colectiva', - 'collective_invoice_contains_orders' => 'la factura colectiva incluye los siguientes pedidos de clientes', - 'compensation_product' => 'producto de compensación', - 'confirm_and_proceed_to_checkout' => 'confirmar y proceder al pago', - 'confirm_and_proceed_to_order' => 'confirmar y continuar con el pedido', - 'confirm_and_send_order' => 'Finalizar el pedido y enviar el enlace de pago', - 'confirm_send_order_info' => 'Cuando se completa el pedido, se crea un enlace de pago y se envía a su cliente por correo electrónico.
    Su cliente puede entonces completar el pago y las mercancías serán enviadas, su comisión será acreditada cuando se complete el pago.', - 'consultant_order_for_home_party' => 'Nombramiento de un consultor para una fiesta en casa.', - 'content' => 'contenido', - 'contents' => 'contenido', - 'cpay' => 'El cliente paga', - 'cpay_text' => 'Mi cliente recibe un enlace de pago y yo recibo mi comisión', - 'create_invoice' => 'hacer una factura', - 'date' => 'fecha', - 'delivery' => 'Entrega', - 'delivery_address_of_the_client' => 'dirección de entrega del cliente', - 'delivery_address_of_the_consultant' => 'dirección de entrega del consultor', - 'delivery_country_can_no_longer_be_changed' => 'El país de entrega ya no se puede cambiar.', - 'delivery_country_changed_customer_info' => 'El país de entrega solo puede ser cambiado por el cliente en Mis clientes.', - 'delivery_country_changed_info' => 'El país de entrega solo se puede cambiar en Mis datos.', - 'delivery_note' => 'nota de entrega', - 'delivery_to_me' => 'entrega a mi', - 'delivery_to_the_customer' => 'entrega al cliente', - 'deliverydata' => 'fechas de entrega', - 'different_delivery_address' => 'dirección de entrega diferente', - 'email_can_not_be_changed' => 'Su dirección de correo electrónico ya no se puede cambiar', - 'error_no_address_data_found' => 'Error: ¡No se encontraron datos de dirección!', - 'excl' => 'más', - 'external_orders' => 'órdenes externas', - 'external_orders_info_pay' => 'pagar = crear factura colectiva y pasar por caja', - 'external_orders_info_remove' => 'eliminar = los pedidos se moverán a eliminados, para cancelaciones, etc.', - 'external_orders_info_reset' => 'restablecer = los pedidos solo se mueven para abrir, las facturas colectivas no se modifican', - 'goods_are_for_customer_and_shipped' => 'Los productos son para un cliente y se envían al cliente.', - 'goods_are_for_me_and_shipped' => 'Los productos son para mí y serán enviados a mi dirección.', - 'gross' => 'bruto', - 'gross_price' => 'precio bruto', - 'incentives' => 'incentivos', - 'included_VAT' => 'VAT incluido', - 'invoice' => 'La factura', - 'invoice_address' => 'dirección de Envio', - 'ipay' => 'Pago', - 'ipay_text' => 'Pago menos mi margen y liquido el precio de venta con mi cliente', - 'land_can_no_longer_be_changed' => 'El país ya no se puede cambiar', - 'link_to_the_invoice' => 'enlace a la factura', - 'my_delivery_address' => 'mi direccion de entrega', - 'net' => 'neto', - 'net_price' => 'precio neto', - 'no_address_created' => 'no se ha creado ninguna dirección', - 'no_career_level_info' => 'Nota: Aún no se le ha asignado un nivel profesional. Por favor contacte con info@mivita.care', - 'no_delivery_address' => 'No se ha creado ninguna dirección de entrega', - 'no_order' => 'sin orden', - 'number_of_items' => 'número de items', - 'order' => 'orden', - 'order_abo_was_placed_successfully' => 'La orden de suscripción se creó exitosamente.', - 'order_consultant' => 'consultor de citas', - 'order_date' => 'fecha de orden', - 'order_for_client' => 'orden para el cliente', - 'order_for_consultant' => 'pedido de consultores', - 'order_number' => 'número de orden', - 'order_via_external_shop' => 'pedido a través de TIENDA externa', - 'order_was_placed_successfully' => 'El pedido se ha realizado correctamente.', - 'payment_link_for_your_customer' => 'El enlace de pago para su cliente', - 'plus_VAT' => 'más el IVA', - 'points' => 'puntos', - 'points_total' => 'puntos totales', - 'points_turnover_assigned' => 'puntos/ventas asignados', - 'product' => 'producto', - 'product_prices_career_level_cpay_info' => 'Los precios de los productos se muestran como precios de venta al cliente, después de completar el pago del cliente, recibirá su comisión de acuerdo con su nivel profesional. +return [ + 'VAT' => 'IVA', + 'add_customer' => 'agregar clientes', + 'advertising_material' => 'materiales de publicidad', + 'adviser_collective_invoice' => 'asesor de facturación colectiva', + 'adviser_order_for_membership' => 'nombramiento de asesor de membresía', + 'adviser_order_for_registration' => 'Cita del consultor para el registro.', + 'art_no' => 'artículo No.', + 'article' => 'artículo', + 'article_remove' => 'eliminar artículo', + 'assigned_advisor' => 'asignar consultores', + 'assigned_counsellor' => 'asesor asignado', + 'billing_address_of_client' => 'dirección de facturación del cliente', + 'billing_address_of_the_advisor' => 'dirección de facturación del consultor', + 'client_order_via_shop' => 'pedido del cliente a través de la tienda', + 'collective_invoice' => 'factura colectiva', + 'collective_invoice_contains_orders' => 'la factura colectiva incluye los siguientes pedidos de clientes', + 'compensation_product' => 'producto de compensación', + 'confirm_and_proceed_to_checkout' => 'confirmar y proceder al pago', + 'confirm_and_proceed_to_order' => 'confirmar y continuar con el pedido', + 'confirm_and_send_order' => 'Finalizar el pedido y enviar el enlace de pago', + 'confirm_send_order_info' => 'Cuando se completa el pedido, se crea un enlace de pago y se envía a su cliente por correo electrónico.
    Su cliente puede entonces completar el pago y las mercancías serán enviadas, su comisión será acreditada cuando se complete el pago.', + 'consultant_order_for_home_party' => 'Nombramiento de un consultor para una fiesta en casa.', + 'content' => 'contenido', + 'contents' => 'contenido', + 'cpay' => 'El cliente paga', + 'cpay_text' => 'Mi cliente recibe un enlace de pago y yo recibo mi comisión', + 'create_invoice' => 'hacer una factura', + 'date' => 'fecha', + 'delivery' => 'Entrega', + 'delivery_address_of_the_client' => 'dirección de entrega del cliente', + 'delivery_address_of_the_consultant' => 'dirección de entrega del consultor', + 'delivery_country_can_no_longer_be_changed' => 'El país de entrega ya no se puede cambiar.', + 'delivery_country_changed_customer_info' => 'El país de entrega solo puede ser cambiado por el cliente en Mis clientes.', + 'delivery_country_changed_info' => 'El país de entrega solo se puede cambiar en Mis datos.', + 'delivery_note' => 'nota de entrega', + 'delivery_to_me' => 'entrega a mi', + 'delivery_to_the_customer' => 'entrega al cliente', + 'deliverydata' => 'fechas de entrega', + 'different_delivery_address' => 'dirección de entrega diferente', + 'email_can_not_be_changed' => 'Su dirección de correo electrónico ya no se puede cambiar', + 'error_no_address_data_found' => 'Error: ¡No se encontraron datos de dirección!', + 'excl' => 'más', + 'external_orders' => 'órdenes externas', + 'external_orders_info_pay' => 'pagar = crear factura colectiva y pasar por caja', + 'external_orders_info_remove' => 'eliminar = los pedidos se moverán a eliminados, para cancelaciones, etc.', + 'external_orders_info_reset' => 'restablecer = los pedidos solo se mueven para abrir, las facturas colectivas no se modifican', + 'goods_are_for_customer_and_shipped' => 'Los productos son para un cliente y se envían al cliente.', + 'goods_are_for_me_and_shipped' => 'Los productos son para mí y serán enviados a mi dirección.', + 'gross' => 'bruto', + 'gross_price' => 'precio bruto', + 'incentives' => 'incentivos', + 'included_VAT' => 'VAT incluido', + 'invoice' => 'La factura', + 'invoice_address' => 'dirección de Envio', + 'ipay' => 'Pago', + 'ipay_text' => 'Pago menos mi margen y liquido el precio de venta con mi cliente', + 'land_can_no_longer_be_changed' => 'El país ya no se puede cambiar', + 'link_to_the_invoice' => 'enlace a la factura', + 'my_delivery_address' => 'mi direccion de entrega', + 'net' => 'neto', + 'net_price' => 'precio neto', + 'no_address_created' => 'no se ha creado ninguna dirección', + 'no_career_level_info' => 'Nota: Aún no se le ha asignado un nivel profesional. Por favor contacte con info@mivita.care', + 'no_delivery_address' => 'No se ha creado ninguna dirección de entrega', + 'no_order' => 'sin orden', + 'number_of_items' => 'número de items', + 'order' => 'orden', + 'order_abo_was_placed_successfully' => 'La orden de suscripción se creó exitosamente.', + 'order_consultant' => 'consultor de citas', + 'order_date' => 'fecha de orden', + 'order_for_client' => 'orden para el cliente', + 'order_for_consultant' => 'pedido de consultores', + 'order_number' => 'número de orden', + 'order_via_external_shop' => 'pedido a través de TIENDA externa', + 'order_was_placed_successfully' => 'El pedido se ha realizado correctamente.', + 'payment_link_for_your_customer' => 'El enlace de pago para su cliente', + 'plus_VAT' => 'más el IVA', + 'points' => 'puntos', + 'points_total' => 'puntos totales', + 'points_turnover_assigned' => 'puntos/ventas asignados', + 'product' => 'producto', + 'product_prices_career_level_cpay_info' => 'Los precios de los productos se muestran como precios de venta al cliente, después de completar el pago del cliente, recibirá su comisión de acuerdo con su nivel profesional. :user_level_name comisión:user_level_margin %.
    Nota: Si sales de la página, el carrito de compras se restablecerá.', - 'product_prices_career_level_info' => 'Los precios de los productos se muestran según su nivel de carrera :user_level_name menos el margen :user_level_margin %.
    Nota: si abandona la página, el carrito de compras se restablecerá .', - 'purchased_from_shop' => 'comprado en la tienda', - 'quantity' => 'número', - 'ship_to_existing_customer_select_customer' => 'enviar a clientes existentes | Seleccionar clientes', - 'ship_to_new_customer' => 'enviar a nuevo cliente', - 'ship_to_this_customer' => 'enviar a este cliente', - 'ship_to_this_customer_check' => 'Entiendo que este proceso de pedido es sólo para pedidos de clientes y no para mis propios pedidos.', - 'ship_to_this_customer_info' => 'Si la información siguiente es incorrecta o necesita ser actualizada, cámbiela primero', - 'ship_to_this_customer_info_2' => 'La dirección de entrega, excepto el país de entrega, también se puede ajustar en el proceso de pago.', - 'ship_to_this_email_info' => 'El enlace del pedido se enviará a su cliente a la siguiente dirección de correo electrónico', - 'shipping' => 'envío', - 'shipping_compensation_product' => 'producto de compensación de envío', - 'shipping_costs' => 'envío', - 'shopping_cart' => 'carro de la compra', - 'shopping_cart_delete' => 'vaciar carrito', - 'shopping_cart_update' => 'actualizar carrito de compra', - 'subtotal' => 'total parcial', - 'sum' => 'total', - 'sum_net' => 'total neto', - 'sums' => 'totales', - 'total' => 'en total', - 'total_gross' => 'bruto total', - 'total_net' => 'neto total', - 'total_price' => 'coste total', - 'total_shipping_costs' => 'costos totales de envío', - 'total_sum' => 'total', - 'total_sums' => 'totales', - 'total_without_VAT' => 'total sin IVA', - 'turnover' => 'el volumen de ventas', - 'unit_price' => 'precio único', - 'weight' => 'peso', - 'you_has_article_in_shopping_cart' => 'tienes :num artículos en tu carrito de compras', -); + 'product_prices_career_level_info' => 'Los precios de los productos se muestran según su nivel de carrera :user_level_name menos el margen :user_level_margin %.
    Nota: si abandona la página, el carrito de compras se restablecerá .', + 'purchased_from_shop' => 'comprado en la tienda', + 'quantity' => 'número', + 'ship_to_existing_customer_select_customer' => 'enviar a clientes existentes | Seleccionar clientes', + 'ship_to_new_customer' => 'enviar a nuevo cliente', + 'ship_to_this_customer' => 'enviar a este cliente', + 'ship_to_this_customer_check' => 'Entiendo que este proceso de pedido es sólo para pedidos de clientes y no para mis propios pedidos.', + 'ship_to_this_customer_info' => 'Si la información siguiente es incorrecta o necesita ser actualizada, cámbiela primero', + 'ship_to_this_customer_info_2' => 'La dirección de entrega, excepto el país de entrega, también se puede ajustar en el proceso de pago.', + 'ship_to_this_email_info' => 'El enlace del pedido se enviará a su cliente a la siguiente dirección de correo electrónico', + 'shipping' => 'envío', + 'shipping_compensation_product' => 'producto de compensación de envío', + 'shipping_costs' => 'envío', + 'shopping_cart' => 'carro de la compra', + 'shopping_cart_delete' => 'vaciar carrito', + 'shopping_cart_update' => 'actualizar carrito de compra', + 'subtotal' => 'total parcial', + 'sum' => 'total', + 'sum_net' => 'total neto', + 'sums' => 'totales', + 'total' => 'en total', + 'total_gross' => 'bruto total', + 'total_net' => 'neto total', + 'total_price' => 'coste total', + 'total_shipping_costs' => 'costos totales de envío', + 'total_sum' => 'total', + 'total_sums' => 'totales', + 'total_without_VAT' => 'total sin IVA', + 'turnover' => 'el volumen de ventas', + 'unit_price' => 'precio único', + 'weight' => 'peso', + 'you_has_article_in_shopping_cart' => 'tienes :num artículos en tu carrito de compras', + 'free_shipping' => 'Envío gratis', + 'free_shipping_reached' => 'Envío gratis a partir de :amount €', + 'free_shipping_info' => 'Solo faltan :missing € para el envío gratis (a partir de :amount €)', +]; diff --git a/resources/lang/es/payment.php b/resources/lang/es/payment.php index 74fe6da..fbf6d1d 100644 --- a/resources/lang/es/payment.php +++ b/resources/lang/es/payment.php @@ -1,166 +1,177 @@ 'American Express', - 'BIC' => 'BIC', - 'IBAN' => 'IBAN', - 'Mastercard' => 'Tarjeta MasterCard', - 'VAT' => 'IVA', - 'VISA' => 'VISA', - 'accepted_data_checkbox_customer' => 'Al hacer clic en "Comprar ahora" acepto las :gtc, las :c_policy y las :p_policy para que mis datos puedan ser procesados ​​para el pedido.', - 'accepted_data_checkbox_user' => 'Al hacer clic en "Comprar ahora" acepto los términos y condiciones generales y la información de protección de datos para que mis datos puedan ser tratados para el pedido.', - 'account_holder' => 'propietario de la cuenta', - 'advisor_order' => 'orden de consejero', - 'agree_SEPA_complete_purchase' => 'acepta el mandato de domiciliación bancaria SEPA y completa la compra', - 'alert_link_appointed' => 'El pago ha sido aprobado.', - 'alert_link_canceled' => 'El pago fue cancelado', - 'alert_link_check' => 'Pago en curso', - 'alert_link_failed' => 'Pago fallido', - 'alert_link_openly' => 'Enlace de pago abierto', - 'alert_link_paid' => 'El pago fue exitoso', - 'alert_link_pending' => 'Pago en curso', - 'alert_link_sent' => 'Enlace de pago enviado', - 'auto_renewal_hl' => 'prórroga automática', - 'auto_renewal_line_1' => '¡Más vale prevenir que lamentar! Recomendamos activar esta opción si desea mantener su membresía anual permanente. Si no se recibe un pago manual a tiempo después de que expire la membresía anual, el sistema desactivará su tienda en línea o su acceso al centro de ventas. Entonces ya no podrá realizar pedidos ni ver sus estadísticas hasta que otro pago reactive su cuenta. Por lo tanto, le aconsejamos que realice el pago mediante domiciliación bancaria SEPA. Guardamos este mandato y debitamos automáticamente tu cuota anual 14 días antes de que expire. De esta forma tendrás un proceso fluido sin tener que prestar atención.', - 'auto_renewal_line_2' => 'Por supuesto, puede revertir esta opción en cualquier momento en su cuenta o cancelar su cuenta/asociación de distribución con MIVITA.', - 'automatic_SEPA_mandate_type_was_selected' => 'Se ha seleccionado la renovación automática. Tu mandato SEPA se guardará y el pago anual se realizará automáticamente.', - 'back_to_shop' => 'volver a la tienda', - 'back_to_shop_shopping_cart' => 'volver al carrito de compras', - 'bank' => 'banco', - 'billing_address' => 'rechnungsadresse', - 'billing_address_can_only_changed_in_salescentre' => 'Su dirección de facturación sólo se puede cambiar en el centro de ventas.', - 'buy_now' => 'comprar ahora', - 'buy_now_copy' => 'Una vez que todos sus datos se hayan completado por completo, haga clic en "Comprar ahora" y será redirigido a nuestro proveedor de pagos; la conexión está cifrada con SSL.', - 'c_policy' => 'derecho a retirada', - 'cancelled' => 'cancelado', - 'check' => 'cheque', - 'checkout_ssl_server' => 'Será redirigido a nuestro servidor de pago, la conexión está cifrada con SSL.', - 'collective_invoice' => 'factura colectiva', - 'commission' => 'Comisión', - 'commission_growth_bonus' => 'Bono de crecimiento de comisiones', - 'commission_payline' => 'Línea de pago de comisiones', - 'commission_shop' => 'Tienda de comisiones', - 'commission_team' => 'Equipo de comisiones', - 'completed' => 'completado', - 'country_of_delivery' => 'país de entrega', - 'credit' => 'abono', - 'credit_added' => 'Crédito añadido', - 'credit_card' => 'tarjeta de crédito', - 'credit_card_number' => 'número de Tarjeta de Crédito', - 'customer_order' => 'pedido cliente', - 'delivery_country_can_only_changed_in_salescentre' => 'El país de entrega sólo se puede cambiar en el centro de ventas.', - 'delivery_country_cannot_change' => 'El país de entrega no se puede cambiar.', - 'excl' => 'más', - 'extern_open' => 'abierto externamente', - 'extern_paid' => 'pagado externamente', - 'external' => 'externo', - 'failed' => 'abortar', - 'firstname_lastname' => 'nombre de pila apellidos', - 'gtc' => 'términos generales y condiciones', - 'homeparty' => 'homeparty', - 'in_process' => 'en curso', - 'invoice_no_payment' => 'factura no pagada', - 'invoice_open' => 'factura abierta', - 'invoice_paid' => 'factura pagada', - 'link_appointed' => 'Pago aprobado', - 'link_canceled' => 'Pago cancelado', - 'link_check' => 'Pago en curso', - 'link_failed' => 'Pago fallido', - 'link_openly' => 'Enlace abierto', - 'link_paid' => 'pagado', - 'link_pending' => 'Pago en curso', - 'link_sent' => 'Enlace enviado', - 'link_was_paid' => 'El pago se completó exitosamente.', - 'membership' => 'membresía', - 'month' => 'mes', - 'months' => 'meses', - 'no_payment' => 'ningún pago', - 'not_assigned' => 'no asignado', - 'not_to_sales_tax_de' => 'no sujeto al impuesto sobre las ventas / DE', - 'not_to_sales_tax_foreign' => 'no sujeto al impuesto sobre las ventas / extranjero', - 'open' => 'abierto', - 'openly' => 'abierto', - 'order' => 'pedido', - 'ordered' => 'ordenado', - 'ordering_country' => 'país del pedido', - 'owner' => 'dueño', - 'p_policy' => 'protección de datos', - 'paid' => 'pagado', - 'paymend_failed' => 'pago cancelado', - 'paymend_open' => 'pago abierto', - 'paymend_paid' => 'pago pagado', - 'payment_by_SEPA' => 'pago vía SEPA', - 'payment_by_SEPA_info' => 'Su pago será procesado y se creará automáticamente una confirmación para el procesamiento del pago.', - 'payment_by_credit_card' => 'Pago con tarjeta de crédito:', - 'payment_by_credit_card_info' => 'Su pago ha sido aprobado, se creará una confirmación de pago automáticamente.', - 'payment_by_invoice' => 'pago mediante factura', - 'payment_by_invoice_info' => 'Su pedido será procesado y se creará automáticamente una confirmación para el procesamiento del pedido.', - 'payment_in_advance' => 'el pago por adelantado', - 'payment_method' => 'método de pago', - 'payment_method_not_enabled_please_contact' => 'método de pago no activado, por favor contáctanos', - 'paypal' => 'PayPal', - 'please_check_form_and_complete' => 'Por favor revisa el formulario y completa toda la información.', - 'please_transfer_amount_following_account' => 'Transfiera: cantidad EUR a los siguientes detalles de la cuenta para completar la compra.', - 'prepayment' => 'el pago por adelantado', - 'purchase_on_account' => 'compra a cuenta', - 'reason_for_payment' => 'propósito de uso', - 'registration' => 'registro', - 'remaining_time' => 'término restante', - 'removed' => 'eliminado', - 'reverse_charge_procedure' => 'procedimiento de inversión del sujeto pasivo', - 'select_and_proceed_to_checkout' => 'seleccione y proceda a pagar', - 'select_and_save' => 'seleccionar y guardar', - 'sepa_direct_debit' => 'débito directo SEPA', - 'shipped' => 'enviado', - 'shop' => 'Comercio', - 'shoporder' => 'pedido de tienda', - 'shoporder_pending' => 'pedido de tienda / pendiente', - 'sofort_bank_transfer' => 'transferencia bancaria instantánea', - 'status' => - array( - 'checkout_cancel' => 'proceso de pago cancelado', - 'checkout_error' => 'error en el proceso de pago', - 'checkout_payment' => 'verificar', - 'payment_approved' => 'pago aprobado: espere el correo electrónico', - 'payment_error' => 'error en el pago', - 'payment_not_found' => 'pago no encontrado', - 'payment_redirect' => 'pago en curso: espere el correo electrónico', - 'store_payment' => 'pago guardado', - 'success' => 'ejecutado con éxito', - 'success_payment' => 'pago exitoso', - 'txaction_appointed' => 'pago aprobado: se envió el correo electrónico; espere la confirmación', - 'txaction_failed' => 'error en el pago: se envió el correo electrónico', - 'txaction_paid' => 'pago confirmado: se ha enviado el correo electrónico', - ), - 'thank_you_very_much' => 'Gracias,', - 'to_sales_tax_de' => 'sujeto al impuesto sobre las ventas / DE', - 'total_amount' => 'cantidad total', - 'trade_fair' => 'feria de muestras', - 'valid' => 'Válido', - 'valid until' => 'válido hasta', - 'verification_no' => 'número de prueba', - 'we_have_received_your_order_get_email' => 'Hemos recibido tu pedido. En breve recibirá un correo electrónico de confirmación de su pedido de nuestra parte.', - 'your_mivita_team' => 'tu equipo de mivita.care', - 'your_order_number_is' => 'tu numero de orden es', +return [ + 'American Express' => 'American Express', + 'BIC' => 'BIC', + 'IBAN' => 'IBAN', + 'Mastercard' => 'Tarjeta MasterCard', + 'VAT' => 'IVA', + 'VISA' => 'VISA', + 'accepted_data_checkbox_customer' => 'Al hacer clic en "Comprar ahora" acepto las :gtc, las :c_policy y las :p_policy para que mis datos puedan ser procesados ​​para el pedido.', + 'accepted_data_checkbox_user' => 'Al hacer clic en "Comprar ahora" acepto los términos y condiciones generales y la información de protección de datos para que mis datos puedan ser tratados para el pedido.', + 'account_holder' => 'propietario de la cuenta', + 'advisor_order' => 'orden de consejero', + 'agree_SEPA_complete_purchase' => 'acepta el mandato de domiciliación bancaria SEPA y completa la compra', + 'alert_link_appointed' => 'El pago ha sido aprobado.', + 'alert_link_canceled' => 'El pago fue cancelado', + 'alert_link_check' => 'Pago en curso', + 'alert_link_failed' => 'Pago fallido', + 'alert_link_openly' => 'Enlace de pago abierto', + 'alert_link_paid' => 'El pago fue exitoso', + 'alert_link_pending' => 'Pago en curso', + 'alert_link_sent' => 'Enlace de pago enviado', + 'auto_renewal_hl' => 'prórroga automática', + 'auto_renewal_line_1' => '¡Más vale prevenir que lamentar! Recomendamos activar esta opción si desea mantener su membresía anual permanente. Si no se recibe un pago manual a tiempo después de que expire la membresía anual, el sistema desactivará su tienda en línea o su acceso al centro de ventas. Entonces ya no podrá realizar pedidos ni ver sus estadísticas hasta que otro pago reactive su cuenta. Por lo tanto, le aconsejamos que realice el pago mediante domiciliación bancaria SEPA. Guardamos este mandato y debitamos automáticamente tu cuota anual 14 días antes de que expire. De esta forma tendrás un proceso fluido sin tener que prestar atención.', + 'auto_renewal_line_2' => 'Por supuesto, puede revertir esta opción en cualquier momento en su cuenta o cancelar su cuenta/asociación de distribución con MIVITA.', + 'automatic_SEPA_mandate_type_was_selected' => 'Se ha seleccionado la renovación automática. Tu mandato SEPA se guardará y el pago anual se realizará automáticamente.', + 'back_to_shop' => 'volver a la tienda', + 'back_to_shop_shopping_cart' => 'volver al carrito de compras', + 'bank' => 'banco', + 'billing_address' => 'rechnungsadresse', + 'billing_address_can_only_changed_in_salescentre' => 'Su dirección de facturación sólo se puede cambiar en el centro de ventas.', + 'buy_now' => 'comprar ahora', + 'buy_now_copy' => 'Una vez que todos sus datos se hayan completado por completo, haga clic en "Comprar ahora" y será redirigido a nuestro proveedor de pagos; la conexión está cifrada con SSL.', + 'c_policy' => 'derecho a retirada', + 'cancelled' => 'cancelado', + 'check' => 'cheque', + 'checkout_ssl_server' => 'Será redirigido a nuestro servidor de pago, la conexión está cifrada con SSL.', + 'collective_invoice' => 'factura colectiva', + 'commission' => 'Comisión', + 'commission_growth_bonus' => 'Bono de crecimiento de comisiones', + 'commission_payline' => 'Línea de pago de comisiones', + 'commission_shop' => 'Tienda de comisiones', + 'commission_team' => 'Equipo de comisiones', + 'completed' => 'completado', + 'country_of_delivery' => 'país de entrega', + 'credit' => 'abono', + 'credit_added' => 'Crédito añadido', + 'credit_card' => 'tarjeta de crédito', + 'credit_card_number' => 'número de Tarjeta de Crédito', + 'customer_order' => 'pedido cliente', + 'delivery_country_can_only_changed_in_salescentre' => 'El país de entrega sólo se puede cambiar en el centro de ventas.', + 'delivery_country_cannot_change' => 'El país de entrega no se puede cambiar.', + 'excl' => 'más', + 'extern_open' => 'abierto externamente', + 'extern_paid' => 'pagado externamente', + 'external' => 'externo', + 'failed' => 'abortar', + 'firstname_lastname' => 'nombre de pila apellidos', + 'gtc' => 'términos generales y condiciones', + 'homeparty' => 'homeparty', + 'in_process' => 'en curso', + 'invoice_no_payment' => 'factura no pagada', + 'invoice_open' => 'factura abierta', + 'invoice_paid' => 'factura pagada', + 'link_appointed' => 'Pago aprobado', + 'link_canceled' => 'Pago cancelado', + 'link_check' => 'Pago en revisión', + 'link_failed' => 'Pago fallido', + 'link_openly' => 'Enlace abierto', + 'link_paid' => 'Pago exitoso', + 'link_pending' => 'Pago en curso', + 'link_sent' => 'Enlace enviado', + 'link_was_paid' => 'El pago se completó exitosamente.', + 'membership' => 'membresía', + 'month' => 'mes', + 'months' => 'meses', + 'no_payment' => 'ningún pago', + 'not_assigned' => 'no asignado', + 'not_to_sales_tax_de' => 'no sujeto al impuesto sobre las ventas / DE', + 'not_to_sales_tax_foreign' => 'no sujeto al impuesto sobre las ventas / extranjero', + 'open' => 'abierto', + 'openly' => 'abierto', + 'order' => 'pedido', + 'ordered' => 'ordenado', + 'ordering_country' => 'país del pedido', + 'owner' => 'dueño', + 'p_policy' => 'protección de datos', + 'paid' => 'pagado', + 'paymend_failed' => 'pago cancelado', + 'paymend_open' => 'pago abierto', + 'paymend_paid' => 'pago pagado', + 'payment_by_SEPA' => 'pago vía SEPA', + 'payment_by_SEPA_info' => 'Su pago será procesado y se creará automáticamente una confirmación para el procesamiento del pago.', + 'payment_by_credit_card' => 'Pago con tarjeta de crédito:', + 'payment_by_credit_card_info' => 'Su pago ha sido aprobado, se creará una confirmación de pago automáticamente.', + 'payment_by_invoice' => 'pago mediante factura', + 'payment_by_invoice_info' => 'Su pedido será procesado y se creará automáticamente una confirmación para el procesamiento del pedido.', + 'payment_in_advance' => 'el pago por adelantado', + 'payment_method' => 'método de pago', + 'payment_method_not_enabled_please_contact' => 'método de pago no activado, por favor contáctanos', + 'paypal' => 'PayPal', + 'please_check_form_and_complete' => 'Por favor revisa el formulario y completa toda la información.', + 'please_transfer_amount_following_account' => 'Transfiera: cantidad EUR a los siguientes detalles de la cuenta para completar la compra.', + 'prepayment' => 'el pago por adelantado', + 'purchase_on_account' => 'compra a cuenta', + 'reason_for_payment' => 'propósito de uso', + 'registration' => 'registro', + 'remaining_time' => 'término restante', + 'removed' => 'eliminado', + 'reverse_charge_procedure' => 'procedimiento de inversión del sujeto pasivo', + 'select_and_proceed_to_checkout' => 'seleccione y proceda a pagar', + 'select_and_save' => 'seleccionar y guardar', + 'sepa_direct_debit' => 'débito directo SEPA', + 'shipped' => 'enviado', + 'shop' => 'Comercio', + 'shoporder' => 'pedido de tienda', + 'shoporder_pending' => 'pedido de tienda / pendiente', + 'cancelled' => 'Cancelado', + 'sofort_bank_transfer' => 'transferencia bancaria instantánea', + 'status' => [ + 'checkout_cancel' => 'proceso de pago cancelado', + 'checkout_error' => 'error en el proceso de pago', + 'checkout_payment' => 'verificar', + 'payment_approved' => 'pago aprobado: espere el correo electrónico', + 'payment_error' => 'error en el pago', + 'payment_not_found' => 'pago no encontrado', + 'payment_redirect' => 'pago en curso: espere el correo electrónico', + 'store_payment' => 'pago guardado', + 'success' => 'ejecutado con éxito', + 'success_payment' => 'pago exitoso', + 'txaction_appointed' => 'pago aprobado: se envió el correo electrónico; espere la confirmación', + 'txaction_failed' => 'error en el pago: se envió el correo electrónico', + 'txaction_paid' => 'pago confirmado: se ha enviado el correo electrónico', + ], + 'thank_you_very_much' => 'Gracias,', + 'to_sales_tax_de' => 'sujeto al impuesto sobre las ventas / DE', + 'total_amount' => 'cantidad total', + 'trade_fair' => 'feria de muestras', + 'valid' => 'Válido', + 'valid until' => 'válido hasta', + 'verification_no' => 'número de prueba', + 'we_have_received_your_order_get_email' => 'Hemos recibido tu pedido. En breve recibirá un correo electrónico de confirmación de su pedido de nuestra parte.', + 'your_mivita_team' => 'tu equipo de mivita.care', + 'your_order_number_is' => 'tu numero de orden es', - // Avisos de referencia de pago anticipado - 'prepayment_important_notice' => 'Aviso importante sobre el pago anticipado', - 'prepayment_reference_notice' => 'IMPORTANTE: Por favor utilice únicamente el siguiente número como referencia de pago:', - 'prepayment_reference_only' => 'Solo así se puede asignar automáticamente su pago.', - 'prepayment_bank_details' => 'Datos bancarios para pago anticipado', - 'prepayment_waiting_payment' => 'Estamos esperando su pago. Una vez recibido, se procesará su pedido.', - 'prepayment_txid' => 'Referencia de pago', + // Avisos de referencia de pago anticipado + 'prepayment_important_notice' => 'Aviso importante sobre el pago anticipado', + 'prepayment_reference_notice' => 'IMPORTANTE: Por favor utilice únicamente el siguiente número como referencia de pago:', + 'prepayment_reference_only' => 'Solo así se puede asignar automáticamente su pago.', + 'prepayment_bank_details' => 'Datos bancarios para pago anticipado', + 'prepayment_waiting_payment' => 'Estamos esperando su pago. Una vez recibido, se procesará su pedido.', + 'prepayment_txid' => 'Referencia de pago', - // DHL Packstation/Paketbox - 'packstation_delivery' => 'Entrega a Packstation/Paketbox', - 'packstation_info' => 'Para la entrega a una Packstation o Paketbox de DHL, necesitamos su número de correo de DHL.', - 'dhl_postnumber' => 'Número de correo DHL', - 'packstation_address_hint' => 'Ingrese el número de Packstation en el campo de dirección (ej. "Packstation 145"). El código postal y la ciudad se refieren a la ubicación de la Packstation.', - 'packstation_alert_title' => 'Importante: Entrega a Packstation', - 'packstation_alert_intro' => 'Si proporciona un número de correo de DHL, la dirección de entrega debe completarse de la siguiente manera:', - 'packstation_alert_street' => 'Packstation [número de 3 dígitos]', - 'packstation_alert_street_example' => 'ej. "Packstation 145" - ¡NO "12345"!', - 'packstation_alert_location' => 'Ubicación de la Packstation', - 'packstation_alert_not_home' => '¡no su dirección de casa!', - 'packstation_alert_footer' => 'El NÚMERO de Packstation tiene 3 dígitos (100-999, en el letrero amarillo). El número de correo DHL tiene 6-10 dígitos y va en el campo separado arriba.', -); + // Mensajes de error del checkout + 'payment_not_found' => 'Pago no encontrado', + 'payment_not_found_description' => 'No se pudo encontrar el pago con la referencia :reference. Por favor contáctenos si ya ha realizado el pago.', + 'payment_canceled' => 'Pago cancelado', + 'payment_canceled_description' => 'El proceso de pago fue cancelado. Su pedido no fue procesado.', + 'payment_error' => 'Error de pago', + 'payment_error_description' => 'Se produjo un error durante el procesamiento del pago. Su pedido no pudo completarse.', + 'payment_unknown_status' => 'Estado de pago desconocido', + 'payment_unknown_status_description' => 'No se pudo determinar el estado del pago. Por favor contáctenos para más información.', + 'contact_support_if_needed' => 'Si tiene alguna pregunta, por favor contacte a nuestro servicio de atención al cliente.', + + // DHL Packstation/Paketbox + 'packstation_delivery' => 'Entrega a Packstation/Paketbox', + 'packstation_info' => 'Para la entrega a una Packstation o Paketbox de DHL, necesitamos su número de correo de DHL.', + 'dhl_postnumber' => 'Número de correo DHL', + 'packstation_address_hint' => 'Ingrese el número de Packstation en el campo de dirección (ej. "Packstation 145"). El código postal y la ciudad se refieren a la ubicación de la Packstation.', + 'packstation_alert_title' => 'Importante: Entrega a Packstation', + 'packstation_alert_intro' => 'Si proporciona un número de correo de DHL, la dirección de entrega debe completarse de la siguiente manera:', + 'packstation_alert_street' => 'Packstation [número de 3 dígitos]', + 'packstation_alert_street_example' => 'ej. "Packstation 145" - ¡NO "12345"!', + 'packstation_alert_location' => 'Ubicación de la Packstation', + 'packstation_alert_not_home' => '¡no su dirección de casa!', + 'packstation_alert_footer' => 'El NÚMERO de Packstation tiene 3 dígitos (100-999, en el letrero amarillo). El número de correo DHL tiene 6-10 dígitos y va en el campo separado arriba.', +]; diff --git a/resources/lang/es/pdf.php b/resources/lang/es/pdf.php index 6d3ac26..3eb8dfc 100644 --- a/resources/lang/es/pdf.php +++ b/resources/lang/es/pdf.php @@ -1,40 +1,75 @@ 'identificación del consultor', - 'amount' => 'cantidad', - 'amount_paid_out_gross' => 'monto del pago (bruto)', - 'as_a_small_entrepreneur_info' => 'Como propietario de una pequeña empresa en el sentido del artículo 19, apartado 1 de la UStG, no se le cobra ningún impuesto sobre las ventas.', - 'credit_no' => 'nota de crédito No.', - 'credit_note' => 'CRÉDITO', - 'credit_note_from' => 'crédito', - 'date' => 'fecha', - 'delivery_date_is_invoice_date' => 'La fecha de entrega corresponde a la fecha de la factura.', - 'delivery_note' => 'NOTA DE ENTREGA', - 'delivery_note_no' => 'albarán de entrega nº.', - 'ek' => 'EK', - 'eprice' => 'precio electrónico', - 'invoice' => 'FACTURA', - 'invoice_does_not_include_vat' => 'La factura se realiza sin impuesto sobre las ventas, ya que en este caso se aplica el cambio de obligación tributaria (procedimiento de inversión de cargo).', - 'invoice_nr' => 'número de factura', - 'net' => 'neto', - 'net_amount' => 'importes netos', - 'off' => 'fuera de', - 'order_no' => 'N º de pedido.', - 'payment_type' => 'método de pago', - 'points' => 'puntos', - 'points_order' => 'orden de puntos', - 'points_shop' => 'tienda de puntos', - 'prices_net' => 'precios netos', - 'reverse_charge_procedure_info' => 'Procedimiento de inversión del sujeto pasivo, reversión de la obligación tributaria.', - 'status_of_invoice' => 'estado de la factura', - 'tax_free_export_delivery' => 'entrega de exportación libre de impuestos', - 'tax_no' => 'impuestos NR', - 'total_incl_VAT' => 'total incluido el IVA legal.', - 'vat_id_of_the_recipient_of_the_service' => 'número de identificación fiscal del beneficiario del beneficio', - 'vat_is_declared_and_paid_by_recipient' => 'El impuesto sobre las ventas debe ser declarado y pagado por el destinatario del servicio.', - 'vat_no' => 'número de identificación del IVA', - 'vat_text' => 'IVA', - 'we_are_always_there_for_questions' => 'Si tienes alguna pregunta, siempre estamos ahí para ayudarte.', - 'your_advisor' => 'tu asesor', -); +return [ + 'adviser_id' => 'identificación del consultor', + 'amount' => 'cantidad', + 'amount_paid_out_gross' => 'monto del pago (bruto)', + 'as_a_small_entrepreneur_info' => 'Como propietario de una pequeña empresa en el sentido del artículo 19, apartado 1 de la UStG, no se le cobra ningún impuesto sobre las ventas.', + 'credit_no' => 'nota de crédito No.', + 'credit_note' => 'CRÉDITO', + 'credit_note_from' => 'crédito', + 'date' => 'fecha', + 'delivery_date_is_invoice_date' => 'La fecha de entrega corresponde a la fecha de la factura.', + 'delivery_note' => 'NOTA DE ENTREGA', + 'delivery_note_no' => 'albarán de entrega nº.', + 'ek' => 'EK', + 'eprice' => 'precio electrónico', + 'invoice' => 'FACTURA', + 'invoice_does_not_include_vat' => 'La factura se realiza sin impuesto sobre las ventas, ya que en este caso se aplica el cambio de obligación tributaria (procedimiento de inversión de cargo).', + 'invoice_nr' => 'número de factura', + 'net' => 'neto', + 'net_amount' => 'importes netos', + 'off' => 'fuera de', + 'order_no' => 'N º de pedido.', + 'payment_type' => 'método de pago', + 'points' => 'puntos', + 'points_order' => 'orden de puntos', + 'points_shop' => 'tienda de puntos', + 'prices_net' => 'precios netos', + 'reverse_charge_procedure_info' => 'Procedimiento de inversión del sujeto pasivo, reversión de la obligación tributaria.', + 'status_of_invoice' => 'estado de la factura', + 'tax_free_export_delivery' => 'entrega de exportación libre de impuestos', + 'tax_no' => 'impuestos NR', + 'total_incl_VAT' => 'total incluido el IVA legal.', + 'vat_id_of_the_recipient_of_the_service' => 'número de identificación fiscal del beneficiario del beneficio', + 'vat_is_declared_and_paid_by_recipient' => 'El impuesto sobre las ventas debe ser declarado y pagado por el destinatario del servicio.', + 'vat_no' => 'número de identificación del IVA', + 'vat_text' => 'IVA', + 'we_are_always_there_for_questions' => 'Si tienes alguna pregunta, siempre estamos ahí para ayudarte.', + 'your_advisor' => 'tu asesor', + + // Avisos de copia para documentos multilingües + 'invoice_copy' => 'Copia de factura', + 'delivery_copy' => 'Copia del albarán', + 'credit_copy' => 'Copia de la nota de crédito', + + // Nombres de archivo + 'contract_filename' => 'Contrato_de_Consultor', + + // Facturas de cancelación + 'cancellation_invoice' => 'FACTURA DE CANCELACIÓN', + 'cancellation_nr' => 'cancelación nº.', + 'cancellation_for' => 'Cancelación de la factura', + 'from' => 'del', + 'attention' => 'ATENCIÓN', + 'cancellation_invoice_info' => 'Esta factura de cancelación anula la factura original con importes negativos. Los puntos se han corregido en consecuencia.', + 'cancelled' => 'Cancelado', + 'cancellation_delivery' => 'ALBARÁN DE CANCELACIÓN', + 'cancellation_delivery_info' => 'Este albarán de cancelación anula el albarán original.', + 'cancellation_delivery_note' => 'Nota: No es necesario devolver los productos a menos que se acuerde lo contrario.', + + // Columnas de tabla + 'pos' => 'Pos.', + 'article' => 'Artículo', + 'quantity' => 'Cantidad', + 'single_price' => 'Precio unitario', + 'total_price' => 'Precio total', + 'plus' => 'más', + 'vat' => 'IVA', + 'subtotal_net' => 'Subtotal (neto)', + 'shipping_costs' => 'Gastos de envío', + 'total_amount' => 'Importe total', + + // Address top + 'address_top' => 'mivita care gmbh • Leinfeld 2 • 87755 Kirchhaslach', +]; diff --git a/resources/lang/es/register.php b/resources/lang/es/register.php index a746704..65fb15f 100644 --- a/resources/lang/es/register.php +++ b/resources/lang/es/register.php @@ -1,64 +1,70 @@ 'He leído el contrato que aparece aquí y lo acepto.', - 'account_deleted' => 'cuenta borrada', - 'adjust' => 'ajustar', - 'advisor_invite' => 'invitar consultores', - 'agree' => 'aceptar', - 'agree_and_continue' => 'estar de acuerdo y seguir adelante', - 'assigned' => 'perdonar', - 'badge' => 'identificación', - 'business_license_deposited' => 'se ha depositado la licencia comercial', - 'business_license_later' => 'Presentaré mi licencia comercial dentro de las próximas 4 semanas.', - 'business_license_non' => 'No necesito una licencia comercial', - 'business_license_non_text' => 'Fuera de Alemania existen diferentes regulaciones en materia de licencias comerciales (p. ej. en Austria o Suiza). Si no está obligado a tener una licencia comercial para este negocio o en este momento, explique brevemente por qué:', - 'business_license_now' => 'cargue su licencia comercial ahora', - 'business_license_release' => 'envíe ya la licencia comercial para su aprobación', - 'change_documents' => 'modificar documentos', - 'change_email' => 'cambiar dirección de correo electrónico', - 'change_email_address_verify_it_info' => '\\u00c4Cambie su dirección de correo electrónico aquí. Le enviaremos un nuevo enlace de activación a su nueva dirección de correo electrónico para verificarlo.', - 'change_email_contact_address_verify_it_info' => 'Cambie su dirección de correo electrónico de contacto aquí. Enviaremos al contacto un nuevo enlace de activación a la nueva dirección de correo electrónico para verificarlo.', - 'complete' => 'completo', - 'complete_registration' => 'registro completo', - 'confirm_your_identity' => 'Confirma tu identidad con tu contraseña antes de continuar.', - 'contract' => 'contrato', - 'contract_data_protection' => 'contrato y protección de datos', - 'create_advisor_send_email_to_invite' => '¡Crea un consultor y envía un correo electrónico para invitarlo!', - 'create_and_next' => 'crear y continuar', - 'data' => 'datos', - 'data_protection' => 'protección de Datos', - 'declaration-of-consent' => 'Declaración de consentimiento: Por la presente consiento el tratamiento de los datos personales que he facilitado voluntariamente. Me han informado que puedo revocar este consentimiento en cualquier momento.', - 'delete_account' => 'borrar cuenta', - 'i_have_read_and_accept_it' => 'He leído el :link y lo acepto.*', - 'next' => 'más', - 'open_payment_options' => 'abrir opciones de pago', - 'package' => 'paquete', - 'password' => 'contraseña', - 'password_has_already_been_created' => 'La contraseña ya ha sido creada.', - 'really_delete_the_file' => '¿Realmente eliminar el archivo?', - 'reg_checked' => 'Por la presente doy mi consentimiento para el procesamiento de datos indicado en la declaración de protección de datos. Me han informado que puedo revocar este consentimiento en cualquier momento.', - 'reg_finisch_hl' => '¡Gracias por su registro!', - 'reg_finisch_line_1' => 'Le hemos enviado un correo electrónico con un enlace para activar su cuenta.', - 'reg_finisch_line_2' => 'Por favor revisa tu correo electrónico y confirma el enlace.', - 'reg_hl' => 'registro', - 'reg_line_1' => 'Este formulario es para registrar nuevos socios de ventas. Después de enviar el formulario, recibirá un correo electrónico con más información y el enlace de activación.', - 'registration' => 'registro', - 'registration_completed' => 'registro completo', - 'required_fields' => 'campos requeridos', - 'save_and_continue' => 'guardar y continuar', - 'select' => 'elegir', - 'sender' => 'tu equipo de mivita.care', - 'trade_licence' => 'licencia de negocios', - 'upload' => 'subir', - 'wizard_business_license_hl' => 'cargar licencia comercial (solo PDF, JPG, PNG)', - 'wizard_business_license_line_1' => 'La ley requiere una licencia comercial válida para poder participar como socio de ventas en MIVITA. Cargue una copia de su licencia comercial actual aquí para que podamos activar su cuenta.', - 'wizard_create_release_hl' => 'gracias', - 'wizard_create_release_line_1' => '¡Su registro y reserva de membresía están completos!
    Tan pronto como hayamos recibido el pago, recibirá automáticamente un correo electrónico y su membresía se activará automáticamente.', - 'wizard_finish_hl' => 'registro completo', - 'wizard_finish_line_1' => '¿Están todos los datos completados correcta y completamente? De lo contrario, puede hacer clic en los puntos individuales anteriores y realizar cambios. Si todo encaja, haga clic en el botón "Completar registro". Luego comprobaremos tus datos y nos pondremos en contacto contigo si tienes alguna pregunta. Tan pronto como hayamos activado su cuenta, recibirá otro correo electrónico.', - 'wizard_reg_release_hl' => 'esperando verificación', - 'wizard_reg_release_line_1' => 'Su registro está completo, sus datos están siendo verificados.
    Después de una verificación exitosa, su cuenta se activará y recibirá un correo electrónico.', - 'wizard_verification_hl' => 'verificación (DNI o pasaporte; PDF, JPG, PNG)', - 'wizard_verification_line_1' => 'Cargue un escaneo/foto de su documento de identidad o pasaporte. El frente es suficiente. Necesitamos su identificación como prueba de identidad para activar su cuenta.', -); +return [ + 'accept-contract' => 'He leído el contrato que aparece aquí y lo acepto.', + 'account_deleted' => 'cuenta borrada', + 'adjust' => 'ajustar', + 'advisor_invite' => 'invitar consultores', + 'agree' => 'aceptar', + 'agree_and_continue' => 'estar de acuerdo y seguir adelante', + 'assigned' => 'perdonar', + 'badge' => 'identificación', + 'business_license_deposited' => 'se ha depositado la licencia comercial', + 'business_license_later' => 'Presentaré mi licencia comercial dentro de las próximas 4 semanas.', + 'business_license_non' => 'No necesito una licencia comercial', + 'business_license_non_text' => 'Fuera de Alemania existen diferentes regulaciones en materia de licencias comerciales (p. ej. en Austria o Suiza). Si no está obligado a tener una licencia comercial para este negocio o en este momento, explique brevemente por qué:', + 'business_license_now' => 'cargue su licencia comercial ahora', + 'business_license_release' => 'envíe ya la licencia comercial para su aprobación', + 'change_documents' => 'modificar documentos', + 'change_email' => 'cambiar dirección de correo electrónico', + 'change_email_address_verify_it_info' => '\\u00c4Cambie su dirección de correo electrónico aquí. Le enviaremos un nuevo enlace de activación a su nueva dirección de correo electrónico para verificarlo.', + 'change_email_contact_address_verify_it_info' => 'Cambie su dirección de correo electrónico de contacto aquí. Enviaremos al contacto un nuevo enlace de activación a la nueva dirección de correo electrónico para verificarlo.', + 'complete' => 'completo', + 'complete_registration' => 'registro completo', + 'confirm_your_identity' => 'Confirma tu identidad con tu contraseña antes de continuar.', + 'contract' => 'contrato', + 'contract_data_protection' => 'contrato y protección de datos', + 'create_advisor_send_email_to_invite' => '¡Crea un consultor y envía un correo electrónico para invitarlo!', + 'create_and_next' => 'crear y continuar', + 'data' => 'datos', + 'data_protection' => 'protección de Datos', + 'declaration-of-consent' => 'Declaración de consentimiento: Por la presente consiento el tratamiento de los datos personales que he facilitado voluntariamente. Me han informado que puedo revocar este consentimiento en cualquier momento.', + 'delete_account' => 'borrar cuenta', + 'i_have_read_and_accept_it' => 'He leído el :link y lo acepto.*', + 'next' => 'más', + 'open_payment_options' => 'abrir opciones de pago', + 'package' => 'paquete', + 'password' => 'contraseña', + 'password_has_already_been_created' => 'La contraseña ya ha sido creada.', + 'really_delete_the_file' => '¿Realmente eliminar el archivo?', + 'reg_checked' => 'Por la presente doy mi consentimiento para el procesamiento de datos indicado en la declaración de protección de datos. Me han informado que puedo revocar este consentimiento en cualquier momento.', + 'reg_finisch_hl' => '¡Gracias por su registro!', + 'reg_finisch_line_1' => 'Le hemos enviado un correo electrónico con un enlace para activar su cuenta.', + 'reg_finisch_line_2' => 'Por favor revisa tu correo electrónico y confirma el enlace.', + 'reg_hl' => 'registro', + 'reg_line_1' => 'Este formulario es para registrar nuevos socios de ventas. Después de enviar el formulario, recibirá un correo electrónico con más información y el enlace de activación.', + 'registration' => 'registro', + 'registration_completed' => 'registro completo', + 'required_fields' => 'campos requeridos', + 'save_and_continue' => 'guardar y continuar', + 'select' => 'elegir', + 'sender' => 'tu equipo de mivita.care', + 'trade_licence' => 'licencia de negocios', + 'upload' => 'subir', + 'wizard_business_license_hl' => 'cargar licencia comercial (solo PDF, JPG, PNG)', + 'wizard_business_license_line_1' => 'La ley requiere una licencia comercial válida para poder participar como socio de ventas en MIVITA. Cargue una copia de su licencia comercial actual aquí para que podamos activar su cuenta.', + 'wizard_create_release_hl' => 'gracias', + 'wizard_create_release_line_1' => '¡Su registro y reserva de membresía están completos!
    Tan pronto como hayamos recibido el pago, recibirá automáticamente un correo electrónico y su membresía se activará automáticamente.', + 'wizard_finish_hl' => 'registro completo', + 'wizard_finish_line_1' => '¿Están todos los datos completados correcta y completamente? De lo contrario, puede hacer clic en los puntos individuales anteriores y realizar cambios. Si todo encaja, haga clic en el botón "Completar registro". Luego comprobaremos tus datos y nos pondremos en contacto contigo si tienes alguna pregunta. Tan pronto como hayamos activado su cuenta, recibirá otro correo electrónico.', + 'wizard_reg_release_hl' => 'esperando verificación', + 'wizard_reg_release_line_1' => 'Su registro está completo, sus datos están siendo verificados.
    Después de una verificación exitosa, su cuenta se activará y recibirá un correo electrónico.', + 'wizard_verification_hl' => 'verificación (DNI o pasaporte; PDF, JPG, PNG)', + 'wizard_verification_line_1' => 'Cargue un escaneo/foto de su documento de identidad o pasaporte. El frente es suficiente. Necesitamos su identificación como prueba de identidad para activar su cuenta.', + 'starter_warning_title' => 'Atención', + 'starter_warning_text' => '¡Bienvenido/a a Mivita!

    Ahora puedes registrarte con una cuota anual de 69,90 € y recibirás tu tienda web personalizada de Mivita.

    Por favor, ten en cuenta:
    Los paquetes de inicio son una oferta exclusiva y única al registrarte y no pueden adquirirse posteriormente.

    Tus opciones:

    • Con paquete de inicio:
    Recibes inmediatamente un 30 % de descuento – también en todas las compras posteriores de este año.

    • Sin paquete de inicio (solo registro & tienda web personalizada):
    Te beneficias permanentemente de un 20 % de descuento.

    Importante para más adelante:
    Si empiezas ahora sin paquete de inicio, solo podrás alcanzar el 30 % de descuento más adelante mediante tu propia cualificación (→ 1.350 puntos de facturación personal en un mes según el plan de marketing).', + 'starter_warning_back' => 'No – por favor, muéstrame los paquetes de inicio de nuevo', + 'starter_warning_confirm' => 'Sí – lo he entendido (continuar sin paquete de inicio)', + 'wizard_package_info' => 'Por favor selecciona tu paquete. Puedes elegir entre la membresía anual simple y un paquete de inicio, que te ofrece un descuento atractivo y la oportunidad de ascender directamente al siguiente rango. El paquete de inicio solo está disponible una vez durante el registro. Selecciona tu producto y haz clic en continuar.', + 'wizard_no_selection' => 'Por favor selecciona un producto para continuar.', +]; diff --git a/resources/lang/es/tables.php b/resources/lang/es/tables.php index 7bd4cf6..87886c9 100644 --- a/resources/lang/es/tables.php +++ b/resources/lang/es/tables.php @@ -1,93 +1,94 @@ 'IVA', - 'abo_delivery' => 'Entregas de suscripción', - 'abo_delivery_day' => 'Día de entrega de la suscripción', - 'account' => 'cuenta', - 'account_to' => 'cuenta hasta', - 'activ' => 'activo', - 'active' => 'Activo', - 'addition' => 'aditivo', - 'address' => 'dirección', - 'adviser' => 'Tutor', - 'adviser_no' => 'consultor no.', - 'amount' => 'cantidad', - 'art' => 'arte', - 'article_no' => 'artículo no.', - 'assigned_advisor' => 'asesor asignado', - 'birthday' => 'cumpleaños', - 'c_no' => 'G.No.', - 'city' => 'ciudad', - 'commission' => 'comisión', - 'contents' => 'contenido', - 'count' => 'Número', - 'country' => 'largo', - 'created' => 'creado', - 'credit_note' => 'crédito', - 'customer' => 'cliente', - 'date' => 'fecha', - 'detail' => 'detalle', - 'earnings' => 'mérito', - 'ek_price' => 'precio de compra', - 'email' => 'correo electrónico', - 'exc' => 'Ex.', - 'executions' => 'Explicaciones', - 'firstname' => 'nombre de pila', - 'from_credit_balance' => 'del credito', - 'gross' => 'bruto', - 'image' => 'imagen', - 'in_no' => 'número de factura.', - 'info' => 'información', - 'invoice' => 'la factura', - 'is_for' => 'es para', - 'label' => 'designación', - 'last_date' => 'Última versión', - 'lastname' => 'apellidos', - 'level' => 'nivel', - 'line' => 'línea', - 'margin' => 'margen', - 'member' => 'Miembro', - 'mobil' => 'móvil', - 'my_commission' => 'Mi comisión', - 'my_price_gross' => 'mi precio es bruto', - 'my_price_net' => 'mi precio neto', - 'net' => 'neto', - 'net_price' => 'precio neto', - 'net_sales' => 'las ventas netas', - 'net_sum' => 'neto total', - 'newsletter' => 'boletin informativo', - 'next_date' => 'Próxima ejecución', - 'note' => 'nota', - 'number' => 'número', - 'order' => 'orden', - 'partner_since' => 'socio desde', - 'payline_qualification' => 'calificación de línea de pago', - 'payment' => 'pago', - 'payment_type' => 'método de pago', - 'phone' => 'teléfono', - 'points' => 'puntos', - 'postcode' => 'código postal', - 'previous_orders' => 'pedidos de clientes anteriores', - 'price' => 'precio', - 'product' => 'producto', - 'products' => 'productos', - 'purchased_in_the_shop' => 'comprado en la tienda', - 'purchases' => 'compras', - 'qualification' => 'calificación', - 'quantity' => 'número', - 'reference_number' => 'número de referencia', - 'rf_no' => 'RF no.', - 'shipping' => 'envío', - 'shop' => 'comercio', - 'shop_commission' => 'comisión de tienda', - 'sponsor' => 'patrocinador', - 'start_date' => 'Fecha de inicio', - 'status' => 'estado', - 'subject' => 'acerca de', - 'sum' => 'total', - 'total' => 'en total', - 'type' => 'arte', - 've' => 'VE', - 'vk_price' => 'precio de venta', -); +return [ + 'VAT' => 'IVA', + 'abo_delivery' => 'Entregas de suscripción', + 'abo_delivery_day' => 'Día de entrega de la suscripción', + 'account' => 'cuenta', + 'account_to' => 'cuenta hasta', + 'activ' => 'activo', + 'active' => 'Activo', + 'addition' => 'aditivo', + 'address' => 'dirección', + 'adviser' => 'Tutor', + 'adviser_no' => 'consultor no.', + 'amount' => 'cantidad', + 'art' => 'arte', + 'article_no' => 'artículo no.', + 'assigned_advisor' => 'asesor asignado', + 'birthday' => 'cumpleaños', + 'c_no' => 'G.No.', + 'city' => 'ciudad', + 'commission' => 'comisión', + 'contents' => 'contenido', + 'count' => 'Número', + 'country' => 'largo', + 'created' => 'creado', + 'credit_note' => 'crédito', + 'customer' => 'cliente', + 'date' => 'fecha', + 'detail' => 'detalle', + 'earnings' => 'mérito', + 'ek_price' => 'precio de compra', + 'email' => 'correo electrónico', + 'exc' => 'Ex.', + 'executions' => 'Explicaciones', + 'firstname' => 'nombre de pila', + 'from_credit_balance' => 'del credito', + 'gross' => 'bruto', + 'image' => 'imagen', + 'in_no' => 'número de factura.', + 'info' => 'información', + 'invoice' => 'la factura', + 'is_for' => 'es para', + 'label' => 'designación', + 'last_date' => 'Última versión', + 'lastname' => 'apellidos', + 'level' => 'nivel', + 'line' => 'línea', + 'margin' => 'margen', + 'member' => 'Miembro', + 'mobil' => 'móvil', + 'my_commission' => 'Mi comisión', + 'my_price_gross' => 'mi precio es bruto', + 'my_price_net' => 'mi precio neto', + 'net' => 'neto', + 'net_price' => 'precio neto', + 'net_sales' => 'las ventas netas', + 'net_sum' => 'neto total', + 'newsletter' => 'boletin informativo', + 'next_date' => 'Próxima ejecución', + 'note' => 'nota', + 'number' => 'número', + 'order' => 'orden', + 'partner_since' => 'socio desde', + 'payline_qualification' => 'calificación de línea de pago', + 'payment' => 'pago', + 'payment_type' => 'método de pago', + 'phone' => 'teléfono', + 'points' => 'puntos', + 'postcode' => 'código postal', + 'previous_orders' => 'pedidos de clientes anteriores', + 'price' => 'precio', + 'product' => 'producto', + 'products' => 'productos', + 'purchased_in_the_shop' => 'comprado en la tienda', + 'purchases' => 'compras', + 'qualification' => 'calificación', + 'quantity' => 'número', + 'reference_number' => 'número de referencia', + 'rf_no' => 'RF no.', + 'shipping' => 'envío', + 'shop' => 'comercio', + 'shop_commission' => 'comisión de tienda', + 'sponsor' => 'patrocinador', + 'start_date' => 'Fecha de inicio', + 'status' => 'estado', + 'subject' => 'acerca de', + 'sum' => 'total', + 'total' => 'en total', + 'type' => 'arte', + 've' => 'VE', + 'vk_price' => 'precio de venta', + 'no_data_available' => 'No hay datos disponibles', +]; diff --git a/resources/lang/es/team.php b/resources/lang/es/team.php index cc4a292..85b33cc 100644 --- a/resources/lang/es/team.php +++ b/resources/lang/es/team.php @@ -1,149 +1,151 @@ 'KU', - 'PP' => 'PP', - 'TP' => 'TP', - 'WB' => 'WB', - 'account' => 'cuenta', - 'account_to' => 'cuenta hasta', - 'active' => 'activo', - 'business' => 'negocio', - 'career_level' => 'nivel de carrera', - 'collapse_all' => 'cerrar todo', - 'commission_WB' => 'bono de crecimiento de comisión', - 'commission_payline' => 'línea de pago de comisión', - 'commission_shop' => 'tienda de comisiones', - 'commission_team' => 'equipo de la Comisión', - 'commission_total' => 'comisión total', - 'completed' => 'terminado', - 'consultant_margin' => 'Margen del asesor', - 'consultant_margin_info' => 'Nota: El margen ya se ha deducido al realizar el pedido y, por lo tanto, ya se ha pagado.', - 'create_new_consultant' => 'crear nuevo asesor', - 'current_commission_level' => 'nivel de comisión actual', - 'customer_commission' => 'comisión de cliente', - 'customer_points' => 'puntos de cliente', - 'date' => 'fecha', - 'e' => 'E', - 'expand_all' => 'abre todo', - 'export' => 'exportar', - 'export_as_xls' => 'exportar como xls', - 'filename_export' => 'mivita-mi-equipo-exporta-', - 'link_for_consultant_registration' => 'enlace de registro de consultor', - 'net_turnover' => 'las ventas netas', - 'new_consultant_copy1' => '¿Quieres registrar un nuevo asesor? Genial, estamos felices por eso. Simplemente envíele el siguiente enlace por correo electrónico, WhatsApp o SMS. Esto le llevará a la página de registro de www.mivita.care. Es importante que no cambie este enlace, porque el ID del consultor adjunto lo identifica como el patrocinador del nuevo consultor. Esta es la única manera de asignarte futuras comisiones de tus ventas. Utilice el "símbolo de copia" para copiar el enlace directamente a su portapapeles.', - 'next_career_level' => 'siguiente nivel de carrera', - 'next_commission_level' => 'siguiente nivel de comisión', - 'no_sponsor_assigned' => 'no hay patrocinador asignado', - 'not_active' => 'no activo', - 'own' => 'propio', - 'payline_points' => 'puntos de línea de pago', - 'payout_details' => 'Detalles del pago', - 'points' => 'puntos', - 'qualification' => 'calificación', - 'qualification_commission' => 'comisión de calificación', - 'qualification_points' => 'puntos de calificación', - 'register_new_consultant' => 'registrar nuevo asesor', - 's' => 'S', - 'sales_store_net' => 'Facturación neta de la tienda', - 'shop' => 'comercio', - 'shop_commission' => 'comisión de tienda', - 'sponsor' => 'patrocinador', - 'structure' => 'estructura', - 'total_points' => 'puntos totales', - 'total_turnover' => 'ventas totales', - 'until' => 'hasta', - 'volume_KU' => 'volumen KU', - 'your_sponsor' => 'su patrocinador', - 'your_team' => 'tu equipo', +return [ + 'KU' => 'KU', + 'PP' => 'PP', + 'TP' => 'TP', + 'WB' => 'WB', + 'account' => 'cuenta', + 'account_to' => 'cuenta hasta', + 'active' => 'activo', + 'business' => 'negocio', + 'career_level' => 'nivel de carrera', + 'collapse_all' => 'cerrar todo', + 'commission_WB' => 'bono de crecimiento de comisión', + 'commission_payline' => 'línea de pago de comisión', + 'commission_shop' => 'tienda de comisiones', + 'commission_team' => 'equipo de la Comisión', + 'commission_total' => 'comisión total', + 'completed' => 'terminado', + 'consultant_margin' => 'Margen del asesor', + 'consultant_margin_info' => 'Nota: El margen ya se ha deducido al realizar el pedido y, por lo tanto, ya se ha pagado.', + 'create_new_consultant' => 'crear nuevo asesor', + 'current_commission_level' => 'nivel de comisión actual', + 'customer_commission' => 'comisión de cliente', + 'customer_points' => 'puntos de cliente', + 'date' => 'fecha', + 'e' => 'E', + 'expand_all' => 'abre todo', + 'export' => 'exportar', + 'export_as_xls' => 'exportar como xls', + 'filename_export' => 'mivita-mi-equipo-exporta-', + 'link_for_consultant_registration' => 'enlace de registro de consultor', + 'net_turnover' => 'las ventas netas', + 'new_consultant_copy1' => '¿Quieres registrar un nuevo asesor? Genial, estamos felices por eso. Simplemente envíele el siguiente enlace por correo electrónico, WhatsApp o SMS. Esto le llevará a la página de registro de www.mivita.care. Es importante que no cambie este enlace, porque el ID del consultor adjunto lo identifica como el patrocinador del nuevo consultor. Esta es la única manera de asignarte futuras comisiones de tus ventas. Utilice el "símbolo de copia" para copiar el enlace directamente a su portapapeles.', + 'next_career_level' => 'siguiente nivel de carrera', + 'next_commission_level' => 'siguiente nivel de comisión', + 'no_sponsor_assigned' => 'no hay patrocinador asignado', + 'not_active' => 'no activo', + 'last_login' => 'Último acceso', + 'registered_at' => 'Registrado el', + 'own' => 'propio', + 'payline_points' => 'puntos de línea de pago', + 'payout_details' => 'Detalles del pago', + 'points' => 'puntos', + 'qualification' => 'calificación', + 'qualification_commission' => 'comisión de calificación', + 'qualification_points' => 'puntos de calificación', + 'register_new_consultant' => 'registrar nuevo asesor', + 's' => 'S', + 'sales_store_net' => 'Facturación neta de la tienda', + 'shop' => 'comercio', + 'shop_commission' => 'comisión de tienda', + 'sponsor' => 'patrocinador', + 'structure' => 'estructura', + 'total_points' => 'puntos totales', + 'total_turnover' => 'ventas totales', + 'until' => 'hasta', + 'volume_KU' => 'volumen KU', + 'your_sponsor' => 'su patrocinador', + 'your_team' => 'tu equipo', - // Filter & Status - 'filter_active' => 'activo', - 'filter_not_active' => 'no activo', - 'filter_all' => 'todos', - 'all_status' => 'Todo el Estado', - 'qualified_green' => 'Calificado (verde)', - 'in_progress_yellow' => 'En Progreso (amarillo)', - 'no_level_red' => 'Sin Nivel (rojo)', + // Filter & Status + 'filter_active' => 'activo', + 'filter_not_active' => 'no activo', + 'filter_all' => 'todos', + 'all_status' => 'Todo el Estado', + 'qualified_green' => 'Calificado (verde)', + 'in_progress_yellow' => 'En Progreso (amarillo)', + 'no_level_red' => 'Sin Nivel (rojo)', - // Performance & Badges - 'optimized' => 'OPTIMIZADO', - 'standard_monitoring' => 'ESTÁNDAR + MONITOREO', - 'fallback' => 'RESPALDO', - 'loading_time' => 'Tiempo de carga:', - 'memory' => 'Memoria:', - 'memory_usage' => 'Uso de memoria:', - 'team_size' => 'Tamaño del equipo:', - 'team_members' => 'Miembros del equipo:', - 'execution_time' => 'Tiempo de ejecución:', - 'user_id' => 'ID de Usuario:', + // Performance & Badges + 'optimized' => 'OPTIMIZADO', + 'standard_monitoring' => 'ESTÁNDAR + MONITOREO', + 'fallback' => 'RESPALDO', + 'loading_time' => 'Tiempo de carga:', + 'memory' => 'Memoria:', + 'memory_usage' => 'Uso de memoria:', + 'team_size' => 'Tamaño del equipo:', + 'team_members' => 'Miembros del equipo:', + 'execution_time' => 'Tiempo de ejecución:', + 'user_id' => 'ID de Usuario:', - // Buttons & Actions - 'performance_details' => 'Detalles de Rendimiento', - 'team_structure' => 'Estructura del Equipo', - 'new_member' => 'Nuevo Miembro', - 'optimized_action' => 'Optimizado', - 'standard_action' => 'Estándar', - 'close' => 'Cerrar', - 'show_details' => 'Mostrar Detalles', - 'test_optimized' => 'Probar Optimizado', - 'standard_version' => 'Versión Estándar', + // Buttons & Actions + 'performance_details' => 'Detalles de Rendimiento', + 'team_structure' => 'Estructura del Equipo', + 'new_member' => 'Nuevo Miembro', + 'optimized_action' => 'Optimizado', + 'standard_action' => 'Estándar', + 'close' => 'Cerrar', + 'show_details' => 'Mostrar Detalles', + 'test_optimized' => 'Probar Optimizado', + 'standard_version' => 'Versión Estándar', - // Modals & Titles - 'performance_metrics_team_overview' => 'Métricas de Rendimiento - Resumen del Equipo', - 'performance_metrics_my_team' => 'Métricas de Rendimiento - Mi Equipo', - 'performance_monitoring' => 'Monitoreo de Rendimiento', - 'fallback_support' => 'Soporte de Respaldo', + // Modals & Titles + 'performance_metrics_team_overview' => 'Métricas de Rendimiento - Resumen del Equipo', + 'performance_metrics_my_team' => 'Métricas de Rendimiento - Mi Equipo', + 'performance_monitoring' => 'Monitoreo de Rendimiento', + 'fallback_support' => 'Soporte de Respaldo', - // Messages & Notifications - 'optimized_with_cache' => 'Optimizado con Caché', - 'datatable_mode_switched' => 'Modo DataTable cambiado a ":mode"', - 'error_loading_optimized_overview' => 'Error al cargar resumen optimizado del equipo: ', - 'live_not_supported_fallback' => 'En Vivo (no soportado en respaldo)', - 'optimized_performance_features' => 'Esta página utiliza funciones de rendimiento optimizadas.', + // Messages & Notifications + 'optimized_with_cache' => 'Optimizado con Caché', + 'datatable_mode_switched' => 'Modo DataTable cambiado a ":mode"', + 'error_loading_optimized_overview' => 'Error al cargar resumen optimizado del equipo: ', + 'live_not_supported_fallback' => 'En Vivo (no soportado en respaldo)', + 'optimized_performance_features' => 'Esta página utiliza funciones de rendimiento optimizadas.', - // Next Level - 'next_level' => 'Siguiente Nivel', + // Next Level + 'next_level' => 'Siguiente Nivel', - // Additional terms - 'calculation_type' => 'Tipo de Cálculo', - 'version' => 'Versión', - 'cache' => 'Caché', - 'live' => 'En Vivo', + // Additional terms + 'calculation_type' => 'Tipo de Cálculo', + 'version' => 'Versión', + 'cache' => 'Caché', + 'live' => 'En Vivo', - // Missing table headers - 'ID' => 'ID', - 'Ebene' => 'Nivel', - 'Level' => 'Nivel', - 'KD' => 'KD', - 'bis' => 'hasta', + // Missing table headers + 'ID' => 'ID', + 'Ebene' => 'Nivel', + 'Level' => 'Nivel', + 'KD' => 'KD', + 'bis' => 'hasta', - // Level Reports - 'level_reports_title' => 'Informes de Ascensos de Nivel - Mi Equipo', - 'level_reports_month' => 'Mes', - 'level_reports_year' => 'Año', - 'level_reports_filter_not_updated' => 'Solo usuarios no actualizados', - 'level_reports_filter_button' => 'Filtrar', - 'level_reports_csv_export' => 'Exportar CSV', - 'level_reports_total_promotions' => 'Total de Ascensos', - 'level_reports_by_level' => 'Ascensos por Nivel', - 'level_reports_table_date' => 'Fecha', - 'level_reports_table_user' => 'Usuario', - 'level_reports_table_from_level' => 'Desde Nivel', - 'level_reports_table_to_level' => 'A Nivel', - 'level_reports_table_current_level' => 'Nivel Actual', - 'level_reports_table_kp_quali' => 'Calif. KP', - 'level_reports_table_user_kp' => 'KP Usuario', - 'level_reports_table_pp_quali' => 'Calif. PP', - 'level_reports_table_user_pp' => 'PP Usuario', - 'level_reports_table_update' => 'Actualizar', - 'level_reports_table_active' => 'Activo', - 'level_reports_by_period' => 'Ascensos por Período', - 'level_reports_no_data' => 'No se Encontraron Ascensos de Nivel', - 'level_reports_no_data_description' => 'No se encontraron entradas con los filtros actuales.', - 'yes' => 'Sí', - 'no' => 'No', - 'not_available' => 'N/A', + // Level Reports + 'level_reports_title' => 'Informes de Ascensos de Nivel - Mi Equipo', + 'level_reports_month' => 'Mes', + 'level_reports_year' => 'Año', + 'level_reports_filter_not_updated' => 'Solo usuarios no actualizados', + 'level_reports_filter_button' => 'Filtrar', + 'level_reports_csv_export' => 'Exportar CSV', + 'level_reports_total_promotions' => 'Total de Ascensos', + 'level_reports_by_level' => 'Ascensos por Nivel', + 'level_reports_table_date' => 'Fecha', + 'level_reports_table_user' => 'Usuario', + 'level_reports_table_from_level' => 'Desde Nivel', + 'level_reports_table_to_level' => 'A Nivel', + 'level_reports_table_current_level' => 'Nivel Actual', + 'level_reports_table_kp_quali' => 'Calif. KP', + 'level_reports_table_user_kp' => 'KP Usuario', + 'level_reports_table_pp_quali' => 'Calif. PP', + 'level_reports_table_user_pp' => 'PP Usuario', + 'level_reports_table_update' => 'Actualizar', + 'level_reports_table_active' => 'Activo', + 'level_reports_by_period' => 'Ascensos por Período', + 'level_reports_no_data' => 'No se Encontraron Ascensos de Nivel', + 'level_reports_no_data_description' => 'No se encontraron entradas con los filtros actuales.', + 'yes' => 'Sí', + 'no' => 'No', + 'not_available' => 'N/A', - 'growth_bonus_details_description' => 'L1 = Socio Directo (obtiene el bono de crecimiento siempre), L2 = Miembros (a partir de aquí el bono de crecimiento se divide si el miembro está calificado), etc. | Muestra comisión (€) y volumen (puntos) por nivel.', -); + 'growth_bonus_details_description' => 'L1 = Socio Directo (obtiene el bono de crecimiento siempre), L2 = Miembros (a partir de aquí el bono de crecimiento se divide si el miembro está calificado), etc. | Muestra comisión (€) y volumen (puntos) por nivel.', +]; diff --git a/resources/views/admin/abo/_change_history.blade.php b/resources/views/admin/abo/_change_history.blade.php new file mode 100644 index 0000000..facdfd7 --- /dev/null +++ b/resources/views/admin/abo/_change_history.blade.php @@ -0,0 +1,62 @@ +@php + $changeHistory = $user_abo->getChangeHistory(); + $priceLabel = $user_abo->is_for === 'me' ? __('abo_history.price_net') : __('abo_history.price_gross'); +@endphp + +
    +
    +
    + {{ __('abo_history.change_history') }} +
    + @if(isset($isAdmin) && $isAdmin && $user_abo->getInitialItems()->isNotEmpty()) + {{--
    + @csrf + +
    + --}} + @endif +
    + + @if($changeHistory->isEmpty()) +

    + {{ __('abo_history.no_changes') }} +

    + @else +
    + + + + + + + + + + + + + + @foreach($changeHistory as $entry) + + + + + + + + + + @endforeach + +
    {{ __('abo_history.col_date') }}{{ __('abo_history.col_action') }}{{ __('abo_history.col_product') }}{{ __('abo_history.col_details') }}{{ __('tables.price') }} ({{ $priceLabel }}){{ __('abo_history.col_changed_by') }}{{ __('abo_history.col_channel') }}
    {{ $entry->getFormattedDate() }}{!! $entry->getActionBadge() !!} + {{ $entry->product_name }} + @if($entry->product_number) +
    {{ $entry->product_number }} + @endif +     		{{ $entry->getChangeDescription() }}{{ $entry->getFormattedTotalPrice() }} €{{ $entry->changed_by_name }}{!! $entry->getChannelBadge() !!}
    +
    + @endif +
    diff --git a/resources/views/admin/abo/_initial_composition.blade.php b/resources/views/admin/abo/_initial_composition.blade.php new file mode 100644 index 0000000..d28f6d2 --- /dev/null +++ b/resources/views/admin/abo/_initial_composition.blade.php @@ -0,0 +1,59 @@ +@php + $initialItems = $user_abo->getInitialItems(); + $initialCompItems = $user_abo->getInitialCompItems(); + $priceLabel = $user_abo->is_for === 'me' ? __('abo_history.price_net') : __('abo_history.price_gross'); +@endphp + +
    +
    + {{ __('abo_history.initial_composition') }} +
    + + @if($initialItems->isEmpty() && $initialCompItems->isEmpty()) +

    + {{ __('abo_history.no_initial_data') }} +

    + @else +
    + + + + + + + + + + + + @foreach($initialItems as $item) + + + + + + + + @endforeach + @foreach($initialCompItems as $item) + + + + + + + + @endforeach + +
    {{ __('order.article') }}{{ __('order.art_no') }}{{ __('tables.quantity') }}{{ __('tables.price') }} ({{ $priceLabel }}){{ __('order.total_sum') }} ({{ $priceLabel }})
    + {{ $item->product_name }} + @if($item->product) +   {!! \App\Services\AboHelper::getAboTypeBadge(\App\Services\AboHelper::getAboShowOn($item->product)) !!} + @endif + {{ $item->product_number }}{{ $item->qty_after }}{{ $item->getFormattedUnitPrice() }} €{{ $item->getFormattedTotalPrice() }} €
    + Comp + {{ $item->product_name }} + {{ $item->product_number }}{{ $item->qty_after }}{{ $item->getFormattedUnitPrice() }} €{{ $item->getFormattedTotalPrice() }} €
    +
    + @endif +
    diff --git a/resources/views/admin/abo/_order_abo.blade.php b/resources/views/admin/abo/_order_abo.blade.php index e7c0273..5876b76 100644 --- a/resources/views/admin/abo/_order_abo.blade.php +++ b/resources/views/admin/abo/_order_abo.blade.php @@ -108,9 +108,19 @@ {{ __('abo.abo_order_hl') }} @if(isset($only_show_products) && $only_show_products === true) -

    {!! __('abo.abo_order_info_block', ['abo-min-duration' => \App\Models\Setting::getContentBySlug('abo-min-duration')]) !!}

    + @if($view === 'team') +
    {!! __('abo.abo_order_info_block_team', ['abo-min-duration' => \App\Models\Setting::getContentBySlug('abo-min-duration')]) !!}
    + @else +
    {!! __('abo.abo_order_info_block', ['abo-min-duration' => \App\Models\Setting::getContentBySlug('abo-min-duration')]) !!}
    + @endif + @elseif(isset($add_only_mode) && $add_only_mode) + @if($view === 'ot') +
    {!! __('abo.abo_order_info_block_customer', ['abo-min-duration' => \App\Models\Setting::getContentBySlug('abo-min-duration')]) !!}
    + @else +
    {!! __('abo.abo_order_info_add_only', ['abo-min-duration' => \App\Models\Setting::getContentBySlug('abo-min-duration')]) !!}
    + @endif @else -

    {{ __('abo.abo_order_info_2') }}

    +
    {{ __('abo.abo_order_info_2') }}
    @endif
    @include('user.abo.vat_info') @@ -121,8 +131,11 @@ data-route="{{ route('modal_load') }}"> {{ __('abo.add_product') }} @endif
    - @php $only_show_products = isset($only_show_products) ? $only_show_products : false; @endphp - @include('admin.abo._order_abo_show', ['only_show_products' => $only_show_products]) + @php + $only_show_products = isset($only_show_products) ? $only_show_products : false; + $add_only_mode = isset($add_only_mode) ? $add_only_mode : false; + @endphp + @include('admin.abo._order_abo_show', ['only_show_products' => $only_show_products, 'add_only_mode' => $add_only_mode])
    \ No newline at end of file diff --git a/resources/views/admin/abo/_order_abo_show.blade.php b/resources/views/admin/abo/_order_abo_show.blade.php index c30c311..6d56332 100644 --- a/resources/views/admin/abo/_order_abo_show.blade.php +++ b/resources/views/admin/abo/_order_abo_show.blade.php @@ -28,7 +28,7 @@
    {{ __('order.content') }}: {{ $abo_item->product->contents }}
    {{ __('order.art_no') }}: {{ $abo_item->product->number }}
    - @if(!isset($only_show_products) || !$only_show_products) + @if((!isset($only_show_products) || !$only_show_products) && (!isset($add_only_mode) || !$add_only_mode))
    {{ __('order.article_remove') }}
    @@ -38,12 +38,14 @@ @if(!isset($only_show_products) || !$only_show_products)
    + @if(!isset($add_only_mode) || !$add_only_mode) - + @endif + - +
    diff --git a/resources/views/admin/abo/detail.blade.php b/resources/views/admin/abo/detail.blade.php index b1b4d90..dc32549 100644 --- a/resources/views/admin/abo/detail.blade.php +++ b/resources/views/admin/abo/detail.blade.php @@ -41,6 +41,14 @@ {{ Form::close() }} +
    + @include('admin.abo._initial_composition') +
    + +
    + @include('admin.abo._change_history') +
    +
    @include('admin.abo._executions')
    @@ -48,7 +56,45 @@ {{ __('back') }} - + @endsection diff --git a/resources/views/admin/business/modal_edit_points.blade.php b/resources/views/admin/business/modal_edit_points.blade.php index 5b68d87..2357f96 100644 --- a/resources/views/admin/business/modal_edit_points.blade.php +++ b/resources/views/admin/business/modal_edit_points.blade.php @@ -18,6 +18,7 @@ placeholder="mivita" required> + {{-- Basis-Informationen --}}
    @@ -33,25 +34,183 @@ @if($userSalesVolume) - - - + + + @if($userSalesVolume->message) - + @endif @endif
    {{ $userSalesVolume->date }}{{ $userSalesVolume->getFormattedPoints() }}{{ formatNumber($userSalesVolume->total_net) }} €{{ $userSalesVolume->getStatusType() }} + + {{ $userSalesVolume->getFormattedPoints() }} + + + {{ formatNumber($userSalesVolume->total_net) }} € + + + {{ $userSalesVolume->getStatusType() }} + + @if($userSalesVolume->user) {{ $userSalesVolume->user->getFullName() }} @else - nicht zugewiesen + nicht zugewiesen @endif
    {{ $userSalesVolume->message }} {{ $userSalesVolume->message }}
    + + {{-- Erweiterte Informationen --}} + @if($userSalesVolume) +
    +
    +
    Verknüpfungen
    +
    + {{-- Bestellung --}} + @if($userSalesVolume->shopping_order) +
    + Bestellung: + @if($userSalesVolume->status === 1) + + #{{ $userSalesVolume->shopping_order->id }} + + @elseif($userSalesVolume->status === 2 || $userSalesVolume->status === 3) + + #{{ $userSalesVolume->shopping_order->id }} + + @elseif($userSalesVolume->status === 6) + @php + $route = ($userSalesVolume->shopping_order->payment_for === 6 || $userSalesVolume->shopping_order->payment_for === 7) + ? route('admin_sales_customers_detail', [$userSalesVolume->shopping_order->id]) + : route('admin_sales_users_detail', [$userSalesVolume->shopping_order->id]); + @endphp + + #{{ $userSalesVolume->shopping_order->id }} (Storno) + + @endif +
    + @endif + + {{-- Rechnung --}} + @if($userSalesVolume->user_invoice) +
    + @if($userSalesVolume->user_invoice->cancellation) + Stornorechnung: + Storno + + {{ $userSalesVolume->user_invoice->full_number }} + + {{-- Link zur Original-Rechnung --}} + @if($userSalesVolume->shopping_order && $userSalesVolume->shopping_order->user_invoice) +
    Original: + + {{ $userSalesVolume->shopping_order->user_invoice->full_number }} + + + @endif + @else + Rechnung: + + {{ $userSalesVolume->user_invoice->full_number }} + + @endif +
    + @endif + + {{-- Info/Notiz --}} + @if($userSalesVolume->info) +
    + Notiz: {{ $userSalesVolume->info }} +
    + @endif +
    +
    + +
    +
    Monatssummen (kumuliert)
    +
    +
    + KP-Punkte (Eigene): + {{ formatNumber($userSalesVolume->month_KP_points) }} +
    +
    + TP-Punkte (Team): + {{ formatNumber($userSalesVolume->month_TP_points) }} +
    +
    + Shop-Punkte: + {{ formatNumber($userSalesVolume->month_shop_points) }} +
    +
    + Umsatz (netto): + {{ formatNumber($userSalesVolume->month_total_net) }} € +
    +
    + Shop-Umsatz: + {{ formatNumber($userSalesVolume->month_shop_total_net) }} € +
    +
    +
    +
    + + {{-- Status-Details --}} +
    +
    +
    Status-Details
    +
    + + {{ $userSalesVolume->getStatusType() }} + + + {{ $userSalesVolume->getStatusPointsType() }} + + @if($userSalesVolume->status_turnover) + + {{ $userSalesVolume->getStatusTurnoverType() }} + + @endif +
    +
    +
    + + {{-- Änderungshistorie (Syslog) --}} + @if($userSalesVolume->syslog && count($userSalesVolume->syslog) > 0) +
    +
    +
    Änderungshistorie
    +
    +
      + @foreach($userSalesVolume->syslog as $timestamp => $log_entry) +
    • {{ $timestamp }}: {{ $log_entry }}
      • + @endforeach +
    +
    +
    +
    + @endif + + {{-- Timestamps --}} +
    +
    + + Erstellt: {{ $userSalesVolume->created_at->format('d.m.Y H:i:s') }} + @if($userSalesVolume->updated_at && $userSalesVolume->updated_at != $userSalesVolume->created_at) + | Aktualisiert: {{ $userSalesVolume->updated_at->format('d.m.Y H:i:s') }} + @endif + +
    +
    + @endif +
    @if($userSalesVolume->isCurrentMonthYear())
    diff --git a/resources/views/admin/customer/_customer_detail.blade.php b/resources/views/admin/customer/_customer_detail.blade.php index d7ceec9..18367e2 100644 --- a/resources/views/admin/customer/_customer_detail.blade.php +++ b/resources/views/admin/customer/_customer_detail.blade.php @@ -51,6 +51,10 @@
    {{ __('E-Mail') }}
    @if($shopping_user->faker_mail) "-" @else {{ $shopping_user->billing_email }} @endif
    +
    +
    {{ __('account.preferred_language') }}
    + {{ \App\Models\ShoppingUser::getAvailableLanguages()[$shopping_user->language] ?? $shopping_user->language }} +
    diff --git a/resources/views/admin/customer/_detail.blade.php b/resources/views/admin/customer/_detail.blade.php index d13400b..7d7dc51 100644 --- a/resources/views/admin/customer/_detail.blade.php +++ b/resources/views/admin/customer/_detail.blade.php @@ -48,6 +48,7 @@ {{ __('customer.edit_customer_data') }} @endif + @endif diff --git a/resources/views/admin/customer/_edit.blade.php b/resources/views/admin/customer/_edit.blade.php index b341107..18be866 100644 --- a/resources/views/admin/customer/_edit.blade.php +++ b/resources/views/admin/customer/_edit.blade.php @@ -283,10 +283,22 @@ {{ Form::textarea('remarks', $shopping_user->remarks, array('placeholder'=>__('Comments'), 'class'=>'form-control', 'rows'=>4, 'id'=>'remarks')) }} +
    +
    + + +

    {{ __('customer.language_hint') }}

    +
    +
    {{ Form::hidden('faker_mail', $shopping_user->faker_mail) }} - {{ Form::hidden('language', $shopping_user->language) }} @if($isView === 'customer-add') {{ Form::hidden('billing_email_1', $billing_email) }} diff --git a/resources/views/admin/dhl/show.blade.php b/resources/views/admin/dhl/show.blade.php index 2910e06..f6365fc 100644 --- a/resources/views/admin/dhl/show.blade.php +++ b/resources/views/admin/dhl/show.blade.php @@ -345,11 +345,11 @@ @endif - @if($shipment->recipient && isset($shipment->recipient['street'])) + @if($shipment->recipient && isset($shipment->recipient['postnumber'])) - Straße: + Postnummer: - {{ $shipment->recipient['street'] }} + {{ $shipment->recipient['postnumber'] }} @endif @@ -539,16 +539,24 @@ @if($shipment->tracking_status || $shipment->dhl_shipment_no)
    -
    +
    Tracking-Informationen
    + @if($shipment->dhl_shipment_no) + + + Bei DHL verfolgen + + @endif
    @if($shipment->tracking_status) -
    -
    +
    +
    Aktueller Status: {{ $shipment->tracking_status }}
    @@ -559,24 +567,52 @@ @endif
    @endif - - @if($shipment->dhl_shipment_no) -
    -

    Verfolgen Sie diese Sendung direkt bei DHL:

    - - - Bei DHL verfolgen - - {{-- TODO: Tracking-Nummer ist nicht mehr verfügbar - - - Lokales Tracking - - --}} + + {{-- Tracking Events Timeline --}} + @if($shipment->trackingEvents && $shipment->trackingEvents->count() > 0) +
    + @foreach($shipment->trackingEvents as $index => $event) +
    +
    + @if($index === 0) + @if($event->status_code === 'delivered') + + @elseif($event->status_code === 'transit') + + @elseif($event->status_code === 'out-for-delivery') + + @elseif($event->status_code === 'failure' || $event->status_code === 'exception') + + @elseif($event->status_code === 'returned') + + @else + + @endif + @else + + @endif +
    +
    +
    + {{ $event->status_text }} +
    + + {{ $event->event_time->format('d.m.Y H:i') }} Uhr + @if($event->location) + · {{ $event->location }} + @endif + +
    +
    + @if(!$loop->last) +
    + @endif + @endforeach +
    + @elseif(!$shipment->tracking_status) +
    + + Noch keine Tracking-Daten vorhanden. Klicken Sie auf "Tracking aktualisieren" um die Daten abzurufen.
    @endif
    diff --git a/resources/views/admin/lead/edit.blade.php b/resources/views/admin/lead/edit.blade.php index 25d6da3..0261678 100644 --- a/resources/views/admin/lead/edit.blade.php +++ b/resources/views/admin/lead/edit.blade.php @@ -26,6 +26,8 @@ {!! Form::open(['action' => route('admin_lead_store')."?show=".$show, 'class' => 'form-horizontal', 'id'=>'lead-form-validation']) !!} + +
      {{ __('back') }} @@ -46,7 +48,55 @@
    {!! Form::close() !!} + + + diff --git a/resources/views/admin/lead/index.blade.php b/resources/views/admin/lead/index.blade.php index 86b1dc3..0f3791b 100644 --- a/resources/views/admin/lead/index.blade.php +++ b/resources/views/admin/lead/index.blade.php @@ -11,7 +11,6 @@
    {!! Form::open(['action' => route('admin_leads'), 'class' => 'form-horizontal', 'id'=>'form_admin_leads']) !!} -
    - @foreach($filter_months as $key=>$value) - - @endforeach - -
    -
    - -
    -
    - {!! Form::close() !!} -
    -
    - - - +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + @if ($current_export) +
    +
    +
    + Aktueller Export: + {!! $current_export->status_badge !!} + — {{ $current_export->total_lines }} Zeilen + ({{ $current_export->invoice_count }} RE, + {{ $current_export->credit_count }} GS, + {{ $current_export->cancellation_count }} ST) + — {{ $current_export->created_at->format('d.m.Y H:i') }} + @if ($current_export->warning_count > 0) + {{ $current_export->warning_count }} + Warnungen + @endif +
    +
    + + CSV + + @if (!$current_export->isLocked()) +
    + @csrf + + + @endif +
    +
    +
    + @endif + + + +
    + - - - - - - - - - - - - + + + + + + + + +
    {{__('#') }}{{__('Umsatz (ohne Soll/Haben-Kz)')}}{{__('Soll/Haben-Kennzeichen')}}{{__('Konto')}}{{__('Gegenkonto (ohne BU-Schlüssel)')}}{{__('BU-Schlüssel')}}{{__('Belegdatum')}}{{__('Belegfeld 1')}}{{__('Buchungstext')}}{{__('Datum')}}{{__('Rechnung')}}KontoBU-Schl.S/HAnzahlSumme
    +
    +
    +
    + + @if ($current_export) +
    +
    + Buchungszeilen (Export {{ $current_export->period_label }}) +
    +
    +
    + + + + + + + + + + + + + + + - - - +
    #TypUmsatzS/HKontoGegenkontoBUBelegdatumBelegfeld 1BuchungstextUSt-ID
    + @endif + + @if ($recent_exports->count() > 0) +
    +
    + Export-Historie +
    +
    + + + + + + + + + + + + + + @foreach ($recent_exports as $exp) + + + + + + + + + + @endforeach + +
    PeriodeStatusZeilenUmsatzProvisionenErstelltAktionen
    {{ $exp->period_label }}{!! $exp->status_badge !!}{{ $exp->total_lines }}{{ number_format($exp->total_revenue, 2, ',', '.') }} EUR{{ number_format($exp->total_commissions, 2, ',', '.') }} EUR{{ $exp->created_at->format('d.m.Y H:i') }} + + + + @if (!$exp->isLocked()) +
    + @csrf + +
    +
    + @csrf + @method('DELETE') + +
    + @else + + @endif +
    +
    +
    + @endif + + + - $('select.on_change_select_filter').on('change', function(){ - oTable.draw(); - }); - - $('input.on_keyup_input_filter').on('keyup', function(){ - oTable.draw(); - }); - }); - @endsection diff --git a/resources/views/admin/product/form.blade.php b/resources/views/admin/product/form.blade.php index 78ef0a6..37de869 100644 --- a/resources/views/admin/product/form.blade.php +++ b/resources/views/admin/product/form.blade.php @@ -121,6 +121,26 @@
    +
    +
    + + +
    +
    +
    +
    +
    + + +
    +
    +
    diff --git a/resources/views/admin/sales/_detail.blade.php b/resources/views/admin/sales/_detail.blade.php index b759c19..3ea69e8 100644 --- a/resources/views/admin/sales/_detail.blade.php +++ b/resources/views/admin/sales/_detail.blade.php @@ -4,14 +4,15 @@
    {{ __('Status') }}: - - {!! \App\Services\Payment::getShoppingOrderBadge($shopping_order) !!} - +
    + + {!! \App\Services\Payment::getShoppingOrderBadge($shopping_order) !!} + +
    -
    +
    {{ __('order.shipping') }}: -
    - @if($shopping_order->payment_for !== 8) +
    @if($shopping_order->payment_for !== 8) @if ($isAdmin)
    -
    +
    {{ __('order.invoice') }}: -
    +
    @if ($isAdmin) @if ($shopping_order->isInvoice()) + class="btn btn-primary btn-sm" title="Download DE"> + target="_blank" class="btn btn-warning btn-sm" title="Ansicht DE"> + {{-- Lokalisierte Versionen --}} + @foreach($shopping_order->user_invoice->getAvailableLocales() as $locale) + + {{ strtoupper($locale) }} + + + {{ strtoupper($locale) }} + + @endforeach @if (Auth::user()->isSySAdmin())
    -
    - @if ($isAdmin && $shopping_order->payment_for != 8) + @if ($isAdmin && $shopping_order->payment_for != 8) +
    + {{ __('order.delivery_note') }}: -
    +
    @if ($shopping_order->isInvoice()) + class="btn btn-primary btn-sm" title="Download DE"> + target="_blank" class="btn btn-warning btn-sm" title="Ansicht DE"> + {{-- Lokalisierte Versionen --}} + @foreach($shopping_order->user_invoice->getAvailableLocales() as $locale) + + {{ strtoupper($locale) }} + + + {{ strtoupper($locale) }} + + @endforeach @endif
    - @endif
    + @endif +
    + @if (!$isAdmin && $shopping_order->isCancellationInvoice()) + @php + $cancellation_invoice = $shopping_order->getCancellationInvoice(); + @endphp + @if($cancellation_invoice) + Stornorechnung:{{ $cancellation_invoice->full_number }} +
    +
    + + + + + + + + {{-- Lokalisierte Versionen der Stornorechnung --}} + @foreach($cancellation_invoice->getAvailableLocales() as $locale) + + {{ strtoupper($locale) }} + + + {{ strtoupper($locale) }} + + @endforeach +
    + + @endif + @endif +
    @@ -122,7 +191,7 @@
    -
    +
    {{ __('order.points_turnover_assigned') }}
    @if($shopping_order->user_sales_volume && $shopping_order->user_sales_volume->user) {{ $shopping_order->user_sales_volume->user->getFullName() }} @@ -133,7 +202,48 @@ data-action="shopping-order-change-points" data-view="{{ $isView }}" data-route="{{ route('modal_load') }}"> @endif +
    +
    + @if ($isAdmin) + @if ($shopping_order->isCancellationInvoice()) + @php + $cancellation_invoice = $shopping_order->getCancellationInvoice(); + @endphp + @if($cancellation_invoice) + Stornorechnung:
    + {{ $cancellation_invoice->full_number }} + + + + + + + {{-- Lokalisierte Versionen der Stornorechnung --}} + @foreach($cancellation_invoice->getAvailableLocales() as $locale) + + {{ strtoupper($locale) }} + + + {{ strtoupper($locale) }} + + @endforeach +
    Erstellt am: {{ $cancellation_invoice->date }} + @endif + @else + @if ($shopping_order->isInvoice()) + + @endif + @endif + @endif
    @@ -324,6 +434,10 @@
    {{ __('Country') }}
    {{ $shopping_order->shopping_user->billing_country->getLocated() }}
    +
    +
    {{ __('account.preferred_language') }}
    + {{ \App\Models\ShoppingUser::getAvailableLanguages()[$shopping_order->shopping_user->language] ?? $shopping_order->shopping_user->language }} +
    @@ -671,7 +785,7 @@
    @@ -713,6 +827,63 @@
    + + +@endsection diff --git a/resources/views/admin/user/cleanup/logs.blade.php b/resources/views/admin/user/cleanup/logs.blade.php new file mode 100644 index 0000000..8fe0c0b --- /dev/null +++ b/resources/views/admin/user/cleanup/logs.blade.php @@ -0,0 +1,75 @@ +@extends('layouts.layout-2') + +@section('content') +

    + Downline-Übertragungen (User Cleanup Logs) +

    + +
    +
    +
    + Info: Diese Übersicht zeigt alle Downline-Übertragungen bei User-Deaktivierungen. + Wenn ein User deaktiviert wird, werden seine Vertriebspartner-Kinder dem nächsten aktiven Sponsor zugewiesen. +
    +
    +
    + +
    + +
    + +
    +
    + + + + + + + + + + +
    IDInaktiver SponsorBetroffenes Kind (Downline)Neuer SponsorÜbertragen am
    +
    +
    + + +@endsection diff --git a/resources/views/admin/user/cleanup/shopping_logs.blade.php b/resources/views/admin/user/cleanup/shopping_logs.blade.php new file mode 100644 index 0000000..980b2ad --- /dev/null +++ b/resources/views/admin/user/cleanup/shopping_logs.blade.php @@ -0,0 +1,75 @@ +@extends('layouts.layout-2') + +@section('content') +

    + Kunden-Übertragungen (Shopping User Member Logs) +

    + +
    +
    +
    + Info: Diese Übersicht zeigt alle Shopping-Kunden-Übertragungen bei User-Löschungen. + Wenn ein User gelöscht wird, werden seine Shopping-Kunden dem neuen Sponsor übertragen. +
    +
    +
    + +
    + +
    + +
    +
    + + + + + + + + + + +
    IDVorheriger BeraterShopping-KundeNeuer BeraterÜbertragen am
    +
    +
    + + +@endsection diff --git a/resources/views/dashboard/_activities.blade.php b/resources/views/dashboard/_activities.blade.php index 9960b66..1567376 100644 --- a/resources/views/dashboard/_activities.blade.php +++ b/resources/views/dashboard/_activities.blade.php @@ -17,7 +17,7 @@ {{ $user->account->getNotice('business_license_reason') }}

    @endif {{ __('register.change_documents') }} + class="ion ion-ios-document text-default mr-1">    {{ __('register.change_documents') }}
    @@ -29,7 +29,7 @@ @if($user->active == 1) @if($user->files->count()) @foreach($user->files()->whereIdentifier('contract')->get() as $file) - {{ __('home.MIVITA_Consultancy_agreement') }}.pdf + {{ $file->original_name }}
    @endforeach @endif diff --git a/resources/views/dashboard/_membership.blade.php b/resources/views/dashboard/_membership.blade.php index 3be7952..d753e7e 100644 --- a/resources/views/dashboard/_membership.blade.php +++ b/resources/views/dashboard/_membership.blade.php @@ -21,8 +21,8 @@ @if($user->isActiveAccount() )
    - {{__('home.active_role')}}: - @if($user->m_level && $user->user_level) {{ $user->user_level->getLang('name') }} @endif
    + {{__('home.active_role')}}: + @if($user->m_level && $user->user_level) {{ $user->user_level->getLang('name') }} @endif diff --git a/resources/views/dashboard/_news.blade.php b/resources/views/dashboard/_news.blade.php index 0e191ec..f77636d 100644 --- a/resources/views/dashboard/_news.blade.php +++ b/resources/views/dashboard/_news.blade.php @@ -1,88 +1,103 @@ -@if(isset($dashboardNews) && $dashboardNews) -
    -
    -
    -
    - - {{__('home.news_updates') }} -
    -
    - {{ $dashboardNews->getDisplayDateFormatted() }} -
    -
    -
    - {{-- Kurzer Teaser Text --}} -
    -
    - - {{ $dashboardNews->getLang('title') }} -
    -

    - {{ $dashboardNews->getLang('teaser') }} -

    -
    - - - - {{-- Collapse für mehr Inhalt --}} - @if($dashboardNews->getLang('content')) -
    -
    -
    - {!! $dashboardNews->getLang('content') !!} +@if (isset($dashboardNews) && $dashboardNews) +
    +
    +
    +
    + + {{ __('home.news_updates') }} +
    +
    + {{ $dashboardNews->getDisplayDateFormatted() }} +
    +
    +
    + {{-- Kurzer Teaser Text --}} +
    +
    + + {{ $dashboardNews->getLang('title') }} +
    +

    + {{ $dashboardNews->getLang('teaser') }} +

    - {{-- Datei-Links --}} - @if($dashboardNews->hasFileLinks()) -
    -
    - - @foreach($dashboardNews->getFileLinks() as $linkData) - - - {{ $linkData['label'] }} + {{-- Collapse für mehr Inhalt --}} + @if ($dashboardNews->getLang('content')) + + + {{-- Mehr lesen Button --}} +
    + - @endforeach - - - - {{ __('navigation.downloadcenter') }} - -
    + + + {{ __('home.news_archive_link') }} + +
    + @endif
    - @endif -
    - - - - {{-- Mehr lesen Button --}} -
    - -
    - @endif
    -
    - + @endif - diff --git a/resources/views/dashboard/news_archive.blade.php b/resources/views/dashboard/news_archive.blade.php new file mode 100644 index 0000000..53f6664 --- /dev/null +++ b/resources/views/dashboard/news_archive.blade.php @@ -0,0 +1,138 @@ +@extends('layouts.layout-2') + +@section('content') + +

    + + {{ __('home.news_archive_title') }} +

    + +
    + + + {{ __('home.news_back_to_dashboard') }} + +
    + + {{-- Aktuelle News --}} + @if($currentNews) +
    +
    + + {{ __('home.news_archive_current') }} +
    +
    + +
    +
    +
    + + {{ $currentNews->getLang('title') }} +
    +
    + {{ $currentNews->getDisplayDateFormatted() }} + {{ __('home.news_archive_current') }} +
    +
    +
    +

    {{ $currentNews->getLang('teaser') }}

    + + @if($currentNews->getLang('content')) +
    +
    +
    {!! $currentNews->getLang('content') !!}
    + + @if($currentNews->hasFileLinks()) +
    + @foreach($currentNews->getFileLinks() as $linkData) + + + {{ $linkData['label'] }} + + @endforeach +
    + @endif +
    + +
    + +
    + @endif +
    +
    + @endif + + {{-- Ältere News --}} +
    +
    + + {{ __('home.news_archive_older') }} +
    +
    + + @if($archiveNews->isEmpty()) +
    + + {{ __('home.news_archive_empty') }} +
    + @else + @foreach($archiveNews as $news) +
    +
    +
    + + {{ $news->getLang('title') }} +
    +
    + {{ $news->getDisplayDateFormatted() }} +
    +
    +
    +

    {{ $news->getLang('teaser') }}

    + + @if($news->getLang('content')) +
    +
    +
    {!! $news->getLang('content') !!}
    + + @if($news->hasFileLinks()) +
    + @foreach($news->getFileLinks() as $linkData) + + + {{ $linkData['label'] }} + + @endforeach +
    + @endif +
    + +
    + +
    + @endif +
    +
    + @endforeach + @endif + +@endsection + +@section('page-script') + +@endsection diff --git a/resources/views/layouts/includes/layout-sidenav.blade.php b/resources/views/layouts/includes/layout-sidenav.blade.php index 377a8a3..b5609d8 100755 --- a/resources/views/layouts/includes/layout-sidenav.blade.php +++ b/resources/views/layouts/includes/layout-sidenav.blade.php @@ -13,13 +13,7 @@ @if (Auth::user()->showSideNav()) -
  • +
  • {{ __('navigation.my_account') }}
    @@ -31,18 +25,7 @@
    {{ __('navigation.credit') }}
    • - @if (Auth::user()->isVIP()) -
  • - -
    {{ __('navigation.myabo') }}
    -
    -
    VIP
    -
    -     -
    • - @endif +
  • @@ -64,39 +47,14 @@
    • - @if (Auth::user()->isActiveShop()) -
  • - - -
    {{ __('navigation.my_shop') }}
    -     - -
    • - @endif + @if (Auth::user()->isActiveAccount()) +
  • + +
    {{ __('navigation.news_archive') }}
    +     +
  • @@ -111,17 +69,11 @@
  • + class="sidenav-icon ion ion-md-funnel rotate-180" style="text-align: right">
    {{ __('navigation.structure') }}
    • -
  • - -
    {{ __('navigation.abos') }}
    -     -
    • +
  • @@ -134,7 +86,7 @@
    {{ __('navigation.marketingplan') }}
    • - + @if (Auth::user()->isVIP())
  • @endif @if (Auth::user()->isActiveAccount()) -
  • +
  • {{ __('navigation.my_clients') }}
    @@ -171,59 +123,56 @@
  • + class="sidenav-icon ion ion-md-contacts">
    {{ __('navigation.overview') }}
  • + class="sidenav-icon ion ion-md-person-add">
    {{ __('navigation.add') }}
    • -
  • - -
    {{ __('navigation.orders') }}
    -     -
    • - - @if (Auth::user()->isVIP()) -
  • - -
    {{ __('navigation.customerabos') }}
    -
    -
    VIP
    -
    -     -
    • - @endif @endif @if (Auth::user()->isActiveAccount()) -
  • +
  • + +
    {{ __('navigation.do_order') }}
    + +     +
    • + @endif + + @if (Auth::user()->isActiveAccount()) +
  • -
    {{ __('navigation.my_orders') }}
    +
    {{ __('navigation.orders') }}
     +
    • @endif @if (Auth::user()->isActiveAccount()) -
  • +
  • - -
    {{ __('navigation.my_homeparty') }}
    + +
    {{ __('navigation.abos') }}
    • @endif + @if (Auth::user()->isActiveShop()) +
  • + + +
    {{ __('navigation.my_shop') }}
    +     + +
    • + @endif + @if (Auth::user()->isActiveAccount()) +
  • + +
    {{ __('navigation.my_homeparty') }}
    +     +
    • + @endif @if (Auth::user()->isActiveAccount())
    • @endif - @endif @if (Auth::user()->isAdmin()) @@ -313,7 +312,7 @@
  • -
    • @@ -364,7 +363,7 @@     @@ -482,7 +480,8 @@
    {{ __('navigation.translate') }}
    +
  • + +
    {{ __('navigation.user_cleanup') }}
    +     +
    • @endif @if (Auth::user()->isSySAdmin())
  • @@ -575,7 +581,7 @@
  • -
    Tools
    +
    {{ __('navigation.tools') }}
  • diff --git a/resources/views/pdf/cancellation-detail-collection.blade.php b/resources/views/pdf/cancellation-detail-collection.blade.php new file mode 100644 index 0000000..4e56a54 --- /dev/null +++ b/resources/views/pdf/cancellation-detail-collection.blade.php @@ -0,0 +1,137 @@ +
    +
    • {{__('tables.commission')}}:
    + + + + + + + + + + + + + + @foreach($shopping_order->shopping_collect_order->shop_items as $key => $shop_item) + + + + + + + + + + + + @endforeach + + + + + + + + + + + + + + + + + + + + + + + + + + + + @foreach ($shopping_order->shopping_collect_order->tax_split as $tax_rate => $tax) + + + + + + @endforeach + + + + + + + + +
    + {{__('tables.article_no')}} + {{__('tables.label')}}{{__('tables.points')}} + {{ __('pdf.eprice') }}* + {{__('tables.quantity')}} + {{__('tables.sum')}}* + {{__('%')}}{{__('MwSt')}}
    + {{ $shop_item['number'] }} + + {{ maxStrLength($shop_item['name'], 30) }} + + -{{ number_format($shop_item['points_total'], 0) }} + + -{{ formatNumber($shop_item['user_price_net']) }} € + + -{{ number_format($shop_item['qty'], 0) }} + + -{{ formatNumber($shop_item['user_price_total_net']) }} € + + {{ formatNumber($shop_item['tax_rate'], 0) }} + + -{{ formatNumber($shop_item['user_tax_total']) }} € +
    + + {{ __('order.total_shipping_costs') }} + + -1 + + -{{ formatNumber($shopping_order->shopping_collect_order->shipping_net) }} € + + + -{{ formatNumber($shopping_order->shopping_collect_order->shipping_tax) }} € +
      + {{ __('order.sums') }} + + -{{ $shopping_order->shopping_collect_order->getFormattedPoints() }} + + + -{{ cleanIntegerFromString($shopping_order->shopping_collect_order->qty_total) }} + + + -{{ formatNumber($shopping_order->shopping_collect_order->price_total_net) }} € + + + + + -{{ formatNumber($shopping_order->shopping_collect_order->tax_total) }} € + +
      + {{__('email.checkout_mail_subtotal_ws')}} + + -{{ formatNumber($shopping_order->shopping_collect_order->price_total_net) }} € +
      + {{ __('order.excl') }} {{ $tax_rate }}% {{ __('order.VAT') }} + @if(isset($shopping_order->shopping_collect_order->net_split[$tax_rate])) + / {{ __('pdf.off') }} -{{ Util::formatNumber($shopping_order->shopping_collect_order->net_split[$tax_rate]) }} € {{ __('pdf.net') }} + @endif + + -{{ formatNumber($tax) }} € +
      + {{ __('pdf.total_incl_VAT') }} + + + -{{ formatNumber($shopping_order->shopping_collect_order->price_total) }} € + +
    +
    diff --git a/resources/views/pdf/cancellation-detail-homeparty.blade.php b/resources/views/pdf/cancellation-detail-homeparty.blade.php new file mode 100644 index 0000000..578d507 --- /dev/null +++ b/resources/views/pdf/cancellation-detail-homeparty.blade.php @@ -0,0 +1,102 @@ +
    + + + + + + + + + + + + + + @if($shopping_order->homeparty->homeparty_host) + @include('pdf.invoice-homeparty-detail', ['homeparty'=>$shopping_order->homeparty, 'homeparty_user' => $shopping_order->homeparty->homeparty_host, 'is_cancellation' => true]) + @endif + + @if($shopping_order->homeparty->homeparty_guests) + @foreach($shopping_order->homeparty->homeparty_guests as $homeparty_guest) + @include('pdf.invoice-homeparty-detail', ['homeparty'=>$shopping_order->homeparty, 'homeparty_user' => $homeparty_guest, 'is_cancellation' => true]) + @endforeach + @endif + + + + @php($hp_order = $shopping_order->homeparty->order) + @if($hp_order['is_bonus']) + + + + + + + @else + + @endif + + + + + + + + + + + + + + + + + + @if($shopping_order->tax_split) + @foreach ($shopping_order->tax_split as $tax_rate => $tax) + + + + + + @endforeach + @else + + + + + + @endif + + + + + + +
    {{__('tables.article_no')}}{{__('tables.label')}}{{__('tables.quantity')}}{{__('tables.points')}}%{{__('tables.vk_price')}}*{{ __('tables.ek_price') }}*
      + {{ $hp_order['voucher_name'] }} + -{{ Util::formatNumber($hp_order['voucher_price'])}} €
      + {{ __('order.sum') }} + -{{ $hp_order['points'] - $hp_order['bonus_points_diff'] }} -{{ Util::formatNumber($hp_order['price'])}} €-{{ Util::formatNumber($hp_order['ek_price'])}} €
      + {{__('email.checkout_mail_shipping')}} + -{{ $shopping_order->getFormattedShippingNet() }} €
      + {{ __('order.total_advisor_price') }} + -{{ Util::formatNumber($hp_order['ek_price_total'])}} €
      + {{ __('order.excl') }} {{ $tax_rate }}% {{ __('order.VAT') }} + @if(isset($shopping_order->net_split[$tax_rate])) + / {{ __('pdf.off') }} -{{ Util::formatNumber($shopping_order->net_split[$tax_rate]) }} € {{ __('pdf.net') }} + @endif + + -{{ formatNumber($tax) }} € +
      + {{__('email.checkout_mail_tax')}} + + -{{ $shopping_order->getFormattedTax() }} € +
      + {{ __('pdf.total_incl_VAT') }} + + + -{{ $shopping_order->getFormattedTotalShipping() }} € + +
    +
    diff --git a/resources/views/pdf/cancellation-detail.blade.php b/resources/views/pdf/cancellation-detail.blade.php new file mode 100644 index 0000000..714bea5 --- /dev/null +++ b/resources/views/pdf/cancellation-detail.blade.php @@ -0,0 +1,196 @@ +
    + + + + + + @if($shopping_order->payment_for === 6) + + + + + @else + + + + + + @endif + + + + @foreach($shopping_order->shopping_order_items as $shopping_order_item) + + + + @if($shopping_order->payment_for === 6) + + + + + @else + + + + + + @endif + + + {{-- Bundle-Items: Enthaltene Produkte im Set/Kit auflisten --}} + @if($shopping_order_item->product->bundleItems && $shopping_order_item->product->bundleItems->count() > 0) + @foreach($shopping_order_item->product->bundleItems as $bundleItem) + + + + @if($shopping_order->payment_for === 6) + + + + + @else + + + + + + @endif + + @endforeach + @endif + @endforeach + + + @if($shopping_order->payment_for === 6) + @php($colspan = 4) + @else + @php($colspan = 5) + @endif + + + + + + + + + + + + @if($shopping_order->tax > 0) + @if($shopping_order->tax_split) + @foreach ($shopping_order->tax_split as $tax_rate => $tax) + + + + + + @endforeach + @else + + + + + + @endif + + + + + + + @else + + + + + + + + + + + @endif + +
    + {{__('tables.article_no')}}. + {{__('tables.label')}} + {{ __('pdf.eprice') }} @if($shopping_order->tax == 0)*@endif{{__('tables.quantity')}}{{__('tables.VAT')}}{{__('tables.sum')}} @if($shopping_order->tax == 0)*@endif + {{__('tables.vk_price')}}* + {{__('tables.quantity')}}{{__('tables.points')}}% + {{ __('tables.ek_price') }}* +
    + {{ $shopping_order_item->product->number }} + + {{ maxStrLength($shopping_order_item->product->getLang('name') , 35) }} + + -{{ $shopping_order_item->getFormattedPrice() }} € + + -{{ cleanIntegerFromString($shopping_order_item->qty) }} + + {{ $shopping_order_item->getFormattedTaxRate() }}% + + -{{ $shopping_order_item->getFormattedTotalPrice() }} € + + -{{ $shopping_order_item->getFormattedPriceVkNet() }} € + + -{{ cleanIntegerFromString($shopping_order_item->qty) }} + + -{{ $shopping_order_item->getFormattedPoints() }} + + @if($shopping_order_item->price > 0) + {{ cleanNumberFormat($shopping_order_item->discount) }} + @else + 0 + @endif + + -{{ $shopping_order_item->getFormattedTotalPriceNet() }} € +
    + {{ $bundleItem->number }} + + -{{ $bundleItem->pivot->quantity }}x {{ maxStrLength($bundleItem->getLang('name'), 30) }} + ---------
      + {{__('email.checkout_mail_shipping')}} + + @if($shopping_order->tax > 0) + @if($shopping_order->payment_for === 6) + -{{ $shopping_order->getFormattedShipping() }} € + @else + -{{ $shopping_order->getFormattedShippingNet() }} € + @endif + @else + -{{ $shopping_order->getFormattedShippingNet() }} € + @endif +
      + {{__('email.checkout_mail_subtotal_ws')}} + + -{{ $shopping_order->getFormattedSubtotalWs() }} € +
      + {{ __('order.excl') }} {{ $tax_rate }}% {{ __('order.VAT') }} + @if(isset($shopping_order->net_split[$tax_rate])) + / {{ __('pdf.off') }} -{{ Util::formatNumber($shopping_order->net_split[$tax_rate]) }} € {{ __('pdf.net') }} + @endif + + -{{ formatNumber($tax) }} € +
      + {{__('email.checkout_mail_tax')}} + + -{{ $shopping_order->getFormattedTax() }} € +
      + {{ __('pdf.total_incl_VAT') }} + + + -{{ $shopping_order->getFormattedTotalShipping() }} € + +
      + {{__('email.checkout_mail_tax')}} + + 0 € +
      + {{ __('order.sum') }} + + + -{{ $shopping_order->getFormattedTotalShipping() }} € + +
    +
    diff --git a/resources/views/pdf/cancellation.blade.php b/resources/views/pdf/cancellation.blade.php new file mode 100644 index 0000000..3709b2f --- /dev/null +++ b/resources/views/pdf/cancellation.blade.php @@ -0,0 +1,421 @@ + + + + + mivita.care - Stornorechnung + + + + + +
    +
    {{ __('pdf.address_top') }}
    + @if($shopping_order->shopping_user->billing_company) + {{ $shopping_order->shopping_user->billing_company }}
    + @else + @if($shopping_order->payment_for !== 6) + {{ __('Company') }}
    + @endif + @endif + {{ \App\Services\HTMLHelper::getSalutationLang($shopping_order->shopping_user->billing_salutation) }} + {{ $shopping_order->shopping_user->billing_firstname }} {{ $shopping_order->shopping_user->billing_lastname }}
    + {{ $shopping_order->shopping_user->billing_address }}
    + @if($shopping_order->shopping_user->billing_address_2) + {{ $shopping_order->shopping_user->billing_address_2 }}
    + @endif + {{ $shopping_order->shopping_user->billing_zipcode }} {{ $shopping_order->shopping_user->billing_city }}
    + @if($shopping_order->shopping_user->billing_country) + {{ $shopping_order->shopping_user->billing_country->getLocated() }} + @endif +
    + @if($shopping_order->payment_for === 6) +
    + + @if(isset($is_copy) && $is_copy) + + + + @endif + + + + + + + + + + + + +
    {{ __('pdf.invoice_copy') }}: {{ strtoupper(app()->getLocale()) }}
    {{ __('pdf.date') }}:{{ $invoice_date }}
    {{ __('pdf.cancellation_nr') }}:{{ $invoice_number }}
    {{ __('pdf.order_no') }}:{{ $shopping_order->getLastShoppingPayment('reference') }}
    +
    + @else +
    + + @if(isset($is_copy) && $is_copy) + + + + @endif + + + @if($shopping_order->payment_for === 7) + + @else + + @endif + + + + + + + + + + + + + +
    {{ __('pdf.invoice_copy') }}: {{ strtoupper(app()->getLocale()) }}
    {{ __('pdf.adviser_id') }}: + @if(isset($shopping_order->member->account)) + {!! str_pad($shopping_order->member->account->m_account, 5, "0", STR_PAD_LEFT) !!} + @endif + + @if(isset($shopping_order->shopping_user->auth_user->account)) + {!! str_pad($shopping_order->auth_user->account->m_account, 5, "0", STR_PAD_LEFT) !!} + @endif +
    {{ __('pdf.date') }}:{{ $invoice_date }}
    {{ __('pdf.cancellation_nr') }}:{{ $invoice_number }}
    {{ __('pdf.order_no') }}:{{ $shopping_order->getLastShoppingPayment('reference') }}
    +
    + @endif +
    +
    {{ __('pdf.cancellation_invoice') }}
    +
    + {{ __('pdf.cancellation_for') }}: {{ $original_invoice->full_number }} + {{ __('pdf.from') }} {{ $original_invoice->date }} +
    +
    + {{ __('pdf.attention') }}: {{ __('pdf.cancellation_invoice_info') }} +
    +
    + + @if($shopping_order->homeparty) + @include('pdf.cancellation-detail-homeparty') + @elseif($shopping_order->shopping_collect_order) + @include('pdf.cancellation-detail-collection') + @else + @include('pdf.cancellation-detail') + @endif + + + + diff --git a/resources/views/pdf/cancellation_delivery.blade.php b/resources/views/pdf/cancellation_delivery.blade.php new file mode 100644 index 0000000..d556cf2 --- /dev/null +++ b/resources/views/pdf/cancellation_delivery.blade.php @@ -0,0 +1,116 @@ + + + + + mivita.care - Storno-Lieferschein + + + +
    +

    {{ __('pdf.cancellation_delivery') }}

    +

    + {{ __('pdf.cancellation_for') }}: {{ $original_invoice->full_number }}
    + {{ __('pdf.date') }}: {{ $invoice_date }}
    + {{ __('pdf.cancellation_nr') }}: {{ $invoice_number }} +

    +
    + +
    + {{ __('pdf.attention') }}: {{ __('pdf.cancellation_delivery_info') }} +
    + + + + + + + + + + + @php $pos = 0; @endphp + @foreach($shopping_order->shopping_order_items as $item) + @php $pos++; @endphp + + + + + + @endforeach + +
    {{ __('pdf.pos') }}{{ __('pdf.article') }}{{ __('pdf.quantity') }}
    {{ $pos }} + {{ $item->product_title }} + @if($item->product_subtitle) +
    {{ $item->product_subtitle }} + @endif +     		-{{ $item->quantity }} {{ $item->unit }}
    + +

    + {{ __('pdf.cancellation_delivery_note') }} +

    + + diff --git a/resources/views/pdf/credit.blade.php b/resources/views/pdf/credit.blade.php index 6f29919..7ac1219 100644 --- a/resources/views/pdf/credit.blade.php +++ b/resources/views/pdf/credit.blade.php @@ -293,6 +293,11 @@
    + @if(isset($is_copy) && $is_copy) + + + + @endif +
    {{ __('pdf.credit_copy') }}: {{ strtoupper(app()->getLocale()) }}
    {{ __('pdf.adviser_id') }}: diff --git a/resources/views/pdf/delivery.blade.php b/resources/views/pdf/delivery.blade.php index 51431c9..f02ac91 100644 --- a/resources/views/pdf/delivery.blade.php +++ b/resources/views/pdf/delivery.blade.php @@ -312,6 +312,11 @@ @if($shopping_order->payment_for === 6)
    + @if(isset($is_copy) && $is_copy) + + + + @endif @@ -329,6 +334,11 @@ @else
    {{ __('pdf.delivery_copy') }}: {{ strtoupper(app()->getLocale()) }}
    {{ __('pdf.date') }}: {{ $invoice_date }}
    + @if(isset($is_copy) && $is_copy) + + + + @endif diff --git a/resources/views/pdf/invoice.blade.php b/resources/views/pdf/invoice.blade.php index 0d1f758..14cea6d 100755 --- a/resources/views/pdf/invoice.blade.php +++ b/resources/views/pdf/invoice.blade.php @@ -293,6 +293,11 @@ @if($shopping_order->payment_for === 6)
    {{ __('pdf.delivery_copy') }}: {{ strtoupper(app()->getLocale()) }}
    {{ __('pdf.adviser_id') }}:
    + @if(isset($is_copy) && $is_copy) + + + + @endif @@ -310,6 +315,11 @@ @else
    {{ __('pdf.invoice_copy') }}: {{ strtoupper(app()->getLocale()) }}
    {{ __('pdf.date') }}: {{ $invoice_date }}
    + @if(isset($is_copy) && $is_copy) + + + + @endif diff --git a/resources/views/portal/abo/my_abo.blade.php b/resources/views/portal/abo/my_abo.blade.php index f4c5b68..ada8a78 100755 --- a/resources/views/portal/abo/my_abo.blade.php +++ b/resources/views/portal/abo/my_abo.blade.php @@ -25,10 +25,13 @@ @include('admin.customer._customer_detail', ['shopping_user' => $customer_detail]) - {!! Form::open(['action' => route('user_abos_update', [$view, $user_abo->id]), 'class' => 'form-horizontal', 'id'=>'cart-order-form']) !!} + @php + $addOnlyMode = App\Services\AboHelper::isAddOnlyMode($user_abo, $view); + @endphp + {!! Form::open(['action' => route('user_abos_update', [$view, $user_abo->id]), 'class' => 'form-horizontal', 'id'=>'cart-order-form', 'data-add-only-mode' => $addOnlyMode ? '1' : '0']) !!}
    - @include('admin.abo._order_abo') + @include('admin.abo._order_abo', ['add_only_mode' => $addOnlyMode])
    @if($comp_products && Yard::instance('shopping')->getNumComp() > 0) @@ -36,7 +39,7 @@ @include('user.order.comp_product') @endif - + {{ Form::close() }}
    @@ -44,7 +47,47 @@
    - {{ __('back') }} + {{ __('abo.back') }} + +
    {{ __('pdf.invoice_copy') }}: {{ strtoupper(app()->getLocale()) }}
    {{ __('pdf.adviser_id') }}:
    + + + + + + + + + + + + +
    {{ __('order.article') }}:
    {{ __('tables.price') }}:
    {{ __('tables.quantity') }}:
    +
    +
    + + +
    + + + @endsection @@ -57,4 +100,4 @@ -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/portal/customer/_edit_form.blade.php b/resources/views/portal/customer/_edit_form.blade.php index ab2e725..8546071 100644 --- a/resources/views/portal/customer/_edit_form.blade.php +++ b/resources/views/portal/customer/_edit_form.blade.php @@ -256,6 +256,25 @@ +
    +
    {{ __('account.preferred_language') }}
    +
    +
    +
    + + +

    {{ __('customer.language_hint') }}

    +
    +
    +
    +
    + +@stack('scripts') @yield('scripts') diff --git a/resources/views/portal/order/_detail.blade.php b/resources/views/portal/order/_detail.blade.php index 44992fa..d192897 100644 --- a/resources/views/portal/order/_detail.blade.php +++ b/resources/views/portal/order/_detail.blade.php @@ -3,33 +3,49 @@
    {{ __('Status') }}: +
    {!! \App\Services\Payment::getShoppingOrderBadge($shopping_order) !!} +
    {{ __('order.shipping') }}: +
    @if($shopping_order->payment_for !== 8) {{ $shopping_order->getShippedType() }} @endif +
    -
    +
    {{ __('order.invoice') }}: - +
    @if ($shopping_order->isInvoice()) + class="btn btn-primary btn-sm" title="Download DE"> + target="_blank" class="btn btn-warning btn-sm" title="Ansicht DE"> + {{-- Lokalisierte Versionen --}} + @foreach($shopping_order->user_invoice->getAvailableLocales() as $locale) + + {{ strtoupper($locale) }} + + + {{ strtoupper($locale) }} + + @endforeach @endif @if (($shopping_order->txaction === 'extern' || $shopping_order->txaction === 'extern_paid') && $shopping_order->wp_invoice_path) - @endif +
    @@ -279,7 +295,7 @@ @if ($shopping_order->txaction !== 'extern')
    - +
    @@ -291,24 +307,36 @@ - @php($count = 0) - @if(isset($shopping_order->shopping_payments) && $shopping_order->shopping_payments) - @foreach ($shopping_order->shopping_payments as $shopping_payment) - @if(isset($shopping_payment) && $shopping_payment) - - - - - - - - - @endif - @endforeach - @endif + {{-- Daten werden per AJAX über DataTables geladen --}}
    #
    {{ ++$count }}{{ $shopping_payment->getPaymentType() }}{{ $shopping_payment->getPaymentAmount() }}{!! \App\Services\Payment::getShoppingPaymentBadge($shopping_payment) !!}{{ $shopping_payment->created_at->format('d.m.Y H:i') }}{{ $shopping_payment->reference }}
    + @push('scripts') + + @endpush @else
    diff --git a/resources/views/portal/order/my_orders.blade.php b/resources/views/portal/order/my_orders.blade.php index a690dd2..ef70bca 100755 --- a/resources/views/portal/order/my_orders.blade.php +++ b/resources/views/portal/order/my_orders.blade.php @@ -19,79 +19,59 @@

    {{ __('navigation.my_orders') }}

    +
    - -
    - +
    +
    - - - - - - - - - - - - + + + + + + + + + + + + - @if($shopping_user->shopping_order) - @forelse($shopping_user->getAllOrdersByMember() as $shopping_order) - - - - - - - - - - - - - @empty - - - - @endforelse - @endif + {{-- Daten werden per AJAX über DataTables geladen --}}
    #{{__('tables.date')}}{{__('tables.amount')}}{{__('tables.status')}}{{__('tables.shipping')}}{{__('tables.firstname')}}{{__('tables.lastname')}}{{__('tables.email')}}{{__('tables.invoice')}}{{__('tables.art')}}
    #{{ __('tables.date') }}{{ __('tables.amount') }}{{ __('tables.status') }}{{ __('tables.shipping') }}{{ __('tables.firstname') }}{{ __('tables.lastname') }}{{ __('tables.email') }}{{ __('tables.invoice') }}{{ __('tables.art') }}
    - - - - {{ $shopping_order->created_at->format('d.m.Y') }} - - {{ $shopping_order->getFormattedTotalShipping() }} € - - {!! \App\Services\Payment::getShoppingOrderBadge($shopping_order) !!} - - {{ $shopping_order->getShippedType() }} - - {{ $shopping_order->shopping_user->billing_firstname }}{{ $shopping_order->shopping_user->billing_lastname }}{{ $shopping_order->shopping_user->billing_email }}{{ $shopping_order->isInvoice() ? ' - ' : '-'; - }}{!! \App\Services\Payment::getPaymentForBadge($shopping_order) !!}
    {{ __('order.no_orders_found') }}
    - @endsection @section('scripts') -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/user/abo/detail.blade.php b/resources/views/user/abo/detail.blade.php index 901e342..b283e33 100644 --- a/resources/views/user/abo/detail.blade.php +++ b/resources/views/user/abo/detail.blade.php @@ -31,26 +31,22 @@
    @include('admin.customer._customer_detail', ['shopping_user' => $customer_detail])
    - @if(App\Services\AboHelper::canCancelAbo($user_abo, $view)) - {!! Form::open(['action' => route('user_abos_update', [$view, $user_abo->id]), 'class' => 'form-horizontal', 'id'=>'cart-order-form']) !!} - -
    - @include('admin.abo._order_abo') -
    - - @if($comp_products && Yard::instance('shopping')->getNumComp() > 0) -
    - @include('user.order.comp_product') -
    - @endif - - {{ Form::close() }} - @else - + @php + $addOnlyMode = App\Services\AboHelper::isAddOnlyMode($user_abo, $view); + @endphp + {!! Form::open(['action' => route('user_abos_update', [$view, $user_abo->id]), 'class' => 'form-horizontal', 'id'=>'cart-order-form', 'data-add-only-mode' => $addOnlyMode ? '1' : '0']) !!} +
    - @include('admin.abo._order_abo', ['only_show_products' => true]) + @include('admin.abo._order_abo', ['add_only_mode' => $addOnlyMode])
    + + @if($comp_products && Yard::instance('shopping')->getNumComp() > 0) +
    + @include('user.order.comp_product') +
    @endif + + {{ Form::close() }}
    @include('admin.abo._executions')
    @@ -58,6 +54,46 @@ {{ __('back') }} + + @endsection @section('scripts') diff --git a/resources/views/user/data_confirm.blade.php b/resources/views/user/data_confirm.blade.php index a6a2414..98bd07f 100644 --- a/resources/views/user/data_confirm.blade.php +++ b/resources/views/user/data_confirm.blade.php @@ -20,7 +20,12 @@
    - {!! File::get(public_path('pdf/mivita_contract_de.php')); !!} + @php($lang = \App::getLocale()) + @if(File::exists(public_path('pdf/mivita_contract_'.$lang.'.php'))) + {!! File::get(public_path('pdf/mivita_contract_'.$lang.'.php')); !!} + @else + {!! File::get(public_path('pdf/mivita_contract_en.php')); !!} + @endif
    diff --git a/resources/views/user/order/delivery.blade.php b/resources/views/user/order/delivery.blade.php index 8b8ad0a..1b15940 100644 --- a/resources/views/user/order/delivery.blade.php +++ b/resources/views/user/order/delivery.blade.php @@ -44,12 +44,9 @@ ({{ __('order.cpay') }}) - @if(Auth::user()->isVIP())
    -
    -
    VIP only
    -
    +

    {{ __('abo.abo_delivery') }} @@ -94,7 +91,6 @@

    - @endif
    diff --git a/resources/views/user/order/payment/index.blade.php b/resources/views/user/order/payment/index.blade.php index edb34a3..a6ac397 100644 --- a/resources/views/user/order/payment/index.blade.php +++ b/resources/views/user/order/payment/index.blade.php @@ -5,6 +5,22 @@ {{ __('navigation.payment_links') }} / {{ __('navigation.overview') }} + {{-- Status-Legende --}} +
    +
    +
    {{ __('tables.status') }} - {{ __('legend') }}
    +
    + @foreach(\App\Services\OrderPaymentService::getStatusBadgeClasses() as $statusKey => $badgeClass) +
    + + {{ __('payment.' . $statusKey) }} + +
    + @endforeach +
    +
    +
    +
    diff --git a/resources/views/user/order/shipping_ot.blade.php b/resources/views/user/order/shipping_ot.blade.php index a565e85..ed93af7 100644 --- a/resources/views/user/order/shipping_ot.blade.php +++ b/resources/views/user/order/shipping_ot.blade.php @@ -12,6 +12,7 @@ {{ Form::hidden('billing_state', Yard::instance('shopping')->getShippingCountryId()) }} {{ Form::hidden('billing_email', $shopping_user->billing_email) }} {{ Form::hidden('shipping_email', $shopping_user->shipping_email) }} + {{ Form::hidden('language', $shopping_user->getLocale()) }} @endif @if($shopping_user->same_as_billing) diff --git a/resources/views/user/order/yard_view_form.blade.php b/resources/views/user/order/yard_view_form.blade.php index 5a9f4d5..bd93ee4 100644 --- a/resources/views/user/order/yard_view_form.blade.php +++ b/resources/views/user/order/yard_view_form.blade.php @@ -203,9 +203,39 @@ @@ -336,3 +366,4 @@ @endif @endif + diff --git a/resources/views/user/team/abo_detail.blade.php b/resources/views/user/team/abo_detail.blade.php index 98e493d..3255dae 100644 --- a/resources/views/user/team/abo_detail.blade.php +++ b/resources/views/user/team/abo_detail.blade.php @@ -3,7 +3,7 @@ @section('content')

    - {{ __('back') }} + {{ __('back') }}
    {{ __('abo.team_subscriptions') }} @@ -45,7 +45,7 @@
    - {{ __('back') }} + {{ __('back') }} @endsection diff --git a/resources/views/user/team/abos.blade.php b/resources/views/user/team/abos.blade.php index a79713f..0c6edf1 100644 --- a/resources/views/user/team/abos.blade.php +++ b/resources/views/user/team/abos.blade.php @@ -29,13 +29,13 @@
    - + {{ __('navigation.abo') }} {{ '#'.$user_abo->payone_userid }}
    - + {{ __('abo.abo_details') }}
    @@ -105,9 +105,18 @@ @endif
    -
    {{ __('tables.partner') }}
    +
    {{ __('tables.adviser') }}
    @if($user_abo->user && $user_abo->user->account) - {{ $user_abo->user->account->m_account }} + + {{ $user_abo->user->account->first_name }} {{ $user_abo->user->account->last_name }} + @endif
    diff --git a/resources/views/user/user_form.blade.php b/resources/views/user/user_form.blade.php index eb6ecd6..077adb4 100644 --- a/resources/views/user/user_form.blade.php +++ b/resources/views/user/user_form.blade.php @@ -351,6 +351,26 @@ +
    +
    + {{ __('account.language_settings') }} +
    +
    +
    +
    + + +

    {{ __('account.language_hint') }}

    +
    +
    +
    +
    diff --git a/resources/views/user/wizard/_payment.blade.php b/resources/views/user/wizard/_payment.blade.php index d3c5d0a..9f7d4c0 100644 --- a/resources/views/user/wizard/_payment.blade.php +++ b/resources/views/user/wizard/_payment.blade.php @@ -1,149 +1,182 @@ - - -
    +
    {{ __('payment.ordering_country') }}
    - {{ App\Services\UserService::getOrderInfo('billing_state') }} + {{ App\Services\UserService::getOrderInfo('billing_state') }}
    {{ __('payment.country_of_delivery') }}
    - {{ App\Services\UserService::getOrderInfo('shipping_state') }} + {{ App\Services\UserService::getOrderInfo('shipping_state') }}
    {{ __('payment.VAT') }}
    - {{ App\Services\UserService::getOrderInfo('tax_free') }} + {{ App\Services\UserService::getOrderInfo('tax_free') }}
    {{ __('payment.reverse_charge_procedure') }}n
    - {{ App\Services\UserService::getOrderInfo('user_reverse_charge') }} + {{ App\Services\UserService::getOrderInfo('user_reverse_charge') }}
    - {!! Form::open(['action' => route('wizard_store_payment', [20]), 'class' => 'form-horizontal']) !!} -
    -

    {{ __('order.shipping_costs') }}: -
    {{ Yard::instance('shopping')->shippingNet() }} €
    - @if(Yard::instance('shopping')->isPriceCurrency()) - ~{{ Yard::instance('shopping')->getCurrencyByKey('shippingNet') }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} + + @php($shippingFree = Yard::instance('shopping')->getShippingFree()) + @php($missingValue = Yard::instance('shopping')->getShippingFreeMissingValue()) + @php($currentShipping = Yard::instance('shopping')->shippingNet()) + @if($shippingFree && intval($currentShipping) == 0) + {{-- Versandkostenfrei erreicht --}} +
    + {{ __('order.free_shipping') }} +
    +
    + + {{ __('order.free_shipping_reached', ['amount' => number_format($shippingFree, 2, ',', '.')]) }} + +
    + @else + {{-- Normale Versandkosten --}} +
    {{ $currentShipping }} €
    + @if(Yard::instance('shopping')->isPriceCurrency()) + ~{{ Yard::instance('shopping')->getCurrencyByKey('shippingNet') }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} + @endif + + @if($shippingFree && $missingValue > 0) + {{-- Zeige wie viel noch fehlt --}} +
    + + + {{ __('order.free_shipping_info', [ + 'amount' => number_format($shippingFree, 2, ',', '.'), + 'missing' => number_format($missingValue, 2, ',', '.') + ]) }} + +
    + @endif @endif
    - +{!! Form::open([ + 'action' => route('wizard_store_payment', [20]), + 'class' => 'form-horizontal', + 'id' => 'wizard-payment-form', +]) !!} + +
    + + {!! __('register.wizard_package_info') !!} +
    + +
    +
    + @php($counter = 1) - @foreach($products as $product) + @foreach ($products as $product) @php($counter++) @endforeach - -
    - @if(count($product->images)) - + @if (count($product->images)) + @endif
    -
    {{$product->getLang('name')}}
    - {!! $product->getLang('copy') !!} +
    {{ $product->getLang('name') }}
    + {!! $product->getLang('copy') !!}
    		- {{ $product->getFormattedPriceWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country) }} € /p.a. - @if( \App\Services\UserService::$user_country && \App\Services\UserService::$user_country->currency) - {!! $product->getFormattedPriceCurrencyWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country) !!} + {{ $product->getFormattedPriceWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country) }} + € + @if (\App\Services\UserService::$user_country && \App\Services\UserService::$user_country->currency) + {!! $product->getFormattedPriceCurrencyWith( + \App\Services\UserService::getTaxFree(), + false, + \App\Services\UserService::$user_country, + ) !!} @endif
    -
    +
    +
    - @if($products_on_board) -
    - - - @foreach($products_on_board as $product) - - - - - - @endforeach - -
    - - -
    - @if(count($product->images)) - - @endif -
    -
    {{$product->getLang('name')}}
    - {!! $product->getLang('copy') !!} -
    -
    -     		- {{ $product->getFormattedPriceWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country) }} € - @if(\App\Services\UserService::$user_country && \App\Services\UserService::$user_country->currency) - {!! $product->getFormattedPriceCurrencyWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country) !!} - @endif -
    +
    + + {{ __('register.wizard_no_selection') }} +
    + +
    +
    +
    + + {{ __('order.total_sum') }} @if (\App\Services\UserService::getTaxFree()) + {{ __('order.net') }} + @else + {{ __('order.gross') }} + @endif: 0 €
    - @endif -
    -
    - {{-- -
    - --}} -
    - - {{ __('order.total_sum') }} @if(\App\Services\UserService::getTaxFree()) {{ __('order.net') }} @else {{ __('order.gross') }} @endif: 0 € +   +

    + {{ __('payment.checkout_ssl_server') }} +
    +{!! Form::close() !!} + +{{-- Modal: Warnung bei reiner Mitgliedschaft ohne Starterpaket --}} + - \ No newline at end of file + calculate_package_payment(); + + // Submit mit Warn-Modal bei reiner Mitgliedschaft + $('#btn-wizard-submit').on('click', function() { + var selected = $('input[name="switchers-package-wizard"]:checked'); + if (!selected.length) { + $('#wizard-selection-error').removeClass('d-none'); + $('.switcher-indicator').addClass('error-box-shadow'); + $('#membership_package_payment_container').addClass('error-box-shadow'); + $('html, body').animate({ + scrollTop: $('#membership_package_payment').offset().top - 100 + }, 300); + return; + } + if (selected.data('is-membership-only') == '1') { + $('#starterWarningModal').modal('show'); + } else { + $('#wizard-payment-form').submit(); + } + }); + + $('#btn-confirm-membership-only').on('click', function() { + $('#starterWarningModal').modal('hide'); + $('#wizard-payment-form').submit(); + }); + }); + diff --git a/resources/views/user/wizard/register_payment.blade.php b/resources/views/user/wizard/register_payment.blade.php index 371cc91..2b23503 100644 --- a/resources/views/user/wizard/register_payment.blade.php +++ b/resources/views/user/wizard/register_payment.blade.php @@ -17,7 +17,7 @@ @endif

    - {{__('register.complete_registration')}} + {{ __('register.complete_registration') }}

    @@ -26,8 +26,8 @@ 1 - {{__('register.package')}} -
    {{__('register.select')}}
    + {{ __('register.package') }} +
    {{ __('register.select') }}
     @@ -35,11 +35,14 @@
    - @if($userHistoryWizardPayment && $userHistoryWizardPayment->status > 2) -
    {{__('membership.payment_has_been_made') }} {{__('membership.status') }} {{ trans('payment.status.'.$userHistoryWizardPayment->getStatusType())}}
    + @if ($userHistoryWizardPayment && $userHistoryWizardPayment->status > 2) +
    + {{ __('membership.payment_has_been_made') }} {{ __('membership.status') }} + {{ trans('payment.status.' . $userHistoryWizardPayment->getStatusType()) }}
    -
    @@ -63,7 +66,7 @@ backButtonSupport: true, useURLhash: false, showStepURLhash: false, - selected: '{{$step}}', + selected: '{{ $step }}', toolbarSettings: { showNextButton: false, showPreviousButton: false, diff --git a/resources/views/web/templates/checkout-error.blade.php b/resources/views/web/templates/checkout-error.blade.php new file mode 100644 index 0000000..f9b0adb --- /dev/null +++ b/resources/views/web/templates/checkout-error.blade.php @@ -0,0 +1,73 @@ +@extends($user_shop ?'web.user.layouts.layout' : 'web.layouts.layout') + +@section('content') + +
    +
    + +
    +
    +
    + + + + + + +
    +
    + + +
    +
    +
    +

    {{ $error_title ?? __('payment.payment_error') }}

    +

    {{ $error_message ?? __('payment.payment_error_description') }}

    +
    + +
    + +

    {{ __('payment.contact_support_if_needed') }}

    + +

    + {{ __('payment.your_mivita_team') }} +

    + + @if($user_shop) +
    + + {{ __('payment.back_to_shop') }} + +
    + @endif +
    +
    + + +
    +
    + +@endsection diff --git a/resources/views/web/templates/checkout.blade.php b/resources/views/web/templates/checkout.blade.php index 055ab59..51bef3c 100644 --- a/resources/views/web/templates/checkout.blade.php +++ b/resources/views/web/templates/checkout.blade.php @@ -529,6 +529,19 @@ @endif
    +
    +
    + + + {{ __('customer.language_hint') }} +
    +
    @else
    @@ -545,6 +558,7 @@ {!! Form::hidden('billing_email', $shopping_user->billing_email) !!} {!! Form::hidden('billing_state', $shopping_user->billing_state) !!} {!! Form::hidden('billing_country_id', $shopping_user->billing_country_id) !!} +