hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 14:03:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-1545 fix order manager view (#4061)

Browse Source 
* remove button on mail deny

display only order element that the order manager has right

fix string not translated

* do not send deny email

* update
This commit is contained in:
Aina Sitraka
2022-06-21 11:23:30 +03:00
committed by GitHub
parent eac4ab3831
commit ccfcf24a3d
13 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Phraseanet-production-client/config/config.js
View File

@@ -13,5 +13,5 @@ module.exports = {
setupDir: _root + 'tests/setup/node.js',
karmaConf: _root + 'config/karma.conf.js',
// change this version when you change JS file for lazy loading
assetFileVersion: 66
assetFileVersion: 67
};

2
Phraseanet-production-client/dist/authenticate.js vendored
View File

@@ -96,7 +96,7 @@ return /******/ (function(modules) { // webpackBootstrap
/******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ }
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=66";
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=67";
/******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() {

2
Phraseanet-production-client/dist/authenticate.min.js vendored
View File

@@ -96,7 +96,7 @@ return /******/ (function(modules) { // webpackBootstrap
/******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ }
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=66";
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=67";
/******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() {

2
Phraseanet-production-client/dist/commons.js vendored
View File

@@ -91,7 +91,7 @@
/******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ }
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=66";
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=67";
/******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() {

2
Phraseanet-production-client/dist/commons.min.js vendored
View File

@@ -91,7 +91,7 @@
/******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ }
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=66";
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=67";
/******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() {

2
Phraseanet-production-client/dist/production.js vendored
View File

@@ -66435,7 +66435,7 @@ var orderItem = function orderItem(services) {
//$('#order-action button.send').prop('disabled', true);
} else if (_underscore2.default.contains(elementArrayType, ELEMENT_TYPE.DENIED)) {
(0, _jquery2.default)('#order-action button.deny, #order-action button.reset').hide();
(0, _jquery2.default)('#order-action span.action-text').html('window.orderItemData.translatedText.refusedPreviously');
(0, _jquery2.default)('#order-action span.action-text').html(window.orderItemData.translatedText.refusedPreviously);
//$('#order-action button.send').prop('disabled', false);
(0, _jquery2.default)('#order-action button.send, #order-action span.action-text').show();
} else {

2
Phraseanet-production-client/dist/production.min.js vendored
View File

@@ -66435,7 +66435,7 @@ var orderItem = function orderItem(services) {
//$('#order-action button.send').prop('disabled', true);
} else if (_underscore2.default.contains(elementArrayType, ELEMENT_TYPE.DENIED)) {
(0, _jquery2.default)('#order-action button.deny, #order-action button.reset').hide();
(0, _jquery2.default)('#order-action span.action-text').html('window.orderItemData.translatedText.refusedPreviously');
(0, _jquery2.default)('#order-action span.action-text').html(window.orderItemData.translatedText.refusedPreviously);
//$('#order-action button.send').prop('disabled', false);
(0, _jquery2.default)('#order-action button.send, #order-action span.action-text').show();
} else {

2
Phraseanet-production-client/src/components/order/orderItem.js
View File

@@ -880,7 +880,7 @@ const orderItem = services => {
//$('#order-action button.send').prop('disabled', true);
} else if (_.contains(elementArrayType, ELEMENT_TYPE.DENIED)) {
$('#order-action button.deny, #order-action button.reset').hide();
$('#order-action span.action-text').html('window.orderItemData.translatedText.refusedPreviously');
$('#order-action span.action-text').html(window.orderItemData.translatedText.refusedPreviously);
//$('#order-action button.send').prop('disabled', false);
$('#order-action button.send, #order-action span.action-text').show();
} else {

2
lib/Alchemy/Phrasea/Notification/Mail/MailInfoOrderCancelled.php
View File

@@ -72,7 +72,6 @@ class MailInfoOrderCancelled extends AbstractMail
*/
public function getButtonText()
{
return $this->app->trans('See my order', [], 'messages', $this->getLocale());
}
/**
@@ -80,6 +79,5 @@ class MailInfoOrderCancelled extends AbstractMail
*/
public function getButtonURL()
{
return $this->app->url('prod');
}
}

4
lib/Alchemy/Phrasea/Order/Controller/ProdOrderController.php
View File

@@ -144,9 +144,11 @@ class ProdOrderController extends BaseOrderController
public function displayOneOrder($order_id)
{
$order = $this->findOr404($order_id);
$grantedBaseIds = array_keys($this->getAclForUser()->get_granted_base([\ACL::ORDER_MASTER]));
return $this->render('prod/orders/order_item.html.twig', [
'order' => $order,
'order' => $order,
'grantedBaseIds' => $grantedBaseIds
]);
}

24
lib/Alchemy/Phrasea/Order/ValidationNotifier/MailNotifier.php
View File

@@ -104,17 +104,19 @@ class MailNotifier implements ValidationNotifier
$sender = Emitter::fromUser($delivery->getAdmin());
$recipient = Receiver::fromUser($delivery->getOrder()->getUser());
$mail = MailInfoOrderCancelled::create($this->application, $recipient, $sender);
// DO not send email PHRAS-1545
$mail->setQuantity($delivery->getQuantity());
$mail->setDeliverer($delivery->getAdmin());
if (($locale = $delivery->getOrder()->getUser()->getLocale()) != null) {
$mail->setLocale($locale);
} elseif (($locale1 = $delivery->getAdmin()->getLocale()) != null) {
$mail->setLocale($locale1);
}
$this->getDeliverer()->deliver($mail);
// $mail = MailInfoOrderCancelled::create($this->application, $recipient, $sender);
//
// $mail->setQuantity($delivery->getQuantity());
// $mail->setDeliverer($delivery->getAdmin());
//
// if (($locale = $delivery->getOrder()->getUser()->getLocale()) != null) {
// $mail->setLocale($locale);
// } elseif (($locale1 = $delivery->getAdmin()->getLocale()) != null) {
// $mail->setLocale($locale1);
// }
//
// $this->getDeliverer()->deliver($mail);
}
}

2
lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php
View File

@@ -59,7 +59,7 @@ class PhraseanetExtension extends \Twig_Extension
{
return [
// change this version when you change JS file to force the navigation to reload js file
'assetFileVersion' => 66
'assetFileVersion' => 67
];
}

4
templates/web/prod/orders/order_item.html.twig
View File

@@ -133,7 +133,8 @@
<table class="table-order">
<tbody>
{% for element in order.getElements() %}
<tr id="element_{{ loop.index }}" class="order_row {% if element.getOrderMaster() is none %}selectable{% else %}{% if element.getDeny() == true %}selectable denied{% else %}selectable validated{% endif %}{% endif %}" elementids="{{element.getSbasId(app)}}_{{element.getRecordId()}}">
{% if element.getBaseId() in grantedBaseIds %}
<tr id="element_{{ loop.index }}" class="order_row {% if element.getOrderMaster() is none %}selectable{% else %}{% if element.getDeny() == true %}selectable denied{% else %}selectable validated{% endif %}{% endif %}" elementids="{{element.getSbasId(app)}}_{{element.getRecordId()}}">
<td width="10%" align="center">
{% if element.getOrderMaster() %}
{% set name = element.getOrderMaster().getDisplayName() | e %}
@@ -169,6 +170,7 @@
<span>{{element.getRecord(app).getOriginalName() }}</span>
</td>
</tr>
{% endif %}
{% endfor %}
</tbody>
</table>