Added Price to Catalog Items. #5719

h-kataria · 2019-06-17T21:14:53Z

Added Currency drop down and Price text field to Angular and non-angular Catalog Item editors. And update Catalog Item details screen t show the price information.

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1602072

Angular Version Catalog Item editor

Non- Angular version Catalog Item editor

Catalog Item summary screen

Price info on Catalog Service detail screen

Service that has no pricing info saved

Catalog Item edit, show price as required field when Currency has been selected.

Added Currency drop down and Price text field to Angular and non-angular Catalog Item editors. And update Catalog Item details screen t show the price information. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1602072

himdel · 2019-06-24T11:32:57Z

app/controllers/catalog_controller.rb

+      @edit[:new][:currency] = params[:currency].to_i
+      @edit[:new][:code_currency] = code_currency_label(params[:currency])
+    end
+    @edit[:new][:price] = params[:price]


missing if params[:price]?

This is called both when saving from angular (st_edit with ?button=save or add), and from non-angular st_form_field_changed.

himdel · 2019-06-24T12:34:34Z

On the non-angular version, UAE Dirham is getting preselected (first option).
Maybe we should not preselect a currency? (Unless we have a user setting for a default currency somewhere?)

(Angular starts with "Nothing selected")

(=> #5719 (comment))

app/assets/javascripts/controllers/catalog/catalog_item_form_controller.js

himdel · 2019-06-24T12:42:12Z

app/views/catalog/_form_basic_info.html.haml

+        %p.form-control-static
+          - currency = ChargebackRateDetailCurrency.currencies_for_select
+          = select_tag("currency",
+            options_for_select(currency, @edit[:new][:currency]),


aah, this is missing the usual [["<Nothing>", nil]] +

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1602072

h-kataria · 2019-06-24T17:41:22Z

@himdel please re-review

Only show Price info on details screen when currency and price was set. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1602072

Also made changes to show `Price` as required field if user has made selection in a currency drop down. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1602072

h-kataria · 2019-06-26T16:24:58Z

@Loicavenel cc

Loicavenel · 2019-06-27T01:59:09Z

Ok, it is fine but I think we need to be more precise.. Price / Month

h-kataria · 2019-06-27T14:43:37Z

@Loicavenel updated labels to Price / Month , screenshots updated to reflect the change.

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1602072

himdel · 2019-07-01T15:23:14Z

Creating a Generic catalog item...

there is no Price/Month field, only "Select Currency", the currency dropdown, and an unlabeled input on the next line (it's the price field, looks like you're only hiding the label, or not generating one without currency)
EDIT: fixed
if I don't select a currency and try to save, I get an error:

 Error caught: [ActiveRecord::RecordNotFound] Couldn't find ChargebackRateDetailCurrency with 'id'=
/home/himdel/.rbenv/versions/2.4.4/lib/ruby/gems/2.4.0/gems/activerecord-5.1.7/lib/active_record/core.rb:189:in `find'
/home/himdel/manageiq-ui-classic/app/controllers/catalog_controller.rb:1284:in `code_currency_label'
/home/himdel/manageiq-ui-classic/app/controllers/catalog_controller.rb:1275:in `get_form_vars'
/home/himdel/manageiq-ui-classic/app/controllers/catalog_controller.rb:881:in `atomic_req_submit'
/home/himdel/manageiq-ui-classic/app/controllers/catalog_controller.rb:100:in `atomic_st_edit'
/home/himdel/manageiq-ui-classic/app/controllers/catalog_controller.rb:76:in `servicetemplate_edit'

As far as I understand, price & currency are not required fields, so, creating a catalog item without currency & price should still be working, right?

(If i do chose a currency, the price is required, that probably makes sense.)

himdel · 2019-07-01T15:31:43Z

Creating an Ansible Playbook (angular) item works as expected, price is only required when a currency was chosen, saving seems to work fine.

The only issue I'm seeing is that ggg is a valid price now ;)

That is also present in the non-angular version.

EDIT: fixed

h-kataria · 2019-07-01T23:30:48Z

@himdel addressed your feedback

himdel · 2019-07-02T10:16:50Z

Trying to add a generic catalog item without price or currency now fails on Price must be a numeric value. Missing a currency present condition for that validation?

(I think that's the last issue, assuming it doesn't still throw Couldn't find ChargebackRateDetailCurrency with 'id'= afterwards.)

Fixed to show label on Price field appropriately when adding new record, and fixed saving of new record when currency/price are both not entered by user. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1602072

himdel · 2019-07-03T08:56:20Z

Two potential issues when unsetting an already set currency:

create a generic item with price and currency, save, edit, unset only currency.
The item will fail validation with Price must be a numeric value, which is surprising because there is a numeric price, just no currency.
(unsetting both works as expected)
do the same in angular
Unsetting a currency works (does not clear the price, but does not show it in detail either),
but gives an error in the console:

miq_debug.self-1351f771c2cd2fab0d83069fd3f62aadbb7effc11a01ed4942f52308793453be.js?body=1:30 TypeError: Cannot read property 'id' of null
    at catalog_item_form_controller.self-76ca03f2b26e2a8aa63b5e81271612a457ca56b30e7df8717628ad06eb469529.js?body=1:472

himdel · 2019-07-03T08:58:52Z

app/assets/javascripts/controllers/catalog/catalog_item_form_controller.js


  function idWatch(name) {
    var fieldName = 'vm._' + name;
    $scope.$watch(fieldName, function(value) {
      vm.catalogItemModel[name + '_id'] = value ? value.id : '';
+      if (name ==  'currency' && typeof value !== 'undefined') {


if (name == 'currency' && ! value) should fix the problem when unsetting currency. (It goes from undefined to a currency, but then it goes to null, not undefined, when unselecting.)

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1602072

miq-bot · 2019-07-03T16:02:18Z

Checked commits h-kataria/manageiq-ui-classic@9ad9add~...12a460a with ruby 2.4.6, rubocop 0.69.0, haml-lint 0.20.0, and yamllint 1.10.0
3 files checked, 0 offenses detected
Everything looks fine. 👍

himdel · 2019-07-04T11:28:55Z

LGTM,
removing currency autoremoves the price on save,
removing just price warns about price required,
angular and ruby are consistent now :)

h-kataria added enhancement wip services hammer/no changelog/yes labels Jun 17, 2019

h-kataria force-pushed the add_pricing_to_service_catalog branch 2 times, most recently from 5bda006 to 9e3c073 Compare June 18, 2019 19:25

miq-bot added the unmergeable label Jun 19, 2019

Added Price to Catalog Items.

9ad9add

Added Currency drop down and Price text field to Angular and non-angular Catalog Item editors. And update Catalog Item details screen t show the price information. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1602072

h-kataria force-pushed the add_pricing_to_service_catalog branch from 9e3c073 to 9ad9add Compare June 19, 2019 14:05

h-kataria removed the wip label Jun 19, 2019

h-kataria changed the title ~~[WIP] - Added Price to Catalog Items.~~ Added Price to Catalog Items. Jun 19, 2019

h-kataria requested a review from himdel June 19, 2019 15:18

h-kataria assigned himdel Jun 19, 2019

h-kataria removed the unmergeable label Jun 19, 2019

himdel reviewed Jun 24, 2019

View reviewed changes

app/assets/javascripts/controllers/catalog/catalog_item_form_controller.js Show resolved Hide resolved

himdel reviewed Jun 24, 2019

View reviewed changes

Addressed PR feedback

1bc6b55

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1602072

h-kataria added the ux/review label Jun 26, 2019

h-kataria added 2 commits June 26, 2019 11:13

Changed label Rate to Price

7fe11f4

Only show Price info on details screen when currency and price was set. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1602072

Added missing changes to save price for catalog bundle

64ac3cb

Also made changes to show `Price` as required field if user has made selection in a currency drop down. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1602072

Changed labels to Price / Month

fcb613c

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1602072

himdel added this to the Sprint 115 Ending Jul 8, 2019 milestone Jul 1, 2019

himdel removed this from the Sprint 115 Ending Jul 8, 2019 milestone Jul 1, 2019

Added validation on "Price" field

11a9375

Fixed to show label on Price field appropriately when adding new record, and fixed saving of new record when currency/price are both not entered by user. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1602072

h-kataria force-pushed the add_pricing_to_service_catalog branch from d127bca to 11a9375 Compare July 2, 2019 18:56

himdel reviewed Jul 3, 2019

View reviewed changes

h-kataria added 3 commits July 3, 2019 10:12

Some more fixes to price validation

acbccef

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1602072

Addressed rubocop warnings

3703088

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1602072

Empty out Price value during save is currency was unset.

12a460a

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1602072

himdel merged commit db9aeca into ManageIQ:master Jul 4, 2019

himdel added this to the Sprint 115 Ending Jul 8, 2019 milestone Jul 4, 2019

h-kataria deleted the add_pricing_to_service_catalog branch July 29, 2019 21:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added Price to Catalog Items. #5719

Added Price to Catalog Items. #5719

h-kataria commented Jun 17, 2019 •

edited

himdel Jun 24, 2019

himdel commented Jun 24, 2019 •

edited

himdel Jun 24, 2019

h-kataria commented Jun 24, 2019

h-kataria commented Jun 26, 2019

Loicavenel commented Jun 27, 2019

h-kataria commented Jun 27, 2019

himdel commented Jul 1, 2019 •

edited

himdel commented Jul 1, 2019 •

edited

h-kataria commented Jul 1, 2019

himdel commented Jul 2, 2019 •

edited

himdel commented Jul 3, 2019 •

edited

himdel Jul 3, 2019

miq-bot commented Jul 3, 2019

himdel commented Jul 4, 2019

Added Price to Catalog Items. #5719

Added Price to Catalog Items. #5719

Conversation

h-kataria commented Jun 17, 2019 • edited

himdel Jun 24, 2019

Choose a reason for hiding this comment

himdel commented Jun 24, 2019 • edited

himdel Jun 24, 2019

Choose a reason for hiding this comment

h-kataria commented Jun 24, 2019

h-kataria commented Jun 26, 2019

Loicavenel commented Jun 27, 2019

h-kataria commented Jun 27, 2019

himdel commented Jul 1, 2019 • edited

himdel commented Jul 1, 2019 • edited

h-kataria commented Jul 1, 2019

himdel commented Jul 2, 2019 • edited

himdel commented Jul 3, 2019 • edited

himdel Jul 3, 2019

Choose a reason for hiding this comment

miq-bot commented Jul 3, 2019

himdel commented Jul 4, 2019

h-kataria commented Jun 17, 2019 •

edited

himdel commented Jun 24, 2019 •

edited

himdel commented Jul 1, 2019 •

edited

himdel commented Jul 1, 2019 •

edited

himdel commented Jul 2, 2019 •

edited

himdel commented Jul 3, 2019 •

edited