Pass locale across different steps (#347)

Author: kurakin-oleksandr

CONTRIBUTING.md

@@ -48,7 +48,7 @@ Its best to:
 
 If you're forking the repository and wish to keep your copy up-to-date with the master, ensure you run this command:
 
-`git remote add upstream [email protected]:osiset/laravel-shopify.git`
+`git remote add upstream [email protected]:Kyon147/laravel-shopify.git`
 
 You can then update by simply running:
 

src/Http/Middleware/Billable.php

@@ -41,6 +41,7 @@ public function handle(Request $request, Closure $next)
                     array_merge($request->input(), [
                         'shop' => $shop->getDomain()->toNative(),
                         'host' => $request->get('host'),
+                        'locale' => $request->get('locale'),
                     ])
                 );
             }

src/Http/Middleware/VerifyScopes.php

@@ -46,6 +46,7 @@ public function handle(Request $request, Closure $next)
             [
                 'shop' => $shop->getDomain()->toNative(),
                 'host' => $request->get('host'),
+                'locale' => $request->get('locale'),
             ]
         );
     }

src/Http/Middleware/VerifyShopify.php

@@ -305,6 +305,7 @@ protected function tokenRedirect(Request $request): RedirectResponse
                 'shop' => ShopDomain::fromRequest($request)->toNative(),
                 'target' => $target,
                 'host' => $request->get('host'),
+                'locale' => $request->get('locale'),
             ]
         );
     }
@@ -320,7 +321,7 @@ protected function installRedirect(ShopDomainValue $shopDomain): RedirectRespons
     {
         return Redirect::route(
             Util::getShopifyConfig('route_names.authenticate'),
-            ['shop' => $shopDomain->toNative(), 'host' => request('host')]
+            ['shop' => $shopDomain->toNative(), 'host' => request('host'), 'locale' => request('locale')]
         );
     }
 

src/Macros/TokenUrl.php

@@ -29,6 +29,7 @@ public function generateParams(string $route, array $params = [], bool $absolute
                 'shop' => ShopDomain::fromRequest(Request::instance())->toNative(),
                 'target' => URL::route($route, $params, $absolute),
                 'host' => Request::instance()->get('host'),
+                'locale' => Request::instance()->get('locale'),
             ],
         ];
     }

src/Traits/AuthController.php

@@ -68,6 +68,7 @@ public function authenticate(Request $request, AuthenticateShop $authShop)
                     'authUrl' => $result['url'],
                     'host' => $request->get('host'),
                     'shopDomain' => $shopDomain,
+                    'locale' => $request->get('locale'),
                 ]
             );
         } else {
@@ -77,6 +78,7 @@ public function authenticate(Request $request, AuthenticateShop $authShop)
                 [
                     'shop' => $shopDomain->toNative(),
                     'host' => $request->get('host'),
+                    'locale' => $request->get('locale'),
                 ]
             );
         }
@@ -100,11 +102,16 @@ public function token(Request $request)
             $params = Util::parseQueryString($query);
             $params['shop'] = $params['shop'] ?? $shopDomain->toNative() ?? '';
             $params['host'] = $request->get('host');
+            $params['locale'] = $request->get('locale');
             unset($params['token']);
 
             $cleanTarget = trim(explode('?', $target)[0].'?'.http_build_query($params), '?');
         } else {
-            $params = ['shop' => $shopDomain->toNative() ?? '', 'host' => $request->get('host')];
+            $params = [
+                'shop' => $shopDomain->toNative() ?? '',
+                'host' => $request->get('host'),
+                'locale' => $request->get('locale'),
+            ];
             $cleanTarget = trim(explode('?', $target)[0].'?'.http_build_query($params), '?');
         }
 

src/Traits/BillingController.php

@@ -60,6 +60,7 @@ public function index(
             [
                 'url' => $url,
                 'host' => $host,
+                'locale' => $request->get('locale'),
                 'apiKey' => Util::getShopifyConfig('api_key', ShopDomain::fromNative($request->get('shop'))),
             ]
         );
@@ -89,6 +90,7 @@ public function process(
             return Redirect::route(Util::getShopifyConfig('route_names.home'), [
                 'shop' => $shop->getDomain()->toNative(),
                 'host' => $host,
+                'locale' => $request->get('locale'),
             ]);
         }
         // Activate the plan and save
@@ -99,16 +101,20 @@ public function process(
             $host
         );
 
+        $data = [
+            'shop' => $shop->getDomain()->toNative(),
+            'host' => $host,
+            'locale' => $request->get('locale'),
+        ];
+
+        if (!Util::useNativeAppBridge()) {
+            $data['billing'] = $result ? 'success' : 'failure';
+        }
+
         // Go to homepage of app
         return Redirect::route(
             Util::getShopifyConfig('route_names.home'),
-            array_merge([
-                'shop' => $shop->getDomain()->toNative(),
-                'host' => $host,
-            ], Util::useNativeAppBridge() ? [] : [
-                'host' => $host,
-                'billing' => $result ? 'success' : 'failure',
-            ])
+            $data
         )->with(
             $result ? 'success' : 'failure',
             'billing'

src/resources/config/shopify-app.php

@@ -351,7 +351,7 @@
     | in this configuration file is unnecessary.
     |
     | If you register the listeners manually again here, the listener will be called twice.
-    | 
+    |
     | If you plan to store your listeners in a different directory like `App\Shopify\Listeners`
     | or within multiple directories, then you should register them here.
     |