Skip to content

Commit 4b9bb29

Browse files
abulsayyad123abulsayyad123
authored
Merge pull request #977 from crossroads/master
[Release] Stock v0.21.1
2 parents 2c8c11e + 4e84b08 commit 4b9bb29

File tree

10 files changed

+76
-56
lines changed

10 files changed

+76
-56
lines changed

‎app/components/mentionable-message-textbox.js‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,16 @@ import AjaxPromise from "stock/utils/ajax-promise";
55

66
let users = null;
77
let selectedUsers = [];
8-
const remoteSearch = (roles, order_id, authToken, cb) => {
8+
const remoteSearch = (
9+
{ roles, messageable_id, messageable_type, is_private },
10+
authToken,
11+
cb
12+
) => {
913
new AjaxPromise("/mentionable_users", "GET", authToken, {
1014
roles: roles.join(),
11-
order_id
15+
messageable_id,
16+
messageable_type,
17+
is_private
1218
}).then(data => {
1319
const images = data.images;
1420
users = data.users.map(user => {
@@ -57,13 +63,14 @@ export default Ember.Component.extend({
5763
Ember.$("body").css({ "overflow-x": "unset" });
5864
const _this = this;
5965
const roles = this.roles;
60-
const order_id = this.orderId;
66+
const messageable_id = this.messageableId;
67+
const messageable_type = this.messageableType;
68+
const is_private = this.isPrivate;
6169
const tribute = new Tribute({
6270
values: function(text, cb) {
6371
if (!users) {
6472
return remoteSearch(
65-
roles,
66-
order_id,
73+
{ roles, messageable_id, messageable_type, is_private },
6774
_this.get("session.authToken"),
6875
users => cb(users)
6976
);

‎app/controllers/items/detail.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ export default GoodcityController.extend(
4646
settings: Ember.inject.service(),
4747
locationService: Ember.inject.service(),
4848
settings: Ember.inject.service(),
49+
session: Ember.inject.service(),
4950
displayScanner: false,
5051
callOrderObserver: false,
5152
hideDetailsLink: true,

‎app/controllers/orders/conversation.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ export default detail.extend(MessageBase, {
1515
model: null,
1616
noMessage: Ember.computed.empty("messages"),
1717
isMentionsActive: false,
18+
messageableType: "Order",
19+
messageableId: Ember.computed(function() {
20+
return this.get("order.id");
21+
}),
1822

1923
displayChatNote: Ember.computed(
2024
"noMessage",

‎app/models/user_profile.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,10 @@ export default Addressable.extend({
5555
);
5656
}),
5757

58-
canCreateUsers: Ember.computed("roles", function() {
58+
canManageUsers: Ember.computed("roles", function() {
5959
const roles = this.get("roles");
6060
return roles.find(
61-
r =>
62-
r.get("permissionNames").indexOf("can_read_or_modify_user") >= 0 ||
63-
r.get("permissionNames").indexOf("can_create_donor") >= 0
61+
r => r.get("permissionNames").indexOf("can_read_or_modify_user") >= 0
6462
);
6563
}),
6664

‎app/styles/templates/orders/_detail.scss‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -898,3 +898,9 @@
898898
margin-left: -1.6%;
899899
}
900900
}
901+
902+
.order-options-container {
903+
display: grid;
904+
grid-template-columns: repeat(4, auto) auto;
905+
justify-content: space-evenly;
906+
}

‎app/templates/manage_users.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
</ul>
4949
{{/infinite-list}}
5050
{{else}}
51-
{{#if session.currentUser.canCreateUsers}}
51+
{{#if session.currentUser.canManageUsers}}
5252
{{#link-to "users.add_user"}}
5353
<div
5454
class="small-6 small-offset-3 medium-offset-1 medium-10 large-8 large-offset-2 columns center-text create-user-button">

‎app/templates/orders/_message_template.hbs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@
5454
setMessageContext=(action 'setMessageContext')
5555
setMentionsActive=(action 'setMentionsActive')
5656
roles=roles
57-
orderId=orderId
57+
messageableId=messageableId
58+
messageableType=messageableType
59+
isPrivate=isPrivate
5860
containerClass='message-textbar-container'}}
5961
</div>
6062
<div class="small-3 large-2 medium-2 columns">

‎app/templates/orders/_order_tabs.hbs‎

Lines changed: 44 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3,51 +3,53 @@
33
<div class="small-12 columns tab_row">
44
<dl class="tabs" data-tab>
55
{{#if model.isGoodCityOrder}}
6-
<dd class="small-3 medium-3 columns text-center {{if highlightSelectedTabSummary 'active'}}">
7-
{{#link-to 'orders.contact_summary' model.id replace=true}}
8-
<i>{{fa-icon 'id-card'}}</i>
9-
<div>{{t "order_tabs.summary"}}</div>
10-
{{/link-to}}
11-
</dd>
12-
13-
<dd class="small-2 medium-2 columns text-center
14-
{{if highlightSelectedTabGoods 'active'}}">
15-
{{#link-to 'orders.active_items' model.id replace=true}}
16-
<i class="item-menu">{{fa-icon 'shopping-basket'}}</i>
17-
<div>{{t "order_tabs.goods"}}</div>
18-
{{/link-to}}
19-
</dd>
6+
<div class="order-options-container">
7+
<dd class="text-center {{if highlightSelectedTabSummary 'active'}}">
8+
{{#link-to 'orders.contact_summary' model.id replace=true}}
9+
<i>{{fa-icon 'id-card'}}</i>
10+
<div>{{t "order_tabs.summary"}}</div>
11+
{{/link-to}}
12+
</dd>
13+
<dd class="text-center {{if highlightSelectedTabGoods 'active'}}">
14+
{{#link-to 'orders.active_items' model.id replace=true}}
15+
<i class="item-menu">{{fa-icon 'shopping-basket'}}</i>
16+
<div>{{t "order_tabs.goods"}}</div>
17+
{{/link-to}}
18+
</dd>
2019

21-
<dd class="small-3 medium-3 columns text-center {{if (is-equal tabName 'order_types') 'active'}}">
22-
{{#link-to 'orders.order_types' model.id replace=true}}
23-
<i>{{fa-icon 'truck'}}</i>
24-
<div>{{t "order_tabs.logistics"}}</div>
25-
{{/link-to}}
26-
</dd>
20+
<dd class="text-center {{if (is-equal tabName 'order_types') 'active'}}">
21+
{{#link-to 'orders.order_types' model.id replace=true}}
22+
<i>{{fa-icon 'truck'}}</i>
23+
<div>{{t "order_tabs.logistics"}}</div>
24+
{{/link-to}}
25+
</dd>
2726

28-
<dd class="small-2 medium-2 columns text-center {{if (is-equal tabName 'conversation') 'active'}}">
29-
{{#link-to 'orders.conversation' model.id replace=true disabled=model.isDraft}}
30-
{{#if model.hasUnreadUserMessages}}
31-
<div class='unread_message'>
32-
{{model.unreadUserMessagesCount}}
33-
</div>
34-
{{/if}}
35-
<i>{{fa-icon 'comments'}}</i>
36-
<div>{{t "order_tabs.user"}}</div>
37-
{{/link-to}}
38-
</dd>
27+
{{#if session.currentUser.canManageUsers}}
28+
<dd class="text-center {{if (is-equal tabName 'conversation') 'active'}}">
29+
{{#link-to 'orders.conversation' model.id replace=true disabled=model.isDraft}}
30+
{{#if model.hasUnreadUserMessages}}
31+
<div class='unread_message'>
32+
{{model.unreadUserMessagesCount}}
33+
</div>
34+
{{/if}}
35+
<i>{{fa-icon 'comments'}}</i>
36+
<div>{{t "order_tabs.user"}}</div>
37+
{{/link-to}}
38+
</dd>
39+
{{/if}}
3940

40-
<dd class="small-2 medium-2 columns text-center {{if (is-equal tabName 'staff_conversation') 'active'}}">
41-
{{#link-to 'orders.staff_conversation' model.id replace=true}}
42-
{{#if model.hasUnreadStaffMessages}}
43-
<div class='unread_message'>
44-
{{model.unreadStaffMessagesCount}}
45-
</div>
46-
{{/if}}
47-
<i>{{fa-icon 'comments'}}</i>
48-
<div>{{t "order_tabs.staff"}}</div>
49-
{{/link-to}}
50-
</dd>
41+
<dd class="text-center {{if (is-equal tabName 'staff_conversation') 'active'}}">
42+
{{#link-to 'orders.staff_conversation' model.id replace=true}}
43+
{{#if model.hasUnreadStaffMessages}}
44+
<div class='unread_message'>
45+
{{model.unreadStaffMessagesCount}}
46+
</div>
47+
{{/if}}
48+
<i>{{fa-icon 'comments'}}</i>
49+
<div>{{t "order_tabs.staff"}}</div>
50+
{{/link-to}}
51+
</dd>
52+
</div>
5153
{{else}}
5254
<dd class="small-4 medium-4 columns text-center
5355
{{if highlightSelectedTabSummary 'active'}}">

‎app/templates/users/contact_details.hbs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
</nav>
1313

1414
<section class="main-section add-user-form new-user-section ui">
15-
{{#unless session.currentUser.canCreateUsers}}
15+
{{#unless session.currentUser.canManageUsers}}
1616
<div class="row">
1717
<div class="access-error">
1818
<i>{{fa-icon 'exclamation-triangle'}}</i>
1919
<span>{{t "users.contact_details.unauthorised_error"}}</span>
2020
</div>
2121
</div>
2222
{{/unless}}
23-
<div class="{{unless session.currentUser.canCreateUsers 'disabled-form'}}">
23+
<div class="{{unless session.currentUser.canManageUsers 'disabled-form'}}">
2424
<div class="row">
2525
<div class="small-5 columns item-label">
2626
{{t 'users.image'}}

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "stock",
3-
"version": "0.21.0",
3+
"version": "0.21.1",
44
"private": true,
55
"directories": {
66
"doc": "doc",

0 commit comments

Comments
 (0)