Camp and Shop now shows data for actual season only.

2018-06-19 20:19:54 +02:00
parent b113d5fca1
commit da9b062dbb
5 changed files with 23 additions and 1 deletions
@@ -406,7 +406,10 @@ QList<VoucherPtr> ShopService::tempVouchers()

 QList<VoucherPtr> ShopService::paiedVouchers()
 {
-    return all(QString("status = %1").arg(QString::number(Voucher::PAID)));
+    SeasonService seasonSrv;
+    SeasonPtr season = seasonSrv.active();
+
+    return all(QString("status = %1 AND season = %2").arg(QString::number(Voucher::PAID), QString::number(season->id())));
 }

 QList<VoucherPtr> ShopService::vouchersForEet()