Completed
Push — master ( 9932d1...54396d )
by Danila
06:32
created
app/code/local/Mygento/Yandexdelivery/Model/Carrier.php 2 patches
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -285,6 +285,10 @@
 block discarded – undo
285 285
         return $this->sendRequest('getOrderInfo', ['order_id' => $order_id], true);
286 286
     }
287 287
 
288
+    /**
289
+     * @param string $method
290
+     * @param boolean $sign
291
+     */
288 292
     protected function sendRequest($method, $data, $sign, $sender = null) {
289 293
         if ($sender) {
290 294
             $data['sender_id'] = $sender;
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
 
125 125
     private function getRequisiteInfo() {
126 126
         $data = [
127
-            'requisite_id' => Mage::getStoreConfig('carriers/' . $this->_name . '/requisite')
127
+            'requisite_id' => Mage::getStoreConfig('carriers/'.$this->_name.'/requisite')
128 128
         ];
129 129
 
130 130
         $result = $this->sendRequest('getRequisiteInfo', $data, true);
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
         }
135 135
         foreach ($result->data->requisites as $requsite) {
136 136
             $requsiteId = $requsite->id;
137
-            Mage::helper($this->_name)->addLog('FFF ' . $requsiteId);
137
+            Mage::helper($this->_name)->addLog('FFF '.$requsiteId);
138 138
             if (!$requsiteId) {
139 139
                 continue;
140 140
             }
@@ -170,9 +170,9 @@  discard block
 block discarded – undo
170 170
         $types = ['todoor', 'post', 'pickup'];
171 171
         $enabled = [];
172 172
         foreach ($types as $type) {
173
-            if (Mage::getStoreConfig('carriers/yandexdelivery_' . $type . '/active')) {
173
+            if (Mage::getStoreConfig('carriers/yandexdelivery_'.$type.'/active')) {
174 174
                 if ($addHypes) {
175
-                    $enabled[] = "'" . $type . "'";
175
+                    $enabled[] = "'".$type."'";
176 176
                 } else {
177 177
                     $enabled[] = $type;
178 178
                 }
@@ -291,13 +291,13 @@  discard block
 block discarded – undo
291 291
         } else {
292 292
             $data['sender_id'] = $this->getSender();
293 293
         }
294
-        return json_decode(Mage::helper($this->_name)->requestApiPost($this->_url . $method, $data, $sign, $method));
294
+        return json_decode(Mage::helper($this->_name)->requestApiPost($this->_url.$method, $data, $sign, $method));
295 295
     }
296 296
 
297 297
     protected function getOrderData($order) {
298 298
 
299
-        if (Mage::getStoreConfig('carriers/' . $this->_name . '/onlyone')) {
300
-            $weight = round(Mage::getStoreConfig('carriers/' . $this->_name . '/oneweight') * 1000 / Mage::getStoreConfig('carriers/' . $this->_name . '/weightunit'), 3);
299
+        if (Mage::getStoreConfig('carriers/'.$this->_name.'/onlyone')) {
300
+            $weight = round(Mage::getStoreConfig('carriers/'.$this->_name.'/oneweight') * 1000 / Mage::getStoreConfig('carriers/'.$this->_name.'/weightunit'), 3);
301 301
             $dimensions = Mage::helper($this->_name)->getStandardSizes();
302 302
         } else {
303 303
             $processed_dimensions = Mage::helper($this->_name)->getSizes($order->getAllVisibleItems(), false);
@@ -328,7 +328,7 @@  discard block
 block discarded – undo
328 328
                 'last_name' => $order->getShippingAddress()->getLastname(),
329 329
             ],
330 330
             'delivery' => [
331
-                'to_yd_warehouse' => Mage::getStoreConfig('carriers/' . $this->_name . '/yd_warehouse'),
331
+                'to_yd_warehouse' => Mage::getStoreConfig('carriers/'.$this->_name.'/yd_warehouse'),
332 332
                 'delivery' => $info_array[3],
333 333
                 'direction' => $info_array[2],
334 334
                 'tariff' => $info_array[1],
@@ -370,10 +370,10 @@  discard block
 block discarded – undo
370 370
             ];
371 371
 
372 372
             //get tax info
373
-            if (Mage::getStoreConfig('carriers/' . $this->_name . '/tax_all')) {
374
-                $data['orderitem_vat_value'] = Mage::getStoreConfig('carriers/' . $this->_name . '/tax_options');
373
+            if (Mage::getStoreConfig('carriers/'.$this->_name.'/tax_all')) {
374
+                $data['orderitem_vat_value'] = Mage::getStoreConfig('carriers/'.$this->_name.'/tax_options');
375 375
             } else {
376
-                $attributeCode = Mage::getStoreConfig('carriers/' . $this->_name . '/tax_all');
376
+                $attributeCode = Mage::getStoreConfig('carriers/'.$this->_name.'/tax_all');
377 377
                 $data['orderitem_vat_value'] = Mage::getResourceModel('catalog/product')->getAttributeRawValue($item->getProductId(), $attributeCode, $order->getStore());
378 378
             }
379 379
 
Please login to merge, or discard this patch.