mirror of
https://github.com/nanoy42/coope
synced 2024-11-22 03:13:12 +00:00
Add use_stocks field
This commit is contained in:
parent
cb449ee414
commit
5a1ae12f6c
6 changed files with 61 additions and 18 deletions
|
|
@ -59,10 +59,10 @@ class ProductAdmin(SimpleHistoryAdmin):
|
|||
"""
|
||||
The admin class for :class:`Products <gestion.models.Product>`.
|
||||
"""
|
||||
list_display = ('name', 'amount', 'is_active', 'category', 'adherentRequired', 'stock', 'volume', 'deg')
|
||||
list_display = ('name', 'amount', 'is_active', 'category', 'adherentRequired', 'stock', 'volume', 'deg', 'use_stocks')
|
||||
ordering = ('name', 'amount', 'stock', 'deg')
|
||||
search_fields = ('name',)
|
||||
list_filter = ('is_active', 'adherentRequired', 'category')
|
||||
list_filter = ('is_active', 'adherentRequired', 'category', 'use_stocks')
|
||||
|
||||
class ReloadAdmin(SimpleHistoryAdmin):
|
||||
"""
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ class KegForm(forms.ModelForm):
|
|||
|
||||
category = forms.ModelChoiceField(queryset=Category.objects.all(), label="Catégorie")
|
||||
deg = forms.DecimalField(max_digits=5, decimal_places=2, label="Degré", validators=[MinValueValidator(0)])
|
||||
create_galopin = forms.BooleanField(label="Créer le produit galopin ?")
|
||||
create_galopin = forms.BooleanField(required=False, label="Créer le produit galopin ?")
|
||||
|
||||
def clean(self):
|
||||
cleaned_data = super().clean()
|
||||
|
|
|
|||
|
|
@ -27,6 +27,13 @@ class Category(models.Model):
|
|||
"""
|
||||
return self.product_set.filter(is_active=True)
|
||||
|
||||
@property
|
||||
def active_stock_products(self):
|
||||
"""
|
||||
Return active products that use stocks
|
||||
"""
|
||||
return self.product_set.filter(is_active=True).filter(use_stocks=True)
|
||||
|
||||
class Product(models.Model):
|
||||
"""
|
||||
Stores a product.
|
||||
|
|
@ -87,6 +94,7 @@ class Product(models.Model):
|
|||
On the graphs on :func:`users.views.profile` view, the number of total consumptions is divised by the showingMultiplier
|
||||
"""
|
||||
draft_category = models.IntegerField(choices=DRAFT_TYPES, default=DRAFT_NONE, verbose_name="Type de pression")
|
||||
use_stocks = models.BooleanField(default=True, verbose_name="Utiliser les stocks ?")
|
||||
history = HistoricalRecords()
|
||||
|
||||
def __str__(self):
|
||||
|
|
|
|||
|
|
@ -19,5 +19,6 @@
|
|||
<strong>Actif</strong> : {{ product.is_active | yesno:"Oui, Non"}}<br>
|
||||
<strong>Dégré</strong> : {{ product.deg }}<br>
|
||||
<strong>Volume</strong> : {{ product.volume }}cl<br>
|
||||
<strong>Utiliser les stocks</strong> : {{product.use_stocks|yesno:"Oui,Non"}}<br>
|
||||
</section>
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for product in category.active_products %}
|
||||
{% for product in category.active_stock_products %}
|
||||
<tr id="tr-{{product.pk}}">
|
||||
<td><a href="{% url 'gestion:productProfile' product.pk %}">{{ product.name }}</a></td>
|
||||
<td id="stock-{{product.pk}}">{{ product.stock }}</td>
|
||||
|
|
|
|||
|
|
@ -160,7 +160,7 @@ def order(request):
|
|||
kegHistory.quantitySold += Decimal(quantity * 0.125)
|
||||
kegHistory.amountSold += Decimal(quantity * product.amount)
|
||||
kegHistory.save()
|
||||
else:
|
||||
if product.use_stocks:
|
||||
if(product.stock > quantity):
|
||||
product.stock -= quantity
|
||||
product.save()
|
||||
|
|
@ -197,6 +197,31 @@ def order(request):
|
|||
consumption, _ = Consumption.objects.get_or_create(customer=user, product=article)
|
||||
consumption.quantity += quantity
|
||||
consumption.save()
|
||||
if(article.draft_category == Product.DRAFT_PINTE):
|
||||
keg = get_object_or_404(Keg, pinte=article)
|
||||
if(not keg.is_active):
|
||||
raise Exception("Fût non actif")
|
||||
kegHistory = get_object_or_404(KegHistory, keg=keg, isCurrentKegHistory=True)
|
||||
kegHistory.quantitySold += Decimal(quantity * 0.5)
|
||||
kegHistory.amountSold += Decimal(quantity * product.amount)
|
||||
kegHistory.save()
|
||||
elif(article.draft_category == Product.DRAFT_DEMI):
|
||||
keg = get_object_or_404(Keg, demi=article)
|
||||
if(not keg.is_active):
|
||||
raise Exception("Fût non actif")
|
||||
kegHistory = get_object_or_404(KegHistory, keg=keg, isCurrentKegHistory=True)
|
||||
kegHistory.quantitySold += Decimal(quantity * 0.25)
|
||||
kegHistory.amountSold += Decimal(quantity * product.amount)
|
||||
kegHistory.save()
|
||||
elif(article.draft_category == Product.DRAFT_GALOPIN):
|
||||
keg = get_object_or_404(Keg, galopin=article)
|
||||
if(not keg.is_active):
|
||||
raise Exception("Fût non actif")
|
||||
kegHistory = get_object_or_404(KegHistory, keg=keg, isCurrentKegHistory=True)
|
||||
kegHistory.quantitySold += Decimal(quantity * 0.125)
|
||||
kegHistory.amountSold += Decimal(quantity * product.amount)
|
||||
kegHistory.save()
|
||||
if article.use_stocks:
|
||||
if(article.stock > quantity):
|
||||
article.stock -= quantity
|
||||
article.save()
|
||||
|
|
@ -296,6 +321,7 @@ def cancel_consumption(request, pk):
|
|||
consumptionT = Consumption.objects.get(customer=user, product=consumption.product)
|
||||
consumptionT.quantity -= consumption.quantity
|
||||
consumptionT.save()
|
||||
if product.use_stocks:
|
||||
product.stock += consumption.quantity
|
||||
product.save()
|
||||
consumption.delete()
|
||||
|
|
@ -467,6 +493,7 @@ class ActiveProductsAutocomplete(autocomplete.Select2QuerySetView):
|
|||
def update_stock(request, pk):
|
||||
product = get_object_or_404(Product, pk=pk)
|
||||
if("stock" in request.GET):
|
||||
if product.use_stocks:
|
||||
product.stock = request.GET.get("stock")
|
||||
product.save()
|
||||
return HttpResponse("Le stock a bien été mis à jour")
|
||||
|
|
@ -492,8 +519,12 @@ def addKeg(request):
|
|||
"""
|
||||
form = KegForm(request.POST or None)
|
||||
if form.is_valid():
|
||||
try:
|
||||
price_profile = PriceProfile.objects.get(use_for_draft=True)
|
||||
except:
|
||||
messages.error(request, "Il n'y a pas de profil de prix pour les pressions")
|
||||
return redirect(reverse('preferences:priceProfilesIndex'))
|
||||
keg = form.save(commit=False)
|
||||
price_profile = get_object_or_404(PriceProfile, use_for_draft=True)
|
||||
pinte_price = compute_price(form.cleaned_data["amount"]/(2*form.cleaned_data["capacity"]), price_profile.a, price_profile.b, price_profile.c, price_profile.alpha)
|
||||
pinte_price = ceil(10*pinte_price)/10
|
||||
name = form.cleaned_data["name"][4:]
|
||||
|
|
@ -509,7 +540,8 @@ def addKeg(request):
|
|||
deg = form.cleaned_data["deg"],
|
||||
adherentRequired = True,
|
||||
showingMultiplier = 1,
|
||||
draft_category = Product.DRAFT_PINTE
|
||||
draft_category = Product.DRAFT_PINTE,
|
||||
use_stocks=False,
|
||||
)
|
||||
pinte.save()
|
||||
keg.pinte = pinte
|
||||
|
|
@ -524,7 +556,8 @@ def addKeg(request):
|
|||
deg = form.cleaned_data["deg"],
|
||||
adherentRequired = True,
|
||||
showingMultiplier = 1,
|
||||
draft_category = Product.DRAFT_DEMI
|
||||
draft_category = Product.DRAFT_DEMI,
|
||||
use_stocks=False,
|
||||
)
|
||||
demi.save()
|
||||
keg.demi = demi
|
||||
|
|
@ -540,7 +573,8 @@ def addKeg(request):
|
|||
deg = form.cleaned_data["deg"],
|
||||
adherentRequired = True,
|
||||
showingMultiplier = 1,
|
||||
draft_category = Product.DRAFT_DEMI
|
||||
draft_category = Product.DRAFT_DEMI,
|
||||
use_stocks=False,
|
||||
)
|
||||
galopin.save()
|
||||
keg.galopin = galopin
|
||||
|
|
|
|||
Loading…
Reference in a new issue