raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-13 23:37:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,896 Commits 19 Branches 453 Tags
4669c71b19afa3211df9be3216b23f2ab1db05c5
Commit Graph

10896 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
luisramos0
4669c71b19 Fix lettuce_share_report_spec by adapting count_on_hand setter, it's not a db column anymore 2019-01-20 20:40:14 +00:00
luisramos0
5d86d3769e Improve variable names in lettuce_share_report_spec 2019-01-20 20:40:14 +00:00
Pau Pérez Fabregat
b05b2c3a5a Merge pull request #3254 from coopdevs/add-default-stock-location 
[Spree Upgrade] Create the default StockLocation in DB
 2019-01-16 12:57:45 +01:00
Pau Pérez Fabregat
d37d964ab9 Merge pull request #3311 from luisramos0/2-0-stable-jan-11th 
[Spree Upgrade] Merging master into 2-0-stable (second run in Jan2019)
 2019-01-16 12:32:52 +01:00
Pau Perez
5b8c0dffe2 Remove test for a state that is no longer possible 2019-01-11 16:39:06 +01:00
Pau Perez
817bf4caa1 Explain why a index forbids more than a location 2019-01-11 16:39:06 +01:00
Pau Perez
10a678bdfe Rely on Spree's default StockLocation 2019-01-11 16:39:06 +01:00
Pau Perez
730d5ff7d6 Include the default location in seed data 
This ensures that new OFN instances will have the proper stock location
set up.
 2019-01-11 15:52:25 +01:00
Pau Perez
9ebe112bcc Abstract OFN's default stock location into a class 2019-01-11 15:52:09 +01:00
luisramos0
9ab99f13c4 Merge branch 'master' into 2-0-stable-jan-11th 2019-01-11 11:58:24 +00:00
Maikel
4920782742 Merge pull request #3072 from luisramos0/2-0-calc-line-items-for-take-2 
Fix bug on calculator_decorator line_items_for where input is line_item with a nil order
 2019-01-11 14:49:25 +11:00
Maikel
ab14b73e17 Merge pull request #3211 from openfoodfoundation/dependabot/bundler/blockenspiel-0.5.0 
Bump blockenspiel from 0.4.5 to 0.5.0
 2019-01-11 10:42:40 +11:00
Maikel
fff054efc1 Merge pull request #3169 from luisramos0/hubPermissions 
Add guard clause on variant overrides filter in case hub id is not present in the hubPermissions
 2019-01-11 10:41:57 +11:00
Maikel
6c3d769121 Merge pull request #3229 from mkllnk/3127-tax-rates-report 
3127 More robust tax rates report
 2019-01-11 10:41:12 +11:00
Maikel
935e233605 Merge pull request #3244 from luisramos0/ruby-racer 
Revert to the ruby racer
 2019-01-11 10:40:02 +11:00
Maikel
4f5bb96484 Merge pull request #3300 from openfoodfoundation/transifex 
Transifex
 2019-01-10 17:52:28 +11:00
Transifex-Openfoodnetwork
15e197b3b0 Updating translations for config/locales/en_GB.yml 2019-01-10 07:31:46 +11:00
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