Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
tobias-kuendig committed Dec 12, 2024
2 parents d4a7390 + ad3433e commit 000c897
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion controllers/Orders.php
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public function show()

$order = Order::with('products', 'order_state')->findOrFail($this->params[0]);

$this->initRelation($order, 'payment_logs');
$this->initRelation($order);

$this->vars['order'] = $order;
$this->vars['money'] = app(Money::class);
Expand Down
2 changes: 2 additions & 0 deletions updates/version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -627,3 +627,5 @@ v3.5.12:
- 'Various small additions (thanks to @RickAcb and @rubenvanerk)'
v3.5.13:
- 'Fixed RainLab.User v3 compatibility'
v3.5.14:
- 'Support for more flexible model extensions in the backend (thanks to @xyz1123581321)'

0 comments on commit 000c897

Please sign in to comment.