Lynne Davis
|
79ea2fd39d
|
Reverse email address
|
2016-10-03 16:54:15 +01:00 |
|
Lynne Davis
|
84b4a9bcbe
|
update to internationalise email address in sell page
|
2016-09-25 14:00:11 +01:00 |
|
Rob Harrington
|
7d149ed198
|
Revert shop property filters - causing 10x slowdown
This commit reverts commits 7eeee78c4e to e8f96e4818 (inclusive)
|
2016-09-18 17:46:43 +10:00 |
|
Rohan Mitchell
|
e8f96e4818
|
When a shop is open, only show taxon badges for currently open order cycles
|
2016-09-16 11:47:45 +10:00 |
|
Rohan Mitchell
|
3ca42ae055
|
Extract ids_to_objs to SerializerHelper
|
2016-09-16 11:36:27 +10:00 |
|
Rohan Mitchell
|
c0db23af90
|
Spree::Taxon.distributed_taxons can be scoped to taxons in open order cycles
|
2016-09-16 11:36:27 +10:00 |
|
Rohan Mitchell
|
db583df198
|
Use inner join for Spree::Taxon.distributed_taxons
|
2016-09-16 11:36:27 +10:00 |
|
Rohan Mitchell
|
306bd25dd9
|
EnterpriseSerialiser shows current properties for open shops and all properties for closed shops
|
2016-09-16 11:36:27 +10:00 |
|
Rohan Mitchell
|
f98b25b719
|
Add Spree::Property.ever_sold_by
|
2016-09-16 11:36:27 +10:00 |
|
Rohan Mitchell
|
1bc477f6b1
|
Add ProducerProperty.ever_sold_by
|
2016-09-16 11:36:26 +10:00 |
|
Rohan Mitchell
|
c37bf3d077
|
Rename Property#sold_by and ProducerProperty#sold_by to currently_sold_by
|
2016-09-16 11:36:26 +10:00 |
|
Rohan Mitchell
|
3a2e0b7eff
|
Fix spacing
|
2016-09-16 11:36:26 +10:00 |
|
Rohan Mitchell
|
38c63fc88b
|
Available producer filters update when taxon filter changed
|
2016-09-16 11:36:26 +10:00 |
|
Rohan Mitchell
|
8ec2ebbf94
|
Swap to using multi-line selectors for property filters - z-index issues with single-line-selectors
|
2016-09-16 11:36:26 +10:00 |
|
Rohan Mitchell
|
e00846776e
|
Client-side, always show properties by their presentation, not their name
|
2016-09-16 11:36:26 +10:00 |
|
Rohan Mitchell
|
8339d247f8
|
Shops on groups page filter by property
|
2016-09-16 11:36:26 +10:00 |
|
Rohan Mitchell
|
ed2522f6d2
|
Explicitly specify supplied or distributed properties for ng filters: properties, propertiesOf
|
2016-09-16 11:36:26 +10:00 |
|
Rohan Mitchell
|
63ef5de0e5
|
Use short syntax for render partial
|
2016-09-16 11:28:45 +10:00 |
|
Rohan Mitchell
|
38d5682762
|
Add property filters for shops
|
2016-09-16 11:28:45 +10:00 |
|
Rohan Mitchell
|
4c40219352
|
Move hubs partials from home to shops, their rightful home
|
2016-09-16 11:28:45 +10:00 |
|
Rohan Mitchell
|
7eeee78c4e
|
WIP: Move hubs partials from home to shops, their rightful home
|
2016-09-16 11:28:45 +10:00 |
|
Rob Harrington
|
0760d4cc1f
|
Fixing property filters on shopfront
|
2016-09-08 12:15:36 +10:00 |
|
Rob Harrington
|
261a574da9
|
Tweaking styling on enterprise change form, and dashboard header row
|
2016-09-07 11:13:48 +10:00 |
|
Rob Harrington
|
da55eb6d27
|
Form for changing enterprise type specifies trial length
|
2016-09-07 11:13:05 +10:00 |
|
Rob Harrington
|
be51a55f16
|
Only display shopfront trial message on dashboard page. Fixes #1120
|
2016-09-02 13:45:49 +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 |
|
Rob Harrington
|
1059c170d1
|
Adding require_relative of Gateway decorator in attempt to fix inheritance for Gateway::PayPalExpress
|
2016-08-31 11:32:09 +10:00 |
|
Rohan Mitchell
|
08465a531d
|
Make properties and propertiesOf filters compatible with both products and enterprises
|
2016-08-26 12:13:48 +10:00 |
|
Rohan Mitchell
|
58e0b95cf6
|
Show property badges on shops
|
2016-08-26 12:13:48 +10:00 |
|
Rohan Mitchell
|
7b5e8fa603
|
Rename API field properties to supplied_properties
|
2016-08-26 12:13:47 +10:00 |
|
Rohan Mitchell
|
c70993ce75
|
Find producer properties of items sold by a shop
|
2016-08-26 12:13:47 +10:00 |
|
Rohan Mitchell
|
aa6e7cba30
|
Do not return duplicates with Spree::Property.sold_by
|
2016-08-26 12:13:47 +10:00 |
|
Rohan Mitchell
|
4529ced3f2
|
Find properties of items sold by a shop
|
2016-08-26 12:13:47 +10:00 |
|
Rohan Mitchell
|
701c047a0a
|
Move our customisations of FlatPercentItemTotal calculator to a new calc: FlatPercentPerItem
|
2016-08-26 09:28:29 +10:00 |
|
Rohan Mitchell
|
b0eebc2e45
|
Round FlatPercentItemTotal calcs per-item before summing full quantity
|
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 |
|
Maikel Linke
|
c34e9c046b
|
Remove quotes around url
|
2016-08-17 16:44:27 +10:00 |
|
Bing Xie
|
ed1f05e674
|
Show successful message
|
2016-08-12 16:31:49 +10:00 |
|
Bing Xie
|
bdb2b5cce8
|
Style and i18n the edit address page
|
2016-08-12 14:44:59 +10:00 |
|
Bing Xie
|
22ccbd5556
|
Required fields validation
|
2016-08-12 14:44:59 +10:00 |
|
Bing Xie
|
81d9ec71d9
|
Front-end updating address function
|
2016-08-12 14:44:59 +10:00 |
|
Bing Xie
|
45e3f8ab3a
|
Fill the from with model
|
2016-08-12 14:44:59 +10:00 |
|
Bing Xie
|
5b40c745f3
|
Add address serializer to customer serializer
|
2016-08-12 14:44:59 +10:00 |
|
Bing Xie
|
69addf056b
|
Edit customer address form
|
2016-08-12 14:44:59 +10:00 |
|
Bing Xie
|
d160142945
|
Make bill address and ship address as nested attributes
|
2016-08-12 14:44:59 +10:00 |
|
Bing Xie
|
8234956a61
|
Inject available countries on admin customers page
|
2016-08-12 14:44:59 +10:00 |
|
Bing Xie
|
225bed9990
|
Add a simple edit address dialog
|
2016-08-12 14:44:59 +10:00 |
|
Bing Xie
|
7f203f5491
|
Show billing address and shipping address on customers index page
|
2016-08-12 14:44:59 +10:00 |
|