@@ -66,8 +66,8 @@ discard block |
||
| 66 | 66 | if ($access_token_entity) { |
| 67 | 67 | |
| 68 | 68 | $this->request->session()->write([ |
| 69 | - 'shopify_access_token_'.$this->ShopifyAPI->api_key => $access_token, |
|
| 70 | - 'shopify_shop_domain_'.$this->ShopifyAPI->api_key => $this->ShopifyAPI->getShopDomain() |
|
| 69 | + 'shopify_access_token_' . $this->ShopifyAPI->api_key => $access_token, |
|
| 70 | + 'shopify_shop_domain_' . $this->ShopifyAPI->api_key => $this->ShopifyAPI->getShopDomain() |
|
| 71 | 71 | ]); |
| 72 | 72 | |
| 73 | 73 | //$this->Auth->setUser($shop_entity); |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | if ($valid_domain) { |
| 118 | 118 | |
| 119 | 119 | $this->request->session()->write([ |
| 120 | - 'shopify_shop_domain_'.$this->ShopifyAPI->api_key => $this->request->data['shop_domain'] |
|
| 120 | + 'shopify_shop_domain_' . $this->ShopifyAPI->api_key => $this->request->data['shop_domain'] |
|
| 121 | 121 | ]); |
| 122 | 122 | |
| 123 | 123 | $redirect_url = Router::url([ |
@@ -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'] |
@@ -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(); |
@@ -66,13 +66,13 @@ discard block |
||
| 66 | 66 | return $this->callLimit() - $this->callsMade(); |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | - public function call($method, $path, $params=array()) { |
|
| 69 | + public function call($method, $path, $params = array()) { |
|
| 70 | 70 | |
| 71 | 71 | if (!$this->_isReady()) { |
| 72 | 72 | return false; |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | - if (!in_array($method, array('POST','PUT','GET','DELETE'))) { |
|
| 75 | + if (!in_array($method, array('POST', 'PUT', 'GET', 'DELETE'))) { |
|
| 76 | 76 | return false; |
| 77 | 77 | } |
| 78 | 78 | |
@@ -85,8 +85,8 @@ discard block |
||
| 85 | 85 | |
| 86 | 86 | $this->response = $http->{strtolower($method)}( |
| 87 | 87 | $path, |
| 88 | - ((in_array($method, array('POST','PUT'))) ? json_encode($params) : $params), |
|
| 89 | - ((in_array($method, array('POST','PUT'))) ? ['type' => 'json'] : []) |
|
| 88 | + ((in_array($method, array('POST', 'PUT'))) ? json_encode($params) : $params), |
|
| 89 | + ((in_array($method, array('POST', 'PUT'))) ? ['type' => 'json'] : []) |
|
| 90 | 90 | ); |
| 91 | 91 | $this->response = $this->response->json; |
| 92 | 92 | |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | } |
| 96 | 96 | |
| 97 | 97 | private function shopApiCallLimitParam($index) { |
| 98 | - $params = explode("/",$this->response->getHeaderLine('http_x_shopify_shop_api_call_limit')); |
|
| 98 | + $params = explode("/", $this->response->getHeaderLine('http_x_shopify_shop_api_call_limit')); |
|
| 99 | 99 | return (int) $params[$index]; |
| 100 | 100 | } |
| 101 | 101 | |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | $response = $http->post('/admin/oauth/access_token', 'client_id=' . $this->api_key . |
| 122 | 122 | '&client_secret=' . $this->shared_secret . |
| 123 | 123 | '&code=' . $code); |
| 124 | - $response = $response->json;; |
|
| 124 | + $response = $response->json; ; |
|
| 125 | 125 | |
| 126 | 126 | if (isset($response['access_token'])) { |
| 127 | 127 | $this->token = $response['access_token']; |
@@ -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 | |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | $query = $this->access_tokens->find(); |
| 100 | 100 | $query = $query->contain(['Shops']); |
| 101 | 101 | $query = $query->where(['api_key' => $api_key, 'token' => $access_token]); |
| 102 | - $query = $query->where(function ($exp, $q) { |
|
| 102 | + $query = $query->where(function($exp, $q) { |
|
| 103 | 103 | return $exp->isNull('expired_at'); |
| 104 | 104 | }); |
| 105 | 105 | |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | $query = $this->access_tokens->find(); |
| 119 | 119 | $query = $query->contain(['Shops']); |
| 120 | 120 | $query = $query->where(['api_key' => $api_key, 'Shops.myshopify_domain' => $shop_domain]); |
| 121 | - $query = $query->where(function ($exp, $q) { |
|
| 121 | + $query = $query->where(function($exp, $q) { |
|
| 122 | 122 | return $exp->isNull('expired_at'); |
| 123 | 123 | }); |
| 124 | 124 | |
@@ -23,26 +23,26 @@ |
||
| 23 | 23 | |
| 24 | 24 | public function output($data, $columns = 10, $terminal_width = 80) |
| 25 | 25 | { |
| 26 | - while((count($data)%$columns != 0) && ($columns > 5)) { |
|
| 26 | + while ((count($data) % $columns != 0) && ($columns > 5)) { |
|
| 27 | 27 | $columns--; |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | $max_length = max(array_map('strlen', $data)); |
| 31 | 31 | |
| 32 | - while(((($columns * ($max_length+3)) + 3) > $terminal_width) && ($columns >= 1)) { |
|
| 32 | + while (((($columns * ($max_length + 3)) + 3) > $terminal_width) && ($columns >= 1)) { |
|
| 33 | 33 | $columns--; |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | $this->_io->out(' ' . str_repeat('+-' . str_repeat('-', $max_length) . '-', $columns) . '+ '); |
| 37 | 37 | |
| 38 | - for($i = 0; $i < count($data); ) { |
|
| 38 | + for ($i = 0; $i < count($data);) { |
|
| 39 | 39 | $output = " "; |
| 40 | 40 | $j = $i; |
| 41 | - for($k = $i; $k < ($columns+$j); $k++) { |
|
| 41 | + for ($k = $i; $k < ($columns + $j); $k++) { |
|
| 42 | 42 | if (!isset($data[$i])) { |
| 43 | 43 | $data[$i] = ''; |
| 44 | 44 | } |
| 45 | - $output .= '| ' . str_repeat(' ', floor(($max_length - strlen($data[$i]))/2)) . $data[$i] . str_repeat(' ', ceil(($max_length - strlen($data[$i]))/2)) . ' '; |
|
| 45 | + $output .= '| ' . str_repeat(' ', floor(($max_length - strlen($data[$i])) / 2)) . $data[$i] . str_repeat(' ', ceil(($max_length - strlen($data[$i])) / 2)) . ' '; |
|
| 46 | 46 | $i++; |
| 47 | 47 | } |
| 48 | 48 | $this->_io->out($output . '|'); |
@@ -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(); |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | $first_run = ((Configure::check('Multidimensional/Shopify')) ? false : true); |
| 34 | 34 | |
| 35 | 35 | //Activate Plugin |
| 36 | - if ((($first_run) ? (strtolower($this->in('Install Shopify Plugin?', ['y','n'])) == 'y') : (strtolower($this->in('Update Configuration?', ['y','n'])) == 'y'))) { |
|
| 36 | + if ((($first_run) ? (strtolower($this->in('Install Shopify Plugin?', ['y', 'n'])) == 'y') : (strtolower($this->in('Update Configuration?', ['y', 'n'])) == 'y'))) { |
|
| 37 | 37 | |
| 38 | 38 | $this->out(); |
| 39 | 39 | $this->out('Please enter your API credentials from your Shopify App page.', 2); |
@@ -71,12 +71,12 @@ discard block |
||
| 71 | 71 | $this->_io->out('<error>Invalid Scope. Try again, or leave blank to continue.</error>'); |
| 72 | 72 | } |
| 73 | 73 | |
| 74 | - } while((count($scope)) && (strlen(trim(implode("", $scope))) > 0) && (count(array_diff($scope, $scope_array)) > 0)); |
|
| 74 | + } while ((count($scope)) && (strlen(trim(implode("", $scope))) > 0) && (count(array_diff($scope, $scope_array)) > 0)); |
|
| 75 | 75 | |
| 76 | - Configure::write('Multidimensional/Shopify.' . $api_key . '.scope',implode(',', $scope)); |
|
| 76 | + Configure::write('Multidimensional/Shopify.' . $api_key . '.scope', implode(',', $scope)); |
|
| 77 | 77 | |
| 78 | 78 | $this->out(''); |
| 79 | - $is_private_app = strtolower($this->in('Is this a private app?', ['y','n'])); |
|
| 79 | + $is_private_app = strtolower($this->in('Is this a private app?', ['y', 'n'])); |
|
| 80 | 80 | |
| 81 | 81 | if ($is_private_app == 'y') { |
| 82 | 82 | $is_private_app = 'true'; |
@@ -84,10 +84,10 @@ discard block |
||
| 84 | 84 | $is_private_app = 'false'; |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | - Configure::write('Multidimensional/Shopify.' . $api_key . '.is_private_app',$is_private_app); |
|
| 87 | + Configure::write('Multidimensional/Shopify.' . $api_key . '.is_private_app', $is_private_app); |
|
| 88 | 88 | |
| 89 | 89 | if ($is_private_app == 'true') { |
| 90 | - Configure::write('Multidimensional/Shopify.' . $api_key . '.private_app_password',$this->in('Private App Password:')); |
|
| 90 | + Configure::write('Multidimensional/Shopify.' . $api_key . '.private_app_password', $this->in('Private App Password:')); |
|
| 91 | 91 | } else { |
| 92 | 92 | Configure::write('Multidimensional/Shopify.' . $api_key . '.private_app_password', NULL); |
| 93 | 93 | } |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | |
| 99 | 99 | $this->out(''); |
| 100 | 100 | |
| 101 | - if (($first_run) || (strtolower($this->in('Update Database?', ['y','n'])) == 'y')) { |
|
| 101 | + if (($first_run) || (strtolower($this->in('Update Database?', ['y', 'n'])) == 'y')) { |
|
| 102 | 102 | |
| 103 | 103 | $this->out(''); |
| 104 | 104 | |
@@ -108,16 +108,16 @@ discard block |
||
| 108 | 108 | |
| 109 | 109 | if ((is_array($status)) && (count($status))) { |
| 110 | 110 | |
| 111 | - $this->out('Updating Databases',2); |
|
| 111 | + $this->out('Updating Databases', 2); |
|
| 112 | 112 | |
| 113 | 113 | if ($migrations->migrate()) { |
| 114 | - $this->out('Success!',2); |
|
| 114 | + $this->out('Success!', 2); |
|
| 115 | 115 | } else { |
| 116 | 116 | $this->_io->out('<error>Update Failed!</error>', 2); |
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | } else { |
| 120 | - $this->out('Shopify Database Files Not Found',2); |
|
| 120 | + $this->out('Shopify Database Files Not Found', 2); |
|
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | } |
@@ -113,7 +113,7 @@ |
||
| 113 | 113 | |
| 114 | 114 | $shop = $this->ShopifyDatabase->getShopDataFromAccessToken($accessToken, $this->api_key); |
| 115 | 115 | |
| 116 | - if($shop && is_array($shop)){ |
|
| 116 | + if ($shop && is_array($shop)) { |
|
| 117 | 117 | return ['id' => $shop['id'], 'username' => $shop['myshopify_domain']]; |
| 118 | 118 | } |
| 119 | 119 | |
@@ -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 | } |