mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-28 07:38:05 +01:00
Fixes some issues with orders showing up as private. (#93986)
## About The Pull Request Applies the fixes from https://github.com/tgstation/tgstation/pull/93417 to budget ordering console Also fixes budget ordering improperly setting cargo as the paying department, as we check for "null" payer to see whether something is privately paid. ## Why It's Good For The Game I really hope one of these days this will just get merged so we don't need this annoying copy paste. How different is the app to the console anyway? ## Changelog 🆑 SyncIt21, JohnFulpWillard fix: budget ordering console correctly differentiates between private & department orders. fix: budget ordering console checkout cart displays correct Private/Department order text amounts. /🆑
This commit is contained in:
@@ -121,7 +121,7 @@
|
||||
"id" = order.id,
|
||||
"amount" = 1,
|
||||
"orderer" = order.orderer,
|
||||
"paid" = !!order.paying_account?.add_to_accounts, //number of orders purchased privatly
|
||||
"paid" = !isnull(order.paying_account), //number of orders purchased privatly
|
||||
"dep_order" = !!order.department_destination, //number of orders purchased by a department
|
||||
"can_be_cancelled" = order.can_be_cancelled,
|
||||
))
|
||||
@@ -271,7 +271,7 @@
|
||||
if(!dept_choice)
|
||||
return
|
||||
if(dept_choice == "Cargo Budget")
|
||||
personal_department = SSeconomy.get_dep_account(cargo_account)
|
||||
personal_department = null
|
||||
|
||||
if(pack.goody && !self_paid)
|
||||
playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 50, FALSE)
|
||||
@@ -298,13 +298,13 @@
|
||||
break
|
||||
|
||||
var/datum/supply_order/order = new(
|
||||
pack = pack ,
|
||||
pack = pack,
|
||||
orderer = name,
|
||||
orderer_rank = rank,
|
||||
orderer_ckey = ckey,
|
||||
reason = reason,
|
||||
paying_account = account,
|
||||
coupon = applied_coupon
|
||||
coupon = applied_coupon,
|
||||
)
|
||||
working_list += order
|
||||
|
||||
|
||||
Reference in New Issue
Block a user