mirror of
https://github.com/inventree/InvenTree
synced 2024-08-30 18:33:04 +00:00
Merge remote-tracking branch 'inventree/master'
This commit is contained in:
Oliver Walters
commit
bebf2c9bee
@ -81,7 +81,8 @@ class SupplierPartList(generics.ListCreateAPIView):
|
||||
'part__stock_items',
|
||||
'part__bom_items',
|
||||
'part__builds',
|
||||
'supplier')
|
||||
'supplier',
|
||||
'pricebreaks')
|
||||
|
||||
serializer_class = SupplierPartSerializer
|
||||
|
||||
@ -151,7 +152,7 @@ supplier_part_api_urls = [
|
||||
|
||||
company_api_urls = [
|
||||
|
||||
url(r'^part/', include(supplier_part_api_urls)),
|
||||
url(r'^part/?', include(supplier_part_api_urls)),
|
||||
|
||||
url(r'^price-break/?', SupplierPriceBreakList.as_view(), name='api-part-supplier-price'),
|
||||
|
||||
|
||||
@ -239,6 +239,10 @@ class SupplierPart(models.Model):
|
||||
""" Return the associated price breaks in the correct order """
|
||||
return self.pricebreaks.order_by('quantity').all()
|
||||
|
||||
@property
|
||||
def unit_pricing(self):
|
||||
return self.get_price(1)
|
||||
|
||||
def get_price(self, quantity, moq=True, multiples=True):
|
||||
""" Calculate the supplier price based on quantity price breaks.
|
||||
|
||||
|
||||
@ -33,7 +33,7 @@ class CompanySerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = Company
|
||||
fields = [
|
||||
'id',
|
||||
'pk',
|
||||
'url',
|
||||
'name',
|
||||
'description',
|
||||
@ -62,6 +62,8 @@ class SupplierPartSerializer(serializers.ModelSerializer):
|
||||
supplier_name = serializers.CharField(source='supplier.name', read_only=True)
|
||||
supplier_logo = serializers.CharField(source='supplier.get_image_url', read_only=True)
|
||||
|
||||
pricing = serializers.CharField(source='unit_pricing', read_only=True)
|
||||
|
||||
class Meta:
|
||||
model = SupplierPart
|
||||
fields = [
|
||||
@ -76,6 +78,7 @@ class SupplierPartSerializer(serializers.ModelSerializer):
|
||||
'manufacturer',
|
||||
'MPN',
|
||||
'URL',
|
||||
'pricing',
|
||||
]
|
||||
|
||||
|
||||
|
||||
@ -33,33 +33,39 @@
|
||||
<div class='col-sm-6'>
|
||||
<table class='table table-striped'>
|
||||
<tr>
|
||||
<td>Part name</td>
|
||||
<td><b>Part name</b></td>
|
||||
<td>{{ part.full_name }}</td>
|
||||
</tr>
|
||||
{% if part.IPN %}
|
||||
<tr>
|
||||
<td>IPN</td>
|
||||
<td><b>IPN</b></td>
|
||||
<td>{{ part.IPN }}</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
{% if part.variant %}
|
||||
<tr>
|
||||
<td>Description</td>
|
||||
<td><b>Variant</b></td>
|
||||
<td>{{ part.variant }}</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
<tr>
|
||||
<td><b>Description</b></td>
|
||||
<td>{{ part.description }}</td>
|
||||
</tr>
|
||||
{% if part.keywords %}
|
||||
<tr>
|
||||
<td>Keywords</td>
|
||||
<td><b>Keywords</b></td>
|
||||
<td>{{ part.keywords }}</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
{% if part.URL %}
|
||||
<tr>
|
||||
<td>URL</td>
|
||||
<td><b>URL</b></td>
|
||||
<td><a href="{{ part.URL }}">{{ part.URL }}</a></td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
<tr>
|
||||
<td>Category</td>
|
||||
<td><b>Category</b></td>
|
||||
<td>
|
||||
{% if part.category %}
|
||||
<a href="{% url 'category-detail' part.category.id %}">{{ part.category.pathstring }}</a>
|
||||
@ -68,20 +74,20 @@
|
||||
</tr>
|
||||
{% if part.default_location %}
|
||||
<tr>
|
||||
<td>Default Location</td>
|
||||
<td><b>Default Location</b></td>
|
||||
<td><a href="{% url 'stock-location-detail' part.default_location.id %}">{{ part.default_location.pathstring }}</a></td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
{% if part.default_supplier %}
|
||||
<tr>
|
||||
<td>Default Supplier</td>
|
||||
<td><b>Default Supplier</b></td>
|
||||
<td><a href="{% url 'supplier-part-detail' part.default_supplier.id %}">
|
||||
{{ part.default_supplier.supplier.name }} | {{ part.default_supplier.SKU }}
|
||||
</a></td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
<tr>
|
||||
<td>Units</td>
|
||||
<td><b>Units</b></td>
|
||||
<td>{{ part.units }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
@ -89,28 +95,28 @@
|
||||
<div class='col-sm-6'>
|
||||
<table class='table table-striped'>
|
||||
<tr>
|
||||
<td>Buildable</td>
|
||||
<td><b>Buildable</b></td>
|
||||
<td>{% include "yesnolabel.html" with value=part.buildable %}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Consumable</td>
|
||||
<td><b>Consumable</b></td>
|
||||
<td>{% include "yesnolabel.html" with value=part.consumable %}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Trackable</td>
|
||||
<td><b>Trackable</b></td>
|
||||
<td>{% include "yesnolabel.html" with value=part.trackable %}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Purchaseable</td>
|
||||
<td><b>Purchaseable</b></td>
|
||||
<td>{% include "yesnolabel.html" with value=part.purchaseable %}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Salable</td>
|
||||
<td><b>Salable</b></td>
|
||||
<td>{% include "yesnolabel.html" with value=part.salable %}</td>
|
||||
</tr>
|
||||
{% if part.minimum_stock > 0 %}
|
||||
<tr>
|
||||
<td>Minimum Stock</td>
|
||||
<td><b>Minimum Stock</b></td>
|
||||
<td>{{ part.minimum_stock }}</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
|
||||
@ -3,7 +3,8 @@
|
||||
{% block pre_form_content %}
|
||||
|
||||
<div class='alert alert-info alert-block'>
|
||||
Calculate pricing information for {{ part }}.
|
||||
Pricing information for:<br>
|
||||
{{ part }}.
|
||||
</div>
|
||||
|
||||
<h4>Quantity</h4>
|
||||
|
||||
@ -57,6 +57,15 @@
|
||||
title: 'Create New Part',
|
||||
url: "{% url 'part-create' %}",
|
||||
},
|
||||
{
|
||||
field: 'supplier_part',
|
||||
label: 'New Supplier Part',
|
||||
title: 'Create new Supplier Part',
|
||||
url: "{% url 'supplier-part-create' %}",
|
||||
data: {
|
||||
part: {{ part.id }}
|
||||
},
|
||||
},
|
||||
{
|
||||
field: 'location',
|
||||
label: 'New Location',
|
||||
|
||||
@ -41,7 +41,17 @@
|
||||
"{% url 'supplier-part-create' %}",
|
||||
{
|
||||
reload: true,
|
||||
data: {part: {{ part.id }} }
|
||||
data: {
|
||||
part: {{ part.id }}
|
||||
},
|
||||
secondary: [
|
||||
{
|
||||
field: 'supplier',
|
||||
label: 'New Supplier',
|
||||
title: 'Create new supplier',
|
||||
url: "{% url 'company-create' %}"
|
||||
}
|
||||
]
|
||||
});
|
||||
});
|
||||
|
||||
@ -83,6 +93,18 @@
|
||||
sortable: true,
|
||||
field: 'MPN',
|
||||
title: 'MPN',
|
||||
},
|
||||
{
|
||||
sortable: true,
|
||||
field: 'pricing',
|
||||
title: 'Price',
|
||||
formatter: function(value, row, index, field) {
|
||||
if (value) {
|
||||
return value;
|
||||
} else {
|
||||
return "<span class='warning-msg'><i>No pricing available</i></span>";
|
||||
}
|
||||
},
|
||||
}
|
||||
],
|
||||
url: "{% url 'api-part-supplier-list' %}"
|
||||
|
||||
@ -226,6 +226,10 @@
|
||||
padding-bottom: 3px;
|
||||
}
|
||||
|
||||
.modal .btn-secondary {
|
||||
background-color: #5e7d87;
|
||||
}
|
||||
|
||||
/* The side navigation menu */
|
||||
.sidenav {
|
||||
height: 100%; /* 100% Full-height */
|
||||
|
||||
@ -362,7 +362,7 @@ function insertNewItemButton(modal, options) {
|
||||
|
||||
var html = "<span style='float: right;'>";
|
||||
|
||||
html += "<div type='button' class='btn btn-primary'";
|
||||
html += "<div type='button' class='btn btn-primary btn-secondary'";
|
||||
|
||||
if (options.title) {
|
||||
html += " title='" + options.title + "'";
|
||||
@ -392,6 +392,8 @@ function attachSecondaryModal(modal, options) {
|
||||
// Insert the button
|
||||
insertNewItemButton(modal, options);
|
||||
|
||||
var data = options.data || {};
|
||||
|
||||
// Add a callback to the button
|
||||
$(modal).find("#btn-new-" + options.field).on('click', function() {
|
||||
|
||||
@ -400,6 +402,7 @@ function attachSecondaryModal(modal, options) {
|
||||
options.url,
|
||||
{
|
||||
modal: '#modal-form-secondary',
|
||||
data: data,
|
||||
success: function(response) {
|
||||
|
||||
/* A successful object creation event should return a response which contains:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user