Commit Graph

803 Commits

Author SHA1 Message Date
Rob Harrington
c7ed27286a Rubocop: Correct Lint/ParenthesesAsGroupedExpression offences 2017-06-23 17:02:20 +10:00
Rob Harrington
28ea23965b Rubocop: Correct Lint/AmbiguousOperator offences 2017-06-23 16:49:08 +10:00
Pierre de Lacroix
a6ed4a2c6a fix bad return value
in method Spree::Adjustment#find_closest_tax_rates_from_included_tax
2017-05-24 14:37:54 +10:00
Rob Harrington
217eda8362 Shipping and payment fees are updated for completed orders when the order changes 2017-05-05 14:20:57 +10:00
Rob Harrington
579f3bf90a Changing quantity and deleting line_items of completed orders works with inventory where present 2017-05-05 14:20:57 +10:00
Rob Harrington
348ab81c42 Overriding #increment! using variant overrides 2017-05-05 14:20:57 +10:00
Rob Harrington
314ccc2f27 Ensuring that #items_bought_by_user doesn't return items from cancelled orders 2017-05-05 14:20:57 +10:00
Maikel Linke
db4a528ba3 Update shipment to re-calculate included tax
And re-create tax charges on the order. (untested)
2017-05-05 14:19:32 +10:00
Maikel Linke
479c7ba24b Update transaction fees of completed orders
The adjustments associated to incomplete payments are re-calculated when
a line item is removed from a completed order.
2017-05-05 14:19:32 +10:00
Maikel Linke
1f08729df3 Update shipping fees after removing item
After removing an item from a completed order, update the shipping fees
of all shipments that are pending or ready (not completed).
2017-05-05 14:19:32 +10:00
Maikel Linke
65f62c42b9 Display products already ordered in this oc
Github issue #1083, part of standing orders.

For now, just display already bought products within the same order
cycle in the popup cart view. The edit cart view should follow. Later,
it should be possible to remove items as well.
2017-05-05 14:18:20 +10:00
Pierre de Lacroix
e854eb0426 add tests
for methods Spree::Order#tax_adjustment_totals
and Spree::Adjustment#find_closest_tax_rate_from_included_tax
2017-04-27 17:32:36 +10:00
Matt-Yorkley
052d6c6b02 Product Import basic specs 2017-03-17 16:11:52 +11:00
Rohan Mitchell
6795237a2d Put timecop into safe mode and fix leaky Timecop.freeze 2016-11-25 14:14:42 +11:00
Rohan Mitchell
57363e2da5 When a product is deleted, touch the supplier and distributors 2016-11-25 14:14:42 +11:00
Rohan Mitchell
da9a3ce9f3 Refresh products cache when product is deleted (cf. destroyed) 2016-11-25 14:14:42 +11:00
Rohan Mitchell
dabac50128 Replace Enterprise.distributing_product and Enterprise.distributing_any_product_of with Enterprise.distributing_products 2016-11-25 14:14:42 +11:00
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
e8848451a5 Spacing 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
631b19084a Fix intermittent failure via FK when deleted taxon is primary taxon on p2 2016-11-25 09:37:05 +11:00
Rohan Mitchell
fdd6400cb8 Fix perms for API soft delete 2016-11-04 09:39:17 +11:00
Rohan Mitchell
1765ba0422 Fix spec dependent on product on_demand 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
d48b00c77c Fix failed user spec 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
Rob Harrington
7d149ed198 Revert shop property filters - causing 10x slowdown
This commit reverts commits 7eeee78c4e to e8f96e4818 (inclusive)
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