diff --git a/quicktill/tillweb/templates/tillweb/stockline-continuous.html b/quicktill/tillweb/templates/tillweb/stockline-continuous.html index b87386f..ff30607 100644 --- a/quicktill/tillweb/templates/tillweb/stockline-continuous.html +++ b/quicktill/tillweb/templates/tillweb/stockline-continuous.html @@ -6,39 +6,62 @@ {% block tillcontent %} -{% if form %} -
{% csrf_token %} - {% include "form-horizontal.html" %} - - - - {% for l in locations %} -
-{% else %} - +
Name{{stockline.name}}
Location{{stockline.location}}
Stock type{{stockline.stocktype}}
Amount remaining{{stockline.remaining_str}}
-{% endif %} -

This is a "continuous" stock line. Continuous stock - lines never have any stock items explicitly on sale. Instead, when - a sale is made the till searches for stock of the specified type - that is not already on sale on another stock line, and uses that. - If a particular stock item doesn't have enough stock left for the - whole sale, multiple stock items are used. Continuous stock lines - are typically used where a single sale (for example of a glass of - wine) can come from multiple stock items (eg. where a wine bottle +

This is a "continuous" stock line. Continuous stock lines never + have any stock items explicitly on sale. Instead, when a sale is + made the till searches for stock of the specified type that is not + already on sale on another stock line, and uses that. If a + particular stock item doesn't have enough stock left for the whole + sale, multiple stock items are used. Continuous stock lines are + typically used where a single sale (for example of a glass of wine) + can come from multiple stock items (eg. where a wine bottle finishes, and the next bottle is from a different case or even a different delivery).

+{% if form %} + + +{% endif %} + +{% if stockline.stocktype.stockonsale %}

Items on sale

(The total amount remaining in these items is @@ -46,6 +69,9 @@

Items on sale

{% with stocklist=stockline.stocktype.stockonsale exclude_column="stockline" %} {% include "tillweb/stocklist.html" %} {% endwith %} +{% endif %} + +
{% include "tillweb/bindings.html" %} diff --git a/quicktill/tillweb/templates/tillweb/stockline-display.html b/quicktill/tillweb/templates/tillweb/stockline-display.html index 3b256d4..6bde863 100644 --- a/quicktill/tillweb/templates/tillweb/stockline-display.html +++ b/quicktill/tillweb/templates/tillweb/stockline-display.html @@ -6,40 +6,62 @@ {% block tillcontent %} -{% if form %} -
{% csrf_token %} - {% include "form-horizontal.html" %} - - - - {% for l in locations %} -
-{% else %} - +
Name{{stockline.name}}
Location{{stockline.location}}
Stock type{{stockline.stocktype}}
Capacity{{stockline.capacity}}
-{% endif %} -

This is a "display" stock line. Display stock lines - can have several stock items on sale at once. Moving from one stock - item to the next is automatic; when one item is empty the next is - used. These stock lines have a "capacity", and the system keeps - track of how many units of each stock item are "on display" and - available to be sold; the "capacity" is the number of units that can - be on display at any one time (for example, in a fridge). Display - stock lines are typically used where it isn't obvious to the member - of staff where one stock item finishes and another one starts; for +

This is a "display" stock line. Display stock lines can have + several stock items on sale at once. Moving from one stock item to + the next is automatic; when one item is empty the next is used. + These stock lines have a "capacity", and the system keeps track of + how many units of each stock item are "on display" and available to + be sold; the "capacity" is the number of units that can be on + display at any one time (for example, in a fridge). Display stock + lines are typically used where it isn't obvious to the member of + staff where one stock item finishes and another one starts; for example, the bottles on display in a fridge may come from several different stock items.

+{% if form %} + + +{% endif %} + {% if stockline.stockonsale %}

Items on sale

diff --git a/quicktill/tillweb/templates/tillweb/stockline-regular.html b/quicktill/tillweb/templates/tillweb/stockline-regular.html index af722dd..72c1396 100644 --- a/quicktill/tillweb/templates/tillweb/stockline-regular.html +++ b/quicktill/tillweb/templates/tillweb/stockline-regular.html @@ -6,38 +6,60 @@ {% block tillcontent %} -{% if form %} -
{% csrf_token %} - {% include "form-horizontal.html" %} - - - - {% for l in locations %} -
-{% else %} - +
- +
Name{{stockline.name}}
Location{{stockline.location}}
Stock type{% if stockline.stocktype %}{{stockline.stocktype}}{% else %}Unrestricted{% endif %}
Department{% if stockline.department %}{{stockline.department}}{% else %}Unrestricted{% endif %}
Pullthru{{stockline.pullthru}}
Pull through qty{{stockline.pullthru}}
-{% endif %} -

This is a "regular" stock line. Regular stock lines - can have at most one stock item on sale at any one time. Finishing - that stock item and putting another item on sale are done explicitly - by the staff. They are typically used where units are dispensed - directly from the stock item to the customer and it's obvious to the - member of staff when the stock item is empty, for example casks/kegs +

This is a "regular" stock line. Regular stock lines can have at + most one stock item on sale at any one time. Finishing that stock + item and putting another item on sale are done explicitly by the + staff. They are typically used where units are dispensed directly + from the stock item to the customer and it's obvious to the member + of staff when the stock item is empty, for example casks/kegs through a pump, bottles of spirits, cards or boxes of snacks, and so on.

+{% if form %} + + +{% endif %} + {% if not stockline.stockonsale %}

There is nothing currently on sale on this stock line.

{% endif %} diff --git a/quicktill/tillweb/templates/tillweb/stocklines.html b/quicktill/tillweb/templates/tillweb/stocklines.html index add8b91..4cb9a8d 100644 --- a/quicktill/tillweb/templates/tillweb/stocklines.html +++ b/quicktill/tillweb/templates/tillweb/stocklines.html @@ -14,6 +14,7 @@

Regular stock lines

is empty, for example casks/kegs through a pump, bottles of spirits, cards or boxes of snacks, and so on.

+{% if regular %} @@ -43,6 +44,9 @@

Regular stock lines

$("#regularstocklinelist").tablesorter(); }); +{% else %} +

No regular stock lines exist at the moment.

+{% endif %}

Display stock lines

@@ -57,6 +61,7 @@

Display stock lines

another one starts; for example, the bottles on display in a fridge may come from several different stock items.

+{% if display %}
@@ -87,6 +92,9 @@

Display stock lines

$("#displaystocklinelist").tablesorter(); }); +{% else %} +

No display stock lines exist at the moment.

+{% endif %}

Continuous stock lines

@@ -100,6 +108,7 @@

Continuous stock lines

(eg. where a wine bottle finishes, and the next bottle is from a different case).

+{% if continuous %}
@@ -126,5 +135,8 @@

Continuous stock lines

$("#continuousstocklinelist").tablesorter(); }); +{% else %} +

No continuous stock lines exist at the moment.

+{% endif %} {% endblock %}