Rohan Mitchell
9b656eaf4f
Property / ProducerProperty changes update distributor enterprise cache
2016-11-25 14:14:42 +11:00
Rohan Mitchell
22080a9a08
Property / ProducerProperty changes update supplier enterprise cache
2016-11-25 14:14:42 +11:00
Rohan Mitchell
1ea4f4274c
Add enterprise cache invalidation for order cycle changes
2016-11-25 14:14:42 +11:00
Rohan Mitchell
bd11c6ce14
New hash style
2016-11-25 14:14:42 +11:00
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
b7e9ffc9da
Fix enterprise user being denied access to admin when spree dash configured (as on production)
2016-11-24 13:35:49 +11:00
Rohan Mitchell
46fcf7b62e
Fix enterprise group save error - initialise address correctly
2016-11-04 09:39:17 +11:00
Rohan Mitchell
7d79fffa33
Reinstate Spree::PaymentMethod::DISPLAY (removed in Spree but used by us)
2016-11-04 09:39:17 +11:00
Rohan Mitchell
fdd6400cb8
Fix perms for API soft delete
2016-11-04 09:39:17 +11:00
Rohan Mitchell
a6a0bdb063
Sanitize values before they're used
2016-11-04 09:39:17 +11:00
Rohan Mitchell
d890770104
Order state transition condition removed in Spree
2016-11-04 09:39:17 +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
Rohan Mitchell
0d4c4f20df
Fix missing EnterpriseFee::Calculator error
...
Conflicts:
app/models/enterprise_fee.rb
2016-11-04 09:39:17 +11:00
Rohan Mitchell
9989b76b7d
Integrate from Spree fork: Calculators work against LineItems
2016-11-04 09:39:17 +11:00
Bing Xie
77f43e3ca7
Refactor setting default addresses
2016-10-21 10:51:36 +11:00
Bing Xie
f14ca87eb5
Set new address for user
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
fd32152e88
Search customers in enterprises
2016-10-21 10:51:36 +11:00
Bing Xie
f7523ad88c
Create customer with default name and addresses
2016-10-21 10:51:36 +11:00
Bing Xie
ae2357d309
Edit customer address with first name and last name
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
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
