Merge pull request #16 from zolthan/patch-1

Wrong language in order status mails
FriendsOfShopware · Dec 6, 2020 · 2d01bf6 · 2d01bf6
2 parents d76358a + b5f6d51
commit 2d01bf6
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/DependencyInjection/OrderServiceGeneratorPass.php b/src/DependencyInjection/OrderServiceGeneratorPass.php
@@ -79,11 +79,13 @@ public function process(ContainerBuilder $container): void
                         continue;
                     }
 
+                    // Fetch order context to pass it into the event
+                    $orderContextStmt = new Expression(new Assign($builder->var('orderContext'), $builder->methodCall($builder->var('this'), 'getOrderContext', [$builder->var('context'), $builder->var('order')])));
                     // Fire event
-                    $arg = $builder->new('\\' . MailDataBagFilter::class, [$builder->var('data'), $builder->var('mailTemplate'), $builder->var('context')]);
+                    $arg = $builder->new('\\' . MailDataBagFilter::class, [$builder->var('data'), $builder->var('mailTemplate'), $builder->var('orderContext')]);
                     $newStmt = new Expression($builder->methodCall($propertyFetch, 'dispatch', [$arg]));
 
-                    array_splice($method->stmts, $i, 0, [$newStmt]);
+                    array_splice($method->stmts, $i, 0, [$orderContextStmt, $newStmt]);
                 }
             }
         }