Skip to content
This repository was archived by the owner on May 16, 2019. It is now read-only.

Commit 6266fa1

Browse files
committed
Changes logic to handle both upper and lower case on all dispute messages from the server.
- this was already done in some cases, now it's done everywhere - TODO: investigate if the previous instances of handling upper and lower cases were because the server was inconsistent. If that's the case, the server should be updated to always use the same case.
1 parent 24022b6 commit 6266fa1

File tree

3 files changed

+33
-33
lines changed

3 files changed

+33
-33
lines changed

js/templates/notification.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<%= polyglot.t('NotificationOrderConfirmed') %>
1414
</div>
1515
<div class="textSize11px floatLeft txt-fade"><%= ob.moment(new Date(ob.timestamp*1000)).locale(window.lang).format('MMM D, h:mm A') %></div>
16-
<% } else if(ob.type == "dispute_close") { %>
16+
<% } else if(ob.type == "DISPUTE_CLOSE" || ob.type == "dispute_close") { %>
1717
<div class="textSize12px row5">
1818
<% if(ob.handle) { %>
1919
<%= polyglot.t('NotificationDisputeClosed',{name: ob.handle}) %>
@@ -24,7 +24,7 @@
2424
<% } %>
2525
</div>
2626
<div class="textSize11px floatLeft txt-fade"><%= ob.moment(new Date(ob.timestamp*1000)).locale(window.lang).format('MMM D, h:mm A') %></div>
27-
<% } else if(ob.type == "dispute_open") { %>
27+
<% } else if(ob.type == "DISPUTE_OPEN" || ob.type == "dispute_open") { %>
2828
<div class="textSize12px row5">
2929
<% if(ob.handle) { %>
3030
<%= polyglot.t('NotificationDispute',{name:ob.handle}) %>

js/views/notificationVw.js

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -19,34 +19,34 @@ module.exports = baseVw.extend({
1919
},
2020

2121
notificationClick: function() {
22-
switch (this.model.get('type')) {
23-
case "follow":
24-
Backbone.history.navigate('#userPage/'+ this.model.get('guid') + '/store', {trigger: true});
25-
break;
26-
case "new order":
27-
Backbone.history.navigate('#transactions/sales/' + this.model.get('order_id'), {trigger: true});
28-
break;
29-
case "dispute_open":
30-
Backbone.history.navigate('#transactions/purchases/' + this.model.get('order_id'), {trigger: true});
31-
break;
32-
case "dispute_close":
33-
Backbone.history.navigate('#transactions/purchases/' + this.model.get('order_id'), {trigger: true});
34-
break;
35-
case "refund":
36-
Backbone.history.navigate('#transactions/purchases/' + this.model.get('order_id'), {trigger: true});
37-
break;
38-
case "payment received":
39-
Backbone.history.navigate('#transactions/purchases/' + this.model.get('order_id'), {trigger: true});
40-
break;
41-
case "order confirmation":
42-
Backbone.history.navigate('#transactions/purchases/' + this.model.get('order_id'), {trigger: true});
43-
break;
44-
case "rating received":
45-
Backbone.history.navigate('#transactions/sales/' + this.model.get('order_id'), {trigger: true});
46-
break;
47-
case "ORDER":
48-
Backbone.history.navigate('#transactions/sales/' + this.model.get('subject') +'/discussion', {trigger: true});
49-
break;
22+
switch (this.model.get('type').toLowerCase()) {
23+
case "follow":
24+
Backbone.history.navigate('#userPage/'+ this.model.get('guid') + '/store', {trigger: true});
25+
break;
26+
case "new order":
27+
Backbone.history.navigate('#transactions/sales/' + this.model.get('order_id'), {trigger: true});
28+
break;
29+
case "dispute_open":
30+
Backbone.history.navigate('#transactions/purchases/' + this.model.get('order_id'), {trigger: true});
31+
break;
32+
case "dispute_close":
33+
Backbone.history.navigate('#transactions/purchases/' + this.model.get('order_id'), {trigger: true});
34+
break;
35+
case "refund":
36+
Backbone.history.navigate('#transactions/purchases/' + this.model.get('order_id'), {trigger: true});
37+
break;
38+
case "payment received":
39+
Backbone.history.navigate('#transactions/purchases/' + this.model.get('order_id'), {trigger: true});
40+
break;
41+
case "order confirmation":
42+
Backbone.history.navigate('#transactions/purchases/' + this.model.get('order_id'), {trigger: true});
43+
break;
44+
case "rating received":
45+
Backbone.history.navigate('#transactions/sales/' + this.model.get('order_id'), {trigger: true});
46+
break;
47+
case "order":
48+
Backbone.history.navigate('#transactions/sales/' + this.model.get('subject') +'/discussion', {trigger: true});
49+
break;
5050
}
5151

5252
this.trigger('notification-click', { view: this });
@@ -61,4 +61,4 @@ module.exports = baseVw.extend({
6161

6262
return this;
6363
}
64-
});
64+
});

js/views/pageNavVw.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ module.exports = baseVw.extend({
246246
})
247247
);
248248

249-
switch (notif.type) {
249+
switch (notif.type.toLowerCase()) {
250250
case "follow":
251251
new Notification(window.polyglot.t('NotificationFollow', {name: username}), {
252252
icon: avatar,
@@ -289,7 +289,7 @@ module.exports = baseVw.extend({
289289
silent: true
290290
});
291291
break;
292-
case "ORDER":
292+
case "order":
293293
new Notification(window.polyglot.t('NotificationNewTransactionMessage', {name: username}), {
294294
icon: avatar,
295295
silent: true

0 commit comments

Comments
 (0)