Jingga/oms-WarehouseManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-WarehouseManagement.git synced 2026-02-16 06:08:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug and media fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2021-10-29 14:49:55 +02:00
parent 35a625bd74
commit 02cf464565
9 changed files with 40 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Admin/Installer.php
View File

@ -14,15 +14,14 @@ declare(strict_types=1);
namespace Modules\WarehouseManagement\Admin; namespace Modules\WarehouseManagement\Admin;
use phpOMS\Config\SettingsInterface;
use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\Localization\ISO639x1Enum;
use phpOMS\Module\InstallerAbstract;
use phpOMS\Module\ModuleInfo;
use Modules\WarehouseManagement\Models\Stock; use Modules\WarehouseManagement\Models\Stock;
use Modules\WarehouseManagement\Models\StockMapper;
use Modules\WarehouseManagement\Models\StockLocation; use Modules\WarehouseManagement\Models\StockLocation;
use Modules\WarehouseManagement\Models\StockLocationMapper; use Modules\WarehouseManagement\Models\StockLocationMapper;
use Modules\WarehouseManagement\Models\StockMapper;
use phpOMS\Config\SettingsInterface;
use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\Module\InstallerAbstract;
use phpOMS\Module\ModuleInfo;
/** /**
* Installer class. * Installer class.

3
Controller/ApiController.php
View File

@ -14,11 +14,10 @@ declare(strict_types=1);
namespace Modules\WarehouseManagement\Controller; namespace Modules\WarehouseManagement\Controller;
use Modules\Admin\Models\NullAccount;
use Modules\WarehouseManagement\Models\Stock; use Modules\WarehouseManagement\Models\Stock;
use Modules\WarehouseManagement\Models\StockMapper;
use Modules\WarehouseManagement\Models\StockLocation; use Modules\WarehouseManagement\Models\StockLocation;
use Modules\WarehouseManagement\Models\StockLocationMapper; use Modules\WarehouseManagement\Models\StockLocationMapper;
use Modules\WarehouseManagement\Models\StockMapper;
use Modules\WarehouseManagement\Models\StockShelf; use Modules\WarehouseManagement\Models\StockShelf;
use Modules\WarehouseManagement\Models\StockShelfMapper; use Modules\WarehouseManagement\Models\StockShelfMapper;

4
Controller/BackendController.php
View File

@ -14,8 +14,8 @@ declare(strict_types=1);
namespace Modules\WarehouseManagement\Controller; namespace Modules\WarehouseManagement\Controller;
use Modules\WarehouseManagement\Models\StockMapper;
use Modules\WarehouseManagement\Models\StockLocationMapper; use Modules\WarehouseManagement\Models\StockLocationMapper;
use Modules\WarehouseManagement\Models\StockMapper;
use phpOMS\Contract\RenderableInterface; use phpOMS\Contract\RenderableInterface;
use phpOMS\Message\RequestAbstract; use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract; use phpOMS\Message\ResponseAbstract;
@ -92,7 +92,6 @@ final class BackendController extends Controller
$view->setData('stock', StockMapper::get((int) $request->getData('id'))); $view->setData('stock', StockMapper::get((int) $request->getData('id')));
return $view; return $view;
} }
@ -156,7 +155,6 @@ final class BackendController extends Controller
$view->setData('location', StockLocationMapper::get((int) $request->getData('id'))); $view->setData('location', StockLocationMapper::get((int) $request->getData('id')));
return $view; return $view;
} }
} }

10
Models/StockLocationMapper.php
View File

@ -33,12 +33,12 @@ final class StockLocationMapper extends DataMapperAbstract
* @since 1.0.0 * @since 1.0.0
*/ */
protected static array $columns = [ protected static array $columns = [
'warehousemgmt_stocklocation_id' => ['name' => 'warehousemgmt_stocklocation_id', 'type' => 'int', 'internal' => 'id'], 'warehousemgmt_stocklocation_id' => ['name' => 'warehousemgmt_stocklocation_id', 'type' => 'int', 'internal' => 'id'],
'warehousemgmt_stocklocation_name' => ['name' => 'warehousemgmt_stocklocation_name', 'type' => 'string', 'internal' => 'name'], 'warehousemgmt_stocklocation_name' => ['name' => 'warehousemgmt_stocklocation_name', 'type' => 'string', 'internal' => 'name'],
'warehousemgmt_stocklocation_stock' => ['name' => 'warehousemgmt_stocklocation_stock', 'type' => 'int', 'internal' => 'stock'], 'warehousemgmt_stocklocation_stock' => ['name' => 'warehousemgmt_stocklocation_stock', 'type' => 'int', 'internal' => 'stock'],
'warehousemgmt_stocklocation_x' => ['name' => 'warehousemgmt_stocklocation_x', 'type' => 'int', 'internal' => 'x'], 'warehousemgmt_stocklocation_x' => ['name' => 'warehousemgmt_stocklocation_x', 'type' => 'int', 'internal' => 'x'],
'warehousemgmt_stocklocation_y' => ['name' => 'warehousemgmt_stocklocation_y', 'type' => 'int', 'internal' => 'y'], 'warehousemgmt_stocklocation_y' => ['name' => 'warehousemgmt_stocklocation_y', 'type' => 'int', 'internal' => 'y'],
'warehousemgmt_stocklocation_z' => ['name' => 'warehousemgmt_stocklocation_z', 'type' => 'int', 'internal' => 'z'], 'warehousemgmt_stocklocation_z' => ['name' => 'warehousemgmt_stocklocation_z', 'type' => 'int', 'internal' => 'z'],
]; ];
/** /**

2
Models/StockMapper.php
View File

@ -34,7 +34,7 @@ final class StockMapper extends DataMapperAbstract
*/ */
protected static array $columns = [ protected static array $columns = [
'warehousemgmt_stock_id' => ['name' => 'warehousemgmt_stock_id', 'type' => 'int', 'internal' => 'id'], 'warehousemgmt_stock_id' => ['name' => 'warehousemgmt_stock_id', 'type' => 'int', 'internal' => 'id'],
'warehousemgmt_stock_name' => ['name' => 'warehousemgmt_stock_name', 'type' => 'string', 'internal' => 'name'], 'warehousemgmt_stock_name' => ['name' => 'warehousemgmt_stock_name', 'type' => 'string', 'internal' => 'name'],
'warehousemgmt_stock_type' => ['name' => 'warehousemgmt_stock_type', 'type' => 'int', 'internal' => 'type'], 'warehousemgmt_stock_type' => ['name' => 'warehousemgmt_stock_type', 'type' => 'int', 'internal' => 'type'],
]; ];

