Rohan Mitchell
|
b6f3e6eca6
|
Fix broken spec
|
2015-11-13 14:03:07 +11:00 |
|
Rohan Mitchell
|
a86cc96452
|
Use pluck instead of map
|
2015-11-13 14:03:07 +11:00 |
|
Rohan Mitchell
|
178e5f59e6
|
Update cart by applying differences rather than clear-and-readd every time
|
2015-11-13 14:03:07 +11:00 |
|
Rohan Mitchell
|
7fffa03d8d
|
Fix bug: set difference comparison of string with number
|
2015-11-13 14:03:07 +11:00 |
|
Rohan Mitchell
|
888e4d80ef
|
Add reliable way to check if cart is dirty. Previous way returned true when cart empty.
|
2015-11-13 14:03:07 +11:00 |
|
Rohan Mitchell
|
d3c7c46800
|
Add method to remove a variant from an order
|
2015-11-13 14:03:07 +11:00 |
|
Rohan Mitchell
|
c432ed9e08
|
Build list of variants removed from the cart when overwriting
|
2015-11-13 14:03:07 +11:00 |
|
Rohan Mitchell
|
e175149e76
|
Add method to check whether a passed-in cart value varies from the cart
|
2015-11-13 14:03:07 +11:00 |
|
Rohan Mitchell
|
1b5901317d
|
Separate concerns: reading products hash and adding items to cart
|
2015-11-13 14:03:07 +11:00 |
|
Rohan Mitchell
|
2f4b5bad26
|
Make benchmark more realistic
|
2015-11-13 14:03:07 +11:00 |
|
Rohan Mitchell
|
64e8927ae9
|
Add benchmark: add to cart
|
2015-11-13 14:03:07 +11:00 |
|
Rohan Mitchell
|
c932d20ef5
|
Extract multi-sample benchmarking into a helper method
|
2015-11-13 14:03:07 +11:00 |
|
Maikel Linke
|
5d5fda3a25
|
Merge remote-tracking branch 'origin/master' into i18n
Conflicts:
config/locales/en.yml
|
2015-11-13 10:07:29 +11:00 |
|
Rob Harrington
|
a96cdd5ee7
|
Merge branch 'master' into line_item_naming
Conflicts:
app/views/admin/order_cycles/edit.html.haml
|
2015-11-13 09:54:26 +11:00 |
|
Rob Harrington
|
4191e2b6f0
|
Changing the way select filters are reset on BOM to try and fix specs
|
2015-11-13 09:44:57 +11:00 |
|
Rob Harrington
|
88fd9f72e6
|
Retry uncooperative BOM feature spec
|
2015-11-13 09:14:20 +11:00 |
|
Rob Harrington
|
3d36ebe2e6
|
Some Ransack trickery to get OrderCycles#index to load only recent OR undated OCs when no orders_close_at predicate is passed in
|
2015-11-12 18:29:19 +11:00 |
|
Rob Harrington
|
6966fbba7c
|
Present date limits being set in line items controller .js unless orderCycleFilter has actually been set
|
2015-11-12 17:40:35 +11:00 |
|
Rob Harrington
|
2310bc95bc
|
Committing changes to version used to bundle Gemfile.lock
|
2015-11-12 17:34:22 +11:00 |
|
Rob Harrington
|
27a5791e26
|
Fixing Angular Specs for line items controller
|
2015-11-12 17:33:12 +11:00 |
|
Rob Harrington
|
be8038e9d0
|
Merge branch 'master' into line_item_naming
Conflicts:
lib/open_food_network/order_cycle_management_report.rb
lib/open_food_network/packing_report.rb
|
2015-11-12 14:40:11 +11:00 |
|
Rob Harrington
|
1556d38b1e
|
Admin Enterprise#update.json renders updated enterprises using index serializer
|
2015-11-12 14:30:43 +11:00 |
|
Rob Harrington
|
4e4de65cba
|
Fetch undated order cycles by default for index actions
|
2015-11-12 12:08:39 +11:00 |
|
Rob Harrington
|
6e8d807408
|
Fixing spec using text-angular broken by upgrade of poltergeist
|
2015-11-12 11:35:22 +11:00 |
|
Rob Harrington
|
095466cb43
|
Fixing syntax error for new method for OCs controller
|
2015-11-12 10:34:09 +11:00 |
|
Rob Harrington
|
2719c699d7
|
Updating line items index spec
|
2015-11-12 10:06:41 +11:00 |
|
Rob Harrington
|
34030276d7
|
Cleaning up line items index (BOM)
|
2015-11-12 10:06:21 +11:00 |
|
Rob Harrington
|
330977186e
|
Using confirm-change and select2-min-search directive for line items index
|
2015-11-12 10:05:14 +11:00 |
|
Rob Harrington
|
fc57255b40
|
Adding save-bar to line items index
|
2015-11-12 10:04:18 +11:00 |
|
Rob Harrington
|
266820742d
|
Using request monitor on line items index (BOM)
|
2015-11-12 10:03:28 +11:00 |
|
Rob Harrington
|
722471a111
|
Allow use of completed_at for orders index ransacking
Needed to override original Spree method to allow intuitive use of
completed_at_gt and completed_at_lt
|
2015-11-12 10:01:35 +11:00 |
|
Rob Harrington
|
86b5e810e5
|
Only try to dereference attrs when enough information is present
|
2015-11-12 09:59:46 +11:00 |
|
Rob Harrington
|
f8a31e8864
|
Resetting select filters in a way that actually works
|
2015-11-12 09:58:55 +11:00 |
|
Rob Harrington
|
639472b917
|
WIP: Adding a request monitoring service to handle loading status
|
2015-11-12 09:57:02 +11:00 |
|
Rob Harrington
|
193325f81b
|
Improve formatting around saving on line items index (BOM)
|
2015-11-12 09:52:10 +11:00 |
|
Rob Harrington
|
5a7cac652c
|
Adding confirm-link directive
|
2015-11-12 09:49:36 +11:00 |
|
Rob Harrington
|
b5aaf36bd2
|
Create directive for scaling by a factor and then formatting as currency
|
2015-11-12 09:48:43 +11:00 |
|
Rob Harrington
|
c5a26249ea
|
Removing unneeded directives
|
2015-11-12 09:47:37 +11:00 |
|
Rob Harrington
|
69ead3c829
|
Line items serialiser gives a sensible value for max_quantity
|
2015-11-12 09:47:12 +11:00 |
|
Rob Harrington
|
93caa4a11d
|
Bumping poltergeist version to 1.7.0
|
2015-11-12 09:45:14 +11:00 |
|
Rohan Mitchell
|
e20d8d3e95
|
Merge branch 'master' into folklabs-producer-emails
|
2015-11-11 14:20:25 +11:00 |
|
Rohan Mitchell
|
fb3e292e20
|
Formatting
|
2015-11-11 11:53:04 +11:00 |
|
Rohan Mitchell
|
f499dd627a
|
with_tax_included_in_price handles exceptions gracefully
|
2015-11-11 11:53:04 +11:00 |
|
Rohan Mitchell
|
8e1bade355
|
Move adjustment specs to their own spec file
|
2015-11-11 11:53:04 +11:00 |
|
Rohan Mitchell
|
a32321df68
|
Clarify label
|
2015-11-11 11:53:04 +11:00 |
|
Rohan Mitchell
|
5a29311137
|
Choose a more sensible default tax rate: one that calculates to the same amount as the current adjustment tax
|
2015-11-11 11:53:04 +11:00 |
|
Rohan Mitchell
|
3e7a12cca1
|
Rename spec support method for faster tab completion on save_and_open_page
|
2015-11-11 11:53:04 +11:00 |
|
Rohan Mitchell
|
81a6e07d5c
|
Admin can remove tax on an adjustment
|
2015-11-11 11:53:04 +11:00 |
|
Rohan Mitchell
|
727ecae62b
|
Admin can modify a taxed adjustment on an order
|
2015-11-11 11:53:04 +11:00 |
|
Rohan Mitchell
|
85e45fa558
|
Use select2
|
2015-11-11 11:53:04 +11:00 |
|