@@ -216,6 +216,7 @@ |
||
| 216 | 216 | * @param $number Integer Число на основе которого нужно сформировать окончание |
| 217 | 217 | * @param $endingsArray Array Массив слов или окончаний для чисел (1, 4, 5), |
| 218 | 218 | * например array('яблоко', 'яблока', 'яблок') |
| 219 | + * @param string[] $endingArray |
|
| 219 | 220 | * @return String |
| 220 | 221 | */ |
| 221 | 222 | static function getNumEnding($number, $endingArray) |
@@ -29,6 +29,9 @@ discard block |
||
| 29 | 29 | public $params = []; |
| 30 | 30 | public $distinct = false; |
| 31 | 31 | |
| 32 | + /** |
|
| 33 | + * @param $instance |
|
| 34 | + */ |
|
| 32 | 35 | function __construct($instance = null) |
| 33 | 36 | { |
| 34 | 37 | if (!$instance) { |
@@ -47,6 +50,9 @@ discard block |
||
| 47 | 50 | return $this->curInstance->pdo->lastInsertId(); |
| 48 | 51 | } |
| 49 | 52 | |
| 53 | + /** |
|
| 54 | + * @param string $table |
|
| 55 | + */ |
|
| 50 | 56 | public function select($table) |
| 51 | 57 | { |
| 52 | 58 | $this->operation = 'SELECT'; |
@@ -83,6 +83,9 @@ |
||
| 83 | 83 | return null; |
| 84 | 84 | } |
| 85 | 85 | |
| 86 | + /** |
|
| 87 | + * @return string |
|
| 88 | + */ |
|
| 86 | 89 | function colName() |
| 87 | 90 | { |
| 88 | 91 | return "{$this->activeForm->requestFormName}[{$this->activeForm->modelName}][{$this->colName}]"; |
@@ -329,6 +329,9 @@ |
||
| 329 | 329 | return $rows; |
| 330 | 330 | } |
| 331 | 331 | |
| 332 | + /** |
|
| 333 | + * @param DataManager $dataManager |
|
| 334 | + */ |
|
| 332 | 335 | public static function drawCol($item, $colName, $params = [], $dataManager = null, $originalCol = '', $originalItem = null) |
| 333 | 336 | { |
| 334 | 337 | $modelName = get_class($item); |
@@ -437,6 +437,9 @@ discard block |
||
| 437 | 437 | } |
| 438 | 438 | } |
| 439 | 439 | |
| 440 | + /** |
|
| 441 | + * @param boolean $new |
|
| 442 | + */ |
|
| 440 | 443 | public function logChanges($new) { |
| 441 | 444 | if (!App::$cur->db->connect || !App::$cur->dashboard) { |
| 442 | 445 | return false; |
@@ -539,7 +542,7 @@ discard block |
||
| 539 | 542 | /** |
| 540 | 543 | * Information extractor for col relations path |
| 541 | 544 | * |
| 542 | - * @param string|array $info |
|
| 545 | + * @param string $info |
|
| 543 | 546 | * @return array |
| 544 | 547 | */ |
| 545 | 548 | public static function parseColRecursion($info) { |
@@ -625,7 +628,7 @@ discard block |
||
| 625 | 628 | * Generate params string for col by name |
| 626 | 629 | * |
| 627 | 630 | * @param string $colName |
| 628 | - * @return boolean|string |
|
| 631 | + * @return false|string |
|
| 629 | 632 | */ |
| 630 | 633 | public static function genColParams($colName) { |
| 631 | 634 | if (empty(static::$cols[$colName]) || static::$storage['type'] == 'moduleConfig') { |
@@ -780,7 +783,7 @@ discard block |
||
| 780 | 783 | /** |
| 781 | 784 | * return relations list |
| 782 | 785 | * |
| 783 | - * @return array |
|
| 786 | + * @return string |
|
| 784 | 787 | */ |
| 785 | 788 | public static function relations() { |
| 786 | 789 | return []; |
@@ -1303,7 +1306,7 @@ discard block |
||
| 1303 | 1306 | * |
| 1304 | 1307 | * @param array $params |
| 1305 | 1308 | * @param array $where |
| 1306 | - * @return boolean |
|
| 1309 | + * @return false|null |
|
| 1307 | 1310 | */ |
| 1308 | 1311 | public static function update($params, $where = []) { |
| 1309 | 1312 | static::fixPrefix($params); |
@@ -116,6 +116,9 @@ discard block |
||
| 116 | 116 | } |
| 117 | 117 | } |
| 118 | 118 | |
| 119 | + /** |
|
| 120 | + * @param string $user_mail |
|
| 121 | + */ |
|
| 119 | 122 | public function passre($user_mail) { |
| 120 | 123 | $user = $this->get($user_mail, 'mail'); |
| 121 | 124 | if (!$user) { |
@@ -400,6 +403,9 @@ discard block |
||
| 400 | 403 | return $return; |
| 401 | 404 | } |
| 402 | 405 | |
| 406 | + /** |
|
| 407 | + * @param integer $cat_id |
|
| 408 | + */ |
|
| 403 | 409 | public function addUserActivity($user_id, $cat_id, $text = '') { |
| 404 | 410 | $ua = new Users\Activity([ |
| 405 | 411 | 'user_id' => $user_id, |
@@ -11,6 +11,10 @@ |
||
| 11 | 11 | |
| 12 | 12 | function indexAction() { |
| 13 | 13 | |
| 14 | + /** |
|
| 15 | + * @param DOMDocument $xml |
|
| 16 | + * @param string $nodeName |
|
| 17 | + */ |
|
| 14 | 18 | function addToXml($xml, $parent, $nodeName, $text) { |
| 15 | 19 | $node = $parent->appendChild($xml->createElement($nodeName)); |
| 16 | 20 | $node->appendChild($xml->createTextNode($text)); |
@@ -1,33 +1,33 @@ |
||
| 1 | 1 | <div class="container-fluid"> |
| 2 | 2 | <div class="row panel"> |
| 3 | 3 | <?php |
| 4 | - if (!empty($_FILES['file'])) { |
|
| 5 | - App::$cur->files->upload($_FILES['file'], ['upload_code' => 'editorManager']); |
|
| 6 | - } |
|
| 7 | - $form = new Ui\Form(); |
|
| 8 | - $form->begin(); |
|
| 9 | - $form->input('file', 'file', 'Загрузить файл'); |
|
| 10 | - echo '<div class="form-group"><button class ="btn btn-primary btn-sm">Загузить</button></div>'; |
|
| 11 | - $form->end(false); |
|
| 12 | - ?> |
|
| 4 | + if (!empty($_FILES['file'])) { |
|
| 5 | + App::$cur->files->upload($_FILES['file'], ['upload_code' => 'editorManager']); |
|
| 6 | + } |
|
| 7 | + $form = new Ui\Form(); |
|
| 8 | + $form->begin(); |
|
| 9 | + $form->input('file', 'file', 'Загрузить файл'); |
|
| 10 | + echo '<div class="form-group"><button class ="btn btn-primary btn-sm">Загузить</button></div>'; |
|
| 11 | + $form->end(false); |
|
| 12 | + ?> |
|
| 13 | 13 | </div> |
| 14 | 14 | <h2>Последние файлы</h2> |
| 15 | 15 | <div class="row"> |
| 16 | 16 | <?php |
| 17 | - $files = Files\File::getList(['where' => ['upload_code', 'editorManager'], 'limit' => 12, 'order' => ['date_create', 'DESC']]); |
|
| 18 | - $i = 0; |
|
| 19 | - foreach ($files as $file) { |
|
| 20 | - ?> |
|
| 17 | + $files = Files\File::getList(['where' => ['upload_code', 'editorManager'], 'limit' => 12, 'order' => ['date_create', 'DESC']]); |
|
| 18 | + $i = 0; |
|
| 19 | + foreach ($files as $file) { |
|
| 20 | + ?> |
|
| 21 | 21 | <div class="col-xs-6 col-sm-2 fileChooser" onclick="OpenFile('<?= $file->path; ?>'); |
| 22 | 22 | return false;"> |
| 23 | 23 | <div class="thumbnail"> |
| 24 | 24 | <?php |
| 25 | - if ($file->type->group == 'image') { |
|
| 26 | - echo "<img class='img-responsive' src ='{$file->path}?resize=200x200' />"; |
|
| 27 | - } else { |
|
| 28 | - echo "<img class='img-responsive' src ='/static/moduleAsset/Files/images/formats/" . pathinfo($file->path, PATHINFO_EXTENSION) . ".png' />"; |
|
| 29 | - } |
|
| 30 | - ?> |
|
| 25 | + if ($file->type->group == 'image') { |
|
| 26 | + echo "<img class='img-responsive' src ='{$file->path}?resize=200x200' />"; |
|
| 27 | + } else { |
|
| 28 | + echo "<img class='img-responsive' src ='/static/moduleAsset/Files/images/formats/" . pathinfo($file->path, PATHINFO_EXTENSION) . ".png' />"; |
|
| 29 | + } |
|
| 30 | + ?> |
|
| 31 | 31 | |
| 32 | 32 | <?= $file->name; ?><br /> |
| 33 | 33 | <small class="text-muted"> |
@@ -15,23 +15,23 @@ |
||
| 15 | 15 | <div class="tab-content"> |
| 16 | 16 | <div role="tabpanel" class="tab-pane fade in active" id="home"> |
| 17 | 17 | <?php |
| 18 | - $form = new Ui\Form(); |
|
| 19 | - $form->begin(); |
|
| 20 | - $form->input('checkbox', 'config[view_empty_warehouse]', 'Показывать отсутствующие товары', ['value' => App::$cur->ecommerce->config['view_empty_warehouse']]); |
|
| 21 | - $form->input('checkbox', 'config[view_empty_image]', 'Показывать товары без изображения', ['value' => App::$cur->ecommerce->config['view_empty_image']]); |
|
| 22 | - $form->input('checkbox', 'config[sell_empty_warehouse]', 'Продавать отсутствующие товары', ['value' => App::$cur->ecommerce->config['sell_empty_warehouse']]); |
|
| 23 | - $form->input('checkbox', 'config[sell_over_warehouse]', 'Продавать сверх остатоков на складе', ['value' => App::$cur->ecommerce->config['sell_over_warehouse']]); |
|
| 24 | - $form->input('checkbox', 'config[show_zero_price]', 'Показывать товары с нулевой ценой', ['value' => App::$cur->ecommerce->config['show_zero_price']]); |
|
| 25 | - $form->input('checkbox', 'config[show_without_price]', 'Показывать товары без цен', ['value' => App::$cur->ecommerce->config['show_without_price']]); |
|
| 26 | - $form->input('select', 'config[defaultCategoryView]', 'Стандартный вид категории', ['value' => App::$cur->ecommerce->config['defaultCategoryView'], 'values' => App::$cur->ecommerce->viewsCategoryList()]); |
|
| 27 | - if (App::$cur->money) { |
|
| 28 | - $form->input('select', 'config[defaultCurrency]', 'Валюта по умолчанию', ['value' => App::$cur->ecommerce->config['defaultCurrency'], 'values' => ['' => 'Выберите'] + \Money\Currency::getList()]); |
|
| 29 | - } |
|
| 30 | - $form->input('text', 'config[orderPrefix]', 'Префикс для номеров заказов', ['value' => App::$cur->ecommerce->config['orderPrefix']]); |
|
| 31 | - $form->input('text', 'config[notify_mail]', 'E-mail оповещений о новых заказах', ['value' => App::$cur->ecommerce->config['notify_mail']]); |
|
| 32 | - $form->input('hidden', 'config[save]', '', ['value' => 1]); |
|
| 33 | - $form->end('Сохранить'); |
|
| 34 | - ?> |
|
| 18 | + $form = new Ui\Form(); |
|
| 19 | + $form->begin(); |
|
| 20 | + $form->input('checkbox', 'config[view_empty_warehouse]', 'Показывать отсутствующие товары', ['value' => App::$cur->ecommerce->config['view_empty_warehouse']]); |
|
| 21 | + $form->input('checkbox', 'config[view_empty_image]', 'Показывать товары без изображения', ['value' => App::$cur->ecommerce->config['view_empty_image']]); |
|
| 22 | + $form->input('checkbox', 'config[sell_empty_warehouse]', 'Продавать отсутствующие товары', ['value' => App::$cur->ecommerce->config['sell_empty_warehouse']]); |
|
| 23 | + $form->input('checkbox', 'config[sell_over_warehouse]', 'Продавать сверх остатоков на складе', ['value' => App::$cur->ecommerce->config['sell_over_warehouse']]); |
|
| 24 | + $form->input('checkbox', 'config[show_zero_price]', 'Показывать товары с нулевой ценой', ['value' => App::$cur->ecommerce->config['show_zero_price']]); |
|
| 25 | + $form->input('checkbox', 'config[show_without_price]', 'Показывать товары без цен', ['value' => App::$cur->ecommerce->config['show_without_price']]); |
|
| 26 | + $form->input('select', 'config[defaultCategoryView]', 'Стандартный вид категории', ['value' => App::$cur->ecommerce->config['defaultCategoryView'], 'values' => App::$cur->ecommerce->viewsCategoryList()]); |
|
| 27 | + if (App::$cur->money) { |
|
| 28 | + $form->input('select', 'config[defaultCurrency]', 'Валюта по умолчанию', ['value' => App::$cur->ecommerce->config['defaultCurrency'], 'values' => ['' => 'Выберите'] + \Money\Currency::getList()]); |
|
| 29 | + } |
|
| 30 | + $form->input('text', 'config[orderPrefix]', 'Префикс для номеров заказов', ['value' => App::$cur->ecommerce->config['orderPrefix']]); |
|
| 31 | + $form->input('text', 'config[notify_mail]', 'E-mail оповещений о новых заказах', ['value' => App::$cur->ecommerce->config['notify_mail']]); |
|
| 32 | + $form->input('hidden', 'config[save]', '', ['value' => 1]); |
|
| 33 | + $form->end('Сохранить'); |
|
| 34 | + ?> |
|
| 35 | 35 | <h3>Обслужвание</h3> |
| 36 | 36 | <a href="/admin/ecommerce/reSearchIndex" class="btn btn-primary">Обновить поисковые индексы</a> |
| 37 | 37 | <h3>Уведомления в браузере</h3> |