Maikel Linke
e6adb8a3b9
Extract email setup in specs for easy upgrade
...
The way we set up email sending completely changes with Spree 2. This
change encapsulates that code in a single method so that it can be
changed easily and doesn't create further merge conflicts while we are
still working on the master branch and the Spree upgrade.
2018-10-25 13:53:22 +11:00
Rob Harrington
b17d8c2fe3
Add validation of open and close dates for order cycles
2018-04-04 17:18:32 +10:00
Pau Perez
6cb038c362
Autocorrect rubocop Layout/BlockEndNewline cop
2018-02-01 09:52:53 +01:00
Rob Harrington
59578a73af
Changing all references to 'be_true' and 'be_false' to 'be true' and 'be false'
...
See next commit for changes where this substitution was broken
2017-11-10 08:47:12 +11:00
Enrico Stano
7874d96003
Set MailMethod for test environment when needed
2017-09-08 23:55:50 +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
Rohan Mitchell
422061f137
Merge branch 'master' into products-caching
...
Conflicts:
app/controllers/shop_controller.rb
app/models/enterprise_fee.rb
app/models/order_cycle.rb
app/models/variant_override.rb
db/schema.rb
lib/open_food_network/products_renderer.rb
spec/lib/open_food_network/products_renderer_spec.rb
2016-03-03 09:42:52 +11:00
Rob Harrington
f280b96215
Hiding a variant from inventory prevents it being available on the shopfront
...
User preferences around inventory-only product selection immediately affect the shopfront
2016-03-02 12:10:22 +11:00
Rob Harrington
77e74c5642
OC Coordinators can opt to restrict products in an order cycle to those in their inventory only
2016-03-02 12:10:22 +11:00
Rohan Mitchell
378a703cc3
Order cycles are undated unless they have both open and close dates defined
2016-02-24 15:05:02 +11:00
Rohan Mitchell
fe41430d1e
Rerefesh products cache when an order cycle is changed
2016-02-24 15:05:02 +11:00
Rohan Mitchell
5d20b4fb51
Add OrderCycle scopes: not_closed, dated
2016-02-24 15:05:01 +11:00
Rohan Mitchell
48b02db70d
Order cycles are undated unless they have both open and close dates defined
2016-02-05 09:27:25 +11:00
Continuous Integration
ae945ace9d
Auto-merge from CI [skip ci]
2015-12-11 11:09:54 +11:00
Maikel Linke
cd7721a127
Using date and time of current timezone
...
Using Time.zone.now and Date.current instead of Time.now and Date.today.
This should make all specs timezone independent.
2015-12-10 11:38:41 +11:00
Rohan Mitchell
ea6974d438
Add OrderCycle#supplied_variants
2015-12-10 09:17:25 +11:00
Rob Harrington
2483eef4be
WIP: BOM Refactor, removing obsolete OrderCycle.recently_closed scope, ordering closed OCs
2015-11-05 14:02:04 +11:00
Rohan Mitchell
be66769999
SELECT DISTINCT results in inconsistent #count value. Work around this with to_a.
2015-08-05 11:05:29 +10:00
Rohan Mitchell
22230294ab
Merge branch 'master' into optimise-shopfront
2015-06-03 10:07:42 +10:00
Rohan Mitchell
7486daa2a3
Merge branch 'master' into require_standard_variant
...
Conflicts:
spec/controllers/spree/admin/variants_controller_spec.rb
spec/lib/open_food_network/permissions_spec.rb
spec/lib/open_food_network/products_and_inventory_report_spec.rb
spec/models/enterprise_spec.rb
2015-05-28 15:08:13 +10:00
Rohan Mitchell
97e49c2bdb
Replace 'array.sort.should == expected.sort' pattern with match_array
2015-05-28 10:46:08 +10:00
Rohan Mitchell
769edbe9d5
Find the earliest closing times for each distributor in an active order cycle
2015-05-27 15:44:01 +10:00
Rob Harrington
b9f19d5777
Fixing broken specs
2015-04-17 13:00:20 +10:00
Victor Nava
d6c30ae1ef
OrderCycle#recently_closed doesn't return orders that are open
2015-03-05 17:28:24 +11:00
Victor Nava
1b709a3e03
Do not load Order Cycles that closed more than a month a go
2015-03-05 16:04:36 +11:00
Maikel Linke
8e280919ac
Using simple_order_cycle in clone spec
...
Creating a coordinator fee and two exchanges in the spec instead of
using a full order_cycle. Timing of this single test:
Before: 15.32 seconds
After: 6.26 seconds
2014-11-28 15:36:34 +11:00
Maikel Linke
aa2cefb88c
Using simple_order_cycle where applicable
...
Before: 3 minutes 0 seconds
After: 1 minute 21.02 seconds
2014-11-28 13:45:25 +11:00
Rafael Schouten
b821107c27
bugfix migration ad specs
2014-09-27 18:14:10 +10:00
Rohan Mitchell
66cece5903
WIP: Extract order cycle fee calculations to EnterpriseFeeCalculator
2014-07-31 11:36:53 +10:00
Will Marshall
0479a0a55d
Fixing bugs, improving dates
2014-04-23 15:46:14 +10:00
Rohan Mitchell
47ac097eb7
Do not show deleted variants on shopfront
2014-04-11 19:08:55 +10:00
Rohan Mitchell
ec0191806a
Update specs to explicitly specify exchange direction
2014-03-26 12:17:49 +11:00
Rohan Mitchell
ac92d0919a
Add incoming boolean field to Exchange, determine exchange direction from this field rather than sender/receiver roles
2014-03-26 11:19:35 +11:00
Rohan Mitchell
638e922ae2
Do not allow customer to purchase the obsolete master of a product
2014-03-20 10:56:46 +11:00
Rohan Mitchell
a8373b7bef
Fix specs: stale data
2014-03-12 13:34:05 +11:00
Rohan Mitchell
f7e1befc75
Spec fees_for only sums per-item fees
2014-02-26 15:16:30 +11:00
Rohan Mitchell
11fb6c96a1
Charge per-order fees on orders exactly once
2014-02-26 14:34:30 +11:00
Rohan Mitchell
75c8da1774
Rename create_adjustments_for to create_line_item_adjustments_for, only show per-item fees
2014-02-26 12:07:38 +11:00
Rohan Mitchell
da8a8e8a1a
Rename method
2014-02-21 15:49:10 +11:00
Rohan Mitchell
08009d4020
Extract application of enterprise fees as adjustments into its own class
2014-02-21 15:48:58 +11:00
Will Marshall
1ca9a86042
Getting in a spec asserting that percentage-based fees are applied
2014-02-07 11:09:47 +11:00
Will Marshall
202f95a8fc
Fix for broken percentage Enterprise Fees in place, no test yet
2014-02-07 11:09:47 +11:00
Rohan Mitchell
d0fd48456e
Variant calculates fees and its price inclusive of fees
2014-02-05 14:01:10 +11:00
Rohan Mitchell
04487da22a
Decouple OrderCycle#fees_for from LineItem
2014-02-05 13:27:17 +11:00
Will Marshall
12743850b4
Removing a chili, refactoring order mailer
2013-12-13 15:40:22 +11:00
Rohan Mitchell
124b6df75d
Show undated order cycles on index page
2013-12-13 14:51:43 +11:00
Will Marshall
e574185c95
Fixing an ordering issue in the order cycle spec
2013-11-29 14:48:06 +11:00
Rohan Mitchell
459b2c1050
Add #upcoming? and #open? to OrderCycle
2013-11-22 11:15:12 +11:00
Rohan Mitchell
3a2394675f
Rename OrderCycle#expired? to #closed?
2013-11-22 11:08:42 +11:00
Rohan Mitchell
5ad63d08f3
Add some more open/close time scopes to order cycles
2013-11-22 10:57:33 +11:00
