Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ui/src/pages/OrderList.vue

svc/main.go

@@ -262,6 +262,11 @@ func InitRoutes(pgDB *sql.DB, mssql *sql.DB, ml *mailer.GraphMailer) *mux.Router
 	rdPerm := "/api/roles/{roleId}/departments/{deptCode}/permissions"
 	rdHandler := routes.NewRoleDepartmentPermissionHandler(pgDB)
 
+	bindV3(r, pgDB,
+		"/api/role-dept-permissions/list", "GET",
+		"user", "update",
+		wrapV3(http.HandlerFunc(rdHandler.List)),
+	)
 	bindV3(r, pgDB,
 		rdPerm, "GET",
 		"user", "update",
@@ -407,6 +412,8 @@ func InitRoutes(pgDB *sql.DB, mssql *sql.DB, ml *mailer.GraphMailer) *mux.Router
 		{"/api/order/update", "POST", "update", http.HandlerFunc(routes.UpdateOrderHandler)},
 		{"/api/order/get/{id}", "GET", "view", routes.GetOrderByIDHandler(mssql)},
 		{"/api/orders/list", "GET", "view", routes.OrderListRoute(mssql)},
+		{"/api/orders/close-ready", "GET", "update", routes.OrderCloseReadyListRoute(mssql)},
+		{"/api/orders/bulk-close", "POST", "update", routes.OrderBulkCloseRoute(mssql)},
 		{"/api/orders/export", "GET", "export", routes.OrderListExcelRoute(mssql)},
 		{"/api/order/check/{id}", "GET", "view", routes.OrderExistsHandler(mssql)},
 		{"/api/order/validate", "POST", "insert", routes.ValidateOrderHandler(mssql)},