Rob Harrington
|
c199e22190
|
Make a few BOM specs more robust
|
2015-11-16 10:31:41 +11:00 |
|
Rob Harrington
|
767671c3b4
|
New pattern: blank Options for index drop down filters are added within service
Rather than in the controller after data is loaded
|
2015-11-16 10:30:44 +11:00 |
|
Rob Harrington
|
ae7fb91a9a
|
Only reloading line_items and orders on BOM, $timeout for adding blankOption
$timeout required for adding a blank option to lists of suppliers,
distributors and orderCycles to prevent spec failures related to the
use of select2
|
2015-11-13 15:59:33 +11:00 |
|
Maikel Linke
|
229070a76b
|
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into i18n
|
2015-11-13 15:20:58 +11:00 |
|
Rohan Mitchell
|
b6f3e6eca6
|
Fix broken spec
|
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
|
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
|
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
|
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
|
6e8d807408
|
Fixing spec using text-angular broken by upgrade of poltergeist
|
2015-11-12 11:35:22 +11:00 |
|
Rob Harrington
|
2719c699d7
|
Updating line items index spec
|
2015-11-12 10:06:41 +11:00 |
|
Rohan Mitchell
|
e20d8d3e95
|
Merge branch 'master' into folklabs-producer-emails
|
2015-11-11 14:20:25 +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
|
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
|
83c0093665
|
Admin can include tax when creating an adjustment
|
2015-11-11 11:53:04 +11:00 |
|
Rohan Mitchell
|
46a9304ae1
|
Extract compute_tax from EnterpriseFeeApplicator to Spree::TaxRate model
|
2015-11-11 11:53:04 +11:00 |
|
Rohan Mitchell
|
6476ce6ba9
|
Make spec more resilient
|
2015-11-10 15:05:45 +11:00 |
|
Rob Harrington
|
b1bac703ed
|
WIP: BOM Refactor, delete line_items using ngResource, updating data requests in line_items_controller
|
2015-11-05 17:50:18 +11:00 |
|
Rob Harrington
|
6769c2c729
|
Can pass params for order or line items into LineItemsController#index
|
2015-11-05 17:07:47 +11:00 |
|
Rob Harrington
|
afef9e3211
|
WIP: BOM Refactor, building order_cycle fetch and update logic with ngResource
|
2015-11-05 15:13:19 +11:00 |
|
Rob Harrington
|
a9e5f2912f
|
WIP: Fixing Orders service specs
|
2015-11-05 14:48:26 +11:00 |
|
Rob Harrington
|
66d1e4297e
|
WIP: Renaming admin.order_cycles to admin.orderCycles for consistency
|
2015-11-05 14:40:42 +11:00 |
|
Rob Harrington
|
51762753f4
|
WIP: BOM Refactor, adding json route for OrderCyclesController#index, loading OCs based on show_more or specific order_close_at_gt
|
2015-11-05 14:04:29 +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 |
|
Rob Harrington
|
e96fa967b8
|
WIP: BOM refactor, rebuilding bulk orders controller as line items controller using new AJAX routes
|
2015-11-05 11:54:36 +11:00 |
|
Maikel Linke
|
8b29612614
|
Merge remote-tracking branch 'origin/master' into i18n
|
2015-11-05 11:54:06 +11:00 |
|
Rohan Mitchell
|
5ffad4d343
|
Fix quantity calculation
|
2015-11-05 09:43:44 +11:00 |
|
Rob Harrington
|
b43049af47
|
WIP: BOM Refactor, building line_item fetch and update logic with ngResource
|
2015-11-04 18:16:17 +11:00 |
|
Rob Harrington
|
f563f04f1c
|
WIP: BOM Refactor, building order fetch and update logic with ngResource, updating rails routes
|
2015-11-04 16:35:56 +11:00 |
|
Rob Harrington
|
ae7e744644
|
WIP: BOM Refactor, adding for_line_items action to enterprises controller
|
2015-11-04 15:02:29 +11:00 |
|
Rob Harrington
|
625e0888ea
|
Adding logic to Admin::BaseController to standardise rendering of data with AMS
|
2015-11-04 12:10:50 +11:00 |
|
Rohan Mitchell
|
a3d638df67
|
Merge branch 'master' into folklabs-producer-emails
|
2015-11-04 11:15:01 +11:00 |
|
Rohan Mitchell
|
015f3eb9ac
|
Display summary rows for admin adjustments
|
2015-11-01 13:42:59 +11:00 |
|
Lynne Davis
|
7350dbb75e
|
Adding tweaks that have been missed from merges
|
2015-10-30 11:54:06 +11:00 |
|