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
15,608 Commits 18 Branches 452 Tags
20c41ce69e04299a6bf821094de21f63f678dcc2
Commit Graph

15608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt-Yorkley
86231672a6 Merge pull request #4703 from openfoodfoundation/daniellemoorhead-patch-1 
Updated shopfront message placeholder for home tab
 2020-01-23 12:32:08 +01:00
Luis Ramos
e47bd019a1 Merge pull request #4656 from mkllnk/config 
Use strings for all environment variables
 2020-01-23 11:07:17 +00:00
Matt-Yorkley
0011caccc6 Update all locales with the latest Transifex translations 2020-01-23 11:45:58 +01:00
Matt-Yorkley
ad5a599ddf Merge pull request #4710 from openfoodfoundation/transifex 
Transifex
 2020-01-23 11:37:10 +01:00
Luis Ramos
43d7609b81 Merge pull request #4707 from Matt-Yorkley/mobile-checkout-tabs 
Remove tabs from cart and checkout
 2020-01-23 10:19:50 +00:00
Transifex-Openfoodnetwork
56d17bca6a Updating translations for config/locales/nb.yml 2020-01-23 19:43:37 +11:00
Transifex-Openfoodnetwork
7f4e53f411 Updating translations for config/locales/fr.yml 2020-01-23 19:41:23 +11:00
Transifex-Openfoodnetwork
bd16b80d5f Updating translations for config/locales/en_FR.yml 2020-01-23 19:38:34 +11:00
Transifex-Openfoodnetwork
c8a1f9b93c Updating translations for config/locales/fr.yml 2020-01-23 19:38:12 +11:00
Maikel
9a8cd60d5a Merge pull request #4694 from Matt-Yorkley/rails-4-prep-routes 
Rails 4 prep: spree routes
 2020-01-23 17:42:37 +11:00
Maikel
4d11dced39 Merge pull request #4687 from openfoodfoundation/dependabot/bundler/ddtrace-0.31.1 
Bump ddtrace from 0.31.0 to 0.31.1
 2020-01-23 16:35:38 +11:00
Maikel Linke
bd67d63b63 Restore payment error feedback 2020-01-23 16:20:07 +11:00
Maikel Linke
6763012ee9 Rescue unknown checkout errors 2020-01-23 16:20:07 +11:00
Maikel
de2f09db75 Merge pull request #4698 from openfoodfoundation/transifex 
Transifex
 2020-01-23 15:59:36 +11:00
Luis Ramos
494cb00774 Merge pull request #4585 from luisramos0/backend_partial_calc_fields 
Bring spree_backend calculator fields partial to OFN
 2020-01-22 20:27:10 +00:00
Luis Ramos
d782bea458 Merge pull request #4633 from luisramos0/fix_prod_link_bug 
Fix bug in frontoffice order details where the product image was a broken link
 2020-01-22 20:25:24 +00:00
luisramos0
766303b332 Add required payment_helper from spree_backend 2020-01-22 20:22:28 +00:00
luisramos0
74226fbdf8 Fix one rubocop issue and update rubocop todo manual for the new controller 2020-01-22 20:22:28 +00:00
luisramos0
dc5374e284 Merge filter_payment_methods and load_data 2020-01-22 20:21:21 +00:00
luisramos0
f6ecf57737 Make before filters easier to understand using the fact that there are only index, create, new and fire actions in this controller 2020-01-22 20:21:21 +00:00
luisramos0
940953b043 Add missing translations for payments 2020-01-22 20:21:21 +00:00
luisramos0
fbc5887fa6 Bring payments routes from spree_backend 2020-01-22 20:21:21 +00:00
luisramos0
61ce849546 Merge spree/admin/payments_controller with its decorator and fix a few rubocop issues 2020-01-22 20:21:21 +00:00
luisramos0
afddaed9fc Add empty but needed payments templates for check payment method 2020-01-22 20:21:21 +00:00
luisramos0
12158d73fa Add payments_controller from spree_backend so that we can now merge it with the OFN's decorator 2020-01-22 20:21:21 +00:00
Matt-Yorkley
5f3abbf00e Refactor BaseController 2020-01-22 12:17:23 +01:00
Matt-Yorkley
a02c58e231 Add join_table to enterprise groups relation 
has_and_belongs_to_many relationships now require a join_table
 2020-01-22 12:17:23 +01:00
