@@ -25,7 +25,7 @@ |
||
| 25 | 25 | |
| 26 | 26 | function parseWarehouse($warehouseCount) { |
| 27 | 27 | $count = $warehouseCount['@attributes']['КоличествоНаСкладе']; |
| 28 | - $objectId = \App::$cur->migrations->findObject((string)$warehouseCount['@attributes']['ИдСклада'], 'Ecommerce\Warehouse'); |
|
| 28 | + $objectId = \App::$cur->migrations->findObject((string) $warehouseCount['@attributes']['ИдСклада'], 'Ecommerce\Warehouse'); |
|
| 29 | 29 | if ($objectId) { |
| 30 | 30 | $modelName = get_class($this->model); |
| 31 | 31 | $warehouse = \Ecommerce\Item\Offer\Warehouse::get([[$modelName::index(), $this->model->pk()], [\Ecommerce\Warehouse::index(), $objectId->object_id]]); |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | |
| 48 | 48 | $walked = []; |
| 49 | 49 | foreach ($this->object->params as $param) { |
| 50 | - if(defined('mdebug')){ |
|
| 50 | + if (defined('mdebug')) { |
|
| 51 | 51 | echo " -> param ($param->id,$param->type,$param->value) "; |
| 52 | 52 | } |
| 53 | 53 | if ($model && $param->type && $param->type != 'item_key') { |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | $parser->parentObject = $this; |
| 60 | 60 | $parser->parentModel = $model; |
| 61 | 61 | $parser->walker = $this->walker; |
| 62 | - if(defined('mdebug')){ |
|
| 62 | + if (defined('mdebug')) { |
|
| 63 | 63 | echo " -> objectParse "; |
| 64 | 64 | } |
| 65 | 65 | $parser->parse(); |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | $parser->param = $param; |
| 75 | 75 | $parser->model = $model; |
| 76 | 76 | $parser->object = $this; |
| 77 | - if(defined('mdebug')){ |
|
| 77 | + if (defined('mdebug')) { |
|
| 78 | 78 | echo " -> parser ($parserName) "; |
| 79 | 79 | } |
| 80 | 80 | $parser->parse(); |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | |
| 48 | 48 | $walked = []; |
| 49 | 49 | foreach ($this->object->params as $param) { |
| 50 | - if(defined('mdebug')){ |
|
| 50 | + if(defined('mdebug')) { |
|
| 51 | 51 | echo " -> param ($param->id,$param->type,$param->value) "; |
| 52 | 52 | } |
| 53 | 53 | if ($model && $param->type && $param->type != 'item_key') { |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | $parser->parentObject = $this; |
| 60 | 60 | $parser->parentModel = $model; |
| 61 | 61 | $parser->walker = $this->walker; |
| 62 | - if(defined('mdebug')){ |
|
| 62 | + if(defined('mdebug')) { |
|
| 63 | 63 | echo " -> objectParse "; |
| 64 | 64 | } |
| 65 | 65 | $parser->parse(); |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | $parser->param = $param; |
| 75 | 75 | $parser->model = $model; |
| 76 | 76 | $parser->object = $this; |
| 77 | - if(defined('mdebug')){ |
|
| 77 | + if(defined('mdebug')) { |
|
| 78 | 78 | echo " -> parser ($parserName) "; |
| 79 | 79 | } |
| 80 | 80 | $parser->parse(); |
@@ -233,7 +233,7 @@ |
||
| 233 | 233 | * Getting items with params |
| 234 | 234 | * |
| 235 | 235 | * @param array $params |
| 236 | - * @return array |
|
| 236 | + * @return Model[] |
|
| 237 | 237 | */ |
| 238 | 238 | public function getItems($params = []) { |
| 239 | 239 | $selectOptions = Ecommerce\OptionsParser::parse($params); |
@@ -71,8 +71,8 @@ |
||
| 71 | 71 | $where[] = ['data', $_GET['data']]; |
| 72 | 72 | } |
| 73 | 73 | $pays = Money\Pay::getList(['where' => $where, 'order' => ['date_create', 'DESC']]); |
| 74 | - if(count($pays)===1){ |
|
| 75 | - Tools::redirect('/money/merchants/pay/'.current($pays)->id); |
|
| 74 | + if (count($pays) === 1) { |
|
| 75 | + Tools::redirect('/money/merchants/pay/' . current($pays)->id); |
|
| 76 | 76 | } |
| 77 | 77 | $this->view->page(['content' => 'pays', 'data' => compact('bread', 'pays')]); |
| 78 | 78 | } else { |
@@ -71,7 +71,7 @@ |
||
| 71 | 71 | $where[] = ['data', $_GET['data']]; |
| 72 | 72 | } |
| 73 | 73 | $pays = Money\Pay::getList(['where' => $where, 'order' => ['date_create', 'DESC']]); |
| 74 | - if(count($pays)===1){ |
|
| 74 | + if(count($pays)===1) { |
|
| 75 | 75 | Tools::redirect('/money/merchants/pay/'.current($pays)->id); |
| 76 | 76 | } |
| 77 | 77 | $this->view->page(['content' => 'pays', 'data' => compact('bread', 'pays')]); |
@@ -33,7 +33,7 @@ |
||
| 33 | 33 | )); |
| 34 | 34 | $context = stream_context_create($options); |
| 35 | 35 | echo "<style>.tmg {margin:0 auto}</style>"; |
| 36 | - echo file_get_contents("http://{$config['domain']}.paykeeper.ru/order/inline/", FALSE, $context); |
|
| 36 | + echo file_get_contents("http://{$config['domain']}.paykeeper.ru/order/inline/", false, $context); |
|
| 37 | 37 | |
| 38 | 38 | } |
| 39 | 39 | |
@@ -236,17 +236,20 @@ |
||
| 236 | 236 | * @return boolean|\Users\User |
| 237 | 237 | */ |
| 238 | 238 | public function get($idn, $ltype = 'id') { |
| 239 | - if (!$idn) |
|
| 240 | - return false; |
|
| 239 | + if (!$idn) { |
|
| 240 | + return false; |
|
| 241 | + } |
|
| 241 | 242 | |
| 242 | - if (is_numeric($idn) && $ltype != 'login') |
|
| 243 | - $user = Users\User::get($idn, 'id'); |
|
| 244 | - elseif ($ltype == 'login') |
|
| 245 | - $user = Users\User::get($idn, 'login'); |
|
| 246 | - else |
|
| 247 | - $user = Users\User::get($idn, 'mail'); |
|
| 248 | - if (!$user) |
|
| 249 | - return []; |
|
| 243 | + if (is_numeric($idn) && $ltype != 'login') { |
|
| 244 | + $user = Users\User::get($idn, 'id'); |
|
| 245 | + } elseif ($ltype == 'login') { |
|
| 246 | + $user = Users\User::get($idn, 'login'); |
|
| 247 | + } else { |
|
| 248 | + $user = Users\User::get($idn, 'mail'); |
|
| 249 | + } |
|
| 250 | + if (!$user) { |
|
| 251 | + return []; |
|
| 252 | + } |
|
| 250 | 253 | |
| 251 | 254 | return $user; |
| 252 | 255 | } |
@@ -257,6 +257,9 @@ |
||
| 257 | 257 | return $user; |
| 258 | 258 | } |
| 259 | 259 | |
| 260 | + /** |
|
| 261 | + * @param boolean $msg |
|
| 262 | + */ |
|
| 260 | 263 | private function msgOrErr($err, $msg) { |
| 261 | 264 | if ($msg) { |
| 262 | 265 | Msg::add($err, 'danger'); |
@@ -16,11 +16,11 @@ |
||
| 16 | 16 | public static $cols = [ |
| 17 | 17 | 'name' => ['type' => 'text'], |
| 18 | 18 | 'code' => ['type' => 'text'], |
| 19 | - 'message' => ['type' => 'dataManager','relation'=>'messages'], |
|
| 19 | + 'message' => ['type' => 'dataManager', 'relation'=>'messages'], |
|
| 20 | 20 | ]; |
| 21 | 21 | public static $dataManagers = [ |
| 22 | 22 | 'manager' => [ |
| 23 | - 'cols' => ['name', 'code','message'] |
|
| 23 | + 'cols' => ['name', 'code', 'message'] |
|
| 24 | 24 | ] |
| 25 | 25 | ]; |
| 26 | 26 | public static $forms = [ |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | */ |
| 186 | 186 | public function getGoodslist() { |
| 187 | 187 | if (!isset($this->goodsList)) { |
| 188 | - return NULL; |
|
| 188 | + return null; |
|
| 189 | 189 | } |
| 190 | 190 | return $this->goodsList; |
| 191 | 191 | } |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | */ |
| 214 | 214 | private function _getTariffList() { |
| 215 | 215 | if (!isset($this->tariffList)) { |
| 216 | - return NULL; |
|
| 216 | + return null; |
|
| 217 | 217 | } |
| 218 | 218 | return $this->tariffList; |
| 219 | 219 | } |
@@ -23,7 +23,7 @@ |
||
| 23 | 23 | $handle = fopen(__DIR__ . '/../vendor/CdekCity_RUS_20170729.csv', 'r'); |
| 24 | 24 | $row = 1; |
| 25 | 25 | $cols = []; |
| 26 | - while (($data = fgetcsv($handle, 10000, ";")) !== FALSE) { |
|
| 26 | + while (($data = fgetcsv($handle, 10000, ";")) !== false) { |
|
| 27 | 27 | if ($row === 1) { |
| 28 | 28 | $cols = $data; |
| 29 | 29 | } else { |
@@ -2,7 +2,7 @@ |
||
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | 4 | 'up' => function () { |
| 5 | - \Ecommerce\Delivery\Field\Item::get(1,'data'); |
|
| 5 | + \Ecommerce\Delivery\Field\Item::get(1, 'data'); |
|
| 6 | 6 | $field = new \Ecommerce\Delivery\Field( |
| 7 | 7 | [ |
| 8 | 8 | 'name' => 'Город', |