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
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
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
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
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
Maikel Linke
c4f81b019e
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into sign_up_email_i18n
2016-08-19 09:27:17 +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
b08a642377
Add billing_address and shipping_address to Customer
2016-08-12 14:44:59 +10:00
Rohan Mitchell
e966b474b4
Remove order cycles feature toggle
2016-08-03 16:07:11 +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
f733c7f207
Include shop enterprise on shop front
2016-07-06 12:45:12 +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
Continuous Integration
5fb5ef1974
Auto-merge from CI [skip ci]
2016-07-02 00:58:27 +10:00
Maikel Linke
c253d73d11
Refactoring with feedback on pr #1073
2016-06-29 15:46:51 +10:00
Maikel Linke
08fdc8a5bd
Load producers of all or selected order cycles into shop
2016-06-29 12:57:09 +10:00
Rohan Mitchell
58379a5e28
Extract property merging to lib class
2016-06-24 07:57:06 +10:00
Rohan Mitchell
4338f632f6
Add scope: Spree::Property.applied_by
2016-06-24 07:57:06 +10:00
Lynne
36093c0f64
Merge pull request #1045 from lin-d-hop/sign_up_email_i18n
...
Sign up email i18n
Merging so that I can test emails on UK staging.
2016-06-20 17:29:37 +01:00
Lynne Davis
f37f89dd07
Adding Community forum to ContentConfig
2016-06-20 15:13:49 +01:00
Rob Harrington
6586e67a5c
Better messaging around deletion of customers
2016-06-17 14:47:04 +10:00
Maikel Linke
db3637fe84
Allow removing customer codes
2016-06-10 18:14:19 +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
6dd05ca4da
Intermittent fail hunting
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
607b674c57
Refactoring tag rule logic, placing in TagRuleApplicator lib class
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
70e6428c1f
Adding FilterOrderCycle tag rule
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
3fb6fba0f0
Adding payment method tag rule logic to Spree::Order.available_payment_methods
2016-05-27 16:25:10 +10:00
Rob Harrington
e553b8c590
Adding filter payment method tag rule logic
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
1cb51b5c71
CodeClimate fixes for filter-products branch
2016-05-27 16:23:26 +10:00
Rob Harrington
50738f28e9
Refactoring tag rule application
...
To allow rules to be loaded and counted before being checked for relevance
2016-05-27 16:23:26 +10:00
Rob Harrington
8b8da33ffc
Further refinements to FilterProducts tag rule
2016-05-27 16:23:26 +10:00
Rob Harrington
17fa0d2baf
Adding tag rule logic for filtering products
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
8a77062888
Include transaction fees in reports
2016-05-27 14:40:22 +10:00
Maikel Linke
e3b43243cc
Add line_items getter to Payment
...
The calculator of a payment method calls `line_items` on the payment.
The code got copied from Spree::Shipment.
2016-05-27 11:30:07 +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
