Luis Ramos
|
1847b62cf4
|
Fix some rubocop issues
|
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
|
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
|
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
|
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 |
|
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 |
|
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
|
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
|
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
|
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
|
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
|
4a2684e3d9
|
Fix rubocop issues
|
2020-10-29 13:38:36 +00:00 |
|
Luis Ramos
|
e860e2ca57
|
Add label to customer balance so it's clear to the manager what's the balance status: credit owed or balance due
|
2020-10-29 13:38:36 +00:00 |
|
Luis Ramos
|
da69dca471
|
Make customer balance serialize with the currency
|
2020-10-29 13:38:36 +00:00 |
|
Luis Ramos
|
e4f3aae7c0
|
Add customer balance to customer list
|
2020-10-29 13:38:36 +00:00 |
|
Luis Ramos
|
76afc0b407
|
Merge pull request #6202 from cillian/sort-admin-products-by-name-fix
Fix sorting of admin products by name
|
2020-10-29 00:09:31 +00:00 |
|
Luis Ramos
|
3730d76b44
|
Merge pull request #6155 from arku/perf/model-specs
Improve model specs' performance
|
2020-10-28 21:06:10 +00:00 |
|
Luis Ramos
|
b66b50cd56
|
Merge pull request #6125 from tsara27/fix-translation
Fix translation for password reset instruction mailer subject
|
2020-10-26 12:01:47 +00:00 |
|
Matt-Yorkley
|
df3ac0394c
|
Fix #s3_credentials
|
2020-10-25 14:04:33 +00:00 |
|
Matt-Yorkley
|
9b72f7e45c
|
Merge pull request #6234 from Matt-Yorkley/fix-ordercyle-layout
Fix minor ordercyle selector layout regression
|
2020-10-23 10:52:25 +02:00 |
|
Matt-Yorkley
|
5edd562691
|
Merge pull request #6238 from openfoodfoundation/mobile-5-product-listings
Merge Product Listings to master
|
2020-10-22 21:55:42 +02:00 |
|
Matt-Yorkley
|
176021b201
|
Fix minor ordercyle selector layout regression
|
2020-10-22 19:57:32 +01:00 |
|
Matt-Yorkley
|
28590fdad4
|
Merge pull request #6223 from luisramos0/image_default_styles
Update image default styles
|
2020-10-22 17:54:32 +02:00 |
|
Luis Ramos
|
61cfdb4038
|
Merge pull request #6114 from mbudm/issue/6031
Add matomo tag to admin pages
|
2020-10-22 15:24:34 +01:00 |
|
Matt-Yorkley
|
489529d30e
|
Merge pull request #5729 from luisramos0/image_settings
Remove Image settings page and standardise Paperclip styles
|
2020-10-22 15:58:14 +02:00 |
|
Matt-Yorkley
|
4dbe966fcf
|
Add subtle hover effect on clickable image
|
2020-10-22 10:37:11 +01:00 |
|
Matt-Yorkley
|
01adf459b1
|
Replace top padding on product list
|
2020-10-22 09:59:16 +01:00 |
|
Matt-Yorkley
|
fb482fc1c7
|
Quickfix: unwanted border-right on bulk buy buttons
|
2020-10-22 15:46:49 +11:00 |
|
Maikel Linke
|
db53848092
|
Enable switching language of "Price breakdown"
And move translation to its own context.
|
2020-10-22 15:46:49 +11:00 |
|
Maikel Linke
|
2887751098
|
Move translation to its own section
|
2020-10-22 15:46:49 +11:00 |
|
Maikel Linke
|
e0a7f50626
|
Standardise new grey colour
|
2020-10-22 15:46:49 +11:00 |
|
Maikel Linke
|
db321da02a
|
Fade "From" producer label
|
2020-10-22 15:46:49 +11:00 |
|
Maikel Linke
|
d5f0fb10f4
|
Distinguish unit size more from variant name
|
2020-10-22 15:46:49 +11:00 |
|