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.

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

Store credit admin UI fixes #2426

Merged
merged 9 commits into from
Dec 22, 2017

Conversation

tvdeyen
Copy link
Member

@tvdeyen tvdeyen commented Dec 1, 2017

Builds on top of #2419

Before

store credit - admin example com - users 2017-12-01 23-44-25

edit - store credit - store credits - admin example com - users 2017-12-01 23-45-29

After

store credit - admin example com - users 2017-12-01 23-49-31

edit - store credit - store credits - admin example com - users 2017-12-01 23-45-08

@tvdeyen tvdeyen added changelog:solidus_backend Changes to the solidus_backend gem Code review needed labels Dec 1, 2017
@tvdeyen tvdeyen force-pushed the store-credit-admin-fixes branch from 81ba8de to 449e582 Compare December 1, 2017 22:54
@solidusio solidusio deleted a comment from houndci-bot Dec 1, 2017
Copy link
Member

@kennyadsl kennyadsl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this also include #2425 right?

I just left a comment about i18n keys, the rest is ok for me, thanks!

category_id: Credit Type
amount_authorized: Authorized
amount_credited: Credited
amount_used: Used
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure these 3 keys are ok, since it could not be clear that they refer to the amount.

Eg.

Used cannot be greater than the credited amount

I don't get what we gain removing the term Amount

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are right. I will change that

@tvdeyen tvdeyen self-assigned this Dec 7, 2017
build-ci.rb Outdated
# @return [Boolean]
# the success of the installation
def self.bundle_install
system(*%W[

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pass array contents as separate arguments.

build-ci.rb Outdated
#
# @return [Boolean]
def self.bundle_check
system(*%W[bundle check --path=#{VENDOR_BUNDLE}])

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pass array contents as separate arguments.

@tvdeyen tvdeyen force-pushed the store-credit-admin-fixes branch from ceda8a0 to 65c9f4c Compare December 12, 2017 09:27
The current balance already indicates the currency of the store credit tables belonging to a currency group.
Currently it is a untranslated boolean
We have too many borders in our layout. Whitespace, tables and headers are separating content areas already, no need additional borders. That only distracts the eye.

Keeps the bottom border for fieldsets that are holding a form. This makes sense as the form buttons sit on top of the bottom border and visually encloses the form field set.
@tvdeyen tvdeyen force-pushed the store-credit-admin-fixes branch from 65c9f4c to 5d4b8e5 Compare December 12, 2017 09:30
@tvdeyen tvdeyen removed the WIP label Dec 12, 2017
@tvdeyen tvdeyen removed their assignment Dec 12, 2017
@tvdeyen
Copy link
Member Author

tvdeyen commented Dec 12, 2017

@kennyadsl made the requested changes. Found old unused translation keys and used them for the table headers.

Copy link
Member

@kennyadsl kennyadsl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@jhawthorn jhawthorn merged commit a9ac152 into solidusio:master Dec 22, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog:solidus_backend Changes to the solidus_backend gem
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants