luisramos0
|
a1d4b4ee98
|
Add orders_controller from spree_backend so that we can now merge it with the OFN's decorator
|
2020-02-04 11:50:03 +00:00 |
|
luisramos0
|
51bca7ce2f
|
Add customer_details_controller from spree_backend so that we can now merge it with the OFN's decorator
|
2020-02-04 11:50:03 +00:00 |
|
Luis Ramos
|
70147f908a
|
Merge pull request #4611 from luisramos0/taxonomies_js
Bring js code to make taxonomies admin work without spree_backend
|
2020-02-04 11:47:27 +00:00 |
|
Luis Ramos
|
c4bf4f001f
|
Merge pull request #4509 from luisramos0/backend_ctrl_payments
Bring spree_backend payments controller to OFN
|
2020-02-04 11:46:23 +00:00 |
|
luisramos0
|
9a2ad16926
|
Make explicit the dependency to font-awesome css rules
|
2020-02-04 09:34:59 +00:00 |
|
luisramos0
|
afec21eb3d
|
Move imports to where they are needed
|
2020-02-04 09:34:59 +00:00 |
|
luisramos0
|
651ee720c6
|
Remove underscore from new jstree css file
|
2020-02-04 09:34:40 +00:00 |
|
luisramos0
|
2e6c5e1fad
|
Add dependencies from spree_backend required by jstree
|
2020-02-04 09:34:40 +00:00 |
|
luisramos0
|
87366ae7fc
|
Remove usage of jConfirm so that we dont have to bring dependency jquery.alerts from spree_backend
|
2020-02-04 09:33:58 +00:00 |
|
luisramos0
|
27aea0b277
|
Bring js code from spree_backend to make taxons admin work
|
2020-02-04 09:33:58 +00:00 |
|
luisramos0
|
d4edc9f20d
|
Bring jstress css from spree_backend
|
2020-02-04 09:33:58 +00:00 |
|
luisramos0
|
6c7991be75
|
Bring jquery.jstree from spree_backend
|
2020-02-04 09:33:34 +00:00 |
|
luisramos0
|
3f81352df5
|
Bring jquery.cookie from spree_backend
|
2020-02-04 09:33:34 +00:00 |
|
Luis Ramos
|
d80554a14a
|
Merge pull request #4744 from luisramos0/oc_pag_bug
Make pagination optional in the ExchangeProductsController
v2.7.3
|
2020-02-03 17:19:06 +00:00 |
|
luisramos0
|
a5fe5fb448
|
Remove usage of deleted const DEFAULT_PAGE
If params[:page] is not in the request, the results will not be paginated now
|
2020-02-03 15:04:34 +00:00 |
|
luisramos0
|
4c51d60bfd
|
Make pagination optional in the ExchangeProductsController
|
2020-02-03 13:11:26 +00:00 |
|
Luis Ramos
|
a0475ee8a4
|
Merge pull request #4613 from luisramos0/autocomplete
Bring remaining variants autocomplete (and related) JS code from spree_backend
|
2020-01-31 16:08:50 +00:00 |
|
Luis Ramos
|
4cdc604f45
|
Merge pull request #4718 from luisramos0/variant_count
Make Order Cycle exchange tab summary not count inventory variants that are hidden
|
2020-01-31 16:03:21 +00:00 |
|
Luis Ramos
|
dbf44c41b2
|
Merge pull request #4657 from luisramos0/pi-xls
Remove Product import code for xls suppport
|
2020-01-31 12:12:25 +00:00 |
|
Kristina Lim
|
f797745848
|
Update all locales with the latest Transifex translations
v2.7.2
|
2020-01-30 23:01:02 +08:00 |
|
Luis Ramos
|
25fae17677
|
Update Copyright to include year 2020
|
2020-01-30 14:44:31 +00:00 |
|
Kristina Lim
|
8ae6048202
|
Merge pull request #4720 from openfoodfoundation/transifex
Transifex
|
2020-01-30 22:40:47 +08:00 |
|
Luis Ramos
|
768631a90a
|
Merge pull request #4616 from luisramos0/orders_js
Bring some JS and CSS code from spree_backend related to orders admin
|
2020-01-30 11:37:07 +00:00 |
|
luisramos0
|
d472ceafcc
|
Add required dependencies from spree_backend
|
2020-01-30 11:36:09 +00:00 |
|
luisramos0
|
9a52a127a4
|
Add js code needed in the product images page
|
2020-01-30 11:36:09 +00:00 |
|
luisramos0
|
c20a41111c
|
Bring some css needed in payments list and product edit page and add image for the credit cards in the payments page as well
|
2020-01-30 11:36:09 +00:00 |
|
luisramos0
|
fd26500ca4
|
Add orders css for the orders edit page
|
2020-01-30 11:36:09 +00:00 |
|
luisramos0
|
4f0e441407
|
Bring and require responsive-tables js and css from spree_backend
|
2020-01-30 11:36:09 +00:00 |
|
Luis Ramos
|
37a5d1d036
|
Merge pull request #4628 from luisramos0/be_fontawesome
Bring fontawesome font and associated css from spree_backend
|
2020-01-30 11:21:35 +00:00 |
|
Luis Ramos
|
c4f7588601
|
Merge pull request #4608 from luisramos0/power_tip
Bring powertip from spree_backend, including js and css
|
2020-01-30 11:20:37 +00:00 |
|
Luis Ramos
|
6509c6f7b5
|
Merge pull request #4588 from luisramos0/base_helper
Bring base helper from spree_backend
|
2020-01-30 11:18:35 +00:00 |
|
Kristina Lim
|
5aadd444aa
|
Merge pull request #4721 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.4.2
Bump rubocop-rails from 2.4.1 to 2.4.2
|
2020-01-30 19:04:24 +08:00 |
|
Kristina Lim
|
278284583f
|
Merge pull request #4735 from mkllnk/4729-init-taxon-dropdown
Activate Foundation's dropdowns after tab switch
|
2020-01-30 19:00:30 +08:00 |
|
luisramos0
|
e192207f4e
|
Fix bug in before filters migration, needs to load payment for the show action
|
2020-01-30 10:27:26 +00:00 |
|
Maikel Linke
|
b63042236d
|
Activate Foundation's dropdowns after tab switch
If the dropdown doesn't exist during page load, Foundation misses it. We
need to initialise it again.
|
2020-01-30 17:02:23 +11:00 |
|
Transifex-Openfoodnetwork
|
32f7a74df7
|
Updating translations for config/locales/en_NZ.yml
|
2020-01-29 15:43:31 +11:00 |
|
luisramos0
|
3e68dc5bb2
|
Extract some methods from base_helper to zones_helper to make it explicit they are only used in the zones admin pages
|
2020-01-28 18:05:30 +00:00 |
|
luisramos0
|
919242d9ec
|
Fix rubocop issues in spree/admin/base_helper
|
2020-01-28 18:05:15 +00:00 |
|
luisramos0
|
844731061c
|
Add needed generic partials
|
2020-01-28 18:04:36 +00:00 |
|
luisramos0
|
109f2866ae
|
Merge base_helper with decorator
|
2020-01-28 18:04:36 +00:00 |
|
luisramos0
|
76eafa8415
|
Bring base_helper from spree_backend
|
2020-01-28 18:04:36 +00:00 |
|
luisramos0
|
947914724a
|
Add frozen string literal magic comment
|
2020-01-28 18:02:58 +00:00 |
|
luisramos0
|
b5004f1cbf
|
Add specs for ExchangeProductsRenderer#exchange_variants
|
2020-01-28 18:02:58 +00:00 |
|
luisramos0
|
4596399bc2
|
Extract logic from controller to renderer service
Re-using the filter_visible method for both products and variants
|
2020-01-28 18:02:58 +00:00 |
|
luisramos0
|
685abccb61
|
Make variant count consider oc config and not count variants that are hidden in the inventory of the coordinator of the OC
|
2020-01-28 18:02:58 +00:00 |
|
Luis Ramos
|
5e61ba8136
|
Merge pull request #4587 from luisramos0/navigation_helper
Bring navigation helper from spree_backend
|
2020-01-28 17:58:18 +00:00 |
|
luisramos0
|
f3447e3a96
|
Move dependency statement to powertip.css
|
2020-01-28 14:07:46 +00:00 |
|
luisramos0
|
3d0a31e838
|
Bring dependencies from spree_backend required by powertip
|
2020-01-28 14:07:46 +00:00 |
|
luisramos0
|
26bb8cc337
|
Bring powertip from spree_backend, including js and css
|
2020-01-28 14:07:45 +00:00 |
|
luisramos0
|
9254928656
|
Remove underscore from product_autocomplete css file
|
2020-01-28 13:53:04 +00:00 |
|