Rohan Mitchell
69382c4c13
Move properties filter dropdown in front of search results
2016-07-29 11:01:51 +10:00
Rohan Mitchell
0b84afd67a
Display property filters for producers
2016-07-29 11:01:51 +10:00
Rohan Mitchell
6f947380cb
Remove unused overrides and views
2016-07-29 09:18:31 +10:00
Rohan Mitchell
eb8cedc497
Remove CMS views and overrides
2016-07-29 09:14:36 +10: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
Maikel Linke
ddb54d1924
Delete fee on payment method if payment invalid
...
PayPalExpress is always creating two payments. The first one is
invalidated and the second one succeeds. Without deleting the old fee on
the invalidated payment, the order lists the fee twice.
2016-07-15 17:43:26 +10:00
Maikel Linke
af6d0ec107
Remove unused code from order confirmation page
2016-07-13 13:54:55 +10:00
Maikel Linke
e693f71775
Inject only needed enterprises into order confirmation page
2016-07-13 13:54:32 +10:00
Maikel Linke
b5bc3a4ca3
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into enterprise-load
2016-07-13 10:01:16 +10:00
Maikel Linke
52f68dac33
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into enterprise-load
2016-07-06 11:35:26 +10:00
Maikel Linke
f984871b23
Inject only needed enterprises into cart and checkout
2016-07-06 11:14:13 +10:00
Rohan Mitchell
f586dbc3e1
Extract OSM tile setup to own directive
2016-07-06 10:44:19 +10:00
Rohan Mitchell
9cc0bb831a
Show properties alongside taxons on producer fat view
2016-06-24 07:57:06 +10:00
Rohan Mitchell
aae1689a27
Show product properties on producers page
2016-06-24 07:57:06 +10:00
Maikel Linke
e284ad62b2
Inject only relative enterprises into shopfront
...
Other shops displayed in producer modals are lazy loaded when opening
their modal.
2016-06-17 17:15:16 +10:00
Rob Harrington
a909f0ddb8
Merge remote-tracking branch 'origin/master' into pr/1033
2016-06-16 15:12:30 +10:00
Rob Harrington
25cdd4af8e
Preventing shop from being changed when unsaved customer changes exist
...
Also making layout of filters on customer index more consistent with other pages
2016-06-16 15:10:16 +10:00
Continuous Integration
9ba07a2afb
Merge remote-tracking branch 'origin/master' into HEAD
2016-06-15 11:26:02 +10:00
Rob Harrington
c8c8f0d02d
Removing old cancel button from bottom of OC forms
2016-06-15 10:51:34 +10:00
Bing Xie
82dc2a8c98
Update bulk products editing page
2016-06-15 10:51:34 +10:00
Bing Xie
001ae19b26
Update create and update order cycle page save-bar
2016-06-15 10:51:34 +10:00
Bing Xie
c003dcded9
Update editing enterprise page save-bar
2016-06-15 10:51:34 +10:00
Bing Xie
41837eb31d
Tweak create order cycle spec
2016-06-15 10:51:34 +10:00
Bing Xie
860a537f30
Add save bar to bulk editing product page
2016-06-15 10:51:34 +10:00
Bing Xie
d8bf66a6c9
Use save bar on enterprise editing page
2016-06-15 10:51:34 +10:00
Bing Xie
2065d81bb4
Use save bar directive in enterprise editing page
2016-06-15 10:51:34 +10:00
Bing Xie
baa6fda3e0
Use save bar in create order cycle page
2016-06-15 10:51:34 +10:00
David Ajnered
fb33be78dd
#591 show selected hub dropdown on customers page and enable easy switch to different hub
2016-06-10 15:42:40 +02:00
Maikel Linke
cb679a6aba
Remove duplicate "What's this?" from order cycles overview
2016-06-10 09:18:26 +10:00
Maikel Linke
ad1ef877c0
Warn about duplicate customer codes
...
The admin customer page displays a warning you change a code to an
existing one.
2016-06-10 09:09:56 +10:00
Continuous Integration
ee10a4b173
Merge remote-tracking branch 'origin/master' into HEAD
2016-06-01 12:16:10 +10:00
Rob Harrington
98f8f7b89f
Adding new help-modal dialog, use for explaining tag rule UI
2016-05-28 01:16:07 +10:00
Rob Harrington
7028fbe288
Find current_customer via current_distributor and current_user rather than current_order
...
Moving available_payment_methods to enterprises_helper, as per available_shipping_methods
2016-05-28 00:31:59 +10:00
Rob Harrington
12e685bd92
Restricting number of tags for tag rules to one
2016-05-27 16:25:10 +10:00
Rob Harrington
a1c7a44fa0
Tag Rules can be rearranged in UI to set priority
2016-05-27 16:25:10 +10:00
Rob Harrington
fa3b43a970
Adding default tag rules
2016-05-27 16:25:10 +10:00
Rob Harrington
bf0db2287b
More structured layout for Tag Rules UI
2016-05-27 16:25:10 +10:00
Rob Harrington
5624fa0c5e
Adding FilterOrderCycles tag rules to UI
2016-05-27 16:25:10 +10:00
Rob Harrington
10434f5ee3
Renaming class
2016-05-27 16:25:10 +10:00
Rob Harrington
9dc1294ec5
Outgoing exchanges can be tagged
...
Using panels infrastructure to display tags and products interfaces
2016-05-27 16:25:10 +10:00
Rob Harrington
e81858c0dc
Renaming PanelToggleRow to PanelCtrl
2016-05-27 16:25:10 +10:00
Rob Harrington
8035b3f24a
Refactoring admin table panels infrastructure
...
Updating enterprise index
2016-05-27 16:25:10 +10:00
Rob Harrington
e999b5715a
Adding FilterPaymentMethods rules to tag rule UI
2016-05-27 16:25:10 +10:00
Rob Harrington
4d83bf2135
Payment methods can be tagged
2016-05-27 16:25:10 +10:00
Rob Harrington
385fd91e70
Adding angularjs payment method controller, updating payment method edit form
2016-05-27 16:25:10 +10:00
Rob Harrington
c61cb1bdcd
Renaming paymentMethodCtrl to paymentMethodsCtrl
2016-05-27 16:23:26 +10:00
Rob Harrington
eedb2854ec
Adding FilterProducts rules to tag rule UI
2016-05-27 16:23:26 +10:00
Rob Harrington
3f8420b0e9
Adding tags to variant overrides
2016-05-27 16:23:26 +10:00
Maikel Linke
0af8377844
Add payment method fees to order during checkout
...
The fee is displayed as "Transaction fee".
2016-05-25 14:56:52 +10:00
Maikel Linke
03f98af60b
Merge remote-tracking branch 'origin/master' into uk/spree-google-analytics
2016-05-25 10:05:09 +10:00
