Jingga/oms-WarehouseManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-WarehouseManagement.git synced 2026-01-11 15:18:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-05-12 00:06:29 +00:00
parent 0b52f587bd
commit 2f64935f99
8 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/greetings.yml vendored
View File

@ -9,5 +9,5 @@ jobs:
- uses: actions/first-interaction@v1 - uses: actions/first-interaction@v1
with: with:
repo-token: ${{ secrets.GITHUB_TOKEN }} repo-token: ${{ secrets.GITHUB_TOKEN }}
issue-message: 'Thank you for createing this issue. We will check it as soon as possible.' issue-message: 'Thank you for creating this issue. We will check it as soon as possible.'
pr-message: 'Thank you for your pull request. We will check it as soon as possible.' pr-message: 'Thank you for your pull request. We will check it as soon as possible.'

4
Admin/Installer.php
View File

@ -46,8 +46,6 @@ final class Installer extends InstallerAbstract
{ {
parent::install($app, $info, $cfgHandler); parent::install($app, $info, $cfgHandler);
self::createDefaultStock($app);
/* Stock types */ /* Stock types */
$fileContent = \file_get_contents(__DIR__ . '/Install/types.json'); $fileContent = \file_get_contents(__DIR__ . '/Install/types.json');
if ($fileContent === false) { if ($fileContent === false) {
@ -61,6 +59,8 @@ final class Installer extends InstallerAbstract
} }
self::createStockTypes($app, $types); self::createStockTypes($app, $types);
self::createDefaultStock($app);
} }
/** /**

3
Controller/ApiController.php
View File

@ -188,7 +188,8 @@ final class ApiController extends Controller
$location->name = $request->getDataString('name') ?? ''; $location->name = $request->getDataString('name') ?? '';
$location->stock = new NullStock($request->getDataInt('stock') ?? 1); $location->stock = new NullStock($request->getDataInt('stock') ?? 1);
$location->type = $request->hasData('type') ? new NullStockType((int) $request->getDataInt('type')) : null; // @todo Define default type instead of just 1
$location->type = new NullStockType($request->getDataInt('type') ?? 1);
return $location; return $location;
} }

2
Theme/Backend/Lang/de.lang.php
View File

@ -21,4 +21,6 @@ return ['WarehouseManagement' => [
'Shelf' => 'Fach', 'Shelf' => 'Fach',
'Type' => 'Typ', 'Type' => 'Typ',
'Location' => 'Lagerplatz', 'Location' => 'Lagerplatz',
'Quantity' => 'Menge',
'All' => 'Alle',
]]; ]];

2
Theme/Backend/Lang/en.lang.php
View File

@ -21,4 +21,6 @@ return ['WarehouseManagement' => [
'Shelf' => 'Shelf', 'Shelf' => 'Shelf',
'Type' => 'Type', 'Type' => 'Type',
'Location' => 'Location', 'Location' => 'Location',
'Quantity' => 'Quantity',
'All' => 'All',
]]; ]];

4
Theme/Backend/stock-list.tpl.php
View File

@ -20,7 +20,7 @@ echo $this->data['nav']->render(); ?>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<div class="portlet"> <section class="portlet">
<div class="portlet-head"> <div class="portlet-head">
<?= $this->getHtml('Stocks'); ?> <?= $this->getHtml('Stocks'); ?>
<i class="g-icon download btn end-xs">download</i> <i class="g-icon download btn end-xs">download</i>
@ -46,6 +46,6 @@ echo $this->data['nav']->render(); ?>
<?php endif; ?> <?php endif; ?>
</table> </table>
</div> </div>
</div> </section>
</div> </div>
</div> </div>

4
Theme/Backend/stock-location-list.tpl.php
View File

@ -20,7 +20,7 @@ echo $this->data['nav']->render(); ?>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<div class="portlet"> <section class="portlet">
<div class="portlet-head"><?= $this->getHtml('Locations'); ?><i class="g-icon download btn end-xs">download</i></div> <div class="portlet-head"><?= $this->getHtml('Locations'); ?><i class="g-icon download btn end-xs">download</i></div>
<div class="slider"> <div class="slider">
<table id="stockList" class="default sticky"> <table id="stockList" class="default sticky">
@ -46,6 +46,6 @@ echo $this->data['nav']->render(); ?>
<?php endif; ?> <?php endif; ?>
</table> </table>
</div> </div>
</div> </section>
</div> </div>
</div> </div>

4
Theme/Backend/stock-type-list.tpl.php
View File

@ -20,7 +20,7 @@ echo $this->data['nav']->render(); ?>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<div class="portlet"> <section class="portlet">
<div class="portlet-head"> <div class="portlet-head">
<?= $this->getHtml('Stocks'); ?> <?= $this->getHtml('Stocks'); ?>
<i class="g-icon download btn end-xs">download</i> <i class="g-icon download btn end-xs">download</i>
@ -46,6 +46,6 @@ echo $this->data['nav']->render(); ?>
<?php endif; ?> <?php endif; ?>
</table> </table>
</div> </div>
</div> </section>
</div> </div>
</div> </div>