@@ -102,7 +102,7 @@ |
||
| 102 | 102 | if ($treePath) { |
| 103 | 103 | $categorys = Category::getList(['where' => ['id', implode(',', $treePath), 'IN']]); |
| 104 | 104 | foreach ($categorys as $category) { |
| 105 | - $href .="/{$category->alias}"; |
|
| 105 | + $href .= "/{$category->alias}"; |
|
| 106 | 106 | } |
| 107 | 107 | } |
| 108 | 108 | return $href . "/" . ($this->alias ? $this->alias : $this->pk()); |
@@ -131,7 +131,7 @@ |
||
| 131 | 131 | if ($treePath) { |
| 132 | 132 | $categorys = Category::getList(['where' => ['id', implode(',', $treePath), 'IN']]); |
| 133 | 133 | foreach ($categorys as $category) { |
| 134 | - $href .="/{$category->alias}"; |
|
| 134 | + $href .= "/{$category->alias}"; |
|
| 135 | 135 | } |
| 136 | 136 | } |
| 137 | 137 | return $href . "/" . ($this->alias ? $this->alias : $this->pk()); |
@@ -7,16 +7,18 @@ |
||
| 7 | 7 | $code = 'main'; |
| 8 | 8 | } |
| 9 | 9 | $menu = \Menu\Menu::get($code, 'code'); |
| 10 | -if ($menu) |
|
| 10 | +if ($menu) { |
|
| 11 | 11 | foreach ($menu->items(['order' => ['weight', 'ASC']]) as $item) { |
| 12 | 12 | $href = $item->href; |
| 13 | +} |
|
| 13 | 14 | if ($item->type == 'materialCategory') { |
| 14 | 15 | $category = \Materials\Category::get($item->aditional); |
| 15 | 16 | $href = $category->alias ? "/materials/{$category->alias}" : "/materials/category/{$category->id}"; |
| 16 | 17 | } |
| 17 | - if (urldecode($_SERVER['REQUEST_URI']) == $href) |
|
| 18 | - $active = ' class = "active" '; |
|
| 19 | - else |
|
| 20 | - $active = ''; |
|
| 18 | + if (urldecode($_SERVER['REQUEST_URI']) == $href) { |
|
| 19 | + $active = ' class = "active" '; |
|
| 20 | + } else { |
|
| 21 | + $active = ''; |
|
| 22 | + } |
|
| 21 | 23 | echo "<li {$active}><a href = '{$href}'>{$item->name}</a></li>"; |
| 22 | 24 | } |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | if (empty($objectsCols[$param->object_id])) { |
| 50 | 50 | $modelName = $param->object->model; |
| 51 | 51 | foreach (array_keys($modelName::$cols) as $colName) { |
| 52 | - $objectsCols[$param->object_id][$colName] = !empty($modelName::$labels[$colName])?$modelName::$labels[$colName]:$colName; |
|
| 52 | + $objectsCols[$param->object_id][$colName] = !empty($modelName::$labels[$colName]) ? $modelName::$labels[$colName] : $colName; |
|
| 53 | 53 | } |
| 54 | 54 | } |
| 55 | 55 | $modelName = $param->object->model; |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -return function ($step = NULL, $params = []) { |
|
| 3 | +return function($step = NULL, $params = []) { |
|
| 4 | 4 | |
| 5 | 5 | App::$cur->db->createTable('migrations_migration', [ |
| 6 | 6 | 'migration_id' => 'pk', |
@@ -6,8 +6,9 @@ |
||
| 6 | 6 | $systemModules = array_slice(scandir(INJI_SYSTEM_DIR . '/modules'), 2); |
| 7 | 7 | foreach ($systemModules as $module) { |
| 8 | 8 | $info = Module::getInfo($module); |
| 9 | - if (!$info || isset($modules[$module])) |
|
| 10 | - continue; |
|
| 9 | + if (!$info || isset($modules[$module])) { |
|
| 10 | + continue; |
|
| 11 | + } |
|
| 11 | 12 | ?> |
| 12 | 13 | <div class ="form-group"> |
| 13 | 14 | <div class="checkbox"> |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | if (empty($blocks[$block->wallet->currency_id])) { |
| 103 | 103 | $blocks[$block->wallet->currency_id] = $block->amount; |
| 104 | 104 | } else { |
| 105 | - $blocks[$block->wallet->currency_id]+= $block->amount; |
|
| 105 | + $blocks[$block->wallet->currency_id] += $block->amount; |
|
| 106 | 106 | } |
| 107 | 107 | } |
| 108 | 108 | return $blocks; |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | $recives = \Money\Reward\Recive::getList(['where' => [['user_id', $user->id], ['reward_id', $reward->id]]]); |
| 185 | 185 | $amount = 0; |
| 186 | 186 | foreach ($recives as $recive) { |
| 187 | - $amount+=$recive->amount; |
|
| 187 | + $amount += $recive->amount; |
|
| 188 | 188 | } |
| 189 | 189 | if ($amount >= $reward->peruser) { |
| 190 | 190 | continue; |
@@ -8,12 +8,12 @@ discard block |
||
| 8 | 8 | <th></th> |
| 9 | 9 | </tr> |
| 10 | 10 | <?php |
| 11 | - foreach ($merchants as $merchant) { |
|
| 12 | - $allowCurrencies = $merchant->allowCurrencies($pay); |
|
| 13 | - if (!$allowCurrencies) { |
|
| 14 | - continue; |
|
| 15 | - } |
|
| 16 | - ?> |
|
| 11 | + foreach ($merchants as $merchant) { |
|
| 12 | + $allowCurrencies = $merchant->allowCurrencies($pay); |
|
| 13 | + if (!$allowCurrencies) { |
|
| 14 | + continue; |
|
| 15 | + } |
|
| 16 | + ?> |
|
| 17 | 17 | <tr> |
| 18 | 18 | <td> |
| 19 | 19 | <img src="<?= Statics::file($merchant->image ? $merchant->image->path : '/static/system/images/no-image.png', '150x150'); ?>" class="img-responsive" /> |
@@ -21,21 +21,21 @@ discard block |
||
| 21 | 21 | </td> |
| 22 | 22 | <td> |
| 23 | 23 | <?php |
| 24 | - foreach ($allowCurrencies as $allowCurrency) { |
|
| 25 | - $className = 'Money\MerchantHelper\\' . $merchant->object_name; |
|
| 26 | - $sum = $className::getFinalSum($pay, $allowCurrency); |
|
| 27 | - ?> |
|
| 24 | + foreach ($allowCurrencies as $allowCurrency) { |
|
| 25 | + $className = 'Money\MerchantHelper\\' . $merchant->object_name; |
|
| 26 | + $sum = $className::getFinalSum($pay, $allowCurrency); |
|
| 27 | + ?> |
|
| 28 | 28 | <b><?= $allowCurrency['currency']->name(); ?></b> |
| 29 | 29 | <a class="btn btn-primary" href ="/money/merchants/go/<?= $pay->id; ?>/<?= $merchant->id; ?>/<?= $allowCurrency['currency']->id; ?>">Оплатить <?= $sum; ?> <?= $allowCurrency['currency']->acronym(); ?></a> |
| 30 | 30 | <?php |
| 31 | - } |
|
| 32 | - ?> |
|
| 31 | + } |
|
| 32 | + ?> |
|
| 33 | 33 | </td> |
| 34 | 34 | <td width="100%"> |
| 35 | 35 | <?= $merchant->previewImage ? '<img src="' . $merchant->previewImage->path . '" class="img-responsive" />' : ''; ?> |
| 36 | 36 | </td> |
| 37 | 37 | </tr> |
| 38 | 38 | <?php |
| 39 | - } |
|
| 40 | - ?> |
|
| 39 | + } |
|
| 40 | + ?> |
|
| 41 | 41 | </table> |
| 42 | 42 | \ No newline at end of file |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -return function ($step = NULL, $params = []) { |
|
| 3 | +return function($step = NULL, $params = []) { |
|
| 4 | 4 | |
| 5 | 5 | App::$cur->db->createTable('money_currency', [ |
| 6 | 6 | 'currency_id' => 'pk', |