Luis Ramos
78cfcd905f
Adapt more & and no & when using sum
2020-11-27 13:59:46 +00:00
Luis Ramos
9bbef16804
Converting all calls to ActiveRelation#sum to use a symbol with &
...
This is only applicable to database columns, if we are summing using a method in the model than the & is required!
2020-11-27 13:59:46 +00:00
Andy Brett
8dfd3f624d
paginate zones using spree routes as well
2020-11-12 14:24:04 -08:00
Andy Brett
9cf30b431a
specify Spree routes for pagination
2020-11-12 14:09:59 -08:00
Pau Pérez Fabregat
777cedd90d
Merge pull request #6305 from efgalvao/issue#6292
...
Fixed issue #6292 .
2020-11-12 17:42:42 +01:00
Pau Pérez Fabregat
7c4691ab33
Merge pull request #6339 from andrewpbrett/fix-instance-unit-picker
...
Fix #6304 (Product edit: Cannot change Variant unit scale of an existing product)
2020-11-12 16:15:00 +01:00
Andy Brett
99301e1fb2
fix #6304
2020-11-06 12:49:07 -08:00
Pau Perez
b5f27d48df
Fix .top-bar-section not to wrap the icons-menu
...
This line-wrap makes the icons-menu overlap the OC selector. The menu's
background is transparent, what makes it look even more broken.
The fix involves refactoring the `.top-bar-section` into using flexbox
instead of this highly coupled CSS and floats. With flexbox it becomes
as easy as telling the browser to space the three sections evenly
filling-up the window, while scaling down the logo if there's not enough
room.
The root cause is that every instance uses a custom logo, which wasn't
the one we used while designing and implementing. This is why using
fixed-sizes in pixels won't work.
2020-11-06 17:35:24 +01:00
Matt-Yorkley
db3576f469
Merge pull request #6308 from luisramos0/translations
...
Fix some missing translations in orders edit page
2020-11-05 18:33:51 +01:00
Matt-Yorkley
c2362921fa
Merge pull request #6272 from tsara27/fix-alignment-order
...
Align center order adjustment and order total title
2020-11-05 18:33:08 +01:00
Matt-Yorkley
0668dd2591
Merge pull request #6307 from efgalvao/issue#6262
...
Fixes issue #6262 .
2020-11-05 18:31:49 +01:00
Luis Ramos
0ae3bf985a
Fix some missing translations in orders edit page
2020-11-04 21:54:27 +00:00
efgalvao
5260c01f16
Update registration.html.haml
...
Removed spaces.
2020-11-04 17:37:11 -03:00
efgalvao
42d5f377e0
Fixes issue #6262 .
2020-11-04 13:11:37 -03:00
Luis Ramos
5cde085241
Fix a number of spree translations
2020-11-04 13:55:36 +00:00
efgalvao
1f1da3eb6d
Fixed issue #6292 .
2020-11-04 09:37:51 -03:00
Luis Ramos
eada388534
Add handle_extensions to get Spree.translations (archaic spree js translations) in handlebars templates
...
This is all legacy from spree that can be cleaned up at some point, we only have two handlebars templates in OFN
2020-11-04 12:15:45 +00:00
Luis Ramos
80cbe6b30f
Add route helper to call to sort_link so that it can find the necessary routes
2020-11-04 12:15:45 +00:00
Luis Ramos
09aef524f3
Make route helpers use spree helper
2020-11-04 12:15:45 +00:00
Matt-Yorkley
0af20e48b0
Add missing translation key for enterprise taxon ordering
2020-10-31 19:17:19 +00:00
Luis Ramos
eea73aa989
Merge pull request #5919 from luisramos0/injector_refactor_for_rails41
...
[Rails 4.1, works in master] Convert relations with to_a so that they work in rails 4.1
2020-10-31 09:33:27 +00:00
Luis Ramos
3b682bc47f
Add warning when uploading a file
2020-10-30 15:09:13 +00:00
Luis Ramos
be35f97622
Add tooltip icon to terms and conditions
2020-10-30 15:09:13 +00:00
Luis Ramos
ca79270ba3
Show T&Cs warning when uploading a new file
2020-10-30 15:09:13 +00:00
Luis Ramos
2cf7b1b36c
Make label translatable
2020-10-30 15:09:13 +00:00
Luis Ramos
f7c07f492c
Make TCs file input onoy accept pdf files
2020-10-30 15:09:13 +00:00
Luis Ramos
9f17e4fd8f
Add upload timestamp to TCs upload form in enterprise business details
2020-10-30 15:09:13 +00:00
Luis Ramos
c980d22826
Make TCs link open in a new tab in the backoffice
2020-10-30 15:09:13 +00:00
Luis Ramos
ad592785cf
Rename methods to follwo ruby convention and improve readability
2020-10-30 15:09:13 +00:00
Luis Ramos
f3ba0ebdbb
Move code to a new helper
2020-10-30 15:09:13 +00:00
Luis Ramos
4d64bf6ece
Add column to customers table to register last time enterprise terms and
...
conditions were accepted so customer doesnt have to accept terms on all
checkouts but only when the enterprise updates the terms file
2020-10-30 15:09:13 +00:00
Luis Ramos
806c8b943d
Move small class to label so that rule is actually applied
2020-10-30 15:08:26 +00:00
Luis Ramos
85096a997f
Add a checkbox to checkout to tick for Terms and Conditions
...
Checkout button should be disabled if checkbox is not ticked
2020-10-30 15:08:26 +00:00
Luis Ramos
399fe2c01b
Make code work for relations and arrays
2020-10-30 10:12:56 +00: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
Andy Brett
292b33b4ea
simplify available units params (and remove regex!)
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
8585e6c7f0
add available units injection to BOM page
2020-10-29 09:18:19 -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
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
e4f3aae7c0
Add customer balance to customer list
2020-10-29 13:38:36 +00: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
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
01adf459b1
Replace top padding on product list
2020-10-22 09:59:16 +01:00
Maikel Linke
2887751098
Move translation to its own section
2020-10-22 15:46:49 +11:00
