Commit
c02c8061fa1ad30a25f6e3f470534435513b23eb
Exists in
staging
and in
42 other branches
all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server
Return price if discount not available
This is necessary for products search view
|
| @@ -104,7 +104,7 @@ class Product < ActiveRecord::Base |
| @@ -104,7 +104,7 @@ class Product < ActiveRecord::Base |
|
104
| end |
104
| end |
|
105
| |
105
| |
|
106
| def price_with_discount |
106
| def price_with_discount |
|
107
| - price - discount if discount |
107
| + discount ? price - discount : price |
|
108
| end |
108
| end |
|
109
| |
109
| |
|
110
| def price=(value) |
110
| def price=(value) |
