Matt-Yorkley
87c7fceae9
Remove dead code for Ruby 1.8...
2021-07-24 21:28:13 +01:00
Luis Ramos
e52937c113
Use rubocop auto correct to add frozen string literal to all files
...
This is an unsafe auto corection, we will need to trust our build here
2021-06-17 23:07:26 +01:00
Matt-Yorkley
38811b5a28
Add Bugsnag message if legacy taxes are used
2021-06-06 20:17:03 +01:00
Matt-Yorkley
52452f7939
Update default tax calculator
...
Line items, shipments and fees can now all be calculated in the same way when applying tax.
2021-06-06 20:16:03 +01:00
Matt-Yorkley
a22cc96ea5
Simplify DefaultTax calculator
...
This logic is handled in TaxRate and doesn't need to be duplicated here.
2021-06-06 20:16:03 +01:00
Luis Ramos
f357c3ff30
Remove require_dependency or use require
...
See here https://edgeguides.rubyonrails.org/upgrading_ruby_on_rails.html#require-dependency
2021-04-23 19:20:25 +01:00
Matt-Yorkley
7e0aad7c7e
Adapt current tax setup to work with shipment taxes
...
This is a temporary step...
2021-04-04 19:19:06 +01:00
Matt-Yorkley
8fccdbf92f
Introduce TaxCategories to ShippingMethods
2021-04-04 19:19:06 +01:00
Luis Ramos
9a9b455e66
Fix problem in default_tax related to sum in active record
2020-10-30 10:12:56 +00:00
Andy Brett
fdb1019ee2
fix styles per rubocop
2020-09-17 16:41:49 -07:00
Andy Brett
66099239aa
add translation for calculator preferred unit error
2020-09-17 08:42:08 -07:00
Andy Brett
977e4e46f3
remove explicit raise from convert_weight
2020-09-17 07:36:28 -07:00
Andy Brett
4123eb7c10
update specs; add specs to validate weight calculator preference is kg or lb
2020-09-12 11:53:45 -07:00
Andy Brett
d32ed6b48f
improve styling on calculators UI
2020-09-12 10:43:14 -07:00
Andy Brett
c618ba3b2c
style fixes
2020-09-07 13:44:42 -07:00
Andy Brett
5a5cbbd318
add drop down list for unit preference
2020-09-07 13:26:09 -07:00
Andy Brett
adb29a9c8f
add preferred_unit to weight shipping calculator
2020-09-07 08:41:48 -07:00
Andy Brett
5793f0103d
Revert "Add a per-pound calculator and a spec for it"
...
This reverts commit e8eadcbf39 .
2020-09-07 07:50:59 -07:00
Andy Brett
e8eadcbf39
Add a per-pound calculator and a spec for it
2020-09-06 09:03:06 -07:00
Luis Ramos
d92f97716a
Extract compute_for and thus resolve the rubocop complexity issue
2020-07-07 17:26:24 +01:00
Luis Ramos
68359d4d1a
Remove unnecessary variable (this sum and += come from the original
...
spree code and is not necessary here now)
2020-07-07 17:26:24 +01:00
Luis Ramos
70432e301d
Early exit if max is zero to make method shorted
2020-07-07 17:26:24 +01:00
Luis Ramos
fbe0a3246d
Extract applicable_rate? and thus resolve rubocop complexity issue
2020-07-07 17:26:24 +01:00
Luis Ramos
b096717172
Extract per_order_fees_total out of compute_order
2020-07-07 17:26:24 +01:00
Luis Ramos
21120dd6ab
Extract per_item_fees_total out of compute_order
2020-07-07 17:26:24 +01:00
Luis Ramos
4b12a5f592
Extract line_items_total from compute_order
2020-07-07 17:26:24 +01:00
Luis Ramos
6a94168ee5
Remove Spree namespace from DefaultTax
2020-07-07 17:26:24 +01:00
Luis Ramos
5e8438c446
Move all calculators outside the spree namespace
2020-07-07 17:26:23 +01:00
Luis Ramos
384ca310a3
Merge branch 'master' into 3-0-stable-apr3
2020-04-03 18:26:26 +01:00
Maikel Linke
4bcd665379
Handle all line items without unit_value in weight calculation
2020-03-26 17:13:29 +11:00
Matt-Yorkley
ef0fb18fda
Fix calculations for weight when variant.unit_value is zero
2020-03-24 22:05:55 +01:00
Matt-Yorkley
3896644a04
Remove attr_accessible declarations
...
Needed for using Strong Parameters in Rails 4
2020-02-22 14:03:16 +01:00
luisramos0
e9e6aa77d8
Make weight calculator work for SubscriptionLineItems by making it test if line_item responds to final_weight_volume field (final_weight_volume_present?)
...
We also add logic to weight_per_variant so that we use variant.unit_value if final_weight_volume is not available but variant_unit is weight
Adapt some test case to test unit_value (in grams) instead of weight (in kgs)
2019-12-08 17:36:21 +00:00
luisramos0
006c6e6b7b
Add comment to explain method in weight calculator
2019-08-02 21:02:33 +01:00
luisramos0
41aa4ff479
Improve code readability and fix rubocop complexity issue in weight calculator
2019-08-02 20:54:41 +01:00
Kristina Lim
e1fce8304d
Update weight calculator and add specs
2019-07-23 23:24:00 +08:00
Kristina Lim
0d6ba90ea1
Round off fee from Calculator::Weight to nearest cent
2019-07-24 00:42:42 +10:00
luisramos0
160b535e2f
Make weight calculator compute 0 for variants with unit different from weight
2019-06-18 15:21:13 +01:00
luisramos0
e8eeb3d5dc
Further improve weight calculator code
2019-06-18 13:28:16 +01:00
luisramos0
4551149532
Improve code of weight calculator
2019-05-31 19:55:39 +01:00
luisramos0
82955b9fe5
Make weight calculator use line_item.final_weight_volume rather than variant.weight for cases where the final weight is set manually in the BOM
2019-05-31 19:55:17 +01:00
luisramos0
86b0d71c7e
Result of rubocop auto-correct and rebuilding rubocop_manual_todo
2019-05-28 12:57:29 +01:00
Maikel Linke
1ea2f37c18
Support international decimals in weight calculator
...
A previous pull request added support for flexible decimal characters
when editing money amounts.
https://github.com/openfoodfoundation/openfoodnetwork/pull/1831
This pull request applies the same principle to the weight calculator
which was missed in the previous pull request.
2019-03-21 12:49:19 +11:00
luisramos0
38ff99717a
Fix bug on calculator_decorator line_items_for where input is line_item with an nil order. Adapted line_items_for so that weight_calculator.line_items_for could be removed.
2018-12-09 19:37:11 +00:00
luisramos0
9490da329a
Move Calculator::Weight from models/open_food_network/calculator to models/calculator
2018-11-07 09:54:30 +00:00
Pierre de Lacroix
2cd570383f
Use localize_number in models
2017-12-01 13:37:24 +11:00
Rohan Mitchell
701c047a0a
Move our customisations of FlatPercentItemTotal calculator to a new calc: FlatPercentPerItem
2016-08-26 09:28:29 +10:00