19
Models/StockMovementType.php
View File

@ -27,20 +27,31 @@ use phpOMS\Stdlib\Base\Enum;
abstract class StockMovementType extends Enum abstract class StockMovementType extends Enum
{ {
public const MERGE = 1; public const MERGE = 1;
public const SPLIT = 2;
public const INCREASE = 4;
public const DECREASE = 8;
public const TRANSFER = 16;
public const SPLIT = 2;
public const INCREASE = 4;
public const DECREASE = 8;
public const TRANSFER = 16;
// @todo: subtypes, maybe creates as database subtypes during install. // @todo: subtypes, maybe creates as database subtypes during install.
public const DESTROY = 1; // 8 public const DESTROY = 1; // 8
public const RETURN = 1; // 8 public const RETURN = 1; // 8
public const INVENTORY_PLUS = 1; // 4 public const INVENTORY_PLUS = 1; // 4
public const INVENTORY_MINUS = 1; // 8 public const INVENTORY_MINUS = 1; // 8
public const PURCHASE = 1; // 4 public const PURCHASE = 1; // 4
public const SALE = 1; // 4 public const SALE = 1; // 4
public const MANUFACTURE_CREATE = 1; // 4 public const MANUFACTURE_CREATE = 1; // 4
public const MANUFACTURE_USE = 1; // 8 public const MANUFACTURE_USE = 1; // 8
public const MANUAL = 1; // 1-16 public const MANUAL = 1; // 1-16
} }

10
Models/StockShelfMapper.php
View File

@ -33,12 +33,12 @@ final class StockShelfMapper extends DataMapperAbstract
* @since 1.0.0 * @since 1.0.0
*/ */
protected static array $columns = [ protected static array $columns = [
'warehousemgmt_stockshelf_id' => ['name' => 'warehousemgmt_stockshelf_id', 'type' => 'int', 'internal' => 'id'], 'warehousemgmt_stockshelf_id' => ['name' => 'warehousemgmt_stockshelf_id', 'type' => 'int', 'internal' => 'id'],
'warehousemgmt_stockshelf_name' => ['name' => 'warehousemgmt_stockshelf_name', 'type' => 'string', 'internal' => 'name'], 'warehousemgmt_stockshelf_name' => ['name' => 'warehousemgmt_stockshelf_name', 'type' => 'string', 'internal' => 'name'],
'warehousemgmt_stockshelf_location' => ['name' => 'warehousemgmt_stockshelf_location', 'type' => 'int', 'internal' => 'location'], 'warehousemgmt_stockshelf_location' => ['name' => 'warehousemgmt_stockshelf_location', 'type' => 'int', 'internal' => 'location'],
'warehousemgmt_stockshelf_x' => ['name' => 'warehousemgmt_stockshelf_x', 'type' => 'int', 'internal' => 'x'], 'warehousemgmt_stockshelf_x' => ['name' => 'warehousemgmt_stockshelf_x', 'type' => 'int', 'internal' => 'x'],
'warehousemgmt_stockshelf_y' => ['name' => 'warehousemgmt_stockshelf_y', 'type' => 'int', 'internal' => 'y'], 'warehousemgmt_stockshelf_y' => ['name' => 'warehousemgmt_stockshelf_y', 'type' => 'int', 'internal' => 'y'],
'warehousemgmt_stockshelf_z' => ['name' => 'warehousemgmt_stockshelf_z', 'type' => 'int', 'internal' => 'z'], 'warehousemgmt_stockshelf_z' => ['name' => 'warehousemgmt_stockshelf_z', 'type' => 'int', 'internal' => 'z'],
]; ];
/** /**

12
Theme/Backend/Lang/Navigation.en.lang.php
View File

@ -13,11 +13,11 @@
declare(strict_types=1); declare(strict_types=1);
return ['Navigation' => [ return ['Navigation' => [
'Arrival' => 'Arrival', 'Arrival' => 'Arrival',
'Articles' => 'Articles', 'Articles' => 'Articles',
'Locations' => 'Locations', 'Locations' => 'Locations',
'Shipping' => 'Shipping', 'Shipping' => 'Shipping',
'Stock' => 'Stock', 'Stock' => 'Stock',
'Stocks' => 'Stocks', 'Stocks' => 'Stocks',
'Warehousing' => 'Warehousing', 'Warehousing' => 'Warehousing',
]]; ]];

2
tests/Bootstrap.php
View File

@ -392,4 +392,4 @@ function phpServe() : void
}); });
} }
phpServe(); \phpServe();