refund

src/main/java/net/collaud/fablab/manager/data/type/HistoryEntryType.java

@@ -8,5 +8,6 @@ public enum HistoryEntryType {
 
 	PAYMENT,
 	USAGE,
-	SUBSCRIPTION
+	SUBSCRIPTION,
+	REFUND
 }

src/main/java/net/collaud/fablab/manager/data/virtual/HistoryEntry.java

@@ -7,7 +7,6 @@
 import net.collaud.fablab.manager.data.PaymentEO;
 import net.collaud.fablab.manager.data.SubscriptionEO;
 import net.collaud.fablab.manager.data.UsageEO;
-import net.collaud.fablab.manager.data.UserEO;
 import net.collaud.fablab.manager.data.type.HistoryEntryType;
 import net.collaud.fablab.manager.export.CsvExport;
 import net.collaud.fablab.manager.export.CsvField;
@@ -37,7 +36,7 @@ public class HistoryEntry implements Comparable<HistoryEntry> {
 	private final HistoryEntryUser user;
 
 	public HistoryEntry(PaymentEO payment) {
-		type = HistoryEntryType.PAYMENT;
+		type = payment.getTotal()>0 ? HistoryEntryType.PAYMENT : HistoryEntryType.REFUND;
 		id = payment.getId();
 		date = payment.getDatePayment();
 		comment = payment.getComment();

src/main/webapp/components/accounting/accounting-list-view.html

@@ -66,7 +66,7 @@ <h1 translate="accounting.title"></h1>
 			<tr ng-repeat="h in history"
 				ng-class="{
 					'bg-warning':h.type==='USAGE',
-					'bg-success':h.type==='PAYMENT',
+					'bg-success':(h.type==='PAYMENT'||h.type=='REFUND'),
 					'bg-info':h.type==='SUBSCRIPTION'
 				}">
 				<td>{{h.date|formatTimestamp:'DD.MM.YYYY'}}</td>

src/main/webapp/components/payment/directive-add-payment.html

@@ -1,6 +1,6 @@
 <form name="formAddPayment" class="form-horizontal" ng-submit="execute()">
 	<div class="panel panel-default">
-		<div class="panel-heading" translate="payment.paymentTitle">
+		<div class="panel-heading" translate="{{addPayment.amount<0 ? 'payment.refundTitle' : 'payment.paymentTitle'}}">
 		</div>
 		<div class="panel-body">
 			<div class="form-group">
@@ -33,7 +33,7 @@
 		<div class="panel-footer text-right">
 					<button type="submit" class="btn btn-default"
 							ng-disabled="formAddPayment.$invalid"
-							translate="payment.addPayment"></button>
+							translate="{{addPayment.amount<0 ? 'payment.addRefund' : 'payment.addPayment'}}"></button>
 		</div>
 	</div>
 </form>

src/main/webapp/components/payment/directive-user-payment-history.html

@@ -18,8 +18,8 @@
 			<tbody>
 				<tr ng-repeat="h in history"
 					ng-class="{'info' : h.type === 'SUBSCRIPTION',
-							'success' : h.type === 'PAYMENT',
-						'warning':h.type === 'USAGE'}">
+							'success' : (h.type === 'PAYMENT'||h.type === 'REFUND'),
+							'warning': h.type === 'USAGE'}">
 					<td>{{h.date|formatTimestamp}}</td>
 					<td>{{h.amount|currency}}</td>
 					<td>{{h.detail}}</td>

src/main/webapp/i18n/en.js

@@ -134,6 +134,7 @@ angular.module('Fablab').config(function ($translateProvider) {
 			userTitle: 'User',
 			usageTitle: 'Add an usage',
 			paymentTitle: 'Add a payment',
+			refundTitle: 'Add a refund',
 			subscriptionTitle:'Subscription',
 			enterName: 'Enter a name',
 			machine: 'Machine',
@@ -147,6 +148,7 @@ angular.module('Fablab').config(function ($translateProvider) {
 			startDate:'Start date',
 			paymentDate:'Payment date',
 			addPayment: 'Add payment',
+			addRefund: 'Add refund',
 			addUsage: 'Add usage',
 			addSubscription: 'Add subscription',
 			details: 'Details',