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

[OPALSUP-309] Remove client specific code #786

Merged
merged 1 commit into from
Oct 29, 2018
Merged

[OPALSUP-309] Remove client specific code #786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion api/app/views/mno_enterprise/jpi/v1/admin/products/_product.json.jbuilder
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,3 @@ json.product_pricings do
end

json.categories product.categories&.map(&:name) if product.respond_to?(:categories)
json.js_editor_enabled product.nid.in? Settings.product_nids.to_a
1 change: 0 additions & 1 deletion api/app/views/mno_enterprise/jpi/v1/admin/subscriptions/_subscription.json.jbuilder
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ if subscription.product
json.product_type subscription.product.product_type
json.single_billing_enabled subscription.product.single_billing_enabled
json.billed_locally subscription.product.billed_locally
json.js_editor_enabled subscription.product.nid.in? Settings.product_nids.to_a
end
end

Expand Down
2 changes: 0 additions & 2 deletions api/app/views/mno_enterprise/jpi/v1/products/_product.json.jbuilder
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,3 @@ json.pricing_plans do
json.extract! pricing, :id, :name, :description, :position, :free, :license_based, :pricing_type, :free_trial_enabled, :free_trial_duration, :free_trial_unit, :per_duration, :per_unit, :prices, :external_id, :quote_based
end if product.respond_to?(:pricing_plans)
end

json.js_editor_enabled product.nid.in? Settings.product_nids.to_a
1 change: 0 additions & 1 deletion api/app/views/mno_enterprise/jpi/v1/subscriptions/_subscription.json.jbuilder
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ if subscription.product
json.single_billing_enabled subscription.product.single_billing_enabled
json.billed_locally subscription.product.billed_locally
json.externally_provisioned subscription.externally_provisioned
json.js_editor_enabled subscription.product.nid.in? Settings.product_nids.to_a
end
end

Expand Down
4 changes: 1 addition & 3 deletions api/spec/controllers/mno_enterprise/jpi/v1/marketplace_controller_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,7 @@ def partial_hash_for_product(product)
"single_billing_enabled" => product.single_billing_enabled,
"billed_locally" => product.billed_locally,
"values_attributes" => product.values,
"assets_attributes" => product.assets,
"js_editor_enabled" => false # This should always expected to be false till it is set as a proper setting in code refactor at a later stage.
# "product_pricings" => product.product_pricings
"assets_attributes" => product.assets
}
end

Expand Down