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
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
ddcfe1535a
Making TagRule autocomplete available to models other than Customer
...
Incorporate ng admin.tags module and rails TagController into existing admin.tagRules module + TagRuleController
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
Rohan Mitchell
9ac6de4215
Admin can set bugherd API key
2016-05-04 11:42:07 +10:00
Rob Harrington
1d7308bf5d
More intuitive logic for minimum billable turnover
2016-04-29 18:03:32 +10:00
Maikel Linke
fa5fa9e228
Auto-complete tags on customers page
...
- new controller serving tags for an enterprise as JSON
- customers page suggesting these tags
- emphasising tags that have rules
2016-04-29 15:18:17 +10:00
Rohan Mitchell
8f8a1191cb
Remove stock cap on max_quantity
2016-04-27 12:27:24 +10:00
Steve Pettitt
2b921542a5
Code styling
2016-04-26 04:24:44 +01: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
Steve Pettitt
7f38f1dd1c
Exclude Accounts & Billing distributor
2016-04-26 03:14:13 +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
a26266159c
Fix timing issue: change in client-side value during server update
2016-04-22 10:47:20 +10:00
Rohan Mitchell
779be7c5a0
Extract params parsing into single method
2016-04-21 16:37:15 +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
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
af4c8bee94
Adding preference def for minimum_billable_turnover
2016-04-15 16:56:09 +01:00
Lynne Davis
abfb8149d9
Adding configurable Shop Trial Length in business model
2016-04-15 16:51:07 +01:00
Steve Pettitt
0b820361de
Merge master
2016-04-15 08:29:52 +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
Maikel Linke
831df0b222
Create and delete customers in admin interface
...
Removed Customers service and extended CustomerResource.
2016-04-15 11:12:22 +10:00
Rohan Mitchell
eb846e27fd
Run a job queue heartbeat every 5 minutes
2016-04-13 16:48:24 +10:00
Steve Pettitt
bc048a943c
Show all payments, format unsuccessful payments grey, add 'invalid' translation.
2016-04-10 22:23:39 +01:00
Steve Pettitt
4414a3f287
Fix spelling mistake
2016-04-09 10:05:45 +01:00
