diff --git a/pos/templates/pos/addition.html b/pos/templates/pos/addition.html index 545f040..683f495 100644 --- a/pos/templates/pos/addition.html +++ b/pos/templates/pos/addition.html @@ -9,6 +9,12 @@ Payment failed. Cash register now contains: {{ currency }}{{ cash.amount }} +{% endif %} +{% if stock_error %} + {% endif %} @@ -32,7 +38,7 @@ {% endfor %} {% endif %} - + diff --git a/pos/templates/pos/order.html b/pos/templates/pos/order.html index b4d3920..fce4e84 100644 --- a/pos/templates/pos/order.html +++ b/pos/templates/pos/order.html @@ -62,6 +62,9 @@ Reset Cash +
  • + View Stock +
    • {% endif %}
  • Admin @@ -123,6 +126,7 @@ } function removeProduct(product) { + console.log("remove " + product); $('#additiondiv').load("{%url 'order_remove_product' '' %}" + encodeURIComponent(product)); } diff --git a/pos/templates/pos/stock.html b/pos/templates/pos/stock.html new file mode 100644 index 0000000..e0b6d1d --- /dev/null +++ b/pos/templates/pos/stock.html @@ -0,0 +1,81 @@ + + + + + Order id {{ order.id }} from {{ order.last_change }} + + {% load static %} + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    +
    +

    {{ company }}

    +
    +
    +
    +
    +

    + +

    +
    +
    +
    +
    +
    • TotalTotal {{ currency }}{{ total_price }}
    + + + + + + + + {% if list %} + {% for product in list %} + + + + + {% endfor %} + {% endif %} + +
    NameStock
    {{ product.name }}{{ product.stock }}
    + + + + + diff --git a/pos/urls.py b/pos/urls.py index beced0e..af9e129 100644 --- a/pos/urls.py +++ b/pos/urls.py @@ -20,5 +20,6 @@ url(r'^print-order/(?P[0-9]+)/?$', views.print_order, name='print_order'), url(r'^print-current-order/?$', views.print_current_order, - name='print_current_order') + name='print_current_order'), + url(r'^stock/?$', views.view_stock, name='view_stock') ] diff --git a/pos/views.py b/pos/views.py index 180fac0..aa84dca 100644 --- a/pos/views.py +++ b/pos/views.py @@ -45,6 +45,24 @@ def order(request): return render(request, 'pos/order.html', context=context) +def _addition_no_stock(request): + cash, current_order, currency = helper.setup_handling(request) + + total_price = current_order.total_price + list = Order_Item.objects.filter(order=current_order) + context = { + 'list': list, + 'total_price': total_price, + 'cash': cash, + 'succesfully_payed': False, + 'payment_error': False, + 'amount_added': 0, + 'currency': currency, + 'stock_error': True, + } + return render(request, 'pos/addition.html', context=context) + + @login_required def addition(request): cash, current_order, currency = helper.setup_handling(request) @@ -59,6 +77,7 @@ def addition(request): 'payment_error': False, 'amount_added': 0, 'currency': currency, + 'stock-error': False, } return render(request, 'pos/addition.html', context=context) @@ -108,6 +127,15 @@ def order_add_product(request, product_id): cash, current_order, _ = helper.setup_handling(request) to_add = get_object_or_404(Product, id=product_id) + + # Make sure we can't go under 0 stock + if to_add.stock_applies: + if to_add.stock < 1: + return _addition_no_stock(request) + else: + to_add.stock -= 1 + to_add.save() + Order_Item.objects.create(order=current_order, product=to_add, price=to_add.price, name=to_add.name) current_order.total_price = ( @@ -123,11 +151,16 @@ def order_add_product(request, product_id): @login_required def order_remove_product(request, product_id): cash, current_order, _ = helper.setup_handling(request) - order_product = get_object_or_404(Order_Item, id=product_id) + order_item = get_object_or_404(Order_Item, id=product_id) + order_product = order_item.product + + if order_product.stock_applies: + order_product.stock += 1 + order_product.save() current_order.total_price = ( current_order.total_price - - order_product.price).quantize( + order_item.price).quantize( decimal.Decimal('0.01')) if current_order.total_price < 0: @@ -137,7 +170,7 @@ def order_remove_product(request, product_id): current_order.total_price = 0 current_order.save() - order_product.delete() + order_item.delete() # I only need default values. return addition(request) @@ -162,10 +195,6 @@ def payment_cash(request): cash, current_order, currency = helper.setup_handling(request) for product in helper.product_list_from_order(current_order): - if product.stock_applies: - product.stock -= 1 - product.save() - cash.amount += product.price amount_added += product.price cash.save() @@ -196,10 +225,6 @@ def payment_card(request): cash, current_order, currency = helper.setup_handling(request) for product in helper.product_list_from_order(current_order): - if product.stock_applies: - product.stock -= 1 - product.save() - current_order.done = True current_order.save() current_order = Order.objects.create(user=request.user) @@ -229,3 +254,16 @@ def cash(request, amount): return HttpResponse('') else: return HttpResponseForbidden('403 Forbidden') + + +@login_required +def view_stock(request): + stock_products = Product.objects.filter(stock_applies=True) + company = helper.get_company() + + context = { + 'list': stock_products, + 'company': company + } + + return render(request, 'pos/stock.html', context=context)