Jingga/oms-Customs
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Customs.git synced 2026-02-17 19:08:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Test fixes
Some checks failed
Image optimization / general_image_workflow (push) Has been cancelled
Details
CI / general_module_workflow_php (push) Has been cancelled
Details
CI / general_module_workflow_js (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-05-16 02:14:54 +00:00
parent dd5e2e73e0
commit af73bc7d6c
15 changed files with 138 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Admin/Installer.php
View File

@ -14,14 +14,7 @@ declare(strict_types=1);
namespace Modules\Customs\Admin;
use Modules\Admin\Models\NullAccount;
use phpOMS\Application\ApplicationAbstract;
use phpOMS\Config\SettingsInterface;
use phpOMS\Message\Http\HttpRequest;
use phpOMS\Message\Http\HttpResponse;
use phpOMS\Module\InstallerAbstract;
use phpOMS\Module\ModuleInfo;
use phpOMS\System\File\PathException;
/**
* Installer class.
@ -40,12 +33,4 @@ final class Installer extends InstallerAbstract
* @since 1.0.0
*/
public const PATH = __DIR__;
/**
* {@inheritdoc}
*/
public static function install(ApplicationAbstract $app, ModuleInfo $info, SettingsInterface $cfgHandler) : void
{
parent::install($app, $info, $cfgHandler);
}
}

5
Admin/Routes/Web/Api.php
View File

@ -12,10 +12,5 @@
*/
declare(strict_types=1);
use Modules\Dashboard\Controller\ApiController;
use Modules\Dashboard\Models\PermissionCategory;
use phpOMS\Account\PermissionType;
use phpOMS\Router\RouteVerb;
return [
];

4
Controller/ApiController.php
View File

