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
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
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
24d0e4fcf8
Update specs for calculator change
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
Rohan Mitchell
b0eebc2e45
Round FlatPercentItemTotal calcs per-item before summing full quantity
2016-08-26 09:28:29 +10:00
Bing Xie
95c152420c
Test customer model updating shipping address
2016-08-12 14:44:59 +10:00
Rohan Mitchell
e966b474b4
Remove order cycles feature toggle
2016-08-03 16:07:11 +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
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
607b674c57
Refactoring tag rule logic, placing in TagRuleApplicator lib class
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
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
Maikel Linke
a624a57bfb
Pass current order to PaymentMethodSerializer
2016-05-25 17:12:47 +10:00
Maikel Linke
16b80a2f1b
Extend PaymentMethod with calculated_adjustments
2016-05-25 14:56:52 +10:00
Rob Harrington
1d8719b474
Default column visibility can be set per user using ColumnPreferences model
2016-05-25 08:10:20 +10:00
Rob Harrington
6a610ff7a4
Merge remote-tracking branch 'origin/master' into uk/trial-length
2016-05-20 12:22:47 +10:00
Rob Harrington
6a3f6e7bfa
Revert "Add line item included_tax_amount method to multiply by quantity"
...
This reverts commit 547fcf49e0
2016-05-20 09:46:31 +10:00
Steve Pettitt
547fcf49e0
Add line item included_tax_amount method to multiply by quantity
2016-05-14 11:00:13 +01:00
Continuous Integration
f90e7d3239
Merge remote-tracking branch 'origin/master' into HEAD
2016-05-06 13:58:37 +10:00
Rob Harrington
1d7308bf5d
More intuitive logic for minimum billable turnover
2016-04-29 18:03:32 +10:00
Rohan Mitchell
8f8a1191cb
Remove stock cap on max_quantity
2016-04-27 12:27:24 +10:00
Steve Pettitt
ad6037ac63
Fix user spec, check config is set
2016-04-26 04:21:50 +01:00
Steve Pettitt
53d50f16d6
Merge current master
2016-04-26 03:18:27 +01:00
Maikel Linke
2367b73d3a
Revert "Associate new users with existing customer records"
...
This reverts commit a25f4fdf44
2016-04-22 14:55:43 +10:00
Rohan Mitchell
5151779f80
When update is for another line item, still update all stock levels and show warnings
2016-04-21 09:36:23 +10:00
Rohan Mitchell
b2d78e7df6
Set allow_backorders explicitly for consistency in CI
2016-04-21 09:36:23 +10:00
Rohan Mitchell
8695dea0a5
Remove variant from cart when it becomes out of stock
2016-04-21 09:36:23 +10:00
Rohan Mitchell
792e17c385
When removing variant from order, if not found then do nothing
2016-04-21 09:36:23 +10:00
Rohan Mitchell
292d027498
When adding an item to cart with not enough stock, add as much as we can without erroring
2016-04-21 09:36:22 +10:00
Lynne Davis
240be2be0f
Updating specs to explore the cases around zero turnover with fixed rate and minimum billable turnover
2016-04-15 16:56:09 +01:00
Lynne Davis
44ac44e1dd
Updating Bill Calculator to include a minimum billable turnover. Shopfronts are not charged if their tunrover is under the minimum billable.
2016-04-15 16:55:07 +01:00
Steve Pettitt
0b820361de
Merge master
2016-04-15 08:29:52 +01:00
Steve Pettitt
fc719230a3
Add failed payments, update spec
2016-04-15 08:26:12 +01:00
Maikel Linke
49febc6333
Store customer email as lower case
2016-04-15 15:35:43 +10:00
Maikel Linke
a25f4fdf44
Associate new users with existing customer records
2016-04-15 11:57:18 +10:00
