diff --git a/fid_bbi/config/vufind/permissions.ini b/fid_bbi/config/vufind/permissions.ini index a74f682e3e69a8a6ecd072cc8607d2eca3f494b7..7e4809f472a967c7767ef33656f4760a1ef0c996 100644 --- a/fid_bbi/config/vufind/permissions.ini +++ b/fid_bbi/config/vufind/permissions.ini @@ -27,4 +27,9 @@ relative_path = ../../../fid/config/vufind/permissions.ini [access.AdminModule] role[] = loggedin FidApiPermission[] = edit_user -permission = access.AdminModule \ No newline at end of file +permission = access.AdminModule + +[fid.Acquisitions] +role[] = loggedin +FidApiPermission[] = full_access +permission = fid.Acquisitions diff --git a/module/fid_bbi/config/module.config.php b/module/fid_bbi/config/module.config.php index 88410003d0499eded3965176d3d053adc747066d..df4afa2dbd8f22440ea94c54a8325e59506ab481 100644 --- a/module/fid_bbi/config/module.config.php +++ b/module/fid_bbi/config/module.config.php @@ -209,8 +209,7 @@ $nonTabRecordActions = [ 'PDA', 'EmailHold', 'ReportErrors', - 'Acquisition', - 'fidSubitoPartialCopy' + 'Acquisition' ]; diff --git a/themes/fid_bbi/languages/fid/de.ini b/themes/fid_bbi/languages/fid/de.ini index 88710403b66acf11f384610df048913b8f3481b6..8aeb8e14a771bd41458e5c70320bc54c3f09a918 100644 --- a/themes/fid_bbi/languages/fid/de.ini +++ b/themes/fid_bbi/languages/fid/de.ini @@ -12,3 +12,5 @@ permission_extended_access = "Zugriff auf FID-Lizenzen" permission_full_access = "Zugriff auf lizenzbewehrte Literatur, Direktlieferung & Digitise-on-Demand" label_college = "Hochschule oder andere affiliierte Institution" + +acquisition_fid_name = "FID BBI" diff --git a/themes/fid_bbi/templates/fid/record/acquisition-address-details.phtml b/themes/fid_bbi/templates/fid/record/acquisition-address-details.phtml new file mode 100644 index 0000000000000000000000000000000000000000..caee99e60cb099db17d51270d198ca12d189f1f9 --- /dev/null +++ b/themes/fid_bbi/templates/fid/record/acquisition-address-details.phtml @@ -0,0 +1,30 @@ +<?php +/** @var \fid\Service\DataTransferObject\User $user */ +/** @var \fid\Service\DataTransferObject\Address $address */ +$address = $this->user->getDeliveryAddress(); +?> +<h2><?=$this->translate("fid::acquisition_delivery_to")?></h2> +<table class="table table-striped"> + <tbody> + <tr> + <th><?= $this->translate("fid::acquisition_order_delivery_name") ?></th> + <td><?= $this->user->getFirstname() ?> <?= $this->user->getLastname() ?></td> + </tr> + <tr> + <th><?= $this->translate("fid::order_delivery_address") ?></th> + <td> + <?php if($user->deliveryAddressIsBusinessAddress() && !empty($college=$user->getCollege())): ?> + <?= $college ?><br> + <?php endif ?> + <?= $address->getLine1() ?><br> + <?= !empty($address->getLine2()) ? $address->getLine2() . '<br>' : '' ?> + <?= $address->getZip() ?> <?= $address->getCity() ?><br> + <?= $address->getCountry() ?> + </td> + </tr> + <tr> + <th><?= $this->translate("Email Address") ?></th> + <td><?= $this->user->getUsername() ?></td> + </tr> + </tbody> +</table> diff --git a/themes/fid_bbi/templates/fid/record/acquisition-digitization.phtml b/themes/fid_bbi/templates/fid/record/acquisition-digitization.phtml new file mode 100644 index 0000000000000000000000000000000000000000..96b18ff52d589027957ba76392ec5f42948c3d89 --- /dev/null +++ b/themes/fid_bbi/templates/fid/record/acquisition-digitization.phtml @@ -0,0 +1,80 @@ +<?php + +use Zend\Form\Element; +use Zend\Form\Form; +use Zend\Form\View\Helper\FormElementErrors; +use Zend\Form\View\Helper\FormLabel; +use Zend\Form\View\Helper\FormSubmit; + +$driver = $this->driver; +/** @var Form $form */ +/** @var FormLabel $formLabel */ +/** @var FormSubmit $formSubmit */ +/** @var FormElementErrors $formElementErrors */ +$form = $this->form; +$formLabel = $this->formLabel(); +$formLabel->setTranslatorTextDomain('fid'); +$formSubmit = $this->formSubmit(); +$formSubmit->setTranslatorTextDomain('fid'); +$formElementErrors = $this->formElementErrors(); +$formElementErrors->setTranslatorTextDomain('fid'); +$this->headTitle($title = $this->translate("fid::acquisition_digitization")); +$form->setAttribute('class','fid-acquisition-form'); +?> + +<h1><?= $title ?></h1> +<?= $this->flashmessages() ?> + +<?= $this->form()->openTag($form) ?> + <div class="form-group"> + <?= $this->translate("fid::acquisition_digitization_info", [ + '%%fidname%%' => $this->translate("fid::acquisition_fid_name"), + ]); ?> + </div> + + <?=$this->render('fid/record/acquisition-address-details'); ?> + <?php + $formatter = $this->recordDataFormatter(); + $this->coreFields = $formatter->getData($driver, $formatter->getDefaults('fid-acquisition-general')); + ?> + <?=$this->render('fid/record/acquisition-record-details'); ?> + + <? /* format */ ?> + <?php + /** @var Element\Select $elemFormat */ + $elemFormat = $form->get('format'); + $elemFormat->setLabelAttributes(['class' => 'control-label']); + $elemFormat->setAttributes(['class' => 'form-control']); + ?> + + <? /* comments */ ?> + <?php + /** @var Element\Text $elemComment */ + $elemComment = $form->get('comment'); + $elemComment->setLabelAttributes(['class' => 'control-label']); + $elemComment->setAttributes(['class' => 'form-control']); + ?> + + <div class="form-group"> + <?= $this->formElementErrors($elemFormat) ?> + <?= $this->formLabel($elemFormat) ?> + <?= $this->formElement($elemFormat) ?> + </div> + + <div class="form-group"> + <?= $this->formElementErrors($elemComment) ?> + <?= $this->formLabel($elemComment) ?> + <?= $this->formElement($elemComment) ?> + </div> + + <? /* submit button */ ?> + <?php + /** @var Element\Submit $elemSubmit */ + $elemSubmit = $form->get('submit'); + $elemSubmit->setAttributes(['class' => 'btn btn-primary']); + ?> + <div class="form-group right"> + <?= $this->formElement($elemSubmit) ?> + </div> + +<?= $this->form()->closeTag($form) ?> diff --git a/themes/fid_bbi/templates/fid/record/acquisition-record-details.phtml b/themes/fid_bbi/templates/fid/record/acquisition-record-details.phtml new file mode 100644 index 0000000000000000000000000000000000000000..ceccce0eec2d235e232117cf6511437a012e6bea --- /dev/null +++ b/themes/fid_bbi/templates/fid/record/acquisition-record-details.phtml @@ -0,0 +1,17 @@ +<?php /* Display FID Acquisition Record Details */ ?> +<?php if (!empty($this->coreFields)): ?> + <h2><?= $this->translate("fid::acquisition_info_requested_item") ?></h2> + <table class="table table-striped"> + <?php foreach ($this->coreFields as $current): ?> + <?php if ($current['label'] == null): ?> + <?= $current['value'] ?> + <?php else: ?> + <tr> + <th><?= $this->transEsc($current['label']) ?>:</th> + <td><?= $current['value'] ?></td> + </tr> + <?php endif; ?> + <?php endforeach; ?> + </table> +<?php endif; ?> +<?php /* End FID Acquisition Record Details */ ?> diff --git a/themes/fid_bbi/templates/myresearch/menu.phtml b/themes/fid_bbi/templates/myresearch/menu.phtml index 0c0b767ed76385744a1973818430475b0c475183..fb4cf216676d9c70490978ba4348c06d113e3c55 100644 --- a/themes/fid_bbi/templates/myresearch/menu.phtml +++ b/themes/fid_bbi/templates/myresearch/menu.phtml @@ -61,6 +61,13 @@ <?php if ($this->userlist()->getMode() !== 'disabled'): ?> <h3><?=$this->translate('Your Lists')?></h3> <ul class="unstyled-list"> + + <li> + <a data-lightbox href="<?=$this->url('fid/user/orders')?>"> + <?=$this->transEsc('Your Orders')?> + </a> + </li> + <?php if ($this->accountCapabilities()->getSavedSearchSetting() === 'enabled'): ?> <li> <a @@ -124,6 +131,9 @@ <li> <a href="<?=$this->url('admin/tags', ['action' => 'List'])?>"><?=$this->translate('Tag Management')?></a> </li> + <li> + <a href="<?=$this->url('fid/admin/orders')?>"><?=$this->transEsc('fid::permission_read_order_list')?></a> + </li> </ul> <?php endif; ?> </div>