@ -14,10 +14,6 @@ declare(strict_types=1);
namespace Modules\Customs\Controller;
use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract;
/**
* Api controller for the dashboard module.
*

39
Controller/BackendController.php
View File

@ -79,7 +79,7 @@ final class BackendController extends Controller
$con = new \phpOMS\DataStorage\Database\Connection\SQLiteConnection([
'db' => 'sqlite',
'database' => __DIR__ . '/../Data/customs.sqlite'
'database' => __DIR__ . '/../Data/customs.sqlite',
]);
$con->connect();
@ -140,7 +140,7 @@ final class BackendController extends Controller
LIMIT 100;
SQL;
$view->data['sanctions'] = \array_merge($view->data['sanctions'], $query->raw($sql)->execute()->fetchAll());
$view->data['sanctions'] = \array_merge($view->data['sanctions'], $query->raw($sql)->execute()?->fetchAll() ?? []);
$sql = <<<SQL
SELECT sanction_us_cons.Ent_num,
@ -158,7 +158,7 @@ final class BackendController extends Controller
LIMIT 100;
SQL;
$view->data['sanctions'] = \array_merge($view->data['sanctions'], $query->raw($sql)->execute()->fetchAll());
$view->data['sanctions'] = \array_merge($view->data['sanctions'], $query->raw($sql)->execute()?->fetchAll() ?? []);
// EU Consolidated
$name = '';
@ -246,7 +246,7 @@ final class BackendController extends Controller
LIMIT 500;
SQL;
$view->data['sanctions'] = \array_merge($view->data['sanctions'], $query->raw($sql)->execute()->fetchAll());
$view->data['sanctions'] = \array_merge($view->data['sanctions'], $query->raw($sql)->execute()?->fetchAll() ?? []);
$con->close();
@ -349,20 +349,35 @@ final class BackendController extends Controller
return $view;
}
/**
* Create HS code view
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
* @param array $data Generic data
*
* @return RenderableInterface
*
* @api
*
* @since 1.0.0
*/
public function viewHSCodeView(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Customs/Theme/Backend/hscode-view');
$original = $request->getDataString('id') ?? '';
if (!$request->hasData('id')
|| \preg_match('/^[0-9 ]+$/', $original = $request->getDataString('id')) !== 1
|| \preg_match('/^[0-9 ]+$/', $original) !== 1
) {
return $view;
}
$con = new \phpOMS\DataStorage\Database\Connection\SQLiteConnection([
'db' => 'sqlite',
'database' => __DIR__ . '/../Data/customs.sqlite'
'database' => __DIR__ . '/../Data/customs.sqlite',
]);
$con->connect();
@ -395,7 +410,7 @@ final class BackendController extends Controller
$query = new Builder($con);
$view->data['goods'] = $query->raw($sql)->execute()->fetchAll();
$view->data['goods'] = $query->raw($sql)->execute()?->fetchAll() ?? [];
if (empty($view->data['goods'])) {
return $view;
@ -425,7 +440,7 @@ final class BackendController extends Controller
$query = new Builder($con);
$view->data['footnotes'] = $query->raw($sql)->execute()->fetchAll();
$view->data['footnotes'] = $query->raw($sql)->execute()?->fetchAll() ?? [];
return $view;
}
@ -454,7 +469,7 @@ final class BackendController extends Controller
$con = new \phpOMS\DataStorage\Database\Connection\SQLiteConnection([
'db' => 'sqlite',
'database' => __DIR__ . '/../Data/customs.sqlite'
'database' => __DIR__ . '/../Data/customs.sqlite',
]);
$con->connect();
@ -474,7 +489,7 @@ final class BackendController extends Controller
$query->bind(['value' => '%' . $request->getDataString('hscode') . '%'], ':description');
$query->bind(['value' => '%' . $request->getDataString('hscode') . '%'], ':code');
$temp = $query->raw($sql)->execute()->fetchAll();
$temp = $query->raw($sql)->execute()?->fetchAll() ?? [];
if (($exactCount = \count($temp)) === 0) {
return $view;
@ -522,7 +537,7 @@ final class BackendController extends Controller
$codeRanges = empty($codeRanges)
? ''
: ' OR (' . \implode (' OR ', $codeRanges) . ')';
: ' OR (' . \implode(' OR ', $codeRanges) . ')';
$exactMatches = '"' . \implode('","', $exactMatches) . '"';
@ -536,7 +551,7 @@ final class BackendController extends Controller
SQL;
$query = new Builder($con);
$view->data['codes'] = $query->raw($sql)->execute()->fetchAll();
$view->data['codes'] = $query->raw($sql)->execute()?->fetchAll() ?? [];
$con->close();

22
Data/CustomsBuildDB.php
View File

@ -1,4 +1,16 @@
<?php
/**
* Jingga
*
* PHP Version 8.2
*
* @package Modules\Customs\Data
* @copyright Dennis Eichhorn
* @license OMS License 2.0
* @version 1.0.0
* @link https://jingga.app
*/
declare(strict_types=1);
// Sources:
@ -35,7 +47,15 @@ $con = new SQLiteConnection(
);
$con->connect();
$schema = \json_decode(\file_get_contents(__DIR__ . '/schema.json'), true);
$schemaContent = \file_get_contents(__DIR__ . '/schema.json');
if ($schemaContent === false) {
return;
}
$schema = \json_decode($schemaContent, true);
if (!\is_array($schema)) {
return;
}
foreach ($schema as $table) {
Builder::createFromSchema($table, $con)->execute();

5
Docs/Dev/en/structure.md
View File

@ -1,5 +0,0 @@
# Structure
## ER
![ER](Modules/Customs/Docs/Dev/img/er.png)

BIN
Docs/Dev/img/er.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 48 KiB

6
Theme/Backend/hscode-view.tpl.php
View File

@ -1,7 +1,7 @@
<?php
$footnotes = $this->data['footnotes'] ?? [];
$goods = $this->data['goods'] ?? [];
$baseDate = strtotime("1899-12-30");
$baseDate = \strtotime("1899-12-30");
?>
<div class="row">
<div class="col-xs-12 col-md-6">
@ -9,8 +9,8 @@ $baseDate = strtotime("1899-12-30");
<div class="portlet-body">
<?php foreach ($goods as $good) : ?>
<div class="form-group">
<label><?= $good['Goods_code'] ?></label>
<p><?= $good['Description'] ?></p>
<label><?= $good['Goods_code']; ?></label>
<p><?= $good['Description']; ?></p>
</div>
<?php endforeach; ?>
</div>

2
info.json
View File

@ -12,7 +12,7 @@
},
"creator": {
"name": "Jingga",
"website": "jingga.app"
"website": "https://jingga.app"
},
"description": "The customs module.",
"directory": "Customs",

3
tests/Controller/ApiControllerTest.php
View File

@ -24,9 +24,6 @@ use phpOMS\DataStorage\Session\HttpSession;
use phpOMS\Dispatcher\Dispatcher;
use phpOMS\Event\EventManager;
use phpOMS\Localization\L11nManager;
use phpOMS\Message\Http\HttpRequest;
use phpOMS\Message\Http\HttpResponse;
use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\Module\ModuleAbstract;
use phpOMS\Module\ModuleManager;
use phpOMS\Router\WebRouter;