@@ -24,7 +24,7 @@ |
||
24 | 24 | * Initialize AppController |
25 | 25 | * |
26 | 26 | * @return void |
27 | - */ |
|
27 | + */ |
|
28 | 28 | public function initialize() |
29 | 29 | { |
30 | 30 | parent::initialize(); |
@@ -23,7 +23,7 @@ |
||
23 | 23 | |
24 | 24 | class ShopifyInstallShell extends Shell { |
25 | 25 | |
26 | - public function main() { |
|
26 | + public function main() { |
|
27 | 27 | |
28 | 28 | //Lets Make This FANCY |
29 | 29 | $this->clear(); |
@@ -36,19 +36,19 @@ |
||
36 | 36 | |
37 | 37 | $this->api_key = isset($config['api_key']) ? $config['api_key'] : ''; |
38 | 38 | |
39 | - if (empty($this->api_key)) { |
|
39 | + if (empty($this->api_key)) { |
|
40 | 40 | |
41 | - $controller = $this->_registry->getController(); |
|
41 | + $controller = $this->_registry->getController(); |
|
42 | 42 | |
43 | - if (isset($controller->request->api_key)) { |
|
44 | - $this->api_key = $controller->request->api_key; |
|
45 | - } |
|
43 | + if (isset($controller->request->api_key)) { |
|
44 | + $this->api_key = $controller->request->api_key; |
|
45 | + } |
|
46 | 46 | |
47 | - } |
|
47 | + } |
|
48 | 48 | |
49 | 49 | $this->ShopifyAPI = $registry->load('Multidimensional/Shopify.ShopifyAPI', [ |
50 | 50 | 'api_key' => $this->api_key |
51 | - ]); |
|
51 | + ]); |
|
52 | 52 | $this->ShopifyDatabase = $registry->load('Multidimensional/Shopify.ShopifyDatabase'); |
53 | 53 | |
54 | 54 | } |
@@ -70,12 +70,12 @@ discard block |
||
70 | 70 | 'shopify_shop_domain_'.$this->ShopifyAPI->api_key => $this->ShopifyAPI->getShopDomain() |
71 | 71 | ]); |
72 | 72 | |
73 | - $this->Auth->setUser($shop_entity); |
|
73 | + $this->Auth->setUser($shop_entity); |
|
74 | 74 | |
75 | 75 | return $this->redirect([ |
76 | 76 | 'controller' => 'Shopify', |
77 | 77 | 'plugin' => false, |
78 | - 'api_key' => $this->ShopifyAPI->api_key]); |
|
78 | + 'api_key' => $this->ShopifyAPI->api_key]); |
|
79 | 79 | |
80 | 80 | |
81 | 81 | } else { |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | |
110 | 110 | $this->render('add'); |
111 | 111 | |
112 | - } elseif (!empty($this->request->data['shop_domain']) && !$this->error) { |
|
112 | + } elseif (!empty($this->request->data['shop_domain']) && !$this->error) { |
|
113 | 113 | |
114 | 114 | $valid_domain = $this->ShopifyAPI->validDomain( |
115 | 115 | $this->request->data['shop_domain'] |
@@ -38,24 +38,24 @@ discard block |
||
38 | 38 | |
39 | 39 | $this->api_key = isset($config['api_key']) ? $config['api_key'] : ''; |
40 | 40 | |
41 | - if (!empty($this->api_key)) { |
|
41 | + if (!empty($this->api_key)) { |
|
42 | 42 | |
43 | - $this->shared_secret = Configure::read('Multidimensional/Shopify.' . $this->api_key . '.shared_secret'); |
|
44 | - $this->scope = Configure::read('Multidimensional/Shopify.' . $this->api_key . '.scope'); |
|
45 | - $this->is_private_app = Configure::read('Multidimensional/Shopify.' . $this->api_key . '.is_private_app'); |
|
46 | - $this->private_app_password = Configure::read('Multidimensional/Shopify.' . $this->api_key . '.private_app_password'); |
|
43 | + $this->shared_secret = Configure::read('Multidimensional/Shopify.' . $this->api_key . '.shared_secret'); |
|
44 | + $this->scope = Configure::read('Multidimensional/Shopify.' . $this->api_key . '.scope'); |
|
45 | + $this->is_private_app = Configure::read('Multidimensional/Shopify.' . $this->api_key . '.is_private_app'); |
|
46 | + $this->private_app_password = Configure::read('Multidimensional/Shopify.' . $this->api_key . '.private_app_password'); |
|
47 | 47 | |
48 | - } else { |
|
48 | + } else { |
|
49 | 49 | |
50 | - throw new NotImplementedException(__('Shopify API key not found')); |
|
50 | + throw new NotImplementedException(__('Shopify API key not found')); |
|
51 | 51 | |
52 | - } |
|
52 | + } |
|
53 | 53 | |
54 | - if (!$this->shared_secret) { |
|
54 | + if (!$this->shared_secret) { |
|
55 | 55 | |
56 | - throw new NotImplementedException(__('Shopify shared secret not found')); |
|
56 | + throw new NotImplementedException(__('Shopify shared secret not found')); |
|
57 | 57 | |
58 | - } |
|
58 | + } |
|
59 | 59 | |
60 | 60 | } |
61 | 61 | |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | return false; |
148 | 148 | } |
149 | 149 | |
150 | - } |
|
150 | + } |
|
151 | 151 | |
152 | 152 | public function setNonce($shop_domain) { |
153 | 153 | |
@@ -194,7 +194,7 @@ discard block |
||
194 | 194 | $string = implode("&", $dataString); |
195 | 195 | return $query['hmac'] == hash_hmac('sha256', $string, $this->shared_secret); |
196 | 196 | |
197 | - } |
|
197 | + } |
|
198 | 198 | |
199 | 199 | private function _urlEncode($url) { |
200 | 200 |