inventree/inventree-app
2
0
Fork 0
mirror of https://github.com/inventree/inventree-app.git synced 2025-06-16 12:15:31 +00:00
Code Activity

Order extra lines (#632)

Browse Source 
* Define classes for extra line item

* Display PO extra line items

- Also, some refactoring

* Support extra line items for sales order

* linting fixes

* Update release notes
This commit is contained in:
Oliver
2025-04-15 20:49:05 +10:00
committed by GitHub
parent 25d7ac9189
commit 72a78291b2
34 changed files with 642 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/inventree/company.dart
View File

@ -1,12 +1,14 @@
import "dart:async";
import "package:flutter/material.dart";
import "package:inventree/api.dart";
import "package:inventree/inventree/model.dart";
import "package:inventree/inventree/purchase_order.dart";
import "package:inventree/widget/company/company_detail.dart";
/*
* The InvenTreeCompany class repreents the Company model in the InvenTree database.
* The InvenTreeCompany class represents the Company model in the InvenTree database.
*/
class InvenTreeCompany extends InvenTreeModel {
@ -20,6 +22,16 @@ class InvenTreeCompany extends InvenTreeModel {
static const String MODEL_TYPE = "company";
@override
Future<Object?> goToDetailPage(BuildContext context) async {
return Navigator.push(
context,
MaterialPageRoute(
builder: (context) => CompanyDetailWidget(this)
)
);
}
@override
List<String> get rolesRequired => ["purchase_order", "sales_order", "return_order"];

8
lib/inventree/model.dart
View File

@ -48,6 +48,12 @@ class InvenTreeModel {
// Construct an InvenTreeModel from a JSON data object
InvenTreeModel.fromJson(this.jsondata);
// Navigate to a detail page for this item
Future<Object?> goToDetailPage(BuildContext context) async {
// Default implementation does not do anything...
return null;
}
// Update whenever the model is loaded from the server
DateTime? lastReload;
@ -311,6 +317,8 @@ class InvenTreeModel {
InvenTreeAPI get api => InvenTreeAPI();
int get pk => getInt("pk");
String get pkString => pk.toString();
// Some common accessors
String get name => getString("name");

39
lib/inventree/orders.dart
View File

@ -119,4 +119,43 @@ class InvenTreeOrderLine extends InvenTreeModel {
String get partImage => getString("thumbnail", subKey: "part_detail");
String get targetDate => getDateString("target_date");
}
/*
* Generic class representing an "ExtraLineItem"
*/
class InvenTreeExtraLineItem extends InvenTreeModel {
InvenTreeExtraLineItem() : super();
InvenTreeExtraLineItem.fromJson(Map<String, dynamic> json) : super.fromJson(json);
int get orderId => getInt("order");
double get quantity => getDouble("quantity");
String get reference => getString("reference");
double get price => getDouble("price");
String get priceCurrency => getString("price_currency");
@override
Map<String, Map<String, dynamic>> formFields() {
return {
"order": {
// The order cannot be edited
"hidden": true,
},
"reference": {},
"description": {},
"quantity": {},
"price": {},
"price_currency": {},
"link": {},
"notes": {},
};
}
}

26
lib/inventree/part.dart
View File

@ -10,6 +10,8 @@ import "package:inventree/l10.dart";
import "package:inventree/inventree/stock.dart";
import "package:inventree/inventree/company.dart";
import "package:inventree/inventree/model.dart";
import "package:inventree/widget/part/category_display.dart";
import "package:inventree/widget/part/part_detail.dart";
/*
@ -29,6 +31,18 @@ class InvenTreePartCategory extends InvenTreeModel {
@override
List<String> get rolesRequired => ["part"];
// Navigate to a detail page for this item
@override
Future<Object?> goToDetailPage(BuildContext context) async {
// Default implementation does not do anything...
return Navigator.push(
context,
MaterialPageRoute(
builder: (context) => CategoryDisplayWidget(this)
)
);
}
@override
Map<String, Map<String, dynamic>> formFields() {
@ -202,6 +216,18 @@ class InvenTreePart extends InvenTreeModel {
@override
List<String> get rolesRequired => ["part"];
// Navigate to a detail page for this item
@override
Future<Object?> goToDetailPage(BuildContext context) async {
// Default implementation does not do anything...
return Navigator.push(
context,
MaterialPageRoute(
builder: (context) => PartDetailWidget(this)
)
);
}
@override
Map<String, Map<String, dynamic>> formFields() {
return {

43
lib/inventree/purchase_order.dart
View File

@ -1,10 +1,12 @@
import "package:flutter/cupertino.dart";
import "package:flutter/material.dart";
import "package:flutter_tabler_icons/flutter_tabler_icons.dart";
import "package:inventree/api.dart";
import "package:inventree/helpers.dart";
import "package:inventree/inventree/company.dart";
import "package:inventree/inventree/model.dart";
import "package:inventree/inventree/orders.dart";
import "package:inventree/widget/order/extra_line_detail.dart";
import "package:inventree/widget/order/purchase_order_detail.dart";
import "package:inventree/widget/progress.dart";
import "package:inventree/api_form.dart";
@ -26,6 +28,16 @@ class InvenTreePurchaseOrder extends InvenTreeOrder {
@override
String get URL => "order/po/";
@override
Future<Object?> goToDetailPage(BuildContext context) async {
return Navigator.push(
context,
MaterialPageRoute(
builder: (context) => PurchaseOrderDetailWidget(this)
)
);
}
static const String MODEL_TYPE = "purchaseorder";
@override
@ -310,6 +322,35 @@ class InvenTreePOLineItem extends InvenTreeOrderLine {
}
}
class InvenTreePOExtraLineItem extends InvenTreeExtraLineItem {
InvenTreePOExtraLineItem() : super();
InvenTreePOExtraLineItem.fromJson(Map<String, dynamic> json) : super.fromJson(json);
@override
InvenTreeModel createFromJson(Map<String, dynamic> json) => InvenTreePOExtraLineItem.fromJson(json);
@override
String get URL => "order/po-extra-line/";
@override
List<String> get rolesRequired => ["purchase_order"];
@override
Future<Object?> goToDetailPage(BuildContext context) async {
return Navigator.push(
context,
MaterialPageRoute(
builder: (context) => ExtraLineDetailWidget(this)
)
);
}
}
/*
* Class representing an attachment file against a PurchaseOrder object
*/

42
lib/inventree/sales_order.dart
View File

@ -1,12 +1,15 @@
import "package:flutter/material.dart";
import "package:inventree/api.dart";
import "package:inventree/helpers.dart";
import "package:inventree/inventree/company.dart";
import "package:inventree/inventree/model.dart";
import "package:inventree/inventree/orders.dart";
import "package:inventree/api.dart";
import "package:inventree/widget/progress.dart";
import "package:inventree/widget/order/extra_line_detail.dart";
import "package:inventree/widget/order/sales_order_detail.dart";
/*
@ -31,6 +34,16 @@ class InvenTreeSalesOrder extends InvenTreeOrder {
String get allocate_url => "${url}allocate/";
@override
Future<Object?> goToDetailPage(BuildContext context) async {
return Navigator.push(
context,
MaterialPageRoute(
builder: (context) => SalesOrderDetailWidget(this)
)
);
}
@override
Map<String, Map<String, dynamic>> formFields() {
Map<String, Map<String, dynamic>> fields = {
@ -239,6 +252,31 @@ class InvenTreeSOLineItem extends InvenTreeOrderLine {
}
class InvenTreeSOExtraLineItem extends InvenTreeExtraLineItem {
InvenTreeSOExtraLineItem() : super();
InvenTreeSOExtraLineItem.fromJson(Map<String, dynamic> json) : super.fromJson(json);
@override
InvenTreeModel createFromJson(Map<String, dynamic> json) => InvenTreeSOExtraLineItem.fromJson(json);
@override
String get URL => "order/so-extra-line/";
@override
List<String> get rolesRequired => ["sales_order"];
@override
Future<Object?> goToDetailPage(BuildContext context) async {
return Navigator.push(
context,
MaterialPageRoute(
builder: (context) => ExtraLineDetailWidget(this)
)
);
}
}
/*
* Class representing a sales order shipment
*/

23
lib/inventree/stock.dart
View File

@ -1,11 +1,14 @@
import "dart:async";
import "package:flutter/material.dart";
import "package:inventree/api.dart";
import "package:inventree/helpers.dart";
import "package:inventree/l10.dart";
import "package:inventree/inventree/part.dart";
import "package:inventree/inventree/model.dart";
import "package:inventree/widget/stock/location_display.dart";
import "package:inventree/widget/stock/stock_detail.dart";
@ -157,6 +160,16 @@ class InvenTreeStockItem extends InvenTreeModel {
@override
List<String> get rolesRequired => ["stock"];
@override
Future<Object?> goToDetailPage(BuildContext context) async {
return Navigator.push(
context,
MaterialPageRoute(
builder: (context) => StockDetailWidget(this)
)
);
}
// Return a set of fields to transfer this stock item via dialog
Map<String, dynamic> transferFields() {
Map<String, dynamic> fields = {
@ -648,6 +661,16 @@ class InvenTreeStockLocation extends InvenTreeModel {
String get pathstring => getString("pathstring");
@override
Future<Object?> goToDetailPage(BuildContext context) async {
return Navigator.push(
context,
MaterialPageRoute(
builder: (context) => LocationDisplayWidget(this)
)
);
}
@override
Map<String, Map<String, dynamic>> formFields() {
Map<String, Map<String, dynamic>> fields = {