raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-30 21:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,629 Commits 18 Branches 452 Tags
a57504ba1fef7c828c5d286a5fb9797240ea297e
Commit Graph

12629 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pau Pérez Fabregat
0eefd2455c Merge pull request #3293 from luisramos0/2-0-stable-jan-8th 
[Spree Upgrade] Merging master into 2-0-stable (first run in Jan2019)
 2019-01-09 16:11:18 +01:00
Pau Pérez Fabregat
399cc5f796 Merge pull request #3224 from alvaro-chalar/footer-message 
Add custom footer message in reports section
 2019-01-09 16:01:02 +01:00
Pau Pérez Fabregat
1815a2116d Merge pull request #3257 from coopdevs/refactor-enterprise-controller-shop-injection 
Refactor to reveal how we load enterprises in shop
 2019-01-09 13:21:56 +01:00
Maikel
abe4f78e5c Merge pull request #2988 from Matt-Yorkley/pi/utf8 
Pi/utf8
 2019-01-09 15:39:05 +11:00
Pau Pérez Fabregat
57267ab4a4 Merge pull request #3297 from openfoodfoundation/transifex 
Transifex
v1.25.0 		2019-01-08 22:45:55 +01:00
Transifex-Openfoodnetwork
f05f4ce0b1 Updating translations for config/locales/en_GB.yml 2019-01-09 07:06:27 +11:00
Pau Pérez Fabregat
bd10400457 Merge pull request #3295 from coopdevs/pull-translations 
Update all locales with the latest Transifex translations
 2019-01-08 17:58:51 +01:00
Pau Perez
f1f1ab9daf Update all locales with the latest Transifex translations 2019-01-08 17:17:35 +01:00
luisramos0
2cc8a0e9e3 Fix models/variant_override_spec by setting mandatory on_demand true when count_on_hand is nil 2019-01-08 15:32:10 +00:00
luisramos0
134a51ab1d Fix merge typo in the cancel email method of the order mailer decorator 2019-01-08 15:31:28 +00:00
luisramos0
e28f9a7c84 Merge branch 'master' into 2-0-stable-jan-8th 2019-01-08 14:29:50 +00:00
Maikel
14ccb39478 Merge pull request #3287 from luisramos0/2-0-edit-variants 
[Spree Upgrade] Fix variant edit page optiontype deface code
 2019-01-08 16:37:38 +11:00
Maikel
abbbfd6191 Merge pull request #3286 from luisramos0/2-0-order-spec 
[Spree Upgrade] Fix specs in admin orders spec
 2019-01-08 16:35:59 +11:00
Maikel
a46180ef78 Merge pull request #3282 from luisramos0/2-0-credit-card 
[Spree Upgrade] Fix credit card spec that was depending on current year
 2019-01-08 16:34:03 +11:00
Maikel
68df27df02 Merge pull request #3281 from luisramos0/2-0-tab-ransl 
[Spree Upgrade] 3119, 3112 and 3073 - fix menu translations
 2019-01-08 16:31:41 +11:00
luisramos0
676f0e71b8 Fix variant edit page optiontype deface code 2019-01-07 12:16:47 +00:00
luisramos0
bdefc0ebd1 Fix admin orders spec by adapting the spec to the recently de-defaced page 2019-01-07 12:16:28 +00:00
luisramos0
42eb92c40a Add missing translation related to capture payments in the backoffice 2019-01-07 12:16:28 +00:00
luisramos0
503d515930 Fix credit card spec that was depending on current year 
After this commit 5d93d1dedb, this static fix was meant to fail 3f33e28839
 2019-01-07 12:16:09 +00:00
luisramos0
d3325ed7bb Add translation entries for admin menu tabs. 
This was moved to new namespace tab in spree 2, see 4c82bfdf48
 2019-01-07 12:15:36 +00:00
Luis Ramos
db6d39cedd Merge pull request #3277 from openfoodfoundation/revert-3246-2-0-create-variants 
Revert "[Spree Upgrade] Set on_demand default value to false in test factories"
 2019-01-07 11:46:37 +00:00
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