Skip to content

Commit

Permalink
Merge branch '1.7.7.x' into merge-177-11-24-20
Browse files Browse the repository at this point in the history
  • Loading branch information
@jolelievre
jolelievre committed Nov 24, 2020
2 parents 64e72ca + 9233da0 commit 3cc5f7b
Show file tree
Hide file tree
Showing 76 changed files with 3,085 additions and 1,242 deletions.
13 changes: 9 additions & 4 deletions admin-dev/themes/new-theme/js/pages/order/view/order-view-page.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,15 @@ export default class OrderViewPage {
});

EventEmitter.on(OrderViewEventMap.productUpdated, (event) => {
this.orderProductRenderer.addOrUpdateProductToList(
$(OrderViewPageMap.productsTableRow(event.orderDetailId)),
event.newRow,
);
const $productRow = $(OrderViewPageMap.productsTableRow(event.orderDetailId));
if ('' === event.newRow) {
$productRow.remove();
} else {
this.orderProductRenderer.addOrUpdateProductToList(
$productRow,
event.newRow,
);
}
this.orderProductRenderer.resetEditRow(event.orderDetailId);
this.orderPricesRefresher.refresh(event.orderId);
this.orderPricesRefresher.refreshProductPrices(event.orderId);
Expand Down
12 changes: 6 additions & 6 deletions app/Resources/translations/default/AdminAdvparametersNotification.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1024,32 +1024,32 @@
<trans-unit id="a375d9230fd61b4a70ac109ab7b11082">
<source>You cannot edit the SuperAdmin profile.</source>
<target>You cannot edit the SuperAdmin profile.</target>
<note>Line: 344</note>
<note>Line: 343</note>
</trans-unit>
<trans-unit id="cd34716bc68eb08479ddf16f17b2580e">
<source>The provided profile is invalid</source>
<target>The provided profile is invalid</target>
<note>Line: 508</note>
<note>Line: 507</note>
</trans-unit>
<trans-unit id="f5d44b60e38b28d19549bb7a107654ca">
<source>You cannot disable or delete your own account.</source>
<target>You cannot disable or delete your own account.</target>
<note>Line: 492</note>
<note>Line: 491</note>
</trans-unit>
<trans-unit id="2450228823b8e17792cf687b8543b59d">
<source>You cannot disable or delete the administrator account.</source>
<target>You cannot disable or delete the administrator account.</target>
<note>Line: 486</note>
<note>Line: 485</note>
</trans-unit>
<trans-unit id="4220fb02fdc65e838a02a3b51c6f737f">
<source>Your current password is invalid.</source>
<target>Your current password is invalid.</target>
<note>Line: 536</note>
<note>Line: 535</note>
</trans-unit>
<trans-unit id="cfe45dd92c1b71a640ea19767578f38c">
<source>The employee must be associated with at least one shop.</source>
<target>The employee must be associated with at least one shop.</target>
<note>Line: 504</note>
<note>Line: 503</note>
</trans-unit>
</body>
</file>
Expand Down
4 changes: 2 additions & 2 deletions app/Resources/translations/default/AdminCatalogNotification.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -831,7 +831,7 @@
<trans-unit id="2cb44aa56605e05e0b912131875edcb7">
<source>There are not enough products in stock.</source>
<target>There are not enough products in stock.</target>
<note>Line: 580</note>
<note>Line: 591</note>
</trans-unit>
</body>
</file>
Expand All @@ -840,7 +840,7 @@
<trans-unit id="4fce600d4fc0429af2f5bc5861eefb3e">
<source>Selected products were successfully canceled.</source>
<target>Selected products were successfully canceled.</target>
<note>Line: 1524</note>
<note>Line: 1531</note>
</trans-unit>
</body>
</file>
Expand Down
2 changes: 1 addition & 1 deletion app/Resources/translations/default/AdminDesignNotification.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<trans-unit id="c402321a8e5818b776007e8a2d00474a">
<source>Current theme is unavailable. Please check your theme's directory name ("%s") and permissions.</source>
<target>Current theme is unavailable. Please check your theme's directory name ("%s") and permissions.</target>
<note>Line: 322</note>
<note>Line: 327</note>
</trans-unit>
</body>
</file>
Expand Down
38 changes: 19 additions & 19 deletions app/Resources/translations/default/AdminNotificationsError.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1016,12 +1016,12 @@ Comment: check if some ids are in list_skip_actions and forbid deletion</note>
<trans-unit id="df3c280f0aaf0cb0d5c25ab322a8bcf9">
<source>You do not have permission to update this.</source>
<target>You do not have permission to update this.</target>
<note>Line: 330</note>
<note>Line: 329</note>
</trans-unit>
<trans-unit id="044bfaec90b16e5caf72b70a5ae4c872">
<source>You need permission to add this.</source>
<target>You need permission to add this.</target>
<note>Line: 560</note>
<note>Line: 559</note>
</trans-unit>
</body>
</file>
Expand Down Expand Up @@ -1361,7 +1361,7 @@ Comment: check if some ids are in list_skip_actions and forbid deletion</note>
<trans-unit id="959c96ec640d353311dd9763d57daad6">
<source>Please fill in all the required fields.</source>
<target>Please fill in all the required fields.</target>
<note>Line: 570</note>
<note>Line: 581</note>
</trans-unit>
<trans-unit id="3a092130bd08641faa55f5abc9e4a1f4">
<source>Positive product quantity is required</source>
Expand All @@ -1381,37 +1381,37 @@ Comment: check if some ids are in list_skip_actions and forbid deletion</note>
<trans-unit id="059cfac7937209448c9fb1cf8f07e321">
<source>Positive product quantity is required.</source>
<target>Positive product quantity is required.</target>
<note>Line: 544</note>
<note>Line: 555</note>
</trans-unit>
<trans-unit id="c5064b408c1894a4dbd6db58f119c4a6">
<source>Selected language cannot be used because it is disabled</source>
<target>Selected language cannot be used because it is disabled</target>
<note>Line: 554</note>
<note>Line: 565</note>
</trans-unit>
<trans-unit id="ea5d4a7a4ca312b276b1d4ea1f74d724">
<source>Selected currency cannot be used because it is deleted.</source>
<target>Selected currency cannot be used because it is deleted.</target>
<note>Line: 560</note>
<note>Line: 571</note>
</trans-unit>
<trans-unit id="021361da28a3e064871e2cbbacd46757">
<source>Selected currency cannot be used because it is disabled.</source>
<target>Selected currency cannot be used because it is disabled.</target>
<note>Line: 564</note>
<note>Line: 575</note>
</trans-unit>
<trans-unit id="bc5d37ff246288c98fa45f3903172747">
<source>Custom field text cannot be longer than %limit% characters.</source>
<target>Custom field text cannot be longer than %limit% characters.</target>
<note>Line: 574</note>
<note>Line: 585</note>
</trans-unit>
<trans-unit id="e1f19b2938605ab0bdc64ba270815786">
<source>Same product quantity is already in cart</source>
<target>Same product quantity is already in cart</target>
<note>Line: 548</note>
<note>Line: 559</note>
</trans-unit>
<trans-unit id="aa83c911e54936648591034d74055aa2">
<source>Gift message not valid</source>
<target>Gift message not valid</target>
<note>Line: 594</note>
<note>Line: 605</note>
</trans-unit>
</body>
</file>
Expand All @@ -1420,47 +1420,47 @@ Comment: check if some ids are in list_skip_actions and forbid deletion</note>
<trans-unit id="59af32e406ca8d94850e9a2a696c9dcd">
<source>Invalid value: the payment must be a positive amount.</source>
<target>Invalid value: the payment must be a positive amount.</target>
<note>Line: 1757</note>
<note>Line: 1762</note>
</trans-unit>
<trans-unit id="546710db975c663e306008fda9fc5865">
<source>Invalid action: this order has not been delivered.</source>
<target>Invalid action: this order has not been delivered.</target>
<note>Line: 1766</note>
<note>Line: 1771</note>
</trans-unit>
<trans-unit id="b5ab864b320f4fcbcd061ee3119cf21c">
<source>Invalid action: this order has already been delivered.</source>
<target>Invalid action: this order has already been delivered.</target>
<note>Line: 1770</note>
<note>Line: 1775</note>
</trans-unit>
<trans-unit id="3e19a894b9552d54a62e99b3f7e7cf94">
<source>Invalid action: this order has already been paid.</source>
<target>Invalid action: this order has already been paid.</target>
<note>Line: 1762</note>
<note>Line: 1767</note>
</trans-unit>
<trans-unit id="7621aa68f3fb11dce889ba85f3a74758">
<source>Invalid action: this order has not been paid.</source>
<target>Invalid action: this order has not been paid.</target>
<note>Line: 1774</note>
<note>Line: 1779</note>
</trans-unit>
<trans-unit id="b19e2fa860ab1d9fdd60f5b7772b6a3e">
<source>The product customization picture could not be found.</source>
<target>The product customization picture could not be found.</target>
<note>Line: 1585</note>
<note>Line: 1590</note>
</trans-unit>
<trans-unit id="074ed474a7e0b671a07422f3014dadfb">
<source>This product is already in your order, please edit the quantity instead.</source>
<target>This product is already in your order, please edit the quantity instead.</target>
<note>Line: 1794</note>
<note>Line: 1799</note>
</trans-unit>
<trans-unit id="5b5d79a83148583db9a987bc0dbb6265">
<source>This product is already in the invoice [1], please edit the quantity instead.</source>
<target>This product is already in the invoice [1], please edit the quantity instead.</target>
<note>Line: 1798</note>
<note>Line: 1803</note>
</trans-unit>
<trans-unit id="963830daedc95e3bd008090ae4c7d1d9">
<source>You cannot edit the price of a product that no longer exists in your catalog.</source>
<target>You cannot edit the price of a product that no longer exists in your catalog.</target>
<note>Line: 1803</note>
<note>Line: 1808</note>
</trans-unit>
</body>
</file>
Expand Down
2 changes: 1 addition & 1 deletion app/Resources/translations/default/AdminNotificationsSuccess.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@
<trans-unit id="4a6c326f3ec43e638da38a44a21b5eb7">
<source>Comment successfully added.</source>
<target>Comment successfully added.</target>
<note>Line: 1215</note>
<note>Line: 1222</note>
</trans-unit>
</body>
</file>
Expand Down
6 changes: 3 additions & 3 deletions app/Resources/translations/default/AdminOrderscustomersFeature.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1100,7 +1100,7 @@ Best regards,</target>
<trans-unit id="e49701f123af735cf327227e8ab09bac">
<source>Manual order -- Employee:</source>
<target>Manual order -- Employee:</target>
<note>Line: 98</note>
<note>Line: 100</note>
</trans-unit>
</body>
</file>
Expand Down Expand Up @@ -1206,12 +1206,12 @@ Best regards,</target>
<trans-unit id="e5d61db40a917c78a9d8e821dd0dd8de">
<source>Add new order</source>
<target>Add new order</target>
<note>Line: 167</note>
<note>Line: 166</note>
</trans-unit>
<trans-unit id="7442e29d7d53e549b78d93c46b8cdcfc">
<source>Orders</source>
<target>Orders</target>
<note>Line: 509</note>
<note>Line: 508</note>
</trans-unit>
</body>
</file>
Expand Down
Loading

0 comments on commit 3cc5f7b

Please sign in to comment.