Maikel
|
eb162f6b29
|
Merge pull request #3934 from openfoodfoundation/dependabot/bundler/activerecord-import-1.0.2
Bump activerecord-import from 1.0.1 to 1.0.2
|
2019-06-21 14:59:03 +10:00 |
|
Maikel
|
5aea361d87
|
Merge pull request #3709 from luisramos0/2-0-prepare-4-rails-4
Start upgrade to Rails 4
|
2019-06-21 14:58:24 +10:00 |
|
Maikel
|
3721c017fa
|
Merge pull request #3670 from luisramos0/2-0-without-spree-fe-assets
[Spree Upgrade] Remove dependency to spree frontend - routes and controllers
|
2019-06-21 14:57:03 +10:00 |
|
Maikel
|
12f0ed9955
|
Merge pull request #3940 from luisramos0/zones
Remove matching of shipping method zone to user address on checkout
|
2019-06-21 14:43:40 +10:00 |
|
Maikel
|
4c4881430c
|
Merge pull request #3908 from kristinalim/fix/3843-unit_type_in_product_import
3877,3843 Improve handling of units and unit type in product import
|
2019-06-21 14:43:01 +10:00 |
|
Matt-Yorkley
|
ab1ed53507
|
Merge pull request #3955 from openfoodfoundation/remove-travis-leftover
No need to keep old and used Travis config file
|
2019-06-18 16:48:13 +01:00 |
|
luisramos0
|
2b3865855d
|
Simplify shipping_method.include? method
|
2019-06-18 11:42:34 +01:00 |
|
luisramos0
|
1da18d3386
|
Fix enterprise model scopes by making ready_for_checkout return enterprises and not ids again and by making not_ready_for_checkout select the id field from the ready_for_checkout scope
|
2019-06-18 10:52:56 +01:00 |
|
luisramos0
|
b025df1798
|
Fix a few more rubocop issues
|
2019-06-18 10:52:56 +01:00 |
|
luisramos0
|
178924af5d
|
Fix long lines in order_cycle model
|
2019-06-18 10:52:45 +01:00 |
|
luisramos0
|
bb1f7fde2f
|
Remove unused routes related to taxons
t/products was already an old route 4 years ago and t/*id is not currently working in master
|
2019-06-18 10:49:20 +01:00 |
|
luisramos0
|
c61e7a1672
|
Remove unused routes
This fix is in spree 2.1 here: ba420fe70e
|
2019-06-18 10:49:20 +01:00 |
|
luisramos0
|
3c964933b1
|
Remove stub of a deleted method #deadcode
|
2019-06-18 10:49:20 +01:00 |
|
luisramos0
|
e7b625edcf
|
Remove spree locale route
This route is not used, ofn code uses query param locale that is picked up in base controller set_locale
|
2019-06-18 10:49:20 +01:00 |
|
luisramos0
|
eab6cc563b
|
Fix rubocop issues
|
2019-06-18 10:49:20 +01:00 |
|
luisramos0
|
8daf9b9247
|
Revert fix in previous commit (orders/populate route used in product import view) and adding a simple fix by setting the product import route to use in the form
|
2019-06-18 10:49:20 +01:00 |
|
luisramos0
|
5ba0f906a1
|
For some reason we need the orders populate route to make product import routes work
|
2019-06-18 10:49:20 +01:00 |
|
luisramos0
|
35c8236c21
|
Add missing datepicker/cal.gif to ofn assets
|
2019-06-18 10:49:20 +01:00 |
|
luisramos0
|
b397a8e661
|
Remove spree_frontend and spree_sample from ofn's gemfile
spree_frontend will only be removed from gemfile.lock when spree_auth_devise is removed from OFN
|
2019-06-18 10:49:20 +01:00 |
|
luisramos0
|
61def8f2e7
|
Convert match routes to get routes to be compatible with rails 4
|
2019-06-18 10:49:20 +01:00 |
|
luisramos0
|
4ff0bf8162
|
Change gemfile to depend on the different spree gems, not spree as a whole
|
2019-06-18 10:49:20 +01:00 |
|
luisramos0
|
02b9fca620
|
Remove unused spree checkout and spree cart routes
|
2019-06-18 10:49:19 +01:00 |
|
luisramos0
|
40f7d07e27
|
Remove unnecessary method from spree storecontroller and spree orderscontroller
|
2019-06-18 10:47:34 +01:00 |
|
luisramos0
|
c56486d7ae
|
Remove unnecessary methods from spree checkoutcontroller
|
2019-06-18 10:47:34 +01:00 |
|
luisramos0
|
56db90f49e
|
Remove unused checkout controller update action and order controller populate action
Additionally, remove routes of these actions as well as routes already defined in routes.rb (checkout and cart)
|
2019-06-18 10:47:34 +01:00 |
|
luisramos0
|
a8b4037885
|
Remove dependency to coupon code logic in checkoutcontroller, ofn doesnt have that feature
|
2019-06-18 10:47:34 +01:00 |
|
luisramos0
|
fc145d472d
|
Add home controller to ofn codebase from spree frontend
|
2019-06-18 10:47:34 +01:00 |
|
luisramos0
|
5037cce6f5
|
Add all the code missing from checkout, order and store controllers to ofn controllers
|
2019-06-18 10:47:34 +01:00 |
|
luisramos0
|
c399491314
|
Move spree frontend routes to ofn and transform decorators with class_eval to controller classes
|
2019-06-18 10:47:34 +01:00 |
|
luisramos0
|
c15c5435ff
|
Fix long lines in exchange model
|
2019-06-18 10:45:01 +01:00 |
|
luisramos0
|
0cdb49818d
|
Remove distinct from enterprise.ready_for_checkout scope
Adapt use of enterprise scope not_ready_for_checkout to rails 4 by adding enterprises table alias to selected field id
|
2019-06-18 10:40:49 +01:00 |
|
luisramos0
|
9548f5c5f7
|
Adapt order_cycle scopes to rail 4
|
2019-06-18 10:40:49 +01:00 |
|
luisramos0
|
ba91abd20e
|
Adapt exchanges.with_any_variant scope to rails 4
|
2019-06-18 10:40:49 +01:00 |
|
luisramos0
|
0d07bf2a3b
|
Adapt enterprise.distributing_products scope to rails 4
|
2019-06-18 10:40:49 +01:00 |
|
luisramos0
|
07a6e62d09
|
Adapt query in product destroy process to rails 4
|
2019-06-18 10:40:49 +01:00 |
|
luisramos0
|
e9667ab289
|
Adapt product.managed_by scope to rails 4
|
2019-06-18 10:40:49 +01:00 |
|
Pau Perez
|
d003ba81e3
|
No need to keep old and used Travis config file
If we ever want to come back to Travis we just need to do a git revert.
Meanwhile, no need to care about it.
|
2019-06-18 11:12:14 +02:00 |
|
Luis Ramos
|
a783f4609a
|
Merge pull request #3942 from jonleighton/exit-if-no-nodenv
Exit script/setup if node is not found
|
2019-06-17 22:10:44 +01:00 |
|
Luis Ramos
|
d9b47ad1b3
|
Merge pull request #3944 from openfoodfoundation/transifex
Transifex
|
2019-06-17 16:39:25 +01:00 |
|
Transifex-Openfoodnetwork
|
930de1b6a2
|
Updating translations for config/locales/en_ZA.yml
|
2019-06-17 20:33:27 +10:00 |
|
Pau Pérez Fabregat
|
e3db218e7c
|
Merge pull request #3941 from luisramos0/enza
Add en_ZA.yml copied from en_GB.yml as requested by instance manager
|
2019-06-17 11:54:09 +02:00 |
|
Jon Leighton
|
150310bf67
|
Exit script/setup if node is not found
This mirrors what the script already does if ruby is not found
|
2019-06-17 11:26:54 +10:00 |
|
luisramos0
|
926fc5ee43
|
Add en_ZA.yml copied from en_GB.yml as requested by instance manager
|
2019-06-16 20:43:20 +01:00 |
|
luisramos0
|
ccc7a43a06
|
Bypass validation of shipping methods zone on checkout
|
2019-06-15 21:11:51 +01:00 |
|
luisramos0
|
e4fcaa5992
|
Fix typo in package.rb
|
2019-06-15 20:45:57 +01:00 |
|
Luis Ramos
|
b1d4461c77
|
Merge pull request #3936 from luisramos0/factories_refactor
Extract factories to separate files and fix rubocop issues
|
2019-06-14 22:28:55 +01:00 |
|
Pau Pérez Fabregat
|
45c77196b3
|
Merge pull request #3935 from mkllnk/update-rubocop-style
Update rubocop style
|
2019-06-14 19:52:22 +02:00 |
|
luisramos0
|
13d41dc1aa
|
Remove duplicate modify entry in factories
|
2019-06-14 13:59:24 +01:00 |
|
luisramos0
|
5ca382be42
|
Remove spec/factories.rb from rubocop exceptions, it doesnt look like a problem any longer
|
2019-06-14 13:55:47 +01:00 |
|
luisramos0
|
3259db69f0
|
Remove unnecessary code, this code as been accepted in spree code base and included in spree v1.2
|
2019-06-14 13:43:30 +01:00 |
|