Merge branch 'master' into cart-temp

This commit is contained in:
elvira
2026-09-28 18:23:55 +03:00
3 changed files with 46 additions and 27 deletions
+18 -1
View File
@@ -31,7 +31,7 @@ DB_DATABASE=boboko
DB_USERNAME=root
DB_PASSWORD=dev
SESSION_DRIVER=database
SESSION_DRIVER=redis
SESSION_LIFETIME=120
SESSION_ENCRYPT=false
SESSION_PATH=/
@@ -88,6 +88,9 @@ SCOUT_QUEUE=true
MEILISEARCH_KEY=dev-meilisearch-key-change-me
MEILISEARCH_HOST=http://meilisearch:7700
# Lunar sets all prices inclusive of tax with these values
LUNAR_STORE_INCLUSIVE_OF_TAX=true
# Host-side ports — change these if another project on this machine already uses the defaults
APP_PORT=8090
STOIC_PORT=2727
@@ -96,3 +99,17 @@ POSTGRES_HOST_PORT=5436
MAILPIT_PORT=8025
VITE_PORT=5173
MEILISEARCH_PORT=7700
STRIPE_SECRET=secret
STRIPE_PUBLIC_KEY=public_key
STRIPE_WEBHOOK_SECRET=webhook_secret
BOXNOW_BASE_URL=https://api-stage.boxnow.gr/api/v1
BOXNOW_LOCATION_API_URL=https://locationapi-stage.boxnow.gr/api/v1
BOXNOW_CLIENT_ID=box-client-id
BOXNOW_CLIENT_SECRET=box-client-secret
BOXNOW_PARTNER_ID=box-partner-id
BOXNOW_ORIGIN_LOCATION_ID=box-location-id
BOXNOW_SENDER_NAME=test
BOXNOW_SENDER_EMAIL=test@test.com
BOXNOW_SENDER_PHONE=+306912345678
Generated
+27 -25
View File
@@ -2441,16 +2441,16 @@
},
{
"name": "google/protobuf",
"version": "v5.36.1",
"version": "v5.36.2",
"source": {
"type": "git",
"url": "https://github.com/protocolbuffers/protobuf-php.git",
"reference": "d64d16befba8632967f604b9644c0bb8f64cfbc3"
"reference": "020bc8e831611869ac387ddd38fbbadd78d15195"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/d64d16befba8632967f604b9644c0bb8f64cfbc3",
"reference": "d64d16befba8632967f604b9644c0bb8f64cfbc3",
"url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/020bc8e831611869ac387ddd38fbbadd78d15195",
"reference": "020bc8e831611869ac387ddd38fbbadd78d15195",
"shasum": ""
},
"require": {
@@ -2479,9 +2479,9 @@
"proto"
],
"support": {
"source": "https://github.com/protocolbuffers/protobuf-php/tree/v5.36.1"
"source": "https://github.com/protocolbuffers/protobuf-php/tree/v5.36.2"
},
"time": "2026-08-31T22:07:31+00:00"
"time": "2026-09-17T15:56:42+00:00"
},
{
"name": "graham-campbell/result-type",
@@ -3022,16 +3022,16 @@
},
{
"name": "jacobjoergensen/laravel-paper",
"version": "1.16.0",
"version": "1.18.0",
"source": {
"type": "git",
"url": "https://github.com/JacobJoergensen/laravel-paper.git",
"reference": "3bcdc1d929ace91e138b268d2394830d559e3695"
"reference": "fd68cb14448245185953f673c0e1504c6c4f71cf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/JacobJoergensen/laravel-paper/zipball/3bcdc1d929ace91e138b268d2394830d559e3695",
"reference": "3bcdc1d929ace91e138b268d2394830d559e3695",
"url": "https://api.github.com/repos/JacobJoergensen/laravel-paper/zipball/fd68cb14448245185953f673c0e1504c6c4f71cf",
"reference": "fd68cb14448245185953f673c0e1504c6c4f71cf",
"shasum": ""
},
"require": {
@@ -3039,7 +3039,8 @@
"illuminate/filesystem": "^12.0|^13.0",
"illuminate/support": "^12.0|^13.0",
"php": "^8.4",
"spatie/yaml-front-matter": "^2.0"
"spatie/yaml-front-matter": "^2.0",
"symfony/yaml": "^7.0|^8.0"
},
"require-dev": {
"laravel/pint": "^1.29",
@@ -3073,6 +3074,7 @@
}
],
"description": "A flat-file Eloquent driver for modern Laravel.",
"homepage": "https://laravel-paper.com",
"keywords": [
"cms",
"content",
@@ -3084,9 +3086,9 @@
],
"support": {
"issues": "https://github.com/JacobJoergensen/laravel-paper/issues",
"source": "https://github.com/JacobJoergensen/laravel-paper/tree/1.16.0"
"source": "https://github.com/JacobJoergensen/laravel-paper/tree/1.18.0"
},
"time": "2026-08-25T18:56:34+00:00"
"time": "2026-09-25T00:16:02+00:00"
},
{
"name": "kirschbaum-development/eloquent-power-joins",
@@ -6184,16 +6186,16 @@
},
{
"name": "open-telemetry/opentelemetry-auto-laravel",
"version": "1.8.0",
"version": "1.9.1",
"source": {
"type": "git",
"url": "https://github.com/opentelemetry-php/contrib-auto-laravel.git",
"reference": "f0a750eeb0a69012d81c84010a4c7a7b61926e00"
"reference": "fd81cb8e18af4b5405fb67c84622833886fa51da"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/opentelemetry-php/contrib-auto-laravel/zipball/f0a750eeb0a69012d81c84010a4c7a7b61926e00",
"reference": "f0a750eeb0a69012d81c84010a4c7a7b61926e00",
"url": "https://api.github.com/repos/opentelemetry-php/contrib-auto-laravel/zipball/fd81cb8e18af4b5405fb67c84622833886fa51da",
"reference": "fd81cb8e18af4b5405fb67c84622833886fa51da",
"shasum": ""
},
"require": {
@@ -6210,7 +6212,7 @@
"nunomaduro/collision": "*",
"open-telemetry/sdk": "^1.8",
"orchestra/testbench": ">=7.41.3",
"phan/phan": "^5.0",
"phan/phan": "^6.0",
"php-http/mock-client": "*",
"phpstan/phpstan": "^1.1",
"phpstan/phpstan-phpunit": "^1.0",
@@ -6247,9 +6249,9 @@
"tracing"
],
"support": {
"source": "https://github.com/opentelemetry-php/contrib-auto-laravel/tree/1.8.0"
"source": "https://github.com/opentelemetry-php/contrib-auto-laravel/tree/1.9.1"
},
"time": "2026-07-09T20:34:43+00:00"
"time": "2026-09-17T05:26:08+00:00"
},
{
"name": "open-telemetry/sdk",
@@ -6353,16 +6355,16 @@
},
{
"name": "open-telemetry/sem-conv",
"version": "1.38.0",
"version": "1.44.0",
"source": {
"type": "git",
"url": "https://github.com/opentelemetry-php/sem-conv.git",
"reference": "e613bc640a407def4991b8a936a9b27edd9a3240"
"reference": "c94bc7ebacef039cda4f4c9270807dcc58b4e3af"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/opentelemetry-php/sem-conv/zipball/e613bc640a407def4991b8a936a9b27edd9a3240",
"reference": "e613bc640a407def4991b8a936a9b27edd9a3240",
"url": "https://api.github.com/repos/opentelemetry-php/sem-conv/zipball/c94bc7ebacef039cda4f4c9270807dcc58b4e3af",
"reference": "c94bc7ebacef039cda4f4c9270807dcc58b4e3af",
"shasum": ""
},
"require": {
@@ -6406,7 +6408,7 @@
"issues": "https://github.com/open-telemetry/opentelemetry-php/issues",
"source": "https://github.com/open-telemetry/opentelemetry-php"
},
"time": "2026-01-21T04:14:03+00:00"
"time": "2026-09-09T22:06:17+00:00"
},
{
"name": "openspout/openspout",
+1 -1
View File
@@ -74,7 +74,7 @@
// ones that already worked, like collection_ids), not just the
// new order_count one. Caught in practice, reverted.
Lunar\Models\Product::class => Modules\Core\Catalog\Services\ProductIndexer::class,
Lunar\Models\ProductOption::class => Lunar\Search\ProductOptionIndexer::class,
Lunar\Models\ProductOption::class => Lunar\Search\ProductOptionIndexer::class
],
];