Commit graph

946 commits

Author SHA1 Message Date
Jérémy Munsch
327defbee0
Merge branch 'trunk' 2026-11-02 11:33:05 +01:00
Jérémy Munsch
dd4f4ce253
Merge branch 'develop' into trunk 2026-11-02 11:24:12 +01:00
Jérémy Munsch
fab265cd68
fix: Mauvais identifiant inco envoyé sur les commandes, on ne donnait pas le no_art a la place de l'auto increment 2026-11-02 11:22:59 +01:00
Jeremy Munsch
24c151cc99
Merge branch 'trunk' 2026-10-30 11:00:55 +01:00
Jérémy Munsch
e8a6ab07de
Merge branch 'develop' into trunk 2026-10-29 21:16:37 +01:00
Jérémy Munsch
cd7d5f5fe9
feat(orders): implement default sorting for order queries
Added default sorting by date in descending order for order queries.
Updated related views and tests to reflect this change.
2026-10-29 21:16:06 +01:00
Jérémy Munsch
0e05779f89
feat(sliders): enhance carousel controls and responsiveness
Added padding for carousel controls on larger screens and improved button styles for better visibility and interaction.
2026-10-29 20:59:30 +01:00
Jérémy Munsch
28d6200136
Merge branch 'develop' into trunk 2026-10-29 20:35:49 +01:00
Jérémy Munsch
c8f895c759
refactor: simplify use statements and type hints
- Removed fully qualified names for better readability.
- Streamlined code by using direct class references.
2026-10-29 20:35:35 +01:00
Jérémy Munsch
c40016bba1
feat(order): implement order placement and related DTOs
- Add methods to convert OrderLine and DeliveryAddress to DTOs.
- Introduce toPlacedEvent method in Order to generate domain event.
- Enhance OrderUnit with Regate code mapping.
- Implement tests for new functionality and ensure correctness.
2026-10-29 20:35:13 +01:00
Jérémy Munsch
71e0d65f31
refactor(OrderService): simplify order creation from basket
Updated the OrderService to utilize the new fromBasket method for creating orders, enhancing code clarity and maintainability. Removed the ProductAvailabilityService as its functionality is now integrated into the ProductRepository.
2026-10-29 20:21:32 +01:00
Jérémy Munsch
da0c3afc14
refactor(MoneyServiceProvider, ViewServiceProvider): streamline boot methods
Removed unnecessary conditionals and improved method calls for clarity.
2026-10-29 20:13:15 +01:00
Jérémy Munsch
e857a58d00
test(Product): add comprehensive tests for Product entity
- Implement tests for product publication status.
- Add tests for product orderability based on various conditions.
- Enhance pricing calculation tests for different discount scenarios.
- Remove outdated PricingServiceTest and refactor ProductAvailabilityServiceTest.
2026-10-29 19:48:38 +01:00
Jérémy Munsch
cfac370e2e
feat(discount): implement published discounts filtering logic
Added logic to filter published discounts, including those with null start or end dates.
2026-10-29 19:19:22 +01:00
Jérémy Munsch
08354b44b6
style(tests): format code for better readability
Improved code formatting in ChangeOrderBladeTest for consistency.
2026-10-29 19:13:31 +01:00
Jérémy Munsch
ed593c25b0
test(UpdateShopPickupExceptionsRequest): remove redundant message test and update error messages
Updated error messages for better clarity and removed unnecessary test for custom messages.
2026-10-29 19:12:21 +01:00
Jérémy Munsch
c52b13cc51
feat(order): implement soft delete handling in order changes
Added support for soft-deleted models in ChangeModelOrder and ChangeModelOrderPosition actions.
This allows for proper order adjustments even when models are soft-deleted.
2026-10-29 19:04:46 +01:00
Jérémy Munsch
7b910c5af6
refactor(UpdateShopPickupExceptionsRequest): remove unused messages method
Cleaned up the code by removing the messages method as it was not utilized.
2026-10-29 18:43:02 +01:00
Jérémy Munsch
961829a0c7
fix(pickup-exceptions): update noReplacement logic for checkbox state
Ensure noReplacement reflects checkbox status for accurate behavior.
2026-10-29 18:24:21 +01:00
Jérémy Munsch
36faed679e
fix(pickup-exceptions): correct spelling of 'Blocked week'
Updated the text from 'Bloqued week' to 'Blocked week' for consistency in error messages.
2026-10-29 18:23:36 +01:00
Jérémy Munsch
cef7a4e4b0
style(pickup-exceptions): fix formatting for readability
Adjusted indentation for better code clarity.
2026-10-29 18:22:51 +01:00
Jérémy Munsch
a87f5756b2
fix(PickupSchedulingService): use equals method for exception ID comparison
Updated the comparison of exception IDs to use the equals method for better accuracy.
2026-10-29 18:21:22 +01:00
Jérémy Munsch
f174aa74cf
Merge branch 'develop' into trunk 2026-10-29 17:10:19 +01:00
Jérémy Munsch
0874259eba
style(FilteredProductResource): fix indentation for nutriscore line 2026-10-29 17:10:13 +01:00
Jérémy Munsch
dfaa74be01
Merge branch 'develop' into trunk 2026-10-29 17:08:21 +01:00
Jérémy Munsch
3ac3cbc7ff
style(products): format change-selected-order route for readability 2026-10-29 17:08:16 +01:00
Jérémy Munsch
62363253ce
Merge branch 'develop' into trunk 2026-10-29 17:06:40 +01:00
Jérémy Munsch
16dfc32f73
Merge branch 'issue-82' into develop 2026-10-29 17:06:27 +01:00
Jérémy Munsch
65df9aa04e
test(SettingsController): update assertions to check forbidden access
Updated test cases to assert forbidden responses instead of successful ones for employee site settings.
2026-10-29 17:05:34 +01:00
Jérémy Munsch
584fee7e69
fix(EloquentPickupExceptionRepository): include pivot data in exception mapping
Updated the mapping function to include pivot data for pickup exceptions, ensuring accurate retrieval of associated order deadlines and replacement dates.
2026-10-29 17:02:07 +01:00
Jérémy Munsch
5d36639705
fix(lang): correct typo in French translation for replacement date
Fixes a typo in the French language file for the replacement date message.
2026-10-29 16:42:41 +01:00
Jérémy Munsch
8e42639134
feat(order): implement change selected order functionality
Add functionality to change the order of models in the product list.
This includes new actions, requests, and UI components for user interaction.
2026-10-29 16:39:23 +01:00
Jérémy Munsch
a94d8a4b49
feat(products): add discount filtering to product index
- Implement discount filtering in product queries and views.
- Update related request and response handling for discounts.
2026-10-29 16:09:41 +01:00
Jérémy Munsch
b9999caf8d
feat(discounts): add discount logic for piece pricing
Implement discount calculations that apply to the piece (sold unit) for products invoiced by weight.
2026-10-29 15:43:37 +01:00
Jérémy Munsch
4d6ff9b726
fix(SettingPolicy): enable Arcadia refresh job dispatching
The Arcadia refresh job dispatching is currently disabled and needs to be enabled when the API is available.
2026-10-29 15:26:45 +01:00
Jérémy Munsch
82697ed416
fix(products): respect is_old_price_displayed discount setting in product cards
- Condition strikethrough price display on showStrippedPrice in ProductCard.vue
- Add showStrippedPrice to product Zod schemas, TypeScript types, repositories and store
- Optimize showStrippedPrice in FilteredProductResource using eager-loaded validDiscount
- Add unit tests for productModelSchema and integration tests in ProductsControllerTest
2026-10-29 15:08:53 +01:00
Jérémy Munsch
0d5958aae6
fix(products): update discount logic for price display
Corrected the logic for displaying discounted prices in the product views.
2026-10-29 14:56:35 +01:00
Jérémy Munsch
e66f3ce17d
Merge branch 'develop' into trunk 2026-10-28 15:25:32 +01:00
Jérémy Munsch
0edef37e50
fix(orders): correct closing tag for order reference span
This change fixes a typo in the order reference display by correcting the closing tag.
2026-10-28 15:25:28 +01:00
Jérémy Munsch
eb72abb9d2
Merge branch 'develop' into trunk 2026-10-28 15:19:02 +01:00
Jérémy Munsch
0ea946a2f6
style(orders): update button alignment and styling for order references
Improve button presentation for better visual consistency.
2026-10-28 15:18:56 +01:00
Jérémy Munsch
8be89194e3
Merge branch 'develop' into trunk 2026-10-28 15:13:49 +01:00
Jérémy Munsch
f882b431b7
refactor(AisleViewer): update page title logic and imports
Improved the logic for displaying the page title based on search criteria.
2026-10-28 15:08:46 +01:00
Jérémy Munsch
889cc66c07
style(faq): update accordion button states for consistency
Adjusted button classes and attributes for accordion items to ensure consistent behavior and appearance.
2026-10-28 15:06:19 +01:00
Jérémy Munsch
9d28162ec4
style(logging): update comment formatting for clarity
Improved the formatting of comments in the logging configuration file for better readability.
2026-10-28 15:03:25 +01:00
Jérémy Munsch
5ca0f4ddde
Merge branch 'develop' into trunk 2026-10-28 13:16:00 +01:00
Jérémy Munsch
db684cf35f
refactor(products): update column classes for filter form
Adjusted column classes from 'col-md' to 'col-xl' for better responsiveness in the product filter form.
2026-10-28 13:15:30 +01:00
Jérémy Munsch
7a5c91e55e
refactor(crud): simplify no results messages in views
Updated no results messages to remove model references for consistency across various views.
2026-10-28 13:04:46 +01:00
Jérémy Munsch
e2263911f3
refactor(products): order tags by 'order' in query
This change ensures that the tags are retrieved in a consistent order.
2026-10-28 12:59:37 +01:00
Jérémy Munsch
aef658645b
refactor(slides): update column definitions and formatting
- Removed unused 'label' and 'text' columns.
- Adjusted 'tableColSorter' parameters for clarity.
2026-10-28 12:55:44 +01:00