mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-12 00:20:42 +01:00
Makes the ops handling fee a percentage, removes supplier fee, ability to remove approved orders and bugfixes (#22350)
- qol: "Reduced the crate fee when making operation orders." - bugfix: "Fixed the wording in some of the operation programs." - bugfix: "Fixed the delivery app showing deliveries it shouldn't." - bugfix: "The cargo control program now properly display status messages." - balance: "Supplier fee was set to 0 for all current suppliers, eliminating the 20 credit charge per supplier." - balance: "The operations order handling fee has been turned into a percentage charge instead, and reduced to 5% by default instead of a flat 20 credits." - rscadd: "It is now possible to reject orders that have been approved but not shipped or paid for."
This commit is contained in:
@@ -36,7 +36,7 @@
|
||||
data["id_name"] = id_card ? id_card.name : "-----"
|
||||
|
||||
//Pass the shipped orders
|
||||
var/list/order_list = SScargo.get_orders_by_status("shipped", TRUE) + SScargo.get_orders_by_status("approved", TRUE) + SScargo.get_orders_by_status("Unpaid", TRUE, list("shipped", "approved"))
|
||||
var/list/order_list = SScargo.get_orders_by_status("shipped", TRUE) + SScargo.get_orders_by_status("approved", TRUE) + SScargo.get_orders_by_status("Unpaid", TRUE, list("shipped", "approved", "rejected", "basket", "submitted"))
|
||||
|
||||
data["order_list"] = order_list
|
||||
|
||||
|
||||
@@ -72,7 +72,7 @@
|
||||
//Pass the status message along
|
||||
data["status_message"] = status_message
|
||||
|
||||
data["handling_fee"] = SScargo.get_handlingfee()
|
||||
data["handling_fee"] = SScargo.get_handlingfee_cost(co.get_value(2))
|
||||
data["crate_fee"] = SScargo.get_cratefee()
|
||||
|
||||
return data
|
||||
|
||||
Reference in New Issue
Block a user