Cillian O'Ruanaidh
5aa8c783b1
Use Rspec syntax instead of Test::Unit in ActionDispatch::Request spec.
2020-10-30 11:12:36 +00:00
Cillian O'Ruanaidh
5a66c855bc
Add :frozen_string_literal magic comment and underscore prefix to unused block argument for Rubocop
2020-10-30 11:12:36 +00:00
Cillian O'Ruanaidh
ea3c456d3b
Patch Rails :deep_munge issue so empty array parameters don't get converted to nil
...
Before people were unable to remove coordinator fees from an order cycle because Rails was converting the empty :coordinator_fee_ids array paramter into nil. This issue was introduced to Rails in v4.0.0.beta1 and isn't fixed until v5.0.0.beta1
Another way to fix this could be to do something like 'params[:coordinator_fee_ids] ||= []' but it seems like this issue could problems in other parts of the app so a more general fix might be better.
Fixes #6224
2020-10-30 11:12:36 +00:00
Luis Ramos
586e8a9abe
Fix some more rubocop issues
2020-10-30 10:13:16 +00:00
Luis Ramos
1847b62cf4
Fix some rubocop issues
2020-10-30 10:12:56 +00:00
Luis Ramos
0618c9e4dd
Fix line_items_decorator spec
2020-10-30 10:12:56 +00:00
Luis Ramos
d15301021a
Rename inject_json_list to inject_json_array
2020-10-30 10:12:56 +00:00
Luis Ramos
55e8dace44
Fix sort_by issue on relation by calling to_a
2020-10-30 10:12:56 +00:00
Luis Ramos
9a9b455e66
Fix problem in default_tax related to sum in active record
2020-10-30 10:12:56 +00:00
Luis Ramos
399fe2c01b
Make code work for relations and arrays
2020-10-30 10:12:56 +00:00
Luis Ramos
3aeb87debc
Make it work with both relations and arrays
2020-10-30 10:12:56 +00:00
Luis Ramos
7b06fdd943
Convert to array before using sort_by!
2020-10-30 10:12:56 +00:00
Luis Ramos
6755354196
Convert relation to_a to be able to use sum
2020-10-30 10:12:56 +00:00
Luis Ramos
440e69e156
Convert relation to array to be able to use sum
2020-10-30 10:12:47 +00:00
Luis Ramos
a53223aefc
Convert relation to array before using array only method sort_by!
2020-10-30 10:10:54 +00:00
Luis Ramos
cc1b4123b7
Make model_set handle collections that are relations and not arrays
2020-10-30 10:10:54 +00:00
Luis Ramos
65ce183830
Make checkout_adjustments_for handle adjustments if a relation is given
2020-10-30 10:10:54 +00:00
Luis Ramos
7e606471e4
Make tag_rulee_applicator and available_payment_methods_filter handle case where a relation is given instead of an array
2020-10-30 10:10:54 +00:00
Luis Ramos
1dace1f0e3
Make quantifier use stock_items relation and not an array because sum will behave differently with an array in rails 4.1
2020-10-30 10:10:54 +00:00
Luis Ramos
08d26102d2
Separate injection methods so that we can have a separate behaviour for lists without having to check their types
...
This change is required for rails 4.1 where the relations api changed
2020-10-30 10:10:54 +00:00
Transifex-Openfoodnetwork
35790b3cca
Updating translations for config/locales/en_FR.yml
2020-10-30 19:29:20 +11:00
Transifex-Openfoodnetwork
2ce05d48bf
Updating translations for config/locales/fr.yml
2020-10-30 19:29:05 +11:00
Tsara Sudrajat
f4c7a0b2a2
Align center order adjustment and order total title
2020-10-30 11:29:38 +07:00
Luis Ramos
6b826423c1
Merge pull request #6145 from andrewpbrett/instance-unit-picker
...
Allow instances to choose available units for products/variants
2020-10-29 22:22:33 +00:00
Luis Ramos
412457bb19
Merge pull request #6122 from luisramos0/customer_total
...
Add Customer balance to customer list
2020-10-29 22:06:05 +00:00
Andy Brett
2605b9cdf0
refactor unitScales function
2020-10-29 09:18:24 -07:00
Andy Brett
867947f6b2
refactor availableUnitScales into unitScales
2020-10-29 09:18:24 -07:00
Andy Brett
8d9b33abe8
update spec with new param structure
2020-10-29 09:18:24 -07:00
Andy Brett
57fe1db10e
guard against nil params[:available_units]
2020-10-29 09:18:24 -07:00
Andy Brett
18d2599075
indicate block argument is unused
2020-10-29 09:18:24 -07:00
Andy Brett
292b33b4ea
simplify available units params (and remove regex!)
2020-10-29 09:18:24 -07:00
Andy Brett
8591934c19
extract availableUnits to separate method
2020-10-29 09:18:24 -07:00
Andy Brett
9bf84bd5a8
provide default availableUnits to specs
2020-10-29 09:18:24 -07:00
Andy Brett
67a603f77f
inject available_units for new variant creation
2020-10-29 09:18:24 -07:00
Andy Brett
331ac28b71
inject available units to edit variants page
2020-10-29 09:18:24 -07:00
Andy Brett
3ead050a56
provide availableUnits to VariantUnitManager spec
2020-10-29 09:18:24 -07:00
Andy Brett
23dd09eaad
remove extra debugger statement 🤦
2020-10-29 09:18:23 -07:00
Andy Brett
8585e6c7f0
add available units injection to BOM page
2020-10-29 09:18:19 -07:00
Andy Brett
866452383d
rubocop fix
2020-10-29 09:17:49 -07:00
Andy Brett
402fc902ff
remove non-default units from expected options array
2020-10-29 09:17:49 -07:00
Andy Brett
8f21b66b96
add controller spec for updating available units
2020-10-29 09:17:49 -07:00
Andy Brett
c9b540677c
refactor general settings controller to handle available_units params
2020-10-29 09:17:49 -07:00
Andy Brett
4f579facfe
move all_units to admin helper
2020-10-29 09:17:49 -07:00
Andy Brett
fa62ec0bff
only show available units for products
2020-10-29 09:17:49 -07:00
Andy Brett
cb3ea133e9
add available units to instance prefs page
2020-10-29 09:17:31 -07:00
Luis Ramos
10490536e2
Merge pull request #6244 from cillian/configurable-geocoder-service
...
Allow Geocoder to be configured to use different APIs
2020-10-29 16:12:52 +00:00
Yih Yang
b477ed4a0a
added products variable
2020-10-29 23:37:56 +08:00
Yih Yang
f7ee08855a
updated implementation
2020-10-29 22:07:11 +08:00
Yih Yang
e3d1f5256b
added product sorting
2020-10-29 22:06:35 +08:00
Luis Ramos
a43737af8b
Merge pull request #6266 from jhsu802701/rubocop_web_helper
...
Exempted spec/support/request/web_helper.rb from Metrics/AbcSize
2020-10-29 13:52:15 +00:00
