-
Notifications
You must be signed in to change notification settings - Fork 3
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
Proposed Solution #3
Open
safafa
wants to merge
20
commits into
nebulab:main
Choose a base branch
from
safafa:workBranch
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
9767a33
Set up linters
01d8747
Add Basket & Good models Setup associantion
c2023d7
Setup routes Create actions & index view
60f06db
Add method calculate tax for goods
97148dd
Update show view
32b9f30
Update taxes and total price for basket
d4e2bcb
Setup rspec and shoulda
b4cfe2c
Implement round up
5ccbc5e
Add tests Fix good name
e538d27
Fix linter err
d663534
Update README.md
safafa ab1c73d
Refactor baskets_spec.rb add before method
0983ba9
Refactor good model & add magic numbers
f64af76
Move build_goods to baskets_helper
b399fab
Remove handle_file from basket
3cdb270
Setup factorybot test callback method
eae6920
Correct good's factory
f02be56
Refactor build_goods_from_file
077fa2d
Test basket model
85e8ff2
Refactor tests
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,17 @@ | ||
class Good < ApplicationRecord | ||
belongs_to :basket | ||
|
||
before_save :calulate_tax_update_price | ||
|
||
private | ||
|
||
def calulate_tax_update_price | ||
exampt = %w[chocolate book pills] | ||
self.basic_tax = (price.to_f.round(2) * 0.1).round(2) unless exampt.any? do |exeption| | ||
name.include?(exeption) | ||
end | ||
self.import_tax = (price.to_f.round(2) * 0.05).round(2) if name.include?('imported') | ||
fprice = quantity.to_f * (price.to_f.round(2) + basic_tax.to_f.round(2) + import_tax.to_f.round(2)) | ||
self.final_price = fprice.round(2) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Here, in just one method, you are setting |
||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
<div> | ||
<ul> | ||
<% baskets.each do |basket|%> | ||
<a href= <%= basket_path(basket.id)%> > basket <%= basket.id%> </a> | ||
<li><a href= <%= basket_path(basket.id)%> > basket <%= basket.id%> </a></li> | ||
<%end%> | ||
</div> | ||
</ul> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,6 @@ | ||
<h1>Baskets#new</h1> | ||
<p>Find me in app/views/baskets/new.html.erb</p> | ||
<div> | ||
<h5> Upload basket </h5> | ||
<%= form_tag({:action => :create}, :multipart => true) do %> | ||
<%= file_field_tag 'file'%> | ||
<%= submit_tag 'submit'%> | ||
<% end %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
<h1>Baskets#show</h1> | ||
<p>Find me in app/views/baskets/show.html.erb</p> | ||
<h1>Basket <%[email protected]%></h1> | ||
<%= @basket.goods.map { |entry| entry} %> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In this case, because those values are going to be constant and might be needed elsewhere in the application, a good Ruby practice is to extract it as a constant and place it at the top of the class:
EXEMPT_FROM_TAX = %w[chocolate book pills]