ItGuild/igfs
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: ItGuild:bff1cb798f02bd42c7ce6dc4367cdbe17074448c
Branches Tags
ItGuild:master
..
compare: ItGuild:d84f23c756fd56c38fb4d50533bdd151e8834d4b
Branches Tags
ItGuild:master

4 Commits
bff1cb798f ... d84f23c756

Author SHA1 Message Date
Kavalar
d84f23c756 fix module shop service 2024-11-08 15:33:27 +03:00
Kavalar
41671c2cd1 Merge branch 'master' of https://git.itguild.info/ItGuild/igfs 2024-11-08 14:58:57 +03:00
Kavalar
c6a92f19c8 Merge branch 'master' of https://git.itguild.info/ItGuild/igfs 2024-11-05 13:32:35 +03:00
Kavalar
b9e1a5382b some fix 2024-11-05 13:24:04 +03:00
2 changed files with 6 additions and 8 deletions
Show Stats Expand all files Collapse all files

10
app/modules/module_shop/controllers/ModuleShopController.php
View File

@ -5,7 +5,6 @@ namespace app\modules\module_shop\controllers;
use app\modules\module_shop\models\forms\CreateModuleShopForm; use app\modules\module_shop\models\forms\CreateModuleShopForm;
use app\modules\module_shop\models\ModuleShop; use app\modules\module_shop\models\ModuleShop;
use app\modules\module_shop\services\ModuleShopService; use app\modules\module_shop\services\ModuleShopService;
use Cassandra\Date;
use JetBrains\PhpStorm\NoReturn; use JetBrains\PhpStorm\NoReturn;
use kernel\AdminController; use kernel\AdminController;
use kernel\app_modules\tag\services\TagService; use kernel\app_modules\tag\services\TagService;
@ -13,7 +12,6 @@ use kernel\FileUpload;
use kernel\Flash; use kernel\Flash;
use kernel\helpers\Debug; use kernel\helpers\Debug;
use kernel\services\ModuleService; use kernel\services\ModuleService;
use mysql_xdevapi\Exception;
use ZipArchive; use ZipArchive;
class ModuleShopController extends AdminController class ModuleShopController extends AdminController
@ -41,7 +39,7 @@ class ModuleShopController extends AdminController
$moduleShopForm->load($_REQUEST); $moduleShopForm->load($_REQUEST);
if (isset($_FILES['path_to_archive']) && $_FILES['path_to_archive']['error'] === UPLOAD_ERR_OK) { if (isset($_FILES['path_to_archive']) && $_FILES['path_to_archive']['error'] === UPLOAD_ERR_OK) {
$file = new FileUpload($_FILES['path_to_archive'], ['zip', 'rar', 'itguild']); $file = new FileUpload($_FILES['path_to_archive'], ['zip', 'rar', 'igm']);
$file->upload(); $file->upload();
$moduleShopForm->setItem('path_to_archive', $file->getUploadFile()); $moduleShopForm->setItem('path_to_archive', $file->getUploadFile());
} }
@ -90,7 +88,7 @@ class ModuleShopController extends AdminController
$module = ModuleShop::find($id); $module = ModuleShop::find($id);
if (!$module) { if (!$module) {
throw new Exception("The module not found"); throw new \Exception("The module not found");
} }
$this->cgView->render("view.php", ['module' => $module]); $this->cgView->render("view.php", ['module' => $module]);
} }
@ -100,7 +98,7 @@ class ModuleShopController extends AdminController
{ {
$module = ModuleShop::find($id); $module = ModuleShop::find($id);
if (!$module) { if (!$module) {
throw new Exception("The module not found"); throw new \Exception("The module not found");
} }
$name = $module->name; $name = $module->name;
@ -113,7 +111,7 @@ class ModuleShopController extends AdminController
{ {
$module = ModuleShop::find($id); $module = ModuleShop::find($id);
if (!$module) { if (!$module) {
throw new Exception("The module not found"); throw new \Exception("The module not found");
} }
$this->moduleShopService->packModule($module); $this->moduleShopService->packModule($module);
} }

4
app/modules/module_shop/services/ModuleShopService.php
View File

@ -22,7 +22,7 @@ class ModuleShopService extends ModuleService
$model->status = $form_model->getItem("status"); $model->status = $form_model->getItem("status");
$model->path_to_archive = $form_model->getItem("path_to_archive"); $model->path_to_archive = $form_model->getItem("path_to_archive");
$model->dependence = $form_model->getItem("dependence"); $model->dependence = $form_model->getItem("dependence");
$model->slug = Slug::url_slug($model->name, ['transliterate' => true, 'lowercase' => true]); $model->slug = $form_model->getItem("slug");
if ($model->save()) { if ($model->save()) {
return $model; return $model;
@ -40,7 +40,7 @@ class ModuleShopService extends ModuleService
$model->status = $form_model->getItem("status"); $model->status = $form_model->getItem("status");
$model->path_to_archive = $form_model->getItem("path_to_archive"); $model->path_to_archive = $form_model->getItem("path_to_archive");
$model->dependence = $form_model->getItem("dependence"); $model->dependence = $form_model->getItem("dependence");
$model->slug = Slug::url_slug($model->name, ['transliterate' => true, 'lowercase' => true]); $model->slug = $form_model->getItem("slug");
if ($model->save()) { if ($model->save()) {
return $model; return $model;