From 33a1699fceb1dd49801a88e633fd9e3dc7a7e6cd Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Mon, 18 Aug 2014 17:35:03 -0400 Subject: [PATCH] Minor enjin tweak. Reverted to nullable gem column because sql db wants to take forever converting. --- .../src/mineplex/enjinTranslator/Enjin.java | 2 +- .../LOC.Core/Model/Sales/GemTransaction.cs | 2 +- .../LOC.Website.Web.Publish.xml | 12 ++++++------ Website/LOCWebsite.suo | Bin 474624 -> 474624 bytes 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/Enjin.java b/Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/Enjin.java index 4b0b139e8..f906ac9e6 100644 --- a/Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/Enjin.java +++ b/Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/Enjin.java @@ -88,7 +88,7 @@ public class Enjin extends MiniPlugin implements CommandExecutor String name = args[1]; int amount = Integer.parseInt(args[2]); - _donationManager.PurchaseUnknownSalesPackage(null, name, "Gem Booster", false, 0, false); + _donationManager.PurchaseUnknownSalesPackage(null, name, "Gem Booster " + amount, false, 0, false); _repository.addGemBooster(name, amount); System.out.println("[" + _dateFormat.format(new Date()) + "] " + name + " received " + amount + " Gem Boosters" + "."); } diff --git a/Website/LOC.Core/Model/Sales/GemTransaction.cs b/Website/LOC.Core/Model/Sales/GemTransaction.cs index 7be893c7e..8372b195d 100644 --- a/Website/LOC.Core/Model/Sales/GemTransaction.cs +++ b/Website/LOC.Core/Model/Sales/GemTransaction.cs @@ -6,7 +6,7 @@ public Account.Account Account { get; set; } - public long Date { get; set; } + public long? Date { get; set; } public string Source { get; set; } diff --git a/Website/LOC.Website.Web/LOC.Website.Web.Publish.xml b/Website/LOC.Website.Web/LOC.Website.Web.Publish.xml index cc154fa82..9b78888fc 100644 --- a/Website/LOC.Website.Web/LOC.Website.Web.Publish.xml +++ b/Website/LOC.Website.Web/LOC.Website.Web.Publish.xml @@ -614,7 +614,7 @@ - + @@ -622,8 +622,8 @@ - - + + @@ -696,9 +696,9 @@ - + - + @@ -748,7 +748,7 @@ - + diff --git a/Website/LOCWebsite.suo b/Website/LOCWebsite.suo index f6e2c37e31ab6d3ac2952a4a38fb62f60bf78db7..baf4e023c2bc79ecf4917debb8f79a74dafa20b2 100644 GIT binary patch delta 388 zcmZqpBh&ClW`xbX5AZFga#ht~kg8i8$0|N`g_UR7~u+&eNI>cf*{lNj2U5wYJ_kChZp5CyW zRekz_Uu^8tH!NdipT6KFi~aQALo6p4ku+@oe3->VdHM!HHXcrPpd&!Q1#HUn`e$rP ljGWsgU$ER^6ubqI0+K=p9s)_j_UA8IfS7gr^OtOrApo=>i6;O6 delta 409 zcmZqpBh&ClWw%fqcx5&hvRvZgWc&{V{0s~X(;1zZG$xnu`%iX`Hr)J${{qYO zBR)(fOx#+Ne~EZ| zp|kxW3|FVhEpOrxjrlw>wBhM6(ep#-vzD-kBuIdW*+WU{M=;MYj zYbRgiQfS}e&IH8F+qby0_*Jm8YB4adFkGA7_lYfedc$&7_2~zGv9V9zu#A;`y2v3G z`{@S{uYQyOBS)|8wA;S7}>Y~dd_l(vHj~y79eKb{`DmrcL)H{GL@|W