mygento / yandexdelivery

app/code/local/Mygento/Yandexdelivery/Helper/Data.php

Doc Comments +8 added lines

@@ -55,6 +55,11 @@ 
         return $result;
     }
 
+    /**
+     * @param string $path
+     *
+     * @return double
+     */
     public function getConfigData($path)
     {
         return Mage::getStoreConfig('carriers/' . $this->_name . '/' . $path);
@@ -222,6 +227,9 @@ 
         ];
     }
 
+    /**
+     * @param string $param
+     */
     private function getAttributeValue($param, $product)
     {
         $attribute = $this->getConfigData('item' . $param);

Spacing +13 added lines, -13 removed lines

@@ -16,13 +16,13 @@ 
     public function addLog($text)
     {
         if ($this->getConfigData('debug')) {
-            Mage::log($text, null, $this->_name . '.log', true);
+            Mage::log($text, null, $this->_name.'.log', true);
         }
     }
 
     public function requestApiPost($url, $data, $sign = false, $method = false)
     {
-        $this->addLog('Request to: ' . $url);
+        $this->addLog('Request to: '.$url);
 
         if ($sign) {
             $data = $this->sign($data, $method);
@@ -57,7 +57,7 @@ 
 
     public function getConfigData($path)
     {
-        return Mage::getStoreConfig('carriers/' . $this->_name . '/' . $path);
+        return Mage::getStoreConfig('carriers/'.$this->_name.'/'.$path);
     }
 
     /**
@@ -96,7 +96,7 @@ 
             }
         }
 
-        $preparedData = $secretKey . $this->getConfigData('' . $method);
+        $preparedData = $secretKey.$this->getConfigData(''.$method);
         $data['secret_key'] = md5($preparedData);
 
         $this->addLog($data);
@@ -105,7 +105,7 @@ 
 
     public function setConfigData($key, $value)
     {
-        Mage::getModel('core/config')->saveConfig('carriers/' . $this->_name . '/' . $key, $value);
+        Mage::getModel('core/config')->saveConfig('carriers/'.$this->_name.'/'.$key, $value);
     }
 
     public function refreshAllCaches()
@@ -159,7 +159,7 @@ 
     {
         if (is_array($arr) and 3 == sizeof($arr)) {
             foreach ($arr as $a) {
-                if ((!is_int($a) and ! is_float($a)) or $a < 0.1) {
+                if ((!is_int($a) and !is_float($a)) or $a < 0.1) {
                     return false;
                 }
             }
@@ -224,17 +224,17 @@ 
 
     private function getAttributeValue($param, $product)
     {
-        $attribute = $this->getConfigData('item' . $param);
+        $attribute = $this->getConfigData('item'.$param);
         if ('0' != $attribute) {
             $attribute_mode = Mage::getModel('catalog/product')->getResource()->getAttribute($attribute)->getFrontendInput();
             if ('select' == $attribute_mode) {
                 $value = $product->getAttributeText($attribute);
-                Mage::helper($this->_name)->addLog('attribute ' . $attribute . ' is select with value -> ' . $value);
+                Mage::helper($this->_name)->addLog('attribute '.$attribute.' is select with value -> '.$value);
             } else {
                 $value = $product->getData($attribute);
             }
         } else {
-            $value = $this->getConfigData('fone' . $param);
+            $value = $this->getConfigData('fone'.$param);
         }
         return round($value, 0);
     }
@@ -256,7 +256,7 @@ 
     public function toOptionArray($model)
     {
         $data_array = [];
-        $model = Mage::getModel('yandexdelivery/' . $model);
+        $model = Mage::getModel('yandexdelivery/'.$model);
         $data = $model->getCollection()->getData();
         foreach ($data as $track) {
             array_push($data_array, [
@@ -270,7 +270,7 @@ 
     public function toOptionsArray($model)
     {
         $data_array = [];
-        $model = Mage::getModel('yandexdelivery/' . $model);
+        $model = Mage::getModel('yandexdelivery/'.$model);
         $data = $model->getCollection()->getData();
         foreach ($data as $track) {
             $data_array[$track['id']] = (isset($track['name']) ? $track['name'] : $track['legal_name']);
@@ -291,9 +291,9 @@ 
         }
         $num = $filter->filter($phone);
         if (strlen($num) == 11) {
-            $phone = '7' . substr($num, 1);
+            $phone = '7'.substr($num, 1);
         } elseif (strlen($num) == 10) {
-            $phone = '7' . $num;
+            $phone = '7'.$num;
         } else {
             $phone = $num;
         }

app/code/local/Mygento/Yandexdelivery/controllers/IndexController.php

Spacing +1 added lines, -1 removed lines

@@ -27,6 +27,6 @@
         );
 
         $result = ['jsonresult' => $results];
-        $this->getResponse()->setBody($callback . '(' . json_encode($result) . ')');
+        $this->getResponse()->setBody($callback.'('.json_encode($result).')');
     }
 }

app/code/local/Mygento/Yandexdelivery/controllers/Adminhtml/Yandexdelivery/ApiController.php

Spacing +5 added lines, -5 removed lines

@@ -24,7 +24,7 @@ 
         foreach ($keys as $key) {
             $tmp = Mage::app()->getRequest()->getParam($key);
             if (!$tmp) {
-                $return = 'No ' . $key . ' in POST';
+                $return = 'No '.$key.' in POST';
                 return $this->getResponse()->setBody($return);
             }
         }
@@ -63,7 +63,7 @@ 
         }
         $msg = '';
         foreach ($result->data->errors as $error) {
-            $msg .= $error . '. ';
+            $msg .= $error.'. ';
         }
         Mage::getSingleton('adminhtml/session')->addError($msg);
         $this->_redirectReferer();
@@ -87,7 +87,7 @@ 
             $errors = (array) $result->data->errors;
             $error_text = '';
             foreach ($errors as $key => $value) {
-                $error_text .= $key . " - " . $value . "\n";
+                $error_text .= $key." - ".$value."\n";
             }
             $message = ['error' => true, 'message' => $error_text];
         }
@@ -122,7 +122,7 @@ 
             if (isset($result->data->errors)) {
                 $msg .= ':';
                 foreach ((array) $result->data->errors as $error) {
-                    $msg .= ' ' . $error;
+                    $msg .= ' '.$error;
                 }
             }
             if ($showAdmin) {
@@ -162,7 +162,7 @@ 
             $data = base64_decode($result->data);
             // @codingStandardsIgnoreEnd
 
-            return $this->_prepareDownloadResponse('yandexdelivery_' . $ydId . '.pdf', $data, 'application/pdf');
+            return $this->_prepareDownloadResponse('yandexdelivery_'.$ydId.'.pdf', $data, 'application/pdf');
         }
         $this->getResponse()->setBody(Mage::helper('yandexdelivery')->__('Error getting order PDF'));
     }

app/code/local/Mygento/Yandexdelivery/Model/Shipping.php

Spacing +19 added lines, -19 removed lines

@@ -16,11 +16,11 @@ 
 
     public function collectRates(Mage_Shipping_Model_Rate_Request $request)
     {
-        Varien_Profiler::start($this->_name . '_collect_rate');
+        Varien_Profiler::start($this->_name.'_collect_rate');
 
         if (!$this->getType()) {
             Mage::helper($this->_name)->addLog('Calc -> no code');
-            Varien_Profiler::stop($this->_name . '_collect_rate');
+            Varien_Profiler::stop($this->_name.'_collect_rate');
             return false;
         }
         $type = $this->getType();
@@ -40,7 +40,7 @@ 
             $quote = $this->getQuote();
             $cartItems = $quote->getAllVisibleItems();
 
-            Mage::helper($this->_name)->addLog('Found ' . count($cartItems) . ' items in quote');
+            Mage::helper($this->_name)->addLog('Found '.count($cartItems).' items in quote');
             Mage::helper($this->_name)->addLog('Calc -> every item in cart');
 
             $processed_dimensions = Mage::helper($this->_name)->getSizes($cartItems, true);
@@ -69,17 +69,17 @@ 
 
         $result = Mage::getModel('shipping/rate_result');
 
-        Mage::helper('yandexdelivery')->__('Will calc type -> ' . $type);
+        Mage::helper('yandexdelivery')->__('Will calc type -> '.$type);
 
-        Varien_Profiler::start($this->_name . '_request');
-        $response = Mage::getModel($this->_name . '/carrier')->searchDeliveryList($data);
-        Varien_Profiler::stop($this->_name . '_request');
+        Varien_Profiler::start($this->_name.'_request');
+        $response = Mage::getModel($this->_name.'/carrier')->searchDeliveryList($data);
+        Varien_Profiler::stop($this->_name.'_request');
 
         if ($response->status != "ok") {
             $errors = (array) $response->data->errors;
-            $error_text = Mage::helper('yandexdelivery')->__('Error:') . ' ';
+            $error_text = Mage::helper('yandexdelivery')->__('Error:').' ';
             foreach ($errors as $key => $value) {
-                $error_text .= $key . " — " . $value . "\n";
+                $error_text .= $key." — ".$value."\n";
             }
             return $this->returnError($error_text);
         }
@@ -88,7 +88,7 @@ 
 
         Mage::helper($this->_name)->addLog('Calculating ended');
 
-        Varien_Profiler::stop($this->_name . '_collect_rate');
+        Varien_Profiler::stop($this->_name.'_collect_rate');
         return $result;
     }
 
@@ -159,9 +159,9 @@ 
             switch ($carrier_offer->type) {
                 case "TODOOR":
                     $method = Mage::getModel('shipping/rate_result_method');
-                    $method->setCarrier($this->_name . '_' . $type);
+                    $method->setCarrier($this->_name.'_'.$type);
                     $method->setCarrierTitle($this->getTypeTitle($type));
-                    $method->setMethod($carrier_offer->tariffId . '_' . $carrier_offer->direction . '_' . $carrier_offer->delivery->id);
+                    $method->setMethod($carrier_offer->tariffId.'_'.$carrier_offer->direction.'_'.$carrier_offer->delivery->id);
                     $method->setMethodTitle($carrier_offer->delivery->name);
                     $method->setPrice($price);
                     $method->setCost($price);
@@ -171,10 +171,10 @@ 
                 case 'PICKUP':
                     foreach ($carrier_offer->pickupPoints as $point) {
                         $method = Mage::getModel('shipping/rate_result_method');
-                        $method->setCarrier($this->_name . '_' . $type);
+                        $method->setCarrier($this->_name.'_'.$type);
                         $method->setCarrierTitle($this->getTypeTitle($type));
-                        $method->setMethod($carrier_offer->tariffId . '_' . $carrier_offer->direction . '_' . $carrier_offer->delivery->id . '_' . $point->id);
-                        $method->setMethodTitle($carrier_offer->delivery->name . ', ' . $point->name);
+                        $method->setMethod($carrier_offer->tariffId.'_'.$carrier_offer->direction.'_'.$carrier_offer->delivery->id.'_'.$point->id);
+                        $method->setMethodTitle($carrier_offer->delivery->name.', '.$point->name);
                         $method->setPrice($price);
                         $method->setCost($price);
                         Mage::dispatchEvent('yandexdelivery_rate_result', ['method' => $method, 'request' => $request]);
@@ -183,10 +183,10 @@ 
                     break;
                 case 'POST':
                     $method = Mage::getModel('shipping/rate_result_method');
-                    $method->setCarrier($this->_name . '_' . $type);
+                    $method->setCarrier($this->_name.'_'.$type);
                     $method->setCarrierTitle($this->getTypeTitle($type));
-                    $method->setMethod($carrier_offer->tariffId . '_' . $carrier_offer->direction . '_' . $carrier_offer->delivery->id);
-                    $method->setMethodTitle($carrier_offer->delivery->name . ', ' . $carrier_offer->tariffName);
+                    $method->setMethod($carrier_offer->tariffId.'_'.$carrier_offer->direction.'_'.$carrier_offer->delivery->id);
+                    $method->setMethodTitle($carrier_offer->delivery->name.', '.$carrier_offer->tariffName);
                     $method->setPrice($price);
                     $method->setCost($price);
                     Mage::dispatchEvent('yandexdelivery_rate_result', ['method' => $method, 'request' => $request]);
@@ -200,7 +200,7 @@ 
 
     protected function getTypeTitle($type)
     {
-        return Mage::getStoreConfig('carriers/' . $this->_name . '_' . $type . '/name');
+        return Mage::getStoreConfig('carriers/'.$this->_name.'_'.$type.'/name');
     }
 
     public function getConfig($path)

app/code/local/Mygento/Yandexdelivery/Block/Adminhtml/Order/View/Tab.php

Spacing +12 added lines, -12 removed lines

@@ -70,13 +70,13 @@ 
         $html = $this->getLayout()->createBlock('adminhtml/widget_button')
                         ->setData([
                             'label' => Mage::helper('yandexdelivery')->__($title),
-                            'onclick' => '' . $name . '.click(\'' . $url . '\');',
+                            'onclick' => ''.$name.'.click(\''.$url.'\');',
                             'class' => 'task'
                         ])->toHtml();
         $html .= '<script type = "text/javascript">
         //<![CDATA[
-            var ' . $name . ';
-            ' . $name . ' = {
+            var ' . $name.';
+            ' . $name.' = {
                 click: function (url) {
                     var request = new Ajax.Request(
                             url,
@@ -142,7 +142,7 @@ 
 
     protected function getFullUrl($path)
     {
-        return Mage::helper('adminhtml')->getUrl('adminhtml/yandexdelivery_api/' . $path, ['_secure' => true, 'orderid' => $this->getOrder()->getId()]);
+        return Mage::helper('adminhtml')->getUrl('adminhtml/yandexdelivery_api/'.$path, ['_secure' => true, 'orderid' => $this->getOrder()->getId()]);
     }
 
     public function getTable()
@@ -168,19 +168,19 @@ 
         </colgroup>';
         $html .= '<thead>
             <tr class="headings">
-                <th>' . $this->__('Status Date') . '</th>
-                <th>' . $this->__('Description') . '</th>
-                <th>' . $this->__('Uniform status') . '</th>
-                <th>' . $this->__('Status') . '</th>
+                <th>' . $this->__('Status Date').'</th>
+                <th>' . $this->__('Description').'</th>
+                <th>' . $this->__('Uniform status').'</th>
+                <th>' . $this->__('Status').'</th>
             </tr>
         </thead>';
         foreach ($result->data->data as $item) {
             $html .= '<tbody class="even">
                     <tr class="border">
-                        <td>' . $item->time . '</td>
-                        <td>' . $item->description . '</td>
-                        <td>' . $item->uniform_status . '</td>
-                        <td>' . $item->status . '</td>
+                        <td>' . $item->time.'</td>
+                        <td>' . $item->description.'</td>
+                        <td>' . $item->uniform_status.'</td>
+                        <td>' . $item->status.'</td>
                     </tr>
                     </tbody>';
         }

app/code/local/Mygento/Yandexdelivery/Block/Adminhtml/Shipment/Grid.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
     {
         $collection = Mage::getModel('yandexdelivery/shipment')->getCollection();
         $collection->getSelect()->join(
-            array('table_alias' => Mage::getConfig()->getTablePrefix() . 'sales_flat_order'),
+            array('table_alias' => Mage::getConfig()->getTablePrefix().'sales_flat_order'),
             'main_table.order_id = table_alias.entity_id',
             array('increment_id' => 'table_alias.increment_id')
         );

app/code/local/Mygento/Yandexdelivery/Block/Version.php

Spacing +3 added lines, -3 removed lines

@@ -20,9 +20,9 @@
      */
     public function render(Varien_Data_Form_Element_Abstract $element)
     {
-        $info = '<fieldset class="config success-msg" style="padding-left:30px;"><a target="_blank" href="https://www.mygento.ru/"><img style="margin-right:5px;" src="//www.mygento.ru/media/favicon/default/favicon.png" width="16" height="16" />' . $this->__('Magento Development') . '</a>';
-        $info .= '<a style="float:right;margin-left: 20px;" target="_blank" href="https://github.com/mygento/yandexdelivery">' . $this->__('Module on Github') . '</a>';
-        $info .= '<a style="float:right;" target="_blank" href="https://mygento.atlassian.net/wiki/pages/viewpage.action?pageId=3708567">' . $this->__('Extension instructions') . '</a></fieldset>';
+        $info = '<fieldset class="config success-msg" style="padding-left:30px;"><a target="_blank" href="https://www.mygento.ru/"><img style="margin-right:5px;" src="//www.mygento.ru/media/favicon/default/favicon.png" width="16" height="16" />'.$this->__('Magento Development').'</a>';
+        $info .= '<a style="float:right;margin-left: 20px;" target="_blank" href="https://github.com/mygento/yandexdelivery">'.$this->__('Module on Github').'</a>';
+        $info .= '<a style="float:right;" target="_blank" href="https://mygento.atlassian.net/wiki/pages/viewpage.action?pageId=3708567">'.$this->__('Extension instructions').'</a></fieldset>';
         return $info;
     }
 }

app/code/local/Mygento/Yandexdelivery/Model/Carrier.php

Doc Comments +4 added lines

@@ -285,6 +285,10 @@
         return $this->sendRequest('getOrderInfo', ['order_id' => $order_id], true);
     }
 
+    /**
+     * @param string $method
+     * @param boolean $sign
+     */
     protected function sendRequest($method, $data, $sign, $sender = null) {
         if ($sender) {
             $data['sender_id'] = $sender;

Spacing +11 added lines, -11 removed lines

@@ -124,7 +124,7 @@ 
 
     private function getRequisiteInfo() {
         $data = [
-            'requisite_id' => Mage::getStoreConfig('carriers/' . $this->_name . '/requisite')
+            'requisite_id' => Mage::getStoreConfig('carriers/'.$this->_name.'/requisite')
         ];
 
         $result = $this->sendRequest('getRequisiteInfo', $data, true);
@@ -134,7 +134,7 @@ 
         }
         foreach ($result->data->requisites as $requsite) {
             $requsiteId = $requsite->id;
-            Mage::helper($this->_name)->addLog('FFF ' . $requsiteId);
+            Mage::helper($this->_name)->addLog('FFF '.$requsiteId);
             if (!$requsiteId) {
                 continue;
             }
@@ -170,9 +170,9 @@ 
         $types = ['todoor', 'post', 'pickup'];
         $enabled = [];
         foreach ($types as $type) {
-            if (Mage::getStoreConfig('carriers/yandexdelivery_' . $type . '/active')) {
+            if (Mage::getStoreConfig('carriers/yandexdelivery_'.$type.'/active')) {
                 if ($addHypes) {
-                    $enabled[] = "'" . $type . "'";
+                    $enabled[] = "'".$type."'";
                 } else {
                     $enabled[] = $type;
                 }
@@ -291,13 +291,13 @@ 
         } else {
             $data['sender_id'] = $this->getSender();
         }
-        return json_decode(Mage::helper($this->_name)->requestApiPost($this->_url . $method, $data, $sign, $method));
+        return json_decode(Mage::helper($this->_name)->requestApiPost($this->_url.$method, $data, $sign, $method));
     }
 
     protected function getOrderData($order) {
 
-        if (Mage::getStoreConfig('carriers/' . $this->_name . '/onlyone')) {
-            $weight = round(Mage::getStoreConfig('carriers/' . $this->_name . '/oneweight') * 1000 / Mage::getStoreConfig('carriers/' . $this->_name . '/weightunit'), 3);
+        if (Mage::getStoreConfig('carriers/'.$this->_name.'/onlyone')) {
+            $weight = round(Mage::getStoreConfig('carriers/'.$this->_name.'/oneweight') * 1000 / Mage::getStoreConfig('carriers/'.$this->_name.'/weightunit'), 3);
             $dimensions = Mage::helper($this->_name)->getStandardSizes();
         } else {
             $processed_dimensions = Mage::helper($this->_name)->getSizes($order->getAllVisibleItems(), false);
@@ -328,7 +328,7 @@ 
                 'last_name' => $order->getShippingAddress()->getLastname(),
             ],
             'delivery' => [
-                'to_yd_warehouse' => Mage::getStoreConfig('carriers/' . $this->_name . '/yd_warehouse'),
+                'to_yd_warehouse' => Mage::getStoreConfig('carriers/'.$this->_name.'/yd_warehouse'),
                 'delivery' => $info_array[3],
                 'direction' => $info_array[2],
                 'tariff' => $info_array[1],
@@ -370,10 +370,10 @@ 
             ];
 
             //get tax info
-            if (Mage::getStoreConfig('carriers/' . $this->_name . '/tax_all')) {
-                $data['orderitem_vat_value'] = Mage::getStoreConfig('carriers/' . $this->_name . '/tax_options');
+            if (Mage::getStoreConfig('carriers/'.$this->_name.'/tax_all')) {
+                $data['orderitem_vat_value'] = Mage::getStoreConfig('carriers/'.$this->_name.'/tax_options');
             } else {
-                $attributeCode = Mage::getStoreConfig('carriers/' . $this->_name . '/tax_all');
+                $attributeCode = Mage::getStoreConfig('carriers/'.$this->_name.'/tax_all');
                 $data['orderitem_vat_value'] = Mage::getResourceModel('catalog/product')->getAttributeRawValue($item->getProductId(), $attributeCode, $order->getStore());
             }