Merge branch 'issue-33' into 'staging'

Fixed #33

See merge request !21

src/server/components/extensions/factionVendor.js

@@ -140,8 +140,13 @@ define([
 			}
 		},
 
-		canBuy: function(itemId, requestedBy) {
-			var item = this.findItem(itemId, requestedBy.name);
+		canBuy: function(itemId, requestedBy, action) {
+			var item = null;
+			if (action == 'buy')
+				item = this.findItem(itemId, requestedBy.name);
+			else if (action == 'buyback')
+				item = this.findBuyback(itemId, requestedBy.name);
+			
 			var result = requestedBy.reputation.canEquipItem(item);
 
 			if (!result) {

src/server/components/trade.js

@@ -134,7 +134,7 @@ define([
 				return;
 			}
 
-			if (!targetTrade.canBuy(msg.itemId, this.obj)) {
+			if (!targetTrade.canBuy(msg.itemId, this.obj, msg.action)) {
 				this.resolveCallback(msg);
 				return;
 			}
@@ -262,7 +262,7 @@ define([
 			return this.items;
 		},
 
-		canBuy: function(itemId, requestedBy) {
+		canBuy: function(itemId, requestedBy, action) {
 			return true;
 		},