Adds external user sale

main/forms.py

@@ -1,6 +1,5 @@
 # coding: utf-8
 from django import forms
-from django.contrib.auth.models import User
 from django.utils.translation import ugettext as _
 
 from models import *
@@ -9,9 +8,20 @@ import utils
 
 
 class OrderForm(forms.ModelForm):
+    customer_name = forms.CharField(required=False)
+
+    def clean(self):
+        if self.cleaned_data['customer'] is None and self.cleaned_data['customer_name'] != u"Ekstern":
+            raise forms.ValidationError(_(u"Du har ikke valgt hvem som skal kjøpe."))
+
+        return self.cleaned_data
+
     def clean_customer(self):
+        if self.cleaned_data['customer'] is None:
+            return self.cleaned_data['customer']
+
         if self.cleaned_data['customer'].get_profile().balance <= 0:
-            raise forms.ValidationError(_("Du har negativ saldo og kan ikke kjøpe noe."))
+            raise forms.ValidationError(_(u"Du har negativ saldo og kan ikke kjøpe noe."))
 
         return self.cleaned_data['customer']
 
@@ -23,7 +33,8 @@ class OrderForm(forms.ModelForm):
 class OrderLineForm(forms.Form):
     product = forms.IntegerField(required=True)
     amount = forms.IntegerField(required=True)
-    unit_price = forms.FloatField(required=True, localize=True)
+    unit_price_int = forms.FloatField(required=True, localize=True)
+    unit_price_ext = forms.FloatField(required=True, localize=True)
 
 
 class DepositForm(forms.ModelForm):
@@ -38,10 +49,10 @@ class SimpleCreateUserForm(forms.Form):
     email = forms.EmailField(required=True, label="E-post")
     facebook_username = forms.CharField(required=False, label="Facebook-brukernavn")
 
-    def _get_facebook_url(self, facebook_username):
-        if facebook_username == "":
+    def _get_facebook_url(self):
+        if self.cleaned_data['facebook_username'] == "":
             return ""
-        return "https://graph.facebook.com/{0}/picture".format(facebook_username)
+        return "https://graph.facebook.com/{0}/picture".format(self.cleaned_data['facebook_username'])
 
     def save(self, commit=True):   
         username = utils.format_username(self.cleaned_data['first_name'], self.cleaned_data['last_name'])
@@ -50,7 +61,7 @@ class SimpleCreateUserForm(forms.Form):
         user.last_name = self.cleaned_data['last_name']
 
         profile = user.get_profile()
-        profile.image = self._get_facebook_url(self.cleaned_data['facebook_username'])
+        profile.image = self._get_facebook_url()
 
         if commit:
             user.save()
@@ -64,7 +75,7 @@ class InventoryTransactionForm(forms.ModelForm):
 
     def __init__(self, *args, **kwargs):
         # Only show active products
-        super (InventoryTransactionForm, self).__init__(*args,**kwargs)
+        super(InventoryTransactionForm, self).__init__(*args, **kwargs)
         self.fields['product'].queryset = Product.objects.filter(active=True)    
 
     class Meta:
@@ -75,4 +86,3 @@ class InventoryTransactionForm(forms.ModelForm):
 class DateRangeForm(forms.Form):
     start_time = forms.DateTimeField(required=False, label=_("Fra"))
     end_time = forms.DateTimeField(required=False, label=_("Til"))
-