mirror of
https://github.com/Karaka-Management/oms-Billing.git
synced 2026-02-11 13:58:41 +00:00
add/fix links and add bill responsibilities
This commit is contained in:
parent
f8796789db
commit
5285cfc53a
|
|
@ -18,7 +18,7 @@
|
||||||
"pid": "/sales/bill",
|
"pid": "/sales/bill",
|
||||||
"type": 3,
|
"type": 3,
|
||||||
"subtype": 1,
|
"subtype": 1,
|
||||||
"name": "List",
|
"name": "Open",
|
||||||
"uri": "{/prefix}sales/bill/list",
|
"uri": "{/prefix}sales/bill/list",
|
||||||
"target": "self",
|
"target": "self",
|
||||||
"icon": null,
|
"icon": null,
|
||||||
|
|
@ -79,7 +79,7 @@
|
||||||
"pid": "/purchase/bill",
|
"pid": "/purchase/bill",
|
||||||
"type": 3,
|
"type": 3,
|
||||||
"subtype": 1,
|
"subtype": 1,
|
||||||
"name": "List",
|
"name": "Open",
|
||||||
"uri": "{/prefix}purchase/bill/list",
|
"uri": "{/prefix}purchase/bill/list",
|
||||||
"target": "self",
|
"target": "self",
|
||||||
"icon": null,
|
"icon": null,
|
||||||
|
|
@ -211,5 +211,36 @@
|
||||||
"permission": { "permission": 2, "type": null, "element": null },
|
"permission": { "permission": 2, "type": null, "element": null },
|
||||||
"parent": 1001602001,
|
"parent": 1001602001,
|
||||||
"children": []
|
"children": []
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 1005108001,
|
||||||
|
"pid": "/purchase/analysis",
|
||||||
|
"type": 3,
|
||||||
|
"subtype": 1,
|
||||||
|
"name": "Bill",
|
||||||
|
"uri": "{/prefix}purchase/analysis/bill",
|
||||||
|
"target": "self",
|
||||||
|
"icon": null,
|
||||||
|
"order": 15,
|
||||||
|
"from": "Billing",
|
||||||
|
"permission": { "permission": 2, "type": null, "element": null },
|
||||||
|
"parent": 1001602001,
|
||||||
|
"children": []
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 1005109001,
|
||||||
|
"pid": "/",
|
||||||
|
"type": 2,
|
||||||
|
"subtype": 1,
|
||||||
|
"name": "Billing",
|
||||||
|
"uri": "{/prefix}private/billing/dashboard?{?}",
|
||||||
|
"target": "self",
|
||||||
|
"icon": null,
|
||||||
|
"order": 5,
|
||||||
|
"from": "Billing",
|
||||||
|
"permission": { "permission": 2, "type": null, "element": null },
|
||||||
|
"parent": 1003401001,
|
||||||
|
"children": [
|
||||||
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -606,5 +606,50 @@
|
||||||
"foreignKey": "editor_doc_id"
|
"foreignKey": "editor_doc_id"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"billing_bill_responsible": {
|
||||||
|
"name": "billing_bill_responsible",
|
||||||
|
"fields": {
|
||||||
|
"billing_bill_responsible_id": {
|
||||||
|
"name": "billing_bill_responsible_id",
|
||||||
|
"type": "INT",
|
||||||
|
"null": false,
|
||||||
|
"primary": true,
|
||||||
|
"autoincrement": true
|
||||||
|
},
|
||||||
|
"billing_bill_responsible_bill": {
|
||||||
|
"name": "billing_bill_responsible_bill",
|
||||||
|
"type": "INT",
|
||||||
|
"null": false,
|
||||||
|
"foreignTable": "billing_bill",
|
||||||
|
"foreignKey": "billing_bill_id"
|
||||||
|
},
|
||||||
|
"billing_bill_responsible_group": {
|
||||||
|
"name": "billing_bill_responsible_group",
|
||||||
|
"type": "INT",
|
||||||
|
"null": false,
|
||||||
|
"foreignTable": "group",
|
||||||
|
"foreignKey": "group_id"
|
||||||
|
},
|
||||||
|
"billing_bill_responsible_account": {
|
||||||
|
"name": "billing_bill_responsible_account",
|
||||||
|
"type": "INT",
|
||||||
|
"null": false,
|
||||||
|
"foreignTable": "account",
|
||||||
|
"foreignKey": "account_id"
|
||||||
|
},
|
||||||
|
"billing_bill_responsible_forwarded_by": {
|
||||||
|
"name": "billing_bill_responsible_forwarded_by",
|
||||||
|
"type": "INT",
|
||||||
|
"null": false,
|
||||||
|
"foreignTable": "account",
|
||||||
|
"foreignKey": "account_id"
|
||||||
|
},
|
||||||
|
"billing_bill_responsible_forwarded_at": {
|
||||||
|
"name": "billing_bill_responsible_forwarded_at",
|
||||||
|
"type": "DATETIME",
|
||||||
|
"null": false
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -29,6 +29,7 @@ use Modules\ClientManagement\Models\ClientMapper;
|
||||||
use Modules\ItemManagement\Models\ItemMapper;
|
use Modules\ItemManagement\Models\ItemMapper;
|
||||||
use Modules\Media\Models\CollectionMapper;
|
use Modules\Media\Models\CollectionMapper;
|
||||||
use Modules\Media\Models\MediaMapper;
|
use Modules\Media\Models\MediaMapper;
|
||||||
|
use Modules\Media\Models\NullCollection;
|
||||||
use Modules\Media\Models\NullMedia;
|
use Modules\Media\Models\NullMedia;
|
||||||
use Modules\Media\Models\PathSettings;
|
use Modules\Media\Models\PathSettings;
|
||||||
use Modules\Media\Models\UploadStatus;
|
use Modules\Media\Models\UploadStatus;
|
||||||
|
|
@ -285,7 +286,7 @@ final class ApiController extends Controller
|
||||||
if ($collection === null) {
|
if ($collection === null) {
|
||||||
$collection = MediaMapper::getParentCollection($path)->limit(1)->execute();
|
$collection = MediaMapper::getParentCollection($path)->limit(1)->execute();
|
||||||
|
|
||||||
if ($collection instanceof NullMedia) {
|
if ($collection instanceof NullCollection) {
|
||||||
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
|
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
|
||||||
'/Modules/Media/Files',
|
'/Modules/Media/Files',
|
||||||
$path,
|
$path,
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
return ['Navigation' => [
|
return ['Navigation' => [
|
||||||
|
'Open' => 'Open',
|
||||||
'Archive' => 'Archive',
|
'Archive' => 'Archive',
|
||||||
'Bill' => 'Bill',
|
'Bill' => 'Bill',
|
||||||
'Billing' => 'Billing',
|
'Billing' => 'Billing',
|
||||||
|
|
|
||||||
|
|
@ -218,7 +218,7 @@ echo $this->getData('nav')->render(); ?>
|
||||||
<section id="mediaFile" class="portlet">
|
<section id="mediaFile" class="portlet">
|
||||||
<div class="portlet-body">
|
<div class="portlet-body">
|
||||||
<?php if (!($original instanceof NullMedia)) : ?>
|
<?php if (!($original instanceof NullMedia)) : ?>
|
||||||
<iframe style="min-height: 600px;" data-form="iUiSettings" data-name="iframeHelper" id="iHelperFrame" src="<?= UriFactory::build('{/backend}Resources/mozilla/Pdf/web/viewer.html{?}&file=' . (($original->isAbsolute ? '' : '/../../../../') . $original->getPath())); ?>" allowfullscreen></iframe>
|
<iframe style="min-height: 600px;" data-form="iUiSettings" data-name="iframeHelper" id="iHelperFrame" src="<?= UriFactory::build('{/backend}Resources/mozilla/Pdf/web/viewer.html{?}&file=' . \urlencode(($original->isAbsolute ? '' : '/../../../../') . $original->getPath())); ?>" allowfullscreen></iframe>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user