Rohan Mitchell
f4f38b4183
Re-apply shop property filters - including performance regression
...
This reverts commit 7d149ed198
2016-11-25 14:14:42 +11:00
Rohan Mitchell
5913004e14
Fix datepicker error parsing date
2016-11-09 11:47:57 +11:00
Rohan Mitchell
a0b740f52d
Generalise fix for missing EnterpriseFee::Calculator to any use of calculated_adjustments
2016-11-04 09:39:17 +11:00
Maikel Linke
b66cf14bcb
Merge remote-tracking branch 'origin/master' into transifex
...
Conflicts:
config/locales/en_GB.yml
2016-10-28 15:21:03 +11:00
Transifex-Openfoodnetwork
b78739f777
Updating translations for config/locales/it.yml [skip ci]
2016-10-21 22:51:27 +11:00
Bing Xie
63617f80c5
Add confirm when delete customer
2016-10-21 10:51:36 +11:00
Bing Xie
bc798504e0
Add new enterprise customers search API
2016-10-21 10:51:36 +11:00
Bing Xie
8afbdcaf79
Move phone down
2016-10-21 10:51:36 +11:00
Bing Xie
3e590f92ff
Set default billing address and shipping address
2016-10-21 10:51:36 +11:00
Transifex-Openfoodnetwork
7cfb25ace9
Updating translations for config/locales/en_GB.yml [skip ci]
2016-10-15 01:48:24 +11:00
Transifex-Openfoodnetwork
33d940c736
Updating translations for config/locales/fr.yml [skip ci]
2016-10-12 01:03:42 +11:00
Maikel Linke
08b9b50f33
Re-phrase shop options
2016-10-07 13:17:28 +11:00
Maikel Linke
c59cd21698
Add option 'allow guest orders' to enterprise
...
An enterprise manager can choose to allow guest orders (default) or
require a valid login for checkout.
2016-10-05 14:04:08 +11:00
Maikel Linke
92694c729f
Move 'shopfront requires login' setting
...
Move 'shopfront requires login' setting to 'shop preferences' tab in
Profile Edit.
Solves issue #901 .
2016-10-05 14:04:08 +11:00
Lynne Davis
a3722dee80
delete file - fix conflict
2016-10-04 15:29:57 +01:00
Transifex-Openfoodnetwork
b349c28b9b
Updating translations for config/locales/nb.yml [skip ci]
2016-10-02 00:38:02 +10:00
Maikel Linke
fba72498e3
Merge remote-tracking branch 'origin/master' into transifex
2016-09-21 16:36:22 +10:00
Lynne Davis
c533f6a15e
Updates to UK translations
2016-09-19 20:33:58 +01:00
Transifex-Openfoodnetwork
23a216004e
Updating translations for config/locales/en_GB.yml [skip ci]
2016-09-20 01:02:27 +10:00
Rob Harrington
7d149ed198
Revert shop property filters - causing 10x slowdown
...
This commit reverts commits 7eeee78c4ee8f96e4818
2016-09-18 17:46:43 +10:00
Rohan Mitchell
38d5682762
Add property filters for shops
2016-09-16 11:28:45 +10:00
Rob Harrington
b2e14711ac
Gateway providers inherit from decorated Gateway and PaymentMethod classes in production
...
Achieved by requiring payment method and gateway decorators in Spree initializer
2016-08-31 12:43:22 +10:00
Rohan Mitchell
509564819a
Remove FlatPercentPerItem calculator for shipping methods and payment methods to reduce confusion
2016-08-26 10:26:50 +10:00
Rohan Mitchell
308c24caf4
Add FlatPercentPerItem calculator for shipping methods, remove FlatPercentItemTotal for enterprise fees (causes shopfront cart discrepencies).
2016-08-26 09:29:09 +10:00
Rohan Mitchell
701c047a0a
Move our customisations of FlatPercentItemTotal calculator to a new calc: FlatPercentPerItem
2016-08-26 09:28:29 +10:00
Continuous Integration
88b9514090
Merge remote-tracking branch 'origin/master' into HEAD
2016-08-24 11:18:41 +10:00
Bing Xie
e5d7b545c9
I18n and refactoring
2016-08-24 10:43:50 +10:00
Maikel Linke
c4f81b019e
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into sign_up_email_i18n
2016-08-19 09:27:17 +10:00
Transifex-Openfoodnetwork
528af8759d
Updating translations for config/locales/nb.yml [skip ci]
2016-08-19 01:23:43 +10:00
Transifex-Openfoodnetwork
baeabdd668
Updating translations for config/locales/nb.yml [skip ci]
2016-08-12 19:53:12 +10:00
Transifex-Openfoodnetwork
1de2300099
Updating translations for config/locales/nb.yml [skip ci]
2016-08-12 19:07:43 +10:00
Transifex-Openfoodnetwork
53e8056450
Updating translations for config/locales/fr.yml [skip ci]
2016-08-12 18:56:13 +10:00
Transifex-Openfoodnetwork
5773876cbc
Updating translations for config/locales/fr.yml [skip ci]
2016-08-12 17:26:28 +10:00
Bing Xie
7f203f5491
Show billing address and shipping address on customers index page
2016-08-12 14:44:59 +10:00
Maikel Linke
8645144231
Merge remote-tracking branch 'origin/master' into transifex
2016-08-10 21:01:12 +10:00
Maikel Linke
d40733d447
Add redirects to global site for /connect, /learn
2016-08-07 10:24:07 +10:00
Rohan Mitchell
5eecdb8c9c
Update footer: Link to sell instead of individual register links
2016-08-05 15:03:07 +10:00
Rohan Mitchell
3b0084025a
Add copy for home page learn and connect panes
2016-08-05 15:02:44 +10:00
Rohan Mitchell
61c9355ffb
Fill in sell page copy
2016-08-05 14:40:42 +10:00
Rohan Mitchell
0830a5bd85
Add basic sell page
...
Conflicts:
config/routes.rb
2016-08-05 12:33:09 +10:00
Rohan Mitchell
f03839b70c
Update shopping header
2016-08-03 16:07:15 +10:00
Rohan Mitchell
1216da38d1
Update menu: [Groups, About] -> [Connect, Learn]
2016-08-03 16:07:15 +10:00
Transifex-Openfoodnetwork
4d1a5c6ffc
Updating translations for config/locales/en_GB.yml [skip ci]
2016-08-01 21:47:34 +10:00
Rohan Mitchell
0b84afd67a
Display property filters for producers
2016-07-29 11:01:51 +10:00
Rohan Mitchell
377074416e
Remove CMS tables. Adds migration helper: drop_table_cascade
2016-07-29 09:18:30 +10:00
Rohan Mitchell
932edeb1c1
Remove CMS style shim - Spree/CMS compatibility
2016-07-29 09:18:30 +10:00
Rohan Mitchell
d3ad823d97
Remove CMS configuration, gem. Fix permalink check dependent on CMS glob path.
2016-07-29 09:18:30 +10:00
Lynne Davis
9e03a130c2
Updating GB translation, from transifex
2016-07-27 18:43:48 +01:00
Maikel Linke
84c434c279
Remove unused/broken multi-cart feature and views
...
This removes ten old overrides of the Spree view. Since the Spree view
is not used any more and got completely replaced by custom views, the
overrides were just adding noise to the code base.
2016-07-22 13:49:20 +10:00
Transifex-Openfoodnetwork
2b7da4738c
Updating translations for config/locales/nb.yml [skip ci]
2016-07-22 00:59:57 +10:00
