raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-04 22:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,608 Commits 18 Branches 452 Tags
20c41ce69e04299a6bf821094de21f63f678dcc2
Commit Graph

15608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
luisramos0
364f9f9abd Improve variable names in cart spec 2019-01-07 11:40:42 +00:00
Pau Pérez Fabregat
34876cc255 Merge pull request #3275 from openfoodfoundation/transifex 
Transifex
 2019-01-07 11:43:06 +01:00
Pau Pérez Fabregat
ed8f719769 Merge pull request #3245 from luisramos0/spring 
Add spring, a rails preloader alternative to zeus, to our gemfile
 2019-01-07 11:07:34 +01:00
luisramos0
2893f1c141 Add test to cover weight calculation bug #3072 2019-01-07 01:18:40 +00:00
Maikel Linke
d2ba305ce6 Fix context data for tax rate finder spec 
The spec was accidentally finding an exact tax rate match. The new test
data provides only close matches to choose from.

The naming of variables has been simplified as well.
 2019-01-04 18:31:46 +11:00
Maikel Linke
a8ccb9b818 Explain why we look for the closest tax rate of a fee 2019-01-04 17:24:45 +11:00
Luis Ramos
116b842852 Revert "[Spree Upgrade] Set on_demand default value to false in test factories" 2019-01-03 23:54:17 +00:00
Maikel
1024fc1f34 Merge pull request #3273 from coopdevs/fix-fr-BE-link 
Fix menu_1_url translation for fr_BE
 2019-01-04 09:52:44 +11:00
Transifex-Openfoodnetwork
9da7ff5698 Updating translations for config/locales/fr.yml 2019-01-04 02:15:57 +11:00
Pau Pérez Fabregat
9f0c6a6bac Merge pull request #3251 from openfoodfoundation/dependabot/bundler/webmock-3.5.1 
Bump webmock from 3.4.2 to 3.5.1
 2019-01-03 11:18:59 +01:00
Pau Perez
edffbd72fe Update rubocop_manual_todo 2019-01-03 11:17:10 +01:00
Pau Perez
ddf916814f Reduce complexity of EnterprisesController#shop 
As asked by Rubocop.
 2019-01-03 11:17:10 +01:00
Pau Perez
e3edb51d3e Update rubocop_todo 2019-01-03 11:17:10 +01:00
Pau Perez
51da607ab1 Fix too long line 2019-01-03 11:17:10 +01:00
Pau Perez
46760ce28c Do not double-render when there is no stock 2019-01-03 11:17:10 +01:00
Pau Perez
cca15e75a6 Refactor to reveal how we load enterprises in shop 
By sticking to Rails conventions we make it more obvious how (badly) we
are loading enterprises in EnterprisesController#shop and shed some
light on the obscure InjectionHelper.

This will also make it easier to improve its performance in the future as
it's among the top offenders. See https://www.skylight.io/app/applications/ibo3NOqCYMnq/1545851520/1d/endpoints/EnterprisesController%23shop?responseType=html
 2019-01-03 11:17:10 +01:00
Maikel
ac76580932 Merge pull request #3274 from openfoodfoundation/transifex 
Transifex
 2019-01-03 11:35:47 +11:00
Transifex-Openfoodnetwork
89bf819b37 Updating translations for config/locales/en_US.yml 2019-01-03 00:33:56 +11:00
Pau Perez
112080d8c6 Fix menu_1_url translation for fr_BE 
The first menu item in OFN BE is currently broken.
 2019-01-02 13:10:33 +01:00
Maikel
832dca9742 Merge pull request #3247 from coopdevs/fix-anonymous-checkout-spec 
[Spree Upgrade] Provide anonymous user instead of nil
 2019-01-02 18:13:06 +11:00
Maikel
63ec4b59fe Merge pull request #3246 from luisramos0/2-0-create-variants 
[Spree Upgrade] Set on_demand default value to false in test factories
 2019-01-02 18:02:34 +11:00
Maikel
f68fd6eea9 Merge pull request #3242 from luisramos0/2-0-line-item-destroy 
[Spree Upgrade] Fix line item destroy by forcing quantity to zero and update_inventory
 2019-01-02 17:44:25 +11:00
Maikel
a3b7364c75 Merge pull request #3241 from luisramos0/2-0-checkout-out-of-stock 
[Spree Upgrade] Fix checkout_controller_spec
 2019-01-02 17:37:34 +11:00
Maikel
3ec7ccb12c Merge pull request #3240 from luisramos0/2-0-orders-ctrl-api 
[Spree Upgrade] Fix api orders controller spec broken tests
 2019-01-02 17:36:40 +11:00
Maikel
d5c48d7c41 Merge pull request #3239 from luisramos0/2-0-ship-method-restart-checkout 
[Spree Upgrade] Fix restart checkout spec
 2019-01-02 17:33:48 +11:00
