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
eba2aae353
Copy StatusMessage to admin.utils module, eventually to be moved here
2015-12-10 09:32:04 +11:00
Rohan Mitchell
c1a80b1e8f
Require confirmation when saving an order cycle without distributors
2015-12-10 09:17:25 +11:00
Rohan Mitchell
8d270e919f
Sort exchanges for display when editing an order cycle
2015-12-10 09:17:25 +11:00
Rohan Mitchell
243ef4ee16
When an outgoing exchange includes a variant that is not in an incoming exchange, remove it from the outgoing exchange
2015-12-10 09:17:25 +11:00
Rohan Mitchell
ea6974d438
Add OrderCycle#supplied_variants
2015-12-10 09:17:25 +11:00
Rohan Mitchell
ccb23cd186
Do not allow re-adding exchange
2015-12-10 09:17:25 +11:00
Rohan Mitchell
d4ee20455e
Remove enterprise options from list when added
2015-12-10 09:17:25 +11:00
Rohan Mitchell
ef603a070e
Add methods to check for novel suppliers and distributors in an order cycle
2015-12-10 09:17:25 +11:00
Rohan Mitchell
1a4448c6d2
Do not allow adding blank enterprises
2015-12-10 09:17:25 +11:00
Rohan Mitchell
036ffeb634
Enterprise service splits enterprises into hubs and producers
2015-12-10 09:17:25 +11:00
Rohan Mitchell
a2c0088c91
Do not show flash message if we're performing an async update without reload
2015-12-10 09:17:24 +11:00
Rohan Mitchell
9fef0a9909
When order cycle is updated, display message instead of reloading the page
2015-12-10 09:17:24 +11:00
Rohan Mitchell
29bfac5f54
Order cycle interface may update or update and close
2015-12-10 09:17:24 +11:00
Maikel Linke
efa7c215e2
Removing usage of SimpleCov
2015-12-04 14:51:44 +11:00
Maikel Linke
1589bd9ac3
Use mail() instead of devise_mail
...
The EnterpriseMailer used `devise_mail` to send confirmation
instructions. That call is more complicated than `mail` and added an
unwanted reply-to header.
2015-12-04 10:37:55 +11:00
Maikel Linke
c4fb4a8510
Removing Suburbs from the code
...
Suburbs are not used any more. Removing the last code bits should avoid
confusion and save a tiny bit of test time.
2015-12-04 10:37:55 +11:00
Rohan Mitchell
d320b2e7d4
Merge branch 'fix-delayed-job' into combined/producer-emails-simplify_fix-delayed-job
2015-12-02 15:06:38 +11:00
Rohan Mitchell
bd854bf2dd
Remove receival_time from exchange, just use receival_instructions
2015-12-02 15:05:49 +11:00
Rohan Mitchell
10edb2b056
Fix delayed job startup - prevent error caused by double load
2015-12-02 10:48:50 +11:00
Rob H
86f1afae92
derp
2015-11-29 18:10:49 +11:00
Rob H
1cffd35968
Fixing up specs pertaining to full_name generation for line_items
2015-11-29 17:52:01 +11:00
Rob Harrington
b341c1ef8a
Ensure that dates in BOM AJAX requests have timezones
2015-11-25 15:06:15 +11:00
Rob Harrington
7e6b43266f
Making sure that price and final_weight_volume can be updated (by distributor or coordinator)
2015-11-25 14:23:55 +11:00
Rob Harrington
4bdc1bc418
LineItem final_weight_volume is updated whenever quantity is changed, though can be set directly
2015-11-18 16:22:36 +11:00
Rob Harrington
33454a7090
Adding server validation errors messages to BOM interface
2015-11-18 14:32:29 +11:00
Rob Harrington
6268b7cc7e
Printing/sending an invoice uses the same template for generating a pdf
2015-11-18 10:02:51 +11:00
Rob Harrington
75846a4d1f
Merge branch 'master' into line_item_naming
2015-11-16 10:38:42 +11:00
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
