{% trans 'Home' %}
@@ -19,18 +26,53 @@
{% block content %}
{% endblock %}
-
-
diff --git a/orchestra/apps/orders/tests/__init__.py b/orchestra/apps/orders/tests/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/orchestra/apps/orders/tests/functional_tests/__init__.py b/orchestra/apps/orders/tests/functional_tests/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/orchestra/apps/orders/tests/functional_tests/tests.py b/orchestra/apps/orders/tests/functional_tests/tests.py
new file mode 100644
index 00000000..f47349c2
--- /dev/null
+++ b/orchestra/apps/orders/tests/functional_tests/tests.py
@@ -0,0 +1,109 @@
+import datetime
+
+from dateutil import relativedelta
+from django.contrib.contenttypes.models import ContentType
+from django.utils import timezone
+
+from orchestra.apps.accounts.models import Account
+from orchestra.apps.users.models import User
+from orchestra.utils.tests import BaseTestCase
+
+from ... import settings
+from ...models import Service
+
+
+class OrderTests(BaseTestCase):
+ DEPENDENCIES = (
+ 'orchestra.apps.orders',
+ 'orchestra.apps.users',
+ 'orchestra.apps.users.roles.posix',
+ )
+
+ def create_account(self):
+ account = Account.objects.create()
+ user = User.objects.create_user(username='rata_palida', account=account)
+ account.user = user
+ account.save()
+ return account
+
+ def create_service(self):
+ service = Service.objects.create(
+ description="FTP Account",
+ content_type=ContentType.objects.get_for_model(User),
+ match='not user.is_main and user.has_posix()',
+ billing_period=Service.ANUAL,
+ billing_point=Service.FIXED_DATE,
+ delayed_billing=Service.NEVER,
+ is_fee=False,
+ metric='',
+ pricing_period=Service.BILLING_PERIOD,
+ rate_algorithm=Service.BEST_PRICE,
+ orders_effect=Service.CONCURRENT,
+ on_cancel=Service.DISCOUNT,
+ payment_style=Service.PREPAY,
+ trial_period=Service.NEVER,
+ refound_period=Service.NEVER,
+ tax=21,
+ nominal_price=10,
+ )
+ service.rates.create(
+ plan='',
+ quantity=1,
+ price=9,
+ )
+ account = self.create_account()
+ user = User.objects.create_user(username='rata_palida_ftp', account=account)
+ POSIX = user._meta.get_field_by_name('posix')[0].model
+ POSIX.objects.create(user=user)
+ return service
+
+# def test_ftp_account_1_year_fiexed(self):
+# service = self.create_service()
+# bp = timezone.now().date() + relativedelta.relativedelta(years=1)
+# bills = service.orders.bill(billing_point=bp, fixed_point=True)
+# self.assertEqual(20, bills[0].get_total())
+
+ def test_ftp_account_1_year_fiexed(self):
+ service = self.create_service()
+ now = timezone.now().date()
+ month = settings.ORDERS_SERVICE_ANUAL_BILLING_MONTH
+ ini = datetime.datetime(year=now.year, month=month,
+ day=1, tzinfo=timezone.get_current_timezone())
+ order = service.orders.all()[0]
+ order.registered_on = ini
+ order.save()
+ bp = ini
+ bills = service.orders.bill(billing_point=bp, fixed_point=False, commit=False)
+ print bills[0][1][0].subtotal
+ print bills
+ bp = ini + relativedelta.relativedelta(months=12)
+ bills = service.orders.bill(billing_point=bp, fixed_point=False, commit=False)
+ print bills[0][1][0].subtotal
+ print bills
+# def test_ftp_account_2_year_fiexed(self):
+# service = self.create_service()
+# bp = timezone.now().date() + relativedelta.relativedelta(years=2)
+# bills = service.orders.bill(billing_point=bp, fixed_point=True)
+# self.assertEqual(40, bills[0].get_total())
+#
+# def test_ftp_account_6_month_fixed(self):
+# service = self.create_service()
+# bp = timezone.now().date() + relativedelta.relativedelta(months=6)
+# bills = service.orders.bill(billing_point=bp, fixed_point=True)
+# self.assertEqual(6, bills[0].get_total())
+#
+# def test_ftp_account_next_billing_point(self):
+# service = self.create_service()
+# now = timezone.now().date()
+# bp_month = settings.ORDERS_SERVICE_ANUAL_BILLING_MONTH
+# if date.month > bp_month:
+# bp = datetime.datetime(year=now.year+1, month=bp_month,
+# day=1, tzinfo=timezone.get_current_timezone())
+# else:
+# bp = datetime.datetime(year=now.year, month=bp_month,
+# day=1, tzinfo=timezone.get_current_timezone())
+#
+# days = (bp - now).days
+# bills = service.orders.bill(billing_point=bp, fixed_point=False)
+# self.assertEqual(40, bills[0].get_total())
+
diff --git a/orchestra/apps/payments/actions.py b/orchestra/apps/payments/actions.py
index 4e57bbcf..365714bc 100644
--- a/orchestra/apps/payments/actions.py
+++ b/orchestra/apps/payments/actions.py
@@ -1,5 +1,29 @@
+from django.contrib import messages
+from django.shortcuts import render
+from django.utils.translation import ugettext_lazy as _
+
from .methods import PaymentMethod
+from .models import Transaction
+
def process_transactions(modeladmin, request, queryset):
+ processes = []
+ if queryset.exclude(state=Transaction.WAITTING_PROCESSING).exists():
+ msg = _("Selected transactions must be on '{state}' state")
+ messages.error(request, msg.format(state=Transaction.WAITTING_PROCESSING))
+ return
for method, transactions in queryset.group_by('source__method'):
if method is not None:
- PaymentMethod.get_plugin(method)().process(transactions)
+ method = PaymentMethod.get_plugin(method)
+ procs = method.process(transactions)
+ processes += procs
+ if not processes:
+ return
+ opts = modeladmin.model._meta
+ context = {
+ 'title': _("Huston, be advised"),
+ 'action_name': _("Process"),
+ 'processes': processes,
+ 'opts': opts,
+ 'app_label': opts.app_label,
+ }
+ return render(request, 'admin/payments/transaction/get_processes.html', context)
diff --git a/orchestra/apps/payments/methods/options.py b/orchestra/apps/payments/methods/options.py
index 22524b73..0cc5368e 100644
--- a/orchestra/apps/payments/methods/options.py
+++ b/orchestra/apps/payments/methods/options.py
@@ -29,7 +29,7 @@ class PaymentMethod(plugins.Plugin):
return data[self.number_field]
def get_bill_message(self, source):
- raise NotImplementedError
+ return ''
class PaymentSourceDataForm(forms.ModelForm):
diff --git a/orchestra/apps/payments/methods/sepadirectdebit.py b/orchestra/apps/payments/methods/sepadirectdebit.py
index fac8873f..e243118b 100644
--- a/orchestra/apps/payments/methods/sepadirectdebit.py
+++ b/orchestra/apps/payments/methods/sepadirectdebit.py
@@ -42,7 +42,8 @@ class SEPADirectDebit(PaymentMethod):
return _("This bill will been automatically charged to your bank account "
" with IBAN number
%s.") % source.number
- def process(self, transactions):
+ @classmethod
+ def process(cls, transactions):
debts = []
credits = []
for transaction in transactions:
@@ -50,15 +51,20 @@ class SEPADirectDebit(PaymentMethod):
credits.append(transaction)
else:
debts.append(transaction)
+ processes = []
if debts:
- self._process_debts(debts)
+ proc = cls.process_debts(debts)
+ processes.append(proc)
if credits:
- self._process_credits(credits)
+ proc = cls.process_credits(credits)
+ processes.append(proc)
+ return processes
- def _process_credits(self, transactions):
+ @classmethod
+ def process_credits(cls, transactions):
from ..models import TransactionProcess
- self.process = TransactionProcess.objects.create()
- context = self.get_context(transactions)
+ process = TransactionProcess.objects.create()
+ context = cls.get_context(transactions)
sepa = lxml.builder.ElementMaker(
nsmap = {
'xsi': 'http://www.w3.org/2001/XMLSchema-instance',
@@ -67,9 +73,9 @@ class SEPADirectDebit(PaymentMethod):
)
sepa = sepa.Document(
E.CstmrCdtTrfInitn(
- self._get_header(context),
+ cls.get_header(context),
E.PmtInf( # Payment Info
- E.PmtInfId(str(self.process.id)), # Payment Id
+ E.PmtInfId(str(process.id)), # Payment Id
E.PmtMtd("TRF"), # Payment Method
E.NbOfTxs(context['num_transactions']), # Number of Transactions
E.CtrlSum(context['total']), # Control Sum
@@ -89,17 +95,19 @@ class SEPADirectDebit(PaymentMethod):
E.BIC(context['bic'])
)
),
- *list(self._get_credit_transactions(transactions)) # Transactions
+ *list(cls.get_credit_transactions(transactions, process)) # Transactions
)
)
)
- file_name = 'credit-transfer-%i.xml' % self.process.id
- self._process_xml(sepa, 'pain.001.001.03.xsd', file_name)
+ file_name = 'credit-transfer-%i.xml' % process.id
+ cls.process_xml(sepa, 'pain.001.001.03.xsd', file_name, process)
+ return process
- def _process_debts(self, transactions):
+ @classmethod
+ def process_debts(cls, transactions):
from ..models import TransactionProcess
- self.process = TransactionProcess.objects.create()
- context = self.get_context(transactions)
+ process = TransactionProcess.objects.create()
+ context = cls.get_context(transactions)
sepa = lxml.builder.ElementMaker(
nsmap = {
'xsi': 'http://www.w3.org/2001/XMLSchema-instance',
@@ -108,9 +116,9 @@ class SEPADirectDebit(PaymentMethod):
)
sepa = sepa.Document(
E.CstmrDrctDbtInitn(
- self._get_header(context),
+ cls.get_header(context, process),
E.PmtInf( # Payment Info
- E.PmtInfId(str(self.process.id)), # Payment Id
+ E.PmtInfId(str(process.id)), # Payment Id
E.PmtMtd("DD"), # Payment Method
E.NbOfTxs(context['num_transactions']), # Number of Transactions
E.CtrlSum(context['total']), # Control Sum
@@ -139,14 +147,16 @@ class SEPADirectDebit(PaymentMethod):
E.BIC(context['bic'])
)
),
- *list(self._get_debt_transactions(transactions)) # Transactions
+ *list(cls.get_debt_transactions(transactions, process)) # Transactions
)
)
)
- file_name = 'direct-debit-%i.xml' % self.process.id
- self._process_xml(sepa, 'pain.008.001.02.xsd', file_name)
+ file_name = 'direct-debit-%i.xml' % process.id
+ cls.process_xml(sepa, 'pain.008.001.02.xsd', file_name, process)
+ return process
- def get_context(self, transactions):
+ @classmethod
+ def get_context(cls, transactions):
return {
'name': settings.PAYMENTS_DD_CREDITOR_NAME,
'iban': settings.PAYMENTS_DD_CREDITOR_IBAN,
@@ -157,9 +167,10 @@ class SEPADirectDebit(PaymentMethod):
'num_transactions': str(len(transactions)),
}
- def _get_debt_transactions(self, transactions):
+ @classmethod
+ def get_debt_transactions(cls, transactions, process):
for transaction in transactions:
- transaction.process = self.process
+ transaction.process = process
account = transaction.account
data = transaction.source.data
transaction.state = transaction.WAITTING_CONFIRMATION
@@ -197,9 +208,10 @@ class SEPADirectDebit(PaymentMethod):
),
)
- def _get_credit_transactions(self, transactions):
+ @classmethod
+ def get_credit_transactions(transactions, process):
for transaction in transactions:
- transaction.process = self.process
+ transaction.process = process
account = transaction.account
data = transaction.source.data
transaction.state = transaction.WAITTING_CONFIRMATION
@@ -231,9 +243,10 @@ class SEPADirectDebit(PaymentMethod):
),
)
- def _get_header(self, context):
+ @classmethod
+ def get_header(cls, context, process):
return E.GrpHdr( # Group Header
- E.MsgId(str(self.process.id)), # Message Id
+ E.MsgId(str(process.id)), # Message Id
E.CreDtTm( # Creation Date Time
context['now'].strftime("%Y-%m-%dT%H:%M:%S")
),
@@ -251,7 +264,8 @@ class SEPADirectDebit(PaymentMethod):
)
)
- def _process_xml(self, sepa, xsd, file_name):
+ @classmethod
+ def process_xml(cls, sepa, xsd, file_name, process):
# http://www.iso20022.org/documents/messages/1_0_version/pain/schemas/pain.008.001.02.zip
path = os.path.dirname(os.path.realpath(__file__))
xsd_path = os.path.join(path, xsd)
@@ -259,9 +273,9 @@ class SEPADirectDebit(PaymentMethod):
schema = etree.XMLSchema(schema_doc)
sepa = etree.parse(StringIO(etree.tostring(sepa)))
schema.assertValid(sepa)
- self.process.file = file_name
- self.process.save()
- sepa.write(self.process.file.path,
+ process.file = file_name
+ process.save()
+ sepa.write(process.file.path,
pretty_print=True,
xml_declaration=True,
encoding='UTF-8')
diff --git a/orchestra/apps/payments/templates/admin/payments/transaction/get_processes.html b/orchestra/apps/payments/templates/admin/payments/transaction/get_processes.html
new file mode 100644
index 00000000..dff04aef
--- /dev/null
+++ b/orchestra/apps/payments/templates/admin/payments/transaction/get_processes.html
@@ -0,0 +1,18 @@
+{% extends "admin/orchestra/generic_confirmation.html" %}
+{% load i18n admin_urls utils %}
+
+{% block content %}
+
The following transaction processes have been generated, you may want to save them on your computer now.
+
+ {% for proc in processes %}
+ - Process #{{ proc.id }}
+ {% if proc.file %}
+
+ {% endif %}
+ {% if proc.data %}
+
+ {% endif %}
+
+ {% endfor %}
+
+{% endblock %}
diff --git a/orchestra/apps/resources/admin.py b/orchestra/apps/resources/admin.py
index 8da3f17b..84b6a747 100644
--- a/orchestra/apps/resources/admin.py
+++ b/orchestra/apps/resources/admin.py
@@ -70,6 +70,10 @@ class ResourceDataAdmin(admin.ModelAdmin):
readonly_fields = ('content_object_link',)
content_object_link = admin_link('content_object')
+
+ def get_queryset(self, request):
+ queryset = super(ResourceDataAdmin, self).get_queryset(request)
+ return queryset.prefetch_related('content_object')
class MonitorDataAdmin(admin.ModelAdmin):
@@ -78,6 +82,10 @@ class MonitorDataAdmin(admin.ModelAdmin):
readonly_fields = ('content_object_link',)
content_object_link = admin_link('content_object')
+
+ def get_queryset(self, request):
+ queryset = super(MonitorDataAdmin, self).get_queryset(request)
+ return queryset.prefetch_related('content_object')
admin.site.register(Resource, ResourceAdmin)
diff --git a/orchestra/apps/users/forms.py b/orchestra/apps/users/forms.py
index a4d3c9c2..42c52ac5 100644
--- a/orchestra/apps/users/forms.py
+++ b/orchestra/apps/users/forms.py
@@ -47,4 +47,3 @@ class UserChangeForm(forms.ModelForm):
# This is done here, rather than on the field, because the
# field does not have access to the initial value
return self.initial["password"]
-
diff --git a/orchestra/apps/users/models.py b/orchestra/apps/users/models.py
index 41a1b886..ea301ae8 100644
--- a/orchestra/apps/users/models.py
+++ b/orchestra/apps/users/models.py
@@ -14,7 +14,7 @@ class User(auth.AbstractBaseUser):
validators=[validators.RegexValidator(r'^[\w.-]+$',
_("Enter a valid username."), 'invalid')])
account = models.ForeignKey('accounts.Account', verbose_name=_("Account"),
- related_name='users', null=True)
+ related_name='users')
first_name = models.CharField(_("first name"), max_length=30, blank=True)
last_name = models.CharField(_("last name"), max_length=30, blank=True)
email = models.EmailField(_('email address'), blank=True)
diff --git a/orchestra/apps/users/roles/__init__.py b/orchestra/apps/users/roles/__init__.py
index b27353d3..0afb6556 100644
--- a/orchestra/apps/users/roles/__init__.py
+++ b/orchestra/apps/users/roles/__init__.py
@@ -13,10 +13,10 @@ class Register(object):
def register(self, name, model):
if name in self._registry:
raise KeyError("%s already registered" % name)
- def has_role(user):
+ def has_role(user, model=model):
try:
getattr(user, name)
- except models.DoesNotExist:
+ except model.DoesNotExist:
return False
return True
setattr(User, 'has_%s' % name, has_role)
diff --git a/orchestra/conf/base_settings.py b/orchestra/conf/base_settings.py
index 85625931..f3e52dc4 100644
--- a/orchestra/conf/base_settings.py
+++ b/orchestra/conf/base_settings.py
@@ -144,7 +144,7 @@ FLUENT_DASHBOARD_APP_GROUPS = (
'orchestra.apps.contacts.models.Contact',
'orchestra.apps.users.models.User',
'orchestra.apps.orders.models.Order',
- 'orchestra.apps.orders.models.Pack',
+ 'orchestra.apps.orders.models.Plan',
'orchestra.apps.bills.models.Bill',
# 'orchestra.apps.payments.models.PaymentSource',
'orchestra.apps.payments.models.Transaction',
diff --git a/orchestra/templates/admin/orchestra/generic_confirmation.html b/orchestra/templates/admin/orchestra/generic_confirmation.html
new file mode 100644
index 00000000..00cb6f2d
--- /dev/null
+++ b/orchestra/templates/admin/orchestra/generic_confirmation.html
@@ -0,0 +1,67 @@
+{% extends "admin/base_site.html" %}
+{% load i18n l10n %}
+{% load url from future %}
+{% load admin_urls static utils %}
+
+{% block extrastyle %}
+{{ block.super }}
+
+
+{% endblock %}
+
+{% block breadcrumbs %}
+
+{% endblock %}
+
+{% block content %}
+
+
+
{{ content_message | safe }}
+
+
+{% endblock %}
+
diff --git a/orchestra/templatetags/utils.py b/orchestra/templatetags/utils.py
index da485c06..e71196fd 100644
--- a/orchestra/templatetags/utils.py
+++ b/orchestra/templatetags/utils.py
@@ -3,6 +3,7 @@ from django.core.urlresolvers import reverse, NoReverseMatch
from django.forms import CheckboxInput
from orchestra import get_version
+from orchestra.admin.utils import admin_change_url
register = template.Library()
@@ -41,6 +42,11 @@ def size(value, length):
return str(value) + (' '*num_spaces)
-@register.filter(name='is_checkbox')
+@register.filter
def is_checkbox(field):
return isinstance(field.field.widget, CheckboxInput)
+
+
+@register.filter
+def admin_link(obj):
+ return admin_change_url(obj)
diff --git a/orchestra/utils/python.py b/orchestra/utils/python.py
index c963918d..54fdcd30 100644
--- a/orchestra/utils/python.py
+++ b/orchestra/utils/python.py
@@ -65,3 +65,8 @@ class OrderedSet(collections.MutableSet):
return len(self) == len(other) and list(self) == list(other)
return set(self) == set(other)
+
+class AttributeDict(dict):
+ def __init__(self, *args, **kwargs):
+ super(AttributeDict, self).__init__(*args, **kwargs)
+ self.__dict__ = self
diff --git a/orchestra/utils/tests.py b/orchestra/utils/tests.py
index 87112a27..ed62399f 100644
--- a/orchestra/utils/tests.py
+++ b/orchestra/utils/tests.py
@@ -76,8 +76,9 @@ class BaseLiveServerTestCase(AppDependencyMixin, LiveServerTestCase):
self.account = Account.objects.create(name='orchestra')
self.username = 'orchestra'
self.password = 'orchestra'
- self.user = User.objects.create_superuser(username='orchestra', password='orchestra',
- email='orchestra@orchestra.org', account=self.account)
+ self.user = User.objects.create_superuser(username='orchestra',
+ password='orchestra', email='orchestra@orchestra.org',
+ account=self.account)
def admin_login(self):
session = SessionStore()