dependabot[bot]
8170937708 Bump webmock from 3.4.2 to 3.5.1 
Bumps [webmock](https://github.com/bblimke/webmock) from 3.4.2 to 3.5.1.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.4.2...v3.5.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-27 19:16:35 +00:00
Pau Pérez Fabregat
d88be202a6 Merge pull request #3223 from kristinalim/fix-rubocop_block_length_ignore_rake_routes_dsl 
Ignore Rake and routes DSL methods in Rubocop BlockLength
 2018-12-27 17:14:57 +01:00
Pau Pérez Fabregat
755eca5abe Merge pull request #3236 from openfoodfoundation/dependabot/bundler/guard-2.15.0 
Bump guard from 2.14.1 to 2.15.0
 2018-12-27 17:14:32 +01:00
Alvaro Chalar
6dccbeca70 Add custom footer message in reports section 2018-12-27 12:22:48 +01:00
Pau Perez
3e793652e8 Provide anonymous user instead of nil 
As explained in
0181835fb6/app/models/spree/user.rb (L26-L32),
all orders have a user so checking out as a guest is just using an
automatically generated user by means of `.anonymous!`.
 2018-12-27 12:18:27 +01:00
luisramos0
467623f000 Sets StockLocation.backorderable_default to false in test factories 
This makes the default value of variant.on_demand be false
 2018-12-26 22:16:05 +00:00
luisramos0
fd21914a15 Add spring, a rails preloader alternative to zeus, to our gemfile 
Add /bin to gitignore, bin is used by spring, rails preloader
 2018-12-26 13:36:48 +00:00
luisramos0
4eaaeb37c9 Reverting to therubyracer because mini racer is causing trouble to some developers using osx. 
We will probably be able to move back to the faster mini racer when we upgrade to newer rails versions
 2018-12-26 13:07:52 +00:00
luisramos0
d44c4778e1 Improve line item code by merging multiple destroy hooks into a single hook: update_inventory_on_destroy. This makes the code easier to read 2018-12-24 16:39:06 +00:00
Pau Pérez Fabregat
1ab50798fe Merge pull request #3189 from luisramos0/3043-i18n-emails 
Make all mailers use appropriate locale when sending emails
 2018-12-24 14:59:04 +01:00
luisramos0
429e513a77 Improve line_item code by moving order.shipment reload to a line_item after_destroy hook 2018-12-23 09:15:18 +00:00
luisramos0
b83ec8d357 Add order.shipments reload to line_item.update_inventory. This is necessary when destroying line items as update_inventory may delete the shipment from the order 2018-12-23 00:23:49 +00:00
luisramos0
26b5250f2c Fix line item destroy by forcing quantity to zero and update_inventory before_destroy so that the variant is restocked 2018-12-22 23:27:27 +00:00
luisramos0
4dd41bae9c Change out of stock message in spec. Now the checkout controller is returning the error message, not the line items validator 2018-12-21 21:50:13 +00:00
luisramos0
c2e05e7d87 In api orders controller spec, remove inventory_units_shipment_id_null as the filter was removed in spree 2 
Also set the distributor used in the tests on completed_order_with_fees so results for that distributor are correct
 2018-12-21 16:10:31 +00:00
luisramos0
8970131685 In restart checkout spec, create failed payment before the valid payment otherwise the failed payment will invalidate the previous payment, even if it is a good one 
In spree 2, every new payment will invalidate all previous payments in the order
See here: c9eebba4f7
 2018-12-21 15:13:52 +00:00
luisramos0
7155f28acf Remove shipping_method_id from RestartCheckout, destroying shipments is now enough as order.shipping_method_id is no longer used and will be dropped. See #2683 for more details 2018-12-21 15:13:43 +00:00
Luis Ramos
1007addddb Merge pull request #3232 from luisramos0/2-0-out-of-stock 
[Spree Upgrade] Scope variants in line items availability validator
 2018-12-21 12:05:43 +00:00
Luis Ramos
6935bfdf8b Merge pull request #3210 from luisramos0/2-0-bom-on-hand 
[Spree Upgrade] Fix availability validator to include inventory_units in it's validation
 2018-12-21 12:04:18 +00:00
luisramos0
6c70998b64 Move StockLocation.fill_status to VariantStock so we can easily override it 2018-12-21 11:33:07 +00:00
luisramos0
17ced61b3d Override Spree::Variant.in_stock? in VariantStock so that we don’t depend on Spree::Stock::Quantifier 2018-12-21 11:33:07 +00:00
luisramos0
1835d97013 Adapt line_item.sufficient_stock? to spree 2 2018-12-21 11:33:07 +00:00
luisramos0
d641705053 Add variant scoping to availability_validator_decorator by using line_item.scoper and moving Spree::Stock::Quantifier.can_supply? to VariantStock so that it becomes overridable 2018-12-21 11:33:07 +00:00
luisramos0
c0a095ffaf Improve variant_overrides_spec variable names 2018-12-21 11:33:07 +00:00
luisramos0
4f79fd5be0 Improve availability validator spec readability and remove unnecessary expect statements 2018-12-21 11:19:12 +00:00