Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

identity_id & unit_factor issue #1100

Merged
merged 14 commits into from
Oct 5, 2017
Merged

identity_id & unit_factor issue #1100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1aaca22
use I18.n in rspec mail template
May 30, 2017
eccbe89
ignore .env
May 30, 2017
7947574
unit factor
Jun 2, 2017
37a22f3
associate priviledges bug should use identity_id
Jun 16, 2017
8a2d416
Merge remote-tracking branch 'sparc-request/master' into musc-i18n-ma…
Jul 12, 2017
002fba7
Merge remote-tracking branch 'sparc-request/v3.0.0' into musc-i18n-ma…
Aug 25, 2017
fb2fcab
contact mail
Aug 29, 2017
335816a
rubyracer 0.12.3
Aug 30, 2017
a30394a
mailer template
Aug 30, 2017
b33a4cf
user pluck instead of map
Sep 5, 2017
c118b50
not &:, but :
Sep 5, 2017
a3bf93b
trigger travis [#151338635]
Sep 6, 2017
a7f4351
Merge branch 'v3.0.0b' into musc-i18n-mailer
loganfreeman Sep 27, 2017
444495e
Merge branch 'v3.0.0b' into musc-i18n-mailer
Stuart-Johnson Oct 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/controllers/catalog_manager/identities_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def associate_with_org_unit
identity = Identity.find identity_id

if rel_type == 'service_provider_organizational_unit'
if not oe.service_providers or (oe.service_providers and not oe.service_providers.map(&:id).include? identity_id)
if not oe.service_providers or (oe.service_providers and not oe.service_providers.pluck(:identity_id).include? identity_id)
# we have a new relationship to create
#identity.create_relationship_to oe.id, 'service_provider_organizational_unit', {"view_draft_status" => false, "is_primary_contact" => false, "hold_emails" => false}
service_provider = oe.service_providers.new
Expand All @@ -43,7 +43,7 @@ def associate_with_org_unit
render :partial => 'catalog_manager/shared/service_providers', :locals => {:entity => oe}

elsif rel_type == 'super_user_organizational_unit'
if not oe.super_users or (oe.super_users and not oe.super_users.map(&:id).include? identity_id)
if not oe.super_users or (oe.super_users and not oe.super_users.pluck(:identity_id).include? identity_id)
# we have a new relationship to create
#identity.create_relationship_to oe.id, 'super_user_organizational_unit'
super_user = oe.super_users.new
Expand All @@ -54,7 +54,7 @@ def associate_with_org_unit
render :partial => 'catalog_manager/shared/super_users', :locals => {:entity => oe}

elsif rel_type == 'clinical_provider_organizational_unit'
if not oe.clinical_providers or (oe.clinical_providers and not oe.clinical_providers.map(&:id).include? identity_id)
if not oe.clinical_providers or (oe.clinical_providers and not oe.clinical_providers.pluck(:identity_id).include? identity_id)
# we have a new relationship to create
#identity.create_relationship_to oe.id, 'super_user_organizational_unit'
clinical_provider = oe.clinical_providers.new
Expand All @@ -65,7 +65,7 @@ def associate_with_org_unit
render :partial => 'catalog_manager/shared/clinical_providers', :locals => {:entity => oe}

elsif rel_type == 'catalog_manager_organizational_unit'
if not oe.catalog_managers or (oe.catalog_managers and not oe.catalog_managers.map(&:id).include? identity_id)
if not oe.catalog_managers or (oe.catalog_managers and not oe.catalog_managers.pluck(:identity_id).include? identity_id)
# we have a new relationship to create
#identity.create_relationship_to oe.id, 'catalog_manager_organizational_unit'
catalog_manager = oe.catalog_managers.new
Expand Down
6 changes: 5 additions & 1 deletion app/models/line_item.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,11 @@ def per_unit_cost(quantity_total=self.quantity)
# factor.
def units_per_package
unit_factor = self.service.displayed_pricing_map.unit_factor
units_per_package = unit_factor || 1
if unit_factor.nil? || unit_factor == 0
units_per_package = 1
else
units_per_package = unit_factor
end

return units_per_package
end
Expand Down