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
a18a198812
Fix locations of requires in admin js all.js
2020-11-04 12:15:45 +00:00
Luis Ramos
cf3f511f4d
Add directive spec to validate the dialog template is loaded on element click
2020-10-30 15:09:13 +00:00
Luis Ramos
3b682bc47f
Add warning when uploading a file
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
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
8591934c19
extract availableUnits to separate method
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
fa62ec0bff
only show available units for products
2020-10-29 09:17:49 -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
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
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
Luis Ramos
9f568c1e9d
Merge pull request #5928 from luisramos0/spree_core_js
...
[Bye bye spree] Bring final bits of js and css from spree_core
2020-10-20 13:20:41 +01:00
Luis Ramos
0f06195baa
Remove Image settings page, these settings will come from ofn-install now
2020-10-20 11:20:37 +01:00
Cillian O'Ruanaidh
35110eaf4a
Make sure :sorting parameter is nested inside the :q parameter to fix sorting of admin products
...
Fixes #6105 .
2020-10-16 15:21:15 +01:00
Matt-Yorkley
32999e6be4
Add polish translations with momentjs
2020-10-12 23:05:43 +01:00
Luis Ramos
9545c57969
Merge pull request #6049 from luisramos0/momentjs
...
Use yarn and move Momentjs from gemfile to yarn
2020-10-12 15:28:23 +01:00
Luis Ramos
fb9bcdee7c
Load spree js on OFN side, not the one on Spree's side
2020-09-23 12:45:30 +01:00
Luis Ramos
3af5482960
Make date picker work with karma tests where the old Spree.translations js translations object is not defined
2020-09-23 12:45:30 +01:00
Luis Ramos
bfd4164c0b
Remove handlebar extensions and some dead translations
...
This is not needed, these translations are always used through Spree.translations and this system is deprecated anyway
2020-09-23 12:45:30 +01:00
Luis Ramos
d5d2ae3ce0
Remove some dead code and broken links from comments
2020-09-23 12:45:29 +01:00
Luis Ramos
496f9c106e
Bring the very last bits of js and css from spree_core
2020-09-23 12:45:29 +01:00
Luis Ramos
a2610279d9
Merge pull request #5976 from luisramos0/address_form
...
Fix address state selector and "use billing address" checkbox in order customer details page
2020-09-23 12:42:37 +01:00
Luis Ramos
2fae7e0df3
Use moment js min and locale files from node_modules
...
In this commit fil and nl-be are also added
We could use moment/min/locales.min.js but that would add all locales available in moment which would be a move in size from current 30k in moment locales to 300k
2020-09-18 16:18:24 +01:00
Luis Ramos
d4c4bcaa50
Make node_modules available for code in app/assets
2020-09-18 15:53:34 +01:00
Matt-Yorkley
77eaebc2a7
Merge pull request #5888 from andrewpbrett/imperial-auto-units
...
Allow US units on products/variants
2020-09-17 15:04:15 +02:00
Luis Ramos
212820b3da
Merge pull request #5912 from luisramos0/tcs
...
Terms and Conditions - upload PDF in the Enterprise Business Details and read them on Checkout
2020-09-17 12:01:45 +01:00
Luis Ramos
f1358dfa9a
Merge pull request #5722 from rioug/4206-back-from-Edit-Product-removed-filters-products-page
...
4206 back from edit product removed filters products page
2020-09-17 11:51:58 +01:00
andresgutgon
d1331ac78a
Fix datetime picker translations on Order cycles screen
...
So the thing is we initialize jQuery plugin on `admin/util.js.erb` but
then we override those defaults on order_cycles.js.erb.coffe. Now both
plugin initializations use the same defaults. Also added 3 missing
translations for `Done`, `Now` and `Time` copies on that timepicker popover
2020-09-06 13:43:35 +02:00
Andy Brett
55e448897f
use fewer sigfigs for ounces; add spec to option_value_namer
2020-09-03 09:11:00 -07:00
Andy Brett
d7a8873ee9
return empty string for unitName if no scale matches
2020-09-03 09:11:00 -07:00
Andy Brett
a2993652c1
get only compatible scales in option_value_namer.js.coffee
2020-09-03 09:11:00 -07:00
Andy Brett
08e6e5a459
add compatibleUnitScales function and spec
2020-09-03 09:11:00 -07:00
Andy Brett
0018ef6eb4
refactor variant_unit_manager.coffee and add systems to scales
2020-09-03 09:11:00 -07:00
Andy Brett
e5e7e12a32
green tests for sorted scales
2020-09-03 09:11:00 -07:00
Andy Brett
e99799bca2
add ounces and round up for lbs
2020-09-03 09:11:00 -07:00
Zee Spencer
cb09c935dc
WIP: Products may be created with pounds for their weight unit_converter
...
See: https://community.openfoodnetwork.org/t/hubs-managers-can-choose-the-adapted-weight-and-measure-units-for-their-shops-given-their-own-local-situation/1289/11
We're not entirely sure what needs to be changed in order for this to
accurately work with shipping and other parts of the eCommerce platform.
We are assuming that so long as we canonically store the weight scale
in grams, that the shipping calculation will be able to do what it needs
to. So if we put in values for "oz" as grams, we may not need to do
much else in order to let product(s) be sold by the pound (or ounce).
Next steps appear to be:
- [ ] When looking at an order as a customer, do we want to show pounds
instead of grams? (See: http://localhost:3000/orders/R125684626 )
- [ ] Compile a list of tests that are worth writing (because we have
no confidence that we know what we are supposed to be doing in
order for this feature to be "ready" to be used by people.)
- [ ] Write a test that demonstrates when we create a product with a
variant in pound that the product's shipping weight is correctly
calculated?
- [ ] Do we want to think about i18n?
2020-09-03 09:10:59 -07:00
Luis Ramos
ffac38d934
Remove option to enter state_name for countries without states
...
Thisis not supported in OFN
2020-09-01 16:06:49 +01:00
Luis Ramos
5716ea8611
Fix rubocop issue
2020-09-01 15:55:46 +01:00
Luis Ramos
ffa0d202be
Add states api endpoint to support existing code on the customer details page when user changes country
2020-09-01 15:46:22 +01:00
Luis Ramos
46623242f7
Make use_billing checkbox work again, missign js code from spree
2020-09-01 14:28:45 +01:00
Luis Ramos
8a75fe777c
Refactor enterprises controller to reduce code duplication
2020-08-31 17:40:34 +01:00
Luis Ramos
66587ccc00
Allow user to remove terms and conditions file
2020-08-31 17:40:34 +01:00
Luis Ramos
24cdd0c467
Refactor enterprise controller to reduce code duplication
2020-08-31 17:40:34 +01:00
Luis Ramos
0974c4b2ac
Move enterprise images translations to the correct place using lazylookup on the server and to main js: namespace for js translations
2020-08-31 17:40:34 +01:00
Gaetan Riou
6564ea7b00
rename ProductFiltersService to ProductFiltersUrl
2020-08-21 12:13:16 +10:00
Gaetan Riou
f71013c514
rename query filter where it was missed, fix bulk_update_product spec
2020-08-21 11:46:36 +10:00
Gaetan Riou
44487af2c8
remove dead filter code
2020-08-21 11:40:48 +10:00
