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 |
|
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
|
d794981ecf
|
Add form field to set tax when creating adjustment on order. Display tax included in adjustments on order interface.
|
2015-11-11 11:53:04 +11:00 |
|
Rohan Mitchell
|
6476ce6ba9
|
Make spec more resilient
|
2015-11-10 15:05:45 +11:00 |
|
Maikel Linke
|
a06b452e7e
|
updated norwegian locale
|
2015-11-07 16:42:35 +11:00 |
|
Maikel Linke
|
0b6cbb43d6
|
updated locale nb.yml
|
2015-11-06 11:56:25 +11:00 |
|
Rob Harrington
|
27903a46e6
|
Adding new save-bar directive for handling save actions for index pages
|
2015-11-06 09:53:31 +11:00 |
|
Rob Harrington
|
330882c689
|
Pulling out styling for red buttons in admin into more generic .red class
|
2015-11-06 09:52:48 +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
|
bf6bd2dc68
|
Hack down routes available for Admin::LineItemsController
|
2015-11-05 17:18:32 +11:00 |
|
Rob Harrington
|
eb7b2e7a3b
|
Use ams_prefix not ams_suffix!
|
2015-11-05 17:17:45 +11:00 |
|
Rob Harrington
|
73c80cb5e5
|
Ordering index orders within query
|
2015-11-05 17:11:13 +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 |
|
Maikel Linke
|
5e59048705
|
i18n typo
|
2015-11-05 14:39:33 +11:00 |
|