Matt-Yorkley
59ebfb9bd4 Fix subquery errors triggered by #warn_invalid_order_cycles 2020-01-22 12:17:23 +01:00
Matt-Yorkley
57ca1d54bb Fix issue with each_serializer not being called in some cases in Rails 4. 2020-01-22 12:17:23 +01:00
Matt-Yorkley
444747c8b2 Split shopping_shared/details partial into header and tabs partials and only include tabs in shop page (not cart and checkout). 2020-01-22 11:30:43 +01:00
Danni M
95f51e2db9 Updated shopfront message placeholder 
Change required now that there is a home tab instead of a green shopfront message.

>An optional message to welcome customers and explain how to shop with you. If text is entered here it will be displayed in a home tab when customers first arrive at your shopfront.
 2020-01-22 14:24:20 +11:00
Transifex-Openfoodnetwork
0463e05296 Updating translations for config/locales/pt_BR.yml 2020-01-22 10:35:12 +11:00
Transifex-Openfoodnetwork
f176e2ba91 Updating translations for config/locales/pt_BR.yml 2020-01-22 10:32:03 +11:00
luisramos0
cccff6b500 Remove unused methods from navigation helper 2020-01-21 22:51:23 +00:00
luisramos0
b4e6c5307e Convert orders submenu partial to haml 2020-01-21 22:51:23 +00:00
luisramos0
fb4f96eb4a Remove unused submenu entries from _tabs partial and convert hash syntax 2020-01-21 22:51:23 +00:00
luisramos0
27572cbe68 Remove alias_method klass_for_with_sym_fallback 2020-01-21 22:49:55 +00:00
luisramos0
8a912d6f02 Remove redundant method tab_with_cancan_check 
This was introduced to work with previous versions of spree
 2020-01-21 22:49:55 +00:00
luisramos0
cd7f97b01d Fix rubocop issues in nav helper 2020-01-21 22:49:55 +00:00
luisramos0
1b18595d94 Merge navigator_helper with decorator 2020-01-21 22:49:55 +00:00
Maikel Linke
30888a9e59 Stabilise spec by not creating noise data 
We were using a more complex order factory that created more data than
we needed. The order contained a second line item and therefor the
manifest had two items as well. Sometimes we would pick the wrong one.
 2020-01-22 09:49:37 +11:00
luisramos0
8987121058 Add navigation helper from spree_backend 2020-01-21 22:48:44 +00:00
Luis Ramos
6bb4f2477c Merge pull request #4586 from luisramos0/states_erb 
Make states/new.js template depend on the states/new.haml template in OFN (not the states/new.erb in spree)
 2020-01-21 22:47:28 +00:00
Matt-Yorkley
cca824f207 Ensure routes declared with match specify a method 2020-01-20 17:32:00 +01:00
Matt-Yorkley
147f7d4850 Separate non-report routes from reports route list for clarity 2020-01-20 17:30:46 +01:00
Matt-Yorkley
8024dcec64 Merge double Spree routes declarations into one 
The app has a lot of problems with this in Rails 4
 2020-01-20 17:27:26 +01:00
Matt-Yorkley
dfee9b6c6b Relax two codeclimate SCSS rules 2020-01-20 15:08:20 +01:00
Luis Ramos
1c3fd26eef Merge pull request #4655 from Matt-Yorkley/mobile-shoptabs 
Mobile: shop tabs
 2020-01-20 08:51:59 +00:00
Matt-Yorkley
f8145f8429 Update shop tab button styling in mobile 2020-01-19 15:59:37 +01:00
Matt-Yorkley
a1256f9aeb Remove old green box styling from shopfront messages 2020-01-19 15:57:01 +01:00